diff --git a/.Rbuildignore b/.Rbuildignore index cfd17d9..eea9270 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,3 +6,6 @@ ^\.vscode$ ^cran-comments\.md$ ^CONDUCT\.md$ +^\.github +^\.gitattributes +^CRAN-SUBMISSION$ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 781fc47..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: r -r: - - oldrel - - release - - devel -warnings_are_errors: true -cache: packages -r_check_revdep: false -sudo: required - -env: - global: - - CRAN: http://cran.rstudio.com - -notifications: - email: - on_success: change - on_failure: change \ No newline at end of file diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 0000000..79c70f8 --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 1.0.2 +Date: 2023-09-30 20:08:37 UTC +SHA: 3f61463e6ab8d088ecff35db7cc1edfe633ee9f3 diff --git a/DESCRIPTION b/DESCRIPTION index 5b815fa..1ed26e9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: waffle Type: Package Title: Create Waffle Chart Visualizations -Version: 1.0.1 -Date: 2019-07-07 +Version: 1.0.2 +Date: 2023-09-30 Authors@R: c( person("Bob", "Rudis", email = "bob@rud.is", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5670-2640")), @@ -23,11 +23,8 @@ Description: Square pie charts (a.k.a. waffle charts) can be used to create waffle charts as well as stitch them together, and to use glyphs for making isotype pictograms. Encoding: UTF-8 -URL: https://gitlab.com/hrbrmstr/waffle -BugReports: https://gitlab.com/hrbrmstr/waffle/issues Copyright: file inst/COPYRIGHTS Suggests: - testthat, knitr, rmarkdown, dplyr, @@ -47,7 +44,7 @@ Imports: stats, htmlwidgets, DT, + plyr, rlang, utils -RoxygenNote: 6.1.1 -VignetteBuilder: knitr +RoxygenNote: 7.2.3 diff --git a/NAMESPACE b/NAMESPACE index 1d9da0b..970a410 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -59,6 +59,7 @@ importFrom(grid,unit.c) importFrom(grid,unit.pmax) importFrom(grid,unit.pmin) importFrom(gtable,is.gtable) +importFrom(plyr,a_ply) importFrom(rlang,is_missing) importFrom(stats,setNames) importFrom(utils,tail) diff --git a/NEWS.md b/NEWS.md deleted file mode 100644 index ab3f4f0..0000000 --- a/NEWS.md +++ /dev/null @@ -1,46 +0,0 @@ -waffle 1.0.1 -- geom_waffle() -- CRAN checks pass - -waffle 0.9.1 -- Fix minor CRAN issues - -waffle 0.9.0 -- Fix for errors retrieving FontAwesome CSS for glyph names -- Enabled use of any compatible font for extended glpyh compatibility - -waffle 0.8.0 -- `parts` can be now be a data frame. the first two columns will be uses as - names and values (respectively) - -waffle 0.7.0 -- yet more fixes for latest ggplot2 2.x -- made factor-level keeping a parameter (TRUE by default) - -waffle 0.6.0 -- keep factor levels; improve default aesthetics - -waffle 0.5.1 -- even moar improved ggplot2 compatibility - -waffle 0.5 -- new & improved ggplot2 compatibility - -waffle 0.4 -- added `use_glyph()` and `glyph_size()` to `waffle()` so you can now make isotype pictograms - -waffle 0.3 -- added a `pad parameter to `waffle to make it easier to align plots -- added `iron to make it easier to do the alignment - -waffle 0.2.3 -- nulled many margins and made the use of `coord_equal optional via the `equal parameter - -waffle 0.2.1 -- added Travis tests to ensure independent package build confirmation - -waffle 0.2 -- added `as_rcdimple thx to Kent Russell (only in non-CRAN version) - -waffle 0.1 -- initial release diff --git a/R/geom-waffle.R b/R/geom-waffle.R index fad90d9..5eddad2 100644 --- a/R/geom-waffle.R +++ b/R/geom-waffle.R @@ -1,4 +1,4 @@ -draw_key_waffle <- function(data, params, size, ...) { # nocov start +draw_key_waffle <- function(data, params, size, ...) { # msg("Called => draw_key_waffle()") # @@ -18,7 +18,7 @@ draw_key_waffle <- function(data, params, size, ...) { # nocov start lty = data$linetype %||% 1 ) ) -} # nocov end +} #' Waffle (Square pie chart) Geom #' @@ -79,7 +79,7 @@ draw_key_waffle <- function(data, params, size, ...) { # nocov start #' facet_wrap(~fct) geom_waffle <- function(mapping = NULL, data = NULL, n_rows = 10, make_proportional = FALSE, flip = FALSE, - na.rm = NA, show.legend = NA, + na.rm = FALSE, show.legend = NA, radius = grid::unit(0, "npc"), inherit.aes = TRUE, ...) { diff --git a/R/stat-waffle.R b/R/stat-waffle.R index ae539e7..56f4d6c 100644 --- a/R/stat-waffle.R +++ b/R/stat-waffle.R @@ -3,7 +3,7 @@ stat_waffle <- function(mapping = NULL, data = NULL, geom = "waffle", n_rows = 10, make_proportional = FALSE, flip = FALSE, radius = grid::unit(0, "npc"), - na.rm = NA, show.legend = NA, + na.rm = FALSE, show.legend = NA, inherit.aes = TRUE, ...) { # msg("Called => stat_waffle::stat_waffle()") diff --git a/R/waffle-package.R b/R/waffle-package.R index 9061538..82b7d59 100644 --- a/R/waffle-package.R +++ b/R/waffle-package.R @@ -13,6 +13,7 @@ #' @import curl #' @import DT #' @import htmlwidgets +#' @importFrom plyr a_ply #' @importFrom gtable is.gtable #' @importFrom RColorBrewer brewer.pal #' @importFrom ggplot2 ggplot geom_tile scale_fill_manual guides geom_tile ggplotGrob diff --git a/R/waffle.R b/R/waffle.R index 2436bb0..1112fe3 100644 --- a/R/waffle.R +++ b/R/waffle.R @@ -24,7 +24,7 @@ #' will map the input to a Font Awesome glyph name and use that glyph for the #' tile instead of a block (making it more like an isotype pictogram than a #' waffle chart). You'll need to install Font Awesome 5 and use -#' the [`extrafont` package](`https://github.com/wch/extrafont`) to +#' the `extrafont` package to #' be able to use Font Awesome 5 glyphs. Sizing is also up to the user since #' fonts do not automatically scale with graphic resize. #' diff --git a/README.md b/README.md index 92caee7..4238611 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,5 @@ -[![Build -Status](https://travis-ci.org/hrbrmstr/waffle.svg)](https://travis-ci.org/hrbrmstr/waffle) -[![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/waffle)](https://cran.r-project.org/package=waffle) -![downloads](https://cranlogs.r-pkg.org/badges/grand-total/waffle) - -# waffle +# 🧇 waffle Create Waffle Chart Visualizations @@ -26,35 +21,43 @@ It uses ggplot2 and returns a ggplot2 object. The following functions are implemented: - - `waffle`: Make waffle (square pie) charts - - `draw_key_pictogram`: Legend builder for pictograms - - `fa_grep`: Search Font Awesome glyph names for a pattern - - `fa_list`: List all Font Awesome glyphs - - `geom_pictogram`: Pictogram Geom - - `geom_waffle`: Waffle (Square pie chart) Geom - - `install_fa_fonts`: Install Font Awesome 5 Fonts - - `iron`: Veritical, left-aligned layout for waffle plots - - `scale_label_pictogram`: Used with geom\_pictogram() to map Font - Awesome fonts to labels - - `theme_enhance_waffle`: Waffle chart theme cruft remover that can be - used with any other theme +- `waffle`: Make waffle (square pie) charts + +- `draw_key_pictogram`: Legend builder for pictograms + +- `fa_grep`: Search Font Awesome glyph names for a pattern + +- `fa_list`: List all Font Awesome glyphs + +- `fa5_brand`: Font Awesome 5 Brand + +- `fa5_solid`: Font Awesome 5 Solid + +- `geom_pictogram`: Pictogram Geom + +- `geom_waffle`: Waffle (Square pie chart) Geom + +- `install_fa_fonts`: Install Font Awesome 5 Fonts + +- `iron`: Veritical, left-aligned layout for waffle plots + +- `scale_label_pictogram`: Used with geom_pictogram() to map Font + Awesome fonts to labels + +- `theme_enhance_waffle`: Waffle chart theme cruft remover that can be + used with any other theme ## Installation ``` r -install.packages("waffle", repos = "https://cinc.rud.is") -# or -devtools::install_git("https://git.rud.is/hrbrmstr/waffle.git") -# or -devtools::install_git("https://git.sr.ht/~hrbrmstr/waffle") +install.packages("waffle") # NOTE: CRAN version is 0.7.0 # or -devtools::install_gitlab("hrbrmstr/waffle") -# or -devtools::install_bitbucket("hrbrmstr/waffle") -# or -devtools::install_github("hrbrmstr/waffle") +remotes::install_github("hrbrmstr/waffle") ``` +NOTE: To use the ‘remotes’ install options you will need to have the +[{remotes} package](https://github.com/r-lib/remotes) installed. + ## Usage ``` r @@ -67,7 +70,7 @@ library(waffle) # current verison packageVersion("waffle") -## [1] '1.0.1' +## [1] '1.0.2' ``` ### Some new bits up first @@ -76,16 +79,25 @@ packageVersion("waffle") data.frame( parts = factor(rep(month.abb[1:3], 3), levels=month.abb[1:3]), vals = c(10, 20, 30, 6, 14, 40, 30, 20, 10), - col = rep(c("blue", "black", "red"), 3), - fct = c(rep("Thing 1", 3), - rep("Thing 2", 3), - rep("Thing 3", 3)) + col = rep(c("navy", "black", "maroon"), 3), + fct = c( + rep("Thing 1", 3), + rep("Thing 2", 3), + rep("Thing 3", 3) + ) ) -> xdf xdf %>% count(parts, wt = vals) %>% - ggplot(aes(fill = parts, values = n)) + - geom_waffle(n_rows = 20, size = 0.33, colour = "white", flip = TRUE) + + ggplot( + aes(fill = parts, values = n) + ) + + geom_waffle( + n_rows = 20, + size = 0.33, + colour = "white", + flip = TRUE + ) + scale_fill_manual( name = NULL, values = c("#a40000", "#c68958", "#ae6056"), @@ -96,14 +108,21 @@ xdf %>% theme_enhance_waffle() ``` - + ``` r xdf %>% count(parts, wt = vals) %>% - ggplot(aes(label = parts, values = n)) + - geom_pictogram(n_rows = 10, aes(colour = parts), flip = TRUE, make_proportional = TRUE) + + ggplot( + aes(label = parts, values = n) + ) + + geom_pictogram( + n_rows = 10, + aes(colour = parts), + flip = TRUE, + make_proportional = TRUE + ) + scale_color_manual( name = NULL, values = c("#a40000", "#c68958", "#ae6056"), @@ -117,19 +136,26 @@ xdf %>% coord_equal() + theme_ipsum_rc(grid="") + theme_enhance_waffle() + - theme(legend.key.height = unit(2.25, "line")) + - theme(legend.text = element_text(size = 10, hjust = 0, vjust = 0.75)) + theme( + legend.key.height = unit(2.25, "line"), + legend.text = element_text(size = 10, hjust = 0, vjust = 0.75) + ) ``` - + ``` r xdf %>% count(parts, wt = vals) %>% - ggplot(aes(label = parts, values = n)) + + ggplot( + aes(label = parts, values = n) + ) + geom_pictogram( - n_rows = 20, size = 6, aes(colour = parts), flip = TRUE, + n_rows = 20, + size = 6, + aes(colour = parts), + flip = TRUE, family = "FontAwesome5Brands-Regular" ) + scale_color_manual( @@ -145,12 +171,14 @@ xdf %>% coord_equal() + theme_ipsum_rc(grid="") + theme_enhance_waffle() + - theme(legend.text = element_text(hjust = 0, vjust = 1)) + theme( + legend.text = element_text(hjust = 0, vjust = 1) + ) ``` - + -### Geoms\! +### Geoms! ``` r library(hrbrthemes) @@ -163,11 +191,22 @@ tibble( fct = c(rep("Thing 1", 3), rep("Thing 2", 3), rep("Thing 3", 3)) ) -> xdf -ggplot(xdf, aes(fill=parts, values=values)) + - geom_waffle(color = "white", size=1.125, n_rows = 6) + +ggplot( + data = xdf, + aes(fill=parts, values=values) +) + + geom_waffle( + color = "white", + size = 1.125, + n_rows = 6 + ) + facet_wrap(~fct, ncol=1) + - scale_x_discrete(expand=c(0,0)) + - scale_y_discrete(expand=c(0,0)) + + scale_x_discrete( + expand = c(0,0,0,0) + ) + + scale_y_discrete( + expand = c(0,0,0,0) + ) + ggthemes::scale_fill_tableau(name=NULL) + coord_equal() + labs( @@ -177,9 +216,9 @@ ggplot(xdf, aes(fill=parts, values=values)) + theme_enhance_waffle() ``` - + -### Waffle Bar Charts with scales\! +### Waffle Bar Charts with scales! ``` r library(dplyr) @@ -189,26 +228,47 @@ storms %>% filter(year >= 2010) %>% count(year, status) -> storms_df -ggplot(storms_df, aes(fill = status, values = n)) + - geom_waffle(color = "white", size = .25, n_rows = 10, flip = TRUE) + - facet_wrap(~year, nrow = 1, strip.position = "bottom") + +ggplot( + data = storms_df, + aes(fill = status, values = n) +) + + geom_waffle( + color = "white", + size = .25, + n_rows = 10, + flip = TRUE + ) + + facet_wrap( + ~year, + nrow = 1, + strip.position = "bottom" + ) + scale_x_discrete() + - scale_y_continuous(labels = function(x) x * 10, # make this multiplyer the same as n_rows - expand = c(0,0)) + + scale_y_continuous( + labels = function(x) x * 10, # make this multiplier the same as n_rows + expand = c(0,0) + ) + ggthemes::scale_fill_tableau(name=NULL) + coord_equal() + labs( + x = "Year", y = "Count", title = "Faceted Waffle Bar Chart", - subtitle = "{dplyr} storms data", - x = "Year", - y = "Count" + subtitle = "{dplyr} storms data" + ) + + theme_minimal( + base_family = "Roboto Condensed" ) + - theme_minimal(base_family = "Roboto Condensed") + - theme(panel.grid = element_blank(), axis.ticks.y = element_line()) + - guides(fill = guide_legend(reverse = TRUE)) + theme( + panel.grid = element_blank(), + axis.ticks.y = element_line() + ) + + guides( + fill = guide_legend(reverse = TRUE) + ) ``` - + ### Basic example @@ -217,7 +277,7 @@ parts <- c(80, 30, 20, 10) waffle(parts, rows = 8) ``` - + ### Use a data frame @@ -230,35 +290,45 @@ parts <- data.frame( waffle(parts, rows = 8) ``` - + ### Slightly more complex example ``` r -parts <- c(`Un-breached\nUS Population` = (318 - 11 - 79), `Premera` = 11, `Anthem` = 79) +c( + `Un-breached\nUS Population` = (318 - 11 - 79), + `Premera` = 11, + `Anthem` = 79 +) -> parts ``` ``` r waffle( - parts, rows = 8, size = 1, - colors = c("#969696", "#1879bf", "#009bda"), legend_pos = "bottom" + parts = parts, + rows = 8, + size = 1, + colors = c("#969696", "#1879bf", "#009bda"), + legend_pos = "bottom" ) ``` **Health records breaches as fraction of US Population** - + + One square == 1m ppl ``` r waffle( - parts / 10, rows = 3, + parts = parts / 10, + rows = 3, colors = c("#969696", "#1879bf", "#009bda") ) ``` **Health records breaches as fraction of US Population** - + + (One square == 10m ppl) @@ -266,12 +336,18 @@ waffle( library(extrafont) waffle( - parts / 10, rows = 3, colors = c("#969696", "#1879bf", "#009bda"), - use_glyph = "medkit", size = 8 -) + expand_limits(y = c(0, 4)) + parts = parts / 10, + rows = 3, + colors = c("#969696", "#1879bf", "#009bda"), + use_glyph = "medkit", + size = 8 +) + + expand_limits( + y = c(0, 4) + ) ``` - + ### Replicating an old favourite @@ -280,23 +356,29 @@ waffle( Via: ``` r -savings <- c( - `Mortgage\n($84,911)` = 84911, `Auto and\ntuition loans\n($14,414)` = 14414, - `Home equity loans\n($10,062)` = 10062, `Credit Cards\n($8,565)` = 8565 -) +c( + `Mortgage\n($84,911)` = 84911, + `Auto and\ntuition loans\n($14,414)` = 14414, + `Home equity loans\n($10,062)` = 10062, + `Credit Cards\n($8,565)` = 8565 +) -> savings ``` ``` r waffle( - savings / 392, rows = 7, size = 0.5, legend_pos = "bottom", + parts = savings / 392, + rows = 7, + size = 0.5, + legend_pos = "bottom", colors = c("#c7d4b6", "#a3aabd", "#a0d0de", "#97b5cf") ) ``` **Average Household Savings Each Year** - -(1 square == $392) + + +(1 square == \$392) ### More replication @@ -308,7 +390,9 @@ professional <- c(`Male` = 44, `Female (56%)` = 56) ``` r waffle( - professional, rows = 10, size = 0.5, + parts = professional, + rows = 10, + size = 0.5, colors = c("#af9139", "#544616") ) ``` @@ -319,27 +403,41 @@ With: ``` r iron( - waffle(c(thing1 = 0, thing2 = 100), rows = 5), - waffle(c(thing1 = 25, thing2 = 75), rows = 5) + waffle( + parts = c(thing1 = 0, thing2 = 100), + rows = 5 + ), + waffle( + parts = c(thing1 = 25, thing2 = 75), + rows = 5 + ) ) ``` - + Without (you can disable this via `keep` parameter now): ``` r iron( - waffle(c(thing1 = 0, thing2 = 100), rows = 5, keep = FALSE), - waffle(c(thing1 = 25, thing2 = 75), rows = 5, keep = FALSE) + waffle( + parts = c(thing1 = 0, thing2 = 100), + rows = 5, + keep = FALSE + ), + waffle( + parts = c(thing1 = 25, thing2 = 75), + rows = 5, + keep = FALSE + ) ) ``` - + **Professional Workforce Makeup** - + Iron example (left-align & padding for multiple plots) @@ -347,7 +445,9 @@ Iron example (left-align & padding for multiple plots) pain.adult.1997 <- c(`YOY (406)` = 406, `Adult (24)` = 24) waffle( - pain.adult.1997 / 2, rows = 7, size = 0.5, + parts = pain.adult.1997 / 2, + rows = 7, + size = 0.5, colors = c("#c7d4b6", "#a3aabd"), title = "Paine Run Brook Trout Abundance (1997)", xlab = "1 square = 2 fish", pad = 3 @@ -356,7 +456,9 @@ waffle( pine.adult.1997 <- c(`YOY (221)` = 221, `Adult (143)` = 143) waffle( - pine.adult.1997 / 2, rows = 7, size = 0.5, + parts = pine.adult.1997 / 2, + rows = 7, + size = 0.5, colors = c("#c7d4b6", "#a3aabd"), title = "Piney River Brook Trout Abundance (1997)", xlab = "1 square = 2 fish", pad = 8 @@ -365,7 +467,9 @@ waffle( stan.adult.1997 <- c(`YOY (270)` = 270, `Adult (197)` = 197) waffle( - stan.adult.1997 / 2, rows = 7, size = 0.5, + parts = stan.adult.1997 / 2, + rows = 7, + size = 0.5, colors = c("#c7d4b6", "#a3aabd"), title = "Staunton River Trout Abundance (1997)", xlab = "1 square = 2 fish" @@ -374,7 +478,7 @@ waffle( iron(A, B, C) ``` - + ## Package Code Metrics @@ -382,10 +486,13 @@ iron(A, B, C) cloc::cloc_pkg_md() ``` -| Lang | \# Files | (%) | LoC | (%) | Blank lines | (%) | \# Lines | (%) | -| :--- | -------: | ---: | --: | ---: | ----------: | ---: | -------: | --: | -| R | 16 | 0.89 | 628 | 0.62 | 209 | 0.61 | 430 | 0.7 | -| Rmd | 2 | 0.11 | 383 | 0.38 | 135 | 0.39 | 184 | 0.3 | +| Lang | \# Files | (%) | LoC | (%) | Blank lines | (%) | \# Lines | (%) | +|:-----|---------:|-----:|----:|-----:|------------:|-----:|---------:|-----:| +| R | 14 | 0.44 | 624 | 0.35 | 218 | 0.36 | 439 | 0.38 | +| Rmd | 2 | 0.06 | 255 | 0.15 | 88 | 0.14 | 139 | 0.12 | +| SUM | 16 | 0.50 | 879 | 0.50 | 306 | 0.50 | 578 | 0.50 | + +{cloc} 📦 metrics for waffle ## Code of Conduct diff --git a/README.Rmd b/README.qmd similarity index 63% rename from README.Rmd rename to README.qmd index 621f8dd..4ea0ce3 100644 --- a/README.Rmd +++ b/README.qmd @@ -1,14 +1,21 @@ --- -output: rmarkdown::github_document +format: gfm +editor_options: + chunk_output_type: console --- -```{r, include = FALSE} -knitr::opts_chunk$set(echo = TRUE, collapse = TRUE, message = FALSE, warning = FALSE, error = FALSE, cache = TRUE, fig.retina = 2) + +```{r, setup, include = FALSE} +knitr::opts_chunk$set( + echo = TRUE, + collapse = TRUE, + message = FALSE, + warning = FALSE, + error = FALSE, + fig.retina = 2 +) ``` -[![Build Status](https://travis-ci.org/hrbrmstr/waffle.svg)](https://travis-ci.org/hrbrmstr/waffle) -[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/waffle)](https://cran.r-project.org/package=waffle) -![downloads](https://cranlogs.r-pkg.org/badges/grand-total/waffle) -# waffle +# 🧇 waffle Create Waffle Chart Visualizations @@ -29,7 +36,7 @@ hrbrpkghelpr::describe_ingredients() ## Installation -```{r nstall-ex, results='asis', echo = FALSE, cache=FALSE} +```{r install-ex, results='asis', echo = FALSE, cache=FALSE} hrbrpkghelpr::install_block() ``` @@ -53,20 +60,29 @@ packageVersion("waffle") ### Some new bits up first -```{r fig.width=8, fig.height=6} +```{r new-bits, fig.width=8, fig.height=6} data.frame( parts = factor(rep(month.abb[1:3], 3), levels=month.abb[1:3]), vals = c(10, 20, 30, 6, 14, 40, 30, 20, 10), - col = rep(c("blue", "black", "red"), 3), - fct = c(rep("Thing 1", 3), - rep("Thing 2", 3), - rep("Thing 3", 3)) + col = rep(c("navy", "black", "maroon"), 3), + fct = c( + rep("Thing 1", 3), + rep("Thing 2", 3), + rep("Thing 3", 3) + ) ) -> xdf xdf %>% count(parts, wt = vals) %>% - ggplot(aes(fill = parts, values = n)) + - geom_waffle(n_rows = 20, size = 0.33, colour = "white", flip = TRUE) + + ggplot( + aes(fill = parts, values = n) + ) + + geom_waffle( + n_rows = 20, + size = 0.33, + colour = "white", + flip = TRUE + ) + scale_fill_manual( name = NULL, values = c("#a40000", "#c68958", "#ae6056"), @@ -78,8 +94,15 @@ xdf %>% xdf %>% count(parts, wt = vals) %>% - ggplot(aes(label = parts, values = n)) + - geom_pictogram(n_rows = 10, aes(colour = parts), flip = TRUE, make_proportional = TRUE) + + ggplot( + aes(label = parts, values = n) + ) + + geom_pictogram( + n_rows = 10, + aes(colour = parts), + flip = TRUE, + make_proportional = TRUE + ) + scale_color_manual( name = NULL, values = c("#a40000", "#c68958", "#ae6056"), @@ -93,14 +116,21 @@ xdf %>% coord_equal() + theme_ipsum_rc(grid="") + theme_enhance_waffle() + - theme(legend.key.height = unit(2.25, "line")) + - theme(legend.text = element_text(size = 10, hjust = 0, vjust = 0.75)) + theme( + legend.key.height = unit(2.25, "line"), + legend.text = element_text(size = 10, hjust = 0, vjust = 0.75) + ) xdf %>% count(parts, wt = vals) %>% - ggplot(aes(label = parts, values = n)) + + ggplot( + aes(label = parts, values = n) + ) + geom_pictogram( - n_rows = 20, size = 6, aes(colour = parts), flip = TRUE, + n_rows = 20, + size = 6, + aes(colour = parts), + flip = TRUE, family = "FontAwesome5Brands-Regular" ) + scale_color_manual( @@ -116,7 +146,9 @@ xdf %>% coord_equal() + theme_ipsum_rc(grid="") + theme_enhance_waffle() + - theme(legend.text = element_text(hjust = 0, vjust = 1)) + theme( + legend.text = element_text(hjust = 0, vjust = 1) + ) ``` ### Geoms! @@ -132,11 +164,22 @@ tibble( fct = c(rep("Thing 1", 3), rep("Thing 2", 3), rep("Thing 3", 3)) ) -> xdf -ggplot(xdf, aes(fill=parts, values=values)) + - geom_waffle(color = "white", size=1.125, n_rows = 6) + +ggplot( + data = xdf, + aes(fill=parts, values=values) +) + + geom_waffle( + color = "white", + size = 1.125, + n_rows = 6 + ) + facet_wrap(~fct, ncol=1) + - scale_x_discrete(expand=c(0,0)) + - scale_y_discrete(expand=c(0,0)) + + scale_x_discrete( + expand = c(0,0,0,0) + ) + + scale_y_discrete( + expand = c(0,0,0,0) + ) + ggthemes::scale_fill_tableau(name=NULL) + coord_equal() + labs( @@ -156,23 +199,43 @@ storms %>% filter(year >= 2010) %>% count(year, status) -> storms_df -ggplot(storms_df, aes(fill = status, values = n)) + - geom_waffle(color = "white", size = .25, n_rows = 10, flip = TRUE) + - facet_wrap(~year, nrow = 1, strip.position = "bottom") + +ggplot( + data = storms_df, + aes(fill = status, values = n) +) + + geom_waffle( + color = "white", + size = .25, + n_rows = 10, + flip = TRUE + ) + + facet_wrap( + ~year, + nrow = 1, + strip.position = "bottom" + ) + scale_x_discrete() + - scale_y_continuous(labels = function(x) x * 10, # make this multiplyer the same as n_rows - expand = c(0,0)) + + scale_y_continuous( + labels = function(x) x * 10, # make this multiplier the same as n_rows + expand = c(0,0) + ) + ggthemes::scale_fill_tableau(name=NULL) + coord_equal() + labs( + x = "Year", y = "Count", title = "Faceted Waffle Bar Chart", - subtitle = "{dplyr} storms data", - x = "Year", - y = "Count" + subtitle = "{dplyr} storms data" + ) + + theme_minimal( + base_family = "Roboto Condensed" ) + - theme_minimal(base_family = "Roboto Condensed") + - theme(panel.grid = element_blank(), axis.ticks.y = element_line()) + - guides(fill = guide_legend(reverse = TRUE)) + theme( + panel.grid = element_blank(), + axis.ticks.y = element_line() + ) + + guides( + fill = guide_legend(reverse = TRUE) + ) ``` @@ -197,20 +260,30 @@ waffle(parts, rows = 8) ### Slightly more complex example ```{r s4} -parts <- c(`Un-breached\nUS Population` = (318 - 11 - 79), `Premera` = 11, `Anthem` = 79) +c( + `Un-breached\nUS Population` = (318 - 11 - 79), + `Premera` = 11, + `Anthem` = 79 +) -> parts ``` ```{r t1, eval=FALSE} waffle( - parts, rows = 8, size = 1, - colors = c("#969696", "#1879bf", "#009bda"), legend_pos = "bottom" + parts = parts, + rows = 8, + size = 1, + colors = c("#969696", "#1879bf", "#009bda"), + legend_pos = "bottom" ) ``` **Health records breaches as fraction of US Population** ```{r fig2, echo=FALSE, fig.width=6, fig.height=1.75} waffle( - parts, rows = 8, size = 1, legend_pos = "bottom", + parts = parts, + rows = 8, + size = 1, + legend_pos = "bottom", colors = c("#969696", "#1879bf", "#009bda") ) ``` @@ -219,7 +292,8 @@ waffle( ```{r t2, eval=FALSE} waffle( - parts / 10, rows = 3, + parts = parts / 10, + rows = 3, colors = c("#969696", "#1879bf", "#009bda") ) ``` @@ -227,7 +301,8 @@ waffle( **Health records breaches as fraction of US Population** ```{r fig3, echo=FALSE, fig.width=6, fig.height=2} waffle( - parts / 10, rows = 3, + parts = parts / 10, + rows = 3, colors = c("#969696", "#1879bf", "#009bda") ) ``` @@ -238,18 +313,30 @@ waffle( library(extrafont) waffle( - parts / 10, rows = 3, colors = c("#969696", "#1879bf", "#009bda"), - use_glyph = "medkit", size = 8 -) + expand_limits(y = c(0, 4)) + parts = parts / 10, + rows = 3, + colors = c("#969696", "#1879bf", "#009bda"), + use_glyph = "medkit", + size = 8 +) + + expand_limits( + y = c(0, 4) + ) ``` ```{r medkit, echo=FALSE, fig.width=6, fig.height=2} library(extrafont) waffle( - parts / 10, rows = 3, colors = c("#969696", "#1879bf", "#009bda"), - use_glyph = "medkit", glyph_size = 8 -) + expand_limits(y = c(0, 4)) + parts = parts / 10, + rows = 3, + colors = c("#969696", "#1879bf", "#009bda"), + use_glyph = "medkit", + glyph_size = 8 +) + + expand_limits( + y = c(0, 4) + ) ``` ### Replicating an old favourite @@ -260,15 +347,20 @@ Via: ```{r s5} -savings <- c( - `Mortgage\n($84,911)` = 84911, `Auto and\ntuition loans\n($14,414)` = 14414, - `Home equity loans\n($10,062)` = 10062, `Credit Cards\n($8,565)` = 8565 -) +c( + `Mortgage\n($84,911)` = 84911, + `Auto and\ntuition loans\n($14,414)` = 14414, + `Home equity loans\n($10,062)` = 10062, + `Credit Cards\n($8,565)` = 8565 +) -> savings ``` ```{r fig4, eval=FALSE} waffle( - savings / 392, rows = 7, size = 0.5, legend_pos = "bottom", + parts = savings / 392, + rows = 7, + size = 0.5, + legend_pos = "bottom", colors = c("#c7d4b6", "#a3aabd", "#a0d0de", "#97b5cf") ) ``` @@ -277,7 +369,10 @@ waffle( **Average Household Savings Each Year** ```{r fig4a, echo=FALSE, fig.width=8, fig.height=2.5} waffle( - savings / 392, rows = 7, size = 0.5, legend_pos = "bottom", + parts = savings / 392, + rows = 7, + size = 0.5, + legend_pos = "bottom", colors = c("#c7d4b6", "#a3aabd", "#a0d0de", "#97b5cf") ) ``` @@ -294,7 +389,9 @@ professional <- c(`Male` = 44, `Female (56%)` = 56) ```{r t5, eval=FALSE} waffle( - professional, rows = 10, size = 0.5, + parts = professional, + rows = 10, + size = 0.5, colors = c("#af9139", "#544616") ) ``` @@ -305,8 +402,14 @@ With: ```{r fct, fig.height=3, fig.width=6} iron( - waffle(c(thing1 = 0, thing2 = 100), rows = 5), - waffle(c(thing1 = 25, thing2 = 75), rows = 5) + waffle( + parts = c(thing1 = 0, thing2 = 100), + rows = 5 + ), + waffle( + parts = c(thing1 = 25, thing2 = 75), + rows = 5 + ) ) ``` @@ -314,15 +417,28 @@ Without (you can disable this via `keep` parameter now): ```{r no_fct, fig.height=3, fig.width=6} iron( - waffle(c(thing1 = 0, thing2 = 100), rows = 5, keep = FALSE), - waffle(c(thing1 = 25, thing2 = 75), rows = 5, keep = FALSE) + waffle( + parts = c(thing1 = 0, thing2 = 100), + rows = 5, + keep = FALSE + ), + waffle( + parts = c(thing1 = 25, thing2 = 75), + rows = 5, + keep = FALSE + ) ) ``` **Professional Workforce Makeup** ```{r f5, echo=FALSE, fig.height=3, fig.width=4} -waffle(professional, rows = 10, size = 0.5, colors = c("#af9139", "#544616")) +waffle( + parts = professional, + rows = 10, + size = 0.5, + colors = c("#af9139", "#544616") +) ``` Iron example (left-align & padding for multiple plots) @@ -331,7 +447,9 @@ Iron example (left-align & padding for multiple plots) pain.adult.1997 <- c(`YOY (406)` = 406, `Adult (24)` = 24) waffle( - pain.adult.1997 / 2, rows = 7, size = 0.5, + parts = pain.adult.1997 / 2, + rows = 7, + size = 0.5, colors = c("#c7d4b6", "#a3aabd"), title = "Paine Run Brook Trout Abundance (1997)", xlab = "1 square = 2 fish", pad = 3 @@ -340,7 +458,9 @@ waffle( pine.adult.1997 <- c(`YOY (221)` = 221, `Adult (143)` = 143) waffle( - pine.adult.1997 / 2, rows = 7, size = 0.5, + parts = pine.adult.1997 / 2, + rows = 7, + size = 0.5, colors = c("#c7d4b6", "#a3aabd"), title = "Piney River Brook Trout Abundance (1997)", xlab = "1 square = 2 fish", pad = 8 @@ -349,7 +469,9 @@ waffle( stan.adult.1997 <- c(`YOY (270)` = 270, `Adult (197)` = 197) waffle( - stan.adult.1997 / 2, rows = 7, size = 0.5, + parts = stan.adult.1997 / 2, + rows = 7, + size = 0.5, colors = c("#c7d4b6", "#a3aabd"), title = "Staunton River Trout Abundance (1997)", xlab = "1 square = 2 fish" @@ -360,7 +482,7 @@ iron(A, B, C) ## Package Code Metrics -```{r} +```{r cloc} cloc::cloc_pkg_md() ``` diff --git a/README_cache/gfm/__packages b/README_cache/commonmark/__packages similarity index 91% rename from README_cache/gfm/__packages rename to README_cache/commonmark/__packages index ec4b77f..1920204 100644 --- a/README_cache/gfm/__packages +++ b/README_cache/commonmark/__packages @@ -1,4 +1,3 @@ -base ggplot2 waffle magrittr @@ -11,4 +10,5 @@ readr purrr stringr forcats +lubridate extrafont diff --git a/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.RData b/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.RData new file mode 100644 index 0000000..23b5ff2 Binary files /dev/null and b/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.RData differ diff --git a/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.rdb b/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.rdb similarity index 100% rename from README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.rdb rename to README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.rdb diff --git a/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.rdx b/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/f5_03d5bae8450bdaadd13ea6f1ab4a6065.rdx differ diff --git a/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.RData b/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.RData new file mode 100644 index 0000000..de194c0 Binary files /dev/null and b/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.RData differ diff --git a/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.rdb b/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.rdb new file mode 100644 index 0000000..404b0e7 Binary files /dev/null and b/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.rdb differ diff --git a/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.rdx b/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.rdx new file mode 100644 index 0000000..bd6eed8 Binary files /dev/null and b/README_cache/commonmark/f8_cfd690625c28c35b29c8d938974bd88b.rdx differ diff --git a/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.RData b/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.RData new file mode 100644 index 0000000..b839008 Binary files /dev/null and b/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.RData differ diff --git a/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.rdb b/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.rdb similarity index 100% rename from README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.rdb rename to README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.rdb diff --git a/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.rdx b/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/fct_d5131e99fe673745f977578f10ca4f48.rdx differ diff --git a/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.RData b/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.RData new file mode 100644 index 0000000..1ce4252 Binary files /dev/null and b/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.RData differ diff --git a/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.rdb b/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.rdb new file mode 100644 index 0000000..ce3e5a5 Binary files /dev/null and b/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.rdb differ diff --git a/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.rdx b/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.rdx new file mode 100644 index 0000000..1fe9512 Binary files /dev/null and b/README_cache/commonmark/fig0_b53874c78d0daf5e69442798ed0e9957.rdx differ diff --git a/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.RData b/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.RData new file mode 100644 index 0000000..f5d43fe Binary files /dev/null and b/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.RData differ diff --git a/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.rdb b/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.rdb new file mode 100644 index 0000000..7c7adc3 Binary files /dev/null and b/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.rdb differ diff --git a/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.rdx b/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.rdx new file mode 100644 index 0000000..ddd0225 Binary files /dev/null and b/README_cache/commonmark/fig1_fd8c7375634d9a3080bf76b1210ae135.rdx differ diff --git a/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.RData b/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.RData new file mode 100644 index 0000000..a6ef658 Binary files /dev/null and b/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.RData differ diff --git a/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.rdb b/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.rdb similarity index 100% rename from README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.rdb rename to README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.rdb diff --git a/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.rdx b/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/fig2_3e1d897a35fd64a9b04f809a167a7b22.rdx differ diff --git a/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.RData b/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.RData new file mode 100644 index 0000000..8506ff6 Binary files /dev/null and b/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.RData differ diff --git a/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.rdb b/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.rdb similarity index 100% rename from README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.rdb rename to README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.rdb diff --git a/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.rdx b/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/fig3_21436c60eef6e30e58acec0b7bc25f8b.rdx differ diff --git a/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.RData b/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.RData new file mode 100644 index 0000000..1e0622f Binary files /dev/null and b/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.RData differ diff --git a/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.rdb b/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.rdb similarity index 100% rename from README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.rdb rename to README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.rdb diff --git a/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.rdx b/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/fig4_01ca1b499c0a5d6ca4c1a7a593a82338.rdx differ diff --git a/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.RData b/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.RData new file mode 100644 index 0000000..c709fe4 Binary files /dev/null and b/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.RData differ diff --git a/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.rdb b/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.rdb similarity index 100% rename from README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.rdb rename to README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.rdb diff --git a/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.rdx b/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/fig4a_cea4386fc158b50d4f068678a41ab9cd.rdx differ diff --git a/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.RData b/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.RData new file mode 100644 index 0000000..237ad2e Binary files /dev/null and b/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.RData differ diff --git a/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.rdb b/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.rdb new file mode 100644 index 0000000..8df52c6 Binary files /dev/null and b/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.rdb differ diff --git a/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.rdx b/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.rdx new file mode 100644 index 0000000..4a5264b Binary files /dev/null and b/README_cache/commonmark/geoms_d324c5a7bdbfed2f829ee8446dfca165.rdx differ diff --git a/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.RData b/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.RData new file mode 100644 index 0000000..c05be38 Binary files /dev/null and b/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.RData differ diff --git a/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.rdb b/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.rdb similarity index 100% rename from README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.rdb rename to README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.rdb diff --git a/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.rdx b/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/medkit0_b81d40f05aea16dff4fa3b419e1880cf.rdx differ diff --git a/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.RData b/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.RData new file mode 100644 index 0000000..3e17779 Binary files /dev/null and b/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.RData differ diff --git a/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.rdb b/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.rdb similarity index 100% rename from README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.rdb rename to README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.rdb diff --git a/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.rdx b/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/medkit_e2b0af9f0792c7bc6e315f773241d501.rdx differ diff --git a/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.RData b/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.RData new file mode 100644 index 0000000..84c570f Binary files /dev/null and b/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.RData differ diff --git a/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.rdb b/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.rdb similarity index 100% rename from README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.rdb rename to README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.rdb diff --git a/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.rdx b/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/no_fct_42840b53bbaf9ee76ab713ef9ad6e208.rdx differ diff --git a/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.RData b/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.RData new file mode 100644 index 0000000..70b5d83 Binary files /dev/null and b/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.RData differ diff --git a/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.rdb b/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.rdb similarity index 100% rename from README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.rdb rename to README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.rdb diff --git a/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.rdx b/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/s2_f3fdec98ad58fa63b580d9d640ea59be.rdx differ diff --git a/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.RData b/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.RData new file mode 100644 index 0000000..28c81e2 Binary files /dev/null and b/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.RData differ diff --git a/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.rdb b/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.rdb new file mode 100644 index 0000000..9daf5cb Binary files /dev/null and b/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.rdb differ diff --git a/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.rdx b/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.rdx new file mode 100644 index 0000000..c1c7896 Binary files /dev/null and b/README_cache/commonmark/s4_6cbe77ac6c30f0d75903003ad6256901.rdx differ diff --git a/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.RData b/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.RData new file mode 100644 index 0000000..275000e Binary files /dev/null and b/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.RData differ diff --git a/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.rdb b/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.rdb similarity index 55% rename from README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.rdb rename to README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.rdb index 3454f41..962b74c 100644 Binary files a/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.rdb and b/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.rdb differ diff --git a/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.rdx b/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.rdx new file mode 100644 index 0000000..bfa75c8 Binary files /dev/null and b/README_cache/commonmark/s5_c4483722b97efa986ba51ccfd73914e8.rdx differ diff --git a/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.RData b/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.RData new file mode 100644 index 0000000..71bdc25 Binary files /dev/null and b/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.RData differ diff --git a/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.rdb b/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.rdb new file mode 100644 index 0000000..6edb2e1 Binary files /dev/null and b/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.rdb differ diff --git a/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.rdx b/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.rdx new file mode 100644 index 0000000..573babf Binary files /dev/null and b/README_cache/commonmark/s6_1341d57d8f06bd280d326384360c3733.rdx differ diff --git a/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.RData b/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.RData new file mode 100644 index 0000000..5d29eaa Binary files /dev/null and b/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.RData differ diff --git a/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.rdb b/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.rdb similarity index 100% rename from README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.rdb rename to README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.rdb diff --git a/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.rdx b/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/t1_bb7c040bc8777672fefe54885238ee4d.rdx differ diff --git a/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.RData b/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.RData new file mode 100644 index 0000000..245f652 Binary files /dev/null and b/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.RData differ diff --git a/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.rdb b/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.rdb similarity index 100% rename from README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.rdb rename to README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.rdb diff --git a/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.rdx b/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/t2_f824a7f8d7299ec29da066a637c33377.rdx differ diff --git a/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.RData b/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.RData new file mode 100644 index 0000000..464c418 Binary files /dev/null and b/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.RData differ diff --git a/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.rdb b/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.rdb similarity index 100% rename from README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.rdb rename to README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.rdb diff --git a/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.rdx b/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/t5_b88afd9700b946468787378af40761ed.rdx differ diff --git a/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.RData b/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.RData new file mode 100644 index 0000000..93fea44 Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.RData differ diff --git a/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.rdb b/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.rdb new file mode 100644 index 0000000..d8d679f Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.rdb differ diff --git a/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.rdx b/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.rdx new file mode 100644 index 0000000..b86aac0 Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-1_4828a517c6e06c8c59b96d2574d9c635.rdx differ diff --git a/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.RData b/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.RData new file mode 100644 index 0000000..99b9aa6 Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.RData differ diff --git a/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.rdb b/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.rdb similarity index 100% rename from README_cache/gfm/t2_7c122c890770243656f73d2b61047447.rdb rename to README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.rdb diff --git a/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.rdx b/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-2_bea0cd1c0d8434e92aefa949e2471809.rdx differ diff --git a/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.RData b/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.RData new file mode 100644 index 0000000..052f81d Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.RData differ diff --git a/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.rdb b/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.rdb similarity index 100% rename from README_cache/gfm/t5_16669037c87db61268030415808cf9e4.rdb rename to README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.rdb diff --git a/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.rdx b/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.rdx new file mode 100644 index 0000000..b7002d3 Binary files /dev/null and b/README_cache/commonmark/unnamed-chunk-3_53c23b892f9bcd1d15b15bc012b24ff1.rdx differ diff --git a/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.RData b/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.RData new file mode 100644 index 0000000..e65a84d Binary files /dev/null and b/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.RData differ diff --git a/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.rdb b/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.rdb new file mode 100644 index 0000000..24889e1 Binary files /dev/null and b/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.rdb differ diff --git a/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.rdx b/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.rdx new file mode 100644 index 0000000..3e9b9cb Binary files /dev/null and b/README_cache/commonmark/waffle-bars_e3bb5bfed66837bf7c6ed124e7003061.rdx differ diff --git a/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.RData b/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.RData deleted file mode 100644 index 11aec65..0000000 Binary files a/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.RData and /dev/null differ diff --git a/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.rdx b/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/f5_710b0d1aefcd2f3ca0b644f85c465808.rdx and /dev/null differ diff --git a/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.RData b/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.RData deleted file mode 100644 index 34b89aa..0000000 Binary files a/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.RData and /dev/null differ diff --git a/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.rdb b/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.rdb deleted file mode 100644 index e4ee4c8..0000000 Binary files a/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.rdb and /dev/null differ diff --git a/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.rdx b/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.rdx deleted file mode 100644 index 51fd139..0000000 Binary files a/README_cache/gfm/f8_e75f3b495a1f5c3210bcdf218e89f520.rdx and /dev/null differ diff --git a/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.RData b/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.RData deleted file mode 100644 index 5b9f0ed..0000000 Binary files a/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.RData and /dev/null differ diff --git a/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.rdx b/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/fct_c36a2595703fe94fc8c044620bf4823b.rdx and /dev/null differ diff --git a/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.RData b/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.RData deleted file mode 100644 index 91c8609..0000000 Binary files a/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.RData and /dev/null differ diff --git a/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.rdb b/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.rdb deleted file mode 100644 index 04f576f..0000000 Binary files a/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.rdb and /dev/null differ diff --git a/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.rdx b/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.rdx deleted file mode 100644 index 997a1ef..0000000 Binary files a/README_cache/gfm/fig0_d65f3c4f4dfa958c9e2f0c987dea3535.rdx and /dev/null differ diff --git a/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.RData b/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.RData deleted file mode 100644 index 48cb62d..0000000 Binary files a/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.RData and /dev/null differ diff --git a/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.rdb b/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.rdb deleted file mode 100644 index c748a4d..0000000 Binary files a/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.rdb and /dev/null differ diff --git a/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.rdx b/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.rdx deleted file mode 100644 index 9e7811b..0000000 Binary files a/README_cache/gfm/fig1_054bb033a6b9ac8e7338f3cdb8d39a62.rdx and /dev/null differ diff --git a/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.RData b/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.RData deleted file mode 100644 index 3bdeb57..0000000 Binary files a/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.RData and /dev/null differ diff --git a/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.rdx b/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/fig2_e0d7e0d0efa50e942d39e6e48ba80912.rdx and /dev/null differ diff --git a/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.RData b/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.RData deleted file mode 100644 index 9d6e9e3..0000000 Binary files a/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.RData and /dev/null differ diff --git a/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.rdx b/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/fig3_e309a8084aaa18ff311eb66314fd7847.rdx and /dev/null differ diff --git a/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.RData b/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.RData deleted file mode 100644 index 15ee4ed..0000000 Binary files a/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.RData and /dev/null differ diff --git a/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.rdx b/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/fig4_6b1a62b15ba919c9e694bd7201ec2879.rdx and /dev/null differ diff --git a/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.RData b/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.RData deleted file mode 100644 index 7f66f3a..0000000 Binary files a/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.RData and /dev/null differ diff --git a/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.rdx b/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/fig4a_8ef1b4def5131112de4e271e683323bb.rdx and /dev/null differ diff --git a/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.RData b/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.RData deleted file mode 100644 index a3a00bc..0000000 Binary files a/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.RData and /dev/null differ diff --git a/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.rdb b/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.rdb deleted file mode 100644 index a62a9da..0000000 Binary files a/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.rdb and /dev/null differ diff --git a/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.rdx b/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.rdx deleted file mode 100644 index 51d017f..0000000 Binary files a/README_cache/gfm/geoms_9869d6ca0aeaee443fd39be86ad1c1df.rdx and /dev/null differ diff --git a/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.RData b/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.RData deleted file mode 100644 index 4349053..0000000 Binary files a/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.RData and /dev/null differ diff --git a/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.rdx b/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/ingredients_03d07729b8c87f59927b3d580f1db2f9.rdx and /dev/null differ diff --git a/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.RData b/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.RData deleted file mode 100644 index d202484..0000000 Binary files a/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.RData and /dev/null differ diff --git a/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.rdx b/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/medkit0_88b2e04a3d99f67d1229102efea7b846.rdx and /dev/null differ diff --git a/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.RData b/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.RData deleted file mode 100644 index dd1470b..0000000 Binary files a/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.RData and /dev/null differ diff --git a/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.rdx b/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/medkit_5481ebf4f47fd648906bc0999d3cb0cf.rdx and /dev/null differ diff --git a/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.RData b/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.RData deleted file mode 100644 index 6e2ed18..0000000 Binary files a/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.RData and /dev/null differ diff --git a/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.rdx b/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/no_fct_2f43bb7d6eb1cb87bf304ad659064fe0.rdx and /dev/null differ diff --git a/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.RData b/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.RData deleted file mode 100644 index 5a3a13b..0000000 Binary files a/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.RData and /dev/null differ diff --git a/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.rdx b/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/nstall-ex_47a60990e2d319f8433b2210a6890028.rdx and /dev/null differ diff --git a/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.RData b/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.RData deleted file mode 100644 index 3591cbe..0000000 Binary files a/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.RData and /dev/null differ diff --git a/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.rdx b/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/s2_66cee9d85dc6a99ef20315ebeab21b5b.rdx and /dev/null differ diff --git a/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.RData b/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.RData deleted file mode 100644 index 6c7de8e..0000000 Binary files a/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.RData and /dev/null differ diff --git a/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.rdb b/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.rdb deleted file mode 100644 index 3fbcc98..0000000 Binary files a/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.rdb and /dev/null differ diff --git a/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.rdx b/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.rdx deleted file mode 100644 index a8fe92c..0000000 Binary files a/README_cache/gfm/s4_48598dc1866f29f3f7f81430098379a9.rdx and /dev/null differ diff --git a/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.RData b/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.RData deleted file mode 100644 index 8bddbf7..0000000 Binary files a/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.RData and /dev/null differ diff --git a/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.rdx b/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.rdx deleted file mode 100644 index 1819910..0000000 Binary files a/README_cache/gfm/s5_eb698fe4b4f2f1dc4a10ee0306e3ff67.rdx and /dev/null differ diff --git a/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.RData b/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.RData deleted file mode 100644 index cb946a8..0000000 Binary files a/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.RData and /dev/null differ diff --git a/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.rdb b/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.rdb deleted file mode 100644 index 2bfbf78..0000000 Binary files a/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.rdb and /dev/null differ diff --git a/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.rdx b/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.rdx deleted file mode 100644 index e28a108..0000000 Binary files a/README_cache/gfm/s6_b603b640ff56082f6aedd602c4aac49e.rdx and /dev/null differ diff --git a/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.RData b/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.RData deleted file mode 100644 index 2f5b710..0000000 Binary files a/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.RData and /dev/null differ diff --git a/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.rdx b/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/t1_9fd276e63f7f98205dafdb3e4ee91dcd.rdx and /dev/null differ diff --git a/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.RData b/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.RData deleted file mode 100644 index 6986e98..0000000 Binary files a/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.RData and /dev/null differ diff --git a/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.rdx b/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/t2_7c122c890770243656f73d2b61047447.rdx and /dev/null differ diff --git a/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.RData b/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.RData deleted file mode 100644 index 18f739a..0000000 Binary files a/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.RData and /dev/null differ diff --git a/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.rdx b/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/t5_16669037c87db61268030415808cf9e4.rdx and /dev/null differ diff --git a/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.RData b/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.RData deleted file mode 100644 index 9ec5908..0000000 Binary files a/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.RData and /dev/null differ diff --git a/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.rdb b/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.rdb deleted file mode 100644 index 20d5dd8..0000000 Binary files a/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.rdb and /dev/null differ diff --git a/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.rdx b/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.rdx deleted file mode 100644 index 66c37d6..0000000 Binary files a/README_cache/gfm/unnamed-chunk-2_f47bc646e2c803344b07d9b3e94f89cd.rdx and /dev/null differ diff --git a/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.RData b/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.RData deleted file mode 100644 index a8e12d1..0000000 Binary files a/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.RData and /dev/null differ diff --git a/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.rdb b/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.rdb deleted file mode 100644 index e69de29..0000000 diff --git a/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.rdx b/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.rdx deleted file mode 100644 index 2a11481..0000000 Binary files a/README_cache/gfm/unnamed-chunk-3_725e7aabb5627f74a5042b223946d90a.rdx and /dev/null differ diff --git a/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.RData b/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.RData deleted file mode 100644 index 2e9a870..0000000 Binary files a/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.RData and /dev/null differ diff --git a/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.rdb b/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.rdb deleted file mode 100644 index 690c20b..0000000 Binary files a/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.rdb and /dev/null differ diff --git a/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.rdx b/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.rdx deleted file mode 100644 index cb5e651..0000000 Binary files a/README_cache/gfm/waffle-bars_da03647ee01c86572450078c58930f82.rdx and /dev/null differ diff --git a/README_files/figure-gfm/f5-1.png b/README_files/figure-commonmark/f5-1.png similarity index 94% rename from README_files/figure-gfm/f5-1.png rename to README_files/figure-commonmark/f5-1.png index 8ece33a..5d32900 100644 Binary files a/README_files/figure-gfm/f5-1.png and b/README_files/figure-commonmark/f5-1.png differ diff --git a/README_files/figure-gfm/f8-1.png b/README_files/figure-commonmark/f8-1.png similarity index 98% rename from README_files/figure-gfm/f8-1.png rename to README_files/figure-commonmark/f8-1.png index 530abfe..60ebab8 100644 Binary files a/README_files/figure-gfm/f8-1.png and b/README_files/figure-commonmark/f8-1.png differ diff --git a/README_files/figure-gfm/fct-1.png b/README_files/figure-commonmark/fct-1.png similarity index 96% rename from README_files/figure-gfm/fct-1.png rename to README_files/figure-commonmark/fct-1.png index 03828d6..516050f 100644 Binary files a/README_files/figure-gfm/fct-1.png and b/README_files/figure-commonmark/fct-1.png differ diff --git a/README_files/figure-gfm/fig0-1.png b/README_files/figure-commonmark/fig0-1.png similarity index 86% rename from README_files/figure-gfm/fig0-1.png rename to README_files/figure-commonmark/fig0-1.png index 973ac05..b1e02f0 100644 Binary files a/README_files/figure-gfm/fig0-1.png and b/README_files/figure-commonmark/fig0-1.png differ diff --git a/README_files/figure-gfm/fig1-1.png b/README_files/figure-commonmark/fig1-1.png similarity index 86% rename from README_files/figure-gfm/fig1-1.png rename to README_files/figure-commonmark/fig1-1.png index 973ac05..b1e02f0 100644 Binary files a/README_files/figure-gfm/fig1-1.png and b/README_files/figure-commonmark/fig1-1.png differ diff --git a/README_files/figure-gfm/fig2-1.png b/README_files/figure-commonmark/fig2-1.png similarity index 91% rename from README_files/figure-gfm/fig2-1.png rename to README_files/figure-commonmark/fig2-1.png index 0a572c2..d0eb38a 100644 Binary files a/README_files/figure-gfm/fig2-1.png and b/README_files/figure-commonmark/fig2-1.png differ diff --git a/README_files/figure-gfm/fig3-1.png b/README_files/figure-commonmark/fig3-1.png similarity index 94% rename from README_files/figure-gfm/fig3-1.png rename to README_files/figure-commonmark/fig3-1.png index 575b8d0..0501e37 100644 Binary files a/README_files/figure-gfm/fig3-1.png and b/README_files/figure-commonmark/fig3-1.png differ diff --git a/README_files/figure-gfm/fig4a-1.png b/README_files/figure-commonmark/fig4a-1.png similarity index 97% rename from README_files/figure-gfm/fig4a-1.png rename to README_files/figure-commonmark/fig4a-1.png index 8bca83e..18c5843 100644 Binary files a/README_files/figure-gfm/fig4a-1.png and b/README_files/figure-commonmark/fig4a-1.png differ diff --git a/README_files/figure-commonmark/geoms-1.png b/README_files/figure-commonmark/geoms-1.png new file mode 100644 index 0000000..1aeb26c Binary files /dev/null and b/README_files/figure-commonmark/geoms-1.png differ diff --git a/README_files/figure-gfm/medkit-1.png b/README_files/figure-commonmark/medkit-1.png similarity index 89% rename from README_files/figure-gfm/medkit-1.png rename to README_files/figure-commonmark/medkit-1.png index ebd0582..a4701c6 100644 Binary files a/README_files/figure-gfm/medkit-1.png and b/README_files/figure-commonmark/medkit-1.png differ diff --git a/README_files/figure-commonmark/new-bits-1.png b/README_files/figure-commonmark/new-bits-1.png new file mode 100644 index 0000000..deb7428 Binary files /dev/null and b/README_files/figure-commonmark/new-bits-1.png differ diff --git a/README_files/figure-commonmark/new-bits-2.png b/README_files/figure-commonmark/new-bits-2.png new file mode 100644 index 0000000..38b0433 Binary files /dev/null and b/README_files/figure-commonmark/new-bits-2.png differ diff --git a/README_files/figure-commonmark/new-bits-3.png b/README_files/figure-commonmark/new-bits-3.png new file mode 100644 index 0000000..1e8613c Binary files /dev/null and b/README_files/figure-commonmark/new-bits-3.png differ diff --git a/README_files/figure-gfm/no_fct-1.png b/README_files/figure-commonmark/no_fct-1.png similarity index 92% rename from README_files/figure-gfm/no_fct-1.png rename to README_files/figure-commonmark/no_fct-1.png index 7d4a7c5..181ec24 100644 Binary files a/README_files/figure-gfm/no_fct-1.png and b/README_files/figure-commonmark/no_fct-1.png differ diff --git a/README_files/figure-commonmark/unnamed-chunk-1-1.png b/README_files/figure-commonmark/unnamed-chunk-1-1.png new file mode 100644 index 0000000..deb7428 Binary files /dev/null and b/README_files/figure-commonmark/unnamed-chunk-1-1.png differ diff --git a/README_files/figure-commonmark/unnamed-chunk-1-2.png b/README_files/figure-commonmark/unnamed-chunk-1-2.png new file mode 100644 index 0000000..38b0433 Binary files /dev/null and b/README_files/figure-commonmark/unnamed-chunk-1-2.png differ diff --git a/README_files/figure-commonmark/unnamed-chunk-1-3.png b/README_files/figure-commonmark/unnamed-chunk-1-3.png new file mode 100644 index 0000000..1e8613c Binary files /dev/null and b/README_files/figure-commonmark/unnamed-chunk-1-3.png differ diff --git a/README_files/figure-commonmark/unnamed-chunk-2-1.png b/README_files/figure-commonmark/unnamed-chunk-2-1.png new file mode 100644 index 0000000..deb7428 Binary files /dev/null and b/README_files/figure-commonmark/unnamed-chunk-2-1.png differ diff --git a/README_files/figure-commonmark/unnamed-chunk-2-2.png b/README_files/figure-commonmark/unnamed-chunk-2-2.png new file mode 100644 index 0000000..38b0433 Binary files /dev/null and b/README_files/figure-commonmark/unnamed-chunk-2-2.png differ diff --git a/README_files/figure-commonmark/unnamed-chunk-2-3.png b/README_files/figure-commonmark/unnamed-chunk-2-3.png new file mode 100644 index 0000000..1e8613c Binary files /dev/null and b/README_files/figure-commonmark/unnamed-chunk-2-3.png differ diff --git a/README_files/figure-commonmark/waffle-bars-1.png b/README_files/figure-commonmark/waffle-bars-1.png new file mode 100644 index 0000000..8e19755 Binary files /dev/null and b/README_files/figure-commonmark/waffle-bars-1.png differ diff --git a/README_files/figure-gfm/geoms-1.png b/README_files/figure-gfm/geoms-1.png deleted file mode 100644 index a28ce4e..0000000 Binary files a/README_files/figure-gfm/geoms-1.png and /dev/null differ diff --git a/README_files/figure-gfm/unnamed-chunk-2-1.png b/README_files/figure-gfm/unnamed-chunk-2-1.png deleted file mode 100644 index bb29700..0000000 Binary files a/README_files/figure-gfm/unnamed-chunk-2-1.png and /dev/null differ diff --git a/README_files/figure-gfm/unnamed-chunk-2-2.png b/README_files/figure-gfm/unnamed-chunk-2-2.png deleted file mode 100644 index 36e6972..0000000 Binary files a/README_files/figure-gfm/unnamed-chunk-2-2.png and /dev/null differ diff --git a/README_files/figure-gfm/unnamed-chunk-2-3.png b/README_files/figure-gfm/unnamed-chunk-2-3.png deleted file mode 100644 index 3c425f7..0000000 Binary files a/README_files/figure-gfm/unnamed-chunk-2-3.png and /dev/null differ diff --git a/README_files/figure-gfm/waffle-bars-1.png b/README_files/figure-gfm/waffle-bars-1.png deleted file mode 100644 index ee56194..0000000 Binary files a/README_files/figure-gfm/waffle-bars-1.png and /dev/null differ diff --git a/README_files/figure-gfm/ww2-1.png b/README_files/figure-gfm/ww2-1.png deleted file mode 100644 index ad0e120..0000000 Binary files a/README_files/figure-gfm/ww2-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/f5-1.png b/README_files/figure-markdown_github-ascii_identifiers/f5-1.png deleted file mode 100644 index 392afd6..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/f5-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/f8-1.png b/README_files/figure-markdown_github-ascii_identifiers/f8-1.png deleted file mode 100644 index 7b091de..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/f8-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/fct-1.png b/README_files/figure-markdown_github-ascii_identifiers/fct-1.png deleted file mode 100644 index a57ddb3..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/fct-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/fig0-1.png b/README_files/figure-markdown_github-ascii_identifiers/fig0-1.png deleted file mode 100644 index 3f2aa32..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/fig0-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/fig1-1.png b/README_files/figure-markdown_github-ascii_identifiers/fig1-1.png deleted file mode 100644 index 3f2aa32..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/fig1-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/fig2-1.png b/README_files/figure-markdown_github-ascii_identifiers/fig2-1.png deleted file mode 100644 index 44c73d2..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/fig2-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/fig3-1.png b/README_files/figure-markdown_github-ascii_identifiers/fig3-1.png deleted file mode 100644 index 1bb7203..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/fig3-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/fig4a-1.png b/README_files/figure-markdown_github-ascii_identifiers/fig4a-1.png deleted file mode 100644 index 1b2e8d5..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/fig4a-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/no_fct-1.png b/README_files/figure-markdown_github-ascii_identifiers/no_fct-1.png deleted file mode 100644 index 42608e9..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/no_fct-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github-ascii_identifiers/ww2-1.png b/README_files/figure-markdown_github-ascii_identifiers/ww2-1.png deleted file mode 100644 index d6a8a32..0000000 Binary files a/README_files/figure-markdown_github-ascii_identifiers/ww2-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/f5-1.png b/README_files/figure-markdown_github/f5-1.png deleted file mode 100644 index 392afd6..0000000 Binary files a/README_files/figure-markdown_github/f5-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/f8-1.png b/README_files/figure-markdown_github/f8-1.png deleted file mode 100644 index 6aaf9f5..0000000 Binary files a/README_files/figure-markdown_github/f8-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/fct-1.png b/README_files/figure-markdown_github/fct-1.png deleted file mode 100644 index 68a0b9d..0000000 Binary files a/README_files/figure-markdown_github/fct-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/fig0-1.png b/README_files/figure-markdown_github/fig0-1.png deleted file mode 100644 index dda4d0f..0000000 Binary files a/README_files/figure-markdown_github/fig0-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/fig1-1.png b/README_files/figure-markdown_github/fig1-1.png deleted file mode 100644 index dda4d0f..0000000 Binary files a/README_files/figure-markdown_github/fig1-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/fig2-1.png b/README_files/figure-markdown_github/fig2-1.png deleted file mode 100644 index 07766a9..0000000 Binary files a/README_files/figure-markdown_github/fig2-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/fig3-1.png b/README_files/figure-markdown_github/fig3-1.png deleted file mode 100644 index b574525..0000000 Binary files a/README_files/figure-markdown_github/fig3-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/fig4a-1.png b/README_files/figure-markdown_github/fig4a-1.png deleted file mode 100644 index d11e8eb..0000000 Binary files a/README_files/figure-markdown_github/fig4a-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/no_fct-1.png b/README_files/figure-markdown_github/no_fct-1.png deleted file mode 100644 index 07dcc84..0000000 Binary files a/README_files/figure-markdown_github/no_fct-1.png and /dev/null differ diff --git a/README_files/figure-markdown_github/ww2-1.png b/README_files/figure-markdown_github/ww2-1.png deleted file mode 100644 index 063a9ca..0000000 Binary files a/README_files/figure-markdown_github/ww2-1.png and /dev/null differ diff --git a/cran-comments.md b/cran-comments.md deleted file mode 100644 index c8e7381..0000000 --- a/cran-comments.md +++ /dev/null @@ -1,11 +0,0 @@ -## Why? -* Latest revs to ggplot2 broke functionality -* Depends on ggplot2 >= 2.0.0 now - -## Test environments -* local OS X install, R 3.3.2 & R-devel -* ubuntu 12.04 (on travis-ci), R-devel, R-release, R-oldrel -* win-builder (devel and release) - -## R CMD check results -* glyphs, isotype & pictograms are properly spelled diff --git a/inst/LICENSE b/inst/COPYRIGHTS similarity index 100% rename from inst/LICENSE rename to inst/COPYRIGHTS diff --git a/man/fa5_brand.Rd b/man/fa5_brand.Rd index b2d76d3..de5b6dd 100644 --- a/man/fa5_brand.Rd +++ b/man/fa5_brand.Rd @@ -4,7 +4,9 @@ \name{fa5_brand} \alias{fa5_brand} \title{Font Awesome 5 Brand} -\format{An object of class \code{character} of length 1.} +\format{ +An object of class \code{character} of length 1. +} \usage{ fa5_brand } diff --git a/man/fa5_solid.Rd b/man/fa5_solid.Rd index 0b8c36d..045bdb8 100644 --- a/man/fa5_solid.Rd +++ b/man/fa5_solid.Rd @@ -4,7 +4,9 @@ \name{fa5_solid} \alias{fa5_solid} \title{Font Awesome 5 Solid} -\format{An object of class \code{character} of length 1.} +\format{ +An object of class \code{character} of length 1. +} \usage{ fa5_solid } diff --git a/man/geom_pictogram.Rd b/man/geom_pictogram.Rd index f6db382..e611441 100644 --- a/man/geom_pictogram.Rd +++ b/man/geom_pictogram.Rd @@ -5,11 +5,21 @@ \alias{geom_pictogram} \alias{GeomPictogram} \title{Pictogram Geom} -\format{An object of class \code{GeomPictogram} (inherits from \code{GeomText}, \code{Geom}, \code{ggproto}, \code{gg}) of length 5.} +\format{ +An object of class \code{GeomPictogram} (inherits from \code{GeomText}, \code{Geom}, \code{ggproto}, \code{gg}) of length 5. +} \usage{ -geom_pictogram(mapping = NULL, data = NULL, n_rows = 10, - make_proportional = FALSE, flip = FALSE, ..., na.rm = FALSE, - show.legend = NA, inherit.aes = TRUE) +geom_pictogram( + mapping = NULL, + data = NULL, + n_rows = 10, + make_proportional = FALSE, + flip = FALSE, + ..., + na.rm = FALSE, + show.legend = NA, + inherit.aes = TRUE +) GeomPictogram } diff --git a/man/geom_waffle.Rd b/man/geom_waffle.Rd index ec5ab3a..526f2d9 100644 --- a/man/geom_waffle.Rd +++ b/man/geom_waffle.Rd @@ -7,19 +7,40 @@ \alias{stat_waffle} \alias{StatWaffle} \title{Waffle (Square pie chart) Geom} -\format{An object of class \code{GeomWaffle} (inherits from \code{GeomRtile}, \code{GeomRrect}, \code{Geom}, \code{ggproto}, \code{gg}) of length 5.} +\format{ +An object of class \code{GeomWaffle} (inherits from \code{GeomRtile}, \code{GeomRrect}, \code{Geom}, \code{ggproto}, \code{gg}) of length 5. + +An object of class \code{StatWaffle} (inherits from \code{Stat}, \code{ggproto}, \code{gg}) of length 8. +} \usage{ -geom_waffle(mapping = NULL, data = NULL, n_rows = 10, - make_proportional = FALSE, flip = FALSE, na.rm = NA, - show.legend = NA, radius = grid::unit(0, "npc"), - inherit.aes = TRUE, ...) +geom_waffle( + mapping = NULL, + data = NULL, + n_rows = 10, + make_proportional = FALSE, + flip = FALSE, + na.rm = FALSE, + show.legend = NA, + radius = grid::unit(0, "npc"), + inherit.aes = TRUE, + ... +) GeomWaffle -stat_waffle(mapping = NULL, data = NULL, geom = "waffle", - n_rows = 10, make_proportional = FALSE, flip = FALSE, - radius = grid::unit(0, "npc"), na.rm = NA, show.legend = NA, - inherit.aes = TRUE, ...) +stat_waffle( + mapping = NULL, + data = NULL, + geom = "waffle", + n_rows = 10, + make_proportional = FALSE, + flip = FALSE, + radius = grid::unit(0, "npc"), + na.rm = FALSE, + show.legend = NA, + inherit.aes = TRUE, + ... +) StatWaffle } diff --git a/man/waffle.Rd b/man/waffle.Rd index ab49633..41379eb 100644 --- a/man/waffle.Rd +++ b/man/waffle.Rd @@ -4,11 +4,24 @@ \alias{waffle} \title{Make waffle (square pie) charts} \usage{ -waffle(parts, rows = 10, keep = TRUE, xlab = NULL, title = NULL, - colors = NA, size = 2, flip = FALSE, reverse = FALSE, - equal = TRUE, pad = 0, use_glyph = FALSE, glyph_size = 12, +waffle( + parts, + rows = 10, + keep = TRUE, + xlab = NULL, + title = NULL, + colors = NA, + size = 2, + flip = FALSE, + reverse = FALSE, + equal = TRUE, + pad = 0, + use_glyph = FALSE, + glyph_size = 12, glyph_font = "Font Awesome 5 Free Solid", - glyph_font_family = "FontAwesome5Free-Solid", legend_pos = "right") + glyph_font_family = "FontAwesome5Free-Solid", + legend_pos = "right" +) } \arguments{ \item{parts}{named vector of values or a data frame to use for the chart} @@ -85,7 +98,7 @@ If you specify a string (vs \code{FALSE}) to \code{use_glyph} the function will map the input to a Font Awesome glyph name and use that glyph for the tile instead of a block (making it more like an isotype pictogram than a waffle chart). You'll need to install Font Awesome 5 and use -the \href{`https://github.com/wch/extrafont`}{extrafont package} to +the \code{extrafont} package to be able to use Font Awesome 5 glyphs. Sizing is also up to the user since fonts do not automatically scale with graphic resize. diff --git a/tests/test-all.R b/tests/test-all.R deleted file mode 100644 index 9fa5fe8..0000000 --- a/tests/test-all.R +++ /dev/null @@ -1,2 +0,0 @@ -library(testthat) -test_check("waffle") diff --git a/tests/testthat/test-waffle.R b/tests/testthat/test-waffle.R deleted file mode 100644 index 7783cde..0000000 --- a/tests/testthat/test-waffle.R +++ /dev/null @@ -1,6 +0,0 @@ -context("basic functionality") -test_that("we can do something", { - - expect_that(waffle(c(80, 30, 20, 10), rows=8), is_a("ggplot")) - -}) diff --git a/vignettes/.gitignore b/vignettes/.gitignore deleted file mode 100644 index 097b241..0000000 --- a/vignettes/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.html -*.R diff --git a/vignettes/building-pictograms.Rmd b/vignettes/building-pictograms.Rmd deleted file mode 100644 index 80c4c07..0000000 --- a/vignettes/building-pictograms.Rmd +++ /dev/null @@ -1,148 +0,0 @@ ---- -title: "Building Pictograms" -output: rmarkdown::html_vignette -vignette: > - %\VignetteIndexEntry{Building Pictograms} - %\VignetteEncoding{UTF-8} - %\VignetteEngine{knitr::rmarkdown} -editor_options: - chunk_output_type: console ---- - -```{r setup, include=FALSE} -knitr::opts_chunk$set( - echo = TRUE, message = FALSE, warning = FALSE, - fig.width = 8, fig.height = 6, out.width = "100%" -) -``` - -```{r libs} -library(waffle) -library(extrafont) -library(dplyr) -``` - -[Isotype](https://en.wikipedia.org/wiki/Isotype_(picture_language)) [pictograms](https://en.wikipedia.org/wiki/Pictogram) are _kinda_ like waffle charts but can also convey additional meaning through conveys its meaning through the resemblance to a physical object. - -The current iteration of the {`waffle`} package makes it possible to make isotype pictograms through the use of [Font Awesome 5](https://fontawesome.com/) glyph fonts. Specifically, there is support for the [solid](https://fontawesome.com/icons?d=gallery&s=solid) and [brands](https://fontawesome.com/icons?d=gallery&s=brands) Font Awesome 5 variants. (We'll be abbreviated "Font Awesome 5" as just "FA" from this point forward.) - -To use FA fonts you need to install them onto your system and then make them available to R. To make the first step in the process easier the package includes an `install_fa_fonts()` function which will present the location of the FA TrueType fonts (ttf) that come with the package. Navigate there, install them however you do that on your operating system, them come back to R and run `extrafont::font_import()`. The {`extrafont`} package is a dependency of this package so it should have come along for the ride when you installed {`waffle`}. - -To see if that incantation worked, you can do: - -```{r ef} -extrafont::loadfonts(quiet = TRUE) - -extrafont::fonttable() %>% - as_tibble() %>% - filter(grepl("Awesom", FamilyName)) -``` - -Because it's 2019 and fonts are still daftly difficult across operating systems you may have different `FontName` or `FamilyName` values for each. If so, you won't be able to use the shortcut names and will have to work some things out on your own or file an issue so I can try to account for your setup in the package itself. - -While FA is great and provides a clever way to get glyphs into R charts without too many machinations a major downside is that Unicode values are used to handle the glyph mappings. Typing Unicode values is seriously not fun regardless of context and it's also not cool that you have to remember the glyph short name and also the Unicode value. We've tried to alieviate some of this pain in a few ways. - -First, we've provided the function `fa_list()` which presents an `htmlwidget` with the short name, which type (brand or solid) it is and also a small image of the font itself. Rather than demonstrate that (and put 139 SVG files in the generated Rmd vignette and kill CRAN's servers) we'll demonstrate a sibling function --- `fa_grep()` --- which lets you do the search before presenting the widget. So, say you wanted to make an isotype pictogram that uses a rocket. You can do something like: - -```{r rocket} -fa_grep("rocket") -``` - -which will present a widget with the available choices. Now, you only need to remember 2 things, the "`rocket`" short name and that it's in the `solid` FA font package. - -A more practical example may be that you're trying to show proportions of consumption of three food areas: fruit, sandwiches, and pizza. We can look for available glyphs by paging or guessing some good keywords to grep for: - -```{r food} -fa_grep("bread|pizza|apple|pear|peach|lemon|sandwich") -``` - -We'll use `apple-alt`, `bread-slice` and `pizza-slice`. Now, we just need some data. - -```{r pict-data} -tibble( - food_group = factor( - c("Fruit", "Sandwiches", "Pizza"), - levels=c("Fruit", "Sandwiches", "Pizza") - ), - consumption = c(5, 20, 52) -) -> xdf - -xdf -``` - -Here's what a traditional waffle chart might look like for that: - -```{r waf1} -ggplot(xdf, aes(fill = food_group, values = consumption)) + - geom_waffle() + - coord_equal() + - theme_minimal() + - theme_enhance_waffle() -``` - -Really, you should be making proportional waffle charts since the whole point is to compare parts of a while and we're pretty good (as humans) of doing that in a 10x10 matrix. The `geom_waffle()` function can do that for us for free: - -```{r waf2} -ggplot(xdf, aes(fill = food_group, values = consumption)) + - geom_waffle(n_rows = 10, make_proportional = TRUE) + - coord_equal() + - theme_minimal() + - theme_enhance_waffle() -``` - -But, this is food and it's fun to play with our food (as we all learned as kids) so let's try turning the boring waffle chart into an pictogram. There are two key {`ggplot2`} components that come with the {`waffle`} package that we _need to use every time we make a pictogram`!!: - -- `geom_pictogram()` (duh) -- `scale_label_pictogram()` (which helps us translate factor level names into FA glyphs) - -Here's how we do that (annotated with comments in the code block: - -```{r pg1, fig.width=8, fig.height=6} -ggplot(xdf, aes(label = food_group, values = consumption)) + - geom_pictogram(n_rows = 10, make_proportional = TRUE, color = "black") + - scale_label_pictogram( - name = NULL, - values = c( - Fruit = "apple-alt", - Sandwiches = "bread-slice", - Pizza = "pizza-slice" - ) - ) + - coord_equal() + - theme_minimal() + - theme_enhance_waffle() + - theme(legend.key.height = unit(2.25, "line")) + - theme(legend.text = element_text(size = 10, hjust = 0, vjust = 0.75)) -``` - -The extra `theme()` components may be of use to you to help get your output to be decent. Combining these FA glyphs with regular text is a bit tricky and you may need to fiddle with sizing to get the exact look you're going for. - -That pictogram is fine, but it could use some color. Let's add some in: - -```{r pg2, fig.width=8, fig.height=6} -ggplot(xdf, aes(label = food_group, values = consumption, color = food_group)) + - geom_pictogram(n_rows = 10, make_proportional = TRUE) + - scale_color_manual( - name = NULL, - values = c( - Fruit = "#a40000", - Sandwiches = "#c68958", - Pizza = "#ae6056" - ) - ) + - scale_label_pictogram( - name = NULL, - values = c( - Fruit = "apple-alt", - Sandwiches = "bread-slice", - Pizza = "pizza-slice" - ) - ) + - coord_equal() + - theme_minimal() + - theme_enhance_waffle() + - theme(legend.key.height = unit(2.25, "line")) + - theme(legend.text = element_text(size = 10, hjust = 0, vjust = 0.75)) -``` - -All the same powerful features of `geom_waffle()` are available to `geom_pictogram()` (including faceting/etc) but you should use them carefully, sparingly, and wisely. Pictures can help tell a data story but pictures can also distract from the data story. diff --git a/vignettes/building-waffle-charts.Rmd b/vignettes/building-waffle-charts.Rmd deleted file mode 100644 index 01f019d..0000000 --- a/vignettes/building-waffle-charts.Rmd +++ /dev/null @@ -1,334 +0,0 @@ ---- -title: "Building Waffle Charts" -output: rmarkdown::html_vignette -vignette: > - %\VignetteIndexEntry{Building Waffle Charts} - %\VignetteEncoding{UTF-8} - %\VignetteEngine{knitr::rmarkdown} -editor_options: - chunk_output_type: console ---- - -```{r setup, include=FALSE} -knitr::opts_chunk$set( - echo = TRUE, message = FALSE, warning = FALSE, - fig.width = 8, fig.height = 6, out.width = "100%" -) -``` - -```{r libs} -library(waffle) -library(ggplot2) -library(dplyr) -``` - -### Our example data - -```{r data} -three_states <- sample(state.name, 3) - -data.frame( - states = factor(rep(three_states, 3), levels = three_states), - vals = c(10, 20, 30, 6, 14, 40, 30, 20, 10), - col = rep(c("blue", "black", "red"), 3), - fct = c(rep("Thing 1", 3), rep("Thing 2", 3), rep("Thing 3", 3)) -) -> xdf - -xdf -``` - -### Single waffle setup - -We'll use this as a base for some of the examples to enable focusing on tweaking the contents of `geom_waffle()`: - -```{r base} -xdf %>% - count(states, wt = vals) %>% - ggplot(aes(fill = states, values = n)) + - expand_limits(x=c(0,0), y=c(0,0)) + - coord_equal() + - labs(fill = NULL, colour = NULL) + - theme_minimal() + - theme_enhance_waffle() -> waf -``` - -### Plain waffles - -```{r plain} -waf + - geom_waffle( - n_rows = 20, size = 0.33, colour = "white", flip = TRUE - ) -``` - -### Proportional waffles - -This likely should be the default. Waffles work best when they are square (makes it easier to compare parts to whole which is the purpose of the chart). You could do this normalization prior to passing data into `geom_waffle()` or let it do it for you with the `make_proportional` parameter. - -```{r prop} -waf + - geom_waffle( - n_rows = 10, size = 0.33, colour = "white", flip = TRUE, - make_proportional = TRUE - ) -``` - -### Thicker lines - -Need to be careful as this can shift perception to the background grid vs the data encoding you're trying to present. - -```{r bigger-lines} -waf + - geom_waffle( - n_rows = 10, size = 3, colour = "white", - make_proportional = TRUE - ) -``` - -### Changing the line color - -You can use this to match any background you're going to use or to just provide a different aesthetic feel. Note that the same problem can occur here as in the "bigger lines" case and attention can be inadvertedly shifted to the grid lines vs the colored proportions. - -```{r color-change-1} -waf + - geom_waffle( - n_rows = 10, size = 0.33, colour = "black", - make_proportional = TRUE - ) -``` - -We can also "fill in the lines" but that pretty much makes it not a waffle chart: - -```{r color-change-2} -waf + - geom_waffle( - aes(colour = states), - n_rows = 10, size = 0.33, make_proportional = TRUE - ) -``` - -You can also map the `colour` aesthetic to a column which can help make a "highlight" effect, but that's going to also contribute to perception skew: - -```{r color-change-3} -waf + - geom_waffle( - aes(colour = states), - n_rows = 10, size = 0.45, make_proportional = TRUE - ) + - scale_colour_manual( - values = c(alpha("black", 1/3), "black", alpha("black", 1/3)) - ) -``` - -You can possibly correct for perception skew by shrinking the width and the height of each cell to make some room for the strokes: - -```{r color-change-4} -waf + - geom_waffle( - aes(colour = states), - n_rows = 10, size = 0.3, make_proportional = TRUE, - height = 0.9, width = 0.9 - ) + - scale_colour_manual( - values = c("white", "black", "white") - ) -``` - -You might be better off just changing the alpha value's though: - -```{r color-change-5} -waf + - geom_waffle( - n_rows = 10, size = 0.3, make_proportional = TRUE, - height = 0.9, width = 0.9 - ) + - scale_fill_manual( - values = c(alpha("#f8766d", 1/3), "#00ba38", alpha("#619cff", 1/3)) - ) -``` - -### Hip to not be square? - -To mix things up you can also round out the corners by specifying a `grid::unit()` value to the `radius` parameter. This isn't generally recommended as the goal is to enable quick mental perception for parts to whole and the rounded corners can delay and/or skew said interpretation. - -Here that is with and without proportional waffles: - -```{r round-one} -waf + - geom_waffle( - n_rows = 10, size = 0.5, colour = "white", - make_proportional = TRUE, - radius = unit(4, "pt") - ) -``` - -```{r round-two} -waf + - geom_waffle( - n_rows = 10, size = 0.5, colour = "white", - radius = unit(4, "pt") - ) -``` - -Also, think twice when changing the stroke color as it continues to contribute to perception skew. Consider shrinking the cells to add more space between them if you choose to do this: - -```{r round-three} -waf + - geom_waffle( - n_rows = 10, size = 1, colour = "black", - make_proportional = TRUE, - radius = unit(4, "pt"), - height = 0.8, width = 0.8 - ) -``` - -You can also use this for the same highlight effect as above: - -```{r round-four} -waf + - geom_waffle( - aes(colour = states), - n_rows = 10, size = 0.4, make_proportional = TRUE, - radius = unit(4, "pt"), - height = 0.9, width = 0.9 - ) + - scale_colour_manual( - values = c("black", "white", "white") - ) -``` - -```{r round-five} -waf + - geom_waffle( - n_rows = 10, size = 1, color = "white", make_proportional = TRUE, - radius = unit(4, "pt"), - height = 1, width = 1 - ) + - scale_fill_manual( - values = c("#f8766d", alpha("#00ba38", 1/3), alpha("#619cff", 1/3)) - ) -``` - -### Basic waffle bar chart - -You can make a bar-like chart with the waffles by using facet wrapping and hacking on strip spacing: - -```{r waffle-bar} -waf + - geom_waffle( - n_rows = 5, color = "white", show.legend = FALSE, flip = TRUE - ) + - facet_wrap(~states) + - theme_minimal() + - theme(panel.spacing.x = unit(0, "npc")) + - theme(strip.text.x = element_text(hjust = 0.5)) -``` - -### Waffle buffet setup - -Since you now know we can use faceting, we can go all sorts of crazy. We'll do another setup for this waffle buffet: - -```{r waffle-buffet-setup} -xdf %>% - ggplot(aes(fill = states, values = vals)) + - expand_limits(x=c(0,0), y=c(0,0)) + - coord_equal() + - labs(fill = NULL, colour = NULL) + - theme_minimal() + - theme_enhance_waffle() -> buf -``` - -### Faceting using another variable - -If you have parts-of-a-whole groups you want to compare across observations you can facet on another variable - -```{r waffle-buffet} -buf + - geom_waffle( - color = "white", size = 0.33 - ) + - facet_wrap(~fct) + - theme(strip.text.x = element_text(hjust = 0.5)) -``` - -Again, waffles generally work better when they are square and each one sums to 100 and this is even more true in a buffet grid of waffles: - -```{r waffle-buffet-prop} -buf + - geom_waffle( - color = "white", size = 0.33, - make_proportional = TRUE, n_rows = 10 - ) + - facet_wrap(~fct) + - theme(legend.position = "bottom") + - theme(strip.text.x = element_text(hjust = 0.5)) -``` - -They can be rounded tiles as well: - -```{r waffle-buffet-round} -buf + - geom_waffle( - color = "white", size = 0.33, - make_proportional = TRUE, n_rows = 10, - radius = unit(2, "pt") - ) + - facet_wrap(~fct) + - theme(legend.position = "bottom") + - theme(strip.text.x = element_text(hjust = 0.5)) -``` - -And, you can do the highlight hack: - -```{r waffle-buffet-high} -buf + - geom_waffle( - color = "white", size = 0.33, - make_proportional = TRUE, n_rows = 10, - radius = unit(2, "pt") - ) + - facet_wrap(~fct) + - scale_fill_manual( - values = c("#f8766d", alpha("#00ba38", 1/3), alpha("#619cff", 1/3)) - ) + - theme(legend.position = "bottom") + - theme(strip.text.x = element_text(hjust = 0.5)) -``` - -If you aren't going to use proportional waffle buffet charts consider altering the aesthetics to make them waffle bars instead: - -```{r waffle-buffet-bars} -buf + - geom_waffle( - color = "white", size = 0.33, n_rows = 4, flip = TRUE - ) + - facet_wrap(~fct) + - theme(legend.position = "bottom") + - theme(strip.text.x = element_text(hjust = 0.5)) -``` - -### Over the top - -```{r over-the-top} -storms %>% - filter(year >= 2010) %>% - count(year, status) -> storms_df - -ggplot(storms_df, aes(fill = status, values = n)) + - geom_waffle(color = "white", size = .25, n_rows = 10, flip = TRUE) + - facet_wrap(~year, nrow = 1, strip.position = "bottom") + - scale_x_discrete() + - scale_y_continuous(labels = function(x) x * 10, # make this multiplyer the same as n_rows - expand = c(0,0)) + - ggthemes::scale_fill_tableau(name=NULL) + - coord_equal() + - labs( - title = "Faceted Waffle Bar Chart", - subtitle = "{dplyr} storms data", - x = "Year", - y = "Count" - ) + - theme_minimal(base_family = "Roboto Condensed") + - theme(panel.grid = element_blank(), axis.ticks.y = element_line()) + - guides(fill = guide_legend(reverse = TRUE)) -``` \ No newline at end of file