diff --git a/DESCRIPTION b/DESCRIPTION index 0f1048f..7cc12d5 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,9 +17,7 @@ Authors@R: c( ) Description: Applies 'AAGI' external brand guidelines to graphics. 'AAGI' colours and font guidelines are applied as useful and reasonable to - both base graphics as well as 'ggplot2' figures. Support for creating - MS Word and PowerPoint files using Quarto and RMarkdown templates is - also provided. + both base graphics as well as 'ggplot2' figures and 'flextable' objects. License: GPL (>= 3) URL: https://github.com/AAGI-Org-AU-Public/theme.aagi, https://aagi-org-au-public.github.io/theme.aagi/ BugReports: https://github.com/AAGI-Org-AU-Public/theme.aagi/issues diff --git a/codemeta.json b/codemeta.json index aaa69b9..a2c9854 100644 --- a/codemeta.json +++ b/codemeta.json @@ -2,7 +2,7 @@ "@context": "https://doi.org/10.5063/schema/codemeta-2.0", "@type": "SoftwareSourceCode", "identifier": "theme.aagi", - "description": "Applies 'AAGI' external brand guidelines to graphics. 'AAGI' colours and font guidelines are applied as useful and reasonable to both base graphics as well as 'ggplot2' figures. Support for creating MS Word and PowerPoint files using Quarto and RMarkdown templates is also provided.", + "description": "Applies 'AAGI' external brand guidelines to graphics. 'AAGI' colours and font guidelines are applied as useful and reasonable to both base graphics as well as 'ggplot2' figures and 'flextable' objects.", "name": "theme.aagi: Apply AAGI Brand Guidelines to Graphic Output and Create AAGI\n Themed Documents", "relatedLink": "https://aagi-org-au-public.github.io/theme.aagi/", "codeRepository": "https://github.com/AAGI-Org-AU-Public/theme.aagi", @@ -373,7 +373,7 @@ }, "applicationCategory": "Tools", "isPartOf": "https://grdc.com.au/research/partnerships-and-initiatives/strategic-partnerships/aagi", - "fileSize": "4867.215KB", + "fileSize": "4710.709KB", "releaseNotes": "https://github.com/AAGI-Org-AU-Public/theme.aagi/blob/master/NEWS.md", "readme": "https://github.com/AAGI-Org-AU-Public/theme.aagi/blob/main/README.md", "developmentStatus": "https://www.repostatus.org/#active" diff --git a/inst/extdata/_extensions/AAGI_Service_and_Support_Report_Skeleton.qmd b/inst/extdata/_extensions/AAGI_Service_and_Support_Report_Skeleton.qmd deleted file mode 100644 index cf402b2..0000000 --- a/inst/extdata/_extensions/AAGI_Service_and_Support_Report_Skeleton.qmd +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: "XXXXXX-XXX Report" -format: - docx: - reference-doc: AAGI_Word_Style_Template.docx - toc: true - colorlinks: true - fig-width: 7 - fig-height: 7 -execute: - echo: false -knitr: - opts_chunk: - fig.path: figures/ - uni: CU -bibliography: references.bib -date: "2024-07-05" ---- - -```{r} -#| include: false -if (params$uni == "CU") { - Project_Lead = "Curtin University -- Prof Mark Gibberd, Dr Julia Easton, Prof Adam Sparks" -} else if (params$uni == "UA") { - Project_Lead = "University of Adelaide -- Dr Julian Taylor, Dr Olena Kravchuck" -} else { - Project_Lead = "University of Queensland -- Prof Scott Chapman, Emeritus Prof Kaye Basford" -} -``` - ---- -author: - - "Author: Dr Bunsen Honeydew" - - "Project Leads: `r Project_Lead`" ---- - -```{r} -#| include: false -#| set ggplot2 theme -#' -library(ggplot2) -library(theme.aagi) - -set_theme(theme_aagi) -``` - -\newpage - - -# References - -::: {#refs} -::: diff --git a/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/AAGI_Letterhead_Template.docx b/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/AAGI_Letterhead_Template.docx deleted file mode 100644 index c7fb9d8..0000000 Binary files a/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/AAGI_Letterhead_Template.docx and /dev/null differ diff --git a/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/pagebreak.lua b/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/pagebreak.lua deleted file mode 100644 index b931051..0000000 --- a/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/pagebreak.lua +++ /dev/null @@ -1,109 +0,0 @@ ---[[ -pagebreak – convert raw LaTeX page breaks to other formats - -Copyright © 2017-2021 Benct Philip Jonsson, Albert Krewinkel - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -]] -local stringify_orig = (require 'pandoc.utils').stringify - -local function stringify(x) - return type(x) == 'string' and x or stringify_orig(x) -end - ---- configs – these are populated in the Meta filter. -local pagebreak = { - asciidoc = '<<<\n\n', - context = '\\page', - epub = '

