Update to Copernicus 7.7 (#559)

rstudio · Jan 24, 2024 · 74ef894 · 74ef894
1 parent edf1d26
commit 74ef894
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: rticles
 Title: Article Formats for R Markdown
-Version: 0.26.1
+Version: 0.26.2
 Authors@R: c(
     person("JJ", "Allaire", , "jj@posit.co", role = "aut"),
     person("Yihui", "Xie", , "xie@yihui.name", role = "aut",

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # rticles (development version)
 
+- Update resources for `copernicus_article()` to version 7.7 from 3 January 2024.
+
 - 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/...sources/README_copernicus_package_7_5.txt → ...sources/README_copernicus_package_7_7.txt b/...sources/README_copernicus_package_7_5.txt → ...sources/README_copernicus_package_7_7.txt
@@ -1,21 +1,21 @@
-File: README_copernicus_package_7_5.txt
+File: README_copernicus_package_7_7.txt
 -------------------------------------------------------------------------
 This is a README file for the Copernicus Publications LaTeX Macro Package 
-copernicus_package.zip in the version 7.5, 20 October 2023
+copernicus_package.zip in the version 7.7, 3 January 2024
 -------------------------------------------------------------------------
 It consists of several files, each with its separate copyright.
 This specific archive is collected for journals published by 
 Copernicus Publications (Copernicus GmbH).
 
-Copyright (C) 2023 Copernicus GmbH
+Copyright (C) 2024 Copernicus GmbH
 
 E-mail: publications@copernicus.org
 URL:   	https://publications.copernicus.org
 
 
 
 Content:
-- copernicus.cls: The LaTeX2e class file designed for Copernicus Publications journals. Current Version 10.1.9, 16 October 2023
+- 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.bst: The bibliographic style file for BibTeX. Current Version 1.6, 20 October 2023 
 - pdfscreencop.sty / pdfscreen.sty

diff --git a/inst/rmarkdown/templates/copernicus/resources/template.tex b/inst/rmarkdown/templates/copernicus/resources/template.tex
@@ -16,6 +16,7 @@
 
 %% 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)
@@ -182,6 +183,19 @@
 %$header-includes$
 %$endfor$
 
+%% \usepackage commands included in the copernicus.cls:
+%\usepackage[german, english]{babel}
+%\usepackage{tabularx}
+%\usepackage{cancel}
+%\usepackage{multirow}
+%\usepackage{supertabular}
+%\usepackage{algorithmic}
+%\usepackage{algorithm}
+%\usepackage{amsthm}
+%\usepackage{float}
+%\usepackage{subfig}
+%\usepackage{rotating}
+
 \begin{document}
 
 $for(include-before)$

diff --git a/inst/rmarkdown/templates/copernicus/skeleton/copernicus.cls b/inst/rmarkdown/templates/copernicus/skeleton/copernicus.cls
@@ -16,7 +16,7 @@
 %% -----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{copernicus}
-    [2023/10/11 10.1.10 Copernicus papers]
+    [2023/12/15 10.1.12 Copernicus papers]
 \frenchspacing
 \clubpenalty10000
 \widowpenalty10000
@@ -1024,6 +1024,9 @@
   \@ifstar
     {\@ssect{#3}{#4}{#5}{#6}}%
     {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+\def\seclinesep#1{\gdef\@seclinesep{#1}}%
+\seclinesep{1.2}%
+\let\orig@seclinesep\@seclinesep
 \def\@afterheading{%
   \@nobreaktrue
   \everypar{%
@@ -1036,14 +1039,15 @@
       \if@secline
         \if@dolinesec
           \if@sansserifface
-            \rlap{\smash{\expandafter\ifnum\cur@secdepth>\@ne\raise1.2\baselineskip\else\raise1.5\baselineskip\fi\hbox{\vrule width\hsize height\arrayrulewidth\relax}}}%
+            \rlap{\smash{\expandafter\ifnum\cur@secdepth>\@ne\expandafter\raise\@seclinesep\baselineskip\else\raise1.5\baselineskip\fi\hbox{\vrule width\hsize height\arrayrulewidth\relax}}}%
           \else
             \rlap{\smash{\raise1.5\baselineskip\hbox{\vrule width\hsize height\arrayrulewidth\relax}}}%
           \fi
         \fi%
         \@dolinesecfalse
         \global\let\@secline@omitted\@undefined
       \fi
+      \global\let\@seclinesep\orig@seclinesep
     \else
       \clubpenalty \@clubpenalty
       \everypar{}%
@@ -1735,7 +1739,7 @@
   \def\theequation{\thesection\@arabic\c@equation}%
   \def\thereaction{\thesection R\@arabic\c@reaction}%
   \let\c@org@lst\c@listings%
-  \let\c@org@alg\c@algorithms%
+  \let\c@org@alg\c@algorithm%
   \let\c@org@eq\c@equation%
   \let\org@theeq\theequation%
   \if@stage@final
@@ -1748,9 +1752,11 @@
     \@addtoreset{listings}{section}%
     \setcounter{listings}{0}%
     \def\thelistings{\thesection\@arabic\c@listings}%
-    \@addtoreset{algorithm}{section}%
-    \setcounter{algorithm}{0}%
-    \def\thealgorithm{\thesection\@arabic\c@algorithm}
+    \IfFileExists{algorithm.sty}{% #9699
+      \@addtoreset{algorithm}{section}%
+      \setcounter{algorithm}{0}%
+      \def\thealgorithm{\thesection\@arabic\c@algorithm}%
+    }{}%
   \fi
   \global\let\old@sect\@sect
   \def\@sect##1##2##3##4##5##6[##7]##8{%
@@ -1815,7 +1821,7 @@
   \ifx\old@ssect\@undefined\else\global\let\@ssect\old@ssect\fi
   \def\thefigure{\@arabic\c@figure}%
   \def\thelistings{\@arabic\c@listings}%
-  \def\thealgorithms{\@arabic\c@algorithms}%
+  \IfFileExists{algorithm.sty}{\def\thealgorithm{\@arabic\c@algorithm}}{}% #9699
   \def\thetable{\@arabic\c@table}}
 \IfFileExists{url.sty}
   {\RequirePackage{url}\urlstyle{same}}%