From 58d31edb0a4d32f223ea9e65277982ba88f145a3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Sep 2010 00:46:42 +0000 Subject: revtex 4.1p2 (13aug10) git-svn-id: svn://tug.org/texlive/trunk@19652 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/revtex/aip.dtx | 28 +++---- Master/texmf-dist/source/latex/revtex/ltxfront.dtx | 8 +- Master/texmf-dist/source/latex/revtex/ltxgrid.dtx | 8 +- Master/texmf-dist/source/latex/revtex/ltxutil.dtx | 8 +- .../texmf-dist/source/latex/revtex/revtex4-1.dtx | 94 ++++++++++------------ 5 files changed, 64 insertions(+), 82 deletions(-) (limited to 'Master/texmf-dist/source/latex/revtex') diff --git a/Master/texmf-dist/source/latex/revtex/aip.dtx b/Master/texmf-dist/source/latex/revtex/aip.dtx index 04a47c748dc..13c711fc823 100644 --- a/Master/texmf-dist/source/latex/revtex/aip.dtx +++ b/Master/texmf-dist/source/latex/revtex/aip.dtx @@ -124,9 +124,9 @@ License %<*package> %%% @LaTeX-file{ %%% filename = "aip.dtx", -%%% version = "4.1p", -%%% date = "2010/03/12", -%%% time = "16:23:00 GMT-8", +%%% version = "4.1r", +%%% date = "2010/07/25", +%%% time = "20:32:00 GMT-8", %%% checksum = "1163", %%% author = "Arthur Ogawa (mailto:arthur_ogawa at sbcglobal.net), %%% commissioned by the American Institute of Physics. @@ -232,7 +232,7 @@ License % \begin{macrocode} %<*driver|package> % - [2010/03/12 4.1p AIP substyle for REVTeX]% \fileversion + [2010/07/25 4.1r AIP substyle for REVTeX]% \fileversion % % \end{macrocode} % @@ -537,7 +537,7 @@ generate the needed \file{.bst} files and install them in % is set by the society (AIP) and journal. % % \begin{macrocode} -\appdef\@bibdataout@init{\@bibdataout@aip}% +\appdef\@bibdataout@rev{\@bibdataout@aip}% \def\@bibdataout@aip{% \immediate\write\@bibdataout{% % \end{macrocode} @@ -552,7 +552,7 @@ generate the needed \file{.bst} files and install them in {% ,pages="1",title="0"% }{% - ,pages="0",title="-1"% + ,pages="0",title=""% }% }% }% @@ -1524,17 +1524,6 @@ generate the needed \file{.bst} files and install them in % Thus, the ``author-year'' bibliography is sorted by author name, and % names are given last name first, followed by initials. % -% Note that \file{aipnumlong.dbj} is the same as \file{aipnum.dbj}, except: -% \begin{itemize} -% \item -% Remove \texttt{jtit-x}, \texttt{jpg-1}. This means article titles and full page range. -% \item -% Add \texttt{article-title-o}: article title is not required. -% \end{itemize} -% -% The differences between \file{aipauthlong.dbj} and \file{aipauth.dbj} -% are exactly the same as between \file{aipnumlong.dbj} and \file{aipnum.dbj} -% % We ensure that the journal substyle has the first word % in the matter by installing the (default) AIP code % later on (see Section~\ref{sec:aip-defaults}). @@ -1557,7 +1546,12 @@ generate the needed \file{.bst} files and install them in \@ifx@empty\refname{% \par\vspace{6\p@ plus 6\p@}% }{% +% \end{macrocode} +% The following line has been commented out: +% \begin{verbatim} % \let\@hangfroms@section\@hang@froms +% \end{verbatim} +% \begin{macrocode} \expandafter\section\expandafter*\expandafter{\refname}% \@nobreaktrue }% diff --git a/Master/texmf-dist/source/latex/revtex/ltxfront.dtx b/Master/texmf-dist/source/latex/revtex/ltxfront.dtx index 1a519133be4..bfa322ea893 100644 --- a/Master/texmf-dist/source/latex/revtex/ltxfront.dtx +++ b/Master/texmf-dist/source/latex/revtex/ltxfront.dtx @@ -114,9 +114,9 @@ License %<*package> %%% @LaTeX-file{ %%% filename = "ltxfront.dtx", -%%% version = "4.1p", -%%% date = "2010/02/25", -%%% time = "18:00:00 UT-8", +%%% version = "4.1r", +%%% date = "2010/07/25", +%%% time = "20:33:00 UT-8", %%% checksum = "2012", %%% author = "Arthur Ogawa (mailto:arthur_ogawa at sbcglobal.net), %%% commissioned by the American Physical Society. @@ -219,7 +219,7 @@ ltxfront% % \begin{macrocode} %<*doc|package|kernel> % - [2010/02/25/18:00:00 4.1p frontmatter package (AO,DPC)]% \fileversion + [2010/07/25/20:33:00 4.1r frontmatter package (AO,DPC)]% \fileversion % %}% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/revtex/ltxgrid.dtx b/Master/texmf-dist/source/latex/revtex/ltxgrid.dtx index 059f3b2bb4b..143cf162dde 100644 --- a/Master/texmf-dist/source/latex/revtex/ltxgrid.dtx +++ b/Master/texmf-dist/source/latex/revtex/ltxgrid.dtx @@ -114,9 +114,9 @@ License %<*package> %%% @LaTeX-file{ %%% filename = "ltxgrid.dtx", -%%% version = "4.1p", -%%% date = "2010/02/25", -%%% time = "18:00:00 UT-8", +%%% version = "4.1r", +%%% date = "2010/07/25", +%%% time = "20:33:00 UT-8", %%% checksum = "5462", %%% author = "Arthur Ogawa (mailto:arthur_ogawa at sbcglobal.net), %%% commissioned by the American Physical Society. @@ -231,7 +231,7 @@ ltxgrid% % \begin{macrocode} %<*doc|package|kernel> % - [2010/02/25/18:00:00 4.1p page grid package (portions licensed from W. E. Baxter web at superscript.com)]% \fileversion + [2010/07/25/20:33:00 4.1r page grid package (portions licensed from W. E. Baxter web at superscript.com)]% \fileversion % %}% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/revtex/ltxutil.dtx b/Master/texmf-dist/source/latex/revtex/ltxutil.dtx index 485620035d2..8281ee845c7 100644 --- a/Master/texmf-dist/source/latex/revtex/ltxutil.dtx +++ b/Master/texmf-dist/source/latex/revtex/ltxutil.dtx @@ -114,9 +114,9 @@ License %<*package> %%% @LaTeX-file{ %%% filename = "ltxutil.dtx", -%%% version = "4.1p", -%%% date = "2010/02/25", -%%% time = "18:00:00 UT-8", +%%% version = "4.1r", +%%% date = "2010/07/25", +%%% time = "20:33:00 UT-8", %%% checksum = "4094", %%% author = "Arthur Ogawa (mailto:arthur_ogawa at sbcglobal.net), %%% commissioned by the American Physical Society. @@ -224,7 +224,7 @@ ltxutil% % \begin{macrocode} %<*doc|package|kernel> % - [2010/02/25/18:00:00 4.1p utilities package (portions licensed from W. E. Baxter web at superscript.com)]% \fileversion + [2010/07/25/20:33:00 4.1r utilities package (portions licensed from W. E. Baxter web at superscript.com)]% \fileversion % %}% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/revtex/revtex4-1.dtx b/Master/texmf-dist/source/latex/revtex/revtex4-1.dtx index 3806fe8f786..92df750df38 100644 --- a/Master/texmf-dist/source/latex/revtex/revtex4-1.dtx +++ b/Master/texmf-dist/source/latex/revtex/revtex4-1.dtx @@ -127,9 +127,9 @@ See the REVTeX 4 README file for restrictions and more information. %<*package> %%% @LaTeX-file{ %%% filename = "revtex4-1.dtx", -%%% version = "4.1p", -%%% date = "2010/03/15", -%%% time = "20:00:00 UT-8", +%%% version = "4.1r", +%%% date = "2010/07/25", +%%% time = "20:33:00 UT-8", %%% checksum = "7177", %%% author = "Arthur Ogawa (mailto:arthur_ogawa at sbcglobal.net), %%% commissioned by the American Physical Society. @@ -222,7 +222,7 @@ See the REVTeX 4 README file for restrictions and more information. % %<*!package&!options> % - [2010/03/15/20:00:00 4.1p (http://publish.aps.org/revtex4/ for documentation)]% \fileversion + [2010/07/25/20:33:00 4.1r (http://publish.aps.org/revtex4/ for documentation)]% \fileversion % % \end{macrocode} % The current class name is remembered in \cmd\class@name. @@ -442,6 +442,9 @@ The file \file{template.aps} is a boilerplate file. \changes{4.1o}{2010/02/09}{(AO, 581) Handle case: merged references, with first ending in a stop character.} \changes{4.1p}{2010/02/24}{(AO, 583) Provide interface to \classname{ltxgrid} \cs{onecolumn@grid@setup} and \cs{twocolumn@grid@setup}} \changes{4.1p}{2010/02/24}{(AO, 584) Per MD, remove trailing space character from each journal abbreviation: it had caused an extraneous space in the .bbl} +\changes{4.1q}{2010/04/01}{(AO, 586) When .bbl is pasted into the document, prevent automatic bibliography inclusion.}% +\changes{4.1q}{2010/04/13}{(AO, 588) Only write \revtex-specific BibTeX .bib data if the .bst style is set by REVTeX.}% +\changes{4.1r}{2010/06/22}{(AO, 595) Provide \cs{lovname} along with other List of Videos definitions.}% \end{filecontents*} % \end{macrocode} @@ -1104,16 +1107,6 @@ The file \file{template.aps} is a boilerplate file. % % \revtex's default for \cmd\longbibliography@sw\ is \cmd\false@sw. % -% Here is a suggested convention for societies and journals that provide two alternative -% Bib\TeX\ styles: if one is named, say, \file{apsrev.bst}, then name the alternative -% \file{apsrevlong.bst}. Then invoke the code: -% \begin{verbatim} -%\appdef\setup@hook{% -% \longbibliography@sw{% -% \appdef\@bibstyle{long}% -% }{}% -%}% -% \end{verbatim} % \begin{macrocode} \DeclareOption{longbibliography}{\@booleantrue\longbibliography@sw}% \DeclareOption{nolongbibliography}{\@booleanfalse\longbibliography@sw}% @@ -2936,6 +2929,7 @@ The file \file{template.aps} is a boilerplate file. % % % \subsection{Videos} +%\changes{4.1r}{2010/06/22}{(AO, 595) Provide \cs{lovname} along with other List of Videos definitions.}% % % \begin{environment}{video} % We define the \env{video} environment analogously to the @@ -2952,18 +2946,24 @@ The file \file{template.aps} is a boilerplate file. % \end{environment} % % \begin{macro}{\thevideo} -% The video counter and float placement defaults. +% The video counter, float placement defaults, strings. % \begin{macrocode} \newcounter{video} \renewcommand \thevideo {\@arabic\c@video} % \end{macrocode} % +% File extension and localizable strings. +% \begin{macrocode} +\def\ext@video{lov}% +\def\fname@video{Video}% +\def\lovname{List of Videos}% +% \end{macrocode} +% +% Float type and default placement. % \begin{macrocode} \def\fps@video{tbp}% \def\ftype@video{4}% -\def\ext@video{lov}% \def\fnum@video{\fname@video~\thevideo}% -\def\fname@video{Video}% \appdef\document@inithook{% \@ifxundefined\c@float@type{}{% \global\setcounter{float@type}{8}% @@ -3434,6 +3434,8 @@ The file \file{template.aps} is a boilerplate file. % \end{macro} % % \begin{macro}{\bibliographystyle} +% \changes{4.1q}{2010/04/01}{(AO, 586) When .bbl is pasted into the document, prevent automatic bibliography inclusion.}% +% \changes{4.1q}{2010/04/13}{(AO, 588) Only write \revtex-specific BibTeX .bib data if the .bst style is set by REVTeX.}% % We arrange for the selection of bibliography style % to occur either due to the document's explicit % \cmd\bibliographystyle\ statement or @@ -3442,9 +3444,15 @@ The file \file{template.aps} is a boilerplate file. % Note that \revtex\ is incompatible with % any package that patches \cmd\bibliographystyle. % Since \classname{natbib} does this, we need a fix. +% +% The Boolean \cmd\bibliographystyle@sw\ signifies that the document contains explicit +% \cmd\bibliographystyle\ markup. If, on the contrary, the bibliography style is set by +% the the society or the journal, then no explicit \cmd\bibliographystyle\ command appears in the document instance. +% In this case \cmd\bibliographystyle@sw\ will be \cmd\false@sw. % \begin{macrocode} \let\bibliographystyle@latex\bibliographystyle -\def\bibliographystyle{\def\@bibstyle}% +\def\bibliographystyle{\@booleantrue\bibliographystyle@sw\def\@bibstyle}% +\@booleanfalse\bibliographystyle@sw % \end{macrocode} % \end{macro} % @@ -3548,6 +3556,10 @@ The file \file{template.aps} is a boilerplate file. % % \begin{environment}{rtx@thebibliography}% % \begin{macro}{\present@bibnote}% +% \changes{4.1f}{2009/07/11}{(AO, 521) Lonely bibliography head}% +% \changes{4.1n}{2010/01/02}{(AO, 572) Independent footnote counter for title block. Abstract footnote counter shared with body.}% +% \changes{4.1o}{2010/02/02}{(AO, 575) Automatically incorporate the (Bib\TeX-generated) .bbl into an explicit \env{thebibliography}}% +% \changes{4.1q}{2010/04/01}{(AO, 586) When .bbl is pasted into the document, prevent automatic bibliography inclusion.}% % We put a tail patch into \cmd\thebibliogrphy\ and % a headpatch into \cmd\endthebibliography. % @@ -3555,9 +3567,6 @@ The file \file{template.aps} is a boilerplate file. % deferred to the bibliography; a journal substyle % might want to override the definition of \cmd\present@bibnote. % -% \changes{4.1f}{2009/07/11}{(AO, 521) Lonely bibliography head}% -% \changes{4.1n}{2010/01/02}{(AO, 572) Independent footnote counter for title block. Abstract footnote counter shared with body.}% -% \changes{4.1o}{2010/02/02}{(AO, 575) Automatically incorporate the (Bib\TeX-generated) .bbl into an explicit \env{thebibliography}}% % We make provisions for the case where there are no \cmd\bibitem s % for the bibliography: we produce no bibliography head at all. % @@ -3566,14 +3575,18 @@ The file \file{template.aps} is a boilerplate file. \NAT@thebibliography{#1}% \let\@TBN@opr\present@bibnote \@FMN@list - \auto@bib@innerbib }{% % \end{macrocode} % The following line was commented out: % \begin{verbatim} %\@endnotesinbib % \end{verbatim} +% The \cmd\auto@bib@innerbib\ directive has been moved from the begin processing to the end processing. +% This means that the content of the \env{thebibliography} environment can itself prevent the +% automatic reading in of the .bbl file. This would be needed when the user has pasted in the +% content of the .bbl file into the document itself, something required by APS and AIP editorial direction. % \begin{macrocode} + \auto@bib@innerbib \edef\@currentlabel{\arabic{NAT@ctr}}% \label{LastBibItem}% \endNAT@thebibliography @@ -3602,6 +3615,7 @@ The file \file{template.aps} is a boilerplate file. % \end{environment} % % \begin{macro}{write@bibliographystyle} +% \changes{4.1q}{2010/04/13}{(AO, 588) Only write \revtex-specific BibTeX .bib data if the .bst style is set by REVTeX.}% % We wish to delay committing the \cmd\bibliographystyle\ until as late as possible. % The journal substyle will define a default bibliography style, and % the document's explicit \cmd\bibliographystyle\ command, if any, will override that default. @@ -3614,10 +3628,13 @@ The file \file{template.aps} is a boilerplate file. % If not, it effectively executes the needed \cmd\bibliographystyle\ command, then neutralizes itself % (we only need to do this once per job). % +% If the document lacks explicit \cmd\bibliographystyle\ markup, we execute +% \cmd\@bibdataout@rev, a hook for \revtex-aware processing. % \begin{macrocode} \def\write@bibliographystyle{% \@ifxundefined\@bibstyle{}{% \expandafter\bibliographystyle@latex\expandafter{\@bibstyle}% + \bibliographystyle@sw{}{\@bibdataout@rev}% }% \global\let\write@bibliographystyle\relax }% @@ -3930,13 +3947,13 @@ The file \file{template.aps} is a boilerplate file. % \begin{macro}{\@bibdataout@aps} % \changes{4.1o}{2010/02/10}{(AO, 580) Provide a document class option to turn off production of eprint field in bibliography.} % \changes{4.1o}{2010/02/12}{(AO, 580) Control .bst at run time.}% +% \changes{4.1q}{2010/04/13}{(AO, 588) Only write \revtex-specific BibTeX .bib data if the .bst style is set by REVTeX.}% % At \cmd\AtBeginDocument\ time, we open the job's \filename{.bib} file. % The hook is available for use by a society to place its own @CONTROL record in the \cmd\@bibdataout\ stream. % \begin{macrocode} \appdef\class@documenthook{\@bibdataout@init}% \def\@bibdataout@init{% \immediate\openout\@bibdataout\pre@bibdata.\bibdata@ext\relax - \@bibdataout@rev }% \def\@bibdataout@rev{% \immediate\write\@bibdataout{% @@ -6937,21 +6954,6 @@ The file \file{template.aps} is a boilerplate file. %\endbatchfile % \end{verbatim} % -% Note that \file{apsrevlong.dbj} is the same as \file{apsrev.dbj}, except: -% \begin{itemize} -% \item -% Remove \texttt{jpg-1}. This means full page range. -% \item -% Remove \texttt{jtit-x}, and add \texttt{article-title-o}: article title is accepted, but not required. -% \item -% Remove \texttt{nm-init}. This means full names. -% \item -% Add \texttt{note-yr}. This means year field produced in full. -% \item -% The file to be \cmd\generate d is \filename{apsrev4-1long.bst} instead of \filename{apsrev4-1.bst}. -% \end{itemize} -% -% % \subsubsection{Comparing apsrev.bst and apsrmp.bst}\label{sec:CompRevRmp} % These two bibliographic styles differ as follows: % \file{apsrev.dbj} has the following guard codes, which \file{apsrmp.dbj} does not: @@ -7411,7 +7413,7 @@ The file \file{template.aps} is a boilerplate file. % For the latter case, we change the meaning, per the code in \file{apsrmp.rtx}. % % \begin{macrocode} -\appdef\@bibdataout@init{\@bibdataout@aps}% +\appdef\@bibdataout@rev{\@bibdataout@aps}% \def\@bibdataout@aps{% \immediate\write\@bibdataout{% % \end{macrocode} @@ -8072,20 +8074,6 @@ The file \file{template.aps} is a boilerplate file. %\endbatchfile % \end{verbatim} % -% Note that \file{apsrmplong.dbj} is the same as \file{apsrmp.dbj}, except: -% \begin{itemize} -% \item -% Remove \texttt{jpg-1}. This means full page range. -% \item -% Remove \texttt{jtit-x}, and add \texttt{article-title-o}: article title is accepted, but not required. -% \item -% Remove \texttt{nm-revv1}, and add \texttt{nm-rev1}. This means full author names, with first author reversed. -% \item -% Add \texttt{note-yr}. This means year field produced in full. -% \item -% The file to be \cmd\generate d is \filename{apsrmp4-1long.bst} instead of \filename{apsrmp4-1.bst}. -% \end{itemize} -% % For a comparison between apsrmp.bst and apsrev.bst, see Section~\ref{sec:CompRevRmp}. % % \changes{4.1c}{2008/08/15}{Document class option longbibliography via \cs{substyle@post}} -- cgit v1.2.3