', - html = '
', - latex = '\\newpage{}', - ms = '.bp', - ooxml = '', - odt = '' -} - -local function pagebreaks_from_config (meta) - local html_class = - (meta.newpage_html_class and stringify(meta.newpage_html_class)) - or os.getenv 'PANDOC_NEWPAGE_HTML_CLASS' - if html_class and html_class ~= '' then - pagebreak.html = string.format('
', html_class) - end - - local odt_style = - (meta.newpage_odt_style and stringify(meta.newpage_odt_style)) - or os.getenv 'PANDOC_NEWPAGE_ODT_STYLE' - if odt_style and odt_style ~= '' then - pagebreak.odt = string.format('', odt_style) - end -end - ---- Return a block element causing a page break in the given format. -local function newpage(format) - if format:match 'asciidoc' then - return pandoc.RawBlock('asciidoc', pagebreak.asciidoc) - elseif format == 'context' then - return pandoc.RawBlock('context', pagebreak.context) - elseif format == 'docx' then - return pandoc.RawBlock('openxml', pagebreak.ooxml) - elseif format:match 'epub' then - return pandoc.RawBlock('html', pagebreak.epub) - elseif format:match 'html.*' then - return pandoc.RawBlock('html', pagebreak.html) - elseif format:match 'latex' then - return pandoc.RawBlock('tex', pagebreak.latex) - elseif format:match 'ms' then - return pandoc.RawBlock('ms', pagebreak.ms) - elseif format:match 'odt' then - return pandoc.RawBlock('opendocument', pagebreak.odt) - else - -- fall back to insert a form feed character - return pandoc.Para{pandoc.Str '\f'} - end -end - -local function is_newpage_command(command) - return command:match '^\\newpage%{?%}?$' - or command:match '^\\pagebreak%{?%}?$' -end - --- Filter function called on each RawBlock element. -function RawBlock (el) - -- Don't do anything if the output is TeX - if FORMAT:match 'tex$' then - return nil - end - -- check that the block is TeX or LaTeX and contains only - -- \newpage or \pagebreak. - if el.format:match 'tex' and is_newpage_command(el.text) then - -- use format-specific pagebreak marker. FORMAT is set by pandoc to - -- the targeted output format. - return newpage(FORMAT) - end - -- otherwise, leave the block unchanged - return nil -end - --- Turning paragraphs which contain nothing but a form feed --- characters into line breaks. -function Para (el) - if #el.content == 1 and el.content[1].text == '\f' then - return newpage(FORMAT) - end -end - -return { - {Meta = pagebreaks_from_config}, - {RawBlock = RawBlock, Para = Para} -} diff --git a/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/skeleton.Rmd deleted file mode 100644 index ef0e6a0..0000000 --- a/inst/rmarkdown/templates/theme_aagi_letterhead/skeleton/skeleton.Rmd +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: "AAGI Letterhead Word Template for RMarkdown" -subtitle: "Live the RStudio Lifestyle You've Always Dreamed of in for writing your AAGI letters" -output: - word_document: - fig_caption: yes - number_sections: FALSE - reference_docx: "AAGI_Letterhead_Template.docx" - pandoc_args: - - '--lua-filter=pagebreak.lua' ---- - -```{r setup, include=FALSE} -knitr::opts_chunk$set( - echo = FALSE, - include = TRUE, - dpi = 300, - dev = "ragg_png", - tab.cap.style = "Caption" -) - -knitr::opts_chunk$set(echo = TRUE) -library(ggplot2) -library(theme.aagi) -``` - -## R Markdown - -This is an R Markdown document. Markdown is a simple formatting syntax for authoring HTML, PDF, and MS Word documents. For more details on using R Markdown see . - -When you click the **Knit** button a document will be generated that includes both content as well as the output of any embedded R code chunks within the document. You can embed an R code chunk like this: - -```{r cars} -summary(cars) -``` - -## Including Plots - -You can also embed plots, for example: - -```{r pressure, echo=FALSE} -plot(pressure) -``` - -Note that the `echo = FALSE` parameter was added to the code chunk to prevent printing of the R code that generated the plot. - -## Plot facet colours - -By default the plot facet colours will match the blue theme but you can change this if you like using `theme_aagi(colourway = "your color")` in your {ggplot2} plots. - -## Including Page Breaks - -You can include page breaks using `\newpage` within your document at any point you wish to have a new page follow. diff --git a/inst/rmarkdown/templates/theme_aagi_letterhead/template.yaml b/inst/rmarkdown/templates/theme_aagi_letterhead/template.yaml deleted file mode 100644 index f143f04..0000000 --- a/inst/rmarkdown/templates/theme_aagi_letterhead/template.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: AAGI Word Document Template -description: AAGI style Word document -create_dir: false diff --git a/man/theme.aagi-package.Rd b/man/theme.aagi-package.Rd index 32e3ea1..90864ac 100644 --- a/man/theme.aagi-package.Rd +++ b/man/theme.aagi-package.Rd @@ -8,12 +8,13 @@ \description{ \if{html}{\figure{logo.png}{options: style='float: right' alt='logo' width='120'}} -Applies 'AAGI' external brand guidelines to graphics. 'AAGI' colours and font guidelines are applied as useful and reasonable to both base graphics as well as 'ggplot2' figures. Support for creating MS Word and PowerPoint files using Quarto and RMarkdown templates is also provided. +Applies 'AAGI' external brand guidelines to graphics. 'AAGI' colours and font guidelines are applied as useful and reasonable to both base graphics as well as 'ggplot2' figures and 'flextable' objects. } \seealso{ Useful links: \itemize{ \item \url{https://github.com/AAGI-Org-AU-Public/theme.aagi} + \item \url{https://aagi-org-au-public.github.io/theme.aagi/} \item Report bugs at \url{https://github.com/AAGI-Org-AU-Public/theme.aagi/issues} }