From b74ab6d22996ea739453c7df39ee2abfb6c61f36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 May 2012 23:32:15 +0000 Subject: tugboat-plain (23may12) git-svn-id: svn://tug.org/texlive/trunk@26611 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/plain/tugboat-plain/tugboat.cmn | 66 ++++++++++------------ .../texmf-dist/tex/plain/tugboat-plain/tugboat.sty | 52 ++++++++++++----- 2 files changed, 69 insertions(+), 49 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn index 1f2bb8ef391..24f48135e19 100644 --- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn +++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.cmn @@ -1,45 +1,29 @@ %% @texfile{ %% filename = "tugboat.cmn", -%% version = "1.19", -%% date = "2008/05/20", -%% time = "10:14:37 EDT", -%% checksum = "01850 1112 3202 36735", +%% version = "see below \fileversion" +%% date = "see below \filedate", %% filetype = "common macros for TUGboat", -%% copyright = "Copyright 1993-1996, 2006 TeX Users Group. +%% copyright = "Copyright 1993-1996,2006,2008,2011,2012 TeX Users Group. %% Unlimited copying and redistribution of this file %% are permitted as long as this file is not %% modified. Modifications (and redistribution of %% modified versions) are also permitted, but only if %% the resulting file is renamed." -%% author = "TeX Users Group", -%% address = "TeX Users Group, -%% P.O.Box 2311, -%% Portland, OR 97208-2311, -%% USA", -%% telephone = "+1 503 223-9994", -%% FAX = "+1 206 203-3960", %% email = "TUGboat@tug.org", %% codetable = "ISO/ASCII", -%% keywords = "tex users group, tugboat, common macros", +%% keywords = "tex users group, tugboat, common macros, plain tex", %% supported = "yes", -%% abstract = "This file contains macros common to both -%% the PLAIN and LaTeX style files for TUGboat, -%% the Communications of the TeX Users Group. +%% abstract = "This file contains macros potentially common to +%% the various style files for TUGboat, %% Among other things, it contains supplementary %% definitions for abbreviations and logos that -%% appear in TUGboat.", -%% docstring = "The checksum field above contains a CRC-16 -%% checksum as the first value, followed by the -%% equivalent of the standard UNIX wc (word -%% count) utility output of lines, words, and -%% characters. This is produced by Robert -%% Solovay's checksum utility.", +%% appear in TUGboat." %% } -%% +%% $Id: tugboat.cmn 100 2012-05-22 18:09:46Z bnb $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{v1.19} -\def\filedate{2008/05/20} +\def\fileversion{v1.20} +\def\filedate{2012/05/22} \message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>} @@ -119,8 +103,9 @@ \def\AmSLaTeX{\AmS-\LaTeX} \def\AmSTeX{\AmS-\TeX} \def\ANSI{\acro{ANSI}} +\def\API{\acro{API}} \def\ASCII{\acro{ASCII}} -\def\aw{A\kern.1em-W} +\def\aw{\acro{A\kern.04em\raise.115ex\hbox{-}W}} \def\AW{Addison\kern.1em-\penalty\z@\hskip\z@skip Wesley} \def\BibTeX{{\rm B\kern-.05em{\smc i\kern-.025emb}\kern-.08em\TeX}} \def\CandT{{\sl Computers \& Typesetting}} @@ -141,6 +126,7 @@ \def\Hawaii{Hawai`i} \def\HTML{\acro{HTML}} \def\HTTP{\acro{HTTP}} +\def\IDE{\acro{IDE}} \def\ISBN{\acro{ISBN}} \def\ISO{\acro{ISO}} \def\ISSN{\acro{ISSN}} @@ -184,6 +170,7 @@ \def\PCTeX{PC\thinspace\TeX} \def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3ptc}\TeX} \def\PDF{\acro{PDF}} +\def\PGF{\acro{PGF}} \def\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\spacefactor1000 } \def\PiCTeX{\PiC\kern-.11em\TeX} \def\plain{{\tt plain}} @@ -191,6 +178,8 @@ \def\POBox{P.\thinspace O.~Box } %\def\POBoxTUG{\POBox\unskip~9506, Providence, RI~02940} \def\PS{{Post\-Script}} +\def\PSTricks{\acro{PST}ricks} +\def\RGB{\acro{RGB}} \def\RTF{\acro{RTF}} \def\SC{Steering Committee} \def\SGML{\acro{SGML}} @@ -213,10 +202,12 @@ % \TeX\-\hbox{$\fam\TestCount\scriptstyle TURES$}} \def\TeXtures{{\it Textures}} \let\Textures=\TeXtures +\def\TeXworks{\TeX\kern-.07em works} \def\TeXXeT{\TeX-{}-\XeT} \def\TFM{\acro{TFM}} \def\Thanh{H\`an~Th\^e\llap{\raise.5ex\hbox{\'{}}}~Th\`anh} \def\TIFF{\acro{TIFF}} +\def\TikZ{Ti{\it k}Z} \def\ttn{{\sl TTN}\spacefactor1000 } \def\TTN{{\sl \TeX{} and TUG NEWS}\spacefactor1000 } \def\tubfont{\sl} % redefined in other situations @@ -736,7 +727,9 @@ \def\signaturemark{\leavevmode\llap{$\diamond$\enspace}} -% some hyphenation exceptions: +% some hyphenation exceptions, unless \tubomithyphenations +% is defined (used in tb*hyf.tex). +\ifx\tubomithyphenations\@thisisundefined \hyphenation{Del-a-ware Dijk-stra Duane Eijk-hout Flor-i-da Free-BSD Ghost-script Ghost-view Hara-lam-bous Jac-kow-ski Karls-ruhe @@ -744,33 +737,34 @@ Net-BSD Open-BSD Open-Office Pfa-Edit Post-Script Rich-ard Skoup South-all Vieth VM-ware Win-Edt - acro-nym ap-pen-dix asyn-chro-nous - bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean + acro-nym acro-nyms analy-sis ap-pen-di-ces ap-pen-dix asyn-chro-nous + bib-lio-graph-i-cal bit-map bit-mapped bit-maps buf-fer buf-fers bool-ean col-umns com-put-able com-put-abil-ity cus-tom-iz-able data-base data-bases de-allo-cate de-allo-cates de-allo-cated de-allo-ca-tion - de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion + de-riv-a-tive de-riv-a-tives de-riv-a-ble der-i-va-tion dis-trib-ut-able es-sence fall-ing half-way in-fra-struc-ture key-note long-est - ma-gyar man-u-script man-u-scripts mne-mon-ic mne-mon-ics - mono-space mono-spaced + ma-gyar man-u-script man-u-scripts meta-table meta-tables + mne-mon-ic mne-mon-ics mono-space mono-spaced name-space name-spaces off-line over-view pal-ettes par-a-digm par-a-dig-mat-ic par-a-digms pipe-line pipe-lines plug-in plug-ins pres-ent-ly pro-gram-mable - re-allo-cate re-allo-cates re-allo-cated + re-allo-cate re-allo-cates re-allo-cated re-printed set-ups se-vere-ly spell-ing spell-ings stand-alone strong-est - sub-ex-pres-sion syn-chro-ni-city syn-chro-nous + sub-ex-pres-sion sub-tables sur-gery syn-chro-ni-city syn-chro-nous text-height text-length text-width time-stamp time-stamped time-stamps vis-ual vis-ual-ly which-ever white-space white-spaces wide-spread wrap-around } +\fi \restorecat\@ @@ -1006,6 +1000,8 @@ that may not be obvious. For full definitions, see real code above. Version Date Changes ------- --------- --------------------------------------------------- +1.20 4 Apr 12 allow omission of hyphenation list + 1.19 20 May 08 additions to hyphenation list 1.18 7 Jun 06 another fix to repair a stupid mistake diff --git a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty index 6df1624419a..84dae0b1f8c 100644 --- a/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty +++ b/Master/texmf-dist/tex/plain/tugboat-plain/tugboat.sty @@ -1,9 +1,9 @@ %% @texfile{ %% filename = "tugboat.sty", -%% version = "1.19", -%% date = "2011/03/11", +%% version = "see below \fileversion" +%% date = "see below \filedate", %% filetype = "Plain TeX macros for TUGboat", -%% copyright = "Copyright 1993, 1999, 2003, 2006, 2011 TeX Users Group. +%% copyright = "Copyright 1993,1999,2003,2006,2011,2012 TeX Users Group. %% Unlimited copying and redistribution of this file %% are permitted as long as this file is not %% modified. Modifications (and redistribution of @@ -17,6 +17,8 @@ %% for preparation of items in TUGboat, the %% Communications of the TeX Users Group.", %% } +%% $Id: tugboat.sty 100 2012-05-22 18:09:46Z bnb $ +%% %% ********************************************************* %% %% TeXing with this file also requires the following files: @@ -27,8 +29,8 @@ % TUGBOAT.STY \def\thistubstyle{plain} -\def\fileversion{v1.19} -\def\filedate{2011/03/04} +\def\fileversion{v1.20} +\def\filedate{2012/05/22} % general items @@ -137,6 +139,14 @@ \font\ninett=cmtt9 \font\eighttt=cmtt8 +\ifx\tubhyphenatett\@thisisundefined + % do not hyphenate typewriter unless explicitly requested (as + % tb0hyf.tex does). + \hyphenchar\tentt=-1 + \hyphenchar\ninett=-1 + \hyphenchar\eighttt=-1 +\fi + \font\tensl=cmsl10 \font\ninesl=cmsl9 \font\eightsl=cmsl8 @@ -592,12 +602,15 @@ \splitmaxdepth\dp\strutbox \floatingpenalty\@MM \leftskip\z@skip \rightskip\z@skip \spaceskip\z@skip \xspaceskip\z@skip \rm \parindent=\normalparindent % always indent footnotes; added for TUGboat + \TUBstartfootnotehook \textindent{#1}\makestrut[10pt;\z@]\futurelet\next\fo@t} -\def\@foot{\strut\egroup +\def\@foot{\strut\egroup\TUBendfootnotehook \ifDelayFirstPar \SetupFirstPar \global\DelayFirstParfalse \fi } \newif\ifFirstPar \FirstParfalse \def\SetupFirstPar{\global\parindent=\z@ \global\FirstPartrue } +\def\TUBstartfootnotehook{} +\def\TUBendfootnotehook{} %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1644,12 +1657,12 @@ \def\CurrentTag{verbatim}% \@defaultoptions \def\inline{\let\@verbstyle\@inlinestyle}% - \def\display{\let\@verbstyle\@displaystyle}% + \def\display{\par\smallverbdisplay\let\@verbstyle\@displaystyle}% \def\displaystyle##1{\def\@altdisplaystyle{##1}}% \def\inlinestyle##1{\def\@altinlinestyle{##1}}% \def\numbered{\@numberedtrue}% \def\ruled{\@ruledtrue}% - \def\smallcode{\ninepoint\tt\baselineskip=10pt}% + \def\smallcode{\ninepoint\tt\baselineskip=10pt }% \let\@verbinputvar\relax \let\@verbinputfile\relax \@SpecialsGetOther @@ -1660,6 +1673,9 @@ \the\everyverbatim } +% By default, switch to 9pt tt for verbatim displays. +\def\smallverbdisplay{\smallcode} + \def\@SpecialsGetOther{% \catcode`\\=\other \catcode`\{=\other \catcode`\}=\other \catcode`\$=\other @@ -1848,8 +1864,8 @@ % Options and variants. -\def\verbinline{\verbatim[\inline]} -\def\verbdisplay{\verbatim[\display]} +\def\verbinline{\@verbatim[\inline]} % \@verbatim to avoid \display +\def\verbdisplay{\verbatim[\display]} % already the default, but what the heck \def\verbfile#1{\verbatim[\inputfromfile{#1}]} @@ -1885,7 +1901,7 @@ \expandafter\@checknexttoken\expandafter{\the\@verbchar}% {\expandafter\@ignoreone\expandafter{\the\@verbchar}% {\endgroup\verbatim[\longform\maketwoendverb]}}% - {\endgroup\verbatim[\inline\longform\makeoneendverb]}% + {\endgroup\@verbatim[\inline\longform\makeoneendverb]}% } \def\setupverbchar{% @@ -2165,9 +2181,11 @@ \initializearticle \pageno=1001 % number of title page -\StretchyTenPointSpacing -\StretchyNinePointSpacing -\StretchyEightPointSpacing +% Stretchy spacing was the default for many years, but in summer 2011 it +% looked too stretchy. Comment out. +%\StretchyTenPointSpacing +%\StretchyNinePointSpacing +%\StretchyEightPointSpacing \makevertverbchar @@ -2179,6 +2197,12 @@ Version Date Changes ------- --------- --------------------------------------------------- +1.20 22 May 12 Do not hyphenate in typewriter. + Add footnote hooks. + No \Stretchy*Spacing by default. + \smallcode for verbatim displays (not inline) + via \smallverbdisplay. + 1.19 4 Mar 11 added \r 1.18 4 Feb 11 changed \rfoot to give same results as LaTeX class -- cgit v1.2.3