Hello community,
here is the log from the commit of package texlive-specs-x for openSUSE:Factory checked in at 2020-05-29 21:19:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-x (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-x.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-x"
Fri May 29 21:19:34 2020 rev:39 rq:806934 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-x/texlive-specs-x.changes 2019-11-07 23:12:25.440265167 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-x.new.3606/texlive-specs-x.changes 2020-05-29 21:34:04.258059400 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink
+
+- Enhance spec file generator to find missing .so man page
+ links for better dependency resolution (bsc#1171682)
+
+-------------------------------------------------------------------
+Wed May 13 13:59:14 UTC 2020 - Dr. Werner Fink
+
+- Modify patch texdoc_cnf.dif to ignore tlpkg/texlive.tlpdb as
+ kpathsea uses the ls-R files as well
+
+-------------------------------------------------------------------
+Tue May 12 09:03:38 UTC 2020 - Dr. Werner Fink
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink
+
+- Add Requires to tex(epstopdf-base.sty) to fix package split
+ of texlive-epstopdf
+
+-------------------------------------------------------------------
+Mon May 4 09:00:25 UTC 2020 - Dr. Werner Fink
+
+- Skip *-dev packages from file dependendcy scanner as otherwise
+ we see doubling name space for some style files like amsmath.sty
+
+-------------------------------------------------------------------
+Mon Apr 27 06:52:15 UTC 2020 - Dr. Werner Fink
+
+- Add patch pythontex_p2top3.dif and a removes file to fully
+ switch pythontex packages of TeXLive to python3
+
+-------------------------------------------------------------------
+Mon Apr 20 10:29:02 UTC 2020 - Dr. Werner Fink
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
Old:
----
tkz-berge.doc.tar.xz
tkz-berge.tar.xz
tkz-doc.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
tlcockpit.doc.tar.xz
tlcockpit.tar.xz
tlshell.doc.tar.xz
tlshell.tar.xz
New:
----
tikz-planets.doc.tar.xz
tikz-planets.tar.xz
tikz-relay.tar.xz
tikz-trackschematic.doc.tar.xz
tikz-trackschematic.tar.xz
tokcycle.doc.tar.xz
tokcycle.tar.xz
transparent.doc.tar.xz
transparent.tar.xz
tuda-ci.doc.tar.xz
tuda-ci.tar.xz
twemoji-colr.doc.tar.xz
twemoji-colr.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-x.spec ++++++
++++ 12101 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-x/texlive-specs-x.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-x.new.3606/texlive-specs-x.spec
++++++ tikz-feynhand.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-feynhand/README.md new/doc/latex/tikz-feynhand/README.md
--- old/doc/latex/tikz-feynhand/README.md 2018-01-31 22:59:37.000000000 +0100
+++ new/doc/latex/tikz-feynhand/README.md 2019-08-20 22:44:55.000000000 +0200
@@ -23,7 +23,7 @@
3. tikzfeynhand.keys.code.tex - defines Tikz keys
4. tikz-feynhand.userguide.pdf - a userguide for the package
5. tikz-feynhand.userguide.tex - the tex source of the userguide
-6. changes.txt - lists changes applied to Tikz-Feynman to obtain Tikz-FeynHand
+6. changes.txt - lists changes since last version
7. shell_escape.jpg - a TexWorks screenshot for the userguide
8. README.md - this file
@@ -32,7 +32,7 @@
LICENSE
-------
-Copyright (C) 2018 Max Dohse
+Copyright (C) 2019 Max Dohse
Copyright (C) 2016 Joshua Ellis
This whole package (code and documentation)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-feynhand/changes.txt new/doc/latex/tikz-feynhand/changes.txt
--- old/doc/latex/tikz-feynhand/changes.txt 2018-01-31 22:59:37.000000000 +0100
+++ new/doc/latex/tikz-feynhand/changes.txt 2019-08-20 22:44:55.000000000 +0200
@@ -1,281 +1,88 @@
LIST OF CHANGES
-by which this package tikz-feynhand (Version 1.0.0 of 2018/01/31)
+by which this package tikz-feynhand (Version 1.1.0 of 2019/08/19)
which is available at https://ctan.org/pkg/tikz-feynhand
-was obtained from the original package tikz-feynman (Version 1.1.0 of 2016/02/05)
-which is available at https://ctan.org/pkg/tikz-feynman
+was obtained from Version 1.0.0
==========================================================================
-The LICENSE has been changed from LPPL to GNU General Public Licence v3.
-
-The changes are rather minor:
-any reference to LuaTex has been removed,
-the definitions that are unnecessary
-for manual diagram creation have been removed,
-and some drawing styles have been added.
-
-In general, I REPLACED each occurence of the string "feynman" by "feynhand",
-in order to avoid clashes when both packages are loaded simultaneously,
-and most of these replacements are NOT listed individually below.
-Apart from that, the list below contains all changes to the best of my knowledge.
-
-The files tikzfeynman.patch.3.0.0.lua and tikzfeynman.patch.3.0.1.lua
-of the original package are not contained in the modified package,
-neither is the documentation of the original package.
-
-All file names and line numbers below refer to
-the files of the original package tikz-feynman (Version 1.1.0 of 2016/02/05).
+All file names and line numbers below refer to the files of Version 1.1.0.
==============================================
- FILE: tikz-feynman.sty
+ FILE: tikz-feynhand.sty
-+ general: package name changed
-+ line 32: removed \RequirePackage{ifluatex}
++ no changes
==============================================
- FILE: tikzlibraryfeynman.code.tex
+ FILE: tikzlibraryfeynhand.code.tex
-+ line 33: removed graphs,
-+ lines 38-48: removed \ifluatex ...
-+ lines 69-84: removed %Luatex warning ...
-+ lines 119-141: removed %% Override Lua ...
-+ line 159: removed \let\tikzfeynman@orig@graph=\graph
-+ lines 162+163: removed, inserted:
- \let\propag=\tikzfeynhand@commands@propag
- \let\propag=\propagator
-+ line 166: removed \tikz@lib@ignore@sizetrue
-+ lines 181-190: removed %% \feynmandiagram ...
-+ lines 266-282: removed %% Diagram ...
-+ lines 284-291: removed %% Graph ...
- inserted:
- %% Propagators
- \newcommand{\tikzfeynhand@commands@propag}[1][]{\draw [#1]}
-+ line 321: removed \pgfkeyslet{/tikzfeynman/rmomentum/.@cmd}...
-+ line 327: removed \pgfkeyslet{/tikzfeynman/rmomentum'/.@cmd}...
- inserted:
- % short versions of momentum styles
- \pgfkeyslet{/tikzfeynhand/rmomentum/.@cmd}{\tikzfeynhand@momentum@stdr}
- \pgfkeyslet{/tikzfeynhand/rmomentum'/.@cmd}{\tikzfeynhand@momentum@stdrp}
++ line 228: inserted:
- \pgfkeyslet{/tikzfeynhand/mom/.@cmd}{\tikzfeynhand@momentum@std}
- \pgfkeyslet{/tikzfeynhand/mom'/.@cmd}{\tikzfeynhand@momentum@stdp}
-
- \pgfkeyslet{/tikzfeynhand/revmom/.@cmd}{\tikzfeynhand@momentum@stdr}
- \pgfkeyslet{/tikzfeynhand/revmom'/.@cmd}{\tikzfeynhand@momentum@stdrp}
+%% Slash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@slash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{slash@@}}
+ {\tikzfeynhand@key@opt{slash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/slash/.@cmd}{\tikzfeynhand@slash}
+
+%% Backslash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@backslash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{backslash@@}}
+ {\tikzfeynhand@key@opt{backslash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/backslash/.@cmd}{\tikzfeynhand@backslash}
==============================================
- FILE: tikzfeynman.keys.code.tex
+ FILE: tikzfeynhand.keys.code.tex
-+ line 22: inserted
- %% Lengths
- \newlength{\feynhanddotsize}
- \setlength{\feynhanddotsize}{1.5mm}
-
- \newlength{\feynhandblobsize}
- \setlength{\feynhandblobsize}{7.5mm}
-
- \newlength{\feynhandlinesize}
- \setlength{\feynhandlinesize}{0.5pt}
-
- \newlength{\feynhandarrowsize}
- \setlength{\feynhandarrowsize}{6pt}
-
- \newlength{\feynhandtopsep}
- \setlength{\feynhandtopsep}{18\feynhandlinesize}
-
- %% Colors
- \newcommand{\feynhandtopsepcolor}{white}
-
-
-+ line 117: replaced \pgfmetadecorationsegmentamplitude
- by 3 * \feynhandlinesize
-+ line 141: removed /tikzfeynman/medium,
-+ lines 145-206: removed %% Diagrams ...
-+ line 219, 258, 280:
- each removed /tikz/graphs/as={},
-+ line 224: replaced /tikz/minimum size=1.5mm,
- by /tikz/minimum size=\feynhanddotsize,
-+ line 225, 264, 337, 348:
- each inserted /tikz/line width = \feynhandlinesize,
-+ lines 230-236: replaced every occurrence of square dot
- by squaredot
-+ lines 238-245: replaced every occurrence of empty dot
- by ringdot
-+ lines 230-236: replaced every occurrence of crossed dot
- by crossdot
-+ line 249: replaced /tikz/minimum size=3mm,
- by /tikz/minimum size=2\feynhanddotsize,
-+ line 260: replaced /tikz/fill=none,
- by /tikz/fill,
-+ lines 261+275:
- each replaced /tikz/outer sep=0.5\pgflinewidth,
- by /tikz/outer sep={0.5*\the\feynhandlinesize},
-+ line 263: replaced /tikz/minimum size=0.75cm,
- by /tikz/minimum size=\feynhandblobsize,
-+ line 264: removed /tikz/pattern=north west lines,
-+ line 269: inserted /tikz/fill=black,
-+ line 270: inserted
- every ringblob@@/.style={
- },
- every ringblob/.style={/tikzfeynhand/every ringblob@@/.append style={#1}},
- ringblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every ringblob@@,
- /tikz/fill=white,
- },
- every NWblob@@/.style={
- },
- every NWblob/.style={/tikzfeynhand/every NWblob@@/.append style={#1}},
- NWblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every NWblob@@,
- /tikz/fill=none,
- /tikz/pattern=north west lines,
- },
- every NEblob@@/.style={
- },
- every NEblob/.style={/tikzfeynhand/every NEblob@@/.append style={#1}},
- NEblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every NEblob@@,
- /tikz/fill=none,
- /tikz/pattern=north east lines,
- },
- every grayblob@@/.style={
- },
- every grayblob/.style={/tikzfeynhand/every grayblob@@/.append style={#1}},
- grayblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every grayblob@@,
- /tikz/fill=gray!50!white,
- },
-+ line 288: replaced arrow size=1.5pt,
- by arrow size=\feynhandarrowsize,
-+ line 295: replaced xshift...
- by xshift=-0.166666\feynhandarrowsize,
-+ line 297: replaced inner sep=\tikzfeynman@arrow@size,
- by inner sep=0mm,
- minimum width = \tikzfeynhand@arrow@size,
-+ line 309: replaced xshift...
- by xshift=0.166666\feynhandarrowsize,
-+ line 316: replaced inner sep=\tikzfeynman@arrow@size,
- by inner sep=0mm,
- minimum width = \tikzfeynhand@arrow@size,
-+ line 343: inserted
- every top@@/.style={
- /tikz/preaction={draw=\feynhandtopsepcolor,line width=\feynhandtopsep}
- },
- every top/.style={/tikzfeynhand/every top@@/.append style={#1}},
- top/.style={
- /tikzfeynhand/every top@@,
- },
++ line 629: inserted:
-+ lines 350-352: replaced amplitude= ...
- by amplitude=3\feynhandlinesize,
- segment length=7.5\feynhandlinesize,
-+ line 381: inserted /tikz/line width = \feynhandlinesize,
-+ lines 383-384: replaced amplitude= ...
- by amplitude=3\feynhandlinesize,
- segment length=7.5\feynhandlinesize,
-+ line 399: inserted /tikz/line width = \feynhandlinesize,
-+ line 435 replaced /tikz/thick,
- by /tikz/line width = 2\feynhandlinesize,
-+ line 442: inserted
- every charged ghost@@/.style={
- /tikz/draw=none,
- /tikz/decoration={name=none},
+ %% Slashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ slash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ slash/size/.store in=\tikzfeynhand@slash@size,
+ slash/size=5\feynhandlinesize,
+ slash/style/.store in=\tikzfeynhand@slash@style,
+ slash/style={},
+ %% Styles
+ slash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{slash/.cd,#1}
+ \draw [\tikzfeynhand@slash@style] (-\tikzfeynhand@slash@size, -2*\tikzfeynhand@slash@size) -- (\tikzfeynhand@slash@size, 2*\tikzfeynhand@slash@size);
+ },
+ },
/tikz/postaction={
- /tikzfeynhand/with arrow=0.5,
+ /tikz/decorate=true,
},
},
- every charged ghost/.style={/tikzfeynhand/every charged ghost@@/.append style={#1}},
- charged ghost/.style={
- /tikzfeynhand/ghost,
- /tikzfeynhand/every charged ghost@@,
- },
- every anti charged ghost@@/.style={
- /tikz/draw=none,
- /tikz/decoration={name=none},
+ slash@@/.default={[]0.5},
+ %%
+ %% Backslashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ backslash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ backslash/size/.store in=\tikzfeynhand@backslash@size,
+ backslash/size=5\feynhandlinesize,
+ backslash/style/.store in=\tikzfeynhand@backslash@style,
+ backslash/style={},
+ %% Styles
+ backslash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{backslash/.cd,#1}
+ \draw [\tikzfeynhand@backslash@style] (-\tikzfeynhand@backslash@size, 2*\tikzfeynhand@backslash@size) -- (\tikzfeynhand@backslash@size, -2*\tikzfeynhand@backslash@size);
+ },
+ },
/tikz/postaction={
- /tikzfeynhand/with reversed arrow=0.5,
+ /tikz/decorate=true,
},
},
- every anti charged ghost/.style={/tikzfeynhand/every anti charged ghost@@/.append style={#1}},
- anti charged ghost/.style={
- /tikzfeynhand/ghost,
- /tikzfeynhand/every anti charged scalar@@,
- },
-
-+ line 447, 459, 473, 486, 497, 520:
- each inserted /tikz/line width = \feynhandlinesize,
-+ line 501: replaced segment length=1.5mm
- by amplitude=3\feynhandlinesize,
- segment length=8\feynhandlinesize
-+ line 510: inserted:
- % short versions of style names
- pho/.style={
- /tikzfeynhand/photon,
- },
- bos/.style={
- /tikzfeynhand/boson,
- },
- antbos/.style={
- /tikzfeynhand/anti charged boson,
- },
- chabos/.style={
- /tikzfeynhand/charged boson,
- },
- sca/.style={
- /tikzfeynhand/scalar,
- },
- chasca/.style={
- /tikzfeynhand/charged scalar,
- },
- antsca/.style={
- /tikzfeynhand/anti charged scalar,
- },
- fer/.style={
- /tikzfeynhand/fermion,
- },
- antfer/.style={
- /tikzfeynhand/anti fermion,
- },
- gho/.style={
- /tikzfeynhand/ghost,
- },
- chagho/.style={
- /tikzfeynhand/charged ghost,
- },
- antgho/.style={
- /tikzfeynhand/anti charged ghost,
- },
- glu/.style={
- /tikzfeynhand/gluon,
- },
- maj/.style={
- /tikzfeynhand/majorana,
- },
- antmaj/.style={
- /tikzfeynhand/anti majorana,
- },
-
-+ line 515: replaced insertion/size=3pt,
- by insertion/size=5\feynhandlinesize,
-+ line 541: replaced momentum/arrow distance=3mm,
- by momentum/arrow distance={\the\feynhandarrowsize},
-+ line 548: inserted
- momentum/arrow thickness/.store in=\tikzfeynhand@momentum@arrow@thickness,
- momentum/arrow thickness={0.64*\the\feynhandlinesize},
- momentum/arrow size/.store in=\tikzfeynhand@momentum@arrow@size,
- momentum/arrow size={0.8*\the\feynhandarrowsize},
-+ lines 559, 573, 592, 613, 627, 646, 667, 681, 700, 721, 736, 756:
- each replaced \draw [-Stealth, \tikzfeynman@momentum@arrow@style]
- by \draw [-{Stealth[length=\tikzfeynhand@momentum@arrow@size]},
- line width=\tikzfeynhand@momentum@arrow@thickness,
- \tikzfeynhand@momentum@arrow@style]
-+ lines 772+776: each removed /tikz/looseness=1.5,
-+ lines 786-814: removed %% Graceful ...
-
+ backslash@@/.default={[]0.5},
Binary files old/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf and new/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex new/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex
--- old/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex 2018-01-31 22:59:37.000000000 +0100
+++ new/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex 2019-08-20 22:44:55.000000000 +0200
@@ -2,7 +2,7 @@
%
% TikZ-FeynHand
% Feynman Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
%
% available at https://ctan.org/pkg/tikz-feynhand
%
@@ -116,7 +116,7 @@
%
\hrule
\vspace{3mm}
-{\centering\Large\bfseries Quick Reference\\}
+{\centering\Large\bfseries Quick Reference\vspace{-2mm}\\}
%
\noindent
\textbf{Environment}\\
@@ -158,13 +158,13 @@
\blucol\verb!\feynhandblobsize, \feynhandlinesize, \feynhandarrowsize, \feynhandtopsep!\txcol\\
\blucol\verb!\renewcommand{\feynhandtopsepcolor}{COLOR}!\txcol\\
\blucol\verb!\tikzfeynhandset{every STYLE={/tikz/color=COLOR},}!\txcol\\
-\vspace{1mm}
+\vspace{0mm}
%
% =====================================================================
\hrule
\vspace{2mm}
-{\centering Version 1.0.0 -
+{\centering Version 1.1.0 -
available at\qquad \texttt{https://ctan.org/pkg/tikz-feynhand}\\}
\vspace{1mm}
@@ -172,6 +172,7 @@
\hrule
% ===== TABEL OF CONTENTS ===========================================
%
+\vspace{-2mm}
\tableofcontents
%
% =====================================================================
@@ -1334,7 +1335,7 @@
\end{minipage}
%
% --------------------------------------------------------------------------------
-\newpage\subsubsection{Keys: In, Out, Looseness, Left/Right, Half/Quarter}
+\subsubsection{Keys: In, Out, Looseness, Left/Right, Half/Quarter}
\label{sec:_feynmandiagrams_keysinoutetc}
%
\noindent
@@ -1441,7 +1442,7 @@
%
% --------------------------------------------------------------------------------
\vspace{-6mm}
-\subsubsection{Propagator labels and momentum arrows}
+\newpage\subsubsection{Propagator labels and momentum arrows}
\label{sec:_feynmandiagrams_proplabelsmomentum}
%
\noindent
@@ -1562,10 +1563,57 @@
\end{feynhand}
\end{tikzpicture}
\end{minipage}
+%
+% -------------------------------------------------------------------------------------------------------
+\vspace{-3mm}
+\subsubsection{Slashes and backslashes}
+\label{sec:_feynmandiagrams_propagators_slashes}
+%
+\noindent
+Back/slashes work like insertions:
+\\
+%
+\begin{minipage}{0.83\linewidth}
+\vercol\begin{verbatim}
+ \vertex [dot] (a1) at (0,0) {}; \vertex [dot] (a2) at (2,0) {};
+ \propag [chabos, red, slash=0.25, slash=0.75] (a1) to (a2);
+\end{verbatim}\txcol
+\end{minipage}
+%
+\begin{minipage}{0.16\linewidth}
+\tikzsetnextfilename{propag_slash_1}
+%\tikzset{external/force remake}
+\begin{tikzpicture}
+ \begin{feynhand}
+ \vertex [dot] (a1) at (0,0) {};
+ \vertex [dot] (a2) at (2,0) {};
+ \propag [chabos, red, slash=0.25, slash=0.75] (a1) to (a2);
+ \end{feynhand}
+\end{tikzpicture}
+\end{minipage}
+\\
+\begin{minipage}{0.83\linewidth}
+\vercol\begin{verbatim}
+ \vertex [ringdot] (a1) at (0,0) {}; \vertex [ringdot] (a2) at (2,0) {};
+ \propag [chabos, red, backslash={[size=6pt,style=Green]0.25}] (a1) to (a2);
+\end{verbatim}\txcol
+\end{minipage}
+%
+\begin{minipage}{0.16\linewidth}
+\tikzsetnextfilename{propag_slash_2}
+%\tikzset{external/force remake}
+\begin{tikzpicture}
+ \begin{feynhand}
+ \vertex [ringdot] (a1) at (0,0) {};
+ \vertex [ringdot] (a2) at (2,0) {};
+ \propag [chabos, red, backslash={[size=6pt,style=Green]0.25}] (a1) to (a2);
+ \end{feynhand}
+\end{tikzpicture}
+\end{minipage}
%
% -------------------------------------------------------------------------------------------------------
-\subsubsection{Crossing propagators (one on top of the other)}
+\newpage\subsubsection{Crossing propagators (one on top of the other)}
\label{sec:_feynmandiagrams_propagators_top}
%
\noindent
@@ -1584,7 +1632,7 @@
\blucol\verb$VALUE$\txcol must be a number between 0 and 1,
and indicates the fraction of propagator length at which TikZ inserts the arrow.
The default value of \blucol\verb$VALUE$\txcol is 0.5.
-\vspace{2mm}\\
+\vspace{-1mm}\\
%
\begin{minipage}{0.8\linewidth}
\blucol\begin{verbatim}
@@ -1607,6 +1655,7 @@
\end{feynhand}
\end{tikzpicture}
\end{minipage}
+\vspace{-5mm}
\\
%
\begin{minipage}{0.8\linewidth}
@@ -1629,6 +1678,7 @@
\end{feynhand}
\end{tikzpicture}
\end{minipage}
+\vspace{-3mm}
%
%
% =====================================================================
@@ -1749,7 +1799,8 @@
\setlength{\feynhandarrowsize}{6pt}
\setlength{\feynhandtopsep}{18\feynhandlinesize}
\renewcommand{\feynhandtopsepcolor}{white}
-%
+\vspace{-4mm}
+\\
The color of a vertex/propagator style can be set for all subsequent diagrams
in the current local Tex group (e.g. document or equation, figure, minipage environment)
by the command \vercol\verb$\tikzfeynhandset$\txcol with the key \vercol\verb$every$\txcol:
@@ -1764,6 +1815,7 @@
% =====================================================================
% ===== APPENDICES ============================================
%
+%\newpage
\appendix
%
\section{TikZ Basics}
@@ -2049,7 +2101,7 @@
%
\begin{figure}
\centering
- \includegraphics[width=0.75\linewidth]{shell_escape.jpg}
+ \includegraphics[width=0.7\linewidth]{shell_escape.jpg}
\caption{TexWorks screenshot.}
\label{Fig:_shell_escape}
\end{figure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj new/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj 2019-08-21 01:53:49.000000000 +0200
@@ -1,9 +1,9 @@
name tikz-feynhand.doc
category Package
-revision 46502
+revision 51915
shortdesc doc files of tikz-feynhand
relocated 1
-docfiles size=114
+docfiles size=113
RELOC/doc/latex/tikz-feynhand/README.md
RELOC/doc/latex/tikz-feynhand/changes.txt
RELOC/doc/latex/tikz-feynhand/shell_escape.jpg
++++++ tikz-feynhand.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-feynhand/tikz-feynhand.sty new/tex/latex/tikz-feynhand/tikz-feynhand.sty
--- old/tex/latex/tikz-feynhand/tikz-feynhand.sty 2018-01-31 22:59:37.000000000 +0100
+++ new/tex/latex/tikz-feynhand/tikz-feynhand.sty 2019-08-20 22:44:55.000000000 +0200
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% TikZ-FeynHand, Version 1.0.0 of 2018/01/31
+% TikZ-FeynHand, Version 1.1.0 of 2019/08/19
% Feynhand Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
% Copyright (C) 2016 Joshua Ellis
%
%
@@ -27,7 +27,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\tikzfeynhand@date{2018/01/31}
+\def\tikzfeynhand@date{2019/08/19}
\def\tikzfeynhand@version@major{1}
\def\tikzfeynhand@version@minor{1}
\def\tikzfeynhand@version@patch{0}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex new/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex
--- old/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex 2018-01-31 22:59:37.000000000 +0100
+++ new/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex 2019-08-20 22:44:55.000000000 +0200
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% TikZ-FeynHand, Version 1.0.0 of 2018/01/31
+% TikZ-FeynHand, Version 1.1.0 of 2019/08/19
% Feynhand Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
% Copyright (C) 2016 Joshua Ellis
%
%
@@ -625,6 +625,54 @@
},
},
insertion@@/.default={[]0.5},
+ %%
+ %% Slashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ slash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ slash/size/.store in=\tikzfeynhand@slash@size,
+ slash/size=5\feynhandlinesize,
+ slash/style/.store in=\tikzfeynhand@slash@style,
+ slash/style={},
+ %% Styles
+ slash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{slash/.cd,#1}
+ \draw [\tikzfeynhand@slash@style] (-\tikzfeynhand@slash@size, -2*\tikzfeynhand@slash@size) -- (\tikzfeynhand@slash@size, 2*\tikzfeynhand@slash@size);
+ },
+ },
+ /tikz/postaction={
+ /tikz/decorate=true,
+ },
+ },
+ slash@@/.default={[]0.5},
+ %%
+ %% Backslashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ backslash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ backslash/size/.store in=\tikzfeynhand@backslash@size,
+ backslash/size=5\feynhandlinesize,
+ backslash/style/.store in=\tikzfeynhand@backslash@style,
+ backslash/style={},
+ %% Styles
+ backslash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{backslash/.cd,#1}
+ \draw [\tikzfeynhand@backslash@style] (-\tikzfeynhand@backslash@size, 2*\tikzfeynhand@backslash@size) -- (\tikzfeynhand@backslash@size, -2*\tikzfeynhand@backslash@size);
+ },
+ },
+ /tikz/postaction={
+ /tikz/decorate=true,
+ },
+ },
+ backslash@@/.default={[]0.5},
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Momentum arrows
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex new/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex
--- old/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex 2018-01-31 22:59:37.000000000 +0100
+++ new/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex 2019-08-20 22:44:55.000000000 +0200
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% TikZ-FeynHand, Version 1.0.0 of 2018/01/31
+% TikZ-FeynHand, Version 1.1.0 of 2019/08/19
% Feynhand Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
% Copyright (C) 2016 Joshua Ellis
%
% This LaTeX file and the whole package are free:
@@ -225,6 +225,20 @@
{\tikzfeynhand@key@opt{insertion@@}[]}}
\pgfkeyslet{/tikzfeynhand/insertion/.@cmd}{\tikzfeynhand@insertion}
+%% Slash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@slash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{slash@@}}
+ {\tikzfeynhand@key@opt{slash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/slash/.@cmd}{\tikzfeynhand@slash}
+
+%% Backslash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@backslash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{backslash@@}}
+ {\tikzfeynhand@key@opt{backslash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/backslash/.@cmd}{\tikzfeynhand@backslash}
+
%% Momentum
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\tikzfeynhand@momentum@std{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-feynhand.tlpobj new/tlpkg/tlpobj/tikz-feynhand.tlpobj
--- old/tlpkg/tlpobj/tikz-feynhand.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-feynhand.tlpobj 2019-08-21 01:53:49.000000000 +0200
@@ -1,6 +1,6 @@
name tikz-feynhand
category Package
-revision 46502
+revision 51915
shortdesc Feynman diagrams with TikZ
relocated 1
longdesc This package lets you draw Feynman diagrams using TikZ. It is a
@@ -21,7 +21,7 @@
RELOC/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex
catalogue-also tikz-feynman
catalogue-ctan /graphics/pgf/contrib/tikz-feynhand
-catalogue-date 2018-02-03 06:27:57 +0100
+catalogue-date 2019-08-19 22:08:01 +0200
catalogue-license gpl3+
catalogue-topics physics pgf-tikz
-catalogue-version 1.0.0
+catalogue-version 1.1.0
++++++ tikz-imagelabels.doc.tar.xz ++++++
Binary files old/doc/latex/tikz-imagelabels/tikz-imagelabels.pdf and new/doc/latex/tikz-imagelabels/tikz-imagelabels.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj new/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj 2019-06-28 01:53:54.000000000 +0200
@@ -1,9 +1,9 @@
name tikz-imagelabels.doc
category Package
-revision 49864
+revision 51490
shortdesc doc files of tikz-imagelabels
relocated 1
-docfiles size=365
+docfiles size=366
RELOC/doc/latex/tikz-imagelabels/README.md
RELOC/doc/latex/tikz-imagelabels/pleiades.jpg
RELOC/doc/latex/tikz-imagelabels/tikz-imagelabels.pdf
++++++ tikz-imagelabels.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-imagelabels/tikz-imagelabels.sty new/tex/latex/tikz-imagelabels/tikz-imagelabels.sty
--- old/tex/latex/tikz-imagelabels/tikz-imagelabels.sty 2019-01-29 23:13:18.000000000 +0100
+++ new/tex/latex/tikz-imagelabels/tikz-imagelabels.sty 2019-06-27 22:58:38.000000000 +0200
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesPackage{tikz-imagelabels}
- [2019/01/29 v0.1 put labels on images using TikZ]
+ [2019/06/27 v0.2 put labels on images using TikZ]
\RequirePackage{tikz}
\RequirePackage{xifthen}
\usetikzlibrary{
@@ -52,6 +52,13 @@
}
\imagelabelset{
+ coordinate label font/.store in = \coordinatelabelfont,
+ coordinate label distance/.store in = \coordinatelabelsep,
+ coordinate label back/.store in = \coordinatelabelback,
+ coordinate label text/.store in = \coordinatelabeltext,
+}
+
+\imagelabelset{
annotation font/.store in = \annotationfont,
arrow distance/.store in = \arrowdistance,
arrow thickness/.store in = \arrowthickness,
@@ -66,6 +73,10 @@
image label distance = 2mm,
image label back = black,
image label text = white,
+ coordinate label font = \sffamily\bfseries\scriptsize,
+ coordinate label distance = 2mm,
+ coordinate label back = black,
+ coordinate label text = white,
annotation font = \normalfont\small,
arrow distance = 1.5mm,
border thickness = 0.6pt,
@@ -159,12 +170,26 @@
text = \imagelabeltext,
font = \imagelabelfont,
},
+ coordinate label style/.style = {
+ rectangle,
+ minimum width = 3mm,
+ minimum height = 3mm,
+ fill = \coordinatelabelback,
+ text = \coordinatelabeltext,
+ font = \coordinatelabelfont,
+ },
image label/.style args = {#1 at #2}{
insert path = {
(image.#2) node[outer sep = \imagelabelsep,
anchor=#2, image label style] {#1}
}
},
+ coordinate label/.style args = {#1 at (#2)}{
+ insert path = {
+ node[outer sep = \coordinatelabelsep,
+ anchor=center, coordinate label style] at (#2) {#1}
+ }
+ },
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-imagelabels.tlpobj new/tlpkg/tlpobj/tikz-imagelabels.tlpobj
--- old/tlpkg/tlpobj/tikz-imagelabels.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-imagelabels.tlpobj 2019-06-28 01:53:55.000000000 +0200
@@ -1,6 +1,6 @@
name tikz-imagelabels
category Package
-revision 49864
+revision 51490
shortdesc Put labels on images using TikZ
relocated 1
longdesc This package allows to add label texts to an existing image
@@ -11,7 +11,7 @@
catalogue-contact-bugs https://github.com/tcpluess/tikz-imagelabels/issues
catalogue-contact-repository https://github.com/tcpluess/tikz-imagelabels
catalogue-ctan /graphics/pgf/contrib/tikz-imagelabels
-catalogue-date 2019-02-21 05:19:21 +0100
+catalogue-date 2019-06-27 14:24:00 +0200
catalogue-license lppl1.3
catalogue-topics graphics pgf-tikz graphics-incl graphics-text
-catalogue-version 0.1
+catalogue-version 0.2
++++++ tikz-kalender.doc.tar.xz ++++++
Binary files old/doc/latex/tikz-kalender/tikz-kalender-example1.pdf and new/doc/latex/tikz-kalender/tikz-kalender-example1.pdf differ
Binary files old/doc/latex/tikz-kalender/tikz-kalender-example2.pdf and new/doc/latex/tikz-kalender/tikz-kalender-example2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-kalender.doc.tlpobj new/tlpkg/tlpobj/tikz-kalender.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-kalender.doc.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-kalender.doc.tlpobj 2019-11-23 01:54:40.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-kalender.doc
category Package
-revision 49456
+revision 52890
shortdesc doc files of tikz-kalender
relocated 1
docfiles size=37
++++++ tikz-kalender.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-kalender/tikz-kalender-translation.clo new/tex/latex/tikz-kalender/tikz-kalender-translation.clo
--- old/tex/latex/tikz-kalender/tikz-kalender-translation.clo 2017-05-17 23:52:21.000000000 +0200
+++ new/tex/latex/tikz-kalender/tikz-kalender-translation.clo 2019-06-06 23:48:30.000000000 +0200
@@ -1,7 +1,16 @@
-\ProvidesFile{tikz-kalender-translation.clo}[2017/05/08 v1.0b
+\ProvidesFile{tikz-kalender-translation.clo}[2019/06/05 v1.0c
Calendar translations (RN)]
-% shorter strings
+% shorter strings than the default definitions
+
+\deftranslation[to=English]{Mon}{Mo}% Monday
+\deftranslation[to=English]{Tue}{Tu}% Tuesday
+\deftranslation[to=English]{Wed}{We}% Wednesday
+\deftranslation[to=English]{Thu}{Th}% Thursday
+\deftranslation[to=English]{Fri}{Fr}% Friday
+\deftranslation[to=English]{Sat}{Sa}% Saturday
+\deftranslation[to=English]{Sun}{Su}% Sunday
+
\deftranslation[to=Polish]{Mon}{Po}% PoniedziaÅek
\deftranslation[to=Polish]{Tue}{Wt}% Wtorek
\deftranslation[to=Polish]{Wed}{\'{S}r}% Åroda
@@ -10,14 +19,4 @@
\deftranslation[to=Polish]{Sat}{So}% Sobota
\deftranslation[to=Polish]{Sun}{Ni}% Niedziela
-\deftranslation[to=English]{Mon}{Mo}
-\deftranslation[to=English]{Tue}{Tu}
-\deftranslation[to=English]{Wed}{We}
-\deftranslation[to=English]{Thu}{Th}
-\deftranslation[to=English]{Fri}{Fr}
-\deftranslation[to=English]{Sat}{Sa}
-\deftranslation[to=English]{Sun}{Su}
-
\endinput
-%%
-%% End of file `tikz-kalender-translation.clo'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-kalender/tikz-kalender.cls new/tex/latex/tikz-kalender/tikz-kalender.cls
--- old/tex/latex/tikz-kalender/tikz-kalender.cls 2018-12-19 23:11:39.000000000 +0100
+++ new/tex/latex/tikz-kalender/tikz-kalender.cls 2019-11-22 23:18:59.000000000 +0100
@@ -7,7 +7,7 @@
\setcounter{errorcontextlines}{100}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{tikz-kalender}[2018/12/18 v0.4d Calendar class (RN)]
+\ProvidesClass{tikz-kalender}[2019/11/22 v0.4f Calendar class (RN)]
\DeclareOption*{\OptionNotUsed}
\ProcessOptions\relax
@@ -98,8 +98,6 @@
\newcommand*\setup[1]{\pgfqkeys{/RN}{#1}}
-\PassOptionsToPackage{english}{babel}
-\PassOptionsToPackage{english}{translator}
\PassOptionsToPackage{a4paper}{geometry}
\PassOptionsToPackage{svgnames}{xcolor}
@@ -136,6 +134,10 @@
\@ifpackageloaded{inputenc}{}{\RequirePackage[utf8]{inputenc}}%
\fi
\RequirePackage{babel,translator,tikz}
+ \@ifpackagelater{pgf}{2019/05/10}{}{%
+ \def\pgfutil@translate#1{\translate{#1}}%
+ % Correct the wrong definition in `pgfutil-latex.def'
+ }%
\input{tikz-kalender-translation.clo}
\usetikzlibrary{calendar}
}
@@ -247,6 +249,11 @@
}
\newcommand*\event{%
+ \ClassError{tikz-kalender}{%
+ Macro \string\event\space is only allowed inside of .events files}{}%
+}
+
+\newcommand*\RN@event{%
\@ifstar{\@tempswatrue\RN@event@i}{\@tempswafalse\RN@event@i}%
}
\newcommand*\RN@event@i[2]{%
@@ -344,12 +351,14 @@
\pgfcalendarifdate{\RN@year-01-01}{Tuesday,Wednesday,Thursday}{%
\setcounter{weeknumber}{1}}{\setcounter{weeknumber}{0}}%
\begingroup%
+ \let\event=\RN@event
\let\year=\RN@year
\def\RN@event@ii##1##2[##3]{}% 1st loop: only the periods
\def\do##1{\InputIfFileExists{##1.events}{}{}}%
\expandafter\docsvlist\expandafter{\RN@events@files}%
\endgroup
\begingroup
+ \let\event=\RN@event
\let\year=\RN@year
\def\RN@period@i##1##2[##3]{}% 2nd loop: only the events
\def\do##1{\InputIfFileExists{##1.events}{}{}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-kalender.tlpobj new/tlpkg/tlpobj/tikz-kalender.tlpobj
--- old/tlpkg/tlpobj/tikz-kalender.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-kalender.tlpobj 2019-11-23 01:54:40.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-kalender
category Package
-revision 49456
+revision 52890
shortdesc A LaTeX based calendar using TikZ
relocated 1
longdesc For usage see the example files tikz-kalender-example1.tex,
@@ -16,7 +16,7 @@
catalogue-contact-bugs https://github.com/rolfn/kalenderRN/issues
catalogue-contact-repository https://github.com/rolfn/kalenderRN
catalogue-ctan /graphics/pgf/contrib/tikz-kalender
-catalogue-date 2018-12-19 13:44:06 +0100
+catalogue-date 2019-11-22 11:08:49 +0100
catalogue-license cc-by-sa-1
catalogue-topics calendar class pgf-tikz
-catalogue-version 0.4d
+catalogue-version 0.4f
++++++ tikz-network.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-network/README.md new/doc/latex/tikz-network/README.md
--- old/doc/latex/tikz-network/README.md 2018-07-30 23:13:38.000000000 +0200
+++ new/doc/latex/tikz-network/README.md 2019-08-15 22:22:22.000000000 +0200
@@ -56,7 +56,7 @@
## License
-Copyright (c) 2018 [Juergen Hackl](mailto:hackl.j@gmx.at)
+Copyright (c) 2019 [Juergen Hackl](mailto:hackl.j@gmx.at)
This program is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Binary files old/doc/latex/tikz-network/tikz-network.pdf and new/doc/latex/tikz-network/tikz-network.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-network/tikz-network.tex new/doc/latex/tikz-network/tikz-network.tex
--- old/doc/latex/tikz-network/tikz-network.tex 2018-07-30 23:13:38.000000000 +0200
+++ new/doc/latex/tikz-network/tikz-network.tex 2019-08-15 22:22:22.000000000 +0200
@@ -2,9 +2,9 @@
% File : tikz-network.tex -- The manual for the package tikz-network
% Author : Juergen Hackl
% Creation : 2018-07-30
-% Time-stamp:
-%
-% Copyright (c) 2018 Juergen Hackl
+% Time-stamp:
+%e
+% Copyright (c) 2019 Juergen Hackl
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
% Book metadata
\title{tikz-network\\manual}
\author[J\"urgen Hackl]{J\"urgen Hackl}
-\publisher{Version 1.0}
+\publisher{Version 1.1}
%%
% If they're installed, use Bergamo and Chantilly from www.fontsite.com.
@@ -83,6 +83,10 @@
\usepackage{xspace}
%%
+% needed for its \numberwithin command
+\usepackage{amsmath}
+
+%%
% Some shortcuts for Tufte's book titles. The lowercase commands will
% produce the initials of the book title in italics. The all-caps commands
% will print out the full title of the book in italics.
@@ -173,15 +177,30 @@
\newcommand{\docfilehook}[2]{\texttt{#1}\index{file hooks!#2}\index{#1@\texttt{#1}}}
\newcommand{\doccounter}[1]{\texttt{#1}\index{#1 counter@\texttt{#1} counter}}
+%%
+% Example environment
-\newenvironment{docspec}{\begin{shaded}}{\vspace{-5mm}\end{shaded}}% command specification environment
+% Create counter
+\newcounter{doccount}
+\newenvironment{docspec}{%
+ \bigskip\noindent% create a vertical offset to previous material
+ \refstepcounter{doccount}% increment the environment's counter
+ \llap{\parbox{1.5cm}{\hfill\small\thedoccount}\hspace{2mm}}\vspace{-9mm}
+ \begin{shaded}
+ }
+ {\vspace{-5mm}\end{shaded}}% command specification environment
+\numberwithin{doccount}{chapter}
% Numerate the sections
\setcounter{secnumdepth}{2}
\setcounter{tocdepth}{3}
+\newenvironment{docspeca}{\begin{shaded}}
+ {\vspace{-5mm}\end{shaded}}% command specification environment
+
+
\usepackage{etoolbox}
@@ -1103,7 +1122,7 @@
The font size of the \docopt{label} can be modified with the option \docopt{fontsize}. Here common \LaTeX~ font size commands\footnote{e.g. \doccmd{tiny}, \doccmd{scriptsize}, \doccmd{footnotesize}, \doccmd{small}, \dots.} can be used to change the size of the label.
-\begin{marginfigure}[6mm]
+\begin{marginfigure}[25mm]
\centering
\begin{tikzpicture}
\Vertex{A} \Vertex[x=2]{B} \Vertex[x=2,y=-1]{C}
@@ -1440,7 +1459,9 @@
In order to display RGB colors for the line color of the edge, the option \docopt{RGB} has to be entered. In combination with this option, the \docopt{color} hast to be a list with the \docarg{RGB
values}, separated by <<,>> and within $\{~\}$.\footnote{e.g. the RGB code for white: $\{255,255,255\}$}
-\begin{marginfigure}%[28mm]
+\newpage
+
+\begin{marginfigure}[10mm]
\centering
\begin{tikzpicture}
\Vertex{A} \Vertex[x=2]{B} \Vertex[x=2,y=-1]{C}
@@ -1976,7 +1997,7 @@
\centering
\begin{tikzpicture}
\Vertices[IdAsLabel]{data/vertices.csv}
- \node at (2,1)[font=\scriptsize]{C};
+ %\node at (2,1)[font=\scriptsize]{C};
\end{tikzpicture}
\end{marginfigure}
@@ -3198,7 +3219,7 @@
\end{tikzpicture}
\end{marginfigure}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
#!/usr/bin/python -tt
# -*- coding: utf-8 -*-
@@ -3217,11 +3238,11 @@
from network2tikz import plot
plot((nodes,edges),'network.tex',**style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
(see above) gives
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
\documentclass{standalone}
\usepackage{tikz-network}
@@ -3239,7 +3260,7 @@
\end{tikzpicture}
\end{document}
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Tweaking the plot is straightforward and can be done as part of your LaTeX workflow.
@@ -3248,11 +3269,11 @@
\texttt{network2tikz} is available from the \href{https://pypi.org/project/network2tikz/}{Python Package Index}, so simply type
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
pip install -U network2tikz
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
to install/update. If your are intersted in the development version of the module check out the \href{https://github.com/hackl/network2tikz}{github repository}.
@@ -3262,48 +3283,57 @@
\item Generate, manipulation, and study of the structure, dynamics, and functions of your complex networks as usual, with your preferred python module.
\item Instead of the default plot functions (e.g. \texttt{igraph.plot()} or \texttt{networkx.draw()}) invoke \texttt{network2tikz} by
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G,'mytikz.tex')
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
+
to store your network visualisation as the TikZ file \texttt{mytikz.tex}. Load the module with:
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
from network2tikz import plot
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\textbf{Advanced usage:}
Of course, you always can improve your plot by manipulating the generated LaTeX file, but why not do it directly in Python? To do so, all visualization options available in \pkg are also implemented in \texttt{network2tikz}. The appearance of the plot can be modified by keyword arguments.\footnote{For a detailed explanation, please see Section \ref{sec:plot_function}.}
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
my_style = {}
plot(G,'mytikz.tex',**my_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
The arguments follow the options described above in the manual.
Additionally, if you are more interested in the final output and not only the \texttt{.tex} file, used
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G,'mypdf.pdf')
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
+
to save your plot as a pdf, or
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
+
to create a temporal plot and directly show the result, i.e. similar to the matplotlib function \texttt{show()}. Finally, you can also create a node and edge list, which can be read and easily modified (in a post-processing step) as showd above.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G,'mycsv.csv')
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\item Compile the figure or add the contents of \texttt{mytikz.tex} into your LaTeX source code. With the option \docopt{standalone}=\docarg{false} only the \tikzsym figure will be saved, which can then be easily included in your \LaTeX~ document via \doccmd{input}\{\texttt{/path/to/mytikz.tex}\}.
@@ -3315,7 +3345,8 @@
Create network object and add some edges.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
#!/usr/bin/python -tt
# -*- coding: utf-8 -*-
@@ -3326,11 +3357,11 @@
net = igraph.Graph([(0,1), (0,2), (2,3), (3,4), (4,2), (2,5), (5,0), (6,3),
(5,6), (6,6)],directed=True)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Adding node and edge properties.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
net.vs["name"] = ["Alice", "Bob", "Claire", "Dennis", "Esther", "Frank", "George"]
net.vs["age"] = [25, 31, 18, 47, 22, 23, 50]
@@ -3338,7 +3369,7 @@
net.es["is_formal"] = [False, False, True, True, True, False, True, False,
False, False]
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Already now the network can be plotted.
\begin{marginfigure}[5mm]
@@ -3365,15 +3396,15 @@
\end{tikzpicture}
\end{marginfigure}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Per default, the node positions are assigned uniform random. In order to create a layout, the layout methods of the network packages can be used. Or the position of the nodes can be directly assigned, in form of a dictionary, where the key is the node id and the value is a tuple of the node position in $x$ and $y$.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
layout = {0: (4.3191, -3.5352), 1: (0.5292, -0.5292),
2: (8.6559, -3.8008), 3: (12.4117, -7.5239),
@@ -3381,7 +3412,7 @@
6: (9.7608, -12.7)}
plot(net,layout=layout)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\begin{marginfigure}[5mm]
\centering
@@ -3412,11 +3443,11 @@
We can simply re-using the previous layout object here, but we also specified that we need a bigger plot ($8 \times 8$ cm) and a larger margin around the graph to fit the self loop and potential labels (1 cm).\footnote{Per default, all size values are based on cm, and all line widths are defined in pt units. With the general option \docopt{units} this can be changed, see Section \ref{sec:plot_function}.}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net, layout=layout, canvas=(8,8), margin=1)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\begin{marginfigure}[5mm]
\centering
@@ -3444,7 +3475,7 @@
In to keep the properties of the visual representation of your network separate from the network itself. You can simply set up a Python dictionary containing the keyword arguments you would pass to \texttt{plot} and then use the double asterisk (\texttt{**}) operator to pass your specific styling attributes to \texttt{plot}:
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
color_dict = {'m': 'blue', 'f': 'red'}
visual_style = {}
@@ -3468,7 +3499,7 @@
# Plot command
plot(net,**visual_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\begin{marginfigure}[5mm]
\centering
@@ -3498,17 +3529,17 @@
Beside showing the network, we can also generate the latex source file, which can be used and modified later on. This is done by adding the output file name with the ending \texttt{'.tex'}.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net,'network.tex',**visual_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
produces
\begin{fullwidth}
\begin{minipage}{17cm}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
\documentclass{standalone}
\usepackage{tikz-network}
@@ -3535,21 +3566,22 @@
\end{tikzpicture}
\end{document}
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\end{minipage}
\end{fullwidth}
Instead of the tex file, a node and edge list can be generates, which can also be used with the library.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net,'network.csv',**visual_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
The node list \texttt{network\_nodes.csv}.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
id,x,y,size,color,opacity,label,position
a,2.868,5.518,0.5,red,0.7,Alice,below
@@ -3560,10 +3592,11 @@
f,3.698,2.808,0.5,blue,0.7,Frank,below
g,5.551,1.000,0.5,blue,0.7,George,below
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
The edge list \texttt{network\_edges.csv}.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
u,v,lw,bend,Direct
a,b,1.0,-8.531,true
@@ -3577,7 +3610,7 @@
g,g,1.0,-8.531,true
g,d,1.0,-8.531,true
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\subsection{The plot function in detail}
\label{sec:plot_function}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-network.doc.tlpobj new/tlpkg/tlpobj/tikz-network.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-network.doc.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-network.doc.tlpobj 2019-08-16 01:54:37.000000000 +0200
@@ -1,9 +1,9 @@
name tikz-network.doc
category Package
-revision 48314
+revision 51884
shortdesc doc files of tikz-network
relocated 1
-docfiles size=278
+docfiles size=287
RELOC/doc/latex/tikz-network/README.md
RELOC/doc/latex/tikz-network/data/edges.csv
RELOC/doc/latex/tikz-network/data/front.pdf
++++++ tikz-network.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-network/tikz-network.sty new/tex/latex/tikz-network/tikz-network.sty
--- old/tex/latex/tikz-network/tikz-network.sty 2018-07-30 23:13:38.000000000 +0200
+++ new/tex/latex/tikz-network/tikz-network.sty 2019-08-15 22:22:22.000000000 +0200
@@ -2,10 +2,10 @@
% File : tikz-network.sty -- Library for plotting networks in TikZ
% Author : Juergen Hackl
% Creation : 2017-02-28
-% Time-stamp:
-% Version : 1.0 (2018-07-30)
+% Time-stamp:
+% Version : 1.1 (2019-08-15)
%
-% Copyright (c) 2018 Juergen Hackl
+% Copyright (c) 2019 Juergen Hackl
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
% ============================================================================
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikz-network}[2018/07/30 tikz-network v1.0]
+\ProvidesPackage{tikz-network}[2019/08/15 tikz-network v1.1]
%=============================================================================
% Used packages
@@ -33,6 +33,7 @@
\RequirePackage{tikz}
\RequirePackage{datatool}
\RequirePackage{graphicx}
+\RequirePackage{trimspaces}
\usetikzlibrary{arrows}
\usetikzlibrary{positioning}
\usetikzlibrary{3d}
@@ -797,6 +798,8 @@
\edef\vertex@rgbValues{}%
% Go through each row element
\DTLforeachkeyinrow{\thisValue}{
+ % Remove leading and trailing spaces
+ \trim@spaces@in\dtlkey
\DTLifeq{\dtlkey}{id}{
% Assign vertex id to storage variable
\edef\vertex@id{\thisValue}%
@@ -970,8 +973,10 @@
{1\DefaultUnit}, position = {}, loopposition = {0}, loopshape = {90},
distance = {.5}, path = {}, fontcolor = {}, fontsize = {}, fontscale ={},}
\edef\edge@rgbValues{}%
- % Go through each row element
- \DTLforeachkeyinrow{\thisValue}{
+ % Go through each row element
+ \DTLforeachkeyinrow{\thisValue}{
+ % Remove leading and trailing spaces
+ \trim@spaces@in\dtlkey
\DTLifeq{\dtlkey}{u}{
% Assign edge id to storage variable
\edef\edge@u{\thisValue}%
@@ -1038,6 +1043,9 @@
\Edge[Network](\edge@u)(\edge@v)
}{
\ifthenelse{\not\equal{\cmdNW@edges@vertices}{}}{
+ % Generate pseudo vertices
+ \Vertices[Pseudo,NoLabel]{\cmdNW@edges@vertices}
+ % Delete existing vertices data base
\DTLifdbexists{vertices}{
\DTLgdeletedb{vertices}
}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-network.tlpobj new/tlpkg/tlpobj/tikz-network.tlpobj
--- old/tlpkg/tlpobj/tikz-network.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-network.tlpobj 2019-08-16 01:54:38.000000000 +0200
@@ -1,19 +1,18 @@
name tikz-network
category Package
-revision 48314
+revision 51884
shortdesc Draw networks with TikZ
relocated 1
longdesc This package allows the creation of images of complex networks
longdesc that are seamlessly integrated into the underlying LaTeX files.
-runfiles size=13
+longdesc The package requires datatool, etex, graphicx, tikz,
+longdesc trimspaces, xifthen, and xkeyval.
+runfiles size=14
RELOC/tex/latex/tikz-network/tikz-network.sty
-catalogue-contact-announce https://github.com/hackl/tikz-network
catalogue-contact-bugs https://github.com/hackl/tikz-network/issues
-catalogue-contact-home https://github.com/hackl/tikz-network
catalogue-contact-repository https://github.com/hackl/tikz-network
-catalogue-contact-support https://github.com/hackl/tikz-network/issues
catalogue-ctan /graphics/pgf/contrib/tikz-network
-catalogue-date 2018-08-04 05:30:36 +0200
+catalogue-date 2019-08-15 18:40:01 +0200
catalogue-license gpl3+
-catalogue-topics pgf-tikz diagram
-catalogue-version 1.0
+catalogue-topics graphics pgf-tikz diagram
+catalogue-version 1.1
++++++ tikz-relay.doc.tar.xz ++++++
++++ 3310 lines of diff (skipped)
++++++ tikzcodeblocks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzcodeblocks/README.md new/doc/latex/tikzcodeblocks/README.md
--- old/doc/latex/tikzcodeblocks/README.md 2018-04-03 23:30:09.000000000 +0200
+++ new/doc/latex/tikzcodeblocks/README.md 2020-04-13 00:31:41.000000000 +0200
@@ -5,7 +5,7 @@
|------------|------------------------------------------------------------|
|author: |Adrian Salamon |
|email: |adriansalamon@gmail.com |
-|date: |2018-04-03 |
+|date: |2020-04-06 |
|licence: |LaTeX Project Public License 1.3c |
## What is tikzcodeblocks?
@@ -28,4 +28,4 @@
### Planed features
-- better multi-language / english support
\ No newline at end of file
+- better multi-language / english support
Binary files old/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.pdf and new/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex new/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex
--- old/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex 2018-04-03 23:30:09.000000000 +0200
+++ new/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex 2020-04-13 00:31:41.000000000 +0200
@@ -95,6 +95,7 @@
\vhEntry{0.1 }{2017-07-06}{A. Salamon}{published}
\vhEntry{0.11}{2017-07-18}{A. Salamon}{update: shapes, translations and fix typos}
\vhEntry{0.12}{2018-04-03}{A. Salamon}{update: LED colors}
+ \vhEntry{0.13}{2020-04-06}{A.~Salamon, A.~Wagner }{bug-fix: wrongly shifed nodes}
\end{versionhistory}
%
\begin{itemize}[leftmargin=*,noitemsep]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj new/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj
--- old/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj 2019-02-28 04:08:44.000000000 +0100
+++ new/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj 2020-04-16 01:57:26.000000000 +0200
@@ -1,9 +1,9 @@
name tikzcodeblocks.doc
category Package
-revision 47265
+revision 54758
shortdesc doc files of tikzcodeblocks
relocated 1
-docfiles size=135
+docfiles size=136
RELOC/doc/latex/tikzcodeblocks/README.md
RELOC/doc/latex/tikzcodeblocks/examples/bsp-einruecken.tikz
RELOC/doc/latex/tikzcodeblocks/examples/bsp-english.tikz
++++++ tikzcodeblocks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzcodeblocks/tikzcodeblocks.sty new/tex/latex/tikzcodeblocks/tikzcodeblocks.sty
--- old/tex/latex/tikzcodeblocks/tikzcodeblocks.sty 2018-04-03 23:30:09.000000000 +0200
+++ new/tex/latex/tikzcodeblocks/tikzcodeblocks.sty 2020-04-13 00:31:41.000000000 +0200
@@ -320,23 +320,23 @@
%
% https://tex.stackexchange.com/questions/223910/reference-a-nodes-color-by-us...
% get color of 'this' element
-every text node part/.add code={}{
- \globalcolorstrue
- \ifx\tikz@fillcolor\pgfutil@empty
- \pgfutil@colorlet{\tikz@fig@name.fill}{.}
- \else
- \pgfutil@colorlet{\tikz@fig@name.fill}{\tikz@fillcolor}
- \fi
- \ifx\tikz@strokecolor\pgfutil@empty
- \pgfutil@colorlet{\tikz@fig@name.draw}{.}
- \else
- \pgfutil@colorlet{\tikz@fig@name.draw}{\tikz@strokecolor}
- \fi
- \ifx\tikz@textcolor\pgfutil@empty
- \pgfutil@colorlet{\tikz@fig@name.text}{.}
- \else
- \pgfutil@colorlet{\tikz@fig@name.text}{\tikz@textcolor}
- \fi
+every text node part/.add code={}{%
+\globalcolorstrue%
+\ifx\tikz@fillcolor\pgfutil@empty%
+\pgfutil@colorlet{\tikz@fig@name.fill}{.}%
+\else%
+\pgfutil@colorlet{\tikz@fig@name.fill}{\tikz@fillcolor}%
+\fi%
+\ifx\tikz@strokecolor\pgfutil@empty%
+\pgfutil@colorlet{\tikz@fig@name.draw}{.}%
+\else%
+\pgfutil@colorlet{\tikz@fig@name.draw}{\tikz@strokecolor}%
+\fi%
+\ifx\tikz@textcolor\pgfutil@empty%
+\pgfutil@colorlet{\tikz@fig@name.text}{.}%
+\else%
+\pgfutil@colorlet{\tikz@fig@name.text}{\tikz@textcolor}%
+\fi%
},
} %end tikzset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzcodeblocks.tlpobj new/tlpkg/tlpobj/tikzcodeblocks.tlpobj
--- old/tlpkg/tlpobj/tikzcodeblocks.tlpobj 2019-02-28 04:08:44.000000000 +0100
+++ new/tlpkg/tlpobj/tikzcodeblocks.tlpobj 2020-04-16 01:57:26.000000000 +0200
@@ -1,6 +1,6 @@
name tikzcodeblocks
category Package
-revision 47265
+revision 54758
shortdesc Helps to draw codeblocks like scratch, NEPO and PXT in TikZ
relocated 1
longdesc tikzcodeblocks is a LaTeX package for typesetting blockwise
@@ -9,7 +9,6 @@
RELOC/tex/latex/tikzcodeblocks/tikzcodeblocks.sty
catalogue-also scratch
catalogue-ctan /graphics/pgf/contrib/tikzcodeblocks
-catalogue-date 2018-04-03 13:13:53 +0200
catalogue-license lppl1.3c
catalogue-topics pgf-tikz
-catalogue-version 0.12
+catalogue-version 0.13
++++++ tikzducks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzducks/README.md new/doc/latex/tikzducks/README.md
--- old/doc/latex/tikzducks/README.md 2019-04-07 23:21:00.000000000 +0200
+++ new/doc/latex/tikzducks/README.md 2020-01-03 23:15:44.000000000 +0100
@@ -1,29 +1,11 @@
-# Tikzducks
+# TikZducks
-This is a little LaTeX package for ducks to be used in TikZ pictures. The project is a continuation of https://tex.stackexchange.com/a/347458/36296
+This is a little LaTeX package for ducks to be used in TikZ pictures. The project is a continuation of the TeX.Stackexchange.com answer [How can we draw a duck](https://tex.stackexchange.com/a/347458/36296)
This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
-The project repository, including a bug tracker, can be found at https://github.com/samcarter/tikzducks/issues
-
-![This repository has an official duck seal of approval](https://i.stack.imgur.com/mSAtL.png)
-
## A few examples:
-![tikz ducks](https://user-images.githubusercontent.com/8226363/33049537-e71e9dd0-ce60-11e...)
-
-## Video showcases
-
-There are several videos featuring the TikZducks, kindly contributed by Ulrike and Gert Fischer, Carla Maggi, Paulo Cereda and Prof. van Duck - many thanks to you all!
-
-[![The great TikZducks Christmas Extravaganza 2017](https://user-images.githubusercontent.com/8226363/43651585-1281b074-9743-11e8-97f5-bf70617738a5.png)](https://vimeo.com/246256860)
-[![International Pizza Day](https://user-images.githubusercontent.com/8226363/43651587-12c92daa-9743-11e8-83b5-7fd3a3ac19a3.png)](https://vimeo.com/254643482)
-[![Happy Groundhog Day](https://user-images.githubusercontent.com/8226363/43651589-12e84334-9743-11e8-9621-d5e6e53a0ca8.png)](https://vimeo.com/252719006)
-[![Aquarela with TikZducks](https://user-images.githubusercontent.com/8226363/43651586-12a6c008-9743-11e8-99d2-5a66e7f5f1ee.png)](https://vimeo.com/270727100)
-[![Saint Crispin's Day](https://user-images.githubusercontent.com/43832342/47496794-37d18600-d858-11e8-9e6e-777ffee1acdc.png)](https://vimeo.com/295353434)
-[![James Bond](https://user-images.githubusercontent.com/43832342/47496795-37d18600-d858-11e8-8c0c-20ea2d0a23cd.png)](https://vimeo.com/284348495)
-[![The great TikZlings Christmas Extravaganza 2018](https://user-images.githubusercontent.com/43832342/49704004-3cd27500-fc0d-11e8-9002-319a8e71aca7.png)](https://vimeo.com/305374856)
-
-
+![tikz ducks](https://user-images.githubusercontent.com/43832342/71718547-d160d400-2e1b-11...)
-The source code for the "The great TikZducks Christmas Extravaganza 2017" is available in https://github.com/cereda/duck-extravaganza, for "The great TikZlings Christmas Extravaganza 2018" it can be found at https://github.com/samcarter/Extravanganza2018 .
+More examples of TikZducks can be seen at https://github.com/samcarter/tikzducks/
\ No newline at end of file
Binary files old/doc/latex/tikzducks/tikzducks-doc.pdf and new/doc/latex/tikzducks/tikzducks-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzducks/tikzducks-doc.tex new/doc/latex/tikzducks/tikzducks-doc.tex
--- old/doc/latex/tikzducks/tikzducks-doc.tex 2019-04-07 23:21:00.000000000 +0200
+++ new/doc/latex/tikzducks/tikzducks-doc.tex 2020-01-03 23:15:44.000000000 +0100
@@ -10,9 +10,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.1
-% April 7, 2019
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[parskip=half]{scrartcl}
@@ -24,7 +21,7 @@
\usepackage{tikzducks}
\usetikzlibrary{ducks}
\usepackage[most]{tcolorbox}
-\usepackage[paper=a4paper,margin=3cm]{geometry}
+\usepackage[paper=a4paper,margin=3cm,foot=2cm]{geometry}
\usepackage{url}
\usepackage{xspace}
\usepackage{scrlayer-scrpage}
@@ -56,7 +53,7 @@
commentstyle={\color{green!50!black}\slshape},
columns=fullflexible,
emphstyle=\color{orange!70!black},
- emph=[1]{water,body,head,eye,pupil,bill,grumpy,tshirt,jacket,tie,cape,shorthair,longhair,crazyhair,recedinghair,eyebrow,beard,glasses,sunglasses,alien,hat,cap,santa,chef,cheese,graduate,tassel,beret,crown,unicorn,icecream,flavoura,flavourb,flavourc,book,bookcolour,signpost,signcolour,signback,magichat,magicstars,magicwand,witch,cricket,rollingpin,lightsaber,torch,cake,pizza,hockey,baguette,wing,football,mask,bunny,inear,necklace,milkshake,wine,peakedcap,prison,tophat,speech,bubblecolour,think,buttons,sheep,squareglasses,tail,basket,easter,egga,eggb,eggc,mohican,mullet,horsetail,darthvader,crozier,queencrown,kingcrown,wing,laughing,parrot,stethoscope,niuqelrah,harlequin,neckerchief,woggle,snowduck,invisible,strawhat,ribbon,vampire,parting,crystalball,helmet,shovel,pickaxe,bowtie,lapel,umbrella,umbrellaclosed,handbag,cocktail,viking,devil},
+ emph=[1]{water,body,head,eye,pupil,bill,grumpy,tshirt,jacket,tie,cape,shorthair,longhair,crazyhair,recedinghair,eyebrow,beard,glasses,sunglasses,alien,hat,cap,santa,chef,cheese,graduate,tassel,beret,crown,unicorn,icecream,flavoura,flavourb,flavourc,book,bookcolour,signpost,signcolour,signback,magichat,magicstars,magicwand,witch,cricket,rollingpin,lightsaber,torch,cake,pizza,hockey,baguette,wing,football,mask,bunny,inear,necklace,milkshake,wine,peakedcap,prison,tophat,speech,bubblecolour,think,buttons,sheep,squareglasses,tail,basket,easter,egga,eggb,eggc,mohican,mullet,horsetail,darthvader,crozier,queencrown,kingcrown,wing,laughing,parrot,stethoscope,niuqelrah,harlequin,neckerchief,woggle,snowduck,invisible,strawhat,ribbon,vampire,parting,crystalball,helmet,shovel,pickaxe,bowtie,lapel,umbrella,umbrellaclosed,handbag,cocktail,viking,devil,aodai,conicalhat,overleaf},
texcsstyle=*\color{duckblue}\bfseries,
keywordstyle=\color{red!60!black}\bfseries,
morekeywords={tikzpicture,picture,scope,patterns,calc,pgfinterruptboundingbox},
@@ -86,7 +83,7 @@
\pgfkeys{/duck/|stripes|/.style={stripes={#1}}}
\pgfmathsetseed{2}
-\setlength{\footheight}{45pt}
+\setlength{\footheight}{41pt}
\newlength{\duckoffset}
\cfoot{%
@@ -119,7 +116,7 @@
\url{https://github.com/samcarter/tikzducks}\\
\url{https://www.ctan.org/pkg/tikzducks}
}{samcarter}}
-\date{Version 1.1 -- \today}
+\date{Version v1.3 \textendash{} 2020/01/03}
\begin{document}
\maketitle
@@ -156,7 +153,9 @@
%
\href{https://tex.stackexchange.com/users/148434/mihikma}{Mihikma} created the duck's beard,
%
-\href{https://github.com/yudai-nkt}{Yudai Nakata} helped with problems of \lstinline|\pdfrandomseed|
+\href{https://github.com/yudai-nkt}{Yudai Nakata} helped with problems of \lstinline|\pdfrandomseed|,
+%
+@marmot for his seemingly infinite knowledge of \TikZ which he shared with the world on TeX.SE
%
and last but not least my thanks go to \href{https://tex.stackexchange.com/users/5763/martin-schr%c3%b6der}{Martin Schr\"oder} for his feedback to the code review.
@@ -167,10 +166,10 @@
The \tikzducks package loads \TikZ, which in turn loads the \lstinline|xcolor| package (amongst others). If you require one of these packages to be loaded with some option, please consider loading it yourself before the \tikzducks package or use, e.g.
-\begin{lstlisting}[aboveskip=0em,morekeywords={xcolor,svgnames}]
+\begin{lstlisting}[morekeywords={xcolor,svgnames}]
\PassOptionsToPackage{svgnames}{xcolor}
\end{lstlisting}
-It also uses the \lstinline|\usetikzlibrary{patterns}| and \lstinline|\usetikzlibrary{calc}|. Furthermore the packages \lstinline|ifpdf| and \lstinline|ifluatex| are necassary starting with version 0.5 of this package.
+It also uses the \lstinline|\usetikzlibrary{patterns}| and \lstinline|\usetikzlibrary{calc}|.
\subsection{License}
@@ -246,6 +245,16 @@
\end{tikzpicture}
\end{tcolorbox}
+For everybody suffering from anatidaephobia, there is also a special option to not draw the duck:
+\begin{tcblisting}{title={Invisible duck}}
+\begin{tikzpicture}
+ \duck[invisible]
+\end{tikzpicture}
+\end{tcblisting}
+
+This can also be useful to recycle some of the accessories presented in \ref{sec:accessories}.
+
+\clearpage
For the \TeX{} purists, there is also a picture mode variant:
{
@@ -257,7 +266,6 @@
\end{tcblisting}
}
-\clearpage
\subsection{Body parts}
The various parts of the duck can also be coloured independently, i.e.\ \lstinline|body|, \lstinline|head| or \lstinline|bill|:
@@ -300,42 +308,50 @@
\end{tikzpicture}
\end{tcblisting}
-For everybody suffering from anatidaephobia, there is also a special option to not draw the duck:
-\begin{tcblisting}{title={Invisible duck}}
-\begin{tikzpicture}
- \duck[invisible]
-\end{tikzpicture}
-\end{tcblisting}
-This can also be useful to recycle some of the accessories presented in \ref{sec:accessories}.
-
-\clearpage
\subsection{Hair styles}
Some duck also like to have nice hair cuts, several different hair styles are available:
-\begin{tcblisting}{title={Hairy duck},righthand width=9cm}
+
+\begin{tcblisting}{title={Long hair duck}}
\begin{tikzpicture}
\duck[longhair]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Short hair duck}}
\begin{tikzpicture}
\duck[shorthair]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Parting hair duck}}
+\begin{tikzpicture}
+ \duck[parting]
+\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Crazy hair duck}}
\begin{tikzpicture}
\duck[crazyhair]
\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Receding hair duck}}
\begin{tikzpicture}
\duck[recedinghair]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Mohican duck}}
\begin{tikzpicture}
\duck[mohican]
\end{tikzpicture}
-\begin{tikzpicture}
- \duck[mullet]
-\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Mullet duck}}
\begin{tikzpicture}
- \duck[parting]
+ \duck[mullet]
\end{tikzpicture}
\end{tcblisting}
@@ -378,37 +394,52 @@
\subsection{Clothing}
-A respectable duck needs a suitable wardrobe. It can choose from a \lstinline|tshirt|, a \lstinline|jacket|, a \lstinline|tie| or a \lstinline|bowtie|. In it's infinite wardrobe these items are available in all colours definable in the current colour model.
+A respectable duck needs a suitable wardrobe. It can choose from several different garments. In it's infinite wardrobe these items are available in all colours definable in the current colour model.
-\begin{tcblisting}{title={Dressed duck}}
+\begin{tcblisting}{title={T-shirt duck}}
\begin{tikzpicture}
- \duck[tshirt]
+ \duck[tshirt=red]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Jacket duck}}
\begin{tikzpicture}
- \duck[jacket]
+ \duck[jacket=blue]
\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Tie duck}}
\begin{tikzpicture}
- \duck[tie]
+ \duck[tshirt,
+ jacket=gray,
+ tie]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Bowtie duck}}
\begin{tikzpicture}
- \duck[bowtie]
+ \duck[tshirt,
+ jacket=gray,
+ bowtie]
\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Ão dà i duck}}
\begin{tikzpicture}
- \duck[cape]
+ \duck[tshirt=cyan,
+ aodai=blue!50!black
+ ]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Cape duck}}
\begin{tikzpicture}
- \duck[tshirt=lightgray,
- jacket=blue!50!black,
- tie=blue!80!black,
- shorthair]
+ \duck[cape]
\end{tikzpicture}
\end{tcblisting}
For more ways to customise the clothing also have a look at the \hyperref[sec:footballducks]{football ducks in Section \ref{sec:footballducks}}.
-\clearpage
\subsection{Accessories}
\label{sec:accessories}
@@ -450,6 +481,12 @@
\end{tikzpicture}
\end{tcblisting}
+\begin{tcblisting}{title={Conical hat duck}}
+\begin{tikzpicture}
+ \duck[conicalhat=brown]
+\end{tikzpicture}
+\end{tcblisting}
+
\begin{tcblisting}{title={Santa Duck}}
\begin{tikzpicture}
\duck[santa=red!80!black,
@@ -846,6 +883,14 @@
\end{tikzpicture}
\end{tcblisting}
+\addtocounter{footnote}{1}
+\begin{tcblisting}{title={Overleaf Duck$^{\thefootnote}$}}
+\begin{tikzpicture}
+ \duck[overleaf]
+\end{tikzpicture}
+\end{tcblisting}
+\footnotetext[\thefootnote]{added to celebrate that \tikzducks are now also available on overleaf, see \url{https://www.overleaf.com/blog/tex-live-upgrade-september-2019}}
+
\clearpage
\section{Random ducks}
With all these available accessories it might be hard to decide which one to choose, but don't worry the \tikzducks provide a solution for this dilemma, the random duck, or short \lstinline|\randuck|, which automatically creates a duck with a randomly chosen accessories and something on top of the head (hair, a hat, ears, alien antenna ...)
@@ -920,7 +965,6 @@
\end{tikzpicture}
\end{tcblisting}
}
-An example making use this option are the \hyperref[starducks]{``Live long and prosper'' ducks}.
To distinguish coordinates from multiple ducks in the same \lstinline|tikzpicture|, one can name the ducks using the option \lstinline[emph={name}]|name|. If this option is used, the coordinates are prefixed with the respective name and a dash: \lstinline|<name>-<coordinate>|.
@@ -1095,336 +1139,13 @@
\end{tikzpicture}
\end{tcblisting}
-In case your favourite team is missing from the above examples, feel free to create an example and share it with the community in \href{https://tex.stackexchange.com/q/387047/36296}{The Duck Pond}.
-
-\clearpage
-\section{Showcase}
-
-\addtocounter{footnote}{1}
-In the following a few examples of possible duck customisations, some of which will require additional packages (which are stated as a comment at the start of the code). For more examples (or to show your own creations) please visit \href{https://tex.stackexchange.com/q/387047/36296}{The Duck Pond} or have a look at \href{https://vimeo.com/246256860}{The Great Christmas Extravaganza}$^{\thefootnote}$\footnotetext[\thefootnote]{the source code is available at \url{https://github.com/cereda/duck-extravaganza}}.
-
-\begin{tcblisting}{title={\texttt{samcarter} duck}}
-\begin{tikzpicture}
- \duck[body=yellow!50!brown!50!white,
- longhair=red!50!brown,
- jacket=blue!50!black]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Paulo duck}}
-\begin{tikzpicture}
- \duck[cap,cricket]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Party duck}}
-\begin{tikzpicture}
- \duck[cake=violet,
- magichat=violet,
- magicstars=white!85!yellow]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Brazil duck}}
-\begin{tikzpicture}
- \definecolor{brazilgreen}{RGB}{0,155,58}%
- \definecolor{brazilyellow}{RGB}{254,223,0}%
- \definecolor{brazilblue}{RGB}{0,39,118}%
- \duck[body=brazilyellow,
- shorthair=brazilgreen]
- \path[preaction={fill, brazilblue},pattern=fivepointed stars, pattern color=white]
- \duckpathjacket;
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Duck in black}}
-\begin{tikzpicture}
- \duck[grumpy, body=yellow!50!brown!50!white, tshirt=white, jacket=black, tie=black, hat=black, sunglasses=black]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Prof.\ van Duck}}
-\begin{tikzpicture}
- \duck[body=yellow!50!brown!40!white,
- crazyhair=gray!50!white,
- eyebrow,
- glasses=brown!70!black,
- book=\scalebox{0.2}{$E=mc^2$},
- bookcolour=red!20!brown]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Knuth duck}}
-\begin{tikzpicture}
- \duck[body=yellow!50!red!20!white,
- recedinghair=gray!50!white,
- eyebrow,
- tshirt=white!93!black,
- jacket=red!50!black,
- glasses=brown!70!lightgray,
- book=\scalebox{0.5}{\TeX},
- bookcolour=black!20!brown]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={May the Quack be with you}}
-\begin{tikzpicture}
- \colorlet{skin}{white!45!gray!80!green}
- \duck[lightsaber, body=skin, bill=gray!80!green,
- tshirt=brown!50!black, jacket=brown!30!gray]
- \fill[skin,rounded corners=3] (0.44,1.70) -- (0.25,2) -- (0.6,1.95);
- \fill[skin,rounded corners=3] (1.34,1.60) -- (1.53,1.9) -- (1.16,1.85);
-\end{tikzpicture}
+\section{Examples}
-\begin{tikzpicture}
- \duck[grumpy,lightsaber=red,cape=black!85!white,
- body=black!70!white,darthvader=black!85!white]
-\end{tikzpicture}
+To see more examples of what can be done with the \tikzducks, you are invited to visit \url{https://github.com/samcarter/tikzducks}.
-\begin{tikzpicture}
- \fill[brown!70!black] (0.5,1.65) circle (0.25);
- \duck[jacket=white!95!brown, body=brown!50!white,
- shorthair=brown!70!black, lightsaber=cyan]
- \fill[brown!70!black] (1.3,1.6) circle (0.25);
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Ghost duck}}
-\colorlet{ghost}{white!98!gray}%
-\begin{tikzpicture}
-\duck[body=ghost,bill=ghost,prison=gray]
-\fill[ghost,rotate=-17](-0.1,0.7) rectangle (0.15,1.3);
-\fill[ghost,rotate=17] (1.6,0.7) rectangle (1.81,1.3);
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={67P/Churyumov-Gerasimenko duck$^{\thefootnote}$}}
-\begin{tikzpicture}[path image/.style={path picture={\foreach \j in {0,...,2}{\node at (0,\j) {\foreach \i in {1,...,5}{\includegraphics[height=1cm]{#1}}};}}}]
-\path (0.1,0.1) rectangle (2.1,2.12);
-\begin{pgfinterruptboundingbox}
-\path[path image=crinklepaper]
- (0.90,1.50) ellipse (0.50 and 0.625);
-\path[path image=crinklepaper] \duckpathbody;
-\fill[gray!80!white] \duckpathbill;
-\fill[white!70!gray, rotate=-20]
- (0.23,1.7675) ellipse (0.0893 and 0.125)
- (-0.06,1.74) ellipse (0.0786 and 0.1143);
-\fill[black, rotate=-20]
- (0.26,1.7575) ellipse (0.0357 and 0.0714)
- (-0.03,1.73) ellipse (0.0286 and 0.0643);
-\end{pgfinterruptboundingbox}
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{If you try this at home, replace the \texttt{crinklepaper} with an image of the comet's surface, e.g. \url{https://arxiv.org/abs/1707.02945}}
-
-\begin{tcblisting}{title={With my username I had to...}}
-%\usepackage{marvosym}
-\definecolor{sgskin}{RGB}{222,197,159}%
-\definecolor{sgblond}{RGB}{238,203,96}%
-\colorlet{sggreen}{olive!50!black}
-\colorlet{sgbill}{sgskin!85!black}
-\colorlet{sgshirt}{sggreen!50!black}
-
-\begin{tikzpicture}
- \duck[body=sgskin,bill=sgbill,tshirt=sgshirt,jacket=sggreen,cap=sggreen]
-\end{tikzpicture}
-
-\begin{tikzpicture}
- \duck[body=sgskin,bill=sgbill,tshirt=sgshirt,jacket=sggreen,shorthair=sgblond]
-\end{tikzpicture}
-
-\begin{tikzpicture}
- \duck[body=sgskin,bill=sgbill,tshirt=sgshirt,jacket=sggreen,parting=brown!70!black,glasses=brown!30!gray, book={\AA}, bookcolour=brown!50!black]
-\end{tikzpicture}
-
-\begin{tikzpicture}
- \duck[body=brown!80!black,bill=brown!65!black,tshirt=sgshirt,jacket=sggreen,grumpy]
- \fill[sgblond, rotate=-10] (0.45,2.0) ellipse (0.12 and 0.05);
- \node[rotate=170] at (0.8,1.89) {\scalebox{0.35}{\Leo}};
-\end{tikzpicture}
-\end{tcblisting}
-
-
-\begin{tcblisting}{title={Live long and prosper},label=starducks}
-%\usepackage{fontawesome}
-\definecolor{unigold}{RGB}{203,157,52}%
-\definecolor{uniblue}{RGB}{46,114,167}%
-\definecolor{unired}{RGB}{177,49,34}%
-
-\definecolor{skink}{RGB}{245,206,193}%
-\definecolor{skins}{RGB}{255,222,151}%
-\definecolor{skinu}{RGB}{146,113,96}%
-
-\newcommand*{\insignia}{\node[rotate=15] at (wing) {\color{yellow!80!brown}\faLocationArrow};}
-
-\begin{tikzpicture}
-\duck[tshirt=black!60!gray, jacket=unigold, body=skink, shorthair=brown!80!black, bill=skink!60!gray]
-\insignia
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[tshirt=black!60!gray, jacket=uniblue, body=skins, mullet=black!60!brown, bill=skins!60!gray]
-\fill[skins,rotate=175, xshift=-46, yshift=-74] (0.45,1.20)--(0.50,0.80)--(0.65,1.20);
-\fill[black!60!brown, rounded corners=1, rotate=70] (1.85,0.13) rectangle (1.91,-0.05);
-\fill[black!60!brown, rounded corners=1, rotate=90] (1.7,-0.75) rectangle (1.76,-0.97);
-\insignia
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[tshirt=black!60!gray, jacket=unired, body=skinu, longhair=black!60!brown, bill=skinu!70!black]
-\insignia
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={French duck}}
-\begin{tikzpicture}
-\duck[body=yellow!60!red!30!white,tshirt=white!90!yellow,|stripes|={\stripes[color=blue!70!black,rotate=-87,width=0.07,distance=0.12]},beret=blue!30!black,baguette=brown]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Bee duck}}
-\begin{tikzpicture}
- \duck[|stripes|={\stripes[distance=0.4,width=0.2,rotate=0,initialx=0.15]},alien=black,laughing]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Jailbird duck}}
-\begin{tikzpicture}
-\duck[peakedcap=gray!40!black,tshirt=white,stripes={
-\stripes[rotate=100,color=gray!40!black]},prison=gray]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Super duck brothers}}
-\newcommand{\superstripes}{\stripes[color=blue!80!black,width=3,height=1.0,rotate=5] \stripes[color=blue!80!black,width=0.1,rotate=0,distance=0.7,initialx=-1.1,height=2]}
-\begin{tikzpicture}
-\duck[tshirt=red!80!black,peakedcap=red!80!black,|stripes|={\superstripes}]
-\fill[white] (0.8,2) circle (0.13);
-\node[red!80!black,rotate=-25] at (0.8,2) {\scalebox{0.6}{\textsf{M}}};
-\end{tikzpicture}
-\begin{tikzpicture}
-\duck[tshirt=green!70!black,peakedcap=green!70!black, |stripes|={\superstripes}]
-\fill[white] (0.8,2) circle (0.13);
-\node[green!70!black,rotate=-25] at (0.8,2) {\scalebox{0.6}{\textsf{L}}};
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Princess duck}}
-\definecolor{pskin}{RGB}{255,200,184}%
-\definecolor{phair}{RGB}{249,249,139}%
-\begin{tikzpicture}
-\duck[body=pskin!80!white,longhair=phair,tshirt=magenta!60!white,jacket=magenta!40!white,necklace=white!85!yellow]
-\path (0.7,2) rectangle (1.4,2.55);
-\fill[yellow!80!orange,rotate=-10,xshift=-11,yshift=5] \duckpathcrown;
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={ZZZoro duck}}
-\begin{tikzpicture}
-\duck[cape=black,hat=black,mask=black]
-\node[rotate=-5] at (0.4,0.7) {\tiny\fontfamily{pzc}\selectfont \textbackslash ZZZ};
-\fill[black,rotate=24] (0.1,0.21) rectangle (1.1,0.23) (1.2,0.22) ellipse (0.15 and 0.03) (1.08,0.22) ellipse (0.03 and 0.15);
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Farm animals}}
-\definecolor{fskin}{RGB}{161,140,126}%
-\definecolor{fbill}{RGB}{238,212,191}%
-\definecolor{fhair}{RGB}{89,72,72}%
-\begin{tikzpicture}
-\duck[body=fskin,bill=fbill,shorthair=fhair,bunny,inear=fbill]
-\node[fskin,rotate=45,scale=3] at (1.7,1.55) {\textsf{s}};
-\fill[fhair,rotate=45] (2.4,0.13) ellipse (0.15 and 0.07);
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[body=white!80!brown, bill=white!60!brown, bunny, longhair=white!60!brown]
-\fill[white!60!brown] (tail) circle (0.2);
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[body=red!20!white,bill=red!30!white,shorthair=red!30!white,bunny=red!30!white,inear=red!30!white]
-\node[red!20!white,rotate=25,scale=3] at (1.7,1.51) {\textsf{s}};
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[body=white!80!brown, bill=white!60!brown, sheep]
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{scope}[yshift=-6]
-\clip[rotate=-5] (0.68,2.38) ellipse (0.3 and 0.4);
-\fill[brown,rotate=-5](0.28,2.26)ellipse (0.3 and 0.4);
-\end{scope}
-\duck[body=brown,mohican=brown!50!black,horsetail]
-\begin{scope}[yshift=-5,xshift=1]
-\clip[rotate=-5] (0.68,2.38) ellipse (0.3 and 0.4);
-\fill[brown,rotate=-5](1.06,2.2) ellipse (0.3 and 0.4);
-\end{scope}
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={Arara duck$^{\thefootnote}$}}
-\begin{tikzpicture}
-\duck[parrot,bill=gray!80!black]
-\shade[left color=cyan!90!blue,right color=blue!70!black] \duckpathwing;
-\shade[bottom color=yellow!70!brown, top color=green!40!teal] \duckpathcrazyhair;
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{In honour of the cool TeX automation tool arara, \url{https://github.com/cereda/arara}}
-
-\begin{tcblisting}{title={Duck Queen}}
-\definecolor{qskin}{RGB}{225,219,206}%
-\definecolor{qbill}{RGB}{170,123,154}%
-\definecolor{qdress}{RGB}{184,209,206}%
-\definecolor{qcrown}{RGB}{90,76,183}%
-\begin{tikzpicture}
-\duck[body=qskin,bill=qbill,jacket=qdress,tshirt=teal!30!qdress,shorthair=gray!60!white,necklace=gray!10!white,handbag=teal!30!qdress]
-\fill[gray!60!white,rotate=-30] (0.27,1.23) rectangle (0.37,0.65);
-\fill[qcrown,scale=0.23,rotate=-20,yshift=82,xshift=38] \duckpathqueencrown;
-\fill[qcrown,yshift=3] \duckpathkingcrown;
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Duck, MD}}
-\begin{tikzpicture}
-\duck[parting=brown!70!black, squareglasses,
- tshirt=teal!50!white, jacket=white,
- buttons=gray!50!white, stethoscope]
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={Duck scout with ``šátek'' and ``turbánek''$^{\thefootnote}$}}
-\begin{tikzpicture}
-\duck[head=yellow!60!brown!50!white,
- tshirt=brown!80!gray!40!white,
- cap=orange!50!yellow,
- neckerchief=orange!50!yellow,
- woggle=brown, bookcolour=brown!80!black,
- book={\tiny\sffamily\scalebox{0.3}{\parbox{1.1cm}{\centering Scouting\\for\\Ducklings}}}]
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{This is a very special duck, because yo' won the scout duck in the contest \href{https://tex.meta.stackexchange.com/q/7493/36296}{When will @egreg reach 654321}. In Czech, the neckerchief is called ``šátek'' and the woggle ``turbánek'', which means ``little turban''.}
-
-\begin{tcblisting}{title={My name is Duck, James Duck}}
-\begin{tikzpicture}
-\duck[tshirt,lapel,jacket=gray!50!black,cocktail,
- buttons,bowtie,parting=brown!50!black]
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={Mary Duckings$^{\thefootnote}$}}
-\begin{tikzpicture}
-\duck[tshirt,bowtie=red!70!black,jacket=blue!50!black,umbrellaclosed=cyan!50!green,longhair=brown!60!black,hat=black]
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{following an idea from Paulo}
+If you have created a duck you would like to share with the community, I would be happy to add it to this collection, just make a pull request or open an issue in the bug tracking system.
\clearpage
\printindex
-\end{document}
\ No newline at end of file
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzducks.doc.tlpobj new/tlpkg/tlpobj/tikzducks.doc.tlpobj
--- old/tlpkg/tlpobj/tikzducks.doc.tlpobj 2019-04-08 01:40:10.000000000 +0200
+++ new/tlpkg/tlpobj/tikzducks.doc.tlpobj 2020-01-05 01:55:17.000000000 +0100
@@ -1,9 +1,9 @@
name tikzducks.doc
category Package
-revision 50840
+revision 53312
shortdesc doc files of tikzducks
relocated 1
-docfiles size=152
+docfiles size=119
RELOC/doc/latex/tikzducks/README.md
RELOC/doc/latex/tikzducks/tikzducks-doc.pdf
RELOC/doc/latex/tikzducks/tikzducks-doc.tex
++++++ tikzducks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzducks/tikzducks.sty new/tex/latex/tikzducks/tikzducks.sty
--- old/tex/latex/tikzducks/tikzducks.sty 2019-04-07 23:21:00.000000000 +0200
+++ new/tex/latex/tikzducks/tikzducks.sty 2020-01-03 23:15:44.000000000 +0100
@@ -11,20 +11,13 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.1
-% April 7, 2019
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{tikzducks}
- [2019/04/07 v1.1 Draw rubber ducks in TikZ]
+\ProvidesPackage{tikzducks}[2020/01/03 version v1.3 Draw rubber ducks in TikZ]
\RequirePackage{tikz}
\usetikzlibrary{patterns} % for the wizard hat
\usetikzlibrary{calc} % for the sports jerseys
-\RequirePackage{ifluatex}
-\RequirePackage{ifxetex}
-
%\pgfdeclarelayer{backgroundlayer}
%\pgfdeclarelayer{bodylayer}
%\pgfdeclarelayer{clothinglayer}
@@ -33,6 +26,8 @@
%
%\pgfsetlayers{backgroundlayer,bodylayer,clothinglayer,hairlayer,hatlayer,main}
+\definecolor{duck@overleafcol}{RGB}{72,172,60}
+
\newcommand*{\duck}[1][]{%
\begin{scope}%
\tikzset{/duck/.cd,#1}%
@@ -59,6 +54,7 @@
\newif\ifduck@mullet
\newif\ifduck@parting
% clothing %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\ifduck@clothing
\newif\ifduck@tshirt
\newif\ifduck@jacket
\newif\ifduck@tie
@@ -66,6 +62,7 @@
\newif\ifduck@stripes
\newif\ifduck@bowtie
\newif\ifduck@lapel
+\newif\ifduck@aodai
% Headgear %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\ifduck@alien
\newif\ifduck@hat
@@ -89,6 +86,7 @@
\newif\ifduck@helmet
\newif\ifduck@viking
\newif\ifduck@devil
+\newif\ifduck@conicalhat
% Accessories %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\ifduck@glasses
\newif\ifduck@sunglasses
@@ -133,6 +131,7 @@
\newif\ifduck@umbrellaclosed
\newif\ifduck@handbag
\newif\ifduck@cocktail
+\newif\ifduck@overleaf
\tikzset{
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -174,19 +173,23 @@
% clothing
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- tshirt/.code = \duck@tshirttrue
+ tshirt/.code = \duck@tshirttrue
+ \duck@clothingtrue
\def\duck@tshirt{#1},
tshirt/.default = white,
- jacket/.code = \duck@jackettrue
+ jacket/.code = \duck@jackettrue
+ \duck@clothingtrue
\def\duck@jacket{#1},
jacket/.default = blue,
tie/.code = \duck@tietrue
\def\duck@tie{#1},
tie/.default = blue,
- cape/.code = \duck@capetrue
+ cape/.code = \duck@capetrue
+ \duck@clothingtrue
\def\duck@cape{#1},
cape/.default = red,
stripes/.code = \duck@stripestrue
+ \duck@clothingtrue
\def\duck@stripes{#1},
stripes/.default = \stripes ,
bowtie/.code = \duck@bowtietrue
@@ -196,6 +199,11 @@
lapel/.code = \duck@lapeltrue
\def\duck@lapel{#1},
lapel/.default = black,
+ aodai/.code = \duck@aodaitrue
+ \duck@clothingtrue
+ \def\duck@aodai{#1},
+ ao dai/.forward to = /duck/aodai,
+ aodai/.default = blue!50!black,
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% hair styles
@@ -324,6 +332,10 @@
\duck@deviltrue
\def\duck@devil{brown!20!white},
viking/.default = gray,
+ conicalhat/.code = \duck@conicalhattrue
+ \def\duck@conicalhat{#1},
+ conical hat/.forward to = /duck/conicalhat,
+ conicalhat/.default = brown!90!orange!90!white,
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Accessories
@@ -503,6 +515,12 @@
\def\duck@handbag{#1},
handbag/.default = red!70!black,
cocktail/.code = \duck@cocktailtrue,
+ overleaf/.code = \duck@overleaftrue
+ \def\duck@body{duck@overleafcol}
+ \duck@graduatetrue
+ \def\duck@graduate{black}
+ \duck@squareglassestrue
+ \def\duck@squareglasses{black}
}
\def\duck@draw{
@@ -553,21 +571,26 @@
%
% water %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@water
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (0.88 and 0.35) (1.00,0.40) ellipse (0.75 and 0.25);
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (1.05 and 0.50) (1.00,0.40) ellipse (0.95 and 0.42);
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (1.23 and 0.63) (1.00,0.40) ellipse (1.17 and 0.57);
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (1.42 and 0.77) (1.00,0.40) ellipse (1.38 and 0.73);
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=0.88, y radius=0.35] (1.00,0.40) ellipse[x radius=0.75, y radius=0.25];
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=1.05, y radius=0.50] (1.00,0.40) ellipse[x radius=0.95, y radius=0.42];
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=1.23, y radius=0.63] (1.00,0.40) ellipse[x radius=1.17, y radius=0.57];
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=1.42, y radius=0.77] (1.00,0.40) ellipse[x radius=1.38, y radius=0.73];
\fi
%
% sheep %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@sheep
- \fill[\duck@sheep] (0.65,1.95) circle (0.15) (0.5,1.75) circle (0.15) (0.46,1.51) circle (0.15) (0.37,1.) circle (0.15) (0.23,0.8) circle (0.15) (0.2,0.6) circle (0.15) (0.25,0.45) circle (0.15) (0.35,0.30) circle (0.15) (0.55,0.25) circle (0.15) (0.75,0.2) circle (0.15) (0.95,0.16) circle (0.15) (1.15,0.2) circle (0.15) (1.35,0.23) circle (0.15) (1.55,0.3) circle (0.15) (1.75,0.38) circle (0.15) (1.95,0.5) circle (0.15) (2.05,0.65) circle (0.15) (2.1,0.85) circle (0.15) (2.05,1.0) circle (0.15) (2.0,1.15) circle (0.15) (1.85,1.35) circle (0.15) (1.6,1.25) circle (0.15) (1.35,1.25) circle (0.15) (1.3,1.5) circle (0.15) (1.3,1.7) circle (0.15) (1.2,1.9) circle (0.15) (0.85,2.05) circle (0.15) (1.05,2.0) circle (0.15);
+ \fill[\duck@sheep] (0.65,1.95) circle[radius=0.15] (0.50,1.75) circle[radius=0.15] (0.46,1.51) circle[radius=0.15] (0.37,1.00) circle[radius=0.15] (0.23,0.80) circle[radius=0.15] (0.20,0.60) circle[radius=0.15] (0.25,0.45) circle[radius=0.15] (0.35,0.30) circle[radius=0.15] (0.55,0.25) circle[radius=0.15] (0.75,0.20) circle[radius=0.15] (0.95,0.16) circle[radius=0.15] (1.15,0.20) circle[radius=0.15] (1.35,0.23) circle[radius=0.15] (1.55,0.30) circle[radius=0.15] (1.75,0.38) circle[radius=0.15] (1.95,0.50) circle[radius=0.15] (2.05,0.65) circle[radius=0.15] (2.10,0.85) circle[radius=0.15] (2.05,1.00) circle[radius=0.15] (2.00,1.15) circle[radius=0.15] (1.85,1.35) circle[radius=0.15] (1.60,1.25) circle[radius=0.15] (1.35,1.25) circle[radius=0.15] (1.30,1.50) circle[radius=0.15] (1.30,1.70) circle[radius=0.15] (1.20,1.90) circle[radius=0.15] (0.85,2.05) circle[radius=0.15] (1.05,2.00) circle[radius=0.15];
\fi
%
% devil (back horn) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@devil
\fill[\duck@devil] (0.7723,2.3756) .. controls (0.6369,2.1184) and (0.7916,2.0228) .. (0.8360,1.9897) .. controls (0.8744,1.9675) and (0.8774,1.9511) .. (0.8853,1.9173) .. controls (0.8853,1.8595) and (0.8407,1.8127) .. (0.7856,1.8127) .. controls (0.7535,1.8178) and (0.7240,1.8231) .. (0.6965,1.8545) .. controls (0.6965,1.8545) and (0.4451,2.2259) .. (0.7723,2.3756) -- cycle;
\fi
+% Conical Hat (background) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@conicalhat
+ \fill[\duck@conicalhat!50!black,rotate=-21] (0.265,1.915) ellipse[x radius=0.79, y radius=0.1];
+ \fill[\duck@conicalhat!30!black] (0.5501,0.9739) -- (0.2002,1.9676) -- (0.2946,2.0008) -- (0.6445,1.0072) -- cycle;
+\fi
%
%\end{pgfonlayer}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -587,18 +610,20 @@
% head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifdefined\duck@head\else\let\duck@head=\duck@body\fi
\fill[\duck@head]
- (0.90,1.50) ellipse (0.50 and 0.625);
+ (0.90,1.50) ellipse[x radius=0.50, y radius=0.625];
%
% bill %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@grumpy
\fill[\duck@bill] \duckpathgrumpybill;
\else
\ifduck@laughing
- \fill[\duck@bill!80!black] (0.40,1.20) .. controls (0.54,1.36) and (0.65,1.31) .. (0.91,1.37) .. controls (0.45,1.06) and (0.36,1.18) .. (0.40,1.20) -- cycle;
- \fill[\duck@bill]
+ \begin{pgfinterruptboundingbox}
+ \fill[\duck@bill!80!black] (0.40,1.20) .. controls (0.54,1.36) and (0.65,1.31) .. (0.91,1.37) .. controls (0.45,1.06) and (0.36,1.18) .. (0.40,1.20) -- cycle;
+ \fill[\duck@bill]
(0.41,1.47) .. controls (0.64,1.53) and (0.54,1.30) ..
(0.91,1.37) .. controls (-0.02,1.10) and (0.28,1.37) ..
(0.41,1.47) -- cycle;
+ \end{pgfinterruptboundingbox}
\else
\ifduck@parrot
\fill[\duck@bill!80!black]
@@ -615,22 +640,22 @@
% has to be behind the eyes
\ifduck@mask
\begin{scope}
- \clip (0.90,1.50) ellipse (0.50 and 0.625);
+ \clip (0.90,1.50) ellipse[x radius=0.50, y radius=0.625];
\fill[\duck@mask,rotate=-15] (-0.1,1.59) rectangle (1.3,1.88);
\end{scope}
\fi%
%
% right eye %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\fill[\duck@eye, rotate=-20]
- (0.23,1.7675) ellipse (0.0893 and 0.125);
+ (0.23,1.7675) ellipse[x radius=0.0893, y radius=0.125];
\fill[\duck@pupil, rotate=-20]
- (0.26,1.7575) ellipse (0.0357 and 0.0714);
+ (0.26,1.7575) ellipse[x radius=0.0357, y radius=0.0714];
%
% left eye %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\fill[\duck@eye, rotate=-20]
- (-0.06,1.74) ellipse (0.0786 and 0.1143);
+ (-0.06,1.74) ellipse[x radius=0.0786, y radius=0.1143];
\fill[\duck@pupil, rotate=-20]
- (-0.03,1.73) ellipse (0.0286 and 0.0643);
+ (-0.03,1.73) ellipse[x radius=0.0286, y radius=0.0643];
%
\fi % from no duck
%\end{pgfonlayer}
@@ -640,6 +665,15 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%\begin{pgfonlayer}{clothinglayer}
+%
+% Strap of the conical hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@conicalhat
+ \ifduck@clothing
+ \fill[\duck@conicalhat!30!black] (1.5943,1.5059) .. controls (1.4384,1.3576) and (1.2780,1.2120) .. (1.0987,1.0923) -- (1.0617,0.9549) .. controls (1.2151,1.0361) and (1.3476,1.1504) .. (1.4785,1.2630) .. controls (1.5417,1.3187) and (1.6038,1.3757) .. (1.6644,1.4344) -- cycle;
+ \else
+ \fill[\duck@conicalhat!30!black] (1.5943,1.5059) .. controls (1.4384,1.3576) and (1.2780,1.2120) .. (1.0987,1.0923) .. controls (0.9540,0.9995) and (0.7864,0.9875) .. (0.6358,1.0398) .. controls (0.6727,0.9043) and (0.9752,0.9113) .. (1.0617,0.9549) .. controls (1.2151,1.0361) and (1.3476,1.1504) .. (1.4785,1.2630) .. controls (1.5417,1.3187) and (1.6038,1.3757) .. (1.6644,1.4344) -- cycle;
+ \fi
+\fi
%
% tshirt %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@tshirt
@@ -665,6 +699,13 @@
\fill[\duck@bowtie] (0.4382, 1.1105) .. controls (0.3984, 1.0671) and (0.3911, 0.9535) .. (0.4116, 0.9176) .. controls (0.4958, 0.9064) and (0.565, 0.9487) .. (0.565, 0.9487) -- (0.6448, 0.9398) .. controls (0.6448, 0.9398) and (0.6777, 0.8844) .. (0.804, 0.8689) .. controls (0.8323, 0.9056) and (0.8422, 1.0026) .. (0.8284, 1.0551) .. controls (0.7881, 1.0942) and (0.6537, 1.0285) .. (0.6537, 1.0285) -- (0.5739, 1.0374) .. controls (0.5739, 1.0374) and (0.5436, 1.0956) .. (0.4382, 1.1105) -- cycle;
\fi
%
+% Ão dà i %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@aodai
+ \begin{pgfinterruptboundingbox}
+ \fill[\duck@aodai] (1.819,1.419) .. controls (2.871,0.120) and (0.711,-0.145) .. (0.296,0.251) .. controls (-0.118,0.647) and (0.232,1.073) .. (0.440,1.128) -- (0.567,0.927) .. controls (0.567,0.927) and (0.543,0.906) .. (0.509,0.882) -- (0.481,0.929) -- (0.458,0.915) -- (0.487,0.868) .. controls (0.473,0.859) and (0.457,0.850) .. (0.441,0.842) -- (0.422,0.894) -- (0.397,0.885) -- (0.417,0.831) .. controls (0.404,0.826) and (0.391,0.821) .. (0.378,0.818) -- (0.364,0.869) -- (0.338,0.862) -- (0.351,0.815) .. controls (0.334,0.814) and (0.318,0.817) .. (0.304,0.825) .. controls (0.303,0.774) and (0.329,0.759) .. (0.365,0.763) -- (0.376,0.722) -- (0.402,0.729) -- (0.391,0.768) .. controls (0.405,0.772) and (0.420,0.778) .. (0.435,0.784) -- (0.447,0.750) -- (0.472,0.759) -- (0.459,0.796) .. controls (0.477,0.805) and (0.496,0.815) .. (0.512,0.825) -- (0.533,0.791) -- (0.556,0.805) -- (0.535,0.840) .. controls (0.567,0.860) and (0.590,0.877) .. (0.590,0.877) .. controls (1.011,1.168) and (0.887,0.936) .. (1.819,1.419) -- cycle;
+ \end{pgfinterruptboundingbox}
+\fi
+%
% lapel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@lapel
\fill[\duck@lapel] (0.490,1.145) .. controls (0.3984,1.13) and (0.3515,1.08) .. (0.3515,1.08) -- (0.4265,1.0192) -- (0.35,0.98) -- (0.513,0.700) -- (1.0089,0.9162) -- (0.9547,0.9868) -- (1.1194,0.9782) -- (1.0822,1.135) .. controls (0.9616,1.1) and (0.8648,1.0300) .. (0.513,0.700) -- cycle;
@@ -684,7 +725,7 @@
%
% necklace (not really clothing, but needs to be below the hair) %%%%%
\ifduck@necklace
- \fill[\duck@necklace] (0.5000,1.112) circle (0.032) (0.5100,1.050) circle (0.032) (0.5200,0.990) circle (0.032) (0.5400,0.931) circle (0.032) (0.5825,0.885) circle (0.032) (0.6450,0.885) circle (0.032) (0.7000,0.910) circle (0.032) (0.7500,0.945) circle (0.032) (0.8000,0.980) circle (0.032) (0.8500,1.020) circle (0.032) (0.9000,1.050) circle (0.032) (0.9500,1.080) circle (0.032) (1.0000,1.110) circle (0.032) (1.0550,1.130) circle (0.032) (1.1100,1.150) circle (0.032) (1.1650,1.165) circle (0.032) (1.2200,1.180) circle (0.032) (1.2750,1.195) circle (0.032) (1.3300,1.210) circle (0.032);
+ \fill[\duck@necklace] (0.5000,1.112) circle[radius=0.032] (0.5100,1.050) circle[radius=0.032] (0.5200,0.990) circle[radius=0.032] (0.5400,0.931) circle[radius=0.032] (0.5825,0.885) circle[radius=0.032] (0.6450,0.885) circle[radius=0.032] (0.7000,0.910) circle[radius=0.032] (0.7500,0.945) circle[radius=0.032] (0.8000,0.980) circle[radius=0.032] (0.8500,1.020) circle[radius=0.032] (0.9000,1.050) circle[radius=0.032] (0.9500,1.080) circle[radius=0.032] (1.0000,1.110) circle[radius=0.032] (1.0550,1.130) circle[radius=0.032] (1.1100,1.150) circle[radius=0.032] (1.1650,1.165) circle[radius=0.032] (1.2200,1.180) circle[radius=0.032] (1.2750,1.195) circle[radius=0.032] (1.3300,1.210) circle[radius=0.032];
\fi
%
% Scout neckerchief %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -697,9 +738,9 @@
% buttons (same argument as for the necklace)
\ifduck@buttons
\ifduck@jacket
- \fill[\duck@buttons] (0.49,0.6) circle (0.05) (0.46,0.45) circle (0.05) (0.45,0.3) circle (0.05);
+ \fill[\duck@buttons] (0.49,0.6) circle[radius=0.05] (0.46,0.45) circle[radius=0.05] (0.45,0.3) circle[radius=0.05];
\else
- \fill[\duck@buttons] (0.53,0.75) circle (0.05) (0.5,0.6) circle (0.05) (0.47,0.45) circle (0.05);
+ \fill[\duck@buttons] (0.53,0.75) circle[radius=0.05] (0.5,0.6) circle[radius=0.05] (0.47,0.45) circle[radius=0.05];
\fi
\fi
%
@@ -783,7 +824,7 @@
\ifdefined\duck@hair\let\duck@beard=\duck@hair\fi
\fi%
\ifduck@beard
- \fill[\duck@beard] (1.3,1.3) circle (0.12) (1.2,1.15) circle (0.12) (0.5,1.05) circle (0.1) (0.525,0.90) circle (0.12) (0.525,0.75) circle (0.12) (0.65,0.65) circle (0.14) (0.75,0.75) circle (0.12) (0.85,0.85) circle (0.12) (0.95,0.95) circle (0.12) (1.05,1.05) circle (0.12) (1.15,1.25) circle (0.12) (1,1.20) circle (0.12) (0.85,1.20) circle (0.12) (0.75,1.15) circle (0.12) (0.65,1.10) circle (0.12) (0.58,1.07) circle (0.12) (0.44,1.46) circle (0.06) (0.52,1.45) circle (0.06) (0.6, 1.41) circle (0.06) (0.68,1.36) circle (0.06) (0.76,1.34) circle (0.06) (0.86,1.26) circle (0.12) (0.38,1.44) circle (0.03) (1,1.28) circle (0.12);
+ \fill[\duck@beard] (1.3,1.3) circle[radius=0.12] (1.2,1.15) circle[radius=0.12] (0.5,1.05) circle[radius=0.1] (0.525,0.90) circle[radius=0.12] (0.525,0.75) circle[radius=0.12] (0.65,0.65) circle[radius=0.14] (0.75,0.75) circle[radius=0.12] (0.85,0.85) circle[radius=0.12] (0.95,0.95) circle[radius=0.12] (1.05,1.05) circle[radius=0.12] (1.15,1.25) circle[radius=0.12] (1,1.20) circle[radius=0.12] (0.85,1.20) circle[radius=0.12] (0.75,1.15) circle[radius=0.12] (0.65,1.10) circle[radius=0.12] (0.58,1.07) circle[radius=0.12] (0.44,1.46) circle[radius=0.06] (0.52,1.45) circle[radius=0.06] (0.6, 1.41) circle[radius=0.06] (0.68,1.36) circle[radius=0.06] (0.76,1.34) circle[radius=0.06] (0.86,1.26) circle[radius=0.12] (0.38,1.44) circle[radius=0.03] (1,1.28) circle[radius=0.12];
\fill[\duck@beard] (1.3,1.3) -- (0.5,1.05) -- (0.65,0.65) -- cycle;
\fi%
%
@@ -799,27 +840,27 @@
\ifduck@alien
\fill[\duck@alien,rotate=-25] (0.09,2.1) rectangle (0.16,2.6);
\fill[\duck@alien,rotate=5] (0.79,1.86) rectangle (0.86,2.25);
- \fill[\duck@alien] (1.20,2.30) circle (0.07);
- \fill[\duck@alien] (0.62,2.35) circle (0.07);
+ \fill[\duck@alien] (1.20,2.30) circle[radius=0.07];
+ \fill[\duck@alien] (0.62,2.35) circle[radius=0.07];
\fi
%
% hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@hat
\ifdefined\duck@hair % with hair
- \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse (0.7 and 0.1);
+ \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse[x radius=0.7, y radius=0.1];
\fill[\duck@hat,rotate=-15] (0.0,2.1) rectangle (0.88,2.4);
- \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse (0.44 and 0.08);
+ \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse[x radius=0.44, y radius=0.08];
\else % without hair
- \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse (0.6 and 0.1);
+ \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse[x radius=0.6, y radius=0.1];
\fill[\duck@hat,rotate=-15] (0.07,2.1) rectangle (0.81,2.4);
- \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse (0.37 and 0.08);
+ \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse[x radius=0.37, y radius=0.08];
\fi
\fi
%
% cap %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@cap
\fill[\duck@cap, start angle=0, end angle=150, radius=0.5] (1.4,1.75) arc;
- \fill[\duck@cap,rotate=-15] (0.3,2.05) ellipse (0.6 and 0.15);
+ \fill[\duck@cap,rotate=-15] (0.3,2.05) ellipse[x radius=0.6, y radius=0.15];
\fi
%
% Santa %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -835,33 +876,33 @@
(1.456,1.759) .. controls (1.534,1.637) and (1.480,1.545) ..
(1.400,1.566) .. controls (1.265,1.714) and (0.577,2.267) ..
(0.44,1.733) -- cycle;
- \fill[white!80!brown] (1.6,1.0) circle (0.17);
+ \fill[white!80!brown] (1.6,1.0) circle[radius=0.17];
\fi
%
% Chef hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@chef
- \fill[\duck@chef,rotate=-15] (0.44,2.1) ellipse (0.37 and 0.08);
+ \fill[\duck@chef,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.08];
\fill[\duck@chef,rotate=-15] (0.07,2.1) rectangle (0.81,2.55);
- \fill[\duck@chef] (1.01,2.47) circle (0.17);
- \fill[\duck@chef] (1.24,2.35) circle (0.15);
- \fill[\duck@chef] (0.77,2.40) circle (0.12);
- \fill[\duck@chef] (1.39,2.20) circle (0.12);
+ \fill[\duck@chef] (1.01,2.47) circle[radius=0.17];
+ \fill[\duck@chef] (1.24,2.35) circle[radius=0.15];
+ \fill[\duck@chef] (0.77,2.40) circle[radius=0.12];
+ \fill[\duck@chef] (1.39,2.20) circle[radius=0.12];
\fi
%
% graduate hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@graduate
- \fill[\duck@graduate,rotate=-15] (0.44,2.1) ellipse (0.37 and 0.1);
+ \fill[\duck@graduate,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.1];
\fill[\duck@graduate,rotate=-15] (0.07,2.1) rectangle (0.81,2.3);
\fill[\duck@graduate] (0.3,2.25) -- (1.05,2.35) -- (1.7,1.95) -- (0.92,1.85) -- cycle;
\fill[\duck@tassel,rounded corners=\scalingfactor*1] (1.12,1.89) -- (1.01,2.1) -- (1.09,2.11) -- (1.2,1.9) -- (1.2,1.3) -- (1.12,1.3) -- cycle;
- \fill[\duck@tassel] (1.16,1.3) ellipse (0.06 and 0.12);
+ \fill[\duck@tassel] (1.16,1.3) ellipse[x radius=0.06, y radius=0.12];
\fi
%
% beret %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@beret
- \fill[\duck@beret,rotate=-25] (0.13,2.15) ellipse (0.5 and 0.17);
- \fill[\duck@beret,rotate=-25] (0.13,2.25) ellipse (0.55 and 0.17);
- \fill[\duck@beret,rotate=-25] (0.13,2.4) circle (0.08);
+ \fill[\duck@beret,rotate=-25] (0.13,2.15) ellipse[x radius=0.5, y radius=0.17];
+ \fill[\duck@beret,rotate=-25] (0.13,2.25) ellipse[x radius=0.55, y radius=0.17];
+ \fill[\duck@beret,rotate=-25] (0.13,2.4) circle[radius=0.08];
\fi
%
% unicorn %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -879,7 +920,7 @@
%
% witch %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@witch
- \fill[\duck@witch,rotate=-15] (0.44,2.13) ellipse (0.75 and 0.17);
+ \fill[\duck@witch,rotate=-15] (0.44,2.13) ellipse[x radius=0.75, y radius=0.17];
\fill[\duck@witch,rotate=-15] (0.05,2.2)--(0.45,3.2)--(0.82,2.2);
\fi
%
@@ -906,29 +947,29 @@
\path (0.55,1.9) rectangle (1.2,2.55);
\begin{pgfinterruptboundingbox}
\begin{scope}
- \clip[rotate=-5] (0.68,2.38) ellipse (0.3 and 0.4);
- \fill[\duck@bunny,rotate=-5] (1.06,2.2) ellipse (0.3 and 0.4) (0.28,2.26) ellipse (0.3 and 0.4);
+ \clip[rotate=-5] (0.68,2.38) ellipse[x radius=0.3, y radius=0.4];
+ \fill[\duck@bunny,rotate=-5] (1.06,2.2) ellipse[x radius=0.3, y radius=0.4] (0.28,2.26) ellipse[x radius=0.3, y radius=0.4];
\end{scope}
\begin{scope}
- \clip[rotate=-5] (0.68,2.38) ellipse (0.25 and 0.35);
- \fill[\duck@inear,rotate=-5] (1.06,2.2) ellipse (0.25 and 0.35) (0.28,2.26) ellipse (0.25 and 0.35);
+ \clip[rotate=-5] (0.68,2.38) ellipse[x radius=0.25, y radius=0.35];
+ \fill[\duck@inear,rotate=-5] (1.06,2.2) ellipse[x radius=0.25, y radius=0.35] (0.28,2.26) ellipse[x radius=0.25, y radius=0.35];
\end{scope}
\end{pgfinterruptboundingbox}
\fi
%
% peaked cap %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@peakedcap
- \fill[\duck@peakedcap,rotate=-15] (0.35,2.05) ellipse (0.5 and 0.15);
- \fill[\duck@peakedcap,rotate=-25] (0.13,2.15) ellipse (0.5 and 0.17);
- \fill[\duck@peakedcap,rotate=-35] (-0.25,2.2) ellipse (0.55 and 0.17);
+ \fill[\duck@peakedcap,rotate=-15] (0.35,2.05) ellipse[x radius=0.5, y radius=0.15];
+ \fill[\duck@peakedcap,rotate=-25] (0.13,2.15) ellipse[x radius=0.5, y radius=0.17];
+ \fill[\duck@peakedcap,rotate=-35] (-0.25,2.2) ellipse[x radius=0.55, y radius=0.17];
\fi
%
% tophat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@tophat
- \fill[\duck@tophat,rotate=-15] (0.44,2.1) ellipse (0.48 and 0.1);
+ \fill[\duck@tophat,rotate=-15] (0.44,2.1) ellipse[x radius=0.48, y radius=0.1];
\fill[\duck@tophat,rotate=-15] (0.12,2.1) -- (0.75,2.1) -- (0.81,2.55) -- (0.07,2.55) -- cycle;
- \fill[\duck@tophat,rotate=-15] (0.44,2.55) ellipse (0.37 and 0.08);
+ \fill[\duck@tophat,rotate=-15] (0.44,2.55) ellipse[x radius=0.37, y radius=0.08];
\fi
%
% darth vader %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -946,33 +987,33 @@
\fill[\duck@harlequin] (0.6006,1.9719) .. controls (0.7432,1.8954) and (0.9320,1.8698) .. (0.9320,1.8698) -- (1.0404,2.3839) .. controls (0.9223,2.8873) and (0.1755,2.5634) .. (0.3019,2.2958) .. controls (0.5807,2.5024) and (0.7251,2.3376) .. (0.6006,1.9719) -- cycle;
\fill[\duck@niuqelrah] (1.2853,1.8902) .. controls (1.1177,1.8507) and (0.9278,1.8703) .. (0.9278,1.8703) -- (1.0404,2.3839) .. controls (1.3637,2.8347) and (1.9373,2.3532) .. (1.7049,2.1284) .. controls (1.5267,2.3895) and (1.3204,2.2666) .. (1.2853,1.8902) -- cycle;
\end{pgfinterruptboundingbox}
- \fill[\duck@harlequin] (1.7,2.07) circle (0.1);
- \fill[\duck@niuqelrah] (0.3,2.23) circle (0.1);
+ \fill[\duck@harlequin] (1.7,2.07) circle[radius=0.1];
+ \fill[\duck@niuqelrah] (0.3,2.23) circle[radius=0.1];
\fi
%
% Straw hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@strawhat
- \fill[\duck@strawhat,rotate=-15] (0.44,2.0) ellipse (0.75 and 0.1);
+ \fill[\duck@strawhat,rotate=-15] (0.44,2.0) ellipse[x radius=0.75, y radius=0.1];
\fill[\duck@strawhat,rotate=-15] (0.1,2.05) rectangle (0.78,2.5);
- \fill[\duck@strawhat,rotate=-15] (0.44,2.5) ellipse (0.34 and 0.08);
+ \fill[\duck@strawhat,rotate=-15] (0.44,2.5) ellipse[x radius=0.34, y radius=0.08];
\fill[\duck@strawhat,rotate=-15] (-0.3,2.02) -- (1.18,2.02) -- (0.78,2.2) -- (0.1,2.2) -- cycle;
- \fill[\duck@ribbon,rotate=-15] (0.44,2.2) ellipse (0.34 and 0.08);
+ \fill[\duck@ribbon,rotate=-15] (0.44,2.2) ellipse[x radius=0.34, y radius=0.08];
\fill[\duck@ribbon,rotate=-15] (0.1,2.2) rectangle (0.78,2.3);
- \fill[\duck@strawhat,rotate=-15] (0.44,2.3) ellipse (0.34 and 0.08);
+ \fill[\duck@strawhat,rotate=-15] (0.44,2.3) ellipse[x radius=0.34, y radius=0.08];
\fi
%
% helmet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@helmet
\fill[\duck@helmet] (1.4331,1.5155) .. controls (1.4365,1.7226) and (1.3866,2.0493) .. (1.0429,2.1279) .. controls (0.7050,2.2052) and (0.4794,1.9294) .. (0.4481,1.8183) .. controls (0.6062,1.8381) and (1.1506,1.7480) .. (1.4331,1.5155) -- cycle;
\fill[\duck@helmet!70!black] (1.0282,2.1360) .. controls (0.9395,2.1312) and (0.8696,2.0652) .. (0.8152,2.0010) .. controls (0.7824,1.9609) and (0.7546,1.9169) .. (0.7309,1.8709) .. controls (0.6510,1.8859) and (0.5703,1.8971) .. (0.4892,1.9024) .. controls (0.4595,1.8831) and (0.4114,1.7962) .. (0.4743,1.7961) .. controls (0.5446,1.7868) and (0.6149,1.7767) .. (0.6845,1.7629) .. controls (0.6647,1.7052) and (0.6469,1.6454) .. (0.6401,1.5851) -- (0.6583,1.5355) -- (0.7069,1.5673) .. controls (0.7193,1.6285) and (0.7363,1.6889) .. (0.7590,1.7471) .. controls (0.9991,1.6922) and (1.2114,1.6182) .. (1.4111,1.4722) .. controls (1.4369,1.4960) and (1.4536,1.5229) .. (1.4475,1.5553) .. controls (1.4417,1.5927) and (1.4030,1.6066) .. (1.3766,1.6276) .. controls (1.2054,1.7408) and (1.0085,1.8089) .. (0.8095,1.8546) .. controls (0.8733,1.9674) and (0.9684,2.0703) .. (1.0932,2.1138) .. controls (1.0751,2.1288) and (1.0515,2.1362) .. (1.0282,2.1360) -- cycle;
- \fill[\duck@helmet!50!white] (0.502,1.845) circle (0.015) (0.586,1.835) circle (0.015) (0.684,1.822) circle (0.015) (0.791,1.799) circle (0.015) (0.899,1.770) circle (0.015) (1.003,1.741) circle (0.015) (1.099,1.706) circle (0.015) (1.185,1.673) circle (0.015) (1.276,1.629) circle (0.015) (1.360,1.581) circle (0.015) (0.676,1.606) circle (0.015) (0.695,1.666) circle (0.015) (0.714,1.729) circle (0.015) (0.784,1.889) circle (0.015) (0.835,1.968) circle (0.015) (0.896,2.034) circle (0.015) (0.957,2.081) circle (0.015) (1.020,2.115) circle (0.015) (1.422,1.535) circle (0.015) (0.502,1.845) circle (0.015);
+ \fill[\duck@helmet!50!white] (0.502,1.845) circle[radius=0.015] (0.586,1.835) circle[radius=0.015] (0.684,1.822) circle[radius=0.015] (0.791,1.799) circle[radius=0.015] (0.899,1.770) circle[radius=0.015] (1.003,1.741) circle[radius=0.015] (1.099,1.706) circle[radius=0.015] (1.185,1.673) circle[radius=0.015] (1.276,1.629) circle[radius=0.015] (1.360,1.581) circle[radius=0.015] (0.676,1.606) circle[radius=0.015] (0.695,1.666) circle[radius=0.015] (0.714,1.729) circle[radius=0.015] (0.784,1.889) circle[radius=0.015] (0.835,1.968) circle[radius=0.015] (0.896,2.034) circle[radius=0.015] (0.957,2.081) circle[radius=0.015] (1.020,2.115) circle[radius=0.015] (1.422,1.535) circle[radius=0.015] (0.502,1.845) circle[radius=0.015];
\fi
%
% Viking %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@viking
\fill[\duck@viking] (1.4331,1.5155) .. controls (1.4365,1.7226) and (1.3866,2.0493) .. (1.0429,2.1279) .. controls (0.7050,2.2052) and (0.4794,1.9294) .. (0.4481,1.8183) .. controls (0.6062,1.8381) and (1.1506,1.7480) .. (1.4331,1.5155) -- cycle;
\fill[\duck@viking!70!black] (1.0282,2.1360) .. controls (0.9395,2.1312) and (0.8696,2.0652) .. (0.8152,2.0010) .. controls (0.7824,1.9609) and (0.7546,1.9169) .. (0.7309,1.8709) .. controls (0.6510,1.8859) and (0.5703,1.8971) .. (0.4892,1.9024) .. controls (0.4595,1.8831) and (0.4114,1.7962) .. (0.4743,1.7961) .. controls (0.5446,1.7868) and (0.6149,1.7767) .. (0.6845,1.7629) .. controls (0.6845,1.7629) and (0.6845,1.7629) .. (0.7590,1.7471) .. controls (0.9991,1.6922) and (1.2114,1.6182) .. (1.4111,1.4722) .. controls (1.4369,1.4960) and (1.4536,1.5229) .. (1.4475,1.5553) .. controls (1.4417,1.5927) and (1.4030,1.6066) .. (1.3766,1.6276) .. controls (1.2054,1.7408) and (1.0085,1.8089) .. (0.8095,1.8546) .. controls (0.8733,1.9674) and (0.9684,2.0703) .. (1.0932,2.1138) .. controls (1.0751,2.1288) and (1.0515,2.1362) .. (1.0282,2.1360) -- cycle;
- \fill[\duck@viking!50!white] (0.502,1.845) circle (0.015) (0.586,1.835) circle (0.015) (0.684,1.822) circle (0.015) (0.791,1.799) circle (0.015) (0.899,1.770) circle (0.015) (1.003,1.741) circle (0.015) (1.099,1.706) circle (0.015) (1.185,1.673) circle (0.015) (1.276,1.629) circle (0.015) (1.360,1.581) circle (0.015) (0.784,1.889) circle (0.015) (0.835,1.968) circle (0.015) (0.896,2.034) circle (0.015) (0.957,2.081) circle (0.015) (1.020,2.115) circle (0.015) (1.422,1.535) circle (0.015);
+ \fill[\duck@viking!50!white] (0.502,1.845) circle[radius=0.015] (0.586,1.835) circle[radius=0.015] (0.684,1.822) circle[radius=0.015] (0.791,1.799) circle[radius=0.015] (0.899,1.770) circle[radius=0.015] (1.003,1.741) circle[radius=0.015] (1.099,1.706) circle[radius=0.015] (1.185,1.673) circle[radius=0.015] (1.276,1.629) circle[radius=0.015] (1.360,1.581) circle[radius=0.015] (0.784,1.889) circle[radius=0.015] (0.835,1.968) circle[radius=0.015] (0.896,2.034) circle[radius=0.015] (0.957,2.081) circle[radius=0.015] (1.020,2.115) circle[radius=0.015] (1.422,1.535) circle[radius=0.015];
\fi
%
% devil (front horn) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -980,6 +1021,14 @@
\fill[\duck@devil] (1.2185,2.3521) .. controls (1.3540,2.0950) and (1.1993,1.9994) .. (1.1548,1.9663) .. controls (1.1165,1.9441) and (1.1134,1.9277) .. (1.1056,1.8938) .. controls (1.1056,1.8361) and (1.1502,1.7893) .. (1.2052,1.7893) .. controls (1.2373,1.7944) and (1.2669,1.7996) .. (1.2944,1.8311) .. controls (1.2944,1.8311) and (1.5458,2.2025) .. (1.2185,2.3521) -- cycle;
\fi
%
+% Conical Hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@conicalhat
+ \path (0.19,1.4) rectangle (1.68,2.32);
+ \begin{pgfinterruptboundingbox}
+ \fill[\duck@conicalhat] (1.6722,1.4137) .. controls (1.6722,1.4337) and (1.3592,1.6230) .. (0.9513,1.7735) .. controls (0.5433,1.9239) and (0.1948,1.9784) .. (0.1948,1.9754) .. controls (0.2049,2.0230) and (1.1428,2.36) .. (1.1428,2.3) .. controls (1.1428,2.35) and (1.6821,1.4784) .. (1.6722,1.4137) -- cycle;
+ \end{pgfinterruptboundingbox}
+\fi
+%
%\end{pgfonlayer}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -991,16 +1040,16 @@
\ifduck@sunglasses
\fill[\duck@sunglasses,rotate=-17] (0.42,1.8) rectangle (0.8,1.84);
\fill[\duck@sunglasses,rotate=-17] (0.12,1.8) rectangle (0.22,1.84);
- \fill[\duck@sunglasses,rotate=-20] (0.23,1.7675) circle (0.14);
- \fill[\duck@sunglasses,rotate=-20] (-0.06,1.74) circle (0.13);
+ \fill[\duck@sunglasses,rotate=-20] (0.23,1.7675) circle[radius=0.14];
+ \fill[\duck@sunglasses,rotate=-20] (-0.06,1.74) circle[radius=0.13];
\fi
%
% glasses %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@glasses
\fill[\duck@glasses,rotate=-17] (0.42,1.8) rectangle (0.8,1.84);
\fill[\duck@glasses,rotate=-17] (0.12,1.8) rectangle (0.22,1.84);
- \fill[\duck@glasses,rotate=-20,even odd rule] (0.23,1.7675) circle (0.14) (0.23,1.7675) circle (0.11);
- \fill[\duck@glasses,rotate=-20,even odd rule] (-0.06,1.74) circle (0.13) (-0.06,1.74) circle (0.095);
+ \fill[\duck@glasses,rotate=-20,even odd rule] (0.23,1.7675) circle[radius=0.14] (0.23,1.7675) circle[radius=0.11];
+ \fill[\duck@glasses,rotate=-20,even odd rule] (-0.06,1.74) circle[radius=0.13] (-0.06,1.74) circle[radius=0.095];
\fi
%
% square glasses
@@ -1014,9 +1063,9 @@
% icecream %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@icecream
\fill[\duck@cone,rotate=-20] (0.35,1.20)--(0.50,0.60)--(0.75,1.20);
- \fill[\duck@flavoura] (0.85,1.03) circle (0.12);
- \fill[\duck@flavourb] (1.05,0.95) circle (0.12);
- \fill[\duck@flavourc] (0.95,1.1) circle (0.12);
+ \fill[\duck@flavoura] (0.85,1.03) circle[radius=0.12];
+ \fill[\duck@flavourb] (1.05,0.95) circle[radius=0.12];
+ \fill[\duck@flavourc] (0.95,1.1) circle[radius=0.12];
\fi
%
% book %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1036,15 +1085,15 @@
%
% speech bubble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@speech
- \fill[\duck@bubblecolour] (-0.5,1.8) ellipse (0.7 and 0.3);
+ \fill[\duck@bubblecolour] (-0.5,1.8) ellipse[x radius=0.7, y radius=0.3];
\fill[\duck@bubblecolour] (-0.2,1.54) -- (0.2,1.35) -- (0.0,1.6) -- cycle;
\node at (-0.5,1.8) {\duck@speech};
\fi
%
% think bubble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@think
- \fill[\duck@bubblecolour] (2,2.4) ellipse (0.7 and 0.35);
- \fill[\duck@bubblecolour] (1.55,2.35) circle (0.25) (2.0,2.15) circle (0.25) (2.4,2.25) circle (0.25) (1.6,2.55) circle (0.25) (2.0,2.6) circle (0.25) (2.35,2.5) circle (0.25) (1.65,1.95) circle (0.1) (1.55,1.80) circle (0.06) (1.47,1.70) circle (0.03);
+ \fill[\duck@bubblecolour] (2,2.4) ellipse[x radius=0.7, y radius=0.35];
+ \fill[\duck@bubblecolour] (1.55,2.35) circle[radius=0.25] (2.0,2.15) circle[radius=0.25] (2.4,2.25) circle[radius=0.25] (1.6,2.55) circle[radius=0.25] (2.0,2.6) circle[radius=0.25] (2.35,2.5) circle[radius=0.25] (1.65,1.95) circle[radius=0.1] (1.55,1.80) circle[radius=0.06] (1.47,1.70) circle[radius=0.03];
\node at (2,2.4) {\duck@think};
\fi
%
@@ -1074,50 +1123,49 @@
%
% cake %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@cake
- \fill[\duck@cake] (1.00,0.50) ellipse (0.4 and 0.2);
+ \fill[\duck@cake] (1.00,0.50) ellipse[x radius=0.4, y radius=0.2];
\fill[\duck@cake] (0.6,0.5) rectangle (1.4,0.7);
- \fill[\duck@cake] (1.00,0.70) ellipse (0.4 and 0.2);
+ \fill[\duck@cake] (1.00,0.70) ellipse[x radius=0.4, y radius=0.2];
\fill[\duck@cake!50!white] (0.75,0.75) rectangle (0.8,0.95);
\fill[\duck@cake!50!white] (1.2,0.75) rectangle (1.25,0.95);
\fill[\duck@cake!50!white] (0.975,0.65) rectangle (1.025,0.85);
- \fill[white!85!yellow] (1.0,0.93) ellipse (0.03 and 0.06);
- \fill[white!85!yellow] (1.225,1.03) ellipse (0.03 and 0.06);
- \fill[white!85!yellow] (0.775,1.03) ellipse (0.03 and 0.06);
+ \fill[white!85!yellow] (1.0,0.93) ellipse[x radius=0.03, y radius=0.06];
+ \fill[white!85!yellow] (1.225,1.03) ellipse[x radius=0.03, y radius=0.06];
+ \fill[white!85!yellow] (0.775,1.03) ellipse[x radius=0.03, y radius=0.06];
\fi
%
% pizza %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@pizza
- \fill[brown] (1.00,0.60) ellipse (0.4 and 0.2);
- \fill[red!70!black] (1.00,0.60) ellipse (0.34 and 0.16);
- \fill[white!85!yellow] (1.15,0.65) ellipse (0.065 and 0.04);
- \fill[white!85!yellow] (0.81,0.57) ellipse (0.065 and 0.04);
- \fill[white!85!yellow] (0.95,0.68) ellipse (0.065 and 0.04);
- \fill[white!85!yellow] (1.02,0.54) ellipse (0.065 and 0.04);
- \fill[green!40!brown] (1.09,0.54) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse (0.07 and 0.02);
- \fill[green!40!brown] (1.00,0.60) ellipse (0.03 and 0.06);
+ \fill[brown] (1.00,0.60) ellipse[x radius=0.4, y radius=0.2];
+ \fill[red!70!black] (1.00,0.60) ellipse[x radius=0.34, y radius=0.16];
+ \fill[white!85!yellow] (1.15,0.65) ellipse[x radius=0.065, y radius=0.04];
+ \fill[white!85!yellow] (0.81,0.57) ellipse[x radius=0.065, y radius=0.04];
+ \fill[white!85!yellow] (0.95,0.68) ellipse[x radius=0.065, y radius=0.04];
+ \fill[white!85!yellow] (1.02,0.54) ellipse[x radius=0.065, y radius=0.04];
+ \fill[green!40!brown] (1.09,0.54) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown] (1.00,0.60) ellipse[x radius=0.03, y radius=0.06];
\fi
+%
% no pizza %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@davidlikespineapplepizza
- \fill[brown] (1.00,0.60) ellipse (0.4 and 0.2);
- \fill[red!70!black] (1.00,0.60) ellipse (0.34 and 0.16);
- \fill[yellow!70!brown] (1.15,0.65) ellipse (0.08 and 0.06);
- \fill[red!70!black] (1.15,0.65) ellipse (0.04 and 0.03);
- \fill[yellow!70!brown] (0.81,0.57) ellipse (0.08 and 0.06);
- \fill[red!70!black] (0.81,0.57) ellipse (0.04 and 0.03);
- \fill[yellow!70!brown] (0.95,0.68) ellipse (0.08 and 0.06);
- \fill[red!70!black] (0.95,0.68) ellipse (0.04 and 0.03);
- \fill[yellow!70!brown] (1.02,0.54) ellipse (0.08 and 0.06);
- \fill[red!70!black] (1.02,0.54) ellipse (0.04 and 0.03);
- \fill[green!40!brown] (1.09,0.54) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse (0.07 and 0.02);
- \fill[green!40!brown] (1.00,0.60) ellipse (0.03 and 0.06);
+ \fill[brown] (1.00,0.60) ellipse[x radius=0.4, y radius=0.2];
+ \fill[red!70!black] (1.00,0.60) ellipse[x radius=0.34, y radius=0.16];
+ \fill[yellow!70!brown] (1.15,0.65) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (1.15,0.65) ellipse[x radius=0.04, y radius=0.03];
+ \fill[yellow!70!brown] (0.81,0.57) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (0.81,0.57) ellipse[x radius=0.04, y radius=0.03];
+ \fill[yellow!70!brown] (0.95,0.68) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (0.95,0.68) ellipse[x radius=0.04, y radius=0.03];
+ \fill[yellow!70!brown] (1.02,0.54) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (1.02,0.54) ellipse[x radius=0.04, y radius=0.03];
+ \fill[green!40!brown] (1.09,0.54) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown] (1.00,0.60) ellipse[x radius=0.03, y radius=0.06];
\fi
%
-%
-%
% Hockey stick %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@hockey
\fill[\duck@hockey, rounded corners=\scalingfactor*1, rotate=-30] (0.5,0.6) rectangle (0.6,2.1);
@@ -1127,59 +1175,59 @@
% baguette %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@baguette
\fill[\duck@baguette!70!white, rounded corners=\scalingfactor*4, rotate=-30] (0.4,0.72) rectangle (0.7,2.0);
- \fill[\duck@baguette!80!black, rotate=5] (1.44,1.1) ellipse (0.1 and 0.03) (1.30,0.9) ellipse (0.1 and 0.03) (1.16,0.7) ellipse (0.1 and 0.03) (1.02,0.5) ellipse (0.1 and 0.03);
+ \fill[\duck@baguette!80!black, rotate=5] (1.44,1.1) ellipse[x radius=0.1, y radius=0.03] (1.30,0.9) ellipse[x radius=0.1, y radius=0.03] (1.16,0.7) ellipse[x radius=0.1, y radius=0.03] (1.02,0.5) ellipse[x radius=0.1, y radius=0.03];
\fi
%
% football %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@football
- \fill[\duck@football] (1.2,0.33) circle (0.32);
+ \fill[\duck@football] (1.2,0.33) circle[radius=0.32];
\begin{scope}
- \clip (1.2,0.33) circle (0.32);
+ \clip (1.2,0.33) circle[radius=0.32];
\fill[black] (1.06,0.30) -- (1.01,0.17) -- (1.14,0.08) -- (1.26,0.14) -- (1.20,0.28) -- cycle (1.37,0.14) -- (1.46,0.27) -- (1.59,0.27) -- (1.41,0.04) -- cycle (1.28,0.38) -- (1.22,0.52) -- (1.33,0.61) -- (1.45,0.51) -- (1.43,0.37) -- cycle (0.87,0.44) -- (1.02,0.40) -- (1.10,0.53) -- (1.07,0.62) -- (0.94,0.57) -- cycle;
\end{scope}
\fi
%
% milkshake %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@milkshake
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse (0.12 and 0.03);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03];
\begin{scope}
\clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03);
- \fill[cyan!10!white, rotate=-10] (0.8,0.94) ellipse (0.18 and 0.4);
- \fill[\duck@milkshake, rotate=-10] (0.8,0.94) ellipse (0.15 and 0.36);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.94) ellipse[x radius=0.18, y radius=0.4];
+ \fill[\duck@milkshake, rotate=-10] (0.8,0.94) ellipse[x radius=0.15, y radius=0.36];
\end{scope}
- \fill[white!85!yellow] (0.83,0.92) circle (0.05) (0.88,0.9) circle (0.05) (0.93,0.92) circle (0.05) (0.99,0.91) circle (0.05) (1.06,0.86) circle (0.05) (1.13,0.87) circle (0.05) (0.85,0.99) circle (0.05) (0.9,0.98) circle (0.07) (1.0,0.98) circle (0.07) (1.1,0.95) circle (0.07);
- \fill[red!90!black] (1.0,1.1) circle (0.05);
- \fill[white!85!yellow] (0.94,1.05) circle (0.05) (1.03,1.03) circle (0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
+ \fill[white!85!yellow] (0.83,0.92) circle[radius=0.05] (0.88,0.9) circle[radius=0.05] (0.93,0.92) circle[radius=0.05] (0.99,0.91) circle[radius=0.05] (1.06,0.86) circle[radius=0.05] (1.13,0.87) circle[radius=0.05] (0.85,0.99) circle[radius=0.05] (0.9,0.98) circle[radius=0.07] (1.0,0.98) circle[radius=0.07] (1.1,0.95) circle[radius=0.07];
+ \fill[red!90!black] (1.0,1.1) circle[radius=0.05];
+ \fill[white!85!yellow] (0.94,1.05) circle[radius=0.05] (1.03,1.03) circle[radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
\fill[red!90!black,rotate=20] (1.2,0.58) rectangle (1.22,0.85);
\fi
%
% wine %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@wine
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse (0.12 and 0.03);
- \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse (0.03 and 0.2);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse[x radius=0.03, y radius=0.2];
\begin{scope}
\clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03);
- \fill[cyan!10!white, rotate=-10] (0.8,1.1) ellipse (0.18 and 0.4);
+ \fill[cyan!10!white, rotate=-10] (0.8,1.1) ellipse[x radius=0.18, y radius=0.4];
\end{scope}
\begin{scope}
\clip[rotate=-10] (0.58,0.5) rectangle (1.02,0.87);
- \fill[\duck@wine, rotate=-10] (0.8,1.1) ellipse (0.15 and 0.36);
+ \fill[\duck@wine, rotate=-10] (0.8,1.1) ellipse[x radius=0.15, y radius=0.36];
\end{scope}
\fi
%
% prison duck %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@prison
- \fill[\duck@prison] (1.5,0.25) circle (0.3);
- \fill[\duck@prison, even odd rule] (1.2,0.1) ellipse (0.10 and 0.07) (1.2,0.1) ellipse (0.06 and 0.04) (1.05,-0.05) ellipse (0.10 and 0.07) (1.05,-0.05) ellipse (0.06 and 0.04) (0.87,-0.2) ellipse (0.10 and 0.07) (0.87,-0.2) ellipse (0.06 and 0.04);
- \fill[\duck@prison, even odd rule] (0.72,-0.2) ellipse (0.10 and 0.07) (0.72,-0.2) ellipse (0.06 and 0.04);
- \fill[\duck@prison,even odd rule,rotate=70](0.4,-1.05) ellipse (0.1 and 0.07) (0.4,-1.05) ellipse (0.06 and 0.04) (0.2,-0.95) ellipse (0.1 and 0.07) (0.2,-0.95) ellipse (0.06 and 0.04) (0.22,-0.58) ellipse (0.1 and 0.07) (0.22,-0.58) ellipse (0.06 and 0.04);
- \fill[\duck@prison,even odd rule,rotate=110](-0.33,-0.55) ellipse (0.1 and 0.07) (-0.33,-0.55) ellipse (0.06 and 0.04);
+ \fill[\duck@prison] (1.5,0.25) circle[radius=0.3];
+ \fill[\duck@prison, even odd rule] (1.2,0.1) ellipse[x radius=0.10, y radius=0.07] (1.2,0.1) ellipse[x radius=0.06, y radius=0.04] (1.05,-0.05) ellipse[x radius=0.10, y radius=0.07] (1.05,-0.05) ellipse[x radius=0.06, y radius=0.04] (0.87,-0.2) ellipse[x radius=0.10, y radius=0.07] (0.87,-0.2) ellipse[x radius=0.06, y radius=0.04];
+ \fill[\duck@prison, even odd rule] (0.72,-0.2) ellipse[x radius=0.10, y radius=0.07] (0.72,-0.2) ellipse[x radius=0.06, y radius=0.04];
+ \fill[\duck@prison,even odd rule,rotate=70] (0.4,-1.05) ellipse[x radius=0.1, y radius=0.07] (0.4,-1.05) ellipse[x radius=0.06, y radius=0.04] (0.2,-0.95) ellipse[x radius=0.1, y radius=0.07] (0.2,-0.95) ellipse[x radius=0.06, y radius=0.04] (0.22,-0.58) ellipse[x radius=0.1, y radius=0.07] (0.22,-0.58) ellipse[x radius=0.06, y radius=0.04];
+ \fill[\duck@prison,even odd rule,rotate=110](-0.33,-0.55) ellipse[x radius=0.1, y radius=0.07] (-0.33,-0.55) ellipse[x radius=0.06, y radius=0.04];
\begin{scope}
\clip[rotate=-12] (0.45,0.15) rectangle (0.63,0.25);
- \fill[\duck@prison,even odd rule,rotate=110](-0.07,-0.6) ellipse (0.1 and 0.07) (-0.07,-0.6) ellipse (0.06 and 0.04);
+ \fill[\duck@prison,even odd rule,rotate=110](-0.07,-0.6) ellipse[x radius=0.1, y radius=0.07] (-0.07,-0.6) ellipse[x radius=0.06, y radius=0.04];
\end{scope}
\fi
%
@@ -1191,14 +1239,14 @@
\fill[\duck@torch,rounded corners=\scalingfactor*1]
(1.1,0.96) -- (0.77,0.25) -- (0.83,0.25) -- (1.3,0.86) -- cycle;
\fill[\duck@torch,rotate=-28]
- (0.62,1.32) ellipse (0.2 and 0.08);
+ (0.62,1.32) ellipse[x radius=0.2, y radius=0.08];
\fi%
%
% sheep %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@sheep
\begin{scope}
- \clip[rotate=-5] (1.2,1.7) ellipse (0.3 and 0.4);
- \fill[\duck@bill,rotate=-5] (0.8,1.5) ellipse (0.3 and 0.4);
+ \clip[rotate=-5] (1.2,1.7) ellipse[x radius=0.3, y radius=0.4];
+ \fill[\duck@bill,rotate=-5] (0.8,1.5) ellipse[x radius=0.3, y radius=0.4];
\end{scope}
\fi
%
@@ -1206,17 +1254,17 @@
\ifduck@basket
\fill[\duck@basket, start angle=180, end angle=360, x radius=0.35, y radius=0.35] (0.65,0.61) arc -- cycle;
\fill[\duck@basket, start angle=180, end angle=0, even odd rule] [x radius=0.35, y radius=0.5] (0.65,0.6) arc -- cycle [x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle;
- \fill[\duck@basket, even odd rule] (1,0.6) ellipse (0.35 and 0.1) (1,0.6) ellipse (0.3 and 0.07);
- \fill[\duck@basket!75!black] (1,0.6) ellipse (0.3 and 0.07);
+ \fill[\duck@basket, even odd rule] (1,0.6) ellipse[x radius=0.35, y radius=0.1] (1,0.6) ellipse[x radius=0.3, y radius=0.07];
+ \fill[\duck@basket!75!black] (1,0.6) ellipse[x radius=0.3, y radius=0.07];
\fi%
%
% easter basket %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@easter
\begin{scope}
\clip [start angle=180, end angle=0, x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle [start angle=180, end angle=360, x radius=0.3, y radius=0.07] (0.7,0.6) arc -- cycle;
- \fill[\duck@eggb, rotate=-5] (0.95,0.72) ellipse (0.09 and 0.13);
- \fill[\duck@egga, rotate=10] (0.94,0.42) ellipse (0.09 and 0.13);
- \fill[\duck@eggc, rotate=-30] (0.7,1.08) ellipse (0.09 and 0.13);
+ \fill[\duck@eggb, rotate=-5] (0.95,0.72) ellipse[x radius=0.09, y radius=0.13];
+ \fill[\duck@egga, rotate=10] (0.94,0.42) ellipse[x radius=0.09, y radius=0.13];
+ \fill[\duck@eggc, rotate=-30] (0.7,1.08) ellipse[x radius=0.09, y radius=0.13];
\end{scope}
\fi%
%
@@ -1236,7 +1284,7 @@
\ifduck@crozier
\begin{scope}
\clip [rotate=-20] (0.6,2.3) rectangle (1.1,1.999);
- \fill[even odd rule,\duck@crozier] (1.5,1.6) circle (0.2) (1.5,1.6) circle (0.1);
+ \fill[even odd rule,\duck@crozier] (1.5,1.6) circle[radius=0.2] (1.5,1.6) circle[radius=0.1];
\end{scope}
\fill[\duck@crozier,rotate=-20] (0.663,0.5) rectangle (0.763,2.0);
\fi
@@ -1244,7 +1292,7 @@
% stethoscope %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@stethoscope
\fill[\duck@stethoscope,rounded corners=\scalingfactor*0.5,rotate=-18] (0.08,0.7) rectangle (0.13,1.24);
- \fill[\duck@stethoscope] (0.35,0.7) circle (0.1);
+ \fill[\duck@stethoscope] (0.35,0.7) circle[radius=0.1];
\begin{scope}
\fill[\duck@stethoscope,rounded corners=\scalingfactor*0.5,rotate=-30] (0.53,1.3) rectangle (0.58,1.72);
\clip[rotate=-30] (0.36,0.89) -- (0.36,1.36) -- (0.79,1.36) -- (0.79,0.89) -- (0.65,0.89) -- (0.65,0.96) -- (0.5,0.96) -- (0.5,0.89) -- cycle ;
@@ -1271,7 +1319,7 @@
%
% crystal ball %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@crystalball
- \shade[ball color=\duck@crystalball,opacity=0.7] (0.93,0.5) circle (0.33);
+ \shade[ball color=\duck@crystalball,opacity=0.7] (0.93,0.5) circle[radius=0.33];
\fi
%
% Cheese %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1279,7 +1327,7 @@
\begin{scope}[xshift=26,yshift=-2]
\fill[\duck@cheese] (-0.3200,0.8058) -- (0.0608,0.7220) -- (0.0608,0.6366) -- (-0.3200,0.5410) -- (0.2143,0.4236) .. controls (0.3395,0.4810) and (0.4241,0.5627) .. (0.4117,0.6253) -- (0.4117,0.7634) .. controls (0.4261,0.8618) and (0.2607,0.8954) .. (0.1907,0.8962) -- cycle;
\fill[\duck@cheese!35!white] (-0.3200,0.8057) -- (-0.3200,0.5410) -- (0.2143,0.4236) -- (0.2143,0.7381) -- cycle;
- \fill[\duck@cheese] (-0.23,0.71) circle (0.04) (0.0,0.55) circle (0.04) (-0.23,0.58) circle (0.02) (-0.15,0.6) circle (0.02) (-0.1,0.7) circle (0.02) (0.1,0.65) circle (0.02) (0,0.65) circle (0.02) (0.1,0.5) circle (0.02) (0.07,0.55) circle (0.01) (0.12,0.6) circle (0.01) (-0.08,0.54) circle (0.01);
+ \fill[\duck@cheese] (-0.23,0.71) circle[radius=0.04] (0.0,0.55) circle[radius=0.04] (-0.23,0.58) circle[radius=0.02] (-0.15,0.6) circle[radius=0.02] (-0.1,0.7) circle[radius=0.02] (0.1,0.65) circle[radius=0.02] (0,0.65) circle[radius=0.02] (0.1,0.5) circle[radius=0.02] (0.07,0.55) circle[radius=0.01] (0.12,0.6) circle[radius=0.01] (-0.08,0.54) circle[radius=0.01];
\end{scope}
\fi
%
@@ -1318,13 +1366,18 @@
%
% cocktail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@cocktail
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse (0.12 and 0.03);
- \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse (0.03 and 0.2);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse[x radius=0.03, y radius=0.2];
\fill[cyan!10!white] (0.92,0.6) -- (0.75,0.9) -- (1.18,0.83) -- cycle;
\fill[gray!60!white] (0.928,0.64) -- (0.85,0.77) -- (1.08,0.77) -- cycle;
- \fill[green!40!brown!60!white] (0.94,0.71) circle (0.04);
- \fill[red!80!black] (0.94,0.72) circle (0.01);
+ \fill[green!40!brown!60!white] (0.94,0.71) circle[radius=0.04];
+ \fill[red!80!black] (0.94,0.72) circle[radius=0.01];
+\fi
+%
+% overleaf duck
+\ifduck@overleaf
+ \fill[white] \duckpathoverleaf;
\fi
%
% wing %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1343,15 +1396,15 @@
% Random ducks
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifluatex
- \let\pdfrandomseed\randomseed
-\fi
-
-\ifxetex
- \pgfmathsetseed{\time}
+\ifdefined\pdfrandomseed % pdflatex
\else
- \pgfmathsetseed{\number\pdfrandomseed}
+ \ifdefined\randomseed
+ \let\pdfrandomseed\randomseed % post TL19 xelatex and lualatex
+ \else
+ \let\pdfrandomseed\time % pre TL19 xelatex
+ \fi
\fi
+\pgfmathsetseed{\number\pdfrandomseed}
\pgfmathdeclarerandomlist{head}{{shorthair}{longhair}{crazyhair}{mohican}{mullet}{beard}{alien}{hat}{cap}{santa}{chef}{graduate}{beret}{magichat}{witch}{crown}{bunny}{peakedcap}{tophat}{queencrown}{kingcrown}{harlequin}{strawhat}{parting}}
\pgfmathdeclarerandomlist{accessories}{{glasses}{sunglasses}{icecream}{book}{signpost}{magicwand}{cricket}{rollingpin}{lightsaber}{cake}{pizza}{hockey}{baguette}{football}{mask}{necklace}{milkshake}{wine}{prison}{cape}{torch}{crozier}{easter}{stethoscope}{neckerchief}{cheese}{shovel}{pickaxe}{crystalball}}
@@ -1593,6 +1646,10 @@
(1.4338,1.0258) -- cycle
}
+\newcommand{\duckpathoverleaf}{%
+ (1.2699,0.6095) .. controls (1.2710,0.5992) and (1.2752,0.5910) .. (1.2822,0.5852) .. controls (1.2892,0.5793) and (1.2983,0.5763) .. (1.3095,0.5763) .. controls (1.3165,0.5762) and (1.3233,0.5778) .. (1.3295,0.5809) .. controls (1.3353,0.5840) and (1.3401,0.5885) .. (1.3436,0.5940) -- (1.3792,0.5940) .. controls (1.3731,0.5785) and (1.3640,0.5664) .. (1.3521,0.5578) .. controls (1.3398,0.5492) and (1.3252,0.5447) .. (1.3103,0.5449) .. controls (1.3002,0.5448) and (1.2902,0.5467) .. (1.2808,0.5505) .. controls (1.2718,0.5544) and (1.2636,0.5601) .. (1.2567,0.5672) .. controls (1.2500,0.5742) and (1.2446,0.5825) .. (1.2410,0.5915) .. controls (1.2372,0.6005) and (1.2353,0.6101) .. (1.2353,0.6198) .. controls (1.2352,0.6294) and (1.2370,0.6389) .. (1.2404,0.6479) .. controls (1.2438,0.6567) and (1.2489,0.6647) .. (1.2554,0.6715) .. controls (1.2625,0.6790) and (1.2709,0.6850) .. (1.2802,0.6892) .. controls (1.2891,0.6933) and (1.2988,0.6954) .. (1.3086,0.6955) .. controls (1.3207,0.6955) and (1.3325,0.6926) .. (1.3432,0.6871) .. controls (1.3540,0.6813) and (1.3633,0.6732) .. (1.3705,0.6634) .. controls (1.3751,0.6571) and (1.3786,0.6501) .. (1.3807,0.6427) .. controls (1.3831,0.6341) and (1.3842,0.6253) .. (1.3841,0.6164) .. controls (1.3840,0.6139) and (1.3839,0.6119) .. (1.3837,0.6092) .. controls (1.3458,0.6093) and (1.3079,0.6094) .. (1.2699,0.6095) -- cycle(1.3486,0.6358) .. controls (1.3458,0.6453) and (1.3410,0.6525) .. (1.3343,0.6575) .. controls (1.3276,0.6625) and (1.3192,0.6650) .. (1.3090,0.6650) .. controls (1.3004,0.6651) and (1.2920,0.6622) .. (1.2852,0.6570) .. controls (1.2783,0.6517) and (1.2733,0.6443) .. (1.2711,0.6359) .. controls (1.2969,0.6359) and (1.3228,0.6358) .. (1.3486,0.6358) -- cycle(1.5160,0.5487) -- (1.5160,0.5662) .. controls (1.5122,0.5593) and (1.5064,0.5538) .. (1.4992,0.5505) .. controls (1.4920,0.5471) and (1.4828,0.5455) .. (1.4715,0.5455) .. controls (1.4505,0.5455) and (1.4329,0.5527) .. (1.4187,0.5670) .. controls (1.4046,0.5814) and (1.3976,0.5993) .. (1.3975,0.6206) .. controls (1.3975,0.6303) and (1.3993,0.6401) .. (1.4029,0.6492) .. controls (1.4063,0.6580) and (1.4114,0.6661) .. (1.4180,0.6729) .. controls (1.4246,0.6801) and (1.4327,0.6857) .. (1.4416,0.6895) .. controls (1.4509,0.6932) and (1.4608,0.6950) .. (1.4708,0.6949) .. controls (1.4800,0.6951) and (1.4891,0.6933) .. (1.4976,0.6896) .. controls (1.5050,0.6862) and (1.5112,0.6807) .. (1.5156,0.6739) -- (1.5156,0.6911) -- (1.5480,0.6911) -- (1.5480,0.5485) -- (1.5160,0.5485) -- (1.5160,0.5487) -- cycle(1.4436,0.5910) .. controls (1.4513,0.5831) and (1.4619,0.5787) .. (1.4729,0.5789) .. controls (1.4833,0.5789) and (1.4926,0.5829) .. (1.5006,0.5911) .. controls (1.5083,0.5986) and (1.5126,0.6088) .. (1.5126,0.6196) .. controls (1.5127,0.6307) and (1.5084,0.6414) .. (1.5006,0.6494) .. controls (1.4926,0.6577) and (1.4833,0.6619) .. (1.4727,0.6619) .. controls (1.4618,0.6621) and (1.4514,0.6577) .. (1.4439,0.6499) .. controls (1.4361,0.6423) and (1.4318,0.6318) .. (1.4317,0.6205) .. controls (1.4315,0.6092) and (1.4355,0.5991) .. (1.4436,0.5910) -- cycle(1.6366,0.6913) -- (1.6366,0.6617) -- (1.6127,0.6617) -- (1.6127,0.5487) -- (1.5806,0.5487) -- (1.5806,0.6617) -- (1.5637,0.6617) -- (1.5637,0.6913) -- (1.5796,0.6913) -- (1.5796,0.6952) .. controls (1.5796,0.7102) and (1.5838,0.7214) .. (1.5922,0.7288) .. controls (1.6005,0.7362) and (1.6131,0.7399) .. (1.6300,0.7399) .. controls (1.6324,0.7398) and (1.6347,0.7396) .. (1.6370,0.7395) -- (1.6370,0.7097) -- (1.6347,0.7097) .. controls (1.6272,0.7097) and (1.6218,0.7084) .. (1.6186,0.7059) .. controls (1.6154,0.7034) and (1.6138,0.6993) .. (1.6138,0.6936) -- (1.6138,0.6910) .. controls (1.6214,0.6913) and (1.6290,0.6912) .. (1.6366,0.6913) -- cycle(1.1906,0.5487) -- (1.2231,0.5487) -- (1.2231,0.7374) -- (1.1906,0.7374) -- cycle(0.9820,0.6095) .. controls (0.9831,0.5992) and (0.9872,0.5910) .. (0.9943,0.5852) .. controls (1.0013,0.5793) and (1.0104,0.5763) .. (1.0216,0.5763) .. controls (1.0285,0.5762) and (1.0354,0.5778) .. (1.0416,0.5809) .. controls (1.0474,0.5839) and (1.0522,0.5885) .. (1.0556,0.5940) -- (1.0914,0.5940) .. controls (1.0854,0.5785) and (1.0763,0.5664) .. (1.0643,0.5578) .. controls (1.0522,0.5492) and (1.0382,0.5449) .. (1.0225,0.5449) .. controls (1.0124,0.5448) and (1.0024,0.5467) .. (0.9931,0.5505) .. controls (0.9840,0.5544) and (0.9758,0.5601) .. (0.9690,0.5672) .. controls (0.9622,0.5742) and (0.9569,0.5825) .. (0.9532,0.5915) .. controls (0.9495,0.6005) and (0.9475,0.6101) .. (0.9475,0.6198) .. controls (0.9475,0.6294) and (0.9492,0.6389) .. (0.9527,0.6479) .. controls (0.9560,0.6567) and (0.9611,0.6647) .. (0.9677,0.6715) .. controls (0.9747,0.6790) and (0.9830,0.6850) .. (0.9924,0.6892) .. controls (1.0012,0.6933) and (1.0109,0.6955) .. (1.0207,0.6955) .. controls (1.0327,0.6955) and (1.0446,0.6927) .. (1.0552,0.6871) .. controls (1.0660,0.6813) and (1.0753,0.6732) .. (1.0826,0.6634) .. controls (1.0871,0.6571) and (1.0906,0.6501) .. (1.0926,0.6427) .. controls (1.0949,0.6341) and (1.0960,0.6253) .. (1.0959,0.6164) .. controls (1.0959,0.6139) and (1.0957,0.6119) .. (1.0956,0.6092) .. controls (1.0577,0.6100) and (1.0199,0.6095) .. (0.9820,0.6095) -- cycle(1.0606,0.6358) .. controls (1.0578,0.6453) and (1.0531,0.6526) .. (1.0463,0.6575) .. controls (1.0397,0.6625) and (1.0312,0.6650) .. (1.0210,0.6650) .. controls (1.0124,0.6651) and (1.0041,0.6622) .. (0.9973,0.6570) .. controls (0.9903,0.6517) and (0.9853,0.6443) .. (0.9830,0.6359) .. controls (1.0089,0.6359) and (1.0348,0.6358) .. (1.0606,0.6358) -- cycle(1.1761,0.6624) .. controls (1.1632,0.6614) and (1.1542,0.6580) .. (1.1492,0.6523) .. controls (1.1441,0.6465) and (1.1415,0.6363) .. (1.1415,0.6214) -- (1.1415,0.5487) -- (1.1083,0.5487) -- (1.1083,0.6913) -- (1.1394,0.6913) -- (1.1394,0.6748) .. controls (1.1438,0.6808) and (1.1494,0.6856) .. (1.1559,0.6891) .. controls (1.1621,0.6923) and (1.1690,0.6938) .. (1.1760,0.6937) .. controls (1.1760,0.6833) and (1.1761,0.6728) .. (1.1761,0.6624) -- cycle(0.8646,0.8092) .. controls (0.8244,0.8248) and (0.6787,0.8306) .. (0.6784,0.7437) .. controls (0.6359,0.7165) and (0.6078,0.6721) .. (0.6078,0.6246) .. controls (0.6077,0.5410) and (0.7016,0.4916) .. (0.7705,0.5391) .. controls (0.8394,0.5866) and (0.8268,0.6919) .. (0.7486,0.7217) .. controls (0.7411,0.7246) and (0.7248,0.7297) .. (0.7117,0.7286) .. controls (0.6931,0.7168) and (0.6704,0.6924) .. (0.6597,0.6682) .. controls (0.6918,0.7064) and (0.7528,0.6983) .. (0.7737,0.6530) .. controls (0.7947,0.6076) and (0.7614,0.5559) .. (0.7115,0.5562) .. controls (0.6914,0.5562) and (0.6724,0.5649) .. (0.6594,0.5802) .. controls (0.6410,0.6019) and (0.6363,0.6254) .. (0.6400,0.6484) .. controls (0.6532,0.7289) and (0.7487,0.7748) .. (0.8197,0.7924) .. controls (0.7966,0.7801) and (0.7548,0.7600) .. (0.7255,0.7380) .. controls (0.8108,0.7051) and (0.8246,0.7770) .. (0.8646,0.8092) -- cycle(0.8731,0.5487) -- (0.8189,0.6913) -- (0.8542,0.6913) -- (0.8874,0.5965) -- (0.9217,0.6913) -- (0.9561,0.6913) -- (0.8991,0.5487) -- cycle
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Picture mode ducks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzducks/tikzlibraryducks.code.tex new/tex/latex/tikzducks/tikzlibraryducks.code.tex
--- old/tex/latex/tikzducks/tikzlibraryducks.code.tex 2019-04-07 23:21:00.000000000 +0200
+++ new/tex/latex/tikzducks/tikzlibraryducks.code.tex 2020-01-03 23:15:44.000000000 +0100
@@ -10,9 +10,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.1
-% April 7, 2019
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{tikzducks}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzducks.tlpobj new/tlpkg/tlpobj/tikzducks.tlpobj
--- old/tlpkg/tlpobj/tikzducks.tlpobj 2019-04-08 01:40:10.000000000 +0200
+++ new/tlpkg/tlpobj/tikzducks.tlpobj 2020-01-05 01:55:18.000000000 +0100
@@ -1,12 +1,12 @@
name tikzducks
category Package
-revision 50840
+revision 53312
shortdesc A little fun package for using rubber ducks in TikZ
relocated 1
longdesc The package is a LaTeX package for ducks to be used in TikZ
longdesc pictures. This project is a continuation of an answer at
longdesc StackExchange How we can draw a duck?
-runfiles size=22
+runfiles size=26
RELOC/tex/latex/tikzducks/tikzducks.sty
RELOC/tex/latex/tikzducks/tikzlibraryducks.code.tex
catalogue-also tikzlings tikzmarmots
@@ -14,7 +14,6 @@
catalogue-contact-repository https://github.com/samcarter/tikzducks
catalogue-contact-support https://github.com/samcarter/tikzducks/issues
catalogue-ctan /graphics/pgf/contrib/tikzducks
-catalogue-date 2019-04-07 09:38:44 +0200
catalogue-license lppl1.3c
-catalogue-topics pgf-tikz
-catalogue-version 1.1
+catalogue-topics amusements graphics pgf-tikz
+catalogue-version 1.3
++++++ tikzlings.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzlings.doc.tlpobj new/tlpkg/tlpobj/tikzlings.doc.tlpobj
--- old/tlpkg/tlpobj/tikzlings.doc.tlpobj 2019-04-08 01:40:10.000000000 +0200
+++ new/tlpkg/tlpobj/tikzlings.doc.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzlings.doc
category Package
-revision 50841
+revision 54080
shortdesc doc files of tikzlings
relocated 1
docfiles size=125
++++++ tikzlings.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzlings.tlpobj new/tlpkg/tlpobj/tikzlings.tlpobj
--- old/tlpkg/tlpobj/tikzlings.tlpobj 2019-04-08 01:40:11.000000000 +0200
+++ new/tlpkg/tlpobj/tikzlings.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzlings
category Package
-revision 50841
+revision 54080
shortdesc A collection of cute little animals and similar creatures
relocated 1
longdesc A collection of LaTeX packages for drawing cute little animals
@@ -31,7 +31,6 @@
catalogue-contact-repository https://github.com/samcarter/tikzlings
catalogue-contact-support https://github.com/samcarter/tikzlings/issues
catalogue-ctan /graphics/pgf/contrib/tikzlings
-catalogue-date 2019-04-07 10:07:47 +0200
catalogue-license lppl1.3c
-catalogue-topics graphics pgf-tikz
+catalogue-topics amusements graphics pgf-tikz
catalogue-version 0.2
++++++ tikzmark.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzmark/README.txt new/doc/latex/tikzmark/README.txt
--- old/doc/latex/tikzmark/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tikzmark/README.txt 2019-05-08 23:16:33.000000000 +0200
@@ -0,0 +1,10 @@
+----------------------------------------------------------------
+tikzmark --- remembering absolute positioning with TikZ
+E-mail: loopspace@mathforge.org
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+The tikzmark package defines a command to "remember" a position
+on a page for later (or earlier) use, primarily (but not
+exclusively) with TikZ.
Binary files old/doc/latex/tikzmark/tikzmark.pdf and new/doc/latex/tikzmark/tikzmark.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmark.doc.tlpobj new/tlpkg/tlpobj/tikzmark.doc.tlpobj
--- old/tlpkg/tlpobj/tikzmark.doc.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmark.doc.tlpobj 2019-10-06 01:54:25.000000000 +0200
@@ -1,8 +1,9 @@
name tikzmark.doc
category Package
-revision 48929
+revision 52293
shortdesc doc files of tikzmark
relocated 1
-docfiles size=112
+docfiles size=105
RELOC/doc/latex/tikzmark/README
+ RELOC/doc/latex/tikzmark/README.txt
RELOC/doc/latex/tikzmark/tikzmark.pdf
++++++ tikzmark.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex new/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
--- old/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2018-10-18 22:26:16.000000000 +0200
+++ new/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2019-10-05 22:49:26.000000000 +0200
@@ -61,6 +61,36 @@
next page/ignore/.style={%
next page vector={\pgfqpoint{0pt}{0pt}}%
},
+ if tikzmark on current page/.code n args={3}{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \pgfkeysalso{#3}%
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \pgfkeysalso{#3}%
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=\the\value{page}\relax%
+ \pgfkeysalso{#2}%
+ \else
+ \pgfkeysalso{#3}%
+ \fi
+ }%
+ }%
+ },
+ if tikzmark on page/.code n args={4}{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \pgfkeysalso{#4}%
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}@label\endcsname}{%
+ \pgfkeysalso{#4}%
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=#2\relax%
+ \pgfkeysalso{#3}%
+ \else
+ \pgfkeysalso{#4}%
+ \fi
+ }%
+ }%
+ },
tikzmark prefix/.initial=,%
tikzmark suffix/.initial=,%
}
@@ -77,6 +107,10 @@
\def\savepicturepage#1#2{%
\expandafter\gdef\csname save@pg@#1\endcsname{#2}%
}
+\def\tikzmarkalias#1#2{%
+ \pgf@node@gnamelet{save@pt@#1}{save@pt@#2}%
+ \pgf@node@gnamelet{save@pt@#1@offset}{save@pt@#2@offset}%
+}
\def\tmk@labeldef#1,#2\@nil{%
\edef\tmk@label{\tikzmark@pp@name{#1}}%
\def\tmk@def{#2}%
@@ -109,22 +143,23 @@
\@ifundefined{save@pg@\csname save@pt@\tmk@label\endcsname}{}{%
\@ifundefined{save@pg@\pgfpictureid}{}{%
\pgfkeysvalueof{/tikz/next page vector}%
- \advance \pgf@xa by %
- \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname\pgf@x\relax
- \advance \pgf@ya by %
- \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname\pgf@y\relax
- \advance \pgf@xa by %
- -\csname save@pg@\pgfpictureid\endcsname\pgf@x\relax
- \advance \pgf@ya by %
- -\csname save@pg@\pgfpictureid\endcsname\pgf@y\relax
+ \edef\tmk@pg{\the\numexpr \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname - \csname save@pg@\pgfpictureid\endcsname\relax}%
+ \ifnum \tmk@pg > 0 \relax
+ \advance \pgf@xa by \pgf@x\relax
+ \advance \pgf@ya by \pgf@y\relax
+ \fi
+ \ifnum \tmk@pg < 0 \relax
+ \advance \pgf@xa by -\pgf@x\relax
+ \advance \pgf@ya by -\pgf@y\relax
+ \fi
}%
}%
\pgf@x=\pgf@xa
\pgf@y=\pgf@ya
\pgftransforminvert
\pgf@pos@transform{\pgf@x}{\pgf@y}%
- }%
- }
+ }%
+}
\newcommand\tikzmark@outside[2][]{%
\tikz[remember picture with id=#2]{#1}%
}
@@ -138,8 +173,13 @@
\ifx\pgfpictureid\@undefined
\let\tikzmark@next=\tikzmark@outside
\else
+ \relax
+ \ifx\scope\tikz@origscope\relax
+ \let\tikzmark@next=\tikzmark@outside
+ \else
\let\tikzmark@next=\tikzmark@inside
\fi
+ \fi
\tikzmark@next%
}
\newcommand\pgfmark[1]{%
@@ -171,19 +211,58 @@
tikzmark suffix=-\the\beamer@slideinframe
}
}{}
+\newif\iftikzmark@
\newcommand\iftikzmark[3]{%
\@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
#3%
}{%
#2%
}%
+}%
+\newcommand\iftikzmarkexists[1]{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \tikzmark@false%
+ }{%
+ \tikzmark@true%
}%
-\newcommand\subnode[3][]{%
+ \iftikzmark@
+}%
+\newcommand\iftikzmarkonpage[2]{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \tikzmark@false
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \tikzmark@false
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=#2\relax%
+ \tikzmark@true
+ \else
+ \tikzmark@false
+ \fi
+ }%
+ }%
+ \iftikzmark@
+}
+\newcommand\iftikzmarkoncurrentpage[1]{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \tikzmark@false
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \tikzmark@false
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=\the\value{page}\relax%
+ \tikzmark@true
+ \else
+ \tikzmark@false
+ \fi
+ }%
+ }%
+ \iftikzmark@
+}
+\def\subnode@#1#2#3{%
\begingroup
\pgfmark{#2}%
\setbox\pgfnodeparttextbox=\hbox\bgroup #3\egroup
- \def\tikz@shape{rectangle}%
- \def\tikz@anchor{center}%
\def\tikz@fig@name{#2}%
\tikzset{every subnode/.try,#1}%
\pgfpointorigin
@@ -193,46 +272,89 @@
\advance\pgf@y by -.5\dp\pgfnodeparttextbox
\pgftransformshift{}%
\setbox\@tempboxa=\hbox\bgroup
- \pgfutil@ifundefined{pgf@sh@s@\tikz@shape}%
- {\PackageError{pgf}{Unknown shape ``\tikz@shape''}{}}%
{%
- {%
- \let\pgf@sh@savedmacros=\pgfutil@empty% MW
- \let\pgf@sh@savedpoints=\pgfutil@empty%
- \def\pgf@sm@shape@name{\tikz@shape}% CJ % TT added prefix!
- \csname pgf@sh@s@\tikz@shape\endcsname%
- \pgf@sh@savedpoints%
- \pgf@sh@savedmacros% MW
- \pgftransformshift{%
- \pgf@sh@reanchor{\tikz@shape}{\tikz@anchor}%
- \pgf@x=-\pgf@x%
- \pgf@y=-\pgf@y%
- }%
- \expandafter\pgfsavepgf@process\csname pgf@sh@sa@\tikz@fig@name\endcsname{%
- \pgf@sh@reanchor{\tikz@shape}{\tikz@anchor}% FIXME : this is double work!
- }%
- % Save the saved points and the transformation matrix
- \edef\pgf@node@name{\tikz@fig@name}%
- \ifx\pgf@node@name\pgfutil@empty%
- \else%
- \expandafter\xdef\csname pgf@sh@ns@\pgf@node@name\endcsname{\tikz@shape}%
- \edef\pgf@sh@@temp{%
- \noexpand\gdef\expandafter\noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
- \expandafter\pgf@sh@@temp\expandafter{%
- \pgf@sh@savedpoints}%
- \edef\pgf@sh@@temp{%
- \noexpand\gdef\expandafter\noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
- \expandafter\pgf@sh@@temp\expandafter{\pgf@sh@savedmacros}% MW
- \pgfgettransform\pgf@temp
- \expandafter\xdef\csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
- \expandafter\xdef\csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
- \fi%
+ \let\pgf@sh@savedmacros=\pgfutil@empty% MW
+ \let\pgf@sh@savedpoints=\pgfutil@empty%
+ \def\pgf@sm@shape@name{rectangle}% CJ % TT added prefix!
+ \pgf@sh@s@rectangle%
+ \pgf@sh@savedpoints%
+ \pgf@sh@savedmacros% MW
+ \pgftransformshift{%
+ \pgf@sh@reanchor{rectangle}{center}%
+ \pgf@x=-\pgf@x%
+ \pgf@y=-\pgf@y%
+ }%
+ \expandafter\pgfsavepgf@process\csname pgf@sh@sa@\tikz@fig@name\endcsname{%
+ \pgf@sh@reanchor{rectangle}{center}% FIXME : this is double work!
}%
+ % Save the saved points and the transformation matrix
+ \edef\pgf@node@name{\tikz@fig@name}%
+ \ifx\pgf@node@name\pgfutil@empty%
+ \else%
+ \expandafter\xdef\csname pgf@sh@ns@\pgf@node@name\endcsname{rectangle}%
+ \edef\pgf@sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
+ \expandafter\pgf@sh@@temp\expandafter{%
+ \pgf@sh@savedpoints}%
+ \edef\pgf@sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
+ \expandafter\pgf@sh@@temp\expandafter{\pgf@sh@savedmacros}% MW
+ \pgfgettransform\pgf@temp
+ \expandafter\xdef\csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
+ \expandafter\xdef\csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
+ \fi%
}%
\egroup
\box\pgfnodeparttextbox
\endgroup
}
+
+\newcommand\subnode[3][]{%
+ \ifmmode
+ \mathchoice{%
+ \subnode@{#1}{#2-d}{\(\displaystyle #3\)}%
+ }{%
+ \subnode@{#1}{#2-t}{\(\textstyle #3\)}%
+ }{%
+ \subnode@{#1}{#2-s}{\(\scriptstyle #3\)}%
+ }{%
+ \subnode@{#1}{#2-ss}{\(\scriptscriptstyle #3\)}%
+ }%
+ \let\pgf@nodecallback\pgfutil@gobble
+ \def\tzmk@prfx{pgf@sys@pdf@mark@pos@pgfid}%
+ \edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+ \edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-2\relax}%
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+ \pgfutil@ifundefined{pgf@sh@ns@#2}{%
+ \pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
+ }{}%
+ \else
+ \pgfnodealias{#2}{#2-d}%
+ \tikzmarkalias{#2}{#2-d}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-s}%
+ \tikzmarkalias{#2}{#2-s}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-ss}%
+ \tikzmarkalias{#2}{#2-ss}%
+ \fi
+ \else
+ \subnode@{#1}{#2}{#3}%
+ \fi
+}
+
\def\tikzmarknode@#1#2#3{%
\tikz[%
remember picture,
@@ -243,6 +365,7 @@
\node[
anchor=base,
inner sep=0pt,
+ minimum width=0pt,
name={#2},
node contents={#3},
every tikzmarknode/.try,
@@ -263,7 +386,7 @@
}%
\let\pgf@nodecallback\pgfutil@gobble
\def\tzmk@prfx{pgf@sys@pdf@mark@pos@pgfid}%
- \edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}
+ \edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
@@ -271,18 +394,25 @@
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
- \pgfnodealias{#2}{#2-t}% %% Fallback
+ \pgfutil@ifundefined{pgf@sh@ns@#2}{%
+ \pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
+ }{}%
\else
\pgfnodealias{#2}{#2-d}%
+ \tikzmarkalias{#2}{#2-d}%
\fi
\else
\pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
\fi
\else
\pgfnodealias{#2}{#2-s}%
+ \tikzmarkalias{#2}{#2-s}%
\fi
\else
\pgfnodealias{#2}{#2-ss}%
+ \tikzmarkalias{#2}{#2-ss}%
\fi
\else
\tikzmarknode@{#1}{#2}{#3}%
@@ -324,6 +454,10 @@
\tl_new:N \l__sn_group_tl
\clist_new:N \l__sn_nodes_clist
\bool_new:N \l__sn_file_bool
+\bool_new:N \g__sn_preamble_bool
+\bool_set_true:N \g__sn_preamble_bool
+\msg_new:nnn {tikzmark} {no file} {File~ "#1"~ doesn't~ exist.}
+\msg_new:nnn {tikzmark} {loading nodes} {Loading~ nodes~ from~ "#1".}
\dim_new:N \l__sn_x_dim
\dim_new:N \l__sn_y_dim
\dim_new:N \l__sn_xa_dim
@@ -335,7 +469,7 @@
\iow_new:N \g__sn_stream
\bool_new:N \g__sn_stream_bool
\tl_new:N \g__sn_filename_tl
-\tl_set:Nx \g__sn_filename_tl {\c_sys_jobname_str}
+\tl_gset:Nx \g__sn_filename_tl {\c_sys_jobname_str}
\cs_new_nopar:Npn \sn_open_stream:
{
@@ -445,13 +579,18 @@
}
\cs_new_nopar:Npn \restore_nodes_from_file:n #1
{
- \file_if_exist:nT {#1.nodes}
+ \file_if_exist:nTF {#1.nodes}
{
+ \msg_log:nnn {tikzmark} {loading nodes} {#1}
\ExplSyntaxOn
\file_input:n {#1.nodes}
\ExplSyntaxOff
}
+ {
+ \msg_warning:nnn {tikzmark} {no file} {#1}
+ }
}
+\AtBeginDocument{\bool_gset_false:N \g__sn_preamble_bool}
\cs_new_nopar:Npn \compose_transformations:Nnn #1#2#3
{
@@ -568,16 +707,23 @@
}
},
restore~ nodes~ from~ file/.code={
- \tikz_fig_must_be_named:
- \pgfkeysalso{append~ after~ command={
- \pgfextra{
- \scope
- \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
- \endscope
+ \bool_if:NTF \g__sn_preamble_bool
+ {
+ \restore_nodes_from_file:n {#1}
+ }
+ {
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \scope
+ \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
+ \endscope
+ }
}
}
}
},
+ restore~ nodes~ from~ file/.default = \g__sn_filename_tl,
restore~ nodes~ from~ list/.code={
\tikz_fig_must_be_named:
\pgfkeysalso{append~ after~ command={
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmark.tlpobj new/tlpkg/tlpobj/tikzmark.tlpobj
--- old/tlpkg/tlpobj/tikzmark.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmark.tlpobj 2019-10-06 01:54:25.000000000 +0200
@@ -1,18 +1,19 @@
name tikzmark
category Package
-revision 48929
+revision 52293
shortdesc Use TikZ's method of remembering a position on a page
relocated 1
longdesc The tikzmark package defines a command to "remember" a position
longdesc on a page for later (or earlier) use, primarily (but not
longdesc exclusively) with TikZ.
-runfiles size=6
+runfiles size=7
RELOC/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
RELOC/tex/latex/tikzmark/tikzmarklibrarylistings.code.tex
+catalogue-contact-bugs https://github.com/loopspace/tikzmark/issues
catalogue-contact-home https://github.com/loopspace/tikzmark
catalogue-contact-repository https://github.com/loopspace/tikzmark
catalogue-ctan /graphics/pgf/contrib/tikzmark
-catalogue-date 2018-10-18 13:12:22 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-10-04 23:28:37 +0200
+catalogue-license lppl1.3c
catalogue-topics pgf-tikz graphics-supp
-catalogue-version 1.6
+catalogue-version 1.8
++++++ tikzmarmots.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmarmots.doc.tlpobj new/tlpkg/tlpobj/tikzmarmots.doc.tlpobj
--- old/tlpkg/tlpobj/tikzmarmots.doc.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmarmots.doc.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzmarmots.doc
category Package
-revision 49114
+revision 54080
shortdesc doc files of tikzmarmots
relocated 1
docfiles size=65
++++++ tikzmarmots.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmarmots.tlpobj new/tlpkg/tlpobj/tikzmarmots.tlpobj
--- old/tlpkg/tlpobj/tikzmarmots.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmarmots.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzmarmots
category Package
-revision 49114
+revision 54080
shortdesc Drawing little marmots in TikZ
relocated 1
longdesc This is a LaTeX package for marmots to be used in TikZ
@@ -15,7 +15,6 @@
catalogue-contact-repository https://github.com/samcarter/tikzmarmots
catalogue-contact-support https://github.com/samcarter/tikzmarmots/issues
catalogue-ctan /graphics/pgf/contrib/tikzmarmots
-catalogue-date 2018-11-09 18:39:11 +0100
catalogue-license lppl1.3c
-catalogue-topics pgf-tikz
+catalogue-topics amusements graphics pgf-tikz
catalogue-version 1.0
++++++ titlesec.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/CHANGES new/doc/latex/titlesec/CHANGES
--- old/doc/latex/titlesec/CHANGES 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/CHANGES 1970-01-01 01:00:00.000000000 +0100
@@ -1,267 +0,0 @@
-Titlesec changes
-
-History of v1.0
-~~~~~~~~~~~~~~~
-1998/02/25 Added nops option
-1998/02/28 Added \@mkboth stuff in \setmarks
-1998/03/01 Changed test in \ttl@secnum
-1998/03/03 Corrected some \fil... commands
-1998/03/03 Replaced the faulty \@hangfrom by new commands
-1998/03/03 Some \def replaced by \newcommand
-1998/03/04 .dtx/.ins scheme finally rejected. Useless
- for users, obtrusive for `readers' and proned
- to errors
-1998/03/04 Tidied up documentation
-1998/03/06 \wordsep renamed and documented
-1998/03/06 Added dummy asignation in \ttl@chap.
-1998/03/06 Removed \ttl@xsect and merged into \tl@sect
-1998/03/06 Added \ProvidesPackage
-
-History of v1.1
-~~~~~~~~~~~~~~~~
-1998/03/25 \chapter corrected, as well as the size options
-1998/03/26 Added compact option
-1998/03/26 Added flushleft, flushright and center options
-1998/04/08 Changed all instances of \noindent by \parindent\z@
-1998/04/14 Added \filinner, \filouter
-1998/04/14 Added drop shape
-1998/05/01 Added rightmargin shape (and margin renamed to
- leftmargin)
-1998/05/03 Added \setheadindent
-
-History of v1.2 (unreleased)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1998/06/01 Compatibility with AMS classes
-1998/06/08 On-demand loading of shapes
-1998/06/11 Frame shape. Some \fil... command
- modified to work in the label of this
- chapter shape.
-1998/07/03 Bottomtitle option (at last...)
-1998/07/14 ...margin styles bug fixed using a method
- similar to bottomtitle.
-1998/07/29 \titleline
-
-====================
-
-History of v2.0
-~~~~~~~~~~~~~~~~
-
-1998/08/05 to
-1998/08/29 Fully reimplemented
-
-History of v2.1
-~~~~~~~~~~~~~~~~
-1999/01/05 We define in this file the three basic shapes.
- Additional ones remain defined in external files.
- Unified the shapes for sections and chapters.
-1999/01/05 \ttl@shape merged into \ttl@format@iii.
-1999/01/05 \titlerule
-1999/01/07 \ttl@defkeys splitted from \ttl@keys
-1999/01/10 Added the \part stuff, including a definition of \@openright
-1999/01/11 Removed unnecessary \ttl@numsecfalse in \ttl@sect@i.
-1999/01/14 Optimized \titlerule
-1999/01/27 Changed \titleline to correct the spacing at the
- top page and to fix a bug which changed the mode
- to horizontal, thus introducing unwanted space
- (\makebox -> \@makebox).
-1999/02/02 \ttl@secnum renamed to \ttl@write and introduced the
- \ttl@savewrite mechanism to sincronize the toc/marks
- with the title in case there is a \newpage in <after>.
-1999/02/03 wrap shape
-1999/02/03 Added a \kern\z@ for not to avoid hyphenation
- of the last word. Not strictly necessary, but
- it is more LaTeX-like.
-1999/02/05 \partmark defined (and in \setmarks, too).
-1999/02/08 \ttl@row@i simplified.
-1999/02/08 \ttl@savefn mechanism.
-1999/02/10 Removed extra \leavevmode in display
-1999/02/13 Now \titleline doesn't add the width. It's set.
-1999/02/17 The part mark is catched, even if unused.
-1999/02/17 old/newparttoc added.
-1999/02/18 Changed many TeX assignments to the LaTeX
- counterpart.
-1999/02/19 Introduced \ttl@startargs.
-
-History of v2.1.1
-~~~~~~~~~~~~~~~~~
-1999/08/04 Moved misplaced lines in \ttl@makeboth
-
-History of v2.2 (unreleased)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1999/11/03 We load titleps if pagestyles are required, but
- some old definitions are restored.
-1999/11/06 Improved outermarks test in \ttl@sect@i. Formerly
- the section number could be printed if a page ended
- with an unnumebered section followed by a numbered one.
-1999/11/06 \ttl@startargs now adds (and passes) automatically the
- section name. Involved macros modified accordingly.
-1999/11/06 Replaced explicit part names by the parameter in
- \ttl@part@i. The same for chapter.
-1999/11/21 \ttl@try's are not given explicitly, but built by
- \ttl@setkeys. Intruduced the \ttl@key@... and
- \ttl@extra@... commands.
-1999/11/23 Minor problems with keys fixed.
-1999/12/10 Added the nobottomtitles* option and \ttl@addstretch.
-2000/01/07 First steps towards the calcwidth feature (basic code).
-2000/01/08 (Continued.) \titleline* for rules of width \titlewidth.
- Option calcwidth implemented.
-2000/01/12 Finished with changes in wrap.tss (no longer
- "experimental" :-) )
-
-History of v2.3
-~~~~~~~~~~~~~~~
-2000/01/19 All keys are grouped in a single file tttkeys. Removed
- page.tsk and deleted the corresponding code in the sty.
-2000/01/19 Classes begun.
-2000/01/19 The level numbers are stored in \ttll@ macros, and not
- passed as arguments.
-2000/01/21 Introduced the new mark scheme. It's mostly compatible
- with the old one, but a compatibility mode seems
- imposible (it was introduced in a preliminary test
- but eventually removed).
-2000/01/23 loadonly package option.
-2000/02/01 Classes finished. Many things had to be rewritten.
-2000/02/02 Made partially compatible with hyperref (dvips).
-2000/02/08 \ttl@savewrite moved from shapes to classes. But
- explicit page breaks expand it, too, to avoid wrong
- toc entries.
-2000/02/18 A new box named \ttl@box stores the title in runin
- leftmargin etc shapes, to increase reliability.
-
-(2.3.1 -- 2.3.3 No changes on this file)
-
-History of v2.3.4
-~~~~~~~~~~~~~~~~~
-2000/05/12 nonindentfirst redefine \titlespacing instead of
- \@afterindent... so that they don't interfere with
- the first entry in tocs.
-2000/05/17 The marks in \ttl@select are protected to prevent
- endless loop if the title is expanded, say, by
- \MakeUppercase.
-
-History of v2.3.5
-~~~~~~~~~~~~~~~~~
-2000/05/21 Restores missing test for secnumdepth in \ttl@mkchap,
- and instead of setting \ttl@toclevel in ttlps now is
- done in \secdef. Except inside the macros, \ttl@toclevel
- is false, so that an explicit \...mark works.
-2000/06/04 \partmark defined with \providecommand
-2000/06/14 A patch mechanism added, for small bug fixes.
-
-History of v2.4
-~~~~~~~~~~~~~~~~
-2001/01/18 Minor changes in code. Essentialy an incremental
- update.
-2001/01/22 \titleformat has a new "easy" starred variant.
-
-History of v2.5
-~~~~~~~~~~~~~~~
-2002/01/02 New macros for \ttl@assign. Now * length allow
- non integer values.
-2002/03/22 Added \ttl@calc and \ttl@calcneg to make titlesec
- calc-savvy.
- - Merged bug fixes of .new into this file.
- - Bugs in frame fixed -- gap in lines, misplaced
- label, wrong margins (sometimes),
- - \leftskip, \rightskip and \linewidth (re)set in
- margin shapes.
- - Removed obsolete flush... options.
- - indentafter and noindentafter, new names for
- indentfirst and nonindentfirst.
- - A new level (\titleclass) without its "location"
- now raises a meaningful error.
- - Bug in top-level \titleclass fixed.
-2002/03/23 Tests for undefined and unformatted sectioning levels,
- and horizontal material in <format>.
- - Missing \if@openright inside \if@twoside in
- page class added.
- - Removed extra (but inoffensive) \expandafter
- in \ttl@class@iii.
-2002/03/27 Added \titlewidthfirst and ...last
- - "Not definable" gives a more meaningful message in
- the context of the package.
-
-History of v.2.6
-~~~~~~~~~~~~~~~~
-2004/08/30 Corrected typo in margin \hsiz -> \hsize.
-2004/10/17 Added a couple of missing \noexpand's in drop.
-2004/12/01 Removed the error about the mode in block because this
- style is general purpose.
-2005/01/16 Missing braces around #2 in the last else part of
- \ttl@headinline added
- - Replaced explicit \makeatother's by a saved value as
- the macros can be used in a class/package file.
-2005/01/18 newlinetospace mechanism
- - // does not break pages; option pageatnewline to
- restore the LaTeX behaviour.
-2005/01/19 \...break in top shape.
- - Renumbered several scratch registers to follow the
- TeXbook (p. 346), with \ttl@box in a few cases. In
- wrap \titlewidthfirst and \titlewidthlast made global.
- - Float heads and foots have now a further argument for
- additional stuff (eg, to remove rules). Option is now
- psfloats while floatps enters in compatibility mode.
- - \ttl@savetitle in all classes. Option toctitles.
-2005/01/21 Changed pageatnewline to make it compatible with
- titletoc, with \ttl@changecentercr.
-2005/01/22 \...tolist in top class.
-
-History of v.2.7
-~~~~~~~~~~~~~~~~
-2007-03-27 Added the `explicit' option.
- - Added \titlepagestyle.
-2007-03-29 Fixed wrong number for chapter in log
- - Patch file named .270 instead of .new
-2007-05-09 Added <after> to leftmargin, so that you can add stuff
- at the beginning of the paragraph, eg, the sec number.
-2007-07-07 Removed the patch mechanism.
-2007-08-07 `explicit' improved.
-
-History of v.2.8
-~~~~~~~~~~~~~~~~
-2007-08-12 \titlepagestyle already used by KOMA-Script. Renamed
- to \assignpagestyle.
-
-History of v.2.9
-~~~~~~~~~~~~~~~~
-2010-05-04 Add \nobreak in \ttl@addcontentsline, to prevent the title
- going to footnotes (!) in runin style in some (rare) cases.
-2010-05-06 Option uppercase (and \ttl@case).
-2011-02-25 \iftitlemeasuring test
-2011-07-14 Fixed \assignpagestyle
-2011-07-15 Introduced the \scantokens mechanism to make sure section
- names are 'letters' and not 'others'
-2011-07-18 Removed \if@nobreak test in wrap/drop, which added a line
- to the title after another section (why?)
-
-History of v.2.9.1
-~~~~~~~~~~~~~~~~~~
-2011-08-28 Removed a spurious > in wrap.tss
-
-History of v.2.9.2
-~~~~~~~~~~~~~~~~~~
-2011-11-11 Fixed a typo in ttlps.def (\MessageBreag)
-
-History of v.2.10.0
-~~~~~~~~~~~~~~~~~~~~
-
-2011-12-15 Split titlesp
-
-History of v.2.10.1
-~~~~~~~~~~~~~~~~~~~~
-
-2015-02-27 Fix: An explict \newpage in 'after' wrote the toc entry twice
-2015-03-09 Fix (partial): A list containing just a sectioning command
- raised an error
-
-History of v.2.10.2
-~~~~~~~~~~~~~~~~~~~~
-
-2015-03-21 Fix: With 2.10.1 labels vanished in hang shape (due to a
- misplaced \noindent)
-
-History of titleps v.1.1.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-2016-03-15 New macro \setmarkboth for compatibility
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/CHANGES.old new/doc/latex/titlesec/CHANGES.old
--- old/doc/latex/titlesec/CHANGES.old 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/titlesec/CHANGES.old 2019-07-18 22:34:43.000000000 +0200
@@ -0,0 +1,341 @@
+## TITLESEC
+
+History of v1.0
+~~~~~~~~~~~~~~~
+1998/02/25 Added nops option
+1998/02/28 Added \@mkboth stuff in \setmarks
+1998/03/01 Changed test in \ttl@secnum
+1998/03/03 Corrected some \fil... commands
+1998/03/03 Replaced the faulty \@hangfrom by new commands
+1998/03/03 Some \def replaced by \newcommand
+1998/03/04 .dtx/.ins scheme finally rejected. Useless
+ for users, obtrusive for `readers' and proned
+ to errors
+1998/03/04 Tidied up documentation
+1998/03/06 \wordsep renamed and documented
+1998/03/06 Added dummy asignation in \ttl@chap.
+1998/03/06 Removed \ttl@xsect and merged into \tl@sect
+1998/03/06 Added \ProvidesPackage
+
+History of v1.1
+~~~~~~~~~~~~~~~~
+1998/03/25 \chapter corrected, as well as the size options
+1998/03/26 Added compact option
+1998/03/26 Added flushleft, flushright and center options
+1998/04/08 Changed all instances of \noindent by \parindent\z@
+1998/04/14 Added \filinner, \filouter
+1998/04/14 Added drop shape
+1998/05/01 Added rightmargin shape (and margin renamed to
+ leftmargin)
+1998/05/03 Added \setheadindent
+
+History of v1.2 (unreleased)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1998/06/01 Compatibility with AMS classes
+1998/06/08 On-demand loading of shapes
+1998/06/11 Frame shape. Some \fil... command
+ modified to work in the label of this
+ chapter shape.
+1998/07/03 Bottomtitle option (at last...)
+1998/07/14 ...margin styles bug fixed using a method
+ similar to bottomtitle.
+1998/07/29 \titleline
+
+====================
+
+History of v2.0
+~~~~~~~~~~~~~~~~
+
+1998/08/05 to
+1998/08/29 Fully reimplemented
+
+History of v2.1
+~~~~~~~~~~~~~~~~
+1999/01/05 We define in this file the three basic shapes.
+ Additional ones remain defined in external files.
+ Unified the shapes for sections and chapters.
+1999/01/05 \ttl@shape merged into \ttl@format@iii.
+1999/01/05 \titlerule
+1999/01/07 \ttl@defkeys splitted from \ttl@keys
+1999/01/10 Added the \part stuff, including a definition of \@openright
+1999/01/11 Removed unnecessary \ttl@numsecfalse in \ttl@sect@i.
+1999/01/14 Optimized \titlerule
+1999/01/27 Changed \titleline to correct the spacing at the
+ top page and to fix a bug which changed the mode
+ to horizontal, thus introducing unwanted space
+ (\makebox -> \@makebox).
+1999/02/02 \ttl@secnum renamed to \ttl@write and introduced the
+ \ttl@savewrite mechanism to sincronize the toc/marks
+ with the title in case there is a \newpage in <after>.
+1999/02/03 wrap shape
+1999/02/03 Added a \kern\z@ for not to avoid hyphenation
+ of the last word. Not strictly necessary, but
+ it is more LaTeX-like.
+1999/02/05 \partmark defined (and in \setmarks, too).
+1999/02/08 \ttl@row@i simplified.
+1999/02/08 \ttl@savefn mechanism.
+1999/02/10 Removed extra \leavevmode in display
+1999/02/13 Now \titleline doesn't add the width. It's set.
+1999/02/17 The part mark is catched, even if unused.
+1999/02/17 old/newparttoc added.
+1999/02/18 Changed many TeX assignments to the LaTeX
+ counterpart.
+1999/02/19 Introduced \ttl@startargs.
+
+History of v2.1.1
+~~~~~~~~~~~~~~~~~
+1999/08/04 Moved misplaced lines in \ttl@makeboth
+
+History of v2.2 (unreleased)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1999/11/03 We load titleps if pagestyles are required, but
+ some old definitions are restored.
+1999/11/06 Improved outermarks test in \ttl@sect@i. Formerly
+ the section number could be printed if a page ended
+ with an unnumebered section followed by a numbered one.
+1999/11/06 \ttl@startargs now adds (and passes) automatically the
+ section name. Involved macros modified accordingly.
+1999/11/06 Replaced explicit part names by the parameter in
+ \ttl@part@i. The same for chapter.
+1999/11/21 \ttl@try's are not given explicitly, but built by
+ \ttl@setkeys. Intruduced the \ttl@key@... and
+ \ttl@extra@... commands.
+1999/11/23 Minor problems with keys fixed.
+1999/12/10 Added the nobottomtitles* option and \ttl@addstretch.
+2000/01/07 First steps towards the calcwidth feature (basic code).
+2000/01/08 (Continued.) \titleline* for rules of width \titlewidth.
+ Option calcwidth implemented.
+2000/01/12 Finished with changes in wrap.tss (no longer
+ "experimental" :-) )
+
+History of v2.3
+~~~~~~~~~~~~~~~
+2000/01/19 All keys are grouped in a single file tttkeys. Removed
+ page.tsk and deleted the corresponding code in the sty.
+2000/01/19 Classes begun.
+2000/01/19 The level numbers are stored in \ttll@ macros, and not
+ passed as arguments.
+2000/01/21 Introduced the new mark scheme. It's mostly compatible
+ with the old one, but a compatibility mode seems
+ imposible (it was introduced in a preliminary test
+ but eventually removed).
+2000/01/23 loadonly package option.
+2000/02/01 Classes finished. Many things had to be rewritten.
+2000/02/02 Made partially compatible with hyperref (dvips).
+2000/02/08 \ttl@savewrite moved from shapes to classes. But
+ explicit page breaks expand it, too, to avoid wrong
+ toc entries.
+2000/02/18 A new box named \ttl@box stores the title in runin
+ leftmargin etc shapes, to increase reliability.
+
+(2.3.1 -- 2.3.3 No changes on this file)
+
+History of v2.3.4
+~~~~~~~~~~~~~~~~~
+2000/05/12 nonindentfirst redefine \titlespacing instead of
+ \@afterindent... so that they don't interfere with
+ the first entry in tocs.
+2000/05/17 The marks in \ttl@select are protected to prevent
+ endless loop if the title is expanded, say, by
+ \MakeUppercase.
+
+History of v2.3.5
+~~~~~~~~~~~~~~~~~
+2000/05/21 Restores missing test for secnumdepth in \ttl@mkchap,
+ and instead of setting \ttl@toclevel in ttlps now is
+ done in \secdef. Except inside the macros, \ttl@toclevel
+ is false, so that an explicit \...mark works.
+2000/06/04 \partmark defined with \providecommand
+2000/06/14 A patch mechanism added, for small bug fixes.
+
+History of v2.4
+~~~~~~~~~~~~~~~~
+2001/01/18 Minor changes in code. Essentialy an incremental
+ update.
+2001/01/22 \titleformat has a new "easy" starred variant.
+
+History of v2.5
+~~~~~~~~~~~~~~~
+2002/01/02 New macros for \ttl@assign. Now * length allow
+ non integer values.
+2002/03/22 Added \ttl@calc and \ttl@calcneg to make titlesec
+ calc-savvy.
+ - Merged bug fixes of .new into this file.
+ - Bugs in frame fixed -- gap in lines, misplaced
+ label, wrong margins (sometimes),
+ - \leftskip, \rightskip and \linewidth (re)set in
+ margin shapes.
+ - Removed obsolete flush... options.
+ - indentafter and noindentafter, new names for
+ indentfirst and nonindentfirst.
+ - A new level (\titleclass) without its "location"
+ now raises a meaningful error.
+ - Bug in top-level \titleclass fixed.
+2002/03/23 Tests for undefined and unformatted sectioning levels,
+ and horizontal material in <format>.
+ - Missing \if@openright inside \if@twoside in
+ page class added.
+ - Removed extra (but inoffensive) \expandafter
+ in \ttl@class@iii.
+2002/03/27 Added \titlewidthfirst and ...last
+ - "Not definable" gives a more meaningful message in
+ the context of the package.
+
+History of v.2.6
+~~~~~~~~~~~~~~~~
+2004/08/30 Corrected typo in margin \hsiz -> \hsize.
+2004/10/17 Added a couple of missing \noexpand's in drop.
+2004/12/01 Removed the error about the mode in block because this
+ style is general purpose.
+2005/01/16 Missing braces around #2 in the last else part of
+ \ttl@headinline added
+ - Replaced explicit \makeatother's by a saved value as
+ the macros can be used in a class/package file.
+2005/01/18 newlinetospace mechanism
+ - // does not break pages; option pageatnewline to
+ restore the LaTeX behaviour.
+2005/01/19 \...break in top shape.
+ - Renumbered several scratch registers to follow the
+ TeXbook (p. 346), with \ttl@box in a few cases. In
+ wrap \titlewidthfirst and \titlewidthlast made global.
+ - Float heads and foots have now a further argument for
+ additional stuff (eg, to remove rules). Option is now
+ psfloats while floatps enters in compatibility mode.
+ - \ttl@savetitle in all classes. Option toctitles.
+2005/01/21 Changed pageatnewline to make it compatible with
+ titletoc, with \ttl@changecentercr.
+2005/01/22 \...tolist in top class.
+
+History of v.2.7
+~~~~~~~~~~~~~~~~
+2007-03-27 Added the `explicit' option.
+ - Added \titlepagestyle.
+2007-03-29 Fixed wrong number for chapter in log
+ - Patch file named .270 instead of .new
+2007-05-09 Added <after> to leftmargin, so that you can add stuff
+ at the beginning of the paragraph, eg, the sec number.
+2007-07-07 Removed the patch mechanism.
+2007-08-07 `explicit' improved.
+
+History of v.2.8
+~~~~~~~~~~~~~~~~
+2007-08-12 \titlepagestyle already used by KOMA-Script. Renamed
+ to \assignpagestyle.
+
+History of v.2.9
+~~~~~~~~~~~~~~~~
+2010-05-04 Add \nobreak in \ttl@addcontentsline, to prevent the title
+ going to footnotes (!) in runin style in some (rare) cases.
+2010-05-06 Option uppercase (and \ttl@case).
+2011-02-25 \iftitlemeasuring test
+2011-07-14 Fixed \assignpagestyle
+2011-07-15 Introduced the \scantokens mechanism to make sure section
+ names are 'letters' and not 'others'
+2011-07-18 Removed \if@nobreak test in wrap/drop, which added a line
+ to the title after another section (why?)
+
+History of v.2.9.1
+~~~~~~~~~~~~~~~~~~
+2011-08-28 Removed a spurious > in wrap.tss
+
+History of v.2.9.2
+~~~~~~~~~~~~~~~~~~
+2011-11-11 Fixed a typo in ttlps.def (\MessageBreag)
+
+History of v.2.10.0
+~~~~~~~~~~~~~~~~~~~~
+
+2011-12-15 Split titlesp
+
+History of v.2.10.1
+~~~~~~~~~~~~~~~~~~~~
+
+2015-02-27 Fix: An explict \newpage in 'after' wrote the toc entry twice
+2015-03-09 Fix (partial): A list containing just a sectioning command
+ raised an error
+
+History of v.2.10.2
+~~~~~~~~~~~~~~~~~~~~
+
+2015-03-21 Fix: With 2.10.1 labels vanished in hang shape (due to a
+ misplaced \noindent)
+
+## TITLEPS
+
+History of v.1.1.1
+~~~~~~~~~~~~~~~~~~
+2016-03-15 New macro \setmarkboth for compatibility
+
+## TITLETOC
+
+History of v1.1
+~~~~~~~~~~~~~~~
+99/04/22: A bug fix. Some missing global assignments in \ttl@tocentry
+ were missing, and page numbers messed up with
+ \titlecontents*
+
+History of v1.2
+~~~~~~~~~~~~~~~~
+1999/10/20: Added \contentsafter. \ttl@tocentry modified to accept
+ the new command for grouping in a paragraph entries of
+ different levels.
+1999/10/27: Instead of defining the level numbers explicitly, that's
+ done with \ttl@setlevels and \ttl@levels.
+1999/10/27: Added the basic code for multiple indexes.
+1999/10/29: Added the toctop test to the \ttl@savel@... commands.
+1999/12/28: Simplified \ttl@savel@... with \ttl@lselect.
+2000/01/12: \contentsafter rejected. An aditional optional parameter
+ is used instead. (Too) many thing had to be rewritten.
+2000/01/27: Removed \ttl@setlevels. Any change of levels are
+ best done with titlesec.
+2000/02/14: Moved misplaced \vskip in ttl@tocentry.
+2000/02/16: A few changes in the "block" separators.
+2000/02/16: Fixed bug in \ttl@margin. For the right margin the
+ correction was used instead of the margin.
+
+History of v1.2.1
+~~~~~~~~~~~~~~~~~
+2000/04/25: Dirty trick to make sure that \ttl@finish is the very
+ last thing in lists of floats (lof, lot, etc.).
+2000/05/14: Missing \global before \ttl@labelfalse added.
+
+History of 1.2.2
+~~~~~~~~~~~~~~~~
+2000/06/05: The optional argument no longer mandatory, but
+ still reporting an error if the length is missing.
+ Minor internal changes, and a patch mechanism added.
+
+History of 1.3
+~~~~~~~~~~~~~~
+2001/01/12: Minor changes and some missing \globals added for
+ partial tocs to work inside a group.
+2001/01/21: Added \dottedcontents.
+
+History of 1.4
+~~~~~~~~~~~~~~
+2002/03/27: titletoc.new merged into this file
+2002/03/27: \ttl@finish written by the last \newpage.
+2002/03/27: \ttl@lsection broke paragraphs always. Now
+ only if the sublevel is typeset.
+2002/03/27: \ttl@finish -> \contentsfinish
+
+History of 1.5
+~~~~~~~~~~~~~~
+2003/06/14: \contentspush didn't work because of the change of
+(.new) \leftskip was done inside a group before the
+ corresponding \par
+2003/06/14: Added an useful error if a partial TOC is not
+(.new) defined.
+2005/01/17: New options rubber/rigidseps, to remove if desired
+ the small vertical "plus" between entries.
+2005/01/20: Begin work on partial lists.
+2005/01/21: \ttl@outblock and \ttl@outnoblock just to avoid a
+ huge definition and to ease patching.
+2005/01/22: Work on partial lists finished (but to be resumed).
+
+History of 1.6
+~~~~~~~~~~~~~~
+2007/05/04: Added the patch 2005/05/03 which fixed a wrong
+ result with \included (F. Mittelbach)
+2007/07/14: Removed the patch mechanism.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/README new/doc/latex/titlesec/README
--- old/doc/latex/titlesec/README 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-This directory holds 3 packages for sectioning titles -- when used as
-such (titlesec), in headers and footers (titleps) and in tables of
-contents (titletoc). They can be used separately, but you will get
-most of them when used together.
-
-Titlesec
-~~~~~~~~
-Sectioning titles, including margin and `wrap' titles, different
-format in odd and even pages, rules above and below the title,
-adding new sectioning levels, measuring the width of the title, etc.
-
-Titletoc
-~~~~~~~~
-TOC entries, with the possibility of changing the format in the middle
-of a document, grouping the entries in a single paragraph, pretty
-free-forms entries, partial tocs, etc. It's described in titlesec.pdf
-(or .tex).
-
-Titleps
-~~~~~~~
-Page styles with working top marks, access to top, first and bot marks
-in a single header/footer, rules, headers/footers for specific floats
-(kinda \thispagestyle), multiple sets of marks, etc. An one-stage
-mechanims is used, without intermediate \leftmark's or \rightmark's.
-
-What's new (2.9. 2.10)
-~~~~~~~~~~~~~~~~
-
-- Fixed \assignpagestyle, which did not work except in a
-few cases.
-- Fixed an incompatibility with hyperref (wrong appendix
-name).
-- Added \iftitlemeasuring
-- Added package option uppercase
-- Fixed a bug when reckoning the number of lines in wrap/drop.
-
-2.9.1: Fixed a typo (a spurious > in wrap.tss).
-2.9.2: Fixed another typo (\MessageBreag in ttlps.def)
-2.10.0: New features in titleps also available in titlesec
-
-Installation
-~~~~~~~~~~~~
-No .ins/.dtx preinstalation is required. Move the files to a place
-where LaTeX can find them and typeset titlesec.tex. All of files in
-this directory are necessary for titlesec.sty to work, except the
-manual titlesec.tex (and this 'readme' file). The manual requires
-titlesec.sty and titletoc.sty, and hence all the .tss and .def
-files as well.
-
-Formerly there were files with extension .new (titlesec.new and
-titletoc.new) used to patch the packages, but if present should be
-removed (they will be ignored, however).
-
-Web site, manual in PDF format and info
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Further details are available on
-
- http://www.texnia.com/titlesec.html
-
-Contact
-~~~~~~~
-Please, for suggestions, bug reports, etc., go to
-More
- http://www.texnia.com/contact.html
-
-Known problems
-~~~~~~~~~~
-Some language styles (for babel) add the indentation
-after a section in a so radical way that titlesec (which
-uses the internal LaTeX macros) cannot supress it again.
-For example, spanish (fixed in version 5.0) and frenchb.
-
-2016/03/21
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/README.md new/doc/latex/titlesec/README.md
--- old/doc/latex/titlesec/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/titlesec/README.md 2019-10-16 22:56:43.000000000 +0200
@@ -0,0 +1,68 @@
+## Titlesec, Titletoc, Titleps
+
+This directory holds 3 packages for sectioning titles -- when used as
+such (titlesec), in headers and footers (titleps) and in tables of
+contents (titletoc). They can be used separately, but you will get
+most of them when used together.
+
+### Titlesec
+
+Sectioning titles, including margin and `wrap` titles, different
+format in odd and even pages, rules above and below the title,
+adding new sectioning levels, measuring the width of the title, etc.
+
+### Titletoc
+
+TOC entries, with the possibility of changing the format in the middle
+of a document, grouping the entries in a single paragraph, pretty
+free-forms entries, partial tocs, etc. It's described in
+`titlesec.pdf`.
+
+### Titleps
+
+Page styles with working top marks, access to top, first and bot marks
+in a single header/footer, rules, headers/footers for specific floats
+(kinda `\thispagestyle`), multiple sets of marks, etc. An one-stage
+mechanims is used, without intermediate `\leftmark`s or `\rightmark`s.
+
+### Latest changes
+
+```
+2.13 2019-10-16
+ - \markboth (which has been redefined in the LaTeX kernel) works
+ again.
+
+2.12 2019-09-09
+ - Fix - Partial TOCs were severely broken.
+ - Fix - An undefined section doesn't raise an error any more.
+
+2.11 2019-07-16
+ - New license: MIT.
+ - Option nostruts, to remove struts inserted by titlesec.
+ - Reorganized code: only sty files, removed def and tss ones
+ (although the mechanism for tss still works).
+ - Fix - Wrong hyperlinks in table of contents with the starred
+ versions, because of a change of behavior of hyperref (it
+ patches the behaviour of an internal macro in hyperref).
+ - Fix - Wrong spacing with titleps and displayed text after a
+ section.
+ - Fix - Newly defined floats raised an error with titletoc.
+```
+
+### Installation
+
+No .ins/.dtx preinstalation is required. Move the files to a place
+where LaTeX can find them and typeset titlesec.tex. All of files in
+this directory are necessary for titlesec.sty to work, except the
+manual titlesec.tex (and this 'readme' file). The manual requires
+titlesec.sty and titletoc.sty.
+
+Further details are available on
+
+ http://www.texnia.com/titlesec.html
+
+### Contact
+
+Please, for suggestions, bug reports, etc., go to
+More
+ http://www.texnia.com/contact.html
Binary files old/doc/latex/titlesec/titleps.pdf and new/doc/latex/titlesec/titleps.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/titleps.tex new/doc/latex/titlesec/titleps.tex
--- old/doc/latex/titlesec/titleps.tex 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/titleps.tex 2019-10-16 22:56:43.000000000 +0200
@@ -1,27 +1,14 @@
-% +--------------------------------------------------+
-% | Typeset this file to get the documentation. |
-% +--------------------------------------------------+
%
-% Copyright (c) 1998-2016 by Javier Bezos.
-% All Rights Reserved.
+% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
%
-% This file is part of the titlesec distribution release 2.10.2
-% -----------------------------------------------------------
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/titlesec
%
-% It 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 2003/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% The Current Maintainer of this work is Javier Bezos.
-\def\fileversion{1.1.1}
-\def\docdate{2016-03-15}
+\def\fileversion{2.13}
+\def\docdate{2019/10/16}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
@@ -621,7 +608,7 @@
\verb|\sectionmark{}|), as well as to synchronize the language by
hand.
-In many cases, the following short marks mechanism will be enough.
+In many cases, the following ``short'' marks mechanism will be enough.
With it, you simply say with \verb|\newshormark| the name of a command
to be used in heads or foots, and then emit the mark at appropiated
places (short marks for variables are not available). An example
@@ -823,3 +810,26 @@
\end{document}
+MIT License
+-----------
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
Binary files old/doc/latex/titlesec/titlesec.pdf and new/doc/latex/titlesec/titlesec.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/titlesec.tex new/doc/latex/titlesec/titlesec.tex
--- old/doc/latex/titlesec/titlesec.tex 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/titlesec.tex 2019-10-16 22:56:43.000000000 +0200
@@ -1,33 +1,21 @@
-% +--------------------------------------------------+
-% | Typeset this file to get the documentation. |
-% +--------------------------------------------------+
%
-% Copyright (c) 1998-2016 by Javier Bezos.
-% All Rights Reserved.
+% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
%
-% This file is part of the titlesec distribution release 2.10.2
-% -----------------------------------------------------------
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/titlesec
%
-% It 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 2003/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% The Current Maintainer of this work is Javier Bezos.
-\def\fileversion{2.10.2}
-\def\docdate{2016-03-21}
+\def\fileversion{2.13}
+\def\docdate{2019/10/16}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
-\usepackage{titletoc}
+\usepackage{titletoc,color}
\def\gobble#1{}
\def\cs#1{\expandafter\gobble\string\\#1}
+\definecolor{notes}{rgb}{.75, .3, .3}%
\makeatletter
\newenvironment{desc}
{\if@nobreak
@@ -36,18 +24,21 @@
\fi
\decl}
{\enddecl}
+\def\@begintheorem#1#2{%
+ \list{}{}%
+ \global\advance\@listdepth\m@ne
+ \item[{\sffamily\bfseries\color{notes}\MakeUppercase{#1}}]}%
+\newtheorem{warning}{Warning}
+\newtheorem{note}{Note}
+\newtheorem{example}{Example}
\makeatother
-\usepackage{textcomp,pslatex}
+\usepackage{textcomp}
\usepackage[linktocpage]{hyperref}
\title{The \textsf{titlesec}, \textsf{titleps} and \textsf{titletoc}
Packages\footnote{The \textsf{titlesec} package is currently at
-version 2.10.2. \copyright{} 1998--2016 Javier Bezos.
-The \textsf{titletoc} package is currently at
-version 1.6. The \textsf{titleps} package is currently at version
-1.1.1 \copyright{} 1999--2016 Javier Bezos. All Rights
-Reserved.}}
+version 2.13. \copyright{} 1998--2019 Javier Bezos.}}
\author{Javier Bezos\footnote{For bug reports, comments and
suggestions go to \href{http://www.tex-tipografia.com/contact.html}%
@@ -69,7 +60,7 @@
\newpagestyle{myps}[\small\sffamily\slshape]{
\headrule
\sethead{Titlesec}{\sectiontitle}{\usepage}}
-
+
\pagestyle{myps}
\newcommand{\examplesep}{%
@@ -104,6 +95,14 @@
\maketitle
\tableofcontents
+
+\begin{note}
+ Please, report any issues you find on
+ \texttt{https://github.com/jbezos/titlesec/issues}, which is better
+ than just complaining on an e-mail list or a web forum. Forking
+ and pull requests are welcome.
+\end{note}
+
\section{Introduction}
This package is essentially a replacement---partial or total---for the
@@ -157,7 +156,6 @@
non-standard way, it remains untouched by the simple settings and
should be changed with the help of the ``Advanced Interface.''
-
\section{Quick Reference}
%~~~~~~~~~~~~~~~~~~~~~~
@@ -334,7 +332,7 @@
there is no section label at that level, but this is not recommended
because by doing so the number is not suppressed in the table of
contents and running heads.
-
+
\item |<sep>| is the horizontal separation between label and title
body and must be a length (it must not be empty). This space is
vertical in |display| shape; in |frame| it is the distance from text
@@ -342,20 +340,26 @@
of sectioning commands. If you are using |picture| and the like, set
this parameter to 0 pt.
-\item |<before-code>| is code preceding the title body. The very last
-command can take an argument, which is the title
-text.\footnote{Remember font size can be changed safely between
-paragraphs only, and changes in the text should be made local with
-a group; otherwise the leading might be wrong---too large or too small.}
-However, with the package option \texttt{explicit} the title must
-be given explicitly with |#1| (see below).
+\item |<before-code>| is code preceding the title body. The very last
+command can take an argument, which is the title
+text.\footnote{Remember font size can be changed safely between
+paragraphs only, and changes in the text should be made local with a
+group; otherwise the leading might be wrong---too large or too small.}
+However, with the package option \texttt{explicit} the title must be
+given explicitly with |#1| (see below). Penalties in this argument may
+lead to unexpected results.
\item |<after-code>| is code following the title body. The typeset
-material is in vertical mode with |hang|, |block| and |display|;
-in horizontal mode with |runin| and |leftmargin| (\fbox{2.7} with the latter,
-at the beginning of the paragraph). Otherwise is ignored.
+material is in vertical mode with |hang|, |block| and |display|; in
+horizontal mode with |runin| and |leftmargin| (\fbox{2.7} with the
+latter, at the beginning of the paragraph). Otherwise is ignored.
+Penalties in this argument may lead to unexpected results.
\end{itemize}
+Penalties, marks and the like must be properly synchronized with page
+breaks. So, |<before-code>| and |<after-code>| are \textit{not} the
+proper places for penalties. See |\sectionbreak| below.
+
\begin{desc}
|\chaptertitlename|
\end{desc}
@@ -457,7 +461,6 @@
\footnote{Formerly |indentfirst| and |nonindentfirst|, now
deprecated.}
-
\begin{desc}
|rigidchapters rubberchapters| \quad (Package options)
\end{desc}
@@ -514,6 +517,18 @@
titles, use the package option \verb|pageatnewline|, which is provided
for backward compatibility.
+\begin{desc}
+|\nostruts|\\
+|nostruts| \quad (Package option)
+\end{desc}
+
+\fbox{2.11} The styles defined by \textsf{titlesec} insert some struts
+at certain places to make sure the vertical space is the same with
+relation with the baseline. This is not always the desired behavior, so
+the package options |nostruts| is provided. An alternative is the macro
+|\nostruts| when defining a section (note this macros is defined only
+within a title).
+
\subsection{Rules}
The package includes some tools for helping in adding rules and other
@@ -674,6 +689,10 @@
changed to \verb|top| (in this example, parts will continue with the
\verb|openright| setting).
+Note these macros apply the penalties at the right place. In other
+words, penalties in |<before-code>| and |<after-code>| can lead to
+unexpected (and even weird) results.
+
\begin{desc}
|\chaptertolists|
\end{desc}
@@ -828,17 +847,24 @@
to the surrounding text, title classes allow to change the generic
behaviour of them. With the help of classes you may insert, say, a
new |subchapter| level between |chapter| and |section|, or creating a
-scheme of your own. \emph{Making a consistent scheme and defining all
-of related stuff like counters, macros, format, spacing and, if there
-is a TOC, TOC format is left to the responsibility of the user.} There
-are three classes: |page| is like the book |\part|, in a single page,
-|top| is like |\chapter|, which begins a page and places the title at
-the top, and |straight| is intended for titles in the middle of
-text.\footnote{There is an further class named |part| to emulate the
-article |\cs{part}|, but you should not use it at all. Use the
-|straight| class instead. Remember some features rely in these
-classes and \textsf{titlesec} does not change by default the
-definition of \texttt{\string\part} and \texttt{\string\chapter}.}
+scheme of your own.
+
+There are three classes: |page| is like the book |\part|, in a single
+page, |top| is like |\chapter|, which begins a page and places the
+title at the top, and |straight| is intended for titles in the middle
+of text.\footnote{There is an further class named |part| to emulate the
+article |\cs{part}|, but you should not use it at all. Use the
+|straight| class instead. Remember some features rely in these classes
+and \textsf{titlesec} does not change by default the definition of
+\texttt{\string\part} and \texttt{\string\chapter}.}
+
+\begin{warning}
+ Making a consistent scheme and defining all of
+ related stuff like counters, macros, format, and spacing is left to the
+ responsibility of the user. If there is a TOC, also the TOC format,
+ which might require redefining the corresponding macros to change the
+ hardcoded value (either by hand or with \textsf{titletoc}).
+\end{warning}
\begin{desc}
|\titleclass{<name>}{<class>}|\\
@@ -890,11 +916,10 @@
\end{desc}
Here, the |<name>| title is considered the top level, with number
-|<start-level-num>| (typically 0 or $-$1). It should be used only
-when creating sectioning commands from scratch with the help of
-|loadonly|, and there must be exactly one (no more, no less)
-declaration of this kind. After it, the rest of levels are added as
-explained above.
+|<start-level-num>| (typically 0 or $-$1). It should be used only when
+creating sectioning commands from scratch with the help of |loadonly|,
+and there must be exactly one (no more, no less) declaration of this
+kind. After it, the rest of levels are added as explained above.
\section{Additional Notes}
%~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1230,10 +1255,10 @@
\item |<left>| even if bracketed is currently mandatory and it
sets the left margin from the left page margin.
-
+
\item |<label width>| is the width of the space created for the label,
as described above.
-
+
\item |<leader width>| is the width of the box containing the char to
be used as filler, as described below.
\end{itemize}
@@ -1490,7 +1515,7 @@
those macros will not be used very often.
\begin{desc}
-|\printcontents[<name>]{<prefix>}{<start-level>}{<toc-code>}|
+|\printcontents[<name>]{<prefix>}{<start-level>}[<toc-depth>]{<toc-code>}|
\end{desc}
Print the current partial toc of |<name>| kind. The format
@@ -1500,25 +1525,29 @@
|lsection| is defined, then this definition will be used; otherwise,
the format is that of |section|. The |<start-level>| parameter sets the
top level of the tocs---for a part toc it would be |0| (chapter), for a
-chapter toc |1| (section), and so on. Finally, |<toc-code>| is
+chapter toc |1| (section), and so on. The |<toc-code>| is
local code for the current toc; it may be used to change the
-|tocdepth| value or |\contentsmargin|, for instance.
+|\contentsmargin|, for instance. \textbf{New 2.11} Finally,
+|<toc-depth>| sets the |tocdepth| locally (in former versions it was
+suggested setting this value with |\setcounter| in the last argument,
+but that was wrong, because this command set counters globally).
A simple usage might look like (provided you are using
\textsf{titlesec} as well):
\begin{verbatim}
\titleformat{\chapter}[display]
{...}{...}{...} % Your definitions come here
- [\vspace*{4pc}%
+ [{\vspace*{4pc}%
\startcontents
- \printcontents{l}{1}{\setcounter{tocdepth}{2}}]
-
+ \printcontents{l}{1}[2]{}}]
+
\titlecontents*{lsection}[0pt]
{\small\itshape}{}{}
{}[ \textbullet\ ][.]
\end{verbatim}
The included entries are those in levels 1 to 2 inclusive (i.e., 1
-and 2).
+and 2). Note the whole optional argument is enclosed in braces, because
+there is an internal \texttt{[]}.
\subsection[Partial lists]{Partial lists \normalfont\normalsize\fbox{2.6}}
@@ -1529,7 +1558,7 @@
|\startlist[<name>]{<list>}|\\
|\stoplist[<name>]{<list>}|\\
|\resumelist[<name>]{<list>}|\\
-|\printlist[<name>]{<list>}{<prefix>}{<toc-code>}|
+|\printlist[<name>]{<list>}{<prefix>}[<toc-depth>]{<toc-code>}|
\end{desc}
Here |<list>| is either |lof| or |lot|. Note as well |\printlist|
@@ -1577,7 +1606,7 @@
{} % That is, without page number
[\addvspace{.5pc}]
\end{verbatim}
-
+
The chapter title is centered with the chapter label on top
of it. There is no page number.
@@ -1702,7 +1731,7 @@
\titleformat{\section}[block]
{\normalfont\sffamily}
{\thesection}{.5em}{\titlerule\\[.8ex]\bfseries}
-
+
\section[Appendix]{Another Ruled Title}
\begin{verbatim}
@@ -1778,7 +1807,7 @@
{}{0pt}{}
\titlespacing{\section}
{\parindent}{*2}{\wordsep}
-
+
\section*{This part is the title itself}
and this part is the section body\ldots
@@ -1920,7 +1949,7 @@
\vspace{1pc}%
\Huge}
\end{verbatim}
-
+
\examplesep
\def\thesection{\Roman{section}}
@@ -1980,14 +2009,14 @@
% 5+1=6, ie, the negative left margin in section
\widenhead{6pc}{0pc}
-
+
\renewpagestyle{plain}{}
\newpagestyle{special}[\small\sffamily]{
\headrule
\sethead[\usepage][\textsl{\chaptertitle}][]
{}{\textsl{\chaptertitle}}{\usepage}}
-
+
\newpagestyle{main}[\small\sffamily]{
\headrule
\sethead[\usepage][\textsl{\thechapter. \chaptertitle}][]
@@ -2048,7 +2077,7 @@
\begin{verbatim}
\usepackage[dvips]{color}
\usepackage[rigidchapters,explicit]{titlesec}
-
+
\DeclareFixedFont{\chapterfont}{T1}{phv}{bx}{n}{11cm}
\titlespacing{\chapter}{0pt}{0pt}{210pt}
@@ -2074,3 +2103,24 @@
\end{document}
+MIT License
+-----------
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/titlesec.doc.tlpobj new/tlpkg/tlpobj/titlesec.doc.tlpobj
--- old/tlpkg/tlpobj/titlesec.doc.tlpobj 2019-02-28 04:08:54.000000000 +0100
+++ new/tlpkg/tlpobj/titlesec.doc.tlpobj 2019-10-17 01:54:43.000000000 +0200
@@ -1,11 +1,11 @@
name titlesec.doc
category Package
-revision 40129
+revision 52413
shortdesc doc files of titlesec
relocated 1
-docfiles size=108
- RELOC/doc/latex/titlesec/CHANGES
- RELOC/doc/latex/titlesec/README
+docfiles size=184
+ RELOC/doc/latex/titlesec/CHANGES.old
+ RELOC/doc/latex/titlesec/README.md
RELOC/doc/latex/titlesec/titleps.pdf
RELOC/doc/latex/titlesec/titleps.tex
RELOC/doc/latex/titlesec/titlesec.pdf
++++++ titlesec.tar.xz ++++++
++++ 3135 lines of diff (skipped)
++++++ tkz-base.doc.tar.xz ++++++
++++ 5264 lines of diff (skipped)
++++++ tkz-base.tar.xz ++++++
++++ 5211 lines of diff (skipped)
++++++ tkz-doc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/README new/doc/latex/tkz-doc/README
--- old/doc/latex/tkz-doc/README 2011-06-06 19:17:31.000000000 +0200
+++ new/doc/latex/tkz-doc/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Class and package for the documentation of all tkz-* packages.
- %%% H I G H L Y E X P E R I M E N T A L %%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/README.md new/doc/latex/tkz-doc/README.md
--- old/doc/latex/tkz-doc/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/README.md 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,46 @@
+# tkz-doc â Class and package for the documentation of all tkz-* packages.
+
+Release 1.43c 2020/04/10
+
+## Note
+
+This package is highly experimental and subject to change without notice.
+
+## Licence
+
+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
+[LaTeX Project Public License](https://www.latex-project.org/lppl/)
+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 Alain Matthes.
+
+## Installation
+
+The package `tkz-doc` is present in `TeXLive` and `MiKTeX`, use the
+package manager to install.
+
+For manual installation all files must be moved into the different directories in your
+installation `TDS` tree or in your `TEXMFHOME`:
+
+```
+ doc/README.md -> TDS:doc/latex/tkz-doc/README.md
+ latex/*.* -> TDS:tex/latex/tkz-doc/*.*
+```
+
+## How to use it
+
+1. If you want to compile the documentation of a `tkz-*` package, you need to use the lualatex engine.
+
+## History
+
+- v 1.43 Correction of bug about the color. Remove the library `babel` of `TikZ`
+- v 1.42 I added in the version 1.4, an option called `cadre`. If you want to draw the frame of the cover, you need to use this option. In this case, you need to
+install the font `orna4`. By default, no frame.
+
+## Author
+
+Alain Matthes, 5 rue de Valence, Paris 75005, al (dot) ma (at) mac (dot) com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/couverture.tex new/doc/latex/tkz-doc/latex/couverture.tex
--- old/doc/latex/tkz-doc/latex/couverture.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/couverture.tex 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,98 @@
+% encoding: utf8
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+
+%<--------- Couverture des documentations --------------------------------
+\def\fileversion{1.43c}
+\def\filedate{2020/04/10}
+\typeout{2020/04/10 1.43c couverture.tex}
+%<------------------ Make Title ------------------------------------------
+
+\renewcommand\maketitle{%
+\null
+\AddToShipoutPicture*{%
+\setlength\unitlength{1mm}
+\put(0,0){%
+ \makebox(0,0)[lb]{%
+ \color{myblue!10}\rule{\paperwidth}{\paperheight}%
+ }%
+ }%
+\put(0,0){%
+ \makebox(0,0)[lb]{%
+ \color{myblue}\rule{40mm}{\paperheight}%
+ }%
+ }%
+\put(20,270){% 270 en portrait 180
+ \rotatebox{90}{%
+ \makebox(0,0)[r]{%
+ \fontsize{30}{30}\color{myblue!50!white}%
+ \bfseries
+ \selectfont{\@title\ \tkzversionofpack}\hfill%
+ }%
+ }%
+ }%
+\put(60,60){%
+\begin{pgfpicture}
+\pgfsys@transformxyscale{.5}{.5}
+\pgfmathdeclarerandomlist{color}{{myblue}{DarkBlue}{SteelBlue}{blue}{MidnightBlue}}
+ \foreach \a in {1,...,5}{%
+ \pgfmathrandominteger{\x}{1}{300}%
+ \pgfmathrandominteger{\y}{1}{200}%
+ \pgfmathrandominteger{\r}{20}{100}%
+ \pgfmathrandominteger{\s}{5}{95}%
+ \pgfmathrandominteger{\o}{50}{80}%
+ \pgfmathrandomitem{\c}{color}%
+ \pgfdeclareradialshading{ballshading}{%
+ \pgfpoint{-10bp}{10bp}}%
+ {%
+ color(0bp)=(\c!15!white);
+ color(9bp)=(\c!75!white);
+ color(18bp)=(\c!70!black);
+ color(25bp)=(\c!50!black);
+ color(50bp)=(black)%
+ }%
+ \pgfsetfillopacity{\o/100}%
+ \pgfpathcircle{\pgfpoint{+\x pt}{+\y pt}}{+\r pt}
+ \pgfshadepath{ballshading}{\s}%
+ \pgfusepath{}%
+ }%
+ \end{pgfpicture}}
+
+\put(60,250){% 60,250 en portait 120,180
+ \makebox(0,0)[l]{%
+ \begin{tikzpicture}
+ \nodeshadowedone(2,-1.25){\fontsize{60}{60}
+ \selectfont{\tkznamecollection}}
+ \end{tikzpicture}
+ }%
+ }%
+\put(120,40){%
+ \makebox(0,0)[l]{%
+ \fontsize{17}{21}
+ \textcolor{sectioncolor}{\selectfont{\tkzauthorofpack}}%
+ }%
+ }%
+\put(120,20){%
+ \makebox(0,0)[l]{%
+ \textcolor{sectioncolor}{\url{\tkzurlauthorcom}}%
+ }%
+ }%
+\put(120,30){%
+ \makebox(0,0)[l]{%
+ \textcolor{sectioncolor}{\today \ \ Documentation V.\tkzversionofdoc}}%
+ }%
+ }%
+\setcounter{footnote}{0}%
+}%
+%<----------------------- End Couverture ---------------------------->
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/tkz-doc.cfg new/doc/latex/tkz-doc/latex/tkz-doc.cfg
--- old/doc/latex/tkz-doc/latex/tkz-doc.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/tkz-doc.cfg 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,88 @@
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+
+% original tkz-doc.cfg
+%
+% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
+% updated. Instead, put your changes in the entire copy of tkz-base.cfg
+% and save the file in a directory part of your TEXINPUTS environment
+% variable.
+%===============================================================================
+
+\def\fileversion{1.43c}
+\def\filedate{22020/04/10}
+\typeout{2020/04/10 1.43c tkz-doc.cfg}
+
+% ============= colors =========================================================
+
+% \definecolor [âštypeâ©]{âšnameâ©}{âšmodel-listâ©}{âšspec-listâ©}
+% \providecolor [âštypeâ©]{âšnameâ©}{âšmodel-listâ©}{âšspec-listâ©}
+% \colorlet [âštypeâ©]{âšnameâ©}[âšnum modelâ©]{âšcolorâ©}
+\definecolor{myblue}{RGB}{020,120,180}
+\definecolor{fondpaille}{cmyk}{0,0,0.1,0}
+\definecolor{bistre}{rgb}{.75,.50,.30}
+\definecolor{textcolor}{RGB}{0, 0, 0}
+\providecolor{bistre}{rgb}{.75,.50,.30}
+\definecolor{mygray}{gray}{0.1}
+
+\colorlet{sectioncolor}{MidnightBlue}
+\colorlet{titlecolorbox}{gray!10}
+\colorlet{pdflinkcolor}{myblue}
+\colorlet{pdfurlcolor}{MidnightBlue}
+\colorlet{pdffilecolor}{Peach}
+\colorlet{stringcolor}{myblue!40!black!100}
+\colorlet{commencolor}{blue!0!black!100}
+
+\colorlet{graphicbackground}{white}
+\colorlet{codebackground}{lightgray!30}
+\colorlet{codeonlybackground}{lightgray!30}
+\colorlet{numbackground}{white}
+\colorlet{textcodecolor}{darkgray}
+\colorlet{numcolor}{black}
+
+\definecolor{Salmon}{RGB}{178,51,51}
+\definecolor{BrickRed}{RGB}{233,49,16}
+\definecolor{TealBlue}{RGB}{16,83,165}
+\definecolor{ForestGreen}{RGB}{10,112,43}
+\definecolor{Tangerine}{RGB}{244,176,108}
+\definecolor{DarkBrown}{RGB}{130,65,0}
+\definecolor{blueGrey}{rgb}{0.4,0.48,0.53}
+\def\tkzred{\color{red}}
+\def\tkzblue{\color{blue}}
+%--------------- mots importants et macros ---------------------------------
+\newcommand*{\BS}{\texttt{\char92}}
+\newcommand*{\tkz}{T{\em k}Z}
+\newcommand*{\PGF}{\tkzname{PGF}}
+\newcommand*{\TIKZ}{Ti\textsl{k}Z}
+\newcommand*{\pdf}{\textsc{pdf}}
+\newcommand*{\pgfname}{\textsc{pgf}}
+\newcommand*{\tikzname}{Ti{\em k}Z}
+\newcommand*{\tkzdft}[1]{{\texttt{#1}}}
+\newcommand*{\tkzAttention}[3]{\ \\\llap{\textcolor{#3}{#1\hskip #2}}}
+\newcommand*{\tkzHand}{\ \\\llap{\textcolor{red}{\lefthand\hskip1em}}}
+\newcommand*{\tkzBomb}{\ \\\llap{\textcolor{red}{\bomb\hskip1em}}}
+\newcommand*{\tkzTwoBomb}{\ \\\llap{\textcolor{red}{\bomb\ \bomb\hskip1em}}}
+\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{black}{#1}}}}
+\newcommand*{\tkzimp}[1]{\textbf{#1}}
+\newcommand*{\tkzHandBomb}{\ \\\llap{\textcolor{red}{\lefthand\ \bomb\hskip1em}}}
+\providecommand\LaTeX{L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX}
+\providecommand\LATEX{\LaTeX}
+\renewcommand\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000}
+\providecommand\TEX{\TeX}
+%-------------------------------------------------------------------------------
+\def\tkz@background@color{white}
+\def\tkz@text@color{black}
+\global\edef\tkz@suc@bkc{\tkz@background@color}
+\global\edef\tkz@suc@txt{\tkz@text@color}
+%-------------------------------------------------------------------------------
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/tkz-doc.cls new/doc/latex/tkz-doc/latex/tkz-doc.cls
--- old/doc/latex/tkz-doc/latex/tkz-doc.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/tkz-doc.cls 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,307 @@
+% tkz-doc.cls
+% encoding: utf8
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+% tkz-doc class for use with the tkz documentation
+% ( AlterMundus Collection ).
+%
+%% Objet : Classe LaTeX et Styles pour créer des documentations.
+%<-------------- Définitions relatives au package --------------------------->
+\newcommand*{\PackageName}{tkz-doc}
+\newcommand*{\PackageVersion}{1.43c}
+\newcommand*{\filedate}{2020/04/10}
+
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+
+%<---------------------- Identification Part -------------------------------->
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{\PackageName}[%
+ \filedate\space Version:\space\PackageVersion\space %
+ tkz documentation class based on scrartcl]
+\newif\if@tkzcadre
+\@tkzcadrefalse
+\DeclareOption{cadre}{\@tkzcadretrue}
+\ProcessOptions\relax
+\LoadClass[titlepage,a4paper]{scrartcl}
+%<----------------- loading some packages ---------------------------------->
+% dvipsnames loads a set of 68 cmyk colors as defined in the dvips driver.
+% svgnames loads a set of 151 rgb color names
+% obsolete usenames
+\PassOptionsToPackage{dvipsnames,svgnames}{xcolor}
+%<-------------------------------------------------------------------------->-
+\KOMAoptions{twoside=false}
+%<-------------------------------------------------------------------------->-
+\RequirePackage{framed,eso-pic}
+\RequirePackage[bottom,stable,ragged]{footmisc}
+\RequirePackage[automark,markcase=ignoreuppercase]{scrlayer-scrpage}
+%<------------- define important words ---------------------------------->
+\InputIfFileExists{tkz-doc.cfg}{\typeout{Local configuration file tkz-doc.cfg found and used}}{\typeout{tkz-doc.cfg not found}}
+ %<-------------------------------------------------------------------------->-
+\pagestyle{scrheadings}
+\clearscrheadings
+\clearscrplain
+\ohead{\textcolor{sectioncolor}{\pagemark}}
+\ihead{\textcolor{sectioncolor}{\headmark}}
+\rofoot{\textcolor{sectioncolor}{\tkznamecollection}}
+\lofoot{\textcolor{sectioncolor}{\tkznameofpack}}
+
+\automark[subsection]{section}
+\KOMAoptions{headsepline=.4pt}
+\addtokomafont{headsepline}{\color{sectioncolor}}
+
+\KOMAoptions{footsepline=.4pt}
+\addtokomafont{footsepline}{\color{sectioncolor}}
+
+\setheadwidth[0pt]{text}
+\setfootwidth[0pt]{text}
+\renewcommand{\footnoterule}{\vspace*{-3pt}{%
+ \color{sectioncolor}\hrule width 2in height 0.4pt}\vspace*{2.6pt}}
+\deffootnote{1.5em}{1em}{\makebox[1.5em][l]{\thefootnotemark}}
+\addtolength{\skip\footins}{\baselineskip}%
+%<------------------â En-tête et pied de page ------------------------------
+\pagenumbering{arabic}
+\newcommand\SectionFontStyle{\ttfamily}
+\setkomafont{sectioning}{\bfseries\SectionFontStyle}
+\setkomafont{pagenumber}{\bfseries\SectionFontStyle}
+\setkomafont{pagehead}{\small\ttfamily}
+\setkomafont{pagefoot}{\small\ttfamily}
+\setkomafont{descriptionlabel}{\itshape}
+\addtokomafont{sectioning}{\color{sectioncolor}}
+\renewcommand*{\raggedsection}{\raggedright}
+%<---------------------------------------------------------------------------
+\newcounter{cnt}\setcounter{cnt}{1}
+\setcounter{secnumdepth}{3}%
+\setcounter{tocdepth}{3}
+%<------------------ Ãxécution et chargement -----------------------------
+\RequirePackage{tikz}
+\usetikzlibrary{decorations.shapes,
+ decorations.text,
+ decorations.pathreplacing,
+ decorations.pathmorphing,
+ decorations.markings,
+ shadows}
+\RequirePackage{tabularx,ragged2e}
+\RequirePackage[bottom,stable,ragged]{footmisc}
+\raggedbottom
+\newbox\tkzbox
+%<--------------- some macros --------------------------------------------
+\def\nodeshadowedone(#1,#2)#3{%
+\node[myblue,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox};
+\node[above,yscale=#2,inner sep=0pt,xslant=#1,myblue!60]{\box\tkzbox};
+}%
+ % some of the macros below are absolete
+\def\nameoffile#1{\gdef\@nameoffile{#1}}
+\def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}}
+\long\def\defoffile#1{\protected@xdef\@defoffile{\@defoffile{#1}}}
+\let\@defoffile\@empty
+%<-------------------------------------------------------------------------
+\newcommand*{\addbs}[1]{\texttt{\textbackslash#1}}
+\newcommand*{\@CellCode}[1]{}
+\newcommand*{\thead}{\noalign{\iffalse}\fi\@thead}
+\newcommand*{\@thead}[1][\em\ttfamily]{\gdef\@CellCode{#1}\iffalse{\fi}}
+\newcommand*{\tbody}{\noalign{\gdef\@CellCode{}}}
+\newcolumntype{I}{>{\@CellCode}}
+%<-------------------------- NewMacroBox ----------------------------------->
+\newcommand*{\ActivBoxName}{}
+\newenvironment{NewMacroBox}[2]{%
+\parindent=0pt
+\renewcommand*{\ActivBoxName}{#1}
+\def\FrameCommand{\color{MidnightBlue}{\vrule width 1pt\hspace{3pt}}}%
+\MakeFramed{\advance\hsize-\width}%
+\noindent
+\makebox[0pt][l]{%
+ \hspace{-4pt}%
+ \setlength{\fboxrule}{1pt}%
+ \setlength{\fboxsep}{3pt}%
+ \fcolorbox{sectioncolor}{titlecolorbox}{%
+ \rule{6pt}{0pt}%
+ \makebox[\width+6pt][l]{\tkzcname{#1#2}}%
+ }%
+}\\*[.5\baselineskip]%
+\noindent
+% \ignorespaces\tkzcname{#1#3}
+\Imacro{#1}%
+}%
+{%
+\par\noindent%
+\makebox[0pt][l]{%
+\hspace{-6pt}%
+\rule{6pt}{1pt}%
+\rule{\textwidth}{1pt}%
+\hspace{-1pt}%
+\rule{1pt}{10pt}%
+}%
+\endMakeFramed
+\noindent
+\ignorespacesafterend
+\par\medskip
+}%
+%<----------------- end NewMacroBox ----------------------------------------->
+
+%<----------------------------- NewEnvBox ----------------------------------->
+\let\fram@d=\MakeFramed \let\endfram@d=\endMakeFramed
+
+\newenvironment{NewEnvBox}[1]{%
+\parindent=0pt
+\renewcommand*{\ActivBoxName}{#1}
+%\gdef\tkzEnvMacro{#1}
+\def\FrameCommand{\color{sectioncolor}{\vrule width 1pt\hspace{3pt}}}%
+\MakeFramed{\advance\hsize-\width}%
+\noindent
+\makebox[0pt][l]{%
+\hspace{-4pt}%
+\setlength{\fboxrule}{1pt}%
+\setlength{\fboxsep}{3pt}%
+\fcolorbox{sectioncolor}{titlecolorbox}{%
+\rule{6pt}{0pt}%
+\makebox[\width+6pt][l]{%
+ \tkzcname{\textcolor{sectioncolor}{begin}\{\ActivBoxName\}}{\oarg{options}}%
+ \hspace*{.25cm}\meta{environment contents}\hspace*{.25cm}%
+ \tkzcname{\textcolor{sectioncolor}{end}\{\ActivBoxName\}}}%
+}%
+}\\*[.5\baselineskip]%
+\noindent
+% \ignorespaces\tkzcname{#1#3}
+\Ienv{#1}
+\color{MidnightBlue}}{%
+\par\noindent%
+\makebox[0pt][l]{%
+\hspace{-6pt}%
+\rule{6pt}{1pt}%
+\rule{\textwidth}{1pt}%
+\hspace{-1pt}%
+\rule{1pt}{10pt}%
+}%
+\endMakeFramed
+\noindent
+\ignorespacesafterend
+\par\medskip
+}
+%<------------------- end NewEnvBox ----------------------------------------->
+%<----------------------------- def macro arg opt---------------------------->
+\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
+\def\cmd@to@cs#1#2{\char\number`#2\relax}
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\providecommand\marg[1]{{\ttfamily\char`\{}\opt{\meta{#1}}{\ttfamily\char`\}}}
+\providecommand\oarg[1]{{\ttfamily[}\opt{\meta{#1}}{\ttfamily]}}
+\providecommand\parg[1]{{\ttfamily(}\opt{\meta{#1}}{\ttfamily)}}
+\newcommand\opt[1]{{\color{myblue}#1}}
+\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}}
+\newcommand*{\var}[1]{\{\opt{\meta{#1}}\}}
+\newcommand*{\varp}[1]{\big(\opt{\meta{#1}}\big)}
+\newcommand*{\vara}[1]{\{#1\}}
+% -- Macros pour indexation -------------------------------------------------
+\newcommand*{\tkzNamePack}[1]{\NamePack{#1}}
+\newcommand*{\tkzNameMacro}[1]{\tkzcname{#1}\Imacro{#1}}
+\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}}
+\newcommand*{\Ilib}[1]{\index{Library_1@\texttt{Library}!\texttt{#1}}}
+\newcommand*{\Ienv}[1]{\index{Environment_1@\texttt{Environment}!\texttt{#1}}}
+\newcommand*{\IargEnv}[2]{\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}}
+\newcommand*{\IargNameEnv}[2]{\texttt{#2}\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}}
+\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}}
+\newcommand*{\IoptNameEnv}[2]{\texttt{#2}\index{#1_3@\texttt{#1: options}!\texttt{#2}}}
+\newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}%n
+\newcommand*{\Iarg}[2]{\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
+\newcommand*{\IargName}[2]{\texttt{#2}\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
+\newcommand*{\IoptName}[2]{\texttt{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}
+\newcommand*{\Iopt}[2]{\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}
+\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}}
+\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}}
+\newcommand*{\Iaccent}[2]{\index{#1@\texttt{#2}}}
+\newcommand*{\NameLib}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}}
+\newcommand*{\NameSys}[1]{\texttt{#1}\index{Operating System !#1@\texttt{#1}}}
+\newcommand*{\NameDist}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{TeX Distributions !#1@\texttt{#1}}}
+\newcommand*{\NameFonct}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Functions !#1@\texttt{#1}}}
+\newcommand*{\NamePack}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Package !#1@\texttt{#1}}}
+\newcommand*{\TOenvline}[3]{\IoptNameEnv{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TOline}[3]{\IoptName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TAline}[3]{\IargName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TMline}[3]{\tkzcname{#1}\index{#1_1@\texttt{\textbackslash#1}}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\tkzcname}[1]{\Imacro{#1}\textbf{\texttt{\textcolor{MidnightBlue}{%
+ \textbackslash#1}}}}
+\newcommand*{\tkzhname}[1]{\textbf{\texttt{\textcolor{MidnightBlue}{%
+ \textbackslash#1}}}}
+
+\DeclareRobustCommand\meta[1]{%
+\ensuremath\langle
+ \ifmmode \expandafter \nfss@text \fi
+ {%
+ \meta@font@select
+ \edef\meta@hyphen@restore
+ {\hyphenchar\the\font\the\hyphenchar\font}%
+ \hyphenchar\font\m@ne
+ \language\l@nohyphenation
+ \/#1\/%
+ \meta@hyphen@restore
+ }\ensuremath\rangle
+}
+\def\meta@font@select{}
+
+\renewcommand*{\idx@heading}{%
+ \idx@@heading{\indexname}%
+}
+\renewenvironment{theindex}{%
+ \@restonecoltrue
+ \columnseprule \z@
+ \columnsep 35\p@
+ \idx@heading%
+ \index@preamble\par\nobreak
+ \thispagestyle{\indexpagestyle}\parindent\z@
+ \setlength{\parskip}{\z@ \@plus .3\p@}%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}%
+ \let\item\@idxitem
+}{%
+ \if@restonecol\onecolumn\else\clearpage\fi
+}
+%<----------- set colors of the document --------------------------
+\pgfkeys{/tkzsetupcolor/.cd,
+ background/.code = {\global\edef\tkz@suc@bkc{#1}},
+ text/.code = {\global\edef\tkz@suc@txt{#1}}}
+\def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{%
+ \tkz@SetUpColors[]}}
+\def\tkz@SetUpColors[#1]{%
+\begingroup
+ \pgfkeys{tkzsetupcolor/.cd,
+ background = \tkz@background@color,
+ text = \tkz@text@color}
+ \pgfqkeys{/tkzsetupcolor}{#1}
+ \pagecolor{\tkz@suc@bkc}
+ \color{\tkz@suc@txt}
+\endgroup}
+
+%<---------------------------------------------------------------------
+\input{couverture}
+%<--------- presentation premiÚre page --------------------------------->
+\newcommand\presentation{%
+ \thispagestyle{empty}%
+ \par\vspace*{3 cm}
+ \begin{center}
+ {\textcolor{myblue}{\Huge \@nameoffile}}
+ \end{center}
+ \par\vspace*{3 cm}
+ \noindent
+ \newlength{\tkz@lx}\settowidth{\tkz@lx}{\huge \tkznamecollection}%
+ \advance\tkz@lx3em\quad
+ \href{\tkzurlauthor}{%
+ \rotatebox{90}{\hspace*{1.5em}{%
+ \textcolor{sectioncolor}{\Huge \tkznamecollection}}}}
+ \textcolor{sectioncolor}{\rule{2pt}{\tkz@lx}}\quad%
+ \begin{minipage}[b]{.90\textwidth}
+ {%
+ \noindent\hfill
+ \raggedleft\Large
+ \href{mailto:al.ma@mac.com}{\textcolor{sectioncolor}{\tkzauthorofpack}}\par
+ }%
+ {\@defoffile}
+ \par
+ \end{minipage}
+}
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/tkzexample.sty new/doc/latex/tkz-doc/latex/tkzexample.sty
--- old/doc/latex/tkz-doc/latex/tkzexample.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/tkzexample.sty 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,502 @@
+% Documentation of tkz-euclide
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+
+%
+% The author of the original code
+% of the environment 'codeexample' is Till Tantau
+% from the file pgfmanual-en-macros.tex
+% (Copyright 2006 by Till Tantau)
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+% H I G H L Y E X P E R I M E N T A L
+%<--------------------------------------------------------------------------->
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{tkzexample}[2020/04/10 v1.43c (code and graphic)]
+\RequirePackage{calc,mdframed,fancyvrb}
+\newif\iftkzcodesaved
+\DeclareOption{saved}{\tkzcodesavedtrue}
+\ProcessOptions\relax
+%<--------------------------------------------------------------------------->
+\colorlet{graphicbackground}{white}
+\colorlet{codebackground}{white}
+\colorlet{codeonlybackground}{white}
+\colorlet{numbackground}{white}
+\colorlet{textcodecolor}{black}
+\colorlet{numcolor}{gray}
+%<--------------------------------------------------------------------------->
+\def\code@style{\small\ttfamily}
+\makeatletter
+\newcounter{code@cnt}%
+
+\ifx\scantokens\@undefined
+ \PackageError{tkzexample}{You need to use extended latex
+ (elatex) or (pdfelatex) to use this package}{}
+\fi
+
+% Define \find@tkzexample such that it doesn't destroy catcodes:
+\begingroup
+\catcode`|=0
+\catcode`[= 1
+\catcode`]=2
+\catcode`\{=12
+\catcode `\}=12
+\catcode`\\=12 |gdef|find@tkzexample#1\end{tkzexample}[|endoftkzexample[#1]]
+|endgroup
+
+\begingroup
+\catcode`|=0
+\catcode`[= 1
+\catcode`]=2
+\catcode`\{=12
+\catcode `\}=12
+\catcode`\\=12 |gdef|find@tkzltxexample#1\end{tkzltxexample}[|endoftkzltxexample[#1]]
+|endgroup
+
+% define \returntospace.
+%
+% It should define NEWLINE as {}, spaces and tabs as \space.
+\begingroup
+\catcode`\^=7
+\catcode`\^^M=13
+\catcode`\^^I=13
+\catcode`\ =13%
+\gdef\returntospace{\catcode`\ =13\def {\space}\catcode`\^^I=13\def^^I{\space}\catcode`\^^M=13\def^^M{}}%
+\endgroup
+
+\begingroup
+\catcode`\%=13
+\catcode`\^^M=13
+\gdef\commenthandler{\catcode`\%=13\def%{\@gobble@till@return}}
+\gdef\@gobble@till@return#1^^M{}
+\gdef\@gobble@till@return@ignore#1^^M{\ignorespaces}
+\gdef\typesetcomment{\catcode`\%=13\def%{\@typeset@till@return}}
+\gdef\@typeset@till@return#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}}\par}
+\gdef\typesetcommentnum{\catcode`\%=13\def%{\@typeset@till@return@num}}
+\gdef\@typeset@till@return@num#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}} \@@par}
+\endgroup
+
+\let\tkz@frameset\colorbox
+\let\tkz@frameltxset\colorbox
+\newwrite\fileexample
+\newdimen\tkzexamplewidth
+\newdimen\tkz@hsep
+\tkz@hsep=0pt
+\newif\ifcode@execute
+\newif\ifcode@saved\code@savedfalse
+\newif\ifnum@show \num@showfalse
+\newif\ifcode@overhang
+\newbox\tkzexamplebox
+\newif\ifcode@vbox \code@vboxfalse
+
+\pgfqkeys{/tkzexample}{%
+ execute code/.is if = code@execute,
+ show num/.is if = num@show,
+ overhang/.is if = code@overhang,
+ code only/.code = {\code@executefalse},
+ width/.code = {\setlength\tkzexamplewidth{#1}},
+ code/.code = {\colorlet{codebackground}{#1}},
+ graphic/.code = {\colorlet{graphicbackground}{#1}},
+ overhang/.code = {\code@overhangtrue},
+ num/.code = {\num@showtrue\setcounter{code@cnt}{1}},
+ numcolor/.code = {\colorlet{numcolor}{#1}},
+ numbkgcolor/.code = {\colorlet{numbackground}{#1}},
+ global num/.code = {\num@showtrue},
+ code style/.code = {\def\code@style{#1}},
+ normal/.code = {\def\code@size{\normalsize}},
+ small/.code = {\def\code@size{\small}},
+ very small/.code = {\def\code@size{\footnotesize}},
+ right margin/.code = {\def\tkz@rightmargin{#1}},
+ left margin/.code = {\def\tkz@leftmargin{#1}},
+ inner left margin/.code = {\def\tkz@innerleftmargin{#1}},
+ inner right margin/.code = {\def\tkz@innerrightmargin{#1}},
+ inner top margin/.code = {\def\tkz@innertopmargin{#1}},
+ inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}},
+ line frame width/.code = {\def\tkz@linewidth{#1}},
+ frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}},
+ frame tex/.code = {\def\tkz@frameltxset{\fcolorbox{#1}}},
+ above skip/.code = {\def\tkz@above{#1}},
+ below skip/.code = {\def\tkz@below{#1}},
+ hsep/.code = {\setlength\tkz@hsep{#1}},
+ pre/.code = {\def\code@pre{#1}},
+ post/.code = {\def\code@post{#1}},
+ latex/.code = {\setlength\tkzexamplewidth{#1}%
+ \def\code@preadd{\begin{minipage}{#1}}%
+ \def\code@postadd{\end{minipage}}},
+ vbox/.code = {\code@vboxtrue
+ \def\code@preadd{\noindent
+ \vbox\bgroup
+ \setlength{\hsize}{\linewidth-6pt}%
+ }%
+ \def\code@postadd{\egroup}},
+ every tkzexample/.style={width=6cm},
+}%
+\def\code@size{}%
+\def\code@pre{}%
+\def\code@post{}%
+\def\code@preadd{}%
+\def\code@postadd{}%
+\def\tkz@above{\par}%
+\def\tkz@below{\par}%
+
+% execution du code
+\def\tkz@result{%
+ \begin{minipage}[t]{\wd\tkzexamplebox}%
+ \hrule width0pt
+ \code@size
+ \box\tkzexamplebox
+ \leavevmode
+ \end{minipage}%
+}%
+
+\newcommand\tkz@code[1]{%
+\begin{minipage}[t]{\code@width}{%
+\color{textcodecolor}%
+\parskip=\z@
+\hrule width\z@
+\vskip-.25em
+\let\do\@makeother
+\dospecials
+\frenchspacing
+\code@style\code@size
+\obeylines
+\@vobeyspaces
+\@tempswafalse
+\ifnum@show
+ \typesetcommentnum
+ \def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty
+ \everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}}%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi%
+ \fi
+ }%
+ \everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}%
+ }%
+\else
+ \typesetcomment
+ \def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi%
+ \fi
+ }%
+\fi
+\obeylines
+\ifcode@saved\input{#1}\else#1\fi%
+}% end of content for the minipage
+\end{minipage}%
+}%
+
+\newcommand\tkz@codesplit[1]{%
+\begin{mdframed}[linewidth = \tkz@linewidth,
+ leftmargin = \tkz@leftmargin,
+ rightmargin = \tkz@rightmargin,
+ backgroundcolor = codeonlybackground,
+ innerleftmargin = \tkz@innerleftmargin,
+ innertopmargin = \tkz@innertopmargin]
+\begingroup
+\color{textcodecolor}%
+\parskip=\z@
+\hrule width0pt
+\let\do\@makeother
+\dospecials
+\frenchspacing
+\code@style\code@size
+\obeylines
+\@vobeyspaces
+\@tempswafalse
+\ifnum@show
+\typesetcommentnum
+\def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty
+ \everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}}%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi
+ \fi
+}%
+\everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}%
+ }%
+\else
+\typesetcomment%
+\def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi%
+ \fi
+}%
+\fi
+\obeylines
+\ifcode@saved\input{#1}\else #1\fi
+\endgroup
+\end{mdframed}%
+}%
+
+
+\def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}%
+\def\tkzFileSavedPrefix{tkzFile}%
+\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkzref}%
+
+\iftkzcodesaved
+\def\tkzexample[#1]{%
+\code@executetrue
+\normalsize
+\pgfkeys{/tkzexample/.cd,
+ right margin = 0pt,
+ left margin = 0pt,
+ line frame width = 0,
+ inner left margin = 0 pt,
+ inner right margin = 0 pt,
+ inner top margin = 6 pt,
+ inner bottom margin = 0 pt}
+\pgfqkeys{/tkzexample}{every tkzexample,#1}%
+\parindent0pt
+\bgroup
+\VerbatimEnvironment
+\killienc\begin{VerbatimOut}{\tkz@File@Saved@Name.tex}}%
+\def\endtkzexample{\end{VerbatimOut}%
+\egroup
+\ifcode@execute
+\setbox\tkzexamplebox=\hbox{\input{\tkz@File@Saved@Name.tex}}%
+\ifdim\wd\tkzexamplebox>\tkzexamplewidth%
+ \gdef\code@mid{\parskip2pt\par}%
+% \hrule
+ %\def\code@mid{\hfill}%
+ \gdef\code@width{\linewidth}%
+\else
+ \ifdim\tkz@hsep=0pt
+ \gdef\code@mid{\hfill}%
+ \else
+ \gdef\code@mid{\hskip\tkz@hsep}%
+ \fi
+ \gdef\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}%
+ \fi
+ \par\noindent
+ \code@savedtrue
+ \ifcode@overhang
+ \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}%
+ \else
+ \tkz@frameltxset{graphicbackground}{\tkz@result}%
+ \fi
+ \else% pas de code pas clair
+ \gdef\code@mid{\hfill}%
+ \gdef\code@width{\linewidth}%
+ \gdef\code@end{}%
+ \fi% fin pas de code
+ \code@mid
+ \ifcode@overhang\tkz@frameltxset{graphicbackground}{\tkz@result}%
+ \else
+ \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}%
+ \fi
+\tkz@below
+}%
+\else% end of code saved code et result ?
+\def\tkzexample[#1]{%
+\begingroup
+\code@executetrue
+\pgfkeys{/tkzexample/.cd,
+ right margin = 0pt,
+ left margin = 0pt,
+ line frame width = 0,
+ inner left margin = 0 pt,
+ inner right margin = 0 pt,
+ inner top margin = 6 pt,
+ inner bottom margin = 0 pt,}
+\pgfqkeys{/tkzexample}{every tkzexample,#1}%
+\parindent0pt
+\begingroup
+%\tkz@above
+\let\do\@makeother
+\dospecials
+\obeylines
+\@vobeyspaces
+\catcode`\%=13 %
+\catcode`\^^M=13 %
+\find@tkzexample}% #1 est tout ce qui se trouve dans l'environnement
+\def\endoftkzexample#1{%
+\endgroup
+\ifcode@execute % et \fcode@save ??
+ \setbox\tkzexamplebox=\hbox{%
+ {\commenthandler
+ \protected@xdef\code@temp{#1}}%
+ \catcode`\^^M=9 %
+ {\ignorespaces\code@preadd\code@pre
+ \expandafter\scantokens\expandafter{\code@temp\ignorespaces}%
+ \code@post\code@postadd\ignorespaces}%
+ }%
+ \ifdim\wd\tkzexamplebox>\tkzexamplewidth
+ \def\code@mid{\par}%
+ \def\code@width{\linewidth-6pt}%
+ \else
+ \ifdim\tkz@hsep=0pt
+ \def\code@mid{\hfill}%
+ \else
+ \def\code@mid{\hskip\tkz@hsep}%
+ \fi%
+ \def\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}%
+ \fi%
+ \par\noindent
+ \ifcode@overhang
+ \tkz@frameset{codebackground}{\tkz@code{#1}}%
+ \else
+ \tkz@frameltxset{graphicbackground}{\tkz@result}%
+ \fi
+\else% pas de code execute
+ \def\code@mid{}%
+ \def\code@width{\linewidth-6pt}%
+ \def\code@end{}%
+ \fi% fin pas de code
+ \code@mid%
+ \ifcode@overhang%
+ \ifcode@execute\tkz@frameltxset{graphicbackground}{\tkz@result}\fi
+ \else%
+\ifcode@execute\tkz@frameset{codebackground}{\tkz@code{#1}}\else
+ \par\vskip1em
+ \tkz@codesplit{#1}
+ %\tkz@frameset{codebackground}{\tkz@code{#1}}%
+\fi
+ \fi
+ \tkz@below
+ \end{tkzexample}%
+}%
+\def\endtkzexample{\endgroup}%
+\fi
+%<--------------------------------------------------------------------------->
+\pgfqkeys{/tkzltxexample}{%
+ width/.code = {\setlength\tkzltxexamplewidth{#1}},
+ code/.code = {\colorlet{codeonlybackground}{#1}},
+ show num/.is if = num@show,
+ num/.code = {\num@showtrue\setcounter{code@cnt}{1}},
+ global num/.code = {\num@showtrue},
+ numcolor/.code = {\colorlet{numcolor}{#1}},
+ numbkgcolor/.code = {\colorlet{numbackground}{#1}},
+ normal/.code = {\def\code@size{\normalsize}},
+ small/.code = {\def\code@size{\small}},
+ very small/.code = {\def\code@size{\footnotesize}},
+ right margin/.code = {\def\tkz@rightmargin{#1}},
+ left margin/.code = {\def\tkz@leftmargin{#1}},
+ inner left margin/.code = {\def\tkz@innerleftmargin{#1}},
+ inner right margin/.code = {\def\tkz@innerrightmargin{#1}},
+ inner top margin/.code = {\def\tkz@innertopmargin{#1}},
+ inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}},
+ line frame width/.code = {\def\tkz@linewidth{#1}},
+ hsep/.code = {\def\tkz@hsep{#1}},
+ typeset listing/.code = {#1},
+ frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}},
+ ignorespaces/.code = {\let\@gobble@till@return =%
+ \@gobble@till@return@ignore},
+ leave comments/.code = {\def\code@catcode@hook{\catcode`\%=12}%
+ \let\commenthandler=\relax%
+ \let\typesetcomment=\relax},
+ every tkzltxexample/.style = {width=8cm},
+ vbox/.code = {\def\code@preadd{\noindent
+ \vbox\bgroup\setlength{\hsize}{\linewidth}}%
+ \def\code@postadd{\egroup}}%
+}
+\def\code@size{}%
+% \def\code@pre{}
+\def\code@post{}%
+\def\code@pre{}%
+\def\code@post{}%
+\def\code@catcode@hook{}%
+
+\newdimen\tkzltxexamplewidth
+\newbox\tkzltxexamplebox
+
+\def\tkzltxexample[#1]{%
+\begingroup
+\pgfkeys{/tkzltxexample/.cd,
+ right margin = 0pt,
+ left margin = 0pt,
+ line frame width = 0,
+ inner left margin = 0 pt,
+ inner right margin = 0 pt,
+ inner top margin = 6 pt,
+ inner bottom margin = 0 pt,}
+\pgfqkeys{/tkzltxexample}{every tkzltxexample,#1}%
+\parindent0pt
+\begingroup%
+\let\do\@makeother
+\dospecials
+\obeylines
+\@vobeyspaces
+\catcode`\%=13 %
+\catcode`\^^M=13 %
+\code@catcode@hook%
+\relax%
+\find@tkzltxexample}
+\def\endoftkzltxexample#1{%
+\endgroup%
+\def\code@end{}%
+\par\vskip1em
+\tkz@codesplit{#1}%
+\par
+\code@post
+\end{tkzltxexample}%
+}%
+
+\def\endtkzltxexample{\endgroup}
+
+
+
+\newcommand\killienc{}
+\@tempcnta128
+\@whilenum\@tempcnta<\@cclvi\do{%
+ \edef\killienc{\killienc\catcode\the\@tempcnta=12}%
+ \advance\@tempcnta\@ne}
+
+\def\tkz@ref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}
+\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkz@ref}
+\pgfkeys{
+/tkzsavedcode/.cd,
+ prefix/.code = {\def\tkzFileSavedPrefix{#1}}}
+
+\newcommand{\tkzSavedCode}[1][]{%
+\pgfkeys{%
+tkzsavedcode/.cd,
+ prefix = tkzFile}
+\pgfqkeys{/tkzsavedcode}{#1}
+\renewenvironment{tkzexample}[1][]{%
+\killienc\VerbatimOut{\tkz@File@Saved@Name.tex}}{%
+\endVerbatimOut}}
+
+% \renewenvironment{tkzexample}[1][]{%
+% \killienc \VerbatimOut{tkzeuc-\tkzref.tex}%
+% }{%
+% \endVerbatimOut
+% }
+% \fi
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-doc.doc.tlpobj new/tlpkg/tlpobj/tkz-doc.doc.tlpobj
--- old/tlpkg/tlpobj/tkz-doc.doc.tlpobj 2019-02-28 04:08:57.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-doc.doc.tlpobj 2020-04-16 01:57:27.000000000 +0200
@@ -1,7 +1,11 @@
name tkz-doc.doc
category Package
-revision 48709
+revision 54758
shortdesc doc files of tkz-doc
relocated 1
-docfiles size=1
- RELOC/doc/latex/tkz-doc/README
+docfiles size=10
+ RELOC/doc/latex/tkz-doc/README.md
+ RELOC/doc/latex/tkz-doc/latex/couverture.tex
+ RELOC/doc/latex/tkz-doc/latex/tkz-doc.cfg
+ RELOC/doc/latex/tkz-doc/latex/tkz-doc.cls
+ RELOC/doc/latex/tkz-doc/latex/tkzexample.sty
++++++ tkz-euclide.doc.tar.xz ++++++
++++ 20551 lines of diff (skipped)
++++++ tkz-euclide.tar.xz ++++++
++++ 8556 lines of diff (skipped)
++++++ tkz-fct.doc.tar.xz ++++++
++++ 8549 lines of diff (skipped)
++++++ tkz-fct.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tkz-fct/tkz-fct.sty new/tex/latex/tkz-fct/tkz-fct.sty
--- old/tex/latex/tkz-fct/tkz-fct.sty 2011-06-06 19:18:15.000000000 +0200
+++ new/tex/latex/tkz-fct/tkz-fct.sty 2020-04-12 23:33:18.000000000 +0200
@@ -1,27 +1,22 @@
-% Copyright 2011 by Alain Matthes
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % tkz-fct.sty encodage : utf8 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % Créé par Alain Matthes le 16-01-2011 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Objet : fonctions numériques en 2D with gnuplot
+% Copyright (C) 2020 Alain Matthes
+% 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 Alain Matthes
+% Objet : fonctions numériques en 2D with gnuplot
% constants from tkz-base
% \tkz@init@xstep
% \tkz@init@ystep
+\typeout{2020/04/11 1.3c function tkz-fct}
%<--------------------------------------------------------------------------->
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-fct}[2011/06/01 1.16 c function ]
+\ProvidesPackage{tkz-fct}[2020/04/11 1.3c function ]
\newcount\tkz@tkzf@fct
\edef\tkzTWOPTCode{\the\catcode`\:}
\tkz@tkzf@fct=0 %
@@ -29,7 +24,7 @@
%<--------------------------------------------------------------------------->
% Initialisation
%<--------------------------------------------------------------------------->
-\RequirePackage{tkz-base}
+\RequirePackage{tkz-base,fp}
% % Code from Christian Tellechea 2009 % modified by AM
% modified \FP@pow from fp.sty
\def\FP@pow#1#2#3{%
@@ -82,26 +77,28 @@
\newif\iftkz@draw
\newif\iftkz@fp
\def\tkz@dmin{-5}\def\tkz@dmax{5}
-\pgfkeys{%
-/tkzfct/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-fp/.is if = tkz@fp,
-fp/.default = false,
-/tkzfct/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
+\global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016
+\global\let\tkz@tmp@xb\tkz@init@xmax% modif 2016
+\global\let\tkz@tmp@ya\tkz@init@ymin% modif 2016
+\global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016
+\catcode`\:=12
+\pgfkeys{/@tkzfct/.cd,
+ domain/.code args = {#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ domain = \tkz@tmp@xa:\tkz@tmp@xb,
+ samples/.store in = \tkz@fct@samples,
+ id/.store in = \tkz@fct@id,
+ fp/.is if = tkz@fp,
+ fp/.default = false,
+ samples = 200,
+ fp = true,
+ id = tkzfct,
+ /@tkzfct/.search also = {/tikz},
+}%
\def\tkzFct{\pgfutil@ifnextchar[{\tkzActivOff\tkz@fct}{\tkz@fct[]}}
\def\tkz@fct[#1]#2{%
-\pgfkeys{/tkzfct/.cd,
-domain = \@xa:\@xb,
-samples = 200,
-fp = true,
-id = tkzfct}
-\pgfqkeys{/tkzfct}{#1}%
+\pgfqkeys{/@tkzfct}{#1}%
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -116,12 +113,14 @@
\def\x{(x*\tkz@init@xstep)}%
\expandafter\edef\csname tkzFctgnu\@alph\tkz@tkzf@fct \endcsname{#2}%
\expandafter\edef\csname tkzFctgnuLast\endcsname{#2}
-\begin{scope}[samples = \tkz@fct@samples,#1]
- \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
- \draw[xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm,/tkzfct/.cd]%
- plot[id=\tkz@fct@id,domain= \tkz@ba:\tkz@bb]%
- function{(#2)/\tkz@init@ystep};%
-\end{scope}
+% %%%%%%%
+\begin{scope}
+ \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
+ \draw[#1, xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm]%
+ plot[ samples = \tkz@fct@samples,id=\tkz@fct@id,
+ domain= \tkz@ba:\tkz@bb] function{(#2)/\tkz@init@ystep};%
+\end{scope}
+% %%%%%%%
\let\tkz@tmp@xstep\tkz@init@xstep
\def\tkz@init@xstep{1}
\iftkz@fp%
@@ -140,27 +139,25 @@
%<--------------------------------------------------------------------------->
% point d'une courbe (new method)
%<--------------------------------------------------------------------------->
-\pgfkeys{%
-/tkzfctpt/.cd,
-draw/.is if = tkz@draw,
-draw/.default = true,
-with/.code = \global\def\tkz@fct@used{#1},
-ref/.code = \global\def\tkz@fct@ref{#1}}
+\pgfkeys{/tkzfctpt/.cd,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ with/.store in = \tkz@fct@used,
+ ref/.store in = \tkz@fct@ref,
+ draw = false,
+ with = {},
+ ref = {}
+ }
\def\tkzDefPointByFct{\pgfutil@ifnextchar[{\tkz@fctpoint}{\tkz@fctpoint[]}}
\def\tkz@fctpoint[#1](#2){%
-\pgfkeys{/tkzfctpt/.cd,
- draw = false,
- with = {},
- ref = {}}
\pgfqkeys{/tkzfctpt}{#1}
-
- \FPeval\x{(#2)}%
+ \FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
\FPeval\tkz@fx{\tkzFctLast}
\else
\edef\tkz@fct{\csname tkzFct\tkz@fct@used\endcsname}
- \FPeval\tkz@fx{\tkz@fct}
+ \FPeval\tkz@fx{\tkz@fct}
\fi
\tkzDefPoint(\x,\tkz@fx){tkzPointResult}%
\iftkz@draw
@@ -174,28 +171,24 @@
%<--------------------------------------------------------------------------->
% tangente \tkzDrawTangentLine
%<--------------------------------------------------------------------------->
-\pgfkeys{%
-/tkztan/.cd,
-draw/.is if = tkz@draw,
-draw/.default = true,
-with/.code = \global\def\tkz@fct@used{#1},
-kr/.code = {\edef\tkz@tan@kr{#1}},
-kl/.code = {\edef\tkz@tan@kl{#1}},
-/tkztan/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}
+\pgfkeys{/@tkztan/.cd,
+ with/.store in = \tkz@fct@used,
+ kr/.store in = \tkz@tan@kr,
+ kl/.store in = \tkz@tan@kl,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ draw = false,
+ with = {},
+ kr = 1,
+ kl = 1,
+ /@tkztan/.search also = {/tikz},
}%
%<--------------------------------------------------------------------------->
\def\tkzDrawTangentLine{\pgfutil@ifnextchar[{\tkz@DrawTangentLine}{%
\tkz@DrawTangentLine[]}}
\def\tkz@DrawTangentLine[#1](#2){%
\begingroup
-\pgfkeys{/tkztan/.cd,
- draw = false,
- with = {},
- kr = 1,
- kl = 1}
-\pgfqkeys{/tkztan}{#1}
+\pgfqkeys{/@tkztan}{#1}
\FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
\FPeval\tkz@img{\tkzFctLast}
@@ -219,7 +212,7 @@
\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
\FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
\protected@edef\tkz@temp{%
-\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp%
+\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp%
(tkzPointResult)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
\fi
% demi tgt --> gauche
@@ -230,7 +223,7 @@
\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
\FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
\protected@edef\tkz@temp{%
-\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp%
+\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp%
(tkzPointResult)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
\fi
\iftkz@draw
@@ -239,29 +232,26 @@
\endgroup
}
%<--------------------------------------------------------------------------->
-% tkzArea
+% tkzArea
%<--------------------------------------------------------------------------->
\pgfkeys{%
/tkzarea/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-/tkzarea/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
+ domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ color = \tkz@otherlinecolor,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /tkzarea/.search also = {/tikz}
+ }
\def\tkzArea{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@aire}{\tkz@aire[]}}
\def\tkz@aire[#1]{%
-\begingroup
-\pgfkeys{%
-/tkzarea/.cd,
-domain = -5:5,
-color = \tkz@otherlinecolor,
-samples = 200,
-id = tkzfonct,
-opacity = .5}
+\begingroup
\pgfqkeys{/tkzarea}{#1}
\iftkz@init@NO
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -287,39 +277,38 @@
\endgroup
}
\let\tkzDrawArea\tkzArea
+
%<--------------------------------------------------------------------------->
% tkzAreafg
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzareafg/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-between/.code args={#1 and #2}{\def\tkz@below{#1}
- \def\tkz@above{#2}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-/tkzareafg/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
-\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
+\pgfkeys{/@tkzareafg/.cd,
+ domain/.code args ={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ between/.code args ={#1 and #2}{\def\tkzfct@below{#1}
+ \def\tkzfct@above{#2}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ between = a and b,
+ color = lightgray,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /@tkzareafg/.search also = {/tikz}
+ }
+
+\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
\def\tkz@airefg[#1]{%
\begingroup
-\pgfkeys{/tkzareafg/.cd,
-domain = -5:5,
-between = a and b,
-color = lightgray,
-samples = 200,
-id = tkzfonct,
-opacity = .5
-}
-\pgfqkeys{/tkzareafg}{#1}
-\def\tkz@fctsup{\csname tkzFctgnu\tkz@below\endcsname}
-\def\tkz@fctinf{\csname tkzFctgnu\tkz@above\endcsname}
+\pgfqkeys{/@tkzareafg}{#1}
+\def\tkz@fctsup{\csname tkzFctgnu\tkzfct@below\endcsname}
+\def\tkz@fctinf{\csname tkzFctgnu\tkzfct@above\endcsname}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@xstep}%
-\else
+\else
\FPset{\tkz@x@delta}{0}
\FPset{\tkz@y@delta}{0}%
\fi%
@@ -329,34 +318,33 @@
\FPdiv\tkz@bb{\tkz@max}{\tkz@init@xstep}
\begin{scope}[domain = \tkz@ba:\tkz@bb,
samples = \tkz@fct@samples,
- id = \tkz@fct@id]
+ id = \tkz@fct@id]
\clip (\tkz@ba,\tkz@ya)--plot function{(\tkz@fctsup)/\tkz@init@ystep}%
--(\tkz@bb,\tkz@ya);%
\clip (\tkz@ba,\tkz@yb)--plot function{(\tkz@fctinf)/\tkz@init@ystep}%
--(\tkz@bb,\tkz@yb);
\fill [color = \tkz@fct@color,
fill opacity = \tkz@fct@opacity,
- /tkzareafg/.cd,
+ /@tkzareafg/.cd,
#1]%
(\tkz@ba,\tkz@ya) rectangle (\tkz@bb,\tkz@yb);
\end{scope}
\endgroup
-}
-\let\tkzDrawAreafg\tkzAreafg
-\def\tkz@pamin{-5}\def\tkz@pamax{5}
+}
+\let\tkzDrawAreafg\tkzAreafg
+\def\tkz@pamin{-5}\def\tkz@pamax{5}
%<--------------------------------------------------------------------------->
-% tkzFctPar
+% tkzFctPar
%<--------------------------------------------------------------------------->
-\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}}
+\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}}
\def\tkz@fctp[#1]#2#3{%
\begingroup
-\pgfkeys{%
-/tkzfct/.cd,
-domain = \tkz@pamin:\tkz@pamax,
-samples = 200,
-fp = true,
-id = tkzfct}
-\pgfqkeys{/tkzfct}{#1}
+\pgfkeys{/@tkzfct/.cd,
+ domain = \tkz@pamin:\tkz@pamax,
+ samples = 200,
+ fp = true,
+ id = tkzfct}
+\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -369,29 +357,29 @@
\clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
\draw [xshift = -\tkz@x@delta cm,%
yshift = -\tkz@y@delta cm,
- /tkzfct/.cd, #1]%
+ /@tkzfct/.cd, #1]%
plot [parametric,domain = \tkz@min:\tkz@max,%
id = tkzparfct]%
function {(#2)/\tkz@init@xstep,(#3)/\tkz@init@ystep};
\tkzActivOn
\end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzFctPolar
+% tkzFctPolar
%<--------------------------------------------------------------------------->
-\def\tkz@pomin{0}\def\tkz@pomax{2*pi}
+\def\tkz@pomin{0}\def\tkz@pomax{2*pi}
\def\tkzFctPolar{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}}
+ \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}}
\def\tkz@FctPolar[#1]#2{%
\begingroup
-\pgfkeys{%
-/tkzfct/.cd,
-domain = \tkz@pomin:\tkz@pomax,
-fp = true,
-samples = 200,
-id = tkzfctpolar}
-\pgfqkeys{/tkzfct}{#1}
+\pgfkeys{/@tkzfct/.cd,
+ domain = \tkz@pomin:\tkz@pomax,
+ fp = true,
+ samples = 200,
+ id = tkzfctpolar
+ }
+\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -399,40 +387,40 @@
\FPset{\tkz@x@delta}{0}
\FPset{\tkz@y@delta}{0}%
\fi%
-
+
\begin{scope}
\tkzActivOff
\draw [xshift = -\tkz@x@delta cm,%
yshift = -\tkz@y@delta cm,
- /tkzfct/.cd, #1]%
+ /@tkzfct/.cd, #1]%
plot [raw gnuplot,id = tkzpolarfct]%
function { set polar;set samples \tkz@fct@samples ; set trange [\tkz@min:\tkz@max]; plot (#2)/\tkz@init@xstep};
\tkzActivOn
\end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSum
+% tkzDrawRiemannSum
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzriemann/.cd,
-interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-number/.code = {\edef\tkz@fct@nb{#1}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}}
+\pgfkeys{/@tkzriemann/.cd,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /@tkzriemann/.search also = {/tikz},
+}
+\def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
+ \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}}
\def\tkz@DrawRiemannSum[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+}
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -442,39 +430,42 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\FPadd\tkz@next{\x}{\tkz@delta}
- \draw[color=\tkz@fct@color,opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next , \tkz@fx/\tkz@init@ystep );
- }
- \end{scope}
+ \draw[ color=\tkz@fct@color,
+ opacity=\tkz@fct@opacity,
+ /@tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next,
+ \tkz@fx/\tkz@init@ystep );
+}
+ \end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumInf
+% tkzDrawRiemannSumInf
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzriemann/.cd,
-interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-number/.code = {\edef\tkz@fct@nb{#1}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
+\pgfkeys{/@tkzriemann/.cd,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /@tkzriemann/.search also = {/tikz},
+ }
+\def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
+ \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
\def\tkz@DrawRiemannSumInf[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -484,42 +475,42 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
- \FPadd\tkz@next{\x}{\tkz@delta}
- \let\tkzFctTmp\tkzFcta
- \FPset\x{\tkz@next}
- \FPeval\tkz@fxnext{\tkzFcta}
-\ifdim \tkz@fx pt < \tkz@fxnext pt\relax
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
-\else
-\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
- \fi
- }
- \end{scope}
+ \let\tkz@firstx\x
+ \FPadd\tkz@next{\x}{\tkz@delta}
+ \let\tkzFctTmp\tkzFcta
+ \FPset\x{\tkz@next}
+ \FPeval\tkz@fxnext{\tkzFcta}
+ \ifdim \tkz@fx pt < \tkz@fxnext pt\relax
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
+\else
+\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
+ \fi
+ }
+ \end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumSup
+% tkzDrawRiemannSumSup
%<--------------------------------------------------------------------------->
\def\tkzDrawRiemannSumSup{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}}
+ \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}}
\def\tkz@DrawRiemannSumSup[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -529,42 +520,42 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
+ \let\tkz@firstx\x
\FPadd\tkz@next{\x}{\tkz@delta}
\let\tkzFctTmp\tkzFcta
\FPset\x{\tkz@next}
\FPeval\tkz@fxnext{\tkzFcta}
\ifdim \tkz@fx pt > \tkz@fxnext pt\relax
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
-\else
-\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
- \fi
- }
- \end{scope}
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
+\else
+\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
+ \fi
+ }
+ \end{scope}
\endgroup
}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumMid
+% tkzDrawRiemannSumMid
%<--------------------------------------------------------------------------->
\def\tkzDrawRiemannSumMid{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}}
+ \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}}
\def\tkz@DrawRiemannSumMid[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/@tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -574,46 +565,43 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
+ \let\tkz@firstx\x
\FPadd\tkz@next{\x}{\tkz@delta}
\FPset\x{\tkz@next}
\FPeval\tkz@fxnext{\tkzFcta}
\FPeval\tkz@midimg{(\tkz@firstimg+\tkz@fxnext)/2}
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep );
- }
- \end{scope}
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep );
+ }
+ \end{scope}
\endgroup
-}
-
+}
+
%<--------------------------------------------------------------------------â>
% tkzXH F rien T et [ ou ]
%<--------------------------------------------------------------------------â>
\def\tkz@ComT{v} % need
-\pgfkeys{
- tkzxh/.cd,
- posgrad/.code = {\def\tkz@tkzXh@posgrad{#1}},
- left/.code = {\def\tkz@tkzXh@left{#1}},
- right/.code = {\def\tkz@tkzXh@right{#1}},
- color/.code = {\def\tkz@tkzXh@color{#1}},
- }
-\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
+\pgfkeys{/@tkzxh/.cd,
+ posgrad/.store in = \tkz@tkzXh@posgrad,
+ left/.store in = \tkz@tkzXh@left,
+ right/.store in = \tkz@tkzXh@right,
+ color/.store in = \tkz@tkzXh@color,
+ posgrad = {below=6 pt},
+ color = \tkz@mainlinecolor,
+ left = {},
+ right = {},
+ }
+\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
\def\tkz@xh[#1]#2{%
-\pgfkeys{/tkzxh/.cd,
- posgrad = {below=6 pt},
- color = \tkz@mainlinecolor,
- left = {},
- right = {}
-}
- \pgfqkeys{/tkzxh}{#1}
+ \pgfqkeys{/@tkzxh}{#1}
\begingroup
\foreach \xA/\RA/\sA/\xB/\RB/\sB in {#2}{%
\tkzDefPoint(\xA,0){deb}\tkzDefPoint(\xB,0){fin}
@@ -627,7 +615,7 @@
\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp at (deb){%
\tkz@showgrad{\xA}$\numprint{\tkz@result}$};\fi
-\ifx\RB\tkz@ComT
+\ifx\RB\tkz@ComT
\protected@edef\tkz@temp{\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp%
at (fin){%
\tkz@showgrad{\xB}$\numprint{\tkz@result}$};\fi
@@ -640,64 +628,65 @@
}%
\endgroup
}%
-%<--------------------------------------------------------------------------->
-% tangente obsolete
-%<--------------------------------------------------------------------------->
-\def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}}
-
-\def\tkz@Tan[#1]#2(#3)#{
-\pgfkeys{/tkztan/.cd,
-draw = false,
-with={},
-kr = 1,
-kl = 1}
-\pgfqkeys{/tkztan}{#1}
- \global\edef\tkz@opttan{#1}
- \FPeval\x{(#3)}%
- \FPeval\tkz@img{#2}
- \let\tkz@yy #2%
- \let\tkz@xx\x%
- \let\tkz@old@img\tkz@img
- \tkz@@Tan
-}
-\def\tkz@@Tan#1{%
-\FPdiv{\tkz@old@x}{\x}{1}
-\let\tkz@nexpty\tkz@img
-\tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1}
-\FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep}
-\FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep}
-\FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep}
-\FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep}
- % demi tgt--> droite
-\FPifzero{\tkz@tan@kr}%
-\else
-\FPadd{\x}{\tkz@xx}{0.000001}%
-\FPeval\tkz@img{\tkz@yy}%
-\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
-\FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
-\protected@edef\tkz@temp{
- \noexpand\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
- (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
-\fi
-% demi tgt --> gauche
-\FPifzero{\tkz@tan@kl}%
- \else
-\FPadd{\x}{\tkz@xx}{-0.000001}
-\FPeval\tkz@img{\tkz@yy}%
-\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
-\FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
- \protected@edef\tkz@temp{
- \noexpand
-\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
- (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
- \fi
-}
+% %<--------------------------------------------------------------------------->
+% % tangente obsolete
+% %<--------------------------------------------------------------------------->
+% \def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}}
+%
+% \def\tkz@Tan[#1]#2(#3)#{
+% \pgfkeys{/@tkztan/.cd,
+% draw = false,
+% with = {},
+% kr = 1,
+% kl = 1
+% }
+% \pgfqkeys{/@tkztan}{#1}
+% \global\edef\tkz@opttan{#1}
+% \FPeval\x{(#3)}%
+% \FPeval\tkz@img{#2}
+% \let\tkz@yy #2%
+% \let\tkz@xx\x%
+% \let\tkz@old@img\tkz@img
+% \tkz@@Tan
+% }
+% \def\tkz@@Tan#1{%
+% \FPdiv{\tkz@old@x}{\x}{1}
+% \let\tkz@nexpty\tkz@img
+% \tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1}
+% \FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep}
+% \FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep}
+% \FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep}
+% \FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep}
+% % demi tgt--> droite
+% \FPifzero{\tkz@tan@kr}%
+% \else
+% \FPadd{\x}{\tkz@xx}{0.000001}%
+% \FPeval\tkz@img{\tkz@yy}%
+% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
+% \FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
+% \protected@edef\tkz@temp{
+% \noexpand\draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
+% (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
+% \fi
+% % demi tgt --> gauche
+% \FPifzero{\tkz@tan@kl}%
+% \else
+% \FPadd{\x}{\tkz@xx}{-0.000001}
+% \FPeval\tkz@img{\tkz@yy}%
+% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
+% \FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
+% \protected@edef\tkz@temp{
+% \noexpand
+% \draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
+% (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
+% \fi
+% }
%<--------------------------------------------------------------------------->
% point d'une courbe obsolete
%<--------------------------------------------------------------------------->
-\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}}
+\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}}
\def\tkz@fctpt[#1]#2(#3)#{%
- \global\edef\tkz@optptfct{#1}
+ \global\edef\tkz@optptfct{#1}
\FPeval\x{(#3)}%
\FPeval\tkz@y{#2}
\tkz@defpoint
@@ -707,7 +696,7 @@
\protected@edef\tkz@temp{
\noexpand \tkzDrawPoint[\tkz@optptfct](#1)}\tkz@temp
\let\tkz@init@xstep\tkz@tmp@xstep
-}
+}
%<-------------------------- the end --------------------------------------->
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-fct.tlpobj new/tlpkg/tlpobj/tkz-fct.tlpobj
--- old/tlpkg/tlpobj/tkz-fct.tlpobj 2019-02-28 04:08:58.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-fct.tlpobj 2020-04-13 01:55:01.000000000 +0200
@@ -1,16 +1,16 @@
name tkz-fct
category Package
-revision 22831
+revision 54703
shortdesc Tools for drawing graphs of functions
relocated 1
longdesc The tkz-fct package is designed to give math teachers (and
longdesc students) easy access to programming graphs of functions with
longdesc TikZ and gnuplot.
-runfiles size=7
+runfiles size=6
RELOC/tex/latex/tkz-fct/tkz-fct.sty
catalogue-also pgf
+catalogue-contact-home http://altermundus.fr
catalogue-ctan /macros/latex/contrib/tkz/tkz-fct
-catalogue-date 2018-09-19 19:07:11 +0200
-catalogue-license lppl
-catalogue-topics graphics-plot
-catalogue-version 1.16c
+catalogue-license lppl1.3
+catalogue-topics graphics graphics-plot pgf-tikz
+catalogue-version 1.3c
++++++ tkz-orm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-orm.doc.tlpobj new/tlpkg/tlpobj/tkz-orm.doc.tlpobj
--- old/tlpkg/tlpobj/tkz-orm.doc.tlpobj 2019-02-28 04:08:59.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-orm.doc.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name tkz-orm.doc
category Package
-revision 39408
+revision 54512
shortdesc doc files of tkz-orm
relocated 1
docfiles size=120
++++++ tkz-orm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-orm.tlpobj new/tlpkg/tlpobj/tkz-orm.tlpobj
--- old/tlpkg/tlpobj/tkz-orm.tlpobj 2019-02-28 04:08:59.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-orm.tlpobj 2020-03-24 02:04:08.000000000 +0100
@@ -1,6 +1,6 @@
name tkz-orm
category Package
-revision 39408
+revision 54512
shortdesc Create Object-Role Model (ORM) diagrams
relocated 1
longdesc The package provides styles for drawing Object-Role Model (ORM)
@@ -9,7 +9,6 @@
RELOC/tex/latex/tkz-orm/tkz-orm.sty
catalogue-contact-home http://purl.org/net/tkz-orm
catalogue-ctan /graphics/pgf/contrib/tkz-orm
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license gpl2lppl1.3
+catalogue-license gpl2 lppl1.3
catalogue-topics diagram pgf-tikz
catalogue-version 0.1.4
++++++ tkz-tab.doc.tar.xz ++++++
++++ 7943 lines of diff (skipped)
++++++ tkz-tab.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tkz-tab/tkz-tab.sty new/tex/latex/tkz-tab/tkz-tab.sty
--- old/tex/latex/tkz-tab/tkz-tab.sty 2019-01-21 00:20:10.000000000 +0100
+++ new/tex/latex/tkz-tab/tkz-tab.sty 2020-04-12 00:30:16.000000000 +0200
@@ -1,41 +1,21 @@
-% Copyright (C) 2009 Alain Matthes
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License , either version 1.3
-% of this license or (at your option) any later version and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/generic/pgf/licenses/LICENSE for more details.%
-% See http://www.latex-project.org/lppl.txt for details.
-%
-%
-% ``tkz-tab'' package for create tables of signs and variations.
-%
-%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % tkz-tab.sty encodage : utf8 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % Créé par Alain Matthes le 04-01-2007. %
- % CTAN version %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% Objet : Création de tableaux (signes et variations)
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+% Objet : Création de tableaux (signes et variations)
%<----------------------------------------------------------------------------->
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-tab}[2019/01/19 v1.4e variations (ctan version) ]
+\ProvidesPackage{tkz-tab}[2020/04/08 v2.1c variations (ctan version)]
%<----------------------------------------------------------------------------->
-\ifx\e@alloc\@undefined
- \RequirePackage{etex}
-\fi
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2005/11/25]
-\RequirePackage{tikz}[2008/01/15]
+\RequirePackage{tikz}
\usetikzlibrary{arrows,patterns}
-
%<------------------------------ Initialisation ----------------------------->
%<------------------------------ Styles ----------------------------->
@@ -204,7 +184,7 @@
\tikzset{arrow style/.append style = {\cmdTAB@TTS@arrowcolor,
> = \cmdTAB@TTS@arrowstyle,
line width = \cmdTAB@TTS@arrowlinewidth}}
-\tikzset{node style/.append style = { fill = \cmdTAB@TTS@backgroundcolor}}
+\tikzset{node style/.append style = { fill = fondpaille}}
\tikzset{fondC/.style={fill = \cmdTAB@TTS@backgroundcolor}}
\tikzset{fondL/.style={fill = \cmdTAB@TTS@backgroundcolor}}
\tikzset{fondT/.style={fill = \cmdTAB@TTS@backgroundcolor}}
@@ -414,8 +394,9 @@
\define@boolkey[TAB]{TL}{help}[true]{}
\presetkeys[TAB]{TL}{help=false}{}
%<--------------------------------------------------------------------------->
-\newcommand*{\tkzTabLine}[2][]{%
-\setkeys[TAB]{TL}{#1}%
+\newcommand{\tkzTabLine}[2][]{%
+ \makeatletter
+ \setkeys[TAB]{TL}{#1}%
\setcounter{tkz@cnt@lg}{\thetkz@cnt@line}%
\stepcounter{tkz@cnt@line}%
\setcounter{tkz@cnt@lgnext}{\thetkz@cnt@line}%
@@ -424,16 +405,16 @@
\setcounter{tkz@cnt@impair}{1}%
\ifTAB@TL@help%
\foreach \x in {#2}
- {%
+ {
\ifthenelse{\isodd{\value{tkz@cnt@cl}}}{%
\path (N\thetkz@cnt@impair\thetkz@cnt@lg) --%
- node[draw,inner sep =1pt,midway,fill=yellow] {%
- \footnotesize Z\thetkz@cnt@impair\thetkz@cnt@lg}%
+ node[draw,inner sep =1pt,midway,fill=yellow]%
+ {\footnotesize Z\thetkz@cnt@impair\thetkz@cnt@lg}%
(N\thetkz@cnt@impair\thetkz@cnt@lgnext);
\stepcounter{tkz@cnt@impair}}{%
\path (M\thetkz@cnt@pair\thetkz@cnt@lg)--%
- node[draw,inner sep =1pt,midway,fill=yellow] {%
- \footnotesize S\thetkz@cnt@pair\thetkz@cnt@lg}%
+ node[draw,inner sep =1pt,midway,fill=yellow]%
+ {\footnotesize S\thetkz@cnt@pair\thetkz@cnt@lg}%
(M\thetkz@cnt@pair\thetkz@cnt@lgnext);
\stepcounter{tkz@cnt@pair}}%
\stepcounter{tkz@cnt@cl}%
@@ -492,6 +473,7 @@
\stepcounter{tkz@cnt@cl}%
}% end foreach
\fi
+ \makeatother
}%
%<--------------------------------------------------------------------------->
%<---------------------------- Variations ------------------------------->
@@ -499,6 +481,7 @@
%<----------------------- Macro pour tracer une flÚche ---------------------->
%<--------------------------------------------------------------------------->
\newcommand*{\tkzDrawArrow}{%
+\makeatletter
\ifthenelse{\equal{\thetkz@cnt@zone}{0}}{%
\setcounter{tkz@cnt@pred}{\thetkz@cnt@cl}
\addtocounter{tkz@cnt@pred}{-1}
@@ -517,6 +500,7 @@
}{%
\setcounter{tkz@cnt@zone}{0}%
}%
+\makeatother
}%
%<--------------------------------------------------------------------------->
\define@boolkey[TAB]{VA}{help}[true]{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-tab.tlpobj new/tlpkg/tlpobj/tkz-tab.tlpobj
--- old/tlpkg/tlpobj/tkz-tab.tlpobj 2019-02-28 04:09:00.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-tab.tlpobj 2020-04-12 01:55:57.000000000 +0200
@@ -1,17 +1,19 @@
name tkz-tab
category Package
-revision 49775
+revision 54662
shortdesc Tables of signs and variations using PGF/TikZ
relocated 1
longdesc The package provides comprehensive facilities for preparing
longdesc lists of signs and variations, using PGF. The package
-longdesc documentation requires the tkz-doc bundle.
+longdesc documentation requires the tkz-doc bundle. This package has
+longdesc been taken temporarily out of circulation to give the author
+longdesc time to investigate some problems.
runfiles size=12
RELOC/tex/latex/tkz-tab/tkz-tab.sty
catalogue-also tableaux tableauvariations tablor tabvar
+catalogue-contact-home http://altermundus.fr
catalogue-contact-repository https://github.com/tkz-sty
catalogue-ctan /macros/latex/contrib/tkz/tkz-tab
-catalogue-date 2019-01-20 08:40:22 +0100
-catalogue-license lppl1.3gpl
-catalogue-topics maths-tabvar pgf-tikz
-catalogue-version 1.4e
+catalogue-license lppl1.3 gpl
+catalogue-topics maths maths-tabvar graphics pgf-tikz
+catalogue-version 2.1c
++++++ tlc-article.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/GettingStarted.tex new/doc/latex/tlc-article/GettingStarted.tex
--- old/doc/latex/tlc-article/GettingStarted.tex 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/GettingStarted.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,409 +0,0 @@
-\documentclass[12pt]{tlc-article}
-
-% ------------------------------------------------------------------------------
-% \makeatletter is used so we can reference commands and definitions defined by
-% tlc-article, which are all prefaced with tlc@.
-\makeatletter
-
-% ------------------------------------------------------------------------------
-
-\def\tlcProduct{tlc-article}
-
-\def\tlcA{\tlcDarkblue{\tlcProduct}}
-
-\def\tlcAL{\tlcDarkblue{\tlc@additionalLayout}}
-\def\tlcBL{\tlcDarkblue{tlcBeginLandscape}}
-\def\tlcDB{\tlcDarkblue{tlcDarkblue}}
-\def\tlcEL{\tlcDarkblue{tlcEndLandScape}}
-\def\tlcHF{\tlcDarkblue{\tlc@headerFooter}}
-\def\tlcLG{\tlcDarkblue{\tlc@logoFile}}
-\def\tlcNCT{newcolumn type: \tlcDarkblue{L, C} \& \tlcDarkblue{R}}
-\def\tlcTOC{\tlcDarkblue{tlcTitlePageAndTableOfContents}}
-\def\tlcVE{\tlcDarkblue{\tlc@versionFile}}
-
-\def\tlcVC{\tlcDarkblue{tlc@version}}
-\def\tlcDC{\tlcDarkblue{tlc@date}}
-\def\tlcSC{\tlcDarkblue{tlc@status}}
-\def\tlcIC{\tlcDarkblue{tlc@instatution}}
-\def\tlcPC{\tlcDarkblue{tlc@permission}}
-
-\def\kpse{\$(kpsewhich -var-value TEXMFLOCAL)}
-\def\texDist{\kpse}
-\def\tlcDist{/tex/latex/\tlcProduct}
-\def\tlcGlobalDist{\texDist\tlcDist}
-
-\def\tlcHome{\$HOME}
-\def\tlcMyDoc{\tlcHome/mydoc}
-
-\def\gitHub{GitHub.com}
-\def\gitHubUrl{http://\gitHub}
-
-\def\tlcRepo{git@\gitHub:Traap/\tlcProduct.git}
-
-\def\tlcPkgFile{data/required-packages.csv}
-\def\tlcNote{\tlcDarkblue{Note}}
-
-% ------------------------------------------------------------------------------
-
-\begin{document}
-
-% ------------------------------------------------------------------------------
-
-\tlcTitlePageAndTableOfContents
- {Getting Started}
- {Gary Allan Howard}
- {Getting Started guide covers how to install \tlcA\ both globally and
- locally, describes the general use case, how to customize your \tlcA\
- environment, describes the commands \tlcA\ implements, and reveals the
- packages \tlcA\ depends upon.}
-
-% ------------------------------------------------------------------------------
-
-\section{Installation}
-This section describes how to install \tlcA\ either globally to make it
-available to your \LaTeX\ environment or locally to the document you are
-authoring. And, this section identifies the prerequisites you must meet in
-order to clone a repository from GitHub.com and install software on your
-computer.
-
-\subsection{Prerequisites}
-The following prerequisites are needed.
-\begin{description}[style=nextline]
- \item[Administrative privilege] You will need administrative privileges to
- install \tlcA\ globally because `sudo' is used.
-
- \item[SSH key] You will need your private key to access \gitHub. Please refer
- to \url{http://help.github.com/articles/generating-an-ssh-key} for
- instructions on `Generating an SSH key'.
-
- \item[Enable your SSH key] The following instructions enable your SSH key so
- you to not have to enter the passphrase for each git command.
-
- \begin{enumerate}
- \item eval \$(ssh-agent -s)
- \item ssh-add ~/.ssh/your-private-key
- \item enter your passphrase
- \end{enumerate}
-
-\end{description}
-
-\subsection{Local installation}
-A local installation is done by installing \tlcA\ into
-/the/path/to/your/document. Assuming your document is located at \tlcMyDoc\ the
-following shell commands will make \tlcA\ available to your document.
-
-\begin{enumerate}
- \item cd \tlcHome
- \item git clone \tlcRepo\
- \item cd \tlcProduct\
- \item mkdir \tlcMyDoc
- \item cp -v \tlcProduct.cls \tlcMyDoc/.
-\end{enumerate}
-
-\clearpage
-\subsection{Global installation}
-A global installation is done by installing \tlcA\ into your /path/to/your/texmf
-directory. Assuming a TexLive installation exists at \texDist\ the following
-shell commands will make \tlcA\ available to your \LaTeX\ environment.
-
-\begin{enumerate}
- \item cd \tlcHome
- \item git clone \tlcRepo\
- \item cd \tlcProduct\
- \item sudo mkdir -p \tlcGlobalDist
- \item sudo mv -v \tlcProduct.cls \tlcGlobalDist/.
- \item sudo mktexlsr \texDist\
-\end{enumerate}
-
-\bigskip
-\tlcNote\ You may remove your local installation by removing \tlcA.
-
-% ------------------------------------------------------------------------------
-\clearpage
-\section{General Use Case}
-The goal of \tlcA\ is to simplify document layout. \tlcA\ orchestrates a
-logical arrangement for document header, footer, author, abstract, table of
-contents, and margins. The following sections outline the default
-implementation for each part \tlcA\ organizes.
-
-\tlcNote\ This document was typeset using the instructions provided throughout
-this section.
-
-\subsection{Document Layout}
-\begin{figure}[h]
- \centering
- \includegraphics{images/titlepage.png}
- \caption{Document Layout}
- \label{fig:layout}
-\end{figure}
-\subsection{documentclass \tlcA}
-\tlcA\ extends the article document class. \tlcA\ provide options directly to
-the article document class. As an example, the Author can specify the font as
-follows:
-
-\begin{lstlisting}[basicstyle=\tiny]
- \documentclass[12pt]{tlc-article}
-\end{lstlisting}
-
-\subsection{Title, Author \& Abstract} \label{sec:TAA}
-\tlcA\ has a macro \tlcTOC\ that can be used to set the document title, document
-author, document abstract, and establish the Table of Contents. The sample
-below reveals how to use \tlcTOC.
-
-\begin{lstlisting}[basicstyle=\tiny]
- \tlcTitlePageAndTableOfContents
- {Document Title}
- {Document Article}
- {Document Abstract}
-\end{lstlisting}
-
-\subsection{Table of Contents}
-The Table of Contents immediately follows the document abstract on page 1, uses
-dark blue for content, dots separate table of contents sections and page number,
-and uses roman numerals.
-
-\subsection{Header \& Footer}
-fancyhdr is used to render the header and footer. The Author can override the
-\tlcA\ by providing an implementation in \tlcHF\, or augment \tlcA\
-application by providing \tlcVE. The sections below show the placement \tlcA\
-uses when writing objects, and where the objects are defined.
-
-\tlcNote\ \tlcA\ ignors \tlcVE\ when \tlcHF\ is defined.
-
-\subsubsection*{Header}
-
-\begin{description}
- \item[lhead] When \tlcLG\ is found, logo.
- \item[chead] Document Title
- \item[rhead] When \tlcVE\ is present, status, date, and version columns.
-\end{description}
-
-\subsubsection*{Footer}
-
-\begin{description}
- \item[lfoot] When \tlcVE\ is present, instatution column.
- \item[cfoot] When \tlcVE\ is present, permission column.
- \item[rfoot] Page 1 of N.
-\end{description}
-
-\subsubsection*{Rule width}
-A 0.1pt rule witdh is placed below the document header and above the document
-footer.
-
-% ------------------------------------------------------------------------------
-
-\clearpage
-\section{Customization}
-This section describes how \tlcA\ can be customized by using the file-hooks
-\tlcA\ check for. \tlcA\ default implementation will be used when the
-file-hooks are now found.
-
-% ------------------------------------------------------------------------------
-
-\subsection{\tlcAL}
-\tlcA\ will use whatever \LaTeX\ definitions are found in \tlcAL\ when it
-exists. The file-check is shown
-below:
-
-\begin{lstlisting}[basicstyle=\tiny]
- \IfFileExists{docstyle/additional-layout.tex}
- {\input{docstyle/additional-layout.tex}}
- {}
-\end{lstlisting}
-
-% ------------------------------------------------------------------------------
-
-\subsection{\tlcHF}
-In the absence of \tlcAL\, \tlcA\ has a builtin header and footer strategy that
-is base on \textit{fancyhdr}, \textit{titling}, and \textit{lastpage} \LaTeX\
-packages. The default implementation is show below:
-
-\begin{lstlisting}[basicstyle=\tiny]
- \IfFileExists{\tlc@logoFile}
- { % Typeset the logo in the left side of the document header.
- \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}
- }
- {% Else: no operation because tlc@logoFile does not exist.
- }
- % Typeset the title in the center of the document header.
- \chead{\large{\thetitle}}
- % Typeset version information in the right side of the document header.
- \IfFileExists{\tlc@versionFile}
- {
- % document status, document date and document version.
- \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}
- % document owner. This maybe a person or company name.
- \lfoot{\tiny \tlc@instatution}
- % document license. This maybe a license or word like confidential.
- \cfoot{\tiny \tlc@permission}
- }
- {% Else: no operation because tlc@versionFile does not exist.
- }
- \renewcommand{\headrulewidth}{0.1pt}
- % eliminate head height too small warning, which is occurring because
- % we are using multiple lines in our header.
- \setlength\headheight{52pt}
- % % footer applied to all pages.
- \rfoot{\tiny{page \thepage~of~\pageref{LastPage}}}
- \renewcommand{\footrulewidth}{0.1pt}
- % we want our header and footer to remain consistent with a table of
- % contents that span multiple pages.
- \AtBeginDocument{\addtocontents{toc}{\protect\thispagestyle{fancy}}}
-\end{lstlisting}
-
-The default implementation can be overridden by defining \tlcHF.
-
-\tlcNote\ When \tlcHF\ exists and is empty, your document will be typeset
-with the defaults from document-class \tlcDarkblue{article}.
-
-% ------------------------------------------------------------------------------
-
-\clearpage
-\subsection{\tlcVE} \label{sec:version}
-\tlcA\ will populate the builtin header and footer with information extracted
-from \tlcVE\ when it is present. \tlcVE\ is a comma-separated-variable file
-that uses the pipe character as the field delimiter. \tlcVE\ uses the following
-column names:
-
-\begin{description}[style=nextline]
- \item[version] The version value is typeset in the rhead area. This field is
- used to convey the version the document was at the date it reached its
- current state.
-
- \item[date] The date value is typeset in the rhead area. This field is used
- to communicate when the document transitioned into its current state.
-
- \item[status] The status value is typeset in the rhead area. This field is
- used to convey the document state such as Approved, Draft, Effective, or
- Obsolete.
-
- \item[instatution] The institution value is typeset in the lfoot area. This
- field is used to tell the reader the author name or company name.
-
- \item[permission] The permission value is typeset in the cfoot area. This
- field is used to identify confidentiality or a particular license.
-
-\end{description}
-
-The extaction methods are shown below.
-\begin{lstlisting}[basicstyle=\tiny]
- % Extract document status, document date and document version from
- % \tlc@versionFile.
- % Argument:
- % 1 - the column name to extract from the data file.
- \newcommand{\tlcVersionPart}[1]{
- \csvreader[separator=pipe]
- {\tlc@versionFile}{
- 1=\version,
- 2=\date,
- 3=\status,
- 4=\instatution,
- 5=\permission
- }{#1}
- }%
-
- % Define extractions macros when \tlc@versionFile exists.
- \IfFileExists{\tlc@versionFile}
- {
- \def\tlc@version{\tlcVersionPart{\version}}
- \def\tlc@date{\tlcVersionPart{\date}}
- \def\tlc@status{\tlcVersionPart{\status}}
- \def\tlc@instatution{\tlcVersionPart{\version}}
- \def\tlc@permission{\tlcVersionPart{\version}}
- }
- {% Else: no operation because tlc@versionFile does not exist.
- }
-\end{lstlisting}
-
-% ------------------------------------------------------------------------------
-
-\subsection{\tlcLG}
-\tlcA\ will typeset the lhead area with \tlcLG\ when it is present. Make sure
-your logo's height is not larger than 34pt to avoid `Package Fancyhdr Warning:
-\\headheight is to small' warning.
-
-% ------------------------------------------------------------------------------
-
-\clearpage
-\section{Definitions \& Commands}
-\subsection{\tlcBL}
-Page layout is rotated 90\textdegree\ clockwise resulting in a landscape page
-orientation. Landscape orientation remains active until \tlcEL.
-
-\subsection{\tlcEL}
-Page layout is returned to portrate orientation when \tlcEL\ is reached.
-
-\subsection{\tlcDB}
-\tlcDB\ is used throughout this document to render text using rbg\{0,0,0.5\}.
-\tlcDB\ is safe to use within your document.
-
-\subsection{\tlcTOC}
-\tlcTOC\ creates the document layout showen in Figure \ref{fig:layout}. Section
-\ref{sec:TAA} shows an example implementation.
-
-\subsection{\tlcNCT}
-New \tlcNCT\ are Left, Center, and Right, respectively are
-designed to use with longtable. Data is wrapped within a table cell. The
-parameter defines the column width. As an example, L{2cm} yields a Left
-aligned, ragged right, wrapped text within a 2cm wide cell.
-
-\begin{lstlisting}[basicstyle=\tiny]
-\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}
-\end{lstlisting}
-
-\subsection{\tlcAL}
-\tlcAL\ is an architectural hook the Author should use when it becomes necessary
-to use packages not provided by \tlcA\, and to design commands that are specific
-to your document.
-
-\subsection{\tlcHF}
-\tlcHF\ is an architectural hook the Author should use to completely override
-the document layout \tlcA\ implements.
-
-\subsection{\tlcVE}
-\tlcVE\ is by used \tlcA\ to populate the document header \& footer. Refer to
-section \ref{sec:version} for \tlcVE\ definitions. \tlcVE\ is not
-used by \tlcA\ when \tlcHF\ is define. However, you might want to use the
-version hook by defining \tlcVE\ and using the commands below to extract data
-from \tlcVE in your \tlcHF.
-\begin{enumerate}
- \item \tlcVC\
- \item \tlcDC\
- \item \tlcSC\
- \item \tlcIC\
- \item \tlcPC\
-\end{enumerate}
-
-\subsection{\tlcLG}
-\tlcLG\ is used to place your logo in the header created by \tlcA.
-% ------------------------------------------------------------------------------
-
-\clearpage
-\section{Required Packages}
-This section documents the dependencies of the required package tlc-article has.
-Package names are listed in alphabetical order. A complete description of each
-package is found at \url{http://www.ctan.org/}. At this writing, you can type in the
-package name and press the search button to learn more about each package.
-
-% Define the column names used by csvreader when reading \packageFile.
-\csvnames{tlcPkgNames}{
- 1=\name
- ,2=\description
-}
-
-% Define the table style used to report the required package names and
-% descriptions.
-\csvstyle{tlcPkgStyle}{
- longtable=|L{3cm}|L{12cm}|
- ,table head=\hline Name & Description\\\hline\hline\endhead
- ,late after line=\\\hline
- ,tlcPkgNames
-}
-
-% Render pckFile using pckStyle as a longtable.
-\csvreader[tlcPkgStyle, separator=pipe]{\tlcPkgFile}{}{\name & \description}
-% ------------------------------------------------------------------------------
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/GettingStarted.texx new/doc/latex/tlc-article/GettingStarted.texx
--- old/doc/latex/tlc-article/GettingStarted.texx 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/GettingStarted.texx 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-\input{GettingStarted.tex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/README.md new/doc/latex/tlc-article/README.md
--- old/doc/latex/tlc-article/README.md 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/README.md 2019-06-23 22:57:37.000000000 +0200
@@ -1,27 +1,26 @@
-#![](data/logo.png)
-The **tlc_article** repository uses a SCRUM framework adapted to standard GitHub
-tooling. **tlc_article** is integrated with Travis-ci.org for continuous
-integration and AllanConsulting.slack.com for centralized notification.
+[tlc-article](data/logo.png)
+
+---
+The goal of **tlc-article** is to simplify document layout. **tlc-article**
+orchestrates a logical arrangement for document header, footer, author,
+abstract, table of contents, and margins.
+[tlc-article.pdf](doc/tlc-article.pdf) is a document instantiated
+using **tlc-article.cls**.
## Installation are done Locally or Globally
### Local Installation
```bash
-$ cd $HOME
-$ git clone git@github.com:Traap/tlc-article.git
-$ cd tlc-article
-$ cp -v tlc-article.cls $HOME/mydoc
-$ cp -v tlc-article.cls $HOME/mydoc/.
+cd $HOME
+git clone git@github.com:Traap/tlc-article.git
+cd tlc-article
+cp -v tlc-article.cls $HOME/mydoc
+cp -v tlc-article.cls $HOME/mydoc/.
```
### Global Installation
```bash
-$ cd $HOME
-$ git clone git@github.com:Traap/tlc-article.git
-$ cd tlc-article
-$ sudo mkdir -p $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article
-$ sudo mv -v tlc-article.cls $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article/.
-$ sudo mktexlsr $(kpsewhich -var-value TEXMFLOCAL)
+cd $HOME
+git clone git@github.com:Traap/tlc-article.git
+cd tlc-article
+./bin/distribute tlc-article.cls
```
-# Project Management
-Please refer to my [Lightweight Project Mangement](https://github.com/Traap/lpm)
-for the project management strategy I use.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/bin/deploy new/doc/latex/tlc-article/bin/deploy
--- old/doc/latex/tlc-article/bin/deploy 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/bin/deploy 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Deploy a new LaTeX style or package.
+#
+# Usage:
+# deploy tlc-article.cls
+#
+# Note:
+# I use this script to test my deployment before publishing with CTAN.
+# ------------------------------------------------------------------------------
+main() {
+ mkdir -vp $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/${1%.}
+ cp -v $1 $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/${1%.}/.
+ mktexlsr $(kpsewhich -var-value TEXMFLOCAL)
+}
+
+# ------------------------------------------------------------------------------
+# Kick start start this script.
+# ------------------------------------------------------------------------------
+main $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/data/additional-layout.tex new/doc/latex/tlc-article/data/additional-layout.tex
--- old/doc/latex/tlc-article/data/additional-layout.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/data/additional-layout.tex 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1,65 @@
+% This use case demonstrates tlc-article being extended. All definitions are
+% process during preamble phase. In other words, before your \begin{document}
+% statement.
+
+% ------------------------------------------------------------------------------
+% \makeatletter is used so we can reference commands and definitions defined by
+% tlc-article, which are all prefaced with tlc@.
+\makeatletter
+
+% ------------------------------------------------------------------------------
+% tlc-article.tex (Getting Starting) definitions.
+
+\def\tlcProduct{tlc-article}%
+
+\def\tlcA{\tlcDarkblue{\tlcProduct}}%
+
+\def\tlcAL{\tlcDarkblue{\tlc@additionalLayout}}%
+\def\tlcBL{\tlcDarkblue{tlcBeginLandscape}}%
+\def\tlcDB{\tlcDarkblue{tlcDarkblue}}%
+\def\tlcEL{\tlcDarkblue{tlcEndLandScape}}%
+\def\tlcHF{\tlcDarkblue{\tlc@headerFooter}}%
+\def\tlcLG{\tlcDarkblue{\tlc@logoFile}}%
+\def\tlcNCT{newcolumn type: \tlcDarkblue{L, C} \& \tlcDarkblue{R}}%
+\def\tlcTOC{\tlcDarkblue{tlcTitlePageAndTableOfContents}}%
+\def\tlcVE{\tlcDarkblue{\tlc@versionFile}}%
+
+\def\tlcVC{\tlcDarkblue{tlc@version}}%
+\def\tlcDC{\tlcDarkblue{tlc@date}}%
+\def\tlcSC{\tlcDarkblue{tlc@status}}%
+\def\tlcIC{\tlcDarkblue{tlc@instatution}}%
+\def\tlcPC{\tlcDarkblue{tlc@permission}}%
+
+\def\kpse{\$(kpsewhich -var-value TEXMFLOCAL)}%
+\def\texDist{\kpse}%
+\def\tlcDist{/tex/latex/\tlcProduct}%
+\def\tlcGlobalDist{\texDist\tlcDist}%
+
+\def\tlcHome{\$HOME}%
+\def\tlcMyDoc{\tlcHome/mydoc}%
+
+\def\gitHub{GitHub.com}%
+\def\gitHubUrl{http://\gitHub}%
+
+\def\tlcRepo{git@\gitHub:Traap/\tlcProduct.git}%
+
+\def\tlcPkgFile{data/required-packages.csv}%
+\def\tlcNote{\tlcDarkblue{Note}}%
+
+% ------------------------------------------------------------------------------%
+% Define the column names used by csvreader when reading \packageFile.
+\csvnames{tlcPkgNames}{
+ 1=\name
+ ,2=\description
+}
+
+% Define the table style used to report the required package names and
+% descriptions.
+\csvstyle{tlcPkgStyle}{
+ longtable=|L{3cm}|L{12cm}|
+ ,table head=\hline Name & Description\\\hline\hline\endhead
+ ,late after line=\\\hline
+ ,tlcPkgNames
+}
+
+% ------------------------------------------------------------------------------%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/data/required-packages.csv new/doc/latex/tlc-article/data/required-packages.csv
--- old/doc/latex/tlc-article/data/required-packages.csv 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/data/required-packages.csv 2019-06-23 22:57:37.000000000 +0200
@@ -4,10 +4,17 @@
csvsimple | The package provides a simple \LaTeX\ interface for the processing of files with comma separated values (CSV); it relies on the key value syntax supported by pgfkeys to simplify usage.
enumitem | This package provides user control over the layout of the three basic list environments: enumerate, itemize and description.
fancyhdr | The package provides extensive facilities, both for constructing headers and footers, and for controlling their use (for example, at times when \LaTeX\ would automatically change the heading style in use).
+fontenc | The package allows the user to select font encodings, and for each encoding provides an interface to `font-encoding specific' commands for each font.
fontenc | The package alows the user to select font encodings, and for each encoding provides an interface to `font-encoding specific' commands for each font.
+geometry | The package provides an easy and flexible user interface to customize page layout, implementing auto-centering and auto-balancing mechanisms so that the users have only to give the least description for the page layout.
geometry | The package provides an easy and flexible user interface to customize page layout, implementing autocentering and auto-balancing mechanisms so that the users have only to give the least description for the page layout.
+glossaries | The glossaries package supports acronyms and multiple glossaries, and has provision for operation in several languages.
graphicx | The package builds upon the graphics package, providing a key-value interface for optional arguments to the `includegraphics' command. This interface provides facilities that go far beyond what the graphics package offers on its own.
hyperref | The hyperref package is used to handle cross-referencing commands in \LaTeX\ to produce hypertext links in the document.
+hyperref | The package is used to handle cross-referencing commands in \LaTeX\ to produce hypertext links in the document.
+inputenc | The package translates various standard and other input encodings into a \LaTeX\ internal language. The internal langage is expressed entierly in \TeX\'s base encoding (standard ASCII printable characters, carriage control tokes and \TeX\ control sequences, the later mostly defined by \LaTeX).
+inputenc | The package translates various standard and other input encodings into a \LaTeX\ internal language. The internal language is expressed entirely in \TeX\'s base encoding (standard ASCII printable characters, carriage control tokens and \TeX\ control sequences, the latter mostly defined by \LaTeX).
+jancyhdr | The package provides extensive facilities, both for constructing headers and footers, and for controlling their use (for example, at times when \LaTeX\ would automatically change the heading style in use).
lastpage | Reference the number of pages in your \LaTeX\ document through the introduction of a new label which can be referenced like `gpageref{LastPage}' to give a reference to the last page of a document.
listings | The package enables the user to typeset programs (programming code) within \LaTeX; the source code is read directly by \TeX\ -- no frontend processor is needed.
lmodern | Latin modern fonts
@@ -17,9 +24,11 @@
parskip | Simply changing `gparskip' and `parindent' leaves a layout that is untidy; this package (though it is no substitute for a properly-designed class) helps alleviate this untidiness.
pdflscape | The package adds PDF support to the landscape environment of package lscape, by setting the PDF /Rotate page attribute.
pdfpages | This package simplifies the inclusion of external multipage PDF documents in \LaTeX\ documents.
+pdf-pie | Ths package provides the means to draw pie (and variant charts) using PGF/TikZ.
spverbatim | The spverbatim package provides an `gspverb' macro that is analogous to 'verb' and an spverbatim environment that is analogous to verbatim with the difference being that `spverb' and spverbatim allow \LaTeX\ to break lines at space characters.
tabularx | The package defines an environment tabularx, an extension of tabular which has an additional column designator, X, which creates a paragraph-like column whose width automatically expands so that the declared width of the environment is filled.
textcomp | The package supports the Text Companion fonts, which provide many text symbols (such as baht, bullet, copyright, musicalnote, onequarter, section, and yen), in the TS1 encoding.
titling | The titling package provides control over the typesetting of the `gmaketitle' command and `thanks' commands, and makes the `title', `author' and `date' information permanently available.
tocloft | Provides control over the typography of the Table of Contents, List of Figures and List of Tables, and the ability to create new `List of ...'. The ToC `gparskip' may be changed.
+todonotes | The package lets the user mark things to do later, in a simple and visually appealing way. The package takes several options to enable customization / fine-tuning of the visual appearance.
xcolor | The package starts from the basic facilities of the color package, and provides easy driver-independent access to several kinds of color tints, shades, tones, and mixes of arbitrary colors.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/data/version.csv new/doc/latex/tlc-article/data/version.csv
--- old/doc/latex/tlc-article/data/version.csv 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/data/version.csv 2019-06-23 22:57:37.000000000 +0200
@@ -1,2 +1,2 @@
-version | date | status | institution | permission
-v1.0.10 | May 30th, 2018 | Released | Traap | BSD-3-Clause
+version | date | status | institution | permission
+v1.0.17 | June 20th, 2019 | Released | Traap | BSD-3-Clause
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/doc/sprint.md new/doc/latex/tlc-article/doc/sprint.md
--- old/doc/latex/tlc-article/doc/sprint.md 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/doc/sprint.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-| Fcevag | Fgneg | Raq | Cbvagf | Vffhrf |
-| ------ | ---------- | ---------- | ------: | ------: |
-| i1.0.6 | 2018-01-01 | 2018-03-18 | 1 | 1 |
-| i1.0.5 | 2018-01-01 | 2018-03-17 | 5 | 5 |
-| i1.0.4 | 2017-01-17 | 2017-02-02 | 11 | 6 |
-| i1.0.3 | 2017-01-14 | 2017-01-16 | 9 | 5 |
-| i1.0.2 | 2017-01-11 | 2017-01-13 | 5 | 3 |
-| i1.0.1 | 2017-01-08 | 2017-01-10 | 9 | 8 |
-| i1.0.0 | 2017-01-05 | 2017-01-07 | 10 | 5 |
Binary files old/doc/latex/tlc-article/doc/tlc-article.pdf and new/doc/latex/tlc-article/doc/tlc-article.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/tlc-article.tex new/doc/latex/tlc-article/tlc-article.tex
--- old/doc/latex/tlc-article/tlc-article.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/tlc-article.tex 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1,385 @@
+\documentclass[12pt]{tlc-article}
+
+% ------------------------------------------------------------------------------
+\begin{document}
+
+% ------------------------------------------------------------------------------
+\tlcTitlePageAndTableOfContents
+ {tlc-article}
+ {Gary Allan Howard}
+ {The \tlcA\ `Getting Started Guide' covers how to install \tlcA\ both globally
+ and locally, describes the general use case, how to customize your \tlcA\
+ environment, describes the commands \tlcA\ implements, and reveals the
+ packages \tlcA\ depends upon.}
+
+% ------------------------------------------------------------------------------
+\section{Installation}
+This section describes how to install \tlcA\ either globally to make it
+available to your \LaTeX\ environment or locally to the document you are
+authoring. And, this section identifies the prerequisites you must meet in
+order to clone a repository from GitHub.com and install software on your
+computer.
+
+% ------------------------------------------------------------------------------
+\subsection{Prerequisites}
+The following prerequisites are needed.
+\begin{description}[style=nextline]
+ \item[Administrative privilege] You will need administrative privileges to
+ install \tlcA\ globally because `sudo' is used.
+
+ \item[SSH key] You will need your private key to access \gitHub. Please refer
+ to \url{http://help.github.com/articles/generating-an-ssh-key} for
+ instructions on `Generating an SSH key'.
+
+ \item[Enable your SSH key] The following instructions enable your SSH key so
+ you to not have to enter the passphrase for each git command.
+\end{description}
+
+\begin{lstlisting}[language=bash]
+eval \$(ssh-agent -s)
+ssh-add ~/.ssh/your-private-key
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{Local installation}
+A local installation is done by installing \tlcA\ into
+/the/path/to/your/document. Assuming your document is located at \tlcMyDoc\ the
+following shell commands will make \tlcA\ available to your document.
+
+\begin{lstlisting}[language=bash]
+cd $HOME
+git clone git@GitHub.com:Traap/tlc-article.git
+cd tlc-article
+mkdir $HOME/mydoc
+cp -v tlc-article.cls $HOME/mydoc/.
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\clearpage
+\subsection{Global installation}
+A global installation is done by installing \tlcA\ into your /path/to/your/texmf
+directory. Assuming a TexLive installation exists at \texDist\ the following
+shell commands will make \tlcA\ available to your \LaTeX\ environment.
+
+\begin{lstlisting}[language=bash]
+cd $HOME
+git clone git@GitHub.com:Traap/tlc-article.git
+cd tlc-article
+sudo mkdir -p $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article
+sudo cp -v tlc-article.cls $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article/.
+sudo mktexlsr $(kpsewhich -var-value TEXMFLOCAL)
+\end{lstlisting}
+
+\bigskip
+
+\todo[inline]{%
+ \tlcNote: You may remove your local installation by removing \tlcA.%
+}%
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{General Use Case}
+The goal of \tlcA\ is to simplify document layout. \tlcA\ orchestrates a
+logical arrangement for document header, footer, author, abstract, table of
+contents, and margins. The following sections outline the default
+implementation for each part \tlcA\ organizes.
+
+\tlcNote\ This document was typeset using the instructions provided throughout
+this section.
+
+\subsection{Document Layout}
+\begin{figure}[h]
+ \centering
+ \includegraphics{images/titlepage.png}
+ \caption{Document Layout}
+ \label{fig:layout}
+\end{figure}
+
+% ------------------------------------------------------------------------------
+\subsection{documentclass \tlcA}
+\tlcA\ extends the article document class. \tlcA\ provide options directly to
+the article document class. As an example, the Author can specify the font as
+follows:
+
+\begin{lstlisting}[basicstyle=\tiny]
+ \documentclass[12pt]{tlc-article}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{Title, Author \& Abstract} \label{sec:TAA}
+\tlcA\ has a macro \tlcTOC\ that can be used to set the document title, document
+author, document abstract, and establish the Table of Contents. The sample
+below reveals how to use \tlcTOC.
+
+\begin{lstlisting}[basicstyle=\tiny]
+ \tlcTitlePageAndTableOfContents
+ {Document Title}
+ {Document Article}
+ {Document Abstract}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{Table of Contents}
+The Table of Contents immediately follows the document abstract on page 1, uses
+dark blue for content, dots separate table of contents sections and page number,
+and uses roman numerals.
+
+% ------------------------------------------------------------------------------
+\subsection{Header \& Footer}
+fancyhdr is used to render the header and footer. The Author can override the
+\tlcA\ by providing an implementation in \tlcHF\, or augment \tlcA\
+application by providing \tlcVE. The sections below show the placement \tlcA\
+uses when writing objects, and where the objects are defined.
+
+\bigskip
+
+\todo[inline]{%
+ \tlcNote: \tlcA\ ignores \tlcVE\ when \tlcHF\ is defined.
+}%
+
+
+
+% ------------------------------------------------------------------------------
+\subsubsection*{Header}
+\begin{description}
+ \item[lhead] When \tlcLG\ is found, logo.
+ \item[chead] Document Title
+ \item[rhead] When \tlcVE\ is present, status, date, and version columns.
+\end{description}
+
+% ------------------------------------------------------------------------------
+\subsubsection*{Footer}
+\begin{description}
+ \item[lfoot] When \tlcVE\ is present, institution column.
+ \item[cfoot] When \tlcVE\ is present, permission column.
+ \item[rfoot] Page 1 of N.
+\end{description}
+
+% ------------------------------------------------------------------------------
+\subsubsection*{Rule width}
+A 0.1pt rule width is placed below the document header and above the document
+footer.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{Customization}
+This section describes how \tlcA\ can be customized by using the file-hooks
+\tlcA\ check for. \tlcA\ default implementation will be used when the
+file-hooks are not found.
+
+\bigskip
+
+\todo[inline]{%
+ \tlcNote: \tlcA\ consumes \tlcAL\ \& \tlcHF\ during the preamble compilation
+ phase.
+}%
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcAL}
+\tlcA\ will use whatever \LaTeX\ definitions are found in \tlcAL\ when it
+exists. The file-check is shown
+below:
+
+\begin{lstlisting}[basicstyle=\tiny]
+ \IfFileExists{data/additional-layout.tex}
+ {\input{data/additional-layout.tex}}
+ {}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcHF}
+In the absence of \tlcAL\, \tlcA\ has a builtin header and footer strategy that
+is base on \textit{fancyhdr}, \textit{titling}, and \textit{lastpage} \LaTeX\
+packages. The default implementation is show below:
+
+\begin{lstlisting}[basicstyle=\tiny]
+\IfFileExists{\tlc@headerFooter}%
+{ % use the customer header and footer defined by \tlc@headerfooter
+ \input{\tlc@headerFooter}%
+}%
+{ % Else : header and footer applied to all pages.
+ \IfFileExists{\tlc@logoFile}%
+ { % Typeset the logo in the left side of the document header.
+ \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}%
+ }%
+ {% Else: no operation because tlc@logoFile does not exist.
+ }%
+ %
+ % Typeset the title in the center of the document header.
+ %
+ \chead{\large{\thetitle}}%
+ %
+ % Typeset version information in the right side of the document header.
+ %
+ \IfFileExists{\tlc@versionFile}%
+ {%
+ % document status, document date and document version.
+ \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}%
+ % document owner. This maybe a person or company name.
+ \lfoot{\tiny \tlc@institution}%
+ % document license. This maybe a license or word like confidential.
+ \cfoot{\tiny \tlc@permission}%
+ }%
+ {% Else: no operation because tlc@versionFile does not exist.
+ }%
+ \renewcommand{\headrulewidth}{0.1pt}%
+ % Eliminate head height too small warning, which is occurring because
+ % we are using multiple lines in our header.
+ \setlength\headheight{34.0pt}%
+ % footer applied to all pages.
+ \rfoot{\tiny{Page \thepage~of~\pageref{LastPage}}}%
+ \renewcommand{\footrulewidth}{0.1pt}%
+}%
+\end{lstlisting}
+
+The default implementation can be overridden by defining \tlcHF.
+
+\tlcVspace
+
+\todo[inline]{%
+ \tlcNote: When \tlcHF\ exists and is empty, your document will be typeset with
+ the defaults from document-class \tlcDarkblue{article}.
+}%
+
+% ------------------------------------------------------------------------------
+\clearpage
+\subsection{\tlcVE} \label{sec:version}
+\tlcA\ will populate the builtin header and footer with information extracted
+from \tlcVE\ when it is present. \tlcVE\ is a comma-separated-variable file
+that uses the pipe character as the field delimiter. \tlcVE\ uses the following
+column names:
+
+\begin{description}[style=nextline]
+ \item[version] The version value is typeset in the rhead area. This field is
+ used to convey the version the document was at the date it reached its
+ current state.
+
+ \item[date] The date value is typeset in the rhead area. This field is used
+ to communicate when the document transitioned into its current state.
+
+ \item[status] The status value is typeset in the rhead area. This field is
+ used to convey the document state such as Approved, Draft, Effective, or
+ Obsolete.
+
+ \item[instatution] The institution value is typeset in the lfoot area. This
+ field is used to tell the reader the author name or company name.
+
+ \item[permission] The permission value is typeset in the cfoot area. This
+ field is used to identify confidentiality or a particular license.
+
+\end{description}
+
+The exaction methods are shown below.
+\begin{lstlisting}[basicstyle=\tiny]
+ % Extract document status, document date and document version from
+ % \tlc@versionFile.
+ % Argument:
+ % 1 - the column name to extract from the data file.
+ \newcommand{\tlcVersionPart}[1]{
+ \csvreader[separator=pipe]
+ {\tlc@versionFile}{
+ 1=\version,
+ 2=\date,
+ 3=\status,
+ 4=\instatution,
+ 5=\permission
+ }{#1}
+ }%
+
+ % Define extractions macros when \tlc@versionFile exists.
+ \IfFileExists{\tlc@versionFile}
+ {
+ \def\tlc@version{\tlcVersionPart{\version}}
+ \def\tlc@date{\tlcVersionPart{\date}}
+ \def\tlc@status{\tlcVersionPart{\status}}
+ \def\tlc@instatution{\tlcVersionPart{\version}}
+ \def\tlc@permission{\tlcVersionPart{\version}}
+ }
+ {% Else: no operation because tlc@versionFile does not exist.
+ }
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcLG}
+\tlcA\ will typeset the lhead area with \tlcLG\ when it is present. Make sure
+your logo's height is not larger than 34pt to avoid `Package Fancyhdr Warning:
+\\headheight is to small' warning.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{Definitions \& Commands}
+\subsection{\tlcBL}
+Page layout is rotated 90\textdegree\ clockwise resulting in a landscape page
+orientation. Landscape orientation remains active until \tlcEL.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcEL}
+Page layout is returned to portrait orientation when \tlcEL\ is reached.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcDB}
+\tlcDB\ is used throughout this document to render text using rbg\{0,0,0.5\}.
+\tlcDB\ is safe to use within your document.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcTOC}
+\tlcTOC\ creates the document layout shown in Figure \ref{fig:layout}. Section
+\ref{sec:TAA} shows an example implementation.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcNCT}
+New \tlcNCT\ are Left, Center, and Right, respectively are
+designed to use with longtable. Data is wrapped within a table cell. The
+parameter defines the column width. As an example, L{2cm} yields a Left
+aligned, ragged right, wrapped text within a 2cm wide cell.
+
+\begin{lstlisting}[basicstyle=\tiny]
+\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}
+\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}
+\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcAL}
+\tlcAL\ is an architectural hook the Author should use when it becomes necessary
+to use packages not provided by \tlcA\, and to design commands that are specific
+to your document.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcHF}
+\tlcHF\ is an architectural hook the Author should use to completely override
+the document layout \tlcA\ implements.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\subsection{\tlcVE}
+\tlcVE\ is by used \tlcA\ to populate the document header \& footer. Refer to
+section \ref{sec:version} for \tlcVE\ definitions. \tlcVE\ is not
+used by \tlcA\ when \tlcHF\ is define. However, you might want to use the
+version hook by defining \tlcVE\ and using the commands below to extract data
+from \tlcVE\ in your \tlcHF.
+\begin{enumerate}
+ \item \tlcVC\
+ \item \tlcDC\
+ \item \tlcSC\
+ \item \tlcIC\
+ \item \tlcPC\
+\end{enumerate}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcLG}
+\tlcA\ places \tlcLG\ in your header when defined.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{Required Packages}
+This section documents the dependencies of the required package tlc-article has.
+Package names are listed in alphabetical order. A complete description of each
+package is found at \url{http://www.ctan.org/}. At this writing, you can type in
+the package name and press the search button to learn more about each package.
+
+% Render pckFile using pckStyle as a longtable.
+\csvreader[tlcPkgStyle, separator=pipe]{\tlcPkgFile}{}{\name & \description}
+% ------------------------------------------------------------------------------
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/tlc-article.texx new/doc/latex/tlc-article/tlc-article.texx
--- old/doc/latex/tlc-article/tlc-article.texx 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/tlc-article.texx 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1 @@
+\input{tlc-article.tex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tlc-article.doc.tlpobj new/tlpkg/tlpobj/tlc-article.doc.tlpobj
--- old/tlpkg/tlpobj/tlc-article.doc.tlpobj 2019-02-28 04:09:00.000000000 +0100
+++ new/tlpkg/tlpobj/tlc-article.doc.tlpobj 2019-06-24 01:39:29.000000000 +0200
@@ -1,15 +1,17 @@
name tlc-article.doc
category Package
-revision 47891
+revision 51431
shortdesc doc files of tlc-article
relocated 1
-docfiles size=38
- RELOC/doc/latex/tlc-article/GettingStarted.tex
- RELOC/doc/latex/tlc-article/GettingStarted.texx
+docfiles size=121
RELOC/doc/latex/tlc-article/LICENSE
RELOC/doc/latex/tlc-article/README.md
+ RELOC/doc/latex/tlc-article/bin/deploy
+ RELOC/doc/latex/tlc-article/data/additional-layout.tex
RELOC/doc/latex/tlc-article/data/logo.png
RELOC/doc/latex/tlc-article/data/required-packages.csv
RELOC/doc/latex/tlc-article/data/version.csv
- RELOC/doc/latex/tlc-article/doc/sprint.md
+ RELOC/doc/latex/tlc-article/doc/tlc-article.pdf
RELOC/doc/latex/tlc-article/images/titlepage.png
+ RELOC/doc/latex/tlc-article/tlc-article.tex
+ RELOC/doc/latex/tlc-article/tlc-article.texx
++++++ tlc-article.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tlc-article/tlc-article.cls new/tex/latex/tlc-article/tlc-article.cls
--- old/tex/latex/tlc-article/tlc-article.cls 2018-05-31 23:51:17.000000000 +0200
+++ new/tex/latex/tlc-article/tlc-article.cls 2019-06-23 22:57:37.000000000 +0200
@@ -1,86 +1,100 @@
% ------------------------------------------------------------------------------
-% Class: tlc-article
+% Class:
+% tlc-article
%
-% Purpose: This LaTeX class provides an article implementation that standardizes
-% a document layout intended for formal documents.
+% Purpose:
+% This LaTeX class provides an article implementation that standardizes
+% a document layout intended for formal documents.
% ------------------------------------------------------------------------------
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{tlc-article}[2018/05/30 v1.0.10 Traap LaTeX Class Article]
+\NeedsTeXFormat{LaTeX2e}%
+\ProvidesClass{tlc-article}[2019/06/20 v1.0.17 Traap LaTeX Class Article]%
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ProcessOptions
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}%
+\ProcessOptions%
-\LoadClass{article}
+\LoadClass{article}%
% ------------------------------------------------------------------------------
% Page layout
-\RequirePackage{parskip} % Blank line after section break.
-\RequirePackage[a4paper,top=1.0in,bottom=1.0in,left=1.0in,right=1.0in]{geometry}
-\RequirePackage{multicol}
-\setlength{\parskip}{0.5em}
-
-% ------------------------------------------------------------------------------
-% Fonts etc.
-\RequirePackage{lmodern}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
+% \RequirePackage{parskip}% Blank line after section break.
+\RequirePackage[a4paper,top=1.0in,bottom=1.0in,left=1.0in,right=1.0in]{geometry}%
+\RequirePackage{multicol}%
+% \setlength{\parskip}{0.5em}%
+
+% ------------------------------------------------------------------------------
+% Required parts to use glossaries must come first.
+\RequirePackage{lmodern}%
+\RequirePackage[T1]{fontenc}%
+\RequirePackage{textcomp}%
+\RequirePackage[utf8]{inputenc}%
+\RequirePackage[colorlinks]{hyperref}%
+\RequirePackage{bookmark}%
+% ------------------------------------------------------------------------------
+% Define glossaries.
+\RequirePackage[acronym, % create 'acronym' glossary type,
+ nopostdot, %
+ nonumberlist, %
+ style=altlist,% use altlist style
+ toc, % add the gloassary to the table of contents.
+ ]{glossaries}%
% ------------------------------------------------------------------------------
% Color, Graphics and links.
-\RequirePackage{graphicx}
-\RequirePackage[table]{xcolor}
-\definecolor{darkblue}{rgb}{0,0,0.5}
+\RequirePackage{graphicx}%
+\RequirePackage[table]{xcolor}%
+\definecolor{darkblue}{rgb}{0,0,0.5}%
% ------------------------------------------------------------------------------
% Listings and verbatim
-\RequirePackage{listings}
-\RequirePackage{spverbatim}
+\RequirePackage{listings}%
+\RequirePackage{spverbatim}%
% ------------------------------------------------------------------------------
% Arrays, list and tables
-\RequirePackage{array}
-\RequirePackage{csvsimple}
-\RequirePackage{enumitem}
-\RequirePackage{longtable}
-\RequirePackage{makecell}
-\RequirePackage{tabularx}
-\setlength{\parindent}{0pt}
+\RequirePackage{array}%
+\RequirePackage{csvsimple}%
+\RequirePackage{enumitem}%
+\RequirePackage{longtable}%
+\RequirePackage{makecell}%
+\RequirePackage{tabularx}%
+\setlength{\parindent}{0pt}%
% ------------------------------------------------------------------------------
% pdf
-\RequirePackage{pdflscape}
-\RequirePackage{pdfpages}
+\RequirePackage{pdflscape}%
+\RequirePackage{pdfpages}%
% ------------------------------------------------------------------------------
% Misc
-\RequirePackage[toc,page]{appendix}
+\RequirePackage[toc,page]{appendix}%
+\RequirePackage{todonotes}%
% ------------------------------------------------------------------------------
% This function is used to simplify making textcolor darkblue.
-\newcommand{\tlcDarkblue}[1]{\textcolor{darkblue}{#1}}
+\newcommand{\tlcDarkblue}[1]{\textcolor{darkblue}{#1}}%
% ------------------------------------------------------------------------------
% Define the optional input files.
-\def\tlc@location{data}
-\def\tlc@logoFile{\tlc@location/logo.png}
-\def\tlc@versionFile{\tlc@location/version.csv}
-\def\tlc@additionalLayout{\tlc@location/additional-layout.tex}
-\def\tlc@headerFooter{\tlc@location/header-footer.tex}
+\def\tlc@location{data}%
+\def\tlc@logoFile{\tlc@location/logo.png}%
+\def\tlc@versionFile{\tlc@location/version.csv}%
+\def\tlc@additionalLayout{\tlc@location/additional-layout.tex}%
+\def\tlc@headerFooter{\tlc@location/header-footer.tex}%
% New column types: L, C, and R are Left, Center, and Right, respectively are
% designed to use with longtable. Data is wrapped within a table cell. The
% parameter defines the column width. As an example, L{2cm} yields a Left
% aligned, ragged right, wrapped text within a 2cm wide cell.
-\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}
+\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}%
+\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}%
+\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}%
% ------------------------------------------------------------------------------
% We define colors that we would like to use throughout our documents.
-\definecolor{codegreen}{rgb}{0,0.6,0}
-\definecolor{codegray}{rgb}{0.5,0.5,0.5}
-\definecolor{codepurple}{rgb}{0.58,0,0.82}
-\definecolor{backcolour}{rgb}{0.95,0.95,0.92}
+\definecolor{codegreen}{rgb}{0,0.6,0}%
+\definecolor{codegray}{rgb}{0.5,0.5,0.5}%
+\definecolor{codepurple}{rgb}{0.58,0,0.82}%
+\definecolor{backcolour}{rgb}{0.95,0.95,0.92}%
% ------------------------------------------------------------------------------
% tlcBeginLandscape and tlcEndLandscape are two new commands used to simplify
@@ -92,21 +106,21 @@
\newcommand{\tlcEndLandscape}{%
\restoregeometry%
\end{landscape}%
-}
+}%
% ------------------------------------------------------------------------------
% We want our table of contents to use dots as a leader.
-\RequirePackage{tocloft}
-\renewcommand\cftsecleader{\cftdotfill{\cftdotsep}}
+\RequirePackage{tocloft}%
+\renewcommand\cftsecleader{\cftdotfill{\cftdotsep}}%
% ------------------------------------------------------------------------------
% We want to allow the calling document to setup additional layout.
-\IfFileExists{\tlc@additionalLayout}
- {\input{\tlc@additionalLayout}}
- {}
+\IfFileExists{\tlc@additionalLayout}%
+ {\input{\tlc@additionalLayout}}%
+ {}%
% ------------------------------------------------------------------------------
-% Create a beautiful document header and document footer using the packages
+% Create a beautiful document header and document footer using the packages
% listed below.
\RequirePackage{fancyhdr} % Page layout in \LaTeX
\RequirePackage{titling} % Control over \maketitle & \thanks
@@ -118,122 +132,132 @@
% \tlc@versionFile.
% Argument:
% 1 - the column name to extract from the data file.
-\newcommand{\tlcVersionPart}[1]{
- \csvreader[separator=pipe]
- {\tlc@versionFile}{
- 1=\version,
- 2=\date,
- 3=\status,
- 4=\institution,
- 5=\permission
- }{#1}
+\newcommand{\tlcVersionPart}[1]{%
+ \csvreader[separator=pipe]%
+ {\tlc@versionFile}{%
+ 1=\version,%
+ 2=\date,%
+ 3=\status,%
+ 4=\institution,%
+ 5=\permission%
+ }{#1}%
}%
% ------------------------------------------------------------------------------
% Define extractions macros when \tlc@versionFile exists.
-\IfFileExists{\tlc@versionFile}
-{
- \def\tlc@version{\tlcVersionPart{\version}}
- \def\tlc@date{\tlcVersionPart{\date}}
- \def\tlc@status{\tlcVersionPart{\status}}
- \def\tlc@institution{\tlcVersionPart{\institution}}
- \def\tlc@permission{\tlcVersionPart{\permission}}
-}
-{% Else: no operation because tlc@versionFile does not exist.
-}
+\IfFileExists{\tlc@versionFile}%
+{%
+ \def\tlc@version{\tlcVersionPart{\version}}%
+ \def\tlc@date{\tlcVersionPart{\date}}%
+ \def\tlc@status{\tlcVersionPart{\status}}%
+ \def\tlc@institution{\tlcVersionPart{\institution}}%
+ \def\tlc@permission{\tlcVersionPart{\permission}}%
+}%
+{% Else: no operation because tlc@versionFile does not exist.
+}%
% ------------------------------------------------------------------------------
% We want to allow the calling document to override the headers and footers that
% we are defining.
-\IfFileExists{\tlc@headerFooter}
+\IfFileExists{\tlc@headerFooter}%
{ % use the customer header and footer defined by \tlc@headerfooter
- \input{\tlc@headerFooter}
-}
+ \input{\tlc@headerFooter}%
+}%
{ % Else : header and footer applied to all pages.
- \IfFileExists{\tlc@logoFile}
- { % Typeset the logo in the left side of the document header.
- \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}
- }
+ \IfFileExists{\tlc@logoFile}%
+ { % Typeset the logo in the left side of the document header.
+ \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}%
+ }%
{% Else: no operation because tlc@logoFile does not exist.
- }
+ }%
+ %
% Typeset the title in the center of the document header.
- \chead{\large{\thetitle}}
- % Typeset version information in the right side of the document header.
- \IfFileExists{\tlc@versionFile}
- {
+ %
+ \chead{\large{\thetitle}}%
+ %
+ % Typeset version information in the right side of the document header.
+ %
+ \IfFileExists{\tlc@versionFile}%
+ {%
% document status, document date and document version.
- \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}
+ \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}%
% document owner. This maybe a person or company name.
- \lfoot{\tiny \tlc@institution}
+ \lfoot{\tiny \tlc@institution}%
% document license. This maybe a license or word like confidential.
- \cfoot{\tiny \tlc@permission}
- }
- {% Else: no operation because tlc@versionFile does not exist.
- }
- \renewcommand{\headrulewidth}{0.1pt}
- % eliminate head height too small warning, which is occurring because
+ \cfoot{\tiny \tlc@permission}%
+ }%
+ {% Else: no operation because tlc@versionFile does not exist.
+ }%
+ \renewcommand{\headrulewidth}{0.1pt}%
+ %
+ % Eliminate head height too small warning, which is occurring because
% we are using multiple lines in our header.
- \setlength\headheight{34.0pt}
+ \setlength\headheight{34.0pt}%
% footer applied to all pages.
- \rfoot{\tiny{Page \thepage~of~\pageref{LastPage}}}
- \renewcommand{\footrulewidth}{0.1pt}
- % we want our header and footer to remain consistent with a table of
- % contents that span multiple pages.
- \AtBeginDocument{\addtocontents{toc}{\protect\thispagestyle{fancy}}}
-}
+ \rfoot{\tiny{Page \thepage~of~\pageref{LastPage}}}%
+ \renewcommand{\footrulewidth}{0.1pt}%
+}%
+
+% ------------------------------------------------------------------------------
+% We want our header and footer to remain consistent with a table of
+% contents that span multiple pages.
+\AtBeginDocument{\addtocontents{toc}{\protect\thispagestyle{fancy}}}%
% ------------------------------------------------------------------------------
% We define colors that are used throughout the document.
-\RequirePackage[colorlinks]{hyperref}
-\definecolor{darkblue}{rgb}{0,0,0.5}
-\hypersetup{
- bookmarksopen = true,
- citebordercolor = white!100,
- citecolor = darkblue,
- filebordercolor = white!100,
- filecolor = darkblue ,
- linkbordercolor = white!100,
- linkcolor = darkblue,
- linktoc = all,
- menubordercolor = white!100,
- pdfauthor = {},
- pdfborder = {0 0 0 [0 0]},
- pdfkeywords = {},
- pdfstartview = FitH,
- pdfsubject = {},
- pdftitle = {},
- runbordercolor = white!100,
- urlbordercolor = white!100,
- urlcolor = darkblue
-}
-
-% ------------------------------------------------------------------------------
-% We define colors that are used when includeing code files (software).
-\lstdefinestyle{tlcStyle}{
- backgroundcolor=\color{backcolour},
- commentstyle=\color{codegreen},
- keywordstyle=\color{magenta},
- numberstyle=\tiny\color{codegray},
- stringstyle=\color{codepurple},
- basicstyle=\footnotesize,
- breakatwhitespace=false,
- breaklines=true,
- captionpos=b,
- keepspaces=true,
- numbers=left,
- numbersep=4pt,
- showspaces=false,
- showstringspaces=false,
- showtabs=false,
- tabsize=2
-}
-\lstset{style=tlcStyle}
+\definecolor{darkblue}{rgb}{0,0,0.5}%
+\hypersetup{%
+ bookmarksopen = true,%
+ citebordercolor = white!100,%
+ citecolor = darkblue,%
+ filebordercolor = white!100,%
+ filecolor = darkblue ,%
+ linkbordercolor = white!100,%
+ linkcolor = darkblue,%
+ linktoc = all,%
+ menubordercolor = white!100,%
+ pdfauthor = {},%
+ pdfborder = {0 0 0 [0 0]},%
+ pdfkeywords = {},%
+ pdfstartview = FitH,%
+ pdfsubject = {},%
+ pdftitle = {},%
+ runbordercolor = white!100,%
+ urlbordercolor = white!100,%
+ urlcolor = darkblue%
+}%
+
+% ------------------------------------------------------------------------------
+% We define colors that are used when includeing code files (software).
+\lstdefinestyle{tlcStyle}{%
+ backgroundcolor=\color{backcolour},%
+ commentstyle=\color{codegreen},%
+ keywordstyle=\color{magenta},%
+ numberstyle=\tiny\color{codegray},%
+ stringstyle=\color{codepurple},%
+ basicstyle=\footnotesize,%
+ breakatwhitespace=false,%
+ breaklines=true,%
+ captionpos=b,%
+ keepspaces=true,%
+ numbers=left,%
+ numbersep=4pt,%
+ showspaces=false,%
+ showstringspaces=false,%
+ showtabs=false,%
+ tabsize=2%
+}%
+\lstset{style=tlcStyle}%
% ------------------------------------------------------------------------------
% End Row : Generally applied to the end of a table row.
\newcommand{\ER}{\\ \hline}%
% ------------------------------------------------------------------------------
+% Default vertical space
+\newcommand{\tlcVspace}{\vspace{3mm}}%
+
+% ------------------------------------------------------------------------------
% Macro to include a file if it exists.
% 1 = the file path to input
\newcommand{\inputIfExists}[1]{\IfFileExists{#1}{\input{#1}}{}}%
@@ -256,7 +280,7 @@
% ------------------------------------------------------------------------------
% We define tlcDebug to aid our users when they are debugging their document.
-% tlcDebug should be placed at the end of your document to allow LaTeX to
+% tlcDebug should be placed at the end of your document to allow LaTeX to
% fully expand all macros and definitions.
\newcommand{\tlcIsDefined}[1]%
{\IfFileExists{#1}%
@@ -264,34 +288,34 @@
{\textcolor{red}{NOT DEFINED}}%
}%
\newcommand{\tlcDebug}{%
- \clearpage
- \section{tlc-article Debug}
- \subsection{tlc-article default files}
- \begin{description}[align=right,leftmargin=*,labelindent=5cm]
- \item[tlc@location:]\tlc@location
- \item[tlc@additionalLayout:]\tlc@additionalLayout
- \item[tlc@headerFooter:]\tlc@headerFooter
- \item[tlc@versionFile:]\tlc@versionFile
- \item[tlc@logoFile:]\tlc@logoFile
- \item[tlc@versionFile:]\tlc@versionFile
- \end{description}
+ \clearpage%
+ \section{tlc-article Debug}%
+ \subsection{tlc-article default files}%
+ \begin{description}[align=right,leftmargin=*,labelindent=5cm]%
+ \item[tlc@location:]\tlc@location%
+ \item[tlc@additionalLayout:]\tlc@additionalLayout%
+ \item[tlc@headerFooter:]\tlc@headerFooter%
+ \item[tlc@versionFile:]\tlc@versionFile%
+ \item[tlc@logoFile:]\tlc@logoFile%
+ \item[tlc@versionFile:]\tlc@versionFile%
+ \end{description}%
%
- \subsection{tlc-article file hooks}
- \begin{description}[align=right,leftmargin=*,labelindent=5cm]
- \item [tlc@additionalLayout:]\tlcIsDefined{\tlc@additionalLayout}
- \item [tlc@headerFooter:]\tlcIsDefined{\tlc@headerFooter}
- \item [tlc@logoFile:]\tlcIsDefined{\tlc@logoFile}
- \item [tlc@versionFile:]\tlcIsDefined{\tlc@versionFile}
- \end{description}
+ \subsection{tlc-article file hooks}%
+ \begin{description}[align=right,leftmargin=*,labelindent=5cm]%
+ \item [tlc@additionalLayout:]\tlcIsDefined{\tlc@additionalLayout}%
+ \item [tlc@headerFooter:]\tlcIsDefined{\tlc@headerFooter}%
+ \item [tlc@logoFile:]\tlcIsDefined{\tlc@logoFile}%
+ \item [tlc@versionFile:]\tlcIsDefined{\tlc@versionFile}%
+ \end{description}%
%
- \subsection{tlc-article header and footer hooks}
- \begin{description}[align=right,leftmargin=*,labelindent=5cm]
- \item[tlc@version:] \tlc@version
- \item[tlc@date:] \tlc@date
- \item[tlc@status:] \tlc@status
- \item[tlc@institution:] \tlc@institution
- \item[tlc@permission:] \tlc@permission
- \end{description}
+ \subsection{tlc-article header and footer hooks}%
+ \begin{description}[align=right,leftmargin=*,labelindent=5cm]%
+ \item[tlc@version:] \tlc@version%
+ \item[tlc@date:] \tlc@date%
+ \item[tlc@status:] \tlc@status%
+ \item[tlc@institution:] \tlc@institution%
+ \item[tlc@permission:] \tlc@permission%
+ \end{description}%
}%
% ------------------------------------------------------------------------------
-\endinput
+\endinput%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tlc-article.tlpobj new/tlpkg/tlpobj/tlc-article.tlpobj
--- old/tlpkg/tlpobj/tlc-article.tlpobj 2019-02-28 04:09:00.000000000 +0100
+++ new/tlpkg/tlpobj/tlc-article.tlpobj 2019-06-24 01:39:29.000000000 +0200
@@ -1,6 +1,6 @@
name tlc-article
category Package
-revision 47891
+revision 51431
shortdesc A LaTeX document class for formal documents
relocated 1
longdesc The package provides a LaTeX document class that orchestrates a
@@ -16,7 +16,7 @@
catalogue-contact-bugs https://github.com/Traap/tlc-article/issues
catalogue-contact-home https://github.com/Traap/tlc-article
catalogue-ctan /macros/latex/contrib/tlc-article
-catalogue-date 2018-06-05 05:23:42 +0200
+catalogue-date 2019-06-23 09:56:44 +0200
catalogue-license bsd3
catalogue-topics class article-like
-catalogue-version 1.0.10
+catalogue-version 1.0.17
++++++ tocdata.doc.tar.xz ++++++
Binary files old/doc/latex/tocdata/tocdata.pdf and new/doc/latex/tocdata/tocdata.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocdata.doc.tlpobj new/tlpkg/tlpobj/tocdata.doc.tlpobj
--- old/tlpkg/tlpobj/tocdata.doc.tlpobj 2019-03-24 02:24:34.000000000 +0100
+++ new/tlpkg/tlpobj/tocdata.doc.tlpobj 2019-07-17 01:53:11.000000000 +0200
@@ -1,6 +1,6 @@
name tocdata.doc
category Package
-revision 50536
+revision 51654
shortdesc doc files of tocdata
relocated 1
docfiles size=226
++++++ tocdata.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tocdata/tocdata.sty new/tex/latex/tocdata/tocdata.sty
--- old/tex/latex/tocdata/tocdata.sty 2019-03-22 21:50:30.000000000 +0100
+++ new/tex/latex/tocdata/tocdata.sty 2019-07-16 23:14:47.000000000 +0200
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{tocdata}
- [2019/03/21 v2.02 Adds author/artist to TOC entries.]
+ [2019/07/06 v2.03 Adds author/artist to TOC entries.]
\RequirePackage{xparse}
@@ -33,6 +33,11 @@
Move \protect\usepackage{titletoc} after \protect\usepackage{tocdata}.%
}
}{}
+
+\@ifclassloaded{memoir}
+{}% memoir
+{% not memoir
+
\@ifpackageloaded{tocloft}{
\PackageError{tocdata}
{%
@@ -43,6 +48,8 @@
}
}{}
+}% not memoir
+
\AtBeginDocument{
\@ifpackageloaded{titletoc}{
\@ifpackageloaded{tocloft}{
@@ -67,11 +74,26 @@
\@bsphack\addtocontents{#1}{\protect\settocdata{#2}}\@esphack%
}
\newcommand{\tocdatafont}[1]{{\normalfont\textit{\small#1}}}
+\def\tocdataformat{\tocdatafont}
\newcommand{\TD@usetocdata}{%
- \tocdatafont{\TD@thistocdata}%
- \global\def\TD@thistocdata{}%
+ \ifdefvoid{\TD@thistocdata}{}{%
+ \tocdataformat{\TD@thistocdata}%
+ \global\def\TD@thistocdata{}%
+ }%
+}
+
+\let\TD@checktocdatafont\tocdatafont
+
+\AtBeginDocument{
+\ifdefequal\TD@checktocdatafont\tocdatafont{}{
+ \PackageWarningNoLine{tocdata}{%
+ You have redefined \protect\tocdatafont,\MessageBreak
+ which has been deprecated. Please redefine\MessageBreak
+ \protect\tocdataformat\space instead}
+}
}
+\newcommand*{\TD@patchstandardlatex}{
\xpatchcmd{\@dottedtocline}
{\hfill\nobreak}
{\hfill\TD@usetocdata\nobreak}
@@ -82,6 +104,8 @@
Authors may not appear in TOC, LOF}
}%
+\@ifclassloaded{memoir}{}{%
+\@ifpackageloaded{tocbasic}{}{%
\xpatchcmd{\l@part}
{\hfil}
{\hfil\TD@usetocdata}
@@ -91,10 +115,11 @@
Could not patch LaTeX core \protect\l@part.\MessageBreak
Authors may not appear in TOC parts}
}%
+}}
-\@ifundefined{chapter}
-{}
-{
+\@ifclassloaded{memoir}{}{%
+\@ifpackageloaded{tocbasic}{}{%
+\@ifundefined{chapter}{}{%
\xpatchcmd{\l@chapter}
{\hfil\nobreak}
{\hfil\TD@usetocdata\nobreak}
@@ -104,8 +129,9 @@
Could not patch LaTeX core \protect\l@chapter.\MessageBreak
Authors may not appear in TOC chapters}
}%
-}
+}}}
+\@ifclassloaded{article}{
\xpatchcmd{\l@section}
{\hfil\nobreak}
{\hfil\TD@usetocdata\nobreak}
@@ -115,6 +141,13 @@
Could not patch LaTeX core \protect\l@section.\MessageBreak
Authors may not appear in TOC sections}
}%
+}{}
+}% TD@patchstandardlatex
+\@ifpackageloaded{lwarp}{%
+ \ifbool{warpingprint}{\TD@patchstandardlatex}{}%
+}{%
+ \TD@patchstandardlatex%
+}
\AtBeginDocument{
\@ifpackageloaded{titletoc}{
@@ -147,6 +180,21 @@
}% end of \AtBeginDocument
\AtBeginDocument{
+\@ifclassloaded{memoir}
+{
+\appto{\cftpartleader}{\TD@usetocdata}
+\appto{\cftchapterleader}{\TD@usetocdata}
+\appto{\cftsectionleader}{\TD@usetocdata}
+\appto{\cftsubsectionleader}{\TD@usetocdata}
+\appto{\cftsubsubsectionleader}{\TD@usetocdata}
+\appto{\cftparagraphleader}{\TD@usetocdata}
+\appto{\cftsubparagraphleader}{\TD@usetocdata}
+\appto{\cftfigureleader}{\TD@usetocdata}
+\appto{\cfttableleader}{\TD@usetocdata}
+\appto{\cftsubfigureleader}{\TD@usetocdata}
+\appto{\cftsubtableleader}{\TD@usetocdata}
+}% memoir
+{% not memoir
\@ifpackageloaded{tocloft}
{
\appto{\cftpartleader}{\TD@usetocdata}
@@ -165,21 +213,150 @@
}% end of tocloft patches
{}% tocloft not loaded
+}% not memoir
}% \AtBeginDocument
-\newcommand{\TD@optionalname}[1]
+\AtBeginDocument{
+
+\@ifpackageloaded{tocbasic}{
+\renewcommand*{\scr@dte@tocline}[3]{%
+ \ifnum \@nameuse{#1tocdepth}>\c@tocdepth
+ \else
+ \tocbasic@DependOnPenaltyAndTOCLevel{#1}%
+ \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax
+ {%
+ \leftskip \@nameuse{scr@tso@#1@indent}\relax
+ \rightskip \@tocrmarg
+ \parfillskip -\rightskip
+ \@nameuse{Ifscr@tso@#1@raggedpage}{%
+ \addtolength{\parfillskip}{\z@ \@plus 1fil}%
+ }{}%
+ \parindent \@nameuse{scr@tso@#1@indent}\relax
+ \@afterindenttrue
+ \interlinepenalty\@M
+ \expandafter\ifx\csname ragged#1entry\endcsname\raggedright
+ \addtolength\rightskip\@flushglue
+ \else
+ \def\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \else
+ \renewcommand\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \fi
+ \fi
+ \fi
+ \leavevmode
+ \@tempdima \@nameuse{scr@tso@#1@numwidth}\relax
+ \@nameuse{Ifscr@tso@#1@dynnumwidth}{%
+ \scr@ifundefinedorrelax{scr@dte@#1@lastmaxnumwidth}{}{%
+ \ifdim \@nameuse{scr@dte@#1@lastmaxnumwidth}>\@tempdima
+ \@tempdima\@nameuse{scr@dte@#1@lastmaxnumwidth}\relax
+ \fi
+ }%
+ }{}%
+ \advance\leftskip \@tempdima
+ \null\nobreak\hskip -\leftskip
+ {%
+ \usetocbasicnumberline
+ \let\scr@dte@numberline@box\numberline@box
+ \def\numberline@box##1{%
+ \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}%
+ \global\scr@dte@tocline@numberwidth
+ \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax
+ \relax
+ \ifdim \scr@dte@tocline@numberwidth
+ >\@nameuse{scr@dte@#1@maxnumwidth}\relax
+ \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth
+ \fi
+ \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{%
+ \ifdim \scr@dte@tocline@numberwidth
+ >\dimexpr \@nameuse{scr@tso@#1@numwidth}%
+ +\@nameuse{scr@tso@#1@numsep}\relax\relax
+ \PackageWarning{tocbasic%
+ }{%
+ number width of #1 toc entries should be
+ increased!\MessageBreak
+ Currently used number width =
+ \the\wd\scr@dte@tocline@numbox,\MessageBreak
+ Wanted number separation
+ \space\space\space =
+ \the\dimexpr\@nameuse{scr@tso@#1@numsep}\relax,\MessageBreak
+ Reserved number width \space\space\space\space\space\space =
+ \the\dimexpr\@nameuse{scr@tso@#1@numwidth}\relax%
+ }%
+ \fi
+ }%
+ \scr@dte@numberline@box{\@nameuse{scr@tso@#1@numberformat}{##1}}%
+ \@nameuse{Ifscr@tso@#1@breakafternumber}{%
+ {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip
+ }{}%
+ }%
+ \@nameuse{scr@tso@#1@entryformat}{%
+ #2%
+ \nobreak
+ {%
+ \normalfont\normalsize\@nameuse{scr@tso@#1@linefill}%
+ \TD@usetocdata% lwarp
+ \nobreak
+ \@nameuse{scr@tso@#1@pagenumberbox}{%
+ \@nameuse{scr@tso@#1@pagenumberformat}{#3}%
+ }%
+ }%
+ \@par
+ }%
+ }%
+ }%
+ \tocbasic@SetPenaltyByTOCLevel{#1}%
+ \fi
+}
+
+}{}
+}
+\AtBeginDocument{
+\@ifpackageloaded{tocstyle}{
+\xpatchcmd\tocstyle@dottedtocline
+ {%
+ \ifx\tocstyle@feature@leaders\relax
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}%
+ \mkern \@dotsep mu$}\hfill
+ \else
+ \tocstyle@feature@leaders
+ \fi%
+ }
+ {%
+ \ifx\tocstyle@feature@leaders\relax
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}%
+ \mkern \@dotsep mu$}\hfill
+ \else
+ \tocstyle@feature@leaders
+ \fi%
+ \TD@usetocdata%
+ }
+ {}%
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch tocstyle \protect\tocstyle@dottedtocline.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }%
+}{}
+}
+\newcommand{\TDoptionalnameprint}[1]
{%
\ifblank{#1}%
{}%
{#1~}%
}
-\newrobustcmd{\tocdatapartprint}[4]
+\newcommand{\tocdatapartprint}[4]
{%
- \par\unskip\noindent%
+ \par\noindent%
{%
\normalfont\normalsize%
\textit{%
\hspace*{4em}--- %
- \TD@optionalname{#1}\TD@optionalname{#2}#3#4%
+ \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4%
}%
}%
}
@@ -190,24 +367,24 @@
}% end of chapters-only
\let\tocdatasectionprint\tocdatapartprint
\let\tocdatasubsectionprint\tocdatapartprint
-\newcommand{\TD@artistauthorprint}[5]{%
+\newcommand{\TDartistauthorprint}[5]{%
\begin{minipage}{\linewidth}%
\csuse{TD@#1align}%
\footnotesize\normalfont%
- \textsc{{\TD@optionalname{#2}\TD@optionalname{#3}#4#5}}%
+ \textsc{{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}}%
\end{minipage}%
\par%
\addvspace{2ex}%
}
\newcommand{\tocdataartistprint}{%
\par\smallskip%
- \TD@artistauthorprint{artist}%
+ \TDartistauthorprint{artist}%
}
\newcommand{\tocdataauthorprint}{%
\par\smallskip%
- \TD@artistauthorprint{author}%
+ \TDartistauthorprint{author}%
}
-\newcommand{\TD@artistauthortextprint}[2]{%
+\newcommand{\TDartistauthortextprint}[2]{%
\addvspace{2ex}%
\begin{minipage}{\linewidth}%
\csuse{TD@#1textalign}%
@@ -219,12 +396,35 @@
\par%
\addvspace{2ex}%
}
-\newcommand{\tocdataartisttextprint}{\TD@artistauthortextprint{artist}}
-\newcommand{\tocdataauthortextprint}{\TD@artistauthortextprint{author}}
+\newcommand{\tocdataartisttextprint}{\TDartistauthortextprint{artist}}
+\newcommand{\tocdataauthortextprint}{\TDartistauthortextprint{author}}
+\@ifclassloaded{article}
+{
+ \newcommand*{\TD@starredsectionauthorprint}[5]{%
+ \unskip\medskip\csuse{tocdata#1print}{#2}{#3}{#4}{#5}\par%
+ \bigskip%
+ }
+}
+{
+ \newcommand*{\TD@starredsectionauthorprint}[5]{%
+ \ifstrequal{#1}{part}%
+ {%
+ \PackageWarning{tocdata}{%
+ The author's name will not be printed for\MessageBreak
+ the starred \protect\part%
+ }
+ }%
+ {%
+ \unskip\medskip\csuse{tocdata#1print}{#2}{#3}{#4}{#5}\par%
+ \bigskip%
+ }%
+ }
+}
\NewDocumentCommand{\TD@sectionauthor}{m s o m O{} m m O{}}{%
\IfBooleanTF{#2}%
{% star:
- \csuse{#1}*{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}%
+ \csuse{#1}*{#4}%
+ \TD@starredsectionauthorprint{#1}{#5}{#6}{#7}{#8}%
}%
{% no star:
\tocdata{toc}{#6 #7}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocdata.tlpobj new/tlpkg/tlpobj/tocdata.tlpobj
--- old/tlpkg/tlpobj/tocdata.tlpobj 2019-03-24 02:24:35.000000000 +0100
+++ new/tlpkg/tlpobj/tocdata.tlpobj 2019-07-17 01:53:12.000000000 +0200
@@ -1,23 +1,26 @@
name tocdata
category Package
-revision 50536
+revision 51654
shortdesc Adds names to chapters, sections, figures in the TOC and LOF
relocated 1
-longdesc This package may be used to add a small amount of data to an
-longdesc entry in the table of contents or list of figures, between the
-longdesc section or caption name and the page number. The typical use
-longdesc would be to add the name of an author or artist of a chapter or
-longdesc section, such as in an anthology or a collection of papers.
-longdesc Additionally, user-level macros are provided which add the
-longdesc author's name to a chapter or section, along with an optional
-longdesc prefix and/or suffix, and add to a figure the artist's name,
-longdesc prefix, and suffix, plus optional additional text. Author and
-longdesc artist names are also added to the index. Additional user-level
-longdesc macros control formatting.
-runfiles size=3
+longdesc The tocdata package may be used to add a small amount of data
+longdesc to an entry in the table of contents or list of figures,
+longdesc between the section or caption name and the page number. The
+longdesc typical use would be to add the name of an author or artist of
+longdesc a chapter or section, such as in an anthology or a collection
+longdesc of papers. Additionally, user-level macros are provided which
+longdesc add the author's name to a chapter or section, along with an
+longdesc optional prefix and/or suffix, and add to a figure the artist's
+longdesc name, prefix, and suffix, plus optional additional text. Author
+longdesc and artist names are also added to the index. Additional
+longdesc user-level macros control formatting. tocdata works with the
+longdesc TOC/LOF formatting of the default LaTeX classes, memoir,
+longdesc koma-script, and with titletoc, tocloft, tocbasic, and
+longdesc tocstyle.
+runfiles size=4
RELOC/tex/latex/tocdata/tocdata.sty
catalogue-ctan /macros/latex/contrib/tocdata
-catalogue-date 2019-03-21 21:40:32 +0100
+catalogue-date 2019-07-16 13:23:38 +0200
catalogue-license lppl1.3
catalogue-topics toc-etc
-catalogue-version 2.02
+catalogue-version 2.03
++++++ tocloft.doc.tar.xz ++++++
Binary files old/doc/latex/tocloft/tocloft.pdf and new/doc/latex/tocloft/tocloft.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocloft.doc.tlpobj new/tlpkg/tlpobj/tocloft.doc.tlpobj
--- old/tlpkg/tlpobj/tocloft.doc.tlpobj 2019-02-28 04:09:42.000000000 +0100
+++ new/tlpkg/tlpobj/tocloft.doc.tlpobj 2020-01-11 01:55:20.000000000 +0100
@@ -1,8 +1,8 @@
name tocloft.doc
category Package
-revision 45188
+revision 53364
shortdesc doc files of tocloft
relocated 1
-docfiles size=125
+docfiles size=126
RELOC/doc/latex/tocloft/README
RELOC/doc/latex/tocloft/tocloft.pdf
++++++ tocloft.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tocloft/tocloft.sty new/tex/latex/tocloft/tocloft.sty
--- old/tex/latex/tocloft/tocloft.sty 2017-09-01 03:34:10.000000000 +0200
+++ new/tex/latex/tocloft/tocloft.sty 2020-01-10 22:41:35.000000000 +0100
@@ -117,7 +117,16 @@
\setlength{\cftparskip}{0pt}
\AtBeginDocument{%
-\if@cftnctoc\else
+\if@cftnctoc
+ % ensure \cftparskip is still set properly
+ \let\OLD@starttoc\@starttoc
+ \renewcommand{\@starttoc}[1]{%
+ \begingroup
+ \parskip=\cftparskip
+ \OLD@starttoc{#1}%
+ \endgroup
+ }
+\else
\renewcommand{\tableofcontents}{%
\@cfttocstart
\par
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocloft.tlpobj new/tlpkg/tlpobj/tocloft.tlpobj
--- old/tlpkg/tlpobj/tocloft.tlpobj 2019-02-28 04:09:42.000000000 +0100
+++ new/tlpkg/tlpobj/tocloft.tlpobj 2020-01-11 01:55:20.000000000 +0100
@@ -1,6 +1,6 @@
name tocloft
category Package
-revision 45188
+revision 53364
shortdesc Control table of contents, figures, etc
relocated 1
longdesc Provides control over the typography of the Table of Contents,
@@ -10,9 +10,8 @@
RELOC/tex/latex/tocloft/tocloft.sty
catalogue-also tocbasic
catalogue-contact-bugs https://github.com/wspr/herries-press/issues
-catalogue-contact-repository https://github.com/wspr/herries-press
+catalogue-contact-repository https://github.com/wspr/herries-press/
catalogue-ctan /macros/latex/contrib/tocloft
-catalogue-date 2017-08-31 05:31:06 +0200
catalogue-license lppl1.3c
catalogue-topics toc-etc
-catalogue-version 2.3i
+catalogue-version 2.3j
++++++ todonotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/todonotes.doc.tlpobj new/tlpkg/tlpobj/todonotes.doc.tlpobj
--- old/tlpkg/tlpobj/todonotes.doc.tlpobj 2019-02-28 04:09:43.000000000 +0100
+++ new/tlpkg/tlpobj/todonotes.doc.tlpobj 2019-11-07 18:46:51.000000000 +0100
@@ -1,6 +1,6 @@
name todonotes.doc
category Package
-revision 49820
+revision 52662
shortdesc doc files of todonotes
relocated 1
docfiles size=113
++++++ todonotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/todonotes.tlpobj new/tlpkg/tlpobj/todonotes.tlpobj
--- old/tlpkg/tlpobj/todonotes.tlpobj 2019-02-28 04:09:43.000000000 +0100
+++ new/tlpkg/tlpobj/todonotes.tlpobj 2019-11-07 18:46:51.000000000 +0100
@@ -1,11 +1,15 @@
name todonotes
category Package
-revision 49820
+revision 52662
shortdesc Marking things to do in a LaTeX document
relocated 1
longdesc The package lets the user mark things to do later, in a simple
longdesc and visually appealing way. The package takes several options
longdesc to enable customization/finetuning of the visual appearance.
+depend pgf
+depend tools
+depend xcolor
+depend xkeyval
runfiles size=5
RELOC/tex/latex/todonotes/todonotes.sty
catalogue-also todo
++++++ tools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/README.md new/doc/latex/tools/README.md
--- old/doc/latex/tools/README.md 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/README.md 2020-02-02 23:42:01.000000000 +0100
@@ -1,67 +1,30 @@
-## README for the `tools` bundle
+The LaTeX `tools` bundle
+========================
+Release 2020-02-02
-This bundle consists of LaTeX2e packages written and supported by
-members of the LaTeX3 Project Team.
+Overview
+--------
-The documented source code of each package is in a file with extension
-`.dtx`. Running LaTeX on the file `tools.ins` will produce all the
-package files, and some associated files.
+This bundle consists of packages providing a range of basic tools for
+LaTeX users. It is a required part of a LaTeX installation.
-So you should first process `tools.ins`:
+Installation
+------------
- latex tools.ins
+We no longer distribute installation instructions for the various TeX
+implementations. All modern TeX systems include `tools` as-standard, and end
+users should in general use the release versions supplied in this way.
-The files with extensions `.sty` and `.tex` (including a file whose
-name is just `.tex`) should then be moved to a directory on LaTeX's
-standard input path.
+Release distribution is carried out only through the CTAN archives.
-Documentation for the individual packages may then be obtained by
-running LaTeX on the `.dtx` files.
-
-For example:
-
- latex array.dtx
-
-will produce the file `array.pdf`, documenting the array package.
-
-
-The file `manifest.txt` contains a list of the main files in the
-distribution together with a one-or-two line summary of each package.
-
-
-### Copyright
-
-Copyright is maintained on each of these packages by the author(s)
-of the package.
-
-
-### Distribution Conditions
-
-All the files in this bundle may be distributed under the conditions
-of the LaTeX Project Public License, either version 1.3c of this
-license or (at your option) any later version. The latest version of
-this license is in
- https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
-
-The list of all files belonging to the Tools Bundle is
-given in the file `manifest.txt`.
-
-Commercial users of the `multicol` package are asked to read the
-notice at the head of the file multicol.dtx.
-
-The use of these files is otherwise unrestricted.
-
-
-### Reporting Bugs
-
-If you wish to report a problem or bug in any of these packages
-please use the
-[Issue Tracker for LaTeX2e on GitHub](https://github.com/latex3/latex2e/issues)
-and follow the guidelines that pop up if you press the `New issue` button.
+Reporting Bugs
+--------------
+If you wish to report a problem or bug in the `tools` bundle
+please use the [Issue Tracker for LaTeX2e on
+GitHub](https://github.com/latex3/latex2e/issues)
+and follow the guidelines that pop up if you press the "New issue" button.
In particular, to check that you are really seeing a bug, please write
a short, self-contained document that shows the problem. This should
@@ -73,9 +36,19 @@
If the bug turns out to be with third-party software then please
contact the developer, and not us!
+License
+-------
+The contents of this bundle are distributed under the [LaTeX Project
+Public License](https://www.latex-project.org/lppl/lppl-1-3c/),
+version 1.3c or later.
-### Copyright
+Copyright
+---------
+
+Copyright is maintained on each of these packages by the author(s)
+of the package.
-This README file is copyright 1993-2017 The LaTeX3 Project.
+-----
+<p>Copyright (C) 1993-2020 The LaTeX Project <br />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/README.txt new/doc/latex/tools/README.txt
--- old/doc/latex/tools/README.txt 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/README.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-
-%
-% Copyright 1993-2017
-% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
-% This file is part of the Standard LaTeX `Tools Bundle'.
-% -------------------------------------------------------
-%
-% It may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3c
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% https://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% The list of all files belonging to the LaTeX `Tools Bundle' is
-% given in the file `manifest.txt'.
-%
-
-
-README for the `tools' bundle
-=============================
-
-This `bundle' consists of LaTeX2e packages written and supported by
-members of the LaTeX3 Project Team.
-
-The documented source code of each package is in a file with extension
-`.dtx'. Running LaTeX on the file tools.ins will produce all the
-package files, and some associated files.
-
-So you should first process tools.ins:
-
- latex tools.ins
-
-The files with extensions `.sty' and `.tex' (including a file whose
-name is just `.tex') should then be moved to a directory on LaTeX's
-standard input path.
-
-See the Note at the end of this file if you have problems processing
-the tools.ins file.
-
-Documentation for the individual packages may then be obtained by
-running LaTeX on the `.dtx' files.
-
-For example:
-
- latex array.dtx
-
-will produce the file array.dvi, documenting the array package.
-
-
-The file manifest.txt contains a list of the main files in the
-distribution together with a one-or-two line summary of each package.
-
-
-Copyright
-=========
-Copyright is maintained on each of these packages by the author(s)
-of the package.
-
-
-Distribution Conditions
-=======================
-
-All the files in this bundle may be distributed under the conditions
-of the LaTeX Project Public License, either version 1.1 of this
-license or (at your option) any later version. The latest version of
-this license is in
- https://www.latex-project.org/lppl.txt
-and version 1.1 or later is part of all distributions of LaTeX
-version 1999/06/01 or later.
-
-The list of all files belonging to the `Tools Bundle' is
-given in the file `manifest.txt'.
-
-Commercial users of the multicol package are asked to read the
-notice at the head of the file multicol.dtx.
-
-The use of these files is otherwise unrestricted.
-
-
-Reporting Bugs
-==============
-
-If you wish to report a problem or bug in any of these packages, use
-the latexbug.tex program that comes with the standard LaTeX
-distribution. Please ensure that you enter `tools' category when
-prompted with a menu of categories, so that the message will be
-automatically forwarded to the appropriate part of our database.
-
-When reporting bugs, please produce a small test file that shows the
-problem, and ensure that you are using the current version of the
-package, and of the base LaTeX software.
-
-
Binary files old/doc/latex/tools/afterpage.pdf and new/doc/latex/tools/afterpage.pdf differ
Binary files old/doc/latex/tools/array.pdf and new/doc/latex/tools/array.pdf differ
Binary files old/doc/latex/tools/bm.pdf and new/doc/latex/tools/bm.pdf differ
Binary files old/doc/latex/tools/calc.pdf and new/doc/latex/tools/calc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/changes.txt new/doc/latex/tools/changes.txt
--- old/doc/latex/tools/changes.txt 2019-01-06 23:04:13.000000000 +0100
+++ new/doc/latex/tools/changes.txt 2020-02-02 23:42:01.000000000 +0100
@@ -6,6 +6,110 @@
=======================================================================
#########################
+# 2020-02-02 Release
+#########################
+
+2020-01-15 David Carlisle
+
+ * tabularx.dtx: Avoid .. at end of the Target width debug message.
+
+2020-01-07 David Carlisle
+
+ * longtable.dtx: additional \endgraf for
+ https://github.com/davidcarlisle/dpctex/issues/8
+
+2020-01-04 David Carlisle
+
+ * hhline.dtx: Allow and ignore spaces in the \hhline argument.
+
+2019-12-09 Frank Mittelbach
+
+ * multicol.dtx:
+ Support up to 20 columns instead of 10; also ensure that
+ the insert boxes are not clobbered (gh/237)
+
+2019-10-15 Frank Mittelbach
+
+ * multicol.dtx: Use \@maxdepth not \maxdepth (gh/190)
+
+#########################
+# 2019-11-10 PL 3 Release
+#########################
+
+2019-11-10 Frank Mittelbach
+
+ * verbatim.dtx: support \vervisiblespace with luatex and xetex (gh/212)
+
+2019-11-08 David Carlisle
+
+ * (shellesc): restore the original catcode of _ to _ not to "
+
+#########################
+# 2019-11-08 Release
+#########################
+
+2019-11-08 David Carlisle
+
+ * (shellesc): restore the original catcode of _ to _ not to "
+
+#########################
+# 2019-10-01 PL 2 Release
+#########################
+
+2019-11-05 Frank Mittelbach
+
+ * varioref.dtx (subsection{Defining the main macros}):
+ Support (mis)use of internal interface by fancyref (sx/515106)
+
+2019-10-17 David Carlisle
+
+ * shellesc.dtx: protect against active _ and "
+
+2019-10-13 David Carlisle
+
+ * shellesc.dtx: add logging in luatex and \ShellEscapeStatus (gh/195)
+
+#########################
+# 2019-10-01 Release
+#########################
+
+2019-09-09 Frank Mittelbach
+
+ * varioref.dtx (subsection{Options}:
+ Option arabic added
+
+2019-08-31 Frank Mittelbach
+
+ * array.dtx: Add a necessary \expandafter so that redefinitions
+ of primitive specifiers give a warning (github/148)
+
+2019-08-25 Frank Mittelbach
+
+ * varioref.dtx: \labelformat and \Ref now available in the kernel
+ so removed from this package but only if running on new kernel
+
+ (subsection{Options}):
+ Provide options space and nospace
+
+ (subsection{Defining the main macros}):
+ Don't drop a preceding space completely but reinsert it later
+ after setting a label;
+ Command \vp@gerefstar, \vref@star and \Vref@star added to support
+ hyperref better
+
+ (subsubsection{Supporting ranges}):
+ Added \vpagerefcompare, \vpagrefnearby and \vpagerefcomparenearby
+
+2019-03-01 Frank Mittelbach
+
+ * multicol.dtx (subsection{The output routines}):
+ Provide minrows counter for balancing.
+
+2019-02-06 David Carlisle
+
+ * longtable.dtx: Document the extra color groups
+
+#########################
# 2019-01-05 Release
#########################
@@ -22,7 +126,7 @@
2018-12-27 Frank Mittelbach
- * multicol.dtx (subsection{The output routines}]):
+ * multicol.dtx (subsection{The output routines}):
Removed dead code, the case where this can go wrong is too
obscure to worry about it (gh/101)
@@ -412,7 +516,7 @@
2005-11-26 Frank Mittelbach
* varioref.dtx: Single hyphen rather than -- in range for spanish
- an galician.
+ and galician.
2005-11-10 Frank Mittelbach
@@ -454,7 +558,7 @@
* varioref.dtx: small change in italian.
small fix in german and ngerman (pr/3793)
-
+
2005-06-09 Frank Mittelbach
* varioref.dtx: fixed bug in Dutch localization (pr/3791)
@@ -471,7 +575,7 @@
2005-04-09 Frank Mittelbach
* varioref.dtx: Basque defaults added (by I\~naki Larra\~naga
- Murgoitio)
+ Murgoitio)
2004-12-07 Morten Hoegholm
@@ -485,7 +589,7 @@
2004-07-03 Frank Mittelbach
* multicol.dtx: fixing errors that happen only if multicol is
- compiled with a special combination of docstrip modules.
+ compiled with a special combination of docstrip modules.
2004-05-08 Frank Mittelbach
@@ -540,7 +644,7 @@
2003-03-29 Frank Mittelbach
- * varioref.dtx (subsection{Options}):
+ * varioref.dtx (subsection{Options}):
Afrikaans option contributed by Danie Els .
2003-03-18 Frank Mittelbach
@@ -549,19 +653,19 @@
2003-03-15 Frank Mittelbach
- * multicol.dtx:
+ * multicol.dtx:
Further corrections to the micro-spacing around the boxes produced
by multicols, so that grid typesetting (given right values for
other parameters) becomes a possibility.
Also added option "grid" which currently does nothing except
producing a warning if the grid might got lost.
-
+
2003-02-17 Frank Mittelbach
- * multicol.dtx:
+ * multicol.dtx:
Add a kern to cancel potential depth of previous line at the
beginning of a multicols and also suppsed \lineskip
-
+
\multicolovershoot set back to 0pt as a default 2pt was simply
wrong in some applications (pr/3465)
@@ -597,7 +701,7 @@
style (pr/3414)
* varioref.dtx: Use \vpageref inside \ref not \@vpageref
- to get spacing correct (pr/3403)
+ to get spacing correct (pr/3403)
2002-06-14 Frank Mittelbach
@@ -613,7 +717,7 @@
\renewcommand\reftextfaceafter {on page~\thevpagerefnum}
texts for "slovak" and "slovene" options added
-
+
2001-09-04 Frank Mittelbach
* varioref.dtx: correct typo in name \vref -> \vr@f
@@ -624,7 +728,7 @@
2001-05-28 Chris Rowley
- * dcolumn.dtx:
+ * dcolumn.dtx:
Documentation of centring improved (pr/3315)
@@ -685,13 +789,13 @@
2000-06-11 Frank Mittelbach
- * multicol.dtx (subsection{The output routines}]): when
+ * multicol.dtx (subsection{The output routines}): when
doing boxed mode do not restrict height of columns to \@colroom
(pr/3212)
2000-05-05 Frank Mittelbach
- * multicol.dtx (subsection{Starting and ): Detect and fix
+ * multicol.dtx (subsection{Starting and ): Detect and fix
problem if a multicols ends at the top of a page
2000-04-16 Frank Mittelbach
@@ -735,7 +839,7 @@
1999-07-19 Frank Mittelbach
- * multicol.dtx:
+ * multicol.dtx:
Added some additional tracing code.
When balancing check that last column doesn't contain a forced
page break; if it does reject the solution.
@@ -758,7 +862,7 @@
1999-05-26 Frank Mittelbach
- * multicol.dtx (subsection{Manual column breaking}):
+ * multicol.dtx (subsection{Manual column breaking}):
Added a \columnbreak command to allow manual column breaks.
1999-05-01 Frank Mittelbach
@@ -1433,7 +1537,7 @@
1994-10-15 Frank Mittelbach
* array.dtx (subsection{Support for ...):
- Added \firsthline and \lasthline from Companion.
+ Added \firsthline and \lasthline from Companion.
1994-10-03 Frank Mittelbach
@@ -1478,7 +1582,7 @@
1994-08-26 Frank Mittelbach
- * multicol.dtx (subsection{The output routines}]):
+ * multicol.dtx (subsection{The output routines}):
Check explicitly for void boxes before assigning the current column
width to their width, because void boxes will not change.
Extract the kept marks before adding a penalty -10000 to the output box
@@ -1534,7 +1638,7 @@
1994-06-07 Frank Mittelbach
- * multicol.dtx (section{New macros and hacks for version 1.2}]):
+ * multicol.dtx (section{New macros and hacks for version 1.2}):
Updated float commands to contain \color@endgroup etc. so
that they work together with the color.sty package.
(Found by SPQR)
Binary files old/doc/latex/tools/dcolumn.pdf and new/doc/latex/tools/dcolumn.pdf differ
Binary files old/doc/latex/tools/delarray.pdf and new/doc/latex/tools/delarray.pdf differ
Binary files old/doc/latex/tools/enumerate.pdf and new/doc/latex/tools/enumerate.pdf differ
Binary files old/doc/latex/tools/fileerr.pdf and new/doc/latex/tools/fileerr.pdf differ
Binary files old/doc/latex/tools/fontsmpl.pdf and new/doc/latex/tools/fontsmpl.pdf differ
Binary files old/doc/latex/tools/ftnright.pdf and new/doc/latex/tools/ftnright.pdf differ
Binary files old/doc/latex/tools/hhline.pdf and new/doc/latex/tools/hhline.pdf differ
Binary files old/doc/latex/tools/indentfirst.pdf and new/doc/latex/tools/indentfirst.pdf differ
Binary files old/doc/latex/tools/layout.pdf and new/doc/latex/tools/layout.pdf differ
Binary files old/doc/latex/tools/longtable.pdf and new/doc/latex/tools/longtable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/manifest.txt new/doc/latex/tools/manifest.txt
--- old/doc/latex/tools/manifest.txt 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/manifest.txt 2020-02-02 23:42:01.000000000 +0100
@@ -2,22 +2,22 @@
%
% Copyright 1993-2016
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% https://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%
% CONTENTS OF THE TOOLS BUNDLE
@@ -36,7 +36,7 @@
Finer control over horizontal rules in tables. Requires array.
longtable.dtx
Multipage tables. (Does not require array, but uses the extended
- features if both are loaded.)
+ features if both are loaded.)
tabularx.dtx
Defines tabularx environment (similar to tabular*) but modifies
column widths, not inter-column space, to achieve a desired
@@ -49,14 +49,14 @@
Access bold math symbols.
calc.dtx
- Infix arithmetic expresions. Contributed to the distribution by
+ Infix arithmetic expresions. Contributed to the distribution by
Kresten Krab Thorup and Frank Jensen.
enumerate.dtx
Extended version of the enumerate environment.
fileerr.dtx
- Suite of small files which may be used to control TeX's
+ Suite of small files which may be used to control TeX's
missing file error loop.
fontsmpl.dtx
@@ -82,7 +82,7 @@
shellesc.dtx
Unified interface for accessing system commands.
-
+
showkeys.dtx
Draft mode showing the `keys' used by \label, \ref, \cite etc.
Binary files old/doc/latex/tools/multicol.pdf and new/doc/latex/tools/multicol.pdf differ
Binary files old/doc/latex/tools/rawfonts.pdf and new/doc/latex/tools/rawfonts.pdf differ
Binary files old/doc/latex/tools/shellesc.pdf and new/doc/latex/tools/shellesc.pdf differ
Binary files old/doc/latex/tools/showkeys.pdf and new/doc/latex/tools/showkeys.pdf differ
Binary files old/doc/latex/tools/somedefs.pdf and new/doc/latex/tools/somedefs.pdf differ
Binary files old/doc/latex/tools/tabularx.pdf and new/doc/latex/tools/tabularx.pdf differ
Binary files old/doc/latex/tools/theorem.pdf and new/doc/latex/tools/theorem.pdf differ
Binary files old/doc/latex/tools/tools-overview.pdf and new/doc/latex/tools/tools-overview.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/tools-overview.tex new/doc/latex/tools/tools-overview.tex
--- old/doc/latex/tools/tools-overview.tex 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/tools-overview.tex 2020-02-02 23:42:01.000000000 +0100
@@ -1,8 +1,13 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{tools-overview.tex}[2015/03/31 v1.0 Tools overview]
+% Copyright (C) 2006-2020
+%
+% The LaTeX3 Project and any individual authors listed elsewhere
+% in this file.
+%
% Copyright (c) 2006-2014 Heiko Oberdiek
-% (c) 2015-2016 The LaTeX3 Project
+% (c) 2015-2019 The LaTeX3 Project
%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
Binary files old/doc/latex/tools/trace.pdf and new/doc/latex/tools/trace.pdf differ
Binary files old/doc/latex/tools/varioref.pdf and new/doc/latex/tools/varioref.pdf differ
Binary files old/doc/latex/tools/verbatim.pdf and new/doc/latex/tools/verbatim.pdf differ
Binary files old/doc/latex/tools/xr.pdf and new/doc/latex/tools/xr.pdf differ
Binary files old/doc/latex/tools/xspace.pdf and new/doc/latex/tools/xspace.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tools.doc.tlpobj new/tlpkg/tlpobj/tools.doc.tlpobj
--- old/tlpkg/tlpobj/tools.doc.tlpobj 2019-02-28 04:09:44.000000000 +0100
+++ new/tlpkg/tlpobj/tools.doc.tlpobj 2020-02-03 01:54:59.000000000 +0100
@@ -1,11 +1,10 @@
name tools.doc
category Package
-revision 49619
+revision 53640
shortdesc doc files of tools
relocated 1
-docfiles size=1639
+docfiles size=1651
RELOC/doc/latex/tools/README.md
- RELOC/doc/latex/tools/README.txt
RELOC/doc/latex/tools/afterpage.pdf
RELOC/doc/latex/tools/array.pdf
RELOC/doc/latex/tools/bm.pdf
++++++ tools.tar.xz ++++++
++++ 2024 lines of diff (skipped)
++++++ topiclongtable.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/topiclongtable/README.md new/doc/latex/topiclongtable/README.md
--- old/doc/latex/topiclongtable/README.md 2018-11-06 21:50:18.000000000 +0100
+++ new/doc/latex/topiclongtable/README.md 2020-04-12 23:33:39.000000000 +0200
@@ -6,12 +6,6 @@
This work is licensed under MIT License.
-This work is a LaTeX package consisting of the following files:
- * README.md
- * topiclongtable.sty
- * topiclongtable-doc.tex
- * topiclongtable-doc.pdf
-
---
This LaTeX package extends `longtable` implementing cells that:
@@ -23,3 +17,6 @@
The typical use case is a table spanning multiple pages that contains a list of hierarchically organized topics (hence the package name).
+---
+
+Copyright (c) 2017-2020 Paolo Brasolin ()
Binary files old/doc/latex/topiclongtable/topiclongtable-doc.pdf and new/doc/latex/topiclongtable/topiclongtable-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/topiclongtable/topiclongtable-doc.tex new/doc/latex/topiclongtable/topiclongtable-doc.tex
--- old/doc/latex/topiclongtable/topiclongtable-doc.tex 2019-03-28 21:59:17.000000000 +0100
+++ new/doc/latex/topiclongtable/topiclongtable-doc.tex 2020-04-12 23:33:39.000000000 +0200
@@ -1,16 +1,13 @@
%
-% This work is sponsored by Human Predictions, LLC (http://www.humanpredictions.com).
-%
-% This work is maintained by Paolo Brasolin ().
+% topiclongtable v1.3.2 - Renders autocollapsing cells in longtables
%
-% This work is licensed under MIT License.
+% Copyright (c) 2017-2020 Paolo Brasolin ()
%
-% This work is a LaTeX package consisting of the following files:
-% * README.md
-% * topiclongtable.sty
-% * topiclongtable-doc.tex
-% * topiclongtable-doc.pdf
+% This work is sponsored by Human Predictions, LLC (http://www.humanpredictions.com).
+% This work is maintained by Paolo Brasolin ().
+% This work is available under the terms of the MIT License.
%
+
\documentclass[full,kernel]{l3doc}
\usepackage{topiclongtable}
@@ -29,7 +26,7 @@
\href{mailto:paolo.brasolin@gmail.com}{paolo.brasolin@gmail.com}
}
-\date{2019/03/27 v1.3.0}
+\date{2020/04/12 v1.3.2}
\maketitle
@@ -63,7 +60,7 @@
\subsection*{Environment}
-\begin{function}[updated=2019-03-27]{topiclongtable}
+\begin{function}[updated=2019-07-08]{topiclongtable}
\begin{syntax}
\tn[no-index]{begin}\{\env{topiclongtable}\}\marg{column specification}
\ \ \meta{cells specification}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/topiclongtable.doc.tlpobj new/tlpkg/tlpobj/topiclongtable.doc.tlpobj
--- old/tlpkg/tlpobj/topiclongtable.doc.tlpobj 2019-03-29 02:24:45.000000000 +0100
+++ new/tlpkg/tlpobj/topiclongtable.doc.tlpobj 2020-04-16 01:57:28.000000000 +0200
@@ -1,6 +1,6 @@
name topiclongtable.doc
category Package
-revision 50629
+revision 54758
shortdesc doc files of topiclongtable
relocated 1
docfiles size=97
++++++ topiclongtable.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/topiclongtable/topiclongtable.sty new/tex/latex/topiclongtable/topiclongtable.sty
--- old/tex/latex/topiclongtable/topiclongtable.sty 2019-03-28 21:59:17.000000000 +0100
+++ new/tex/latex/topiclongtable/topiclongtable.sty 2020-04-12 23:33:39.000000000 +0200
@@ -1,16 +1,13 @@
%
-% This work is sponsored by Human Predictions, LLC (http://www.humanpredictions.com).
-%
-% This work is maintained by Paolo Brasolin ().
+% topiclongtable v1.3.2 - Renders autocollapsing cells in longtables
%
-% This work is licensed under MIT License.
+% Copyright (c) 2017-2020 Paolo Brasolin ()
%
-% This work is a LaTeX package consisting of the following files:
-% * README.md
-% * topiclongtable.sty
-% * topiclongtable-doc.tex
-% * topiclongtable-doc.pdf
+% This work is sponsored by Human Predictions, LLC (http://www.humanpredictions.com).
+% This work is maintained by Paolo Brasolin ().
+% This work is available under the terms of the MIT License.
%
+
\NeedsTeXFormat{LaTeX2e}[2017-04-15]
\RequirePackage{zref-abspage}[2016/05/21]
@@ -21,7 +18,7 @@
\RequirePackage{longtable}[2014/10/28]
\PassOptionsToPackage{longtable}{multirow}
-\ProvidesExplPackage {topiclongtable} {2019/03/27} {1.3.0} {Renders autocollapsing cells in longtables}
+\ProvidesExplPackage {topiclongtable} {2020/04/12} {v1.3.2} {Renders autocollapsing cells in longtables}
\ProcessOptions\relax
@@ -101,6 +98,7 @@
%% reset counters and table variables
\int_gzero:N \g_tlt_col_idx_int
\int_gzero:N \g_tlt_row_idx_int
+ \prop_gclear:N \g_tlt_topics_labels_prop
\clist_gset:Nn \g_tlt_multirows_heights_clist \c_empty_clist
\clist_gset:Nn \g_tlt_rows_spans_prop \c_empty_clist
}
@@ -357,7 +355,7 @@
\clist_pop:NNTF \l_tmpa_clist \l_tmpb_tl {
\int_set:Nn \l_tmpa_int \l_tmpb_tl
} {
- \int_set_eq:NN \l_tmpa_int \c_one
+ \int_set_eq:NN \l_tmpa_int \c_one_int
}
% if integer A is zero, skip
\int_compare:nNnTF { \l_tmpa_int } { = } { 0 } {} {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/topiclongtable.tlpobj new/tlpkg/tlpobj/topiclongtable.tlpobj
--- old/tlpkg/tlpobj/topiclongtable.tlpobj 2019-03-29 02:24:45.000000000 +0100
+++ new/tlpkg/tlpobj/topiclongtable.tlpobj 2020-04-16 01:57:28.000000000 +0200
@@ -1,6 +1,6 @@
name topiclongtable
category Package
-revision 50629
+revision 54758
shortdesc Extend longtable with cells that merge hierarchically
relocated 1
longdesc This LaTeX package extends longtable implementing cells that:
@@ -10,15 +10,13 @@
longdesc page breaks, and automatically draw the correct separation
longdesc lines. The typical use case is a table spanning multiple pages
longdesc that contains a list of hierarchically organized topics (hence
-longdesc the package name).
+longdesc the package name). The package depends on array, expl3,
+longdesc longtable, multirow, xparse, and zref-abspage.
runfiles size=4
RELOC/tex/latex/topiclongtable/topiclongtable.sty
catalogue-contact-bugs https://github.com/paolobrasolin/topiclongtable/issues
-catalogue-contact-development https://github.com/paolobrasolin/topiclongtable
-catalogue-contact-home https://github.com/paolobrasolin/topiclongtable
catalogue-contact-repository https://github.com/paolobrasolin/topiclongtable
catalogue-ctan /macros/latex/contrib/topiclongtable
-catalogue-date 2019-03-27 22:00:53 +0100
catalogue-license mit
-catalogue-topics table-long
-catalogue-version 1.3.0
+catalogue-topics table-long table expl3
+catalogue-version 1.3.2
++++++ toptesi.doc.tar.xz ++++++
++++ 3035 lines of diff (skipped)
++++++ toptesi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/topcoman.sty new/tex/latex/toptesi/topcoman.sty
--- old/tex/latex/toptesi/topcoman.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/topcoman.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topcmn')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{topcoman}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Additional commands for the TOPtesi bundle]
@@ -51,17 +51,19 @@
\fi
\providecommand{\ohm}{\textormath{\textohm}{\mathrm{\Omega}}}
\@ifpackageloaded{toptesi}{%
-\providecommand\ped{}\providecommand\ap{}
-\renewcommand*{\ped}[1]{\textormath{\textsubscript{#1}}{_{\mathrm{#1}}}}
-\renewcommand*{\ap}[1]{\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}}{%
-\providecommand*{\ped}[1]{\textormath{\textsubscript{#1}}{_{\mathrm{#1}}}}%
-\providecommand*{\ap}[1]{\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}}
-\@ifpackageloaded{siunitx}{\def\unit#1{\si{\,#1}}}{%
-\providecommand\unit{}%
-\renewcommand\unit[1]{\ensuremath{{\mathrm{\,#1}}}}
-}
-\providecommand{\gei}{\ensuremath{{\mathop{\mathrm{j}}\nolimits}}}
-\providecommand{\eu}{\ensuremath{{\mathop{\mathrm{e}}\nolimits}}}
+\providecommand\ped{}\providecommand\ap{}%
+\renewcommand*{\ped}[1]{\textormath{\textsubscript{#1}}{_{\mathrm{#1}}}}%
+\renewcommand*{\ap}[1]{\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}}%
+{\providecommand*{\ped}[1]{\textormath{\textsubscript{#1}}%
+ {_{\mathrm{#1}}}}%
+\providecommand*{\ap}[1]{\textormath{\textsuperscript{#1}}%
+ {^{\mathrm{#1}}}}}
+\@ifpackageloaded{siunitx}{\def\unit#1{\si{\,#1}}}%
+ {\providecommand\unit{}%
+ \renewcommand\unit[1]{\ensuremath{{\mathrm{\,#1}}}}%
+ }
+\providecommand{\gei}{\ensuremath{\mathop{\mathrm{\mathstrut j}\nolimits}}}
+\providecommand{\eu}{\ensuremath{\mathop{\mathrm{e}}\nolimits}}
\providecommand{\micro}{\textormath{\textmu}{%
\ifPDFTeX
\ifdefined\muup\muup\else\mbox{\textmu}\fi
@@ -88,7 +90,7 @@
\let\p@figure\empty\let\p@table\empty}
\DisableFigTabNames
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/topfront.sty new/tex/latex/toptesi/topfront.sty
--- old/tex/latex/toptesi/topfront.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/topfront.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topfrn')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{topfront}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Title page for TOPtesi and other classes]
@@ -204,9 +204,11 @@
\newlength\T@Tlogoheight
\setlength\T@Tlogoheight{0.8\dimexpr(\paperwidth-\textwidth)/2}}{}
-\newcommand\logosede[2][\T@Tlogoheight]{\def\@logosede{#2}\TPT@logoheight=#1\relax
-\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}%
-\expandafter\fillup@TCP@logobox\@logosede,!}}
+\newcommand\logosede[2][\T@Tlogoheight]%
+ {\def\@logosede{#2}\TPT@logoheight=#1\relax
+ \ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{%
+ \begin{lrbox}{\TPT@logobox}%
+ \expandafter\fillup@TCP@logobox\@logosede,!}}
\def\fillup@TCP@logobox#1,#2!{%
\ifblank{#1}{\end{lrbox}\ifdim\wd\TPT@logobox>\textwidth
@@ -556,7 +558,7 @@
{\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}%
\endgroup}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-dottorale.sty new/tex/latex/toptesi/toptesi-dottorale.sty
--- old/tex/latex/toptesi/toptesi-dottorale.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-dottorale.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,13 +7,13 @@
%% toptesi.dtx (with options: `topdoc')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
\ProvidesPackage{toptesi-dottorale}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Ph.D. degree title page]
@@ -542,7 +542,7 @@
{\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}%
\endgroup}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-magistrale.sty new/tex/latex/toptesi/toptesi-magistrale.sty
--- old/tex/latex/toptesi/toptesi-magistrale.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-magistrale.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topmag')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-magistrale}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Master degree title page]
@@ -98,12 +98,18 @@
}%
\newif\iffemminile
-\ifTOPfront\ifclassica
-\def\Candidato{Laureando}
-\def\Candidata{Laureanda}
-\def\Candidati{Laureandi}
-\def\Candidate{Laureande}
-\fi\fi
+\def\Candidato{\ifclassica Laureando\else Candidato\fi}
+\def\Candidata{\ifclassica Laureanda\else Candidata\fi}
+\def\Candidati{\ifclassica Laureandi\else Candidati\fi}
+\def\Candidate{\ifclassica Laureande\else Candidate\fi}
+\newcommand\TitoloListaCandidati[1]{\CandidateNames#1,,,,!}
+\def\CandidateNames#1,#2,#3,#4,!{%
+ \gdef\Candidato{#1}% Masc/neutr-sing
+ \gdef\Candidati{#2}% Masc/neutr-plur
+ \gdef\Candidata{#3}% Fem-sing
+ \gdef\Candidate{#4}% Fem-plur
+}
+
\let\@stitle\empty % default short title string
\newcommand*{\titolo}[2][]{%
@@ -379,29 +385,28 @@
\end{center}%
\fi
\ifclassica
- \ifnum\value{tomo}>\z@
- \par\bigskip
- \noindent\makebox[\textwidth]{%
- \large\textbf{%
- \ifcase\c@tomo%
- \or \PrimoTomo%
- \or \SecondoTomo%
- \or \TerzoTomo%
- \or \QuartoTomo%
- \else
- \PackageWarning{toptesi}{%
- Counter tomo equals \the\c@tomo\MessageBreak
- We never considered a thesis might get
- divided in more than four volumes}%
- \fi}}%
- \fi
- \vspace{1em}
+ \ifnum\value{tomo}>\z@
+ \par\bigskip
+ \noindent\makebox[\textwidth]{%
+ \large\textbf{%
+ \ifcase\c@tomo%
+ \or \PrimoTomo%
+ \or \SecondoTomo%
+ \or \TerzoTomo%
+ \or \QuartoTomo%
+ \else
+ \PackageWarning{toptesi}{%
+ Counter tomo equals \the\c@tomo\MessageBreak
+ We never considered a thesis might get\MessageeBreak
+ divided in more than four volumes}%
+ \fi}}%
+ \fi
+ \vspace{1em}
\fi
\par
\unless\iftopTPTlogos
{\vfill\centering \printloghi\par}\fi
\vfill
- \iflanguage{italian}{%
\iffemminile
\def\@nomecandidato{\Candidata}%
\else
@@ -413,7 +418,6 @@
\else
\def\@nomecandidato{\Candidati}%
\fi}
- }{}%
\unless\iftriennale
\def\BoxRelatori{%
@@ -487,7 +491,7 @@
{\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}%
\endgroup}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-monografia.sty new/tex/latex/toptesi/toptesi-monografia.sty
--- old/tex/latex/toptesi/toptesi-monografia.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-monografia.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topmon')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-monografia}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Bachelor degree title page]
@@ -54,7 +54,8 @@
\NomeRelatore{Relatore}{Relatori}
\providecommand\@principaladviser{}
\def\relatore#1{\gdef\@principaladviser{#1}}
-\providecommand\@secondadviser{}\def\secondorelatore#1{\gdef\@secondadviser{#1}}
+\providecommand\@secondadviser{}
+\def\secondorelatore#1{\gdef\@secondadviser{#1}}
\providecommand\@thirdadviser{}
\def\terzorelatore#1{\gdef\@thirdadviser{#1}}
@@ -98,32 +99,32 @@
\def\sedutadilaurea#1{\getseduta#1 !}
\def\getseduta#1 #2!{%
- \def\@tempA{#2}%
- \ifx\@tempA\empty
- \def\@submitdate{#1}%
+ \def\@tempA{#2}%
+ \ifx\@tempA\empty
+ \def\@submitdate{#1}%
+ \else
+ \unless\ifclassica
+ \def\@submitdate{#1 #2}%
\else
- \unless\ifclassica
- \def\@submitdate{#1 #2}%
- \else
- \s@dutaclassica#1 #2!%
- \fi
+ \s@dutaclassica#1 #2!%
\fi
+ \fi
}%
\def\s@dutaclassica#1 #2!{%
- \if@ldstyle
- \s@paranumeri#2-!%
- \ifx\2\empty
- \edef\@submitdate{\noexpand#1 \noexpand\oldstylenums{#2}}%
- \else
- \s@paranumeri#2!%
- \edef\@submitdate{\noexpand#1
- \noexpand\oldstylenums{\1} -- \noexpand\oldstylenums{\2}}%
- \fi
- \let\1\undefined
- \let\2\undefined
+ \if@ldstyle
+ \s@paranumeri#2-!%
+ \ifx\2\empty
+ \edef\@submitdate{\noexpand#1 \noexpand\oldstylenums{#2}}%
\else
- \def\@submitdate{#1 #2}%
+ \s@paranumeri#2!%
+ \edef\@submitdate{\noexpand#1
+ \noexpand\oldstylenums{\1} -- \noexpand\oldstylenums{\2}}%
\fi
+ \let\1\undefined
+ \let\2\undefined
+ \else
+ \def\@submitdate{#1 #2}%
+ \fi
}
\def\s@paranumeri#1-#2!{\def\1{#1}\def\2{#2}}%
@@ -150,7 +151,8 @@
\newlength\T@Tlogoheight
\setlength\T@Tlogoheight{0.8\dimexpr(\paperwidth-\textwidth)/2}}{}
-\newcommand\logosede[2][\T@Tlogoheight]{\def\@logosede{#2}\TPT@logoheight=#1\relax
+\newcommand\logosede[2][\T@Tlogoheight]%
+{\def\@logosede{#2}\TPT@logoheight=#1\relax
\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}%
\expandafter\fillup@TCP@logobox\@logosede,!}}
@@ -197,7 +199,8 @@
\providecommand\Correlatori{Correlatori}
\newcommand\CoAdvisorName[2]{\gdef\Correlatore{#1}%
\gdef\Correlatori{#2}}
-\ifcsundef{iftopTPTlogos}{\newbool{topTPTlogos} \booltrue{topTPTlogos}}{}
+\ifcsundef{iftopTPTlogos}{\newbool{topTPTlogos}%
+ \booltrue{topTPTlogos}}{}
\NewDocumentEnvironment{ThesisTitlePage}{s}
{% OPENING
\IfBooleanTF{#1}{\boolfalse{topTPTlogos}}{\booltrue{topTPTlogos}}%
@@ -209,12 +212,15 @@
\PackageWarning{monografia}{No configuration file found}%
}%C
}{% CLOSING
- \ifbool{topTPTlogos}{\noindent\raisebox{-0.5em}[\z@][\z@]{\makebox[\textwidth]{\printloghi}}\par\bigskip}{}
+ \ifbool{topTPTlogos}{\noindent\raisebox{-0.5em}[\z@][\z@]%
+ {\makebox[\textwidth]{\printloghi}}\par\bigskip}{}
\ifdefempty{\ateneo}{}{{\centering\huge \@ateneo\par}}
- \ifdefempty{\@NomeAteneo}{}{\medskip{\centering\large
+ \ifdefempty{\@NomeAteneo}{}{\medskip{\centering\large
\expandafter\MakeUppercase\expandafter{\@NomeAteneo}\par}}
- \ifdefempty{\@strutturadi}{}{\vspace{\stretch{0.1}}\par{\centering \Large\@struttura\par}}
- \ifdefempty{\@corsodistudi}{}{\bigskip{\centering\large \NomeCorsoDiStudi\ \@corsodistudi\par}}
+ \ifdefempty{\@strutturadi}{}{\vspace{\stretch{0.1}}\par{\centering
+ \Large\@struttura\par}}
+ \ifdefempty{\@corsodistudi}{}{\bigskip{\centering\large
+ \NomeCorsoDiStudi\ \@corsodistudi\par}}
\ifdefempty{\@materia}{}{\medskip{\centering\large\@materia\par}}
\vspace{\stretch{0.25}}
{\centering\large \@monografia\par}
@@ -324,7 +330,7 @@
\newpage}
}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-scudo.sty new/tex/latex/toptesi/toptesi-scudo.sty
--- old/tex/latex/toptesi/toptesi-scudo.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-scudo.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topscu')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-scudo}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Extension for ScuDo theses]
@@ -27,10 +27,9 @@
\RequirePackage{unicode-math}
\fi
\AtBeginDocument{%
-\providecommand\diff{}%
-\renewcommand{\diff}{\mathop{}\!\mathrm{d}}
-\providecommand{\gei}{\ensuremath{{\mathop{\mathrm{j}}\nolimits}}}
-\providecommand{\eu}{\ensuremath{{\mathop{\mathrm{e}}\nolimits}}}
+\providecommand\diff{}\renewcommand{\diff}{\mathop{}\!\mathrm{d}}
+\providecommand{\gei}{\ensuremath{\mathop{\mathrm{\mathstrut j}}\nolimits}}
+\providecommand{\eu}{\ensuremath{\mathop{\mathrm{e}}\nolimits}}
\let\iu\gei}
\ifcsundef{ifmybibstyle}{\newif\ifmybibstyle\mybibstylefalse}{}
@@ -82,7 +81,11 @@
citestyle=numeric,
sorting=nty,
natbib]{biblatex} % LaTeX specific bibliography handler
- \addbibresource{references.bib}% bibliographic data base(s}
+ \IfFileExists{references.bib}% bibliographic data base(s}
+ {\addbibresource{references.bib}}%
+ {\IfFileExists{\jobname.bib}%
+ {\addbibresource{\jobname.bib}}%
+ {\relax}}
\fi
\usepackage{imakeidx}% to generate automatic indices
\ifPDFTeX \usepackage{indentfirst}\fi
@@ -99,15 +102,19 @@
\providecommand*\@title{}
\providecommand*\@subtitle{\vspace{\stretch{1}}}
\providecommand*\@author{}
-\providecommand*\@Nsupervisor{Supervisor}\providecommand*\@Nsupervisors{Supervisors}
+\providecommand*\@Nsupervisor{Supervisor}
+\providecommand*\@Nsupervisors{Supervisors}
\newcount\@supervisornumber
\providecommand*\@supervisorlist{}
\providecommand\@Nexaminationcommittee{Doctoral Examination Committee:}
\providecommand*\@Examinerlist{}
\providecommand*\@examlocation{Politecnico di Torino}
\providecommand*\@examinationdate{}
-\providecommand*\@creativecommons{This thesis is licensed under a Creative Commons License, Attribution - Noncommercial- NoDerivative Works 4.0 International: see \url{www.creativecommons.org}.
-The text may be reproduced for non-commercial purposes, provided that credit is given to the original author.}
+\providecommand*\@creativecommons{This thesis is licensed
+under a Creative Commons License, Attribution - Noncommercial-
+NoDerivative Works 4.0 International: see \url{www.creativecommons.org}.
+The text may be reproduced for non-commercial purposes, provided that
+credit is given to the original author.}
\providecommand\@disclaimer{\noindent I hereby declare that
the contents and organisation of this dissertation constitute
my own original work and does not compromise in any way the
@@ -142,7 +149,8 @@
\newlength\T@Tlogoheight
\setlength\T@Tlogoheight{0.8\dimexpr(\paperwidth-\textwidth)/2}}{}
-\newcommand\PhDschoolLogo[2][\T@Tlogoheight]{\def\@logosede{#2}\TPT@logoheight=#1\relax
+\newcommand\PhDschoolLogo[2][\T@Tlogoheight]%
+{\def\@logosede{#2}\TPT@logoheight=#1\relax
\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}%
\expandafter\fillup@TCP@logobox\@logosede,!}}
@@ -257,7 +265,7 @@
}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-sss.sty new/tex/latex/toptesi/toptesi-sss.sty
--- old/tex/latex/toptesi/toptesi-sss.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-sss.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topsss')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-sss}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
High school title page]
@@ -143,7 +143,7 @@
\clearpage}%%
%%
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi.cfg new/tex/latex/toptesi/toptesi.cfg
--- old/tex/latex/toptesi/toptesi.cfg 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi.cfg 2019-05-06 23:04:32.000000000 +0200
@@ -7,7 +7,7 @@
%% toptesi.dtx (with options: `topcfg')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
@@ -65,7 +65,7 @@
provided that credit is given to the original author.}
\fi
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi.cls new/tex/latex/toptesi/toptesi.cls
--- old/tex/latex/toptesi/toptesi.cls 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi.cls 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `class')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesClass{toptesi}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Class for typesetting university theses]
@@ -73,7 +73,7 @@
\expandafter\stop
\fi
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi.sty new/tex/latex/toptesi/toptesi.sty
--- old/tex/latex/toptesi/toptesi.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topsty')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Extension for toptesi.cls]
@@ -227,19 +227,23 @@
\newif\iffigurespage
\newif\iftablespage
\newif\ifnumeriromani
+\newif\if@mainmatter
\newif\iffrontmatter
-\def\frontmatter{\clearpage\ps@plain%
+\def\frontmatter{\clearpage\ps@plain\@mainmatterfalse
\ifTOPnumerazioneromana\numeriromanitrue\fi
\frontmattertrue\@openrightfalse\c@secnumdepth=-2\relax
}
-\def\mainmatter{\if@twoside\@openrighttrue\fi
+\def\mainmatter{\@mainmattertrue
+\if@twoside\@openrighttrue\fi
\ifTOPnumerazioneromana\numeriromanifalse\fi
- \frontmatterfalse\c@secnumdepth=2
+ \frontmatterfalse
+ \c@secnumdepth=2
\clearpage\ps@headings
\ifTOPnumerazioneromana\pagenumbering{arabic}\fi
}
\newcommand\backmatter{\cleardoublepage[empty]%
+\@mainmatterfalse
\setcounter{secnumdepth}{-1}\if@twoside\@openrightfalse\fi}
\AtBeginDocument{%
@@ -247,6 +251,7 @@
}
\figurespagefalse
\tablespagefalse
+
\let\ps@blank\ps@plain
\newcommand*\blankpagestyle[1]{%
\expandafter\let\expandafter\ps@blank\csname ps@#1\endcsname}
@@ -256,6 +261,7 @@
\if@openright
\null\thispagestyle{#1}\clearpage
\fi\fi\fi}
+
\def\sommario{%
\iffrontmatter\else\frontmattertrue\fi
\chapter*{\summaryname}}
@@ -264,24 +270,47 @@
\iffrontmatter\else\frontmattertrue\fi
\chapter*{\acknowledgename}}
\let\acknowledgements\ringraziamenti
-\def\@chapter[#1]#2{\iffrontmatter\mainmatter\fi
- \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
+\RenewDocumentCommand{\chapter}
+ {s O{#4} O{#2} m O{plain}}{%
+ \if@openright\cleardoublepage
+ \else\clearpage\fi
+ \thispagestyle{#5}%
+ \global\@topnum\z@
+ \@afterindentfalse
+\IfBooleanTF{#1}{%
+ \c@secnumdepth=-3\relax
+ \let\iftoc\iffalse
+}{%
+ \iffrontmatter\mainmatter\fi
+ \let\iftoc\iftrue
+}%
+ \ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter % where \if@mainmatter is defined
+ % (e.g. book.cls, toptesi.cls)
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \iftoc\addcontentsline{toc}{chapter}{%
+ \protect\numberline{\thechapter}#2}\fi
+ \else %
+ \iftoc\addcontentsline{toc}{chapter}{#2}\fi
+ \fi
+ \else % Were \mainmatter is not defined (e.g.report.cls)
+ \iftoc\addcontentsline{toc}{chapter}{#2}\fi
+ \fi
+ \markboth{#3}{#3}% No \MakeUppercase
+ \iftoc
+ \addtocontents{lof}%
+ {\protect\addvspace{10\p@}}%
+ \addtocontents{lot}%
+ {\protect\addvspace{10\p@}}%
+ \fi
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#4}]%
+ \else
+ \@makechapterhead{#4}%
+ \@afterheading
+ \fi
+}
\def\@part[#1]#2{\iffrontmatter\mainmatter\fi
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
@@ -300,30 +329,34 @@
\fi
\Huge \bfseries #2\par}%
\@endpart}
+
\renewcommand\tableofcontents{%
\chapter*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
\@starttoc{toc}%
\clearpage
\if@restonecol\twocolumn\fi
}
+
+\providecommand\phantomsection{}% in case \hyperref was not loaded
+
\renewcommand\listoffigures{%
- \chapter*{\listfigurename}
- \@mkboth{\listfigurename}{\listfigurename}%
+ \phantomsection
+ \chapter*{\listfigurename}%
\addcontentsline{toc}{chapter}{\listfigurename}
\@starttoc{lof}%
\clearpage
\if@restonecol\twocolumn\fi
}
+
\renewcommand\listoftables{%
+ \phantomsection
\chapter*{\listtablename}%
\addcontentsline{toc}{chapter}{\listtablename}
- \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\clearpage
\if@restonecol\twocolumn\fi
}
-\def\indici{%
+\def\indici{% If headings are desired, the pagestyle must be set in advance
\iffrontmatter\else\frontmattertrue\fi
\tableofcontents
\iftablespage
@@ -333,7 +366,7 @@
\listoftables
\let\addvspace=\saveaddvspace}
\fi
- \iffigurespage
+ \iffigurespage%
{\addvspace{10pt}
\let\saveaddvspace=\addvspace
\def\addvspace##1{}
@@ -342,6 +375,7 @@
\fi
\ifbool{@twoside}{\cleardoublepage[empty]}{}}
\let\allcontents\indici
+
\onecolumn
\if@twoside
\unless\ifScuDo
@@ -557,7 +591,6 @@
\usecounter{enumi}}
\else
\chapter*{\bibname}\relax
- \@mkboth{\bibname}{\bibname}\relax
\addcontentsline{toc}{chapter}{\bibname}\relax
\list{[\arabic{enumi}]}{\settowidth\labelwidth{[#1]}%
\leftmargin\labelwidth
@@ -733,7 +766,7 @@
}
\let\wittysentences\citazioni \let\endwittysentences\endcitazioni
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/toptesi.tlpobj new/tlpkg/tlpobj/toptesi.tlpobj
--- old/tlpkg/tlpobj/toptesi.tlpobj 2019-02-28 04:09:50.000000000 +0100
+++ new/tlpkg/tlpobj/toptesi.tlpobj 2019-07-26 23:54:49.000000000 +0200
@@ -1,6 +1,6 @@
name toptesi
category Package
-revision 49211
+revision 51743
shortdesc Bundle for typesetting multilanguage theses
relocated 1
longdesc This bundle contains everything needed for typesetting a
@@ -27,7 +27,7 @@
RELOC/tex/latex/toptesi/toptesi.cls
RELOC/tex/latex/toptesi/toptesi.sty
catalogue-ctan /macros/latex/contrib/toptesi
-catalogue-date 2018-11-21 16:45:50 +0100
+catalogue-date 2019-07-26 15:59:19 +0200
catalogue-license lppl1.3c
-catalogue-topics dissertation class
-catalogue-version 6.2.09
+catalogue-topics dissertation class multilingual
+catalogue-version 6.3.06
++++++ tpic2pdftex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/tpic2pdftex.man1.pdf and new/texmf-dist/doc/man/man1/tpic2pdftex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj new/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj
--- old/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj 2019-11-19 01:55:54.000000000 +0100
@@ -1,6 +1,6 @@
name tpic2pdftex.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of tpic2pdftex
docfiles size=26
texmf-dist/doc/man/man1/tpic2pdftex.1
++++++ tracklang.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/tracklang/CHANGES new/doc/generic/tracklang/CHANGES
--- old/doc/generic/tracklang/CHANGES 2018-05-13 23:53:50.000000000 +0200
+++ new/doc/generic/tracklang/CHANGES 2019-12-01 22:36:02.000000000 +0100
@@ -1,3 +1,44 @@
+v1.4 (2019-11-30):
+
+ * tracklang.tex:
+
+ - Changed \TrackLangIfFileExists to also include script and
+ variant in file search (search order has changed slightly).
+
+ - Added \TrackLangRedefHook
+
+ - New commands provided to assist integration with language
+ packages:
+
+ \TrackLangAddExtraRegionFile
+ \TrackLangAddExtraScriptFile
+ \TrackLangProvidePredefinedLanguage
+ \TrackLangProvidePredefinedDialect
+
+ - New switch \ifTrackLangShowVerbose for debugging
+
+v1.3.9 (2019-11-11):
+
+ * tracklang.tex:
+
+ - added \TrackIfKnownLanguage
+
+v1.3.8 (2019-10-06):
+
+ * tracklang.tex:
+
+ - added undetermined (und) language
+ - added 'nil' as a dialect of 'undetermined'
+
+ * tracklang.sty:
+
+ - added \@tracklang@prelangpkgcheck@hook
+
+v1.3.7 (2019-08.31):
+
+ * tracklang.sty: corrected misspelt \AddTrackedLangage (should be
+ \AddTrackedLanguage)
+
v1.3.6 (2018-05-13):
* \GetTrackedDialectFromLanguageTag now sets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/tracklang/README new/doc/generic/tracklang/README
--- old/doc/generic/tracklang/README 2018-05-13 23:53:50.000000000 +0200
+++ new/doc/generic/tracklang/README 2019-12-01 22:36:02.000000000 +0100
@@ -1,6 +1,6 @@
-Generic TeX Bundle : tracklang v1.3.6
+Generic TeX Bundle : tracklang v1.4
-Last Modified : 2018-05-13
+Last Modified : 2019-11-30
Author : Nicola Talbot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/tracklang/samples/animals/animals.sty new/doc/generic/tracklang/samples/animals/animals.sty
--- old/doc/generic/tracklang/samples/animals/animals.sty 2016-10-09 01:34:41.000000000 +0200
+++ new/doc/generic/tracklang/samples/animals/animals.sty 2019-12-01 22:36:02.000000000 +0100
@@ -1,9 +1,17 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{animals}[2016/10/06 v1.2 (NLCT) Sample package to test tracklang.sty]
+\ProvidesPackage{animals}[2019/11/30 v1.2.1 (NLCT) Sample package to test tracklang.sty]
-\RequirePackage{tracklang}[2016/10/07]
+\RequirePackage{tracklang}[2019/11/30]
-\DeclareOption*{\TrackLanguageTag{\CurrentOption}}
+\DeclareOption*{%
+ \TrackIfKnownLanguage{\CurrentOption}%
+ {\PackageInfo{animals}{Tracking language `\CurrentOption'}}% successful
+ {% failed
+ \PackageError{animals}%
+ {Unknown language specification `\CurrentOption'}%
+ {You need to supply either a known dialect label or a valid language tag}%
+ }%
+}
\ProcessOptions
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-de.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-de.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals.pdf and new/doc/generic/tracklang/samples/animals/sample-animals.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions.pdf and new/doc/generic/tracklang/samples/regions/sample-regions.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang.pdf and new/doc/generic/tracklang/samples/sample-tracklang.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang2.pdf and new/doc/generic/tracklang/samples/sample-tracklang2.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang3.pdf and new/doc/generic/tracklang/samples/sample-tracklang3.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang4.pdf and new/doc/generic/tracklang/samples/sample-tracklang4.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang5.pdf and new/doc/generic/tracklang/samples/sample-tracklang5.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang6.pdf and new/doc/generic/tracklang/samples/sample-tracklang6.pdf differ
Binary files old/doc/generic/tracklang/tracklang.pdf and new/doc/generic/tracklang/tracklang.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tracklang.doc.tlpobj new/tlpkg/tlpobj/tracklang.doc.tlpobj
--- old/tlpkg/tlpobj/tracklang.doc.tlpobj 2019-02-28 04:09:51.000000000 +0100
+++ new/tlpkg/tlpobj/tracklang.doc.tlpobj 2019-12-02 01:58:14.000000000 +0100
@@ -1,9 +1,9 @@
name tracklang.doc
category Package
-revision 47704
+revision 52991
shortdesc doc files of tracklang
relocated 1
-docfiles size=314
+docfiles size=330
RELOC/doc/generic/tracklang/CHANGES
RELOC/doc/generic/tracklang/README
RELOC/doc/generic/tracklang/samples/animals/animals-en-GB.ldf
++++++ tracklang.tar.xz ++++++
++++ 2154 lines of diff (skipped)
++++++ translations.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/translations/README new/doc/latex/translations/README
--- old/doc/latex/translations/README 2017-09-01 03:34:26.000000000 +0200
+++ new/doc/latex/translations/README 2020-02-28 23:29:38.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the TRANSLATIONS package v1.7a - 2017/08/31
+the TRANSLATIONS package v1.8 - 2020/02/28
internationalization of LaTeX2e packages
--------------------------------------------------------------------------
@@ -7,7 +7,7 @@
Web: https://github.com/cgnieder/translations
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2017 Clemens Niederberger
+Copyright 2012--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/translations/translations_en.pdf and new/doc/latex/translations/translations_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/translations/translations_en.tex new/doc/latex/translations/translations_en.tex
--- old/doc/latex/translations/translations_en.tex 2017-09-01 03:34:26.000000000 +0200
+++ new/doc/latex/translations/translations_en.tex 2020-02-28 23:29:38.000000000 +0100
@@ -1,7 +1,7 @@
-% !arara: pdflatex: { shell: on }
+% arara: pdflatex: { shell: on, interaction: nonstopmode }
% !arara: biber
-% arara: pdflatex
-% arara: pdflatex
+% !arara: pdflatex
+% !arara: pdflatex
% --------------------------------------------------------------------------
% the TRANSLATIONS package
%
@@ -12,7 +12,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,8 +31,10 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\documentclass[load-preamble+,french,spanish,ngerman,english]{cnltx-doc}
+\documentclass[load-preamble]{cnltx-doc}
+\usepackage[french,spanish,ngerman,english]{babel}
% ----------------------------------------------------------------------------
+\usepackage{imakeidx}
% document layout and typographic features
\setcnltx{
package = {translations} ,
@@ -81,13 +83,19 @@
\microtypesetup{tracking=scshape}
-\defbibheading{bibliography}[\bibname]{\addsec{#1}}
-
+\usepackage[
+ backend=biber,
+ style=cnltx,
+ sortlocale=en_US,
+ indexing=cite]{biblatex}
\usepackage{csquotes}
+\addbibresource{cnltx.bib}
+
+\usepackage[biblatex]{embrac}
+\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
+\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
-\usepackage{embrac}[2012/06/29]
- \ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
- \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
+\defbibheading{bibliography}{\section{References}}
% ----------------------------------------------------------------------------
% other packages, bibliography, index
@@ -420,7 +428,7 @@
\meta{false} if the current \pkg{babel} language is \code{american}.
\expandable\command{ifcurrentbaselanguage}[\marg{lang}\marg{true}\marg{false}]
\sinceversion{1.2}Places \meta{true} in the input stream if the current
- language is \meta{lang}. Note: a dialect does notcount as a language of
+ language is \meta{lang}. Note: a dialect does not count as a language of
it's own here. If the current \pkg{babel} language is \code{american}
then \cs{ifcurrentbaselanguage}\Marg{English} will be \meta{true}.
\end{commands}
@@ -488,7 +496,7 @@
chosen a language for which no translation is defined the language `fallback'
will be used, \ie, the translation provided with
\cs{DeclareTranslationFallback}. If no fallback translation is provided
-either the translation will expand to the literal string.
+either, the translation will expand to the literal string.
The following three examples should make this concept clear:
@@ -618,10 +626,13 @@
\item German, and
\item Spanish.
\end{itemize}
-The corresponding dictionary is loaded automatically if the document language
-is one of these languages. If you'd like to contribute and add the basic
-dictionary in your language this is more than welcome and highly appreciated!
-The easiest way to do this would be to copy one of the existing files
+The corresponding dictionary\footnote{Or dictionaries if more than one of
+ these languages are loaded in a document. This works since v0.18.} is loaded
+automatically if the document language is one of these languages.
+
+\emph{If you'd like to contribute and add the basic dictionary in your
+ language this is more than welcome and highly appreciated!} The easiest way
+to do this would be to copy one of the existing files
\code{translations-basic-dictionary-\meta{lang}.trsl} and modify the file
accordingly. You can then send me the file via email and I'll add it to
\translations.
@@ -775,4 +786,6 @@
% \section{Implementation}
% \lstinputlisting[style=cnltx]{translations.sty}
+\printbibliography
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translations.doc.tlpobj new/tlpkg/tlpobj/translations.doc.tlpobj
--- old/tlpkg/tlpobj/translations.doc.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translations.doc.tlpobj 2020-02-29 02:00:23.000000000 +0100
@@ -1,9 +1,9 @@
name translations.doc
category Package
-revision 45189
+revision 53962
shortdesc doc files of translations
relocated 1
-docfiles size=134
+docfiles size=132
RELOC/doc/latex/translations/README
RELOC/doc/latex/translations/translations_en.pdf
RELOC/doc/latex/translations/translations_en.tex
++++++ translations.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-catalan.trsl new/tex/latex/translations/translations-basic-dictionary-catalan.trsl
--- old/tex/latex/translations/translations-basic-dictionary-catalan.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-catalan.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-dutch.trsl new/tex/latex/translations/translations-basic-dictionary-dutch.trsl
--- old/tex/latex/translations/translations-basic-dictionary-dutch.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-dutch.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-english.trsl new/tex/latex/translations/translations-basic-dictionary-english.trsl
--- old/tex/latex/translations/translations-basic-dictionary-english.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-english.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-french.trsl new/tex/latex/translations/translations-basic-dictionary-french.trsl
--- old/tex/latex/translations/translations-basic-dictionary-french.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-french.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-german.trsl new/tex/latex/translations/translations-basic-dictionary-german.trsl
--- old/tex/latex/translations/translations-basic-dictionary-german.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-german.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-spanish.trsl new/tex/latex/translations/translations-basic-dictionary-spanish.trsl
--- old/tex/latex/translations/translations-basic-dictionary-spanish.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-spanish.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations.sty new/tex/latex/translations/translations.sty
--- old/tex/latex/translations/translations.sty 2017-09-01 03:34:26.000000000 +0200
+++ new/tex/latex/translations/translations.sty 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,8 +25,8 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\newcommand*\@trnslt@date{2017/08/31}
-\newcommand*\@trnslt@version{v1.7a}
+\newcommand*\@trnslt@date{2018/02/28}
+\newcommand*\@trnslt@version{v1.8}
\newcommand*\@trnslt@packageinfo{internationalization of LaTeX2e packages}
\ProvidesPackage{translations}[%
@@ -143,7 +143,9 @@
\@trnslt@if@language{#1}
{}{%
\csdef{@trnslt@language@#1}{#1}%
- \listeadd\@trnslt@languages{#1}%
+ \@trnslt@if@dialect{#1}
+ {}
+ {\listeadd\@trnslt@languages{#1}}%
}%
}
@@ -838,6 +840,29 @@
\DeclareLanguage{vietnamese}
\DeclareLanguage{welsh}
+\DeclareLanguageDialect{british}{english}
+\DeclareLanguageDialect{australian}{english}
+\DeclareLanguageDialect{american}{english}
+\DeclareLanguageDialect{acadian}{french}
+\DeclareLanguageDialect{canadien}{french}
+\DeclareLanguageDialect{canadian}{english}
+\DeclareLanguageDialect{newzealand}{english}
+\DeclareLanguageDialect{irish}{gaelic}
+\DeclareLanguageDialect{scottish}{gaelic}
+\DeclareLanguageDialect{austrian}{german}
+\DeclareLanguageDialect{hindi}{hindustani}
+\DeclareLanguageDialect{urdu}{hindustani}
+\DeclareLanguageDialect{indonesian}{malay}
+\DeclareLanguageDialect{brazil}{portuges}
+\DeclareLanguageDialect{serbian}{serbocroatian}
+\DeclareLanguageDialect{croatian}{serbocroatian}
+\DeclareLanguageDialect{lowersorbian}{sorbian}
+\DeclareLanguageDialect{uppersorbian}{sorbian}
+\DeclareLanguageDialect{swissgerman}{german}
+\DeclareLanguageDialect{swissfrench}{french}
+\DeclareLanguageDialect{swissitalian}{italian}
+\DeclareLanguageDialect{swissromansh}{romansh}
+
% --------------------------------------------------------------------------
% aliases and dialects:
\DeclareLanguageAlias {Afrikaans}{afrikaans}
@@ -866,32 +891,23 @@
\DeclareLanguageAlias {Finnish}{finnish}
\DeclareLanguageAlias {francais}{french}
\DeclareLanguageAlias {Francais}{francais}
-\DeclareLanguageDialect{canadien}{french}
\DeclareLanguageAlias {Canadien}{canadien}
\DeclareLanguageAlias {French}{french}
-\DeclareLanguageDialect{acadian}{french}
\DeclareLanguageAlias {Acadian}{acadian}
\DeclareLanguageAlias {frenchle}{french}
-\DeclareLanguageDialect{american}{english}
\DeclareLanguageAlias {American}{american}
-\DeclareLanguageDialect{australian}{english}
\DeclareLanguageAlias {Australian}{australian}
-\DeclareLanguageDialect{british}{english}
\DeclareLanguageAlias {British}{british}
-\DeclareLanguageDialect{canadian}{english}
\DeclareLanguageAlias {Canadian}{canadian}
\DeclareLanguageAlias {English}{english}
\DeclareLanguageAlias {UKenglish}{british}
\DeclareLanguageAlias {USenglish}{american}
-\DeclareLanguageDialect{newzealand}{english}
\DeclareLanguageAlias {Newzealand}{newzealand}
\DeclareLanguageAlias {Ethiop}{ethiop}
\DeclareLanguageAlias {Esperanto}{esperanto}
\DeclareLanguageAlias {Estonian}{estonian}
\DeclareLanguageAlias {Friulan}{friulan}
\DeclareLanguageAlias {Gaelic}{gaelic}
-\DeclareLanguageDialect{irish}{gaelic}
-\DeclareLanguageDialect{scottish}{gaelic}
\DeclareLanguageAlias {Irish}{irish}
\DeclareLanguageAlias {irish gaelic}{irish}
\DeclareLanguageAlias {Irish Gaelic}{irish}
@@ -902,7 +918,6 @@
\DeclareLanguageAlias {German}{german}
\DeclareLanguageAlias {germanb}{german}
\DeclareLanguageAlias {ngerman}{german}
-\DeclareLanguageDialect{austrian}{german}
\DeclareLanguageAlias {Austrian}{austrian}
\DeclareLanguageAlias {naustrian}{austrian}
\DeclareLanguageAlias {Greek}{greek}
@@ -913,9 +928,7 @@
\DeclareLanguageAlias {Hindustani}{hindustani}
\DeclareLanguageAlias {hindi-urdu}{hindustani}
\DeclareLanguageAlias {Hindi-Urdu}{hindi-urdu}
-\DeclareLanguageDialect{hindi}{hindustani}
\DeclareLanguageAlias {Hindi}{hindi}
-\DeclareLanguageDialect{urdu}{hindustani}
\DeclareLanguageAlias {Urdu}{urdu}
\DeclareLanguageAlias {Hungarian}{hungarian}
\DeclareLanguageAlias {magyar}{hungarian}
@@ -949,7 +962,6 @@
\DeclareLanguageAlias {Bahasai}{bahasai}
\DeclareLanguageAlias {bahasam}{bahasa}
\DeclareLanguageAlias {Bahasam}{bahasam}
-\DeclareLanguageDialect{indonesian}{malay}
\DeclareLanguageAlias {Indonesian}{indonesian}
\DeclareLanguageAlias {indon}{indonesian}
%
@@ -975,7 +987,6 @@
\DeclareLanguageAlias {Piemonteis}{piemonteis}
\DeclareLanguageAlias {Pinyin}{pinyin}
\DeclareLanguageAlias {Polish}{polish}
-\DeclareLanguageDialect{brazil}{portuges}
\DeclareLanguageAlias {Brazil}{brazil}
\DeclareLanguageAlias {brazilian}{brazil}
\DeclareLanguageAlias {Brazilian}{brazilian}
@@ -998,18 +1009,14 @@
\DeclareLanguageAlias {Serbocroatian}{serbocroatian}
\DeclareLanguageAlias {serbo-croatian}{serbocroatian}
\DeclareLanguageAlias {Serbo-Croatian}{serbocroatian}
-\DeclareLanguageDialect{serbian}{serbocroatian}
\DeclareLanguageAlias {Serbian}{serbian}
\DeclareLanguageAlias {serbianc}{serbian}
-\DeclareLanguageDialect{croatian}{serbocroatian}
\DeclareLanguageAlias {Croatian}{croatian}
\DeclareLanguageAlias {Slovak}{slovak}
\DeclareLanguageAlias {Slovenian}{slovenian}
\DeclareLanguageAlias {slovene}{slovenian}
\DeclareLanguageAlias {Slovene}{slovene}
\DeclareLanguageAlias {Sorbian}{sorbian}
-\DeclareLanguageDialect{lowersorbian}{sorbian}
-\DeclareLanguageDialect{uppersorbian}{sorbian}
\DeclareLanguageAlias {Lowersorbian}{lowersorbian}
\DeclareLanguageAlias {Uppersorbian}{uppersorbian}
\DeclareLanguageAlias {lsorbian}{lowersorbian}
@@ -1023,10 +1030,6 @@
\DeclareLanguageAlias {Spanglish}{spanglish}
\DeclareLanguageAlias {Spanish}{spanish}
\DeclareLanguageAlias {Swedish}{swedish}
-\DeclareLanguageDialect{swissgerman}{german}
-\DeclareLanguageDialect{swissfrench}{french}
-\DeclareLanguageDialect{swissitalian}{italian}
-\DeclareLanguageDialect{swissromansh}{romansh}
\DeclareLanguageAlias {Swissgerman}{swissgerman}
\DeclareLanguageAlias {swiss german}{swissgerman}
\DeclareLanguageAlias {Swiss German}{swissgerman}
@@ -1060,11 +1063,22 @@
% OK, we have everything, do we? No, wait: let's load the basic dictionary
% that is part of this package if it is available for the document language
% --------------------------------------------------------------------------
-% load basic dictionary if available
+% load basic dictionaries if available
\AtBeginDocument{%
- \@trnslt@load@dictionary@silent@for
- {translations-basic-dictionary}
- \@trnslt@current@language
+ \@ifpackageloaded{babel}
+ {\let\@trnslt@loaded@languages\bbl@loaded}
+ {}%
+ \@ifpackageloaded{polyglossia}
+ {\let\@trnslt@loaded@languages\xpg@loaded}
+ {}%
+ \ifdefined\@trnslt@loaded@languages\else
+ \let\@trnslt@loaded@languages\@trnslt@current@language
+ \fi
+ \expanded{%
+ \noexpand\forcsvlist
+ {\noexpand\@trnslt@load@dictionary@silent@for{translations-basic-dictionary}}
+ {\expandonce\@trnslt@loaded@languages}%
+ }%
}
\endinput
@@ -1158,3 +1172,5 @@
2017/07/03 v1.6a - fix issue #6 (bug in \@trnslt@save@translation@for)
2017/07/06 v1.7 - return translation values in \unexpanded
2017/08/31 v1.7a - add missing dependency on pdftexcmds
+2020/02/28 v1.8 - load basic dictionary for each loaded language (if
+ available)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translations.tlpobj new/tlpkg/tlpobj/translations.tlpobj
--- old/tlpkg/tlpobj/translations.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translations.tlpobj 2020-02-29 02:00:23.000000000 +0100
@@ -1,6 +1,6 @@
name translations
category Package
-revision 45189
+revision 53962
shortdesc Internationalisation of LaTeX2e packages
relocated 1
longdesc This package (once part of the exsheets package), provides a
@@ -24,7 +24,6 @@
catalogue-contact-bugs https://github.com/cgnieder/translations/issues
catalogue-contact-repository https://github.com/cgnieder/translations/
catalogue-ctan /macros/latex/contrib/translations
-catalogue-date 2017-11-30 18:19:07 +0100
catalogue-license lppl1.3
catalogue-topics multilingual package-supp
-catalogue-version 1.7a
+catalogue-version 1.8
++++++ translator.doc.tar.xz ++++++
Binary files old/doc/latex/translator/translator.pdf and new/doc/latex/translator/translator.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translator.doc.tlpobj new/tlpkg/tlpobj/translator.doc.tlpobj
--- old/tlpkg/tlpobj/translator.doc.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translator.doc.tlpobj 2020-03-24 02:04:08.000000000 +0100
@@ -1,6 +1,6 @@
name translator.doc
category Package
-revision 46231
+revision 54512
shortdesc doc files of translator
relocated 1
docfiles size=57
++++++ translator.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translator/translator-environment-dictionary-French.dict new/tex/latex/translator/translator-environment-dictionary-French.dict
--- old/tex/latex/translator/translator-environment-dictionary-French.dict 2017-11-30 22:55:26.000000000 +0100
+++ new/tex/latex/translator/translator-environment-dictionary-French.dict 2019-05-31 23:46:14.000000000 +0200
@@ -7,4 +7,4 @@
\providetranslation{disadvantage}{d\'esavantage}
\providetranslation{Disadvantage}{D\'esavantage}
\providetranslation{disadvantages}{d\'esavantages}
-\providetranslation{disadvantages}{D\'esavantages}
+\providetranslation{Disadvantages}{D\'esavantages}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translator/translator-months-dictionary-Italian.dict new/tex/latex/translator/translator-months-dictionary-Italian.dict
--- old/tex/latex/translator/translator-months-dictionary-Italian.dict 2017-11-30 22:55:26.000000000 +0100
+++ new/tex/latex/translator/translator-months-dictionary-Italian.dict 2019-05-31 23:46:14.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesDictionary{translator-months-dictionary}{English}
+\ProvidesDictionary{translator-months-dictionary}{Italian}
\providetranslation{January}{gennaio}
\providetranslation{February}{febbraio}
@@ -26,11 +26,11 @@
\providetranslation{Nov}{nov}
\providetranslation{Dec}{dic}
-\providetranslation{Monday}{Luned\`i}
+\providetranslation{Monday}{luned\`i}
\providetranslation{Tuesday}{marted\`i}
\providetranslation{Wednesday}{mercoled\`i}
\providetranslation{Thursday}{gioved\`i}
-\providetranslation{Friday}{venerdi\`i}
+\providetranslation{Friday}{venerd\`i}
\providetranslation{Saturday}{sabato}
\providetranslation{Sunday}{domenica}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translator/translator.sty new/tex/latex/translator/translator.sty
--- old/tex/latex/translator/translator.sty 2018-01-06 22:33:00.000000000 +0100
+++ new/tex/latex/translator/translator.sty 2019-05-31 23:46:14.000000000 +0200
@@ -1,7 +1,7 @@
% Copyright 2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2105 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2017,2018 Joseph Wright
+% Copyright 2017-2019 Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -11,7 +11,7 @@
% See the documentation file for more details.
\ProvidesPackage{translator}
- [2018/01/04 v1.12 Easy translation of strings in LaTeX]
+ [2019-05-31 v1.12a Easy translation of strings in LaTeX]
\RequirePackage{keyval}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translator.tlpobj new/tlpkg/tlpobj/translator.tlpobj
--- old/tlpkg/tlpobj/translator.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translator.tlpobj 2020-03-24 02:04:08.000000000 +0100
@@ -1,6 +1,6 @@
name translator
category Package
-revision 46231
+revision 54512
shortdesc Easy translation of strings in LaTeX
relocated 1
longdesc This LaTeX package provides a flexible mechanism for
@@ -121,7 +121,6 @@
catalogue-contact-bugs https://github.com/josephwright/translator/issues
catalogue-contact-repository https://github.com/josephwright/translator
catalogue-ctan /macros/latex/contrib/translator
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics multilingual package-supp
-catalogue-version 1.12
+catalogue-version 1.12a
++++++ ttfutils.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ttf2afm.1 new/texmf-dist/doc/man/man1/ttf2afm.1
--- old/texmf-dist/doc/man/man1/ttf2afm.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ttf2afm.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TTF2AFM 1 "8 March 2016" "Web2C 2019"
+.TH TTF2AFM 1 "8 March 2016" "Web2C 2020"
.PP
.SH "NAME"
ttf2afm \- utility to generate AFM files for TrueType fonts
Binary files old/texmf-dist/doc/man/man1/ttf2afm.man1.pdf and new/texmf-dist/doc/man/man1/ttf2afm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttf2pk.man1.pdf and new/texmf-dist/doc/man/man1/ttf2pk.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttf2tfm.man1.pdf and new/texmf-dist/doc/man/man1/ttf2tfm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttfdump.man1.pdf and new/texmf-dist/doc/man/man1/ttfdump.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ttfutils.doc.tlpobj new/tlpkg/tlpobj/ttfutils.doc.tlpobj
--- old/tlpkg/tlpobj/ttfutils.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/ttfutils.doc.tlpobj 2020-03-04 23:54:20.000000000 +0100
@@ -1,6 +1,6 @@
name ttfutils.doc
category TLCore
-revision 50602
+revision 54074
shortdesc doc files of ttfutils
docfiles size=65
texmf-dist/doc/man/man1/ttf2afm.1
++++++ ttfutils.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ttfutils.tlpobj new/tlpkg/tlpobj/ttfutils.tlpobj
--- old/tlpkg/tlpobj/ttfutils.tlpobj 2019-03-27 02:27:00.000000000 +0100
+++ new/tlpkg/tlpobj/ttfutils.tlpobj 2020-03-04 23:54:20.000000000 +0100
@@ -1,6 +1,6 @@
name ttfutils
category TLCore
-revision 50602
+revision 54074
shortdesc convert TrueType to TFM and PK fonts
longdesc Utilities: ttf2afm ttf2pk ttf2tfm ttfdump. FreeType is the
longdesc underlying library.
++++++ tudscr.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/LICENSE.md new/doc/latex/tudscr/LICENSE.md
--- old/doc/latex/tudscr/LICENSE.md 2017-03-27 23:42:47.000000000 +0200
+++ new/doc/latex/tudscr/LICENSE.md 2020-01-14 22:52:06.000000000 +0100
@@ -1,8 +1,8 @@
- TUD-Script -- Corporate Design of Technische UniversitÀt Dresden
+ TUD-Script – Corporate Design of Technische UniversitÀt Dresden
----------------------------------------------------------------------------
- Copyright (C) Falk Hanisch , 2012-2017
+ Copyright (C) Falk Hanisch , 2012-2020
----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/README.md new/doc/latex/tudscr/README.md
--- old/doc/latex/tudscr/README.md 2017-06-06 01:14:56.000000000 +0200
+++ new/doc/latex/tudscr/README.md 2020-01-14 22:52:06.000000000 +0100
@@ -1,10 +1,10 @@
- TUD-Script -- Corporate Design of Technische UniversitÀt Dresden
+ TUD-Script – Corporate Design of Technische UniversitÀt Dresden
----------------------------------------------------------------------------
- Copyright (C) Falk Hanisch , 2012-2017
+ Copyright (C) Falk Hanisch , 2012-2020
- tudscr 2017/03/29 v2.05l
+ tudscr 2020/01/14 v2.06f
----------------------------------------------------------------------------
@@ -20,18 +20,11 @@
Das TUD-Script-Bundle stellt sowohl Klassen als auch Pakete bereit, um
LaTeX-Dokumente im Corporate Design der Technischen UniversitÀt Dresden zu
erstellen. Es basiert auf dem KOMA-Script-Bundle, welches zwingend vorhanden
-sein muss. AuÃerdem sollten die beiden PostScript-Schriftfamilien Univers und
-DIN-Bold installiert werden. Geschieht dies nicht, können die Dokumentklassen
-zwar genutzt werden, die ausgegebenen Dokumente entsprechen in diesem Fall
-jedoch nicht dem ursprÃŒnglich erhofftem Stil.
-
-Mitarbeiter und Studenten der Technischen UniversitÀt Dresden können die
-Schriftdateien unter https://tu-dresden.de/service/publizieren/cd/4_latex vom
-UniversitÀtsmarketing mit dem Hinweis auf die Verwendung von LaTeX anfordern.
-FÃŒr die Installation der PostScript-Schriften sei auf den entsprechenden
-Release unter https://github.com/tud-cd/tudscr/releases/tag/fonts und das
-LaTeX-Forum der Technischen UniversitÀt Dresden verwiesen:
-http://latex.wcms-file3.tu-dresden.de/phpBB3/
+sein muss. Bei Fragen, Problemen und Anmerkungen sei entweder auf das
+[LaTeX-Forum der Technischen UniversitÀt Dresden](https://latex.wcms-file3.tu-dresden.de/phpBB3/)
+oder das
+[GitHub-Repository *tudscr*](https://github.com/tud-cd/tudscr/issues)
+verwiesen:
Klassen und Pakete
@@ -53,13 +46,45 @@
TUD-Script vereinfacht,
+ das Paket **mathswap** fÃŒr das Austauschen mathematischer Trennzeichen
innerhalb von Zahlen (Àhnlich zu **ionumbers**),
-+ das Paket **twocolfix** zur Fehlerbefehbung der Position von Ãberschriften im
- zweispaltigen Layout und
++ das Paket **twocolfix** zur Fehlerbefehbung der Position von Ãberschriften
+ im zweispaltigen Layout und
+ eine umfassende Anwenderdokumentation sowie mehrere Tutorials.
Versionen
---------
+**v2.06f** (2020/01/14)
++ Anpassungen fÃŒr Paket `scrbase v3.28`
+
+**v2.06e** (2019/10/23)
++ Bugfix fÃŒr Paket `scrlfile v3.27`
+
+**v2.06d** (2019/08/27)
++ Bugfix fÃŒr griechische Glyphen im Mathematikmodus beim Einsatz von LuaLaTeX
+ (Ligaturen fÃŒr angrenzende Glyphen sind entgegen der Definition aktiviert)
+
+**v2.06c** (2019/08/20)
++ Bugfix fÃŒr Paket **fix-tudscrfonts**
++ Bugfix fÃŒr `\textrightarrow`
++ vertikales Layout der Ausgaben von Paket **tudscrsupervisor** verbessert
++ Verwendung von Paket **mathastext** angepasst
+
+**v2.06b** (2019/07/17)
++ Bugfix fÃŒr nicht ordnungsgemÀÃes NFSS (New Font Selection Scheme)
+
+**v2.06a** (2019/07/09)
++ Bugfix fÃŒr Paket **mathastext** bezÃŒglich der Eingabekodierung
+
+**v2.06** (2019/06/28)
++ Open Sans als neue Schrift des Corporate Designs
++ Minuskelziffern als Standard auswÀhlbar
++ UnterstÃŒtzung von Roboto Mono als Schreibmaschinenschrift
++ Unterschriftenfeld auf Titel mit Option `titlesignature` bereitgestellt
++ E-Mail-Adresse auf Titel mit `\emailaddress` nutzbar
++ Befehl `\frontispiece` aus KOMA-Script unterstÃŒtzt
++ individuelle Untertitel fÃŒr Teile und Kapitel mit `\setpartsubtitle` und
+ `\setchaptersubtitle` möglich
+
**v2.05m** (2017/05/30)
+ Bugfix fÃŒr Unicode-Engines fÃŒr die Glyphe `Ã`
+ Bugfix fÃŒr Paket **siunitx** bei Erkennung der Schriftfamilie
@@ -154,7 +179,7 @@
+ Probleme mit der Klasse **standalone** behoben
+ Laden der Schriften des Corporate Designs im OpenType-Format mit Paket
**fontspec** ermöglicht
-+ verbesserte Installationsroutine der PostScript-Schriften
++ verbesserte Installationsroutine der Type1-Schriften
+ Seiten im Stil des Corporate Designs werden mithilfe des Paketes
**scrlayer-scrpage** erzeugt
+ verschiedene Optionen und Befehle zur individuellen Gestaltung dieser Seiten
@@ -191,20 +216,14 @@
Summary
-------
-The TUD-Script bundle provides both classes and packages in order to
-create LaTeX documents in the corporate design of the Technische UniversitÀt
-Dresden. It bases on the KOMA-Script bundle, which must necessarily be present.
-In addition, the PostScript font families Univers and DIN-Bold should be
-installed. Otherwise, the document classes can admittedly be used, but in this
-case, the created documents do not correspond to the originally thought style.
-
-Employees and students of the Technische UniversitÀt Dresden can request these
-fonts via https://tu-dresden.de/service/publizieren/cd/4_latex from the
-university marketing university marketing with regard to the use of LaTeX. To
-install the PostScript fonts, please refer to the corresponding release under
-https://github.com/tud-cd/tudscr/releases/tag/fonts and the LaTeX forum of the
-Technische UniversitÀt Dresden:
-http://latex.wcms-file3.tu-dresden.de/phpBB3/
+The TUD-Script bundle provides both classes and packages in order to create
+LaTeX documents in the corporate design of the Technische UniversitÀt Dresden.
+It bases on the KOMA-Script bundle, which must necessarily be present.
+For questions, problems and comments, please refer to eihter the
+[LaTeX forum of the Technische UniversitÀt Dresden](https://latex.wcms-file3.tu-dresden.de/phpBB3/)
+or the
+[GitHub repository *tudscr*](https://github.com/tud-cd/tudscr/issues):
+
Classes and Packages
--------------------
@@ -232,6 +251,38 @@
Versions
--------
+**v2.06f** (2020/01/14)
++ adaptions for package `scrbase v3.28`
+
+**v2.06e** (2019/10/23)
++ bug fix for package `scrlfile v3.27`
+
+**v2.06d** (2019/08/27)
++ bug fix for greek glyphs in math mode when using LuaLaTeX
+ (boundary ligatures are activated contrary to definition)
+
+**v2.06c** (2019/08/20)
++ bug fix for package **fix-tudscrfonts**
++ bug fix for `\textrightarrow`
++ improved vertical layout of output generated by package **tudscrsupervisor**
++ revised usage of package **mathastext**
+
+**v2.06b** (2019/07/17)
++ bug fix for improper NFSS (New Font Selection Scheme)
+
+**v2.06a** (2019/07/09)
++ bug fix for package **mathastext** regarding input encoding
+
+**v2.06** (2019/06/28)
++ Open Sans as new corporate design font
++ text figures selectable as default
++ support of Roboto Mono as typewriter font
++ signature field on title page with option `titlesignature` provided
++ e-mail address on title page with `\emailaddress` available
++ macro `\frontispiece` from KOMA-Script supported
++ customized subtitles for parts and chapters with `\setpartsubtitle` and
+ `\setchaptersubtitle` possible
+
**v2.05m** (2017/05/30)
+ bug fix for Unicode engines for glyph`Ã`
+ bug fix for package **siunitx** when recognizing the font family
@@ -325,7 +376,7 @@
+ fixed bug with class **standalone**
+ loading the corporate design fonts in OpenType format with package
**fontspec** is possible
-+ improved installation routine of PostScript fonts
++ improved installation routine of Type1 fonts
+ pages in the style of the corporate design are generated using the package
**scrlayer-scrpage**
+ various options and commands to customize these pages
Binary files old/doc/latex/tudscr/tudscr.pdf and new/doc/latex/tudscr/tudscr.pdf differ
Binary files old/doc/latex/tudscr/tudscr_print.pdf and new/doc/latex/tudscr/tudscr_print.pdf differ
Binary files old/doc/latex/tudscr/tudscrsource.pdf and new/doc/latex/tudscr/tudscrsource.pdf differ
Binary files old/doc/latex/tudscr/tutorials/mathswap.pdf and new/doc/latex/tudscr/tutorials/mathswap.pdf differ
Binary files old/doc/latex/tudscr/tutorials/mathtype.pdf and new/doc/latex/tudscr/tutorials/mathtype.pdf differ
Binary files old/doc/latex/tudscr/tutorials/treatise.pdf and new/doc/latex/tudscr/tutorials/treatise.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tudscr.doc.tlpobj new/tlpkg/tlpobj/tudscr.doc.tlpobj
--- old/tlpkg/tlpobj/tudscr.doc.tlpobj 2019-02-28 04:10:08.000000000 +0100
+++ new/tlpkg/tlpobj/tudscr.doc.tlpobj 2020-04-15 01:55:09.000000000 +0200
@@ -1,9 +1,9 @@
name tudscr.doc
category Package
-revision 44480
+revision 54744
shortdesc doc files of tudscr
relocated 1
-docfiles size=1143
+docfiles size=1096
RELOC/doc/latex/tudscr/LICENSE.md
RELOC/doc/latex/tudscr/README.md
RELOC/doc/latex/tudscr/tudscr.pdf
++++++ tudscr.tar.xz ++++++
++++ 37310 lines of diff (skipped)
++++++ tugboat-plain.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/tugboat-plain/README new/doc/plain/tugboat-plain/README
--- old/doc/plain/tugboat-plain/README 2016-11-08 23:36:17.000000000 +0100
+++ new/doc/plain/tugboat-plain/README 2019-06-13 21:55:08.000000000 +0200
@@ -1,8 +1,8 @@
-$Id: README 169 2016-11-07 19:11:13Z karl $
+$Id: README 242 2019-06-12 22:01:32Z karl $
(This README file is public domain.)
The plain style files for TUGboat, the journal of the TeX Users Group.
-See http://tug.org/TUGboat for all issues, contact information,
+See https://tug.org/TUGboat for all issues, contact information,
notes for authors, and all else.
tugboat.sty is for both regular and proceedings issue. Just \input it.
Binary files old/doc/plain/tugboat-plain/tubguide.pdf and new/doc/plain/tugboat-plain/tubguide.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat-plain.doc.tlpobj new/tlpkg/tlpobj/tugboat-plain.doc.tlpobj
--- old/tlpkg/tlpobj/tugboat-plain.doc.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat-plain.doc.tlpobj 2019-06-14 01:38:39.000000000 +0200
@@ -1,6 +1,6 @@
name tugboat-plain.doc
category Package
-revision 48608
+revision 51373
shortdesc doc files of tugboat-plain
relocated 1
docfiles size=60
++++++ tugboat-plain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/tugboat-plain/tugboat.sty new/tex/plain/tugboat-plain/tugboat.sty
--- old/tex/plain/tugboat-plain/tugboat.sty 2018-09-06 22:47:33.000000000 +0200
+++ new/tex/plain/tugboat-plain/tugboat.sty 2019-06-13 21:55:08.000000000 +0200
@@ -1,6 +1,6 @@
%% @texfile{
%% filename = "tugboat.sty",
-%% copyright = "Copyright 1993,1999,2003,2006,2011-2017 TeX Users Group.
+%% copyright = "Copyright 1993,1999,2003,2006,2011-2019 TeX Users Group.
%% Unlimited copying and redistribution of this file
%% are permitted as long as this file is not
%% modified. Modifications (and redistribution of
@@ -18,11 +18,11 @@
%% for preparation of items in TUGboat, the
%% Communications of the TeX Users Group.",
%% }
-%% $Id: tugboat.sty 207 2018-09-06 17:32:17Z karl $
+%% $Id: tugboat.sty 242 2019-06-12 22:01:32Z karl $
\def\thistubstyle{plain}
-\def\fileversion{v1.24}
-\def\filedate{2018-09-05}
+\def\fileversion{v1.25}
+\def\filedate{2019-06-10}
% general items
@@ -228,7 +228,7 @@
\belowdisplayskip=3pt plus 3pt minus 1pt
\abovedisplayshortskip=0pt plus 3pt
\belowdisplayshortskip=1pt plus 3pt minus 1pt
- \def\rm{\fam\z@\tenrm}%
+ \def\rm{\def\sl{\fam\slfam\tensl}\fam\z@\tenrm}%
\textfont\z@=\tenrm \scriptfont\z@=\sevenrm
\def\oldstyle{\fam\@ne\teni}%
\textfont\@ne=\teni \scriptfont\@ne=\seveni
@@ -2200,6 +2200,11 @@
Version Date Changes
------- --------- ---------------------------------------------------
+1.25 12 Jun 19 \tenpoint \rm: reset \sl to \tensl,
+ since the \tenpoint \bf changes it to \tenbfsl.
+
+1.24 5 Sep 18 only version number bump to match tugboat.cmn.
+
1.23 19 Mar 17 define \manual and \manualsl in each of \tenpoint,
\ninepoint, \eightpoint; define \SMC in \eightpoint.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat-plain.tlpobj new/tlpkg/tlpobj/tugboat-plain.tlpobj
--- old/tlpkg/tlpobj/tugboat-plain.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat-plain.tlpobj 2019-06-14 01:38:39.000000000 +0200
@@ -1,6 +1,6 @@
name tugboat-plain
category Package
-revision 48608
+revision 51373
shortdesc Plain TeX macros for TUGboat
relocated 1
longdesc The macros defined in this directory (in files tugboat.sty and
@@ -12,7 +12,7 @@
RELOC/tex/plain/tugboat-plain/tugproc.sty
catalogue-also tugboat
catalogue-ctan /macros/plain/contrib/tugboat
-catalogue-date 2018-09-06 20:20:38 +0200
+catalogue-date 2019-06-13 05:27:39 +0200
catalogue-license other-free
catalogue-topics journalpub
-catalogue-version 1.24
+catalogue-version 1.25
++++++ tugboat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tugboat/README new/doc/latex/tugboat/README
--- old/doc/latex/tugboat/README 2018-09-06 22:47:15.000000000 +0200
+++ new/doc/latex/tugboat/README 2020-03-12 21:31:15.000000000 +0100
@@ -1,11 +1,11 @@
-$Id: README 205 2018-09-06 17:28:53Z karl $
-Copyright 2006, 2009-2018 TeX Users Group.
+$Id: README 274 2020-03-12 16:47:21Z karl $
+Copyright 2006, 2009-2020 TeX Users Group.
You may freely use, modify and/or distribute this file.
LaTeX macros for use in TUGboat
===============================
-See the TUGboat web pages at http://tug.org/TUGboat for upcoming
+See the TUGboat web pages at https://tug.org/TUGboat for upcoming
deadlines, tips on writing articles, access to online issues, etc.
We greatly appreciate new article submissions!
@@ -24,7 +24,7 @@
Usually you can get the tugboat packages through your distribution.
But if you want to install it by hand from CTAN, its directory there
-(see http://ctan.org/pkg/tugboat) has three files containing TeX code:
+(see https://ctan.org/pkg/tugboat) has three files containing TeX code:
tugboat.dtx -- the source for the macros
tugboat.ins -- the docstrip instructions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tugboat/ltubguid.ltx new/doc/latex/tugboat/ltubguid.ltx
--- old/doc/latex/tugboat/ltubguid.ltx 2018-12-14 22:55:53.000000000 +0100
+++ new/doc/latex/tugboat/ltubguid.ltx 2020-03-12 21:31:15.000000000 +0100
@@ -1,8 +1,7 @@
-% $Id: ltubguid.ltx 216 2018-12-13 21:40:11Z karl $
+% $Id: ltubguid.ltx 274 2020-03-12 16:47:21Z karl $
% ltubguid.ltx - documentation for ltugboat classes.
%
-% Copyright 1994,1995,1996,2001,2005,2006,2010,2013,2014,2017,2018
-% TeX Users Group.
+% Copyright 1994-2020 TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -208,7 +207,7 @@
use with \LaTeX~2.09; major contributors have been Robin Fairbairns,
Sebastian Rahtz, Michel Goossens, Nico Poppelier and Johannes Braams.
Many others have been involved, including Barbara Beeton, Karl Berry,
-Mimi Burbank, and the \LaTeX3 team.
+Mimi Burbank, and the \LaTeX\ team.
\section{Availability}
@@ -227,8 +226,8 @@
is no longer used for proceedings or anything else.)
The\,\verb|.dtx| file may itself be processed by \LaTeX{} to
-produce a formatted (somewhat `literate') source listing for those who
-would like more detailed descriptions of the \TUB\ macros.
+produce a formatted (somewhat `literate') source listing for those
+interested in the implementation of the \TUB\ macros.
\section{The general structure of a paper}
@@ -313,7 +312,8 @@
Authors may note that the style of ordinary issues of \TUB{} makes
no distinction between the titles of the divisions; the visual style
relies on the section numbers to indicate where the divisions lie in
-the hierarchy.
+the hierarchy. If you use \cs{paragraph}, consider ending the paragraph
+label with a period; sometimes it is helpful, sometimes not.
Reference may, however, be made to the `title' of divisions of the
paper, whether they are numbered or not. The \cs{nameref} command
@@ -525,19 +525,35 @@
\TUB\ optional-argument feature is not available.
If you use the \pkgname{listings} package, please specify:
-\begin{verbatim}
-\lstset{columns=flexible}
-\end{verbatim}
-The other values for the \verb|columns| option don't work well in
-\TUB. Also, if you use \cs{small} for displayed verbatim, please reset
-inline verbatim to the normal text size:
\begin{verbatim}[\small]
-\lstset{columns=flexible,
+\lstset{columns=flexible, keepspaces=true,
+ commentstyle=\slshape,
basicstyle=\ttfamily\small}
\lstdefinestyle{inline}
- {basicstyle=\ttfamily\normalsize}
+ {basicstyle=\ttfamily\normalsize}
\end{verbatim}
+Explanations:
+\begin{itemize}
+\item \texttt{columns=flexible}:
+The other values for the \verb|columns| option don't work well in \TUB.
+
+\item \texttt{keepspaces=true}:
+However, having flexible columns makes spaces in the input not
+necessarily correspond to spaces in the output. That's usually desired,
+for alignment of the sources, hence \texttt{keepspaces}.
+
+\item \texttt{commentstyle=\cs{slshape}}:
+We prefer slanted to Computer Modern typewriter italic.
+Using regular upright typewriter for comments is fine too.
+
+\item \texttt{basicstyle=...}:
+We usually prefer \cs{small} for displayed verbatim; when using
+\texttt{listings}, it is necessary to reset inline verbatim to the
+normal text size.
+
+\end{itemize}
+
\section{Floating inserts}
The classes do not make any change to \LaTeX{}'s built-in provision
@@ -592,7 +608,6 @@
\verb|\MacOSX| & \MacOSX \\
\verb|\MathML| & \MathML \\
\verb|\MF| & \MF \\
- \verb|\MP| & \MP \\
\verb|\OMEGA| & \OMEGA \\
\verb|\PDF| & \PDF \\
\verb|\SGML| & \SGML \\
@@ -616,7 +631,7 @@
list in figure~\ref{fig:acro-logo} have already been used in the present
paper.
-\subsection{Other special typesetting}
+\subsection{Assorted other markup}
A small list of special typesetting commands follows: a large set of
such commands is defined in the classes, but the list covers most of
@@ -639,18 +654,22 @@
% for example \verb|\sfrac{3}{4}| is set as \sfrac{3}{4}\,.
\end{cmdlist}
+For commands to typeset urls, see section~\ref{sec:urls}.
+
\section{Use of packages}
-In general, authors can use non-standard packages in their papers.
-However, the paper does need to be processable on the \TUB{} production
-computers (running current \TeX\ Live). A sensible mechanism for
-submitting out-of-the-ordinary packages (as for paper-specific
-bibliographies) is by use of the \envname{filecontents} environment.
+Being a \TeX\ journal, authors may use both standard and non-standard
+external packages for their articles. The overriding criterion is that
+articles need to be processable on the \TUB{} production computers
+(running current \TeX\ Live). A sensible mechanism for submitting
+personal packages is by use of the \envname{filecontents} environment.
+It's also fine to submit manuscript source with additional packages in a
+zip or other archive.
In general, packages currently on \CTAN, and known to work with
-\emph{current} \LaTeX{} are unlikely to give problems. In particular,
+\emph{current} \LaTeX{} are likely to be fine. In particular,
the team is happy to accept papers using packages that are supported by
-members of the \LaTeX3 team,\footnote{%
+members of the \LaTeX\ team,\footnote{%
Those in the \LaTeX{} base distribution, or one of those in the
\CTANref{packages} sub-tree on \CTAN.} subject to the warning already
mentioned (section~\ref{sec:verbatim}): that use of the standard
@@ -658,33 +677,78 @@
facilities provided by the \TUB\ classes.
\tug{} has a policy that macro packages described in \TUB{} should be
-available for readers to use. Since typing macros from printed
-sources is such an error-prone undertaking, authors of publicly
-available packages are urged to submit their macros to the \CTAN{}
-archives. If a package is only available under restricted terms,
-authors are urged to make this fact clear when first submitting an
-article to the editor.
-
-At present, the list of canonically recommended packages consists of
-only two, \path|mflogo.sty| \cite{Vieth:mflogo:1995} and \path|url.sty|
-\cite{Arseneau:url:1996}.
-
-Both classes will load the \pkgname{mflogo} package if it is present on the
-author's system; if the package is not present, the classes will
-emulate its more important features; the package defines \MF{} and
-\MP{} logos using recent versions of Knuth's \verb|logo10| font family.
-
-The \pkgname{url} package is useful when one is typesetting significant
-numbers of file names, network addresses or \acro{URL}s; it is being
-used in the present paper (not least in the bibliography). Speaking of
-urls, nowadays we generally omit a leading \texttt{http://} or
-\texttt{https://}.
+available for readers to use. Since typing macros from printed sources
+is a tedious undertaking, authors of publicly available packages are
+urged to submit their macros to \CTAN{}. If a package is only available
+under restricted terms, authors are requested to make this fact clear
+when first submitting an article to the editor.
+
+The \texttt{ltugboat} class loads the package \path|mflogo.sty|
+\cite{Vieth:mflogo:1995} for typesetting the \MF\ logo. (If this package
+is not present by some mischance, \texttt{ltugboat} will emulate its
+important feature.)
+
+An additional canonically-recommended package is \path|url.sty|
+\cite{Arseneau:url:1996}, for typesetting filenames, email addresses,
+urls, etc.; it is being used throughout the present paper (not least in
+the bibliography), either on its own or via \texttt{hyperref}.
Although not necessarily recommended in all cases, many additional
packages are commonly used. To mention a few: \texttt{microtype} can
-help reduce overfull boxes; sometimes it may be preferable to use the
-Latin Modern fonts via \texttt{lmodern}; and \texttt{hyperref} allows
-for many internal links and other features.
+help reduce overfull boxes (and improve appearance); sometimes it may be
+preferable to use the Latin Modern fonts via \texttt{lmodern};
+\texttt{iftex} provides tests for the \TeX\ engine being run;
+\texttt{texosquery} provides operating system information; and
+\texttt{hyperref} supports live and internal hyperlinks, outlines, and
+many other features.
+
+\section{Typesetting urls}
+\label{sec:urls}
+
+As mentioned above, please load either \texttt{url} or (preferably)
+\texttt{hyperref} so that reasonable line breaking of urls can happen.
+
+Furthermore, for the printed (visible) \TUB\ page, nowadays we typically
+omit a leading \texttt{http://} or \texttt{https://}. But for the link
+to actually work in the output \PDF\ or \HTML, the protocol is required
+(or it appears to be a local filesystem path). Therefore the
+\texttt{ltugboat} class provides (as of version 2.23, released
+March~2020) commands \cs{tbsurl} for \texttt{https} and \cs{tbhurl} for
+\texttt{http}.\footnote{They are simple two-line wrapper around
+\cs{hyper@linkurl}, and are due to Ulrike Fischer.
+\url{https://github.com/latex3/hyperref/issues/125}\raggedright}
+
+For example, \verb|\tbsurl{tug.org}| typesets the text
+`\texttt{tug.org}' (with the usual url line breaks) as a link to
+\url{https://tug.org}.
+
+Similarly, \verb|\tbhurl{mirror.ctan.org}| typesets the text
+`\texttt{mirror.ctan.org}' as a link to \url{http://mirror.ctan.org}.
+
+\cs{tbsurl} and \cs{tbhurl} only add the protocol and make live links if
+\texttt{hyperref} is loaded. Without \texttt{hyperref}, they are merely
+synonyms for \cs{url}. This is ok, and we still request that the
+protocol not be included; if live links are not being produced in the
+output, the printed url without the protocol suffices. (When a user
+copies/pastes url text into a browser, it will normally work.)
+
+For \texttt{ftp}, \texttt{rsync}, and other protocols, it is best to
+include them explicitly and use \cs{url}:\\ \verb|\url{ftp://tug.org}|,\\
+\verb|\url{rsync://tug.org}|, etc.
+
+\subsection{Url shortcuts}
+\label{sec:urlshortcuts}
+
+Another aspect of urls: the \tug\ web server supports a shortcut url
+mechanism, \url{tug.org/l/}\meta{ident}, where \meta{ident} can be any
+tag, similar to \url{tinyurl.com} and similar sites. The idea is that
+\url{tug.org} shortcuts can be used in \TUB\ articles needing to link to
+excessively long and/or unstable web resources; then we update the
+shortcut if needed, and not worry that a commercial shortcut provider
+will disappear.
+
+The only way to create a \url{tug.org/l/} shortcut is by request, which
+we are happy to receive.
\section{Bibliography}
\label{sec:biblio}
@@ -692,8 +756,8 @@
In short: our basic recommendation for handling bibliographies is to use
\BibTeX\ and the \pkgname{tugboat} bibliography style. No document
options are needed or recommended. All that is required in the article
-source (as shown in the template available from
-\url{tug.org/TUGboat}) is the following:
+source (as in the template available from \url{tug.org/TUGboat}) is the
+following:
\begin{verbatim}[\small]
\bibliographystyle{tugboat}
@@ -707,30 +771,35 @@
\begin{itemize}
\item It is based on \pkgname{abbrvurl.bst} (see \url{ctan.org/pkg/urlbst}),
-\item thus supports \textsf{url} and \textsf{doi} fields, among others.
-
-\item The \textsf{url} field is ignored if either the \textsf{doi} or
-\textsf{howpublished} field is present, since in practice we observe
-that people put the same information in all those fields, and we don't
-want to use up space typesetting redundant information.
-
-\item Has even more abbreviations than \textsf{abbrv}, including
-printing only two author names (plus ``et~al\@.'') if there are more
-than four authors (thanks to Mico Loretan).
+\item and thus supports \textsf{url} and \textsf{doi} fields, among others.
+Please use \textsf{url} instead of putting urls in the
+\textsf{note} field, where possible. Also, please don't bother to
+include ``url access date'' information for \TUB; we find that extraneous.
+
+\item The \textsf{url} field is ignored if either the \textsf{howpublished} or
+\textsf{doi} field is present. In practice we observe that people put
+the same information in all those fields, and we don't want to typeset
+redundant information.
+
+\item Has even more abbreviations than \textsf{abbrv}, such as
+printing only two author names (plus ``et~al.'')\ if there are more than
+four authors (thanks to Mico Loretan).
\item Defines an \textsf{@online} entry type as an alias for \textsf{@misc}.
-\item For completeness only: \verb|tugboat.bst| provides ``secret''
+\item For completeness only: \verb|tugboat.bst| provides editor-intended
fields \textsf{newpage} to force a page break after the current item,
-and \textsf{urlnewline} to force a line break before the \textsf{url}
-value. We've found that these presentation tweaks are often necessary
-for the final typeset output. Authors need not worry about them.
+\textsf{urlnewline} to force a line break before the \textsf{url} value,
+and \textsf{journaltie} to output a tie instead of space after the
+\textsf{journal} value. As editors, we've found that these presentation
+tweaks can be desirable for the final typeset output. Authors need not
+worry about them.
\end{itemize}
If you use \BibTeX, feel free to take advantage of the accumulated
bibliography of \TUB{} itself (\url{info/tugboat.bib} on \CTAN), and the
-various compilations by Nelson Beebe in that same directory.
+other compilations by Nelson Beebe in that same directory.
Bibliographies provide further problems because they're notoriously
difficult to typeset at the best of times. \LaTeX{} sets \cs{sloppy}
@@ -742,32 +811,31 @@
\begin{verbatim}
\SetBibJustification{\raggedright}
\end{verbatim}
-as the present article does, to achieve somewhat better results.
+as the present article does, to often achieve somewhat better results.
-A last note for bibliographies: for references to other issues of \TUB,
-please use the format \textsl{volno:issno}, e.g., ``\TUB\ 32:1'' for
-volume~32, number~1.
+A last note for references: for \TUB\ issues, please use the format
+\textsl{volno\,:\,issno}, e.g., ``\TUB\ 32:1'' for volume~32, number~1.
\section{Non-recommended bibliography facilities}
The preceding gives the bibliography recommendations for current \TUB\
-article. If, for whatever reason, you cannot follow the recommendation,
-this section is about some of the myriad historical and other
-possibilities.
+articles. If, for whatever reason, you do not wish to follow those
+recommendations, this section is about some of the myriad historical and
+other possibilities.
-Notwithstanding the general recommendation for the \pkgname{tugboat}
-(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard
+Notwithstanding that general recommendation for the \pkgname{tugboat}
+(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard-style
citation support may be selected by specifying \optname{harvardcite} as
an option of the \cs{documentclass} command.\footnote{%
The macros used derive rather directly from the `harvard' styles
- written by Glenn Paulley and now maintained by Peter Williams; the
+ written by Glenn Paulley and later maintained by Peter Williams; the
\BibTeX{} style derives from one developed by Patrick Daly.}
If your article demands Harvard-style citations, you may prefer to load
\pkgname{natbib} or similar instead of using \TUB's facilities; that's
-ok.
+fine.
-The basic citation format is `author(s), year', but the macros are
-capable of many variations: this in turn places somewhat of a load on
+This basic citation format is `author(s), year', but the macros are
+capable of many variations. This in turn places somewhat of a load on
the author to use the correct citation macro. The macros available are
shown in figure~\ref{fig:citation-macros}; the figure assumes an entry
in the bibliography with authors Tom, Dick, and~Harry, and with a 1990
@@ -805,7 +873,7 @@
options. The default state (option \optname{extralabel}) attaches the
extra characters.
-As for \BibLaTeX, we don't recommend it for \TUB. If you feel you must
+As for \BibLaTeX: we don't recommend it for \TUB. If you feel you must
use it, that is ok, but we may still change it to using the default
\LaTeX\ and \BibTeX\ facilities in processing for publication if the
output from \BibLaTeX\ is problematic, as we have often seen it to be.
@@ -852,11 +920,8 @@
Of course, the syntax of commands given to the \LaTeX{} classes is
different (as discussed in section~\ref{sec:syntax}); arguments are
-(almost always) enclosed in braces, and neither of the forms of
-argument provision promulgated by the `plain' macros
-(\cs{macro}\meta{argument}\linebreak[0]\cs{endmacro} and
-\cs{macro * }\meta{argument}\verb| *|) are provided by the \LaTeX{}
-classes.
+(almost always) enclosed in braces instead of the various
+forms provided by the `plain' macros.
\SetBibJustification{\raggedright}
\bibliographystyle{tugboat}
Binary files old/doc/latex/tugboat/ltubguid.pdf and new/doc/latex/tugboat/ltubguid.pdf differ
Binary files old/doc/latex/tugboat/tugboat.pdf and new/doc/latex/tugboat/tugboat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat.doc.tlpobj new/tlpkg/tlpobj/tugboat.doc.tlpobj
--- old/tlpkg/tlpobj/tugboat.doc.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat.doc.tlpobj 2020-03-13 02:07:59.000000000 +0100
@@ -1,9 +1,9 @@
name tugboat.doc
category Package
-revision 49415
+revision 54261
shortdesc doc files of tugboat
relocated 1
-docfiles size=204
+docfiles size=206
RELOC/doc/latex/tugboat/README
RELOC/doc/latex/tugboat/ltubguid.ltx
RELOC/doc/latex/tugboat/ltubguid.pdf
++++++ tugboat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/tugboat/tugboat.bst new/bibtex/bst/tugboat/tugboat.bst
--- old/bibtex/bst/tugboat/tugboat.bst 2018-12-14 22:55:53.000000000 +0100
+++ new/bibtex/bst/tugboat/tugboat.bst 2020-03-12 21:31:15.000000000 +0100
@@ -1,15 +1,17 @@
-%%% $Id: tugboat.bst 210 2018-10-29 18:04:16Z karl $
+%%% $Id: tugboat.bst 271 2020-01-13 19:13:12Z karl $
%%% TUGboat changes are public domain.
%%%
%%% Modified for TUGboat from abbrvurl.bst:
-%%% abbreviate "page(s)" to "p(p).",
+%%% Abbreviate "page(s)" to "p(p).",
%%% "volume" to "vol.",
%%% "editor(s)" to "ed(s)".
-%%% urlintro=""
-%%% reduce long author lists in format.names per Mico.
-%%% new fields for editors:
-%%% "newpage" - force page break after entry
-%%% "urlnewline" - force line break before url value.
+%%% Set urlintro="".
+%%% Output "Ph.D." rather than "PhD".
+%%% Reduce long author lists in format.names per Mico Loretan.
+%%% New fields for editors:
+%%% "newpage" - force page break after entry;
+%%% "urlnewline" - force line break before url value;
+%%% "journaltie" - ~ instead of space after journal name.
%%% --karl, originally created 24jul18.
%%%
%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/abbrv.bst
@@ -22,7 +24,7 @@
%%% Added hyperref support.
%%% Original headers follow...
-% BibTeX standard bibliography style `abbrv'
+% [was] BibTeX standard bibliography style `abbrv'
% version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
% Copyright (C) 1985, all rights reserved.
% Copying of this file is authorized only if either
@@ -60,8 +62,9 @@
pubmed % urlbst
url % urlbst
lastchecked % urlbst
- newpage % tub
+ newpage % tub
urlnewline % tub
+ journaltie % tub
}
{}
{ label }
@@ -149,15 +152,23 @@
% urlbst
% arg on stack is what needs to be written.
+%
% If a journal, we want to omit the following comma, as in
% "TUGboat 39(1)" instead of the default "TUGboat, 39(1)".
%
+% Furthermore, if field journaltie is non-empty, output a tie after the
+% journal name instad of a space.
+%
FUNCTION {output.nonnull.original}
{ 's :=
output.state mid.sentence =
{ last.output.check "journal" = not
{ ", " * }
- { " " *}
+ { journaltie empty$ not
+ { "~" * }
+ { " " * }
+ if$
+ }
if$
write$
}
@@ -580,8 +591,8 @@
{ pages empty$
{ "" }
{ pages multi.page.check
- { "pp." pages n.dashify tie.or.space.connect }
- { "p." pages tie.or.space.connect }
+ { "pp.~" pages n.dashify * }
+ { "p.~" pages * }
if$
}
if$
@@ -1183,7 +1194,7 @@
title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
format.btitle "title" output.check
new.block
- "PhD thesis" format.thesis.type output.nonnull
+ "Ph.D. thesis" format.thesis.type output.nonnull
school "school" output.check
address output
format.date "year" output.check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugboat.cls new/tex/latex/tugboat/ltugboat.cls
--- old/tex/latex/tugboat/ltugboat.cls 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugboat.cls 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugboat}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUGboat journal class%
]
\csname tugstyloaded@\endcsname
@@ -52,7 +52,7 @@
\let\tuborigthepage = \thepage
\def\thepage{%
\ifnum\value{page}>900
- \textsl{?\,\@arabic{\numexpr\the\c@page-900\relax}}%
+ \textsl{?\texorpdfstring{\,}{}\@arabic{\numexpr\the\c@page-900\relax}}%
\else
\arabic{page}%
\fi}%
@@ -78,6 +78,11 @@
\@tubrunningfull
}%
}
+\AtBeginDocument{%
+ \ifx\undefined\texorpdfstring
+ \DeclareRobustCommand{\texorpdfstring}[2]{#1}%
+ \fi
+}
\DeclareOption{11pt}{%
\TBWarning{The \@tugclass\space class only supports 10pt fonts:
\MessageBreak option \CurrentOption\space ignored}%
@@ -193,6 +198,7 @@
}
\def\BibLaTeX{\Bib\kern.02em \LaTeX}
\def\BibTeX{\Bib\kern-.08em \TeX}
+\def\bfBibTeX{B{\SMC\SMC IB}\TeX}
\def\BSD{\acro{BSD}}
\def\CandT{\textsl{Computers \& Typesetting}}
\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
@@ -213,7 +219,7 @@
\def\DVItoVDU{DVIto\kern-.12em VDU}
\def\ECMA{\acro{ECMA}}
\def\EPS{\acro{EPS}}
-\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}\mbox{-}\kern-.125em\TeX}
\DeclareRobustCommand{\ExTeX}{%
\ensuremath{\textstyle\varepsilon_{\kern-0.15em\cal{X}}}\kern-.2em\TeX}
\def\FAQ{\acro{FAQ}}
@@ -224,6 +230,7 @@
\def\Hawaii{Hawai`i}
\def\HTML{\acro{HTML}}
\def\HTTP{\acro{HTTP}}
+\def\iOS{i\acro{OS}}
\def\IDE{\acro{IDE}}
\def\IEEE{\acro{IEEE}}
\def\ISBN{\acro{ISBN}}
@@ -249,7 +256,12 @@
A}%
\vss}%
}}
+\def\LuaHBTeX{Lua\acro{HB}\-\TeX}%
+\def\LuaHBLaTeX{Lua\acro{HB}\-\LaTeX}%
+\def\LuaLaTeX{Lua\-\LaTeX}% dtk-logos defines it and people like to use it
+\def\LuaTeX{Lua\-\TeX}% ditto
\def\LyX{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX}
+\def\macOS{mac\acro{OS}}
\def\MacOSX{Mac\,\acro{OS\,X}}
\def\MathML{Math\acro{ML}}
\def\Mc{\setbox\TestBox=\hbox{M}M\vbox
@@ -274,6 +286,8 @@
\def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
\def\PCTeX{PC\thinspace\TeX}
\def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
+\def\pdflatex{pdf\-\LaTeX}% dtk-logos
+\def\pdftex{pdf\-\TeX}% dtk-logos
\def\PDF{\acro{PDF}}
\def\PGF{\acro{PGF}}
\def\PHP{\acro{PHP}}
@@ -307,7 +321,7 @@
\def\TeXworks{\TeX\kern-.07em works}
\def\TeXXeT{\TeX-{}-\XeT}
\def\TFM{\acro{TFM}}
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\ifx\Umathchardef\@thisisundefined % xetex|luatex
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
@@ -346,6 +360,12 @@
\DeclareRobustCommand{\Xe}{\leavevmode
\tubhideheight{\hbox{X%
\setbox0=\hbox{\TeX}\setbox1=\hbox{E}%
+ \ifdim \fontdimen1\font>0pt
+ % XeTeX logo needs tinkering when slanted/italic font.
+ \def\XekernbeforeE{-.11em}%
+ \def\XekernafterE{-.11em}%
+ \dp1=-.17ex
+ \fi
\lower\dp0\hbox{\raise\dp1\hbox{\kern\XekernbeforeE\tubreflect{E}}}%
\kern\XekernafterE}}}
\def\XeTeX{\Xe\TeX}
@@ -464,6 +484,24 @@
\DeclareRobustCommand{\tubbraced}[1]{\mbox{\texttt{\char`\{#1\char`\}}}}
\DeclareRobustCommand{\env}[1]{\cs{begin}\tubbraced{#1}}
\DeclareRobustCommand{\thinskip}{\hskip 0.16667em\relax}
+\AtBeginDocument{%
+\ifx\hyper@normalise\undefined
+ \def\tbsurl{\url}% no hyperref, so just \url is fine.
+ \def\tbhurl{\url}%
+\else
+ % This hyperref hook-in is due to Ulrike Fischer.
+ % \url{https://github.com/latex3/hyperref/issues/125}.
+ \DeclareRobustCommand*{\tbsurl}{\hyper@normalise\tbsurl@}%
+ \def\tbsurl@#1{\hyper@linkurl{\Hurl{#1}}{https://#1}}%
+ \DeclareRobustCommand*{\tbhurl}{\hyper@normalise\tbhurl@}
+ \def\tbhurl@#1{\hyper@linkurl{\Hurl{#1}}{http://#1}}%
+\fi
+}
+\DeclareRobustCommand{\!}{\ifmmode\mskip-\thinmuskip \else\kern-0.16667em \fi}
+\DeclareRobustCommand{\tubthinnerspace}
+ {\ifmmode\mskip.5\thinmuskip \else\kern0.08333em \fi}
+\DeclareRobustCommand{\tubthinnerspaceneg}
+ {\ifmmode\mskip-.5\thinmuskip \else\kern-0.08333em \fi}
\def\endash{--}
\def\emdash{\endash-}
\def\d@sh#1#2{\unskip#1\thinskip#2\thinskip\ignorespaces}
@@ -1004,7 +1042,10 @@
\let\and=\quad
\ignorespaces\@author}%
{%
- \noindent\bf\raggedright\ignorespaces\frenchspacing\@title\endgraf
+ \noindent\bf\raggedright\ignorespaces\frenchspacing
+ \let\BibTeX=\bfBibTeX % else LaTeX Font Warning:
+ % Font shape `OT1/cmr/bx/sc' undefined
+ \@title\endgraf
}%
\ifdim \wd0 < 5\p@ % omit if author is null
\else
@@ -1119,7 +1160,7 @@
\def\TB@nosection#1#2{\TBWarning{class does not support \string#1,
\string#2\space used instead}#2}
\def\TBtocsectionfont{\normalfont}
-\newskip\TBtocsectionspace \TBtocsectionspace=1.0em\@plus\p@
+\newskip\TBtocsectionspace \TBtocsectionspace=1.0ex\@plus\p@
\def\l@section#1#2{\addpenalty{\@secpenalty}%
\addvspace{\TBtocsectionspace}%
\@tempdima 1.5em
@@ -1319,7 +1360,6 @@
\@ifpackageloaded{microtype}
{\g@addto@macro\@verbatim{\microtypesetup{activate=false}}}{}
}
-
\if@Harvardcite
\let\@internalcite\cite
\def\cite{\def\@citeseppen{-1000}%
@@ -1458,9 +1498,11 @@
\topregister\vskip \headmargin \vskip 10\p@}}}}%
}
\def\@oddhead{\MakeRegistrationMarks
+ \frenchspacing
\normalsize\csname normalshape\endcsname\rm \tubheadhook
\rtitlex\qquad \midrtitle\hfil \rtitlenexttopage\quad \thepage}
\def\@evenhead{\MakeRegistrationMarks
+ \frenchspacing
\normalsize\csname normalshape\endcsname\rm \tubheadhook
\thepage \quad\rtitlenexttopage \hfil\midrtitle \qquad\rtitlex}
@@ -1474,7 +1516,7 @@
\let\newline=\\%
\frenchspacing
\hfil\rhTitle}
- \def\@evenfoot{\tubrunningauthor\hfil}
+ \def\@evenfoot{\frenchspacing \let\thanks\@gobble \tubrunningauthor\hfil}
}
\def\@tubrunningminimal{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugboat.sty new/tex/latex/tugboat/ltugboat.sty
--- old/tex/latex/tugboat/ltugboat.sty 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugboat.sty 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -31,7 +31,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugboat}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUG compatibility package%
]
\@obsoletefile{ltugboat.cls}{ltugboat.sty}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugcomn.sty new/tex/latex/tugboat/ltugcomn.sty
--- old/tex/latex/tugboat/ltugcomn.sty 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugcomn.sty 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{ltugcomn}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUGboat `common macros' package%
]
\IfFileExists{mflogo.sty}%
@@ -118,6 +118,7 @@
}
\def\BibLaTeX{\Bib\kern.02em \LaTeX}
\def\BibTeX{\Bib\kern-.08em \TeX}
+\def\bfBibTeX{B{\SMC\SMC IB}\TeX}
\def\BSD{\acro{BSD}}
\def\CandT{\textsl{Computers \& Typesetting}}
\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
@@ -138,7 +139,7 @@
\def\DVItoVDU{DVIto\kern-.12em VDU}
\def\ECMA{\acro{ECMA}}
\def\EPS{\acro{EPS}}
-\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}\mbox{-}\kern-.125em\TeX}
\DeclareRobustCommand{\ExTeX}{%
\ensuremath{\textstyle\varepsilon_{\kern-0.15em\cal{X}}}\kern-.2em\TeX}
\def\FAQ{\acro{FAQ}}
@@ -149,6 +150,7 @@
\def\Hawaii{Hawai`i}
\def\HTML{\acro{HTML}}
\def\HTTP{\acro{HTTP}}
+\def\iOS{i\acro{OS}}
\def\IDE{\acro{IDE}}
\def\IEEE{\acro{IEEE}}
\def\ISBN{\acro{ISBN}}
@@ -174,7 +176,12 @@
A}%
\vss}%
}}
+\def\LuaHBTeX{Lua\acro{HB}\-\TeX}%
+\def\LuaHBLaTeX{Lua\acro{HB}\-\LaTeX}%
+\def\LuaLaTeX{Lua\-\LaTeX}% dtk-logos defines it and people like to use it
+\def\LuaTeX{Lua\-\TeX}% ditto
\def\LyX{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX}
+\def\macOS{mac\acro{OS}}
\def\MacOSX{Mac\,\acro{OS\,X}}
\def\MathML{Math\acro{ML}}
\def\Mc{\setbox\TestBox=\hbox{M}M\vbox
@@ -199,6 +206,8 @@
\def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
\def\PCTeX{PC\thinspace\TeX}
\def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
+\def\pdflatex{pdf\-\LaTeX}% dtk-logos
+\def\pdftex{pdf\-\TeX}% dtk-logos
\def\PDF{\acro{PDF}}
\def\PGF{\acro{PGF}}
\def\PHP{\acro{PHP}}
@@ -232,7 +241,7 @@
\def\TeXworks{\TeX\kern-.07em works}
\def\TeXXeT{\TeX-{}-\XeT}
\def\TFM{\acro{TFM}}
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\ifx\Umathchardef\@thisisundefined % xetex|luatex
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
@@ -271,6 +280,12 @@
\DeclareRobustCommand{\Xe}{\leavevmode
\tubhideheight{\hbox{X%
\setbox0=\hbox{\TeX}\setbox1=\hbox{E}%
+ \ifdim \fontdimen1\font>0pt
+ % XeTeX logo needs tinkering when slanted/italic font.
+ \def\XekernbeforeE{-.11em}%
+ \def\XekernafterE{-.11em}%
+ \dp1=-.17ex
+ \fi
\lower\dp0\hbox{\raise\dp1\hbox{\kern\XekernbeforeE\tubreflect{E}}}%
\kern\XekernafterE}}}
\def\XeTeX{\Xe\TeX}
@@ -389,6 +404,24 @@
\DeclareRobustCommand{\tubbraced}[1]{\mbox{\texttt{\char`\{#1\char`\}}}}
\DeclareRobustCommand{\env}[1]{\cs{begin}\tubbraced{#1}}
\DeclareRobustCommand{\thinskip}{\hskip 0.16667em\relax}
+\AtBeginDocument{%
+\ifx\hyper@normalise\undefined
+ \def\tbsurl{\url}% no hyperref, so just \url is fine.
+ \def\tbhurl{\url}%
+\else
+ % This hyperref hook-in is due to Ulrike Fischer.
+ % \url{https://github.com/latex3/hyperref/issues/125}.
+ \DeclareRobustCommand*{\tbsurl}{\hyper@normalise\tbsurl@}%
+ \def\tbsurl@#1{\hyper@linkurl{\Hurl{#1}}{https://#1}}%
+ \DeclareRobustCommand*{\tbhurl}{\hyper@normalise\tbhurl@}
+ \def\tbhurl@#1{\hyper@linkurl{\Hurl{#1}}{http://#1}}%
+\fi
+}
+\DeclareRobustCommand{\!}{\ifmmode\mskip-\thinmuskip \else\kern-0.16667em \fi}
+\DeclareRobustCommand{\tubthinnerspace}
+ {\ifmmode\mskip.5\thinmuskip \else\kern0.08333em \fi}
+\DeclareRobustCommand{\tubthinnerspaceneg}
+ {\ifmmode\mskip-.5\thinmuskip \else\kern-0.08333em \fi}
\def\endash{--}
\def\emdash{\endash-}
\def\d@sh#1#2{\unskip#1\thinskip#2\thinskip\ignorespaces}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugproc.cls new/tex/latex/tugboat/ltugproc.cls
--- old/tex/latex/tugboat/ltugproc.cls 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugproc.cls 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugproc}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUG conference proceedings class%
]
\def\@tugclass{ltugproc}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugproc.sty new/tex/latex/tugboat/ltugproc.sty
--- old/tex/latex/tugboat/ltugproc.sty 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugproc.sty 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2003/12/01 or later.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -31,7 +31,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugproc}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUG compatibility package%
]
\@obsoletefile{ltugproc.cls}{ltugproc.sty}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat.tlpobj new/tlpkg/tlpobj/tugboat.tlpobj
--- old/tlpkg/tlpobj/tugboat.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat.tlpobj 2020-03-13 02:07:59.000000000 +0100
@@ -1,12 +1,12 @@
name tugboat
category Package
-revision 49415
+revision 54261
shortdesc LaTeX macros for TUGboat articles
relocated 1
longdesc Provides ltugboat.cls for both regular and proceedings issues
-longdesc of the TUGboat journal. The distribution also a BibTeX style,
+longdesc of the TUGboat journal. Also provides a BibTeX style,
longdesc tugboat.bst.
-runfiles size=39
+runfiles size=40
RELOC/bibtex/bst/tugboat/ltugbib.bst
RELOC/bibtex/bst/tugboat/tugboat.bst
RELOC/tex/latex/tugboat/ltugboat.cls
@@ -17,7 +17,6 @@
catalogue-also tugboat-plain
catalogue-contact-home https://tug.org/TUGboat
catalogue-ctan /macros/latex/contrib/tugboat
-catalogue-date 2018-12-14 21:15:38 +0100
catalogue-license lppl1.3
catalogue-topics journalpub class
-catalogue-version 2.21
+catalogue-version 2.23
++++++ turabian-formatting.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/turabian-formatting/README new/doc/latex/turabian-formatting/README
--- old/doc/latex/turabian-formatting/README 2018-08-01 23:17:38.000000000 +0200
+++ new/doc/latex/turabian-formatting/README 2020-03-20 22:27:47.000000000 +0100
@@ -1,4 +1,4 @@
-Turabian Formatting for LaTeX (2018/08/01)
+Turabian Formatting for LaTeX (2020/03/19)
INTRODUCTION
@@ -37,7 +37,7 @@
==============================
-Copyright 2013-2018 Omar Abdool
+Copyright 2013-2020 Omar Abdool
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3 of this license
Binary files old/doc/latex/turabian-formatting/turabian-formatting-doc.pdf and new/doc/latex/turabian-formatting/turabian-formatting-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/turabian-formatting/turabian-formatting-doc.tex new/doc/latex/turabian-formatting/turabian-formatting-doc.tex
--- old/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2018-08-01 23:17:38.000000000 +0200
+++ new/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2020-03-20 22:27:47.000000000 +0100
@@ -1,7 +1,7 @@
% Turabian Formatting for LaTeX -- Package Documentation
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -19,7 +19,7 @@
% and turabian-formatting-doc.pdf (in addition to the README file).
%
% ==============================
-% Last updated: 2018/08/01
+% Last updated: 2020/03/19
%
%
@@ -50,7 +50,7 @@
\usepackage{marginnote}
\renewcommand*{\raggedleftmarginnote}{}
\renewcommand*{\marginfont}{\ttfamily}
-\renewcommand*{\marginnotevadjust}{2\baselineskip}
+\renewcommand*{\marginnotevadjust}{\parskip}
\usepackage{geometry}
\geometry{top=1.5in, bottom=1.75in, left=1.75in, right=1.75in}
@@ -196,7 +196,7 @@
The \texttt{twocolumn} option, however, is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option.
-Both documents classes, by default, are set to \texttt{oneside}. The \texttt{twoside} option is also supported.
+Both document classes, by default, are set to \texttt{oneside}. The \texttt{twoside} option is also supported.
\clearpage
\subsection{Ragged Right (Left Align) Text}
@@ -230,7 +230,9 @@
To produce a list of endnotes, use the \textcmd{theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes." The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{%
The \emph{Notes} heading, when using the \texttt{turabian-researchpaper} document class, is typeset with \textcmd{section*}. The \texttt{turabian-thesis} document class, however, typesets the \emph{Notes} heading with \textcmd{chapter*}. If there are no endnotes preceding \textcmd{theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.}
-When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter. In this case, the endnotes list then uses subheadings that divide endnotes by each chapter.\autocite[162]{turabian_manual_2018}
+When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter (using the \textcmd{chapter} command).\footnote{%
+ The starred \textcmd{chapter*} command does not restart the numbering of endnotes.}
+In this case, the endnotes list then uses subheadings that divide endnotes by each chapter.\autocite[162]{turabian_manual_2018}
\clearpage
@@ -335,7 +337,7 @@
\texttt{turabian-researchpaper} provides the optional \textcmd{course} command for typesetting course information (such as the course title).
\marginnote{\textbackslash institution\{\}\newline \textbackslash department\{\}\newline \textbackslash location\{\}}
-\texttt{turabian-thesis} also provides: (1) \textcmd{institution} for typesetting the institution at the top of the page, (2) for typesetting the name of the department, and (3) \textcmd{location} for typesetting a location just above the date.
+\texttt{turabian-thesis} also provides: (1) \textcmd{institution} for typesetting the institution at the top of the page, (2) \textcmd{department} for typesetting the name of the department, and (3) \textcmd{location} for typesetting a location just above the date.
To create a custom title page, use the \texttt{titlepage} environment.
@@ -416,9 +418,9 @@
\label{sec:required_packages}
-This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, \texttt{endnotes}, and \texttt{xparse}.
+This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, and \texttt{endnotes}.
-The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{fancyhdr}, \texttt{tocloft}, \texttt{ellipsis}, and \texttt{threeparttable}.
+The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{tocloft}, \texttt{ellipsis}, and \texttt{threeparttable}.
\clearpage
@@ -426,6 +428,24 @@
\label{sec:updates}
+\marginnote{\rmfamily{2020/03/19}}%
+
+Part, chapter, section, and subsection headings are easier to adjust. This includes better support for \textcmd{MakeUppercase}.
+
+Vertical spacing, in typesetting part, chapter, section, and subsection headings, is more precise.
+
+The \texttt{appendixes} environment provides better support for adjusting the typesetting of appendix headings.
+
+Improved support for \texttt{biblatex}.
+
+The bibliography/references list, by default, is no longer included in the table of contents (instead, use the \texttt{heading=bibintoc} option with \textcmd{printbibliography}).
+
+Significantly improved support for implementing endnotes with the \texttt{endnotes} package.
+
+The \textcmd{chapter*} command no longer resets footnote and endnote counters.
+
+The \texttt{xparse} package is no longer required.
+
\marginnote{\rmfamily{2018/08/01}}%
If the \texttt{biblatex-chicago} package is loaded by the user, the \texttt{noibid} option is no longer passed to the package by default.
@@ -438,7 +458,7 @@
The \textcmd{tableofcontents} command no longer causes subsequent pages to be typeset using the \texttt{plain} page style.
-Paragraphs immediately following chapter, section, and subsection headings now have an indentation of 0.5 inches.
+Paragraphs, immediately following chapter, section, and subsection headings, now have an indentation of 0.5 inches.
The lists of figures, tables, and illustrations each appear as entries in the table of contents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turabian-formatting.doc.tlpobj new/tlpkg/tlpobj/turabian-formatting.doc.tlpobj
--- old/tlpkg/tlpobj/turabian-formatting.doc.tlpobj 2019-02-28 04:10:11.000000000 +0100
+++ new/tlpkg/tlpobj/turabian-formatting.doc.tlpobj 2020-03-20 23:58:45.000000000 +0100
@@ -1,6 +1,6 @@
name turabian-formatting.doc
category Package
-revision 48330
+revision 54436
shortdesc doc files of turabian-formatting
relocated 1
docfiles size=38
++++++ turabian-formatting.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/turabian-formatting/turabian-formatting.sty new/tex/latex/turabian-formatting/turabian-formatting.sty
--- old/tex/latex/turabian-formatting/turabian-formatting.sty 2018-08-01 23:17:38.000000000 +0200
+++ new/tex/latex/turabian-formatting/turabian-formatting.sty 2020-03-20 22:27:47.000000000 +0100
@@ -4,7 +4,7 @@
% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2018/08/01 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2020/03/19 Turabian Formatting]
% Package options: flags and variables
@@ -74,13 +74,12 @@
\setlength\footskip{0.5in}
-% Text spacing is double spaced
+% Text spacing is double-spaced
\RequirePackage{setspace}
\setstretch{2}
-% Preserve normalsize and footnotesize single spacing baselineskip values
-
+% Preserve normalsize and footnotesize single-spacing baselineskip values
\newlength\tf@singlelineskip
\newlength\tf@fnsinglelineskip
@@ -143,13 +142,12 @@
% Footnotes: readjust footnote rule size and placement
\renewcommand{\footnoterule}{%
- \vspace*{-3pt}
- \hrule width 2in height 0.4pt
- \vspace*{-4pt}}
-
-% Footnotes: make command to set footnote punctuation
-\newcommand{\tf@setfnpunct}[1]{\def\tf@thefnpunct{#1\,\,}}
-\tf@setfnpunct{.}
+ \kern-3\p@
+ \hrule \@width 2in height 0.4\p@
+ \kern-4\p@}
+
+% Footnotes: set default footnote punctuation
+\def\tf@thefnpunct{.\,\,}
% Footnotes: renew command for typesetting footnotes
\renewcommand{\@makefntext}[1]{%
@@ -163,8 +161,8 @@
\def\ps@headings{%
\let\@oddfoot\@empty
\let\@evenfoot\@empty
- \def\@evenhead{\thepage\hfil\slshape\leftmark}
- \def\@oddhead{{\slshape\rightmark}\hfil\thepage}
+ \def\@evenhead{\thepage}
+ \def\@oddhead{\hfil\thepage}
\let\@mkboth\@gobbletwo
\let\markboth\@mkboth
\let\chaptermark\@gobble
@@ -192,8 +190,10 @@
% Set top section command name to "section" (default)
\def\tf@topsecname{section}
-% Set adjustment for baselineskip after \section and \section* headings
-\def\tf@adjaftersec{\dimexpr \baselineskip -\tf@singlelineskip -\p@ \relax}
+% Redefine \@afterheading to adjust for baselineskip after headings
+\def\tf@adjaftersec{\dimexpr \baselineskip -\tf@singlelineskip \relax}
+\let\tf@tempafterheading\@afterheading
+\def\@afterheading{\vskip -\tf@adjaftersec\relax \tf@tempafterheading}
% Headings formatting: \section, \subsection, and \subsubsection
\setcounter{secnumdepth}{0}
@@ -201,47 +201,96 @@
\renewcommand{\section}{%
\@startsection{section}{1}%
{\z@}%
- {-\tf@singlelineskip}%
+ {2\tf@singlelineskip}%
{\tf@singlelineskip}%
- {\normalfont\bfseries\normalsize\singlespacing\centering}}
+ {\normalfont\bfseries\normalsize\centering}}
\renewcommand{\subsection}{%
\@startsection{subsection}{2}%
{\z@}%
- {-\tf@singlelineskip}%
+ {2\tf@singlelineskip}%
{\tf@singlelineskip}%
- {\normalfont\mdseries\normalsize\singlespacing\centering}}
+ {\normalfont\mdseries\normalsize\centering}}
\renewcommand{\subsubsection}{%
\@startsection{subsubsection}{3}%
{\z@}%
- {-\tf@singlelineskip}%
+ {2\tf@singlelineskip}%
{\tf@singlelineskip}%
- {\normalfont\bfseries\normalsize\singlespacing\raggedright}}
+ {\normalfont\bfseries\normalsize\raggedright}}
+
+% Sections: section heading formatting
+\def\tf@makesectionhead#1#2#3#4#5{%
+ \vskip -\tf@singlelineskip\relax
+ \begingroup
+ \singlespacing
+ #4{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #5\@@par}%
+ \endgroup}
+
+% Sections: formatting of TOC \addcontentsline
+\def\tf@tocline#1#2{\protect{\csname the#1\endcsname\quad}}
+
+% Sections: redefine \@sect to use \tf@makesectionhead and \tf@tocline
+\def\@sect#1#2#3#4#5#6[#7]#8{%
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \tf@makesectionhead{#1}{#2}{#3}{#6}{#8}
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else \tf@tocline{#1}{#2} \fi #7}%
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax \@svsec #8}%
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else \tf@tocline{#1}{#2} \fi #7}}%
+ \fi
+ \@xsect{#5}}
-% Headings formatting: following paragraphs start with an indent
-\def\tf@afterindent{\@afterindenttrue}
+% Sections: redefine \@ssect
+\def\@ssect#1#2#3#4#5{%
+ \@tempskipa #3\relax
+ \ifdim \@tempskipa>\z@
+ \vskip -\tf@singlelineskip\relax
+ \begingroup
+ \singlespacing
+ #4{%
+ \@hangfrom{\hskip #1}%
+ \interlinepenalty \@M #5\@@par}%
+ \endgroup
+ \else
+ \def\@svsechd{#4{\hskip #1\relax #5}}%
+ \fi
+ \@xsect{#3}}
-% Table of Contents: renew formatting
+% Table of Contents: set adjustment for baselineskip after toc heading
+\def\tf@adjaftersectoc{%
+ \vspace{\dimexpr \baselineskip -3\tf@singlelineskip \relax}}
-\def\tf@tocpagestyle{\@empty}
+% Table of Contents: \@starttoc formatting hook
+\def\tf@starttocformat{\singlespacing}
\renewcommand{\tableofcontents}{%
- \tf@tocpagestyle
\expandafter\csname \tf@topsecname\endcsname*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \@mkboth{}{}%
\if@optraggedright
\let\tf@tocrmarg\@tocrmarg
\def\@tocrmarg{\tf@tocrmarg plus1fil}
\fi
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
- \@starttoc{toc}}}%
+ \tf@adjaftersectoc
+ {\tf@starttocformat\@starttoc{toc}}}%
% List of Figures and List of Tables: adjust titles
-
\renewcommand{\listfigurename}{Figures}
\renewcommand{\listtablename}{Tables}
@@ -262,20 +311,18 @@
% List of Figures
\renewcommand{\listoffigures}{%
\expandafter\csname \tf@topsecname\endcsname*{\listfigurename}%
- \@mkboth{\listfigurename}{\listfigurename}%
+ \@mkboth{}{}%
\addcontentsline{toc}{\tf@topsecname}{\listfigurename}%
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
- \@starttoc{lof}}}
+ \tf@adjaftersectoc
+ {\tf@starttocformat\@starttoc{lof}}}
% List of Tables
\renewcommand{\listoftables}{%
\expandafter\csname \tf@topsecname\endcsname*{\listtablename}%
- \@mkboth{\listtablename}{\listtablename}%
+ \@mkboth{}{}%
\addcontentsline{toc}{\tf@topsecname}{\listtablename}%
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
- \@starttoc{lot}}}
+ \tf@adjaftersectoc
+ {\tf@starttocformat\@starttoc{lot}}}
% List of Illustrations
\newcommand{\listillustrationname}{Illustrations}
@@ -283,10 +330,10 @@
\newcommand{\listofillustrations}{%
\expandafter\csname \tf@topsecname\endcsname*{\listillustrationname}%
- \@mkboth{\listillustrationname}{\listillustrationname}%
+ \@mkboth{}{}%
\addcontentsline{toc}{\tf@topsecname}{\listillustrationname}%
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
+ \tf@adjaftersectoc
+ { \tf@starttocformat
{\tf@illustrsection Figures}\par\nopagebreak
\@starttoc{lof}
\vspace{\tf@singlelineskip}
@@ -295,7 +342,6 @@
% Figures and Tables: float positioning
-
\setlength\textfloatsep{%
\dimexpr 2\tf@singlelineskip +\p@ \relax minus 1\tf@singlelineskip}
\setlength\floatsep{%
@@ -307,7 +353,6 @@
\def\fps@figure{!htb}
% Figures and Tables: caption formatting
-
\setlength\abovecaptionskip{\z@}
\setlength\belowcaptionskip{\z@}
@@ -317,7 +362,6 @@
\small#1. #2\par
\vskip\belowcaptionskip}
-
% Lists: enumerate and itemize formatting
\setlength\leftmargini{1.5\parindent}
\setlength\leftmargin{\leftmargini}
@@ -391,7 +435,6 @@
% thebibliography environment: formatting (adjust \@openbib@code hook default)
-
\setlength\bibindent{\parindent}
\renewcommand\@openbib@code{%
@@ -422,52 +465,36 @@
\DefineBibliographyStrings{english}{%
references = {Bibliography}}
\fi
- \renewcommand{\bibsetup}{%
- \addcontentsline{toc}{\tf@topsecname}{\bibname}
- \vspace{\dimexpr -2\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing%
- \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}}
- \renewcommand{\bibitemsep}{1\baselineskip}
+ \renewcommand{\bibitemsep}{\tf@singlelineskip}
\renewcommand{\bibhang}{0.5in}
+ \renewcommand{\bibsetup}{%
+ \vskip \tf@adjaftersec\relax
+ \vskip -\tf@singlelineskip\relax
+ \singlespacing}%
}{}}
\fi
% Endnotes: support and formatting
-
\if@endnotesformat
- \RequirePackage{endnotes, xparse}
+ \RequirePackage{endnotes}
% Changes footnote marker type and formatting
- \tf@setfnpunct{}
+ \def\tf@thefnpunct{\,\,}
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\PassOptionsToPackage{notetype=endonly}{biblatex-chicago}
- \AtEndPreamble{%
- % Make endnotes use of "_" not a special character when in text mode
- \appto{\enoteheading}{%
- \catcode`_=12
- \begingroup\lccode`~=`_
- \lowercase{\endgroup\let~}\sb
- \mathcode`_="8000}
-
- % Create \jobname.ent if not already defined to avoid missing file error
- \preto{\theendnotes}{%
- \IfFileExists{./\jobname.ent}%
- {}%
- {%
- \immediate\openout\@enotes=\jobname.ent\relax
- \immediate\write\@enotes{}%
- }}}
+ % Create \jobname.ent to avoid missing file error
+ \@openenotes
% Set default endnotes formatting
\renewcommand{\enotesize}{\normalsize}
\renewcommand{\enoteformat}{%
+ \singlespacing
\if@optraggedright \raggedright \fi
\setlength\parindent{\footnotemargin}
- \vspace{\tf@singlelineskip}
\theenmark.\,\,}
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/turabian-formatting/turabian-researchpaper.cls new/tex/latex/turabian-formatting/turabian-researchpaper.cls
--- old/tex/latex/turabian-formatting/turabian-researchpaper.cls 2018-08-01 23:17:38.000000000 +0200
+++ new/tex/latex/turabian-formatting/turabian-researchpaper.cls 2020-03-20 22:27:47.000000000 +0100
@@ -4,7 +4,7 @@
% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-researchpaper}[2018/08/01 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2020/03/19 Turabian Research Paper]
% Default point size
@@ -79,118 +79,69 @@
\RequirePackage{turabian-formatting}
-% Part: formatting
-\def\tf@partformat{\normalfont\bfseries\singlespacing\centering}
-
-\def\@part[#1]#2{%
- \ifnum \c@secnumdepth >-2\relax
- \refstepcounter{part}%
- \addcontentsline{toc}{part}%
- {\protect{\partname\space\thepart}}%
- \else
- \addcontentsline{toc}{part}{#1}%
- \fi
- \markboth{}{}%
- { \tf@partformat
- \interlinepenalty \@M
- \ifnum \c@secnumdepth >-2\relax
- \partname\nobreakspace\thepart
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \ifstrempty{#2}%
- {}%
- {#2\par\nobreak}}%
- \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}}
-
-\def\@spart#1{%
- { \tf@partformat
- \interlinepenalty \@M
- #1\par\nobreak}%
- \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}}
-
+% Sections: \section* adjustment to space after heading
+\newif\if@adjustssect\@adjustssecttrue
+\newlength\tf@ssectafterskip
% Sections: command to disable differentiate and reformat \section*
\gdef\noadjustssect{\@adjustssectionfalse}
-% Sections: \section* adjustment to space after heading
-\newif\if@adjustssection\@adjustssectiontrue
-\newlength\tf@ssect@afterskip
-\setlength\tf@ssect@afterskip{1\p@}
-
-% Sections: adjustment to space after \section heading
-\newif\if@tf@adjustsection\@tf@adjustsectionfalse
-\newlength\tf@sect@afterskip
-\setlength\tf@sect@afterskip{1\p@}
+% Sections: \section* heading formatting hook
+\def\tf@ssectformat#1{#1}
-% Sections: redefine \@startsection to differentiate starred version
+% Sections: redefine \@startsection to support \if@adjustssect and \tf@ssectformat
\def\@startsection#1#2#3#4#5#6{%
\if@noskipsec \leavevmode \fi
\par
\@tempskipa #4\relax
\@afterindenttrue
\ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \tf@afterindent
+ \@tempskipa -\@tempskipa \@afterindentfalse
\fi
\if@nobreak \everypar{} \else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
- \setlength\tf@ssect@afterskip{\dimexpr #5 -\tf@adjaftersec \relax}
- \if@adjustssection
- \ifstrequal{#1}{section}%
- {\setlength\tf@ssect@afterskip{%
- \dimexpr 2\tf@singlelineskip -\tf@adjaftersec \relax}}%
- {}
- \fi
- \setlength\tf@sect@afterskip{\dimexpr #5 -\tf@adjaftersec \relax}
- \if@tf@adjustsection
- \ifstrequal{#1}{section}%
- {\setlength\tf@sect@afterskip{%
- \dimexpr 2\tf@singlelineskip -\tf@adjaftersec \relax}}%
- {}
+ \setlength\tf@ssectafterskip{#5}
+ \ifnum #2 =1
+ \if@adjustssect \setlength\tf@ssectafterskip{2\tf@singlelineskip} \fi
\fi
\@ifstar
- {\@ssect{#3}{#4}{\tf@ssect@afterskip}{#6}}%
- {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\tf@sect@afterskip}{#6}}}}
+ {\@ssect{#3}{#4}{\tf@ssectafterskip}{\tf@ssectformat{#6}}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
-% Sections: formatting between \@svsec and heading
-\protected@edef\tf@secsep#1#2{\@empty}
-% Sections: formatting of TOC \addcontentsline
-\def\tf@tocline#1{\protect{\csname the#1\endcsname\quad}}
+% Part: formatting (unsupported)
+\def\tf@partformat{\normalfont\bfseries\centering}
-% Sections: redefine \@sect to support optional two-line formatting
-\def\@sect#1#2#3#4#5#6[#7]#8{%
- \ifnum #2>\c@secnumdepth
- \let\@svsec\@empty
- \else
- \refstepcounter{#1}%
- \protected@edef\@svsec{\@seccntformat{#1}\relax}%
- \fi
- \@tempskipa #5\relax
- \ifdim \@tempskipa>\z@
- \begingroup
- #6{%
- \@hangfrom{\hskip #3\relax\@svsec}%
- \interlinepenalty \@M \tf@secsep{#1}{#8}#8\@@par}%
- \endgroup
- \csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \ifnum #2>\c@secnumdepth \else
- \tf@tocline{#1}%
- \fi
- #7}%
+\def\@part[#1]#2{%
+ \@afterindenttrue
+ \ifnum \c@secnumdepth >\m@ne
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\protect{\partname\space\thepart}}%
\else
- \def\@svsechd{%
- #6{\hskip #3\relax\@svsec #8}%
- \csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \ifnum #2>\c@secnumdepth \else
- \tf@tocline{#1}%
- \fi
- #7}}%
+ \addcontentsline{toc}{part}{#1}%
\fi
- \@xsect{#5}}
+ \markboth{}{}%
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
+ \interlinepenalty \@M
+ \tf@partformat{%
+ \ifnum \c@secnumdepth >\m@ne
+ \partname\nobreakspace\thepart\relax\@@par
+ \fi%
+ #2\@@par}%
+ \endgroup
+ \vskip 2\tf@singlelineskip
+ \@afterheading}
+
+\def\@spart#1{%
+ \@afterindenttrue
+ { \singlespacing
+ \interlinepenalty \@M
+ \tf@partformat{#1\@@par}}%
+ \vskip 2\tf@singlelineskip
+ \@afterheading}
% Title page: commands for use with \maketitle
@@ -230,7 +181,7 @@
% Formatting for titlepage option
\renewcommand{\maketitle}{%
\begin{titlepage}%
- \tf@setfnpunct{}
+ \def\tf@thefnpunct{\,\,}
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\let\footnoterule\relax
\normalfont\normalsize\centering\singlespacing
@@ -276,7 +227,6 @@
% Table of Contents, List of Figures, and List of Tables: item number alignment
-%\def\numberline#1{\hb@xt@\@tempdima{\hfil #1\hspace{1em}}}
\def\@tocrmarg{0.75in}
\def\@pnumwidth{3.5ex}
@@ -288,30 +238,33 @@
\renewcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{1\baselineskip}%
+ \vskip 2\tf@singlelineskip %
\setlength\@tempdima{0.5in}%
- \vskip \tf@singlelineskip
- { \parindent \z@
- \rightskip \z@
+ { \parindent \z@ \rightskip \z@
\parfillskip -\@rightskip
\leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
\bfseries #1\nobreak\hfil \nobreak\par}
+ \if@compatibility
+ \global\@nobreaktrue
+ \everypar{\global\@nobreakfalse\everypar{}}%
+ \fi
\fi}
\renewcommand*{\l@section}[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty\@secpenalty
- \setlength\@tempdima{\z@}%
\vskip \tf@singlelineskip
- { \parindent \z@
- \rightskip \@tocrmarg
+ \setlength\@tempdima{\z@}%
+ \begingroup
+ \parindent \z@ \rightskip \@tocrmarg
\parfillskip -\rightskip
\leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \endgroup
\fi}
\renewcommand*{\l@subsection}{%
@@ -344,31 +297,43 @@
% Appendixes: adjust formatting of section headings
\def\tf@appendixsecfrmt{%
- \DeclareRobustCommand{\@seccntformat}[1]{%
- \ifstrequal{##1}{section}%
- {\appendixname\space \csname the##1\endcsname}%
- {\csname the##1\endcsname\quad}}
- \DeclareRobustCommand{\tf@secsep}[2]{%
- \ifstrequal{##1}{section}%
- {\ifstrempty{##2}{}{\par\nobreak}}%
- {\@empty}}
- \def\tf@tocline##1{\appendixname\space \csname the##1\endcsname.\quad}
- \@tf@adjustsectiontrue}
+ \def\thesection{\@Alph\c@section}
+ \protect\def\tf@makesectionhead##1##2##3##4##5{%
+ \vskip -\tf@singlelineskip\relax
+ \ifnum ##2 =1
+ \begingroup
+ \singlespacing
+ \interlinepenalty \@M
+ ##4{\appendixname\space\thesection\relax\@@par ##5\@@par}%
+ \vskip \tf@singlelineskip
+ \endgroup
+ \else
+ \begingroup
+ \singlespacing
+ ##4{%
+ \@hangfrom{\hskip ##3\relax\@svsec}%
+ \interlinepenalty \@M ##5\@@par}%
+ \endgroup
+ \fi}
+ \def\tf@tocline##1##2{%
+ \ifnum ##2 =1
+ \protect{\appendixname\space\thesection.\quad}
+ \else
+ \protect{\csname the##1\endcsname\quad}
+ \fi}}
% Appendixes: make environment
\newenvironment{appendixes}%
{%
\setcounter{secnumdepth}{1}
- \tf@appendixsecfrmt
- \setcounter{section}{0}%
- \setcounter{subsection}{0}%
- \gdef\thesection{\@Alph\c@section}%
+ \setcounter{section}{0}
+ \setcounter{subsection}{0}
+ \tf@appendixsecfrmt%
}%
{%
\setcounter{secnumdepth}{0}%
\setcounter{section}{0}%
\setcounter{subsection}{0}%
- \gdef\thesection{\@arabic\c@section}%
}%
% Appendixes: remove \appendix command
@@ -377,14 +342,10 @@
% Endnotes: Notes heading formatted as \section*
\if@endnotesformat
- \renewcommand{\enoteheading}{%
+ \def\enoteheading{%
\section*{\notesname}%
- \markboth{\notesname}{\notesname}%
- \addcontentsline{toc}{section}{\notesname}%
- \vspace{\dimexpr -4\tf@singlelineskip +1\baselineskip \relax}
- \singlespacing\mbox{}%
- \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}
- \let\tf@afterindent\@afterindenttrue}%
+ \markboth{}{}%
+ \addcontentsline{toc}{section}{\notesname}}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/turabian-formatting/turabian-thesis.cls new/tex/latex/turabian-formatting/turabian-thesis.cls
--- old/tex/latex/turabian-formatting/turabian-thesis.cls 2018-08-01 23:17:38.000000000 +0200
+++ new/tex/latex/turabian-formatting/turabian-thesis.cls 2020-03-20 22:27:47.000000000 +0100
@@ -4,7 +4,7 @@
% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-thesis}[2018/08/01 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2020/03/19 Turabian Theses and Dissertations]
% Default point size
@@ -128,57 +128,56 @@
\if@openright \cleardoublepage \else \clearpage \fi
\secdef\@part\@spart}
-\def\tf@partformat{\normalfont\bfseries\normalsize\singlespacing\centering}
+\def\tf@partformat{\normalfont\bfseries\normalsize\centering}
% Part: heading with empty page
\def\@part[#1]#2{%
\ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \refstepcounter{part}%
- \addcontentsline{toc}{part}%
- {\protect\numberline{\partname\space\thepart}#1}%
- \else
- \addcontentsline{toc}{part}{#1}%
- \fi
+ \refstepcounter{part}
+ \setcounter{footnote}{0}
+ \addcontentsline{toc}{part}%
+ {\protect\numberline{\partname\space\thepart}#1}
\else
- \addcontentsline{toc}{part}{#1}%
+ \addcontentsline{toc}{part}{#1}
\fi
- \markboth{}{}%
- { \tf@partformat
+ \markboth{}{}
+ \thispagestyle{empty}
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
\interlinepenalty \@M
- \thispagestyle{empty}%
- \ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \partname\nobreakspace\thepart
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
- #2\par}
+ \tf@partformat{
+ \ifnum \c@secnumdepth >-2\relax
+ \partname\nobreakspace\thepart\relax\@@par
+ \fi%
+ #1\@@par}%
+ \endgroup
\@endpart}
% Part: heading with plain page style; allows following part description
\def\@spart#1{%
\ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \refstepcounter{part}%
- \addcontentsline{toc}{part}%
- {\protect\numberline{\partname\space\thepart}#1}%
- \fi
+ \refstepcounter{part}
+ \setcounter{footnote}{0}
+ \addcontentsline{toc}{part}%
+ {\protect\numberline{\partname\space\thepart}#1}
+ \else
+ \addcontentsline{toc}{part}{#1}
\fi
- \markboth{}{}%
- { \tf@partformat
+ \markboth{}{}
+ \thispagestyle{plain}
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
\interlinepenalty \@M
- \thispagestyle{plain}%
- \ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \partname\nobreakspace\thepart
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
- \ifstrempty{#1}{}{#1\par\nobreak}}%
- \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}
+ \tf@partformat{
+ \ifnum \c@secnumdepth >-2\relax
+ \partname\nobreakspace\thepart\relax\@@par
+ \fi%
+ #1\@@par}%
+ \endgroup
+ \vskip 2\tf@singlelineskip
+ \@afterindenttrue
\@afterheading}
\def\@endpart{\if@openright \cleardoublepage \else \clearpage \fi}
@@ -220,83 +219,62 @@
\@tfchapterbeforefalse
\fi}
-% Chapter: formatting
-\def\tf@chapformat{\normalfont\bfseries\normalsize\singlespacing\centering}
-
-\newlength\tf@adjafterchapskip
-\setlength\tf@adjafterchapskip{\z@}
-
-\def\tf@setafterchapskip{%
- \setlength\tf@adjafterchapskip{%
- \dimexpr 3\tf@singlelineskip -\baselineskip \relax}}
-
+% Chapter: heading layout
\def\@chapter[#1]#2{%
\@figuredblnumfalse
\@tabledblnumfalse
- \tf@afterindent
+ \@afterindenttrue
\ifnum \c@secnumdepth >\m@ne
+ \setcounter{footnote}{0}
\if@mainmatter
\tf@chapcounter
- \typeout{\@chapapp\space\thechapter.}%
+ \typeout{\@chapapp\space\thechapter}
\addcontentsline{toc}{chapter}%
- {\protect\numberline{\@chapapp\space\thechapter}#1}%
+ {\protect\numberline{\@chapapp\space\thechapter}#1}
+ \tf@endnotesection{\@chapapp\space\thechapter}
\else
\tf@restoreftcounters
- \addcontentsline{toc}{chapter}{#1}%
+ \addcontentsline{toc}{chapter}{#1}
+ \tf@endnotesection{#1}
\fi
\else
- \addcontentsline{toc}{chapter}{#1}%
+ \addcontentsline{toc}{chapter}{#1}
\fi
- \chaptermark{#1}%
- \@makechapterhead{#2}%
+ \chaptermark{#1}
+ \@makechapterhead{#2}
\@afterheading}
\def\@schapter#1{%
\@figuredblnumfalse
\@tabledblnumfalse
\tf@restoreftcounters
- \tf@afterindent
- \@makeschapterhead{#1}%
+ \@afterindenttrue
+ \@makeschapterhead{#1}
\@afterheading}
+% Chapter: heading formatting
+\def\tf@chapformat{\normalfont\bfseries\normalsize\centering}
+
\def\@makechapterhead#1{%
- \tf@setafterchapskip
- { \tf@chapformat
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \@chapapp\space \thechapter
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
\interlinepenalty\@M
- \ifstrempty{#1}{}{#1\par\nobreak \vspace{\tf@adjafterchapskip}}}}
+ \tf@chapformat{
+ \ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \@chapapp\space \thechapter\relax\@@par
+ \fi%
+ \fi%
+ #1\@@par}
+ \endgroup
+ \vskip 2\tf@singlelineskip}
\def\@makeschapterhead#1{%
- \tf@setafterchapskip
- { \tf@chapformat
+ { \singlespacing
\interlinepenalty\@M
- #1\par\nobreak
- \vspace{\tf@adjafterchapskip}}}
-
-
-% Sections: redefine \@startsection to support adjusting space after section headings
-\def\@startsection#1#2#3#4#5#6{%
- \if@noskipsec \leavevmode \fi
- \par
- \@tempskipa #4\relax
- \@afterindenttrue
- \ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \tf@afterindent
- \fi
- \if@nobreak
- \everypar{}%
- \else
- \addpenalty\@secpenalty\addvspace\@tempskipa
- \fi
- \@ifstar
- {\@ssect{#3}{#4}{\dimexpr #5 -\tf@adjaftersec \relax}{#6}}%
- {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\dimexpr #5 -\tf@adjaftersec \relax}{#6}}}}
+ \tf@chapformat{#1}\par\nobreak}%
+ \vskip 2\tf@singlelineskip}
% Title page: commands for use with \maketitle
@@ -357,7 +335,7 @@
\renewcommand{\maketitle}{%
\begin{titlepage}%
\singlespacing
- \tf@setfnpunct{}
+ \def\tf@thefnpunct{\,\,}
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\let\footnoterule\relax
\normalfont\normalsize
@@ -404,9 +382,8 @@
\renewcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{1\baselineskip}%
+ \vskip 2\tf@singlelineskip %
\setlength\@tempdima{1.25in}%
- \vskip 1\baselineskip
{ \parindent \z@
\rightskip \z@
\parfillskip -\@rightskip
@@ -433,7 +410,7 @@
\renewcommand*{\l@section}{%
\ifnum \c@tocdepth >\z@ \vskip \tf@singlelineskip \fi
- \@dottedtocline{1}{1.5in}{\z@}}
+ \@dottedtocline{1}{1.25in}{\z@}}
\renewcommand*{\l@subsection}{%
\ifnum \c@tocdepth >1 \vskip \tf@singlelineskip \fi
@@ -493,19 +470,36 @@
\newcounter{appendix}
+% Appendixes: heading formatting
+\def\tf@appendixchapfrmt{%
+ \def\thechapter{\@Alph\c@appendix}
+ \def\@chapapp{\appendixname}%
+ \protect\def\@chapter[##1]##2{%
+ \tf@appendixcounter
+ \setcounter{footnote}{0}
+ \@afterindenttrue
+ \typeout{\@chapapp\space\thechapter}
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline{\@chapapp\space\thechapter}##1}
+ \chaptermark{##1}
+ \tf@endnotesection{\@chapapp\space\thechapter}
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
+ \interlinepenalty\@M
+ \tf@chapformat{\@chapapp\space \thechapter\@@par ##2\@@par}
+ \endgroup
+ \vskip 2\tf@singlelineskip
+ \@afterheading}}
+
\newenvironment{appendixes}%
{%
- \@mainmattertrue
- \setcounter{section}{0}%
- \def\@chapapp{\appendixname}%
- \def\thechapter{\@Alph\c@appendix}
- \def\tf@chapcounter{\refstepcounter{appendix}}
\if@doublenumerate
\if@tfchapterbefore \else
\setcounter{tf@tempchapfcnt}{\value{figure}}
\setcounter{tf@tempchaptcnt}{\value{table}}
\fi
- \def\tf@chapcounter{%
+ \def\tf@appendixcounter{%
\refstepcounter{appendix}
\@figuredblnumtrue
\@tabledblnumtrue}
@@ -513,70 +507,48 @@
\setcounter{table}{0}
\def\tf@figuredblnumprefix{A}
\def\tf@tabledblnumprefix{A}
+ \else
+ \def\tf@appendixcounter{%
+ \refstepcounter{appendix}
+ \@figuredblnumfalse
+ \@tabledblnumfalse}
\fi
+ \tf@appendixchapfrmt%
}%
{%
\if@doublenumerate
\setcounter{figure}{\value{tf@tempchapfcnt}}
\setcounter{table}{\value{tf@tempchaptcnt}}
- \fi
+ \fi%
}
% Appendixes: remove \appendix command
\def\appendix{\@empty}
-% Endnotes: layout and formatting
+% Endnotes: reset endnote counter and create endnote section heading
+\def\tf@endnotesection#1{%
+ \if@endnotesformat
+ \setcounter{endnote}{0}
+ \if@enotesopen
+ \addtoendnotes{\noexpand\tf@enotesechead{#1}}
+ \fi
+ \fi}
+% Endnotes: format and make endnote section heading if followed by an endnote
\if@endnotesformat
+ \def\tf@enotesechead#1{%
+ \@ifnextchar\@doanenote%
+ {\vskip\tf@singlelineskip\relax \section*{#1}}%
+ {}}
+\fi
- \let\tf@chapter\chapter
-
- \@addtoreset{endnote}{chapter}
-
- % Renew Notes heading formatted as \chapter* (also added to Table of Content)
- \renewcommand{\enoteheading}{%
- \tf@chapter*{\notesname}%
- \@mkboth{\notesname}{\notesname}%
- \addcontentsline{toc}{chapter}{\notesname}%
- \vspace{\dimexpr -5\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing\mbox{}%
- \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}
- \let\tf@afterindent\@afterindenttrue}%
-
- % Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
- \RenewDocumentCommand{\chapter}{som}{%
- \IfBooleanTF{#1}%
- {% if \chapter*
- \tf@chapter*{#3}%
- \setcounter{endnote}{0}%
- \addtoendnotes{%
- \noexpand\tf@enotedivider%
- {\noexpand\section*}{\unexpanded{#3}}}%
- }%
- {% if \chapter
- \IfNoValueTF{#2}%
- {\tf@chapter{#3}}%
- {\tf@chapter[#2]{#3}}%
- \setcounter{endnote}{0}%
- \if@mainmatter
- \addtoendnotes{%
- \noexpand\tf@enotedivider%
- {\noexpand\section*}{\@chapapp\space \thechapter}}%
- \else
- \addtoendnotes{%
- \noexpand\tf@enotedivider%
- {\noexpand\section*}{\unexpanded{#3}}}%
- \fi
- }}
-
- % Empty subheading divider before \theendnotes for use with \tf@enotedivider
- \preto{\theendnotes}{%
- \addtoendnotes{\noexpand\tf@enotedivider{}{}}}
-
- % Make endnote divider if not followed by another endnote divider
- \def\tf@enotedivider#1#2{\@ifnextchar\tf@enotedivider{}{#1{#2}}}%
-
+% Endnotes: Notes heading formatted as \chapter*
+\if@endnotesformat
+ \def\enoteheading{%
+ \chapter*{\notesname}%
+ \@mkboth{}{}%
+ \addcontentsline{toc}{chapter}{\notesname}}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turabian-formatting.tlpobj new/tlpkg/tlpobj/turabian-formatting.tlpobj
--- old/tlpkg/tlpobj/turabian-formatting.tlpobj 2019-02-28 04:10:11.000000000 +0100
+++ new/tlpkg/tlpobj/turabian-formatting.tlpobj 2020-03-20 23:58:45.000000000 +0100
@@ -1,6 +1,6 @@
name turabian-formatting
category Package
-revision 48330
+revision 54436
shortdesc Formatting based on Turabian's Manual
relocated 1
longdesc The turabian-formatting package provides Chicago-style
@@ -13,6 +13,5 @@
RELOC/tex/latex/turabian-formatting/turabian-thesis.cls
catalogue-also turabian biblatex-chicago
catalogue-ctan /macros/latex/contrib/turabian-formatting
-catalogue-date 2018-08-01 18:15:02 +0200
catalogue-license lppl1.3
catalogue-topics dissertation class
++++++ txfontsb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/txfontsb/README new/doc/fonts/txfontsb/README
--- old/doc/fonts/txfontsb/README 2011-03-02 00:50:15.000000000 +0100
+++ new/doc/fonts/txfontsb/README 2019-11-12 22:42:19.000000000 +0100
@@ -1,6 +1,8 @@
-Release (v1.1/12/Jan/2011) of txfontsb package adding true small caps
+Release (v1.1.1/12/Nov/2019) of txfontsb package adding true small caps
and greek to txfonts package.
+OpenType fonts added (12/Nov/2019)
+
Go to the doc sudirectory for instructions.
A. Tsolomitis.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txfontsb.doc.tlpobj new/tlpkg/tlpobj/txfontsb.doc.tlpobj
--- old/tlpkg/tlpobj/txfontsb.doc.tlpobj 2019-02-28 04:10:20.000000000 +0100
+++ new/tlpkg/tlpobj/txfontsb.doc.tlpobj 2020-03-24 02:04:16.000000000 +0100
@@ -1,6 +1,6 @@
name txfontsb.doc
category Package
-revision 21578
+revision 54512
shortdesc doc files of txfontsb
relocated 1
docfiles size=22
++++++ txfontsb.tar.xz ++++++
Binary files old/fonts/opentype/public/txfontsb/FreeSerifb-SmallCaps.otf and new/fonts/opentype/public/txfontsb/FreeSerifb-SmallCaps.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifb-SmallCapsAlt.otf and new/fonts/opentype/public/txfontsb/FreeSerifb-SmallCapsAlt.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifb.otf and new/fonts/opentype/public/txfontsb/FreeSerifb.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifbBold.otf and new/fonts/opentype/public/txfontsb/FreeSerifbBold.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifbBoldItalic.otf and new/fonts/opentype/public/txfontsb/FreeSerifbBoldItalic.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifbItalic.otf and new/fonts/opentype/public/txfontsb/FreeSerifbItalic.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txfontsb.tlpobj new/tlpkg/tlpobj/txfontsb.tlpobj
--- old/tlpkg/tlpobj/txfontsb.tlpobj 2019-02-28 04:10:20.000000000 +0100
+++ new/tlpkg/tlpobj/txfontsb.tlpobj 2020-03-24 02:04:16.000000000 +0100
@@ -1,13 +1,13 @@
name txfontsb
category Package
-revision 21578
+revision 54512
shortdesc Extensions to txfonts, using GNU Freefont
relocated 1
longdesc A set of fonts that extend the txfonts bundle with small caps
longdesc and old style numbers, together with Greek support. The
longdesc extensions are made with modifications of the GNU Freefont.
execute addMap gptimes.map
-runfiles size=1596
+runfiles size=2083
RELOC/fonts/afm/public/txfontsb/FreeSerifb-SmallCaps.afm
RELOC/fonts/afm/public/txfontsb/FreeSerifb-SmallCapsAlt.afm
RELOC/fonts/afm/public/txfontsb/FreeSerifb.afm
@@ -17,6 +17,12 @@
RELOC/fonts/enc/dvips/txfontsb/gptimes.enc
RELOC/fonts/enc/dvips/txfontsb/gptimesy.enc
RELOC/fonts/map/dvips/txfontsb/gptimes.map
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifb-SmallCaps.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifb-SmallCapsAlt.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifb.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifbBold.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifbBoldItalic.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifbItalic.otf
RELOC/fonts/tfm/public/txfontsb/gtimesb6a.tfm
RELOC/fonts/tfm/public/txfontsb/gtimesb6r.tfm
RELOC/fonts/tfm/public/txfontsb/gtimesbi6a.tfm
@@ -74,7 +80,6 @@
RELOC/tex/latex/txfontsb/txfontsb.sty
catalogue-also newtx
catalogue-ctan /fonts/txfontsb
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license gpl
+catalogue-license gpl lppl1
catalogue-topics font font-maths font-greek font-type1
-catalogue-version 1.1
+catalogue-version 1.1.1
++++++ uantwerpendocs.doc.tar.xz ++++++
Binary files old/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf and new/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex new/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex
--- old/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenbamathesis}
\usepackage[english]{babel} % or dutch if your text is in Dutch
@@ -40,7 +40,7 @@
\facultyacronym{TI}
\academicyear{2015-2016}
-\diploma{BA-IW-EM}
+\diploma{MA-IW-EM}
\defenselocation{Antwerpen}
\defensedate{juni 2016}
Binary files old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf and new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
--- old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext}
\usepackage[english,dutch]{babel}
Binary files old/doc/latex/uantwerpendocs/uantwerpendocs.pdf and new/doc/latex/uantwerpendocs/uantwerpendocs.pdf differ
Binary files old/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf and new/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex new/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex
--- old/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,10pt]{uantwerpenexam}
\usepackage{newpxtext} % demonstration of some fine font packages
\usepackage{newpxmath}
Binary files old/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf and new/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex new/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex
--- old/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,10pt]{uantwerpenexam}
\usepackage{newpxtext} % demonstration of some fine font packages
\usepackage{newpxmath}
Binary files old/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf and new/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenletter-example.tex new/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
--- old/doc/latex/uantwerpendocs/uantwerpenletter-example.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenletter-example.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper]{uantwerpenletter}
%% As a good UAntwerpen citizen, you would use the calibri font.
Binary files old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf and new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex
--- old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
\usepackage{mathptmx}
Binary files old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf and new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex
--- old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
\usepackage{newpxtext}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj new/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj
--- old/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj 2019-03-29 02:24:45.000000000 +0100
+++ new/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj 2019-05-06 01:39:04.000000000 +0200
@@ -1,6 +1,6 @@
name uantwerpendocs.doc
category Package
-revision 50626
+revision 51007
shortdesc doc files of uantwerpendocs
relocated 1
docfiles size=366
++++++ uantwerpendocs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls new/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
--- old/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenbamathesis}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@titlepagenoartwork
\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
\newif\if@titlepagetableonly
@@ -411,6 +411,8 @@
{\MoSIW:\\elektromechanica, afstudeerrichting elektromechanica}{
\ifthenelse{\equal{#1}{MA-IW-EM-EN}}
{\MoSIW:\\elektromechanica, afstudeerrichting energie}{
+ \ifthenelse{\equal{#1}{MA-IW-EM}}
+ {\MoSIW:\\elektromechanica}{
\ifthenelse{\equal{#1}{MA-TEW-HI}}
{\MoSTEW: handelsingenieur}{
\ifthenelse{\equal{#1}{MA-TEW-HIBI}}
@@ -420,7 +422,7 @@
\ifthenelse{\equal{#1}{MA-TEW-BK}}
{\MoSTEW: bedrijfskunde}
{\errmessage{Error in argument to macro diploma: must be one of
- BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+ BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}}
}
\newcommand\thesisname{ERROR}
\IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpencoursetext.cls new/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
--- old/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpencoursetext}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@copyright
\DeclareOption{copyright}{\@copyrighttrue}
\newif\if@qr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenexam.cls new/tex/latex/uantwerpendocs/uantwerpenexam.cls
--- old/tex/latex/uantwerpendocs/uantwerpenexam.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenexam.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenexam}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@examiner
\DeclareOption{examiner}{\@examinertrue}
\ExecuteOptions{a4paper,twoside,10pt}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenletter.cls new/tex/latex/uantwerpendocs/uantwerpenletter.cls
--- old/tex/latex/uantwerpendocs/uantwerpenletter.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenletter.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenletter}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@filled
\DeclareOption{filled}{\@filledtrue}
\ExecuteOptions{a4paper,10pt,final,oneside,openright}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls new/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
--- old/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenmasterthesis}
- [2019/03/27 v2.3 .dtx skeleton file]
+ [2019/04/10 v2.4 .dtx skeleton file]
\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls new/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
--- old/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls 2019-05-05 20:05:56.000000000 +0200
@@ -25,9 +25,9 @@
%% The Current Maintainer of this work is Walter Daems.
%%
\ProvidesClass{uantwerpenphdthesis}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@titlepagenoartwork
\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
\newif\if@titlepagetableonly
@@ -501,6 +501,8 @@
{\MoSIW:\\elektromechanica, afstudeerrichting elektromechanica}{
\ifthenelse{\equal{#1}{MA-IW-EM-EN}}
{\MoSIW:\\elektromechanica, afstudeerrichting energie}{
+ \ifthenelse{\equal{#1}{MA-IW-EM}}
+ {\MoSIW:\\elektromechanica}{
\ifthenelse{\equal{#1}{MA-TEW-HI}}
{\MoSTEW: handelsingenieur}{
\ifthenelse{\equal{#1}{MA-TEW-HIBI}}
@@ -510,7 +512,7 @@
\ifthenelse{\equal{#1}{MA-TEW-BK}}
{\MoSTEW: bedrijfskunde}
{\errmessage{Error in argument to macro diploma: must be one of
- BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+ BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}}
}
\newcommand\thesisname{ERROR}
\IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uantwerpendocs.tlpobj new/tlpkg/tlpobj/uantwerpendocs.tlpobj
--- old/tlpkg/tlpobj/uantwerpendocs.tlpobj 2019-03-29 02:24:46.000000000 +0100
+++ new/tlpkg/tlpobj/uantwerpendocs.tlpobj 2019-05-06 01:39:04.000000000 +0200
@@ -1,6 +1,6 @@
name uantwerpendocs
category Package
-revision 50626
+revision 51007
shortdesc Course texts, master theses, and exams in University of Antwerp style
relocated 1
longdesc These class files implement the house style of the University
@@ -32,7 +32,7 @@
RELOC/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
RELOC/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
catalogue-ctan /macros/latex/contrib/uantwerpendocs
-catalogue-date 2019-03-28 19:50:55 +0100
+catalogue-date 2019-04-10 20:30:42 +0200
catalogue-license lppl1.3
catalogue-topics class dissertation essay letter exam
-catalogue-version 2.3
+catalogue-version 2.4
++++++ ucalgmthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucalgmthesis/README.md new/doc/latex/ucalgmthesis/README.md
--- old/doc/latex/ucalgmthesis/README.md 2019-04-01 00:04:57.000000000 +0200
+++ new/doc/latex/ucalgmthesis/README.md 2019-10-24 23:48:41.000000000 +0200
@@ -59,6 +59,11 @@
\end{document}
```
+The easiest way to get started is perhaps to rename
+`sample-thesis.tex`, change the metadata and layout options to your
+liking, and put the content of your thesis into the files it includes
+(`frontmatter.tex`, `chapter1.tex`, etc.)
+
Commands
--------
@@ -98,13 +103,17 @@
- `singlespaced`, `onehalfspaced`, `doublespaced` sets up the line
spacing (`onehalfspaced` is the default).
-- `palatino`, `times`, `garamond`, `utopia`, `libertine` offer some nice
- alternative typefaces (i.e., fonts) to the default Computer Modern.
-
-- `headers` produces running heads. Per the guidelines, must not be
- the thesis title or author's name, and must be separated from the
- main text by a line. The class uses the chapter number and title and
- places it flush right in the header.
+- `palatino`, `times`, `garamond`, `utopia`, `libertine` offer some
+ nice alternative typefaces (i.e., fonts) to the default Computer
+ Modern. Note that `garamond` uses the
+ [`garamondx`](https://ctan.org/tex-archive/fonts/garamondx?lang=en)
+ package, which is not included in the TeXLive distibution (and is
+ not available on Overleaf).
+
+- `headers` produces running heads. Per the guidelines, the running
+ heads must not be the thesis title or author's name, and must be
+ separated from the main text by a line. The class uses the chapter
+ number and title and places it flush right in the header.
- `fullpage` calls `\fullpagethesis`, so produces a thesis with 1"
margins all around. This produces very long lines and is not
@@ -186,6 +195,12 @@
- `garamond` and `utopia` use the `mathdesign` package, which has a buggy
`\hrulefill` command. The package tries to correct this.
+- `garamond` uses the `garamondx` package. This package has a
+ restrictive license and is thus not included in the TeXLive
+ distribution. Use the
+ [`getnonfreefonts`](https://www.tug.org/fonts/getnonfreefonts/)
+ installer to download it.
+
- The guidelines require that the official filed thesis is laid out
for one-sided printing (equal left and right margins). You may want
to print the thesis two-sided, however, e.g., to give a nice bound
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucalgmthesis/appendix.tex new/doc/latex/ucalgmthesis/appendix.tex
--- old/doc/latex/ucalgmthesis/appendix.tex 2019-04-01 00:04:57.000000000 +0200
+++ new/doc/latex/ucalgmthesis/appendix.tex 2019-10-24 23:48:41.000000000 +0200
@@ -8,7 +8,7 @@
\chapter*{Appendix}\label{appendix}
% \chapter* doesn't include it in the TOC, so we have to do that by
-% hand. If you have multiple chapters, use \chapter instead and
+% hand. If you have multiple appendices, use \chapter instead and
% remove the following line.
\addcontentsline{toc}{chapter}{Appendix}
Binary files old/doc/latex/ucalgmthesis/sample-thesis.pdf and new/doc/latex/ucalgmthesis/sample-thesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucalgmthesis/sample-thesis.tex new/doc/latex/ucalgmthesis/sample-thesis.tex
--- old/doc/latex/ucalgmthesis/sample-thesis.tex 2019-04-02 23:02:20.000000000 +0200
+++ new/doc/latex/ucalgmthesis/sample-thesis.tex 2019-10-24 23:48:41.000000000 +0200
@@ -1,24 +1,28 @@
% A Sample Thesis for the University of Calgary
% =============================================
-% Load the UCalgary Memoir Thesis class. By default (without options),
-% this produces a 1-1/2 spaced thesis in 11 point font without running
-% heads. Use package options singlespaced or doublespaced for single
-% or double line spacing. The default font is LaTeX's Computer
-% Modern. Use package options times, palatino, libertine, garamond, or
-% utopia for other nice typefaces. (You may need to install the
-% relevant packages to get these to work.) Use package option headers
-% if you want running heads. Use option fullpage if you want the text
-% to occupy all allowable space (1 inch margins all around), or option
-% manuscript if you want a page layout suitable for reviewing and
-% proof reading. Option manuscript selects 12 pt type, doublespaced,
-% approx. 25 lines per page, with approx. 72 characters per line. You
-% may want to remove the option for the version you file in the Vault;
-% it looks nicer and is a bit more compact. You can also use any
-% options that the memoir class recognizes, such as 10pt for 10 point
-% font, 11pt for 11 point font, 12pt for 12 point type,
-% etc. Documentation of the memoir package can be found at
-% https://ctan.org/pkg/memoir?lang=en
+% This is a sample LaTeX document to build a University of Calgary
+% graduate thesis according to the guidelines of the Faculty of
+% Graduate Studies, available here:
+% https://grad.ucalgary.ca/current-students/thesis-based-students/thesis/build...
+
+% To use this sample for your own thesis, rename this file, make any changes
+% necessary, then add the content of your thesis t othe included files
+% frontmatter.tex, chapter1.tex, etc.
+
+% First, we load the UCalgary Memoir Thesis class ucalgmthesis,
+% available at https://github.com/rzach/ucalgmthesis
+
+% By default (without options), this produces a 1-1/2 spaced thesis in
+% 11 point font without running heads. See the README file for a
+% description of all package options.
+
+% In our sample we give three options: Option utopia sets the thesis in a
+% nice font. Option headers produces running heads. Option manuscript
+% formats the page in a way suitable for reading and commenting: 12 pt type,
+% double spaced, approx. 25 lines per page, with approx. 72 characters
+% per line. For filing in the Vault, remove that option to produce a
+% more compact thesis with a slightly better layout.
\documentclass[utopia,headers,manuscript]{ucalgmthesis}
@@ -37,8 +41,7 @@
\usepackage{microtype}
% We'll need some colored links, so we load xcolor and hyperref. But
-% you can take that out if you don't want links at all or are happy
-% with the standard garish colored boxes.
+% you can take that out if you don't want links at all.
\usepackage[dvipsnames]{xcolor}
@@ -100,7 +103,7 @@
% The year
-\thesisyear{2018}
+\thesisyear{2019}
% Tell hyperref to put author and title into the PDF metadata
@@ -123,6 +126,8 @@
% \includeonly{titlepage}
+% and then copy the resulting PDF to a separate file.
+
\begin{document}
\frontmatter
@@ -153,8 +158,9 @@
\include{backmatter}
-% The appendix contains material that would clutter up the main
-% text. Remove it if you don't have an appendix.
+% The appendix contains material that would clutter up the main text,
+% such as program code, survey instruments, or interview transcripts.
+% Remove it if you don't have an appendix.
\appendix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj new/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj
--- old/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj 2019-04-03 01:25:25.000000000 +0200
+++ new/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj 2019-10-25 01:54:50.000000000 +0200
@@ -1,9 +1,9 @@
name ucalgmthesis.doc
category Package
-revision 50705
+revision 52527
shortdesc doc files of ucalgmthesis
relocated 1
-docfiles size=41
+docfiles size=42
RELOC/doc/latex/ucalgmthesis/LICENSE
RELOC/doc/latex/ucalgmthesis/README.md
RELOC/doc/latex/ucalgmthesis/appendix.tex
++++++ ucalgmthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ucalgmthesis/ucalgmthesis.cls new/tex/latex/ucalgmthesis/ucalgmthesis.cls
--- old/tex/latex/ucalgmthesis/ucalgmthesis.cls 2019-04-02 23:02:20.000000000 +0200
+++ new/tex/latex/ucalgmthesis/ucalgmthesis.cls 2019-10-24 23:48:41.000000000 +0200
@@ -11,7 +11,7 @@
% Distributed under the terms of the MIT License
% https://opensource.org/licenses/MIT
-\ProvidesClass{ucalgmthesis}[2019/04/02
+\ProvidesClass{ucalgmthesis}[2019/10/24
University of Calgary Memoir Thesis Class]
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
@@ -85,12 +85,12 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
-% By default, typeset with one half spacing, no running heads, 11 pt
+% By default, typeset with one half spacing, no running heads
\ExecuteOptions{onehalfspaced,plain}
% Tell memoir the document has to be one-sided (i.e., don't switch
-% margins, etc.) and don't add empty pages before new chapters
+% margins, etc.), 11 pt, and don't add empty pages before new chapters
\PassOptionsToClass{openany,oneside,11pt}{memoir}
\ProcessOptions
@@ -119,8 +119,13 @@
\newcommand{\manuscriptthesis}{%
\setlxvchars
- \settypeblocksize{25\baselineskip}{1.1\lxvchars}{*}%
- \setulmargins{*}{*}{*}%
+ \settypeblocksize{25\baselineskip}{1.1\lxvchars}{*}
+ \if@twoside
+ \setlrmargins{*}{*}{1.618}
+ \else
+ \setlrmargins{*}{*}{1}
+ \fi
+ \setulmargins{*}{*}{*}
\checkandfixthelayout}
% fix a bug in mathdesign
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucalgmthesis.tlpobj new/tlpkg/tlpobj/ucalgmthesis.tlpobj
--- old/tlpkg/tlpobj/ucalgmthesis.tlpobj 2019-04-03 01:25:25.000000000 +0200
+++ new/tlpkg/tlpobj/ucalgmthesis.tlpobj 2019-10-25 01:54:50.000000000 +0200
@@ -1,6 +1,6 @@
name ucalgmthesis
category Package
-revision 50705
+revision 52527
shortdesc LaTeX thesis class for University of Calgary Faculty of Graduate Studies
relocated 1
longdesc ucalgmthesis.cls is a LaTeX class file that produces documents
@@ -20,6 +20,6 @@
catalogue-contact-bugs https://github.com/rzach/ucalgmthesis/issues
catalogue-contact-repository https://github.com/rzach/ucalgmthesis
catalogue-ctan /macros/latex/contrib/ucalgmthesis
-catalogue-date 2019-04-02 20:36:26 +0200
+catalogue-date 2019-10-24 21:00:42 +0200
catalogue-license mit
catalogue-topics class dissertation
++++++ ucbthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/README new/doc/latex/ucbthesis/README
--- old/doc/latex/ucbthesis/README 2015-07-06 00:12:11.000000000 +0200
+++ new/doc/latex/ucbthesis/README 2019-07-21 00:54:02.000000000 +0200
@@ -1,14 +1,13 @@
-UCB Thesis Class Version 3.5, 2015-06-01
+UCB Thesis Class Version 3.6, 2019-07-19
-Copyright (C) 1988-2014 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
+Copyright (C) 1988-2019 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
This is a class file for producing Ph.D. dissertations and masters theses
conforming to the documents "Dissertation Filing Guide" and "Thesis
Filing Guide" produced by the UC Berkeley Graduate Division and available
-on the web at http://grad.berkeley.edu/academic-progress/dissertation/
-and http://grad.berkeley.edu/academic-progress/thesis/, respectively.
+on the web at https://grad.berkeley.edu/academic-progress/.
This class is currently based on the dissertation and thesis guides,
-dated May 2010 -- June 2015 and February 2011 -- June 2015, respectively.
+accessed in July 2019.
This class is a fork of the UCTHESIS document class (which is still being
maintained for use with older theses, but which should not be used for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/example/chap1.tex new/doc/latex/ucbthesis/example/chap1.tex
--- old/doc/latex/ucbthesis/example/chap1.tex 2014-04-15 23:30:23.000000000 +0200
+++ new/doc/latex/ucbthesis/example/chap1.tex 2019-07-21 00:54:02.000000000 +0200
@@ -55,7 +55,7 @@
ashy Bujumbura may assess, hadn't servitor. Wash, Doff, Algorithm.
\begin{table}
-\begin{center}
+\centering
\begin{tabular}{|c|c|c|}
\hline
1-2-3 & yes & no \\
@@ -65,7 +65,6 @@
Wordstar & no & no \\
\hline
\end{tabular}
-\end{center}
\caption{Pigeonhole sportsman grin historic stockpile.}
\end{table}
Davidson witting and grammatic. Hoofmark and Avogadro ionosphere.
@@ -75,7 +74,7 @@
Sony tomography.
\begin{table}
-\begin{center}
+\centering
\begin{tabular}{|ccccc|}
\hline
\textbf{Mitre} & \textbf{Enchantress} & \textbf{Hagstrom} &
@@ -89,8 +88,7 @@
Leavenworth & Hidden & Benedictine & Vivacious & Utensil \\
\hline
\end{tabular}
-\end{center}
-\caption{Utensil wallaby Juno titanium.}
+\caption{Utensil wallaby Juno titanium}
\end{table}
Aviv censor seventh, conjugal. Faceplate emittance borough airline.
@@ -122,6 +120,24 @@
known ashy Bujumbura may, assess, hadn't servitor. Wash, Doff, and
Algorithm.
+\begin{sidewaystable}
+\centering
+\begin{tabular}{|ccccc|}
+\hline
+\textbf{Mitre} & \textbf{Enchantress} & \textbf{Hagstrom} &
+\textbf{Atlantica} & \textbf{Martinez} \\
+\hline
+Arabic & Spicebush & Sapient & Chaos & Conquer \\
+Jail & Syndic & Prevent & Ballerina & Canker \\
+Discovery & Fame & Prognosticate & Corroborate & Bartend \\
+Marquis & Regal & Accusation & Dichotomy & Soprano \\
+Indestructible & Porterhouse & Sofia & Cavalier & Trance \\
+Leavenworth & Hidden & Benedictine & Vivacious & Utensil \\
+\hline
+\end{tabular}
+\caption{Abeam utensil wallaby Juno titanium}
+\end{sidewaystable}
+
\begin{itemize}
\item Davidson witting and grammatic. Jukes foundry mesh sting speak,
Gillespie, Birmingham Bentley. Hedgehog, swollen McGuire; gnat.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/example/thesis.tex new/doc/latex/ucbthesis/example/thesis.tex
--- old/doc/latex/ucbthesis/example/thesis.tex 2014-04-15 23:30:23.000000000 +0200
+++ new/doc/latex/ucbthesis/example/thesis.tex 2019-07-21 00:54:02.000000000 +0200
@@ -6,6 +6,7 @@
\documentclass{ucbthesis}
\usepackage{biblatex}
+\usepackage{rotating} % provides sidewaystable and sidewaysfigure
% To compile this file, run "latex thesis", then "biber thesis"
% (or "bibtex thesis", if the output from latex asks for that instead),
@@ -19,6 +20,8 @@
% be indented (like the others), then include this line:
% \usepackage{indentfirst}
+\addtolength{\abovecaptionskip}{\baselineskip}
+
\newtheorem{theorem}{Jibberish}
\bibliography{references}
@@ -38,6 +41,10 @@
\chair{Professor Richard Francis Sony}
\othermembers{Professor Roger Spam \\
Associate Professor Michael Chex}
+% For a co-chair who is subordinate to the \chair listed above
+% \cochair{Professor Benedict Francis Pope}
+% For two co-chairs of equal standing (do not use \chair with this one)
+% \cochairs{Professor Richard Francis Sony}{Professor Benedict Francis Pope}
\numberofmembers{3}
% Previous degrees are no longer to be listed on the title page.
% \prevdegrees{B.A. (University of Northern South Dakota at Hoople) 1978 \\
@@ -47,8 +54,8 @@
% \emphasis{Colloidal Telemetry}
% This is optional, and rare
% \jointinstitution{University of Western Maryland}
-% This is optional
-\campus{Berkeley}
+% This is optional (default is Berkeley)
+% \campus{Berkeley}
% For a masters thesis, replace the above \documentclass line with
% \documentclass[masters]{ucbthesis}
@@ -108,9 +115,9 @@
\include{chap1}
\include{chap2}
+\printbibliography
+
% \appendix
% \chapter{More Monticello Candidates}
-\printbibliography
-
\end{document}
Binary files old/doc/latex/ucbthesis/ucbthesis.pdf and new/doc/latex/ucbthesis/ucbthesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/ucbthesis.tex new/doc/latex/ucbthesis/ucbthesis.tex
--- old/doc/latex/ucbthesis/ucbthesis.tex 2015-07-06 00:12:11.000000000 +0200
+++ new/doc/latex/ucbthesis/ucbthesis.tex 2019-07-21 00:54:02.000000000 +0200
@@ -9,7 +9,7 @@
\title{The UCB Thesis Class}
\author{Paul Vojta\\Mathematics Department\\
\texttt{\href{mailto:vojta@math.berkeley.edu}{vojta@math.berkeley.edu}}}
-\date{Version 3.5\\June 1, 2015}
+\date{Version 3.6\\July 19, 2019}
\lstset{% settings taken from msu-thesis documentation
basicstyle=\ttfamily\small,
@@ -37,10 +37,9 @@
formatting requirements given in the \emph{Dissertation Filing Guide}
or the \emph{Thesis Filing Guide} (as appropriate) produced by the
UC Berkeley Graduate Division and available on the web at
-\url{http://grad.berkeley.edu/policies/}.
+\url{https://grad.berkeley.edu/academic-progress/}.
This version of the class is based on the dissertation and thesis guides,
-dated May 2010 -- December 2013 and February 2011 -- February 2014,
-respectively.\end{quote}}
+accessed in July 2019.\end{quote}}
\section{Introduction}
@@ -93,7 +92,7 @@
A (partial) list of thesis classes at other University of California
campuses is available on the web at
-\url{http://math.berkeley.edu/~vojta/ucthesis.html}.
+\url{https://math.berkeley.edu/~vojta/ucthesis.html}.
\section{Using the \pkg{ucbthesis} Class}
@@ -204,10 +203,9 @@
slick. The format of the front matter is specified quite explicitly
in the documents ``Dissertation Filing Guide'' and ``Thesis Filing Guide''
produced by the UC Berkeley Graduate Division and available on the web at
-\url{http://grad.berkeley.edu/policies/}.
+\url{https://grad.berkeley.edu/academic-progress/}.
The current version of the class is based on the dissertation and thesis
-guides, dated May 2010 -- July 2013 and February 2011 -- July 2013,
-respectively.
+guides, accessed in July 2019.
A complete example of the use of the front matter commands can be
found in the sample dissertation distributed with the class.
@@ -246,6 +244,8 @@
(e.g.~``Professor Michael A. Harrison'') \\
\lstinline|\\cochair| & Title and name of your committee co-chair
(use with \lstinline|\\chair|, if you have a co-chair). \\
+\lstinline|\\cochairs| & Titles and names of your (co-equal) committee
+ co-chairs (replaces \lstinline|\\chair| and \lstinline|\\cochair|). \\
\lstinline|\\othermembers| & The names of the other members of your committee
separated by linebreaks
(e.g.~\lstinline!Professor Susan L. Graham\\\\Professor Jim Pitman!) \\
@@ -397,4 +397,10 @@
Version 3.5 added support for printing the Designated Emphasis on the abstract
page (a Graduate Division requirement).
+Version 3.6 changed the font in the title from bold to regular and adjusted the
+spacing in the abstract page. It added \lstinline!\cochairs! to the
+documentation. In the example, it added a sideways table, added sample uses
+of \lstinline!\cochair! and \lstinline!\cochairs!, and moved the (commented-out)
+appendix to after the bibliography (as per requirements).
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucbthesis.doc.tlpobj new/tlpkg/tlpobj/ucbthesis.doc.tlpobj
--- old/tlpkg/tlpobj/ucbthesis.doc.tlpobj 2019-02-28 04:10:33.000000000 +0100
+++ new/tlpkg/tlpobj/ucbthesis.doc.tlpobj 2019-07-22 01:53:43.000000000 +0200
@@ -1,6 +1,6 @@
name ucbthesis.doc
category Package
-revision 37776
+revision 51690
shortdesc doc files of ucbthesis
relocated 1
docfiles size=51
++++++ ucbthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ucbthesis/ucbthesis.cls new/tex/latex/ucbthesis/ucbthesis.cls
--- old/tex/latex/ucbthesis/ucbthesis.cls 2015-07-06 00:12:11.000000000 +0200
+++ new/tex/latex/ucbthesis/ucbthesis.cls 2019-07-21 00:54:02.000000000 +0200
@@ -1,5 +1,5 @@
-%% ucbthesis.cls 2014-04-11
-%% Copyright (C) 1988-2014 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
+%% ucbthesis.cls 2019-07-19
+%% Copyright (C) 1988-2019 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,8 +20,8 @@
%%% ====================================================================
%%% @LaTeX-class-file{
%%% filename = "ucbthesis.cls",
-%%% version = "3.5",
-%%% date = "1 June 2015",
+%%% version = "3.6",
+%%% date = "19 July 2019",
%%% license = "LPPL",
%%% codetable = "ISO/ASCII",
%%% keywords = "LaTeX, ucbthesis",
@@ -111,6 +111,11 @@
%%% Version 3.5 adds the designated emphasis to the
%%% abstract (which is required).
%%%
+%%% Version 3.6 changes the title from bold font to
+%%% regular and adjusts the spacing in the abstract page.
+%%% It adds \cochairs to the documentation and makes some
+%%% fixes and adds some material to the example thesis.
+%%%
%%% A problem that some people have had is
%%% that you can't use \pagestyle{headings}
%%% and \markboth if you use \part. The solution
@@ -120,7 +125,7 @@
%%% ====================================================================
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ucbthesis}[2015/06/01 v3.5 University of California, Berkeley Thesis Class]
+\ProvidesClass{ucbthesis}[2019/07/19 v3.6 University of California, Berkeley Thesis Class]
% ****************************************
% * OPTIONS *
@@ -358,7 +363,7 @@
\def\emphasis#1{\gdef\@emphasis{#1}}
% The name of your UC Campus (e.g. Berkeley, Los Angeles)
-\def\@campus{Berkeley} % default value is Berkeley
+\def\@campus{Berkeley} % default value is Berkeley
\def\campus#1{\gdef\@campus{#1}}
% The alwayssingle environment ensures that front matter is always
@@ -398,7 +403,7 @@
\begin{center}
\fmfont
- \textbf{\@title}\par
+ \@title\par
\vspace{14pt minus 4pt}
by \par
{\@author}\par
@@ -505,7 +510,7 @@
\thispagestyle{empty}
\begin{center}
{\fmfont
-{\bfseries\@title}\par
+\@title\par
\vspace{1in}
Copyright \@degreeyear\par
by\par
@@ -521,40 +526,33 @@
% of the rest of the dissertation in Arabic. It requires definition
% of the \title, \author, \degree, \field, \campus, and \chair macros.
-\def\abstract{
-\begin{alwayssingle}
-% \pagestyle{simple}
-\thispagestyle{simple}
-\setcounter{page}{1}
-\begin{center}
-{\fmfont
-{\bfseries \abstractname}\par
-\vspace{.5in}
-\@title\par
-\vspace{.1in}
-by\par
-\vspace{.1in}
-\@author\par
-\vspace{.1in}
-{\@degree} in \@field\par
- \ifdefined\@emphasis
- and the Designated Emphasis in\par
- {\@emphasis}\par
- \fi
-\vspace{.1in}
-University of California, {\@campus}\par
-\vspace{.1in}
-{\@chair}, \@chairtitle
-\ifdefined\@cochair
- \par
- \vspace{.1in}
- {\@cochair}, Co-chair
-\fi}
-\vspace{.1in}
-\end{center}}
-
-\def\endabstract{\par\vfil\null\end{alwayssingle}
-}
+\renewenvironment{abstract}
+ {\begin{alwayssingle}
+ % \pagestyle{simple}
+ \thispagestyle{simple}
+ \setlength{\parindent}{0pt}
+ \setlength{\parskip}{\baselineskip}
+ \setcounter{page}{1}
+ \begin{center}
+ \abstractname \par
+ \@title\par
+ by\par
+ \@author\par
+ {\@degree} in \@field\par
+ \ifdefined\@emphasis
+ and the Designated Emphasis in\par
+ {\@emphasis}\par
+ \fi
+ University of California, {\@campus}\par
+ {\@chair}, \@chairtitle \par
+ \ifdefined\@cochair
+ {\@cochair}, Co-chair\par
+ \fi
+ \end{center}
+ \setlength{\parskip}{.6\baselineskip}
+ \vspace{.4\baselineskip}
+ }
+ {\par\end{alwayssingle}}
% The abstract is no longer signed (12/2009)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucbthesis.tlpobj new/tlpkg/tlpobj/ucbthesis.tlpobj
--- old/tlpkg/tlpobj/ucbthesis.tlpobj 2019-02-28 04:10:33.000000000 +0100
+++ new/tlpkg/tlpobj/ucbthesis.tlpobj 2019-07-22 01:53:43.000000000 +0200
@@ -1,6 +1,6 @@
name ucbthesis
category Package
-revision 37776
+revision 51690
shortdesc Thesis and dissertation class supporting UCB requirements
relocated 1
longdesc The class provides the necessary framework for electronic
@@ -10,7 +10,7 @@
runfiles size=6
RELOC/tex/latex/ucbthesis/ucbthesis.cls
catalogue-ctan /macros/latex/contrib/ucbthesis
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-20 07:42:59 +0200
catalogue-license lppl1.3
catalogue-topics dissertation
-catalogue-version 3.5
+catalogue-version 3.6