Merge pull request #207 from grattan/auto_colours

Major update of grattantheme to incorporate new branding elements; improve the colouring functionality and simplify powerpoint creation

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: grattantheme
 Type: Package
 Title: Create Graphs in the Grattan Institute Style
-Version: 0.11.1
+Version: 1.0.0
 Authors@R: c(
     person("Matt", "Cowgill", email = "[email protected]", 
                 role = c("aut")),
@@ -12,27 +12,31 @@ Description: Enables the user to create ggplot2 charts that conform
 License: MIT + file LICENSE
 Depends: R (>= 3.5.0)
 Imports:
+    clipr,
+    cowsay, 
+    dplyr, 
     ggrepel (>= 0.8.0),
     ggplot2 (>= 3.3.0),
     glue,
-    purrr (>= 0.3.0),
-    knitr (>= 1.22),
-    rmarkdown (>= 1.12),
     gridExtra,
+    grDevices, 
+    fs, 
+    knitr (>= 1.22), 
+    lifecycle,
+    rmarkdown (>= 1.12),
     patchwork (>= 1.0.0),
+    praise,
+    purrr (>= 0.3.0),
+    officer,
     openxlsx (>= 4.1.0.1),
-    stringr,
     rstudioapi,
-    officer,
     rvg,
-    clipr,
+    stringr,
     utils,
-    gdtools,
-    fs
 VignetteBuilder: knitr
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.1
 Suggests: 
     assertthat,
     testthat (>= 2.1.0),

NAMESPACE

@@ -5,22 +5,164 @@ export(colour_text)
 export(create_fullslide)
 export(export_latex_code)
 export(grattan_arrow)
+export(grattan_black)
+export(grattan_blue)
+export(grattan_blue1)
+export(grattan_blue2)
+export(grattan_blue3)
+export(grattan_blue4)
+export(grattan_blue5)
+export(grattan_blue6)
+export(grattan_blue7)
+export(grattan_blue8)
+export(grattan_box)
 export(grattan_colour_manual)
+export(grattan_darkblue)
+export(grattan_darkblue1)
+export(grattan_darkblue2)
+export(grattan_darkblue3)
+export(grattan_darkblue4)
+export(grattan_darkblue5)
+export(grattan_darkblue6)
+export(grattan_darkblue7)
+export(grattan_darkblue8)
+export(grattan_darkgrey)
+export(grattan_darkgrey1)
+export(grattan_darkgrey2)
+export(grattan_darkgrey3)
+export(grattan_darkgrey4)
+export(grattan_darkgrey5)
+export(grattan_darkgrey6)
+export(grattan_darkgrey7)
+export(grattan_darkgrey8)
+export(grattan_darkorange)
+export(grattan_darkorange1)
+export(grattan_darkorange2)
+export(grattan_darkorange3)
+export(grattan_darkorange4)
+export(grattan_darkorange5)
+export(grattan_darkorange6)
+export(grattan_darkorange7)
+export(grattan_darkorange8)
+export(grattan_darkred)
+export(grattan_darkred1)
+export(grattan_darkred2)
+export(grattan_darkred3)
+export(grattan_darkred4)
+export(grattan_darkred5)
+export(grattan_darkred6)
+export(grattan_darkred7)
+export(grattan_darkred8)
+export(grattan_darkyellow)
+export(grattan_darkyellow1)
+export(grattan_darkyellow2)
+export(grattan_darkyellow3)
+export(grattan_darkyellow4)
+export(grattan_darkyellow5)
+export(grattan_darkyellow6)
+export(grattan_darkyellow7)
+export(grattan_darkyellow8)
 export(grattan_fill_manual)
+export(grattan_grey1)
+export(grattan_grey2)
+export(grattan_grey3)
+export(grattan_grey4)
+export(grattan_grey5)
+export(grattan_grey_alpha)
+export(grattan_grey_title)
+export(grattan_gridlinegrey)
 export(grattan_label)
 export(grattan_label_repel)
+export(grattan_lightblue)
+export(grattan_lightblue1)
+export(grattan_lightblue2)
+export(grattan_lightblue3)
+export(grattan_lightblue4)
+export(grattan_lightblue5)
+export(grattan_lightblue6)
+export(grattan_lightblue7)
+export(grattan_lightblue8)
+export(grattan_lightgrey)
+export(grattan_lightgrey1)
+export(grattan_lightgrey2)
+export(grattan_lightgrey3)
+export(grattan_lightgrey4)
+export(grattan_lightgrey5)
+export(grattan_lightgrey6)
+export(grattan_lightgrey7)
+export(grattan_lightgrey8)
+export(grattan_lightorange)
+export(grattan_lightorange1)
+export(grattan_lightorange2)
+export(grattan_lightorange3)
+export(grattan_lightorange4)
+export(grattan_lightorange5)
+export(grattan_lightorange6)
+export(grattan_lightorange7)
+export(grattan_lightorange8)
+export(grattan_lightred)
+export(grattan_lightred1)
+export(grattan_lightred2)
+export(grattan_lightred3)
+export(grattan_lightred4)
+export(grattan_lightred5)
+export(grattan_lightred6)
+export(grattan_lightred7)
+export(grattan_lightred8)
+export(grattan_lightyellow)
+export(grattan_lightyellow1)
+export(grattan_lightyellow2)
+export(grattan_lightyellow3)
+export(grattan_lightyellow4)
+export(grattan_lightyellow5)
+export(grattan_lightyellow6)
+export(grattan_lightyellow7)
+export(grattan_lightyellow8)
+export(grattan_orange)
+export(grattan_orange1)
+export(grattan_orange2)
+export(grattan_orange3)
+export(grattan_orange4)
+export(grattan_orange5)
+export(grattan_orange6)
+export(grattan_orange7)
+export(grattan_orange8)
+export(grattan_orange_alpha)
 export(grattan_pal)
+export(grattan_palettes)
 export(grattan_point_filled)
+export(grattan_red)
+export(grattan_red1)
+export(grattan_red2)
+export(grattan_red3)
+export(grattan_red4)
+export(grattan_red5)
+export(grattan_red6)
+export(grattan_red7)
+export(grattan_red8)
 export(grattan_save)
 export(grattan_save_all)
 export(grattan_save_pptx)
 export(grattan_x_continuous)
 export(grattan_y_continuous)
-export(make_presentation)
-export(make_slide)
+export(grattan_yellow)
+export(grattan_yellow1)
+export(grattan_yellow2)
+export(grattan_yellow3)
+export(grattan_yellow4)
+export(grattan_yellow5)
+export(grattan_yellow6)
+export(grattan_yellow7)
+export(grattan_yellow8)
+export(make_grattan_pal)
+export(make_grattan_pal_discrete)
+export(register_palette)
 export(save_chartdata)
+export(scale_colour_grattan)
+export(scale_fill_grattan)
 export(scale_x_continuous_grattan)
 export(scale_y_continuous_grattan)
+export(set_aesthetics)
 export(stitch_pdfs)
 export(theme_grattan)
 export(watermark)
@@ -39,7 +181,6 @@ importFrom(ggplot2,update_geom_defaults)
 importFrom(ggrepel,geom_label_repel)
 importFrom(grid,arrow)
 importFrom(grid,convertX)
-importFrom(knitr,opts_chunk)
 importFrom(officer,on_slide)
 importFrom(officer,ph_location_label)
 importFrom(officer,ph_with)
@@ -59,9 +200,6 @@ importFrom(patchwork,wrap_plots)
 importFrom(purrr,map)
 importFrom(purrr,walk)
 importFrom(purrr,walk2)
-importFrom(rmarkdown,pandoc_available)
-importFrom(rmarkdown,pandoc_version)
-importFrom(rmarkdown,render)
 importFrom(rstudioapi,getActiveDocumentContext)
 importFrom(rvg,dml)
 importFrom(tools,file_path_sans_ext)

NEWS.md

@@ -1,3 +1,25 @@
+# grattantheme 1.0.0
+### Colours 
+* deprecate `grattan_fill_manual` and `grattan_fill_manual` in favour of a different implementation of `scale_fill_manual` and `scale_colour_manual`
+* set default geoms on load 
+* change colours from being called as data and rather being called as objects
+* creates a base colour and uses `grDevices::colorRampPalette` to make the lighter/darker permutations 
+* deprecates `grattan_pal` in favour of `make_grattan_pal` and `make_grattan_pal_discrete`
+
+### Chart templates 
+* deprecate `create_pptx_shell` and `create_slide_shell` as `officer` now offers functionality to edit notes directly
+* makes the caption a text box and placeholder for easier editing
+* includes the template for the new theme 
+* updates the older templates for better caption management
+* removes the `helvetica` font choice as arial is now the standard font choice
+
+### Clean up 
+* delete `make_slide` as it was deprecated
+* rename `chart_helper.R` to `chart_helpers.R`
+* delete deprecated chart templates 
+* simplifies `grattan_arrow` test as it was failing
+
+
 # grattantheme 0.11.1
 * fix the slide template so slide number stops appearing in the top right hand corner when copying slides across decks