From 63cabff9faf247f04610a0aa654b51e259068ed7 Mon Sep 17 00:00:00 2001 From: RLumSK Date: Thu, 4 Apr 2024 23:25:16 +0200 Subject: [PATCH 1/4] Update to Copernicus template 7.8 --- NEWS.md | 2 +- R/copernicus_article.R | 2 +- ....txt => README_copernicus_package_7_8.txt} | 6 ++--- .../copernicus/resources/template.tex | 1 - .../copernicus/skeleton/copernicus.cfg | 27 ++++++++++++++----- 5 files changed, 25 insertions(+), 13 deletions(-) rename inst/rmarkdown/templates/copernicus/resources/{README_copernicus_package_7_7.txt => README_copernicus_package_7_8.txt} (84%) diff --git a/NEWS.md b/NEWS.md index 93deb73a..9a444457 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ - `oup_article()` now supports also `acknowledgments` in addition to `acknowledgements` as the original OUP LaTeX template (thanks, @dmkaplan2000, #563). -- Update resources for `copernicus_article()` to version 7.7 from 3 January 2024. +- Update resources for `copernicus_article()` to version 7.8 from 18 March 2024 (RLumSK). - Update `tf_article()` template to latest bundle update from `InteractCADLaTeX` v1.04 - May 2023. - `thanks: true` will now show the contact information will all authors. Use diff --git a/R/copernicus_article.R b/R/copernicus_article.R index 854c5cdc..01581160 100644 --- a/R/copernicus_article.R +++ b/R/copernicus_article.R @@ -13,7 +13,7 @@ #' #' An number of required and optional manuscript sections, e.g. `acknowledgements`, `competinginterests`, or `authorcontribution`, must be declared using the respective properties of the R Markdown header - see skeleton file. #' -#' **Version:** Based on `copernicus_package.zip` in the version 7.7, 03 January 2024, using `copernicus.cls` in version 10.1.11, 03 January October 2024. +#' **Version:** Based on `copernicus_package.zip` in the version 7.8, 18 March 2024, using `copernicus.cls` in version 10.1.11, 03 January. #' #' **Copernicus journal abbreviations:** You can use the function `copernicus_journal_abbreviations()` to get the journal abbreviation for all journals supported by the Copernicus article template. #' diff --git a/inst/rmarkdown/templates/copernicus/resources/README_copernicus_package_7_7.txt b/inst/rmarkdown/templates/copernicus/resources/README_copernicus_package_7_8.txt similarity index 84% rename from inst/rmarkdown/templates/copernicus/resources/README_copernicus_package_7_7.txt rename to inst/rmarkdown/templates/copernicus/resources/README_copernicus_package_7_8.txt index 83521f42..48ce6c9a 100644 --- a/inst/rmarkdown/templates/copernicus/resources/README_copernicus_package_7_7.txt +++ b/inst/rmarkdown/templates/copernicus/resources/README_copernicus_package_7_8.txt @@ -1,7 +1,7 @@ -File: README_copernicus_package_7_7.txt +File: README_copernicus_package_7_8.txt ------------------------------------------------------------------------- This is a README file for the Copernicus Publications LaTeX Macro Package -copernicus_package.zip in the version 7.7, 3 January 2024 +copernicus_package.zip in the version 7.8, 18 March 2024 ------------------------------------------------------------------------- It consists of several files, each with its separate copyright. This specific archive is collected for journals published by @@ -16,7 +16,7 @@ URL: https://publications.copernicus.org Content: - copernicus.cls: The LaTeX2e class file designed for Copernicus Publications journals. Current Version 10.1.11, 3 January 2024 -- copernicus.cfg: The configuration file containing journal-specific information used by the class file. Last update 15 March 2023 +- copernicus.cfg: The configuration file containing journal-specific information used by the class file. Last update 18 March 2024 - copernicus.bst: The bibliographic style file for BibTeX. Current Version 1.6, 20 October 2023 - pdfscreencop.sty / pdfscreen.sty - template.tex: A LaTeX template in journal style. \ No newline at end of file diff --git a/inst/rmarkdown/templates/copernicus/resources/template.tex b/inst/rmarkdown/templates/copernicus/resources/template.tex index 04b29b06..963e5840 100644 --- a/inst/rmarkdown/templates/copernicus/resources/template.tex +++ b/inst/rmarkdown/templates/copernicus/resources/template.tex @@ -16,7 +16,6 @@ %% Journal abbreviations (please use the same for preprints and final revised papers) - % Advances in Geosciences (adgeo) % Advances in Radio Science (ars) % Advances in Science and Research (asr) diff --git a/inst/rmarkdown/templates/copernicus/skeleton/copernicus.cfg b/inst/rmarkdown/templates/copernicus/skeleton/copernicus.cfg index 31ac1692..301916a0 100644 --- a/inst/rmarkdown/templates/copernicus/skeleton/copernicus.cfg +++ b/inst/rmarkdown/templates/copernicus/skeleton/copernicus.cfg @@ -10,7 +10,8 @@ \DeclareOption{spd}{\@sansseriffacetrue\@sansserifheadertrue\@abstractcenteredtrue\@firstbartrue\@stage@finalfalse\sptrue} \newif\ifegusphere \DeclareOption{egusphere}{\@twostagejnltrue\eguspheretrue} \DeclareOption{egusphered}{\@stage@finalfalse\eguspheretrue} -\newif\ifsand \DeclareOption{sand}{\@sansseriffacetrue\@sansserifheadertrue\@abstractcenteredtrue\@bartrue\sandtrue} +\newif\ifsand \DeclareOption{sand}{\@sansseriffacetrue\@sansserifheadertrue\@abstractcenteredtrue\@bartrue\@twostagejnltrue\sandtrue} + \DeclareOption{sandd}{\@sansseriffacetrue\@sansserifheadertrue\@abstractcenteredtrue\@bartrue\@stage@finalfalse\sandtrue} \newif\ifpolf \DeclareOption{polf}{\@sansseriffacetrue\@sansserifheadertrue\@bartrue\polftrue} \newif\ifjbji \DeclareOption{jbji}{\@sansseriffacetrue\@sansserifheadertrue\@abstractcenteredtrue\@bartrue\jbjitrue} \newif\ifmr \DeclareOption{mr}{\@sansseriffacetrue\@sansserifheadertrue\@abstractcenteredtrue\@bartrue\@twostagejnltrue\mrtrue} @@ -1030,12 +1031,24 @@ \def\@journalnameshortlower{sand} \def\@journalstartyear{2021} \def\@sentence{Published by Copernicus Publications on behalf of the Federal Office for the Safety of Nuclear Waste Management (BASE).} - \def\@journalurl{www.sand.copernicus.org} - \def\@journallogo{\includegraphics{SAND_Logo.pdf}} - \definecolor{textcol}{rgb}{0.0,0.0,0.0} - \definecolor{bgcol}{rgb}{1,1,1} - \definecolor{barcol}{rgb}{1.0,1.0,1.0} - \definecolor{rulecol}{rgb}{0.0,0.0,0.0} + \if@stage@final + \def\@journalurl{www.sand.copernicus.org} + \def\@journallogo{\includegraphics{SAND_Logo.pdf}} + \definecolor{textcol}{rgb}{0.0,0.0,0.0} + \definecolor{bgcol}{rgb}{1,1,1} + \definecolor{barcol}{rgb}{1.0,1.0,1.0} + \definecolor{rulecol}{rgb}{0.0,0.0,0.0} + \else + \def\@journalurl{} + \def\@journallogo{} + \def\@sentenceDiscussion{} + \if@cop@home + \definecolor{journalname}{rgb}{1.0,1.0,1.0} + \definecolor{buttonbackground}{rgb}{1.0,1.0,1.0} + \definecolor{paneltext}{rgb}{1.0,1.0,1.0} + \definecolor{buttontext}{rgb}{1.0,1.0,1.0} + \fi + \fi \fi \ifegusphere%classical \def\@journalname{EGUsphere} From 84aad6c590e1205ba4fffca3269f38c56b54010b Mon Sep 17 00:00:00 2001 From: RLumSK Date: Thu, 4 Apr 2024 23:27:40 +0200 Subject: [PATCH 2/4] Address issue #565 reported by @colinasmith --- inst/rmarkdown/templates/copernicus/resources/template.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/rmarkdown/templates/copernicus/resources/template.tex b/inst/rmarkdown/templates/copernicus/resources/template.tex index 963e5840..c6853fae 100644 --- a/inst/rmarkdown/templates/copernicus/resources/template.tex +++ b/inst/rmarkdown/templates/copernicus/resources/template.tex @@ -206,7 +206,7 @@ $for(author)$ -\Author[$author.affiliation$]{$author.given_name$}{$author.surname$} +\Author[$author.affiliation$]$if(author.corresponding)$[$author.email$]$endif${$author.given_name$}{$author.surname$} $endfor$ From 855c02bb635e9fb191ba4d98666255ea95b50ad5 Mon Sep 17 00:00:00 2001 From: RLumSK Date: Thu, 4 Apr 2024 23:32:24 +0200 Subject: [PATCH 3/4] Update documentation for Copernicus files --- man/copernicus_article.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/copernicus_article.Rd b/man/copernicus_article.Rd index 6633f1f2..6e5a8eb5 100644 --- a/man/copernicus_article.Rd +++ b/man/copernicus_article.Rd @@ -61,7 +61,7 @@ This was adapted from An number of required and optional manuscript sections, e.g. \code{acknowledgements}, \code{competinginterests}, or \code{authorcontribution}, must be declared using the respective properties of the R Markdown header - see skeleton file. -\strong{Version:} Based on \code{copernicus_package.zip} in the version 7.7, 03 January 2024, using \code{copernicus.cls} in version 10.1.11, 03 January October 2024. +\strong{Version:} Based on \code{copernicus_package.zip} in the version 7.8, 18 March 2024, using \code{copernicus.cls} in version 10.1.11, 03 January. \strong{Copernicus journal abbreviations:} You can use the function \code{copernicus_journal_abbreviations()} to get the journal abbreviation for all journals supported by the Copernicus article template. From d9f148dbc29f62d774962246c186f9ba897149cc Mon Sep 17 00:00:00 2001 From: RLumSK Date: Thu, 4 Apr 2024 23:35:32 +0200 Subject: [PATCH 4/4] Update NEWS with thanks --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 9a444457..eab7cd69 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ - `oup_article()` now supports also `acknowledgments` in addition to `acknowledgements` as the original OUP LaTeX template (thanks, @dmkaplan2000, #563). -- Update resources for `copernicus_article()` to version 7.8 from 18 March 2024 (RLumSK). +- Update resources for `copernicus_article()` to version 7.8 from 18 March 2024 (@RLumSK) and fix issue #565 reported by @colinasmith - Update `tf_article()` template to latest bundle update from `InteractCADLaTeX` v1.04 - May 2023. - `thanks: true` will now show the contact information will all authors. Use