summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-06 20:47:15 +0000
committerKarl Berry <karl@freefriends.org>2018-09-06 20:47:15 +0000
commit0ed21e3b08ac7967aa4923032ccb6aa64c13f4e5 (patch)
treedc0dd2e97c7f96f48fca7b12b8915ca82181924d
parent15d1db0618b158e41f253e9d8af74981f10d0dd3 (diff)
tugboat (6sep18)
git-svn-id: svn://tug.org/texlive/trunk@48607 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst1514
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/README11
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx361
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/ltubguid.pdfbin323389 -> 321945 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/manifest.txt3
-rw-r--r--Master/texmf-dist/doc/latex/tugboat/tugboat.pdfbin464291 -> 465138 bytes
-rw-r--r--Master/texmf-dist/source/latex/tugboat/tugboat.dtx73
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugboat.cls29
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugboat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugproc.cls2
-rw-r--r--Master/texmf-dist/tex/latex/tugboat/ltugproc.sty2
12 files changed, 1760 insertions, 239 deletions
diff --git a/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst b/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst
new file mode 100644
index 00000000000..a99d7a479b1
--- /dev/null
+++ b/Master/texmf-dist/bibtex/bst/tugboat/tugboat.bst
@@ -0,0 +1,1514 @@
+%%% $Id: tugboat.bst 205 2018-09-06 17:28:53Z karl $
+%%% Modified for TUGboat from abbrurl.bst:
+%%% abbreviate "page(s)" to "p(p).",
+%%% "volume" to "vol.",
+%%% "editor(s)" to "ed(s)".
+%%% urlintro=""
+%%% reduce long author lists in format.names per Mico.
+%%% TUGboat changes public domain.
+%%% --karl, originally created 24jul18.
+%%%
+%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/abbrv.bst
+%%% ... by urlbst, version 0.7 (marked with "% urlbst")
+%%% See <http://purl.org/nxg/dist/urlbst>
+%%% Added webpage entry type, and url and lastchecked fields.
+%%% Added eprint support.
+%%% Added DOI support.
+%%% Added PUBMED support.
+%%% Added hyperref support.
+%%% Original headers follow...
+
+% BibTeX standard bibliography style `abbrv'
+ % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
+ % Copyright (C) 1985, all rights reserved.
+ % Copying of this file is authorized only if either
+ % (1) you make absolutely no changes to your copy, including name, or
+ % (2) if you do make changes, you name it something other than
+ % btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
+ % This restriction helps ensure that all standard styles are identical.
+ % The file btxbst.doc has the documentation for this style.
+
+ENTRY
+ { address
+ author
+ booktitle
+ chapter
+ edition
+ editor
+ howpublished
+ institution
+ journal
+ key
+ month
+ note
+ number
+ organization
+ pages
+ publisher
+ school
+ series
+ title
+ type
+ volume
+ year
+ eprint % urlbst
+ doi % urlbst
+ pubmed % urlbst
+ url % urlbst
+ lastchecked % urlbst
+ newpage % tub
+ urlnewline % tub
+ }
+ {}
+ { label }
+
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+
+% urlbst...
+% urlbst constants and state variables
+STRINGS { urlintro
+ eprinturl eprintprefix doiprefix doiurl pubmedprefix pubmedurl
+ citedstring onlinestring linktextstring
+ openinlinelink closeinlinelink }
+INTEGERS { hrefform inlinelinks makeinlinelink
+ addeprints adddoiresolver addpubmedresolver }
+FUNCTION {init.urlbst.variables}
+{
+ % The following constants may be adjusted by hand, if desired
+
+ % The first set allow you to enable or disable certain functionality.
+ #0 'addeprints := % 0=no eprints; 1=include eprints
+ #1 'adddoiresolver := % 0=no DOI resolver; 1=include it
+ #1 'addpubmedresolver := % 0=no PUBMED resolver; 1=include it
+ #2 'hrefform := % 0=no crossrefs; 1=hypertex xrefs; 2=hyperref refs
+ #0 'inlinelinks := % 0=URLs explicit; 1=URLs attached to titles
+
+ % String constants, which you _might_ want to tweak.
+ "" 'urlintro := % prefix before URL; typically "Available from:" or "URL":
+ "online" 'onlinestring := % indication that resource is online; typically "online"
+ "cited " 'citedstring := % indicator of citation date; typically "cited "
+ "[link]" 'linktextstring := % dummy link text; typically "[link]"
+ "http://arxiv.org/abs/" 'eprinturl := % prefix to make URL from eprint ref
+ "arXiv:" 'eprintprefix := % text prefix printed before eprint ref; typically "arXiv:"
+ "http://dx.doi.org/" 'doiurl := % prefix to make URL from DOI
+ "doi:" 'doiprefix := % text prefix printed before DOI ref; typically "doi:"
+ "http://www.ncbi.nlm.nih.gov/pubmed/" 'pubmedurl := % prefix to make URL from PUBMED
+ "PMID:" 'pubmedprefix := % text prefix printed before PUBMED ref; typically "PMID:"
+
+ % The following are internal state variables, not configuration constants,
+ % so they shouldn't be fiddled with.
+ #0 'makeinlinelink := % state variable managed by possibly.setup.inlinelink
+ "" 'openinlinelink := % ditto
+ "" 'closeinlinelink := % ditto
+}
+INTEGERS {
+ bracket.state
+ outside.brackets
+ open.brackets
+ within.brackets
+ close.brackets
+}
+% ...urlbst to here
+
+% tub: move up to use earlier.
+FUNCTION {not}
+{ { #0 }
+ { #1 }
+ if$
+}
+
+FUNCTION {and}
+{ 'skip$
+ { pop$ #0 }
+ if$
+}
+
+FUNCTION {or}
+{ { pop$ #1 }
+ 'skip$
+ if$
+}
+
+FUNCTION {init.state.consts}
+{ #0 'outside.brackets := % urlbst...
+ #1 'open.brackets :=
+ #2 'within.brackets :=
+ #3 'close.brackets := % ...urlbst to here
+
+ #0 'before.all :=
+ #1 'mid.sentence :=
+ #2 'after.sentence :=
+ #3 'after.block :=
+}
+
+STRINGS { s t last.output.check }
+
+% urlbst
+% arg on stack is what needs to be written.
+% If a journal, we want to omit the following comma, as in
+% "TUGboat 39(1)" instead of the default "TUGboat, 39(1)".
+%
+FUNCTION {output.nonnull.original}
+{ 's :=
+ output.state mid.sentence =
+ { last.output.check "journal" = not
+ { ", " * }
+ { " " *}
+ if$
+ 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
+}
+
+% urlbst...
+% The following three functions are for handling inlinelink. They wrap
+% a block of text which is potentially output with write$ by multiple
+% other functions, so we don't know the content a priori.
+% They communicate between each other using the variables makeinlinelink
+% (which is true if a link should be made), and closeinlinelink (which holds
+% the string which should close any current link. They can be called
+% at any time, but start.inlinelink will be a no-op unless something has
+% previously set makeinlinelink true, and the two ...end.inlinelink functions
+% will only do their stuff if start.inlinelink has previously set
+% closeinlinelink to be non-empty.
+% (thanks to 'ijvm' for suggested code here)
+FUNCTION {uand}
+{ 'skip$ { pop$ #0 } if$ } % 'and' (which isn't defined at this point in the file)
+FUNCTION {possibly.setup.inlinelink}
+{ makeinlinelink hrefform #0 > uand
+ { doi empty$ adddoiresolver uand
+ { pubmed empty$ addpubmedresolver uand
+ { eprint empty$ addeprints uand
+ { url empty$
+ { "" }
+ { url }
+ if$ }
+ { eprinturl eprint * }
+ if$ }
+ { pubmedurl pubmed * }
+ if$ }
+ { doiurl doi * }
+ if$
+ % an appropriately-formatted URL is now on the stack
+ hrefform #1 = % hypertex
+ { "\special {html:<a href=" quote$ * swap$ * quote$ * "> }{" * 'openinlinelink :=
+ "\special {html:</a>}" 'closeinlinelink := }
+ { "\newline\href {" swap$ * "} {" * 'openinlinelink := % hrefform=#2 -- hyperref
+ % the space between "} {" matters: a URL of just the right length can cause "\% newline em"
+ "}" 'closeinlinelink := }
+ if$
+ #0 'makeinlinelink :=
+ }
+ 'skip$
+ if$ % makeinlinelink
+}
+FUNCTION {add.inlinelink}
+{ openinlinelink empty$
+ 'skip$
+ { openinlinelink swap$ * closeinlinelink *
+ "" 'openinlinelink :=
+ }
+ if$
+}
+FUNCTION {output.nonnull}
+{ % Save the thing we've been asked to output
+ 's :=
+ % If the bracket-state is close.brackets, then add a close-bracket to
+ % what is currently at the top of the stack, and set bracket.state
+ % to outside.brackets
+ bracket.state close.brackets =
+ { "]" *
+ outside.brackets 'bracket.state :=
+ }
+ 'skip$
+ if$
+ bracket.state outside.brackets =
+ { % We're outside all brackets -- this is the normal situation.
+ % Write out what's currently at the top of the stack, using the
+ % original output.nonnull function.
+ s
+ add.inlinelink
+ output.nonnull.original % invoke the original output.nonnull
+ }
+ { % Still in brackets. Add open-bracket or (continuation) comma, add the
+ % new text (in s) to the top of the stack, and move to the close-brackets
+ % state, ready for next time (unless inbrackets resets it). If we come
+ % into this branch, then output.state is carefully undisturbed.
+ bracket.state open.brackets =
+ { " [" * }
+ { ", " * } % bracket.state will be within.brackets
+ if$
+ s *
+ close.brackets 'bracket.state :=
+ }
+ if$
+}
+
+% Call this function just before adding something which should be presented in
+% brackets. bracket.state is handled specially within output.nonnull.
+FUNCTION {inbrackets}
+{ bracket.state close.brackets =
+ { within.brackets 'bracket.state := } % reset the state: not open nor closed
+ { open.brackets 'bracket.state := }
+ if$
+}
+
+FUNCTION {format.lastchecked}
+{ lastchecked empty$
+ { "" }
+ { inbrackets citedstring lastchecked * }
+ if$
+}
+% ...urlbst to here
+
+FUNCTION {output}
+{ duplicate$ empty$
+ 'pop$
+ 'output.nonnull
+ if$
+}
+
+% tub: save name of field (what's on stack, e.g., "journal") in
+% variable last.output.check for use in output.nonnull.original.
+FUNCTION {output.check}
+{ 't :=
+ duplicate$ empty$
+ { pop$ "empty " t * " in " * cite$ * warning$ }
+ { t 'last.output.check :=
+ output.nonnull }
+ if$
+}
+
+FUNCTION {output.bibitem.original} % urlbst (renamed from output.bibitem, so it can be wrapped below)
+{ newline$
+ "\bibitem{" write$
+ cite$ write$
+ "}" write$
+ newline$
+ ""
+ before.all 'output.state :=
+}
+
+FUNCTION {fin.entry.original} % urlbst (renamed from fin.entry, so it can be wrapped below)
+{ doi empty$ url empty$ and
+ { add.period$ }
+ { skip$ }
+ if$
+ 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 {new.block.checka}
+{ empty$
+ 'skip$
+ 'new.block
+ if$
+}
+
+FUNCTION {new.block.checkb}
+{ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.block
+ if$
+}
+
+FUNCTION {new.sentence.checka}
+{ empty$
+ 'skip$
+ 'new.sentence
+ if$
+}
+
+FUNCTION {new.sentence.checkb}
+{ empty$
+ swap$ empty$
+ and
+ 'skip$
+ 'new.sentence
+ if$
+}
+
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+ { pop$ "" }
+ 'skip$
+ if$
+}
+
+FUNCTION {emphasize}
+{ duplicate$ empty$
+ { pop$ "" }
+ { "{\em " swap$ * "}" * }
+ if$
+}
+
+INTEGERS { nameptr namesleft numnames }
+
+FUNCTION {format.names}
+{ 's :=
+ #1 'nameptr :=
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+ nameptr #1 >
+ % following lines implement printing only 2 author names (+ "et al.")
+ % whenever there are more than 4 authors. Thanks Mico.
+ % https://tex.stackexchange.com/questions/26575
+ { nameptr #2
+ #1 + =
+ numnames #3
+ > and
+ { "others" 't :=
+ #1 'namesleft := }
+ 'skip$
+ if$
+ namesleft #1 >
+ { ", " * t * }
+ { numnames #2 >
+ { "," * }
+ 'skip$
+ if$
+ t "others" =
+ { " et~al." * }
+ { " and " * t * }
+ if$
+ }
+ if$
+ }
+ 't
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
+ while$
+}
+
+FUNCTION {format.authors}
+{ author empty$
+ { "" }
+ { author format.names }
+ if$
+}
+
+FUNCTION {format.editors}
+{ editor empty$
+ { "" }
+ { editor format.names
+ editor num.names$ #1 >
+ { ", eds." * }
+ { ", ed." * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.title}
+{ title empty$
+ { "" }
+ { title "t" change.case$ }
+ if$
+}
+
+FUNCTION {n.dashify}
+{ '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 {format.date}
+{ year empty$
+ { month empty$
+ { "" }
+ { "there's a month but no year in " cite$ * warning$
+ month
+ }
+ if$
+ }
+ { month empty$
+ 'year
+ { month " " * year * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.btitle}
+{ title emphasize
+}
+
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+ { "~" }
+ { " " }
+ if$
+ swap$ * *
+}
+
+FUNCTION {either.or.check}
+{ empty$
+ 'pop$
+ { "can't use both " swap$ * " fields in " * cite$ * warning$ }
+ if$
+}
+
+FUNCTION {format.bvolume}
+{ volume empty$
+ { "" }
+ { "vol." volume tie.or.space.connect
+ series empty$
+ 'skip$
+ { " of " * series emphasize * }
+ if$
+ "volume and number" number either.or.check
+ }
+ if$
+}
+
+FUNCTION {format.number.series}
+{ volume empty$
+ { number empty$
+ { series field.or.null }
+ { output.state mid.sentence =
+ { "number" }
+ { "Number" }
+ if$
+ number tie.or.space.connect
+ series empty$
+ { "there's a number but no series in " cite$ * warning$ }
+ { " in " * series * }
+ if$
+ }
+ if$
+ }
+ { "" }
+ if$
+}
+
+FUNCTION {format.edition}
+{ edition empty$
+ { "" }
+ { output.state mid.sentence =
+ { edition "l" change.case$ " edition" * }
+ { edition "t" change.case$ " edition" * }
+ if$
+ }
+ 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 empty$
+ { "" }
+ { pages multi.page.check
+ { "pp." pages n.dashify tie.or.space.connect }
+ { "p." pages tie.or.space.connect }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.vol.num.pages}
+{ volume field.or.null
+ number empty$
+ 'skip$
+ { "(" number * ")" * *
+ volume empty$
+ { "there's a number but no volume in " cite$ * warning$ }
+ 'skip$
+ if$
+ }
+ if$
+ pages empty$
+ 'skip$
+ { duplicate$ empty$
+ { pop$ format.pages }
+ { ":" * pages n.dashify * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+ 'format.pages
+ { type empty$
+ { "chapter" }
+ { type "l" change.case$ }
+ if$
+ chapter tie.or.space.connect
+ pages empty$
+ 'skip$
+ { ", " * format.pages * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.in.ed.booktitle}
+{ booktitle empty$
+ { "" }
+ { editor empty$
+ { "In " booktitle emphasize * }
+ { "In " format.editors * ", " * booktitle emphasize * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+ month empty$ year empty$ note empty$
+ and and and and and
+ key empty$ not and
+ { "all relevant fields are empty in " cite$ * warning$ }
+ 'skip$
+ if$
+}
+
+FUNCTION {format.thesis.type}
+{ type empty$
+ 'skip$
+ { pop$
+ type "t" change.case$
+ }
+ if$
+}
+
+FUNCTION {format.tr.number}
+{ type empty$
+ { "Technical Report" }
+ 'type
+ if$
+ number empty$
+ { "t" change.case$ }
+ { number tie.or.space.connect }
+ if$
+}
+
+FUNCTION {format.article.crossref}
+{ key empty$
+ { journal empty$
+ { "need key or journal for " cite$ * " to crossref " * crossref *
+ warning$
+ ""
+ }
+ { "In {\em " journal * "\/}" * }
+ if$
+ }
+ { "In " key * }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.crossref.editor}
+{ editor #1 "{vv~}{ll}" format.name$
+ editor num.names$ duplicate$
+ #2 >
+ { pop$ " et~al." * }
+ { #2 <
+ 'skip$
+ { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { " et~al." * }
+ { " and " * editor #2 "{vv~}{ll}" format.name$ * }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.book.crossref}
+{ volume empty$
+ { "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+ "In "
+ }
+ { "Volume" volume tie.or.space.connect
+ " of " *
+ }
+ if$
+ editor empty$
+ editor field.or.null author field.or.null =
+ or
+ { key empty$
+ { series empty$
+ { "need editor, key, or series for " cite$ * " to crossref " *
+ crossref * warning$
+ "" *
+ }
+ { "{\em " * series * "\/}" * }
+ if$
+ }
+ { key * }
+ if$
+ }
+ { format.crossref.editor * }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+FUNCTION {format.incoll.inproc.crossref}
+{ editor empty$
+ editor field.or.null author field.or.null =
+ or
+ { key empty$
+ { booktitle empty$
+ { "need editor, key, or booktitle for " cite$ * " to crossref " *
+ crossref * warning$
+ ""
+ }
+ { "In {\em " booktitle * "\/}" * }
+ if$
+ }
+ { "In " key * }
+ if$
+ }
+ { "In " format.crossref.editor * }
+ if$
+ " \cite{" * crossref * "}" *
+}
+
+% urlbst...
+% Functions for making hypertext links.
+% In all cases, the stack has (link-text href-url)
+%
+% make 'null' specials
+FUNCTION {make.href.null}
+{
+ pop$
+}
+% make hypertex specials
+FUNCTION {make.href.hypertex}
+{
+ "\special {html:<a href=" quote$ *
+ swap$ * quote$ * "> }" * swap$ *
+ "\special {html:</a>}" *
+}
+% make hyperref specials
+FUNCTION {make.href.hyperref}
+{
+ "\newline\href {" swap$ * "} {\path{" * swap$ * "}}" *
+}
+FUNCTION {make.href}
+{ hrefform #2 =
+ 'make.href.hyperref % hrefform = 2
+ { hrefform #1 =
+ 'make.href.hypertex % hrefform = 1
+ 'make.href.null % hrefform = 0 (or anything else)
+ if$
+ }
+ if$
+}
+
+% If inlinelinks is true, then format.url should be a no-op, since it's
+% (a) redundant, and (b) could end up as a link-within-a-link.
+% Likewise if the url is empty.
+% Likewise if doi is present, on the assumption that
+% url most likely redundantly specifies the same info as those fields; this
+% seems to be what people do in practice.
+FUNCTION {format.url}
+{ inlinelinks #1 = url empty$ or
+ doi empty$ not or
+ howpublished empty$ not or
+ { "" }
+ { hrefform #1 =
+ { % special case -- add HyperTeX specials
+ urlintro "\url{" url * "}" * url make.href.hypertex * }
+ { urlintro "\url{" * url * "}" * }
+ if$
+ }
+ if$
+}
+
+FUNCTION {format.eprint}
+{ eprint empty$
+ { "" }
+ { eprintprefix eprint * eprinturl eprint * make.href }
+ if$
+}
+
+FUNCTION {format.doi}
+{ doi empty$
+ { "" }
+ { doiprefix doi * doiurl doi * make.href }
+ if$
+}
+
+FUNCTION {format.pubmed}
+{ pubmed empty$
+ { "" }
+ { pubmedprefix pubmed * pubmedurl pubmed * make.href }
+ if$
+}
+
+% Output a URL. We can't use the more normal idiom (something like
+% `format.url output'), because the `inbrackets' within
+% format.lastchecked applies to everything between calls to `output',
+% so that `format.url format.lastchecked * output' ends up with both
+% the URL and the lastchecked in brackets.
+%
+% If the `urlnewline' field is present, output \newline before the
+% url value.
+FUNCTION {output.url}
+{ url empty$
+ 'skip$
+ { new.block
+ format.url output
+ urlnewline empty$ not
+ { "\newline " write$ }
+ 'skip$
+ if$
+ format.lastchecked output
+ }
+ if$
+}
+
+FUNCTION {output.web.refs}
+{
+ new.block
+ inlinelinks
+ 'skip$ % links were inline -- don't repeat them
+ {
+ output.url
+ addeprints eprint empty$ not and
+ { format.eprint output.nonnull }
+ 'skip$
+ if$
+ adddoiresolver doi empty$ not and
+ { format.doi output.nonnull }
+ 'skip$
+ if$
+ addpubmedresolver pubmed empty$ not and
+ { format.pubmed output.nonnull }
+ 'skip$
+ if$
+ }
+ if$
+}
+
+% Wrapper for output.bibitem.original.
+% If the URL field is not empty, set makeinlinelink to be true,
+% so that an inline link will be started at the next opportunity
+FUNCTION {output.bibitem}
+{ outside.brackets 'bracket.state :=
+ output.bibitem.original
+ inlinelinks url empty$ not doi empty$ not or pubmed empty$ not or eprint empty$ not or and
+ { #1 'makeinlinelink := }
+ { #0 'makeinlinelink := }
+ if$
+}
+
+% Wrapper for fin.entry.original
+FUNCTION {fin.entry}
+{ output.web.refs % urlbst
+ makeinlinelink % ooops, it appears we didn't have a title for inlinelink
+ { possibly.setup.inlinelink % add some artificial link text here, as a fallback
+ linktextstring output.nonnull }
+ 'skip$
+ if$
+ bracket.state close.brackets = % urlbst
+ { "]" * }
+ 'skip$
+ if$
+ fin.entry.original
+ newpage empty$ not
+ { "\newpage " write$ }
+ 'skip$
+ if$
+}
+
+% Webpage entry type.
+% Title and url fields required;
+% author, note, year, month, and lastchecked fields optional
+% See references
+% ISO 690-2 http://www.nlc-bnc.ca/iso/tc46sc9/standard/690-2e.htm
+% http://www.classroom.net/classroom/CitingNetResources.html
+% http://neal.ctstateu.edu/history/cite.html
+% http://www.cas.usf.edu/english/walker/mla.html
+% for citation formats for web pages.
+FUNCTION {webpage}
+{ output.bibitem
+ author empty$
+ { editor empty$
+ 'skip$ % author and editor both optional
+ { format.editors output.nonnull }
+ if$
+ }
+ { editor empty$
+ { format.authors output.nonnull }
+ { "can't use both author and editor fields in " cite$ * warning$ }
+ if$
+ }
+ if$
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$
+ format.title "title" output.check
+ inbrackets onlinestring output
+ new.block
+ year empty$
+ 'skip$
+ { format.date "year" output.check }
+ if$
+ % We don't need to output the URL details ('lastchecked' and 'url'),
+ % because fin.entry does that for us, using output.web.refs. The only
+ % reason we would want to put them here is if we were to decide that
+ % they should go in front of the rather miscellaneous information in 'note'.
+ new.block
+ note output
+ fin.entry
+}
+% ...urlbst to here
+
+
+FUNCTION {article}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ { journal emphasize "journal" output.check
+ possibly.setup.inlinelink format.vol.num.pages output% urlbst
+ format.date "year" output.check
+ }
+ { format.article.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {book}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check }
+ { format.authors output.nonnull
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.btitle "title" output.check
+ crossref missing$
+ { format.bvolume output
+ new.block
+ format.number.series output
+ new.sentence
+ publisher "publisher" output.check
+ address output
+ }
+ { new.block
+ format.book.crossref output.nonnull
+ }
+ if$
+ format.edition output
+ format.date "year" output.check
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {booklet}
+{ output.bibitem
+ format.authors output
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ howpublished address new.block.checkb
+ howpublished output
+ address output
+ format.date output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check }
+ { format.authors output.nonnull
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.btitle "title" output.check
+ crossref missing$
+ { format.bvolume output
+ format.chapter.pages "chapter and pages" output.check
+ new.block
+ format.number.series output
+ new.sentence
+ publisher "publisher" output.check
+ address output
+ }
+ { format.chapter.pages "chapter and pages" output.check
+ new.block
+ format.book.crossref output.nonnull
+ }
+ if$
+ format.edition output
+ format.date "year" output.check
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
+ format.chapter.pages output
+ new.sentence
+ publisher "publisher" output.check
+ address output
+ format.edition output
+ format.date "year" output.check
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.chapter.pages output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {inproceedings}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ new.block
+ crossref missing$
+ { format.in.ed.booktitle "booktitle" output.check
+ format.bvolume output
+ format.number.series output
+ format.pages output
+ address empty$
+ { organization publisher new.sentence.checkb
+ organization output
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ new.sentence
+ organization output
+ publisher output
+ }
+ if$
+ }
+ { format.incoll.inproc.crossref output.nonnull
+ format.pages output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {conference} { inproceedings }
+
+FUNCTION {manual}
+{ output.bibitem
+ author empty$
+ { organization empty$
+ 'skip$
+ { organization output.nonnull
+ address output
+ }
+ if$
+ }
+ { format.authors output.nonnull }
+ if$
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.btitle "title" output.check
+ author empty$
+ { organization empty$
+ { address new.block.checka
+ address output
+ }
+ 'skip$
+ if$
+ }
+ { organization address new.block.checkb
+ organization output
+ address output
+ }
+ if$
+ format.edition output
+ format.date output
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ new.block
+ "Master's thesis" format.thesis.type output.nonnull
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {misc}
+{ output.bibitem
+ format.authors output
+ title howpublished new.block.checkb
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title output
+ howpublished new.block.checka
+ howpublished output
+ format.date output
+ new.block
+ note output
+ fin.entry
+ empty.misc.check
+}
+
+FUNCTION {online}
+{ misc }
+
+FUNCTION {phdthesis}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.btitle "title" output.check
+ new.block
+ "PhD thesis" format.thesis.type output.nonnull
+ school "school" output.check
+ address output
+ format.date "year" output.check
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+ editor empty$
+ { organization output }
+ { format.editors output.nonnull }
+ if$
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.btitle "title" output.check
+ format.bvolume output
+ format.number.series output
+ address empty$
+ { editor empty$
+ { publisher new.sentence.checka }
+ { organization publisher new.sentence.checkb
+ organization output
+ }
+ if$
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ new.sentence
+ editor empty$
+ 'skip$
+ { organization output }
+ if$
+ publisher output
+ }
+ if$
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ new.block
+ format.tr.number output.nonnull
+ institution "institution" output.check
+ address output
+ format.date "year" output.check
+ new.block
+ note output
+ fin.entry
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+ format.authors "author" output.check
+ new.block
+ title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
+ format.title "title" output.check
+ new.block
+ note "note" output.check
+ format.date output
+ fin.entry
+}
+
+FUNCTION {default.type} { misc }
+
+MACRO {jan} {"Jan."}
+
+MACRO {feb} {"Feb."}
+
+MACRO {mar} {"Mar."}
+
+MACRO {apr} {"Apr."}
+
+MACRO {may} {"May"}
+
+MACRO {jun} {"June"}
+
+MACRO {jul} {"July"}
+
+MACRO {aug} {"Aug."}
+
+MACRO {sep} {"Sept."}
+
+MACRO {oct} {"Oct."}
+
+MACRO {nov} {"Nov."}
+
+MACRO {dec} {"Dec."}
+
+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. Softw. Eng."}
+
+MACRO {ieeetc} {"IEEE Trans. Comput."}
+
+MACRO {ieeetcad}
+ {"IEEE Trans. Comput.-Aided Design Integrated Circuits"}
+
+MACRO {ipl} {"Inf. Process. Lett."}
+
+MACRO {jacm} {"J.~ACM"}
+
+MACRO {jcss} {"J.~Comput. Syst. Sci."}
+
+MACRO {scp} {"Sci. Comput. Programming"}
+
+MACRO {sicomp} {"SIAM J. Comput."}
+
+MACRO {tocs} {"ACM Trans. Comput. Syst."}
+
+MACRO {tods} {"ACM Trans. Database Syst."}
+
+MACRO {tog} {"ACM Trans. Gr."}
+
+MACRO {toms} {"ACM Trans. Math. Softw."}
+
+MACRO {toois} {"ACM Trans. Office Inf. Syst."}
+
+MACRO {toplas} {"ACM Trans. Prog. Lang. Syst."}
+
+MACRO {tcs} {"Theoretical Comput. Sci."}
+
+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 {sort.format.names}
+{ 's :=
+ #1 'nameptr :=
+ ""
+ s num.names$ 'numnames :=
+ numnames 'namesleft :=
+ { namesleft #0 > }
+ { nameptr #1 >
+ { " " * }
+ 'skip$
+ if$
+ s nameptr "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" format.name$ 't :=
+ nameptr numnames = t "others" = and
+ { "et al" * }
+ { 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 {author.organization.sort}
+{ author empty$
+ { organization empty$
+ { key empty$
+ { "to sort, need author, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
+ if$
+ }
+ { author sort.format.names }
+ if$
+}
+
+FUNCTION {editor.organization.sort}
+{ editor empty$
+ { organization empty$
+ { key empty$
+ { "to sort, need editor, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
+ if$
+ }
+ { editor sort.format.names }
+ if$
+}
+
+FUNCTION {presort}
+{ type$ "book" =
+ type$ "inbook" =
+ or
+ 'author.editor.sort
+ { type$ "proceedings" =
+ 'editor.organization.sort
+ { type$ "manual" =
+ 'author.organization.sort
+ 'author.sort
+ if$
+ }
+ if$
+ }
+ if$
+ " "
+ *
+ year field.or.null sortify
+ *
+ " "
+ *
+ title field.or.null
+ sort.format.title
+ *
+ #1 entry.max$ substring$
+ 'sort.key$ :=
+}
+
+ITERATE {presort}
+
+SORT
+
+STRINGS { longest.label }
+
+INTEGERS { number.label longest.label.width }
+
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+ #1 'number.label :=
+ #0 'longest.label.width :=
+}
+
+FUNCTION {longest.label.pass}
+{ number.label int.to.str$ 'label :=
+ number.label #1 + 'number.label :=
+ label width$ longest.label.width >
+ { label 'longest.label :=
+ label width$ 'longest.label.width :=
+ }
+ 'skip$
+ if$
+}
+
+EXECUTE {initialize.longest.label}
+
+ITERATE {longest.label.pass}
+
+FUNCTION {begin.bib}
+{ preamble$ empty$
+ 'skip$
+ { preamble$ write$ newline$ }
+ if$
+ "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+}
+
+EXECUTE {begin.bib}
+
+EXECUTE {init.urlbst.variables} % urlbst
+EXECUTE {init.state.consts}
+
+ITERATE {call.type$}
+
+FUNCTION {end.bib}
+{ newline$
+ "\end{thebibliography}" write$ newline$
+}
+
+EXECUTE {end.bib}
diff --git a/Master/texmf-dist/doc/latex/tugboat/README b/Master/texmf-dist/doc/latex/tugboat/README
index 5c36819e5ea..11e6e50e24c 100644
--- a/Master/texmf-dist/doc/latex/tugboat/README
+++ b/Master/texmf-dist/doc/latex/tugboat/README
@@ -1,5 +1,5 @@
-$Id: README 121 2013-08-02 18:44:59Z bnb $
-Copyright 2006, 2009-2013 TeX Users Group.
+$Id: README 205 2018-09-06 17:28:53Z karl $
+Copyright 2006, 2009-2018 TeX Users Group.
You may freely use, modify and/or distribute this file.
LaTeX macros for use in TUGboat
@@ -33,9 +33,10 @@ But if you want to install it by hand from CTAN, its directory there
but much updated since)
other files are
- ltugbib.bst -- a BibTeX style for ltugboat.cls's Harvard-cite capabilities
- ltubguid.pdf -- browsable user documentation
- tugboat.pdf -- browsable implementation documentation
+ ltubguid.pdf -- user documentation
+ tugboat.bst -- recommended BibTeX style for TUGboat
+ (approximately abbrvurl plus yet more abbreviations)
+ ltugbib.bst -- BibTeX style for ltugboat.cls's Harvard-cite capabilities
Processing the .ins file produces:
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
index 32b680931f9..64d19469b12 100644
--- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
+++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.ltx
@@ -1,7 +1,8 @@
-% $Id: ltubguid.ltx 187 2017-11-06 20:29:32Z karl $
+% $Id: ltubguid.ltx 205 2018-09-06 17:28:53Z karl $
% ltubguid.ltx - documentation for ltugboat classes.
%
-% Copyright 1994,1995,1996,2001,2005,2006,2010,2013,2014,2017 TeX Users Group.
+% Copyright 1994,1995,1996,2001,2005,2006,2010,2013,2014,2017,2018
+% TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -39,28 +40,28 @@
author = {Timothy Van Zandt and others},
title = {The {\textsf{fancyvrb}} package},
year = {2015},
- howpublished = {\url{https://ctan.org/pkg/fancyvrb}},
+ howpublished = {\url{ctan.org/pkg/fancyvrb}},
}
@Misc{pkg:listings,
author = {Carsten Heinz and others},
title = {The {\textsf{listings}} package},
year = {2015},
- howpublished = {\url{https://ctan.org/pkg/listings}},
+ howpublished = {\url{ctan.org/pkg/listings}},
}
@Misc{Arseneau:url:1996,
author = {Donald Arseneau},
title = {The {\textsf{url}} package},
year = {2013},
- howpublished = {\url{https://ctan.org/pkg/url}},
+ howpublished = {\url{ctan.org/pkg/url}},
}
@Misc{Rahtz:hyperref:1997,
author = {Sebastian Rahtz and Heiko Oberdiek and others},
title = {The {\textsf{hyperref}} package},
year = 2017,
- howpublished = {\url{https://ctan.org/pkg/hyperref}},
+ howpublished = {\url{ctan.org/pkg/hyperref}},
}
@Book{Lamport:1994,
@@ -76,14 +77,14 @@
title = {The {\textsf{verbatim}} package},
year = {1996},
month = {June},
- howpublished = {\url{https://ctan.org/pkg/mflogo}},
+ howpublished = {\url{ctan.org/pkg/mflogo}},
}
@Misc{Vieth:mflogo:1995,
author = {Ulrik Vieth},
title = {The {\textsf{mflogo}} package},
year = {1999},
- howpublished = {\url{https://ctan.org/pkg/mflogo}},
+ howpublished = {\url{ctan.org/pkg/mflogo}},
}
@Article{Whitney:TB10-3-378,
@@ -95,7 +96,7 @@
volume = {10},
number = {3},
pages = {378--385},
- note = {\url{https://ctan.org/pkg/tugboat-plain}},
+ note = {\url{ctan.org/pkg/tugboat-plain}},
}
\end{filecontents}
@@ -103,8 +104,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% ctandir.sty -- an experimental style file to go with Donald
-% Arseneau's url.sty to perform some of the functions that we use the
-% \FAQverb stuff in the UK TUG FAQ for
+% Arseneau's url.sty. Not recommended these days, better to use
+% https://ctan.org/pkg/..., but don't feel like rewriting.
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -114,7 +115,7 @@
% Arseneau's |url.sty|
%
% we need url.sty; we can rely on it to demand anything it needs of
-% LaTeX
+% LaTeX. Not
\IfFileExists{url.sty}%
{\RequirePackage{url}}%
{\PackageWarning{ctandir}{You should acquire a copy of url.sty}%
@@ -158,10 +159,6 @@
\CTANfile{tub-biblio}{digests/tugboat/biblio/tugboat.bib}
\CTANfile{url}{macros/latex/contrib/misc/url.sty}
%
-% commands that would be defined by changebar if we were using it:
-\providecommand\cbstart{}
-\providecommand\cbend{}
-%
% ***** Commands provided by this paper *****
%
% Typeset the name of an environment, class, package, option, program
@@ -215,7 +212,7 @@
\author{Robin Fairbairns \& TUGboat editors}
\EDITORnoaddress
\netaddress{tugboat@tug.org}
-\personalURL{https://tug.org/TUGboat}
+\personalURL{tug.org/TUGboat}
\maketitle
\section{Introduction}
@@ -230,9 +227,10 @@ Mimi Burbank, and the \LaTeX3 team.
\section{Availability}
-The \TUB\ web pages are at:\\\centerline{\url{https://tug.org/TUGboat}} They
-include an article template, information for authors and reviewers, all
-the back issues, and more.
+The \TUB\ web pages are at:\\\centerline{\url{https://tug.org/TUGboat}}
+They provide \textbf{an article template}, information for authors and
+reviewers, and the complete run of all published \TUB\ issues, among
+other things.
The macros are released for general use, and are distributed via \CTAN{}
(directory \CTANref{tub-latex}) in the usual \LaTeX{} way as files
@@ -279,20 +277,20 @@ and one/two-side options).
of the reference; see section~\ref{sec:biblio}.
\item[final] Set up for the final copy of a paper: page numbering to
come from elsewhere, no cropmarks.
-\item[harvardcite] Specify Harvard-style citation (not especially
- recommended in general, though they are used in the present document); see
+\item[harvardcite] Specify Harvard-style citation (not
+ recommended in general; see section~\ref{sec:biblio}); see
section~\ref{sec:biblio}.
\item[noextralabel] Don't use the extra label-distinguishing mark in
the body of the reference; see section~\ref{sec:biblio}.
-\item[nonumber] Sections are not to be numbered; section heading
+\item[nonumber] Sections are not numbered; section heading
layout is to be as in the `plain' \pkgname{tugboat} styles.
\item[numbersec] Sections, subsections and subsubsections are to be
numbered (this is the default setting\Dash the author need not
explicitly set it).
\item[onecolumn] Typeset article in one column.
\item[preprint] Set up for a preprint.
-\item[rawcite] Specify default (unnumbered) citation; see
- section~\ref{sec:biblio}.
+\item[rawcite] Explicitly specify the standard \LaTeX\ citation method,
+ which is the default; see section~\ref{sec:biblio}.
\item[runningfull] Information in both header and footer (default).
\item[runningminimal] Information in header only.
\item[runningoff] Information in neither header nor footer.
@@ -316,12 +314,6 @@ environments, or modify the definitions of \LaTeX{} `standard'
commands. Section~\ref{sec:equiv} lists equivalences between macros
defined by the `plain' package and those defined by the new package.
-The `down' side of this decision is, of course, the `welter of
-\LaTeX{} braces' that Barbara Beeton has been heard to complain of in
-production team discussions. One has to hope that the (near)
-uniformity of syntax offers those who think like Barbara some small
-recompense!
-
\section{Divisions of the paper}
\label{sec:divs-paper}
@@ -333,15 +325,10 @@ article (the classes are defined in terms of \LaTeX{}'s
\cs{chapter}, which doesn't even appear in the parent class, receives
the same treatment).
-Authors should note that the style of ordinary issues of \TUB{} makes
+Authors may note that the style of ordinary issues of \TUB{} makes
no distinction between the titles of the divisions; the visual style
relies on the section numbers to indicate where the divisions lie in
-the hierarchy. As a result, the un-numbered `\verb|*|' forms of the
-\cs{section}, etc., commands, are inappropriate. The
-\clsname{ltugboat} class therefore warns the author who (possibly
-inadvertently) uses one of these forms. (An author who wishes to use
-un-numbered sections throughout the paper may use the
-\optname{nonumber} class option (see~\ref{sec:boat-opts}).
+the hierarchy.
Reference may, however, be made to the `title' of divisions of the
paper, whether they are numbered or not. The \cs{nameref} command
@@ -357,20 +344,18 @@ and the command \verb|\nameref{sec:divs-paper}| produces
\subsection{Abstracts}
-The classes make provision for abstracts, but the provision is
-different for the two classes.
-
-The \clsname{ltugboat} class provides two environments, \envname{abstract}
-and \envname{longabstract}. The \envname{abstract} environment simply
-typesets its body as an un-numbered section whose title is
-`Abstract'. The \envname{longabstract} environment typesets its body in
-small text, and separates the abstract from the rest of the paper with
-a decorative line.
+The \clsname{ltugboat} class provides two environments for abstracts,
+\envname{abstract} and \envname{longabstract}. The \envname{abstract}
+environment simply typesets its body as an un-numbered section whose
+title is `Abstract'. The \envname{longabstract} environment typesets its
+body in small text, and separates the abstract from the rest of the
+paper with a decorative line; this is rarely used.
\subsection{Appendices}
-A paper may have appendices, which are expressed in exactly the same
-way as they would be in the \LaTeX{} article class:
+A paper may have appendices, which can be expressed in exactly the same
+way as they would be in the \LaTeX{} article class (confusing as that
+may be):
\begin{verbatim}[\small]
\appendix
@@ -383,9 +368,8 @@ Which will produce `section' headings similar to:
\textbf{A\quad This is appendix A}
\end{quote}
-\TUB{} articles may have a small extension to this format: this
-extension was originally developed for proceedings of past years, but is
-also available in normal issues:
+\TUB{} articles may have a small extension to this format using an
+\texttt{appendix} environment:
\begin{verbatim}[\small]
\begin{appendix}
@@ -393,7 +377,7 @@ also available in normal issues:
...
\end{appendix}
\end{verbatim}
-Which will produce `section' headings similar to:
+which will produce `section' headings similar to:
\begin{quote}
\textbf{Appendix A\quad This is the first one}
\end{quote}
@@ -414,7 +398,7 @@ and for each \cs{author} there should be a \cs{address} command that
gives a (postal) correspondence address. In addition (wherever
possible), \TUB{} likes to quote an email address for authors: for
this, the \cs{netaddress} command is used. Finally, each
-author may advertise a `home' Web page, using a \cs{personalURL} command.
+author may mention a web page, using a \cs{personalURL} command.
For example, the present paper has at its start:
@@ -457,13 +441,7 @@ given at \tug'95 (abbreviated):
\address{Elsevier Science Ltd\\
...}
\netaddress{...}
-
-\author{Robin Fairbairns}
-\address{University of Cambridge
- Computer Laboratory\\
- ...}
-\netaddress{...}
-\personalURL{...}
+...
\end{verbatim}
The class files will take care of arranging author names and addresses
@@ -471,22 +449,16 @@ between the \cs{maketitle} and (possibly) \cs{makesignature} commands.
\subsection{Compilation articles}
-\begin{sloppypar}
- Compilation articles are built from a set of contributed parts, and
- are under the general (sub-)\penalty0\relax\hskip0pt plus0pt minus0pt\relax
- editorship of the author\footnote{Or authors: there's no reason in
- particular that compilation articles should not be put together
- by more than one person.} of the article. The author of the article
- is presented (using \cs{author} and suchlike commands) in the usual
- way, and writes the introductory text. Each contributors' part then
- follows. The contributor's name is quoted in the \cs{contributor}
- command, which is an analogue of the \cs{author} command;
- contributors' \cs{address}, \cs{netaddress} or \cs{personalURL}.
- The \cs{contributor} command opens a group in which the contribution
- appears, and the contributor's signature (produced with a
- \cs{makesignature} command) closes the group. The general scheme
- looks like:
-\end{sloppypar}
+Compilation articles are written as a set of contributed parts under the
+general editorship of the author(s) of the article. The author of the
+article is presented (using \cs{author}, etc.)\ in the
+usual way, and writes the introductory text. Each contributors' part
+then follows. The contributor's name is quoted in the \cs{contributor}
+command, which is an analogue of the \cs{author} command; contributors'
+\cs{address}, \cs{netaddress} or \cs{personalURL}. The \cs{contributor}
+command opens a group in which the contribution appears, and the
+contributor's signature (produced with a \cs{makesignature} command)
+closes the group. The general scheme looks like:
\begin{verbatim}[\small\makeescape\|\makebgroup\[\makeegroup\]]
\title{Example compilation article}
\author{Robin Fairbairns}
@@ -505,24 +477,18 @@ between the \cs{maketitle} and (possibly) \cs{makesignature} commands.
\section{Verbatim text}
\label{sec:verbatim}
-The classes do not at present provide the same wide range of
-facilities as the `plain' \pkgname{tugboat} style
-\cite{Whitney:TB10-3-378}; the author had hoped to `borrow' facilities
-from a package which is believed to be in development, but in the
-event that package has not materialised.
-
-For in-line verbatim text, authors should ordinarily employ the
-facilities of \LaTeX{} itself (the \cs{verb} macro). This macro, of
-course, is highly restricted as to its usage (primarily, that it may
+For inline verbatim text, authors should ordinarily employ the
+facilities of \LaTeX{} itself, that is, the \cs{verb} macro. This macro, of
+course, is highly restricted as to its usage\Dash primarily, it may
not appear in the argument of \emph{any} other macro, even
-\cs{footnote}).
+\cs{footnote}.
For displayed verbatim text, the classes add a small increment to
the functionality of \LaTeX{}'s \envname{verbatim} environment, by
introducing an optional argument. The optional argument may contain
commands to be executed before starting the verbatim text; the set of
commands which have useful effect is strictly limited, but the
-following are commonly used:
+following are common:
\begin{itemize}
\item Font size selection commands: for example, all the display
verbatim in the present paper starts with
@@ -545,6 +511,8 @@ produces:
\begin{verbatim}[\small\makevmeta]
The !<duration> is long ...
\end{verbatim}
+ The \verb|!| character is made a general escape character by
+ \cs{makevmeta}, but \verb|<>| are not made grouping characters.
\item More generally, one of the \cs{make*} commands,\footnote{\cs{makeescape},
\cs{makebgroup}, \dots, \cs{makecomment}; used, for example, as
@@ -560,8 +528,8 @@ Two caveats about these optional arguments:
verbatim. An author who wishes to start verbatim text with a
\verb|[| character should provide an empty optional argument (i.e.,
`\verb|[]|') to the \envname{verbatim} environment.
-\item The \TUB\ facility is lost when anything is loaded that also defines the
- \verb|verbatim| environment, as discussed next.
+\item The \TUB\ facility is lost when any package is loaded that also
+ defines the \verb|verbatim| environment, as discussed next.
\end{itemize}
Authors may wish to use a more featureful verbatim package, such as such
@@ -619,7 +587,7 @@ set of the macros.
The classes provide macros that produce `correct' representations of a
large number of acronyms and logos; a small representative selection is
shown in figure~\ref{fig:acro-logo}. The sample documents at
-\url{https://tug.org/TUGboat/location.html} have a more complete list,
+\url{tug.org/TUGboat/location.html} have a more complete list,
and of course the class sources are the ultimate reference.
\begin{figure}[htbp!]
\begin{center}
@@ -653,14 +621,14 @@ and of course the class sources are the ultimate reference.
\end{figure}
Authors are especially urged to note the \cs{acro} command, which is
-defined in the classes. The visual appearance of (mostly) lower-case
-English text, with interpolated acronyms in the same point size, is
-generally unpleasing in Computer Modern. Therefore, the \cs{acro}
-command typesets its argument slightly smaller than it would otherwise
-appear: compare `\acro{DANTE}' (\verb|\acro{DANTE}|) with `DANTE'\@.
-Many of the provided macros merely generate calls to \cs{acro}; two
-examples, \cs{CTAN} and \cs{tug} of the list in
-figure~\ref{fig:acro-logo} have already been used in the present paper.
+defined in the classes. The visual appearance of all-caps sequences
+among normal text is rather unpleasing in Computer Modern,
+unfortunately. Therefore, the \cs{acro} command typesets its argument
+one point size smaller than the surrounding text: compare `\acro{DANTE}'
+(\verb|\acro{DANTE}|) with `DANTE'\@. Many of the provided macros merely
+generate calls to \cs{acro}; two examples, \cs{CTAN} and \cs{tug} of the
+list in figure~\ref{fig:acro-logo} have already been used in the present
+paper.
\subsection{Other special typesetting}
@@ -687,33 +655,22 @@ the `everyday' ones.
\section{Use of packages}
-In general, the \TUB{} team will be sympathetic to authors who wish to
-use non-standard packages in their papers; indeed, in a journal
-devoted to the usage of \TeX{}, the editor would be churlish indeed to
-refuse such usage. However, the team does need to be able to process
-the paper on the \TUB{} production computers.
+In general, authors can use non-standard packages in their papers.
+However, the paper does need to be processable on the \TUB{} production
+computers (running current \TeX\ Live). A sensible mechanism for
+submitting out-of-the-ordinary packages (as for paper-specific
+bibliographies) is by use of the \envname{filecontents} environment.
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{%
+\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{%
Those in the \LaTeX{} base distribution, or one of those in the
- \CTANref{packages} sub-tree on \CTAN.} subject to the warning:
-\begin{itemize}
-\item Use of the \pkgname{verbatim} package has implications for the
- \envname{verbatim} facilities provided by the classes\Dash see
- section~\ref{sec:verbatim}.
-\end{itemize}
-
-Usage of other packages should always be subject to negotiation with
-the team. If the team does not have access to a copy of the package,
-life is going to be very difficult; authors need to be sensible
-in this regard. A sensible mechanism for submitting
-out-of-the-ordinary packages (as for paper-specific bibliographies) is
-by use of the \envname{filecontents} environment.
+ \CTANref{packages} sub-tree on \CTAN.} subject to the warning already
+mentioned (section~\ref{sec:verbatim}): that use of the standard
+\pkgname{verbatim} package eliminates the special \envname{verbatim}
+facilities provided by the \TUB\ classes.
-\cbstart
\tug{} has a policy that macro packages described in \TUB{} should be
available for readers to use. Since typing macros from printed
sources is such an error-prone undertaking, authors of publicly
@@ -721,11 +678,6 @@ available packages are urged to submit their macros to the \CTAN{}
archives. If a package is only available under restricted terms,
authors are urged to make this fact clear when first submitting an
article to the editor.
-\cbend
-
-Some facilities are considered inappropriate for delivery by the
-\TUB{} classes, and as a result, the \TUB{} team recommend certain
-packages to authors.
At present, the list of canonically recommended packages consists of
only two, \path|mflogo.sty| \cite{Vieth:mflogo:1995} and \path|url.sty|
@@ -738,74 +690,102 @@ emulate its more important features; the package defines \MF{} and
The \pkgname{url} package is useful when one is typesetting significant
numbers of file names, network addresses or \acro{URL}s; it is being
-used in the present paper (not least in the bibliography).
+used in the present paper (not least in the bibliography). Speaking of
+urls, nowadays we generally omit a leading \texttt{http://} or
+\texttt{https://}.
Although not necessarily recommended in all cases, many additional
-packages are commonly used: \texttt{microtype} can help reduce overfull
-boxes, sometimes it may be preferable to use the Latin Modern fonts via
-\texttt{lmodern}, \texttt{hyperref} allows for many internal links and
-other features, and of course individual papers may need to load
-particular packages for the subject at hand.
+packages are commonly used. To mention a few: \texttt{microtype} can
+help reduce overfull boxes; sometimes it may be preferable to use the
+Latin Modern fonts via \texttt{lmodern}; and \texttt{hyperref} allows
+for many internal links and other features.
\section{Bibliography}
\label{sec:biblio}
In short: our basic recommendation for handling bibliographies is to use
-\BibTeX\ and the \pkgname{plain} bibliography style. No document
-options are needed or recommended. All that is required in the article
+\BibTeX\ and the \pkgname{tugboat} bibliography style. No document
+options are needed or recommended. All that is required in the article
source (as shown in the template available from
-\url{https://tug.org/TUGboat}) is the following:
+\url{tug.org/TUGboat}) is the following:
\begin{verbatim}[\small]
-\bibliographystyle{plain}
+\bibliographystyle{tugboat}
\bibliography{yourbibfile}
\end{verbatim}
-The rest of this section is about cases where, for whatever reason, you
-don't want to do that.
-
-Bibliographic citations give much grief to the editorial team. Good
-publishing practice requires that there be editorial control of the
-way citations in a journal are presented yet, all too often, authors
-submit articles whose bibliography is formatted according to their
-preference. The important rules for authors, then, are that they
-\emph{shouldn't} supply a \verb|.bbl| file (\BibTeX{} processed output),
-and that they \emph{shouldn't} write out a \envname{thebibliography}
-environment, but should rather submit a working \verb|.bib| file with their
-paper.\footnote{The program \progname{bibextract}, available from
- \CTAN{} in directory \CTANref{bibextract}, provides a convenient
- mechanism for extracting just the relevant portions of your
- bibliography database for submitting your paper; many of the common
- \BibTeX{}-database management packages, such as \textsc{Bib}\acro{DB} or
- \textsc{Bib}Tools offer similar facilities.} As with uncommon
-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{\tubraggedfoot Available on \CTAN{} as
- \CTANref{tub-biblio}} it is always available to the production team,
-so authors may reference items from the \verb|tugboat.bib|
-file without further ado.
-
-Notwithstanding the general recommendation for the \pkgname{plain}
-\BibTeX\ style,
-two citation styles are supported within \TUB{} articles, `\texttt{raw}'
-and `\texttt{harvard}'. The raw citation style uses the `standard'
-\BibTeX{} `\pkgname{plain}' (numeric) citation style. Raw citation is
-selected by default (by execution of class option \optname{rawcite}).
-
-Harvard citation may be selected by specifying \optname{harvardcite} as an
-option of the \cs{documentclass} command. The macros used derive
-pretty directly from the `harvard' styles written by Glenn
-Paulley and now maintained by Peter Williams; the \BibTeX{} style
-derives from one developed by Patrick Daly.
-
-The basic citation format is `author-year', but the macros are capable
-of many variations: this in turn places somewhat of a load on the
-author to use the correct citation macro. The macros available are
+If you don't have \verb|tugboat.bst|, which was released in 2018, it's
+fine to use \pkgname{plain} or \pkgname{abbrv}. If you do have it,
+though, you may enjoy the following small but useful features:
+
+\begin{itemize}
+\item It is based on \pkgname{abbrvurl.bst} (see \url{ctan.org/pkg/urlbst}),
+
+\item thus supports \textsf{url} and \textsf{doi} fields, among others.
+
+\item The \textsf{url} field is ignored if either the \textsf{doi} or
+\textsf{howpublished} field is present, since in practice we observe
+that people put the same information in all those fields, and we don't
+want to use up space typesetting redundant information.
+
+\item Has even more abbreviations than \textsf{abbrv}, including
+printing only two author names (plus ``et~al\@.'') if there are more
+than four authors (thanks to Mico Loretan).
+
+\item Defines an \textsf{@online} entry type as an alias for \textsf{@misc}.
+
+\item For completeness only: \verb|tugboat.bst| provides ``secret''
+fields \textsf{newpage} to force a page break after the current item,
+and \textsf{urlnewline} to force a line break before the \textsf{url}
+value. We've found that these presentation tweaks are often necessary
+for the final typeset output. Authors need not worry about them.
+
+\end{itemize}
+
+If you use \BibTeX, feel free to take advantage of the accumulated
+bibliography of \TUB{} itself (\url{info/tugboat.bib} on \CTAN), and the
+various compilations by Nelson Beebe in that same directory.
+
+Bibliographies provide further problems because they're notoriously
+difficult to typeset at the best of times. \LaTeX{} sets \cs{sloppy}
+when typesetting the bibliography, but this often leads to unpleasant
+output in the narrow columns typical of \TUB{}. The author can control
+the typesetting using the command \cs{SetBibJustification}. The classes
+set \cs{sloppy}, by default (just like \LaTeX{}), but the author may
+(for example) say:
+\begin{verbatim}
+ \SetBibJustification{\raggedright}
+\end{verbatim}
+as the present article does, to achieve somewhat better results.
+
+A last note for bibliographies: for references to other issues of \TUB,
+please use the format \textsl{volno:issno}, e.g., ``\TUB\ 32:1'' for
+volume~32, number~1.
+
+\section{Non-recommended bibliography facilities}
+
+The preceding gives the bibliography recommendations for current \TUB\
+article. If, for whatever reason, you cannot follow the recommendation,
+this section is about some of the myriad historical and other
+possibilities.
+
+Notwithstanding the general recommendation for the \pkgname{tugboat}
+(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard
+citation support may be selected by specifying \optname{harvardcite} as
+an option of the \cs{documentclass} command.\footnote{%
+ The macros used derive rather directly from the `harvard' styles
+ written by Glenn Paulley and now maintained by Peter Williams; the
+ \BibTeX{} style derives from one developed by Patrick Daly.}
+If your article demands Harvard-style citations, you may prefer to load
+\pkgname{natbib} or similar instead of using \TUB's facilities; that's
+ok.
+
+The basic citation format is `author(s), year', but the macros are
+capable of many variations: this in turn places somewhat of a load on
+the author to use the correct citation macro. The macros available are
shown in figure~\ref{fig:citation-macros}; the figure assumes an entry
-in the bibliography with authors Tom, Dick, and~Harry, and with a
-1990 date.
+in the bibliography with authors Tom, Dick, and~Harry, and with a 1990
+date.
\begin{figure}[htbp!]
\begin{center}
@@ -839,17 +819,12 @@ controlled by the \optname{extralabel} and \optname{noextralabel} class
options. The default state (option \optname{extralabel}) attaches the
extra characters.
-Bibliographies provide further problems because they're notoriously
-difficult to typeset at the best of times. \LaTeX{} sets \cs{sloppy}
-when typesetting the bibliography, but this can often lead to pretty
-unpleasant output in the narrow columns typical of \TUB{}. The author
-may control the typesetting using the command
-\cs{SetBibJustification}. The classes set \cs{sloppy}, by default
-(just like \LaTeX{}), but the author may (for example) say:
-\begin{verbatim}
- \SetBibJustification{\raggedright}
-\end{verbatim}
-as the present article does, to achieve somewhat better results.
+As for \BibLaTeX, we don't recommend it for \TUB. If you feel you must
+use it, that is ok, but we may still change it to using the default
+\LaTeX\ and \BibTeX\ facilities in processing for publication if the
+output from \BibLaTeX\ is problematic, as we have often seen it to be.
+
+
\section{Equivalences between the `plain' and \LaTeX{} \TUB\ packages}
\label{sec:equiv}
@@ -898,7 +873,7 @@ argument provision promulgated by the `plain' macros
classes.
\SetBibJustification{\raggedright}
-\bibliographystyle{plain}
+\bibliographystyle{tugboat}
\bibliography{tubguide}
\makesignature
diff --git a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
index d840a525385..cdf822ebba0 100644
--- a/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
+++ b/Master/texmf-dist/doc/latex/tugboat/ltubguid.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tugboat/manifest.txt b/Master/texmf-dist/doc/latex/tugboat/manifest.txt
index 1ced4ca477a..b4613f77c61 100644
--- a/Master/texmf-dist/doc/latex/tugboat/manifest.txt
+++ b/Master/texmf-dist/doc/latex/tugboat/manifest.txt
@@ -1,9 +1,10 @@
-$Id: manifest.txt 66 2010-11-23 16:33:37Z karl $
+$Id: manifest.txt 205 2018-09-06 17:28:53Z karl $
List of files in the tugboat LaTeX package covered by the LPPL:
ltubguid.ltx
ltubguid.pdf
ltugbib.bst
+tugboat.bst
tugboat.dtx
tugboat.pdf
tugboat.ins
diff --git a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
index e179bd1c634..bce08c44405 100644
--- a/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
+++ b/Master/texmf-dist/doc/latex/tugboat/tugboat.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tugboat/tugboat.dtx b/Master/texmf-dist/source/latex/tugboat/tugboat.dtx
index 75d987cccfc..8dff9585db9 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 187 2017-11-06 20:29:32Z karl $
+% $Id: tugboat.dtx 205 2018-09-06 17:28:53Z karl $
% tugboat.dtx - main source for LaTeX TUGboat classes.
%
-% Copyright 1994-2017 TeX Users Group.
+% Copyright 1994-2018 TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -28,7 +28,7 @@
%<ltugboatsty>\ProvidesPackage{ltugboat}
%<ltugprocsty>\ProvidesPackage{ltugproc}
%<ltugcomn> \ProvidesPackage{ltugcomn}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
%<ltugboatcls> TUGboat journal class%
%<ltugproccls> TUG conference proceedings class%
%<ltugboatsty|ltugprocsty> TUG compatibility package%
@@ -177,14 +177,14 @@
% |\SC|& Steering Committee\\
% |\SGML|& SGML\\
% |\SliTeX|&\\
-% |\slMF|& Metafont (slanted)\Dash deprecated: use
+% |\slMF|& Metafont, slanted: deprecated: use
% \cs{textsl} instead \\
% |\stTeX|& \TeX{} for the Atari ST\\
% |\SVG|&\\
% |\TANGLE|&\\
% |\TB|& The \TeX book\\
% |\TeX|& (Although nearly every package defines this,
-% most\Dash including plain\Dash are missing the
+% most, including plain, are missing the
% spacefactor adjustment)\\
% |\TeXhax|&\\
% |\TeXMaG|& (defunct)\\
@@ -324,7 +324,7 @@
\providecommand{\@tugclass}{ltugboat}
% \end{macrocode}
%
-% Warnings/error messages/information messages~--- if we're using
+% Warnings/error messages/information messages\Dash if we're using
% \LaTeXe{} we can use the \cs{Class*} commands:
%
% \begin{macrocode}
@@ -415,9 +415,8 @@
% causes those letters to be suppressed. Note that (a) no two
% references will in any case have the same labels in the default
% (plain) |rawcite| setup, and that (b) the distinguishing letters
-% appear in the labels themselves~--- the even remotely intelligent
-% reader should be able to work out the correspondence one with the
-% other\dots
+% appear in the labels themselves; the reader can work out the
+% correspondence one with the other\dots
%
% \begin{macrocode}
\DeclareOption{extralabel}{\let\UseExtraLabel\@firstofone}
@@ -669,6 +668,7 @@
%
\def\BSD{\acro{BSD}}
\def\CandT{\textsl{Computers \& Typesetting}}
+% must not define \CJK, because the CJK package does.
% \end{macrocode}
% We place our \cs{kern} after \cs{-} so that it disappears if the
% hyphenation is taken:
@@ -1079,7 +1079,7 @@
% \cs{,}, but that we provide a new definition of |~| by redefining
% its robust underpinnings\footnote{\cs{DeclareRobustCommand} doesn't
% mind redefinition, fortunately} (based on the version in
-% AMS-\TeX~--- the \LaTeXe{} version has \cs{leavevmode} and doesn't
+% AMS-\TeX---the \LaTeXe{} version has \cs{leavevmode} and doesn't
% care about surrounding space).
% \begin{macrocode}
\DeclareRobustCommand{\nobreakspace}{%
@@ -1662,7 +1662,7 @@
\ifnum\count@>1
\count@\authornumber
\advance\count@ by \m@ne
- #1{\ignorespaces\theauthor{\number\count@}\unskip\ and }%
+ #1{\ignorespaces\theauthor{\number\count@}\unskip\@tubauthorlastsep}%
\fi
% \end{macrocode}
%
@@ -1673,6 +1673,8 @@
#1{\ignorespaces\theauthor{\number\authornumber}\unskip}
\fi
}
+%
+\def\@tubauthorlastsep{, }% until 2018, was: "\ and "
% \end{macrocode}
%
% Signature blocks. The author can (in principle) define a different
@@ -1751,11 +1753,12 @@
\vspace{#1}%
\rightline{%
\vbox{\hsize\signaturewidth \ninepoint \raggedright
- \parindent \z@ \everypar={\hangindent 1pc }
+ \parindent \z@ \everypar={\hangindent 1pc }%
\parskip \z@skip
\def\|{\unskip\hfil\break}%
\def\\{\endgraf}%
- \def\phone{\rm Phone: }
+ \def\phone{\rm Phone: }%
+ \def\tubmultipleaffilauthor{\\\hspace*{1em}}%
\rm\@signature}%
}%
\ifnum\authornumber<0 \endgroup\fi
@@ -1763,6 +1766,19 @@
\def\signaturemark{\leavevmode\llap{$\diamond$\enspace}}
% \end{macrocode}
%
+% The idea here is that if multiple authors share affiliation
+% information, we need only typeset the affiliation once. We separate by
+% commas for the \cs{maketitle}, and put on separate lines in the
+% \cs{makesignature}. Similarly, within \cs{netaddress},
+% |!tubmultipleaffilnet| separates with a space before and after the
+% comma, while . (All this per bb.) See |tb122childs-trotter.ltx| for an
+% example.
+%
+% \begin{macrocode}
+\def\tubmultipleaffilauthor{\unskip, \ignorespaces}%
+\def\tubmultipleaffilnet{\textrm{\unskip~,\ \ignorespaces}}
+% \end{macrocode}
+%
% Now all the awful machinery of author definitions.
% \cs{authornumber} records the number of authors we have recorded to
% date.
@@ -1788,7 +1804,7 @@
}
% \end{macrocode}
% \cs{contributor} is for a small part of a multiple-part article; it
-% begins a group that will be ended in \cs{makesignature}
+% begins a group that will be ended in \cs{makesignature}.
% \begin{macrocode}
\def\contributor{%
\begingroup
@@ -1866,7 +1882,8 @@
% \LaTeXe.
%
% \begin{macrocode}
- #1\@sanitize\makespace\ \makeactive\@
+ #1\@sanitize\makespace\ \makeactive\@%
+ \makeescape! \makebgroup[ \makeegroup]% seems more useful than literals
\makeactive\.\makeactive\%\@relay@netaddress}%
% \end{macrocode}
%
@@ -2106,9 +2123,9 @@
% last \cs{sectitle} will actually be executed.
%
% \begin{macrocode}
-\newif\ifSecTitle
-\SecTitlefalse
\newif\ifWideSecTitle
+\newif\iftubtitlerulefullwidth
+\newif\ifSecTitle \SecTitlefalse
\newcommand{\sectitle}{%
\SecTitletrue
\@ifstar
@@ -2181,7 +2198,7 @@
%
% \begin{macro}{\@sectitle@newline}
% For use inside \cs{sectitle} as |\\|. Works similarly to |\\| in
-% the ``real world''~--- uses an optional argument
+% the ``real world''---uses an optional argument
% \begin{macrocode}
\newcommand{\@sectitle@newline}[1][\z@]{%
\ifdim#1>\z@
@@ -2212,7 +2229,11 @@
\hrule \@height\z@ \@depth\z@ \@width 10\p@
\kern-\topskip
\kern-\strulethickness
- \hrule \@height\strulethickness \@depth\z@
+ \iftubtitlerulefullwidth
+ \hrule \@height\strulethickness \@depth\z@ width\textwidth
+ \else
+ \hrule \@height\strulethickness \@depth\z@
+ \fi
\kern\medskipamount
\nobreak
\fi
@@ -2376,9 +2397,9 @@
\fi
% \end{macrocode}
%
-% \cs{TB@startsection} used to trap \verb"*" versions of sectioning
+% \cs{TB@startsection} used to warn about \verb"*" versions of sectioning
% commands when numbering wasn't in effect. But that eventually seemed
-% a useless complaint, since being able to switch back and forth between
+% a useless complaint, since it can be usefule to switch back and forth between
% numbered and unnumbered can be useful during article development.
% So now \cs{TB@startsection} is just a synonym for \cs{@startsection}.
%
@@ -2626,7 +2647,7 @@
\def\tubcaptionfonts{\small}%
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
- \sbox\@tempboxa{\tubcaptionfonts \tubmakecaptionbox{#1}{#2}}% try in an hbox
+ \sbox\@tempboxa{\tubcaptionfonts \frenchspacing \tubmakecaptionbox{#1}{#2}}% try in an hbox
\ifdim \wd\@tempboxa > \hsize
{% caption doesn't fit on one line; set as a paragraph.
\tubcaptionfonts \raggedright \hyphenpenalty=\@M \parindent=1em
@@ -2643,7 +2664,7 @@
\fi
\vskip\belowcaptionskip}
%
-\def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper
+\def\tubmakecaptionbox#1#2{#1:\ #2}% allow overriding for a paper
% \end{macrocode}
%
% Also use \cs{tubcaptionfonts} for the caption
@@ -3244,12 +3265,12 @@
%</classtail>
% \end{macrocode}
%
-% \cs{SMC} \emph{isn't} small caps~--- Barbara Beeton says she thinks
+% \cs{SMC} \emph{isn't} small caps---Barbara Beeton says she thinks
% of it as ``big small caps''. She says (modulo capitalisation of
% things\dots):
% \begin{quote}
% For the things it's used for, regular small caps are not
-% appropriate~--- they're too small. Real small caps are
+% appropriate---they're too small. Real small caps are
% appropriate for author names (and are so used in continental
% bibliographies), section headings, running heads, and, on
% occasion, words to which some emphasis is to be given. \cs{SMC}
@@ -3257,7 +3278,7 @@
% which look terrible in small caps, but nearly as bad in all caps
% in the regular text size. The principle of using ``one size
% smaller'' than the text size is similar to the design of caps in
-% German~--- where they are smaller relative to lowercase than are
+% German---where they are smaller relative to lowercase than are
% caps in fonts intended for English, to improve the appearance of
% regular text in which caps are used at the heads of all nouns, not
% just at the beginnings of sentences.
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
index a1ef7d5d591..c0fcbc23707 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.cls
@@ -33,7 +33,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugboat}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
TUGboat journal class%
]
\csname tugstyloaded@\endcsname
@@ -718,11 +718,12 @@
\ifnum\count@>1
\count@\authornumber
\advance\count@ by \m@ne
- #1{\ignorespaces\theauthor{\number\count@}\unskip\ and }%
+ #1{\ignorespaces\theauthor{\number\count@}\unskip\@tubauthorlastsep}%
\fi
#1{\ignorespaces\theauthor{\number\authornumber}\unskip}
\fi
}
+\def\@tubauthorlastsep{, }% until 2018, was: "\ and "
\def\signature#1{\def\@signature{#1}}
\def\@signature{\@defaultsignature}
\def\@defaultsignature{{%
@@ -768,16 +769,19 @@
\vspace{#1}%
\rightline{%
\vbox{\hsize\signaturewidth \ninepoint \raggedright
- \parindent \z@ \everypar={\hangindent 1pc }
+ \parindent \z@ \everypar={\hangindent 1pc }%
\parskip \z@skip
\def\|{\unskip\hfil\break}%
\def\\{\endgraf}%
- \def\phone{\rm Phone: }
+ \def\phone{\rm Phone: }%
+ \def\tubmultipleaffilauthor{\\\hspace*{1em}}%
\rm\@signature}%
}%
\ifnum\authornumber<0 \endgroup\fi
}
\def\signaturemark{\leavevmode\llap{$\diamond$\enspace}}
+\def\tubmultipleaffilauthor{\unskip, \ignorespaces}%
+\def\tubmultipleaffilnet{\textrm{\unskip~,\ \ignorespaces}}
\newcount\authornumber
\authornumber=0
\def\author{%
@@ -814,7 +818,8 @@
\newcommand{\netaddress}[1][\relax]{%
\begingroup
\def\@network{}%
- #1\@sanitize\makespace\ \makeactive\@
+ #1\@sanitize\makespace\ \makeactive\@%
+ \makeescape! \makebgroup[ \makeegroup]% seems more useful than literals
\makeactive\.\makeactive\%\@relay@netaddress}%
\def\@relay@netaddress#1{%
\ProtectNetChars
@@ -913,9 +918,9 @@
\newdimen\stbaselineskip \stbaselineskip=18\p@
\newdimen\stfontheight
\settoheight{\stfontheight}{\sectitlefont O}
-\newif\ifSecTitle
-\SecTitlefalse
\newif\ifWideSecTitle
+\newif\iftubtitlerulefullwidth
+\newif\ifSecTitle \SecTitlefalse
\newcommand{\sectitle}{%
\SecTitletrue
\@ifstar
@@ -967,7 +972,11 @@
\hrule \@height\z@ \@depth\z@ \@width 10\p@
\kern-\topskip
\kern-\strulethickness
- \hrule \@height\strulethickness \@depth\z@
+ \iftubtitlerulefullwidth
+ \hrule \@height\strulethickness \@depth\z@ width\textwidth
+ \else
+ \hrule \@height\strulethickness \@depth\z@
+ \fi
\kern\medskipamount
\nobreak
\fi
@@ -1166,7 +1175,7 @@
\def\tubcaptionfonts{\small}%
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
- \sbox\@tempboxa{\tubcaptionfonts \tubmakecaptionbox{#1}{#2}}% try in an hbox
+ \sbox\@tempboxa{\tubcaptionfonts \frenchspacing \tubmakecaptionbox{#1}{#2}}% try in an hbox
\ifdim \wd\@tempboxa > \hsize
{% caption doesn't fit on one line; set as a paragraph.
\tubcaptionfonts \raggedright \hyphenpenalty=\@M \parindent=1em
@@ -1182,7 +1191,7 @@
\hb@xt@\hsize{\tubcaptionleftglue\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
-\def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper
+\def\tubmakecaptionbox#1#2{#1:\ #2}% allow overriding for a paper
\def\fnum@figure{{\tubcaptionfonts \bf \figurename\nobreakspace\thefigure}}
\def\fnum@table{{\tubcaptionfonts \bf \tablename\nobreakspace\thetable}}
\setlength\abovecaptionskip{6pt plus1pt minus1pt}
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
index cac733c3655..c4666bb13f3 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugboat.sty
@@ -32,7 +32,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugboat}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
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 14dfba4f7de..d5d41b3b3b6 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugcomn.sty
@@ -33,7 +33,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{ltugcomn}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
TUGboat `common macros' package%
]
\IfFileExists{mflogo.sty}%
diff --git a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
index 17c4958c4a6..06c1cfae147 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.cls
@@ -33,7 +33,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugproc}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
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 c73c00b82d5..c8c08599bcc 100644
--- a/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
+++ b/Master/texmf-dist/tex/latex/tugboat/ltugproc.sty
@@ -32,7 +32,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugproc}
- [2017/11/06 v2.19
+ [2018-09-06 v2.20
TUG compatibility package%
]
\@obsoletefile{ltugproc.cls}{ltugproc.sty}