Skip to content

Commit 6841a8b

Browse files
authored
Merge branch 'main' into translation
2 parents f789850 + e3475d7 commit 6841a8b

File tree

378 files changed

+21117
-410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

378 files changed

+21117
-410
lines changed

.Rprofile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ if (file.exists('~/.Rprofile')) {
55
options(blogdown.new_bundle = TRUE)
66
options(blogdown.subdir = "blog")
77
options(blogdown.title_case = TRUE)
8-
options(blogdown.hugo.version = "0.89.0")
8+
options(blogdown.hugo.version = "0.133.0")
99
options(blogdown.knit.on_save = FALSE)
1010
options(blogdown.method = "markdown")

.github/workflows/latest-hugo.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# This workflow is not a blocker but to identify issues with upcoming hugo versions
2+
on:
3+
push:
4+
branches:
5+
- 'main'
6+
workflow_dispatch:
7+
8+
name: Test build with latest Hugo
9+
10+
jobs:
11+
build:
12+
name: Test build with latest hugo
13+
runs-on: macOS-latest
14+
steps:
15+
- name: Install latest hugo
16+
run: brew install hugo || true
17+
18+
- uses: actions/checkout@v4
19+
20+
- name: Build the website
21+
run: hugo --minify --buildFuture

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ index_cache
2626
resources/_gen
2727
.hugo_build.lock
2828
/layouts/shortcodes/blogdown
29+
30+
/.quarto/

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ Note that main.min.css that contains all the CSS is stored under themes/ropensci
228228
* Check "New Maintainer Wanted" issues.
229229
* Update package categories in https://github.com/ropensci/roregistry/blob/gh-pages/scripts/update_categories.R (not directly related to the newsletter but good to do monthly!).
230230
* Update pinned repositories of github.com/ropensci to feature new packages.
231+
* Check metadata of posts on Rogue Scholar for the previous month (for instance authors). https://rogue-scholar.org/blogs/ropensci
231232
* Start a new post with the newsletter archetype, use the same title "rOpenSci News Digest, MONTH YEAR" and slug "ropensci-news-digest-month-YYYY" and tag "newsletter".
232233
* **Make sure your branch is based on the latest commit of the default branch, re-base if needed.**
233234
* Open the Rproj in `scripts/use-cases` (in another RStudio window), run `renv::restore()` and source `get_use_cases.R` to update use cases data (you need a Discourse API key, contact Scott).

archetypes/Rmd/index.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ socialAlt: "Alternative description of the image"
2626
# the text below is for populating the "share on Twitter" button
2727
# if deleted, the title of the post will be used
2828
social: "A post about blabla by @[email protected]!"
29+
# this field is for the storing the name(s) of the editor(s) of your post
30+
# you can leave it empty until you know who'll review your PR
31+
editor:
2932
---
3033

3134
This is the R Markdown (.Rmd) template for a blog post or tech note.
@@ -49,7 +52,7 @@ knitr::knit_hooks$set(
4952
plot = function(x, options) {
5053
hugoopts <- options$hugoopts
5154
paste0(
52-
"`{{<figure src=",
55+
"`{{< figure src=",
5356
'"', x, '" ',
5457
if (!is.null(hugoopts)) {
5558
glue::glue_collapse(
@@ -94,7 +97,7 @@ Citation of an R package[^3].
9497

9598
### Subsection heading
9699

97-
We recommend the use of [Hugo shortcodes](https://gohugo.io/content-management/shortcodes/) to include images, tweets, videos, gists, etc. In the Rmd file they need to be between `<!--html_preserve-->` and `<!--/html_preserve-->`.
100+
We recommend the use of [Hugo shortcodes](https://gohugo.io/content-management/shortcodes/) to include images, videos, gists, etc. In the Rmd file they need to be between `<!--html_preserve-->` and `<!--/html_preserve-->`.
98101

99102
**Add an image** by using a Hugo shortcode. The image is saved under `/content/blog/YYYY-MM-DD-slug/name-of-image.png`.
100103

@@ -113,13 +116,6 @@ plot(1:10)
113116
Once this file is knitted the plot above will be inserted with the correct syntax.
114117

115118

116-
**Embed a tweet** by using a Hugo shortcode.
117-
118-
<!--html_preserve-->
119-
{{< tweet user="SanDiegoZoo" id="1453110110599868418" >}}
120-
<!--/html_preserve-->
121-
122-
123119
**Tweak code highlighting** Below you can see how to use Hugo [Chroma code highlighting options](https://gohugo.io/content-management/syntax-highlighting/#highlight-shortcode): highlight the 1st and 4th to 6th code lines, number lines as a table starting from 199.
124120

125121
```{r hl, hlopts = list(linenos='table',hl_lines='[1,"4-6"]',linenostart=199)}

archetypes/md/index.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ socialAlt: "Alternative description of the image"
2626
# the text below is for populating the "share on Mastodon" button
2727
# if deleted, the title of the post will be used
2828
social: "A post about blabla by @[email protected]!"
29+
# this field is for the storing the name(s) of the editor(s) of your post
30+
# you can leave it empty until you know who'll review your PR
31+
editor:
2932
---
3033

3134
This is the Markdown (.md) template for a blog post or tech note.
@@ -47,19 +50,14 @@ Citation of an R package[^3].
4750

4851
### Subsection heading
4952

50-
We recommend the use of [Hugo shortcodes](https://gohugo.io/content-management/shortcodes/) to include images, tweets, videos, gists, etc.
53+
We recommend the use of [Hugo shortcodes](https://gohugo.io/content-management/shortcodes/) to include images,, videos, gists, etc.
5154

5255
**Add an image** by using a Hugo shortcode. The image is saved under `/content/blog/YYYY-MM-DD-slug/name-of-image.png`.
5356

5457
{{< figure src = "name-of-image.png" width = "400" alt = "this is the alternative text" >}}
5558

5659
Consult the Technical Guidelines for tips on changing image size, alignment, and for advice on alternative text.
5760

58-
**Embed a tweet** by using a Hugo shortcode.
59-
60-
{{< tweet user="SanDiegoZoo" id="1453110110599868418" >}}
61-
62-
6361
**Add citation or footnote** text by using the format below
6462

6563
[^1]: Sciaini, M., Fritsch, M., Scherer, C., & Simpkins, C. E. (2018). NLMR and landscapetools: An integrated environment for simulating and modifying neutral landscape models in R. Methods in Ecology and Evolution, 9(11), 2240-2248. <https://doi.org/10.1111/2041-210X.13076>

archetypes/newsletter/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ english <- function(x) {
2828
}
2929
3030
nice_string <- function(...) {
31+
if (length(...) == 2) {
32+
return(paste(c(...), collapse = " and "))
33+
}
3134
glue::glue_collapse(..., sep = ", ", last = ", and ")
3235
}
3336
```
@@ -612,5 +615,6 @@ Some useful tips for R package developers. :eyes:
612615
## Last words
613616

614617
Thanks for reading! If you want to get involved with rOpenSci, check out our [Contributing Guide](https://contributing.ropensci.org) that can help direct you to the right place, whether you want to make code contributions, non-code contributions, or contribute in other ways like sharing use cases.
618+
You can also support our work through [donations](/donate).
615619

616620
If you haven't subscribed to our newsletter yet, you can [do so via a form](/news/). Until it's time for our next newsletter, you can keep in touch with us via our [website](/) and [Mastodon account](https://hachyderm.io/@rOpenSci).

archetypes/qmd/index.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
slug: "post-template"
3+
title: Post Title in Title Case
4+
# Delete the package_version line below if your post is not about a package
5+
package_version: 0.1.0
6+
author:
7+
- Author Name1
8+
- Author Name2
9+
# Set the date below to the publication date of your post
10+
date: 2020-03-10
11+
# Minimal tags for a post about a community-contributed package
12+
# that has passed software peer review are listed below
13+
# Consult the Technical Guidelines for information on choosing tags
14+
tags:
15+
- Software Peer Review
16+
- packages
17+
- R
18+
- community
19+
# The summary below will be used by e.g. Mastodon preview cards
20+
description: "A very short summary of your post (~ 100 characters)"
21+
# If you have no preferred image for Mastodon preview cards,
22+
# delete the socialImg and socialAlt lines below
23+
# - Note "/" between year/month/day
24+
socialImg: blog/2019/06/04/post-template/name-of-image.png
25+
socialAlt: "Alternative description of the image"
26+
# the text below is for populating the "share on Twitter" button
27+
# if deleted, the title of the post will be used
28+
social: "A post about blabla by @[email protected]!"
29+
# this field is for the storing the name(s) of the editor(s) of your post
30+
# you can leave it empty until you know who'll review your PR
31+
editor:
32+
# Quarto metadata
33+
format: hugo-md
34+
knitr:
35+
opts_chunk:
36+
fig.path: ""
37+
---
38+
39+
40+
This is the Quarto (.qmd) template for a blog post or tech note.
41+
To generate your post with just Markdown (.md), use that template instead.
42+
43+
[Quarto docs for Hugo](https://quarto.org/docs/output-formats/hugo.html).
44+
45+
Throughout this template, including the YAML,
46+
you should change "post-template" to the slug of your post,
47+
and "2019-06-04" to your publication date.
48+
49+
Save this file under /content/blog/YYYY-MM-DD-slug/index.qmd in the local copy of your roweb3 fork.
50+
51+
The figure paths in the resulting Markdown will already be valid so you won't need to edit the Markdown file.
52+
53+
## Section heading in sentence case
54+
55+
Citation of the primary literature[^1].
56+
57+
Citation of a website[^2].
58+
59+
Citation of an R package[^3].
60+
61+
### Subsection heading
62+
63+
We recommend the use of [Hugo shortcodes](https://gohugo.io/content-management/shortcodes/) to include images, videos, gists, etc.
64+
65+
**Add an image** by using a Hugo shortcode. The image is saved under `/content/blog/YYYY-MM-DD-slug/name-of-image.png`.
66+
67+
{{{< figure src = "name-of-image.png" width = "400" alt = "this is the alternative text" >}}}
68+
69+
Consult the Technical Guidelines for tips on changing image size, alignment, and for advice on alternative text.
70+
71+
Below is another image, a plot generated by a code chunk, so you might see how to add alternative text in this case.
72+
73+
```{r chunkname}
74+
#| label: fig-polar
75+
#| fig-cap: "A line plot on a polar axis"
76+
#| fig-alt: "alternative text please make it informative"
77+
plot(1:10)
78+
```
79+
80+
Once this file is rendered the plot above will be inserted with the correct syntax.
81+
82+
83+
**Add citation or footnote** text by using the format below
84+
85+
[^1]: Sciaini, M., Fritsch, M., Scherer, C., & Simpkins, C. E. (2018). NLMR and landscapetools: An integrated environment for simulating and modifying neutral landscape models in R. Methods in Ecology and Evolution, 9(11), 2240-2248. <https://doi.org/10.1111/2041-210X.13076>
86+
[^2]: Elin Waring, Michael Quinn, Amelia McNamara, Eduardo Arino de la Rubia, Hao Zhu and Shannon Ellis (2019). skimr: Compact and Flexible Summaries of Data. R package version 1.0.7. https://CRAN.R-project.org/package=skimr
87+
[^3]: Hugo static site generator. https://gohugo.io/

config.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ DefaultContentLanguage = "en"
3030
title = "rOpenSci - open tools for open science"
3131
languageName = "Français"
3232
weight = 3
33+
[languages.pt]
34+
title = "rOpenSci - open tools for open science"
35+
languageName = "Português"
36+
weight = 4
37+
[languages.tr]
38+
title = "rOpenSci - open tools for open science"
39+
languageName = "Türkçe"
40+
weight = 5
3341

3442

3543
[permalinks]
@@ -45,7 +53,7 @@ DefaultContentLanguage = "en"
4553
projects = ["r-universe", "software-review", "stat-software-review", "champions", "multilingual-publishing"]
4654
blogs = ["blog", "technotes"]
4755
events = ["events", "commcalls"]
48-
githubsource = "https://github.com/ropensci/roweb3/tree/HEAD/content/"
56+
githubsource = "https://github.com/ropensci/roweb3/blob/main/content/"
4957
registry = "https://ropensci.github.io/roregistry/registry.json"
5058
citations = "https://ropensci-org.github.io/ropensci_citations/citations_all_parts_clean.json"
5159

@@ -58,7 +66,7 @@ DefaultContentLanguage = "en"
5866
home = ["HTML", "RSS", "JSON"]
5967
section = ["HTML", "RSS", "JSON"]
6068
taxonomy = ["HTML", "RSS", "JSON"]
61-
taxonomyTerm = ["HTML", "RSS", "JSON"]
69+
term = ["HTML", "RSS", "JSON"]
6270

6371
[outputFormats.Calendar]
6472
protocol = "https://"
@@ -95,8 +103,12 @@ DefaultContentLanguage = "en"
95103
noHl = false
96104
tabWidth = 4
97105
[markup.goldmark]
106+
[markup.goldmark.renderHooks]
107+
[markup.goldmark.renderHooks.link]
108+
enableDefault = false
98109
[markup.goldmark.renderer]
99110
unsafe = true
111+
#https://gohugo.io/render-hooks/links/#default
100112
[markup.goldmark.parser]
101113
autoHeadingID = true
102114
autoHeadingIDType = 'github'

content/author/adam-sparks/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
name: Adam Sparks
33
link: https://adamhsparks.netlify.com/
44
linkedin: adam-h-sparks
5-
mastodon: https://fosstodon.org/@adamhsparks
5+
mastodon: https://rstats.me/@adamhsparks
66
github: adamhsparks
77
---

0 commit comments

Comments
 (0)