summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/abstract/README17
-rw-r--r--Master/texmf-dist/doc/latex/abstract/abstract.pdfbin172587 -> 165624 bytes
-rw-r--r--Master/texmf-dist/source/latex/abstract/abstract.dtx106
-rw-r--r--Master/texmf-dist/source/latex/abstract/abstract.ins10
-rw-r--r--Master/texmf-dist/tex/latex/abstract/abstract.sty53
5 files changed, 132 insertions, 54 deletions
diff --git a/Master/texmf-dist/doc/latex/abstract/README b/Master/texmf-dist/doc/latex/abstract/README
index 8cbd4dbfeee..49210e24865 100644
--- a/Master/texmf-dist/doc/latex/abstract/README
+++ b/Master/texmf-dist/doc/latex/abstract/README
@@ -2,6 +2,13 @@
abstract environment, and in particular provides for a one column abstract
in a two column paper.
+NOTE: Will Robertson will be taking over suppporting the package
+
+Changes in version 1.2 (2009/05/23)
+o Added style option
+o \abstitleskip now works as described
+
+
Changes (2004/04/16)
o Changed license from LPPL v1.0 to v1.3
o Updated contact details
@@ -10,9 +17,9 @@ Changes in version 1.1
o Added an option for a run-in heading
-----------------------------------------------------------------
- Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
- (or at: pandgwilson at earthlink dot net)
- Copyright 2000 --- 2004 Peter R. Wilson
+ Author: Peter Wilson, Herries Press (herries dot press at earthlink dot net)
+
+ Copyright 2000 --- 2009 Peter R. Wilson
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -48,6 +55,6 @@ o run: latex abstract.dtx
o Print abstract.dvi for a hardcopy of the user manual
-2004/04/16
+2009/05/23
Peter Wilson
-peter.r.wilson@boeing.com
+herries dot press at earthlink dot net
diff --git a/Master/texmf-dist/doc/latex/abstract/abstract.pdf b/Master/texmf-dist/doc/latex/abstract/abstract.pdf
index 5b24e9af41d..e51b7528a86 100644
--- a/Master/texmf-dist/doc/latex/abstract/abstract.pdf
+++ b/Master/texmf-dist/doc/latex/abstract/abstract.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/abstract/abstract.dtx b/Master/texmf-dist/source/latex/abstract/abstract.dtx
index 5aee33ec49d..49299d3de9f 100644
--- a/Master/texmf-dist/source/latex/abstract/abstract.dtx
+++ b/Master/texmf-dist/source/latex/abstract/abstract.dtx
@@ -1,8 +1,8 @@
% \iffalse meta-comment
% abstract.dtx
-% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-% (or at: pandgwilson at earthlink dot net)
-% Copyright 2000 --- 2004 Peter R. Wilson
+% Author: Peter Wilson, Herries Press
+% herries dot press at earthlink dot net
+% Copyright 2000 --- 2009 Peter R. Wilson
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{255}
+% \CheckSum{281}
%
% \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
% \DoNotIndex{\@centercr,\@cite}
@@ -77,16 +77,18 @@
% \changes{v1.0}{2000/06/11}{First public release}
% \changes{v1.1}{2001/02/11}{Added runin option}
% \changes{v1.1a}{2004/04/16}{Changed license and contact details}
+% \changes{v1.2}{2009/05/22}{Changed contact details, and minor improvements}
+% \changes{v1.2}{2009/05/23}{Added style option}
%
% \def\dtxfile{abstract.dtx}
% ^^A \def\fileversion{v0.3}
% ^^A \def\filedate{2000/05/20}
% ^^A \def\fileversion{v1.0}
% ^^A \def\filedate{2000/06/11}
-% \def\fileversion{v1.1}
-% \def\filedate{2001/02/11}
-% \def\fileversion{v1.1a}
-% \def\filedate{2004/04/16}
+% \def\fileversion{v1.1} \def\filedate{2001/02/11}
+% \def\fileversion{v1.1a} \def\filedate{2004/04/16}
+% \def\fileversion{v1.2} \def\filedate{2009/05/23}
+%
% \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package
% \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option
% \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file
@@ -99,9 +101,9 @@
% \filedate.}}
%
% \author{%
-% Peter Wilson\thanks{After May 2004 at: \texttt{pandgwilson at earthlink dot net}}\\
-% Catholic University of America \\
-% Now at \texttt{peter.r.wilson@boeing.com}
+% Peter Wilson \\
+% Herries Press\\
+% \texttt{herries dot press at earthlink dot net}
% }
% \date{\filedate}
% \maketitle
@@ -172,10 +174,14 @@
% numbered |\chapter|
% or as a |\section|, depending on whether the document class supports
% chapters or not.
+% \item \Lopt{style}. You specify the style for the title.\footnote{This
+% option was suggested by Will Robertson.} The \Lopt{addtotoc} option
+% does not apply if you use the \Lopt{style} option.
% \item \Lopt{runin}. The abstract title is typeset as a run-in\footnote{This
% option was suggested by R.~Chandrasekhar (\texttt{chandra@ee.uwa.edu.au}).} heading.
-% Note that the \Lopt{number} option is ignored if the \Lopt{runin} option
-% is used.
+% Note that the \Lopt{number} and \Lopt{style} options are ignored if the
+% \Lopt{runin} option is used, and the \Lopt{number} and \Lopt{addtotoc}
+% options are ignored if the \Lopt{style} option is given.
% \end{itemize}
%
% When the \Lopt{number} option is used with a class that provides chapters,
@@ -242,6 +248,15 @@
% \end{verbatim}
% \end{small}\par
%
+% \DescribeMacro{\abstitlestyle}
+% When the \Lopt{style} option is used the title is set as \\
+% \verb?\abstitlestyle{\abstractname}? where the default definition
+% is simply \\
+% \verb?\newcommand{\abstitlestyle}[1]{#1}? \\
+% It is up to you to redefine \cs{abstitlestyle} to give any effects
+% you want (e.g., if you want the title added to the ToC you have to include
+% the necessary code as part of your redefinition).
+%
%
% \DescribeMacro{\absleftindent}
% \DescribeMacro{\absrightindent}
@@ -325,17 +340,19 @@
% \begin{macrocode}
%<*usc>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{abstract}[2001/02/11 v1.1 configurable abstracts]
+\ProvidesPackage{abstract}[2009/05/23 v1.2 configurable abstracts]
% \end{macrocode}
%
%
% The following |\if...| commands are for implementing various options.
% \changes{v1.1}{2001/02/11}{Added \cs{if@bsrunin}}
+% \changes{v1.2}{2009/05/23}{Added \cs{if@bsstyle}}
% \begin{macro}{\if@bsonecol}
% \begin{macro}{\ifadd@bstotoc}
% \begin{macro}{\ifnumber@bs}
% \begin{macro}{\if@bsrunin}
+% \begin{macro}{\if@bsstyle}
% \begin{macrocode}
\newif\if@bsonecol
\@bsonecoltrue
@@ -345,26 +362,34 @@
\number@bsfalse
\newif\if@bsrunin
\@bsruninfalse
+\newif\if@bsstyle
+ \@bsstylefalse
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% Now declare and process the options.
+% \changes{v1.2}{2009/05/23}{Added the style option and supporting code}
% \begin{macrocode}
\DeclareOption{original}{\@bsonecolfalse}
\DeclareOption{addtotoc}{\add@bstotoctrue}
\DeclareOption{number}{\number@bstrue}
\DeclareOption{runin}{\@bsrunintrue}
+\DeclareOption{style}{\@bsstyletrue}
\ProcessOptions\relax
% \end{macrocode}
+% Disable the \Lopt{number} and \Lopt{addtotoc} option if \Lopt{style} is
+% specified.
% Make sure that the \Lopt{number} option is disabled
% if \Lopt{runin} is used (otherwise the \Lopt{addtotoc} option
-% may not work as expected).
+% may not work as expected) and also disable the \Lopt{style} option.
% \begin{macrocode}
-\if@bsrunin\number@bsfalse\fi
+\if@bsstyle\number@bsfalse\add@bstotocfalse\fi
+\if@bsrunin\number@bsfalse\@bsstylefalse\fi
% \end{macrocode}
%
@@ -553,6 +578,16 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\abstitlestyle}
+% When the \Lopt{style} option is called this macro is called to typeset
+% the abstract
+% heading; it should be redefined by the user to suit.
+% \begin{macrocode}
+\newcommand*{\abstitlestyle}[1]{#1}
+
+% \end{macrocode}
+% \end{macro}
+%
% \begin{environment}{abstract}
% At last we are in position to redefine the |abstract| environment. This
% follows very much along the lines of the original definition, but with
@@ -566,20 +601,29 @@
\titlepage
\null\vfil
\@beginparpenalty\@lowpenalty
- \if@bsrunin\else
+ \if@bsrunin
+ \else
% \end{macrocode}
% If the \Lopt{runin} option is not used:
% number the title, if called for, otherwise typeset the title in the
% specified (via |\absnamepos|) environment and adjust the following vertical
% spacing.
+% \changes{v1.2}{2009/05/22}{Made \cs{abstitleskip} behave to match the manual}
% \begin{macrocode}
- \ifnumber@bs \num@bs \else
- \begin{\absnamepos}%
- \abstractnamefont \abstractname
- \@endparpenalty\@M
- \end\absnamepos%
- \vspace{\abstitleskip}%
+ \if@bsstyle
+ \abstitlestyle{\abstractname}
+ \else
+ \ifnumber@bs
+ \num@bs
+ \else
+ \begin{\absnamepos}%
+ \abstractnamefont \abstractname
+ \@endparpenalty\@M
+ \end\absnamepos%
+%% \vspace{\abstitleskip}%
+ \fi
\fi
+ \vspace{\abstitleskip}%
\fi
% \end{macrocode}
% Try adding the title to the ToC, then start the environment for typesetting
@@ -598,11 +642,19 @@
% as any style differences are embedded in the new macros.
% \begin{macrocode}
\renewenvironment{abstract}{%
- \if@bsrunin\else
- \ifnumber@bs \num@bs \else
- \begin{\absnamepos}\abstractnamefont\abstractname\end\absnamepos%
- \vspace{\abstitleskip}%
+ \if@bsrunin
+ \else
+ \if@bsstyle
+ \abstitlestyle{\abstractname}
+ \else
+ \ifnumber@bs
+ \num@bs
+ \else
+ \begin{\absnamepos}\abstractnamefont\abstractname\end\absnamepos%
+%% \vspace{\abstitleskip}%
+ \fi
\fi
+ \vspace{\abstitleskip}%
\fi
\put@bsintoc%
\begin{@bstr@ctlist}\if@bsrunin\@bsrunintitle\fi\abstracttextfont}%
diff --git a/Master/texmf-dist/source/latex/abstract/abstract.ins b/Master/texmf-dist/source/latex/abstract/abstract.ins
index d6e960d0a7a..2a42d1b08da 100644
--- a/Master/texmf-dist/source/latex/abstract/abstract.ins
+++ b/Master/texmf-dist/source/latex/abstract/abstract.ins
@@ -1,7 +1,6 @@
%% abstract.ins
-%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%% (or at: pandgwilson at earthlink dot net)
-%% Copyright 2000 --- 2004 Peter R. Wilson
+%% Author: Peter Wilson, Herries Press (herries dot press at earthlink dot net)
+%% Copyright 2000 --- 2009 Peter R. Wilson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -31,9 +30,8 @@
\preamble
-----------------------------------------------------------------
- Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
- (or at: pandgwilson at earthlink dot net)
- Copyright 2000 --- 2004 Peter R. Wilson
+ Author: Peter Wilson, Herries Press (herries dot press at earthlink dot net)
+ Copyright 2000 --- 2009 Peter R. Wilson
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/abstract/abstract.sty b/Master/texmf-dist/tex/latex/abstract/abstract.sty
index 6fad44c848a..ee1927806de 100644
--- a/Master/texmf-dist/tex/latex/abstract/abstract.sty
+++ b/Master/texmf-dist/tex/latex/abstract/abstract.sty
@@ -7,9 +7,8 @@
%% abstract.dtx (with options: `usc')
%%
%% -----------------------------------------------------------------
-%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%% (or at: pandgwilson at earthlink dot net)
-%% Copyright 2000 --- 2004 Peter R. Wilson
+%% Author: Peter Wilson, Herries Press (herries dot press at earthlink dot net)
+%% Copyright 2000 --- 2009 Peter R. Wilson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,7 +25,7 @@
%% -----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{abstract}[2001/02/11 v1.1 configurable abstracts]
+\ProvidesPackage{abstract}[2009/05/23 v1.2 configurable abstracts]
\newif\if@bsonecol
\@bsonecoltrue
@@ -36,13 +35,17 @@
\number@bsfalse
\newif\if@bsrunin
\@bsruninfalse
+\newif\if@bsstyle
+ \@bsstylefalse
\DeclareOption{original}{\@bsonecolfalse}
\DeclareOption{addtotoc}{\add@bstotoctrue}
\DeclareOption{number}{\number@bstrue}
\DeclareOption{runin}{\@bsrunintrue}
+\DeclareOption{style}{\@bsstyletrue}
\ProcessOptions\relax
-\if@bsrunin\number@bsfalse\fi
+\if@bsstyle\number@bsfalse\add@bstotocfalse\fi
+\if@bsrunin\number@bsfalse\@bsstylefalse\fi
\newcommand{\abstractnamefont}{\normalfont\small\bfseries}
\newcommand{\abstracttextfont}{\normalfont\small}
@@ -108,30 +111,48 @@
\chapter{\abstractname}}
}
+\newcommand*{\abstitlestyle}[1]{#1}
+
\if@titlepage
\renewenvironment{abstract}{%
\titlepage
\null\vfil
\@beginparpenalty\@lowpenalty
- \if@bsrunin\else
- \ifnumber@bs \num@bs \else
- \begin{\absnamepos}%
- \abstractnamefont \abstractname
- \@endparpenalty\@M
- \end\absnamepos%
- \vspace{\abstitleskip}%
+ \if@bsrunin
+ \else
+ \if@bsstyle
+ \abstitlestyle{\abstractname}
+ \else
+ \ifnumber@bs
+ \num@bs
+ \else
+ \begin{\absnamepos}%
+ \abstractnamefont \abstractname
+ \@endparpenalty\@M
+ \end\absnamepos%
+%% \vspace{\abstitleskip}%
+ \fi
\fi
+ \vspace{\abstitleskip}%
\fi
\put@bsintoc%
\begin{@bstr@ctlist}\if@bsrunin\@bsrunintitle\fi\abstracttextfont}%
{\par\end{@bstr@ctlist}\vfil\null\endtitlepage}
\else
\renewenvironment{abstract}{%
- \if@bsrunin\else
- \ifnumber@bs \num@bs \else
- \begin{\absnamepos}\abstractnamefont\abstractname\end\absnamepos%
- \vspace{\abstitleskip}%
+ \if@bsrunin
+ \else
+ \if@bsstyle
+ \abstitlestyle{\abstractname}
+ \else
+ \ifnumber@bs
+ \num@bs
+ \else
+ \begin{\absnamepos}\abstractnamefont\abstractname\end\absnamepos%
+%% \vspace{\abstitleskip}%
+ \fi
\fi
+ \vspace{\abstitleskip}%
\fi
\put@bsintoc%
\begin{@bstr@ctlist}\if@bsrunin\@bsrunintitle\fi\abstracttextfont}%