diff --git a/inst/resources/blocs_marque/prefecture_r24/24-centre-val-de-loire-RVB.png b/inst/resources/blocs_marque/prefecture_r24/24-centre-val-de-loire-RVB.png index 8ca8356..034a51a 100644 Binary files a/inst/resources/blocs_marque/prefecture_r24/24-centre-val-de-loire-RVB.png and b/inst/resources/blocs_marque/prefecture_r24/24-centre-val-de-loire-RVB.png differ diff --git a/inst/resources/blocs_marque/prefecture_r75/75-nouvelle-aquitaine-RVB.png b/inst/resources/blocs_marque/prefecture_r75/75-nouvelle-aquitaine-RVB.png index 834782a..4a7da1a 100644 Binary files a/inst/resources/blocs_marque/prefecture_r75/75-nouvelle-aquitaine-RVB.png and b/inst/resources/blocs_marque/prefecture_r75/75-nouvelle-aquitaine-RVB.png differ diff --git a/man/add_plot_header.Rd b/man/add_plot_header.Rd index 44b6fef..aa19c50 100644 --- a/man/add_plot_header.Rd +++ b/man/add_plot_header.Rd @@ -23,7 +23,7 @@ Add a logo to a plot library(ggplot2) p <- ggplot(data = iris, aes(x = Sepal.Length, y = Sepal.Width)) + - geom_point(aes(color = Species, shape = Species)) + geom_point(aes(color = Species, shape = Species)) add_plot_header(p, gglogo("marianne")) } diff --git a/man/check_fonts_in_r.Rd b/man/check_fonts_in_r.Rd index 03d41ee..4515be0 100644 --- a/man/check_fonts_in_r.Rd +++ b/man/check_fonts_in_r.Rd @@ -30,17 +30,10 @@ check_fonts_in_r(import = FALSE) # Test if working library(ggplot2) -ggplot(mtcars) + - geom_point(aes(cyl, mpg)) + - labs( - title = "Mon titre avec Marianne", - x = "lab X avec Spectral", - y = "Lab Y avec Spectral" - ) + - theme( - title = element_text(family = "Marianne"), - axis.title.x = element_text(family = "Spectral"), - axis.title.y = element_text(family = "Spectral") - ) +ggplot(mtcars) + geom_point(aes(cyl, mpg)) + labs(title = "Mon titre avec Marianne", + x = "lab X avec Spectral", y = "Lab Y avec Spectral") + + theme(title = element_text(family = "Marianne"), + axis.title.x = element_text(family = "Spectral"), + axis.title.y = element_text(family = "Spectral")) } } diff --git a/man/create_header_html_gouv.Rd b/man/create_header_html_gouv.Rd index 9dc3e22..ff7daee 100644 --- a/man/create_header_html_gouv.Rd +++ b/man/create_header_html_gouv.Rd @@ -25,5 +25,5 @@ an html file create html_gouv bootstrap header } \examples{ -create_header_html_gouv(logo = 'gouvernement') +create_header_html_gouv(logo = "gouvernement") } diff --git a/man/fonts-dependencies.Rd b/man/fonts-dependencies.Rd index b265e9d..a97b293 100644 --- a/man/fonts-dependencies.Rd +++ b/man/fonts-dependencies.Rd @@ -28,10 +28,8 @@ Markdown output formats or Shiny applications. library(htmltools) library(gouvdown) -tag <- p( - "The quick brown fox jumps over the lazy dog", - style = "font-family: 'Marianne', Arial, sans-serif" -) +tag <- p("The quick brown fox jumps over the lazy dog", + style = "font-family: 'Marianne', Arial, sans-serif") tag <- attachDependencies(tag, marianne_font_dep()) diff --git a/man/gglogo.Rd b/man/gglogo.Rd index d24f2c8..3cd3c0d 100644 --- a/man/gglogo.Rd +++ b/man/gglogo.Rd @@ -49,9 +49,8 @@ parameters are provided. library(grid) header <- gglogo("marianne", x = 0, y = 1) -vp <- viewport(x = 0.22, y = 0.78, - width = 0.2, height = 0.2, - just = c("right", "bottom")) +vp <- viewport(x = 0.22, y = 0.78, width = 0.2, height = 0.2, just = c("right", + "bottom")) pushViewport(vp) grid.draw(header) } diff --git a/man/gouv_colors.Rd b/man/gouv_colors.Rd index 8eaea8b..bf01b7d 100644 --- a/man/gouv_colors.Rd +++ b/man/gouv_colors.Rd @@ -19,7 +19,6 @@ requested hex code. } \examples{ gouv_colors("a1") - } \references{ \url{https://www.gouvernement.fr/charte/charte-graphique-les-fondamentaux/les-couleurs} diff --git a/man/theme_gouv.Rd b/man/theme_gouv.Rd index 34a7ea4..0d25ba2 100644 --- a/man/theme_gouv.Rd +++ b/man/theme_gouv.Rd @@ -93,14 +93,9 @@ All font sizes are set in points and colors are either a color name or a hex cod \dontrun{ library(ggplot2) ggplot(data = iris, aes(x = Sepal.Length, y = Sepal.Width)) + - geom_point(aes(color = Species, shape = Species)) + - labs( - x = "Sepal Length", y = "Sepal Width", - title = "Sepal Length-Width", - subtitle = "with theme_gouv()" - ) + - theme_gouv() + - scale_color_gouv_discrete() + geom_point(aes(color = Species, shape = Species)) + + labs(x = "Sepal Length", y = "Sepal Width", title = "Sepal Length-Width", + subtitle = "with theme_gouv()") + theme_gouv() + + scale_color_gouv_discrete() } - } diff --git a/man/theme_gouv_map.Rd b/man/theme_gouv_map.Rd index aa3ac7e..2273093 100644 --- a/man/theme_gouv_map.Rd +++ b/man/theme_gouv_map.Rd @@ -66,10 +66,8 @@ library(ggplot2) library(sf) demo(nc, ask = FALSE, echo = FALSE) -ggplot(data = nc) + - geom_sf(aes(fill = BIR79)) + - theme_gouv_map() + - scale_color_gouv_continuous() + - labs(title = "North Carolina SIDS", subtitle = "with theme_gouv_map()") +ggplot(data = nc) + geom_sf(aes(fill = BIR79)) + theme_gouv_map() + + scale_color_gouv_continuous() + labs(title = "North Carolina SIDS", + subtitle = "with theme_gouv_map()") } } diff --git a/man/theme_grey_gouv.Rd b/man/theme_grey_gouv.Rd index 8d81a93..ef39e40 100644 --- a/man/theme_grey_gouv.Rd +++ b/man/theme_grey_gouv.Rd @@ -19,14 +19,9 @@ ggplot2 grey theme with French government design template \dontrun{ library(ggplot2) ggplot(data = iris, aes(x = Sepal.Length, y = Sepal.Width)) + - geom_point(aes(color = Species, shape = Species)) + - labs( - x = "Sepal Length", y = "Sepal Width", - title = "Sepal Length-Width", - subtitle = "with gouv_theme()" - ) + - theme_grey_gouv() + - scale_color_gouv_discrete(palette = "pal_gouv_fr") + geom_point(aes(color = Species, shape = Species)) + + labs(x = "Sepal Length", y = "Sepal Width", title = "Sepal Length-Width", + subtitle = "with gouv_theme()") + theme_grey_gouv() + + scale_color_gouv_discrete(palette = "pal_gouv_fr") } - }