diff options
| author | Norbert Preining <norbert@preining.info> | 2022-04-06 03:01:01 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2022-04-06 03:01:01 +0000 |
| commit | 333540a9182285f9d72d7d39be3fa730c135d664 (patch) | |
| tree | bdffc5aea11535dc73e81752b4a77eed105989ff /macros | |
| parent | a4e931576165d0a4a143915f4725399272e06fee (diff) | |
CTAN sync 202204060301
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/latex/contrib/ametsoc/AMS_Refs.pdf | bin | 172127 -> 0 bytes | |||
| -rw-r--r-- | macros/latex/contrib/ametsoc/README | 62 | ||||
| -rw-r--r-- | macros/latex/contrib/ametsoc/ametsoc.cls | 1189 | ||||
| -rw-r--r-- | macros/latex/contrib/ametsoc/ametsoc2014.bst | 1745 | ||||
| -rw-r--r-- | macros/latex/contrib/ametsoc/amsdocs.pdf | bin | 234479 -> 0 bytes | |||
| -rw-r--r-- | macros/latex/contrib/ametsoc/references.bib | 138 | ||||
| -rw-r--r-- | macros/latex/contrib/ametsoc/template.tex | 223 | ||||
| -rw-r--r-- | macros/latex/contrib/srdp-mathematik/README.md (renamed from macros/latex/contrib/srdp-mathematik/README.txt) | 24 | ||||
| -rw-r--r-- | macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf | bin | 178836 -> 175330 bytes | |||
| -rw-r--r-- | macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty | 17 | ||||
| -rw-r--r-- | macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex | 82 | ||||
| -rw-r--r-- | macros/texinfo/latest/texinfo.tex | 45 |
12 files changed, 110 insertions, 3415 deletions
diff --git a/macros/latex/contrib/ametsoc/AMS_Refs.pdf b/macros/latex/contrib/ametsoc/AMS_Refs.pdf Binary files differdeleted file mode 100644 index a7ab773eb7..0000000000 --- a/macros/latex/contrib/ametsoc/AMS_Refs.pdf +++ /dev/null diff --git a/macros/latex/contrib/ametsoc/README b/macros/latex/contrib/ametsoc/README deleted file mode 100644 index d6e0ad62ad..0000000000 --- a/macros/latex/contrib/ametsoc/README +++ /dev/null @@ -1,62 +0,0 @@ -25 August 2014, Version 4.3.2 -================================== -Files in the -American Meteorological Society -LaTeX Package - -Modified for CTAN -================================== - -You will be provided with a tarred, zipped LaTeX package containing -7 files. - -================================== -Basic Class File: ametsoc.cls. - -The file ametsoc.cls is the manuscript class file. - -Use \documentclass{ametsoc} for your .tex document to -generate a PDF that follows all AMS guidelines for submission and peer review. - -Use \documentclass[twocol]{ametsoc} for your .tex document -to generate a PDF that resembles the layout of an AMS journal page, -including single spacing and two columns. This journal style -PDF is only for the author's personal use, and any papers -submitted in this style will not be accepted. - -Always use \documentclass{ametsoc} -when generating a PDF for submission to the AMS. - -================================== -Template: - -template.tex is a file for the author to use when making his/her paper. - -The file provides a basic blank template with some -section headings for authors to more easily enter their manuscript. - -================================== -Bibliography Files: - -ametsoc2014.bst, references.bib, and AMS_Refs.pdf - -ametsoc2014.bst is the bibliography style file. - -references.bib should be altered with your own bibliography information. - -AMS_Refs.pdf explains AMS reference style and contains detailed examples. - -================================== -Documention: - -Found in amsdocs.pdf and in this file, readme.txt. - -================================== -Help for Authors -================================== - -For questions or problems related to submitting your LaTeX manuscript to the AMS, see the AMS LaTeX Submission Info web page: -http://www2.ametsoc.org/ams/index.cfm/publications/authors/journal-and-bams-authors/author-resources/latex-author-info/ - -or contact: latex@ametsoc.org - diff --git a/macros/latex/contrib/ametsoc/ametsoc.cls b/macros/latex/contrib/ametsoc/ametsoc.cls deleted file mode 100644 index bda341f632..0000000000 --- a/macros/latex/contrib/ametsoc/ametsoc.cls +++ /dev/null @@ -1,1189 +0,0 @@ -% Version 4.3.2, 25 August 2014 -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% ametsoc.cls -% -% Article Class for >> AMS Journals << -% -% Copyright 2014 American Meteorological Society -% -% Written by Amy Hendrickson -% TeXnology Inc. -% http://www.texnology.com -% amyh@texnology.com -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Version history -% -% 7 May 2014 -- Nicole Rietmann, AMS -% Updated to version 4.1 -% Changed draft line spacing from 1.66 to 2 -% Added \bibpunct command to template -% -% 12 May 2014 -- Nicole Rietmann, AMS -% Updated to version 4.2 -% Added version and date to footer -% Changed line spacing from 2 to 2.25 -% Added if/else statements for fig/table line spacing (\baselinestretch) -% Decreased vertical space after section heads -% Removed en dashes around page numbers -% Removed line after abstract -% Decreased vertical space after appendix title -% -% 16 May 2014 -- Nicole Rietmann, AMS -% Updated to version 4.3 -% Added command to fix equation line spacing -% -% 19 May 2014 -- Nicole Rietmann, AMS -% Updated to version 4.3.1 -% Removed unnecessary \usepackage{tikz} command -% -% -% 25 August 2014 -- Nicole Rietmann, AMS -% Updated to version 4.3.2 -% Correction of \BAMS to \bams for journal command -% Addition of JAS to journal list in .cls and template -% Clarified appendix fig/table placement in template and amsdocs.pdf -% Addition of BAMS capsule instructions in template and amsdocs.pdf -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -%%%%%%%%%%%%%%%%%%%%%%% -%% Options - -\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue} - -\newif\ifdraft -\DeclareOption{draft}{\global\drafttrue -\renewcommand\baselinestretch{2.25} -\def\arraystretch{2.15} -\@twocolumnfalse -\setlength\overfullrule{5pt}} - -\DeclareOption{twocol}{\setlength\overfullrule{0pt} -\renewcommand\baselinestretch{1} -\def\arraystretch{1.15} -\brokenpenalty=5000 -\global\draftfalse -\@twocolumntrue -} - -\DeclareOption{onecolumn}{\@twocolumnfalse} -\DeclareOption{twocolumn}{\@twocolumntrue} - -%%%%%%%%%%%%% - -%% default options declared -\ExecuteOptions{letterpaper,twoside,onecolumn,draft} - -%% This is where options used with \documentclass[]{}, -%% ie, \documentclass[draft]{ammetsoc} -%% are activated: - -\ProcessOptions - -%%%%%%%%%% -%% Standard 10 point default settings: - -%% Font family settings -\renewcommand\normalsize{% -\ifdraft - \@setfontsize\normalsize{12pt}{12pt}% -\else - \@setfontsize\normalsize{9.85pt}{11.5}% -\baselineskip=11.5pt plus .1pt -\fi - \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ - \abovedisplayshortskip \z@ \@plus3\p@ - \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@ - \belowdisplayskip \abovedisplayskip - \let\@listi\@listI} - - -\normalsize - -\newcommand\normaltextsize{% - \@setfontsize\normaltextsize{10.5pt}{12} - \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ - \abovedisplayshortskip \z@ \@plus3\p@ - \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@ - \belowdisplayskip \abovedisplayskip - \let\@listi\@listI} - -\newcommand\small{% - \@setfontsize\small\@ixpt{11}% - \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus2\p@ - \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@ - \def\@listi{\leftmargin\leftmargini - \topsep 4\p@ \@plus2\p@ \@minus2\p@ - \parsep 2\p@ \@plus\p@ \@minus\p@ - \itemsep \parsep}% - \belowdisplayskip \abovedisplayskip -} - -\newcommand\bigfootnotesize{% - \@setfontsize\bigfootnotesize{8.5pt}{9.5}% - \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus\p@ - \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@ - \def\@listi{\leftmargin\leftmargini - \topsep 3\p@ \@plus\p@ \@minus\p@ - \parsep 2\p@ \@plus\p@ \@minus\p@ - \itemsep \parsep}% - \belowdisplayskip \abovedisplayskip -} - -\newcommand\footnotesize{% - \@setfontsize\footnotesize\@viiipt{9.5}% - \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ - \abovedisplayshortskip \z@ \@plus\p@ - \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@ - \def\@listi{\leftmargin\leftmargini - \topsep 3\p@ \@plus\p@ \@minus\p@ - \parsep 2\p@ \@plus\p@ \@minus\p@ - \itemsep \parsep}% - \belowdisplayskip \abovedisplayskip -} -\newcommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand\bigtiny{\@setfontsize\bigtiny{5.5pt}\@vipt} -\newcommand\tiny{\@setfontsize\tiny\@vpt\@vipt} -\newcommand\large{\@setfontsize\large\@xiipt{14}} -\newcommand\Large{\@setfontsize\Large\@xivpt{18}} -\newcommand\LARGE{\@setfontsize\LARGE\@xviipt{22}} -\newcommand\huge{\@setfontsize\huge\@xxpt{25}} -\newcommand\Huge{\@setfontsize\Huge\@xxvpt{30}} - -%% Font commands to accomodate -%% earlier TeX and LaTeX font conventions: -\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} -\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} -\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} -\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} -\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} -\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} -\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} -\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal} -\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%% Page style settings - \parindent = 10pt - \parskip = 0\p@ %\@plus .0001pt - \textheight=9in %% -\advance\textheight-12pt %this works for first page -\advance\textheight-8pt - -\advance\textheight4pt - -\textwidth= 39pc - -\pdfpagewidth=7.87in -\pdfpageheight=10.5in - -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} - - -\setlength\headheight{12\p@} -\setlength\headsep {12\p@} -\setlength\topskip {10\p@} -\setlength\footskip{35\p@} - - -\setlength\maxdepth{.5\topskip} - -%%% Running head and foot definition. - -\def\currvolume{Please supply {\tt\string\volume\string{<volume number>\string}}} -\def\currdate{Please supply {\tt\string\issuedate\string{<issue date>\string}}} -\def\volume#1{\def\currvolume{Volume #1}} -\def\issuedate#1{\def\currdate{#1}} -\let\currvolume\relax -\let\currdate\relax - -\def\ps@plain{% - \def\@oddhead{\vbox{\ifdraft\else\iffirstpage\global\firstpagefalse -\vtop to0pt{\vss -\rlap{\hbox to\textwidth{\hfill\color{gray}\small -Generated using the official AMS \LaTeX\ template---two-column layout. -FOR AUTHOR USE ONLY, NOT FOR SUBMISSION!\hfill}} -\vskip3pt -\hrule width \textwidth -\vskip18pt} -\fi\fi -\ifdraft\else -\vtop to 0pt{\vss -\rlap{\hbox to\textwidth{\footnotesize\sc\rlap{\currvolume}\hfill -%%% -\uppercase{\currjournal} -%%% -\hfill -\llap{\currdate}}} -\vss}\fi}}% - \def\@oddfoot{\hbox to\textwidth{\rlap{\ifdraft\small\else\scriptsize\fi -%\copyright \theyear\ -Generated using v4.3.2 of the AMS \LaTeX\ template}\hfill -\normalsize\ifdraft\thepage\hfill\else -\thepage\hfill\fi}}% - \let\@evenfoot\@empty - \let\@evenfoot\@empty} - - \def\ps@headings{% - \def\@oddfoot{\ifdraft\centerline{\thepage}\else\hfill\fi} - \let\@evenfoot\@oddfoot - \def\@evenhead{{\ifdraft\hfill\else\normalsize\thepage -\bigfootnotesize\sc\hfill -\uppercase{\currjournal} -\hfill \currvolume\fi}}% - \def\@oddhead{{\ifdraft\hfill\else\bigfootnotesize\sc\currdate\hfill \therunningheadauthors\hfill \normalsize\thepage -%\currvolume -\fi}}% -} - -%%%%%%%%%%%% -%% Names to be used in Bibliography, Figure and Table captions, and -%% Appendix - -\newcommand\refname{References} -\newcommand\figurename{{\sc Fig.}} -\newcommand\tablename{{\sc Table}} -\newcommand\appendixname{Appendix} - -%%%%%%%%%%%%%%% -%% margin notes positioning -\setlength\marginparsep {10\p@} -\setlength\marginparpush{5\p@} -\setlength\marginparwidth {48\p@} - -%%%%%%%%%%%%%%% -%% needed by output routine - -\setlength\oddsidemargin {-19pt} -\evensidemargin\oddsidemargin - - -%%%%%%%%%%%%%%% -%% Footnote settings - -\renewcommand\footnoterule{% -\vskip11pt - \hrule\@width.2\columnwidth - \vskip10pt} - -\newcommand\@makefntext[1]{% - \parindent 1em% - \noindent - \hb@xt@1.8em{\hss\@makefnmark}#1} - -%% distance between footnotes -\setlength\footnotesep{6.65\p@} - -%% distance between text and baseline of first footnote -\setlength{\skip\footins}{6\p@ \@plus .1\p@ \@minus 2\p@ -} - -\skip\@mpfootins = \skip\footins - -%%%%%%%%%%%%%%% -%% distance between figures and tables and text -\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} - -%% Separation used when you type \begin{figure}[h]...\end{figure} or -%% \begin{table}[h]...\end{table} -\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} - -%% Separation used when you type \begin{figure*}...\end{figure*} or -%% \begin{table*}...\end{table*} -\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} - -%% Separation used when you type \begin{figure*}[h]...\end{figure*} or -%% \begin{table*}[h]...\end{table*} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} - -%%%%%%%%%% -%% float positioning, needed by output routine -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} - -%%%%%%%%% -%% Listing defaults, -%% up to six levels of indentation - -%% add to top of new list if started in vertical mode -\setlength\partopsep{2\p@ \@plus 1\p@ \@minus 1\p@} - -\def\@listi{\leftmargin\leftmargini - \parsep 4\p@ \@plus2\p@ \@minus\p@ - \topsep 8\p@ \@plus2\p@ \@minus4\p@ - \itemsep4\p@ \@plus2\p@ \@minus\p@} -\let\@listI\@listi -\@listi - -\def\@listii {\leftmargin\leftmarginii - \labelwidth\leftmarginii - \advance\labelwidth-\labelsep - \topsep 4\p@ \@plus2\p@ \@minus\p@ - \parsep 2\p@ \@plus\p@ \@minus\p@ - \itemsep \parsep} - -\def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii - \advance\labelwidth-\labelsep - \topsep 2\p@ \@plus\p@\@minus\p@ - \parsep \z@ - \partopsep \p@ \@plus\z@ \@minus\p@ - \itemsep \topsep} - -\def\@listiv {\leftmargin\leftmarginiv - \labelwidth\leftmarginiv - \advance\labelwidth-\labelsep} - -\def\@listv {\leftmargin\leftmarginv - \labelwidth\leftmarginv - \advance\labelwidth-\labelsep} - -\def\@listvi {\leftmargin\leftmarginvi - \labelwidth\leftmarginvi - \advance\labelwidth-\labelsep} - - -%% indentation of various levels of listing: -\setlength\leftmargini {2em} -\leftmargin \leftmargini - -\setlength\leftmarginii {2.2em} -\setlength\leftmarginiii {1.87em} -\setlength\leftmarginiv {1.7em} - - \setlength\leftmarginv {.5em} - \setlength\leftmarginvi {.5em} - -\setlength \labelsep {.5em} -\setlength \labelwidth{\leftmargini} -\addtolength\labelwidth{-\labelsep} - -\@beginparpenalty -\@lowpenalty -\@endparpenalty -\@lowpenalty -\@itempenalty -\@lowpenalty - -%% \begin{enumerate}\item \end{enumerate} -%% will use these defaults: - -\renewcommand\theenumi{\@arabic\c@enumi} -\renewcommand\theenumii{\@alph\c@enumii} -\renewcommand\theenumiii{\@roman\c@enumiii} -\renewcommand\theenumiv{\@Alph\c@enumiv} -\newcommand\labelenumi{\theenumi.} -\newcommand\labelenumii{(\theenumii)} -\newcommand\labelenumiii{\theenumiii.} -\newcommand\labelenumiv{\theenumiv.} -\renewcommand\p@enumii{\theenumi} -\renewcommand\p@enumiii{\theenumi(\theenumii)} -\renewcommand\p@enumiv{\p@enumiii\theenumiii} - -%% \begin{itemize}\item \end{itemize} -%% will use these defaults: - -\newcommand\labelitemi{\textbullet} -\newcommand\labelitemii{\normalfont\bfseries \textendash} -\newcommand\labelitemiii{\textasteriskcentered} -\newcommand\labelitemiv{\textperiodcentered} - -%% \begin{description}\item \end{description} -%% will use these defaults: - -\newenvironment{description} - {\list{}{\labelwidth\z@ \itemindent-\leftmargin - \let\makelabel\descriptionlabel}} - {\endlist} -\newcommand*\descriptionlabel[1]{\hspace\labelsep - \normalfont\bfseries #1} - -%%%%%%%%%% -%% Used within other commands for influencing -%% whether to start a new page. -\@lowpenalty 51 -\@medpenalty 151 -\@highpenalty 301 - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Float settings - -%% How many figures or tables at the top of page? -\setcounter{topnumber}{10} -%% How much space may be used by figures and tables at the top of page? -\renewcommand\topfraction{.95} - -%% Same, at the bottom of the page -\setcounter{bottomnumber}{10} -\renewcommand\bottomfraction{.95} - -%% How many figures/tables in total on one page? -\setcounter{totalnumber}{10} - -%% How much of the page should be text? -\renewcommand\textfraction{.01}%% How much of the page must reserved for text? -\renewcommand\floatpagefraction{.95} - -%% Similarly, but for double column figures or tables: -\setcounter{dbltopnumber}{2} -\renewcommand\dbltopfraction{.95} -\renewcommand\dblfloatpagefraction{.95} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%% Section head definitions -\setcounter{secnumdepth}{4} - -\newcounter {section} -\newcounter {subsection}[section] -\newcounter {subsubsection}[subsection] -\newcounter {paragraph}[subsubsection] -\newcounter {subparagraph}[paragraph] -\renewcommand \thesection {\@arabic\c@section} -\renewcommand\thesubsection {\@alph\c@subsection} -\renewcommand\thesubsubsection{\@arabic\c@subsubsection} -\renewcommand\theparagraph {(\@roman\c@paragraph)} -\renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph} - -%% Innards of \@startsection, used for section fonts. -%% The change is to make italic small caps for subsubsection, have -%% upright section number - -\def\@sect#1#2#3#4#5#6[#7]#8{% - \ifnum #2>\c@secnumdepth - \let\@svsec\@empty - \else - \refstepcounter{#1}% - \protected@edef\@svsec{\@seccntformat{#1}\ifnum#2=4\else\ifnum#2=3)\else.\fi\fi\ \hskip1pt\relax}% - \fi - \@tempskipa #5\relax - \ifdim \@tempskipa>\z@ - \begingroup - #6{% - \@hangfrom{\hskip #3\relax\@svsec}% - \interlinepenalty \@M -%% the following line is the change from the latex.ltx default: -\ifnum#2=3\let\dothis\sc\else\let\dothis\relax\fi\dothis{#8} -\@@par}% - \endgroup - \csname #1mark\endcsname{#7}% - \addcontentsline{toc}{#1}{% - \ifnum #2>\c@secnumdepth \else - \protect\numberline{\csname the#1\endcsname}% - \fi - #7}% - \else - \def\@svsechd{% - #6{\hskip #3\relax - \@svsec #8}% - \csname #1mark\endcsname{#7}% - \addcontentsline{toc}{#1}{% - \ifnum #2>\c@secnumdepth \else - \protect\numberline{\csname the#1\endcsname}% - \fi - #7}}% - \fi - \@xsect{#5}} - -\newcommand\section{\@startsection {section}{1}{\z@}% - {-12pt \@plus -1ex \@minus -.2ex}% - {6pt}% - {\ifdraft\large\else\normalsize\fi\bfseries}} -\newcommand\subsection{\@startsection{subsection}{2}{\z@}% - {-12pt \@plus -1ex \@minus -.2ex}% - {6pt}% - {\ifdraft\large\else\normalsize\fi\it}} -\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-12pt \@plus -1ex \@minus -.2ex}% - {6pt}% - {\sc}}% -\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}% - {6pt \@plus1ex \@minus.2ex}% - {-1em}% - {\normalfont\ifdraft\large\else\normaltextsize\fi\it}} -\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% - {3.25ex \@plus1ex \@minus .2ex}% - {-1em}% - {\normalfont\normaltextsize\bfseries}} - - -%%%%%%%%%%%% -%% Quotation, Quote -\newenvironment{quotation} - {\list{}{\listparindent 1.5em% - \itemindent \listparindent - \rightmargin \leftmargin - \parsep \z@ \@plus\p@}% - \item\relax} - {\endlist} - -\newenvironment{quote} - {\list{}{\rightmargin\leftmargin}% - \item\relax} - {\endlist} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Setting table and array widths -%% (\begin{tabular}...\end{tabular} and -%% \begin{array}...\end{array} - -%% white space between columns in array -\setlength\arraycolsep{5\p@} - -%%%%%%%%%%% -%% white space between columns in tabular -\setlength\tabcolsep{6\p@} - -%%%%%%%%%%% -%% Width of ruled lines in array -\setlength\arrayrulewidth{.4\p@} - -%%%%%%%%%%% -%% Distance between two ruled lines -\setlength\doublerulesep{2\p@} - -%%%%%%%%%%% -\setlength\tabbingsep{\labelsep} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% \fbox{} settings - -%% determine how much space between ruled lines and text: -\setlength\fboxsep{3\p@} - -%% Width of ruled lines used by \fbox: -\setlength\fboxrule{.4\p@} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Declaring counters - -%% equations counter: -\renewcommand \theequation {\@arabic\c@equation} - -%% figure counter: -\newcounter{figure} -\renewcommand\thefigure{\@arabic\c@figure} - -%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Equation line spacing - -\everydisplay{\def\arraystretch{1.0}} - -%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Figures - -%% Choices for figure float placement if [] hasn't been -%% used for \begin{figure} -\def\fps@figure{tbp} -\def\draftspace{\renewcommand\baselinestretch{2.25}} -\def\twocolspace{\renewcommand\baselinestretch{1}} -%\renewcommand\baselinestretch{2.25} -\ifdraft\draftspace\else\twocolspace\fi - - -\def\ftype@figure{1} -\def\ext@figure{lof} %for List of Figures, which we won't use -\def\fnum@figure{\figurename~\thefigure} - -\newenvironment{figure} - {\@float{figure}} - {\end@float} -\newenvironment{figure*} - {\@dblfloat{figure}} - {\end@dblfloat} - -%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Tables -\newcounter{table} - -%% Choices for figure float placement if [] hasn't been -%% used for \begin{figure} -\def\fps@table{tbp} - -%\renewcommand\baselinestretch{2.25} -\ifdraft\draftspace\else\twocolspace\fi - -\def\ftype@table{2} -\def\ext@table{lot} % for List of Tables, which we won't use -\def\fnum@table{\tablename~\thetable} - -\newenvironment{table} - {\footnotesize\@float{table}} - {\end@float} - -\newenvironment{table*} - {\@dblfloat{table}} - {\end@dblfloat} - -%%% Figure and Table Captions -\newlength\abovecaptionskip -\newlength\belowcaptionskip -\setlength\abovecaptionskip{10\p@} -\setlength\belowcaptionskip{5\p@} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Bibliography -%%% Customized with natbib package - -\newdimen\bibindent -\setlength\bibindent{1.5em} -\newenvironment{thebibliography}[1] - {\section*{\refname - \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}}% - \list{\@biblabel{\@arabic\c@enumiv}}% - {\settowidth\labelwidth{\@biblabel{#1}}% - \leftmargin\labelwidth - \advance\leftmargin\labelsep - \@openbib@code - \usecounter{enumiv}% - \let\p@enumiv\@empty - \renewcommand\theenumiv{\@arabic\c@enumiv}}% - \sloppy - \clubpenalty4000 - \@clubpenalty \clubpenalty - \widowpenalty4000% - \sfcode`\.\@m} - {\def\@noitemerr - {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} -\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} -\let\@openbib@code\@empty - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% To get curr month/day/year - -\def\today{\ifcase\month\or - January\or February\or March\or April\or May\or June\or - July\or August\or September\or October\or November\or December\fi - \space\number\day, \number\year} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Two-column defaults - -\setlength\columnsep{12\p@} -\setlength\columnseprule{0\p@} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Default page style: plain -%% Running heads and feet - -\pagestyle{headings} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Default page numbering - -\pagenumbering{arabic} - -%% default page style, some leaway for lines going into -%% margin, no ragged bottom -\ifdraft\else - \twocolumn\fi - \sloppy - \flushbottom - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% All the usepackages included in this style %%%%%%%%%%%%%%%%% -\usepackage{graphicx} -\usepackage{amsmath,amsfonts,amssymb,bm} -\usepackage[scaled=.97]{helvet} %% to get bold helvetica -\usepackage{mathptmx}%{times} -\usepackage{natbib} -\def\bibfont{\ifdraft\normalsize\else\footnotesize\fi} -\usepackage{url} -\usepackage{xcolor} -\usepackage{indentfirst} -\usepackage{multicol} -\usepackage{ifthen} -\usepackage{rotating} -%% Start line numbers immediately if in draft mode, -%% use endfloat commands to put tables and figures at -%% end of paper. -\ifdraft -\usepackage[nomarkers,tablesfirst]{endfloat} -\usepackage{lineno} -\linenumbers -\fi - - - -%%%%%%%%%% Setting up title/running head info %%%%%%%%%%%%%%%% -\def\title#1{\def\thetitle{#1}} -\def\received#1{\ifdraft\def\thereceived{}\else\def\thereceived{#1}\fi} -\received{} -\def\authors#1{\def\theauthors{#1}} -\def\author#1{\def\theauthors{#1}} - -\newcounter{extraauth} -\newcounter{loopnum} - -\def\extraauthor#1{\global\advance\c@extraauth by 1 -\expandafter\gdef\csname extraauthors\the\c@extraauth\endcsname{#1}} - -\let\extraauthors\extraauthor - -\def\extraaffil#1{\expandafter\gdef\csname extraaffil\the\c@extraauth\endcsname{#1}} - -\def\affiliation#1{\def\theaffiliation{#1}} - -\let\theextraaffil\relax -\let\theextraauthor\relax -\let\theextraauthors\relax - -\def\abstract#1{\def\theabstract{% -\centerline{\vtop{\ifdraft\normalsize\else \bigfootnotesize\fi\hsize 5.125in -\ifdraft\internallinenumbers\fi -\noindent\hskip8pt\relax #1\vskip1sp}}}} - -\let\dothanks\relax - -\def\correspondingauthor#1{% -\thanks{\ifdraft\internallinenumbers\normalsize\fi - \noindent{\it Corresponding author address:}\ #1 - \vskip1pt - \noindent\theemail -}} - -\let\thecorrespondingauthor\relax - -{\makeatletter -\gdef\email{\bgroup\makeatletter\xemail} -\gdef\xemail#1{\gdef\theemail{{\ifdraft\normalsize\else\footnotesize\fi E-mail: #1}}\egroup} -} - -\def\articledoi#1{\def\thedoi{{\ifdraft\normalsize\else\scriptsize\fi\sc DOI: #1}}} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% \maketitle, \@maketitle, for beginning of article - -%% allows multiple \thanks in draft mode -\newcount\thanksnum -\newcount\savethanksnum -\def\thanksloop{\savethanksnum=\thanksnum -\thanksnum=1\relax -\loop -\ifnum\thanksnum<\savethanksnum -\ifx\expandafter\csname thanks\the\thanksnum\endcsname\relax -\else -\vskip1sp -\noindent\llap{$^{\@fnsymbol{\the\thanksnum}}$}\csname thanks\the\thanksnum\endcsname -\global\advance\thanksnum by 1\fi -\repeat -\ifx\expandafter\csname thanks\the\thanksnum\endcsname\relax -\else -\vskip1sp -\noindent\llap{$^{\@fnsymbol{\the\thanksnum}}$}\csname thanks\the\thanksnum\endcsname\ \vskip1sp\fi -} - - -%% allows multiple \extraauthor and \extraaffil - -\def\extraloop{\c@loopnum=\c@extraauth -\c@extraauth=1\relax -\loop -\ifnum\c@extraauth<\c@loopnum -\ifx\expandafter\csname extraauthors\the\c@extraauth\endcsname\relax -\else -\vskip12pt -\ifdraft\rm\else\sc\fi -\csname extraauthors\the\c@extraauth\endcsname -\vskip3pt -{\it -\csname extraaffil\the\c@extraauth\endcsname} -\global\advance\c@extraauth by 1\fi -\repeat -\ifx\expandafter\csname extraauthors\the\c@extraauth\endcsname\relax -\else -\vskip12pt -\ifdraft\rm\else\sc\fi -\csname extraauthors\the\c@extraauth\endcsname -\vskip3pt -{\it \csname extraaffil\the\c@extraauth\endcsname} -\fi -} - -%% Makes title on first page of article, -%% allows switches for draft/twocol mode -\newif\iffirstpage -\newcommand\maketitle{\par -\global\firstpagetrue -\thispagestyle{plain} - \begingroup - \renewcommand\thefootnote{\@fnsymbol\c@footnote}% - \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}% - \long\def\@makefntext##1{\parindent 1em\footnotesize\noindent - \hb@xt@1.8em{% - \hss\@textsuperscript{\normalfont\@thefnmark}}##1 - \vskip1sp -% \vskip1pt\footnoterule - \small - \vskip3pt -\ifdraft\else\dothanks\fi -}% -\ifdraft - \@maketitle -\@thanks -\else - \twocolumn[\@maketitle]% -\@thanks -\fi - \endgroup - \setcounter{footnote}{0}% - \global\let\thanks\relax - \global\let\maketitle\relax - \global\let\@maketitle\relax - \global\let\@thanks\@empty - \global\let\theauthor\@empty - \global\let\@date\@empty - \global\let\thetitle\@empty - \global\let\title\relax - \global\let\author\relax -\normalsize -} - -%% Allows switches for draft/twocol mode -\def\@maketitle{% -\vglue61pt - \begin{center}% -\ifdraft -\def\thanks##1{\global\advance\thanksnum by 1 -$^{\@fnsymbol{\the\thanksnum}}$% -\expandafter\gdef\csname thanks\the\thanksnum\endcsname{##1}} -\fi% - { -\vglue-4pt -\ifdraft\Large\else\large\fi\bf \thetitle \par}% - \vskip 12pt - {\normalsize\ifdraft\rm\else\sc\fi\theauthors% -} - \vskip 6pt -{\bigfootnotesize\it -\ifdraft\internallinenumbers\normalsize\fi -\theaffiliation -\ifdraft\normalsize\fi -%% -{\normalsize -\extraloop -}\vskip5pt -%\fi -%% -\vskip14pt -\rm -\ifx\thereceived\empty\else -(\thereceived) -\vskip9pt -\fi -} -\end{center} -\ifdraft -\vfill -\thanksloop -\dothanks -\eject\fi -\centerline{\ifdraft\normalsize\else\bigfootnotesize\fi\sc ABSTRACT} -\vskip7pt -\theabstract -\vskip17pt -\ifdraft\newpage\fi -} - - -\advance\voffset-36pt - - -%% to be used in running heads for [twocol] option: -\def\runningheadauthors#1{% -\def\therunningheadauthors{{\spaceskip=1pt #1}}} -\runningheadauthors{Please use command {\tt\string\runningheadauthors\string{\string}}} -\runningheadauthors{} - -%% to be used in running heads for [twocol] option: -\def\and{\ \ \ A N D\ \ \ } - -%% Keeps single line at bottom of previous page or at top of current page -%% from occurring. -\clubpenalty=10000 -\widowpenalty=10000 - -%% It would be nice to use this, but it messes up the page makeup. -%% No hyphenation over page breaks -%\brokenpenalty=5000 - -%% bold helvetica, which will scale according to font family -%% where it is found: - -\def\sfbf#1{\leavevmode\hbox{\fontfamily{phv}\selectfont\bfseries #1}} - - -%% needed for small caps in italic for subsubsection head -%% Doing this in tikz saves having to import another font file - -\newcommand{\textscsl}[1]{% - \tikz[baseline=(N.base)]% - % The transform says: - % x' = 1x + 0.22y + 0pt - % y' = 0x + 1y + 0pt - % This gives a slant - adjust the value for each font! - \pgfsys@transformcm{1}{0}{0.22}{1}{0pt}{0pt}% - \node[inner sep=0pt] (N) {\textsc{#1}};% -} - -\def\listfigurename{\uppercase{List of Figures}} -\def\listtablename{\uppercase{List of Tables}} - -%% needed for draft version -\newcommand\listoffigures{% - \section*{\listfigurename - \@mkboth{\MakeUppercase\listfigurename}% - {\MakeUppercase\listfigurename}}% -\baselineskip=18pt -\normalsize - \@starttoc{lof}% - } - -\newcommand\listoftables{% - \section*{\listtablename - \@mkboth{\MakeUppercase\listtablename}% - {\MakeUppercase\listtablename}}% -\baselineskip=18pt -\normalsize - \@starttoc{lot}% - } - -%% Handle table and figure captions somewhat differently; put -%% in line numbers when in draft mode, change font size for draft mode. - -\def\appendcaption#1#2{\ifdraft -\ifx\@captype\xtable -\@makecaption{Table #1}{#2} - \addcontentsline{\csname ext@table\endcsname}{table}% - {\protect\numberline{#1}{\ignorespaces #2}}% -\else -\@makecaption{Fig. #1}{#2} - \addcontentsline{\csname ext@figure\endcsname}{figure}% - {\protect\numberline{#1}{\ignorespaces #2}}% -\fi -\else -\caption{#2} -\fi -} - -\def\xtable{table} -\long\def\@makecaption#1#2{% -\ifx\@captype\xtable \vskip4pt\else \vskip\abovecaptionskip\fi - \sbox\@tempboxa{\ifdraft\normaltextsize\else\footnotesize\fi #1. #2}% - \ifdim \wd\@tempboxa >\hsize -%% -\global\setbox0\vbox{ -\ifdraft\normaltextsize\internallinenumbers\baselineskip=20pt\else \footnotesize\fi -#1. #2 -} -\ifdim\ht0<24pt -\setbox1=\vbox{\unvbox0 -\global\setbox2=\lastbox} -\copy1 -\vskip-6pt -\centerline{\hbox{\unhbox2}} -\par -\else -\ifdraft\normaltextsize\else\footnotesize\fi -\ifdraft\internallinenumbers\baselineskip=20pt\fi -\hskip10pt #1. #2\par -\fi - \else - \global \@minipagefalse - \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% - \fi -\ifx\@captype\xtable - \vskip\belowcaptionskip\fi} - -%% make section heads end with a period. -\def\@seccntformat#1{\csname the#1\endcsname} - -\def\acknowledgments{\paragraph*{Acknowledgments.}} -\def\acknowledgment{\paragraph*{Acknowledgment.}} - -%% tables, to make correct space around the horizontal lines at the -%% top, underneath the column headers, and at the bottom of the table. -\def\topline{\hline\hline\vrule height 10pt depth4pt width0pt\relax} -\def\midline{\hline\vrule height 10pt width0pt\relax} -\def\botline{\hline} - - -%% Allow two 1 col width tables or 1 col width figures to -%% be side by side in a two-column width illustration or table. - -\def\sidebyside#1#2{\hbox to\textwidth{% -\vbox{\hsize=.5\textwidth\advance\hsize -6pt #1}\hfill -\vbox{\let\internallinenumbers\relax\hsize=.5\textwidth\advance\hsize -6pt #2}}} - -%% Make tabular default fontsize be footnotesize. -\let\savetabular\tabular -\def\tabular{\footnotesize\baselineskip=12pt\savetabular} - -\@namedef{tabular*}#1{\def\@halignto{to#1} -\footnotesize\baselineskip12pt\@tabular} - -%%% The following commands are used for draft mode when -%%% figures and tables are sent to the end of the paper. -%%% These terms help format the list of tables and list of figures nicely. - -\def\fignumberline#1#2{\bgroup -\normaltextsize\parindent=0pt\leftskip=42pt\noindent\hskip-42pt\hbox to 42pt{\bf Fig.~#1.\hfill}% -\advance\hsize -42pt -#2\xdotfill\currpage\hbox to -44pt{}\vskip1sp\egroup} - -\def\tabnumberline#1#2{\bgroup -\normaltextsize\parindent=0pt\leftskip=50pt\noindent\hskip-50pt\hbox to 50pt{\bf Table~#1.\hfill}% -\advance\hsize -88pt -#2\xdotfill\currpage\hbox to -50pt{}\vskip1sp\egroup} - - -\def\l@figure#1#2{% -\let\numberline\fignumberline -\def\currpage{#2}#1\vskip12pt} - -\def\l@table#1#2{% -\let\numberline\tabnumberline -\def\currpage{#2}#1\vskip12pt} - -%% Make meaning different depending on whether in draft or twocol mode. -\def\thanks#1{\footnotemark\, - \protected@xdef\@thanks{\@thanks - \protect\footnotetext[\the\c@footnote]{% -\ifdraft\noexpand\internallinenumbers\fi#1}}% -} - -%% Wider space between dots than standard \dotfill -\def\xdotfill{% - \leavevmode - \cleaders \hb@xt@ 1.5em{\hss.\hss}\hfill - \kern\z@} - - - -\ifdraft -%%% only needed if line numbers are activated - -%%% from Brian Papa, ametsoc.sty - -% The following section defines a new command that helps to resolve the issue of missing line numbers preceding some -% equations when using various math display environments -% -\newcommand*\patchAmsMathEnvironmentForLineno[1]{% - \expandafter\let\csname old#1\expandafter\endcsname\csname #1\endcsname - \expandafter\let\csname oldend#1\expandafter\endcsname\csname end#1\endcsname - \renewenvironment{#1}% - {\linenomath\csname old#1\endcsname}% - {\csname oldend#1\endcsname\endlinenomath}}% -\newcommand*\patchBothAmsMathEnvironmentsForLineno[1]{% - \patchAmsMathEnvironmentForLineno{#1}% - \patchAmsMathEnvironmentForLineno{#1*}}% -\AtBeginDocument{% -\patchBothAmsMathEnvironmentsForLineno{equation}% -\patchBothAmsMathEnvironmentsForLineno{align}% -\patchBothAmsMathEnvironmentsForLineno{flalign}% -\patchBothAmsMathEnvironmentsForLineno{alignat}% -\patchBothAmsMathEnvironmentsForLineno{gather}% -\patchBothAmsMathEnvironmentsForLineno{multline}% -\patchBothAmsMathEnvironmentsForLineno{eqnarray}% -} -\fi - -%%%%%%%%%%%% -%% Appendix - -\newif\iffirstappendix -\newenvironment{appendix}[1][1]% -{\vskip12pt\goodbreak -\ifthenelse{\equal{#1}{1}}% -{\renewcommand\theequation{A\arabic{equation}}% -\setcounter{equation}{0}% reset counter -\ifdraft\else -\setcounter{figure}{0}% reset counter -\setcounter{table}{0}% reset counter -\renewcommand\thefigure{A\arabic{figure}} -\renewcommand\thetable{A\arabic{table}} -\fi -\setcounter{section}{0}% reset counter -\setcounter{subsection}{0}% reset counter -\renewcommand\thesection{A\arabic{section}} -\begin{center}% -{\textnormal APPENDIX}% -\end{center}}% -{\renewcommand\theequation{{#1}\arabic{equation}}% -\setcounter{equation}{0}% reset counter -\setcounter{section}{0}% reset counter -\setcounter{subsection}{0}% reset counter -\ifdraft\else -\renewcommand\thefigure{#1\arabic{figure}} -\renewcommand\thetable{#1\arabic{table}} -\fi -\renewcommand\thesection{#1\arabic{section}} -\begin{center}% -{\textnormal APPENDIX #1}% -\end{center}} -}% - - - -\long\def\appendixtitle#1{{\vskip-1pt\centering\bf #1\vskip6pt}} - -%%% Added Nov 12, 2013; updated 25 Aug 2014 - -\def\journal#1{\expandafter\ifx\csname #1\endcsname\relax -\typeout{^^J^^J -\string\journal\string{\string} has incorrect name!^^J -Please choose a journal name from the following list:^^J^^J -jamc (Journal of Applied Meteorology and Climatology)^^J -jtech (Journal of Atmospheric and Oceanic Technology)^^J -jhm (Journal of Hydrometeorology)^^J -jpo (Journal of Physical Oceanography)^^J -jas (Journal of Atmospheric Sciences)^^J -jcli (Journal of Climate)^^J -mwr (Monthly Weather Review)^^J -wcas (Weather, Climate, and Society)^^J -waf (Weather and Forecasting)^^J -bams (Bulletin of the American Meteorological Society)^^J -ei (Earth Interactions)^^J^^J} -\stop -\else -\xdef\currjournal{\csname #1\endcsname} -\xdef\therunningheadauthors{\csname #1\endcsname} -\fi} - -\def\jamc{J o u r n a l \ \ o f \ \ A p p l i e d \ \ M e t e o r o l o g y \ \ a n d \ \ C l i m a t o l o g y} - -\def\jtech{J o u r n a l \ \ o f \ \ A t m o s p h e r i c \ \ a n d \ \ O c e a n i c \ \ T e c h n o l o g y} - -\def\jhm{J o u r n a l \ \ o f \ \ H y d r o m e t e o r o l o g y} - -\def\jpo{J o u r n a l \ \ o f \ \ P h y s i c a l \ \ O c e a n o g r a p h y} - -\def\jas{J o u r n a l \ \ o f \ \ t h e \ \ A t m o s p h e r i c \ \ S c i e n c e s} - -\def\jcli{J o u r n a l \ \ o f \ \ C l i m a t e} - -\def\mwr{M o n t h l y \ \ W e a t h e r \ \ R e v i e w} - -\def\wcas{W e a t h e r, \ \ C l i m a t e, \ \ a n d \ \ S o c i e t y} - -\def\waf{W e a t h e r \ \ a n d \ \ F o r e c a s t i n g} - -\def\bams{B u l l e t i n \ \ o f \ \ t h e \ \ A m e r i c a n \ \ M e t e o r o l o g i c a l \ \ S o c i e t y} - -\def\ei{E a r t h \ \ I n t e r a c t i o n s} - -\def\theyear{\the\year} -\def\curryear#1{\def\theyear{#1}} -\endinput diff --git a/macros/latex/contrib/ametsoc/ametsoc2014.bst b/macros/latex/contrib/ametsoc/ametsoc2014.bst deleted file mode 100644 index 4fb598c363..0000000000 --- a/macros/latex/contrib/ametsoc/ametsoc2014.bst +++ /dev/null @@ -1,1745 +0,0 @@ -%% Updated 7 May 2014 -%% -%% This is file `ametsoc_2014.bst', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% merlin.mbs (with options: `ay,nat,nm-rev1,jnrlst,nmlm,x8,m1,keyxyr,dt-beg,yr-com,yrp-col,note-yr,thtit-a,vol-2bf,vnum-sp,volp-com,pgsep-s,num-xser,numser,ser-vol,bkpg-x,pg-bk,pre-edn,agu-doi,doi,edparc,bkedcap,edby,edbyy,blk-tit,in-x,pp,ed,abr,ednx,ord,jabr,eprint,url,url-nt,em-it,nfss,') -%% ---------------------------------------- -%% *** Bibliography style for all AMS Journals and BAMS *** -%% -%% Copyright 1994-2005 Patrick W Daly -%% Updated 2014 Nicole Rietmann - % =============================================================== - % IMPORTANT NOTICE: - % This bibliographic style (bst) file has been generated from one or - % more master bibliographic style (mbs) files, listed above. - % - % This generated file can be redistributed and/or modified under the terms - % of the LaTeX Project Public License Distributed from CTAN - % archives in directory macros/latex/base/lppl.txt; either - % version 1 of the License, or any later version. - % =============================================================== - % Name and version information of the main mbs file: - % \ProvidesFile{merlin.mbs}[2005/10/17 4.14 (PWD, AO, DPC)] - % For use with BibTeX version 0.99a or later - %------------------------------------------------------------------- - % This bibliography style file is intended for texts in ENGLISH - % This is an author-year citation style bibliography. As such, it is - % non-standard LaTeX, and requires a special package file to function properly. - % Such a package is natbib.sty by Patrick W. Daly - % The form of the \bibitem entries is - % \bibitem[Jones et al.(1990)]{key}... - % \bibitem[Jones et al.(1990)Jones, Baker, and Smith]{key}... - % The essential feature is that the label (the part in brackets) consists - % of the author names, as they should appear in the citation, with the year - % in parentheses following. There must be no space before the opening - % parenthesis! - % With natbib v5.3, a full list of authors may also follow the year. - % In natbib.sty, it is possible to define the type of enclosures that is - % really wanted (brackets or parentheses), but in either case, there must - % be parentheses in the label. - % The \cite command functions as follows: - % \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al. 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al. 1990, chap. 2) - % \citep[e.g.,][]{key} ==>> (e.g., Jones et al. 1990) - % \citep[e.g.,][p. 32]{key} ==>> (e.g., Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 - %--------------------------------------------------------------------- - -ENTRY - { address - archive - author - booktitle - chapter - doi - edition - editor - eid - eprint - howpublished - department - institution - journal - key - month - note - number - organization - pages - publisher - school - series - title - type - url - volume - year - } - {} - { label extra.label sort.label short.list } -INTEGERS { output.state before.all mid.sentence after.sentence after.block } -FUNCTION {init.state.consts} -{ #0 'before.all := - #1 'mid.sentence := - #2 'after.sentence := - #3 'after.block := -} -STRINGS { s t} -FUNCTION {output.nonnull} -{ 's := - output.state mid.sentence = - { ", " * write$ } - { output.state after.block = - { add.period$ write$ - newline$ - "\newblock " write$ - } - { output.state before.all = - 'write$ - { add.period$ " " * write$ } - if$ - } - if$ - mid.sentence 'output.state := - } - if$ - s -} -FUNCTION {output} -{ duplicate$ empty$ - 'pop$ - 'output.nonnull - if$ -} -FUNCTION {output.check} -{ 't := - duplicate$ empty$ - { pop$ "empty " t * " in " * cite$ * warning$ } - 'output.nonnull - if$ -} -FUNCTION {fin.entry} -{ add.period$ - write$ - newline$ -} - -FUNCTION {new.block} -{ output.state before.all = - 'skip$ - { after.block 'output.state := } - if$ -} -FUNCTION {new.sentence} -{ output.state after.block = - 'skip$ - { output.state before.all = - 'skip$ - { after.sentence 'output.state := } - if$ - } - if$ -} -FUNCTION {add.blank} -{ " " * before.all 'output.state := -} - -FUNCTION {date.block} -{ - ":" * - add.blank -} - -FUNCTION {not} -{ { #0 } - { #1 } - if$ -} -FUNCTION {and} -{ 'skip$ - { pop$ #0 } - if$ -} -FUNCTION {or} -{ { pop$ #1 } - 'skip$ - if$ -} -FUNCTION {new.block.checkb} -{ empty$ - swap$ empty$ - and - 'skip$ - 'new.block - if$ -} -FUNCTION {field.or.null} -{ duplicate$ empty$ - { pop$ "" } - 'skip$ - if$ -} -FUNCTION {emphasize} -{ duplicate$ empty$ - { pop$ "" } - { "\textit{" swap$ * "}" * } - if$ -} -FUNCTION {bolden} -{ duplicate$ empty$ - { pop$ "" } - { "\textbf{" swap$ * "}" * } - if$ -} -FUNCTION {tie.or.space.prefix} -{ duplicate$ text.length$ #3 < - { "~" } - { " " } - if$ - swap$ -} - -FUNCTION {capitalize} -{ "u" change.case$ "t" change.case$ } - -FUNCTION {space.word} -{ " " swap$ * " " * } - % Here are the language-specific definitions for explicit words. - % Each function has a name bbl.xxx where xxx is the English word. - % The language selected here is ENGLISH -FUNCTION {bbl.and} -{ "and"} - -FUNCTION {bbl.cand} -{ ", and"} - -FUNCTION {bbl.etal} -{ "et~al." } - -FUNCTION {bbl.editors} -{ "Eds." } - -FUNCTION {bbl.editor} -{ "Ed." } - -FUNCTION {bbl.edby} -{ "edited by" } - -FUNCTION {bbl.edition} -{ "ed." } - -FUNCTION {bbl.volume} -{ "Vol." } - -FUNCTION {bbl.of} -{ "of" } - -FUNCTION {bbl.number} -{ "No." } - -FUNCTION {bbl.nr} -{ "No." } - -FUNCTION {bbl.in} -{ "in" } - -FUNCTION {bbl.pages} -{ "pp." } - -FUNCTION {bbl.page} -{ "p." } - -FUNCTION {bbl.chapter} -{ "chap." } - -FUNCTION {bbl.techrep} -{ "Tech. Rep." } - -FUNCTION {bbl.mthesis} -{ "M.S. thesis" } - -FUNCTION {bbl.phdthesis} -{ "Ph.D. thesis" } - -FUNCTION {bbl.first} -{ "1st" } - -FUNCTION {bbl.second} -{ "2nd" } - -FUNCTION {bbl.third} -{ "3rd" } - -FUNCTION {bbl.fourth} -{ "4th" } - -FUNCTION {bbl.fifth} -{ "5th" } - -FUNCTION {bbl.st} -{ "st" } - -FUNCTION {bbl.nd} -{ "nd" } - -FUNCTION {bbl.rd} -{ "rd" } - -FUNCTION {bbl.th} -{ "th" } - -MACRO {jan} {"Jan."} - -MACRO {feb} {"Feb."} - -MACRO {mar} {"Mar."} - -MACRO {apr} {"Apr."} - -MACRO {may} {"May"} - -MACRO {jun} {"Jun."} - -MACRO {jul} {"Jul."} - -MACRO {aug} {"Aug."} - -MACRO {sep} {"Sep."} - -MACRO {oct} {"Oct."} - -MACRO {nov} {"Nov."} - -MACRO {dec} {"Dec."} - -FUNCTION {eng.ord} -{ duplicate$ "1" swap$ * - #-2 #1 substring$ "1" = - { bbl.th * } - { duplicate$ #-1 #1 substring$ - duplicate$ "1" = - { pop$ bbl.st * } - { duplicate$ "2" = - { pop$ bbl.nd * } - { "3" = - { bbl.rd * } - { bbl.th * } - if$ - } - if$ - } - if$ - } - if$ -} - -MACRO {acmcs} {"ACM Comput. Surv."} - -MACRO {acta} {"Acta Inf."} - -MACRO {cacm} {"Commun. ACM"} - -MACRO {ibmjrd} {"IBM J. Res. Dev."} - -MACRO {ibmsj} {"IBM Syst.~J."} - -MACRO {ieeese} {"IEEE Trans. Software Eng."} - -MACRO {ieeetc} {"IEEE Trans. Comput."} - -MACRO {ieeetcad} - {"IEEE Trans. Comput. Aid. Des."} - -MACRO {ipl} {"Inf. Process. Lett."} - -MACRO {jacm} {"J.~ACM"} - -MACRO {jcss} {"J.~Comput. Syst. Sci."} - -MACRO {scp} {"Sci. Comput. Program."} - -MACRO {sicomp} {"SIAM J. Comput."} - -MACRO {tocs} {"ACM Trans. Comput. Syst."} - -MACRO {tods} {"ACM Trans. Database Syst."} - -MACRO {tog} {"ACM Trans. Graphic."} - -MACRO {toms} {"ACM Trans. Math. Software"} - -MACRO {toois} {"ACM Trans. Office Inf. Syst."} - -MACRO {toplas} {"ACM Trans. Progr. Lang. Syst."} - -MACRO {tcs} {"Theor. Comput. Sci."} - -FUNCTION {bibinfo.check} -{ swap$ - duplicate$ missing$ - { - pop$ pop$ - "" - } - { duplicate$ empty$ - { - swap$ pop$ - } - { swap$ - pop$ - } - if$ - } - if$ -} -FUNCTION {bibinfo.warn} -{ swap$ - duplicate$ missing$ - { - swap$ "missing " swap$ * " in " * cite$ * warning$ pop$ - "" - } - { duplicate$ empty$ - { - swap$ "empty " swap$ * " in " * cite$ * warning$ - } - { swap$ - pop$ - } - if$ - } - if$ -} -FUNCTION {format.eprint} -{ eprint duplicate$ empty$ - 'skip$ - { "\eprint" - archive empty$ - 'skip$ - { "[" * archive * "]" * } - if$ - "{" * swap$ * "}" * - } - if$ -} -STRINGS { bibinfo} -INTEGERS { nameptr namesleft numnames } - -FUNCTION {format.names} -{ 'bibinfo := - duplicate$ empty$ 'skip$ { - 's := - "" 't := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr - duplicate$ #1 > - { "{f.~}{vv~}{ll}{, jj}" } - { "{vv~}{ll}{, f.}{, jj}" } - if$ - format.name$ - bibinfo bibinfo.check - 't := - nameptr #1 > - { - nameptr #1 - #1 + = - numnames #8 - > and - { "others" 't := - #1 'namesleft := } - 'skip$ - if$ - namesleft #1 > - { ", " * t * } - { t "others" = - { ", and Coauthors" * } - { ", and " * t * } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ - } if$ -} -FUNCTION {format.names.ed} -{ - 'bibinfo := - duplicate$ empty$ 'skip$ { - 's := - "" 't := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr - "{f.~}{vv~}{ll}{, jj}" - format.name$ - bibinfo bibinfo.check - 't := - nameptr #1 > - { - namesleft #1 > - { ", " * t * } - { t "others" = - { " et~al." * } - { ", and " * t * } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ - } if$ -} -FUNCTION {format.key} -{ empty$ - { key field.or.null } - { "" } - if$ -} - -FUNCTION {format.authors} -{ author "author" format.names -} -FUNCTION {get.bbl.editor} -{ editor num.names$ #1 > 'bbl.editors 'bbl.editor if$ } - -FUNCTION {format.editors} -{ editor "editor" format.names duplicate$ empty$ 'skip$ - { - "," * - " " * - get.bbl.editor - capitalize - % " " swap$ * "," * - * - } - if$ -} -FUNCTION {format.conf.pages} -{ pages "pages" bibinfo.check} - -FUNCTION {format.book.pages} -{ pages "pages" bibinfo.check - duplicate$ empty$ 'skip$ - { " " * bbl.pages * } - if$ -} -FUNCTION {format.doi} -{ doi "doi" bibinfo.check - duplicate$ empty$ 'skip$ - { - "\doi{" swap$ * "}" * - } - if$ -} -FUNCTION {format.note} -{ - url empty$ - 'skip$ - { "\urlprefix\url{" url * "}" * output } - if$ - note empty$ - { "" } - { note #1 #1 substring$ - duplicate$ "{" = - 'skip$ - { output.state mid.sentence = - { "l" } - { "u" } - if$ - change.case$ - } - if$ - note #2 global.max$ substring$ * "note" bibinfo.check - } - if$ -} - -FUNCTION {format.title} -{ title - duplicate$ empty$ 'skip$ - { "t" change.case$ } - if$ - "title" bibinfo.check -} -FUNCTION {format.full.names} -{'s := - "" 't := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr - "{vv~}{ll}" format.name$ - 't := - nameptr #1 > - { - nameptr #1 - #1 + = - numnames #8 - > and - { "others" 't := - #1 'namesleft := } - 'skip$ - if$ - namesleft #1 > - { ", " * t * } - { - s nameptr "{ll}" format.name$ duplicate$ "others" = - { 't := } - { pop$ } - if$ - t "others" = - { - " " * bbl.etal * - } - { - numnames #2 > - { "," * } - 'skip$ - if$ - ", and " - * t * - } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {author.editor.key.full} -{ author empty$ - { editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.full.names } - if$ - } - { author format.full.names } - if$ -} - -FUNCTION {author.key.full} -{ author empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { author format.full.names } - if$ -} - -FUNCTION {editor.key.full} -{ editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.full.names } - if$ -} - -FUNCTION {make.full.names} -{ type$ "book" = - type$ "inbook" = - or - 'author.editor.key.full - { type$ "proceedings" = - 'editor.key.full - 'author.key.full - if$ - } - if$ -} - -FUNCTION {output.bibitem} -{ newline$ - "\bibitem[{" write$ - label write$ - ")" make.full.names duplicate$ short.list = - { pop$ } - { * } - if$ - "}]{" * write$ - cite$ write$ - "}" write$ - newline$ - "" - before.all 'output.state := -} - -FUNCTION {if.digit} -{ duplicate$ "0" = - swap$ duplicate$ "1" = - swap$ duplicate$ "2" = - swap$ duplicate$ "3" = - swap$ duplicate$ "4" = - swap$ duplicate$ "5" = - swap$ duplicate$ "6" = - swap$ duplicate$ "7" = - swap$ duplicate$ "8" = - swap$ "9" = or or or or or or or or or -} -FUNCTION {n.separate} -{ 't := - "" - #0 'numnames := - { t empty$ not } - { t #-1 #1 substring$ if.digit - { numnames #1 + 'numnames := } - { #0 'numnames := } - if$ - t #-1 #1 substring$ swap$ * - t #-2 global.max$ substring$ 't := - numnames #5 = - { duplicate$ #1 #2 substring$ swap$ - #3 global.max$ substring$ - "\," swap$ * * - } - 'skip$ - if$ - } - while$ -} -FUNCTION {n.dashify} -{ - n.separate - 't := - "" - { t empty$ not } - { t #1 #1 substring$ "-" = - { t #1 #2 substring$ "--" = not - { "--" * - t #2 global.max$ substring$ 't := - } - { { t #1 #1 substring$ "-" = } - { "-" * - t #2 global.max$ substring$ 't := - } - while$ - } - if$ - } - { t #1 #1 substring$ * - t #2 global.max$ substring$ 't := - } - if$ - } - while$ -} - -FUNCTION {word.in} -{ "" } - -FUNCTION {format.date} -{ year "year" bibinfo.check duplicate$ empty$ - { - "empty year in " cite$ * "; set to ????" * warning$ - pop$ "????" - } - 'skip$ - if$ - extra.label * - before.all 'output.state := - ", " swap$ * -} -FUNCTION {format.btitle} -{ title "title" bibinfo.check - duplicate$ empty$ 'skip$ - { - emphasize - } - if$ -} -FUNCTION {either.or.check} -{ empty$ - 'pop$ - { "can't use both " swap$ * " fields in " * cite$ * warning$ } - if$ -} -FUNCTION {format.bvolume} -{ volume empty$ - { "" } - { bbl.volume volume tie.or.space.prefix - "volume" bibinfo.check * * - series "series" bibinfo.check - duplicate$ empty$ 'pop$ -%%% NO ITALIC SERIES { emphasize ", " * swap$ * } - {", " * swap$ * } - if$ - "volume and number" number either.or.check - } - if$ -} -FUNCTION {format.number.series} -{ volume empty$ - { number empty$ - { series field.or.null } - { series empty$ - { number "number" bibinfo.check } - { output.state mid.sentence = - { bbl.number } - { bbl.number capitalize } - if$ - number tie.or.space.prefix "number" bibinfo.check * * - "," * " " * - series "series" bibinfo.check * - } - if$ - } - if$ - } - { "" } - if$ -} -FUNCTION {is.num} -{ chr.to.int$ - duplicate$ "0" chr.to.int$ < not - swap$ "9" chr.to.int$ > not and -} - -FUNCTION {extract.num} -{ duplicate$ 't := - "" 's := - { t empty$ not } - { t #1 #1 substring$ - t #2 global.max$ substring$ 't := - duplicate$ is.num - { s swap$ * 's := } - { pop$ "" 't := } - if$ - } - while$ - s empty$ - 'skip$ - { pop$ s } - if$ -} - -FUNCTION {convert.edition} -{ extract.num "l" change.case$ 's := - s "first" = s "1" = or - { bbl.first 't := } - { s "second" = s "2" = or - { bbl.second 't := } - { s "third" = s "3" = or - { bbl.third 't := } - { s "fourth" = s "4" = or - { bbl.fourth 't := } - { s "fifth" = s "5" = or - { bbl.fifth 't := } - { s #1 #1 substring$ is.num - { s eng.ord 't := } - { edition 't := } - if$ - } - if$ - } - if$ - } - if$ - } - if$ - } - if$ - t -} - -FUNCTION {format.edition} -{ edition duplicate$ empty$ 'skip$ - { - convert.edition - output.state mid.sentence = - { "l" } - { "t" } - if$ change.case$ - "edition" bibinfo.check - " " * bbl.edition * - } - if$ -} -INTEGERS { multiresult } -FUNCTION {multi.page.check} -{ 't := - #0 'multiresult := - { multiresult not - t empty$ not - and - } - { t #1 #1 substring$ - duplicate$ "-" = - swap$ duplicate$ "," = - swap$ "+" = - or or - { #1 'multiresult := } - { t #2 global.max$ substring$ 't := } - if$ - } - while$ - multiresult -} -FUNCTION {format.pages} -{ pages duplicate$ empty$ 'skip$ - { duplicate$ multi.page.check - { - n.dashify - } - { - } - if$ - "pages" bibinfo.check - } - if$ -} -FUNCTION {format.journal.pages} -{ pages duplicate$ empty$ 'pop$ - { swap$ duplicate$ empty$ - { pop$ pop$ format.pages } - { - ", " * - swap$ - n.dashify - "pages" bibinfo.check - * - } - if$ - } - if$ -} -FUNCTION {format.journal.eid} -{ eid "eid" bibinfo.check - duplicate$ empty$ 'pop$ - { swap$ duplicate$ empty$ 'skip$ - { - ", " * - } - if$ - swap$ * - } - if$ -} -FUNCTION {format.vol.num.pages} -{ volume field.or.null - duplicate$ empty$ 'skip$ - { - "volume" bibinfo.check - } - if$ - number "number" bibinfo.check duplicate$ empty$ 'skip$ - { - swap$ duplicate$ empty$ - { "there's a number but no volume in " cite$ * warning$ } - 'skip$ - if$ - swap$ - "~(" swap$ * ")" * - } - if$ * - bolden - eid empty$ - { format.journal.pages } - { format.journal.eid } - if$ -} - -FUNCTION {format.chapter.pages} -{ chapter empty$ - 'format.pages - { type empty$ - { bbl.chapter } - { type "l" change.case$ - "type" bibinfo.check - } - if$ - chapter tie.or.space.prefix - "chapter" bibinfo.check - * * - pages empty$ - 'skip$ - { ", " * format.pages * } - if$ - } - if$ -} - -FUNCTION {format.booktitle} -{ - booktitle "booktitle" bibinfo.check - emphasize -} -FUNCTION {format.bktitle} -{ - booktitle "booktitle" bibinfo.check -} -FUNCTION {format.in.ed.booktitle} -{ format.booktitle duplicate$ empty$ 'skip$ - { - editor "editor" format.names.ed duplicate$ empty$ 'pop$ - { - get.bbl.editor - swap$ "," * - " " * swap$ * - swap$ - "," * - " " * swap$ - * } - if$ - word.in swap$ * - } - if$ -} -FUNCTION {format.thesis.type} -{ type duplicate$ empty$ - 'pop$ - { swap$ pop$ - "t" change.case$ "type" bibinfo.check - } - if$ -} -FUNCTION {format.tr.number} -{ number "number" bibinfo.check - type duplicate$ empty$ - { pop$ bbl.techrep } - 'skip$ - if$ - "type" bibinfo.check - swap$ duplicate$ empty$ - { pop$ "t" change.case$ } - { tie.or.space.prefix * * } - if$ -} -FUNCTION {format.article.crossref} -{ - word.in - " \cite{" * crossref * "}" * -} -FUNCTION {format.book.crossref} -{ volume duplicate$ empty$ - { "empty volume in " cite$ * "'s crossref of " * crossref * warning$ - pop$ word.in - } - { bbl.volume - capitalize - swap$ tie.or.space.prefix "volume" bibinfo.check * * bbl.of space.word * - } - if$ - " \cite{" * crossref * "}" * -} -FUNCTION {format.incoll.inproc.crossref} -{ - word.in - " \cite{" * crossref * "}" * -} -FUNCTION {format.org.or.pub} -{ 't := - "" - address empty$ t empty$ and - 'skip$ - { - t empty$ - { address "address" bibinfo.check * - } - { t * - address empty$ - 'skip$ - { ", " * address "address" bibinfo.check * } - if$ - } - if$ - } - if$ -} -FUNCTION {format.publisher.address} -{ publisher "publisher" bibinfo.warn format.org.or.pub -} - -FUNCTION {format.organization.address} -{ format.org.or.pub organization "organization" bibinfo.check -} - -FUNCTION {article} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title "title" output.check - new.sentence - crossref missing$ - { - journal - "journal" bibinfo.check - emphasize - "journal" output.check - format.vol.num.pages output - format.doi output - } - { format.article.crossref output.nonnull - format.pages output - } - if$ - format.note output - format.eprint output - fin.entry -} -FUNCTION {book} -{ output.bibitem - author empty$ - { format.editors "author and editor" output.check - editor format.key output - %add.blank - } - { format.authors output.nonnull - crossref missing$ - { "author and editor" editor either.or.check } - 'skip$ - if$ - } - if$ - format.date "year" output.check - date.block - format.btitle "title" output.check - crossref missing$ - { format.bvolume output - new.sentence - format.edition output - format.number.series output - format.publisher.address output - } - { - new.sentence - format.book.crossref output.nonnull - } - if$ - format.book.pages output - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {booklet} -{ output.bibitem - format.authors output - author format.key output - format.date "year" output.check - date.block - format.title "title" output.check - new.sentence - howpublished "howpublished" bibinfo.check output - address "address" bibinfo.check output - format.book.pages output - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {inbook} -{ output.bibitem - author empty$ - { format.editors "author and editor" output.check - editor format.key output - } - { format.authors output.nonnull - crossref missing$ - { "author and editor" editor either.or.check } - 'skip$ - if$ - } - if$ - format.date "year" output.check - date.block - format.btitle "title" output.check - crossref missing$ - { - format.bvolume output - format.chapter.pages "chapter and pages" output.check - new.sentence - format.edition output - format.number.series output - format.publisher.address output - } - { - format.chapter.pages "chapter and pages" output.check - new.sentence - format.book.crossref output.nonnull - } - if$ - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {incollection} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title "title" output.check - new.sentence - crossref missing$ - { format.in.ed.booktitle "booktitle" output.check - format.bvolume output - format.number.series output - format.edition output - format.publisher.address output - format.chapter.pages output - } - { format.incoll.inproc.crossref output.nonnull - format.chapter.pages output - } - if$ - format.doi output - format.note output - format.eprint output - fin.entry -} -FUNCTION {inproceedings} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title "title" output.check - new.sentence - crossref missing$ - { format.in.ed.booktitle "booktitle" output.check - - publisher empty$ - { format.organization.address output } - { format.publisher.address output - organization "organization" bibinfo.check output - - } - if$ - format.bvolume output - howpublished "howpublished" bibinfo.check output - format.pages output - format.number.series output - } - { format.incoll.inproc.crossref output.nonnull - format.pages output - } - if$ - format.doi output - format.note output - format.eprint output - fin.entry -} -FUNCTION {conference} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title "title" output.check - new.sentence - crossref missing$ - { format.in.ed.booktitle "booktitle" output.check - - publisher empty$ - { format.organization.address output } - { format.publisher.address output - organization "organization" bibinfo.check output - } - if$ - format.bvolume output - howpublished "howpublished" bibinfo.check output - format.conf.pages output - format.number.series output - } - { format.incoll.inproc.crossref output.nonnull - format.conf.pages output - } - if$ - format.doi output - format.note output - format.eprint output - fin.entry -} -FUNCTION {manual} -{ output.bibitem - format.authors output - author format.key output - format.date "year" output.check - date.block - format.btitle "title" output.check - new.sentence - address "address" bibinfo.check output - organization "organization" bibinfo.check output - format.edition output - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {mastersthesis} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title - "title" output.check - new.sentence - bbl.mthesis format.thesis.type output.nonnull - department "department" bibinfo.warn output - school "school" bibinfo.warn output - format.book.pages output - address "address" bibinfo.check output - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {misc} -{ output.bibitem - format.authors output - author format.key output - format.date "year" output.check - date.block - format.number.series output - new.sentence - format.title output - new.sentence - format.publisher.address output - format.note output - format.book.pages output - howpublished "howpublished" bibinfo.check output - format.doi output - format.eprint output - fin.entry -} - -FUNCTION {atlas} -{ output.bibitem - format.authors output "author" output.check - author format.key output - format.date "year" output.check - date.block - format.number.series output - new.sentence - format.btitle "title" output.check - format.publisher.address output - format.note output -% format.book.pages output - fin.entry -} - -FUNCTION {phdthesis} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title - "title" output.check - new.sentence - bbl.phdthesis format.thesis.type output.nonnull - school "school" bibinfo.warn output - format.book.pages output - address "address" bibinfo.check output - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {proceedings} -{ output.bibitem - format.editors output - editor format.key output - format.date "year" output.check - date.block - format.btitle "title" output.check - format.bvolume output - format.number.series output - publisher empty$ - { format.organization.address output } - { organization "organization" bibinfo.check output - format.publisher.address output - } - if$ - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {techreport} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title - "title" output.check - new.sentence - format.tr.number output.nonnull - howpublished "howpublished" bibinfo.check output - institution "institution" bibinfo.warn output -address "address" bibinfo.check output - format.book.pages output - new.sentence - format.doi output - format.note output - format.eprint output - fin.entry -} - -FUNCTION {unpublished} -{ output.bibitem - format.authors "author" output.check - author format.key output - format.date "year" output.check - date.block - format.title "title" output.check - format.doi output - format.note "note" output.check - format.eprint output - fin.entry -} - -FUNCTION {default.type} { misc } -READ -FUNCTION {sortify} -{ purify$ - "l" change.case$ -} -INTEGERS { len } -FUNCTION {chop.word} -{ 's := - 'len := - s #1 len substring$ = - { s len #1 + global.max$ substring$ } - 's - if$ -} -FUNCTION {format.lab.names} -{ 's := - "" 't := - s #1 "{vv~}{ll}" format.name$ - s num.names$ duplicate$ - #2 > - { pop$ - " " * bbl.etal * - } - { #2 < - 'skip$ - { s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = - { - " " * bbl.etal * - } - { bbl.and space.word * s #2 "{vv~}{ll}" format.name$ - * } - if$ - } - if$ - } - if$ -} - -FUNCTION {author.key.label} -{ author empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {author.editor.key.label} -{ author empty$ - { editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.lab.names } - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {editor.key.label} -{ editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.lab.names } - if$ -} - -FUNCTION {calc.short.authors} -{ type$ "book" = - type$ "inbook" = - or - 'author.editor.key.label - { type$ "proceedings" = - 'editor.key.label - 'author.key.label - if$ - } - if$ - 'short.list := -} - -FUNCTION {calc.label} -{ calc.short.authors - short.list - "(" - * - year duplicate$ empty$ - short.list key field.or.null = or - { pop$ "" } - 'skip$ - if$ - * - 'label := -} - -FUNCTION {sort.format.names} -{ 's := - #1 'nameptr := - "" - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr - "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" - format.name$ 't := - nameptr #1 > - { - nameptr #1 - #1 + = - numnames #8 - > and - { "others" 't := - #1 'namesleft := } - 'skip$ - if$ - " " * - namesleft #1 = t "others" = and - { "zzzzz" * } - { t sortify * } - if$ - } - { t sortify * } - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {sort.format.title} -{ 't := - "A " #2 - "An " #3 - "The " #4 t chop.word - chop.word - chop.word - sortify - #1 global.max$ substring$ -} -FUNCTION {author.sort} -{ author empty$ - { key empty$ - { "to sort, need author or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { author sort.format.names } - if$ -} -FUNCTION {author.editor.sort} -{ author empty$ - { editor empty$ - { key empty$ - { "to sort, need author, editor, or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { editor sort.format.names } - if$ - } - { author sort.format.names } - if$ -} -FUNCTION {editor.sort} -{ editor empty$ - { key empty$ - { "to sort, need editor or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { editor sort.format.names } - if$ -} -FUNCTION {presort} -{ calc.label - label sortify - " " - * - type$ "book" = - type$ "inbook" = - or - 'author.editor.sort - { type$ "proceedings" = - 'editor.sort - 'author.sort - if$ - } - if$ - #1 entry.max$ substring$ - 'sort.label := - sort.label - * - " " - * - title field.or.null - sort.format.title - * - #1 entry.max$ substring$ - 'sort.key$ := -} - -ITERATE {presort} -SORT -STRINGS { last.label next.extra } -INTEGERS { last.extra.num number.label } -FUNCTION {initialize.extra.label.stuff} -{ #0 int.to.chr$ 'last.label := - "" 'next.extra := - #0 'last.extra.num := - #0 'number.label := -} -FUNCTION {forward.pass} -{ last.label label = - { last.extra.num #1 + 'last.extra.num := - last.extra.num int.to.chr$ 'extra.label := - } - { "a" chr.to.int$ 'last.extra.num := - "" 'extra.label := - label 'last.label := - } - if$ - number.label #1 + 'number.label := -} -FUNCTION {reverse.pass} -{ next.extra "b" = - { "a" 'extra.label := } - 'skip$ - if$ - extra.label 'next.extra := - extra.label - duplicate$ empty$ - 'skip$ - { "{\natexlab{" swap$ * "}}" * } - if$ - 'extra.label := - label extra.label * 'label := -} -EXECUTE {initialize.extra.label.stuff} -ITERATE {forward.pass} -REVERSE {reverse.pass} -FUNCTION {bib.sort.order} -{ sort.label - " " - * - year field.or.null sortify - * - " " - * - title field.or.null - sort.format.title - * - #1 entry.max$ substring$ - 'sort.key$ := -} -ITERATE {bib.sort.order} -SORT -FUNCTION {begin.bib} -{ preamble$ empty$ - 'skip$ - { preamble$ write$ newline$ } - if$ - "\begin{thebibliography}{" number.label int.to.str$ * "}" * - write$ newline$ - "\providecommand{\natexlab}[1]{#1}" - write$ newline$ - "\providecommand{\url}[1]{\texttt{#1}}" - write$ newline$ - "\renewcommand{\UrlFont}{\rmfamily}" - write$ newline$ - "\providecommand{\urlprefix}{URL }" - write$ newline$ - "\expandafter\ifx\csname urlstyle\endcsname\relax" - write$ newline$ - " \providecommand{\doi}[1]{doi:\discretionary{}{}{}#1}\else" - write$ newline$ - " \providecommand{\doi}{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url}\fi" - write$ newline$ - "\providecommand{\eprint}[2][]{\url{#2}}" - write$ newline$ -} -EXECUTE {begin.bib} -EXECUTE {init.state.consts} -ITERATE {call.type$} -FUNCTION {end.bib} -{ newline$ - "\end{thebibliography}" write$ newline$ -} -EXECUTE {end.bib} -%% End of customized bst file -%% -%% End of file `ametsoc_V2.bst'. diff --git a/macros/latex/contrib/ametsoc/amsdocs.pdf b/macros/latex/contrib/ametsoc/amsdocs.pdf Binary files differdeleted file mode 100644 index 1c4c97060e..0000000000 --- a/macros/latex/contrib/ametsoc/amsdocs.pdf +++ /dev/null diff --git a/macros/latex/contrib/ametsoc/references.bib b/macros/latex/contrib/ametsoc/references.bib deleted file mode 100644 index 01891a64f9..0000000000 --- a/macros/latex/contrib/ametsoc/references.bib +++ /dev/null @@ -1,138 +0,0 @@ -% -% JOURNAL ABBREVIATIONS -% -@STRING{AMS = "Amer.\ Meteor.\ Soc."} -@STRING{AGU = "Amer.\ Geophys.\ Union"} -@STRING{AIP = "Amer. Inst. Phys."} -@STRING{ADGEO = "Adv.\ Geosci."} -@STRING{AFM = "Agric.\ For.\ Meteor."} -@STRING{AM = "Ann.\ Meteor."} -@STRING{AN = "Astrophys.\ Norv."} % Astrophysica Norvegica -@STRING{AO = "Atmos.--Ocean"} % Atmosphere--Ocean, published by Canadian Meteorological Society (CMOS) -@STRING{AR = "Atmos.\ Res."} % Atmospheric Research -@STRING{ARFM = "Annu.\ Rev.\ Fluid Mech."} -@STRING{AUMET = "Aust.\ Meteor.\ Mag."} -@STRING{BAMS = "Bull.\ Amer.\ Meteor.\ Soc."} -@STRING{CAP = "Contrib.\ Atmos.\ Phys."} -@STRING{CC = "Climate Change"} % Climate Change -@STRING{CCH = "Climatic Change"} % Climatic Change -@STRING{CDYN = "Climate Dyn."} -@STRING{CHAOS = "Chaos"} -@STRING{COL = "Collier's"} -@STRING{CRS = "Cont.\ Shelf Res."} -@STRING{DAO = "Dyn.\ Atmos.\ Oceans"} -@STRING{ECO = "Ecology"} -@STRING{EI = "Earth Interact."} -@STRING{GA = "Geophysica"} % Geophysica, published by Geophysical Society of Finland -@STRING{GEOMAG = "Geophys.\ Mag."} -@STRING{GN = "Geophys.\ Norv."} % Geophysica Norvegica -@STRING{GRL = "Geophys.\ Res.\ Lett."} -@STRING{GEOINT = "Geofis.\ Int."} % Geofisica Internacional (Mexican journal -- vols. 3--5 contained proceedings from a hurricane conference -@STRING{GEOPUB = "Geofys.\ Publ."} -@STRING{GPC = "Global Planet.\ Change"} -@STRING{HP = "Health Phys."} -@STRING{IAOP = "Izv.\ Atmos.\ Ocean.\ Phys.\ (Engl.\ Transl.)"} -@STRING{IJC = "Int.\ J.\ Climatol."} -@STRING{JAM = "J.\ Appl.\ Meteor."} % renamed to name below in 2006 -@STRING{JAMC = "J.\ Appl.\ Meteor.\ Climatol."} % Journal of Applied Meteorology and Climatology (this journal used to be called the Journal of Applied Meteorology before 2006) -@STRING{JAS = "J.\ Atmos.\ Sci."} -@STRING{JAOT = "J.\ Atmos.\ Oceanic Technol."} -@STRING{JCAM = "J.\ Climate Appl.\ Meteor."} % from 1983--87, now JAMC -@STRING{JCLI = "J.\ Climate"} -@STRING{JCR = "J.\ Coastal Res."} -@STRING{JFM = "J.\ Fluid\ Mech."} -@STRING{JEM = "J.\ Eng.\ Math."} % Journal of Engineering Mathematics -@STRING{JGR = "J.\ Geophys.\ Res."} -@STRING{JHM = "J.\ Hydrometeor."} -@STRING{JMS = "J.\ Mar.\ Syst."} -@STRING{JM = "J.\ Meteor."} -@STRING{JMR = "J.\ Mar.\ Res."} -@STRING{JMSJ = "J.\ Meteor.\ Soc.\ Japan"} -@STRING{JPO = "J.\ Phys.\ Oceanogr."} -@STRING{JOCEAN = "J.\ Oceanogr."} % Journal of Oceanography -@STRING{JOSJ = "J.\ Oceanogr.\ Soc.\ Japan"} -@STRING{JSE = "J.\ Struct.\ Eng."} % Journal of Structural Engineering at ASCE -@STRING{JTM = "J.\ Tropical Meteor."} -@STRING{JWEIA = "J.\ Wind Eng.\ Ind.\ Aerodyn."} -@STRING{MA = "Meteor.\ Appl."} -@STRING{MAP = "Meteor.\ Atmos.\ Phys."} -@STRING{METMON = "Meteor.\ Monogr."} -@STRING{METZEIT = "Meteor.\ Z."} -@STRING{MWL = "Mar.\ Wea.\ Log"} -@STRING{MWR = "Mon.\ Wea.\ Rev."} -@STRING{NAT = "Nature"} -@STRING{NHR = "Nat.\ Hazards Rev."} -@STRING{NWD = "Natl.\ Weather Dig."} -@STRING{OA = "Oceanol. Aeta"} -@STRING{OCEAN = "Oceanography"} % a quarterly journal of The Oceanography Society -@STRING{PAG = "Pure Appl.\ Geophys."} -@STRING{PF = "Phys.\ Fluids"} -@STRING{PHYSD = "Physica D"} -@STRING{PMG = "Pap.\ Meteor.\ Geophys."} % Papers in Meteorology and Geophysics -@STRING{PNAS = "Proc.\ Natl.\ Acad.\ Sci.\ (USA)"} -@STRING{PRE = "Phys.\ Rev.\ E"} -@STRING{PRSA = "Proc.\ Roy.\ Soc."} -@STRING{PT = "Phys.\ Today"} -@STRING{PTRS = "Philos.\ Trans.\ Roy.\ Soc.\ London"} -@STRING{QJRMS = "Quart.\ J.\ Roy.\ Meteor.\ Soc."} -@STRING{RGEO = "Rev. Geophys."} -@STRING{SCI = "Science"} -@STRING{SOLA = "SOLA"} % Scientific Online Letters on the Atmosphere -@STRING{TAGU = "Eos, Trans.\ Amer.\ Geophys.\ Union"} -@STRING{TELLUS = "Tellus"} -@STRING{TCFD = "Theor.\ Comput.\ Fluid Dyn."} -@STRING{WEA = "Weather"} -@STRING{WW = "Weatherwise"} -@STRING{WF = "Wea.\ Forecasting"} -@STRING{WMOB = "WMO Bull."} - -% SAMPLE REFERENCES. Remove these and insert your own reference database. - -@article{Becker+Schmitz2003, - author = {E. Becker and G. Schmitz}, - title = {Climatological effects of orography and land--sea heating contrasts on the gravity - wave--driven circulation of the mesosphere}, - journal = {J. Atmos. Sci.}, - year = {2003}, - volume = 60, - pages = {103--118}, - doi = {10.1175/1520-0469(2003)060<0103:CEOOAL>2.0.CO;2}} - -@article{Knutti2008, - author={R. Knutti and M. R. Allen and P. Friedlingstein and J. M. Gregory and G. C. Hegerl and G. A. Meeh and M. Meinshausen and J. M. Murphy and G.-K. Plattne and S. C. B. Raper and T. F. Stocker and P. A. Stott and H. Teng and and T. M. L. Wigley}, - title={A review of uncertainties in global temperature projections over the twenty-first century}, - journal = {J. Climate}, - year = {2008}, - volume = 21, - pages = {2651--2663}, - doi = {10.1175/2007JCLI2119.1}} - -@article {EmeryEA1986, -author = {Emery, W. J. and Thomas, A. C. and Collins, M. J. and Crawford, W. R. and Mackas, D. L.}, -title = {An objective method for computing advective surface velocities from sequential infrared satellite images}, -journal = {J. Geophys. Res.}, -volume = {91}, -doi = {10.1029/JC091iC11p12865}, -pages = {12865--12878}, -year = {1986} -} - -@CONFERENCE{Kuji_Nakajima2002, -AUTHOR = {M. Kuji and T. Nakajima}, - YEAR = 2002, - TITLE = {Retrieval of cloud geometrical parameters using remote sensing data}, - BOOKTITLE = {{\rm Preprints,} 11th Conf. on Cloud Physics}, - ADDRESS = {Ogden, UT}, - ORGANIZATION = {Amer. Meteor. Soc.}, - PAGES = {JP1.7}, - NOTE = {[Available online at \url{http://ams.confex.com/ams/pdfpapers/39550.pdf}.]} - -@article {MeixnerEA2002, -author = {T. Meixner and L. A. Bastidas and H. V. Gupta and R. C. Bales}, -title = {Multicriteria parameter estimation for models of stream chemical composition}, -journal = {Water Resour. Res.}, -volume = {38}, -doi = {10.1029/2000WR000112}, -eid = {1027}, -year = {2002} -}
\ No newline at end of file diff --git a/macros/latex/contrib/ametsoc/template.tex b/macros/latex/contrib/ametsoc/template.tex deleted file mode 100644 index c7d447fdac..0000000000 --- a/macros/latex/contrib/ametsoc/template.tex +++ /dev/null @@ -1,223 +0,0 @@ -%% Version 4.3.2, 25 August 2014 -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Template.tex -- LaTeX-based template for submissions to the -% American Meteorological Society -% -% Template developed by Amy Hendrickson, 2013, TeXnology Inc., -% amyh@texnology.com, http://www.texnology.com -% following earlier work by Brian Papa, American Meteorological Society -% -% Email questions to latex@ametsoc.org. -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% PREAMBLE -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%% Start with one of the following: -% DOUBLE-SPACED VERSION FOR SUBMISSION TO THE AMS -\documentclass{ametsoc} - -% TWO-COLUMN JOURNAL PAGE LAYOUT---FOR AUTHOR USE ONLY -% \documentclass[twocol]{ametsoc} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% To be entered only if twocol option is used - -\journal{jamc} - -% Please choose a journal abbreviation to use above from the following list: -% -% 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) - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%Citations should be of the form ``author year'' not ``author, year'' -\bibpunct{(}{)}{;}{a}{}{,} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% To be entered by author: - -%% May use \\ to break lines in title: - -\title{Title here} - -%%% Enter authors' names, as you see in this example: -%%% Use \correspondingauthor{} and \thanks{Current Affiliation:...} -%%% immediately following the appropriate author. -%%% -%%% Note that the \correspondingauthor{} command is NECESSARY. -%%% The \thanks{} commands are OPTIONAL. - - %\authors{Author One\correspondingauthor{Author One, - % American Meteorological Society, - % 45 Beacon St., Boston, MA 02108.} -% and Author Two\thanks{Current affiliation: American Meteorological Society, - % 45 Beacon St., Boston, MA 02108.}} - -\authors{Author One\correspondingauthor{Dept., Institution, Address, City, State/Country.}} - -%% Follow this form: - % \affiliation{American Meteorological Society, - % Boston, Massachusetts.} - -\affiliation{} - -%% Follow this form: - %\email{latex@ametsoc.org} - -\email{} - -%% If appropriate, add additional authors, different affiliations: - %\extraauthor{Extra Author} - %\extraaffil{Affiliation, City, State/Province, Country} - -%\extraauthor{} -%\extraaffil{} - -%% May repeat for a additional authors/affiliations: - -%\extraauthor{} -%\extraaffil{} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ABSTRACT -% -% Enter your abstract here -% Abstracts should not exceed 250 words in length! -% -% For BAMS authors only: If your article requires a Capsule Summary, please place the capsule text at the end of your abstract -% and identify it as the capsule. Example: This is the end of the abstract. (Capsule Summary) This is the capsule summary. - -\abstract{Enter the text of your abstract here.} - -\begin{document} - -%% Necessary! -\maketitle - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% MAIN BODY OF PAPER -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% - -%% In all cases, if there is only one entry of this type within -%% the higher level heading, use the star form: -%% -% \section{Section title} -% \subsection*{subsection} -% text... -% \section{Section title} - -%vs - -% \section{Section title} -% \subsection{subsection one} -% text... -% \subsection{subsection two} -% \section{Section title} - -%%% -% \section{First primary heading} - -% \subsection{First secondary heading} - -% \subsubsection{First tertiary heading} - -% \paragraph{First quaternary heading} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ACKNOWLEDGMENTS -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -\acknowledgments -Start acknowledgments here. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% APPENDIXES -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Use \appendix if there is only one appendix. -%\appendix - -% Use \appendix[A], \appendix}[B], if you have multiple appendixes. -%\appendix[A] - -%% Appendix title is necessary! For appendix title: -%\appendixtitle{} - -%%% Appendix section numbering (note, skip \section and begin with \subsection) -% \subsection{First primary heading} - -% \subsubsection{First secondary heading} - -% \paragraph{First tertiary heading} - -%% Important! -%\appendcaption{<appendix letter and number>}{<caption>} -%must be used for figures and tables in appendixes, e.g., -% -%\begin{figure} -%\noindent\includegraphics[width=19pc,angle=0]{figure01.pdf}\\ -%\appendcaption{A1}{Caption here.} -%\end{figure} -% -% All appendix figures/tables should be placed in order AFTER the main figures/tables, i.e., tables, appendix tables, figures, appendix figures. -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% REFERENCES -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Make your BibTeX bibliography by using these commands: -% \bibliographystyle{ametsoc2014} -% \bibliography{references} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% TABLES -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Enter tables at the end of the document, before figures. -%% -% -%\begin{table}[t] -%\caption{This is a sample table caption and table layout. Enter as many tables as -% necessary at the end of your manuscript. Table from Lorenz (1963).}\label{t1} -%\begin{center} -%\begin{tabular}{ccccrrcrc} -%\hline\hline -%$N$ & $X$ & $Y$ & $Z$\\ -%\hline -% 0000 & 0000 & 0010 & 0000 \\ -% 0005 & 0004 & 0012 & 0000 \\ -% 0010 & 0009 & 0020 & 0000 \\ -% 0015 & 0016 & 0036 & 0002 \\ -% 0020 & 0030 & 0066 & 0007 \\ -% 0025 & 0054 & 0115 & 0024 \\ -%\hline -%\end{tabular} -%\end{center} -%\end{table} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% FIGURES -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Enter figures at the end of the document, after tables. -%% -% -%\begin{figure}[t] -% \noindent\includegraphics[width=19pc,angle=0]{figure01.pdf}\\ -% \caption{Enter the caption for your figure here. Repeat as -% necessary for each of your figures. Figure from \protect\cite{Knutti2008}.}\label{f1} -%\end{figure} - -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/srdp-mathematik/README.txt b/macros/latex/contrib/srdp-mathematik/README.md index 5ebd2ac109..be20314ea2 100644 --- a/macros/latex/contrib/srdp-mathematik/README.txt +++ b/macros/latex/contrib/srdp-mathematik/README.md @@ -1,19 +1,4 @@ -__________________________________ - - The - srdp-mathematik package - v1.9.5 - - 2022/03/04 -___________________________________ - -Maintainer: Christoph Weberndorfer -E-mail : c.weberndorfer@gmail.com - Comments, bug reports and suggestions are welcome. -Licence : Released under the LaTeX Project Public License 1.3c or - later, see http://www.latex-project.org/lppl.txt - ----------------------------------------------------------------------- +# srdp-mathematik.sty v1.9.6 This package provides basic commands for the defined formats of the Austrian sRDP in mathematics. Furthermore, it includes ways to implement answers in the tex file, which can be voluntarily displayed in the pdf file and @@ -25,4 +10,11 @@ Dieses Paket bietet grundlegende Befehle für die vorgegebenen Formate der öste Reife- und Diplomprüfung (sRDP) in Mathematik. Es bietet darüber hinaus die Möglichkeit, Antworten in die tex Datei zu implentieren und diese bei Bedarf in der pdf Datei anzuzeigen. Außerdem können die eingegeben Antwortmöglichkeiten variiert werden, um mehrere Gruppe für zum Beispiel Schularbeiten einfach zu erstellen. + +---------------------------------------------------------------------- + +Maintainer: Christoph Weberndorfer + + + diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf Binary files differindex c2dff7ff86..c9bada9a13 100644 --- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf +++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty index 4209fa9c14..1b1bbde374 100644 --- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty +++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty @@ -10,7 +10,7 @@ % \NeedsTeXFormat{LaTeX2e}[1996/12/26] -\ProvidesPackage{srdp-mathematik}[2022/03/04 v1.9.5 Standard-Schularbeitsformate] +\ProvidesPackage{srdp-mathematik}[2022/04/05 v1.9.6 Standard-Schularbeitsformate] \usepackage{color} @@ -129,6 +129,18 @@ }}}}}}}}} +\ExplSyntaxOn +\NewDocumentCommand{\stringprocess}{ m m } +{\egreg_string_process:nn{#1}{#2}} +\cs_new_protected:Npn \egreg_string_process:nn#1#2 +{\tl_map_inline:nn{#2}{#1{##1}}} +\ExplSyntaxOff + +\newcommand{\boxchar}[2]{\strut#2#1} +\newcommand{\stretchstring}[2][\ \ ]{\stringprocess{\boxchar{#1}}{#2}} + + + \newcommand{\antwort}[2][]{\ifthenelse{\theAntworten=1}{{\color[rgb]{1,0,0}#2}}{#1}} \newcommand{\info}[2][]{\ifthenelse{\theinfo=1}{ @@ -141,9 +153,10 @@ \ifthenelse{\theAntworten=1}{\switchon}{} + \def\antwortzeile #1\\{% \ifswitch% -{\color[rgb]{1,0,0}#1}\\ +\color[rgb]{1,0,0}#1\\ \fi% } diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex index ece0c2195a..5e4ef530bc 100644 --- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex +++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex @@ -55,7 +55,7 @@ hidelinks \vfill -\Huge The \textit{srdp-mathematik} package v1.9.5\\[1cm] +\Huge The \textit{srdp-mathematik} package v1.9.6\\[1cm] Documentation \\ [1cm] @@ -235,29 +235,24 @@ Die Option 3 \texttt{ms} ermöglicht die Darstellung des Notenschlüssels entspr %\textsc{Ausgabe:} %\notenschluessel[1/2]{0.91}{0.8}{0.64}{0.5} -\subsubsection{\texttt{\textbackslash beurteilungsraster}} +\subsubsection{\texttt{\textbackslash beurteilung}} -Der Befehl \texttt{beurteilungsraster} entspricht der aktuellen Vorgabe der Beurteilung der standardisierten Reifeprüfung (Stand 2019). Dabei müssen die Punkte für Teil 1, Ausgleichspunkte und Teil 2 angegeben werden. Die in Klammer angegebenen Werte entsprechen der bei der Reifeprüfung verwendeten prozentuellen Notenverteilung, können jedoch jederzeit verändert werden. \leer +Der Befehl \texttt{\textbackslash beurteilung} ist ein für Schularbeiten angepasstes Beurteilungsschema der standardisierten Reifeprüfung und ist für das Deckblatt der Schularbeit vorgesehen. Dabei müssen die Punkte für Teil 1 und Teil 2 angegeben werden. Die in Klammer angegebenen Werte entsprechen der empfohlenen prozentuellen Notenverteilung, die jedoch jederzeit individuell angepasst werden können. \leer \textsc{Eingabe:} \begin{verbatim} -\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel - T1={24}, % Punkte im Teil 1 - AP={4}, % Ausgleichspunkte aus Teil 2 - T2={20}, % Punkte im Teil 2 - } +\beurteilung{0.875}{0.75}{0.625}{1/2}{ % Prozentschluessel + T1={16}, % Punkte im Teil 1 + T2={8}, % Punkte im Teil 2 + } \end{verbatim} \textsc{Ausgabe:}\leer -siehe nächste Seite \newpage - - -\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel - T1={24}, % Punkte im Teil 1 - AP={4}, % Ausgleichspunkte aus Teil 2 - T2={20}, % Punkte im Teil 2 +\beurteilung{0.875}{0.75}{0.625}{1/2}{ % Prozentschluessel + T1={16}, % Punkte im Teil 1 + T2={8}, % Punkte im Teil 2 } \newpage @@ -312,6 +307,20 @@ wird.] {Dies ist die notwendige Eingabe und wird in rot angezeigt und nur wenn \texttt{'solution\_on'} eingestellt ist.} +\subsubsection{\texttt{\textbackslash antwortzeile}} +In manchen Fällen ist es notwendig, dass ganze Zeilen einer Tabelle als Lösung ein- und ausgeblendet werden können. Zu diesem Zweck kann der Befehl \texttt{\textbackslash antwortzeile} verwendet werden.\leer + +\textsc{Eingabe:} + +\begin{verbatim} +\begin{tabular}{c|c} +$x$ & $f(x)$ \\ \hline +0 & 2 \\ +2 & 4 \\ +\antwortzeile 4 & 16 \\ +\end{tabular} +\end{verbatim} + \subsection{Paketoption -- Erstellung von Gruppen: \texttt{[random=0,1,2,\ldots]}} Das \texttt{srdp-mathematik}-Paket ermöglicht auch die automatische Erstellung von Gruppen für Schularbeiten, durch Vertauschung der Antwortmöglichkeiten aller Typ-1-Aufgaben. Dazu kann die \texttt{random}-Option im \texttt{srdp-mathematik}-Paket eingebunden geladen werden. Also: @@ -469,6 +478,47 @@ Der Winkel Alpha ist 30\degre. ($\alpha = 30 \degre$) Der Winkel Alpha ist 30\degre. ($\alpha = 30 \degre$) +\subsubsection{\texttt{\textbackslash stretchstring}} +Der Befehl \texttt{\textbackslash stretchstring} erleichtert es, einen Text (oder Zahlen) durch Leerzeichen zu trennen, um etwa Rechnungen auf Arbeitsblättern zum Ausfüllen zu erstellen. + +\textsc{Eingabe:} +\begin{verbatim} +\begin{tabular}{r} +\stretchstring{35}\\ +\stretchstring{724}\\ +\stretchstring{28}\\ +\stretchstring{436}\\ \hline +\stretchstring{1223}\\ +\end{tabular} +\end{verbatim} + +\textsc{Ausgabe:}\\ +\begin{tabular}{r} +\stretchstring{35}\\ +\stretchstring{724}\\ +\stretchstring{28}\\ +\stretchstring{436}\\ \hline +\stretchstring{1223}\\ +\end{tabular}\leer + +Es ist außerdem möglich, den Abstand zwischen den Zeichen individuell anzugeben.\leer + +\textsc{Eingabe:} +\begin{verbatim} +\stretchstring[\,]{4126} + +\stretchstring[\quad]{4126} + +\stretchstring[\hspace{2cm}]{4126} +\end{verbatim} + +\textsc{Ausgabe:}\\ +\stretchstring[\,]{4126} + +\stretchstring[\quad]{4126} + +\stretchstring[\hspace{2cm}]{4126} + \section{Typ-1-Aufgaben} Das \texttt{srdp-mathematik}-Paket ermöglicht die Verwendung vorgefertigter Aufgabenformate, die bei der österreichischen, standardisierten Reifeprüfung Anwendung finden. @@ -635,8 +685,6 @@ Wichtig zu erwähnen ist dabei, dass ausschließlich die Zahl in eckigen Klammer } -\newpage - Die Eingabe in eckiger Klammer ist dabei optional. Wird sie nicht angegeben, wird der Standard von 5 angenommen. \leer diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex index 951ac11fcf..ab837e82eb 100644 --- a/macros/texinfo/latest/texinfo.tex +++ b/macros/texinfo/latest/texinfo.tex @@ -3,9 +3,9 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2022-01-02.12} +\def\texinfoversion{2022-03-13.19} % -% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -3171,16 +3171,8 @@ end % Default is `distinct'. \kbdinputstyle distinct -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} - -\def\xkey{\key} -\def\kbdsub#1#2#3\par{% - \def\one{#1}\def\three{#3}\def\threex{??}% - \ifx\one\xkey\ifx\threex\three \key{#2}% - \else{\tclose{\kbdfont\setcodequotes\look}}\fi - \else{\tclose{\kbdfont\setcodequotes\look}}\fi +\def\kbd#1{% + \tclose{\kbdfont\setcodequotes#1}% } % definition of @key that produces a lozenge. Doesn't adjust to text size. @@ -4417,7 +4409,6 @@ $$% % Find the correct column width \hsize=\expandafter\csname col\the\colcount\endcsname % - \rightskip=0pt \ifnum\colcount=1 \advance\hsize by\leftskip % Add indent of surrounding text \else @@ -5961,7 +5952,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Chapters, sections, etc. % Let's start with @part. -\outer\parseargdef\part{\partzzz{#1}} +\parseargdef\part{\partzzz{#1}} \def\partzzz#1{% \chapoddpage \null @@ -8680,9 +8671,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% } \def\wordTop{Top} -% Until the next @node or @bye command, divert output to a box that is not -% output. -\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}% +% Until the next @node, @part or @bye command, divert output to a box that +% is not output. +\def\ignorenode{\setbox\dummybox\vbox\bgroup +\def\part{\egroup\part}% +\def\node{\egroup\node}% \ignorenodebye } @@ -9391,13 +9384,12 @@ might help (with 'rm \jobname.?? \jobname.??s')% \catcode`\^^M = 5 % in case we're inside an example \normalturnoffactive % allow _ et al. in names \makevalueexpandable - % If the image is by itself, center it. \ifvmode \imagevmodetrue \else \ifx\centersub\centerV % for @center @image, we need a vbox so we can have our vertical space \imagevmodetrue - \vbox\bgroup % vbox has better behavior than vtop herev + \vbox\bgroup % vbox has better behavior than vtop here \fi\fi % \ifimagevmode @@ -9405,11 +9397,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Usually we'll have text after the image which will insert % \parskip glue, so insert it here too to equalize the space % above and below. - \nobreak\vskip\parskip - \nobreak + \vskip\parskip + % + % Place image in a \vtop for a top page margin that is (close to) correct, + % as \topskip glue is relative to the first baseline. + \vtop\bgroup\hrule height 0pt\vskip-\parskip \fi % - % Leave vertical mode so that indentation from an enclosing + % Enter horizontal mode so that indentation from an enclosing % environment such as @quotation is respected. % However, if we're at the top level, we don't want the % normal paragraph indentation. @@ -9438,8 +9433,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi % \ifimagevmode + \egroup \medskip % space after a standalone image - \fi + \fi \ifx\centersub\centerV \egroup \fi \endgroup} @@ -10898,6 +10894,9 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{1EF8}{\~Y}% \DeclareUnicodeCharacter{1EF9}{\~y}% % + % Exotic spaces + \DeclareUnicodeCharacter{2007}{\hphantom{0}}% + % % Punctuation \DeclareUnicodeCharacter{2013}{--}% \DeclareUnicodeCharacter{2014}{---}% |