Hello community,
here is the log from the commit of package texlive-specs-w for openSUSE:Factory checked in at 2017-06-25 19:22:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-w (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-w.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-w"
Sun Jun 25 19:22:53 2017 rev:26 rq:504813 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.changes 2017-06-08 14:56:32.709708815 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-w.new/texlive-specs-w.changes 2017-06-25 19:29:41.020269844 +0200
@@ -1,0 +2,42 @@
+Mon Jun 19 13:31:54 UTC 2017 - werner@suse.de
+
+- Fix texlive-pdftex-def dependency as now texlive-graphics-def does
+ provide pdftex.def
+- Fix texlive-rotating dependency as now texlive-graphics does
+ provide rotating.sty
+
+-------------------------------------------------------------------
+Fri Jun 16 12:14:49 UTC 2017 - werner@suse.de
+
+- Notive: Some patches have been moved
+ * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c
+ * context_fourier-map.dif from texlive-specs-e to texlive-specs-f
+ * dvips_config.dif from texlive-specs-g to texlive-specs-h
+ * jadetex_ini.dif from texlive-specs-l to texlive-specs-m
+ * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w
+ * texdraw_info.dif from texlive-specs-v to texlive-specs-w
+ this entry exists only to silent the auto factory bot
+
+-------------------------------------------------------------------
+Tue Jun 13 10:38:52 UTC 2017 - werner@suse.de
+
+- Final TeXLive 2017 20170520
+- Remove patch fontspec_emph.dif as now upstream
+- Update patches
+ * kpathsea_cnf.dif
+ * latex2man_tmphandling.dif
+ * latexdiff_perl.dif
+ * latexpand_perl.dif
+ * luaotfload_varfonts.dif
+ * luatex_cnf.dif
+ * musixtex_various.dif
+ * tetex_scripts.dif
+ * tex4ht_env.dif
+ * texconfig_scripts.dif
+
+-------------------------------------------------------------------
+Thu Jun 1 12:29:31 UTC 2017 - werner@suse.de
+
+- Update to TeXLive 2017 20170520 pretest
+
+-------------------------------------------------------------------
Old:
----
tikz-3dplot.doc.tar.xz
tikz-3dplot.tar.xz
tikz-bayesnet.doc.tar.xz
tikz-bayesnet.tar.xz
tikz-cd.doc.tar.xz
tikz-cd.tar.xz
tikz-dependency.doc.tar.xz
tikz-dependency.tar.xz
tikz-dimline.doc.tar.xz
tikz-dimline.tar.xz
tikz-feynman.doc.tar.xz
tikz-feynman.tar.xz
tikz-inet.doc.tar.xz
tikz-inet.tar.xz
tikz-opm.doc.tar.xz
tikz-opm.tar.xz
tikz-palattice.doc.tar.xz
tikz-palattice.tar.xz
tikz-qtree.doc.tar.xz
tikz-qtree.tar.xz
tikz-timing.doc.tar.xz
tikz-timing.tar.xz
tikzinclude.doc.tar.xz
tikzinclude.tar.xz
tikzmark.doc.tar.xz
tikzmark.tar.xz
tikzorbital.doc.tar.xz
tikzorbital.tar.xz
tikzpagenodes.doc.tar.xz
tikzpagenodes.tar.xz
tikzpfeile.doc.tar.xz
tikzpfeile.tar.xz
tikzposter.doc.tar.xz
tikzposter.tar.xz
tikzscale.doc.tar.xz
tikzscale.tar.xz
tikzsymbols.doc.tar.xz
tikzsymbols.tar.xz
times.tar.xz
timetable.tar.xz
timing-diagrams.doc.tar.xz
timing-diagrams.tar.xz
tipa-de.doc.tar.xz
tipa.doc.tar.xz
tipa.tar.xz
tipfr.doc.tar.xz
tipfr.tar.xz
titlecaps.doc.tar.xz
titlecaps.tar.xz
titlefoot.tar.xz
titlepages.doc.tar.xz
titlepic.doc.tar.xz
titlepic.tar.xz
titleref.doc.tar.xz
titleref.tar.xz
titlesec.doc.tar.xz
titlesec.tar.xz
titling.doc.tar.xz
titling.tar.xz
tkz-base.doc.tar.xz
tkz-base.tar.xz
tkz-berge.doc.tar.xz
tkz-berge.tar.xz
tkz-doc.doc.tar.xz
tkz-doc.tar.xz
tkz-euclide.doc.tar.xz
tkz-euclide.tar.xz
tkz-fct.doc.tar.xz
tkz-fct.tar.xz
tkz-graph.doc.tar.xz
tkz-graph.tar.xz
tkz-kiviat.doc.tar.xz
tkz-kiviat.tar.xz
tkz-linknodes.doc.tar.xz
tkz-linknodes.tar.xz
tkz-orm.doc.tar.xz
tkz-orm.tar.xz
tkz-tab.doc.tar.xz
tkz-tab.tar.xz
tlc2.doc.tar.xz
tocbibind.doc.tar.xz
tocbibind.tar.xz
tocloft.doc.tar.xz
tocloft.tar.xz
tocvsec2.doc.tar.xz
tocvsec2.tar.xz
todo.doc.tar.xz
todo.tar.xz
todonotes.doc.tar.xz
todonotes.tar.xz
tokenizer.doc.tar.xz
tokenizer.tar.xz
toolbox.doc.tar.xz
toolbox.tar.xz
tools.doc.tar.xz
tools.tar.xz
topfloat.doc.tar.xz
topfloat.tar.xz
toptesi.doc.tar.xz
toptesi.tar.xz
totcount.doc.tar.xz
totcount.tar.xz
totpages.doc.tar.xz
totpages.tar.xz
tpic2pdftex.doc.tar.xz
tpslifonts.doc.tar.xz
tpslifonts.tar.xz
tqft.doc.tar.xz
tqft.tar.xz
tracklang.doc.tar.xz
tracklang.tar.xz
trajan.doc.tar.xz
trajan.tar.xz
tram.doc.tar.xz
tram.tar.xz
translation-array-fr.doc.tar.xz
translation-arsclassica-de.doc.tar.xz
translation-biblatex-de.doc.tar.xz
translation-chemsym-de.doc.tar.xz
translation-dcolumn-fr.doc.tar.xz
translation-ecv-de.doc.tar.xz
translation-enumitem-de.doc.tar.xz
translation-europecv-de.doc.tar.xz
New:
----
tablefootnote.doc.tar.xz
tablefootnote.tar.xz
tableof.doc.tar.xz
tableof.tar.xz
tablestyles.doc.tar.xz
tablestyles.tar.xz
tablists.doc.tar.xz
tablists.tar.xz
tablor.doc.tar.xz
tablor.tar.xz
tabls.doc.tar.xz
tabls.tar.xz
tabriz-thesis.doc.tar.xz
tabriz-thesis.tar.xz
tabstackengine.doc.tar.xz
tabstackengine.tar.xz
tabto-generic.tar.xz
tabto-ltx.doc.tar.xz
tabto-ltx.tar.xz
tabu.doc.tar.xz
tabu.tar.xz
tabularborder.doc.tar.xz
tabularborder.tar.xz
tabularcalc.doc.tar.xz
tabularcalc.tar.xz
tabularew.doc.tar.xz
tabularew.tar.xz
tabulars-e.doc.tar.xz
tabulary.doc.tar.xz
tabulary.tar.xz
tabvar.doc.tar.xz
tabvar.tar.xz
tagging.doc.tar.xz
tagging.tar.xz
tagpair.doc.tar.xz
tagpair.tar.xz
talk.doc.tar.xz
talk.tar.xz
tamefloats.doc.tar.xz
tamefloats.tar.xz
tamethebeast.doc.tar.xz
tap.doc.tar.xz
tap.tar.xz
tapir.doc.tar.xz
tapir.tar.xz
tasks.doc.tar.xz
tasks.tar.xz
tcldoc.doc.tar.xz
tcldoc.tar.xz
tcolorbox.doc.tar.xz
tcolorbox.tar.xz
tdclock.doc.tar.xz
tdclock.tar.xz
tds.doc.tar.xz
tdsfrmath.doc.tar.xz
tdsfrmath.tar.xz
technics.doc.tar.xz
technics.tar.xz
ted.doc.tar.xz
ted.tar.xz
templates-fenn.doc.tar.xz
templates-sommer.doc.tar.xz
templatetools.doc.tar.xz
templatetools.tar.xz
tempora.doc.tar.xz
tempora.tar.xz
tengwarscript.doc.tar.xz
tengwarscript.tar.xz
tensor.doc.tar.xz
tensor.tar.xz
termcal.doc.tar.xz
termcal.tar.xz
termlist.doc.tar.xz
termlist.tar.xz
termmenu.doc.tar.xz
termmenu.tar.xz
testhyphens.doc.tar.xz
testhyphens.tar.xz
testidx.doc.tar.xz
testidx.tar.xz
tetex.doc.tar.xz
tetex.tar.xz
tetex_scripts.dif
teubner.doc.tar.xz
teubner.tar.xz
tex-ewd.doc.tar.xz
tex-ewd.tar.xz
tex-font-errors-cheatsheet.doc.tar.xz
tex-gyre-math.doc.tar.xz
tex-gyre-math.tar.xz
tex-gyre.doc.tar.xz
tex-gyre.tar.xz
tex-ini-files.doc.tar.xz
tex-ini-files.tar.xz
tex-label.doc.tar.xz
tex-label.tar.xz
tex-overview.doc.tar.xz
tex-ps.doc.tar.xz
tex-ps.tar.xz
tex-refs.doc.tar.xz
tex-virtual-academy-pl.doc.tar.xz
tex.doc.tar.xz
tex4ebook.doc.tar.xz
tex4ebook.tar.xz
tex4ht.doc.tar.xz
tex4ht.tar.xz
tex4ht_env.dif
texapi.doc.tar.xz
texapi.tar.xz
texbytopic.doc.tar.xz
texconfig.doc.tar.xz
texconfig.tar.xz
texconfig_scripts.dif
texcount.doc.tar.xz
texcount.tar.xz
texdef.doc.tar.xz
texdef.tar.xz
texdiff.doc.tar.xz
texdiff.tar.xz
texdirflatten.doc.tar.xz
texdirflatten.tar.xz
texdoc.doc.tar.xz
texdoc.tar.xz
texdoc_cnf.dif
texdraw.doc.tar.xz
texdraw.tar.xz
texdraw_info.dif
texfot.doc.tar.xz
texfot.tar.xz
texilikechaps.tar.xz
texilikecover.tar.xz
texosquery.doc.tar.xz
texosquery.tar.xz
texproposal.doc.tar.xz
thaienum.doc.tar.xz
thaienum.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-w.spec ++++++
++++ 25000 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-w.new/texlive-specs-w.spec
++++++ tikz-3dplot.doc.tar.xz -> tableof.doc.tar.xz ++++++
++++ 8581 lines of diff (skipped)
++++++ tikz-3dplot.doc.tar.xz -> tableof.tar.xz ++++++
++++ 8607 lines of diff (skipped)
++++++ tikzsymbols.doc.tar.xz -> tabls.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tabls/miscdoc.sty new/doc/latex/tabls/miscdoc.sty
--- old/doc/latex/tabls/miscdoc.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tabls/miscdoc.sty 2016-11-25 19:30:11.000000000 +0100
@@ -0,0 +1,95 @@
+\ProvidesPackage{miscdoc}[2010/01/20 v1.2 documentation macros misc latex pkgs]
+
+% miscdoc.sty
+% Copyright 2010 Robin Fairbairns
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Robin Fairbairns.
+%
+% This work consists of the file miscdoc.sty (only)
+
+\setcounter{errorcontextlines}{1274}
+
+% The package arose from a small exercise to document packages whose
+% previous documentation consisted solely of comments in the package files.
+% The macros here defined are lifted from the author's faq.sty
+% (written for the UK TeX FAQ, CTAN:help/uk-tex-faq) or are inspired
+% by others' work (credited where the author is known) ... except
+% where they came as a flash of inspiration while actually writing the
+% documentation.
+
+% this option suggested by Heiko Oberdiek, 2010-01-29
+\DeclareOption{hyper}{%
+ \AtEndOfPackage{%
+ \RequirePackage[pdfusetitle]{hyperref}
+ \RequirePackage{bookmark}
+ \bookmarksetup{numbered,open,openlevel=1}
+ }
+}
+\ProcessOptions\relax
+
+% note: T1 encoding assumed
+\usepackage{lmodern}
+\usepackage[T1]{fontenc}
+\usepackage{booktabs}
+
+% from faq.sty
+\newcommand\cs[1]{\texttt{\char`\\#1}}
+\let\csx\cs
+\def\bsbs{\cs{\char`\\}}
+
+% \cmdinvoke\cs<argument sequence>
+% \cs typeset as above
+% <argument sequence> may consist of optional or mandatory arguments;
+%
+% the `arguments' are simply typesett \texttt, as yet -- if something
+% fancier is needed, there's a bunch of code needs rewriting here...
+\DeclareRobustCommand\cmdinvoke{\@ifstar
+ {\let\@tempa\emph\@scmdinvoke}%
+ {\let\@tempa\relax\@scmdinvoke}%
+}
+\def\@scmdinvoke#1{\texttt{\symbol{92}#1}%
+ \futurelet\@let@token\@cmdinvoke
+}
+\def\@cmdinvoke{\ifx\@let@token\bgroup
+ \let\@tempb\@cmdinvoke@lbrace
+ \else
+ \ifx\@let@token[% ]
+ \let\@tempb\@cmdinvoke@lbrack
+ \else
+ \ifx\@let@token(% )
+ \let\@tempb\@cmdinvoke@lparen
+ \else
+ \let\@tempb\@empty
+ \fi
+ \fi
+ \fi
+ \@tempb
+}
+\def\@cmdinvoke@lbrace#1{\penalty0\hskip0pt\relax
+ \texttt{\symbol{123}\@tempa{#1}\symbol{125}}%
+ \futurelet\@let@token\@cmdinvoke
+}
+\def\@cmdinvoke@lbrack[#1]{\penalty-150\hskip0pt\relax
+ \texttt{[\@tempa{#1}]}%
+ \futurelet\@let@token\@cmdinvoke
+}
+\def\@cmdinvoke@lparen(#1){\penalty-150\hskip0pt\relax
+ \texttt{(\@tempa{#1})}%
+ \futurelet\@let@token\@cmdinvoke
+}
+
+% sui generis
+\newcommand\newitem{\par\addvspace{1ex}\noindent}
+
+% inspired by doc.sty in latex distribution
+\newcommand\meta[1]{\ensuremath{\langle}\emph{#1}\ensuremath{\rangle}}
Binary files old/doc/latex/tabls/tabls.pdf and new/doc/latex/tabls/tabls.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tabls/tabls.tex new/doc/latex/tabls/tabls.tex
--- old/doc/latex/tabls/tabls.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tabls/tabls.tex 2016-11-25 19:30:11.000000000 +0100
@@ -0,0 +1,83 @@
+\documentclass[a4paper]{article}
+\usepackage[a4paper]{geometry}
+\usepackage{miscdoc}
+\usepackage[scaled=0.85]{luximono}
+\begin{document}
+\title{The \textsf{tabls} package}
+\author{Donald Arseneau\thanks{Documentation derived from the package
+ file by Robin Fairbairns}}
+\maketitle
+\begin{quote}
+ The package modifies \LaTeX{}'s \texttt{array} and \texttt{tabular}
+ environments to keep text from touching other text or hlines above
+ or below.
+\end{quote}
+\section{New parameters, etc.}
+
+The behaviour of the package is controlled by a small set of
+parameters, which are all \TeX{} \cs{dimen} registers (and so may be
+adjusted using \LaTeX{} \cs{setlength} commands.
+
+\paragraph{\cs{tablinesep} (or \cs{tablelineskip}):} the minimum space
+between text on successive lines in a tabular environment. Negative
+distances are treated as zero. The default value is \texttt{1pt}. A
+value of \texttt{0pt} turns off checking for touching text. Text
+given in an \verb|@{ }| specification (cf. the \textsf{array} package)
+is never checked for overlap.
+
+\paragraph{\cs{arraylinesep} (or \cs{arraylineskip})}: like
+\cs{tablinesep}, but for arrays.
+
+\paragraph{\cs{extrarulesep}:} extra space to add above and below each
+\cs{hline} and \cs{cline}. There will be at least
+\texttt{\cs{extrarulesep} + 0.5\cs{tablinesep}} between an \cs{hline}
+and a line of text. Negative values can be used, but only until some
+text touches the line. The default value is \texttt{3pt}.
+
+\noindent To ensure interline separations in tables but not arrays,
+declare
+\begin{quote}
+ \cs{setlength}\cmdinvoke{arraylinesep}{0pt}
+\end{quote}
+\noindent The appearance of normal \LaTeX{} tables can be had with
+\begin{quote}
+ \cs{setlength}\cmdinvoke{tablinesep}{0pt}\\
+ \cs{setlength}\cmdinvoke{arraylinesep}{0pt}\\
+ \cs{setlength}\cmdinvoke{extrarulesep}{0pt}
+\end{quote}
+\noindent but it would be better to not use \textsf{tabls} in this
+situation.
+
+The command \cmdinvoke{hline}[extra] has gained an optional length
+argument (just like \bsbs), which gives the space to insert below the
+line. This space is in addition to the \cs{extrarulesep} and
+linesep. A negative value will reduce the space until the line
+touches some text below, and will then have no further effect. For
+example, \cmdinvoke{hline}[-9cm] draws a horizontal line while
+suppressing all the extra spacing.
+
+(This \cs{hline} also fixes the notches that used to appear at the
+junction between horizontal and vertical lines.)
+
+\section{How it works}
+
+There are no struts in the preamble entries\footnote{The comments in
+ the package say this is a lie\dots}, rather, there are tests to
+measure the maximum height and depth of all entries on a line. The
+maximum values start at the size of LaTeX's \cs{@arstrut} minus the
+appropriate linesep. At the \bsbs, a strut is inserted (in its own
+column) which is that maximum size plus the linesep plus any
+additional space for separation from \cs{hline}s.
+
+\section{The Downside}
+
+Building a table will be slower than before because the entries have
+to be boxed twice (by the package's \cs{@seesize} and by \cs{halign}
+itself) instead of just once.
+\cs{setlength}\cmdinvoke{tablinesep}{0pt} will recover most of this
+speed, with \cs{extrarulesep} still partially in effect\,---\,extra
+space will still be added around \cs{hline}s, but it may be taken up
+by very tall or very deep table entries; thus text may still touch the
+lines. Because of the speed penalty, if your computer is slow, it is
+probably best to omit \textsf{tabls} until producing a final copy.
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzsymbols/README new/doc/latex/tikzsymbols/README
--- old/doc/latex/tikzsymbols/README 2016-04-04 23:16:01.000000000 +0200
+++ new/doc/latex/tikzsymbols/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-tikzsymbols
-===========
-
-Overview
---------
-
-The `tiksymbols` package v4.0 contains symbols created using tikz.
-
-This package provides:
- * various emoticons
- * cooking symbols
- * trees
- * other symbols (e.g. Penrose-Triangle(Triban), chair, coffeecup, etc.)
-
-Changes
--------
-* v1.6 Several bugs fixed and some options added.
-* v1.7 New symbols and some "bugs" fixed
-* v2.0 Bug fixed, now option "tree=on/off" is working again,
- new symbols: "Triban", improved BasicTree code.
- New option: "marvsoym" (see documentation for more details).
-* v2.2 Included \@ifpackageloaded, now symbols can have negative scale,
- Did something else, I can`t remember.
-* v2.25 Changed some code
-* v2.5 New option: draftabsolute (symbols are replaced by text and LateX
- becomes faster again). Changed manual a bit.
-* v3.0 Symbols are stored inside a save-box and are used via \usebox{},
- New option: "draft=absolute" (old option is still useable but obsolete),
- Changed output of "draft=absolute",
- New option: "prefix=<prefix>", adds a <prefix> to all commands,
- New option: "usebox=true/false" If false the symbols aren`t stored inside a box,
- See manual for more changes.
-* v3.0a New cookingsymbols: \grater, \bottle
-* v3.0b Deleted some non-ASCII characters.
-* v3.0g Removed a bug caused by me messing up with commands.
- Removed package `calc` and replaced \setlength with \pgfmathsetlength
- Reworked some code of the symbols.
- Did not change the manual.
-* v3.0h Created a bug in the process of fixing the last bug,
- added the forgotten \fi.
-* v3.01alpha Copied the 2e code and started rewriting the code
- in LaTeX3.
-* v3.38 Nearly finished rewriting.
-* v3.40 Now everything is coded in LaTeX3.
-* v3.40-v0.95 Various fixes and changes.
-* v3.95 New emoticon \(d)Changey.
-* v4.0 Finished reworking the code.
-
-
-Requirements
-------------
-
- * expl3 & xparse
- * tikz
- * xcolor
- * xspace
- * l3keys2e
-
-
-This file contains
-------------------
-
- * README
- * tikzsymbols.pdf
- * tikzsymbols.dtx
- * tikzsymbols.ins
-
-License
--------
-This material is subject to the LaTeX Project Public License. See
-
- http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
-
-for the details of that license.
-
Binary files old/doc/latex/tikzsymbols/tikzsymbols.pdf and new/doc/latex/tikzsymbols/tikzsymbols.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabls.doc.tlpobj new/tlpkg/tlpobj/tabls.doc.tlpobj
--- old/tlpkg/tlpobj/tabls.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/tabls.doc.tlpobj 2017-04-14 18:01:12.000000000 +0200
@@ -0,0 +1,9 @@
+name tabls.doc
+category Package
+revision 17255
+shortdesc doc files of tabls
+relocated 1
+docfiles size=59
+ RELOC/doc/latex/tabls/miscdoc.sty
+ RELOC/doc/latex/tabls/tabls.pdf
+ RELOC/doc/latex/tabls/tabls.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzsymbols.doc.tlpobj new/tlpkg/tlpobj/tikzsymbols.doc.tlpobj
--- old/tlpkg/tlpobj/tikzsymbols.doc.tlpobj 2016-04-14 19:51:53.000000000 +0200
+++ new/tlpkg/tlpobj/tikzsymbols.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-name tikzsymbols.doc
-category Package
-revision 40236
-shortdesc doc files of tikzsymbols
-relocated 1
-docfiles size=121
- RELOC/doc/latex/tikzsymbols/README
- RELOC/doc/latex/tikzsymbols/tikzsymbols.pdf
++++++ tikzsymbols.tar.xz -> tabls.tar.xz ++++++
++++ 2721 lines of diff (skipped)
++++++ tikz-3dplot.doc.tar.xz -> tcldoc.doc.tar.xz ++++++
++++ 15452 lines of diff (skipped)
++++++ tikz-3dplot.doc.tar.xz -> tcldoc.tar.xz ++++++
++++ 9501 lines of diff (skipped)
++++++ tikzpagenodes.doc.tar.xz -> tds.doc.tar.xz ++++++
++++ 6898 lines of diff (skipped)
++++++ tikz-3dplot.doc.tar.xz -> ted.doc.tar.xz ++++++
++++ 8452 lines of diff (skipped)
++++++ tikz-3dplot.doc.tar.xz -> ted.tar.xz ++++++
++++ 8774 lines of diff (skipped)
++++++ tpic2pdftex.doc.tar.xz -> tetex.doc.tar.xz ++++++
++++ 2995 lines of diff (skipped)
++++++ tetex_scripts.dif ++++++
---
texmf-dist/scripts/texlive/fmtutil-sys.sh | 1
texmf-dist/scripts/texlive/fmtutil.pl | 24 ++++++++---
texmf-dist/scripts/texlive/mktexlsr.pl | 7 ++-
texmf-dist/scripts/texlive/texconfig-dialog.sh | 14 +++++-
texmf-dist/scripts/texlive/texlinks.sh | 53 ++++++++++++++++---------
texmf-dist/scripts/texlive/updmap-sys.sh | 1
texmf-dist/scripts/texlive/updmap.pl | 19 +++++---
7 files changed, 85 insertions(+), 34 deletions(-)
--- texmf-dist/scripts/texlive/fmtutil-sys.sh
+++ texmf-dist/scripts/texlive/fmtutil-sys.sh 2016-02-01 15:28:31.009755153 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texmf-dist/scripts/texlive/fmtutil.pl
+++ texmf-dist/scripts/texlive/fmtutil.pl 2016-06-09 12:03:21.132289331 +0000
@@ -10,16 +10,16 @@
# History:
# Original shell script (C) 2001 Thomas Esser, public domain
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
require "mktexlsr.pl";
TeX::Update->import();
}
@@ -70,7 +70,7 @@ TeXLive::TLUtils::prepend_own_path();
# this function checks by itself whether it is running on windows or not
reset_root_home();
-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -361,7 +361,14 @@ sub callback_build_formats {
TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
}
} else {
+ my ($uid, $gid);
$tmpdir = File::Temp::tempdir(CLEANUP => 1);
+ if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
+ my $cnt = chown $uid, $gid, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ $cnt = chmod 0770, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ }
}
# set up destination directory
$opts{'fmtdir'} ||= "$texmfvar/web2c";
@@ -576,6 +583,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else
if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure.
@@ -635,11 +643,15 @@ sub rebuild_one_format {
",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
return $FMT_NOTAVAIL;
} else {
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_error("not building $fmt due to missing engine $eng.\n");
return $FMT_FAILURE;
}
}
+ if ($ENV{batchmode} eq "yes") {
+ $texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
+ }
my $cmdline = "$eng -ini $tcxflag $recorderswitch $jobswitch "
. "$prgswitch $texargs";
print_verbose("running \`$cmdline' ...\n");
--- texmf-dist/scripts/texlive/mktexlsr.pl
+++ texmf-dist/scripts/texlive/mktexlsr.pl 2016-02-08 09:36:58.465067429 +0000
@@ -72,7 +72,7 @@ output version information and exit
use strict;
$^W = 1;
-
+use POSIX qw(setgid);
package mktexlsr;
my $ismain;
@@ -340,6 +340,11 @@ sub write {
my %params = @_;
my $fn;
my $dosort = 0;
+ my $gid = getgrnam("mktex");
+ if (defined($gid) && $> == 0) {
+ POSIX::setgid($gid);
+ umask(0002);
+ }
$fn = $params{'filename'} if $params{'filename'};
$dosort = $params{'sort'};
if (!defined($self->{'root'})) {
--- texmf-dist/scripts/texlive/texconfig-dialog.sh
+++ texmf-dist/scripts/texlive/texconfig-dialog.sh 2016-02-01 15:30:20.646789151 +0000
@@ -157,7 +157,14 @@ termCtl()
###############################################################################
menuMain()
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your TeX system using the
@@ -169,8 +176,9 @@ menuMain()
More likely these days, you're better off using tlmgr.
See http://tug.org/texlive/tlmgr.html.
-eof
- termCtl readln
+ eof
+ termCtl readln
+ fi
while :; do
logMessage='view logfile'
--- texmf-dist/scripts/texlive/texlinks.sh
+++ texmf-dist/scripts/texlive/texlinks.sh 2009-09-02 12:47:26.000000000 +0000
@@ -100,7 +100,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ (umask 077; mkdir -m 0700 "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
}
@@ -108,16 +108,18 @@ setupTmpDir()
# search a binary along $PATH:
check_for_binary()
{
- testbin=$1
- set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
- for i
- do
- if [ -x "$i/$testbin" ]; then
- echo "$i/$testbin"
- return 0
- fi
- done
- return 1
+# testbin=$1
+# set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
+# for i
+# do
+# if [ -x "$i/$testbin" ]; then
+# echo "$i/$testbin"
+# return 0
+# fi
+# done
+# return 1
+
+ type -p $1
}
@@ -208,8 +210,22 @@ search_symlinkdir()
upd_symlinkdir()
{
search_symlinkdir || return 0
- for i in `sed 's@ .*@@' cnf_file_ln.$$`; do
- install_link "$selfautoloc/$i" "$symlinkdir/$i"
+ set x `cat cnf_file_ln.$$` ; shift
+ while test $# != 0; do
+ fmt=$1; ini=$3; shift; shift; shift
+
+ # Some broken shells destroy the positional arguments when calling a
+ # shellfunction. Therefore, we save and restore them "by hand" in the
+ # main_args_while variable.
+ main_args_while="$@"
+
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
+ install_link "$selfautoloc/$fmt" "$symlinkdir/$fmt"
+
+ # restore positional arguments:
+ set x $main_args_while; shift
done
}
@@ -274,12 +290,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$.$RANDOM
setupTmpDir
cd "$tmpdir" || cleanup 1
- sed '/^[ ]*#/d; /^[ ]*$/d' $cnf_file \
- | awk '{print $1, $2}' > cnf_file_ln.$$
+ sed '/^[ ]*#/d; /^[ ]*$/d; s%\*%%' $cnf_file \
+ | awk '{print $1, $2, $NF}' > cnf_file_ln.$$
if test -z "$dirs"; then
if test $multiplatform = true; then
@@ -300,13 +316,16 @@ main()
# cnf_file_ln.$$ has lines with "format engine" pairs
set x `cat cnf_file_ln.$$`; shift
while test $# != 0; do
- fmt=$1; engine=$2; shift; shift
+ fmt=$1; engine=$2; ini=$3; shift; shift; shift
# Some broken shells destroy the positional arguments when calling a
# shellfunction. Therefore, we save and restore them "by hand" in the
# main_args_while variable.
main_args_while="$@"
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine$exeext"; then
case $unlink in
--- texmf-dist/scripts/texlive/updmap-sys.sh
+++ texmf-dist/scripts/texlive/updmap-sys.sh 2016-02-01 15:28:58.194011537 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec updmap --sys ${1+"$@"}
--- texmf-dist/scripts/texlive/updmap.pl
+++ texmf-dist/scripts/texlive/updmap.pl 2017-04-10 08:48:59.737567193 +0000
@@ -16,15 +16,15 @@
my $svnid = '$Id: updmap.pl 44331 2017-05-14 02:15:43Z preining $';
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg");
}
my $lastchdate = '$Date: 2017-05-14 04:15:43 +0200 (Sun, 14 May 2017) $';
@@ -46,7 +46,7 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
# see more comments at the definition of this function.
reset_root_home();
-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(my $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -397,7 +397,12 @@ sub main {
}
print "in $changes_config_file\n";
print "Do you really want to continue (y/N)? ";
- my $answer = <STDIN>;
+ my $answer;
+ if (-t STDIN ) {
+ $answer = <STDIN>;
+ } else {
+ $answer = "y";
+ }
$answer = "n" if !defined($answer);
chomp($answer);
print "answer =$answer=\n";
++++++ translation-dcolumn-fr.doc.tar.xz -> teubner.doc.tar.xz ++++++
++++ 1773 lines of diff (skipped)
++++++ toolbox.doc.tar.xz -> tex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/README new/doc/latex/toolbox/README
--- old/doc/latex/toolbox/README 2013-11-27 23:24:54.000000000 +0100
+++ new/doc/latex/toolbox/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-The TeX programmer's toolbox; enhanced version.
-This (La)TeX package provides some macros which are convenient for
-writing indices, glossaries, or other macros.
-It contains macros which support
-
- - implicit macros - a useful supplement to \index or varindex for
- writing glossaries or indices
- - fancy optional arguments
- - loops over tokenlists and itemlists
- - searching, splitting, and replacing
- - controlled expansion
- - redefinition of macros
- - concatenated macro names
-
-Author: M. V\"ath martin@mvath.de
-
-The package may be distributed and/or modified under the conditions of
-the LaTeX Project Public License (version 1.3c or later).
Binary files old/doc/latex/toolbox/toolbox.pdf and new/doc/latex/toolbox/toolbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.tex new/doc/latex/toolbox/toolbox.tex
--- old/doc/latex/toolbox/toolbox.tex 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/toolbox/toolbox.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-\documentclass{ltxdoc}
-\OnlyDescription%% Comment this out, or
-%%\AlsoImplementation%% uncomment this line, if you want to see the source.
-
-%% If you want an index, uncomment one of the following lines.
-%% After running latex a first time, you have to use
-%% makeindex -s gind.ist toolbox
-%% Then run latex again.
-%%\CodelineIndex% comment this out if you want an index referring to codelines
-%%\PageIndex% comment this out if you want an index referring to pages
-%%\OldMakeindex% uncomment this line, if your MakeIndex is pre-v2.9
-
-\setlength\hfuzz{15pt}
-\hbadness=7000
-\begin{document}
-\DocInput{toolbox.dtx}
-\end{document}
-\endinput
-%%
-%% End of file `toolbox.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.txt new/doc/latex/toolbox/toolbox.txt
--- old/doc/latex/toolbox/toolbox.txt 2013-11-27 23:24:54.000000000 +0100
+++ new/doc/latex/toolbox/toolbox.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,790 +0,0 @@
-
-%%#
-%%# Author:
-%%#
-%%# M. V\"ath martin@mvath.de
-%%#
-%%# The author thanks
-%%# David Kastrup
-%%#
-
-%%# The package may be distributed and/or modified under the conditions of
-%%# the LaTeX Project Public License (version 1.3c or later).
-
-%%#############################################################################
-%%#
-%%# The TeX programmer's toolbox; enhanced version.
-%%# This (La)TeX package provides some macros which are convenient for
-%%# writing indices, glossaries, or other macros.
-%%# It contains macros which support
-%%#
-%%# - implicit macros - a useful supplement to \index or varindex for
-%%# writing glossaries or indices
-%%# - fancy optional arguments
-%%# - loops over tokenlists and itemlists
-%%# - searching, splitting, and replacing
-%%# - controlled expansion
-%%# - redefinition of macros
-%%# - concatenated macro names
-%%#
-%%#############################################################################
-
-%%#
-%%# This package was tested with plain TeX, LaTeX 2.09, and LaTeX 2e,
-%%# and it should actually run with all TeX formats.
-%%#
-
-
-%%# To use toolbox, you have to put `toolbox.sty' in a path where TeX looks
-%%# for its input files. The TeX documents using toolbox need the
-%%# following modifications in their header:
-%%#
-%%# a) If you use LaTeX2.09, use toolbox as a style option, e.g.
-%%# \documentstyle[toolbox]{article}
-%%# or
-%%# \documentstyle[toolbox,12pt]{article}
-%%# b) If you use LaTeX2e, put in the preamble the command
-%%# \usepackage{toolbox}
-%%# c) If you use some other (non-LaTeX) format, you will probably have to
-%%# insert a line like
-%%# \catcode`\@=11\input toolbox.sty\catcode`\@=12\relax
-%%#
-%%# The only LaTeX-specific commands used in `toolbox.sty' are:
-%%#
-%%# \newcommand (only in the form \newcommand{\command}{} to ensure that
-%%# \command was not defined before)
-%%# \ProvidesPackage
-%%# \typeout
-%%#
-%%# The above commands are used only if they are defined.
-%%#
-
-%%#
-%%# Description of the provided macros:
-%%#
-
-%%# General remark: Many macros could appear in several sections.
-%%# For example, \toolboxMakeDef and \toolboxSourround might be considered
-%%# as macros which support redefinitions of macros. However, we put them
-%%# in different sections which perhaps explain better their nature.
-
-%%#
-%%# Implicit macro definitions
-%%# --------------------------
-
-%%# What we mean by implicit macro definitions is probably best explained by
-%%# the following examples which show the intended usage:
-%%#
-%%# (In the following examples, we always refer to the \index command. Note
-%%# that it may be more convenient to use for indices the varindex package in
-%%# addition - the documentation of varindex (release 2.3 or newer) gives
-%%# additional hints and examples how these two (essentially independent)
-%%# approaches can be combined in practice).
-%%#
-%%# Assume that you want to write an index for a book which has rather
-%%# long and complicated \index entries. The first idea that one might have in
-%%# this connection is to put the various \index commands at the beginning of
-%%# the document into several macros (one for each \index entry), and to use
-%%# just these macros in the main text. For example, one might want to write
-%%# near the beginning of the document commands like
-%%# \newcommand{\Start}{\index{finish or end}}
-%%# \newcommand{\End}{\index{finish or end}}
-%%# and then to use in the main text \Start and \End whenever a reference
-%%# in the corresponding index to the current place is desired.
-%%# However, this has two major disadvantages:
-%%# 1. Unless you are very disciplinary with your macro names, it is easy to
-%%# forget that \End writes an index entry. So the \End in the main text
-%%# might be very confusing.
-%%# 2. You cannot choose short and intuitive macro names for common phrases,
-%%# because they are usually already reserved by TeX, LaTeX, or some
-%%# packages.
-%%#
-%%# To avoid these problems, one may be very disciplinary and call the
-%%# involved macros systematically e.g. \GlossaryStart \GlossaryEnd etc.
-%%# However, this produces terrible long and unreadable macro names in the
-%%# main text.
-%%#
-%%# The implicit macro definitions of "toolbox" provide a more convenient
-%%# solution. The idea is that you do not use the corresponding macros directly
-%%# but only implicitly by a call of other macros where your "macro name" is
-%%# just an argument.
-%%# Moreover, "toolbox" assists you in writing the corresponding definitions.
-%%# For example, if you know that you want a set of macros which all expand
-%%# into something of the form \index{...}, you can give a ``mask'' which
-%%# contains this form, and you only have to fill in the changing content
-%%# (similarly as for usual TeX macros with arguments, but the level of
-%%# abstraction is one step higher).
-%%# For the above task, you might use the command:
-%%#
-%%# \toolboxMakeDef{Glossary}{\index{#1}}
-%%#
-%%# The argument `Glossary' serves to distinguish independent definitions
-%%# (this will become clear later). Its effect visible now is that it
-%%# determines the name of the following macros which you can use after
-%%# the above call:
-%%#
-%%# \NewGlossary{start-1}{start}
-%%# \NewGlossary{start-2}{start or beginning}
-%%# \NewGlossary{end}{finish or end}
-%%#
-%%# These command are now similar to the \newcommand definitions explained
-%%# above. However, there is no name collision with the TeX-internal command
-%%# \end. Of course, this means that you cannot just write \end in the main
-%%# text to get the desired index entry. Instead, you have to write the more
-%%# intuitive commands
-%%#
-%%# \Glossary{start-1}
-%%# \Glossary{start-2}
-%%# \Glossary{end}
-%%#
-%%# (again, the name \Glossary stems from our first call of \toolboxMakeDef).
-%%# Note that e.g. \Glossary{start-1} expands not only to `start' but
-%%# actually to \index{start} (because of our first call of \toolboxMakeDef).
-%%# Note also that you can use symbols like - or numbers which are usually
-%%# not allowed in TeX macro names.
-%%#
-%%# Of course, similarly as for \newcommand, you can also do other things with
-%%# the macros. For example,
-%%#
-%%# \LetGlossary\tempname{end}
-%%# \NewGlossary*{finish}\tempname
-%%#
-%%# will first define \tempname to expand to the same text as \Glossary{end},
-%%# and then defines a new entry \Glossary{finish} to expand to the same text
-%%# as \tempname. Hence, the above new lines make the calls \Glossary{end} and
-%%# \Glossary{finish} equivalent.
-%%#
-%%# At the end of your list of \NewGlossary commands, you might want to put
-%%#
-%%# \toolboxFreeDef*{Glossary}
-%%#
-%%# The purpose of this command is that \NewGlossary cannot be used anymore
-%%# (unless, of course, you define it again). So you cannot unintentionally
-%%# add new entries to your glossary list (but you still can use \Glossary{...}
-%%# to reference to the already produced entries).
-%%# Moreover, the above command frees some memory which was needed for
-%%# \NewGlossary to work.
-%%#
-%%# If you additionally want to free the memory used by \Glossary, you can use
-%%#
-%%# \toolboxFreeDef{Glossary}
-%%#
-%%# (without the `*'). This may be necessary, if you want to call again e.g.
-%%#
-%%# \toolboxMakeDef{Glossary}{\emph{#1}\index{#1}}
-%%#
-%%# (if you have not freed the memory for \Glossary before this repeated call,
-%%# TeX will complain that \Glossary is already defined).
-%%#
-%%# Of course, it is possible to call \toolboxMakeDef with several different
-%%# names, for example, for \Glossary, \SymbolList etc. Another application
-%%# might be to use a different command to mark e.g.\ the main occurrence of
-%%# some index entry or to output additionally the entry into the running text.
-%%# We do this in the following example which simultaneously
-%%# demonstrates that the names can also be constructed in another way:
-%%#
-%%# \toolboxMakeDef[Ind]{}{\index{#1}}
-%%# \toolboxMakeDef[Ind]{Main}{\index{#1|textbf}}
-%%# \toolboxMakeDef{OutInd}{#1}
-%%#
-%%# \IndNew{A}{A is a letter}
-%%# \IndNewMain{A}{A is a letter}
-%%# \NewOutInd{A}{\textbf{The letter A}\Ind{A}}
-%%#
-%%# After the above commands, you can use \Ind{A}, \IndMain{A}, and
-%%# \OutInd{A} to produce the corresponding \index entry, the "main" \index
-%%# entry (with a boldface page number), and the text \textbf{The letter A}
-%%# with an additional entry into the index, respectively.
-%%# Of course, it might usually be more convenient to define the \Ind and
-%%# \IndMain" entries simultaneously, e.g. as follows
-%%#
-%%# \toolboxMakeDef[Ind]{}{#1}
-%%# \toolboxMakeDef[Ind]{Main}{#1}
-%%# \newcommand{\NewStandardInd}[2]{%
-%%# \IndNew{#1}{\index{#2}}%
-%%# \IndNewMain{#1}{\index{#2|textbf}}}
-%%#
-%%# \NewStandardInd{A}{A is a letter}
-%%#
-%%# This approach has the additional advantage that you can define exceptional
-%%# cases "by hand" (e.g. if you want that for certain "main" index
-%%# entries the page number is printed with "\textsl" instead of "\textbf").
-
-%%# Since the motivation for implicit definitions now is hopefully clear,
-%%# let us now describe in detail which commands are provided by "toolbox"
-%%# for this purpose.
-%%# As explained in the example, the main generic macro provided to this
-%%# purpose is \toolboxMakeDef. Its call syntax is as follows:
-%%#
-%%# \toolboxMakeDef[Prefix]{Name}{ReplacementMask}
-%%#
-%%# (the argument [Prefix] is optional and by default empty).
-%%# The above command generates new macros
-%%#
-%%# \PrefixNewName
-%%# \PrefixRenewName
-%%# \PrefixProvideName
-%%# \PrefixDefName
-%%# \PrefixLetName
-%%# \PrefixName
-%%#
-%%# which in turn can be called as follows
-%%#
-%%# \PrefixNewName{something}{RememberText}
-%%# \PrefixRenewName{something}{RememberText}
-%%# \PrefixProvideName{something}{RememberText}
-%%# \PrefixDefName{something}{RememberText}
-%%# \PrefixNewName*{something}{\SomeMacro}
-%%# \PrefixRenewName*{something}{\SomeMacro}
-%%# \PrefixProvideName*{something}{\SomeMacro}
-%%# \PrefixDefName*{something}{\SomeMacro}
-%%# \PrefixLetName{\SomeMacro}{something}
-%%# \PrefixName{something}
-%%# \PrefixName*{something}
-%%#
-%%# These calls are in a sense similar to the respective commands
-%%#
-%%# \newcommand{\something}{RememberText}
-%%# \renewcommand{\something}{RememberText}
-%%# \providecommand{\something}{RememberText}
-%%# \def\something{RememberText}
-%%# \newcommand{\something}{}\let\something\SomeMacro
-%%# \renewcommand{\something}{}\let\something\SomeMacro
-%%# \@ifundefined\something{\let\something\SomeMacro}{}
-%%# \let\something\SomeMacro
-%%# \let\SomeMacro{\something}
-%%# \something
-%%# \something (but without error if \something is undefined).
-%%#
-%%# with the differences already pointed out before:
-%%# 1. The macro name actually used is not \something. Instead, it is a name
-%%# which does not conflict with any existing macro (except one
-%%# generated previously by another \PrefixNewName, but in this case a
-%%# descriptive error is reported). For this reason, it is not possible to
-%%# use this macro directly but only indirectly by the call
-%%# \PrefixName{something} (or with \PrefixLetName).
-%%# 2. The replacement text is not `RememberText' but determined by
-%%# ReplacementMask where every occurrence of #1 in ReplacementMask is
-%%# replaced by RememberText (recall the examples). If you want to have the
-%%# plain RememberText, use {#1} as ReplacementMask.
-%%#
-%%# Since toolbox 4.2 there is another slight difference: The symbol '#'
-%%# is treated as usual and not as in a macro definition.
-%%#
-%%# \toolboxMakeDef gives an error message if the commands
-%%# \Prefix... are already defined. If you intentionally want to
-%%# change a previous definition, you have to call the command
-%%#
-%%# \toolboxFreeDef[Prefix]{Name}
-%%#
-%%# before. The latter not only lets all of the macros \Prefix... be
-%%# \undefined, but also frees all other memory internally used by the
-%%# corresponding call of \toolboxMakeDef
-%%# (note, however, that the above command does not free the
-%%# memory allocated before by calls of \PrefixNew... - to free the latter,
-%%# you have to call subsequently e.g.
-%%#
-%%# \PrefixNewName*{...}{\undefined}
-%%#
-%%% before). There is also the command
-%%#
-%%# \toolboxFreeDef*[Prefix]{Name}
-%%#
-%%# which acts similarly as \toolboxFreeDef but which does not undefine the
-%%# two macros \PrefixName and \PrefixLetName.
-%%#
-
-%%#
-%%# Fancy optional argument parsing
-%%# -------------------------------
-
-%%# This section contains macros which are convenient if you e.g. write a
-%%# package that contains macros which contain a lot of optional arguments
-%%# and flags (like "*").
-%%# Typically, to read such an optional argument or flag, you save
-%%# the next token with \futurelet and then call a macro which decides what to
-%%# do with the token read. Thus, a typical use of \futurelet looks like
-%%#
-%%# \def\MacroWithOptionalFlag{\futurelet\tokread\myscan}
-%%#
-%%# which will define \tokread to be the token *following* the macro
-%%# \MacroWithOptionalFlag in the token stream and then execute \myscan.
-%%# In this context, it is not very convenient that you are *forced*
-%%# to define a macro \myscan: It could be more convenient if you could just
-%%# write the *content* of \tokread (in braces) into the above definition.
-%%# You can indeed do this if you replace \futurelet by \toolboxFuturelet:
-%%#
-%%# \toolboxFuturelet\token{argument}
-%%#
-%%# The call \toolboxFuturelet\token{\command} has precisely the same effect as
-%%# \futurelet\token\command. The advantage of \toolboxFuturelet is that
-%%# instead of a single \command one may use also a sequence of commands.
-
-%%# Let us consider \MacroWithOptionalFlag as above. Assume that the user
-%%# has called this macro in the form "\MacroWithOptionalFlag*" where the
-%%# "*" is a flag which should cause your macro to do something slightly
-%%# different. On some place in your macro definition you will have recognized
-%%# (e.g. with \futurelet or \toolboxFuturelet) that a "*" is following
-%%# in the calling sequence. So you now want to execute your action
-%%# (whatever \MacroWithOptionalFlag is supposed to do).
-%%# However, if you do not take special care, after this action, TeX will
-%%# print a "*", because this is the next token on the token stream: \futurelet
-%%# does not delete any tokens. So you have to "gobble" this token away.
-%%# A rude way to do this is by using the macro \gobblenext as the last token
-%%# in you macro which can be defined by
-%%# \begin{verbatim}
-%%# \def\gobblenext#1{}\end{verbatim}
-%%# However, this has two major drawbacks:
-%%#
-%%# 1. This works for "*", but not for "{" or space tokens.
-%%# For space tokens the situation is even worse, since TeX eats spaces
-%%# around arguments, so sometimes space tokens might unexpectedly
-%%# disappear.
-%%# 2. It is not possible in this way to read another argument following
-%%# the "*": Recall that \gobblenext must be the *last* token in your
-%%# macro expansion, i.e. you have "lost control" after this call.
-%%#
-%%# The solution to these problems is instead of calling \gobblenext to use
-%%# \toolboxGobbleNext as the last command in your call:
-%%# You can pass it an argument which describes the action that
-%%# you want to do *after* gobbling the next token ("*" in the above example)
-%%# from the token stream. Thus
-%%#
-%%# \toolboxGobbleNext{cmd}
-%%#
-%%# erases the token following that command from the token stream and
-%%# then executes cmd. This is similar to
-%%# \def\toolboxGobbleNext#1#2{#1}
-%%# with the difference that #2 is considered as a token and that no spaces
-%%# are eaten.
-%%# The effect is that e.g. the call
-%%#
-%%# Example:
-%%# \toolboxGobbleNext{\foo}{{arg}
-%%# is the same as \foo{arg} (the brace "{" is eaten in this example).
-
-%%# As described earlier, the commands "\futurelet" or "\toolboxFuturelet" can
-%%# be used to check for optional flags. Frequently you will only want
-%%# to test for one particular flag and decide the next action on this flag.
-%%# Of course, you can test the token found with \ifx...\f", but this has the
-%%# disadvantage that some tokens (e.g. \fi) follow your action, which might
-%%# be bad (recall that e.g. \toolboxGobbleNext must be the last command of
-%%# your action, i.e. it would in the above examples not gobble the "*" but
-%%# the "\fi" which is probably not what you want).
-%%# The simplest solution is to use the command \toolboxIfNextToken which
-%%# already has the test included. For example, to test for an optional "[",
-%%# you can simply write
-%%#
-%%# \def\MacroWithOptionalBrace{\toolboxIfNextToken[{\yes}{\no}}
-%%#
-%%# and then the call "\MacroWithOptionalBrace[...]" will expand to "\yes[...]"
-%%# while "\MacroWithOptionalBrace x" will expand to "\no x"
-%%# (note that the brace is not gobbled - if you want the latter,
-%%# use "\toolboxIfNextGobbling" described below).
-
-%%# More precisely, the calling syntax of "\toolboxIfNextToken" is
-%%#
-%%# \toolboxIfNextToken{token}{IfPart}{ElsePart}
-%%#
-%%# The semantic is the following:
-%%# If the token following this command is `token', then IfPart is executed,
-%%# otherwise ElsePart. It is explicitly admissible that `token' is a space.
-%%# To support further tests, \toolboxToken is \let to the token which follows
-%%# the command. \toolboxToken is only a temporary token, i.e.
-%%# it may also be modified by other commands of this package; in particular,
-%%# you may also freely to modify \toolboxToken.
-%%# The token \toolboxSpaceToken which is described later may be handy
-%%# in connection with this command.
-%%#
-%%# In contrast to similar LaTeX2e macros much care has been taken
-%%# that spaces are not eaten. This solves the following problem:
-%%#
-%%# Assume that you want to write a macro which should have the calling syntax
-%%# "\mymacro{arg1}" or "\mymacro{arg1}[arg2]". You will probably implement
-%%# \mymacro to read the first argument and then to look whether the next
-%%# token is a "[". If you use the LaTeX2e macro to test for "[",
-%%# then all spaces until the next non-space token would be gobbled which means
-%%# that if you would use the LaTeX2e macros for the test, then the call
-%%# "\mymacro{arg1} Text" would behave like "\mymacro{arg1}Text",
-%%# i.e. the space is `mysteriously' lost. With the "toolbox" macros this
-%%# does not happen. The `disadvantage' is that "\mymacro{arg1} [arg2]"
-%%# is not the same as "\mymacro{arg1}[arg2]" (which is reasonable IMHO).
-%%#
-%%# Example:
-%%#
-%%# \def\mycmd#1{\toolboxIfNextToken[{\ParseOpt{#1}}{\NoOpt{#1}}}
-%%# \def\ParseOpt#1[#2]{\OptAtEnd{#1}{#2}}
-%%#
-%%# After the above definition, \mycmd{arg} executes \NoOpt{arg} while
-%%# \mycmd{arg}[optional] executes \OptAtEnd{arg}{optional}
-%%# We point out once more that in the first call a space following
-%%# \mycmd{arg} does not vanish (as would be the case if the LaTeX 2e macros
-%%# would have been used).
-
-%%# If \toolboxIfNextToken has found the required token, it does *not*
-%%# gobble that token from the token stream. Of course, you can do this by
-%%# yourself using the earlier described macro \toolboxGobbleNext. However,
-%%# it is simpler to use
-%%#
-%%# \toolboxIfNextGobbling{token}{IfPart}{ElsePart}
-%%#
-%%# This command is analogous to \toolboxIfNextToken with the difference that
-%%# in the case that the next token is the desired token, it is gobbled before
-%%# IfPart is executed.
-%%#
-%%# Example:
-%%#
-%%# \def\myloop{\toolboxIfNextGobbling*\toolboxTokenLoop\toolboxLoop}
-%%#
-%%# This makes \myloop*... behave like \toolboxTokenLoop, and
-%%# \myloop... (without *) behave like \toolboxLoop.
-
-%%# The following macro is one which you may want to use in connection with
-%%# LaTeX 2e optional arguments:
-%%#
-%%# \toolboxIfEmpty{arg}{IfPart}{ElsePart}
-%%#
-%%# The argument is not expand; it is only used to decide whether the
-%%# {IfPart} or the {ElsePart} will be expanded.
-%%# For further tests there are more involved macros:
-%%#
-%%# \toolboxIfx{arg}\macro{IfPart}{ElsePart}
-%%#
-%%# This tests via \ifx whether \def\Macro{arg} would give the definition
-%%# of \macro.
-%%#
-%%# \toolboxIfX{arga}{argb}{IfPart}{ElsePart}
-%%#
-%%# This tests whether "arga" and "argb" are the same token sequences.
-%%# If you want to avoid the \else and \fi commands to avoid certain side
-%%# effects, you can use instead:
-%%#
-%%# \toolboxIfElse{ifcmd}{IfPart}{ElsePart}
-%%#
-%%# This is rather analogous to "ifcmd" IfPart \else ElsePart \fi
-%%# but has everything in this line already eliminated from the tokenlist
-%%# when IfPart resp. ElsePart are expanded.
-
-%%#
-%%# Loops over tokenlists and itemlists
-%%# -----------------------------------
-
-%%# \toolboxLoop{items}{action}
-%%#
-%%# This calls iteratively "action{#1}", where #1 runs over each item in the
-%%# argument items. Here, an item is either a token or a group braced by {...}.
-%%# In the latter case, the braces are lost. Spaces in items are ignored
-%%# (unless they are braced). It is admissible that \action is not a single
-%%# macro but instead a sequence of tokens.
-%%# Examples follow below.
-%%#
-%%# The counterintuitive order of arguments is explained by the fact that the
-%%# typical usage is
-%%# \expandafter\toolboxLoop\expandafter{\MacroExpandingToItems}{action}
-%%# which for swapped order of arguments could hardly be written.
-
-%%# \toolboxLoop is not reentrant i.e. "action" may not expand
-%%# to something which contains a call to \toolboxLoop. To enable such calls
-%%# anyway, the command
-%%#
-%%# \toolboxLoopName{name}{items}{\action}
-%%#
-%%# is provided which is analogous to \toolboxLoop. This is also not reentrant,
-%%# but in contrast to \toolboxLoop, calls with different `name' arguments can
-%%# be used independently of each other, i.e. in the `action' part of a
-%%# \toolboxLoop (or \toolboxLoopName) can be a call to \toolboxLoopName with
-%%# a *different* `name'.
-%%# In particular, using a counter in `name' one could easily implement
-%%# even recursive calls. In this connection, it should be noted that
-%%# `name' is expanded via \csname ... \endcsname, and so you may use
-%%# constructs like \the\namecounter there.
-
-%%# \toolboxTokenLoop{tokens}{\action}
-%%#
-%%# This is similar to \toolboxLoop: The command \action\toolboxToken
-%%# is executed iteratively where \toolboxToken runs over each token in tokens.
-%%# The important difference is that \toolboxToken is a token (instead of an
-%%# item). In particular, \toolboxToken runs through every single token
-%%# including spaces and braces.
-%%# The token \toolboxSpaceToken which is described later may be handy
-%%# in connection with this command.
-%%#
-%%# Example:
-%%#
-%%# \toolboxTokenLoop{Some text}{\kern0.1em}
-%%#
-%%# is the similar to "\kern0.1em S\kern0.1em o\kern0.1em m...", i.e. you
-%%# get wider spacing between the letters of "Some text" (I do not claim that
-%%# this is typographically a good idea).
-%%#
-%%# Note that you do not have to take special care about the space.
-%%# With \toolboxLoop, you would have to mask the space e.g. with
-%%#
-%%# \toolboxLoop{Some{ }text}{\kern0.1em} or
-%%# \toolboxLoop{Some\toolboxSpace text}{\kern0.1em}
-%%#
-%%# In contrast, \toolboxTokenLoop would behave differently here:
-%%#
-%%# \toolboxTokenLoop{Some{ }text}{\kern0.1em}
-%%#
-%%# would produce \kern0.1em S...\kern0.1em{\kern0.1em <space>\kern0.1em}...
-%%# because the braces are simply considered as tokens.
-
-%%# \toolboxTokenLoop is not reentrant. Analogously to \toolboxLoopName,
-%%# independent versions can be generated by
-%%#
-%%# \toolboxTokenName{name}{tokens}{\action}
-
-%%#
-%%# Controlled expansion
-%%# --------------------
-
-%%# There are some occasions when you want more control over the expansion.
-%%# E.g. you might want to concatenate the contents of two macros to a
-%%# further macro or you want to expand a macro by one level but no full
-%%# expansion. Usually you can get this effects with \expandafter, but if
-%%# you expand several concatenated tokens in this way you either have to
-%%# write a lot of \expandafter's or you have to define subsidiary macros
-%%# that help you to \expandafter certain parts of macros. The macros in
-%%# this section allow you to do this in the most generic way that I could
-%%# implement.
-
-%%# \toolboxDef\macrotodefine{argumentlist}
-%%#
-%%# This call is similar to
-%%# \def\macrotodefine{argumentlist}
-%%# with two important differences:
-%%#
-%%# For \toolboxDef, the argumentlist is expanded precisely by one level.
-%%# argumentlist may not contain macros with parameters, and spaces on the
-%%# highest level are ignored. If you want to force a space on a particular
-%%# place, use the macro \toolboxSpace at this place
-%%# (which is described later). Contrary to the usual \def, the symbol # is
-%%# treated as a usual symbol.
-%%#
-%%# Example of usage:
-%%# \toolboxDef\chain{\chain\toolboxSpace\after}
-%%# This modifies the macro \chain such that a space and the content of the
-%%# macro \after is appended at the end.
-
-%%# \toolboxAppend\macrotodefine{arglist}
-%%#
-%%# This is equivalent to \toolboxDef\macrotodefine{\macrotodefine arglist}
-%%#
-
-%%# \toolboxSurround{ContentBefore}{ContentAfter}\macro
-%%#
-%%# This redefines \macro such that ContentBefore is put at the beginning
-%%# and ContentAfter after the definition of \macro. So this is equivalent to
-%%# \def\macro{ContentBefore * ContentAfter}
-%%# where * is the old content of \macro. It is required that \macro is a
-%%# usual macro without any arguments. If you want to patch more complicated
-%%# macros, use the patch.doc package instead.
-%%# The order of the arguments may appear strange, but it is convenient if
-%%# ContentBefore or ContentAfter are macros which should be expanded with
-%%# \expandafter.
-
-%%# There is some subsidiary macro used in the implementation of the above
-%%# macros which might be useful also in some other situations:
-%%#
-%%# \toolboxTokDef{argumentlist}\macrotodefine
-%%#
-%%# This call is similar to
-%%# \def\macrotodefine{argumentlist}
-%%# with the difference that the symbol # is stored as such.
-%%# The order of the arguments has been swapped in order to simplify the
-%%# application of \expandafter to the argumentlist.
-
-%%#
-%%# Searching, splitting, and replacing
-%%# ----------------------------------
-
-%%# \toolboxSplitAt{argument}{search}{\beforestring}{\afterstring}
-%%#
-%%# Here, \beforestring and \afterstring are arbitrary macro names,
-%%# and search and argument are any sequences of tokens (which are in
-%%# the following considered as `strings').
-%%#
-%%# This call scans the string `argument' for the first occurrence of `search'.
-%%# The macros \beforestring and \afterstring are defined correspondingly
-%%# such that \beforestring expands to the part before the first occurrence,
-%%# and \afterstring to the part following the first occurrence.
-%%# If `search' does not occur in `argument', \beforestring is defined to
-%%# `argument', and \afterstring is \let \undefined.
-%%#
-%%# If \beforestring or \afterstring had already been defined before the
-%%# call, the previous definition is tacitly overridden.
-%%# It is explicitly allowed that \beforestring and \afterstring are the
-%%# same names. In this case, the result has the meaning of \afterstring.
-%%#
-%%# It is guaranteed that braces {...} are *not* lost in `argument'.
-%%# However, `search' may not contain any braces, and `argument' may contain
-%%# only matching pairs of braces. Moreover, occurrences of `search' within a
-%%# pair of braces in `argument' are not recognized.
-%%#
-%%# (The order of the arguments has been chosen in order to simplify the
-%%# use of \expandafter).
-%%#
-%%# There are some restrictions for the strings in search. For example,
-%%# the symbol '#' is not allowed.
-%%#
-%%# In the above call, the arguments may not run over several paragraphs.
-%%# If you want the latter, you have to use the alternative call
-%%#
-%%# \toolboxSplitAt*{argument}{search}{\beforestring}{\afterstring}
-%%#
-%%# Example of usage:
-%%#
-%%# \def\examplemacro#1{\toolboxSplitAt{#1}{@}\testme\testme
-%%# \ifx\testme\undefined
-%%# ... (do this when #1 contains no `@' token)
-%%# \fi}
-%%#
-
-%%# \toolboxMakeSplit{search}{command}
-%%#
-%%# If \toolboxSplitAt should be used several times with the same search
-%%# string, it is much more effective to use the above call: This call
-%%# defines a new macro \command (the name is determined by the second argument
-%%# of \toolboxMakeSplit) which can be called in the form
-%%#
-%%# \command{argument}{\beforestring}{\afterstring}
-%%#
-%%# and which has the analogous meaning as \toolboxSplitAt (the argument
-%%# {search} is implicitly fixed and taken from the call of
-%%# \toolboxMakeSplit).
-%%# It is explicitly admissible that the above macro \toolboxMakeSplit is
-%%# used with an already existing command name. In this case, the previous
-%%# definition of \command is tacitly overridden.
-%%#
-%%# The command created by \toolboxMakeSplit does not accept arguments which
-%%# run over several paragraphs. If you want the latter, you have to create
-%%# this command by the alternative call
-%%#
-%%# \toolboxMakeSplit*{search}{command}
-
-%%#
-%%# The command
-%%# \toolboxFreeSplit{command}
-%%# frees the memory used by a previous \toolboxMakeSplit (and lets \command
-%%# again be undefined).
-
-%%# The command
-%%# \toolboxReplace{search}{replace}\macro
-%%# replaces in \macro all occurences of {search} by {replace}.
-%%# The same matches are found as in \toolboxSplitAt.
-%%# If you need to search for the same text several times, it is faster
-%%# to use the command
-%%# \toolboxReplaceSplit{replace}\SplitCmd\macro
-%%# where \SplitCmd is a command previously generated with \toolboxMakeSplit*
-%%# according to your search string. (You could also use \toolboxMakeSplit
-%%# to generate \SplitCmd, but then \macro should not contain any \par's).
-
-%%#
-%%# Redefinition of macros
-%%# ----------------------
-
-%%# \toolboxMakeHarmless{\macro}
-%%#
-%%# The above call redefines \macro such that it expands to an ASCII text
-%%# containing the previous definition of \macro (i.e. the catcodes of \macro
-%%# are changed).
-
-%%# \toolboxDropBrace\variable
-%%#
-%%# drops possible outer braces in \variable. More precisely,
-%%# if \variable expands to {content}, then \variable is redefined to
-%%# content (without braces). Otherwise, nothing happens.
-
-%%#
-%%# \toolboxIf\comparison{DefinitionCommand}{\macro}...
-%%#
-%%# The above command allows conditional definitions.
-%%# Here, {DefinitionCommand} is either \def, {\long\def}, \let, or some
-%%# similar command like the LaTeX \newcommand. If the test
-%%# \ifx\comparison\macro evaluates positive, then \macro is defined
-%%# correspondingly. Otherwise, \macro is not changed.
-%%#
-%%# Examples:
-%%#
-%%# \toolboxIf\undefined\def\macro{....}
-%%# \toolboxIf\undefined\let\macro...
-%%# \toolboxIf\undefined{\long\def}\macro{....}
-%%# \toolboxIf\undefined\newcommand{\macro}{....}
-%%#
-%%# are similar to \def\macro{...} resp. \let\macro... resp.
-%%# \long\def\macro{...} resp. \newcommand{\macro}{...} with the difference
-%%# that \macro is not changed if it was already defined.
-%%# In this sense, \toolboxIf is a more flexible variant of \providecommand.
-%%#
-
-%%# \toolboxNewiftrue{name} or \toolboxNewiffalse{name}
-%%#
-%%# If the command \ifname was already introduced with \newif, then
-%%# nothing happens. Otherwise \ifname is introduced similarly to
-%%# \newif\ifname and set to `true' respectively `false'.
-%%# In contrast to the corresponding command in TeX or LaTeX 2.09, this macro
-%%# is not \outer!
-
-%%# \toolboxNewifTrue{name} or \toolboxNewifFalse{name}
-%%#
-%%# are similar to \toolboxNewiftrue{name} and \toolboxNewiffalse{name},
-%%# respectively, with the difference that \ifname is set unconditionally
-%%# to `true' respectively `false'.
-
-%%#
-%%# Concatenated macro names
-%%# ------------------------
-
-%%# \toolboxLet\variable{macroname}
-%%#
-%%# The above command is analogous to \let\variable\macroname with the
-%%# difference that macroname can also contain other tokens like numbers
-%%# (it is obtained via \csname). Some converse to this command is
-%%#
-%%# \toolboxWithNr {number}\cmd{macro}
-%%#
-%%# which translates into \cmd\macronumber (here, `macro' and `number'
-%%# are just concatenated and evaluated via \csname).
-%%# Examples:
-%%# \toolboxWithNr 1\let{name}\toolboxEmpty
-%%# This is the same as \let\name1\toolboxEmpty
-%%# (but such that \name1 is considered as a name, not as \name 1)
-%%# \toolboxWithNr {10}\def{name}{Foo}
-%%# This corresponds analogously to \def\name10{Foo}.
-%%# \toolboxLet \mymacro{name\the\mycount}
-%%# This is similar to \let\mymacro\namexx where xx is the content
-%%# of the counter \mycount.
-
-%%#
-%%# Various
-%%# -------
-
-%%# The following macros have equivalents in most formats (like LaTeX2e).
-%%# However, we do not want to rely too much on these formats, so we provide
-%%# our own definitions.
-%%# The macro
-%%# \toolboxEmpty
-%%# expands to nothing (usually, this is the same as \empty).
-%%# Similarly, the macro
-%%# \toolboxSpace
-%%# expands to a space symbol (usually, this is the same as \space).
-%%# The token
-%%# \toolboxSpaceToken
-%%# is \let a space token (usually, this is the same as \@sptoken).
-%%# This token is convenient in tests of tokens
-%%# (because it is hard to get a space there which is not eaten by the TeX
-%%# parser, although sometimes also constructions like
-%%# \expandafter\ifx\toolboxSpace\token can be used).
-%%# Also the macros
-%%# \toolboxFirstOfTwo
-%%# \toolboxSecondOfTwo
-%%# are provided which read two arguments and return only the first
-%%# respectively second argument (usually, this is the same as
-%%# \@firstoftwo respectively \@secondoftwo). Similarly,
-%%# \toolboxGobbleArg{argument}
-%%# just reads its argument and expands to nothing.
-
-\endinput
-%%
-%% End of file `toolbox.txt'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/initex.1 new/texmf-dist/doc/man/man1/initex.1
--- old/texmf-dist/doc/man/man1/initex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/initex.1 2016-11-25 19:30:37.000000000 +0100
@@ -0,0 +1 @@
+.so man1/tex.1
Binary files old/texmf-dist/doc/man/man1/initex.man1.pdf and new/texmf-dist/doc/man/man1/initex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tex.1 new/texmf-dist/doc/man/man1/tex.1
--- old/texmf-dist/doc/man/man1/tex.1 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tex.1 2017-05-03 19:35:31.000000000 +0200
@@ -0,0 +1,514 @@
+.TH TEX 1 "16 June 2015" "Web2C 2017"
+.\"=====================================================================
+.if n .ds MF Metafont
+.if t .ds MF Metafont
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+.el .ds OX TeX
+.\" BX definition must follow TX so BX can use TX
+.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
+.if n .ds BX BibTeX
+.\" LX definition must follow TX so LX can use TX
+.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX
+.if n .ds LX LaTeX
+.if n .ds WB Web
+.if t .ds WB W\s-2EB\s0
+.\" EX and EE are used for displays that are pure code
+.de EX
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+..
+.\"=====================================================================
+.SH NAME
+tex, initex \- text formatting and typesetting
+.SH SYNOPSIS
+.B tex
+.RI [ options ]
+.RI [ \fB&\fPformat ]
+.RI [ file | \fB\e\fPcommands ]
+.\"=====================================================================
+.SH DESCRIPTION
+Run the \*(TX typesetter on
+.IR file ,
+usually creating
+.IR file.dvi .
+If the file argument has no extension, ".tex" will be appended to it.
+Instead of a filename, a set of \*(TX commands can be given, the first
+of which must start with a backslash.
+With a
+.BI & format
+argument \*(TX uses a different set of precompiled commands,
+contained in
+.IR format\fB.fmt\fP ;
+it is usually better to use the
+.B -fmt
+.I format
+option instead.
+.PP
+\*(TX
+formats the interspersed text and commands contained in the named
+files
+and outputs a typesetter independent file (called
+.IR DVI ,
+which is short for
+.IR "DeVice Independent" ).
+\*(TX's capabilities and language are described in
+.IR "The \*(OXbook" .
+\*(TX
+is normally used with a large body of precompiled macros,
+and there are several specific formatting systems, such as
+\*(LX,
+which require the support of several macro files.
+.PP
+This version of \*(TX looks at its command line to see what name it
+was called under. If they exist, then both
+.B initex
+and
+.B virtex
+are symbolic links to the
+.B tex
+executable. When called as
+.BR initex
+(or when the
+.B -ini
+option is given) it can be used to precompile macros into a
+.I .fmt
+file. When called as
+.B virtex
+it will use the
+.I plain
+format. When called under any other name, \*(TX will use that name as
+the name of the format to use. For example, when called as
+.B tex
+the
+.I tex
+format is used, which is identical to the
+.I plain
+format. The commands defined by the
+.I plain
+format are documented in
+.IR "The \*(OXbook" .
+Other formats that are often available include
+.I latex
+and
+.IR amstex .
+.PP
+The non-option command line arguments to the
+\*(TX
+program are passed to it as the first input line. (But it is often
+easier to type extended arguments as the first input line, since UNIX
+shells tend to gobble up or misinterpret \*(TX's favorite symbols,
+like backslashes, unless you quote them.)
+As described in
+.IR "The \*(OXbook" ,
+that first line should begin with a filename, a
+.IR \econtrolsequence ,
+or a
+.IR &formatname .
+.PP
+The normal usage is to say
+.EX
+tex paper
+.EE
+to start processing
+.IR paper.tex .
+The name
+.I paper
+will be the ``jobname'', and is used in forming
+output filenames.
+If \*(TX doesn't get a filename in the first line, the jobname is
+.IR texput .
+When looking for a file, \*(TX looks for the name with and without the
+default extension
+.RI ( .tex )
+appended, unless the name already contains that extension. If
+.I paper
+is the ``jobname'',
+a log of error messages, with rather more detail than normally appears
+on the screen, will appear in
+.IR paper.log ,
+and the output file will be in
+.IR paper.dvi .
+.PP
+This version of \*(TX can look in the first line of the file
+.I paper.tex
+to see if it begins with the magic sequence
+.IR %& .
+If the first line begins with
+.BI %& format
+.BI -translate-file \ tcxname
+then \*(TX will use the named format and translation table
+.I tcxname
+to process the source file. Either the format name or the
+.B -translate-file
+specification may be omitted, but not both. This overrides the
+format selection based on the name by which the program is invoked.
+The
+.B -parse-first-line
+option or the
+.B parse_first_line
+configuration variable controls whether this behaviour is enabled.
+.PP
+The
+.I e
+response to \*(TX's error prompt causes the system default editor to
+start up at the current line of the current file. The environment
+variable TEXEDIT can be used to change the editor used. It may
+contain a string with "%s" indicating where the filename goes and "%d"
+indicating where the decimal line number (if any) goes. For example,
+a TEXEDIT string for
+.B emacs
+can be set with the
+.B sh
+command
+.EX
+\fITEXEDIT="emacs +%d %s"; export TEXEDIT\fP
+.EE
+.PP
+A convenient file in the library is
+.IR null.tex ,
+containing nothing.
+When \*(TX can't find a file it thinks you want to input, it keeps
+asking you for another filename; responding `null' gets you out
+of the loop if you don't want to input anything. You can also type your
+EOF character (usually control-D).
+.PP
+.\"=====================================================================
+.SH OPTIONS
+This version of \*(TX understands the following command line options.
+.TP
+.B -enc
+Enable the enc\*(TX extensions. This option is only effective in
+combination with
+.BR -ini .
+For documentation of the enc\*(TX extensions see
+.BR http://www.olsak.net/enctex.html .
+.TP
+.B -file-line-error
+Print error messages in the form
+.I file:line:error
+which is similar to the way many compilers format them.
+.TP
+.B -no-file-line-error
+Disable printing error messages in the
+.I file:line:error
+style.
+.TP
+.B -file-line-error-style
+This is the old name of the
+.B -file-line-error
+option.
+.TP
+.BI -fmt \ format
+Use
+.I format
+as the name of the format to be used, instead of the name by which
+\*(TX was called or a
+.I %&
+line.
+.TP
+.B -halt-on-error
+Exit with an error code when an error is encountered during processing.
+.TP
+.B -help
+Print help message and exit.
+.TP
+.B -ini
+Start in
+.I INI
+mode, which is used to dump formats. The
+.I INI
+mode can be used for typesetting, but no format is preloaded, and
+basic initializations like setting catcodes may be required.
+.TP
+.BI -interaction \ mode
+Sets the interaction mode. The mode can be either
+.IR batchmode ,
+.IR nonstopmode ,
+.IR scrollmode ,
+and
+.IR errorstopmode .
+The meaning of these modes is the same as that of the corresponding
+\ecommands.
+.TP
+.B -ipc
+Send DVI output to a socket as well as the usual output file. Whether
+this option is available is the choice of the installer.
+.TP
+.B -ipc-start
+As
+.BR -ipc ,
+and starts the server at the other end as well. Whether this option
+is available is the choice of the installer.
+.TP
+.BI -jobname \ name
+Use
+.I name
+for the job name, instead of deriving it from the name of the input file.
+.TP
+.BI -kpathsea-debug \ bitmask
+Sets path searching debugging flags according to the bitmask. See the
+.I Kpathsea
+manual for details.
+.TP
+.BI -mktex \ fmt
+Enable
+.RI mktex fmt ,
+where
+.I fmt
+must be either
+.I tex
+or
+.IR tfm .
+.TP
+.B -mltex
+Enable ML\*(TX extensions. Only effective in combination with
+.BR -ini .
+.TP
+.BI -no-mktex \ fmt
+Disable
+.RI mktex fmt ,
+where
+.I fmt
+must be either
+.I tex
+or
+.IR tfm .
+.TP
+.BI -output-comment \ string
+Use
+.I string
+for the
+.I DVI
+file comment instead of the date.
+.TP
+.BI -output-directory \ directory
+Write output files in
+.I directory
+instead of the current directory. Look up input files in
+.I directory
+first, then along the normal search path. See also description of the
+TEXMFOUTPUT environment variable.
+.TP
+.B -parse-first-line
+If the first line of the main input file begins with
+.I %&
+parse it to look for a dump name or a
+.B -translate-file
+option.
+.TP
+.B -no-parse-first-line
+Disable parsing of the first line of the main input file.
+.TP
+.BI -progname \ name
+Pretend to be program
+.IR name .
+This affects both the format used and the search paths.
+.TP
+.B -recorder
+Enable the filename recorder. This leaves a trace of the files opened
+for input and output in a file with extension
+.IR .fls .
+.TP
+.B -shell-escape
+Enable the
+.BI \ewrite18{ command }
+construct. The
+.I command
+can be any shell command. This construct is normally
+disallowed for security reasons.
+.TP
+.B -no-shell-escape
+Disable the
+.BI \ewrite18{ command }
+construct, even if it is enabled in the
+.I texmf.cnf
+file.
+.TP
+.B -src-specials
+Insert source specials into the
+.I DVI
+file.
+.TP
+.BI -src-specials \ where
+Insert source specials in certain places of the
+.I DVI
+file.
+.I where
+is a comma-separated value list:
+.IR cr ,
+.IR display ,
+.IR hbox ,
+.IR math ,
+.IR par ,
+.IR parent ,
+or
+.IR vbox .
+.TP
+.BI -translate-file \ tcxname
+Use the
+.I tcxname
+translation table to set the mapping of input characters and
+re-mapping of output characters.
+.TP
+.BI -default-translate-file \ tcxname
+Like
+.B -translate-file
+except that a
+.I %&
+line can overrule this setting.
+.TP
+.B -version
+Print version information and exit.
+.\"=====================================================================
+.SH ENVIRONMENT
+See the Kpathsearch library documentation (the `Path specifications'
+node) for precise details of how the environment variables are used.
+The
+.B kpsewhich
+utility can be used to query the values of the variables.
+.PP
+One caveat: In most \*(TX formats, you cannot use ~ in a filename you
+give directly to \*(TX, because ~ is an active character, and hence is
+expanded, not taken as part of the filename. Other programs, such as
+\*(MF, do not have this problem.
+.PP
+.TP
+.B TEXMFOUTPUT
+Normally, \*(TX puts its output files in the current directory. If
+any output file cannot be opened there, it tries to open it in the
+directory specified in the environment variable TEXMFOUTPUT.
+There is no default value for that variable. For example, if you say
+.I tex paper
+and the current directory is not writable, if TEXMFOUTPUT has
+the value
+.IR /tmp ,
+\*(TX attempts to create
+.I /tmp/paper.log
+(and
+.IR /tmp/paper.dvi ,
+if any output is produced.) TEXMFOUTPUT is also checked for input
+files, as \*(TX often generates files that need to be subsequently
+read; for input, no suffixes (such as ``.tex'') are added by default,
+the input name is simply checked as given.
+.TP
+.B TEXINPUTS
+Search path for
+.I \einput
+and
+.I \eopenin
+files.
+This probably start with ``.'', so
+that user files are found before system files. An empty path
+component will be replaced with the paths defined in the
+.I texmf.cnf
+file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the
+current directory and ``/home/user/tex'' to the standard search path.
+.TP
+.B TEXFORMATS
+Search path for format files.
+.TP
+.B TEXPOOL
+search path for
+.B tex
+internal strings.
+.TP
+.B TEXEDIT
+Command template for switching to editor. The default, usually
+.BR vi ,
+is set when \*(TX is compiled.
+.TP
+.B TFMFONTS
+Search path for font metric
+.RI ( .tfm )
+files.
+.\"=====================================================================
+.SH FILES
+The location of the files mentioned below varies from system to
+system. Use the
+.B kpsewhich
+utility to find their locations.
+.TP
+.I texmf.cnf
+Configuration file. This contains definitions of search paths as well
+as other configuration parameters like
+.BR parse_first_line .
+.TP
+.I tex.pool
+Text file containing \*(TX's internal strings.
+.TP
+.I texfonts.map
+Filename mapping definitions.
+.TP
+.I *.tfm
+Metric files for \*(TX's fonts.
+.TP
+.I *.fmt
+Predigested \*(TX format (.\|fmt) files.
+.TP
+.I $TEXMFMAIN/tex/plain/base/plain.tex
+The basic macro package described in the \*(OXbook.
+.br
+.\"=====================================================================
+.SH NOTES
+This manual page is not meant to be exhaustive. The complete
+documentation for this version of \*(TX can be found in the info manual
+.IR "Web2C: A TeX implementation" .
+.\"=====================================================================
+.SH BUGS
+This version of \*(TX implements a number of optional extensions.
+In fact, many of these extensions conflict to a greater or lesser
+extent with the definition of \*(TX. When such extensions are
+enabled, the banner printed when \*(TX starts is changed to print
+.B TeXk
+instead of
+.BR TeX .
+.PP
+This version of \*(TX fails to trap arithmetic overflow when
+dimensions are added or subtracted. Cases where this occurs are rare,
+but when it does the generated
+.I DVI
+file will be invalid.
+.\"=====================================================================
+.SH "SEE ALSO"
+.BR mf (1),
+.br
+Donald E. Knuth,
+.IR "The \*(OXbook" ,
+Addison-Wesley, 1986, ISBN 0-201-13447-0.
+.br
+Leslie Lamport,
+.IR "\*(LX \- A Document Preparation System" ,
+Addison-Wesley, 1985, ISBN 0-201-15790-X.
+.br
+K. Berry,
+.IR "Eplain: Expanded plain \*(TX" ,
+ftp://ftp.cs.umb.edu/pub/tex/eplain/doc.
+.br
+Michael Spivak,
+.IR "The Joy of \*(OX" ,
+2nd edition, Addison-Wesley, 1990, ISBN 0-8218-2997-1.
+.br
+.I TUGboat
+(the journal of the \*(TX Users Group).
+.\"=====================================================================
+.SH TRIVIA
+\*(TX, pronounced properly, rhymes with ``blecchhh.'' The proper
+spelling in typewriter-like fonts is ``TeX'' and not ``TEX'' or ``tex.''
+.\"=====================================================================
+.SH AUTHORS
+\*(TX was created by Donald E. Knuth,
+who implemented it using his \*(WB system for Pascal programs.
+It was ported to Unix at Stanford by Howard Trickey, and
+at Cornell by Pavel Curtis.
+The version now offered with the Unix \*(TX distribution is that
+generated by the \*(WB to C system
+.RB ( web2c ),
+originally written by Tomas Rokicki and Tim Morgan.
+.PP
+The enc\*(TX extensions were written by Petr Olsak.
Binary files old/texmf-dist/doc/man/man1/tex.man1.pdf and new/texmf-dist/doc/man/man1/tex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex.doc.tlpobj new/tlpkg/tlpobj/tex.doc.tlpobj
--- old/tlpkg/tlpobj/tex.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/tex.doc.tlpobj 2017-05-04 02:07:14.000000000 +0200
@@ -0,0 +1,9 @@
+name tex.doc
+category TLCore
+revision 44166
+shortdesc doc files of tex
+docfiles size=15
+ texmf-dist/doc/man/man1/initex.1
+ texmf-dist/doc/man/man1/initex.man1.pdf
+ texmf-dist/doc/man/man1/tex.1
+ texmf-dist/doc/man/man1/tex.man1.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/toolbox.doc.tlpobj new/tlpkg/tlpobj/toolbox.doc.tlpobj
--- old/tlpkg/tlpobj/toolbox.doc.tlpobj 2016-04-14 19:53:29.000000000 +0200
+++ new/tlpkg/tlpobj/toolbox.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-name toolbox.doc
-category Package
-revision 32260
-shortdesc doc files of toolbox
-relocated 1
-docfiles size=49
- RELOC/doc/latex/toolbox/README
- RELOC/doc/latex/toolbox/toolbox.pdf
- RELOC/doc/latex/toolbox/toolbox.tex
- RELOC/doc/latex/toolbox/toolbox.txt
++++++ tex4ht_env.dif ++++++
---
texmf-dist/tex4ht/base/unix/tex4ht.env | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- texmf-dist/tex4ht/base/unix/tex4ht.env
+++ texmf-dist/tex4ht/base/unix/tex4ht.env 2010-01-28 09:42:44.000000000 +0000
@@ -226,7 +226,7 @@ S*
%
<javahelp>
.html mv %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
+.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
.jhm echo "java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html"
.jhm echo "--- Warning --- Beware of leftover %%1*.html files from other compilations"
.jhm java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html
@@ -237,42 +237,42 @@ S*
<emspk>
.html mv %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.html %%1.tmp
+.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.html %%1.tmp
</emspk>
<jsml>
.jsml mv %%1.jsml %%1.tmp
-.jsml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
+.jsml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
</jsml>
<docbk>
.xml cp %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
+.xml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
</docbk>
<xhtml>
.html mv %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
+.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
.xht mv %%1.xht %%1.tmp
-.xht java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
.xml mv %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
</xhtml>
<xhtmml>
.html mv %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
+.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
.xht mv %%1.xht %%1.tmp
-.xht java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
.xml mv %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
</xhtmml>
<ooxtpipes>
.4oo mv %%0.4oo %%0.tmp
-.4oo java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
+.4oo java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
.4om mv %%1.4om %%1.tmp
-.4om java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
+.4om java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
</ooxtpipes>
%
<validatehtml>
++++++ texconfig_scripts.dif ++++++
---
texmf-dist/scripts/texlive/texconfig.sh | 35 +-------------------------------
1 file changed, 2 insertions(+), 33 deletions(-)
--- texmf-dist/scripts/texlive/texconfig.sh
+++ texmf-dist/scripts/texlive/texconfig.sh 2009-09-02 12:47:26.000000000 +0000
@@ -40,7 +40,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$.$RANDOM
needsCleanup=false
lastUpdatedFile=
@@ -975,21 +975,6 @@ For more information about these \`featu
;;
formats)
- cat >&2 <http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
setupTmpDir
echo "$progname: analyzing old configuration..." >&2
fmtutil --catcfg > $tmpdir/pre
@@ -1015,22 +1000,6 @@ EOM
# "hyphen FORMAT"
hyphen)
- cat >&2 <http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
tcBatchHyphenFormat=$2
formatsForHyphen=`getFormatsForHyphen`
formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
@@ -1276,7 +1245,7 @@ Valid PAPER settings:
;;
rehash)
- mktexlsr
+ ( unset KPSE_DOT; mktexlsr )
;;
#
++++++ toolbox.doc.tar.xz -> texdef.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/README new/doc/latex/toolbox/README
--- old/doc/latex/toolbox/README 2013-11-27 23:24:54.000000000 +0100
+++ new/doc/latex/toolbox/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-The TeX programmer's toolbox; enhanced version.
-This (La)TeX package provides some macros which are convenient for
-writing indices, glossaries, or other macros.
-It contains macros which support
-
- - implicit macros - a useful supplement to \index or varindex for
- writing glossaries or indices
- - fancy optional arguments
- - loops over tokenlists and itemlists
- - searching, splitting, and replacing
- - controlled expansion
- - redefinition of macros
- - concatenated macro names
-
-Author: M. V\"ath martin@mvath.de
-
-The package may be distributed and/or modified under the conditions of
-the LaTeX Project Public License (version 1.3c or later).
Binary files old/doc/latex/toolbox/toolbox.pdf and new/doc/latex/toolbox/toolbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.tex new/doc/latex/toolbox/toolbox.tex
--- old/doc/latex/toolbox/toolbox.tex 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/toolbox/toolbox.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-\documentclass{ltxdoc}
-\OnlyDescription%% Comment this out, or
-%%\AlsoImplementation%% uncomment this line, if you want to see the source.
-
-%% If you want an index, uncomment one of the following lines.
-%% After running latex a first time, you have to use
-%% makeindex -s gind.ist toolbox
-%% Then run latex again.
-%%\CodelineIndex% comment this out if you want an index referring to codelines
-%%\PageIndex% comment this out if you want an index referring to pages
-%%\OldMakeindex% uncomment this line, if your MakeIndex is pre-v2.9
-
-\setlength\hfuzz{15pt}
-\hbadness=7000
-\begin{document}
-\DocInput{toolbox.dtx}
-\end{document}
-\endinput
-%%
-%% End of file `toolbox.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.txt new/doc/latex/toolbox/toolbox.txt
--- old/doc/latex/toolbox/toolbox.txt 2013-11-27 23:24:54.000000000 +0100
+++ new/doc/latex/toolbox/toolbox.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,790 +0,0 @@
-
-%%#
-%%# Author:
-%%#
-%%# M. V\"ath martin@mvath.de
-%%#
-%%# The author thanks
-%%# David Kastrup
-%%#
-
-%%# The package may be distributed and/or modified under the conditions of
-%%# the LaTeX Project Public License (version 1.3c or later).
-
-%%#############################################################################
-%%#
-%%# The TeX programmer's toolbox; enhanced version.
-%%# This (La)TeX package provides some macros which are convenient for
-%%# writing indices, glossaries, or other macros.
-%%# It contains macros which support
-%%#
-%%# - implicit macros - a useful supplement to \index or varindex for
-%%# writing glossaries or indices
-%%# - fancy optional arguments
-%%# - loops over tokenlists and itemlists
-%%# - searching, splitting, and replacing
-%%# - controlled expansion
-%%# - redefinition of macros
-%%# - concatenated macro names
-%%#
-%%#############################################################################
-
-%%#
-%%# This package was tested with plain TeX, LaTeX 2.09, and LaTeX 2e,
-%%# and it should actually run with all TeX formats.
-%%#
-
-
-%%# To use toolbox, you have to put `toolbox.sty' in a path where TeX looks
-%%# for its input files. The TeX documents using toolbox need the
-%%# following modifications in their header:
-%%#
-%%# a) If you use LaTeX2.09, use toolbox as a style option, e.g.
-%%# \documentstyle[toolbox]{article}
-%%# or
-%%# \documentstyle[toolbox,12pt]{article}
-%%# b) If you use LaTeX2e, put in the preamble the command
-%%# \usepackage{toolbox}
-%%# c) If you use some other (non-LaTeX) format, you will probably have to
-%%# insert a line like
-%%# \catcode`\@=11\input toolbox.sty\catcode`\@=12\relax
-%%#
-%%# The only LaTeX-specific commands used in `toolbox.sty' are:
-%%#
-%%# \newcommand (only in the form \newcommand{\command}{} to ensure that
-%%# \command was not defined before)
-%%# \ProvidesPackage
-%%# \typeout
-%%#
-%%# The above commands are used only if they are defined.
-%%#
-
-%%#
-%%# Description of the provided macros:
-%%#
-
-%%# General remark: Many macros could appear in several sections.
-%%# For example, \toolboxMakeDef and \toolboxSourround might be considered
-%%# as macros which support redefinitions of macros. However, we put them
-%%# in different sections which perhaps explain better their nature.
-
-%%#
-%%# Implicit macro definitions
-%%# --------------------------
-
-%%# What we mean by implicit macro definitions is probably best explained by
-%%# the following examples which show the intended usage:
-%%#
-%%# (In the following examples, we always refer to the \index command. Note
-%%# that it may be more convenient to use for indices the varindex package in
-%%# addition - the documentation of varindex (release 2.3 or newer) gives
-%%# additional hints and examples how these two (essentially independent)
-%%# approaches can be combined in practice).
-%%#
-%%# Assume that you want to write an index for a book which has rather
-%%# long and complicated \index entries. The first idea that one might have in
-%%# this connection is to put the various \index commands at the beginning of
-%%# the document into several macros (one for each \index entry), and to use
-%%# just these macros in the main text. For example, one might want to write
-%%# near the beginning of the document commands like
-%%# \newcommand{\Start}{\index{finish or end}}
-%%# \newcommand{\End}{\index{finish or end}}
-%%# and then to use in the main text \Start and \End whenever a reference
-%%# in the corresponding index to the current place is desired.
-%%# However, this has two major disadvantages:
-%%# 1. Unless you are very disciplinary with your macro names, it is easy to
-%%# forget that \End writes an index entry. So the \End in the main text
-%%# might be very confusing.
-%%# 2. You cannot choose short and intuitive macro names for common phrases,
-%%# because they are usually already reserved by TeX, LaTeX, or some
-%%# packages.
-%%#
-%%# To avoid these problems, one may be very disciplinary and call the
-%%# involved macros systematically e.g. \GlossaryStart \GlossaryEnd etc.
-%%# However, this produces terrible long and unreadable macro names in the
-%%# main text.
-%%#
-%%# The implicit macro definitions of "toolbox" provide a more convenient
-%%# solution. The idea is that you do not use the corresponding macros directly
-%%# but only implicitly by a call of other macros where your "macro name" is
-%%# just an argument.
-%%# Moreover, "toolbox" assists you in writing the corresponding definitions.
-%%# For example, if you know that you want a set of macros which all expand
-%%# into something of the form \index{...}, you can give a ``mask'' which
-%%# contains this form, and you only have to fill in the changing content
-%%# (similarly as for usual TeX macros with arguments, but the level of
-%%# abstraction is one step higher).
-%%# For the above task, you might use the command:
-%%#
-%%# \toolboxMakeDef{Glossary}{\index{#1}}
-%%#
-%%# The argument `Glossary' serves to distinguish independent definitions
-%%# (this will become clear later). Its effect visible now is that it
-%%# determines the name of the following macros which you can use after
-%%# the above call:
-%%#
-%%# \NewGlossary{start-1}{start}
-%%# \NewGlossary{start-2}{start or beginning}
-%%# \NewGlossary{end}{finish or end}
-%%#
-%%# These command are now similar to the \newcommand definitions explained
-%%# above. However, there is no name collision with the TeX-internal command
-%%# \end. Of course, this means that you cannot just write \end in the main
-%%# text to get the desired index entry. Instead, you have to write the more
-%%# intuitive commands
-%%#
-%%# \Glossary{start-1}
-%%# \Glossary{start-2}
-%%# \Glossary{end}
-%%#
-%%# (again, the name \Glossary stems from our first call of \toolboxMakeDef).
-%%# Note that e.g. \Glossary{start-1} expands not only to `start' but
-%%# actually to \index{start} (because of our first call of \toolboxMakeDef).
-%%# Note also that you can use symbols like - or numbers which are usually
-%%# not allowed in TeX macro names.
-%%#
-%%# Of course, similarly as for \newcommand, you can also do other things with
-%%# the macros. For example,
-%%#
-%%# \LetGlossary\tempname{end}
-%%# \NewGlossary*{finish}\tempname
-%%#
-%%# will first define \tempname to expand to the same text as \Glossary{end},
-%%# and then defines a new entry \Glossary{finish} to expand to the same text
-%%# as \tempname. Hence, the above new lines make the calls \Glossary{end} and
-%%# \Glossary{finish} equivalent.
-%%#
-%%# At the end of your list of \NewGlossary commands, you might want to put
-%%#
-%%# \toolboxFreeDef*{Glossary}
-%%#
-%%# The purpose of this command is that \NewGlossary cannot be used anymore
-%%# (unless, of course, you define it again). So you cannot unintentionally
-%%# add new entries to your glossary list (but you still can use \Glossary{...}
-%%# to reference to the already produced entries).
-%%# Moreover, the above command frees some memory which was needed for
-%%# \NewGlossary to work.
-%%#
-%%# If you additionally want to free the memory used by \Glossary, you can use
-%%#
-%%# \toolboxFreeDef{Glossary}
-%%#
-%%# (without the `*'). This may be necessary, if you want to call again e.g.
-%%#
-%%# \toolboxMakeDef{Glossary}{\emph{#1}\index{#1}}
-%%#
-%%# (if you have not freed the memory for \Glossary before this repeated call,
-%%# TeX will complain that \Glossary is already defined).
-%%#
-%%# Of course, it is possible to call \toolboxMakeDef with several different
-%%# names, for example, for \Glossary, \SymbolList etc. Another application
-%%# might be to use a different command to mark e.g.\ the main occurrence of
-%%# some index entry or to output additionally the entry into the running text.
-%%# We do this in the following example which simultaneously
-%%# demonstrates that the names can also be constructed in another way:
-%%#
-%%# \toolboxMakeDef[Ind]{}{\index{#1}}
-%%# \toolboxMakeDef[Ind]{Main}{\index{#1|textbf}}
-%%# \toolboxMakeDef{OutInd}{#1}
-%%#
-%%# \IndNew{A}{A is a letter}
-%%# \IndNewMain{A}{A is a letter}
-%%# \NewOutInd{A}{\textbf{The letter A}\Ind{A}}
-%%#
-%%# After the above commands, you can use \Ind{A}, \IndMain{A}, and
-%%# \OutInd{A} to produce the corresponding \index entry, the "main" \index
-%%# entry (with a boldface page number), and the text \textbf{The letter A}
-%%# with an additional entry into the index, respectively.
-%%# Of course, it might usually be more convenient to define the \Ind and
-%%# \IndMain" entries simultaneously, e.g. as follows
-%%#
-%%# \toolboxMakeDef[Ind]{}{#1}
-%%# \toolboxMakeDef[Ind]{Main}{#1}
-%%# \newcommand{\NewStandardInd}[2]{%
-%%# \IndNew{#1}{\index{#2}}%
-%%# \IndNewMain{#1}{\index{#2|textbf}}}
-%%#
-%%# \NewStandardInd{A}{A is a letter}
-%%#
-%%# This approach has the additional advantage that you can define exceptional
-%%# cases "by hand" (e.g. if you want that for certain "main" index
-%%# entries the page number is printed with "\textsl" instead of "\textbf").
-
-%%# Since the motivation for implicit definitions now is hopefully clear,
-%%# let us now describe in detail which commands are provided by "toolbox"
-%%# for this purpose.
-%%# As explained in the example, the main generic macro provided to this
-%%# purpose is \toolboxMakeDef. Its call syntax is as follows:
-%%#
-%%# \toolboxMakeDef[Prefix]{Name}{ReplacementMask}
-%%#
-%%# (the argument [Prefix] is optional and by default empty).
-%%# The above command generates new macros
-%%#
-%%# \PrefixNewName
-%%# \PrefixRenewName
-%%# \PrefixProvideName
-%%# \PrefixDefName
-%%# \PrefixLetName
-%%# \PrefixName
-%%#
-%%# which in turn can be called as follows
-%%#
-%%# \PrefixNewName{something}{RememberText}
-%%# \PrefixRenewName{something}{RememberText}
-%%# \PrefixProvideName{something}{RememberText}
-%%# \PrefixDefName{something}{RememberText}
-%%# \PrefixNewName*{something}{\SomeMacro}
-%%# \PrefixRenewName*{something}{\SomeMacro}
-%%# \PrefixProvideName*{something}{\SomeMacro}
-%%# \PrefixDefName*{something}{\SomeMacro}
-%%# \PrefixLetName{\SomeMacro}{something}
-%%# \PrefixName{something}
-%%# \PrefixName*{something}
-%%#
-%%# These calls are in a sense similar to the respective commands
-%%#
-%%# \newcommand{\something}{RememberText}
-%%# \renewcommand{\something}{RememberText}
-%%# \providecommand{\something}{RememberText}
-%%# \def\something{RememberText}
-%%# \newcommand{\something}{}\let\something\SomeMacro
-%%# \renewcommand{\something}{}\let\something\SomeMacro
-%%# \@ifundefined\something{\let\something\SomeMacro}{}
-%%# \let\something\SomeMacro
-%%# \let\SomeMacro{\something}
-%%# \something
-%%# \something (but without error if \something is undefined).
-%%#
-%%# with the differences already pointed out before:
-%%# 1. The macro name actually used is not \something. Instead, it is a name
-%%# which does not conflict with any existing macro (except one
-%%# generated previously by another \PrefixNewName, but in this case a
-%%# descriptive error is reported). For this reason, it is not possible to
-%%# use this macro directly but only indirectly by the call
-%%# \PrefixName{something} (or with \PrefixLetName).
-%%# 2. The replacement text is not `RememberText' but determined by
-%%# ReplacementMask where every occurrence of #1 in ReplacementMask is
-%%# replaced by RememberText (recall the examples). If you want to have the
-%%# plain RememberText, use {#1} as ReplacementMask.
-%%#
-%%# Since toolbox 4.2 there is another slight difference: The symbol '#'
-%%# is treated as usual and not as in a macro definition.
-%%#
-%%# \toolboxMakeDef gives an error message if the commands
-%%# \Prefix... are already defined. If you intentionally want to
-%%# change a previous definition, you have to call the command
-%%#
-%%# \toolboxFreeDef[Prefix]{Name}
-%%#
-%%# before. The latter not only lets all of the macros \Prefix... be
-%%# \undefined, but also frees all other memory internally used by the
-%%# corresponding call of \toolboxMakeDef
-%%# (note, however, that the above command does not free the
-%%# memory allocated before by calls of \PrefixNew... - to free the latter,
-%%# you have to call subsequently e.g.
-%%#
-%%# \PrefixNewName*{...}{\undefined}
-%%#
-%%% before). There is also the command
-%%#
-%%# \toolboxFreeDef*[Prefix]{Name}
-%%#
-%%# which acts similarly as \toolboxFreeDef but which does not undefine the
-%%# two macros \PrefixName and \PrefixLetName.
-%%#
-
-%%#
-%%# Fancy optional argument parsing
-%%# -------------------------------
-
-%%# This section contains macros which are convenient if you e.g. write a
-%%# package that contains macros which contain a lot of optional arguments
-%%# and flags (like "*").
-%%# Typically, to read such an optional argument or flag, you save
-%%# the next token with \futurelet and then call a macro which decides what to
-%%# do with the token read. Thus, a typical use of \futurelet looks like
-%%#
-%%# \def\MacroWithOptionalFlag{\futurelet\tokread\myscan}
-%%#
-%%# which will define \tokread to be the token *following* the macro
-%%# \MacroWithOptionalFlag in the token stream and then execute \myscan.
-%%# In this context, it is not very convenient that you are *forced*
-%%# to define a macro \myscan: It could be more convenient if you could just
-%%# write the *content* of \tokread (in braces) into the above definition.
-%%# You can indeed do this if you replace \futurelet by \toolboxFuturelet:
-%%#
-%%# \toolboxFuturelet\token{argument}
-%%#
-%%# The call \toolboxFuturelet\token{\command} has precisely the same effect as
-%%# \futurelet\token\command. The advantage of \toolboxFuturelet is that
-%%# instead of a single \command one may use also a sequence of commands.
-
-%%# Let us consider \MacroWithOptionalFlag as above. Assume that the user
-%%# has called this macro in the form "\MacroWithOptionalFlag*" where the
-%%# "*" is a flag which should cause your macro to do something slightly
-%%# different. On some place in your macro definition you will have recognized
-%%# (e.g. with \futurelet or \toolboxFuturelet) that a "*" is following
-%%# in the calling sequence. So you now want to execute your action
-%%# (whatever \MacroWithOptionalFlag is supposed to do).
-%%# However, if you do not take special care, after this action, TeX will
-%%# print a "*", because this is the next token on the token stream: \futurelet
-%%# does not delete any tokens. So you have to "gobble" this token away.
-%%# A rude way to do this is by using the macro \gobblenext as the last token
-%%# in you macro which can be defined by
-%%# \begin{verbatim}
-%%# \def\gobblenext#1{}\end{verbatim}
-%%# However, this has two major drawbacks:
-%%#
-%%# 1. This works for "*", but not for "{" or space tokens.
-%%# For space tokens the situation is even worse, since TeX eats spaces
-%%# around arguments, so sometimes space tokens might unexpectedly
-%%# disappear.
-%%# 2. It is not possible in this way to read another argument following
-%%# the "*": Recall that \gobblenext must be the *last* token in your
-%%# macro expansion, i.e. you have "lost control" after this call.
-%%#
-%%# The solution to these problems is instead of calling \gobblenext to use
-%%# \toolboxGobbleNext as the last command in your call:
-%%# You can pass it an argument which describes the action that
-%%# you want to do *after* gobbling the next token ("*" in the above example)
-%%# from the token stream. Thus
-%%#
-%%# \toolboxGobbleNext{cmd}
-%%#
-%%# erases the token following that command from the token stream and
-%%# then executes cmd. This is similar to
-%%# \def\toolboxGobbleNext#1#2{#1}
-%%# with the difference that #2 is considered as a token and that no spaces
-%%# are eaten.
-%%# The effect is that e.g. the call
-%%#
-%%# Example:
-%%# \toolboxGobbleNext{\foo}{{arg}
-%%# is the same as \foo{arg} (the brace "{" is eaten in this example).
-
-%%# As described earlier, the commands "\futurelet" or "\toolboxFuturelet" can
-%%# be used to check for optional flags. Frequently you will only want
-%%# to test for one particular flag and decide the next action on this flag.
-%%# Of course, you can test the token found with \ifx...\f", but this has the
-%%# disadvantage that some tokens (e.g. \fi) follow your action, which might
-%%# be bad (recall that e.g. \toolboxGobbleNext must be the last command of
-%%# your action, i.e. it would in the above examples not gobble the "*" but
-%%# the "\fi" which is probably not what you want).
-%%# The simplest solution is to use the command \toolboxIfNextToken which
-%%# already has the test included. For example, to test for an optional "[",
-%%# you can simply write
-%%#
-%%# \def\MacroWithOptionalBrace{\toolboxIfNextToken[{\yes}{\no}}
-%%#
-%%# and then the call "\MacroWithOptionalBrace[...]" will expand to "\yes[...]"
-%%# while "\MacroWithOptionalBrace x" will expand to "\no x"
-%%# (note that the brace is not gobbled - if you want the latter,
-%%# use "\toolboxIfNextGobbling" described below).
-
-%%# More precisely, the calling syntax of "\toolboxIfNextToken" is
-%%#
-%%# \toolboxIfNextToken{token}{IfPart}{ElsePart}
-%%#
-%%# The semantic is the following:
-%%# If the token following this command is `token', then IfPart is executed,
-%%# otherwise ElsePart. It is explicitly admissible that `token' is a space.
-%%# To support further tests, \toolboxToken is \let to the token which follows
-%%# the command. \toolboxToken is only a temporary token, i.e.
-%%# it may also be modified by other commands of this package; in particular,
-%%# you may also freely to modify \toolboxToken.
-%%# The token \toolboxSpaceToken which is described later may be handy
-%%# in connection with this command.
-%%#
-%%# In contrast to similar LaTeX2e macros much care has been taken
-%%# that spaces are not eaten. This solves the following problem:
-%%#
-%%# Assume that you want to write a macro which should have the calling syntax
-%%# "\mymacro{arg1}" or "\mymacro{arg1}[arg2]". You will probably implement
-%%# \mymacro to read the first argument and then to look whether the next
-%%# token is a "[". If you use the LaTeX2e macro to test for "[",
-%%# then all spaces until the next non-space token would be gobbled which means
-%%# that if you would use the LaTeX2e macros for the test, then the call
-%%# "\mymacro{arg1} Text" would behave like "\mymacro{arg1}Text",
-%%# i.e. the space is `mysteriously' lost. With the "toolbox" macros this
-%%# does not happen. The `disadvantage' is that "\mymacro{arg1} [arg2]"
-%%# is not the same as "\mymacro{arg1}[arg2]" (which is reasonable IMHO).
-%%#
-%%# Example:
-%%#
-%%# \def\mycmd#1{\toolboxIfNextToken[{\ParseOpt{#1}}{\NoOpt{#1}}}
-%%# \def\ParseOpt#1[#2]{\OptAtEnd{#1}{#2}}
-%%#
-%%# After the above definition, \mycmd{arg} executes \NoOpt{arg} while
-%%# \mycmd{arg}[optional] executes \OptAtEnd{arg}{optional}
-%%# We point out once more that in the first call a space following
-%%# \mycmd{arg} does not vanish (as would be the case if the LaTeX 2e macros
-%%# would have been used).
-
-%%# If \toolboxIfNextToken has found the required token, it does *not*
-%%# gobble that token from the token stream. Of course, you can do this by
-%%# yourself using the earlier described macro \toolboxGobbleNext. However,
-%%# it is simpler to use
-%%#
-%%# \toolboxIfNextGobbling{token}{IfPart}{ElsePart}
-%%#
-%%# This command is analogous to \toolboxIfNextToken with the difference that
-%%# in the case that the next token is the desired token, it is gobbled before
-%%# IfPart is executed.
-%%#
-%%# Example:
-%%#
-%%# \def\myloop{\toolboxIfNextGobbling*\toolboxTokenLoop\toolboxLoop}
-%%#
-%%# This makes \myloop*... behave like \toolboxTokenLoop, and
-%%# \myloop... (without *) behave like \toolboxLoop.
-
-%%# The following macro is one which you may want to use in connection with
-%%# LaTeX 2e optional arguments:
-%%#
-%%# \toolboxIfEmpty{arg}{IfPart}{ElsePart}
-%%#
-%%# The argument is not expand; it is only used to decide whether the
-%%# {IfPart} or the {ElsePart} will be expanded.
-%%# For further tests there are more involved macros:
-%%#
-%%# \toolboxIfx{arg}\macro{IfPart}{ElsePart}
-%%#
-%%# This tests via \ifx whether \def\Macro{arg} would give the definition
-%%# of \macro.
-%%#
-%%# \toolboxIfX{arga}{argb}{IfPart}{ElsePart}
-%%#
-%%# This tests whether "arga" and "argb" are the same token sequences.
-%%# If you want to avoid the \else and \fi commands to avoid certain side
-%%# effects, you can use instead:
-%%#
-%%# \toolboxIfElse{ifcmd}{IfPart}{ElsePart}
-%%#
-%%# This is rather analogous to "ifcmd" IfPart \else ElsePart \fi
-%%# but has everything in this line already eliminated from the tokenlist
-%%# when IfPart resp. ElsePart are expanded.
-
-%%#
-%%# Loops over tokenlists and itemlists
-%%# -----------------------------------
-
-%%# \toolboxLoop{items}{action}
-%%#
-%%# This calls iteratively "action{#1}", where #1 runs over each item in the
-%%# argument items. Here, an item is either a token or a group braced by {...}.
-%%# In the latter case, the braces are lost. Spaces in items are ignored
-%%# (unless they are braced). It is admissible that \action is not a single
-%%# macro but instead a sequence of tokens.
-%%# Examples follow below.
-%%#
-%%# The counterintuitive order of arguments is explained by the fact that the
-%%# typical usage is
-%%# \expandafter\toolboxLoop\expandafter{\MacroExpandingToItems}{action}
-%%# which for swapped order of arguments could hardly be written.
-
-%%# \toolboxLoop is not reentrant i.e. "action" may not expand
-%%# to something which contains a call to \toolboxLoop. To enable such calls
-%%# anyway, the command
-%%#
-%%# \toolboxLoopName{name}{items}{\action}
-%%#
-%%# is provided which is analogous to \toolboxLoop. This is also not reentrant,
-%%# but in contrast to \toolboxLoop, calls with different `name' arguments can
-%%# be used independently of each other, i.e. in the `action' part of a
-%%# \toolboxLoop (or \toolboxLoopName) can be a call to \toolboxLoopName with
-%%# a *different* `name'.
-%%# In particular, using a counter in `name' one could easily implement
-%%# even recursive calls. In this connection, it should be noted that
-%%# `name' is expanded via \csname ... \endcsname, and so you may use
-%%# constructs like \the\namecounter there.
-
-%%# \toolboxTokenLoop{tokens}{\action}
-%%#
-%%# This is similar to \toolboxLoop: The command \action\toolboxToken
-%%# is executed iteratively where \toolboxToken runs over each token in tokens.
-%%# The important difference is that \toolboxToken is a token (instead of an
-%%# item). In particular, \toolboxToken runs through every single token
-%%# including spaces and braces.
-%%# The token \toolboxSpaceToken which is described later may be handy
-%%# in connection with this command.
-%%#
-%%# Example:
-%%#
-%%# \toolboxTokenLoop{Some text}{\kern0.1em}
-%%#
-%%# is the similar to "\kern0.1em S\kern0.1em o\kern0.1em m...", i.e. you
-%%# get wider spacing between the letters of "Some text" (I do not claim that
-%%# this is typographically a good idea).
-%%#
-%%# Note that you do not have to take special care about the space.
-%%# With \toolboxLoop, you would have to mask the space e.g. with
-%%#
-%%# \toolboxLoop{Some{ }text}{\kern0.1em} or
-%%# \toolboxLoop{Some\toolboxSpace text}{\kern0.1em}
-%%#
-%%# In contrast, \toolboxTokenLoop would behave differently here:
-%%#
-%%# \toolboxTokenLoop{Some{ }text}{\kern0.1em}
-%%#
-%%# would produce \kern0.1em S...\kern0.1em{\kern0.1em <space>\kern0.1em}...
-%%# because the braces are simply considered as tokens.
-
-%%# \toolboxTokenLoop is not reentrant. Analogously to \toolboxLoopName,
-%%# independent versions can be generated by
-%%#
-%%# \toolboxTokenName{name}{tokens}{\action}
-
-%%#
-%%# Controlled expansion
-%%# --------------------
-
-%%# There are some occasions when you want more control over the expansion.
-%%# E.g. you might want to concatenate the contents of two macros to a
-%%# further macro or you want to expand a macro by one level but no full
-%%# expansion. Usually you can get this effects with \expandafter, but if
-%%# you expand several concatenated tokens in this way you either have to
-%%# write a lot of \expandafter's or you have to define subsidiary macros
-%%# that help you to \expandafter certain parts of macros. The macros in
-%%# this section allow you to do this in the most generic way that I could
-%%# implement.
-
-%%# \toolboxDef\macrotodefine{argumentlist}
-%%#
-%%# This call is similar to
-%%# \def\macrotodefine{argumentlist}
-%%# with two important differences:
-%%#
-%%# For \toolboxDef, the argumentlist is expanded precisely by one level.
-%%# argumentlist may not contain macros with parameters, and spaces on the
-%%# highest level are ignored. If you want to force a space on a particular
-%%# place, use the macro \toolboxSpace at this place
-%%# (which is described later). Contrary to the usual \def, the symbol # is
-%%# treated as a usual symbol.
-%%#
-%%# Example of usage:
-%%# \toolboxDef\chain{\chain\toolboxSpace\after}
-%%# This modifies the macro \chain such that a space and the content of the
-%%# macro \after is appended at the end.
-
-%%# \toolboxAppend\macrotodefine{arglist}
-%%#
-%%# This is equivalent to \toolboxDef\macrotodefine{\macrotodefine arglist}
-%%#
-
-%%# \toolboxSurround{ContentBefore}{ContentAfter}\macro
-%%#
-%%# This redefines \macro such that ContentBefore is put at the beginning
-%%# and ContentAfter after the definition of \macro. So this is equivalent to
-%%# \def\macro{ContentBefore * ContentAfter}
-%%# where * is the old content of \macro. It is required that \macro is a
-%%# usual macro without any arguments. If you want to patch more complicated
-%%# macros, use the patch.doc package instead.
-%%# The order of the arguments may appear strange, but it is convenient if
-%%# ContentBefore or ContentAfter are macros which should be expanded with
-%%# \expandafter.
-
-%%# There is some subsidiary macro used in the implementation of the above
-%%# macros which might be useful also in some other situations:
-%%#
-%%# \toolboxTokDef{argumentlist}\macrotodefine
-%%#
-%%# This call is similar to
-%%# \def\macrotodefine{argumentlist}
-%%# with the difference that the symbol # is stored as such.
-%%# The order of the arguments has been swapped in order to simplify the
-%%# application of \expandafter to the argumentlist.
-
-%%#
-%%# Searching, splitting, and replacing
-%%# ----------------------------------
-
-%%# \toolboxSplitAt{argument}{search}{\beforestring}{\afterstring}
-%%#
-%%# Here, \beforestring and \afterstring are arbitrary macro names,
-%%# and search and argument are any sequences of tokens (which are in
-%%# the following considered as `strings').
-%%#
-%%# This call scans the string `argument' for the first occurrence of `search'.
-%%# The macros \beforestring and \afterstring are defined correspondingly
-%%# such that \beforestring expands to the part before the first occurrence,
-%%# and \afterstring to the part following the first occurrence.
-%%# If `search' does not occur in `argument', \beforestring is defined to
-%%# `argument', and \afterstring is \let \undefined.
-%%#
-%%# If \beforestring or \afterstring had already been defined before the
-%%# call, the previous definition is tacitly overridden.
-%%# It is explicitly allowed that \beforestring and \afterstring are the
-%%# same names. In this case, the result has the meaning of \afterstring.
-%%#
-%%# It is guaranteed that braces {...} are *not* lost in `argument'.
-%%# However, `search' may not contain any braces, and `argument' may contain
-%%# only matching pairs of braces. Moreover, occurrences of `search' within a
-%%# pair of braces in `argument' are not recognized.
-%%#
-%%# (The order of the arguments has been chosen in order to simplify the
-%%# use of \expandafter).
-%%#
-%%# There are some restrictions for the strings in search. For example,
-%%# the symbol '#' is not allowed.
-%%#
-%%# In the above call, the arguments may not run over several paragraphs.
-%%# If you want the latter, you have to use the alternative call
-%%#
-%%# \toolboxSplitAt*{argument}{search}{\beforestring}{\afterstring}
-%%#
-%%# Example of usage:
-%%#
-%%# \def\examplemacro#1{\toolboxSplitAt{#1}{@}\testme\testme
-%%# \ifx\testme\undefined
-%%# ... (do this when #1 contains no `@' token)
-%%# \fi}
-%%#
-
-%%# \toolboxMakeSplit{search}{command}
-%%#
-%%# If \toolboxSplitAt should be used several times with the same search
-%%# string, it is much more effective to use the above call: This call
-%%# defines a new macro \command (the name is determined by the second argument
-%%# of \toolboxMakeSplit) which can be called in the form
-%%#
-%%# \command{argument}{\beforestring}{\afterstring}
-%%#
-%%# and which has the analogous meaning as \toolboxSplitAt (the argument
-%%# {search} is implicitly fixed and taken from the call of
-%%# \toolboxMakeSplit).
-%%# It is explicitly admissible that the above macro \toolboxMakeSplit is
-%%# used with an already existing command name. In this case, the previous
-%%# definition of \command is tacitly overridden.
-%%#
-%%# The command created by \toolboxMakeSplit does not accept arguments which
-%%# run over several paragraphs. If you want the latter, you have to create
-%%# this command by the alternative call
-%%#
-%%# \toolboxMakeSplit*{search}{command}
-
-%%#
-%%# The command
-%%# \toolboxFreeSplit{command}
-%%# frees the memory used by a previous \toolboxMakeSplit (and lets \command
-%%# again be undefined).
-
-%%# The command
-%%# \toolboxReplace{search}{replace}\macro
-%%# replaces in \macro all occurences of {search} by {replace}.
-%%# The same matches are found as in \toolboxSplitAt.
-%%# If you need to search for the same text several times, it is faster
-%%# to use the command
-%%# \toolboxReplaceSplit{replace}\SplitCmd\macro
-%%# where \SplitCmd is a command previously generated with \toolboxMakeSplit*
-%%# according to your search string. (You could also use \toolboxMakeSplit
-%%# to generate \SplitCmd, but then \macro should not contain any \par's).
-
-%%#
-%%# Redefinition of macros
-%%# ----------------------
-
-%%# \toolboxMakeHarmless{\macro}
-%%#
-%%# The above call redefines \macro such that it expands to an ASCII text
-%%# containing the previous definition of \macro (i.e. the catcodes of \macro
-%%# are changed).
-
-%%# \toolboxDropBrace\variable
-%%#
-%%# drops possible outer braces in \variable. More precisely,
-%%# if \variable expands to {content}, then \variable is redefined to
-%%# content (without braces). Otherwise, nothing happens.
-
-%%#
-%%# \toolboxIf\comparison{DefinitionCommand}{\macro}...
-%%#
-%%# The above command allows conditional definitions.
-%%# Here, {DefinitionCommand} is either \def, {\long\def}, \let, or some
-%%# similar command like the LaTeX \newcommand. If the test
-%%# \ifx\comparison\macro evaluates positive, then \macro is defined
-%%# correspondingly. Otherwise, \macro is not changed.
-%%#
-%%# Examples:
-%%#
-%%# \toolboxIf\undefined\def\macro{....}
-%%# \toolboxIf\undefined\let\macro...
-%%# \toolboxIf\undefined{\long\def}\macro{....}
-%%# \toolboxIf\undefined\newcommand{\macro}{....}
-%%#
-%%# are similar to \def\macro{...} resp. \let\macro... resp.
-%%# \long\def\macro{...} resp. \newcommand{\macro}{...} with the difference
-%%# that \macro is not changed if it was already defined.
-%%# In this sense, \toolboxIf is a more flexible variant of \providecommand.
-%%#
-
-%%# \toolboxNewiftrue{name} or \toolboxNewiffalse{name}
-%%#
-%%# If the command \ifname was already introduced with \newif, then
-%%# nothing happens. Otherwise \ifname is introduced similarly to
-%%# \newif\ifname and set to `true' respectively `false'.
-%%# In contrast to the corresponding command in TeX or LaTeX 2.09, this macro
-%%# is not \outer!
-
-%%# \toolboxNewifTrue{name} or \toolboxNewifFalse{name}
-%%#
-%%# are similar to \toolboxNewiftrue{name} and \toolboxNewiffalse{name},
-%%# respectively, with the difference that \ifname is set unconditionally
-%%# to `true' respectively `false'.
-
-%%#
-%%# Concatenated macro names
-%%# ------------------------
-
-%%# \toolboxLet\variable{macroname}
-%%#
-%%# The above command is analogous to \let\variable\macroname with the
-%%# difference that macroname can also contain other tokens like numbers
-%%# (it is obtained via \csname). Some converse to this command is
-%%#
-%%# \toolboxWithNr {number}\cmd{macro}
-%%#
-%%# which translates into \cmd\macronumber (here, `macro' and `number'
-%%# are just concatenated and evaluated via \csname).
-%%# Examples:
-%%# \toolboxWithNr 1\let{name}\toolboxEmpty
-%%# This is the same as \let\name1\toolboxEmpty
-%%# (but such that \name1 is considered as a name, not as \name 1)
-%%# \toolboxWithNr {10}\def{name}{Foo}
-%%# This corresponds analogously to \def\name10{Foo}.
-%%# \toolboxLet \mymacro{name\the\mycount}
-%%# This is similar to \let\mymacro\namexx where xx is the content
-%%# of the counter \mycount.
-
-%%#
-%%# Various
-%%# -------
-
-%%# The following macros have equivalents in most formats (like LaTeX2e).
-%%# However, we do not want to rely too much on these formats, so we provide
-%%# our own definitions.
-%%# The macro
-%%# \toolboxEmpty
-%%# expands to nothing (usually, this is the same as \empty).
-%%# Similarly, the macro
-%%# \toolboxSpace
-%%# expands to a space symbol (usually, this is the same as \space).
-%%# The token
-%%# \toolboxSpaceToken
-%%# is \let a space token (usually, this is the same as \@sptoken).
-%%# This token is convenient in tests of tokens
-%%# (because it is hard to get a space there which is not eaten by the TeX
-%%# parser, although sometimes also constructions like
-%%# \expandafter\ifx\toolboxSpace\token can be used).
-%%# Also the macros
-%%# \toolboxFirstOfTwo
-%%# \toolboxSecondOfTwo
-%%# are provided which read two arguments and return only the first
-%%# respectively second argument (usually, this is the same as
-%%# \@firstoftwo respectively \@secondoftwo). Similarly,
-%%# \toolboxGobbleArg{argument}
-%%# just reads its argument and expands to nothing.
-
-\endinput
-%%
-%% End of file `toolbox.txt'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texdef/INSTALL new/texmf-dist/doc/support/texdef/INSTALL
--- old/texmf-dist/doc/support/texdef/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/texdef/INSTALL 2016-11-25 19:30:50.000000000 +0100
@@ -0,0 +1,59 @@
+Installation
+============
+
+Requirements
+------------
+
+The `texdef` program is a Perl script which needs a Perl interpreter to work.
+Informations about installing Perl can be found at http://www.perl.org/get.html.
+
+The script calls a TeX compiler (tex, latex, ...) to display the definition of commands/macros.
+Therefore (La)TeX must also be installed.
+Informations about installing (La)TeX can be found at http://www.latex-project.org/ftp.html.
+
+
+Location
+--------
+
+For installation the script 'texdef.pl' must simply be copied to a location suitable for executables,
+i.e. a directory in the PATHi, e.g. '/usr/bin' or '/usr/local/bin' for Linux/Unix.
+
+The script should be set as "executable", i.e. 'chmod +x texdef.pl' for Linux/Unix.
+This is not required for MS Windows.
+
+
+Name
+----
+
+This script can show the definitions of commands with different flavours of TeX
+(tex, etex, latex, pdftex, pdfetex, pdflatex, xetex, xelatex, context, ...).
+The flavour can be given using an command line option or over the _script name_,
+i.e. if the script is called 'texdef' it will use 'tex', but called 'latexdef'
+it will use 'latex' and so on.
+The script can be simply copied several times, but creating _symbolic links_
+to the real script is enough on operation systems / file systems which support
+this.
+
+At least the two variations 'texdef' and 'latexdef' should be installed.
+
+
+Quick Install Nodes for Linux/Unix
+----------------------------------
+
+ cp texdef.pl /usr/local/bin/
+ cd /usr/local/bin
+ ln -s texdef.pl texdef
+ ln -s texdef.pl latexdef
+ ln -s texdef.pl etexdef
+ ln -s texdef.pl luatexdef
+ ln -s texdef.pl lualatexdef
+ ln -s texdef.pl pdftexdef
+ ln -s texdef.pl pdflatexdef
+ ln -s texdef.pl xetexdef
+ ln -s texdef.pl xelatexdef
+ ln -s texdef.pl 'some other TeX flavour of your choice'
+
+or use the Makefile (defaults to `/usr/local/bin`)
+
+ make install INSTALLDIR=/your/path
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texdef/README new/texmf-dist/doc/support/texdef/README
--- old/texmf-dist/doc/support/texdef/README 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/texdef/README 2016-11-25 19:30:50.000000000 +0100
@@ -0,0 +1,88 @@
+texdef -- Show definitions of TeX commands
+Version 1.7b -- 2012/05/15
+Copyright (C) 2011-2012 Martin Scharrer
+This program comes with ABSOLUTELY NO WARRANTY;
+This is free software, and you are welcome to redistribute it under certain conditions;
+
+Usage:
+ texdef [options] commandname [commandname ...]
+ latexdef [options] commandname [commandname ...]
+
+Other program names are possible. See the 'tex' option. Command names do not need to start with `\`.
+
+Options:
+ --tex <format>, -t <format> : Use given format of TeX: 'tex', 'latex', 'context'.
+ Variations of 'tex' and 'latex', like 'luatex', 'lualatex', 'xetex', 'xelatex' are supported.
+ The default is given by the used program name: 'texdef' -> 'tex', 'latexdef' -> 'latex', etc.
+ --source, -s : Try to show the original source code of the command definition (L).
+ --value, -v : Show value of command instead (i.e. \the\command).
+ --Environment, -E : Every command name is taken as an environment name. This will show the definition of
+ both \Macro\foo and \Macro\endfoo if \texttt{foo} is used as command name (L).
+ --preamble, -P : Show definition of the command inside the preamble.
+ --beforeclass, -B : Show definition of the command before \documentclass.
+ --package <pkg>, -p <pkg> : (M) Load given tex-file, package or module depending on whether '*tex', '*latex'
+ or 'context' is used. For LaTeX the <pkg> can start with `[<options>]` and end
+ with `<pkgname>` or `{<pkgname>}`.
+ --class <class>, -c <class> : (LaTeX only) Load given class instead of default ('article').
+ The <class> can start with `[<classs options>]` and end
+ with `<classname>` or `{<classname>}`.
+ --environment <env>, -e <env> : (M) Show definition inside the given environment <env>.
+ --othercode <code>, -o <code> : (M) Add other code into the preamble before the definition is shown.
+ This can be used to e.g. load PGF/TikZ libraries.
+ --before <code>, -b <code> : (M) Place <code> before definition is shown.
+ The <code> can be arbitray TeX code and doesn't need be be balanced.
+ --after <code>, -a <code> : (M) Place <code> after definition is shown.
+ The <code> can be arbitray TeX code and doesn't need be be balanced.
+ --find, -f : Find file where the command sequence was defined (L).
+ --Find, -F : Show full filepath of the file where the command sequence was defined (L).
+ --list, -l : List user level command sequences of the given packages (L).
+ --list-defs, -L : List user level command sequences and their shorten definitions of the given packages (L).
+ --list-all, -ll : List all command sequences of the given packages (L).
+ --list-defs-all, -LL : List all command sequences and their shorten definitions of the given packages (L).
+ --ignore-cmds , -i : Ignore the following command sequence(s) in the above lists. (M)
+ --ignore-regex , -I : Ignore all command sequences in the above lists which match the given Perl regular expression(s). (M)
+ --pgf-keys, -k : Takes commands as pgfkeys and displays their definitions. Keys must use the full path but the common '.\@cmd' prefix is applied.
+ --pgf-Keys, -K : Takes commands as pgfkeys and displays their definitions. Keys must use the full path.
+ --version, -V : If used alone prints version of this script.
+ (L) Together with -p or -c prints version of LaTeX package(s) or class, respectively.
+ --edit : Opens the file holding the macro definition. Uses --Find and --source. (L)
+ If the source definition can not be found the definition is printed as normal instead.
+ --editor <editor> : Can be used to set the used editor. If not used the environment variables TEXDEF_EDITOR, EDITOR and
+ SELECTED_EDITOR are read in this order. If none of these are set a list of default
+ editors are tried. The <editor> string can include '%f' for the filename, '%n' for
+ the line number and '%%' for a literal '%'. If no '%' is used '+%n %f' is added to
+ the given command.
+ --tempdir <directory> : Use given existing directory for temporary files.
+ --help, -h : Print this help and quit.
+
+ Long option can be shorten as long the are still unique. Short options can be combined.
+ If the option 'environment', 'before' and 'after' are used toegether the
+ produced code will be inserted in the given order (reversed order for 'after').
+ (M) = This option can be given multiple times.
+ (L) = LaTeX only. Requires the packages 'filehook' and 'currfile'.
+
+Examples:
+Show the definition of '\chapter' with different classes ('article' (default), 'book' and 'scrbook'):
+
+ latexdef chapter
+ latexdef -c book chapter
+ latexdef -c scrbook chapter
+
+Show value of `\textwidth` with different class options:
+
+ latexdef -c [a4paper]{book} -v paperwidth
+ latexdef -c [letter]{book} -v paperwidth
+
+Show definition of TikZ's '\draw' outside and inside a 'tikzpicture' environment:
+
+ latexdef -p tikz draw
+ latexdef -p tikz --env tikzpicture draw
+
+Show definition of TikZ's '\draw' inside a node, inside a 'beamer' frame in 'handout' mode:
+
+ latexdef -c [handout]beamer -p tikz --env frame --env tikzpicture -b '\node {' -a '};' draw
+
+List all user level command sequences (macros) defined by the 'xspace' LaTeX package:
+
+ latexdef -l -p xspace
+
Binary files old/texmf-dist/doc/support/texdef/texdef.pdf and new/texmf-dist/doc/support/texdef/texdef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdef.doc.tlpobj new/tlpkg/tlpobj/texdef.doc.tlpobj
--- old/tlpkg/tlpobj/texdef.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/texdef.doc.tlpobj 2017-04-14 18:01:56.000000000 +0200
@@ -0,0 +1,8 @@
+name texdef.doc
+category Package
+revision 26420
+shortdesc doc files of texdef
+docfiles size=64
+ texmf-dist/doc/support/texdef/INSTALL
+ texmf-dist/doc/support/texdef/README
+ texmf-dist/doc/support/texdef/texdef.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/toolbox.doc.tlpobj new/tlpkg/tlpobj/toolbox.doc.tlpobj
--- old/tlpkg/tlpobj/toolbox.doc.tlpobj 2016-04-14 19:53:29.000000000 +0200
+++ new/tlpkg/tlpobj/toolbox.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-name toolbox.doc
-category Package
-revision 32260
-shortdesc doc files of toolbox
-relocated 1
-docfiles size=49
- RELOC/doc/latex/toolbox/README
- RELOC/doc/latex/toolbox/toolbox.pdf
- RELOC/doc/latex/toolbox/toolbox.tex
- RELOC/doc/latex/toolbox/toolbox.txt
++++++ toolbox.doc.tar.xz -> texdef.tar.xz ++++++
++++ 1823 lines of diff (skipped)
++++++ toolbox.doc.tar.xz -> texdoc.tar.xz ++++++
++++ 36421 lines of diff (skipped)
++++++ texdoc_cnf.dif ++++++
---
texmf-dist/texdoc/texdoc.cnf | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- texmf-dist/texdoc/texdoc.cnf
+++ texmf-dist/texdoc/texdoc.cnf 2010-11-12 11:46:52.320054617 +0000
@@ -61,8 +61,11 @@
# For each "ext" in zipext_list, you must define a "unzip_ext" unzipper.
# The unzipped data must be printed on stdout. Example:
#
-# zipext_list = gz
-# unzip_gz = gzip -d -c
+zipext_list = gz, bz2, xz, lzma
+unzip_gz = gzip -d -c
+unzip_bz2 = bzip2 -d -c
+unzip_xz = xz -d -c
+unzip_lzma = lzma -d -c
## User interaction
++++++ texdraw_info.dif ++++++
---
texmf-dist/doc/info/texdraw.info | 5 +++++
1 file changed, 5 insertions(+)
--- texmf-dist/doc/info/texdraw.info
+++ texmf-dist/doc/info/texdraw.info 2016-06-09 12:09:59.736660763 +0000
@@ -14,6 +14,11 @@ this manual under the conditions for ver
entire resulting derived work is distributed under the terms of a
permission notice identical to this one.
+INFO-DIR-SECTION TeX
+START-INFO-DIR-ENTRY
+* TeXdraw: (texdraw). TeX commands for drawing.
+END-INFO-DIR-ENTRY
+
File: texdraw, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
++++++ texinfo.tar.xz ++++++
++++ 2367 lines of diff (skipped)
++++++ texlive-common.doc.tar.xz ++++++
Binary files old/doc/texlive/texlive-common/install-lnx-main.png and new/doc/texlive/texlive-common/install-lnx-main.png differ
Binary files old/doc/texlive/texlive-common/stdcoll.png and new/doc/texlive/texlive-common/stdcoll.png differ
Binary files old/doc/texlive/texlive-common/tlmgr-general-options.png and new/doc/texlive/texlive-common/tlmgr-general-options.png differ
Binary files old/doc/texlive/texlive-common/tlmgr-gui.png and new/doc/texlive/texlive-common/tlmgr-gui.png differ
Binary files old/doc/texlive/texlive-common/tray-menu.png and new/doc/texlive/texlive-common/tray-menu.png differ
Binary files old/doc/texlive/texlive-common/wizard-w32.png and new/doc/texlive/texlive-common/wizard-w32.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-common.doc.tlpobj new/tlpkg/tlpobj/texlive-common.doc.tlpobj
--- old/tlpkg/tlpobj/texlive-common.doc.tlpobj 2016-04-23 03:19:39.000000000 +0200
+++ new/tlpkg/tlpobj/texlive-common.doc.tlpobj 2017-05-05 02:06:57.000000000 +0200
@@ -1,9 +1,9 @@
name texlive-common.doc
category TLCore
-revision 40682
+revision 44191
shortdesc doc files of texlive-common
relocated 1
-docfiles size=93
+docfiles size=69
RELOC/doc/texlive/index.html
RELOC/doc/texlive/texlive-common/examples/ex5.tex
RELOC/doc/texlive/texlive-common/examples/ex6.tex
++++++ texlive-cz.doc.tar.xz ++++++
++++ 6739 lines of diff (skipped)
++++++ texlive-de.doc.tar.xz ++++++
++++ 15410 lines of diff (skipped)
++++++ texlive-en.doc.tar.xz ++++++
++++ 15173 lines of diff (skipped)
++++++ texlive-es.doc.tar.xz ++++++
++++ 6558 lines of diff (skipped)
++++++ texlive-fr.doc.tar.xz ++++++
++++ 10078 lines of diff (skipped)
++++++ texlive-it.doc.tar.xz ++++++
++++ 7115 lines of diff (skipped)
++++++ texlive-pl.doc.tar.xz ++++++
++++ 7860 lines of diff (skipped)
++++++ texlive-ru.doc.tar.xz ++++++
++++ 6262 lines of diff (skipped)
++++++ texlive-sr.doc.tar.xz ++++++
++++ 9088 lines of diff (skipped)
++++++ texlive-zh-cn.doc.tar.xz ++++++
Binary files old/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf and new/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex
--- old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2016-05-11 16:44:20.000000000 +0200
+++ new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2017-05-14 06:56:21.000000000 +0200
@@ -1,7 +1,7 @@
% $Id$
% TeX Live documentation. Originally written by Sebastian Rahtz and
% Michel Goossens, now maintained by Karl Berry and others.
-% Translated by Jjgod Jiang ,
+% Translated by Jiang Jiang ,
% Jinsong Zhao ,
% Yue Wang
% Helin Gai
@@ -13,22 +13,18 @@
\usepackage{tex-live-zh-cn, indentfirst}
\title{%
- {\huge \textit{\TeX\ Live 指南---2016}}%
+ {\huge \textit{\TeX\ Live 指南---2017}}%
}
\author{Karl Berry 编写 \\[3mm]
\url{http://tug.org/texlive/}
}
-\date{2016 年 6 月}
+\date{2017 年 5 月}
\begin{document}
\maketitle
-\begin{center}
-今年的 \TeX\ Live 谨献给我们不幸离世的同事 Sebastian Rahtz 和 Peter Breitenlohner。
-\end{center}
-
\begin{multicols}{2}
\tableofcontents
%\listoftables
@@ -37,7 +33,7 @@
\section{简介}
\label{sec:intro}
-\subsection{\TeX\ Live 与 \TeX\ Collection}
+\subsection{\protect\TeX\protect\ Live 与 \protect\TeX\protect\ Collection}
本文档描述 \TL{} 软件的主要功能和特性,\TL{} 是 \TeX{} 及其相关程序在
GNU/Linux 及其他类 Unix 系统、\MacOSX\ 和 Windows
@@ -63,8 +59,8 @@
\MacOSX{}、和 Cygwin。它还包含了源代码,可供在没有提
供可执行文件的平台上编译安装。
-至于 Windows,\TL{} 仅支持 Windows Vista 或后续版本。
-Windows~XP 和 2000 可能可以继续工作。我们没有包含 64 位的 Windows
+至于 Windows,\TL{} 仅支持 Windows~7 或后续版本。
+Windows Vista, Windows~XP 和 2000 可能可以继续工作。我们没有包含 64 位的 Windows
可执行文件,不过 32 位的可执行文件也能 64 位的系统上正常运行。
除了 \TL{} 以外,Windows 和 \MacOSX 用户还有其它的选择,请参考
@@ -160,7 +156,8 @@
这个小节描述的是 \TL{} 的内容,以及包含 \TL{} 的 \TK{}。
-\subsection{\TL, pro\TeX{}t, Mac\TeX\ 的大集合:\TK}
+\subsection{\protect\TeX\protect\ Collection: \protect\TL,
+ pro\protect\TeX{}t, Mac\protect\TeX}
\label{sec:tl-coll-dists}
\TK{} 的 \DVD{} 包含了以下内容:
@@ -184,7 +181,7 @@
\CTAN{} 和 \pkgname{protext} 并不一定遵循 \TL{} 的版权协议,因此在分发或修改时要
格外地小心。
-\subsection{\TL{} 的顶层目录}
+\subsection{\protect\TL{} 的顶层目录}
\label{sec:tld}
这里是 \TL{} 发行版顶层目录的一个简短的列表和描述。
@@ -241,7 +238,8 @@
所有这些目录树,包括个人的,都应该遵循 \TeX\ 目录结构 (\TDS,
\url{http://tug.org/tds}),包括其中所有细小的子目录,否则文件就
可能找不到。第 \ref{sec:local-personal-macros} 节 (第
-\pageref{sec:local-personal-macros} 页) 有更详细的介绍。
+\pageref{sec:local-personal-macros} 页) 有更详细的介绍。这里描述的顺序和搜索的
+优先级相反,也就是说,列在更靠后的目录树会被更优先搜索。
\begin{ttdescription}
\item [TEXMFDIST] 这个目录树包含几乎所有原有发行版本的文件——配置文件、脚本、宏
@@ -249,17 +247,17 @@
录下。
\item [TEXMFLOCAL] 系统管理员用来安装供整个系统使用的额外的或更新过的宏包、字体
的目录。
-\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。
-这个变量根据不同的用户选择不同的主目录。
-\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap+、和 \verb+fmtutil+
-这些程序存储个人修改过的配置文件。
+\item [TEXMFSYSVAR] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和
+\verb+fmtutil-sys+ 还有 \verb+tlmgr+ 这几个命令存储、缓存运行时使用的格式文件和
+生成的 map 文件,对整个系统都有效。
\item [TEXMFSYSCONFIG] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和
\verb+fmtutil-sys+ 这些程序存储修改过的全局文件.
+\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。
+这个变量根据不同的用户选择不同的主目录。
\item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap+ 和
\verb+fmtutil+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。
-\item [TEXMFSYSVAR] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和
-\verb+fmtutil-sys+ 还有 \verb+tlmgr+ 这几个命令存储、缓存运行时使用的格式文件和
-生成的 map 文件,对整个系统都有效。
+\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap+、和 \verb+fmtutil+
+这些程序存储个人修改过的配置文件。
\item [TEXMFCACHE] \ConTeXt\ MkIV 和 Lua\LaTeX\ 用来保存 (缓存的) 运行时
数据的目录树;缺省为 \code{TEXMFSYSVAR},如果该目录不可写,则使用
\code{TEXMFVAR}。
@@ -270,14 +268,14 @@
\begin{description}
\item[全系统根目录] 可以包含多个 \TL{} 版本:
\begin{ttdescription}
- \item[2015] 上一个版本。
- \item[2016] 当前版本。
+ \item[2016] 上一个版本。
+ \item[2017] 当前版本。
\begin{ttdescription}
\item [bin] ~
\begin{ttdescription}
\item [i386-linux] \GNU/Linux 二进制文件
\item [...]
- \item [universal-darwin] \MacOSX\ 二进制文件
+ \item [x86\_64-darwin] \MacOSX\ 二进制文件
\item [win32] Windows 二进制文件
\end{ttdescription}
\item [texmf-dist\ \ ] \envname{TEXMFDIST} 和 \envname{TEXMFMAIN}
@@ -289,8 +287,8 @@
\item[用户主 (home) 目录] (\texttt{\$HOME} 或
\texttt{\%USERPROFILE\%})
\begin{ttdescription}
- \item[.texlive2015] 给上个版本的,个人生成和配置的数据。
- \item[.texlive2016] 给这个版本的,个人生成和配置的数据。
+ \item[.texlive2016] 给上个版本的,个人生成和配置的数据。
+ \item[.texlive2017] 给这个版本的,个人生成和配置的数据。
\begin{ttdescription}
\item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE}
\item [texmf-config] \envname{TEXMFCONFIG}
@@ -505,23 +503,23 @@
\begin{figure}[tb]
\begin{boxedverbatim}
-Installing TeX Live 2016 from: ...
-Platform: i386-linux => 'GNU/Linux on Intel x86'
+Installing TeX Live 2017 from: ...
+Platform: x86_64-linux => 'GNU/Linux on x86_64'
Distribution: inst (compressed)
Directory for temporary files: /tmp
...
- Detected platform: GNU/Linux on Intel x86
+ Detected platform: GNU/Linux on Intel x86_64
- <B> platforms: 1 out of 17
+ <B> platforms: 1 out of 19
<S> Set installation scheme (scheme-full)
<C> customizing installation collections
- 47 collections out of 48, disk space required: 4268 MB
+ 40 collections out of 41, disk space required: 4900 MB
<D> directories:
TEXDIR (the main TeX directory):
- /usr/local/texlive/2016
+ /usr/local/texlive/2017
...
<O> options:
@@ -531,6 +529,7 @@
Actions:
<I> start installation to hard disk
+ <P> save installation profile to 'texlive.profile' and exit
<H> help
<Q> quit
\end{boxedverbatim}
@@ -610,21 +609,23 @@
===============================================================================
a [ ] Cygwin on Intel x86 (i386-cygwin)
b [ ] Cygwin on x86_64 (x86_64-cygwin)
- c [ ] MacOSX/Darwin universal binaries (universal-darwin)
- d [ ] MacOSX/Darwin on x86_64 (x86_64-darwin)
- e [ ] FreeBSD on x86_64 (amd64-freebsd)
- f [ ] FreeBSD on Intel x86 (i386-freebsd)
- g [ ] GNU/Linux on ARM (armel-linux)
- h [ ] GNU/Linux on ARMhf (armhf-linux)
- i [X] GNU/Linux on Intel x86 (i386-linux)
- j [ ] GNU/Linux on PowerPC (powerpc-linux)
- k [ ] GNU/Linux on x86_64 (x86_64-linux)
- l [ ] NetBSD on x86_64 (amd64-netbsd)
- m [ ] NetBSD on Intel x86 (i386-netbsd)
- o [ ] Solaris on Intel x86 (i386-solaris)
- p [ ] Solaris on Sparc (sparc-solaris)
- s [ ] Solaris on x86_64 (x86_64-solaris)
- t [ ] Windows (win32)
+ c [ ] MacOSX legacy (10.5-10.6) on Intel x86 (i386-darwin)
+ d [ ] MacOSX legacy (10.5) on PowerPC (powerpc-darwin)
+ e [ ] MacOSX current on x86_64 (x86_64-darwin)
+ f [ ] MacOSX legacy (10.6-10.9) on x86_64 (x86_64-darwinlegacy)
+ g [ ] FreeBSD on x86_64 (amd64-freebsd)
+ h [ ] FreeBSD on Intel x86 (i386-freebsd)
+ i [ ] GNU/Linux on ARM (armel-linux)
+ j [ ] GNU/Linux on ARMhf (armhf-linux)
+ k [ ] GNU/Linux on Intel x86 (i386-linux)
+ l [ ] GNU/Linux on PowerPC (powerpc-linux)
+ m [X] GNU/Linux on x86_64 (x86_64-linux)
+ o [ ] NetBSD on x86_64 (amd64-netbsd)
+ p [ ] NetBSD on Intel x86 (i386-netbsd)
+ s [ ] Solaris on Intel x86 (i386-solaris)
+ t [ ] Solaris on Sparc (sparc-solaris)
+ u [ ] Solaris on x86_64 (x86_64-solaris)
+ v [ ] Windows (win32)
\end{boxedverbatim}
\caption{Binaries (二进制程序) 菜单}\label{fig:bin-text}
\end{figure}
@@ -648,8 +649,8 @@
e [ ] minimal scheme (plain only)
f [ ] ConTeXt scheme
g [ ] GUST TeX Live scheme
- h [ ] teTeX scheme (more than medium, but nowhere near full)
- i [ ] XML scheme
+ h [ ] infrastructure-only scheme (no TeX at all)
+ i [ ] teTeX scheme (more than medium, but nowhere near full)
j [ ] custom selection of collections
\end{boxedverbatim}
\caption{Scheme (安装方案) 菜单}\label{fig:scheme-text}
@@ -684,8 +685,8 @@
缺省的目录布局在第~\ref{sec:texmftrees}~节有过叙述,见
第~\pageref{sec:texmftrees}~页。在 Unix 下默认的安装目录是
-\dirname{/usr/local/texlive/2016} 而 Windows 下是
-|%SystemDrive%\texlive\2016|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
+\dirname{/usr/local/texlive/2017} 而 Windows 下是
+|%SystemDrive%\texlive\2017|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
发行版本一个,你可以通过修改搜索路径来在它们中间切换。
这个安装路径可以通过设置安装程序中的 \dirname{TEXDIR} 来修改。这个选项和其他选项
@@ -699,7 +700,7 @@
在线版本) 以了解完整的列表和更多的信息。
一个合理的选择是你自己主目录下的一个子目录,尤其在只有你一个人
-使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2016|'。
+使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2017|'。
我们建议在目录名称中保留年份,这样可以让你保留多个不同版本的
\TL{}。(你可能希望还维护一个类似 \dirname{/usr/local/texlive-cur}
@@ -762,16 +763,18 @@
成。这样每次二进制文件或者断字模式更新的时候,这些格式文件也得不
到更新,所以可能会导致它们的不兼容。
-\item[install font/macro \ldots\ tree:] 忽略下载安装大部分宏包中的文档和源代码文
-件。不建议使用。
+\item[install font/macro \ldots\ tree:] 下载安装大部分宏包中的文档和源代码文
+件。建议选择。
\item[create symlinks in standard directories:]
这个选项 (只对 Unix 有效的) 可以省下设定环境变量的步骤。如果
没有选择它,就必须把 \TL{} 的对应目录添加到 \envname{PATH},
\envname{MANPATH} 和 \envname{INFOPATH} 中。如果要创建符号链
-接,你需要对这些目标目录的写权限。我们强烈建议不要\emph{不要}
-用这个命令来覆盖现有的 \TeX\ 系统,它主要是为了在用户已知的
-标准目录中创建符号链接设计的,这些目录并不包含任何 \TeX\ 文件。
+接,你需要对这些目标目录的写权限。这个选项是为了在用户已知的
+标准目录中创建符号链接设计的,比如 \dirname{/usr/local/bin},
+这些目录并不包含任何 \TeX\ 文件。不要用这个选项来覆盖系统中
+现有的文件,比如给它指定系统目录。最保险和推荐的做法还是不要
+选择这个选项。
\item[after installation \ldots\ \CTAN:] 从 \DVD\ 安装时,这个选项
被缺省启用,因为通常你会希望在此后通过 \CTAN\ 安装一年内更新的软件
@@ -781,7 +784,24 @@
第~\ref{sec:dvd-install-net-updates}~节。
\end{description}
-如果所有的设置已经齐备,你就可以按下 `I' 来开始安装了。安装完成后,
+Windows 专有的选项,在高级 Perl/Tk 界面中显示有:
+\begin{description}
+\item[adjust PATH setting in registry] 保证所有程序都可以在它们的
+搜索路径中找到 \TL{} 程序目录。
+
+\item[add menu shortcuts] 如果选择了,它会在开始菜单中创建一个 \TL{}
+子菜单。除了 `TeX Live menu' 和 `No shortcuts' 之外,还有 `Launcher entry'
+这个选项。这个选项在第 \ref{sec:sharedinstall} 节有详细叙述。
+
+\item[change file associations] The options are `Only new' (create
+ file associations, but do not overwrite existing ones), `All' and
+ `None'.
+
+\item[install \TeX{}works front end]
+\end{description}
+
+如果所有的设置已经齐备,你就可以在文本界面中按下 `I',或者图形界面
+中按下 `Install TeX Live' 按钮来开始安装了。安装完成后,
你可以跳至第~\ref{sec:postinstall}~节来了解还需要做些什么工作。
\subsection{install-tl 命令行选项}
@@ -878,18 +898,18 @@
这样:
\begin{sverbatim}
-PATH=/usr/local/texlive/2016/bin/i386-linux:$PATH; export PATH
-MANPATH=/usr/local/texlive/2016/texmf-dist/doc/man:$MANPATH; export MANPATH
-INFOPATH=/usr/local/texlive/2016/texmf-dist/doc/info:$INFOPATH; export INFOPATH
+PATH=/usr/local/texlive/2017/bin/i386-linux:$PATH; export PATH
+MANPATH=/usr/local/texlive/2017/texmf-dist/doc/man:$MANPATH; export MANPATH
+INFOPATH=/usr/local/texlive/2017/texmf-dist/doc/info:$INFOPATH; export INFOPATH
\end{sverbatim}
对于 csh 或者 tcsh,需要修改的文件通常是 \filename{$HOME/.cshrc},而
应该添加的内容类似:
\begin{sverbatim}
-setenv PATH /usr/local/texlive/2016/bin/i386-linux:$PATH
-setenv MANPATH /usr/local/texlive/2016/texmf-dist/doc/man:$MANPATH
-setenv INFOPATH /usr/local/texlive/2016/texmf-dist/doc/info:$INFOPATH
+setenv PATH /usr/local/texlive/2017/bin/i386-linux:$PATH
+setenv MANPATH /usr/local/texlive/2017/texmf-dist/doc/man:$MANPATH
+setenv INFOPATH /usr/local/texlive/2017/texmf-dist/doc/info:$INFOPATH
\end{sverbatim}
如果你已经在你的配置文件里写过了这样的路径设置,那就只需要
@@ -906,8 +926,8 @@
这个文件是否存在,如果有的话,添加下面这样的内容:
\begin{sverbatim}
-MANPATH_MAP /usr/local/texlive/2016/bin/i386-linux \
- /usr/local/texlive/2016/texmf-dist/doc/man
+MANPATH_MAP /usr/local/texlive/2017/bin/i386-linux \
+ /usr/local/texlive/2017/texmf-dist/doc/man
\end{sverbatim}
然后 2)~检查 \filename{/etc/environment} 是否定义了默认的搜索路径
@@ -936,15 +956,16 @@
列表中自己指定一个 \CTAN\ 镜像。使用与上述一致的 \dirname{tlnet}
子目录路径。
-\subsubsection{\XeTeX{} 和 Lua\TeX{} 的系统字体配置}
+\subsubsection{\protect\XeTeX\protect\ 和 Lua\protect\TeX 的系统字体配置}
\label{sec:font-conf-sys}
\XeTeX\ 和 Lua\TeX\ 可以使用任何系统安装的字体,而不只是 \TeX\ 目录树
中的那些。它们使用类似但不完全一致的方式实现这一功能。
-在 Windows 和 \MacOSX\ 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用。
-但如果你在其他 Unix 系统中安装了 \filename{xetex} 软件包,则需要把系
-统配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。
+在 Windows 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用,只要通过字体名称就可以了。
+在 \MacOSX\ 下如果需要按字体名称查找则需要额外的步骤,参见 Mac\TeX\ 网页
+(\url{http://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex}
+软件包,需要把系统按如下配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。
为了进行配置,\pkgname{xetex} 安装后 (不管是初始安装还是后来安装的) 都会在
\filename{TEXMFSYSVAR/fonts/conf/texlive-fontconfig.conf} 创建一个
@@ -969,7 +990,7 @@
你可以运行 \code{fc-list} 来查看系统字体的名称。命令
\code{fc-list : family style file spacing} 可以列出一些有趣的信息。
-\subsubsection{\ConTeXt{} Mark IV}
+\subsubsection{\protect\ConTeXt{} Mark IV}
\label{sec:context-mkiv}
“旧”的 \ConTeXt{} (Mark II) 和“新的” \ConTeXt{} (Mark IV)
@@ -985,7 +1006,7 @@
\end{sverbatim}
来刷新 \ConTeXt{} 磁盘缓存数据。
生成的文件会被保存在 \code{TEXMFCACHE} 目录下,在 \TL{} 中这个目录
-的默认值是 \verb+TEXMSYSVAR;TEXMFVAR+。
+的默认值是 \verb+TEXMFSYSVAR;TEXMFVAR+。
\ConTeXt\ MkIV 会读取 \verb+TEXMFCACHE+ 提到的所有路径,
并写入第一个可写东风路径。在读取时,最后找到的匹配会被优先选择。
@@ -1114,7 +1135,8 @@
\cmdname{gv} 和 \cmdname{xpdf} 现在都不包含在 \TL{} 中,你
必须单独安装它们。请分别参阅 \url{http://www.gnu.org/software/gv} 和
\url{http://www.foolabs.com/xpdf}。(还有许多其他的 PDF 查看器。)
-Windows 下我们推荐 Sumatra PDF (\url{http://blog.kowalczyk.info/software/sumatrapdf})。
+Windows 下我们推荐 Sumatra PDF
+(\url{https://www.sumatrapdfreader.org/free-pdf-reader.html})。
\item 除 \filename{sample2e.tex} 外可能会对你有用的标准测试文件:
@@ -1151,7 +1173,7 @@
这里是一些你可能会考虑安装的其他工具的链接。
\begin{description}
-\item[Ghostscript] \url{http://www.cs.wisc.edu/~ghost/}
+\item[Ghostscript] \url{https://ghostscript.com/}
\item[Perl] \url{http://www.perl.org/} 与 CPAN 中的补充包,
\url{http://www.cpan.org/}
\item[ImageMagick] \url{http://www.imagemagick.com}, 用于图形处理和转换
@@ -1160,17 +1182,17 @@
\item[面向 \TeX\ 的编辑器] 有很广泛的选择,一般依用户个人的口味而定。这
里按字典序列出了一些 (部分是 Windows 才有的)。
\begin{itemize*}
- \item \cmdname{GNU Emacs} 在 Windows 下的原生版本在
- \url{http://www.gnu.org/software/emacs/windows/ntemacs.html}。
+ \item \cmdname{GNU Emacs} 在 Windows 下也有原生版本,参见
+ \url{http://www.gnu.org/software/emacs/emacs.html}。
\item \cmdname{Emacs 的 Auc\TeX\ 包} 的 Windows 版本在 \CTAN\ 提供。
AuC\TeX\ 的主页在 \url{http://www.gnu.org/software/auctex}。
- \item \cmdname{LEd} 在 \url{http://mirror.ctan.org/support/LEd} 提供。
+ \item \cmdname{LEd} 在 \url{http://www.latexeditor.org/} 提供。
\item \cmdname{SciTE} 在
\url{http://www.scintilla.org/SciTE.html} 提供。
\item \cmdname{Texmaker} 是自由软件,在
\url{http://www.xm1math.net/texmaker} 提供。
\item \cmdname{TeXstudio} 是 \cmdname{Texmaker} 的一个
- fork,引入了额外的功能;\url{http://texstudio.sourceforge.net}。
+ fork,引入了额外的功能;\url{http://texstudio.org}。
\item \cmdname{TeXnicCenter} 是自由软件,在
\url{http://www.texniccenter.org} 提供,也随 pro\TeX{}t
发行版附带。
@@ -1193,8 +1215,8 @@
\subsection{用户共享 (或跨机器) 安装}
\label{sec:sharedinstall}
-\TL{} 的设计可以使它在同一个系统的不同的用户间共享,或者可以在网络上不
-同的系统间共享。在标准的目录结构下,不需要配置固定的绝对路径:\TL{} 程
+\TL{} 的设计可以使它在同一个网络中的不同的系统间共享。在标准的
+目录结构下,不需要配置固定的绝对路径:\TL{} 程
序所需要的文件都能通过都在这些程序自身的相对路径找到。你可以在
\filename{$TEXMFDIST/web2c/texmf.cnf} 配置文件中看到实际的处理,
它包含了类似下面的内容:
@@ -1203,22 +1225,19 @@
...
TEXMFDIST = $TEXMFROOT/texmf-dist
...
-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
+TEXMFLOCAL = $SELFAUTOGRANDPARENT/../texmf-local
\end{verbatim}
这就意味着,其它的系统或用户只需要把 \TL{} 的可执行文件的位置添加到其
系统的搜索路径中就可以使用了。
同理,你也可以先把 \TL{} 安装在本地,然后再把整个安装目录转移到网络上。
-至于 Windows,可以在 \url{http://tug.org/texlive/w32client.html}
-下载到一个叫 \filename{tlaunch} 的启动程序。它的主窗口的菜单和按钮包括许多
-\TeX\ 相关功能的程序和文档。
-
-首次使用时,它会修改 \TL\ 的搜索路径并创建一些文件关联。它还会创建一个开始
-菜单项目来取消这些配置,在这个启动器自身的菜单里也有这个选项。
-
-所有这些配置都是在一个 ini 文件里设置的。你可以自己编辑这个文件来添加比如
-SumatraPDF 或者某个 \LaTeX\ 编辑器的信息。参见上述网站获得更多的信息。
+至于 Windows,\TL{} 包含了一个叫 \filename{tlaunch} 的启动程序。它的主
+窗口的菜单和按钮包括许多 \TeX\ 相关功能的程序和文档,还可以通过 \code{ini}
+定制。首次使用时,它会进行一些 Windows 专有的安装后设置,比如给当前用户
+修改搜索路径并创建文件关联。因此,在局域网络中可以访问到 \TL{} 的工作站
+只需要启动器的快捷菜单就够了。参见 \code{tlaunch} 手册 (\code{texdoc tlaunch},
+或 \url{https://ctan.org/pkg/tlaunch})。
\htmlanchor{tlportable}
\section{便携 (\USB{}) 安装}
@@ -1230,8 +1249,10 @@
后复制到 \USB{} 盘上。
要使用这样的便携安装来运行 \TeX{},你必须将对应的二进制目录加入终端
-的搜索路径,如往常一样。在 Windows 下,你可以双击安装根目录下的
-\filename{tl-tray-menu} 来选择执行一些常见任务,如这个截图所示:
+的搜索路径,如往常一样。
+
+在 Windows 下,你可以双击安装根目录下的 \filename{tl-tray-menu}
+来创建一个临时的启动栏菜单,以选择执行一些常见任务,如这个截图所示:
\medskip
\tlpng{tray-menu}{4cm}
@@ -1239,49 +1260,6 @@
\noindent `More\ldots' 项目解释了如何定制这个菜单。
-\htmlanchor{tlisoinstall}
-\subsection{\ISO\ (或 \DVD) 安装}
-\label{sec:isoinstall}
-
-如果你不需要经常更新或者修改安装,或者有其他可以使用 \TL{} 的系统,
-创建一个 \TL{} 安装的 \ISO\ 可能会比较方便,因为:
-
-\begin{itemize}
-\item 在不同计算机之间复制 \ISO\ 要比复制普通安装快得多。
-\item 如果你双启动不同的操作系统而且希望它们共享一个
- \TL{} 的安装,\ISO\ 安装不会受不同文件系统支持
- (FAT32, NTFS, HFS+) 的限制。
-\item 虚拟机可以直接挂载这样的 \ISO{}。
-\end{itemize}
-
-当然你还可以把 \ISO\ 刻录到 \DVD{} 上,如果有用的话。
-
-桌面 \GNU/Linux/Unix 系统,包括 \MacOSX{},都能够挂载 \ISO{}。Windows 8 是第一个
-(!) 支持这个功能的 Windows 版本。此外,没有任何与普通硬盘安装不同的地方,参见第
-\ref{sec:env} 节。
-
-在准备这样的 \ISO\ 安装时,最好忽略发布年份的子目录,并让 \filename{texmf-local}
-处在和其他目录树 (\filename{texmf-dist}, \filename{texmf-var} 等) 同级。
-你可以在安装程序的普通目录选项中设置这些。
-
-对于一个物理的 (而不是虚拟的) Windows 系统,你可以将 \ISO\ 刻录在
-DVD 上,不过花点时间在免费的 \ISO\ 挂载工具上是值得的,比如
-\url{http://wincdemu.sysprogs.org/} 的 WinCDEmu。
-
-至于 Windows 系统集成,你可以包含第~\ref{sec:sharedinstall} 节描述的
-\filename{w32client} 脚本 (在 \url{http://tug.org/texlive/w32client.html}),
-它在 \ISO\ 里和在网络安装时一样好用。
-
-在 \MacOSX{},如果符号链接 \filename{/usr/texbin} 指向对应的二进制目录,
-TeXShop 会使用 DVD 安装,比如:
-\begin{verbatim}
-sudo ln -s /Volumes/MyTeXLive/bin/universal-darwin /usr/texbin
-\end{verbatim}
-
-历史说明:\TL{} 2010 是第一个不支持“live”发布的 \TL{} 版本,但要在
-\DVD\ 或者 \ISO\ 上执行一直是需要一定技巧的,尤其是必须设置一些环境
-变量。如果你从现有的安装创建 \ISO\ 就不需要了。
-
\htmlanchor{tlmgr}
\section{\cmdname{tlmgr}: 管理你的安装}
\label{sec:tlmgr}
@@ -1371,12 +1349,12 @@
install: xetex-def
...
running mktexlsr
-mktexlsr: Updating /usr/local/texlive/2016/texmf-dist/ls-R...
+mktexlsr: Updating /usr/local/texlive/2017/texmf-dist/ls-R...
...
running fmtutil-sys --missing
...
Transcript written on xelatex.log.
-fmtutil: /usr/local/texlive/2016/texmf-var/web2c/xetex/xelatex.fmt installed.
+fmtutil: /usr/local/texlive/2017/texmf-var/web2c/xetex/xelatex.fmt installed.
\end{fverbatim}
如你所见,\prog{tlmgr} 会安装所有依赖的包,也会处理所有包括刷新文件名
@@ -1429,6 +1407,8 @@
格式的本地磁盘时是这样的。
\end{description}
+另外,另一种方式可以参见 \filename{tlaunch}, 在第~\ref{sec:sharedinstall} 节有描述。
+
\subsection{Windows 上附加的软件}
为了使安装更加完整,\TL{} 需要支持那些 Windows 机器上不常见的软件包。
@@ -1475,7 +1455,7 @@
\label{sec:winhome}
Windows 下对应于 Unix 下的主目录的是 \verb|%USERPROFILE%|。
-在 Windows XP 下,它通常位于
+在 Windows Vista 和以后的系统下,它通常位于
\verb|C:\Documents and Settings\<username>|;
在 Windows Vista 和之后的版本下是 \verb|C:\Users\<username>|。通常情况下,在
\filename{texmf.cnf} 文件和 \KPS{} 中,\verb|~| 在 Windows 和 Unix 下均可以
@@ -1621,17 +1601,6 @@
数据库 (见第~\pageref{sec:filename-database}~页的``文件名数据库'') 存在,也就是说,
是否有数据库正好对应着 \var{p} 的一个前缀。如果存在,就在数据库中寻找符合的路径后缀。
-要是没有这种数据库存在、又或者所有的数据库都不能和指定的路径前缀匹配上、再或者找到的数
-据库里没有进一步的匹配,就要搜索文件系统了 (前提是我们没在路径前加上 \samp{!!} ,又
-或者搜索时就指定了这是一次``必定存在 (must exist)''型的搜索方式)。此时 \KPS{} 将
-根据路径元素构建一个需要检查的目录列表,逐个尝试这些目录,试图找到指定的文件。
-
-搜索 \samp{.vf} 文件和 \TeX{} 用 \cs{openin} 命令读入的文件时,会指定``文件必
-定存在 (must exist)''这个选项。而有些文件 (比如 \file{cmr10.vf}) 可能不存在,
-花费时间在磁盘上对它进行搜索是不值得的。因此,如果你安装了新的 \samp{.vf} 文件后没有
-更新 \file{ls-R},那这个文件将永远找不到。搜索时会优先在数据库寻找,然后再去搜索磁盘。
-一旦找到了就立即停止搜索,返回结果。
-
尽管最简单也最常见的路径元素是目录名称,\KPS{} 搜索的路径里还是可以使用其他额外功能的:
多层默认值,环境变量名称、配置文件值、用户主目录,以及递归式子目录查找。所以我们把 \KPS{}
将搜索路径变换为一个或多个基本目录名的过程称为\emph{展开}路径元素的过程。展开的方式
@@ -1676,16 +1645,16 @@
而这个 \file{texmf.cnf} 存放的路径则是在 \envname{TEXMFCNF} 变量里定义的,
但我们不建议设置这个 (或者任何) 环境变量。
-作为代替,标准的安装将产生文件 \file{.../2016/texmf.cnf}。如果你必须修改缺省
+作为代替,标准的安装将产生文件 \file{.../2017/texmf.cnf}。如果你必须修改缺省
值 (一般不需要),这是修改的地方。主配置文件是
-\file{.../2016/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
+\file{.../2017/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
新后会丢失修改。
搜索路径里\emph{所有的} \file{texmf.cnf} 文件都会被读入,而先读入的优先级更高。
比如搜索路径是 \verb|.:$TEXMF|,那么文件 \file{./texmf.cnf} 里面的值要比
\verb|$TEXMF/texmf.cnf| 里边的优先。
-\begin{itemize}
+\begin{itemize*}
\item
以 \code{\%} 表示单行注释。
\item
@@ -1712,7 +1681,7 @@
\file{texmf.cnf},这会很有用。
\item
在读入所有定义后再开始展开,所以你可以引用后边才定义的变量。
-\end{itemize}
+\end{itemize*}
展示上面所有内容的一段配置文件
\ifSingleColumn
如下:
@@ -2058,16 +2027,6 @@
\centering
\input{examples/ex6a.tex}
\caption{寻找配置文件}\label{fig:dvipsdbga}
-
-\bigskip
-
-\input{examples/ex6b.tex}
-\caption{寻找 prolog 文件}\label{fig:dvipsdbgb}
-
-\bigskip
-
-\input{examples/ex6c.tex}
-\caption{寻找字体文件}\label{fig:dvipsdbgc}
\end{figure*}
\cmdname{dvips} 启动后就开始搜寻其需要使用的文件。首先找到的是 \file{texmf.cnf},
@@ -2194,7 +2153,7 @@
版本,年复一年。Eitan 于 2009 年 6 月过早地离开了我们,我们希望把这份文档
献给它,以志纪念。
-\item Hans Hagen,他对 \ConTeXt\ 格式 (\url{http://pragma-ade.com}) 做了
+\item Hans Hagen,他对 \ConTeXt\ 宏包 (\url{http://pragma-ade.com}) 做了
许多测试和修改,使之能够包含在 \TL{} 的框架下。
\item \Thanh, Martin Schr\"oder,和 pdf\TeX\ 团队,他们持续不断地改进 \TeX\
@@ -2257,8 +2216,8 @@
\item Vladimir Volovich,他很大地帮助解决了许多移植和维护的问题,尤其是令我们能够
将 \cmdname{xindy} 包含进来。
-\item Staszek Wawrykiewicz,\TL{} 主要的测试人员,同时还是许多重要波兰语支持的协调
-人员:字体、Windows 安装,和其他许多工作。
+\item Staszek Wawrykiewicz,\TL{} 的一个主要的测试人员,同时还是许多重要波兰语
+支持的协调人员:字体、Windows 安装,和其他许多工作。
\item Olaf Weber,他在以前几年对 \Webc{} 耐心的维护。
@@ -2269,16 +2228,18 @@
\end{itemize*}
二进制版本的编译者:
-Ettore Aldrovandi (\pkgname{i386-solaris}, \pkgname{x86\_64-solaris}),
Marc Baudoin (\pkgname{amd64-netbsd}, \pkgname{i386-netbsd}),
Karl Berry (\pkgname{i386-linux}),
Ken Brown (\pkgname{i386-cygwin}, \pkgname{x86\_64-cygwin}),
Simon Dales (\pkgname{armhf-linux}),
Akira Kakuto (\pkgname{win32}),
-Dick Koch (\pkgname{universal-darwin}, \pkgname{x86\_64-darwin}),
+Dick Koch (\pkgname{x86\_64-darwin}),
Nikola Le\v{c}i\'c (\pkgname{amd64-freebsd}, \pkgname{i386-freebsd}),
-Mojca Miklavec (\pkgname{mipsel-linux}, \pkgname{sparc-solaris}),
-Norbert Preining (\pkgname{alpha-linux}, \pkgname{x86\_64-linux}),
+Mojca Miklavec (\pkgname{i386-darwin}, \pkgname{powerpc-darwin},
+ \pkgname{x86\_64-darwinlegacy},
+ \pkgname{i386-solaris}, \pkgname{x86\_64-solaris},
+ \pkgname{sparc-solaris}),
+Norbert Preining (\pkgname{x86\_64-linux}),
Thomas Schmitz (\pkgname{powerpc-linux}),
Boris Veytsman (\pkgname{armel-linux}).
关于 \TL{} 编译进程的信息,请查阅 \url{http://tug.org/texlive/build.html}。
@@ -2320,8 +2281,8 @@
\texttt{texconfig} 脚本的辅助下,基于标准的 \Webc{} 来制作第二版的 \CD{}。
第 3 版的 \CD{} 基于 Olaf Weber 完成的 \Webc{} 的一个重大修正版本,7.2。与此同时,
\teTeX{} 的一个新版本出现了,\TL{} 也包含了其中绝大多数特性。第 4 版依照上面的模式进
-行,使用了新版本的 \teTeX{} 和新版本的 \Webc{} (7.3)。系统此时也包括了完整的 Windows
-下的配置。
+行,使用了新版本的 \teTeX{} 和新版本的 \Webc{} (7.3)。感谢 Fabrice Popineau 的帮
+助,系统此时也包括了完整的 Windows 下的配置。
在第 5 版 (2000 年 3 月) 中检查并修正了 \CD{} 的许多部分,更新了数百个软件包。软件
包的详细说明现在存放在 XML 文件中。不过 \TeX\ Live 5 的首要变化还是移除了所有的非自由软
@@ -2780,15 +2741,15 @@
内容,以及其他功能 (见主页)。
\XeTeX\ (见其主页了解更多信息):
-\begin{itemize}
+\begin{itemize*}
\item 使用 HarfBuzz 库替代 ICU 进行字体排版。(仍然使用 ICU 来支持输入编码、双向
排版,以及可选的 Unicode 断行。)
\item 使用 Graphite2 和 HarfBuzz 来替代 SilGraphite 进行 Graphite 排版。
\item 在 Mac 上,使用 Core Text 替代 (Apple 不再建议使用的) ATSUI。
-\item 在名称相同的情况下有限使用 TrueType/OpenType 字体而不是 Type1 字体。
+\item 在名称相同的情况下优先使用 TrueType/OpenType 字体而不是 Type1 字体。
\item 修正偶尔出现的 \XeTeX\ 和 \code{xdvipdfmx} 字体查找不匹配的问题。
\item 支持 OpenType math 间距调整。
-\end{itemize}
+\end{itemize*}
\cmdname{xdvi}: 现在使用 FreeType 替代 \code{t1lib} 进行字体渲染。
@@ -2887,9 +2848,7 @@
部分额外平台提供了定制二进制包 (\url{http://tug.org/texlive/custom-bin.html})。
此外,为节省空间部分平台现在没有在 \DVD\ 中提供,但可以通过网络安装。
-\htmlanchor{news}
-\subsection{当前版本---2016}
-\label{sec:tlcurrent}
+\subsubsection{2016}
Lua\TeX: 原生命令有大量改变,包括重命名和去除,还有一些节点结构的重整。这些修改
在 Han Hagen 的“Lua\TeX\ 0.90 对于 PDF 的后端改变及更多”
@@ -2918,7 +2877,7 @@
\cs{mdfivesum}; 字符分类限制提高到了 4096;DVI 版本提升。
其他实用工具:
-\begin{itemize}
+\begin{itemize*}
\item \code{gregorio} 是一个新的程序,作为 \code{gregoriotex} 宏包的一部分用于
Gregorian 圣歌音乐的排版;它缺省就被包括在了 \code{shell\_escape\_commands}
中。
@@ -2930,17 +2889,74 @@
忽略所有调整。
\item \code{ps2pk} 可以处理扩展 PK/GF 字体了。
-\end{itemize}
+\end{itemize*}
Mac\TeX: 去除了 \TeX\ Distribution Preference Pane;它的功能现在在 TeX Live
Utility 里提供了;更新了捆绑的 GUI 应用;给需要在 Ghostscript 中使用多种 CJK
字体的用户提供了新的 \code{cjk-gs-integrate} 脚本。
基础架构:支持系统级别的 \code{tlmgr} 配置文件;校验包的完整性;如果有 GPG 还会
-校验网络更新的签名。(如果没有 GPG 则跳过这一步。)
+校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。
+(如果没有 GPG 则跳过这一步。)
平台:\code{alpha-linux} 和 \code{mipsel-linux} 被移除了。
+\htmlanchor{news}
+\subsection{当前版本---2017}
+\label{sec:tlcurrent}
+
+Lua\TeX: 更多 callback,更多排版控制,更多对内部机制的控制;在一些平台
+增加了用来动态载入代码的 \code{ffi} 库。
+
+pdf\TeX: 去年的 |SOURCE_DATE_EPOCH_TEX_PRIMITIVES| 环境变量被改名为
+|FORCE_SOURCE_DATE|,没有功能改变。如果 \cs{pdfpageattr} token 列表包含了字符串
+\code{/MediaBox},则会忽略输出默认的 \code{/MediaBox}。
+
+Xe\TeX: Unicode/OpenType 数学支持现在是基于 HarfBuzz 的 MATH table 支持实现的;
+还有一些 bug 修正。
+
+Dvips: 保证最后一次设置的 papersize special 是最后选中的纸张尺寸,和
+\code{dvipdfmx} 以及宏包希望的效果一致;\code{-L0} 选项 (\code{L0}
+配置文件设置) 可以用来恢复以前的行为,也就是第一次设置纸张尺寸的 special
+才有效。
+
+ep\TeX, eup\TeX: 来自 pdf\TeX\ 新的原生命令 \cs{pdfuniformdeviate},
+\cs{pdfnormaldeviate}, \cs{pdfrandomseed}, \cs{pdfsetrandomseed},
+\cs{pdfelapsedtime}, \cs{pdfresettimer}。
+
+Mac\TeX: 从这一年开始,Mac\TeX\ 只支持 Apple 还在发布安全更新的
+\MacOSX\ 版本,使用的平台名称是 |x86_64-darwin|,目前这包括 Yosemite,
+El~Capitan, 和 Sierra (10.10 及以后的)。给更老版本的 \MacOSX\
+用的二进制程序不会包含在 Mac\TeX\ 里面,但 \TeX\ Live 里还会提供
+(|x86_64-darwinlegacy|, \code{i386-darwin}, \code{powerpc-darwin})。
+
+基础架构: \envname{TEXMFLOCAL} 树现在 (默认) 是在 \envname{TEXMFSYSCONFIG} 和
+\envname{TEXMFSYSVAR} 之前搜索了;这是为了更好地符合本地文件优先于系统文件的
+原则。另外,\code{tlmgr} 有一个新的 \code{shell} 模式,进行交互和脚本使用,和
+一个新的 \code{conf auxtrees} 功能来方便添加和删除额外的目录树。
+
+\code{updmap} 和 \code{fmtutil}: 这些脚本如果在没有明确指定是系统模式
+(\code{updmap-sys}, \code{fmtutil-sys}, 或者 \code{-sys} 选项),还是用
+户模式 (\code{updmap-user}, \code{fmtutil-user}, 或者 \code{-user} 选项)
+的时候会给出警告。这是为了减少常见的不小心启用用户模式而导致系统更新无法
+生效。细节请参见 \url{http://tug.org/texlive/scripts-sys-user.html}。
+
+\code{install-tl}: Mac 下的个人路径现在默认设置为和 Mac\TeX\ 一样的
+(|~/Library/...|)。增加了新选项 \code{-init-from-profile} 来以特定
+profile 启动安装;新命令 \code{P} 来直接保存一个 profile;新的 profile
+变量名 (但先前的名字也还支持)。
+
+Sync\TeX: 临时文件现在被改为了 \code{foo.synctex(busy)},而不是
+\code{foo.synctex.gz(busy)} (不再有~\code{.gz})。需要删除临时文
+件的前端和编译系统因此需要调整。
+
+其他工具: \code{texosquery-jre8} 是一个新的跨平台程序,用来在 \TeX\ 文档
+中获取系统 locale 和其他 OS 信息;它已经包含在了 |shell_escape_commands|
+中,可以在受限的 shell 环境中执行。(texosquery 也支持更老的 JRE 版本,但
+不能在受限模式下启用,因为 Oracle 由于安全问题不再支持那些版本了。)
+
+平台:见上述的 Mac\TeX\ 条目。没有其他的变化。
+
\subsection{未来}
\emph{\TL{} 并不完美!} (也永远不会达到完美。) 我们希望继续发行新的
@@ -2985,6 +3001,6 @@
2009 年的简体中文版本由 Jiang Jiang 和 Jinsong Zhao 翻译。
-2010 到 2015 年的简体中文版本都由 Jiang Jiang 翻译。
+2010 到 2017 年的简体中文版本都由 Jiang Jiang 翻译。
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj
--- old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2016-05-12 03:23:45.000000000 +0200
+++ new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2017-05-15 02:07:45.000000000 +0200
@@ -1,9 +1,9 @@
name texlive-zh-cn.doc
category TLCore
-revision 41031
+revision 44333
shortdesc doc files of texlive-zh-cn
relocated 1
-docfiles size=259
+docfiles size=229
RELOC/doc/texlive/texlive-zh-cn/Makefile
RELOC/doc/texlive/texlive-zh-cn/README-live.ZH-CN
RELOC/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty
++++++ texlive.infra.doc.tar.xz ++++++
++++ 3914 lines of diff (skipped)
++++++ texlive.infra.tar.xz ++++++
++++ 6647 lines of diff (skipped)
++++++ texliveonfly.doc.tar.xz ++++++
++++++ texliveonfly.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texliveonfly.tlpobj new/tlpkg/tlpobj/texliveonfly.tlpobj
--- old/tlpkg/tlpobj/texliveonfly.tlpobj 2016-04-14 19:50:24.000000000 +0200
+++ new/tlpkg/tlpobj/texliveonfly.tlpobj 2017-04-14 18:02:10.000000000 +0200
@@ -14,6 +14,6 @@
runfiles size=5
texmf-dist/scripts/texliveonfly/texliveonfly.py
catalogue-ctan /support/texliveonfly
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl3
catalogue-topics distribution
++++++ texloganalyser.doc.tar.xz ++++++
++++++ texloganalyser.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texloganalyser.tlpobj new/tlpkg/tlpobj/texloganalyser.tlpobj
--- old/tlpkg/tlpobj/texloganalyser.tlpobj 2016-04-14 19:50:25.000000000 +0200
+++ new/tlpkg/tlpobj/texloganalyser.tlpobj 2017-04-14 18:02:11.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=3
texmf-dist/scripts/texloganalyser/texloganalyser
catalogue-ctan /support/texloganalyser
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license bsd
catalogue-topics log-manip
catalogue-version 0.9
++++++ texlogos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlogos.tlpobj new/tlpkg/tlpobj/texlogos.tlpobj
--- old/tlpkg/tlpobj/texlogos.tlpobj 2016-04-14 19:50:25.000000000 +0200
+++ new/tlpkg/tlpobj/texlogos.tlpobj 2017-04-14 18:02:11.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/texlogos/texlogos.sty
catalogue-also hologo
catalogue-ctan /macros/latex/contrib/texlogos/texlogos.sty
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics logo
catalogue-version 1.3.1
++++++ texmate.doc.tar.xz ++++++
++++++ texmate.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texmate.tlpobj new/tlpkg/tlpobj/texmate.tlpobj
--- old/tlpkg/tlpobj/texmate.tlpobj 2016-04-14 19:50:26.000000000 +0200
+++ new/tlpkg/tlpobj/texmate.tlpobj 2017-04-14 18:02:11.000000000 +0200
@@ -16,7 +16,7 @@
runfiles size=7
RELOC/tex/latex/texmate/texmate.sty
catalogue-ctan /macros/latex/contrib/texmate
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics games
catalogue-version 2
++++++ texments.doc.tar.xz ++++++
++++++ texments.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texments.tlpobj new/tlpkg/tlpobj/texments.tlpobj
--- old/tlpkg/tlpobj/texments.tlpobj 2016-04-14 19:50:26.000000000 +0200
+++ new/tlpkg/tlpobj/texments.tlpobj 2017-04-14 18:02:11.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/latex/texments/texments.sty
catalogue-also minted verbments
catalogue-ctan /macros/latex/contrib/texments
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics listing
catalogue-version 0.2.0
++++++ texpower.doc.tar.xz ++++++
++++++ texpower.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texpower.tlpobj new/tlpkg/tlpobj/texpower.tlpobj
--- old/tlpkg/tlpobj/texpower.tlpobj 2016-04-14 19:50:27.000000000 +0200
+++ new/tlpkg/tlpobj/texpower.tlpobj 2017-04-14 18:02:12.000000000 +0200
@@ -25,7 +25,7 @@
RELOC/tex/latex/texpower/tpsettings.cfg
catalogue-also prosper beamer
catalogue-ctan /macros/latex/contrib/texpower
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics presentation
catalogue-version 0.2
++++++ texshade.doc.tar.xz ++++++
++++++ texshade.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texshade.tlpobj new/tlpkg/tlpobj/texshade.tlpobj
--- old/tlpkg/tlpobj/texshade.tlpobj 2016-04-14 19:50:29.000000000 +0200
+++ new/tlpkg/tlpobj/texshade.tlpobj 2017-04-14 18:02:14.000000000 +0200
@@ -17,7 +17,7 @@
RELOC/tex/latex/texshade/texshade.def
RELOC/tex/latex/texshade/texshade.sty
catalogue-ctan /macros/latex/contrib/texshade
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl2
catalogue-topics chemistry molbio
catalogue-version 1.24
++++++ texsis.doc.tar.xz ++++++
++++++ texsis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texsis.tlpobj new/tlpkg/tlpobj/texsis.tlpobj
--- old/tlpkg/tlpobj/texsis.tlpobj 2016-04-14 19:50:30.000000000 +0200
+++ new/tlpkg/tlpobj/texsis.tlpobj 2017-04-14 18:02:14.000000000 +0200
@@ -9,7 +9,7 @@
longdesc Simplified control of type sizes, line spacing, footnotes,
longdesc running headlines and footlines, and tables of contents,
longdesc figures and tables; Specialized document formats for research
-longdesc papers, preprints and ``e-prints,'' conference proceedings,
+longdesc papers, preprints and "e-prints", conference proceedings,
longdesc theses, books, referee reports, letters, and memoranda;
longdesc Simplified means of constructing an index for a book or thesis;
longdesc Easy to use double column formatting; Specialized environments
@@ -19,6 +19,11 @@
longdesc physicists, but others may also find it useful. It is
longdesc completely compatible with Plain TeX.
depend tex
+depend cm
+depend hyphen-base
+depend knuth-lib
+depend plain
+depend texsis
depend texsis.ARCH
execute AddFormat name=texsis engine=pdftex options="-translate-file=cp227.tcx texsis.ini" fmttriggers=cm,hyphen-base,knuth-lib,plain,texsis
runfiles size=142
@@ -63,7 +68,7 @@
texmf-dist/tex/texsis/base/twin.txs
texmf-dist/tex/texsis/config/texsis.ini
catalogue-ctan /macros/texsis
-catalogue-date 2016-04-01 09:40:16 +0200
+catalogue-date 2016-10-16 19:36:27 +0200
catalogue-license lppl
catalogue-topics physics format
catalogue-version 2.18
++++++ textcase.doc.tar.xz ++++++
++++++ textcase.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textcase.tlpobj new/tlpkg/tlpobj/textcase.tlpobj
--- old/tlpkg/tlpobj/textcase.tlpobj 2016-04-14 19:50:32.000000000 +0200
+++ new/tlpkg/tlpobj/textcase.tlpobj 2017-04-14 18:02:15.000000000 +0200
@@ -16,6 +16,6 @@
runfiles size=1
RELOC/tex/latex/textcase/textcase.sty
catalogue-ctan /macros/latex/contrib/textcase
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics macro-supp
++++++ textfit.doc.tar.xz ++++++
++++++ textfit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textfit.tlpobj new/tlpkg/tlpobj/textfit.tlpobj
--- old/tlpkg/tlpobj/textfit.tlpobj 2016-04-14 19:50:32.000000000 +0200
+++ new/tlpkg/tlpobj/textfit.tlpobj 2017-04-14 18:02:15.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=2
RELOC/tex/latex/textfit/textfit.sty
catalogue-ctan /macros/latex/contrib/textfit
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics fit-to-size
catalogue-version 5
++++++ textglos.doc.tar.xz ++++++
++++++ textglos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textglos.tlpobj new/tlpkg/tlpobj/textglos.tlpobj
--- old/tlpkg/tlpobj/textglos.tlpobj 2016-04-14 19:50:33.000000000 +0200
+++ new/tlpkg/tlpobj/textglos.tlpobj 2017-04-14 18:02:15.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=1
RELOC/tex/latex/textglos/textglos.sty
catalogue-ctan /macros/latex/contrib/textglos
-catalogue-date 2015-08-12 06:28:09 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics linguistic
catalogue-version 1.0
++++++ textgreek.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textgreek.doc.tlpobj new/tlpkg/tlpobj/textgreek.doc.tlpobj
--- old/tlpkg/tlpobj/textgreek.doc.tlpobj 2016-04-14 19:50:33.000000000 +0200
+++ new/tlpkg/tlpobj/textgreek.doc.tlpobj 2017-05-05 02:06:59.000000000 +0200
@@ -1,6 +1,6 @@
name textgreek.doc
category Package
-revision 24282
+revision 44192
shortdesc doc files of textgreek
relocated 1
docfiles size=136
++++++ textgreek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textgreek.tlpobj new/tlpkg/tlpobj/textgreek.tlpobj
--- old/tlpkg/tlpobj/textgreek.tlpobj 2016-04-14 19:50:33.000000000 +0200
+++ new/tlpkg/tlpobj/textgreek.tlpobj 2017-05-05 02:06:59.000000000 +0200
@@ -1,13 +1,14 @@
name textgreek
category Package
-revision 24282
+revision 44192
shortdesc Upright greek letters in text
relocated 1
longdesc Use upright greek letters as text symbols, e.g. \textbeta.
+depend greek-fontenc
runfiles size=3
RELOC/tex/latex/textgreek/textgreek.sty
catalogue-ctan /macros/latex/contrib/textgreek
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics text-symbol
catalogue-version 0.7
++++++ textmerg.doc.tar.xz ++++++
++++++ textmerg.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textmerg.tlpobj new/tlpkg/tlpobj/textmerg.tlpobj
--- old/tlpkg/tlpobj/textmerg.tlpobj 2016-04-14 19:50:33.000000000 +0200
+++ new/tlpkg/tlpobj/textmerg.tlpobj 2017-04-14 18:02:16.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=2
RELOC/tex/generic/textmerg/textmerg.sty
catalogue-ctan /macros/latex/contrib/textmerg
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics doc-gen
catalogue-version 2.01
++++++ textopo.doc.tar.xz ++++++
++++++ textopo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textopo.tlpobj new/tlpkg/tlpobj/textopo.tlpobj
--- old/tlpkg/tlpobj/textopo.tlpobj 2016-04-14 19:50:34.000000000 +0200
+++ new/tlpkg/tlpobj/textopo.tlpobj 2017-04-14 18:02:16.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/latex/textopo/textopo.def
RELOC/tex/latex/textopo/textopo.sty
catalogue-ctan /macros/latex/contrib/textopo
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics molbio chemistry
catalogue-version 1.5
++++++ textpath.doc.tar.xz ++++++
++++++ textpath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpath.tlpobj new/tlpkg/tlpobj/textpath.tlpobj
--- old/tlpkg/tlpobj/textpath.tlpobj 2016-04-14 19:50:35.000000000 +0200
+++ new/tlpkg/tlpobj/textpath.tlpobj 2017-04-14 18:02:16.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/latex/textpath/textpathmp.sty
catalogue-also pst-text
catalogue-ctan /graphics/metapost/contrib/macros/textpath
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-text
catalogue-version 1.6
++++++ textpos.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/README new/doc/latex/textpos/README
--- old/doc/latex/textpos/README 2014-01-05 00:42:24.000000000 +0100
+++ new/doc/latex/textpos/README 2016-11-25 19:30:15.000000000 +0100
@@ -2,12 +2,12 @@
Textpos: absolute positioning of text on the LaTeX page
-------------------------------------------------------
-Version 1.7j, 2014 January 3
+Version 1.8, 2016 June 7
This package facilitates placing boxes at absolute positions on the
LaTeX page. There are several reasons why this might be useful, but
the main one (or at least my motivating one) is to help produce a
-large-format conference poster.
+large-format conference poster.
This package provides a single environment, plus a starred variant,
which contains the text (or graphics, or table, or whatever) which is
@@ -36,7 +36,7 @@
Licence
-------
-This software is copyright, 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray.
+This software is copyright, 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray.
It is released under the terms of the [LaTeX Project Public License][lppl],
which is included in the file LICENCE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.7j new/doc/latex/textpos/VERSION-1.7j
--- old/doc/latex/textpos/VERSION-1.7j 2014-01-05 00:42:24.000000000 +0100
+++ new/doc/latex/textpos/VERSION-1.7j 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-textpos-1.7j, released 2014 January 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.8 new/doc/latex/textpos/VERSION-1.8
--- old/doc/latex/textpos/VERSION-1.8 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/textpos/VERSION-1.8 2016-11-25 19:30:15.000000000 +0100
@@ -0,0 +1 @@
+textpos-1.8, released 2016 June 7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/README-examples new/doc/latex/textpos/examples/README-examples
--- old/doc/latex/textpos/examples/README-examples 2014-01-05 00:42:24.000000000 +0100
+++ new/doc/latex/textpos/examples/README-examples 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-The t?.tex files in this directory are intended as regression tests,
-rather than strictly as examples. They nonetheless serve to illustrate
-some of what textpos can do.
-
-Not all of them actually work, as regression tests, right now, but
-this is because when comparing binary formats such as .dvi files,
-it's not always completely obvious what counts as a significant
-change. Any comments and suggestions would be welcome.
-
-Norman
-2006 September 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/README.examples new/doc/latex/textpos/examples/README.examples
--- old/doc/latex/textpos/examples/README.examples 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/textpos/examples/README.examples 2016-11-25 19:30:15.000000000 +0100
@@ -0,0 +1,11 @@
+The t?.tex files in this directory are intended as regression tests,
+rather than strictly as examples. They nonetheless serve to illustrate
+some of what textpos can do.
+
+Not all of them actually work, as regression tests, right now, but
+this is because when comparing binary formats such as .dvi files,
+it's not always completely obvious what counts as a significant
+change. Any comments and suggestions would be welcome.
+
+Norman
+2006 September 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t10.tex new/doc/latex/textpos/examples/t10.tex
--- old/doc/latex/textpos/examples/t10.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/textpos/examples/t10.tex 2016-11-25 19:30:15.000000000 +0100
@@ -0,0 +1,46 @@
+%%% Testing:interactions between (x,y)-positioning and \TPMargin
+% See https://bitbucket.org/nxg/textpos/issues/3/
+% Thanks to Richard Schreiber for the report and initial test code.
+
+\documentclass{minimal}
+\usepackage[top=0mm,bottom=0mm,left=0mm,right=0mm,a5paper]{geometry}
+\usepackage{color}
+\usepackage[absolute,showboxes]{textpos}
+
+\parindent0mm
+\begin{document}
+
+\textblockrulecolour{magenta}
+\TPGrid[0mm,0mm]{6}{9}%
+\TPMargin{5mm}%
+
+\null\vskip 4cm
+\noindent \hrule width 2\TPHorizModule
+\smallskip
+\hbox to 2\TPHorizModule{$\leftarrow$\hfil two units wide\hfil $\rightarrow$}
+
+\begin{textblock}{2}(0,0)
+ This box is top-left.
+ The top and left margin lines touch the edge of the page.
+\end{textblock}
+
+\begin{textblock}{2}[0,1](0,9)
+ This box should sit at the bottom left.
+ The box should be two units wide, and the text correspondingly narrower.
+ The bottom and left margin lines should touch the edge of the page.
+\end{textblock}
+
+\TPMargin*{5mm}
+\begin{textblock}{2}[1,0](6,0)
+ This box should sit at the top right of the page, and the text
+ should be two units wide. The top and right margin lines should be
+ off the page.
+\end{textblock}
+
+\TPMargin{0mm}%
+\begin{textblock}{2}[1,1](6,9)
+ This box sits at the bottom right edge.
+ The text and box are two units wide.
+ The bottom and right margin lines touch the edge of the page.
+\end{textblock}
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t6.tex new/doc/latex/textpos/examples/t6.tex
--- old/doc/latex/textpos/examples/t6.tex 2007-04-03 02:15:52.000000000 +0200
+++ new/doc/latex/textpos/examples/t6.tex 2016-11-25 19:30:15.000000000 +0100
@@ -20,15 +20,21 @@
Blue
\end{textblock}
-\begin{textblock}{8}(14,0)
+\begin{textblock}{12}(4,-1)
+ \hrule width 12\TPHorizModule
+ \vbox to 0pt{\hbox{12 units}\vss}
+ \vskip1\TPVertModule
\hrule width 8\TPHorizModule
+ \vbox to 0pt{\hbox{8 units}\vss}
\vskip1\TPVertModule
\hrule width 4\TPHorizModule
+ \vbox to 0pt{\hbox{4 units}\vss}
\vskip1\TPVertModule
\hrule width 2\TPHorizModule
+ \vbox to 0pt{\hbox{2 units}\vss}
\vskip1\TPVertModule
\hrule width 1\TPHorizModule
-\end{textblock}
+\end{textblock}
\begin{textblock}{12}(4,4)
This text is inside a box with a blue background. The text is flush
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t9.tex new/doc/latex/textpos/examples/t9.tex
--- old/doc/latex/textpos/examples/t9.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/textpos/examples/t9.tex 2016-11-25 19:30:15.000000000 +0100
@@ -0,0 +1,67 @@
+%%% Testing: switching between absolute and relative mode
+
+\documentclass{article}
+
+\usepackage[absolute,showboxes]{textpos}
+\setlength{\parindent}{0pt}
+\TPHorizModule=1cm
+\TPVertModule=1cm
+
+\begin{document}
+
+Here is some text, which appears in the body of the page.
+\begin{textblock}{5}(0,0)
+This text is at (0,0), and should appear at the very top-left corner.
+\end{textblock}
+
+Here is more text, which also appears in the body.
+\begin{textblock}{5}(1,1)
+This text is at (1,1), and should appear near the top-left corner, 1cm
+in and down.
+\end{textblock}
+
+\newpage
+\TPoptions{ absolute=false,
+ showboxes = false}
+
+Here is some text, which appears in the body of page two.
+\begin{textblock}{5}(0,0)
+This text is at (0,0), and appears at the top-left of the text block,
+just under `Here is some text'.
+It should not have a box around it.
+\end{textblock}
+
+\vskip4cm
+Here is more text, which also appears in the body of p.2.
+\begin{textblock}{5}(1,1)
+This text is at (1,1), and also appears in the text block 1cm along
+and down from the `Here is more text', and without a surrounding box.
+\end{textblock}
+
+\TPoptions{absolute=true, showboxes=true, showtext=false}
+
+\vskip4cm
+Text. The corresponding text block should appear only as a box, with
+no text inside it. It appears in the top-left corner of the page.
+\begin{textblock}{5}(0,0)
+This text should not appear (just the box, positioned 2cm along and
+down from `Text.'
+\end{textblock}
+
+\TPoptions{absolute=false, showboxes=true, showtext=true}
+
+\vskip4cm
+Text 2.
+\begin{textblock}{5}(6,0)
+This text should appear surrounded by a box, level with, but along from, `Text 2'.
+\end{textblock}
+
+\newpage
+\TPoptions{absolute=true}
+
+Page 3.
+\begin{textblock}{5}(0,0)
+This text appears at the extreme top-left of page three.
+\end{textblock}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos-example.tex new/doc/latex/textpos/textpos-example.tex
--- old/doc/latex/textpos/textpos-example.tex 2014-01-05 00:42:24.000000000 +0100
+++ new/doc/latex/textpos/textpos-example.tex 2016-11-25 19:30:15.000000000 +0100
@@ -7,7 +7,7 @@
%% textpos.dtx (with options: `example')
%% Textpos: absolute positioning of text on the page
%%%% File: textpos.dtx
-%%%% Copyright 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray
+%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,7 +29,7 @@
%%
%% See the file LICENCE for a copy of the LPPL.
%%
-%% Mercurial ident: 41b12ce5565c, 2014-01-03 19:15 +0000
+%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100
%%
\documentclass{article}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos.html new/doc/latex/textpos/textpos.html
--- old/doc/latex/textpos/textpos.html 2014-01-05 00:42:24.000000000 +0100
+++ new/doc/latex/textpos/textpos.html 2016-11-25 19:30:15.000000000 +0100
@@ -1,65 +1,97 @@
<?xml version="1.0"?>
-
<html xmlns="http://www.w3.org/1999/xhtml">
<head profile="http://dublincore.org/documents/dcq-html/">
<title>Textpos</title>
-<meta name='DC.subject' content='latex, textpos, absolute positioning'/>
-<meta name='DC.title' content='Textpos'/>
-<meta name='DC.date' content='2006-8-24'/> <!-- 1.7 release date -->
-<meta name='rcsdate' content='$Date$'/>
-<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
-<link href="http://nxg.me.uk" rev="author"/>
-
+<meta name="DC.subject" content="latex, textpos, absolute positioning"/>
+<meta name="DC.title" content="Textpos"/>
+<meta name="DC.date" content="2016-06-07"/>
+<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/>
+<link href="https://nxg.me.uk/norman" rev="author"/>
+<link type="text/css" rel="stylesheet" href="style.css"/>
</head>
<body>
<h1>Textpos</h1>
<div class="abstract">
<p>Lay out text and graphics at arbitrary positions on the LaTeX page.</p>
-<p>The textpos home page is at <code>http://purl.org/nxg/dist/textpos</code></a>;
+
+<p>
+
+<span class="distpage">The textpos home page is at
+<a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>;</span>
please quote this URL rather than the URL it resolves to.</p>
-<p>Version 1.7j, 2014 January 3.</p>
+<p>Version 1.8, 2016 June 7.</p>
</div>
<p>This package facilitates placing boxes at absolute positions on the
LaTeX page. There are several reasons why this might be useful, but
the main one (or at least my motivating one) is to help produce a
large-format conference poster. Other applications include placing
-material within, say, figures. Textpos is also discussed in the http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos'>TeX FAQ
+material within, say, figures. Textpos is also discussed in the <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos">TeX FAQ
entry on absolute positioning</a>.</p>
<p>This package provides a single environment, which contains the text
(or graphics, or table, or whatever) which is to be placed on the
page, and which specifies where it is to be placed. The environment
-is accompanied by various configuration commands. See the manual (pdf)</a>.</p>
+is accompanied by various configuration commands. See the <a href="textpos.pdf">manual (pdf)</a>.</p>
<p>An article describing Textpos appeared in TUGboat in 2002:
-Norman Gray, <em>Absolute Positioning with Textpos</em>,
+<a href="http://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf">Norman Gray, <em>Absolute Positioning with Textpos</em>,
TUGboat <strong>23</strong> (3/4), pp341–4, 2002.</a></p>
-<p>I have a collection of general advice about http://purl.org/nxg/note/posters" >creating
+<p>I have a collection of general advice about <a href="http://purl.org/nxg/note/posters">creating
conference posters with LaTeX</a>.</p>
<p>Rolf Niepraschk provided me with a wonderful demo
-(<a href="niepraschk-eso-pic.tex" >tex</a>,
-<a href="niepraschk-eso-pic.pdf" >pdf</a>)
+(<a href="niepraschk-eso-pic.tex">tex</a>,
+<a href="niepraschk-eso-pic.pdf">pdf</a>)
of using Textpos along with his <code>eso-pic</code> package,
and the <code>calc</code> package, to produce a grid which can help lay out
material on the page.</p>
<p>The source is held at
-<a href='https://bitbucket.org/nxg/textpos'>bitbucket</a>,
+<a href="https://bitbucket.org/nxg/textpos">bitbucket</a>,
and there is an issues list there, for bug reports.</p>
-<h3>History</h3>
+
+<div class="distpage">
+ <h2>Installation and further information</h2>
+</div>
+
+<ol>
+
+
+
+<li>Run LaTeX on the file <code>textpos.ins</code> – this will
+unpack the style file <code>textpos.sty</code> amongst other files.
+Place this somewhere where TeX can find it.</li>
+
+<li>Run LaTeX on the file <code>textpos.dtx</code> to obtain the
+documentation.</li>
+</ol>
+
+<p class="distpage">The <code>textpos</code> home page is at <a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more up-to-date versions available there.</p>
+
+<p><code>Textpos</code> is also available on CTAN:
+<a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/">/tex-archive/macros/latex/contrib/textpos/</a></p>
+
+
+
+<h2>History</h2>
<dl>
+<dt><strong>1.8, 2016 June 5</strong></dt>
+<dd><ul>
+<li>Added the <code>\TPoptions</code> command, to switch modes on and
+off within the document. Various documentation tweaks.</li>
+<li>The behaviour of <code>\TPMargin</code> and
+<code>\TPMargin*</code> were somewhat underspecified in versions of
+Textpos before v1.8, and in consequence inconsistently implemented.
+This has now been rationalised, but the change <em>may</em> change
+documents which relied on the previous behaviour.
+Thanks to Richard Schreiber for the detailed bug report.</li>
+</ul></dd>
+
<dt>1.7j, 2014 January 3</dt>
<dd>Re-released under the LPPL.</dd>
@@ -74,7 +106,7 @@
<dt>1.7g, 2010 September 30</dt>
<dd>Bugfix: change the way we handle the {color} package not being
-loaded -- replacement <code>\color</code> command is now robust.
+loaded – replacement <code>\color</code> command is now robust.
Thanks to Joseph Wright for the bugreport.
Also adjusted documentation of reference points.</dd>
@@ -175,7 +207,7 @@
<dt>1.2a, 2002 April 28</dt>
<dd>Version 1.2 had an error, which caused a confusing error
if you gave any fractional part in the arguments to the
-<code>{textblock}</code> environment. This was fixed in version 1.2a,
+<code>{textblock}</code> environment. This was fixed in version 1.2a,
which adds a <code>{textblock*}</code> environment (fully compatible
with <code>calc</code>), and does not attempt to support calc-style
expressions in the parameters to the unstarred
@@ -185,40 +217,16 @@
<dd>Rolf Niepraschk <code>niepraschk@ptb.de</code> provided code to
make textpos compatible with the <code>calc</code> package</dd>
-<dt>Version 1.1 was released in 1999</dt>
+<dt>Version 1.1</dt>
+<dd>Released in 1999</dd>
</dl>
-<h3>Installation and further information</h3>
-
-<ol>
-
-<li>Run LaTeX on the file <code>textpos.ins</code> -- this will
-unpack the style file <code>textpos.sty</code> amongst other files.
-Place this somewhere where TeX can find it.</li>
-
-<li>Run LaTeX on the file <code>textpos.dtx</code> to obtain the
-documentation.</li>
-</ol>
-
-<p>The <code>textpos</code> home page is at <code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more
-up-to-date versions available there.</p>
-
-<p><code>Textpos</code> is also available on CTAN:
-/tex-archive/macros/latex/contrib/textpos/</a></p>
-
<div class="signature">
-<a href="http://nxg.me.uk" >Norman Gray</a><br />
-2014 January 3
+<a href="http://nxg.me.uk">Norman Gray</a><br/>
+2016 June 7
</div>
</body>
</html>
-
-
-<!-- Local Variables: -->
-<!-- mode: nxml -->
-<!-- End: -->
Binary files old/doc/latex/textpos/textpos.pdf and new/doc/latex/textpos/textpos.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.doc.tlpobj new/tlpkg/tlpobj/textpos.doc.tlpobj
--- old/tlpkg/tlpobj/textpos.doc.tlpobj 2016-04-14 19:50:35.000000000 +0200
+++ new/tlpkg/tlpobj/textpos.doc.tlpobj 2017-04-14 18:02:16.000000000 +0200
@@ -1,14 +1,15 @@
name textpos.doc
category Package
-revision 32571
+revision 41331
shortdesc doc files of textpos
relocated 1
-docfiles size=90
+docfiles size=96
RELOC/doc/latex/textpos/LICENCE
RELOC/doc/latex/textpos/README
- RELOC/doc/latex/textpos/VERSION-1.7j
- RELOC/doc/latex/textpos/examples/README-examples
+ RELOC/doc/latex/textpos/VERSION-1.8
+ RELOC/doc/latex/textpos/examples/README.examples
RELOC/doc/latex/textpos/examples/t1.tex
+ RELOC/doc/latex/textpos/examples/t10.tex
RELOC/doc/latex/textpos/examples/t2.tex
RELOC/doc/latex/textpos/examples/t3.tex
RELOC/doc/latex/textpos/examples/t4.tex
@@ -16,6 +17,7 @@
RELOC/doc/latex/textpos/examples/t6.tex
RELOC/doc/latex/textpos/examples/t7.tex
RELOC/doc/latex/textpos/examples/t8.tex
+ RELOC/doc/latex/textpos/examples/t9.tex
RELOC/doc/latex/textpos/niepraschk-eso-pic.pdf
RELOC/doc/latex/textpos/niepraschk-eso-pic.tex
RELOC/doc/latex/textpos/textpos-example.tex
++++++ textpos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/textpos/textpos.sty new/tex/latex/textpos/textpos.sty
--- old/tex/latex/textpos/textpos.sty 2014-01-05 00:42:24.000000000 +0100
+++ new/tex/latex/textpos/textpos.sty 2016-11-25 19:34:00.000000000 +0100
@@ -7,7 +7,7 @@
%% textpos.dtx (with options: `package')
%% Textpos: absolute positioning of text on the page
%%%% File: textpos.dtx
-%%%% Copyright 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray
+%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,11 +29,11 @@
%%
%% See the file LICENCE for a copy of the LPPL.
%%
-%% Mercurial ident: 41b12ce5565c, 2014-01-03 19:15 +0000
+%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{textpos}[2014/01/03 v1.7j]
-\typeout{Package: textpos 2014/01/03 1.7j, absolute positioning of text on the page}
+\ProvidesPackage{textpos}[2016/06/07 v1.8]
+\typeout{Package: textpos 2016/06/07 1.8, absolute positioning of text on the page}
\newif\ifTPshowboxes
\TPshowboxesfalse
@@ -44,6 +44,7 @@
\newif\ifTP@abspos
\TP@absposfalse
\DeclareOption{absolute}{\TP@abspostrue}
+\DeclareOption{relative}{\TP@absposfalse}
\newif\ifTP@overlay
\TP@overlayfalse
\DeclareOption{overlay}{\TP@overlaytrue}
@@ -55,6 +56,13 @@
\ifTP@abspos
\RequirePackage{everyshi}
\fi
+\RequirePackage{keyval}
+\define@key{tp}{absolute}{\csname TP@abspos#1\endcsname}
+\define@key{tp}{overlay}{\csname TP@overlay#1\endcsname}
+\define@key{tp}{verbose}{\csname TP@chatter#1\endcsname}
+\define@key{tp}{showboxes}{\csname TPshowboxes#1\endcsname}
+\define@key{tp}{showtext}{\csname TP@showtext#1\endcsname}
+\def\TPoptions{\setkeys{tp}}
\def\TP@xfloat#1[#2]{
\par\def\@captype{#1}%
\@floatpenalty\z@
@@ -236,9 +244,9 @@
\relax
\else
\egroup % end of inner vbox
- \hskip\TP@absmargin
+ \hskip\TP@absmargin % (just \hfil would work here, too)
\egroup % end of inner hbox
- \vskip \TP@absmargin
+ \vskip\TP@absmargin
\fi
\ifTPshowboxes
\vskip-\TPboxrulesize
@@ -260,21 +268,18 @@
\ifdim\TP@margin < 0pt
\advance\@tempdima \TP@margin
\advance\@tempdimb \TP@margin
- % #1,#2 are proportions of \TP@textbox size
- \@tempdimc=-#1\wd\TP@textbox
- \advance\@tempdima\@tempdimc
- \@tempdimc=-#2\ht\TP@textbox
- \advance\@tempdimb\@tempdimc
- \else
- % \TP@margin is positive
- % #1,#2 are proportions of \TP@framebox size = \TP@textbox+2\TP@margin
\@tempdimc=\wd\TP@textbox
- \advance\@tempdimc 2\TP@margin
- \@tempdimc=#1\@tempdimc
+ \advance\@tempdimc 2\TP@margin % now \@tempdimc is width of textblock
+ \multiply\@tempdimc #1
\advance\@tempdima -\@tempdimc
\@tempdimc=\ht\TP@textbox
- \advance\@tempdimc 2\TP@margin
- \@tempdimc=#2\@tempdimc
+ \advance\@tempdimc 2\TP@margin % now \@tempdimc is height of textblock
+ \multiply\@tempdimc #2
+ \advance\@tempdimb -\@tempdimc
+ \else
+ \@tempdimc=#1\wd\TP@textbox
+ \advance\@tempdima -\@tempdimc
+ \@tempdimc=#2\ht\TP@textbox
\advance\@tempdimb -\@tempdimc
\fi
\ifTP@abspos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.tlpobj new/tlpkg/tlpobj/textpos.tlpobj
--- old/tlpkg/tlpobj/textpos.tlpobj 2016-04-14 19:50:35.000000000 +0200
+++ new/tlpkg/tlpobj/textpos.tlpobj 2017-04-14 18:02:16.000000000 +0200
@@ -1,6 +1,6 @@
name textpos
category Package
-revision 32571
+revision 41331
shortdesc Place boxes at arbitrary positions on the LaTeX page
relocated 1
longdesc A package to facilitate placement of boxes at absolute
@@ -10,7 +10,7 @@
runfiles size=3
RELOC/tex/latex/textpos/textpos.sty
catalogue-ctan /macros/latex/contrib/textpos
-catalogue-date 2015-08-03 05:43:12 +0200
-catalogue-license gpl
+catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-license lppl1.3
catalogue-topics layout
-catalogue-version 1.7j
+catalogue-version 1.8
++++++ texvc.doc.tar.xz ++++++
++++++ texvc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texvc.tlpobj new/tlpkg/tlpobj/texvc.tlpobj
--- old/tlpkg/tlpobj/texvc.tlpobj 2016-04-14 19:50:36.000000000 +0200
+++ new/tlpkg/tlpobj/texvc.tlpobj 2017-04-14 18:02:16.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/texvc/texvc.sty
catalogue-ctan /macros/latex/contrib/texvc
-catalogue-date 2015-11-11 05:13:37 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics foreign-import
catalogue-version 1.0
++++++ texware.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvitype.1 new/texmf-dist/doc/man/man1/dvitype.1
--- old/texmf-dist/doc/man/man1/dvitype.1 2016-04-26 19:41:35.000000000 +0200
+++ new/texmf-dist/doc/man/man1/dvitype.1 2017-05-03 19:35:31.000000000 +0200
@@ -1,4 +1,4 @@
-.TH DVITYPE 1 "16 June 2015" "Web2C 2016"
+.TH DVITYPE 1 "16 June 2015" "Web2C 2017"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/dvitype.man1.pdf and new/texmf-dist/doc/man/man1/dvitype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pooltype.1 new/texmf-dist/doc/man/man1/pooltype.1
--- old/texmf-dist/doc/man/man1/pooltype.1 2016-04-26 19:41:35.000000000 +0200
+++ new/texmf-dist/doc/man/man1/pooltype.1 2017-05-03 19:35:31.000000000 +0200
@@ -1,4 +1,4 @@
-.TH POOLTYPE 1 "16 June 2015" "Web2C 2016"
+.TH POOLTYPE 1 "16 June 2015" "Web2C 2017"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/pooltype.man1.pdf and new/texmf-dist/doc/man/man1/pooltype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texware.doc.tlpobj new/tlpkg/tlpobj/texware.doc.tlpobj
--- old/tlpkg/tlpobj/texware.doc.tlpobj 2016-04-27 03:25:11.000000000 +0200
+++ new/tlpkg/tlpobj/texware.doc.tlpobj 2017-05-04 02:07:17.000000000 +0200
@@ -1,8 +1,8 @@
name texware.doc
category TLCore
-revision 40768
+revision 44166
shortdesc doc files of texware
-docfiles size=13
+docfiles size=5
texmf-dist/doc/man/man1/dvitype.1
texmf-dist/doc/man/man1/dvitype.man1.pdf
texmf-dist/doc/man/man1/pooltype.1
++++++ tfrupee.doc.tar.xz ++++++
++++++ tfrupee.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tfrupee.tlpobj new/tlpkg/tlpobj/tfrupee.tlpobj
--- old/tlpkg/tlpobj/tfrupee.tlpobj 2016-04-14 19:51:33.000000000 +0200
+++ new/tlpkg/tlpobj/tfrupee.tlpobj 2017-04-14 18:02:40.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/fonts/type1/public/tfrupee/tfrupee.pfb
RELOC/tex/latex/tfrupee/tfrupee.sty
catalogue-ctan /fonts/tfrupee
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl3
catalogue-topics font font-type1 font-specialist
catalogue-version 1.02
++++++ thalie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/CHANGELOG.md new/doc/latex/thalie/CHANGELOG.md
--- old/doc/latex/thalie/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thalie/CHANGELOG.md 2017-04-26 00:31:16.000000000 +0200
@@ -0,0 +1,64 @@
+* thalie 0.9b (2017-04-24)
+
+ * Remove blank page at the beginning of documentation.
+ * Add missing dependency.
+
+ -- Louis Paternault
+
+* thalie 0.9a (2017-04-22)
+
+ * Thalie.sty
+
+ * Commands `\playmark`, `\actmark` and `\scenemark` no longer include label (e.g. "Act 1"). It is up to the user to add it or not.
+ * Display default translations, even in language environments using non-latin characters where no latin font is available (closes #24).
+ * Do not add a wrong indentation after character name in verse environment (closes #3).
+ * Package options can be redefined anywhere in the document (closes #5).
+ * Reduce vertical space around character names in style `imprimerie-verse` (closes #6).
+ * Replace package [ifthen](http://ctan.org/pkg/ifthen) with package [etoolbox](http://ctan.org/pkg/etoolbox) (closes #29).
+ * Style of ramatis personæ can be customized (closes #9 #15 #18 #19).
+ * Use [translations](http://ctan.org/pkg/translations) to translate words ("act", "scene", etc.).
+
+ * Documentation
+
+ * Add sections *Examples* and *Localization*.
+ * Add a note about non-latin characters and character style `bold` (closes #26).
+ * Fix `\customact` example.
+ * Various minor improvements.
+
+ * README
+
+ * Convert README from text to markdown.
+ * Add examples.
+
+ -- Louis Paternault
+
+* thalie 0.8 (2015-12-30)
+
+ * Fix release errors in previous release.
+
+ -- Louis Paternault
+
+* thalie 0.7 (2015-12-28)
+
+ * Update project URL to http://framagit.org/spalax/thalie.
+ * Add commands `\pauseverse`, `\resumeverse` and `\adjustverse`.
+ * Add package option `xspace`.
+ * Minor documentation improvements.
+
+ -- Louis Paternault
+
+* thalie 0.6 (2014-06-26)
+
+ * Add character style `imprimerie-verse`, `imprimerie-prose`, and `arden`.
+ * Correct a lot of typos in documentation (thanks Per).
+ * Better alignment of groups of characters.
+ * Improve spacing (thanks Caroline).
+ * Several documentation and core improvements.
+
+ -- Louis Paternault
+
+* thalie 0.5 (2013-06-08)
+
+ * Initial release.
+
+ -- Louis Paternault
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/README new/doc/latex/thalie/README
--- old/doc/latex/thalie/README 2015-12-30 23:06:16.000000000 +0100
+++ new/doc/latex/thalie/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-Thalie
-
-A package providing tools to typeset drama plays. It defines commands to
-introduce characters' lines, to render stage directions, to divide a play into
-acts and scenes, to automatically build the dramatis personae, etc.
-
-VERSION: 0.8 (2015-12-30)
-
-PROJECT HOME PAGE: https://git.framasoft.org/spalax/thalie
-
-LICENSE
-
-Copyright 2010-2015 Louis Paternault
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
-of this license or (at your option) any later version.
-The latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of LaTeX
- version 2005/12/01 or later.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/README.md new/doc/latex/thalie/README.md
--- old/doc/latex/thalie/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thalie/README.md 2017-04-26 00:31:16.000000000 +0200
@@ -0,0 +1,30 @@
+Thalie — A LaTeX package providing tools to typeset drama plays
+===============================================================
+
+[![Sources](https://img.shields.io/badge/sources-thalie-brightgreen.svg)](http://framagit.org/spalax/thalie)
+[![CTAN](https://img.shields.io/ctan/v/thalie.svg)](http://ctan.org/pkg/thalie)
+[![Documentation](https://img.shields.io/badge/doc-pdf-brightgreen.svg)](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.pdf)
+
+It defines commands to introduce characters' lines, to render stage direction,
+to divide a play into acts and scenes, to automatically build the dramatis
+personae, etc.
+
+- Version 0.9b (2017-04-24)
+- Usage and installation instruction are available in the [documentation](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.pdf).
+- Examples
+ - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.9b/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.9b/examples/cyrano.tex))
+ - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.9b/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.9b/examples/domjuan.tex))
+ - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.9b/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.9b/examples/hamlet.tex))
+
+License
+-------
+
+*Copyright 2010-2017 Louis Paternault*
+
+This work may be distributed and/or modified under the conditions of the LaTeX
+Project Public License, either version 1.3 of this license or (at your option)
+any later version.
+
+The latest version of this license is in http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX version
+2005/12/01 or later.
Binary files old/doc/latex/thalie/thalie.pdf and new/doc/latex/thalie/thalie.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.doc.tlpobj new/tlpkg/tlpobj/thalie.doc.tlpobj
--- old/tlpkg/tlpobj/thalie.doc.tlpobj 2016-04-14 19:51:33.000000000 +0200
+++ new/tlpkg/tlpobj/thalie.doc.tlpobj 2017-04-26 02:09:51.000000000 +0200
@@ -1,9 +1,10 @@
name thalie.doc
category Package
-revision 39241
+revision 44048
shortdesc doc files of thalie
relocated 1
-docfiles size=99
+docfiles size=105
+ RELOC/doc/latex/thalie/CHANGELOG.md
RELOC/doc/latex/thalie/LICENSE.txt
- RELOC/doc/latex/thalie/README
+ RELOC/doc/latex/thalie/README.md
RELOC/doc/latex/thalie/thalie.pdf
++++++ thalie.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie-english.trsl new/tex/latex/thalie/thalie-english.trsl
--- old/tex/latex/thalie/thalie-english.trsl 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/thalie/thalie-english.trsl 2017-04-24 00:08:37.000000000 +0200
@@ -0,0 +1,26 @@
+\ProvideDictionaryFor{English}{thalie}
+
+\ProvideDictTranslation{play}{play}
+\ProvideDictTranslation{plays}{plays}
+\ProvideDictTranslation{Play}{Play}
+\ProvideDictTranslation{Plays}{Plays}
+\ProvideDictTranslation{act}{acte}
+\ProvideDictTranslation{acts}{acts}
+\ProvideDictTranslation{Act}{Act}
+\ProvideDictTranslation{Acts}{Acts}
+\ProvideDictTranslation{scene}{scene}
+\ProvideDictTranslation{scenes}{scenes}
+\ProvideDictTranslation{Scene}{Scene}
+\ProvideDictTranslation{Scenes}{Scenes}
+\ProvideDictTranslation{interlude}{interlude}
+\ProvideDictTranslation{interludes}{interludes}
+\ProvideDictTranslation{Interlude}{Interlude}
+\ProvideDictTranslation{Interludes}{Interludes}
+\ProvideDictTranslation{curtain}{curtain}
+\ProvideDictTranslation{curtains}{curtains}
+\ProvideDictTranslation{Curtain}{Curtain}
+\ProvideDictTranslation{Curtains}{Curtains}
+\ProvideDictTranslation{pause}{pause}
+\ProvideDictTranslation{pauses}{pauses}
+\ProvideDictTranslation{Pause}{Pause}
+\ProvideDictTranslation{Pauses}{Pauses}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie-fallback.trsl new/tex/latex/thalie/thalie-fallback.trsl
--- old/tex/latex/thalie/thalie-fallback.trsl 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/thalie/thalie-fallback.trsl 2017-04-24 00:08:37.000000000 +0200
@@ -0,0 +1,45 @@
+\ProvideDictionaryFor{fallback}{thalie}
+
+\makeatletter
+
+\newcommand{\@latin}[1]{%
+ % Try hard to display argument, even in an environment that uses non-latin characters.
+ \ifdefined\normalfontlatin%
+ {\normalfontlatin#1}%
+ \else%
+ {%
+ \ifdefined\ensureascii%
+ {\ensureascii{#1}}%
+ \else%
+ {#1}%
+ \fi%
+ }%
+ \fi%
+}
+
+\ProvideTranslationFallback{play}{\@latin{play}}
+\ProvideTranslationFallback{plays}{\@latin{plays}}
+\ProvideTranslationFallback{Play}{\@latin{Play}}
+\ProvideTranslationFallback{Plays}{\@latin{Plays}}
+\ProvideTranslationFallback{act}{\@latin{acte}}
+\ProvideTranslationFallback{acts}{\@latin{acts}}
+\ProvideTranslationFallback{Act}{\@latin{Act}}
+\ProvideTranslationFallback{Acts}{\@latin{Acts}}
+\ProvideTranslationFallback{scene}{\@latin{scene}}
+\ProvideTranslationFallback{scenes}{\@latin{scenes}}
+\ProvideTranslationFallback{Scene}{\@latin{Scene}}
+\ProvideTranslationFallback{Scenes}{\@latin{Scenes}}
+\ProvideTranslationFallback{interlude}{\@latin{interlude}}
+\ProvideTranslationFallback{interludes}{\@latin{interludes}}
+\ProvideTranslationFallback{Interlude}{\@latin{Interlude}}
+\ProvideTranslationFallback{Interludes}{\@latin{Interludes}}
+\ProvideTranslationFallback{curtain}{\@latin{curtain}}
+\ProvideTranslationFallback{curtains}{\@latin{curtains}}
+\ProvideTranslationFallback{Curtain}{\@latin{Curtain}}
+\ProvideTranslationFallback{Curtains}{\@latin{Curtains}}
+\ProvideTranslationFallback{pause}{\@latin{pause}}
+\ProvideTranslationFallback{pauses}{\@latin{pauses}}
+\ProvideTranslationFallback{Pause}{\@latin{Pause}}
+\ProvideTranslationFallback{Pauses}{\@latin{Pauses}}
+
+\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie-french.trsl new/tex/latex/thalie/thalie-french.trsl
--- old/tex/latex/thalie/thalie-french.trsl 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/thalie/thalie-french.trsl 2017-04-24 00:08:37.000000000 +0200
@@ -0,0 +1,26 @@
+\ProvideDictionaryFor{French}{thalie}
+
+\ProvideDictTranslation{play}{pi\`ece}
+\ProvideDictTranslation{plays}{pi\`eces}
+\ProvideDictTranslation{Play}{Pi\`ece}
+\ProvideDictTranslation{Plays}{Pi\`eces}
+\ProvideDictTranslation{act}{acte}
+\ProvideDictTranslation{acts}{actes}
+\ProvideDictTranslation{Act}{Acte}
+\ProvideDictTranslation{Acts}{Actes}
+\ProvideDictTranslation{scene}{sc\`ene}
+\ProvideDictTranslation{scenes}{sc\`enes}
+\ProvideDictTranslation{Scene}{Sc\`ene}
+\ProvideDictTranslation{Scenes}{Sc\`enes}
+\ProvideDictTranslation{interlude}{interm\`ede}
+\ProvideDictTranslation{interludes}{interm\`edes}
+\ProvideDictTranslation{Interlude}{Interm\`ede}
+\ProvideDictTranslation{Interludes}{Interm\`edes}
+\ProvideDictTranslation{curtain}{rideau}
+\ProvideDictTranslation{curtains}{rideaux}
+\ProvideDictTranslation{Curtain}{Rideau}
+\ProvideDictTranslation{Curtains}{Rideaux}
+\ProvideDictTranslation{pause}{pause}
+\ProvideDictTranslation{pauses}{pauses}
+\ProvideDictTranslation{Pause}{Pause}
+\ProvideDictTranslation{Pauses}{Pauses}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie.sty new/tex/latex/thalie/thalie.sty
--- old/tex/latex/thalie/thalie.sty 2015-12-30 23:06:16.000000000 +0100
+++ new/tex/latex/thalie/thalie.sty 2017-04-26 00:31:16.000000000 +0200
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% thalie.dtx (with options: `package')
-%% Copyright 2010-2015 Louis Paternault
+%% Copyright 2010-2017 Louis Paternault
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,137 +23,30 @@
%% and the derived file thalie.sty.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{thalie}
- [2015/12/30 v0.8 A package to typeset drama plays]
-\RequirePackage{ifthen}
+ [2017/04/24 v0.9b A package to typeset drama plays]
+
+\RequirePackage{pgfkeys}
\RequirePackage{etoolbox}
\RequirePackage{suffix}
-\RequirePackage{longtable}
+\RequirePackage{tabularx}
\RequirePackage{xspace}
-\RequirePackage{pgfopts}
-
-\pgfkeys{
- % Character style
- /THALIE/.cd,
- characterstyle/.value required,
- characterstyle/.default=simple,
- characterstyle/.is choice,
- characterstyle/bold/.code=\def\@characterstyle{bold},
- characterstyle/center/.code=\def\@characterstyle{center},
- characterstyle/margin/.code=\def\@characterstyle{margin},
- characterstyle/simple/.code=\def\@characterstyle{simple},
- characterstyle/arden/.code=\def\@characterstyle{arden},
- characterstyle/imprimerie-verse/.code=\def\@characterstyle{imprimerie-verse},
- characterstyle/imprimerie-prose/.code=\def\@characterstyle{imprimerie-prose},
- characterstyle,
-}
-
-\pgfkeys{
- % play style
- /THALIE/.cd,
- playstyle/.value required,
- playstyle/.default=box,
- playstyle/.is choice,
- playstyle/center/.code=\def\@playstyle{center},
- playstyle/bigcenter/.code=\def\@playstyle{bigcenter},
- playstyle/box/.code=\def\@playstyle{box},
- playstyle/custom/.code=\def\@playstyle{custom},
- playstyle,
-}
-\pgfkeys{
- % act style
- /THALIE/.cd,
- actstyle/.value required,
- actstyle/.default=bigcenter,
- actstyle/.is choice,
- actstyle/center/.code=\def\@actstyle{center},
- actstyle/bigcenter/.code=\def\@actstyle{bigcenter},
- actstyle/box/.code=\def\@actstyle{box},
- actstyle/custom/.code=\def\@actstyle{custom},
- actstyle,
-}
-\pgfkeys{
- % scene style
- /THALIE/.cd,
- scenestyle/.value required,
- scenestyle/.default=center,
- scenestyle/.is choice,
- scenestyle/center/.code=\def\@scenestyle{center},
- scenestyle/bigcenter/.code=\def\@scenestyle{bigcenter},
- scenestyle/box/.code=\def\@scenestyle{box},
- scenestyle/custom/.code=\def\@scenestyle{custom},
- scenestyle,
-}
-
-\pgfkeys{
- % play level
- /THALIE/.cd,
- playlevel/.value required,
- playlevel/.default=chapter,
- playlevel/.store in=\@playlevel,
- playlevel,
-}
-\pgfkeys{
- % act level
- /THALIE/.cd,
- actlevel/.value required,
- actlevel/.default=section,
- actlevel/.store in=\@actlevel,
- actlevel,
-}
-\pgfkeys{
- % scene level
- /THALIE/.cd,
- scenelevel/.value required,
- scenelevel/.default=subsection,
- scenelevel/.store in=\@scenelevel,
- scenelevel,
-}
-\pgfkeys{
- % interlude level
- /THALIE/.cd,
- interludelevel/.value required,
- interludelevel/.default=act,
- interludelevel/.is choice,
- interludelevel/play/.code=\def\@interludelevel{play},
- interludelevel/act/.code=\def\@interludelevel{act},
- interludelevel/scene/.code=\def\@interludelevel{scene},
- interludelevel,
-}
-\newif\if@xspace
-\pgfkeys{
- % xspace option
- /THALIE/.cd,
- xspace/.value required,
- xspace/.is if=@xspace,
- xspace/.default=true,
- xspace,
-}
-
-\ProcessPgfPackageOptions{/THALIE}
-\newcommand{\playname}{Play}
-\newcommand{\actname}{Act}
-\newcommand{\scenename}{Scene}
-\newcommand{\interludename}{Interlude}
-\newcommand{\curtainname}{Curtain}
-\newcommand{\pausename}{Pause}
-\@ifpackageloaded{babel}{
- \addto\captionsfrench{%
- \renewcommand{\playname}{Pi\`ece}
- \renewcommand{\actname}{Acte}
- \renewcommand{\scenename}{Sc\`ene}
- \renewcommand{\interludename}{Interm\`ede}
- \renewcommand{\curtainname}{Rideau}
- \renewcommand{\pausename}{Pause}
- }
- \addto\captionsenglish{%
- % Useless: these are the default...
- }
-}{}
+\RequirePackage{translations}
+\LoadDictionary{thalie}
+\LoadDictionaryFor{fallback}{thalie}
+\newcommand{\playname}{\GetTranslation{Play}}
+\newcommand{\actname}{\GetTranslation{Act}}
+\newcommand{\scenename}{\GetTranslation{Scene}}
+\newcommand{\interludename}{\GetTranslation{Interlude}}
+\newcommand{\curtainname}{\GetTranslation{Curtain}}
+\newcommand{\pausename}{\GetTranslation{Pause}}
\newcommand{\playmark}[1]{%
\markboth{\MakeUppercase{#1}}{}%
}
\newcommand{\actmark}[1]{%
- \markright{\MakeUppercase{#1}}%
+ \markright{\MakeUppercase{%
+ \GetTranslation{Act}\ \theact%
+ \ifdefempty{#1}{}{: #1}%
+ }}%
}
\newcommand{\scenemark}[1]{%
}
@@ -168,20 +61,20 @@
% - Style
% - Label (none = not in toc)
% - Title
- \ifthenelse{\equal{#1}{center}}{
+ \ifdefstring{#1}{center}{
\begin{center}
\textsc{#2}
#3
\end{center}
- }{\ifthenelse{\equal{#1}{bigcenter}}{
+ }{\ifdefstring{#1}{bigcenter}{
\begin{center}
\Large
\textsc{#2}
#3
\end{center}
- }{\ifthenelse{\equal{#1}{box}}{
+ }{\ifdefstring{#1}{box}{
\begin{center}
\framebox{\begin{minipage}{0.7\textwidth}
\begin{center}
@@ -189,7 +82,7 @@
\vspace{0.5em}
#2
- \ifthenelse{\equal{#3}{} \OR \equal{#2}{}}{}{---}
+ \ifboolexpr{test{\ifstrempty{#3}} or test{\ifstrempty{#2}}}{}{---}
#3
\vspace{0.5em}
@@ -201,7 +94,7 @@
}
\newcommand\@clearpage[1]{%
% Clear page if necessary
- \ifthenelse{\equal{#1}{part} \OR \equal{#1}{chapter}}{
+ \ifboolexpr{test{\ifdefstring{#1}{part}} or test{\ifdefstring{#1}{chapter}}}{
\cleardoublepage
\thispagestyle{empty}
}{}
@@ -209,7 +102,7 @@
\newcommand{\play}[2][]{%
\refstepcounter{play}
- \ifthenelse{\equal{#1}{}}{
+ \ifstrempty{#1}{
\def\@short{#2}
}{
\def\@short{#1}
@@ -217,7 +110,7 @@
\@clearpage{\@playlevel}
\playmark{\@short}
\addcontentsline{toc}{\@playlevel}{\@short}
- \ifthenelse{\equal{\@playstyle}{custom}}{
+ \ifdefstring{\@playstyle}{custom}{
\customplay{\theplay}{#2}
}{
\@displaytitle{\@playstyle}{}{#2}
@@ -225,7 +118,7 @@
}
\WithSuffix\newcommand\play*[1]{%
\@clearpage{\@playlevel}
- \ifthenelse{\equal{\@playstyle}{custom}}{
+ \ifdefstring{\@playstyle}{custom}{
\customplay*{#1}
}{
\@displaytitle{\@playstyle}{}{#1}
@@ -233,28 +126,28 @@
}
\newcommand{\act}[2][]{%
\refstepcounter{act}
- \ifthenelse{\equal{#1}{}}{
+ \ifstrempty{#1}{
\def\@short{#2}
}{
\def\@short{#1}
}
- \ifthenelse{\equal{\@short}{}}{
- \def\@label{\actname{} \theact{}}
+ \ifdefempty{\@short}{
+ \def\@label{\GetTranslation{Act} \theact{}}
}{
- \def\@label{\actname{} \theact{}\xspace: }
+ \def\@label{\GetTranslation{Act} \theact{}\xspace: }
}
\@clearpage{\@actlevel}
- \actmark{\@label\@short}
+ \actmark{\@short}
\addcontentsline{toc}{\@actlevel}{\@label\@short}
- \ifthenelse{\equal{\@actstyle}{custom}}{
+ \ifdefstring{\@actstyle}{custom}{
\customact{\theact}{#2}
}{
- \@displaytitle{\@actstyle}{\actname{} \theact}{#2}
+ \@displaytitle{\@actstyle}{\GetTranslation{Act} \theact}{#2}
}
}
\WithSuffix\newcommand\act*[1]{%
\@clearpage{\@actlevel}
- \ifthenelse{\equal{\@actstyle}{custom}}{
+ \ifdefstring{\@actstyle}{custom}{
\customact*{#1}
}{
\@displaytitle{\@actstyle}{}{#1}
@@ -262,76 +155,76 @@
}
\newcommand{\scene}[2][]{%
\refstepcounter{scene}
- \ifthenelse{\equal{#1}{}}{
+ \ifstrempty{#1}{
\def\@short{#2}
}{
\def\@short{#1}
}
- \ifthenelse{\equal{\@short}{}}{
- \def\@label{\scenename{} \thescene{}}
+ \ifdefempty{\@short}{
+ \def\@label{\GetTranslation{Scene} \thescene{}}
}{
- \def\@label{\scenename{} \thescene{}\xspace: }
+ \def\@label{\GetTranslation{Scene} \thescene{}\xspace: }
}
\@clearpage{\@scenelevel}
- \scenemark{\@label\@short}
+ \scenemark{\@short}
\addcontentsline{toc}{\@scenelevel}{\@label\@short}
- \ifthenelse{\equal{\@scenestyle}{custom}}{
+ \ifdefstring{\@scenestyle}{custom}{
\customscene{\thescene}{#2}
}{
- \@displaytitle{\@scenestyle}{\scenename{} \thescene}{#2}
+ \@displaytitle{\@scenestyle}{\GetTranslation{Scene} \thescene}{#2}
}
}
\WithSuffix\newcommand\scene*[1]{%
\@clearpage{\@scenelevel}
- \ifthenelse{\equal{\@scenestyle}{custom}}{
+ \ifdefstring{\@scenestyle}{custom}{
\customscene*{#1}
}{
\@displaytitle{\@scenestyle}{}{#1}
}
}
\newcommand{\interlude}[2][]{%
- \ifthenelse{\equal{#1}{}}{
+ \ifstrempty{#1}{
\def\@short{#2}
}{
\def\@short{#1}
}
- \ifthenelse{\equal{\@short}{}}{
- \def\@label{\interludename{}}
+ \ifdefempty{\@short}{
+ \def\@label{\GetTranslation{Interlude}}
}{
- \def\@label{\interludename{}\xspace: }
+ \def\@label{\GetTranslation{Interlude}\xspace: }
}
- \ifthenelse{\equal{\@interludelevel}{play}}{
+ \ifdefstring{\@interludelevel}{play}{
\@clearpage{\@playlevel}
- \playmark{\@label\@short}
+ \playmark{\@short}
\addcontentsline{toc}{\@playlevel}{\@label\@short}
- \@displaytitle{\@playstyle}{\interludename}{#2}
- }{\ifthenelse{\equal{\@interludelevel}{act}}{
+ \@displaytitle{\@playstyle}{\GetTranslation{Interlude}}{#2}
+ }{\ifdefstring{\@interludelevel}{act}{
\@clearpage{\@actlevel}
- \actmark{\@label\@short}
+ \actmark{\@short}
\addcontentsline{toc}{\@actlevel}{\@label\@short}
- \@displaytitle{\@actstyle}{\interludename}{#2}
+ \@displaytitle{\@actstyle}{\GetTranslation{Interlude}}{#2}
}{% \@interludelevel is scene
\@clearpage{\@scenelevel}
- \scenemark{\@label\@short}
+ \scenemark{\@short}
\addcontentsline{toc}{\@scenelevel}{\@label\@short}
- \@displaytitle{\@scenestyle}{\interludename}{#2}
+ \@displaytitle{\@scenestyle}{\GetTranslation{Interlude}}{#2}
}}
}
\WithSuffix\newcommand\interlude*[1]{%
- \ifthenelse{\equal{\@interludelevel}{play}}{
+ \ifdefstring{\@interludelevel}{play}{
\@clearpage{\@playlevel}
- \@displaytitle{\@playstyle}{\interludename}{#1}
- }{\ifthenelse{\equal{\@interludelevel}{act}}{
+ \@displaytitle{\@playstyle}{\GetTranslation{Interlude}}{#1}
+ }{\ifdefstring{\@interludelevel}{act}{
\@clearpage{\@actlevel}
- \@displaytitle{\@actstyle}{\interludename}{#1}
+ \@displaytitle{\@actstyle}{\GetTranslation{Interlude}}{#1}
}{% \@interludelevel is scene
\@clearpage{\@scenelevel}
- \@displaytitle{\@scenestyle}{\interludename}{#1}
+ \@displaytitle{\@scenestyle}{\GetTranslation{Interlude}}{#1}
}}
}
\newcommand\curtain{
\begin{center}
- \sffamily\LARGE\bfseries \textsc{\curtainname}
+ \Large\textsc{\GetTranslation{Curtain}}
\end{center}
}
\newcommand{\@maybexspace}{%
@@ -340,97 +233,105 @@
\fi%
}
\newcommand{\@speaks}[2][]{%
- \ifthenelse{\equal{#1}{}}{%
+ \ifstrempty{#1}{%
\speakswithoutdirection{#2}%
}{%
\speakswithdirection{#2}{#1}%
}\@maybexspace%
}
-\ifthenelse{\equal{\@characterstyle}{bold}}{%
- % Bold style
- \newcommand\speakswithdirection[2]{%
- \noindent%
- {\bfseries\sffamily #1} \emph{(#2)}\xspace:%
- }
- \newcommand\speakswithoutdirection[1]{%
- \noindent%
- {\bfseries\sffamily #1\xspace:}%
- }%
-}{}%
-\ifthenelse{\equal{\@characterstyle}{center}}{%
- % Center style
- \newcommand\speakswithdirection[2]{%
- \begin{center}%
- \textsc{#1},\\\emph{#2}%
- \end{center}%
- }%
- \newcommand\speakswithoutdirection[1]{%
- \begin{center}%
- \textsc{#1}%
- \end{center}%
- }%
-}{}%
-\ifthenelse{\equal{\@characterstyle}{imprimerie-verse}}{%
- % Style for verse plays defined by the French Imprimerie nationale
- \newcommand\speakswithdirection[2]{%
- \begin{center}%
- \textsc{#1}, \emph{#2}%
- \end{center}%
- }%
- \newcommand\speakswithoutdirection[1]{%
- \begin{center}%
- \textsc{#1}%
- \end{center}%
- }%
-}{}%
-\ifthenelse{\equal{\@characterstyle}{imprimerie-prose}}{%
- % Style for prose plays defined by the French Imprimerie nationale
- \newcommand\speakswithdirection[2]{%
- \noindent\hspace*{-\parindent}\textsc{#1}, \emph{#2}\xspace:%
- }%
- \newcommand\speakswithoutdirection[1]{%
- \noindent\hspace*{-\parindent}\textsc{#1}\xspace:%
- }%
-}{}%
-\ifthenelse{\equal{\@characterstyle}{arden}}{%
- \newcommand\speakswithdirection[2]{%
- \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}} [\emph{#2}]\quad%
- }%
- \newcommand\speakswithoutdirection[1]{%
- \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}}\quad%
- }%
-}{}%
-\ifthenelse{\equal{\@characterstyle}{simple}}{%
- % Simple style
- \newcommand\speakswithdirection[2]{%
- \indent\textsc{#1}, \emph{#2}\xspace:%
- }%
- \newcommand\speakswithoutdirection[1]{%
- \indent\textsc{#1}\xspace:%
- }%
-}{}%
-\ifthenelse{\equal{\@characterstyle}{margin}}{%
- % Margin style
- \setlength{\leftskip}{3cm}
- \newcommand\speakswithdirection[2]{%
- \hspace{-3cm} #1 #2
- }
- \newcommand\speakswithoutdirection[1]{%
- \hspace{-3cm} #1
- }%
-}{}%
+\newenvironment{@smallcenter}
+ {\par\smallskip\centering}
+ {\par\nopagebreak\ignorespacesafterend}
+\providecommand{\speakswithdirection}{}
+\providecommand{\speakswithoutdirection}{}
+\newcommand{\@setcharacterstyle}[1]{
+ \ifstrequal{#1}{bold}{%
+ % Bold style
+ \renewcommand\speakswithdirection[2]{%
+ \noindent%
+ {\bfseries\sffamily ##1} \emph{(##2)}\xspace:%
+ }
+ \renewcommand\speakswithoutdirection[1]{%
+ \noindent%
+ {\bfseries\sffamily ##1\xspace:}%
+ }%
+ }{}%
+ \ifstrequal{#1}{center}{%
+ % Center style
+ \renewcommand\speakswithdirection[2]{%
+ \begin{center}%
+ \textsc{##1},\\\emph{##2}%
+ \end{center}%
+ \par\ignorespacesafterend%
+ }%
+ \renewcommand\speakswithoutdirection[1]{%
+ \begin{center}%
+ \textsc{##1}%
+ \end{center}%
+ \par\ignorespacesafterend%
+ }%
+ }{}%
+ \ifstrequal{#1}{imprimerie-verse}{%
+ % Style for verse plays defined by the French Imprimerie nationale
+ \renewcommand\speakswithdirection[2]{%
+ \begin{@smallcenter}%
+ \textsc{##1}, \emph{##2}%
+ \end{@smallcenter}%
+ }%
+ \renewcommand\speakswithoutdirection[1]{%
+ \begin{@smallcenter}%
+ \textsc{##1}%
+ \end{@smallcenter}%
+ }%
+ }{}%
+ \ifstrequal{#1}{imprimerie-prose}{%
+ % Style for prose plays defined by the French Imprimerie nationale
+ \renewcommand\speakswithdirection[2]{%
+ \noindent\hspace*{-\parindent}\textsc{##1}, \emph{##2}\xspace:%
+ }%
+ \renewcommand\speakswithoutdirection[1]{%
+ \noindent\hspace*{-\parindent}\textsc{##1}\xspace:%
+ }%
+ }{}%
+ \ifstrequal{#1}{arden}{%
+ \renewcommand\speakswithdirection[2]{%
+ \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{##1}} [\emph{##2}]\quad%
+ }%
+ \renewcommand\speakswithoutdirection[1]{%
+ \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{##1}}\quad%
+ }%
+ }{}%
+ \ifstrequal{#1}{simple}{%
+ % Simple style
+ \renewcommand\speakswithdirection[2]{%
+ \indent\textsc{##1}, \emph{##2}\xspace:%
+ }%
+ \renewcommand\speakswithoutdirection[1]{%
+ \indent\textsc{##1}\xspace:%
+ }%
+ }{}%
+ \ifstrequal{#1}{margin}{%
+ % Margin style
+ \setlength{\leftskip}{3cm}
+ \renewcommand\speakswithdirection[2]{%
+ \hspace{-3cm} ##1 ##2
+ }
+ \renewcommand\speakswithoutdirection[1]{%
+ \hspace{-3cm} ##1
+ }%
+ }{}%
+}
\newcommand{\@dramatis@clear}{}
-\provideboolean{@dramatis@hidden}
+\newcommand{\@empty@}{}
+\providebool{@dramatis@hidden}
\newenvironment{dramatis}[1][]{
\@dramatis@clear{}
\undef{\@dramatis@clear}
- \undef{\@dramatis@hook}
- \newcommand{\@dramatis@hook}{}
- \ifthenelse{\equal{#1}{hidden}}{
- \setboolean{@dramatis@hidden}{true}
- }{\ifthenelse{\equal{#1}{}}{
- \setboolean{@dramatis@hidden}{false}
- \gappto{\@dramatis@hook}{\begin{longtable}{l}}
+ \ifstrequal{#1}{hidden}{
+ \booltrue{@dramatis@hidden}
+ }{\ifstrempty{#1}{
+ \boolfalse{@dramatis@hidden}
+ \dramatisenv
}{
\ClassError{thalie}{%
Environment dramatis does not accept option #1.%
@@ -439,43 +340,63 @@
}
}
}{%
- \ifthenelse{\boolean{@dramatis@hidden}}{%
- }{%
- \gappto{\@dramatis@hook}{\end{longtable}}
- \@dramatis@hook{}%
- }
-}
-\newcommand{\@character}[2]{%
- \ifthenelse{\( \equal{#1}{} \) \AND \( \equal{#2}{} \)}{%
- ~%
+ \notbool{@dramatis@hidden}{%
+ \enddramatisenv
}{}%
- \ifthenelse{\( \NOT \equal{#1}{} \) \AND \( \equal{#2}{} \)}{%
- #1%
+}
+\newenvironment{dramatisenv}{%
+ \list{}{\rightmargin1cm\leftmargin2cm}\item[]
+}{%
+ \endlist%
+}
+
+\newcommand{\dramatischaractername}[1]{\textbf{#1}}
+
+\newcommand{\dramatischaracterdescription}[1]{#1}
+
+\newcommand{\characterspace}{ %
+ \notbool{@dramatis@hidden}{%
+ \smallskip\newline %
+ }{} %
+}
+
+\newcommand{\dramatischaracter}[2]{ %
+ \hspace*{-1cm} %
+ \ifboolexpr{(not test {\ifdefempty{#1}}) and test {\ifdefempty{#2}}}{%
+ \dramatischaractername{#1} %
}{}%
- \ifthenelse{\( \equal{#1}{} \) \AND \( \NOT \equal{#2}{} \)}{%
- #2%
+ \ifboolexpr{ test{\ifdefempty{#1}} and not test{\ifdefempty{#2}}}{%
+ \dramatischaracterdescription{#2} %
}{}%
- \ifthenelse{\( \NOT \equal{#1}{} \) \AND \( \NOT \equal{#2}{} \)}{%
- #1, #2%
+ \ifboolexpr{ (not test{\ifdefempty{#1}}) and (not test{\ifdefempty{#2}})}{%
+ \dramatischaractername{#1}, \dramatischaracterdescription{#2} %
}{}%
- \tabularnewline
-}
-\newcommand{\characterspace}{%
- \gappto{\@dramatis@hook}{\@character{}{~}}
+ \newline %
}
-\newenvironment{charactergroup}[1]{%
- \gdef\@groupname{#1}
- \gappto{\@dramatis@hook}{
- \hspace{-7.2pt}\begin{math}\left.
- \begin{tabular}{ll}
- }
+
+ \newlength{\@spaceaftergroup}
+\newenvironment{charactergroup}[2][5cm]{%
+ \notbool{@dramatis@hidden}{%
+ \gdef\@groupname{#2} %
+ \gdef\@grouplength{#1} %
+ \hspace*{-1.3pt}\math\left. %
+ \minipage[c]{#1} %
+ \vspace*{2pt} %
+ }{}%
}{%
- \gappto{\@dramatis@hook}{
- \end{tabular}
- \right\} \end{math}
- }
- \protected@xappto{\@dramatis@hook}{\@groupname}
- \gappto{\@dramatis@hook}{\tabularnewline}
+ \notbool{@dramatis@hidden}{%
+ \vspace*{-8pt} %
+ \endminipage %
+ \right\} \endmath %
+ %
+ \setlength{\@spaceaftergroup}{\linewidth}
+ \addtolength\@spaceaftergroup{-\@grouplength}
+ \addtolength\@spaceaftergroup{-20pt}
+ \begin{minipage}[c]{\@spaceaftergroup}
+ \@groupname %
+ \end{minipage}
+ \newline %
+ }{}%
}
\newcommand{\setcharactername}[2]{%
\expandafter\gdef\csname#1name\endcsname{%
@@ -494,17 +415,16 @@
}%
}
\newcommand{\@definecharactercommand}[2]{%
- \@ifundefined{#1}{%
- }{%
+ \ifcsdef{#1}{%
\ClassError{thalie}{%
A command named \@backslashchar#1 already exists. We cannot define a new
one.%
}{%
Choose another command name to introduce character #2's lines.%
}%
- }%
- \@ifundefined{#1name}{%
}{%
+ }%
+ \ifcsdef{#1name}{%
\ClassError{thalie}{%
A command named \@backslashchar#1name already exists. We cannot define a
new one.%
@@ -513,6 +433,7 @@
when a new command is defined by adding "name" to it, it does not
conflict with an existing one.
}%
+ }{%
}%
\setcharactername{#1}{#2}%
}
@@ -520,7 +441,8 @@
\def\defcharcommand@without#1{\@speaks{#1}}
\pgfkeys{
% Character definition
- /CHARACTER/.is family, /CHARACTER,
+ /THALIE/CHARACTER/.is family,
+ /THALIE/CHARACTER,
cmd/.value required,
cmd/.store in=\@cmd,
drama/.value required,
@@ -532,36 +454,34 @@
\undef{\@drama}
\undef{\@cmd}
\undef{\@desc}
- \pgfkeys{/CHARACTER, #1}%
+ \pgfkeys{/THALIE/CHARACTER, #1}%
% Forbidden combinations
- \ifthenelse{
- \( \( \NOT \isundefined{\@cmd} \) \AND \equal{#2}{} \) \OR
- \( \equal{#2}{} \AND \isundefined{\@cmd} \AND \isundefined{\@desc} \AND \isundefined{\@drama} \) \OR
- \( \isundefined{\@cmd} \AND \( \NOT \equal{#2}{} \) \AND \( \NOT \isundefined{\@drama} \) \)
+ \ifboolexpr{
+ ( test{\ifdef{\@cmd}} and test{\ifstrempty{#2}} ) or
+ ( test{\ifstrempty{#2}} and test{\ifundef{\@cmd}} and test{\ifundef{\@desc}} and test{\ifundef{\@drama}} ) or
+ ( test{\ifundef{\@cmd}} and (not test{\ifstrempty{#2}}) and test{\ifdef{\@drama}} )
}{
\ClassError{thalie}{Invalid character definition.}{All combination of omitted arguments are not allowed. See the documentation for more information}
- }{
- % Defining character command
- \ifthenelse{\( \NOT \isundefined{\@cmd} \) \AND \( \NOT \equal{#2}{} \)}{
- \@definecharactercommand{\@cmd}{#2}
- }{
- }
- \ifthenelse{
- \( \NOT \equal{#2}{} \) \AND \( \NOT \isundefined{\@cmd} \) \AND \( \NOT \isundefined{\@drama} \) \AND \isundefined{\@desc}
- }{
- \ifthenelse{\equal{\@drama}{}}{
+ }{}
+ % Defining character command
+ \ifboolexpr{ test{\ifdef{\@cmd}} and (not test{\ifstrempty{#2}}) }{%
+ \@definecharactercommand{\@cmd}{#2}
+ }{}%
+ \notbool{@dramatis@hidden}{%
+ \ifboolexpr{ (not test{\ifstrempty{#2}}) and test{\ifdef{\@cmd}} and test{\ifdef{\@drama}} and test{\ifundef{\@desc}}}{%
+ \ifdefempty{\@drama}{%
% Hidden character. Nothing added to dramatis personae
- }{
+ }{%
% Populating dramatis personae
- \protected@xappto{\@dramatis@hook}{\noexpand\@character{\@drama}{}}
- }
- }{
+ \dramatischaracter{\@drama}{\@empty@}
+ }%
+ }{%
% Populating dramatis personae
- \@ifundefined{@desc}{\def\@desc{}}{}
- \@ifundefined{@drama}{\def\@drama{#2}}{}
- \protected@xappto{\@dramatis@hook}{\noexpand\@character{\@drama}{\@desc}}
- }
- }
+ \ifcsundef{@desc}{\gdef\@desc{}}{}%
+ \ifcsundef{@drama}{\gdef\@drama{#2}}{}%
+ \dramatischaracter{\@drama}{\@desc}
+ }%
+ }{}%
}
\newcommand{\disposablecharacter}[2][]{%
\@speaks[#1]{#2}%
@@ -575,7 +495,7 @@
\end{em}
\end{quote}
}
-\newcommand\pause{\did{\pausename}}
+\newcommand\pause{\did{\GetTranslation{Pause}}}
\newlength{\@verseadjust}
@@ -595,6 +515,110 @@
\newcommand{\resumeverse}{%
\hspace{\@verseadjust}\hspace{\the\dimen\@ne}
}
+\RequirePackage{pgfopts}
+
+\pgfkeys{
+ % Character style
+ /THALIE/.cd,
+ characterstyle/.value required,
+ characterstyle/.default=simple,
+ characterstyle/.is choice,
+ characterstyle/bold/.code=\@setcharacterstyle{bold},
+ characterstyle/center/.code=\@setcharacterstyle{center},
+ characterstyle/margin/.code=\@setcharacterstyle{margin},
+ characterstyle/simple/.code=\@setcharacterstyle{simple},
+ characterstyle/arden/.code=\@setcharacterstyle{arden},
+ characterstyle/imprimerie-verse/.code=\@setcharacterstyle{imprimerie-verse},
+ characterstyle/imprimerie-prose/.code=\@setcharacterstyle{imprimerie-prose},
+ characterstyle,
+}
+
+\pgfkeys{
+ % play style
+ /THALIE/.cd,
+ playstyle/.value required,
+ playstyle/.default=box,
+ playstyle/.is choice,
+ playstyle/center/.code=\def\@playstyle{center},
+ playstyle/bigcenter/.code=\def\@playstyle{bigcenter},
+ playstyle/box/.code=\def\@playstyle{box},
+ playstyle/custom/.code=\def\@playstyle{custom},
+ playstyle,
+}
+\pgfkeys{
+ % act style
+ /THALIE/.cd,
+ actstyle/.value required,
+ actstyle/.default=bigcenter,
+ actstyle/.is choice,
+ actstyle/center/.code=\def\@actstyle{center},
+ actstyle/bigcenter/.code=\def\@actstyle{bigcenter},
+ actstyle/box/.code=\def\@actstyle{box},
+ actstyle/custom/.code=\def\@actstyle{custom},
+ actstyle,
+}
+\pgfkeys{
+ % scene style
+ /THALIE/.cd,
+ scenestyle/.value required,
+ scenestyle/.default=center,
+ scenestyle/.is choice,
+ scenestyle/center/.code=\def\@scenestyle{center},
+ scenestyle/bigcenter/.code=\def\@scenestyle{bigcenter},
+ scenestyle/box/.code=\def\@scenestyle{box},
+ scenestyle/custom/.code=\def\@scenestyle{custom},
+ scenestyle,
+}
+
+\pgfkeys{
+ % play level
+ /THALIE/.cd,
+ playlevel/.value required,
+ playlevel/.default=chapter,
+ playlevel/.store in=\@playlevel,
+ playlevel,
+}
+\pgfkeys{
+ % act level
+ /THALIE/.cd,
+ actlevel/.value required,
+ actlevel/.default=section,
+ actlevel/.store in=\@actlevel,
+ actlevel,
+}
+\pgfkeys{
+ % scene level
+ /THALIE/.cd,
+ scenelevel/.value required,
+ scenelevel/.default=subsection,
+ scenelevel/.store in=\@scenelevel,
+ scenelevel,
+}
+\pgfkeys{
+ % interlude level
+ /THALIE/.cd,
+ interludelevel/.value required,
+ interludelevel/.default=act,
+ interludelevel/.is choice,
+ interludelevel/play/.code=\def\@interludelevel{play},
+ interludelevel/act/.code=\def\@interludelevel{act},
+ interludelevel/scene/.code=\def\@interludelevel{scene},
+ interludelevel,
+}
+\newif\if@xspace
+\pgfkeys{
+ % xspace option
+ /THALIE/.cd,
+ xspace/.value required,
+ xspace/.is if=@xspace,
+ xspace/.default=true,
+ xspace,
+}
+
+\ProcessPgfPackageOptions{/THALIE}
+\newcommand{\setthalieoptions}[1]{%
+ \pgfkeys{/THALIE/.cd, #1}%
+}
\endinput
%%
%% End of file `thalie.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.tlpobj new/tlpkg/tlpobj/thalie.tlpobj
--- old/tlpkg/tlpobj/thalie.tlpobj 2016-04-14 19:51:34.000000000 +0200
+++ new/tlpkg/tlpobj/thalie.tlpobj 2017-04-26 02:09:51.000000000 +0200
@@ -1,17 +1,20 @@
name thalie
category Package
-revision 39241
+revision 44048
shortdesc Typeset drama plays
relocated 1
longdesc The package provides tools to typeset drama plays. It defines
longdesc commands to introduce characters' lines, to render stage
longdesc directions, to divide a play into acts and scenes and to build
longdesc the dramatis personae automatically.
-runfiles size=4
+runfiles size=8
+ RELOC/tex/latex/thalie/thalie-english.trsl
+ RELOC/tex/latex/thalie/thalie-fallback.trsl
+ RELOC/tex/latex/thalie/thalie-french.trsl
RELOC/tex/latex/thalie/thalie.sty
catalogue-also drama dramatist play
catalogue-ctan /macros/latex/contrib/thalie
-catalogue-date 2015-12-30 21:00:07 +0100
+catalogue-date 2017-04-24 23:53:23 +0200
catalogue-license lppl1.3
catalogue-topics drama-script
-catalogue-version 0.8
+catalogue-version 0.9b
++++++ theoremref.doc.tar.xz ++++++
++++++ theoremref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/theoremref.tlpobj new/tlpkg/tlpobj/theoremref.tlpobj
--- old/tlpkg/tlpobj/theoremref.tlpobj 2016-04-14 19:51:34.000000000 +0200
+++ new/tlpkg/tlpobj/theoremref.tlpobj 2017-04-14 18:02:41.000000000 +0200
@@ -12,6 +12,6 @@
runfiles size=3
RELOC/tex/latex/theoremref/theoremref.sty
catalogue-ctan /macros/latex/contrib/theoremref
-catalogue-date 2015-08-03 05:43:12 +0200
-catalogue-license lppl
+catalogue-date 2016-12-28 10:23:26 +0100
+catalogue-license lpplgpl2
catalogue-topics label-ref maths-theorem
++++++ thesis-ekf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/README new/doc/latex/thesis-ekf/README
--- old/doc/latex/thesis-ekf/README 2015-04-20 00:33:46.000000000 +0200
+++ new/doc/latex/thesis-ekf/README 2017-04-11 00:04:27.000000000 +0200
@@ -1,22 +1,18 @@
-thesis-ekf class, 2014 by Tibor Tomacs
+thesis-ekf class
+Copyright 2014- by Tibor Tomacs
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.2 of this license or (at your option) any later
version. The latest version of this license is in:
- http://www.latex-project.org/lppl.txt
+http://www.latex-project.org/lppl.txt
and version 1.2 or later is part of all distributions of
LaTeX version 1999/12/01 or later.
Install:
- - run 'latex thesis-ekf.ins' for the cls file
- - run twice 'pdflatex thesis-ekf.dtx' to get the documentation
-
-Thesis class for the Eszterhazy Karoly College (Eger, Hungary).
-Since the college is in Hungary,
-the documentation is given in Hungarian only.
-
-LaTeX-osztaly szakdolgozat keszitesehez
-az Eszterhazy Karoly Foiskola hallgatoi reszere.
\ No newline at end of file
+ - Run 'latex thesis-ekf.ins' for the cls file.
+ - Run twice 'pdflatex thesis-ekf.dtx' to get the documentation.
+
+Thesis class for the Eszterhazy Karoly University (Eger, Hungary).
\ No newline at end of file
Binary files old/doc/latex/thesis-ekf/szakdolgozat1.pdf and new/doc/latex/thesis-ekf/szakdolgozat1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/szakdolgozat1.tex new/doc/latex/thesis-ekf/szakdolgozat1.tex
--- old/doc/latex/thesis-ekf/szakdolgozat1.tex 2015-04-20 00:33:46.000000000 +0200
+++ new/doc/latex/thesis-ekf/szakdolgozat1.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-\documentclass{thesis-ekf}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\PassOptionsToPackage{defaults=hu-min}{magyar.ldf}
-\usepackage[magyar]{babel}
-\usepackage{graphicx,amsmath,amssymb,amsthm}
-\graphicspath{{./images/}}
-\footnotestyle{rule=fourth}
-
-\newtheorem{tetel}{Tétel}[chapter]
-\newtheorem{lemma}[tetel]{Lemma}
-\theoremstyle{definition}
-\newtheorem{definicio}[tetel]{Definíció}
-\newtheorem{feladat}[tetel]{Feladat}
-\theoremstyle{remark}
-\newtheorem{megjegyzes}[tetel]{Megjegyzés}
-\newtheorem*{megoldas}{Megoldás}
-
-\logo{\includegraphics[width=8cm]{ekf-logo1}}
-\institute{Eszterházy Károly Főiskola\\ Matematikai és Informatikai Intézet}
-\title{A szakdolgozat címe}
-\authorcaption{Készítette:}
-\author{Szerző neve\\ szak}
-\supervisorcaption{Témavezető:}
-\supervisor{Tanár neve\\ beosztás}
-\city{Eger}
-\date{2015}
-
-\begin{document}
-\maketitle
-\tableofcontents
-
-\chapter*{Bevezetés}
-
-\chapter{Fejezet címe}
-
-\section{Szakasz címe}
-
-\subsection{Alszakasz címe}
-
-\begin{thebibliography}{1}
-\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám.
-\end{thebibliography}
-\end{document}
Binary files old/doc/latex/thesis-ekf/szakdolgozat2.pdf and new/doc/latex/thesis-ekf/szakdolgozat2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/szakdolgozat2.tex new/doc/latex/thesis-ekf/szakdolgozat2.tex
--- old/doc/latex/thesis-ekf/szakdolgozat2.tex 2015-04-20 00:33:46.000000000 +0200
+++ new/doc/latex/thesis-ekf/szakdolgozat2.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-\documentclass[logodown]{thesis-ekf}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\PassOptionsToPackage{defaults=hu-min}{magyar.ldf}
-\usepackage[magyar]{babel}
-\usepackage{graphicx,amsmath,amssymb,amsthm}
-\graphicspath{{./images/}}
-\footnotestyle{rule=fourth}
-
-\newtheorem{tetel}{Tétel}[chapter]
-\newtheorem{lemma}[tetel]{Lemma}
-\theoremstyle{definition}
-\newtheorem{definicio}[tetel]{Definíció}
-\newtheorem{feladat}[tetel]{Feladat}
-\theoremstyle{remark}
-\newtheorem{megjegyzes}[tetel]{Megjegyzés}
-\newtheorem*{megoldas}{Megoldás}
-
-\logo{\includegraphics[width=3cm]{ekf-logo2}}
-\institute{Eszterházy Károly Főiskola\\ Matematikai és Informatikai Intézet}
-\title{A szakdolgozat címe}
-\authorcaption{Készítette:}
-\author{Szerző neve\\ szak}
-\supervisorcaption{Témavezető:}
-\supervisor{Tanár neve\\ beosztás}
-\city{Eger}
-\date{2015}
-
-\begin{document}
-\maketitle
-\tableofcontents
-
-\chapter*{Bevezetés}
-
-\chapter{Fejezet címe}
-
-\section{Szakasz címe}
-
-\subsection{Alszakasz címe}
-
-\begin{thebibliography}{1}
-\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám.
-\end{thebibliography}
-\end{document}
Binary files old/doc/latex/thesis-ekf/szakdolgozat3.pdf and new/doc/latex/thesis-ekf/szakdolgozat3.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/szakdolgozat3.tex new/doc/latex/thesis-ekf/szakdolgozat3.tex
--- old/doc/latex/thesis-ekf/szakdolgozat3.tex 2015-04-20 00:33:46.000000000 +0200
+++ new/doc/latex/thesis-ekf/szakdolgozat3.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-\documentclass[centeredchapter]{thesis-ekf}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\PassOptionsToPackage{defaults=hu-min}{magyar.ldf}
-\usepackage[magyar]{babel}
-\usepackage{graphicx,amsmath,amssymb,amsthm}
-\graphicspath{{./images/}}
-\footnotestyle{rule=fourth}
-
-\newtheorem{tetel}{Tétel}[chapter]
-\newtheorem{lemma}[tetel]{Lemma}
-\theoremstyle{definition}
-\newtheorem{definicio}[tetel]{Definíció}
-\newtheorem{feladat}[tetel]{Feladat}
-\theoremstyle{remark}
-\newtheorem{megjegyzes}[tetel]{Megjegyzés}
-\newtheorem*{megoldas}{Megoldás}
-
-\logo{\includegraphics[width=9cm]{ekf-logo3}}
-\institute{Matematikai és Informatikai Intézet}
-\title{A szakdolgozat címe}
-\authorcaption{Készítette:}
-\author{Szerző neve\\ szak}
-\supervisorcaption{Témavezető:}
-\supervisor{Tanár neve\\ beosztás}
-\city{Eger}
-\date{2015}
-
-\begin{document}
-\maketitle
-\tableofcontents
-
-\chapter*{Bevezetés}
-
-\chapter{Fejezet címe}
-
-\section{Szakasz címe}
-
-\subsection{Alszakasz címe}
-
-\begin{thebibliography}{1}
-\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám.
-\end{thebibliography}
-\end{document}
Binary files old/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eke-logo.pdf and new/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eke-logo.pdf differ
Binary files old/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eku-logo.pdf and new/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eku-logo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex
--- old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex 2017-04-11 00:04:27.000000000 +0200
@@ -0,0 +1,36 @@
+\documentclass[colorlinks]{thesis-ekf}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+\usepackage{graphicx,amsmath,amssymb,amsthm}
+\graphicspath{{./figures/}}
+
+\newtheorem{thm}{Theorem}[chapter]
+\newtheorem{lemma}[thm]{Lemma}
+\theoremstyle{definition}
+\newtheorem{defin}[thm]{Definition}
+\newtheorem{exercise}[thm]{Exercise}
+\theoremstyle{remark}
+\newtheorem{remark}[thm]{Remark}
+\newtheorem*{answer}{Answer}
+
+\begin{document}
+\logo{\includegraphics[width=9cm]{eku-logo}}
+\institute{Institute of Mathematics and Informatics}
+\title{Title}
+\author{John Smith\\ Mathematics B.Sc.}
+\supervisor{Dr.~John Brown\\ associate professor}
+\city{Eger}
+\date{2017}
+\maketitle
+\tableofcontents
+
+\chapter*{Introduction}
+\chapter{Chapter title}
+\section{Section title}
+\subsection{Subsection title}
+
+\begin{thebibliography}{1}
+\bibitem{Birkel} \textsc{Birkel, T.}, Moment bounds for associated sequences, Ann.\ Probab.\ 16, 1988.
+\end{thebibliography}
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex
--- old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex 2017-04-11 00:04:27.000000000 +0200
@@ -0,0 +1,38 @@
+\documentclass[colorlinks]{thesis-ekf}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\PassOptionsToPackage{defaults=hu-min}{magyar.ldf}
+\usepackage[magyar]{babel}
+\usepackage{graphicx,amsmath,amssymb,amsthm}
+\graphicspath{{./figures/}} % A képfájlokat a [figures] mappába kell tenni!
+\footnotestyle{rule=fourth}
+
+\newtheorem{tetel}{Tétel}[chapter]
+\newtheorem{lemma}[tetel]{Lemma}
+\theoremstyle{definition}
+\newtheorem{definicio}[tetel]{Definíció}
+\newtheorem{feladat}[tetel]{Feladat}
+\theoremstyle{remark}
+\newtheorem{megjegyzes}[tetel]{Megjegyzés}
+\newtheorem*{megoldas}{Megoldás}
+
+\begin{document}
+\logo{\includegraphics[width=9cm]{eke-logo}}
+\institute{Matematikai és Informatikai Intézet}
+\title{A szakdolgozat címe}
+\author{Szerző neve\\ szak}
+\supervisor{Tanár neve\\ beosztás}
+\city{Eger}
+\date{2017}
+\maketitle
+\tableofcontents
+
+\chapter*{Bevezetés}
+\chapter{Fejezet címe}
+\section{Szakasz címe}
+\subsection{Alszakasz címe}
+
+\begin{thebibliography}{1}
+\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám.
+\end{thebibliography}
+\end{document}
Binary files old/doc/latex/thesis-ekf/thesis-ekf.pdf and new/doc/latex/thesis-ekf/thesis-ekf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj
--- old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2016-04-14 19:51:34.000000000 +0200
+++ new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2017-04-14 18:02:41.000000000 +0200
@@ -1,14 +1,12 @@
name thesis-ekf.doc
category Package
-revision 36950
+revision 43745
shortdesc doc files of thesis-ekf
relocated 1
-docfiles size=567
+docfiles size=291
RELOC/doc/latex/thesis-ekf/README
- RELOC/doc/latex/thesis-ekf/szakdolgozat1.pdf
- RELOC/doc/latex/thesis-ekf/szakdolgozat1.tex
- RELOC/doc/latex/thesis-ekf/szakdolgozat2.pdf
- RELOC/doc/latex/thesis-ekf/szakdolgozat2.tex
- RELOC/doc/latex/thesis-ekf/szakdolgozat3.pdf
- RELOC/doc/latex/thesis-ekf/szakdolgozat3.tex
+ RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eke-logo.pdf
+ RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eku-logo.pdf
+ RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex
+ RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex
RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf
++++++ thesis-ekf.tar.xz ++++++
Binary files old/tex/latex/thesis-ekf/images/ekf-logo1.png and new/tex/latex/thesis-ekf/images/ekf-logo1.png differ
Binary files old/tex/latex/thesis-ekf/images/ekf-logo2.pdf and new/tex/latex/thesis-ekf/images/ekf-logo2.pdf differ
Binary files old/tex/latex/thesis-ekf/images/ekf-logo3.pdf and new/tex/latex/thesis-ekf/images/ekf-logo3.pdf differ
Binary files old/tex/latex/thesis-ekf/images/ekf-logo4.pdf and new/tex/latex/thesis-ekf/images/ekf-logo4.pdf differ
Binary files old/tex/latex/thesis-ekf/images/ekf-logo5.pdf and new/tex/latex/thesis-ekf/images/ekf-logo5.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thesis-ekf/thesis-ekf.cls new/tex/latex/thesis-ekf/thesis-ekf.cls
--- old/tex/latex/thesis-ekf/thesis-ekf.cls 2015-04-20 00:33:46.000000000 +0200
+++ new/tex/latex/thesis-ekf/thesis-ekf.cls 2017-04-11 00:04:27.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% ./thesis-ekf.dtx (with options: `class')
%% This is a generated file.
-%% Copyright (C) 2014 Tibor Tomacs
+%% Copyright (C) 2014- by Tibor Tomacs
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.2 of this license or (at your option) any later
@@ -19,56 +19,65 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{thesis-ekf}[2015/04/19 v1.1 class for EKF thesis]
-\LoadClass[a4paper,12pt]{report}
-\RequirePackage[top=25mm,bottom=25mm,inner=30mm,outer=25mm]{geometry}
-\RequirePackage[unicode,linktocpage,linkcolor=blue,citecolor=blue,urlcolor=blue,
-pdfstartview=FitH,bookmarksnumbered,pdfborder={0 0 0}]{hyperref}
-\linespread{1.24}
-\overfullrule10pt
+\ProvidesClass{thesis-ekf}[2017/04/08 v2.1 Thesis class for Eszterhazy Karoly University (Eger, Hungary)]
+
+\RequirePackage{kvoptions,etoolbox,setspace}
+\SetupKeyvalOptions{family=ekf,prefix=ekf@}
+\DeclareVoidOption{twoside}{\PassOptionsToClass{twoside}{report}}
+\DeclareVoidOption{colorlinks}{\PassOptionsToPackage{colorlinks}{hyperref}}
+\DeclareBoolOption{logodown}
+\DeclareBoolOption[true]{centeredchapter}
+\DeclareStringOption[12pt]{fontsize}
+\DeclareStringOption[10mm]{institutesep}
+\DeclareStringOption[0mm]{logosep}
+\DeclareStringOption[\stretch{1.5}]{titlesep}
+\DeclareStringOption[15mm]{authorsep}
+\DeclareStringOption[10mm]{xmargin}
+\DeclareStringOption[1mm]{captionsep}
+\DeclareStringOption[\large\normalfont\scshape]{institutefont}
+\DeclareStringOption[\large\normalfont\scshape]{logofont}
+\DeclareStringOption[\Huge\normalfont\sffamily\bfseries]{titlefont}
+\DeclareStringOption[\large\normalfont]{authorfont}
+\DeclareStringOption[\large\normalfont\bfseries]{captionfont}
+\DeclareStringOption[\large\normalfont\scshape]{cityfont}
+\ProcessKeyvalOptions{ekf}
+\InputIfFileExists{thesis-ekf.cfg}{}{}
+
+\def\ekf@ten{10pt}
+\def\ekf@eleven{11pt}
+\def\ekf@twelve{12pt}
+
+\ifx\ekf@fontsize\ekf@ten\else
+\ifx\ekf@fontsize\ekf@eleven\else
+\ifx\ekf@fontsize\ekf@twelve\else
+\ClassWarning{thesis-ekf}{Unused option: fontsize=\ekf@fontsize. Use fontsize=10pt, fontsize=11pt or fontsize=12pt!}
+\def\ekf@fontsize{12pt}
+\fi\fi\fi
+
+\PassOptionsToClass{\ekf@fontsize}{report}
+\LoadClass{report}
+
+\RequirePackage[unicode,linktocpage,allcolors=blue,pdfstartview=FitH,bookmarksnumbered,pdfborder={0 0 0}]{hyperref}
+\RequirePackage[a4paper,top=25mm,bottom=25mm,inner=30mm,outer=25mm]{geometry}
+
+\onehalfspacing
\flushbottom
\widowpenalty=10000
\clubpenalty=10000
-\if@twoside
-\def\ps@plain{}
-\def\@oddfoot{\hbox{}\hfill\normalsize\textnormal\thepage}
-\def\@evenfoot{\normalsize\textnormal\thepage}
-\def\@aftertitlepage{\thispagestyle{empty}\hbox{}\newpage}
-\else
-\def\@aftertitlepage{}
-\fi
-
-\renewcommand*\l@chapter[2]{%
- \ifnum \c@tocdepth >\z@
- \addpenalty\@secpenalty
- \addvspace{1.0em \@plus\p@}%
- \setlength\@tempdima{1.8em}%
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \leavevmode \bfseries
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
- \endgroup
- \fi}
-\renewcommand*\l@section{\@dottedtocline{1}{1.8em}{2.5em}}
-\renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.2em}}
-
-\def\thesisekf@chapternumber{%
+\def\ekf@chapternumber{%
\@ifundefined{l@magyar}
{\@chapapp\space \thechapter}
{\iflanguage{magyar}
{\magyar@huordinal@chapterheaddot \@chapapp}
{\@chapapp\space \thechapter}}}
-\def\thesisekf@centeredchapter{%
+\def\ekf@centeredchapter{%
\def\@makechapterhead##1{%
\vspace*{50\p@}%
{\parindent \z@ \raggedright \normalfont
\ifnum \c@secnumdepth >\m@ne
- {\centering\huge\bfseries \thesisekf@chapternumber
+ {\centering\huge\bfseries \ekf@chapternumber
\par\nobreak}
\vskip 20\p@
\fi
@@ -85,55 +94,147 @@
\vskip 40\p@
}}}
-\def\logo#1{\def\@logo{#1}}\logo{LOGO}
-\def\institute#1{\def\@institute{#1}}\institute{INSTITUTE}
-\def\authorcaption#1{\def\@authorcaption{#1}}\authorcaption{Author:}
-\def\supervisorcaption#1{\def\@supervisorcaption{#1}}\supervisorcaption{Supervisor:}
-\def\supervisor#1{\def\@supervisor{#1}}\supervisor{}
-\def\city#1{\def\@city{#1}}\city{}
+\AfterEndPreamble{
+
+\ifekf@centeredchapter
+ \ekf@centeredchapter
+ \let\original@selectlanguage\selectlanguage
+ \def\selectlanguage#1{\original@selectlanguage{#1}\ekf@centeredchapter}\fi
+
+\def\@dottedtocline#1#2#3#4#5{%
+ \ifnum #1>\c@tocdepth \else
+ \vskip \z@ \@plus.2\p@
+ {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+ \parindent #2\relax\@afterindenttrue
+ \interlinepenalty\@M
+ \leavevmode
+ \@tempdima #3\relax
+ \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ {#4}\nobreak
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+ mu$}\hfill
+ \nobreak
+ \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
+ \par}%
+ \fi}
+
+\renewcommand*\l@chapter[2]{%
+ \ifnum \c@tocdepth >\z@
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}%
+ \setlength\@tempdima{1.8em}%
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode \bfseries
+ \advance\leftskip\@tempdima
+ \hskip -\leftskip
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \endgroup
+ \fi}
+\renewcommand*\l@section{\@dottedtocline{1}{1.8em}{2.5em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{4.3em}{3.2em}}
+
+\if@nochanged@authorcaption@%
+ \@ifundefined{l@magyar}{}{%
+ \iflanguage{magyar}{\gdef\ekf@authorcaption{K\'{e}sz\'{\i}tette}}{}}\fi
+
+\if@nochanged@supervisorcaption@%
+ \@ifundefined{l@magyar}{}{%
+ \iflanguage{magyar}{\gdef\ekf@supervisorcaption{T\'{e}mavezet\H{o}}}{}}\fi
+
+}
+
+\def\logo#1{\gdef\ekf@logo{#1}}
+\logo{}
+\def\ekf@logo@{\ifx\ekf@logo\@empty%
+ \ClassWarning{thesis-ekf}{There isn't logo!}%
+ \else\ekf@logo\fi}
+
+\def\institute#1{\gdef\ekf@institute{#1}}
+\institute{}
+\def\ekf@institute@{\ifx\ekf@institute\@empty%
+ \ClassWarning{thesis-ekf}{There isn't institute!}%
+ \else\ekf@institute\fi}
+
+\def\title#1{\gdef\ekf@title{#1}}
+\title{}
+\def\ekf@title@{\ifx\ekf@title\@empty
+ \ClassWarning{thesis-ekf}{There isn't title!}~%
+ \else\ekf@title\fi}
+
+\def\author#1{\gdef\ekf@author{#1}}
+\author{}
+\def\ekf@author@{\ifx\ekf@author\@empty
+ \ClassWarning{thesis-ekf}{There isn't author!}~%
+ \else\ekf@author\fi}
+
+\newif\if@nochanged@authorcaption@\@nochanged@authorcaption@true
+\def\authorcaption#1{\@nochanged@authorcaption@false\gdef\ekf@authorcaption{#1}}
+\def\ekf@authorcaption{Author}
+\def\ekf@authorcaption@{\ifx\ekf@author\@empty~%
+ \else
+ \ifx\ekf@authorcaption\@empty
+ \ClassWarning{thesis-ekf}{There isn't authorcaption!}~%
+ \else\ekf@authorcaption\fi\fi}
+
+\def\supervisor#1{\gdef\ekf@supervisor{#1}}
+\supervisor{}
+\def\ekf@supervisor@{\ifx\ekf@supervisor\@empty
+ \ClassWarning{thesis-ekf}{There isn't supervisor!}~%
+ \else\ekf@supervisor\fi}
+
+\newif\if@nochanged@supervisorcaption@\@nochanged@supervisorcaption@true
+\def\supervisorcaption#1{\@nochanged@supervisorcaption@false\gdef\ekf@supervisorcaption{#1}}
+\def\ekf@supervisorcaption{Supervisor}
+\def\ekf@supervisorcaption@{\ifx\ekf@supervisor\@empty~%
+ \else
+ \ifx\ekf@supervisorcaption\@empty
+ \ClassWarning{thesis-ekf}{There isn't supervisorcaption!}~%
+ \else\ekf@supervisorcaption\fi\fi}
+
+\def\city#1{\gdef\ekf@city{#1}}
+\city{}
+\def\ekf@city@{\ekf@city\ifx\ekf@city\@empty%
+ \ClassWarning{thesis-ekf}{There isn't city!}\fi}
+
+\def\date#1{\gdef\ekf@date{#1}}
+\date{\number\year}
+\def\ekf@date@{\ekf@date\ifx\ekf@date\@empty%
+ \ClassWarning{thesis-ekf}{There isn't date!}\fi}
+
+\def\ekf@sep{,~}
+\def\ekf@sep@{\ifx\ekf@city\@empty\else\ifx\ekf@date\@empty\else\ekf@sep\fi\fi}
\def\maketitle{
-\if@centeredchapter
-\thesisekf@centeredchapter
-\let\oldselectlanguage\selectlanguage
-\def\selectlanguage##1{\oldselectlanguage{##1}\thesisekf@centeredchapter}
-\fi
\thispagestyle{empty}
-\begin{large}
-\centering
-\if@logono{\scshape\@institute\\}\fi
-\if@logoup{\scshape\@logo\\\@institute\\}\fi
-\if@logodown{\scshape\@institute\\[10mm]\@logo\\}\fi
-\vfill{\Huge\sffamily\bfseries\@title\\}\vspace{\stretch{1.8}}
-\begin{tabular}[t]{@{\hspace{10mm}}l@{}}
-{\bfseries\@authorcaption}\\[1mm]
-\@author
+{\centering
+\ifekf@logodown
+{\ekf@institutefont\ekf@institute@\ifx\ekf@institute\@empty\else\\
+\vspace{\ekf@institutesep}\fi}
+{\ekf@logofont\ekf@logo@\ifx\ekf@logo\@empty~\\\else\\\fi}
+\else
+{\ekf@logofont\ekf@logo@\ifx\ekf@logo\@empty\else\\\vspace{\ekf@logosep}\fi}
+{\ekf@institutefont\ekf@institute@\ifx\ekf@institute\@empty~\\\else\\\fi}
+\fi
+\vfill{\ekf@titlefont\ekf@title@\\}\vspace{\ekf@titlesep}
+{\ekf@authorfont
+\begin{tabular}[t]{@{\hspace{\ekf@xmargin}}l@{}}
+{\ekf@captionfont\ekf@authorcaption@}\\[\ekf@captionsep]
+\ekf@author@
\end{tabular}
\hfill
-\begin{tabular}[t]{@{}l@{\hspace{10mm}}}
-{\bfseries\@supervisorcaption}\\[1mm]
-\@supervisor
-\end{tabular}
-\par\vspace{15mm}
-{\scshape\@city\if\@city\empty\else,~\fi\@date\par}
-\end{large}
-\newpage\@aftertitlepage}
-
-\newif\if@logono
-\newif\if@logoup
-\newif\if@logodown
-\newif\if@centeredchapter
-
-\DeclareOption{nocolorlinks}{\hypersetup{colorlinks=false}}
-\DeclareOption{colorlinks}{\hypersetup{colorlinks}}
-\DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse}
-\DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue}
-\DeclareOption{logono}{\@logonotrue\@logoupfalse\@logodownfalse}
-\DeclareOption{logoup}{\@logonofalse\@logouptrue\@logodownfalse}
-\DeclareOption{logodown}{\@logonofalse\@logoupfalse\@logodowntrue}
-\DeclareOption{centeredchapter}{\@centeredchaptertrue}
-\ExecuteOptions{nocolorlinks,oneside,logoup}
-\ProcessOptions
+\begin{tabular}[t]{@{}l@{\hspace{\ekf@xmargin}}}
+{\ekf@captionfont\ekf@supervisorcaption@}\\[\ekf@captionsep]
+\ekf@supervisor@
+\end{tabular}}
+\par\vspace{\ekf@authorsep}
+{\ekf@cityfont\ekf@city@\ekf@sep@\ekf@date@\par}
+}
+\newpage
+\if@twoside\thispagestyle{empty}\hbox{}\newpage\fi}
+
\endinput
%%
%% End of file `thesis-ekf.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-ekf.tlpobj new/tlpkg/tlpobj/thesis-ekf.tlpobj
--- old/tlpkg/tlpobj/thesis-ekf.tlpobj 2016-04-14 19:51:35.000000000 +0200
+++ new/tlpkg/tlpobj/thesis-ekf.tlpobj 2017-04-14 18:02:41.000000000 +0200
@@ -1,19 +1,14 @@
name thesis-ekf
category Package
-revision 36950
-shortdesc Thesis class for Eszterhazy Karoly College
+revision 43745
+shortdesc Thesis class for Eszterhazy Karoly University
relocated 1
-longdesc The distribution contains the files to generate the thesis
-longdesc class as well as three templates.
-runfiles size=848
- RELOC/tex/latex/thesis-ekf/images/ekf-logo1.png
- RELOC/tex/latex/thesis-ekf/images/ekf-logo2.pdf
- RELOC/tex/latex/thesis-ekf/images/ekf-logo3.pdf
- RELOC/tex/latex/thesis-ekf/images/ekf-logo4.pdf
- RELOC/tex/latex/thesis-ekf/images/ekf-logo5.pdf
+longdesc This is a class file for theses and dissertations in the
+longdesc Eszterhazy Karoly University (Eger, Hungary).
+runfiles size=2
RELOC/tex/latex/thesis-ekf/thesis-ekf.cls
catalogue-ctan /macros/latex/contrib/thesis-ekf
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-04-08 12:47:10 +0200
catalogue-license lppl1.2
catalogue-topics dissertation class
-catalogue-version 1.1
+catalogue-version 2.1
++++++ thesis-titlepage-fhac.doc.tar.xz ++++++
++++++ thesis-titlepage-fhac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj new/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj
--- old/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj 2016-04-14 19:51:37.000000000 +0200
+++ new/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj 2017-04-14 18:02:41.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/latex/thesis-titlepage-fhac/figbib_add.sty
RELOC/tex/latex/thesis-titlepage-fhac/gloss_add.sty
catalogue-ctan /macros/latex/contrib/thesis-titlepage-fhAC
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics dissertation
catalogue-version 0.1
++++++ thinsp.doc.tar.xz ++++++
++++++ thinsp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thinsp.tlpobj new/tlpkg/tlpobj/thinsp.tlpobj
--- old/tlpkg/tlpobj/thinsp.tlpobj 2016-04-14 19:51:38.000000000 +0200
+++ new/tlpkg/tlpobj/thinsp.tlpobj 2017-04-14 18:02:41.000000000 +0200
@@ -7,7 +7,7 @@
runfiles size=1
RELOC/tex/latex/thinsp/thinsp.sty
catalogue-ctan /macros/latex/contrib/thinsp
-catalogue-date 2016-02-10 22:17:36 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics typesetting
catalogue-version 0.2
++++++ thmbox.doc.tar.xz ++++++
++++++ thmbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmbox.tlpobj new/tlpkg/tlpobj/thmbox.tlpobj
--- old/tlpkg/tlpobj/thmbox.tlpobj 2016-04-14 19:51:38.000000000 +0200
+++ new/tlpkg/tlpobj/thmbox.tlpobj 2017-04-14 18:02:41.000000000 +0200
@@ -11,6 +11,6 @@
RELOC/tex/latex/thmbox/thmbox.sty
catalogue-also shadethm
catalogue-ctan /macros/latex/contrib/thmbox
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths-theorem decoration
++++++ thmtools.doc.tar.xz ++++++
++++++ thmtools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmtools.tlpobj new/tlpkg/tlpobj/thmtools.tlpobj
--- old/tlpkg/tlpobj/thmtools.tlpobj 2016-04-14 19:51:38.000000000 +0200
+++ new/tlpkg/tlpobj/thmtools.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -28,7 +28,7 @@
RELOC/tex/latex/thmtools/thmtools.sty
RELOC/tex/latex/thmtools/unique.sty
catalogue-ctan /macros/latex/exptl/thmtools
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics maths-theorem
catalogue-version 66
++++++ threadcol.doc.tar.xz ++++++
++++++ threadcol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threadcol.tlpobj new/tlpkg/tlpobj/threadcol.tlpobj
--- old/tlpkg/tlpobj/threadcol.tlpobj 2016-04-14 19:51:39.000000000 +0200
+++ new/tlpkg/tlpobj/threadcol.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -15,7 +15,7 @@
runfiles size=1
RELOC/tex/latex/threadcol/threadcol.sty
catalogue-ctan /macros/latex/contrib/threadcol
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics pdf-feat
catalogue-version 1.0
++++++ threeddice.doc.tar.xz ++++++
++++++ threeddice.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threeddice.tlpobj new/tlpkg/tlpobj/threeddice.tlpobj
--- old/tlpkg/tlpobj/threeddice.tlpobj 2016-04-14 19:51:39.000000000 +0200
+++ new/tlpkg/tlpobj/threeddice.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/metapost/threeddice/threeddice.mp
catalogue-also dice epsdice
catalogue-ctan /graphics/metapost/contrib/macros/threeddice
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use
catalogue-version 1.0
++++++ threeparttable.doc.tar.xz ++++++
++++++ threeparttable.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threeparttable.tlpobj new/tlpkg/tlpobj/threeparttable.tlpobj
--- old/tlpkg/tlpobj/threeparttable.tlpobj 2016-04-14 19:51:39.000000000 +0200
+++ new/tlpkg/tlpobj/threeparttable.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -13,6 +13,6 @@
RELOC/tex/latex/threeparttable/3parttable.sty
RELOC/tex/latex/threeparttable/threeparttable.sty
catalogue-ctan /macros/latex/contrib/threeparttable
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics table notes
++++++ threeparttablex.doc.tar.xz ++++++
++++++ threeparttablex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threeparttablex.tlpobj new/tlpkg/tlpobj/threeparttablex.tlpobj
--- old/tlpkg/tlpobj/threeparttablex.tlpobj 2016-04-14 19:51:39.000000000 +0200
+++ new/tlpkg/tlpobj/threeparttablex.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/tex/latex/threeparttablex/threeparttablex.sty
catalogue-ctan /macros/latex/contrib/threeparttablex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics table notes
catalogue-version 0.3
++++++ thumb.doc.tar.xz ++++++
++++++ thumb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumb.tlpobj new/tlpkg/tlpobj/thumb.tlpobj
--- old/tlpkg/tlpobj/thumb.tlpobj 2016-04-14 19:51:40.000000000 +0200
+++ new/tlpkg/tlpobj/thumb.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -8,7 +8,7 @@
RELOC/tex/latex/thumb/thumb.sty
catalogue-also fancyhdr
catalogue-ctan /macros/latex/contrib/thumb
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics layout-page
catalogue-version 1.0
++++++ thumbpdf.doc.tar.xz ++++++
++++++ thumbpdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumbpdf.tlpobj new/tlpkg/tlpobj/thumbpdf.tlpobj
--- old/tlpkg/tlpobj/thumbpdf.tlpobj 2016-04-14 19:51:40.000000000 +0200
+++ new/tlpkg/tlpobj/thumbpdf.tlpobj 2017-04-14 18:02:42.000000000 +0200
@@ -14,7 +14,7 @@
texmf-dist/tex/generic/thumbpdf/thumbpdf.sty
texmf-dist/tex/generic/thumbpdf/thumbpdf.tex
catalogue-ctan /support/thumbpdf
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pdf-feat
catalogue-version 3.16
++++++ thumbs.doc.tar.xz ++++++
++++++ thumbs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumbs.tlpobj new/tlpkg/tlpobj/thumbs.tlpobj
--- old/tlpkg/tlpobj/thumbs.tlpobj 2016-04-14 19:51:41.000000000 +0200
+++ new/tlpkg/tlpobj/thumbs.tlpobj 2017-04-14 18:02:43.000000000 +0200
@@ -15,7 +15,7 @@
runfiles size=14
RELOC/tex/latex/thumbs/thumbs.sty
catalogue-ctan /macros/latex/contrib/thumbs
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics layout-page
catalogue-version 1.0q
++++++ thumby.doc.tar.xz ++++++
++++++ thumby.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumby.tlpobj new/tlpkg/tlpobj/thumby.tlpobj
--- old/tlpkg/tlpobj/thumby.tlpobj 2016-04-14 19:51:41.000000000 +0200
+++ new/tlpkg/tlpobj/thumby.tlpobj 2017-04-14 18:02:43.000000000 +0200
@@ -14,7 +14,7 @@
runfiles size=3
RELOC/tex/latex/thumby/thumby.sty
catalogue-ctan /macros/latex/contrib/thumby
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl3
catalogue-topics layout-page
catalogue-version 0.1
++++++ thuthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/Makefile new/doc/latex/thuthesis/Makefile
--- old/doc/latex/thuthesis/Makefile 2016-03-02 00:38:54.000000000 +0100
+++ new/doc/latex/thuthesis/Makefile 2017-03-26 23:47:40.000000000 +0200
@@ -106,5 +106,5 @@
@if [ -z "$(version)" ]; then \
echo "Usage: make dist version=[x.y.z | ctan]"; \
else \
- gulp build --version=$(version); \
+ npm run build -- --version=$(version); \
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/README.md new/doc/latex/thuthesis/README.md
--- old/doc/latex/thuthesis/README.md 2016-03-02 00:38:54.000000000 +0100
+++ new/doc/latex/thuthesis/README.md 2017-03-26 23:47:40.000000000 +0200
@@ -7,7 +7,7 @@
此宏包旨在建立一个简单易用的清华大学学位论文LaTeX模板,包括本科综合论文训练、硕士论文、博士论文、博士哲学论文以及博士后出站报告。现在支持本科、硕士、博士论文、博士后出站报告格式,对其它格式(还有么?)的支持会陆续加入。
# 文档
-请下载模板,里面包括具体使用说明以及示例文档:
+请[下载](https://github.com/xueruini/thuthesis/releases)模板,里面包括具体使用说明以及示例文档:
* 模板使用说明 (thuthesis.pdf)
* 示例文档 (main.pdf)
@@ -22,13 +22,16 @@
通过TeX发行版工具自动从[CTAN](http://www.ctan.org/pkg/thuthesis)更新。
## 手动更新
-从 [GitHub](https://github.com/xueruini/thuthesis)下载放入论文目录,执行命令:
+从 [GitHub](https://github.com/xueruini/thuthesis)下载放入论文目录,执行命令(Windows 用户在文件夹空白处按`Shift+鼠标右键`,点击“在此处打开命令行窗口”):
- $ latex thuthesis.ins
+ latex thuthesis.ins
+
+即可得到 `thuthesis.cls` 和 `thuthesis.cfg` 等模板文件。
# 提问
按推荐顺序排序:
+* 先到 [FAQ](https://github.com/xueruini/thuthesis/wiki/FAQ) 看看常见问题
* [Github Issues](http://github.com/xueruini/thuthesis/issues)
* [TeX@newsmth](http://www.newsmth.net/nForum/#!board/TeX)
* [ThuThesis@Google Groups](http://groups.google.com/group/thuthesis)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/data/ack.tex new/doc/latex/thuthesis/data/ack.tex
--- old/doc/latex/thuthesis/data/ack.tex 2016-01-19 00:37:47.000000000 +0100
+++ new/doc/latex/thuthesis/data/ack.tex 2017-03-26 23:47:40.000000000 +0200
@@ -1,5 +1,5 @@
% 如果使用声明扫描页,将可选参数指定为扫描后的 PDF 文件名,例如:
-% \begin{ack}[scan-statement.pdf]
+% \begin{acknowledgement}[scan-statement.pdf]
\begin{acknowledgement}
衷心感谢导师 xxx 教授和物理系 xxx 副教授对本人的精心指导。他们的言传身教将使
我终生受益。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/dtx-style.sty new/doc/latex/thuthesis/dtx-style.sty
--- old/doc/latex/thuthesis/dtx-style.sty 2016-02-02 00:07:09.000000000 +0100
+++ new/doc/latex/thuthesis/dtx-style.sty 2017-03-26 23:47:40.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2005-2016 by Ruini Xue
+%% Copyright (C) 2005-2017 by Ruini Xue
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -127,8 +127,8 @@
\texttt{#2}\IfBooleanF#1{\thu@special@index{file}{#2}}}
\newcommand{\myentry}[1]{%
\marginpar{\raggedleft\color{purple}\bfseries\strut #1}}
-\newcommand{\note}[1]{{%
- \color{magenta}{\bfseries 说明:}\emph{#1}}}
+\newcommand{\note}[2][Note]{{%
+ \color{magenta}{\bfseries #1}\emph{#2}}}
\def\thuthesis{\textsc{Thu}\-\textsc{Thesis}}
\endinput
Binary files old/doc/latex/thuthesis/figures/scan-record.pdf and new/doc/latex/thuthesis/figures/scan-record.pdf differ
Binary files old/doc/latex/thuthesis/main.pdf and new/doc/latex/thuthesis/main.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/main.tex new/doc/latex/thuthesis/main.tex
--- old/doc/latex/thuthesis/main.tex 2016-02-02 00:07:09.000000000 +0100
+++ new/doc/latex/thuthesis/main.tex 2017-03-26 23:47:40.000000000 +0200
@@ -68,4 +68,8 @@
%% 个人简历
\include{data/resume}
+
+%% 本科生进行格式审查是需要下面这个表格,答辩可能不需要。选择性留下。
+% 综合论文训练记录表
+\includepdf[pages=-]{scan-record.pdf}
\end{document}
Binary files old/doc/latex/thuthesis/shuji.pdf and new/doc/latex/thuthesis/shuji.pdf differ
Binary files old/doc/latex/thuthesis/thuthesis.pdf and new/doc/latex/thuthesis/thuthesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thuthesis.doc.tlpobj new/tlpkg/tlpobj/thuthesis.doc.tlpobj
--- old/tlpkg/tlpobj/thuthesis.doc.tlpobj 2016-04-14 19:51:41.000000000 +0200
+++ new/tlpkg/tlpobj/thuthesis.doc.tlpobj 2017-04-14 18:02:43.000000000 +0200
@@ -1,9 +1,9 @@
name thuthesis.doc
category Package
-revision 40085
+revision 43609
shortdesc doc files of thuthesis
relocated 1
-docfiles size=773
+docfiles size=787
RELOC/doc/latex/thuthesis/Makefile
RELOC/doc/latex/thuthesis/README.md
RELOC/doc/latex/thuthesis/data/ack.tex
@@ -15,6 +15,7 @@
RELOC/doc/latex/thuthesis/data/resume.tex
RELOC/doc/latex/thuthesis/dtx-style.sty
RELOC/doc/latex/thuthesis/figures/scan-auth.pdf
+ RELOC/doc/latex/thuthesis/figures/scan-record.pdf
RELOC/doc/latex/thuthesis/figures/scan-statement.pdf
RELOC/doc/latex/thuthesis/figures/thu-fig-logo.eps
RELOC/doc/latex/thuthesis/figures/thu-fig-logo.pdf
++++++ thuthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thuthesis/thuthesis.cfg new/tex/latex/thuthesis/thuthesis.cfg
--- old/tex/latex/thuthesis/thuthesis.cfg 2016-03-20 22:19:13.000000000 +0100
+++ new/tex/latex/thuthesis/thuthesis.cfg 2017-03-26 23:47:40.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2005-2016 by Xue Ruini
+%% Copyright (C) 2005-2017 by Xue Ruini
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -23,7 +23,7 @@
%% This is the configuration file of the thuthesis package with LaTeX2e.
%%
\ProvidesFile{thuthesis.cfg}
-[2016/03/20 5.3.1 Tsinghua University Thesis Template]
+[2017/03/26 5.3.2 Tsinghua University Thesis Template]
\theoremsymbol{\ensuremath{\square}}
\newtheorem*{proof}{证明}
\theoremstyle{plain}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thuthesis/thuthesis.cls new/tex/latex/thuthesis/thuthesis.cls
--- old/tex/latex/thuthesis/thuthesis.cls 2016-03-20 22:19:13.000000000 +0100
+++ new/tex/latex/thuthesis/thuthesis.cls 2017-03-26 23:47:40.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2005-2016 by Ruini Xue
+%% Copyright (C) 2005-2017 by Ruini Xue
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -25,10 +25,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{thuthesis}
-[2016/03/20 5.3.1 Tsinghua University Thesis Template]
+[2017/03/26 5.3.2 Tsinghua University Thesis Template]
\hyphenation{Thu-Thesis}
\def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.3.1}
+\def\version{5.3.2}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
@@ -82,7 +82,7 @@
\RequirePackage{amsmath}
\RequirePackage[defaultsups]{newtxtext}
\RequirePackage{newtxmath}
-\RequirePackage{tgcursor}
+\RequirePackage{courier}
\RequirePackage{graphicx}
\RequirePackage[labelformat=simple]{subcaption}
\RequirePackage{pdfpages}
@@ -99,15 +99,13 @@
\RequirePackage{pifont}
\fi
\RequirePackage{CJKfntef}
-\ifxetex
- \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace}
- \defaultfontfeatures{Mapping=tex-text}
-\fi
\RequirePackage[amsmath,thmmarks,hyperref]{ntheorem}
\RequirePackage{array}
\RequirePackage{longtable}
\RequirePackage{booktabs}
\RequirePackage[numbers,super,sort&compress]{natbib}
+\patchcmd{\@chapter}{\addtocontents{lof}{\protect\addvspace{10\p@}}}{}{}{} % lof
+\patchcmd{\@chapter}{\addtocontents{lot}{\protect\addvspace{10\p@}}}{}{}{} % lot
\RequirePackage{hyperref}
\ifxetex
\hypersetup{%
@@ -222,7 +220,7 @@
{Too many footnotes in this page.}{Keep footnote less than 10.}
\fi
\ifthu@pifootnote%
- \ding{\numexpr171+\value{#1}}%
+ \ding{\the\numexpr\value{#1}+171\relax}%
\else%
\textcircled{\xiaoliu\arabic{#1}}%
\fi}
@@ -457,7 +455,7 @@
\newcommand\thu@underline[2][6em]{\hskip1pt\underline{\hb@xt@ #1{\hss#2\hss}}\hskip3pt}
\newlength{\thu@title@width}
\newcommand{\thu@put@title}[2][\thu@title@width]{%
- \begin{CJKfilltwosides}{#1}#2\end{CJKfilltwosides}}
+ \begin{CJKfilltwosides}[b]{#1}#2\end{CJKfilltwosides}}
\def\thu@first@titlepage{%
\ifthu@postdoctor\thu@first@titlepage@postdoctor\else\thu@first@titlepage@other\fi}
\newcommand{\thu@first@titlepage@postdoctor}{
@@ -535,14 +533,19 @@
\parbox[t][9cm][t]{\paperwidth-8cm}{
\renewcommand{\baselinestretch}{1.3}
\begin{center}
- \yihao[1.2]{\sffamily\heiti\thu@ctitle}\par
- \par\vskip 18bp
- \xiaoer[1] \textrm{\thu@apply}
+ \yihao[1.2]{\sffamily\heiti\thu@ctitle}\par%
+ \par\vskip 18bp%
+ \xiaoer[1]\textrm{\thu@apply}%
\end{center}}
\fi
\ifthu@bachelor
\vskip1cm
- \parbox[t][7.0cm][t]{\textwidth}{%
+ \ifx\thu@cassosupervisor\@empty%
+ \def\thu@tempa{7.0cm}
+ \else%
+ \def\thu@tempa{8.0cm}
+ \fi%
+ \parbox[t][\thu@tempa][t]{\textwidth}{%
{\fangsong\sanhao[1.8]%
\hspace*{1.65cm}
\setlength{\thu@title@width}{4em}
@@ -621,37 +624,38 @@
\parbox[t][5.2cm][t]{\paperwidth-7.2cm}{
\renewcommand{\baselinestretch}{1.5}
\begin{center}
- \erhao[1.1]\bfseries\sffamily\thu@etitle
+ \erhao[1.1]\bfseries\sffamily\thu@etitle%
\end{center}}
\parbox[t][][t]{\paperwidth-7.2cm}{
\renewcommand{\baselinestretch}{1.3}
\begin{center}
- \sanhao
+ \sanhao%
\ifthu@master Thesis \else Dissertation \fi
Submitted to\\
{\bfseries Tsinghua University}\\
in partial fulfillment of the requirement\\
for the \ifthu@professional professional \fi
degree of\\
- {\bfseries\sffamily\thu@edegree}
+ {\bfseries\sffamily\thu@edegree}%
\ifthu@professional\relax\else
\\in\\[3bp]
- {\bfseries\sffamily\thu@emajor}
+ {\bfseries\sffamily\thu@emajor}%
\fi
\end{center}}
\parbox[t][][b]{\paperwidth-7.2cm}{
\renewcommand{\baselinestretch}{1.3}
\begin{center}
\sanhao\sffamily by\\[3bp]
- \bfseries\thu@eauthor
+ \bfseries\thu@eauthor%
\ifthu@professional
\ifx\thu@emajor\empty\relax\else
- \\(~\thu@emajor~)
+ \\(~\thu@emajor~)%
\fi\fi
\end{center}}
\par\vspace{0.9cm}
\parbox[t][2.1cm][t]{\paperwidth-7.2cm}{
- \renewcommand{\baselinestretch}{1.2}\xiaosan\centering
+ \renewcommand{\baselinestretch}{1.2}
+ \xiaosan\centering
\begin{tabular}{rl}
\ifthu@master Thesis \else Dissertation \fi
Supervisor : & \thu@esupervisor\\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thuthesis.tlpobj new/tlpkg/tlpobj/thuthesis.tlpobj
--- old/tlpkg/tlpobj/thuthesis.tlpobj 2016-04-14 19:51:43.000000000 +0200
+++ new/tlpkg/tlpobj/thuthesis.tlpobj 2017-04-14 18:02:44.000000000 +0200
@@ -1,6 +1,6 @@
name thuthesis
category Package
-revision 40085
+revision 43609
shortdesc Thesis template for Tsinghua University
relocated 1
longdesc ThuThesis is a LaTeX thesis template package for Tsinghua
@@ -12,7 +12,7 @@
RELOC/tex/latex/thuthesis/thuthesis.cls
RELOC/tex/latex/thuthesis/thuthesis.sty
catalogue-ctan /macros/latex/contrib/thuthesis
-catalogue-date 2016-03-20 20:27:17 +0100
+catalogue-date 2017-03-26 15:08:49 +0200
catalogue-license lppl1.3
catalogue-topics dissertation class chinese
-catalogue-version 5.3.1
+catalogue-version 5.3.2
++++++ ticket.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/README new/doc/latex/ticket/README
--- old/doc/latex/ticket/README 2010-12-08 01:31:20.000000000 +0100
+++ new/doc/latex/ticket/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-
-
- ticket.sty v0.4b
- Making labels, visting cards, pins with LaTeX
-
- Author: Thomas Emmel
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-This is README.txt, last changed November 30, 2010
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Idea of ticket:
-ticket.sty provides an easy to handle interface to produce
-visiting cards, labels for your files, stickers, pins and
-other stuff for your office, conferences etc.
-All you need is a definition of your "ticket" included in
-a ticket definition file and the two commands
-\ticketdefault and \ticket.
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Content:
-
-README.txt ........... this file
-
-ticket.sty ........... the style file
-
-doc .................. documentation and examples
-doc/manual.xxx ....... a short introduction
-doc/ex_.....xxx ...... example files
-
-tdf .................. ticket definitions
- Send me more tdf-files!!!
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Please read the manual for further info.
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-License:
-
-The bundle is placed under the LaTeX Project Public License
-(macros/latex/base/lppl.txt on CTAN).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/README.txt new/doc/latex/ticket/README.txt
--- old/doc/latex/ticket/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ticket/README.txt 2016-11-25 19:30:16.000000000 +0100
@@ -0,0 +1,42 @@
+
+
+ ticket.sty v0.4d
+ Creation of labels, business cards, pins with LaTeX
+
+ Author: Thomas Emmel
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+This is README.txt, last changed October 11, 2016
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Idea of ticket:
+ticket.sty provides an easy to handle interface to create
+business cards, labels for your files, stickers, pins and
+other stuff for your office, conferences etc.
+All you need is a definition of your "ticket" included in
+a ticket definition file and the two commands
+\ticketdefault and \ticket.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Content:
+
+README.txt ........... this file
+
+ticket.sty ........... the style file
+
+doc .................. documentation and examples
+doc/manual.xxx ....... a short introduction
+doc/ex_.....xxx ...... example files
+
+tdf .................. ticket definitions
+ Send me more tdf-files!!!
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Please read the manual for further reading.
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+License:
+
+The bundle is placed under the LaTeX Project Public License v1.3
+(license/lppl1.3 on CTAN).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/comment new/doc/latex/ticket/comment
--- old/doc/latex/ticket/comment 2006-10-07 01:35:29.000000000 +0200
+++ new/doc/latex/ticket/comment 2016-11-25 19:30:16.000000000 +0100
@@ -1,3 +1,3 @@
-Make labels, visiting-cards, pins and flash-cards with LaTeX.
-Provides an easy to handle interface to produce visiting-cards, labels for your files, stickers, pins and other stuff for your office, conferences etc.
+Make labels, business-cards, pins and flash-cards with LaTeX.
+Provides an easy to handle interface to produce business-cards, labels for your files, stickers, pins and other stuff for your office, conferences etc.
All you need is a definition of your "ticket" included in a ticket definition file and the two commands \ticketdefault and \ticket.
Binary files old/doc/latex/ticket/ex_file.pdf and new/doc/latex/ticket/ex_file.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/ex_file.tex new/doc/latex/ticket/ex_file.tex
--- old/doc/latex/ticket/ex_file.tex 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/ticket/ex_file.tex 2016-11-25 19:30:16.000000000 +0100
@@ -16,7 +16,7 @@
% make your default ticket. \ticketdefault is somewhat like a background
\renewcommand{\ticketdefault}{%
\put(155,5){\begin{sideways}%
- \includegraphics[width=35mm]{ifmlogoc}\end{sideways}}%
+ \includegraphics[width=35mm]{logo}\end{sideways}}%
\put(150,50){\begin{rotate}{180}\Huge C O M P U T E R\end{rotate}}%
}
Binary files old/doc/latex/ticket/ex_flashcard.pdf and new/doc/latex/ticket/ex_flashcard.pdf differ
Binary files old/doc/latex/ticket/ex_marks.pdf and new/doc/latex/ticket/ex_marks.pdf differ
Binary files old/doc/latex/ticket/ex_pin.pdf and new/doc/latex/ticket/ex_pin.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/ex_pin.tex new/doc/latex/ticket/ex_pin.tex
--- old/doc/latex/ticket/ex_pin.tex 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/ticket/ex_pin.tex 2016-11-25 19:30:16.000000000 +0100
@@ -14,7 +14,7 @@
% make your default ticket. \ticketdefault is somewhat like a background
\renewcommand{\ticketdefault}{%
- \put(50, 3){\includegraphics[width=15mm]{ifmlogoc}}
+ \put(50, 3){\includegraphics[width=15mm]{logo}}
\put( 5, 13){\line(1,0){60}}
\put( 7, 10){\scriptsize Animal annual meeting (AAM)}
\put( 7, 7){\scriptsize In the gardens}
Binary files old/doc/latex/ticket/ex_vcard.pdf and new/doc/latex/ticket/ex_vcard.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/ex_vcard.tex new/doc/latex/ticket/ex_vcard.tex
--- old/doc/latex/ticket/ex_vcard.tex 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/ticket/ex_vcard.tex 2016-11-25 19:30:16.000000000 +0100
@@ -24,7 +24,7 @@
% now what do you like to put in your ticket
\newcommand{\vcardfront}[5]{\ticket{%
- \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{ifmlogoc}}
+ \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{logo}}
\put( 63.2, 2){\color{uni}your logo}
\put( 5, 13){\color{uni}\line(1,0){56}}
\put( 7, 10){\small your company}
Binary files old/doc/latex/ticket/logo.png and new/doc/latex/ticket/logo.png differ
Binary files old/doc/latex/ticket/manual.pdf and new/doc/latex/ticket/manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/manual.tex new/doc/latex/ticket/manual.tex
--- old/doc/latex/ticket/manual.tex 2010-12-08 01:31:20.000000000 +0100
+++ new/doc/latex/ticket/manual.tex 2016-11-25 19:30:16.000000000 +0100
@@ -1,12 +1,11 @@
-\documentclass[a4paper,KOMA,landscape]{powersem}
+\documentclass[aspectratio=1610,hyperref={pdfpagelabels=false}]{beamer}
-\usepackage[stmo,button,display]{ifmslide}
-%\usepackage[stmo,button]{ifmslide}
-%\usepackage[draft]{ifmslide}
-\definecolor{background}{gray}{.9}
+\usetheme{Bergen}
%\nobuttons
%% user definitions
+
+\def\code#1{\texttt{#1}}
\newcommand{\ticket}{{\code{ticket.sty}}}
\newcommand{\bs}{{\mtt\\}}
@@ -22,13 +21,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
-\panelposition{bottom}
-\pageTransitionDissolve
\sffamily
\title{\begin{minipage}[t]{0.98\textwidth}\begin{center}
- {\mdseries \ticket{} v0.4b November 30, 2010}\\[1ex]
- Making labels, visiting cards, pins and flash-cards with \LaTeX\\[1ex]
+ {\mdseries \ticket{} v0.4d October 11, 2016}\\[1ex]
+ Making labels, business cards, pins and flash-cards with \LaTeX\\[1ex]
A short introduction
\end{center}\end{minipage}}
@@ -36,38 +33,35 @@
{thomas@family-emmel.de}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\slidepagestyle{empty}
-\releasebutton \buttonsize(10mm,4mm)(8,8) \freebutton(263,180)[h]
-\begin{slide}
+\begin{frame}
\maketitle
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\hidebackground
-\pageTransitionReplace
-\centerslidesfalse
-\begin{slide}
- \section{A short introduction}
+\begin{frame}
+\frametitle{A short introduction}
- \ticket{} provides a simple interface to produce
- visiting (or calling) cards, labels for your files, stickers, pins and
+\begin{block}{\ticket{}}
+ provides a simple interface to produce
+\end{block}
+ business cards, labels for your files, stickers, pins and
other stuff for your office, conferences etc.\\[2ex]
All you need is a definition of your \lq{}ticket\rq{} included in
a ticket definition file (\code{.tdf}),\\
- $\rightarrowtail$ see \hyperlink{tdf}{ticket definition file}\\
+% $\rightarrowtail$ see \hyperlink{tdf}{ticket definition file}\\
and the two commands \code{\bs{}ticketdefault} and \code{\bs{}ticket}.\\
- $\rightarrowtail$ see \hyperlink{ticket}{how to fill your ticket}\\[2ex]
+% $\rightarrowtail$ see \hyperlink{ticket}{how to fill your ticket}\\[2ex]
See these examples to get an idea what you can get:\\
- $\rightarrowtail$ \href{ex_file.pdf}{\code{ex\_file}} back labels for your files...\\
- $\rightarrowtail$ \href{ex_pin.pdf}{\code{ex\_pin}} pins for a conference...\\
- $\rightarrowtail$ \href{ex_vcard.pdf}{\code{ex\_vcard}} visiting-cards (also business cards, name cards...)\\
- $\rightarrowtail$ \href{ex_marks.pdf}{\code{ex\_marks}} different markers used...\\
- $\rightarrowtail$ \href{ex_flashcard.pdf}{\code{ex\_flashcard}} flash-cards, try it...\\
- $\rightarrowtail$ \href{ex_flashcard_dup.pdf}{\code{ex\_flashcard\_dup}} in duplex mode\\
- $\rightarrowtail$ \href{ex_flashcard_rm.pdf}{\code{ex\_flashcard\_rm}} in rows\\
-\end{slide}
+ \begin{exampleblock}{\href{ex_file.pdf}{\code{ex\_file}}}back labels for your files...\end{exampleblock}
+ \begin{exampleblock}{\href{ex_pin.pdf}{\code{ex\_pin}}}pins for a conference...\end{exampleblock}
+ \begin{exampleblock}{\href{ex_vcard.pdf}{\code{ex\_vcard}}} business-cards...\end{exampleblock}
+ \begin{exampleblock}{\href{ex_marks.pdf}{\code{ex\_marks}}} different markers used...\end{exampleblock}
+ \begin{exampleblock}{\href{ex_flashcard.pdf}{\code{ex\_flashcard}}} flash-cards, try it...\end{exampleblock}
+ \begin{exampleblock}{\href{ex_flashcard_dup.pdf}{\code{ex\_flashcard\_dup}}}in duplex mode\end{exampleblock}
+ \begin{exampleblock}{\href{ex_flashcard_rm.pdf}{\code{ex\_flashcard\_rm}}}in rows\end{exampleblock}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{How to use it}
+\begin{frame}
+ \frametitle{How to use it}
Just add this line to the header of your latex-file:
@@ -75,11 +69,11 @@
Use the letter or article documentclass and
set up the paper-size that you need.
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{The ticket definition file}\hypertarget{tdf}{}
-A sample ticket definition (\code{lz1680.tdf}) for a \lq{}LEITZ\rq{}-product is:\\[-4ex]
+\begin{frame}[fragile]
+ \frametitle{The ticket definition file}\hypertarget{tdf}{}
+A sample ticket definition (\code{lz1680.tdf}) for a \lq{}LEITZ\rq{}-product is:\\
\begin{quote}
\begin{minipage}[t]{0.5\textwidth}
{\scriptsize
@@ -89,13 +83,10 @@
%% pre-cutted label for wide files
%%
\unitlength=1mm
-
%% tested for an HP5SiMX, adjust it for your printer
\hoffset=-16.2mm
\voffset=-6.6mm
-
\ticketNumbers{1}{4}
-
\ticketSize{189}{56.5} % in unitlength
\ticketDistance{0}{9.8} % in unitlength
\end{verbatim}
@@ -109,10 +100,10 @@
\code{\bs{}ticketSize\{width\}\{height\}} is the size of one ticket and
\code{\bs{}ticketDistance\{dist$_x$\}\{dist$_y$\}} are spaces
between the tickets.
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{Missing the ticket definition file}
+\begin{frame}
+ \frametitle{Missing the ticket definition file}
If you like to test a new ticket definition or you like to create only a single output without reusing those definitions anymore, \ticket{} assumes default values which can be
redefined in your file.\\
Simply call \ticket{} without any ticket definition:
@@ -120,33 +111,36 @@
\code{\bs{}usepackage[{\itshape other options}]\{ticket\}}
and add your definitions directly to the head of the file after loading ticket.sty.
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{How to fill your ticket}\hypertarget{ticket}{}%
+\begin{frame}[fragile]
+ \frametitle{How to fill your ticket}\hypertarget{ticket}{}%
\ticket{} enables a picture-environment for all tickets.
You can put things
into this picture with \code{\color{red}\bs{}ticketdefault} and \code{\color{red}\bs{}ticket}.
Both commands offer one argument.\\
- \code{\color{red}\bs{}ticketdefault} is used to put a default and unique background to your ticket, that will be -- of course -- not changed for all tickets unless
- you change it with \code{\bs{}renewcommand}:\\[-5ex]
- \begin{quote}
+ \begin{exampleblock}{\code{\bs{}ticketdefault}}
+ is used to put a default and unique background to your ticket, that will be -- of course -- not changed for all tickets unless
+ you change it with:\\
+% \begin{quote}
\begin{minipage}[t]{.5\textwidth}
{\scriptsize
\begin{verbatim}
\renewcommand{\ticketdefault}{%
- \put(100, 5){\includegraphics[width=35mm]{ifmlogoc}}%
+ \put(100, 5){\includegraphics[width=35mm]{logo}}%
\put(100,50){\begin{rotate}{180}\Huge ...\end{rotate}}%
}
\end{verbatim}
\normalsize
}
\end{minipage}
- \end{quote}
- \code{\color{red}\bs{}ticket} is used to provide the content which will be changed
+% \end{quote}
+ \end{exampleblock}
+ \begin{exampleblock}{\code{\bs{}ticket}}
+ is used to provide the content which will be changed
for the individual tickets. The simplest way to do that is to define a new
- command like this:\\[-5ex]
- \begin{quote}
+ command like this:\\
+% \begin{quote}
\begin{minipage}[t]{0.5\textwidth}
{\scriptsize
\begin{verbatim}
@@ -157,114 +151,97 @@
\end{verbatim}
}
\end{minipage}
- \end{quote}
-\end{slide}
+% \end{quote}
+\end{exampleblock}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\cross{%
\begin{picture}(0,0)%
\put(-2,0){\line(1,0){4}}\put(0,-2){\line(0,1){4}}%
\end{picture}}%
-\begin{slide}
- \section{Additional Options}
+\begin{frame}
+ \frametitle{Additional Options}
Most of the options other than the tdf-file are used to create marks
or decorations around the ticket:\\
-\begin{picture}(0,0)(-350,10)\color{red}
+\begin{alertblock}{crossmark%
+\begin{picture}(23,0)(-5,0)\color{red}
\put(0,0){\cross}%
- \put(0,10){\cross}%
- \put(20,0){\cross}%
- \put(20,10){\cross}%
-\end{picture}%
-\begin{picture}(0,0)(-380,10)\color{red}
- \put(0,0){\cross}%
- \put(0,10){\cross}%
- \put(20,0){\cross}%
- \put(20,10){\cross}%
-\end{picture}%
-{\color{red}\bfseries crossmark \\}
-Add a cross at all four corners of the ticket\\
-\begin{picture}(0,0)(-350,10)\color{red}
+ \put(0,8){\cross}%
+ \put(17,0){\cross}%
+ \put(17,8){\cross}%
+\end{picture}}
+Add a cross at all four corners of the ticket
+\end{alertblock}
+\begin{alertblock}{circlemark%
+\begin{picture}(23,0)(-5,0)\color{red}
\put(0,0){\circle{2}}%
- \put(0,10){\circle{2}}%
- \put(20,0){\circle{2}}%
- \put(20,10){\circle{2}}%
-\end{picture}%
-\begin{picture}(0,0)(-380,10)\color{red}
- \put(0,0){\circle{2}}%
- \put(0,10){\circle{2}}%
- \put(20,0){\circle{2}}%
- \put(20,10){\circle{2}}%
-\end{picture}%
-{\color{red}\bfseries circlemark \\}
-Add a circle at all four corners\\
-\begin{picture}(0,0)(-350,10)\color{red}
- \put(-1,0){\line(-1,0){2}}
- \put(0,-1){\line(0,-1){2}}
- \put(-1,10){\line(-1,0){2}}
- \put(0,11){\line(0,1){2}}
- \put(21,0){\line(1,0){2}}
- \put(20,-1){\line(0,-1){2}}
- \put(21,10){\line(1,0){2}}
- \put(20,11){\line(0,1){2}}
+ \put(0,8){\circle{2}}%
+ \put(17,0){\circle{2}}%
+ \put(17,8){\circle{2}}%
\end{picture}%
-\begin{picture}(0,0)(-380,10)\color{red}
- \put(-1,0){\line(-1,0){2}}
- \put(0,-1){\line(0,-1){2}}
- \put(-1,10){\line(-1,0){2}}
- \put(0,11){\line(0,1){2}}
- \put(21,0){\line(1,0){2}}
- \put(20,-1){\line(0,-1){2}}
- \put(21,10){\line(1,0){2}}
- \put(20,11){\line(0,1){2}}
-\end{picture}%
-{\color{red}\bfseries emptycrossmark \\}
-A crossmark where the part of the cross inside the ticket is not visible\\
-\begin{picture}(0,0)(-350,10)\color{red}
+}
+Add a circle at all four corners
+\end{alertblock}
+\begin{alertblock}{emptycrossmark%
+\begin{picture}(23,0)(-5,0)\color{red}
\put(-1,0){\line(-1,0){2}}
\put(0,-1){\line(0,-1){2}}
- \put(-1,10){\line(-1,0){2}}
+ \put(-1,8){\line(-1,0){2}}
\put(0,11){\line(0,1){2}}
- \put(20,-1){\line(0,-1){2}}
- \put(20,11){\line(0,1){2}}
+ \put(18,0){\line(1,0){2}}
+ \put(17,-1){\line(0,-1){2}}
+ \put(18,8){\line(1,0){2}}
+ \put(17,11){\line(0,1){2}}
\end{picture}%
-\begin{picture}(0,0)(-380,10)\color{red}
+}
+A crossmark where the part of the cross inside the ticket is not visible
+\end{alertblock}
+\begin{alertblock}{cutmark%
+\begin{picture}(23,0)(-5,0)\color{red}
\put(0,-1){\line(0,-1){2}}
\put(0,11){\line(0,1){2}}
- \put(21,0){\line(1,0){2}}
- \put(20,-1){\line(0,-1){2}}
- \put(21,10){\line(1,0){2}}
- \put(20,11){\line(0,1){2}}
+ \put(18,0){\line(1,0){2}}
+ \put(17,-1){\line(0,-1){2}}
+ \put(18,8){\line(1,0){2}}
+ \put(17,11){\line(0,1){2}}
\end{picture}%
-{\color{red}\bfseries cutmark \\}
-Just add cutmarks at the outer region of the page\\
-\begin{picture}(0,0)(-350,10)\color{red}
- \put(0,0){\line(0,1){10}}
- \put(0,0){\line(1,0){20}}
- \put(20,10){\line(-1,0){20}}
- \put(20,10){\line(0,-1){10}}
-\end{picture}%
-\begin{picture}(0,0)(-380,10)\color{red}
- \put(0,0){\line(0,1){10}}
- \put(0,0){\line(1,0){20}}
- \put(20,10){\line(-1,0){20}}
- \put(20,10){\line(0,-1){10}}
+}
+Just add cutmarks at the outer region of the page
+\end{alertblock}
+\begin{alertblock}{boxed%
+\begin{picture}(23,0)(-5,0)\color{red}
+ \put(0,0){\line(0,1){8}}
+ \put(0,0){\line(1,0){17}}
+ \put(17,8){\line(-1,0){17}}
+ \put(17,8){\line(0,-1){8}}
\end{picture}%
-{\color{red}\bfseries boxed \\}
-Add a frame around each ticket\\
-The option {\color{red}\bfseries rowmode} creates the tickets in rows instead of columns,
+}
+Add a frame around each ticket
+\end{alertblock}
+\begin{alertblock}{rowmode}
+This option creates the tickets in rows instead of columns,
which might be useful in some cases.
-\end{slide}
+\end{alertblock}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{Special commands}
-You can add additional page-breaks with \code{\bs{}newpage\bs{}ticketreset}. This clears the ticket-buffers and sets the corresponding values to initial values.
-
+\begin{frame}
+ \frametitle{Special commands}
+\begin{exampleblock}{reset tickets}
+ You can add additional page-breaks with \code{\bs{}newpage\bs{}ticketreset}. This clears the ticket-buffers and sets the corresponding values to initial values.
This can be used if you create a handful of tickets multiple times.
+\end{exampleblock}
-The command \code{\bs{}backside} is useful for flash-cards, see the use-cases below.
-\end{slide}
+\begin{exampleblock}{\code{\bs{}backside}}
+is useful for flash-cards, see the use-cases below.
+\end{exampleblock}
+
+\begin{exampleblock}{skip tickets}
+Once you printed a series of tickets you mostly end up with some empty stickers on your sheet. In this case use \code{\bs{}ticketskip\{5\}} to skip 5 tickets (New feature)
+\end{exampleblock}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{Organising and reading input}
+\begin{frame}[fragile]
+ \frametitle{Organising and reading input}
In general it is a good idea to create a file that contains all definitions and the whole latex-setup and a second file that contains only the data that you like to print which can be referenced by \code{\bs{}input}.
For example, if you reference a huge database of names of people which are used for the pins of a conference, you can easily write a script (perl, python...) that extracts the data to a file that is itself latex-formated with a \code{\bs{}myticket\{ \}\{ \}\{ \}} on each line.
@@ -286,31 +263,34 @@
}
\end{minipage}
\end{quote}
-
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{Use-cases}
- Some examples were referenced at the beginning of this manual. I will finish this short introduction with an overview of special examples and their implementations:
-
-\subsection{Files and pins}
-This is a simple example for your files. The same applies to pins. Start with a \code{\bs{}ticketdefault}, with this background:
+\begin{frame}
+ \frametitle{Use-cases}
+ Some examples were referenced at the beginning of this manual. I will finish this short introduction with an overview of special examples and their implementations...
+\end{frame}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{frame}[fragile]
+\begin{block}{Files and pins}
+This is a simple example for your files.
+\end{block}
+The same applies to pins. Start with a \code{\bs{}ticketdefault}, with this background:
\begin{quote}
\begin{minipage}[t]{0.5\textwidth}
{\scriptsize
\begin{verbatim}
\renewcommand{\ticketdefault}{%
\put(155,5){\begin{sideways}%
- \includegraphics[width=35mm]{ifmlogoc}\end{sideways}}%
+ \includegraphics[width=35mm]{logo}\end{sideways}}%
\put(150,50){\begin{rotate}{180}\Huge C O M P U T E R\end{rotate}}%
}
\end{verbatim}
}
\end{minipage}
\end{quote}
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
+\begin{frame}[fragile]
\vspace*{10mm}
Now, create the content of the \code{\bs{}ticket} which differs:
\begin{quote}
@@ -338,17 +318,18 @@
\begin{document}
...
\filelabel{1}{\LaTeX{} - styles}{Standard styles\\Own styles\\%
- \hspace*{5mm}\bfseries ifmslide\\\hspace*{5mm}\bfseries ticket}%
+ \hspace*{5mm}\bfseries ...\\\hspace*{5mm}\bfseries ticket}%
...
\end{verbatim}
}
\end{minipage}
\end{quote}
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}\vspace*{-4mm}
-\subsection{Visiting-cards}
+\begin{frame}[fragile]\vspace*{-4mm}
+\begin{block}{Business-cards}
In this example, the \code{\bs{}ticketdefault} is empty, since we need a front and and background that differs:
+\end{block}
\begin{quote}
\begin{minipage}[t]{0.5\textwidth}
{\scriptsize
@@ -356,14 +337,15 @@
\renewcommand{\ticketdefault}{}%
\newcommand{\vcardfront}[5]{\ticket{%
- \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{ifmlogoc}}
+ \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{logo}}
\put( 63.2, 2){\color{uni}your logo}
\put( 5, 13){\color{uni}\line(1,0){56}}
\put( 7, 10){\small your company}
\put( 7,6.5){\small street 1}\put( 7, 3){\small xxxxx city and state}
\put( 7, 24){\small phone:}\put( 7, 20){\small fax:}
\put(6,40){\bfseries\LARGE #1}
- \put(7,36){#2}\put(15,24){\small #3}\put(15,20){\small #4}\put( 7,16){\small #5}
+ \put(7,36){#2}\put(15,24){\small #3}
+ \put(15,20){\small #4}\put( 7,16){\small #5}
}}
\newcommand{\vcardback}[1]{\ticket{%
@@ -376,9 +358,9 @@
}
\end{minipage}
\end{quote}
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}\vspace*{10mm}
+\begin{frame}[fragile]\vspace*{10mm}
And fill the tickets:
\begin{quote}
\begin{minipage}[t]{0.5\textwidth}
@@ -392,24 +374,27 @@
% ten cards for the front
\whiledo{\thenumcards<10}{%
\stepcounter{numcards}%
- \vcardfront{Mr. X}{Degree/Profession}{+YY/XXXX/ZZZ ZZ ZZ}{+YY/XXXX/ZZZ ZZ ZZ}
+ \vcardfront{Mr. X}{Degree/Profession}
+ {+YY/XXXX/ZZZ ZZ ZZ}{+YY/XXXX/ZZZ ZZ ZZ}
{yourmail@your-provider.xxx}}
\setcounter{numcards}{0}
% and ten for the backside
\whiledo{\thenumcards<10}{%
\stepcounter{numcards}%
- \vcardback{phone: ---/HH HH HHH\\fax: ---/HH HH HHH\\homestreet 7\\everywhere}}
+ \vcardback{phone: ---/HH HH HHH\\fax: ---/HH HH HHH\\%
+ homestreet 7\\everywhere}}
...
\end{verbatim}
}
\end{minipage}
\end{quote}
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}\vspace*{-4mm}
-\subsection{Flashcards}
+\begin{frame}[fragile]\vspace*{-4mm}
+\begin{block}{Flashcards}
In this case we work with two different \code{\bs{}ticket}-definitions since we have a file
with two different commands. However, this can be changed according to your taste:
+\end{block}
\begin{quote}
\begin{minipage}[t]{0.5\textwidth}
{\scriptsize
@@ -439,9 +424,9 @@
}
\end{minipage}
\end{quote}
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}\vspace*{10mm}
+\begin{frame}[fragile]\vspace*{10mm}
Now change the command for the backside:
\begin{quote}
\begin{minipage}[t]{0.5\textwidth}
@@ -484,17 +469,19 @@
}
\end{minipage}
\end{quote}
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{slide}
- \section{Acknowledgements...}
- Many thanks to those who used ticket.sty for many years and helped
+\begin{frame}
+ \frametitle{Acknowledgements...}
+ \begin{block}{Many thanks}
+ to those who used ticket.sty for many years and helped
to find some small bugs and those who provided ticket-definition-files (tdf)
and suggestions for new features.
+ \end{block}
Many special thanks to Santiago Mejia who created an initial version
of the flash-card use-case.
-\end{slide}
+\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\end{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/test.tex new/doc/latex/ticket/test.tex
--- old/doc/latex/ticket/test.tex 2010-12-08 01:31:20.000000000 +0100
+++ new/doc/latex/ticket/test.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-%%%%
-%
-% ticket.sty example file for a pin for conferences
-%
-%%%%
-% use the corresponding paper size for your ticket definition
-\documentclass[a4paper,10pt]{letter}
-
-% load ticket.sty with the appropriate ticket definition
-\usepackage[freepin,crossmark]{ticket}
-
-% load misc stuff
-\usepackage{graphicx}
-
-% make your default ticket. \ticketdefault is somewhat like a background
-\renewcommand{\ticketdefault}{%
- \put(50, 3){\includegraphics[width=15mm]{ifmlogoc}}
- \put( 5, 13){\line(1,0){60}}
- \put( 7, 10){\scriptsize Animal annual meeting (AAM)}
- \put( 7, 7){\scriptsize In the gardens}
- \put( 7, 4){\scriptsize April 1, 2000}
-}
-
-% now what do you like to put in your ticket
-\newcommand{\confpin}[2]{\ticket{%
- \put(35,36){\makebox[0mm]{\bfseries\Large #1}}
- \put(35,28){\makebox[0mm]{\bfseries\large #2}}%
-}}
-
-
-%% the pins for the partipiciants ... ;-)
-%% you can generate this part from a database!
-\begin{document}
-\sffamily
-\confpin{Camelus dromedarius}{North Africa}
-\confpin{Urocyon cinereoargenteus}{America}
-\confpin{Galago moholi}{South Africa}
-\confpin{Dasypus novemcintus}{South America}
-\confpin{Rhinocerus sondaicus}{Java}
-\confpin{Canis lupus}{Northern sphere}
-\confpin{Ramphastus spec.}{South Amerika}
-\confpin{Panthera tigris sondaica}{Java}
-\confpin{Hippocampus spec.}{the ocean}
-\confpin{Anthonomus grandis}{Mexico}
-\confpin{Petrogale penicillata}{Australia}
-\confpin{Tarsius spec.}{Sumatra}
-\end{document}
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ticket.doc.tlpobj new/tlpkg/tlpobj/ticket.doc.tlpobj
--- old/tlpkg/tlpobj/ticket.doc.tlpobj 2016-04-14 19:51:43.000000000 +0200
+++ new/tlpkg/tlpobj/ticket.doc.tlpobj 2017-04-14 18:02:44.000000000 +0200
@@ -1,10 +1,10 @@
name ticket.doc
category Package
-revision 20679
+revision 42280
shortdesc doc files of ticket
relocated 1
-docfiles size=124
- RELOC/doc/latex/ticket/README
+docfiles size=148
+ RELOC/doc/latex/ticket/README.txt
RELOC/doc/latex/ticket/comment
RELOC/doc/latex/ticket/ex_file.pdf
RELOC/doc/latex/ticket/ex_file.tex
@@ -19,7 +19,7 @@
RELOC/doc/latex/ticket/ex_pin.tex
RELOC/doc/latex/ticket/ex_vcard.pdf
RELOC/doc/latex/ticket/ex_vcard.tex
+ RELOC/doc/latex/ticket/logo.png
RELOC/doc/latex/ticket/manual.pdf
RELOC/doc/latex/ticket/manual.tex
- RELOC/doc/latex/ticket/test.tex
RELOC/doc/latex/ticket/words.tex
++++++ ticket.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ticket/invite.tdf new/tex/latex/ticket/invite.tdf
--- old/tex/latex/ticket/invite.tdf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/ticket/invite.tdf 2016-11-25 19:34:00.000000000 +0100
@@ -0,0 +1,14 @@
+%%
+%% ticket for "confirmation invitation"
+%
+\unitlength=1mm
+
+%% tested for an HP5SiMX, adjust for your printer
+\hoffset=-16.2mm
+\voffset=-6.6mm
+
+\ticketNumbers{1}{6}
+
+\ticketSize{180.0}{40.0} % in unitlength
+\ticketDistance{0}{0} % in unitlength
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ticket/rex23184237.tdf new/tex/latex/ticket/rex23184237.tdf
--- old/tex/latex/ticket/rex23184237.tdf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/ticket/rex23184237.tdf 2016-11-25 19:34:00.000000000 +0100
@@ -0,0 +1,15 @@
+%%
+%% ticket for "Rex 23184237/PP"
+%% pre-cutted label for wide files
+%%
+\unitlength=1mm
+
+%% tested for an Epson XP215, adjust for your printer
+\hoffset=-19.2mm
+\voffset=-8.6mm
+
+\ticketNumbers{1}{5}
+
+\ticketSize{188}{53} % in unitlength
+\ticketDistance{0}{0} %in unitlength
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ticket/ticket.sty new/tex/latex/ticket/ticket.sty
--- old/tex/latex/ticket/ticket.sty 2010-12-08 01:31:20.000000000 +0100
+++ new/tex/latex/ticket/ticket.sty 2016-11-25 19:34:00.000000000 +0100
@@ -2,12 +2,12 @@
%%
%% This is file `ticket.sty',
%%
-%% File: ticket.sty Copyright (c) 1999,2000,2005 Thomas Emmel
+%% File: ticket.sty Copyright (c) 1999-2016 Thomas Emmel
%%
%%
%%
% This package may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
+% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
@@ -34,12 +34,17 @@
% Santiago Mejia
% v0.4b added 'rowmode' introduced by Wulf Coulmann
% <wulf at coulmann dot de>
+% v0.4c added \ticketskip to allow for empty tickets
+% at the start such that you can re-use used sheets
+% by Maximilian Appel <mail at maxappel dot de>
+% v0.4d lost some examples in last package
+% no new features
%
% Many thanks for all contributions
%
%
-\def\fileversion{v0.4b}
-\def\filedate{2010/11/30}
+\def\fileversion{v0.4d}
+\def\filedate{2016/10/11}
\ProvidesPackage{ticket}[\filedate\space\fileversion]
\typeout{Package: `ticket' \fileversion\space <\filedate> (Thomas Emmel)}
@@ -189,6 +194,15 @@
\fi%
\fi}%
+% by Maximilian Appel 2016
+\newcounter{ticket@skipped}
+\newcommand{\ticketskip}[1]{
+ \setcounter{ticket@skipped}{0}
+ \ % space needed to avoid "there is no line here to end" error
+ \whiledo{\theticket@skipped<#1}{\stepcounter{ticket@skipped}\ticket@counter}
+}
+%
+
% default content...
% users should renew this command
\newcommand{\ticketdefault}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ticket.tlpobj new/tlpkg/tlpobj/ticket.tlpobj
--- old/tlpkg/tlpobj/ticket.tlpobj 2016-04-14 19:51:44.000000000 +0200
+++ new/tlpkg/tlpobj/ticket.tlpobj 2017-04-14 18:02:44.000000000 +0200
@@ -1,6 +1,6 @@
name ticket
category Package
-revision 20679
+revision 42280
shortdesc Make labels, visiting-cards, pins with LaTeX
relocated 1
longdesc Provides an easy to handle interface to produce visiting cards,
@@ -8,7 +8,7 @@
longdesc office, conferences etc. All you need is a definition of your
longdesc 'ticket' included in a ticket definition file and the two
longdesc commands \ticketdefault and \ticket.
-runfiles size=16
+runfiles size=18
RELOC/tex/latex/ticket/aj8414.tdf
RELOC/tex/latex/ticket/dura5222.tdf
RELOC/tex/latex/ticket/flashCard.tdf
@@ -16,15 +16,17 @@
RELOC/tex/latex/ticket/freepin2.tdf
RELOC/tex/latex/ticket/freepin3.tdf
RELOC/tex/latex/ticket/he4432.tdf
+ RELOC/tex/latex/ticket/invite.tdf
RELOC/tex/latex/ticket/lz1680.tdf
RELOC/tex/latex/ticket/lz1681.tdf
RELOC/tex/latex/ticket/lz1685.tdf
+ RELOC/tex/latex/ticket/rex23184237.tdf
RELOC/tex/latex/ticket/ticket.sty
RELOC/tex/latex/ticket/zw32010.tdf
RELOC/tex/latex/ticket/zw3424.tdf
RELOC/tex/latex/ticket/zw4752.tdf
catalogue-ctan /macros/latex/contrib/ticket
-catalogue-date 2015-08-03 05:43:12 +0200
-catalogue-license lppl
+catalogue-date 2016-10-11 17:37:14 +0200
+catalogue-license lppl1.3
catalogue-topics labels
-catalogue-version 0.4b
+catalogue-version 0.4d
++++++ ticollege.doc.tar.xz ++++++
++++++ ticollege.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ticollege.tlpobj new/tlpkg/tlpobj/ticollege.tlpobj
--- old/tlpkg/tlpobj/ticollege.tlpobj 2016-04-14 19:51:44.000000000 +0200
+++ new/tlpkg/tlpobj/ticollege.tlpobj 2017-04-14 18:02:44.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=6
RELOC/tex/latex/ticollege/ticollege.sty
catalogue-ctan /graphics/pgf/contrib/ticollege
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pgf-tikz doc-supp
catalogue-version 1.0
++++++ tie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tie.1 new/texmf-dist/doc/man/man1/tie.1
--- old/texmf-dist/doc/man/man1/tie.1 2016-04-26 19:41:35.000000000 +0200
+++ new/texmf-dist/doc/man/man1/tie.1 2017-05-03 19:35:31.000000000 +0200
@@ -1,4 +1,4 @@
-.TH TIE 1 "7 April 2010" "Web2C 2016"
+.TH TIE 1 "7 April 2010" "Web2C 2017"
.\"=====================================================================
.SH NAME
tie \- merge or apply WEB change files
Binary files old/texmf-dist/doc/man/man1/tie.man1.pdf and new/texmf-dist/doc/man/man1/tie.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tie.doc.tlpobj new/tlpkg/tlpobj/tie.doc.tlpobj
--- old/tlpkg/tlpobj/tie.doc.tlpobj 2016-04-27 03:25:12.000000000 +0200
+++ new/tlpkg/tlpobj/tie.doc.tlpobj 2017-05-04 02:07:17.000000000 +0200
@@ -1,7 +1,7 @@
name tie.doc
category TLCore
-revision 40768
+revision 44166
shortdesc doc files of tie
-docfiles size=6
+docfiles size=3
texmf-dist/doc/man/man1/tie.1
texmf-dist/doc/man/man1/tie.man1.pdf