From 0f72571658dc8c0767598ae883d9f01477c19ce8 Mon Sep 17 00:00:00 2001 From: Jeremy Allen Date: Sat, 14 Oct 2023 15:19:56 -0400 Subject: [PATCH 1/5] inner dowble quotes were causing images not render in final book; with single inner quotes the images now render --- remote-setups-common.Rmd | 4 +++- render-r-script-demo.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/remote-setups-common.Rmd b/remote-setups-common.Rmd index 553e9ad..d8752a5 100644 --- a/remote-setups-common.Rmd +++ b/remote-setups-common.Rmd @@ -18,8 +18,10 @@ As a starting point, consider a local Git repo that is not yet connected to GitH ```{r no_github} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"no_github\"" +#| fig.alt = "Setup described as \'no_github\'" + knitr::include_graphics("img/no-github.jpeg") + ``` This is not very exciting, but sets the stage for what's to come. diff --git a/render-r-script-demo.md b/render-r-script-demo.md index bcda95c..ef4ca6a 100644 --- a/render-r-script-demo.md +++ b/render-r-script-demo.md @@ -1,7 +1,7 @@ R scripts can be rendered! ================ -jenny -2022-06-23 +jeremyallen +2023-10-14 Here’s some prose in a very special comment. Let’s summarize the built-in dataset `VADeaths`. From 5e59ed919bf1b79ab3658e4e836c2c2f3bac9335 Mon Sep 17 00:00:00 2001 From: Jeremy Allen Date: Sat, 14 Oct 2023 15:21:26 -0400 Subject: [PATCH 2/5] inner dowble quotes were causing images not render in final book; with single inner quotes the images now render --- remote-setups-common.Rmd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/remote-setups-common.Rmd b/remote-setups-common.Rmd index d8752a5..daef3aa 100644 --- a/remote-setups-common.Rmd +++ b/remote-setups-common.Rmd @@ -45,7 +45,7 @@ A common next step is to associate a local repo with a copy on GitHub, owned by ```{r ours-you} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"ours\"" +#| fig.alt = "Setup described as \'ours\'" knitr::include_graphics("img/ours-you.jpeg") ``` @@ -89,7 +89,7 @@ Here is a variation on "ours" that is equivalent in practice. ```{r ours-them} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"ours\"" +#| fig.alt = "Setup described as \'ours\'" knitr::include_graphics("img/ours-them.jpeg") ``` @@ -115,7 +115,7 @@ It's not broken *per se*, but it's limiting. ```{r theirs} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"theirs\"" +#| fig.alt = "Setup described as \'theirs\'" knitr::include_graphics("img/theirs.jpeg") ``` @@ -146,7 +146,7 @@ This is an ideal setup if you want to make a pull request and generally follow t ```{r fork-them} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"fork\"" +#| fig.alt = "Setup described as \'fork\'" knitr::include_graphics("img/fork-them.jpeg") ``` @@ -188,7 +188,7 @@ This is a less common variation on the fork setup. ```{r fork-ours} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"fork\"" +#| fig.alt = "Setup described as \'fork\'" knitr::include_graphics("img/fork-ours.jpeg") ``` @@ -210,7 +210,7 @@ Here is one last fork setup that's sub-optimal, but it can be salvaged. ```{r fork-no-upstream} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"fork_upstream_is_not_origin_parent\"" +#| fig.alt = "Setup described as \'fork_upstream_is_not_origin_parent\'" knitr::include_graphics("img/fork_upstream_is_not_origin_parent.jpeg") ``` From d765b352e9e0336977052eaf2558b9c537e6f2e1 Mon Sep 17 00:00:00 2001 From: Jeremy Allen Date: Sat, 14 Oct 2023 15:24:50 -0400 Subject: [PATCH 3/5] inner double quotes were causing images not render in final book; with single inner quotes the images now render --- remote-setups-equivocal.Rmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote-setups-equivocal.Rmd b/remote-setups-equivocal.Rmd index 797d10b..d2bb320 100644 --- a/remote-setups-equivocal.Rmd +++ b/remote-setups-equivocal.Rmd @@ -33,7 +33,7 @@ When we detect just one GitHub remote, but we can't verify the info above, useth ```{r maybe_ours_or_theirs} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"maybe_ours_or_theirs\"" +#| fig.alt = "Setup described as \'maybe_ours_or_theirs\'" knitr::include_graphics("img/maybe_ours_or_theirs.jpeg") ``` @@ -45,7 +45,7 @@ When we detect two GitHub remotes, but we can't verify the info above, usethis d ```{r maybe_fork} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"maybe_fork\"" +#| fig.alt = "Setup described as \'maybe_fork\'" knitr::include_graphics("img/maybe_fork.jpeg") ``` From 2e79253dc1efda941b232b0c41f76c7783e7649d Mon Sep 17 00:00:00 2001 From: Jeremy Allen Date: Sat, 14 Oct 2023 15:29:39 -0400 Subject: [PATCH 4/5] inner double quotes were causing images not render in final book; with single inner quotes the images now render --- workflows-upstream-changes-into-fork.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows-upstream-changes-into-fork.Rmd b/workflows-upstream-changes-into-fork.Rmd index b71f5e8..7cac6e0 100644 --- a/workflows-upstream-changes-into-fork.Rmd +++ b/workflows-upstream-changes-into-fork.Rmd @@ -80,7 +80,7 @@ We assume your repo has this favorable configuration: ```{r fork-them} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \"fork\"" +#| fig.alt = "Setup described as \'fork\'" knitr::include_graphics("img/fork-them.jpeg") ``` From 1d46aa83ab04ea0300c3b3d17c81f7390f664978 Mon Sep 17 00:00:00 2001 From: Jeremy Allen Date: Mon, 16 Oct 2023 18:36:54 -0400 Subject: [PATCH 5/5] removed escape slashes from single inner quotes in fig.alt chunk options --- remote-setups-common.Rmd | 14 +++++++------- remote-setups-equivocal.Rmd | 4 ++-- workflows-upstream-changes-into-fork.Rmd | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/remote-setups-common.Rmd b/remote-setups-common.Rmd index daef3aa..394d411 100644 --- a/remote-setups-common.Rmd +++ b/remote-setups-common.Rmd @@ -18,7 +18,7 @@ As a starting point, consider a local Git repo that is not yet connected to GitH ```{r no_github} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'no_github\'" +#| fig.alt = "Setup described as 'no_github'" knitr::include_graphics("img/no-github.jpeg") @@ -45,7 +45,7 @@ A common next step is to associate a local repo with a copy on GitHub, owned by ```{r ours-you} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'ours\'" +#| fig.alt = "Setup described as 'ours'" knitr::include_graphics("img/ours-you.jpeg") ``` @@ -89,7 +89,7 @@ Here is a variation on "ours" that is equivalent in practice. ```{r ours-them} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'ours\'" +#| fig.alt = "Setup described as 'ours'" knitr::include_graphics("img/ours-them.jpeg") ``` @@ -115,7 +115,7 @@ It's not broken *per se*, but it's limiting. ```{r theirs} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'theirs\'" +#| fig.alt = "Setup described as 'theirs'" knitr::include_graphics("img/theirs.jpeg") ``` @@ -146,7 +146,7 @@ This is an ideal setup if you want to make a pull request and generally follow t ```{r fork-them} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'fork\'" +#| fig.alt = "Setup described as 'fork'" knitr::include_graphics("img/fork-them.jpeg") ``` @@ -188,7 +188,7 @@ This is a less common variation on the fork setup. ```{r fork-ours} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'fork\'" +#| fig.alt = "Setup described as 'fork'" knitr::include_graphics("img/fork-ours.jpeg") ``` @@ -210,7 +210,7 @@ Here is one last fork setup that's sub-optimal, but it can be salvaged. ```{r fork-no-upstream} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'fork_upstream_is_not_origin_parent\'" +#| fig.alt = "Setup described as 'fork_upstream_is_not_origin_parent'" knitr::include_graphics("img/fork_upstream_is_not_origin_parent.jpeg") ``` diff --git a/remote-setups-equivocal.Rmd b/remote-setups-equivocal.Rmd index d2bb320..dd6a23e 100644 --- a/remote-setups-equivocal.Rmd +++ b/remote-setups-equivocal.Rmd @@ -33,7 +33,7 @@ When we detect just one GitHub remote, but we can't verify the info above, useth ```{r maybe_ours_or_theirs} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'maybe_ours_or_theirs\'" +#| fig.alt = "Setup described as 'maybe_ours_or_theirs'" knitr::include_graphics("img/maybe_ours_or_theirs.jpeg") ``` @@ -45,7 +45,7 @@ When we detect two GitHub remotes, but we can't verify the info above, usethis d ```{r maybe_fork} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'maybe_fork\'" +#| fig.alt = "Setup described as 'maybe_fork'" knitr::include_graphics("img/maybe_fork.jpeg") ``` diff --git a/workflows-upstream-changes-into-fork.Rmd b/workflows-upstream-changes-into-fork.Rmd index 7cac6e0..ff8c16b 100644 --- a/workflows-upstream-changes-into-fork.Rmd +++ b/workflows-upstream-changes-into-fork.Rmd @@ -80,7 +80,7 @@ We assume your repo has this favorable configuration: ```{r fork-them} #| echo = FALSE, fig.align = "center", out.width = "60%", -#| fig.alt = "Setup described as \'fork\'" +#| fig.alt = "Setup described as 'fork'" knitr::include_graphics("img/fork-them.jpeg") ```