-
Notifications
You must be signed in to change notification settings - Fork 522
Updates AMS to V6.1 #444
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updates AMS to V6.1 #444
Changes from 7 commits
beec027
5f12f3a
7f65495
e9cd1a1
5e580d8
9df3228
c36f847
664ce6e
29e34d2
3cc1fd7
3352213
944c15a
0bd2da5
93c3121
4521383
3aa21ec
f013c2a
5409113
ef268a7
3b10ab5
4cd9f70
5ff8ffd
801be50
3021031
d16e04a
f4550da
e75fe96
4ffd088
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,9 +88,9 @@ amq_article <- function( | |
| #' <https://www.ametsoc.org/ams/index.cfm/publications/authors/journal-and-bams-authors/author-resources/latex-author-info/>. | ||
| #' @export | ||
| #' @rdname article | ||
| ams_article <- function(..., keep_tex = TRUE, md_extensions = c("-autolink_bare_uris")) { | ||
| ams_article <- function(..., keep_tex = TRUE, md_extensions = c("-autolink_bare_uris", "-auto_identifiers")) { | ||
| pdf_document_format( | ||
|
||
| "ams", keep_tex = keep_tex, md_extensions = md_extensions, ... | ||
| "ams", keep_tex = keep_tex, md_extensions = md_extensions, citation_package = 'natbib', ... | ||
|
||
| ) | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,149 @@ | ||
| \documentclass[$layout$]{ametsoc} | ||
cderv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| \usepackage{color} | ||
| \usepackage{hyperref} | ||
| \journal{$journal$} | ||
cderv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| % Please choose a journal abbreviation to use above from the following list: | ||
| %% Version 6.1, 1 September 2021 | ||
| % | ||
| % jamc (Journal of Applied Meteorology and Climatology) | ||
| % jtech (Journal of Atmospheric and Oceanic Technology) | ||
| % jhm (Journal of Hydrometeorology) | ||
| % jpo (Journal of Physical Oceanography) | ||
| % jas (Journal of Atmospheric Sciences) | ||
| % jcli (Journal of Climate) | ||
| % mwr (Monthly Weather Review) | ||
| % wcas (Weather, Climate, and Society) | ||
| % waf (Weather and Forecasting) | ||
| % bams (Bulletin of the American Meteorological Society) | ||
| % ei (Earth Interactions) | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % TemplateV6.1.tex -- LaTeX-based blank template for submissions to the | ||
| % American Meteorological Society | ||
| % | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % PREAMBLE | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
|
|
||
| %% Start with one of the following: | ||
| % 1.5-SPACED VERSION FOR SUBMISSION TO THE AMS | ||
| \documentclass[$if(twocol)$twocol$endif$]{ametsocV6.1} | ||
|
|
||
| % TWO-COLUMN JOURNAL PAGE LAYOUT---FOR AUTHOR USE ONLY | ||
| % \documentclass[twocol]{ametsocV6.1} | ||
|
|
||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| %Citations should be of the form ``author year'' not ``author, year'' | ||
| \bibpunct{(}{)}{;}{a}{}{,} | ||
|
|
||
| $for(header-includes)$ | ||
| $header-includes$ | ||
| $endfor$ | ||
|
|
||
| %%% To be entered by author: | ||
|
|
||
| %% May use \\ to break lines in title: | ||
|
|
||
| \title{$title$} | ||
|
|
||
| $if(author1)$ | ||
| \authors{$author1$ | ||
| $if(correspondingauthor)$ | ||
| \correspondingauthor{$author1$,$correspondingauthor$} | ||
| $endif$ | ||
| $if(author2)$ | ||
| and $author2$ | ||
| $if(currentaddress)$ | ||
| \thanks{$currentaddress$} | ||
| $endif$ | ||
| $endif$ | ||
| } | ||
| $endif$ | ||
| $if(affiliation)$ | ||
| \affiliation{$affiliation$} | ||
| $endif$ | ||
| $if(extraauthor)$ | ||
| \extraauthor{Extra Author} | ||
| $endif$ | ||
| $if(exaffiliation)$ | ||
| \extraaffil{$exaffiliation$} | ||
| $endif$ | ||
| %% Enter authors' names and affiliations as you see in the examples below. | ||
| % | ||
| %% Use \correspondingauthor{} and \thanks{} (\thanks command to be used for affiliations footnotes, | ||
| %% such as current affiliation, additional affiliation, deceased, co-first authors, etc.) | ||
| %% immediately following the appropriate author. | ||
| % | ||
| %% Note that the \correspondingauthor{} command is NECESSARY. | ||
| %% The \thanks{} commands are OPTIONAL. | ||
| % | ||
| %% Enter affiliations within the \affiliation{} field. Use \aff{#} to indicate the affiliation letter at both the | ||
| %% affiliation and at each author's name. Use \\ to insert line breaks to place each affiliation on its own line. | ||
|
|
||
| $if(email)$ | ||
| $email$ | ||
| $endif$ | ||
| %\authors{Author One,\aff{a}\correspondingauthor{Author One, email@email.com} | ||
| %Author Two,\aff{a} | ||
| %Author Three,\aff{b} | ||
| %Author Four,\aff{a} | ||
| %Author Five\thanks{Author Five's current affiliation: NCAR, Boulder, Colorado},\aff{c} | ||
| %Author Six,\aff{c} | ||
| %Author Seven,\aff{d} | ||
| % and Author Eight\aff{a,d} | ||
| %} | ||
| % | ||
| %\affiliation{\aff{a}{First Affiliation}\\ | ||
| %\aff{b}{Second Affiliation}\\ | ||
| %\aff{c}{Third Affiliation}\\ | ||
| %\aff{d}{Fourth Affiliation} | ||
| %} | ||
|
|
||
| $for(exauthors)$ | ||
| \extraauthor{$exauthors.name$ | ||
| $if(exauthors.correspondingauthor)$ | ||
| \correspondingauthor{$exauthors.name$,$exauthors.correspondingauthor$} | ||
| $endif$ | ||
| $if(exauthors.currentaddress)$ | ||
| \thanks{$exauthors.currentaddress$} | ||
| $endif$} | ||
| $if(exauthors.exaffiliation)$ | ||
| \extraaffil{$exauthors.exaffiliation$} | ||
| $endif$ | ||
| $if(exauthors.email)$ | ||
| $exauthors.email$ | ||
| % Credit to https://stackoverflow.com/a/67609365 for different last-author case. | ||
| \authors{ | ||
| $if(authors/allbutlast)$ | ||
|
||
| $for(authors/allbutlast)$ | ||
|
||
| $it.name$$if(it.current)$\thanks{$it.current$}$endif$,\aff{$it.aff$}$if(it.email)$\correspondingauthor{$it.name$, $it.email$}$endif$ | ||
cderv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $endfor$ | ||
| and~ | ||
| $endif$ | ||
| $for(authors/last)$ | ||
cderv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $it.name$$if(it.current)$\thanks{$it.current$}$endif$\aff{$it.aff$}$if(it.email)$\correspondingauthor{$it.name$, $it.email$}$endif$ | ||
| $endfor$ | ||
| } | ||
|
|
||
| $if(highlighting-macros)$ | ||
| % For Pandoc highlighting needs | ||
| $highlighting-macros$ | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs to be kept - it is part of the required part for Pandoc processing. Some of the thing in this template comes from Pandoc template and must be present. As we have now a Pandoc requirement version for this PR, we could probably leverage partials: https://pandoc.org/MANUAL.html#partials |
||
| % Credit to https://stackoverflow.com/a/67609365 for different last-affiliation case. | ||
| \affiliation{ | ||
| $if(affiliations/allbutlast)$ | ||
| $for(affiliations/allbutlast)$ | ||
| \aff{$it.aff$}{$it.name$}\\ | ||
| $endfor$ | ||
| $endif$ | ||
| $for(affiliations/last)$ | ||
cderv marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| \aff{$it.aff$}{$it.name$} | ||
| $endfor$ | ||
| } | ||
|
|
||
| $if(csl-refs)$ | ||
| % Pandoc citation processing | ||
| \newlength{\csllabelwidth} | ||
| \setlength{\csllabelwidth}{3em} | ||
| \newlength{\cslhangindent} | ||
| \setlength{\cslhangindent}{1.5em} | ||
| % for Pandoc 2.8 to 2.10.1 | ||
| \newenvironment{cslreferences}% | ||
| {$if(csl-hanging-indent)$\setlength{\parindent}{0pt}% | ||
| \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces$endif$}% | ||
| {\par} | ||
| % For Pandoc 2.11+ | ||
| \newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing | ||
| {% don't indent paragraphs | ||
| \setlength{\parindent}{0pt} | ||
| % turn on hanging indent if param 1 is 1 | ||
| \ifodd #1 \everypar{\setlength{\hangindent}{\cslhangindent}}\ignorespaces\fi | ||
| % set entry spacing | ||
| \ifnum #2 > 0 | ||
| \setlength{\parskip}{#2\baselineskip} | ||
| \fi | ||
| }% | ||
| {} | ||
| \usepackage{calc} % for calculating minipage widths | ||
| \newcommand{\CSLBlock}[1]{#1\hfill\break} | ||
| \newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}} | ||
| \newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break} | ||
| \newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} | ||
| $endif$ | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs to stay for Pandoc citation processing. it is part of the Pandoc template. |
||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % ABSTRACT | ||
| % | ||
| % Enter your abstract here | ||
| % Abstracts should not exceed 250 words in length! | ||
| % | ||
|
|
||
| % pandoc header | ||
| $for(header-includes)$ | ||
| $header-includes$ | ||
| $endfor$ | ||
|
||
| \abstract{$abstract$} | ||
|
|
||
| \begin{document} | ||
|
|
||
| %% Necessary! | ||
| \maketitle | ||
|
|
||
| \bibliographystyle{ametsocV6} | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % SIGNIFICANCE STATEMENT/CAPSULE SUMMARY | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % | ||
| % If you are including an optional significance statement for a journal article or a required capsule summary for BAMS | ||
| % (see www.ametsoc.org/ams/index.cfm/publications/authors/journal-and-bams-authors/formatting-and-manuscript-components for details), | ||
| % please apply the necessary command as shown below: | ||
| % | ||
| % Significance Statement (all journals except BAMS) | ||
| % | ||
| %\statement | ||
| % Enter significance statement here, no more than 120 words. See \url{www.ametsoc.org/index.cfm/ams/publications/author-information/significance-statements/} for details. | ||
| % | ||
|
|
||
| $if(statement)$ | ||
| %$if(twocol)$\twocolsig$else$\statement$endif$ | ||
| $statement$ | ||
| $endif$ % FIXME, AMS template says to use twocolsig instead of sig for twocol, but there is no sig, is two col twocolstatement or twocolsig? | ||
cderv marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| %% Capsule (BAMS only) | ||
| %% | ||
| %\capsule | ||
| % Enter BAMS capsule here, no more than 30 words. See \url{www.ametsoc.org/index.cfm/ams/publications/author-information/formatting-and-manuscript-components/#capsule} for details. | ||
| % | ||
|
|
||
| $if(capsule)$ | ||
| %$if(twocol)$\twocolcapsule$else$\capsule$endif$ | ||
| $capsule$ | ||
| $endif$ | ||
|
|
||
| %% * * If using twocol mode, you will need to use the commands "twocolsig" and "twocolcapsule" in place of "sig" and "capsule" | ||
| %% to ensure that the text box correctly spans across both columns. | ||
| % | ||
|
|
||
| $for(include-before)$ | ||
| $include-before$ | ||
|
|
||
| $endfor$ | ||
|
|
||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % MAIN BODY OF PAPER | ||
| %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
| % | ||
|
|
||
| $body$ | ||
|
|
||
| $for(include-after)$ | ||
| $include-after$ | ||
|
|
||
| $endfor$ | ||
|
|
||
| \end{document} | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to understand: why do we need to remove this extension here ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be honest I'm not sure what my reasoning was. It might be the sort of thing that is obvious if we put it back in and see what results.