diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bc1fa8db..24901451 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,11 +20,10 @@ jobs:
with:
fetch-depth: 0
- - name: Install Google Fonts
+ - name: Provide Fonts
run: |
- wget -O Atkinson_Hyperlegible.zip https://fonts.google.com/download?family=Atkinson%20Hyperlegible
- unzip -d Atkinson_Hyperlegible/ Atkinson_Hyperlegible.zip
- mv Atkinson_Hyperlegible /usr/share/fonts/
+ mkdir /usr/share/fonts/Atkinson_Hyperlegible
+ cp -r fonts/ /usr/share/fonts/Atkinson_Hyperlegible/
fc-cache -fv
- uses: quarto-dev/quarto-actions/setup@v2
diff --git a/R/country_top_20.R b/R/country_top_20.R
index 58574b54..c188f6d9 100644
--- a/R/country_top_20.R
+++ b/R/country_top_20.R
@@ -108,7 +108,7 @@ country_multiple_plot <- ggplot(country_multiple_df_plot, aes(cr_year, prop, fil
scale_fill_identity() +
theme_minimal(base_family = "Atkinson Hyperlegible") +
labs(
- y = "OA Share", x = "2017 - 2023",
+ y = "OA Share", x = "2017 - 2024",
subtitle = "**Country**
Total Lead Author Articles | Country Share"
) +
theme(
diff --git a/R/cr_upw.R b/R/cr_upw.R
index 6da19839..75e135fb 100644
--- a/R/cr_upw.R
+++ b/R/cr_upw.R
@@ -13,7 +13,7 @@ cr_upw_data <- function(cr_upw = hoaddata::cr_upw, my_cat = "Global", ...) {
cr_upw_plot <- function(cr_upw_data = hoaddata::cr_upw, ...) {
plot_df <- cr_upw_data(cr_upw_data, ...)
- my_plot <- ggplot(plot_df, aes(cr_year, value / article_total,
+ my_plot <- ggplot(plot_df, aes(as.character(cr_year), value / article_total,
fill = name,
tooltip = glue::glue('{name}
{format(value, big.mark = ",")} / {round((value / article_total) * 100, 1)}%
articles with CC license in {cr_year}')
)) +
diff --git a/R/oam_publisher_cc.R b/R/oam_publisher_cc.R
index 6c101693..98eaa969 100644
--- a/R/oam_publisher_cc.R
+++ b/R/oam_publisher_cc.R
@@ -89,7 +89,7 @@ top_13_plot <- function(.collection = NULL, ...) {
`CC BY-NC-ND` = "#C82E6B"
)) +
theme_minimal(base_family = "Atkinson Hyperlegible", base_size = 13) +
- labs(y = NULL, x = "2017-2023") +
+ labs(y = NULL, x = "2017-2024") +
theme(panel.grid.major.x = element_blank(),
panel.grid.minor.x = element_blank(),
axis.text.x=element_blank(),
diff --git a/R/open_md.R b/R/open_md.R
index ec910cd0..e0245742 100644
--- a/R/open_md.R
+++ b/R/open_md.R
@@ -59,6 +59,7 @@ open_md_react <- function(...) {
`2021` = indicator_column(name = "2021"),
`2022` = indicator_column(name = "2022"),
`2023` = indicator_column(name = "2023"),
+ `2024` = indicator_column(name = "2024"),
cat = colDef(show = FALSE)
))
diff --git a/R/publisher_cc.R b/R/publisher_cc.R
index 1ff031ba..aa9e8b19 100644
--- a/R/publisher_cc.R
+++ b/R/publisher_cc.R
@@ -89,7 +89,7 @@ top_13_plot <- function(.collection = NULL, ...) {
`CC BY-NC-ND` = "#C82E6B"
)) +
theme_minimal(base_family = "Atkinson Hyperlegible", base_size = 13) +
- labs(y = NULL, x = "2017-2023") +
+ labs(y = NULL, x = "2017-2024") +
theme(panel.grid.major.x = element_blank(),
panel.grid.minor.x = element_blank(),
axis.text.x=element_blank(),
diff --git a/R/teaser.R b/R/teaser.R
index 88d2866b..a380b253 100644
--- a/R/teaser.R
+++ b/R/teaser.R
@@ -20,25 +20,25 @@ cc_ind_global <- function(jn_ind_df = jn_ind_df) {
distinct() %>%
ungroup()
}
-#' Publications 2017 - 2022
+#' Publications 2017 - 2024
all_publications <- cc_ind_global(jn_ind_df = jn_ind_df) |>
distinct(cr_year, jn_all) |>
pull(jn_all) |>
sum(na.rm = TRUE)
-#' Publications 2022
-all_publications_2022 <-
+#' Publications 2023
+all_publications_2023 <-
cc_ind_global(jn_ind_df = jn_ind_df) |>
distinct(cr_year, jn_all) |>
- filter(cr_year == "2022") |>
+ filter(cr_year == "2023") |>
pull(jn_all) |>
sum(na.rm = TRUE)
#' CC publications 2017 - 2022
cc_publications <- cc_ind_global(jn_ind_df = jn_ind_df) |>
pull(cc_total) |>
sum(na.rm = TRUE)
-#' CC publications 2022
-cc_publications_22 <- cc_ind_global(jn_ind_df = jn_ind_df) |>
- filter(cr_year == "2022") |>
+#' CC publications 2023
+cc_publications_23 <- cc_ind_global(jn_ind_df = jn_ind_df) |>
+ filter(cr_year == "2023") |>
pull(cc_total) |>
sum(na.rm = TRUE)
@@ -66,25 +66,25 @@ cc_ind_de <- function(jn_aff_df = jn_aff_df) {
mutate_if(is.numeric, ~replace(., is.na(.), 0))
}
-#' Publications 2017 - 2022
+#' Publications 2017 - 2024
all_publications_de <- cc_ind_de(jn_aff_df = jn_aff_df) |>
distinct(cr_year, jn_all) |>
pull(jn_all) |>
sum(na.rm = TRUE)
-#' Publications 2022
-all_publications_2022_de <-
+#' Publications 2023
+all_publications_2023_de <-
cc_ind_de(jn_aff_df = jn_aff_df) |>
distinct(cr_year, jn_all) |>
- filter(cr_year == "2022") |>
+ filter(cr_year == "2023") |>
pull(jn_all) |>
sum(na.rm = TRUE)
-#' CC publications 2017 - 2022
+#' CC publications 2017 - 2023
cc_publications_de <- cc_ind_de(jn_aff_df = jn_aff_df) |>
pull(cc_total) |>
sum(na.rm = TRUE)
-#' CC publications 2022
-cc_publications_22_de <- cc_ind_de(jn_aff_df = jn_aff_df) |>
- filter(cr_year == "2022") |>
+#' CC publications 2023
+cc_publications_23_de <- cc_ind_de(jn_aff_df = jn_aff_df) |>
+ filter(cr_year == "2023") |>
pull(cc_total) |>
sum(na.rm = TRUE)
@@ -97,10 +97,10 @@ basic_stat <- function(...) {
cc_publications_de = cc_publications_de,
all_publications_de = all_publications_de,
all_publications = all_publications,
- cc_publications_22 = cc_publications_22,
- all_publications_2022 = all_publications_2022,
- cc_publications_22_de = cc_publications_22_de,
- all_publications_2022_de = all_publications_2022_de
+ cc_publications_23 = cc_publications_23,
+ all_publications_2023 = all_publications_2023,
+ cc_publications_23_de = cc_publications_23_de,
+ all_publications_2023_de = all_publications_2023_de
) |>
mutate(across(everything(), ~ case_when(
. < 1000 ~ as.character(.),
@@ -110,7 +110,7 @@ basic_stat <- function(...) {
glue::glue('
2017-2023
+2017-2024
2022
+2023
Germany* | |||
{round(cc_publications_22 / all_publications_2022 * 100, 1)}% | -{round(cc_publications_22_de / all_publications_2022_de * 100, 1)}% | +{round(cc_publications_23 / all_publications_2023 * 100, 1)}% | +{round(cc_publications_23_de / all_publications_2023_de * 100, 1)}% |
{number_format$cc_publications_22} out of {number_format$all_publications_2022} | -{number_format$cc_publications_22_de} out of {number_format$all_publications_2022_de} | +{number_format$cc_publications_23} out of {number_format$all_publications_2023} | +{number_format$cc_publications_23_de} out of {number_format$all_publications_2023_de} |