diff options
author | Karl Berry <karl@freefriends.org> | 2014-06-27 22:04:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-06-27 22:04:04 +0000 |
commit | 12cee3cba0ade234b98b7b478bde7cec95d7ea9d (patch) | |
tree | bf954bf0f82d96b0b7bd5b08487fff45b4f29411 | |
parent | 502b3247f7162d722b01b5f0cb89f6c27c12256d (diff) |
tugboat (27jun14)
git-svn-id: svn://tug.org/texlive/trunk@34457 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx | 19 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf | bin | 314452 -> 314450 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/tugboat/tugboat.pdf | bin | 463497 -> 462479 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/tugboat/tugboat.dtx | 121 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugboat.cls | 52 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugboat.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugproc.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tugboat/ltugproc.sty | 2 |
9 files changed, 92 insertions, 111 deletions
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx index 38f43e13296..1e23d976df0 100644 --- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx +++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx @@ -1,4 +1,4 @@ -% $Id: ltubguid.ltx 123 2013-12-23 19:31:46Z karl $ +% $Id: ltubguid.ltx 124 2014-01-06 18:31:47Z karl $ % ltubguid.ltx - documentation for ltugboat classes. % % Copyright 1994,1995,1996,2001,2005,2006,2010,2013 TeX Users Group. @@ -241,9 +241,6 @@ } \makeatother % -% for raggedy-footnotes (necessary for CTAN references, I find) -\newcommand\raggedfoot{\rightskip=\raggedskip plus\raggedstretch\relax} -% % To use umlauts in a bibliography entry in BibTeX 0.99, we have to % use a certain amount of subterfuge... \let\umlaut\" @@ -345,13 +342,13 @@ They are listed here for completeness. \section{Command syntax} \label{sec:syntax} -We would have liked to offer perfectly uniform syntax for people to -use when preparing their papers. Unfortunately, uniform syntax is not +We would have liked to offer perfectly uniform syntax for people to use +when preparing their papers. Unfortunately, uniform syntax is not available with any widely-available set of macros (though see, for example, the discussions in \citeNP{Ogawa:TB15-3-325}, \citeNP{Baxter:TB15-3-331}, and \citeNP{Swift:TB16-3-269}). In the -circumstances, we have sought simply to keep to the spirit of -Lamport's \citeyear{Lamport:1994}, as modified\footnote{\raggedfoot The cited +circumstances, we have sought simply to keep to the spirit of Lamport's +\citeyear{Lamport:1994}, as modified\footnote{\tubraggedfoot The cited edition of Lamport's book documents the modified version of \LaTeX{}, but it's worth emphasising that we use the modified version as the reference.} by the \LaTeXe{} work (see, for example, @@ -730,7 +727,7 @@ In general, packages currently on \CTAN, and known to work with \emph{current} \LaTeX{} are unlikely to give problems. In particular, the team is happy to accept papers using packages -that are supported by members of the \LaTeX3 team,\footnote{%\raggedfoot +that are supported by members of the \LaTeX3 team,\footnote{% Those in the \LaTeX{} base distribution, or one of those in the \CTANref{packages} sub-tree on \CTAN.} subject to the two provisos: \begin{itemize} @@ -815,7 +812,7 @@ packages, the \envname{filecontents} environment is a convenient way to deliver the bibliography file. A special case is the accumulated bibliography of \TUB{} -itself;\footnote{\raggedfoot Available on \CTAN{} as +itself;\footnote{\tubraggedfoot Available on \CTAN{} as \CTANref{tub-biblio}} it is always available to the production team, so that authors may make reference to items from the \verb|tugboat.bib| file without further ado. @@ -827,7 +824,7 @@ and `\texttt{harvard}' (the present article is employing \emph{harvard} citation). The raw citation style uses the `standard' \BibTeX{} `\pkgname{plain}' (numeric) citation style; its modification by use of Donald Arseneau's \pkgname{cite} -package\footnote{\raggedfoot Available on \CTAN{} as \CTANref{cite}} +package\footnote{\tubraggedfoot Available on \CTAN{} as \CTANref{cite}} is acceptable. Raw citation is selected by default (by execution of class option \optname{rawcite}). diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf Binary files differindex 310133f93b3..c3fa5131297 100644 --- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf +++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf diff --git a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf Binary files differindex 3e672ff57ce..f26395cc6b2 100644 --- a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf +++ b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx index 226193784ea..adb18f42dbf 100644 --- a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx +++ b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx @@ -1,8 +1,8 @@ % \iffalse (this is a meta-comment (so they say)) -% $Id: tugboat.dtx 123 2013-12-23 19:31:46Z karl $ +% $Id: tugboat.dtx 132 2014-06-27 16:26:15Z karl $ % tugboat.dtx - main source for LaTeX TUGboat classes. % -% Copyright 1994-1998, 2000-2001, 2004-2013 TeX Users Group. +% Copyright 1994-1998, 2000-2001, 2004-2014 TeX Users Group. % % This file is part of the tugboat package. % @@ -28,7 +28,7 @@ %<ltugboatsty>\ProvidesPackage{ltugboat} %<ltugprocsty>\ProvidesPackage{ltugproc} %<ltugcomn> \ProvidesPackage{ltugcomn} - [2013/12/23 v2.14 + [2014/06/27 v2.15 %<ltugboatcls> TUGboat journal class% %<ltugproccls> TUG conference proceedings class% %<ltugboatsty|ltugprocsty> TUG compatibility package% @@ -344,7 +344,7 @@ \def\preprint{\preprinttrue} \DeclareOption{draft}{% \AtEndOfClass{% - \setcounter{page}{1001}% + \setcounter{page}{901}% \BlackBoxes \def\MakeRegistrationMarks{}% \PrelimDrafttrue @@ -658,7 +658,6 @@ % \def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} -\def\CD{\acro{CD}} % \end{macrocode} % We place our \cs{kern} after \cs{-} so that it disappears if the % hyphenation is taken: @@ -1115,7 +1114,9 @@ \ensuremath{\rangle}% } % -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +% Use \tt rather than \texttt because italic typewriter is just too ugly, +% and upright works well enough in both italic and bold contexts. +\DeclareRobustCommand{\cs}[1]{{\tt \char`\\#1}} % \DeclareRobustCommand\env[1]{% \cs{begin}\texttt{\char`\{#1\char`\}}} @@ -1493,7 +1494,7 @@ % font shape provoked me to generate the following stuff that is % configurable. % -% Here's the command for the user to define hir own new version. The +% Here's the command for the user to define a new version. The % arguments are font family, series and shape, and then the two kern % values used in placing the raised `A' of \LaTeX. % @@ -1510,12 +1511,25 @@ % % More are defined in the initial version, for bold CM sans (which is % used as \cs{SecTitleFont}), and CM italic medium and bold, and -% Bitstream Charter (which Nelson Beebe likes to use): +% Bitstream Charter (which Nelson Beebe likes to use). Duplicate for +% Latin Modern. % % \begin{macrocode} -\DeclareLaTeXLogo{cmss}{bx}n{.3}{.15} -\DeclareLaTeXLogo{cmr}m{it}{.3}{.27} -\DeclareLaTeXLogo{cmr}{bx}{it}{.3}{.27} +\DeclareLaTeXLogo{cmss}{bx}{n}{.3}{.15} +\DeclareLaTeXLogo{lmss}{bx}{n}{.3}{.15} +% +\DeclareLaTeXLogo{cmr}{m}{it}{.29}{.2} +\DeclareLaTeXLogo{lmr}{m}{it}{.29}{.2} +% +\DeclareLaTeXLogo{cmr}{m}{sl}{.29}{.15} +\DeclareLaTeXLogo{lmr}{m}{sl}{.29}{.15} +% +\DeclareLaTeXLogo{cmr}{bx}{it}{.29}{.2} +\DeclareLaTeXLogo{lmr}{bx}{it}{.29}{.2} +% +\DeclareLaTeXLogo{cmr}{bx}{sl}{.29}{.2} +\DeclareLaTeXLogo{lmr}{bx}{sl}{.29}{.2} +% \DeclareLaTeXLogo{bch}{m}{n}{.2}{.08} \DeclareLaTeXLogo{bch}{m}{it}{.2}{.08} % \end{macrocode} @@ -1524,7 +1538,7 @@ % or to use the default value otherwise: % % \begin{macrocode} -\DeclareRobustCommand\LaTeX{\expandafter\let\expandafter\reserved@a +\DeclareRobustCommand{\LaTeX}{\expandafter\let\expandafter\reserved@a \csname @LaTeX@\f@family/\f@series/\f@shape\endcsname \ifx\reserved@a\relax\let\reserved@a\@LaTeX@default\fi \expandafter\@LaTeX\reserved@a} @@ -1538,17 +1552,19 @@ % original; other versions are added as needed. % % \begin{macrocode} -\newcommand\@LaTeX[2]{L\kern-#1em - {\sbox\z@ T% - \vbox to\ht0{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - A}% - \vss}% - }% - \kern-#2em% - \TeX} +\newcommand\@LaTeX[2]{% + %\wlog{latex logo family=\f@family/\f@series/\f@shape -> #1, #2.}% + L\kern-#1em + {\sbox\z@ T% + \vbox to\ht0{\hbox{$\m@th$% + \csname S@\f@size\endcsname + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + A}% + \vss}% + }% + \kern-#2em% + \TeX} % \end{macrocode} % % \subsection{Authors, contributors, addresses, signatures} @@ -1715,21 +1731,6 @@ \def\signaturemark{\leavevmode\llap{$\diamond$\enspace}} % \end{macrocode} % -% The code previously defined the following: -% -% {\small\begin{verbatim} -% {\makeactive\@ -% \gdef\signatureat{\makeactive\@\def@{\char"40\discretionary{}{}{}}} -% \makeactive\% -% \gdef\signaturepercent{\makeactive\%\def%{\char"25\discretionary{}{}{}}} -% } -% \end{verbatim}} -% -% However, they were never used within the class (or within -% |ltugproc.cls|). They have therefore been deleted; the identically -% defined \cs{netaddrat} and \cs{netaddrpercent} may be used in the -% unlikely event that they're needed elsewhere. -% % Now all the awful machinery of author definitions. % \cs{authornumber} records the number of authors we have recorded to % date. @@ -2407,29 +2408,18 @@ % \end{macrocode} % % \cs{l@<sectioning-name>} is for table of contents (of an article). -% % We define new macros to allow easily changing the font used for toc % entries (for \TUB, we usually want roman, not bold), and the space -% between entries. Nelson Beebe's articles are almost the only ones -% that ever have toc's. +% between entries. Nelson Beebe and Frank Mittelbach's articles +% often have toc's (and few others). Also turn off microtype +% protrusion after \tableofcontents or leaders get messed up. % % \begin{macrocode} \def\TBtocsectionfont{\normalfont} \newskip\TBtocsectionspace \TBtocsectionspace=1.0em\@plus\p@ % \end{macrocode} % -% Don't ask me (RF) why \cs{l@part} is there; I commented it out -% because I couldn't understand why it had been left there for me. To -% be finally deleted in a future release of these macros\dots % \begin{macrocode} -%\def\l@part#1#2{\addpenalty{\@secpenalty}% -% \addvspace{2.25em\@plus\p@}% -% \begingroup -% \@tempdima 3em \parindent\z@ \rightskip\z@ \parfillskip\z@ -% {\large \bf \leavevmode #1\hfil \hbox to\@pnumwidth{\hss #2}}\par -% \nobreak -% \endgroup} -% \def\l@section#1#2{\addpenalty{\@secpenalty}% \addvspace{\TBtocsectionspace}% \@tempdima 1.5em @@ -2767,9 +2757,11 @@ % \begin{macrocode} \def\verbatim{\par\obeylines \futurelet\reserved@a\@switch@sqbverbatim} +% \def\@switch@sqbverbatim{\ifx\reserved@a[%] \expandafter\@sqbverbatim\else \def\reserved@b{\@sqbverbatim[]}\expandafter\reserved@b\fi} +% \def\@sqbverbatim[#1]{% % \end{macrocode} % @@ -2835,24 +2827,6 @@ \if@ruled\kern5\p@\hrule\endtrivlist\fi} % \end{macrocode} % -% \cs{enablemetacode} simply typesets\footnote{Or will simply typeset, -% when we get around to implementation proper} something that looks -% (verbatim) like: -% -% \verb| <meta-text>| -% -% \noindent as: -% -% \verb| |\ensuremath{\langle}\textit{meta-text}\ensuremath{\rangle} -% -% \begin{macrocode} -{\makeactive< - \gdef<#1>{{\reset@font\ensuremath{\langle}% - \textit{#1}% - \ensuremath{\rangle}}} -} -% \end{macrocode} -% % Define the \cs{if} used by the \cs{ruled} option: % % \begin{macrocode} @@ -3327,6 +3301,13 @@ %% } % \end{macrocode} % +% \begin{macro}{\tubraggedfoot} +% To get a ragged-right footnote. +% \begin{macrocode} +\newcommand\tubraggedfoot{\rightskip=\raggedskip plus\raggedstretch\relax} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\creditfootnote} % \begin{macro}{\supportfootnote} % Sometimes we want the label ``Editor's Note:'', sometimes not. diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls index c2af6f96fee..4dcb485b200 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugboat} - [2013/12/23 v2.14 + [2014/06/27 v2.15 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -46,7 +46,7 @@ \def\preprint{\preprinttrue} \DeclareOption{draft}{% \AtEndOfClass{% - \setcounter{page}{1001}% + \setcounter{page}{901}% \BlackBoxes \def\MakeRegistrationMarks{}% \PrelimDrafttrue @@ -178,7 +178,6 @@ \def\BibTeX{\Bib\kern-.08em \TeX} \def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} -\def\CD{\acro{CD}} \def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \def\CMkIV{\ConTeXt\ \MkIV} \def\Cplusplus{C\plusplus} @@ -440,7 +439,7 @@ \ifmmode \egroup \fi \ensuremath{\rangle}% } -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\DeclareRobustCommand{\cs}[1]{{\tt \char`\\#1}} \DeclareRobustCommand\env[1]{% \cs{begin}\texttt{\char`\{#1\char`\}}} \def\thinskip{\hskip 0.16667em\relax} @@ -645,26 +644,35 @@ \newcommand\DeclareLaTeXLogo[5]{\expandafter\def \csname @LaTeX@#1/#2/#3\endcsname{{#4}{#5}}} \def\@LaTeX@default{{.36}{.15}} -\DeclareLaTeXLogo{cmss}{bx}n{.3}{.15} -\DeclareLaTeXLogo{cmr}m{it}{.3}{.27} -\DeclareLaTeXLogo{cmr}{bx}{it}{.3}{.27} +\DeclareLaTeXLogo{cmss}{bx}{n}{.3}{.15} +\DeclareLaTeXLogo{lmss}{bx}{n}{.3}{.15} +\DeclareLaTeXLogo{cmr}{m}{it}{.29}{.2} +\DeclareLaTeXLogo{lmr}{m}{it}{.29}{.2} +\DeclareLaTeXLogo{cmr}{m}{sl}{.29}{.15} +\DeclareLaTeXLogo{lmr}{m}{sl}{.29}{.15} +\DeclareLaTeXLogo{cmr}{bx}{it}{.29}{.2} +\DeclareLaTeXLogo{lmr}{bx}{it}{.29}{.2} +\DeclareLaTeXLogo{cmr}{bx}{sl}{.29}{.2} +\DeclareLaTeXLogo{lmr}{bx}{sl}{.29}{.2} \DeclareLaTeXLogo{bch}{m}{n}{.2}{.08} \DeclareLaTeXLogo{bch}{m}{it}{.2}{.08} -\DeclareRobustCommand\LaTeX{\expandafter\let\expandafter\reserved@a +\DeclareRobustCommand{\LaTeX}{\expandafter\let\expandafter\reserved@a \csname @LaTeX@\f@family/\f@series/\f@shape\endcsname \ifx\reserved@a\relax\let\reserved@a\@LaTeX@default\fi \expandafter\@LaTeX\reserved@a} -\newcommand\@LaTeX[2]{L\kern-#1em - {\sbox\z@ T% - \vbox to\ht0{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - A}% - \vss}% - }% - \kern-#2em% - \TeX} +\newcommand\@LaTeX[2]{% + %\wlog{latex logo family=\f@family/\f@series/\f@shape -> #1, #2.}% + L\kern-#1em + {\sbox\z@ T% + \vbox to\ht0{\hbox{$\m@th$% + \csname S@\f@size\endcsname + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + A}% + \vss}% + }% + \kern-#2em% + \TeX} \def\theauthor#1{\csname theauthor#1\endcsname} \def\theaddress#1{\csname theaddress#1\endcsname} \def\thenetaddress#1{\csname thenetaddress#1\endcsname} @@ -1266,11 +1274,6 @@ }% \def\endverbatim{\@TBendverbatim \if@ruled\kern5\p@\hrule\endtrivlist\fi} -{\makeactive< - \gdef<#1>{{\reset@font\ensuremath{\langle}% - \textit{#1}% - \ensuremath{\rangle}}} -} \let\if@ruled\iffalse \AtBeginDocument{% \@ifpackageloaded{microtype} @@ -1532,6 +1535,7 @@ %% \hskip0.27778\fontdimen6\textfont\z@\relax %% #1% %% } +\newcommand\tubraggedfoot{\rightskip=\raggedskip plus\raggedstretch\relax} \def\creditfootnote{\nomarkfootnote\xEdNote} \def\supportfootnote{\nomarkfootnote\relax} \gdef\nomarkfootnote#1#2{\begingroup diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty index 28d4efbc401..d4bd293513a 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty @@ -31,7 +31,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugboat} - [2013/12/23 v2.14 + [2014/06/27 v2.15 TUG compatibility package% ] \@obsoletefile{ltugboat.cls}{ltugboat.sty} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty index b38c684dac5..f8c6f4c9298 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ltugcomn} - [2013/12/23 v2.14 + [2014/06/27 v2.15 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% @@ -119,7 +119,6 @@ \def\BibTeX{\Bib\kern-.08em \TeX} \def\BSD{\acro{BSD}} \def\CandT{\textsl{Computers \& Typesetting}} -\def\CD{\acro{CD}} \def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \def\CMkIV{\ConTeXt\ \MkIV} \def\Cplusplus{C\plusplus} @@ -381,7 +380,7 @@ \ifmmode \egroup \fi \ensuremath{\rangle}% } -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\DeclareRobustCommand{\cs}[1]{{\tt \char`\\#1}} \DeclareRobustCommand\env[1]{% \cs{begin}\texttt{\char`\{#1\char`\}}} \def\thinskip{\hskip 0.16667em\relax} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls index 5c1eeecd719..deeec3fb5b7 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2013/12/23 v2.14 + [2014/06/27 v2.15 TUG conference proceedings class% ] \def\@tugclass{ltugproc} diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty index 90c71cc63ac..ad2b03b779c 100644 --- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty +++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty @@ -31,7 +31,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugproc} - [2013/12/23 v2.14 + [2014/06/27 v2.15 TUG compatibility package% ] \@obsoletefile{ltugproc.cls}{ltugproc.sty} |