Hello community,
here is the log from the commit of package texlive-specs-w for openSUSE:Factory checked in at 2020-05-29 21:19:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-w (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-w.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-w"
Fri May 29 21:19:29 2020 rev:40 rq:806933 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.changes 2019-11-07 23:12:19.288258429 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-w.new.3606/texlive-specs-w.changes 2020-05-29 21:33:47.690010082 +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:
----
tetex.doc.tar.xz
tetex.tar.xz
tetex_scripts.dif
New:
----
tensind.doc.tar.xz
tensind.tar.xz
tex-nutshell.doc.tar.xz
texlive-ja.doc.tar.xz
texlive-scripts-extra.doc.tar.xz
texlive-scripts-extra.tar.xz
texlive-scripts-extra_scripts.dif
texlive-scripts.doc.tar.xz
texlive-scripts.tar.xz
texlive-scripts_scripts.dif
texonly.doc.tar.xz
texplate.doc.tar.xz
texplate.tar.xz
theanodidot.doc.tar.xz
theanodidot.tar.xz
theanomodern.doc.tar.xz
theanomodern.tar.xz
theanooldstyle.doc.tar.xz
theanooldstyle.tar.xz
thuaslogos.doc.tar.xz
thuaslogos.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-w.spec ++++++
++++ 12964 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-w.new.3606/texlive-specs-w.spec
++++++ tablvar.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tablvar/README.md new/doc/latex/tablvar/README.md
--- old/doc/latex/tablvar/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tablvar/README.md 2019-07-03 23:39:58.000000000 +0200
@@ -0,0 +1,37 @@
+# The tablvar package
+
+
+## Presentation
+
+- A complete and easy to use package for typesetting pretty tables of signs and variations according to French usage.
+- The syntax is similar to that of the array environment and uses intuitive position commands.
+- Arrows are automatically drawn (with PSTricks by default or TikZ in option).
+- Macros are provided for drawing double bars, single bars crossing the zeros, areas where the function is not defined or placing special values.
+- Several features of variation tables can be customized.
+
+
+## Documentation
+
+The documentation is in French.
+
+
+## Installation
+
+- run LaTeX on tablvar.ins, you obtain the file tablvar.sty,
+- if then you run LaTeX + dvips + ps2pdf on tablvar.dtx you get the file tablvar.pdf which is also in the archive,
+- put the files tablvar.sty and tablvar.pdf in your TeX Directory Structure.
+
+
+## License
+
+This file 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
+
+
+## Author
+
+Antoine Missier
+
+Email: antoine.missier@ac-toulouse.fr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tablvar/README.txt new/doc/latex/tablvar/README.txt
--- old/doc/latex/tablvar/README.txt 2018-12-24 23:15:05.000000000 +0100
+++ new/doc/latex/tablvar/README.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-
-PURPOSE
-
-A complete and easy to use package for typesetting pretty
-tables of signs and variations according to french usage.
-
-The syntax is similar to that on array environment
-and uses intuitive position commands to draw arrows
-automatically (with pstricks by default or tikz in option).
-
-Many functionnalities are provided for drawing twin bars,
-single bars crossing the zeros, areas where the function
-is not defined, placing special values,...
-
-The design of tables can be customized.
-
-The documentation is in french.
-
-
-EXAMPLE
-
-A simple example of a table with 4 intervals (and 4 arrows) :
-\[
-\begin{tablvar}{4}
- \hline
- x & -5 && -1 && 2 && 3 && 5 \\
- \hline
- f'(x) & & + & 0 & - & 0 & + & 0 & - & \\
- \hline
- \variations{ \mil{f(x)} & \bas{0} && \haut{2} && \bas{1} &&
- \haut{4} && \bas{-3} }
- \hline
-\end{tablvar}
-\]
-
-
-LICENSE
-
-This file 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
-
Binary files old/doc/latex/tablvar/tablvar.pdf and new/doc/latex/tablvar/tablvar.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tablvar.doc.tlpobj new/tlpkg/tlpobj/tablvar.doc.tlpobj
--- old/tlpkg/tlpobj/tablvar.doc.tlpobj 2019-02-28 04:06:40.000000000 +0100
+++ new/tlpkg/tlpobj/tablvar.doc.tlpobj 2019-07-04 01:54:01.000000000 +0200
@@ -1,8 +1,8 @@
name tablvar.doc
category Package
-revision 49493
+revision 51543
shortdesc doc files of tablvar
relocated 1
-docfiles size=50
- RELOC/doc/latex/tablvar/README.txt
+docfiles size=55
+ RELOC/doc/latex/tablvar/README.md
RELOC/doc/latex/tablvar/tablvar.pdf
++++++ tablvar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tablvar/tablvar.sty new/tex/latex/tablvar/tablvar.sty
--- old/tex/latex/tablvar/tablvar.sty 2018-11-21 23:00:23.000000000 +0100
+++ new/tex/latex/tablvar/tablvar.sty 2019-07-03 23:39:58.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 by Antoine Missier
+%% Copyright (C) 2018-2019 by Antoine Missier
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,15 +22,11 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{tablvar}
- [11/11/2018 v1.0 .dtx tablvar file]
-%% \DescribeEnv{tablvar}
-
-
-
+ [2019/07/01 v1.2 .dtx tablvar file]
\RequirePackage{array}
\RequirePackage{ifthen}
\RequirePackage{multido}
-\RequirePackage{colortbl}
+\RequirePackage{colortbl} % pour \ZIc
\newboolean{tikz}
\DeclareOption{tikz}{\setboolean{tikz}{true}}
@@ -45,7 +41,6 @@
\RequirePackage{pst-node}
}
-
\newlength{\intervalwidth}
\setlength{\intervalwidth}{2.5em} % largeur des "intervalles"
@@ -58,14 +53,13 @@
\newcounter{maxdiscont}
\setcounter{maxdiscont}{3} % nb max de discontinuités
-\newcommand{\tablvarstretch}{1.2}
+\newcommand{\tablvarstretch}{1.4}
\newlength{\tvbarrewidth}
\setlength{\tvbarrewidth}{0.5pt}
\definecolor{tvbarrecolor}{gray}{0.7}
-
\newcommand*{\fleche}[2]{
\ifthenelse{\boolean{tikz}}{
\tikz[remember picture,overlay]{\draw[->,>=stealth,
@@ -95,7 +89,7 @@
}
}
-\newcommand{\hachure}[2]{
+\newcommand*{\hachure}[2]{
\ifthenelse{\boolean{tikz}}{
\tikz[remember picture,overlay]{\fill[pattern=north east lines]
(#1) rectangle (#2);}
@@ -105,7 +99,6 @@
}
}
-
\newcounter{ligne} % numéro de ligne
\newcounter{noeud} % numéro du nœud
\newcounter{numvr} % numéro de la valeur remarquable
@@ -123,18 +116,17 @@
\newcounter{ZIstar} % numéro de ZI pour la commande \ZI*
\newcounter{ZIvarlignes} % dernière ligne des variations
-
\newcolumntype{i}[1]{>{\centering\arraybackslash $}p{#1}<{$}}
% nouveau type de colonne i pour les intervalles
\newcommand{\tablvarinit}{
+ \setlength{\extrarowheight}{0pt} % paramètre de l'extension array
\renewcommand{\arraystretch}{\tablvarstretch}
- % la redéfinition de \arraystretch sera locale dans tablvar
\setcounter{ligne}{0}
\setcounter{numvr}{0}
}
-\newcommand{\ZIinit}[1][\intervalwidth]{
+\newcommand*{\ZIinit}[1][\intervalwidth]{
\setlength{\ZIheight}{0pt}
\setlength{\ZIdepth}{0pt}
\setlength{\ZIwidth}{#1}
@@ -175,13 +167,12 @@
}
}{\end{array}}
-
\newcounter{loop@counter}
-\newcommand{\tvloop}[2]{%
+\newcommand{\varloop}[2]{%
\setcounter{loop@counter}{#1}
\addtocounter{loop@counter}{-1}% on boucle 1 fois de moins que #1
\ifthenelse{\value{loop@counter}=0}{}{%
- #2 \tvloop{\value{loop@counter}}{#2}%
+ #2 \varloop{\value{loop@counter}}{#2}%
}
}
@@ -192,7 +183,7 @@
\multido{\I=1+1}{\themaxdiscont}{\setcounter{discont\I}{0}}
\setcounter{ZIvarlignes}{#1} % nécessaire pour \ZIh
% boucle : on exécute le code #2 un nb de fois égal à (#1)-1
- \tvloop{#1}{%
+ \varloop{#1}{%
\setcounter{noeud}{0}\setcounter{numvr}{0}\setcounter{ZI}{0}
% à chaque boucle on réinitialise certains compteurs
\stepcounter{ligne} % le numéro de ligne est incrémenté
@@ -218,7 +209,6 @@
\\ % dernier retour ligne du tableau
}
-
\newcommand*{\@pos}[3][c]{
\stepcounter{noeud}
\ifthenelse{\theligne=#2}{
@@ -238,7 +228,6 @@
\newcommand*{\vdecal}[2]{\smash{\raisebox{#1}{$#2$}}}
-
\newcommand*{\bb}{\kern1pt\vrule\kern1pt\vrule\kern1pt}
\newcommand*{\barre}[1][]{\makebox[0pt]{$#1$}
@@ -256,7 +245,7 @@
\newsavebox{\@tvlbox}
\newsavebox{\@tvrbox}
-\newcommand{\bblim}[4]{
+\newcommand*{\bblim}[4]{
\sbox{\@tvlbox}{$#2$}
\sbox{\@tvrbox}{$#4$}
\ifdim \wd\@tvlbox > \wd\@tvrbox
@@ -279,7 +268,6 @@
}
}
-
\newcommand{\ZIc}{\discont \cellcolor[gray]{0.7}}
\newcommand*{\@ZI}[1][0pt]{%
@@ -308,7 +296,7 @@
\stepcounter{ZIstar}
}
-\newcommand{\ZIh}{\@ifstar{\@@ZI}{\@ZI}}
+\newcommand*{\ZIh}{\@ifstar{\@@ZI}{\@ZI}}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tablvar.tlpobj new/tlpkg/tlpobj/tablvar.tlpobj
--- old/tlpkg/tlpobj/tablvar.tlpobj 2019-02-28 04:06:40.000000000 +0100
+++ new/tlpkg/tlpobj/tablvar.tlpobj 2019-07-04 01:54:01.000000000 +0200
@@ -1,21 +1,21 @@
name tablvar
category Package
-revision 49493
+revision 51543
shortdesc Typesetting pretty tables of signs and variations according to French usage
relocated 1
-longdesc tablvar is a complete and easy to use package for typesetting
+longdesc This is a complete and easy-to-use package for typesetting
longdesc pretty tables of signs and variations according to French
-longdesc usage. The syntax is similar to that on array environment and
-longdesc uses intuitive position commands to draw arrows automatically
-longdesc (with PSTricks by default or TikZ in option). Many
-longdesc functionalities are provided for drawing twin bars, single bars
-longdesc crossing the zeros, areas where the function is not defined,
-longdesc placing special values,... The design of tables can be
+longdesc usage. The syntax is similar to that of the array environment
+longdesc and uses intuitive position commands. Arrows are drawn
+longdesc automatically (using PSTricks by default or TikZ as an option).
+longdesc Macros are provided for drawing twin bars, single bars crossing
+longdesc the zeros, areas where the function is not defined, or placing
+longdesc special values. Several features of the variation tables can be
longdesc customized.
runfiles size=3
RELOC/tex/latex/tablvar/tablvar.sty
catalogue-ctan /macros/latex/contrib/tablvar
-catalogue-date 2018-12-25 09:41:14 +0100
+catalogue-date 2019-07-02 22:29:19 +0200
catalogue-license lppl1.3
catalogue-topics maths-tabvar maths french
-catalogue-version 1.0
+catalogue-version 1.2
++++++ tabriz-thesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/README new/doc/xelatex/tabriz-thesis/README
--- old/doc/xelatex/tabriz-thesis/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/README 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,30 @@
+The tabriz-thesis class
+-----------------------
+
+This class file has been written for the University of Tabriz students to
+easily write their projects, theses, and dissertations.
+
+Author: Vahid Damanafshan
+Copyright (C) 2011-2013 by Vahid Damanafshan http://www.damanafshan.ir
+
+
+
+To run the root file, you must have the XB Niloofar, IranNastaliq,
+and the Yas fonts on your computer and run XeLaTeX on the file.
+
+
+-------------------------------------------------------------------
+This file 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/06/01 or later.
+
+This work has the LPPL maintenance status "author-maintained".
+
+-------------------------------------------------------------------
+To get help, please explore http://forum.parsilatex.com
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/appendix1.tex new/doc/xelatex/tabriz-thesis/appendix1.tex
--- old/doc/xelatex/tabriz-thesis/appendix1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/appendix1.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,12 @@
+\chapter{توپولوژیهای روی فضاهای اندازهها}
+\thispagestyle{empty}
+\section{ توپولوژیِ مبهمِ روی فضای اندازهها}
+چندین توپولوژی وجود دارد که میتوان آنها را برای مجموعه اندازهها انتخاب کرد. یک شرط قابل قبول و حداقلی این است که اگر تور
+ $ (m_{i})_{i\in I} $
+به
+$ m $
+همگرا باشد آنگاه باید در
+$\mathbb{R} $
+داشته باشیم
+$\int dm_{i}\to \int fdm $.
+برای مطالعه بیشتر، میتوان به \cite{mainarticle} مراجعه کرد. از طرف دیگر ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/chapter1.tex new/doc/xelatex/tabriz-thesis/chapter1.tex
--- old/doc/xelatex/tabriz-thesis/chapter1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/chapter1.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,235 @@
+\chapter{راهنمای استفاده از کلاس}
+\thispagestyle{empty}
+\section{مقدمه}
+حروفچینی پروژه کارشناسی، پایاننامه یا رساله یکی از موارد پرکاربرد استفاده از زیپرشین است. از طرفی، یک پروژه، پایاننامه یا رساله، احتیاج به تنظیمات زیادی از نظر صفحهآرایی دارد که ممکن است برای
+یک کاربر مبتدی، مشکل باشد. به همین خاطر، برای راحتی کار کاربر، کلاس حاضر با نام
+ \LRE{\verb!tabriz-thesis!}
+ برای حروفچینی پروژهها، پایاننامهها و رسالههای دانشگاه تبریز با استفاده از نرمافزار زیپرشین، آماده شده است. این فایل به
+گونهای طراحی شده است که کلیه خواستههای مورد نیاز مدیریت تحصیلات تکمیلی دانشگاه تبریز را برآورده میکند و نیز، حروفچینی بسیاری
+از قسمتهای آن، به طور خودکار انجام میشود.
+
+کلیه فایلهای لازم برای حروفچینی با کلاس گفته شده، داخل پوشهای به نام
+ \LRE{\verb!tabriz-thesis!}
+ قرار داده شده است. توجه داشته باشید که برای استفاده از این کلاس باید فونتهای
+\LRE{\verb!XB Niloofar!}،
+ \verb!Yas!
+ و
+ \verb!IranNastaliq!
+ روی سیستم شما نصب شده باشد.
+\section{این همه فایل؟!}\label{sec2}
+از آنجایی که یک پایاننامه یا رساله، یک نوشته بلند محسوب میشود، لذا اگر همه تنظیمات و مطالب پایاننامه را داخل یک فایل قرار بدهیم، باعث شلوغی
+و سردرگمی میشود. به همین خاطر، قسمتهای مختلف پایاننامه یا رساله داخل فایلهای جداگانه قرار گرفته است. مثلاً تنظیمات پایهای کلاس، داخل فایل
+\LRE{\verb!tabriz-thesis.cls!}،
+تنظیمات قابل تغییر توسط کاربر، داخل
+\verb!commands.tex!،
+قسمت مشخصات فارسی پایاننامه، داخل
+\LRE{\verb!fa-title.tex!}،
+مطالب فصل اول، داخل
+\verb!chapter1!
+و ... قرار داده شده است. نکته مهمی که در اینجا وجود دارد این است که از بین این فایلها، فقط فایل
+\LRE{\verb!tabriz-thesis.tex!}
+قابل اجرا است. یعنی بعد از تغییر فایلهای دیگر، برای دیدن نتیجه تغییرات، باید این فایل را اجرا کرد. بقیه فایلها به این فایل، کمک میکنند تا بتوانیم خروجی کار را ببینیم. اگر به فایل
+\LRE{\verb!tabriz-thesis.tex!}
+دقت کنید، متوجه میشوید که قسمتهای مختلف پایاننامه، توسط دستورهایی مانند
+\verb!input!
+و
+\verb!include!
+به فایل اصلی، یعنی
+\LRE{\verb!tabriz-thesis.tex!}
+معرفی شدهاند. بنابراین، فایلی که همیشه با آن سروکار داریم، فایل
+\LRE{\verb!tabriz-thesis.tex!}
+است.
+در این فایل، فرض شده است که پایاننامه یا رساله، از ۳ فصل و یک پیوست، تشکیل شده است. با این حال، اگر
+ پایاننامه یا رساله، بیشتر از ۳ فصل و یک پیوست است، باید خودتان فصلهای بیشتر را به این فایل، اضافه کنید. این کار، بسیار ساده است. فرض کنید بخواهید یک فصل دیگر هم به پایاننامه، اضافه کنید. برای این کار، کافی است یک فایل با نام
+\verb!chapter4!
+و با پسوند
+\verb!.tex!
+بسازید و آن را داخل پوشه
+\LRE{\verb!tabriz-thesis!}
+قرار دهید و سپس این فایل را با دستور
+\verb!\include{chapter4}!
+داخل فایل
+\LRE{\verb!tabriz-thesis.tex!}
+و بعد از دستور
+\verb!\include{chapter3}!
+ قرار دهید.
+\section{از کجا شروع کنم؟}
+قبل از هر چیز، بدیهی است که باید یک توزیع تِک مناسب مانند
+\verb!Live TeX!
+و یک ویرایشگر تِک مانند
+\verb!Texmaker!
+را روی سیستم خود نصب کنید. نسخه بهینه شده \verb!Texmaker! را میتوانید از سایت
+ \href{http://www.parsilatex.com}{پارسیلاتک}%
+\LTRfootnote{\url{http://www.parsilatex.com}}
+ و \verb!Live TeX! را هم میتوانید از
+ \href{http://www.tug.org/texlive}{سایت رسمی آن}%
+\LTRfootnote{\url{http://www.tug.org/texlive}}
+ دانلود کنید.
+
+در مرحله بعد، سعی کنید که یک پشتیبان از پوشه
+\LRE{\verb!tabriz-thesis!}
+ بگیرید و آن را در یک جایی از هارددیسک سیستم خود ذخیره کنید تا در صورت خراب کردن فایلهایی که در حال حاضر، با آنها کار میکنید، همه چیز را از
+ دست ندهید.
+
+ حال اگر نوشتن \پ اولین تجربه شما از کار با لاتک است، توصیه میشود که یکبار به طور سرسری، کتاب «%
+\href{http://www.tug.ctan.org/tex-archive/info/lshort/persian/lshort.pdf}{مقدمهای نه چندان کوتاه بر
+\lr{\LaTeXe}}\LTRfootnote{\url{http://www.tug.ctan.org/tex-archive/info/lshort/persian/lshort.pdf}}»
+ ترجمه دکتر مهدی امیدعلی، عضو هیات علمی دانشگاه شاهد را مطالعه کنید. این کتاب، کتاب بسیار کاملی است که خیلی از نیازهای شما در ارتباط با حروفچینی را برطرف میکند.
+
+
+بعد از موارد گفته شده، فایل
+\LRE{\verb!tabriz-thesis.tex!}
+و
+\LRE{\verb!fa-title!}
+را باز کنید و مشخصات پایاننامه خود مثل نام، نام خانوادگی، عنوان پایاننامه و ... را جایگزین مشخصات موجود در فایل
+\LRE{\verb!fa-title!}
+ کنید. دقت داشته باشید که نیازی نیست
+نگران چینش این مشخصات در فایل پیدیاف خروجی باشید. فایل
+\LRE{\verb!tabriz-thesis.cls!}
+همه این کارها را به طور خودکار برای شما انجام میدهد. در ضمن، موقع تغییر دادن دستورهای داخل فایل
+\LRE{\verb!fa-title!}
+ کاملاً دقت کنید. این دستورها، خیلی حساس هستند و ممکن است با یک تغییر کوچک، موقع اجرا، خطا بگیرید. برای دیدن خروجی کار، فایل
+\LRE{\verb!fa-title!}
+ را
+\verb!Save!،
+(نه
+\verb!As Save!)
+کنید و بعد به فایل
+\LRE{\verb!tabriz-thesis.tex!}
+برگشته و آن را اجرا کنید. حال اگر میخواهید مشخصات انگلیسی \پ را هم عوض کنید، فایل
+\LRE{\verb!en-title!}
+را باز کنید و مشخصات داخل آن را تغییر دهید.%
+\RTLfootnote{
+برای نوشتن پروژه کارشناسی، نیازی به وارد کردن مشخصات انگلیسی پروژه نیست. بنابراین، این مشخصات، به طور خودکار،
+نادیده گرفته میشود.
+}
+ در اینجا هم برای دیدن خروجی، باید این فایل را
+\verb!Save!
+کرده و بعد به فایل
+\LRE{\verb!tabriz-thesis.tex!}
+برگشته و آن را اجرا کرد.
+
+برای راحتی بیشتر،
+فایل
+\LRE{\verb!tabriz-thesis.cls!}
+طوری طراحی شده است که کافی است فقط یکبار مشخصات \پ را وارد کنید. هر جای دیگر که لازم به درج این مشخصات باشد، این مشخصات به طور خودکار درج میشود. با این حال، اگر مایل بودید، میتوانید تنظیمات موجود را تغییر دهید. توجه داشته باشید که اگر کاربر مبتدی هستید و یا با ساختار فایلهای
+\verb!cls!
+ آشنایی ندارید، به هیچ وجه به این فایل، یعنی فایل
+\LRE{\verb!tabriz-thesis.cls!}
+دست نزنید.
+
+نکته دیگری که باید به آن توجه کنید این است که در فایل
+\LRE{\verb!tabriz-thesis.cls!}،
+سه گزینه به نامهای
+\verb!bsc!،
+\verb!msc!
+و
+\verb!phd!
+برای تایپ پروژه، پایاننامه و رساله،
+طراحی شده است. بنابراین اگر قصد تایپ پروژه کارشناسی، پایاننامه یا رساله را دارید،
+ در فایل
+\LRE{\verb!tabriz-thesis.tex!}
+باید به ترتیب از گزینههای
+\verb!bsc!،
+\verb!msc!
+و
+\verb!phd!
+استفاده کنید. با انتخاب هر کدام از این گزینهها، تنظیمات مربوط به آنها به طور خودکار، اعمل میشود.
+\section{مطالب \پ را چطور بنویسم؟}
+\subsection{نوشتن فصلها}
+همانطور که در بخش \ref{sec2} گفته شد، برای جلوگیری از شلوغی و سردرگمی کاربر در هنگام حروفچینی، قسمتهای مختلف \پ از جمله فصلها، در فایلهای جداگانهای قرار داده شدهاند.
+بنابراین، اگر میخواهید مثلاً مطالب فصل ۱ را تایپ کنید، باید فایلهای
+\LRE{\verb!tabriz-thesis.tex!}
+و
+\verb!chapter1!
+را باز کنید و محتویات داخل فایل
+\verb!chapter1!
+را پاک کرده و مطالب خود را تایپ کنید. توجه کنید که همانطور که قبلاً هم گفته شد، تنها فایل قابل اجرا، فایل
+\LRE{\verb!tabriz-thesis.tex!}
+است. لذا برای دیدن حاصل (خروجی) فایل خود، باید فایل
+\verb!chapter1!
+را
+\verb!Save!
+کرده و سپس فایل
+\LRE{\verb!tabriz-thesis.tex!}
+را اجرا کنید. یک نکته بدیهی که در اینجا وجود دارد، این است که لازم نیست که فصلهای \پ را به ترتیب تایپ کنید. میتوانید ابتدا مطالب فصل ۳ را تایپ کنید و سپس مطالب فصل ۱ را تایپ کنید.
+
+نکته بسیار مهمی که در اینجا باید گفته شود این است که سیستم \lr{\TeX}، محتویات یک فایل تِک را به ترتیب پردازش میکند. به عنوان مثال، اگه فایلی، دارای ۴ خط دستور باشد، ابتدا خط ۱، بعد خط ۲، بعد خط ۳ و در آخر، خط ۴ پردازش میشود. بنابراین، اگر مثلاً مشغول تایپ مطالب فصل ۳ هستید، بهتر است
+که دو دستور
+\verb!\include{chapter1}!
+و
+\verb!\include{chapter2}!
+را در فایل
+\LRE{\verb!tabriz-thesis.tex!}،
+غیرفعال%
+\RTLfootnote{
+برای غیرفعال کردن یک دستور، کافی است پشت آن، یک علامت
+\%
+ بگذارید.
+}
+ کنید. زیرا در غیر این صورت، ابتدا مطالب فصل ۱ و ۲ پردازش شده (که به درد ما نمیخورد؛ چون ما میخواهیم خروجی فصل ۳ را ببینیم) و سپس مطالب فصل ۳ پردازش میشود و این کار باعث طولانی شدن زمان اجرا میشود. زیرا هر چقدر حجم فایل اجرا شده، بیشتر باشد، زمان بیشتری هم برای اجرای آن، صرف میشود.
+\subsection{مراجع}
+برای وارد کردن مراجع \پ خود، کافی است فایل
+\verb!references.tex!
+را باز کرده و مراجع خود را مانند مراجع داخل آن، وارد کنید. اگر کاربر حرفهای تِک هستید، پیشنهاد میشود که از \lr{Bib\TeX} برای
+وارد کردن مراجع استفاده کنید. نکتهای که باید به آن توجه کنید این است که در نسخههای قدیمی زیپرشین،
+قسمت مراجع، حاشیههای نامناسبی ایجاد میکرد. لذا در نسخههای جدید، این حاشیهها اصلاح شده و به خاطر همین، چند دستور جدید، جایگزین شده است. بنابراین، اگه هنوز از نسخههای قدیمی زیپرشین استفاده میکنید، ممکن است هنگام پردازش قسمت مراجع، با خطا مواجه شوید. برای اطلاع از این دستورها، میتوانید به تالار گفتگوی پارسیلاتک و یا راهنمای بسته
+\verb!bidi!
+مراجعه کنید.
+\subsection{واژهنامه فارسی به انگلیسی و برعکس}
+برای وارد کردن واژهنامه فارسی به انگلیسی و برعکس، چنانچه کاربر مبتدی هستید، بهتر است مانند روش بکار رفته در فایلهای
+\verb!dicfa2en!
+و
+\verb!dicen2fa!
+عمل کنید. اما چنانچه کاربر پیشرفته هستید، بهتر است از بسته
+\verb!glossaries!
+استفاده کنید. راهنمای این بسته را میتوانید به راحتی و با یک جستجوی ساده در اینترنت پیدا کنید.
+\subsection{نمایه}
+برای وارد کردن نمایه، باید از
+\verb!xindy!
+استفاده کنید. زیرا
+\verb!MakeIndex!
+با حروف «گ»، «چ»، «پ»، «ژ» و «ک» مشکل دارد و ترتیب الفبایی این حروف را رعایت نمیکند. همچنین، فاصله بین هر گروه از کلمات در
+\verb!MakeIndex!،
+به درستی رعایت نمیشود که باعث زشت شدن حروفچینی این قسمت میشود. راهنمای چگونگی کار با
+\verb!xindy!
+را میتوانید در تالار گفتگوی پارسیلاتک، پیدا کنید.
+\section{اگر سوالی داشتم، از کی بپرسم؟}
+برای پرسیدن سوالهای خود در مورد حروفچینی با زیپرشین، میتوانید به
+ \href{http://forum.parsilatex.com}{تالار گفتگوی پارسیلاتک}%
+\LTRfootnote{\url{http://www.forum.parsilatex.com}}
+مراجعه کنید. شما هم میتوانید روزی به سوالهای دیگران در این تالار، جواب بدهید.
+
+در ادامه، برای فهم بیشتر مطالب، چند تعریف، قضیه و مثال آورده شده است!
+\begin{definition}
+مجموعه همه ارزیابیهای (پیوسته) روی $(X,\tau)$، دامنه توانی احتمالی
+\index{دامنه توانی احتمالی}
+$ X $
+نامیده میشود.
+\end{definition}
+\begin{theorem}[باناخ-آلااغلو]
+\index{قضیه باناخ-آلااغلو}
+اگر $ V $ یک همسایگی $ 0 $ در فضای برداری
+\index{فضای!برداری}
+ توپولوژیکی $ X $ باشد و
+\begin{equation}\label{eq1}
+K=\left\lbrace \Lambda \in X^{*}:|\Lambda x|\leqslant 1 ; \ \forall x\in V\right\rbrace,
+\end{equation}
+آنگاه $ K $، ضعیف*-فشرده است که در آن، $ X^{*} $ دوگان
+\index{فضای!دوگان}
+ فضای برداری توپولوژیکی $ X $ است به طوری که عناصر آن، تابعیهای
+خطی پیوسته
+\index{تابعی خطی پیوسته}
+ روی $X$ هستند.
+\end{theorem}
+تساوی \eqref{eq1} یکی از مهمترین تساویها در آنالیز تابعی است که در ادامه، به وفور از آن استفاده میشود.
+\begin{example}
+برای هر فضای مرتب، گردایه
+$$U:=\left\lbrace U\in O: U=\uparrow U\right\rbrace $$
+از مجموعههای بالایی باز، یک توپولوژی تعریف میکند که از توپولوژی اصلی، درشتتر است.
+\end{example}
+حال تساوی
+\begin{equation}\label{eq2}
+\sum_{n=1}^{+\infty} 3^{n}x+70x=\int_{1}^{n}8nx+\exp{(2nx)}
+\end{equation}
+را در نظر بگیرید. با مقایسه تساوی \eqref{eq2} با تساوی \eqref{eq1} میتوان نتیجه گرفت که ...
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/chapter2.tex new/doc/xelatex/tabriz-thesis/chapter2.tex
--- old/doc/xelatex/tabriz-thesis/chapter2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/chapter2.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,9 @@
+\chapter{فضاهای فشرده پایدار و فضاهای مرتب فشرده}
+\thispagestyle{empty}
+\section{فضاهای فشرده پایدار}
+یک فضای توپولوژیک جزئاً مرتب (یا به طور خلاصه، فضای مرتب)، از دیدگاه آبرامسکی
+\cite{abramsky2}،
+مجموعهای مانند $ X $ همراه
+با یک توپولوژی $ \mathcal{O} $ و یک ترتیب $ \leq $ است به طوری که گراف ترتیب در $X\times X $ بسته باشد. بنابراین ...
+\section{فضاهای مرتب فشرده}
+در این بخش به بیان ...
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/chapter3.tex new/doc/xelatex/tabriz-thesis/chapter3.tex
--- old/doc/xelatex/tabriz-thesis/chapter3.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/chapter3.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,6 @@
+\chapter{اندازهها و ارزیابیها}
+\thispagestyle{empty}
+\section{اندازهها و تابعیهای خطی مثبت روی $\mathrm{C(X)}$}
+فرض کنید $X$ یک فضای توپولوژیکی روی ...
+\section{تابعیهای خطی}
+در این بخش ...
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/dicen2fa.tex new/doc/xelatex/tabriz-thesis/dicen2fa.tex
--- old/doc/xelatex/tabriz-thesis/dicen2fa.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/dicen2fa.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,15 @@
+\chapter*{واژهنامه انگلیسی به فارسی}\markboth{واژهنامه انگلیسی به فارسی}{واژهنامه انگلیسی به فارسی}
+\addcontentsline{toc}{chapter}{واژهنامه انگلیسی به فارسی}
+\thispagestyle{empty}
+
+\persiangloss{مجموعه جزئاً مرتب کامل جهتدار}{Dcpo}
+\persiangloss{فضای تابع}{Function Space}
+\persiangloss{اندازه }{Measure}
+\persiangloss{مرتب}{Ordered}
+\persiangloss{دامنهتوانی}{Powerdomain}
+\persiangloss{احتمالی}{Probabilistic}
+\persiangloss{قطعهبرنامه}{Program Fragment}
+\persiangloss{دامنه معنایی}{Semantic Domain}
+\persiangloss{پایدار}{Stably}
+\persiangloss{ارزیابی}{Valuation}
+\persiangloss{توپولوژی ضعیف}{Weak Topology}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/dicfa2en.tex new/doc/xelatex/tabriz-thesis/dicfa2en.tex
--- old/doc/xelatex/tabriz-thesis/dicfa2en.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/dicfa2en.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,15 @@
+\chapter*{واژهنامه فارسی به انگلیسی}\markboth{واژهنامه فارسی به انگلیسی}{واژهنامه فارسی به انگلیسی}
+\addcontentsline{toc}{chapter}{واژهنامه فارسی به انگلیسی}
+\thispagestyle{empty}
+
+\englishgloss{Probabilistic}{احتمالی}
+\englishgloss{Valuation}{ارزیابی}
+\englishgloss{Measure}{اندازه }
+\englishgloss{Stably}{پایدار}
+\englishgloss{Weak Topology}{توپولوژی ضعیف}
+\englishgloss{Powerdomain}{دامنهتوانی}
+\englishgloss{Function Space}{فضای تابع}
+\englishgloss{Semantic Domain}{دامنه معنایی}
+\englishgloss{Program Fragment}{قطعهبرنامه}
+\englishgloss{Dcpo}{مجموعه جزئاً مرتب کامل جهتدار}
+\englishgloss{Ordered}{مرتب}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/en-title.tex new/doc/xelatex/tabriz-thesis/en-title.tex
--- old/doc/xelatex/tabriz-thesis/en-title.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/en-title.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,23 @@
+% در این فایل، عنوان پایاننامه، مشخصات خود و چکیده پایاننامه را به انگلیسی، وارد کنید.
+% توجه داشته باشید که جدول حاوی مشخصات پروژه/پایاننامه/رساله، به طور خودکار، رسم میشود.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\baselineskip=.6cm
+\begin{latin}
+\latinuniversity{University of Tabriz}
+\latinfaculty{Faculty Of Mathematical Sciences}
+\latinsubject{Pure Mathematics}
+\latinfield{Mathematical Analysis}
+\latintitle{Writing Projects, Theses, and Dissertations Using \textsf{tabriz-thesis} Class}
+\firstlatinsupervisor{First Supervisor}
+%\secondlatinsupervisor{Second Supervisor}
+\firstlatinadvisor{First Advisor}
+%\secondlatinadvisor{Second Advisor}
+\latinname{Vahid}
+\latinsurname{Damanafshan}
+\latinthesisdate{2011}
+\latinkeywords{Probabilistic powerdomain; Stably compact space; Valuation}
+\en-abstract{
+This thesis studies on writing projects, theses and dissertations using \textsf{tabriz-thesis} Class. It ...
+}
+\latinvtitle
+\end{latin}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/fa-title.tex new/doc/xelatex/tabriz-thesis/fa-title.tex
--- old/doc/xelatex/tabriz-thesis/fa-title.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/fa-title.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,77 @@
+% در این فایل، عنوان پایاننامه، مشخصات خود، متن تقدیمی، ستایش، سپاسگزاری و چکیده پایاننامه را به فارسی، وارد کنید.
+% توجه داشته باشید که جدول حاوی مشخصات پروژه/پایاننامه/رساله و همچنین، مشخصات داخل آن، به طور خودکار، درج میشود.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% دانشگاه خود را وارد کنید
+\university{تبریز}
+% دانشکده، آموزشکده و یا پژوهشکده خود را وارد کنید
+\faculty{دانشکده علوم ریاضی}
+% گروه آموزشی خود را وارد کنید
+\department{گروه ریاضی محض}
+% نام رشته تحصیلی خود را وارد کنید
+\subject{ریاضی محض}
+% گرایش خود را وارد کنید
+\field{آنالیز ریاضی}
+% عنوان پایاننامه را وارد کنید
+\title{نوشتن پروژه، پایاننامه و رساله با استفاده از کلاس
+\lr{\textsf{tabriz-thesis}}}
+% نام استاد(ان) راهنما را وارد کنید
+\firstsupervisor{استاد راهنمای اول}
+%\secondsupervisor{استاد راهنمای دوم}
+% نام استاد(دان) مشاور را وارد کنید. چنانچه استاد مشاور ندارید، دستور پایین را غیرفعال کنید.
+\firstadvisor{استاد مشاور اول}
+%\secondadvisor{استاد مشاور دوم}
+% نام پژوهشگر را وارد کنید
+\name{وحید}
+% نام خانوادگی پژوهشگر را وارد کنید
+\surname{دامنافشان}
+% تاریخ پایاننامه را وارد کنید
+\thesisdate{۱۳۹۰}
+% کلمات کلیدی پایاننامه را وارد کنید
+\keywords{ارزیابی، دامنهتوانی احتمالی، فضای فشرده پایدار}
+% چکیده پایاننامه را وارد کنید
+\fa-abstract{
+این پایاننامه، به بحث در مورد نوشتن پروژه، پایاننامه و رساله با استفاده از کلاس
+\lr{\textsf{tabriz-thesis}}
+میپردازد. در این پایاننامه سعی شده است که ...
+}
+\vtitle
+% چنانچه مایل به چاپ صفحات «تقدیم»، «نیایش» و «سپاسگزاری» در خروجی نیستید، خطهای زیر را با گذاشتن ٪ در ابتدای آنها غیرفعال کنید.
+ % پایاننامه خود را تقدیم کنید!
+\begin{acknowledgementpage}
+
+\vspace{4cm}
+
+{\nastaliq
+{\Huge
+ تقدیم به همه آنهایی که
+\vspace{1.5cm}
+
+\hspace{3cm}
+می خواهند بیشتر بدانند
+}}
+\end{acknowledgementpage}
+\newpage
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\thispagestyle{empty}
+% سپاسگزاری
+\noindent{\nastaliq
+سپاسگزاری...
+}
+\\[2cm]
+سپاس خداوندگار حکیم را که با لطف بیکران خود، آدمی را زیور عقل آراست.
+
+
+در آغاز وظیفه خود میدانم از زحمات بیدریغ استاد راهنمای خود، جناب آقای دکتر ...، صمیمانه تشکر
+و قدردانی کنم که قطعاً بدون
+راهنماییهای ارزنده ایشان، این مجموعه به انجام نمیرسید.
+
+از جناب آقای دکتر ... که زحمت مطالعه و مشاوره این رساله
+را تقبل فرمودند و
+در آماده سازی این رساله، به نحو احسن اینجانب را مورد راهنمایی قرار دادند، کمال امتنان را دارم.
+
+همچنین لازم میدانم از پدید آورندگان بسته زیپرشین، مخصوصاً جناب آقای وفا خلیقی، که این پایاننامه با استفاده از این بسته، آماده شده است و نیز از آقای دکتر مرتضی فغفوری و آقای محمود امینطوسی به خاطر پاسخگویی به سوالاتم در مورد \lr{\LaTeX}، کمال قدردانی را داشته باشم.
+
+ در پایان، بوسه میزنم بر دستان خداوندگاران مهر و مهربانی، پدر و مادر عزیزم و بعد از خدا، ستایش میکنم وجود مقدسشان را و تشکر میکنم از برادران عزیزم به پاس عاطفه سرشار و گرمای امیدبخش وجودشان، که در این سردترین روزگاران، بهترین پشتیبان من بودند.
+% با استفاده از دستور زیر، امضای شما، به طور خودکار، درج میشود.
+\signature
+\newpage\clearpage
\ No newline at end of file
Binary files old/doc/xelatex/tabriz-thesis/logo.jpg and new/doc/xelatex/tabriz-thesis/logo.jpg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/references.tex new/doc/xelatex/tabriz-thesis/references.tex
--- old/doc/xelatex/tabriz-thesis/references.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/references.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,65 @@
+% مراجع خود را در این قسمت وارد کنید.
+% دستوری برای کوچک کردن اندازه فونتها
+\small
+% شروع محیط مراجع
+\begin{thebibliography}{9}
+\bibitem{semi}
+دامنافشان، وحید، \textbf{دامنه توانی احتمالی برای فضاهای فشرده پایدار با استفاده از فضاهای مرتب فشرده}، سمینار کارشناسی ارشد، دانشگاه تبریز، تبریز، ۱۳۸۸.
+\begin{LTRitems}
+\resetlatinfont
+
+\bibitem{abramsky1}
+S. Abramsky, {\em Domain theory in logical form}, Ann. Pure Applied Logic 51 (1991) 1–77.
+
+\bibitem{abramsky2}
+S. Abramsky, A. Jung, {\em Domain theory}, in: S. Abramsky, D.M. Gabbay, T.S.E. Maibaum (Eds.), Handbook of
+Logic in Computer Science, Vol. 3, Clarendon Press, Oxford, 1994, pp. 1–68.
+
+\bibitem{aliprantis}
+C.D. Aliprantis and O. Burkinshaw, {\em Principles of Real Analysis}. Academic Press.
+
+\bibitem{alvarez1}
+M. Alvarez-Manilla, {\em Measure theoretic results for continuous valuations on partially ordered spaces}, Ph.D.
+thesis, Imperial College, University of London, 2001.
+
+\bibitem{alvarez2}
+M. Alvarez-Manilla, A. Edalat, N. Saheb-Djahromi, {\em An extension result for continuous valuations}, J. London
+Math. Soc. 61 (2000) 629–640.
+
+\bibitem{mainarticle}
+M. Alvarez-Manilla, A. Jung, K. Keimel, {\em The probabilistic powerdomain for stably compact
+spaces}, Theoretical Computer Science 328 (2004) 221 – 244.
+
+\bibitem{birkhoff}
+G. Birkhoff, {\em Lattice Theory}, 3rd Edition, AMS Colloq. Publication, Vol. 25, American Mathematical Society,
+Providence, 1967.
+
+\bibitem{choq3}
+G. Choquet, {\em Lectures on Analysis}, Vol. 1, W. A. Benjamin Inc., London, 1969.
+
+\bibitem{desh}
+J. Desharnais, V. Gupta, R. Jagadeesan, P. Panangaden, {\em Metrics for labeled Markov systems}, in: J.C.M.
+Baeten, S. Mauw (Eds.), Proc. 10th Internat. Conf. on Concurrency Theory, Lecture Notes in Computer
+Science, Vol. 1664, Springer, Berlin, 1999, pp. 258–273.
+
+\bibitem{edward1}
+D.A. Edwards, {\em On the existence of probability measures with given marginals}, Ann. Inst. Fourier, Grenoble,
+28 (1978) 53–78.
+
+\bibitem{folland}
+G.B. Folland, {\em Real Analysis: Modern Techniques and Their Applications}, 2nd Edition, Wiley, 1999.
+
+\bibitem{gierz1}
+G. Gierz, K.H. Hofmann, K. Keimel, J.D. Lawson, M. Mislove, D.S. Scott, {\em A Compendium of Continuous
+Lattices}, Springer, Berlin, 1980.
+
+\bibitem{gierz2}
+G. Gierz, K.H. Hofmann, K. Keimel, J.D. Lawson, M. Mislove, D.S. Scott, {\em Continuous Lattices and
+Domains}, Encyclopedia of Mathematics and its Applications, Vol. 93, Cambridge University Press,
+Cambridge, 2003.
+
+\bibitem{horn}
+A. Horn, A. Tarski, {\em Measures on Boolean algebras}, Trans. Amer. Math. Soc. 64 (1948) 467–497.
+
+\end{LTRitems}
+\end{thebibliography}
\ No newline at end of file
Binary files old/doc/xelatex/tabriz-thesis/tabriz-thesis.pdf and new/doc/xelatex/tabriz-thesis/tabriz-thesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/tabriz-thesis.tex new/doc/xelatex/tabriz-thesis/tabriz-thesis.tex
--- old/doc/xelatex/tabriz-thesis/tabriz-thesis.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/tabriz-thesis.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,41 @@
+% !TEX TS-program = XeLaTeX
+%%% یک نمونه پروژه/پایاننامه/رساله با استفاده از کلاس Tabriz_thesis، نسخه 1.1
+%%% وحید دامنافشان، دانشگاه صنعتی کرمانشاه، http://www.damanafshan.ir
+%%% تالار گفتگوی پارسیلاتک، http://forum.parsilatex.com
+%%% آپدیت شده در اسفند ۹۱
+
+%-----------------------------------------------------------------------------------------------------
+% توجه داشته باشید برای دیدن خروجی کامل شامل نمایه و فهرست مطالب، ابتدا دو بار این فایل را
+% را اجرا کرده، سپس با استفاده از خط فرمان، به مسیر پوشه جاری رفته و دستور
+% xindy -L persian -C utf8 -M texindy -M page-ranges tabriz-thesis.idx
+% را در خط فرمان اجرا کنید. سپس دو بار دیگر، این فایل را اجرا کنید.
+% اگر قصد نوشتن پروژه کارشناسی را دارید، در خط زیر به جای msc، کلمه bsc و اگر قصد نوشتن رساله دکتری
+% را دارید، کلمه phd را قرار دهید. کلیه تنظیمات لازم، به طور خودکار، اعمال میشود.
+\documentclass[msc]{tabriz-thesis}
+\csname@twosidetrue\endcsname
+\usepackage{xepersian}
+\settextfont[Scale=1.1]{XB Niloofar}
+\defpersianfont\nastaliq[Scale=2]{IranNastaliq}
+% چنانچه میخواهید اعداد در فرمولها، انگلیسی باشد، خط زیر را غیرفعال کنید.
+\setdigitfont[Scale=1.1]{Yas}
+\begin{document}
+\baselineskip=.75cm
+\pagenumbering{harfi}
+\input{fa-title}
+\tableofcontents\clearpage
+%\listoffigures\clearpage
+%\listoftables\clearpage
+\pagenumbering{arabic}
+\include{chapter1}
+\include{chapter2}
+\include{chapter3}
+\appendix
+\include{appendix1}
+\include{references}
+\baselineskip=.75cm
+\include{dicfa2en}
+\include{dicen2fa}
+\printindex
+\input{en-title}
+\label{LastPage}
+\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj new/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj
--- old/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj 2019-02-28 04:06:41.000000000 +0100
+++ new/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj 2019-07-26 00:58:27.000000000 +0200
@@ -1,9 +1,9 @@
name tabriz-thesis.doc
category Package
-revision 29421
+revision 51729
shortdesc doc files of tabriz-thesis
relocated 1
-docfiles size=85
+docfiles size=170
RELOC/doc/latex/tabriz-thesis/README
RELOC/doc/latex/tabriz-thesis/appendix1.tex
RELOC/doc/latex/tabriz-thesis/chapter1.tex
@@ -17,3 +17,16 @@
RELOC/doc/latex/tabriz-thesis/references.tex
RELOC/doc/latex/tabriz-thesis/tabriz-thesis.pdf
RELOC/doc/latex/tabriz-thesis/tabriz-thesis.tex
+ RELOC/doc/xelatex/tabriz-thesis/README
+ RELOC/doc/xelatex/tabriz-thesis/appendix1.tex
+ RELOC/doc/xelatex/tabriz-thesis/chapter1.tex
+ RELOC/doc/xelatex/tabriz-thesis/chapter2.tex
+ RELOC/doc/xelatex/tabriz-thesis/chapter3.tex
+ RELOC/doc/xelatex/tabriz-thesis/dicen2fa.tex
+ RELOC/doc/xelatex/tabriz-thesis/dicfa2en.tex
+ RELOC/doc/xelatex/tabriz-thesis/en-title.tex
+ RELOC/doc/xelatex/tabriz-thesis/fa-title.tex
+ RELOC/doc/xelatex/tabriz-thesis/logo.jpg
+ RELOC/doc/xelatex/tabriz-thesis/references.tex
+ RELOC/doc/xelatex/tabriz-thesis/tabriz-thesis.pdf
+ RELOC/doc/xelatex/tabriz-thesis/tabriz-thesis.tex
++++++ tabriz-thesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/tabriz-thesis/tabriz-thesis.cls new/tex/xelatex/tabriz-thesis/tabriz-thesis.cls
--- old/tex/xelatex/tabriz-thesis/tabriz-thesis.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/xelatex/tabriz-thesis/tabriz-thesis.cls 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,509 @@
+
+%%
+%% This is file `tabriz-thesis.cls',
+%% The original file was xepersian-thesis.cls by Vafa Khalighi
+%% __________________________________
+%% Copyright © 2011-2013 Vahid Damanafshan
+%%
+%% http://www.damanafshan.ir
+%% http://www.parsilatex.com
+%% http://forum.parsilatex.com
+%%
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{tabriz-thesis}
+ [2013/03/17 v1.1 University of Tabriz projects/theses/dissertations Class]
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
+\ProcessOptions
+\LoadClass[a4paper,11pt,oneside,openany]{book}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{amsthm}
+\RequirePackage{amssymb}
+\RequirePackage{amsmath}
+\RequirePackage[top=40mm, bottom=40mm, left=25mm, right=35mm]{geometry}
+\RequirePackage{graphicx}
+\RequirePackage{framed}
+\RequirePackage{lastpage}
+\RequirePackage{fancyhdr}
+\RequirePackage[nottoc]{tocbibind}
+\RequirePackage{makeidx}
+\makeindex
+\RequirePackage[]{hyperref}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\university#1{\gdef\@university{#1}}
+\def\department#1{\gdef\@department{#1}}
+\def\degree#1{\gdef\@degree{#1}}
+\def\thesisdate#1{\gdef\@thesisdate{#1}}
+\newcommand{\firstsupervisor}[1]{\def\@firstsupervisor{#1}}
+\newcommand{\secondsupervisor}[1]{\def\@secondsupervisor{#1}}
+\newcommand{\firstadvisor}[1]{\def\@firstadvisor{#1}}
+\newcommand{\secondadvisor}[1]{\def\@secondadvisor{#1}}
+\def\name#1{\gdef\@name{#1}}
+\def\surname#1{\gdef\@surname{#1}}
+\long\def\keywords#1{\gdef\@keywords{#1}}
+\long\def\fa-abstract#1{\gdef\@fa-abstract{#1}}
+\def\faculty#1{\gdef\@faculty{#1}}
+\def\subject#1{\gdef\@subject{#1}}
+\def\field#1{\gdef\@field{#1}}
+\def\department#1{\gdef\@department{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\latintitle#1{\gdef\@latintitle{#1}}
+\def\latinauthor#1{\gdef\@latinauthor{#1}}
+\def\latindegree#1{\gdef\@latindegree{#1}}
+\def\latinfaculty#1{\gdef\@latinfaculty{#1}}
+\def\latinthesisdate#1{\gdef\@latinthesisdate{#1}}
+\def\latinsubject#1{\gdef\@latinsubject{#1}}
+\def\latinfield#1{\gdef\@latinfield{#1}}
+\def\firstlatinsupervisor#1{\gdef\@firstlatinsupervisor{#1}}
+\def\secondlatinsupervisor#1{\gdef\@secondlatinsupervisor{#1}}
+\def\firstlatinadvisor#1{\gdef\@firstlatinadvisor{#1}}
+\def\secondlatinadvisor#1{\gdef\@secondlatinadvisor{#1}}
+\def\latinname#1{\gdef\@latinname{#1}}
+\def\latinsurname#1{\gdef\@latinsurname{#1}}
+\long\def\en-abstract#1{\gdef\@en-abstract{#1}}
+\long\def\latinkeywords#1{\gdef\@latinkeywords{#1}}
+\def\latinuniversity#1{\gdef\@latinuniversity{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\if@bscthesis
+\@bscthesisfalse
+\DeclareOption{bsc}{\@bscthesistrue}
+\newif\if@mscthesis
+\@mscthesisfalse
+\DeclareOption{msc}{\@mscthesistrue}
+\ProcessOptions
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\vtitle}{\begin{titlepage}
+\vspace{-10ex}\centerline{{\includegraphics[height=4.3cm]{logo}}}
+\vspace{-2ex}
+{\large\@faculty\par
+
+\vspace{-3ex}\@department}
+\vskip 4ex
+ \if@mscthesis
+{\large\bfseries پایاننامه}
+\else
+ \if@bscthesis
+ {\large\bfseries پروژه }
+ \else
+{\large\bfseries رساله}
+\fi\fi
+\vskip 2ex
+{\large\bfseries\writtenfor
+\if@mscthesis
+کارشناسی ارشد
+\else
+\if@bscthesis
+کارشناسی
+\else
+دکتری
+\fi\fi
+}
+{\large\bfseries{در رشته}}
+\vskip 1ex
+\centerline{\large \bfseries\@subject%
+\if@mscthesis%
+، گرایش
+\else
+\if@bscthesis%
+\relax%
+\else%
+، گرایش
+\fi\fi
+\@field}
+\vskip 6ex
+%\baselineskip=.750cm
+\centerline{\Large \bfseries\onvan}
+%\vskip .2cm
+ {\huge\bfseries {\baselineskip=1cm \@title}}\baselineskip=1.5cm\par
+\vskip 4ex
+ \baselineskip=.5cm
+\large
+{\ifx\@firstsupervisor\undefined%
+\ifx\@secondsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondsupervisor\undefined%
+استاد راهنما
+{\Large\bfseries\par
+\@firstsupervisor}
+\else
+\large
+استادان راهنما
+\par
+{\Large\bfseries \@firstsupervisor{} و \@secondsupervisor}
+\fi\fi}
+\par\large
+{\ifx\@firstadvisor\undefined%
+\ifx\@secondadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondadvisor\undefined%
+استاد مشاور
+{\Large\bfseries\par
+\@firstadvisor}
+\else
+
+\large
+استادان مشاور
+\par
+{\Large\bfseries\@firstadvisor{} و \@secondadvisor}
+\fi\fi}
+
+{\large%
+ \by}\par
+\par
+{\Large\bfseries{\nastaliq\large\bfseries \@name\ \ \@surname}}\par
+%\vskip 3ex
+%\vfill
+{\large \@thesisdate}
+%\vfill
+\end{titlepage}%
+\newpage
+\thispagestyle{empty}
+\baselineskip=.7cm
+\if@bscthesis \relax
+\else
+\begin{frame}
+\noindent
+نام خانوادگی دانشجو:
+\@surname
+ \hspace*{\fill}
+ نام:
+\@name
+ \hspace*{\fill}\\ \hrule
+ \vspace{3mm}
+ \noindent
+ عنوان:
+\@title\\ \hrule
+ \vspace{3mm}
+ \noindent
+{\ifx\@firstsupervisor\undefined%
+\ifx\@secondsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondsupervisor\undefined%
+استاد راهنما:
+{
+\@firstsupervisor}
+\else
+\large
+استادان راهنما:
+{\@firstsupervisor{} و \@secondsupervisor}
+\fi\fi}%\par
+\noindent
+{\ifx\@firstadvisor\undefined%
+\ifx\@secondadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondadvisor\undefined%
+\par\noindent
+استاد مشاور:
+{
+\@firstadvisor}
+\else\\
+\large
+استادان مشاور:
+{\@firstadvisor{} و \@secondadvisor}
+\fi\fi}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+ مقطع تحصیلی:
+ \if@mscthesis
+کارشناسی ارشد
+\else
+دکتری
+\fi
+ \hspace*{\fill}
+رشته:
+\@subject
+ \hspace*{\fill}
+ گرایش:
+\@field
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+دانشگاه:
+\@university
+ \hspace*{\fill}
+\@faculty\hspace*{\fill}
+\\
+تاریخ فارغالتحصیلی:
+\@thesisdate
+ \hspace*{\fill}
+تعداد صفحات:
+\pageref{LastPage}\hspace*{\fill}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+واژگان کلیدی:
+\@keywords
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+\textbf{چکیده}\par
+\@fa-abstract
+\end{frame}
+\fi
+}
+\def\frame{\newpage
+\thispagestyle{empty}
+\begin{framed}\thispagestyle{empty}}
+\def\endframe{\thispagestyle{empty}\end{framed}
+\thispagestyle{empty}
+\newpage
+}
+\def\abstractpage{\newpage
+\thispagestyle{empty}
+\vskip 15mm
+\par
+\begin{abstract}}
+\def\endabstractpage{\end{abstract}
+\newpage
+}
+
+\def\latinabstract{\newpage
+\thispagestyle{empty}
+\vskip 15mm
+\begin{center}{\Large\bfseries \@latintitle \\[5mm]}
+{\bfseries Abstract}
+\end{center}
+\vspace{5mm}}
+
+\def\endlatinabstract{\newpage}
+
+\def\acknowledgementpage{\newpage
+\thispagestyle{empty}
+
+\vspace{1cm}
+\par\noindent}
+\def\endacknowledgementpage{\newpage}
+
+\def\titlepage{\newpage\centering
+ \thispagestyle{empty}
+ \parindent 0pt \parskip 10pt plus 1fil minus 1fil
+ \def\baselinestretch{1}\@normalsize\vbox to \vsize\bgroup\vbox to 9in\bgroup}
+\def\endtitlepage{\par\kern 0pt\egroup\vss\egroup\newpage}
+
+\def\signature{\vspace{1cm}
+\begin{flushleft}
+{\nastaliq \scriptsize \@name\ \@surname \\
+\@thesisdate}
+\end{flushleft}}
+
+\def\abstract{\subsection*{\abstractname}\small
+\@normalsize}
+\def\endabstract{\par}
+
+\newcommand{\latinvtitle}{%
+\if@bscthesis \relax
+\else
+\begin{frame}
+\noindent
+Surname:
+\@latinsurname
+ \hspace*{\fill}
+Name:
+\@latinname
+ \hspace*{\fill}\\ \hrule
+ \vspace{3mm}
+ \noindent
+Title:
+\@latintitle\\ \hrule
+ \vspace{3mm}
+ \noindent
+{\ifx\@firstlatinsupervisor\undefined%
+\ifx\@secondlatinsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinsupervisor\undefined%
+Supervisor:
+{
+\@firstlatinsupervisor}
+\else
+\large
+Supervisors:
+{ \@firstlatinsupervisor{} and \@secondlatinsupervisor}
+\fi\fi}\par
+\noindent
+{\ifx\@firstlatinadvisor\undefined%
+\ifx\@secondlatinadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinadvisor\undefined%
+Advisor:
+{
+\@firstlatinadvisor}
+\else
+\large
+Advisors:
+{\@firstlatinadvisor{} and \@secondlatinadvisor}
+\fi\fi}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+Degree:
+ \if@mscthesis
+ Master of Science
+\else
+ Doctor of Science
+\fi
+ \hspace*{\fill}
+Subject:
+\@latinsubject
+\hspace*{\fill}
+\\
+Field:
+\@latinfield
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+\@latinuniversity
+ \hspace*{\fill}
+\@latinfaculty\hspace*{\fill}
+\\
+Date:
+\@latinthesisdate
+ \hspace*{\fill}
+Number of pages:
+\pageref{LastPage}\hspace*{\fill}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+Keywords:
+\@latinkeywords
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+\textbf{Abstract}\par
+\@en-abstract
+\end{frame}
+\begin{titlepage}
+\vspace{-1.5cm}{\includegraphics[height=4.3cm]{logo}}
+\centerline{\bf \@latinuniversity}
+\large\bfseries
+\@latinfaculty\space
+\vskip 5mm
+%{
+ \if@mscthesis
+Dissertation Submitted in Partial
+\\[.2cm]
+ Fulfillment of The Requirements For The
+\\[.2cm]
+Degree of Master of Science in\par
+\else
+Doctoral Thesis Submitted in Partial
+\\[.2cm]
+Fulfillment of The Requirements For The
+\\[.2cm]
+Degree of Doctor of Science in \par
+\fi
+{\large\bfseries \@latinsubject}
+\vskip 1cm
+\baselineskip=.750cm
+{\Large\bfseries\@latintitle}
+\baselineskip=.750cm \par
+%\addtolength{\baselineskip}{-5mm}
+\vskip 1.5cm
+\large
+{\ifx\@firstlatinsupervisor\undefined%
+\ifx\@secondlatinsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinsupervisor\undefined%
+Supervisor
+{\large\bfseries\par
+\@firstlatinsupervisor}
+\else
+\large
+Supervisors
+\par
+{\large\bfseries \@firstlatinsupervisor{} and \@secondlatinsupervisor}
+\fi\fi}
+\par
+\large
+{\ifx\@firstlatinadvisor\undefined%
+\ifx\@secondlatinadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinadvisor\undefined%
+Advisor
+{\large\bfseries\par
+\@firstlatinadvisor}
+\else
+
+\large
+Advisors
+\par
+{\large\bfseries\@firstlatinadvisor{} and \@secondlatinadvisor}
+\fi\fi}
+\vskip 5mm
+{\bfseries\latinby}\par
+{\large %\supervisorfont
+\@latinname \; \@latinsurname}\par
+\vskip 5mm
+
+\par
+\vskip 1cm
+
+{\@latinthesisdate}
+\par
+\vskip 1cm
+
+\par
+
+\vfill
+%
+\end{titlepage}
+\fi}
+
+\def\onvan{عنوان}
+\def\writtenfor{برای دریافت درجه }
+\def\by{پژوهشگر}
+\def\latinby{By}
+\def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else
+\hbox{}
+\thispagestyle{empty}
+\newpage
+\if@twocolumn\hbox{}\newpage\fi\fi\fi}
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\bibname}{مراجع}
+\newcommand\persiangloss[2]{#1\dotfill\lr{#2}\\}
+\newcommand\englishgloss[2]{#2\dotfill\lr{#1}\\}
+\newcommand{\پ}{پروژه/پایاننامه/رساله }
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+\theoremstyle{definition}
+\newtheorem{definition}{تعریف}[section]
+\theoremstyle{theorem}
+\newtheorem{theorem}[definition]{قضیه}
+\newtheorem{lemma}[definition]{لم}
+\newtheorem{proposition}[definition]{گزاره}
+\newtheorem{corollary}[definition]{نتیجه}
+\newtheorem{remark}[definition]{ملاحظه}
+\theoremstyle{definition}
+\newtheorem{example}[definition]{مثال}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[OL,EL]{\thepage}
+\fancyhead[OR]{\small\rightmark}
+\fancyhead[ER]{\small\leftmark}
+\renewcommand{\chaptermark}[1]{%
+\markboth{\thechapter.\ #1}{}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Copyright © 2011-2013 by Vahid Damanafshan
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vahid Damanafshan.
+%%
+%%
+%%
+%%
+%% Special thanks to Vafa Khalighi for his invaluable hints.
+%%
+%% End of file `tabriz-thesis.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabriz-thesis.tlpobj new/tlpkg/tlpobj/tabriz-thesis.tlpobj
--- old/tlpkg/tlpobj/tabriz-thesis.tlpobj 2019-02-28 04:06:41.000000000 +0100
+++ new/tlpkg/tlpobj/tabriz-thesis.tlpobj 2019-07-26 00:58:28.000000000 +0200
@@ -1,15 +1,16 @@
name tabriz-thesis
category Package
-revision 29421
+revision 51729
shortdesc A template for the University of Tabriz
relocated 1
longdesc The package offers a document class for typesetting theses and
longdesc dissertations at the University of Tabriz. The class requires
longdesc use of XeLaTeX.
-runfiles size=3
+runfiles size=6
RELOC/tex/latex/tabriz-thesis/tabriz-thesis.cls
-catalogue-ctan /macros/latex/contrib/tabriz-thesis
-catalogue-date 2016-06-24 19:18:15 +0200
+ RELOC/tex/xelatex/tabriz-thesis/tabriz-thesis.cls
+catalogue-ctan /macros/xetex/latex/tabriz-thesis
+catalogue-date 2019-07-25 16:05:27 +0200
catalogue-license lppl1.3
-catalogue-topics dissertation persian xetex
+catalogue-topics class dissertation persian xetex
catalogue-version 1.1
++++++ tabto-ltx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabto-ltx.doc.tlpobj new/tlpkg/tlpobj/tabto-ltx.doc.tlpobj
--- old/tlpkg/tlpobj/tabto-ltx.doc.tlpobj 2019-03-02 02:26:09.000000000 +0100
+++ new/tlpkg/tlpobj/tabto-ltx.doc.tlpobj 2020-03-04 23:53:52.000000000 +0100
@@ -1,6 +1,6 @@
name tabto-ltx.doc
category Package
-revision 50188
+revision 54080
shortdesc doc files of tabto-ltx
relocated 1
docfiles size=17
++++++ tabto-ltx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabto-ltx.tlpobj new/tlpkg/tlpobj/tabto-ltx.tlpobj
--- old/tlpkg/tlpobj/tabto-ltx.tlpobj 2019-03-02 02:26:09.000000000 +0100
+++ new/tlpkg/tlpobj/tabto-ltx.tlpobj 2020-03-04 23:53:52.000000000 +0100
@@ -1,6 +1,6 @@
name tabto-ltx
category Package
-revision 50188
+revision 54080
shortdesc "Tab" to a measured position in the line
relocated 1
longdesc \tabto{<length>} moves the typesetting position to <length>
@@ -13,9 +13,9 @@
longdesc the next defined 'tab stop'.
runfiles size=2
RELOC/tex/latex/tabto-ltx/tabto.sty
+catalogue-alias tabto
catalogue-also tabto-generic
catalogue-ctan /macros/latex/contrib/tabto
-catalogue-date 2019-03-01 08:38:06 +0100
catalogue-license lppl1.3
catalogue-topics layout
catalogue-version 1.4
++++++ tagging.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tagging/README new/doc/latex/tagging/README
--- old/doc/latex/tagging/README 2011-08-31 22:22:27.000000000 +0200
+++ new/doc/latex/tagging/README 2019-09-09 23:19:49.000000000 +0200
@@ -1,13 +1,21 @@
- The `tagging' package provides document configuration by
+ The `tagging' package provides document configuration by
including or omitting tagged input.
- tagging is licenced under the LPPL. For more details,
-please see the accompanying manual: taggingmanual.pdf.
+ tagging is licenced under the LPPL. For more details,
+please see the accompanying manual: tagging.pdf.
Change History
~~~~~~~~~~~~~~
-2011-08-22 Initial release, providing:
+2019-09-09 1.1.0.1 Fix a stupid bug
+
+2019-09-07 1.1 Kindly provided and inspired by Frank Mittelbach:
+
+ Bug fixes
+ <nonsense by BL>: Removed interference with comment environment (from verbatim package)
+ Allow initial active tag list to be passed as package options
+
+2011-08-22 1.0 Initial release, providing:
\tagged{list}{y} Conditional inclusion
\untagged{list}{n} Conditional exclusion
Binary files old/doc/latex/tagging/tagging.pdf and new/doc/latex/tagging/tagging.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tagging/tagging.tex new/doc/latex/tagging/tagging.tex
--- old/doc/latex/tagging/tagging.tex 2011-08-31 22:22:27.000000000 +0200
+++ new/doc/latex/tagging/tagging.tex 2019-09-09 23:19:49.000000000 +0200
@@ -1,6 +1,10 @@
-% taggingmanual.tex
-% Copyright 2011 Brent Longborough
-%
+% !TEX TS-program = latexmkl
+% !TEX encoding = UTF-8 Unicode
+% !TeX spellcheck = en_GB
+% -----------------------------------------------------
+% tagging.tex
+% Copyright 2019 Brent Longborough
+% -----------------------------------------------------
% 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.
@@ -12,7 +16,7 @@
% This work has the LPPL maintenance status `maintained'.
% The Current Maintainer of this work is Brent Longborough.
%
-% This work consists of these files:
+% This work consists of these files:
% tagging.sty, tagging.tex, and tagging.pdf
% -----------------------------------------------------
\documentclass[a4paper,12pt,twoside,openany]{memoir}
@@ -36,10 +40,11 @@
\pagestyle{ruled}
\settocdepth{section}
\setsecnumdepth{none}
-\newcommand{\tpfname}{\textsf{tagging.sty}}
-\newcommand{\tpname}{\textsf{\itshape tagging}}
-\newcommand{\gitVtag}{\space1.0}
-\newcommand{\gitVtagn}{\space1.0}
+\newcommand{\tpn}{tagging}
+\newcommand{\tpfname}{\textsf{\tpn.sty}}
+\newcommand{\tpname}{\textsf{\itshape \tpn}}
+\newcommand{\gitVtag}{\space1.1.0.1}
+\newcommand{\gitVtagn}{\space1.1.0.1}
% -----------------------------------------------------
\usepackage[%
bookmarksnumbered,
@@ -59,7 +64,7 @@
\Large A package for document configuration
}
\author{Brent Longborough}
-\date{28th August, 2011}
+\date{9th September, 2019}
\maketitle
{\centering
@@ -84,17 +89,18 @@
to produce more than one result at different places
in a single document.
-To use \tpname, just include a standard \verb!\usepackage{tagging}!
-in your document preamble; there are no package options.
+To use \tpname, just include a standard
+\verb!\usepackage{tagging}! in your document preamble; there
+are no package options which alter its intrinsic behaviour,
+although later you will see how any options you may give are
+subverted.
With \tpname, you mark up parts of your
\LaTeX source code with \textit{tags} --- labels which
make some kind of sense for you in relation to
the document you are writing.
-For example, imagine you are writing a car owners' manual.\footnote{%
-OK, I know Peugeot don't do this,
-but imagine a top-end luxury car manufacturer.}
+For example, imagine you are writing a car owners' manual.
The car can have optional features, such as automatic transmission
or a navigation system, and can be powered by diesel or petrol.
@@ -111,7 +117,7 @@
Alternatively, you might prefer to tag pieces of the document
as applying to given models, by labelling them with one more
-model designations.
+model designations.
For such an application, you would probably have
a number of master document source files,
each of which would activate the appropriate tags,
@@ -126,7 +132,7 @@
in which something --- an idea, an algorithm, for instance --- has evolved.
The description of the evolving thing could be labelled with its stages,
and then repeatedly imbedded from a master source document with different
-active tags to reflect the stage in its evolution.
+active tags to reflect the stage in its evolution.
The possibilities are, if not limitless,
at least very extensive.
@@ -213,7 +219,7 @@
The tag control commands determine which tags
are active at any point in the document.
The document starts with all tags inactive;
-\tpname\ requires that you explicitly activate
+\tpname\ requires that you explicitly activate
the tags you need.
Once a tag has been activated, it remains active from that point
@@ -225,9 +231,18 @@
\subsection{{\ttfamily\textbackslash usetag\{{\itshape<taglist>}\}}}
This command activates \emph{all} the tags in \texttt{\itshape<taglist>}.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
+\subsection{{\ttfamily\textbackslash usepackage[{\itshape<taglist>}]\{\tpn\}}}
+If you wish, you may activate one or more tags, once, in your
+document preamble by passing a taglist as options when you call
+the package.
+\emph{All} the tags in \texttt{\itshape<taglist>} are activated.
+Any tags activated this way can still be deactivated and
+reactivated as many times as you may need in the body of the
+document.
+% - - - - - - - - - - - - - - - - - - - - - - - - - - -
\subsection{{\ttfamily\textbackslash droptag\{{\itshape<taglist>}\}}}
This command deactivates \emph{all} the tags in \texttt{\itshape<taglist>}.
-\tpname\ is too simple to include a command
+\tpname\ is too simple to include a command
to ``deactivate all known tags'' --- sorry.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -313,25 +328,30 @@
\section{Acknowledgements and dependencies}
\tpname\ is based on an idea by \href{http://tex.stackexchange.com/users/2674/leo-liu}{Leo Liu}.
-It would have been a lot more difficult to implement without the help of
+It would have been a lot more difficult to implement without the help of
Philipp Lehman's
\href{http://www.ctan.org/tex-archive/macros/latex/contrib/etoolbox}{etoolbox}
and of
\href{http://www.ctan.org/pkg/verbatim}{verbatim}, currently maintained by
-Rainer Schöpf, both of which are required for \tpname to work.
+Rainer Schöpf, both of which are required for \tpname\ to work.
+
+I am most grateful to Frank Mittelbach, who intervened to fix my
+dodgy code and to provide the ability to activate tags as
+package options, thereby directly inspiring v1.1.
-The \href{http://tex.stackexchange.com}{\TeX.SE community}
-has been a constant source of help, inspiration, and amazement.
+The \href{http://tex.stackexchange.com}{\TeX.SE community} has
+been a constant source of help, inspiration, and amazement.
-Of course, we all stand on the shoulders of giants: Donald Knuth,
-and then too many others to name.
+Of course, we all stand on the shoulders of giants: Donald
+Knuth, and then too many others to name.
Thank you all. Any failings that remain are entirely
``an ill-favoured thing, sir, but mine own''.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
+\clearpage
\section{Copyright \& licence}
-Copyright \copyright\ 2011, Brent Longborough.
+Copyright \copyright\ 2019, Brent Longborough.
This work --- \tpname\ --- may be distributed and/or modified under the
conditions of the LaTeX Project Public License: either version 1.3
@@ -345,8 +365,8 @@
This work has the LPPL maintenance status `maintained';
the Current Maintainer of this work is Brent Longborough.
-This work consists of the files tagging.sty, taggingtest.tex,
-taggingmanual.tex, and taggingmanual.pdf
+This work consists of the files
+tagging.sty, tagging.tex, and tagging.pdf
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
\section{From the author}
@@ -358,7 +378,7 @@
However, I'll be very happy to receive your comments by email.\\[\baselineskip]
Enjoy!\\
Brent Longborough\\[\baselineskip]
-\textsf{brent+tagging (at) longborough (dot) org}\\
+\textsf{brent+ctan (at) llwyd-consulting (dot) cymru}\\
and at \href{http://tex.stackexchange.com/users/344/brent-longborough}{\TeX.SE}
% -----------------------------------------------------
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tagging.doc.tlpobj new/tlpkg/tlpobj/tagging.doc.tlpobj
--- old/tlpkg/tlpobj/tagging.doc.tlpobj 2019-02-28 04:06:44.000000000 +0100
+++ new/tlpkg/tlpobj/tagging.doc.tlpobj 2019-09-11 01:55:19.000000000 +0200
@@ -1,9 +1,9 @@
name tagging.doc
category Package
-revision 23761
+revision 52064
shortdesc doc files of tagging
relocated 1
-docfiles size=26
+docfiles size=33
RELOC/doc/latex/tagging/README
RELOC/doc/latex/tagging/tagging.pdf
RELOC/doc/latex/tagging/tagging.tex
++++++ tagging.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagging/tagging.sty new/tex/latex/tagging/tagging.sty
--- old/tex/latex/tagging/tagging.sty 2011-08-31 22:22:27.000000000 +0200
+++ new/tex/latex/tagging/tagging.sty 2019-09-09 23:19:49.000000000 +0200
@@ -1,5 +1,5 @@
% tagging.sty
-% Copyright 2011 Brent Longborough
+% Copyright 2019 Brent Longborough
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,11 +12,13 @@
% This work has the LPPL maintenance status `maintained'.
% The Current Maintainer of this work is Brent Longborough.
%
-% This work consists of these files:
+% This work consists of these files:
% tagging.sty, tagging.tex, and tagging.pdf
% --------------------------------------------------------------
-\ProvidesPackage{tagging}[2011/08/04]
+\ProvidesPackage{tagging}[2019/09/09 v1.1.0.1]
\RequirePackage{etoolbox,verbatim}
+
+
\newcommand{\taggedy}{\relax}
\newcommand{\taggedn}{\relax}
\newcommand\usetag[1]{%
@@ -25,6 +27,8 @@
\newcommand\droptag[1]{%
\def\do##1{\csundef{tagged@##1}{}}%
\docsvlist{#1}}%
+
+
\newenvironment{taggedblock}[1]%
{\def\do##1{%
\ifcsname tagged@##1\endcsname%
@@ -32,10 +36,10 @@
\let\endcomment\relax%
\fi}%
\docsvlist{#1}%
- \comment}%
- {\endcomment\leavevmode}%
+ \comment\ignorespaces}% FMi
+ {\endcomment\ignorespacesafterend}% FMi
\newenvironment{untaggedblock}[1]{%
- \csdef{@tagged@flag}{}
+ \csdef{@tagged@flag}{}% FMi
\def\do##1{%
\ifcsname tagged@##1\endcsname%
\csundef{@tagged@flag}{}
@@ -45,8 +49,10 @@
\let\comment\relax%
\let\endcomment\relax%
\fi%
- \comment}%
- {\endcomment\leavevmode}%
+ \comment\ignorespaces}% FMi
+ {\endcomment\ignorespacesafterend}% FMi
+
+
\newcommand{\iftagged}[3]%
{\renewcommand{\taggedy}{#2}%
\renewcommand{\taggedn}{#3}%
@@ -57,3 +63,7 @@
}%
\newcommand{\tagged}[2]{\iftagged{#1}{#2}{}}
\newcommand{\untagged}[2]{\iftagged{#1}{}{#2}}
+
+%FMi Allow tags to be activated as package options
+\DeclareOption*{\usetag{\CurrentOption}}
+\ProcessOptions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tagging.tlpobj new/tlpkg/tlpobj/tagging.tlpobj
--- old/tlpkg/tlpobj/tagging.tlpobj 2019-02-28 04:06:44.000000000 +0100
+++ new/tlpkg/tlpobj/tagging.tlpobj 2019-09-11 01:55:19.000000000 +0200
@@ -1,6 +1,6 @@
name tagging
category Package
-revision 23761
+revision 52064
shortdesc Document configuration with tags
relocated 1
longdesc The package allows the user to generate multiple documents from
@@ -8,7 +8,10 @@
longdesc and specifying which marked pieces to include or exclude.
runfiles size=1
RELOC/tex/latex/tagging/tagging.sty
+catalogue-contact-bugs https://github.com/Hightor/tagging/issues
+catalogue-contact-repository https://github.com/Hightor/tagging
catalogue-ctan /macros/latex/contrib/tagging
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-09 19:04:08 +0200
catalogue-license lppl1.3
catalogue-topics cond-comp
+catalogue-version 1.1.0.1
++++++ tagpdf.doc.tar.xz ++++++
++++ 26954 lines of diff (skipped)
++++++ tagpdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-attr-code.sty new/tex/latex/tagpdf/tagpdf-attr-code.sty
--- old/tex/latex/tagpdf/tagpdf-attr-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-attr-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-attr-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-attr-code} {2019/07/02} {0.61}
{part of tagpdf - code related to attributes and attribute classes}
% the obj is written in tagpdf-tree-code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-checks-code.sty new/tex/latex/tagpdf/tagpdf-checks-code.sty
--- old/tex/latex/tagpdf/tagpdf-checks-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-checks-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-checks-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-checks-code} {2019/07/02} {0.61}
{part of tagpdf - code related to checks and messages}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-luatex.def new/tex/latex/tagpdf/tagpdf-luatex.def
--- old/tex/latex/tagpdf/tagpdf-luatex.def 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-luatex.def 2019-07-02 23:03:25.000000000 +0200
@@ -1,5 +1,5 @@
-\ProvidesExplFile {tagpdf-luatex.def} {2019/03/20} {0.60}
- {tagpdf driver for luatex}
+\ProvidesExplFile {tagpdf-luatex.def} {2019/07/02} {0.61}
+ {tagpdf~driver~for~luatex}
%\newattribute \g__uftag_mc_type_attr %the value represent the type
%\newattribute \g__uftag_mc_cnt_attr %will hold the \c@g__uftag_MCID_abs_int value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-mc-code-generic.sty new/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
--- old/tex/latex/tagpdf/tagpdf-mc-code-generic.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-mc-code-generic.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2019/07/02} {0.61}
{part of tagpdf - code related to marking chunks - generic mode}
% for the label system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-mc-code-lua.sty new/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
--- old/tex/latex/tagpdf/tagpdf-mc-code-lua.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-mc-code-lua.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2019/07/02} {0.61}
{tagpdf - mc code only for the luamode }
% the two attibutes are defined in the driver file.
@@ -250,6 +250,7 @@
\exp_args:Nx \__uftag_mc_handle_stash:n { \__uftag_get_mc_abs_cnt: }
}
}
+ \bool_set_false:N\l__uftag_mc_artifact_bool
%\group_end:
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-mc-code-shared.sty new/tex/latex/tagpdf/tagpdf-mc-code-shared.sty
--- old/tex/latex/tagpdf/tagpdf-mc-code-shared.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-mc-code-shared.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2019/07/02} {0.61}
{part of tagpdf - code related to marking chunks - code shared by generic and luamode }
% I use a latex counter for the absolute count, so that it is added to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-pdftex.def new/tex/latex/tagpdf/tagpdf-pdftex.def
--- old/tex/latex/tagpdf/tagpdf-pdftex.def 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-pdftex.def 2019-07-02 23:03:25.000000000 +0200
@@ -1,5 +1,5 @@
-\ProvidesExplFile {tagpdf-pdftex.def} {2019/03/20} {0.60}
- {tagpdf driver for pdftex}
+\ProvidesExplFile {tagpdf-pdftex.def} {2019/07/02} {0.61}
+ {tagpdf~driver~for~pdftex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% driver (pdflatex) commands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-roles-code.sty new/tex/latex/tagpdf/tagpdf-roles-code.sty
--- old/tex/latex/tagpdf/tagpdf-roles-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-roles-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-roles-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-roles-code} {2019/07/02} {0.61}
{part of tagpdf - code related to roles and structure names}
\__uftag_seq_new:N \g__uftag_role_tags_seq %to get names from numbers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-space-code.sty new/tex/latex/tagpdf/tagpdf-space-code.sty
--- old/tex/latex/tagpdf/tagpdf-space-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-space-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-space-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-space-code} {2019/07/02} {0.61}
{part of tagpdf - code related to real space chars}
% luatex uses an attribute (declared in the driver file) and some luacode in tagpdf.lua
% perhaps I will split the code by engine in the future
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-struct-code.sty new/tex/latex/tagpdf/tagpdf-struct-code.sty
--- old/tex/latex/tagpdf/tagpdf-struct-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-struct-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-struct-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-struct-code} {2019/07/02} {0.61}
{part of tagpdf - code related to storing structure}
% I will use a latex counter for the structure count
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-tree-code.sty new/tex/latex/tagpdf/tagpdf-tree-code.sty
--- old/tex/latex/tagpdf/tagpdf-tree-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-tree-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-tree-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-tree-code} {2019/07/02} {0.61}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%this does the actual finishing:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-user.sty new/tex/latex/tagpdf/tagpdf-user.sty
--- old/tex/latex/tagpdf/tagpdf-user.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-user.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-user} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-user} {2019/07/02} {0.61}
{tagpdf - user commands}
\NewDocumentCommand \tagpdfsetup { m }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf.lua new/tex/latex/tagpdf/tagpdf.lua
--- old/tex/latex/tagpdf/tagpdf.lua 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf.lua 2019-07-02 23:03:25.000000000 +0200
@@ -1,8 +1,18 @@
--- Packageversion: 0.60
--- Packagedate: 2019/03/20
-- tagpdf.lua
-- Ulrike Fischer
+local ProvidesLuaModule = {
+ name = "tagpdf",
+ version = "0.61", --TAGVERSION
+ date = "2019-07-02", --TAGDATE
+ description = "tagpdf lua code",
+ license = "The LATEX Project Public License 1.3c"
+}
+
+if luatexbase and luatexbase.provides_module then
+ luatexbase.provides_module (ProvidesLuaModule)
+end
+
--[[
The code has quite probably a number of problems
- more variables should be local instead of global
@@ -512,11 +522,10 @@
tableinsert(uftag.mc[mcnum]["kids"], kidtable )
end
+
function uftag.func.mc_num_of_kids (mcnum)
local num = 0
if uftag.mc[mcnum] and uftag.mc[mcnum]["kids"] then
- texio.write_nl("XXXXXXXXXXXXXXXXX")
- texio.write_nl(table.serialize(uftag.mc[mcnum]["kids"]))
num = #uftag.mc[mcnum]["kids"]
end
uftag.trace.log ("MC" .. mcnum .. "has " .. num .. "KIDS",4)
@@ -554,6 +563,7 @@
uftag.struct[structnum]["mc"]=uftag.struct[structnum]["mc"] or { }
-- a structure can contain more than on mc chunk, the content should be ordered
tableinsert(uftag.struct[structnum]["mc"],mcnum)
+ uftag.trace.log("MCNUM "..mcnum.." insert in struct "..structnum,3)
-- but every mc can only be in one structure
uftag.mc[mcnum]= uftag.mc[mcnum] or { }
uftag.mc[mcnum]["parent"] = structnum
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf.sty new/tex/latex/tagpdf/tagpdf.sty
--- old/tex/latex/tagpdf/tagpdf.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,7 +1,7 @@
-\RequirePackage{expl3}[2018/06/14]
+\RequirePackage{expl3}[2019/07/01]
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdf} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf} {2019/07/02} {0.61}
{A package to experiment with pdf tagging}
%\debug_on:n{check-declarations,check-expressions,deprecation}
@@ -41,10 +41,11 @@
\RequirePackage{atbegshi}
\RequirePackage{zref-base,zref-lastpage}
\RequirePackage{etoolbox}
+\RequirePackage{l3pdf}
%\RequirePackage{pdfescape} %check if needed
%\RequirePackage{pdftexcmds}%check if needed (expandable commands!)
-\RequirePackage{l3str-convert}
+%\RequirePackage{l3str-convert}
\cs_generate_variant:Nn \str_set_convert:Nnnn {Nonn, Noon, Nnon }
@@ -83,18 +84,7 @@
tabsorder / structure .code:n = {\tl_set:Nn \l__uftag_tree_tabs_order_tl {/Tabs/S}},
tabsorder / none .code:n = {\tl_set:Nn \l__uftag_tree_tabs_order_tl {}},
tabsorder .initial:n = structure,
- compresslevel .choices:nn = {1,2,3,4,5,6,7,8,9}
- {
- \driver_pdf_compresslevel:n {#1}
- \driver_pdf_objects_enable:
- },
- compresslevel / 0 .code:n =
- {
- \driver_pdf_compresslevel:n { 0 }
- \driver_pdf_objects_disable:
- },
- compresslevel .value_required:n = true,
- uncompress .meta:n = { compresslevel = 0 },
+ uncompress .code:n = {\pdf_uncompress: },
inputencoding .code:n =
{
\sys_if_engine_pdftex:T
@@ -102,7 +92,7 @@
},
}
-% escape commands are a bit engine specific so have been moved to the driver files.
+% escape commands are a bit engine specific so have been moved to the backend files.
% commands to escape strings so that they can be safely used in pdf
% currently not much used. But will be needed later, when alt and actualtext are added.
% we probably need the equivalent \pdfescapestring, \pdfescapename \pdfescapehex
@@ -114,7 +104,7 @@
%\cs_set_eq:NN \__uftag_pdf_escape_string:n \EdefEscapeString
%\cs_set_eq:NN \__uftag_pdf_escape_name:Nn \EdefEscapeName
-%escape command. They are driver specific as \pdf@escapehex would ignore most chars
+%escape command. They are backend specific as \pdf@escapehex would ignore most chars
%outside the "pdflatex" range
@@ -137,7 +127,7 @@
}
-%testing the engines and loading the driver files
+%testing the engines and loading the backend files
\sys_if_engine_xetex:T
{
\PackageError { tagpdf } { xelatex~is~not~supported~-~aborting } {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdfdocu-patches.sty new/tex/latex/tagpdf/tagpdfdocu-patches.sty
--- old/tex/latex/tagpdf/tagpdfdocu-patches.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdfdocu-patches.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,7 +1,7 @@
\RequirePackage{expl3}[2018/06/14]
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
\RequirePackage{xpatch}
-\ProvidesExplPackage {tagpdfdocu-patches} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdfdocu-patches} {2019/07/02} {0.61}
{patches/commands for the tagpdf documentation}
% to do : marginnote, perhaps the description macros ...
@@ -198,7 +198,7 @@
% keys that overwrite \enit@format must be patched, eg like the follow
% the font key should be patched in a similar way
-\enitkv@key{enumitem}{format}{%
+\enitkv@key{}{format}{% new enumitem don't use first argument
\def\enit@format{%
\tagstructbegin{tag=LI}%
\tagstructbegin{tag=Lbl}%
@@ -213,20 +213,20 @@
{
\hook_put_left:nnn
{ pdf }
- { startlink_url }
+ { link_begin_url }
{
\uftag_struct_begin:n{tag=Link}
- \uftag_mc_begin:n{tag=Link}\def\blub{abc}
+ \uftag_mc_begin:n{tag=Link}
}
\hook_put:nnnn
{ pdf }
- { startlink_url_attr }
+ { link_begin_url_attr }
{ /StructParent }
{ \int_use:N\c@g__uftag_parenttree_obj_int }
\hook_put_right:nnn
{ pdf }
- { endlink_url }
+ { link_end_url }
{
\__uftag_struct_finish_link:
\uftag_mc_end:
@@ -235,19 +235,19 @@
\hook_put_left:nnn
{ pdf }
- { startlink_link }
+ { link_begin_link }
{
\uftag_struct_begin:n{tag=Link}
\uftag_mc_begin:n{tag=Link}
}
\hook_put:nnnn
{ pdf }
- { startlink_link_attr }
+ { link_begin_link_attr }
{ /StructParent }
{ \int_use:N\c@g__uftag_parenttree_obj_int }
\hook_put_right:nnn
{ pdf }
- { endlink_link }
+ { link_end_link }
{
\__uftag_struct_finish_link:
\uftag_mc_end:
@@ -257,13 +257,13 @@
% "alternative descriptions " for PAX3. How to get better text here??
\hook_put:nnnn
{ pdf }
- { startlink_url_attr }
+ { link_begin_url_attr }
{ /Contents }
{ (url) }
\hook_put:nnnn
{ pdf }
- { startlink_link_attr }
+ { link_begin_link_attr }
{ /Contents }
{ (ref) }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tagpdf.tlpobj new/tlpkg/tlpobj/tagpdf.tlpobj
--- old/tlpkg/tlpobj/tagpdf.tlpobj 2019-03-22 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/tagpdf.tlpobj 2019-07-03 01:55:00.000000000 +0200
@@ -1,6 +1,6 @@
name tagpdf
category Package
-revision 50509
+revision 51535
shortdesc Tools for experimenting with tagging using pdfLaTeX and LuaLaTeX
relocated 1
longdesc The package offers tools to experiment with tagging and
@@ -31,7 +31,7 @@
catalogue-contact-repository https://github.com/u-fischer/tagpdf
catalogue-contact-support https://github.com/u-fischer/tagpdf/issues
catalogue-ctan /macros/latex/contrib/tagpdf
-catalogue-date 2019-03-21 08:11:50 +0100
+catalogue-date 2019-07-02 14:34:15 +0200
catalogue-license lppl1.3c
catalogue-topics tagged-pdf accessible
-catalogue-version 0.60
+catalogue-version 0.61
++++++ tasks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tasks/README new/doc/latex/tasks/README
--- old/doc/latex/tasks/README 2016-08-15 00:00:01.000000000 +0200
+++ new/doc/latex/tasks/README 2020-03-21 22:17:24.000000000 +0100
@@ -1,14 +1,14 @@
--------------------------------------------------------------------------
-the TASKS package v0.12 2016/08/13
+the TASKS package v1.2 2020/03/21
- Horizontal columned lists.
+ lists with columns filled horizontally
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://github.com/cgnieder/tasks/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2013-2016 Clemens Niederberger
+Copyright 2013--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/tasks/tasks-manual.pdf and new/doc/latex/tasks/tasks-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tasks/tasks-manual.tex new/doc/latex/tasks/tasks-manual.tex
--- old/doc/latex/tasks/tasks-manual.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tasks/tasks-manual.tex 2020-03-21 22:17:24.000000000 +0100
@@ -0,0 +1,498 @@
+% --------------------------------------------------------------------------
+% the TASKS package
+%
+% lists with columns filled horizontally
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/tasks/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013--2020 Clemens Niederberger
+%
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+\documentclass{tasks-manual}
+
+\begin{document}
+
+\section{Preface}
+\subsection{Motivation \& History}
+Originally \Tasks\ has been an integral part of the
+\ExSheets\changedversion{0.7} package~\cite{pkg:exsheets}. However, users
+told me that it indeed could be useful to have it as a stand-alone package not
+having to load the whole \ExSheets\ beast just for having the \env{tasks}
+environment available. Since I agree with this the environment has been
+extracted into a package if its own, \Tasks. Since then \Tasks\ has been
+distributed as a package of its own but as part of the \ExSheets\
+bundle\changedversion{0.10}. With v0.10 I decided to make it a completely
+independent package. So the relation to \ExSheets\ only is a historical one.
+
+The reason for the \env{tasks} environment is an unwritten agreement in German
+maths textbooks (exspecially in (junior) high school textbooks) to organize
+exercises in columns counting horizontally rather than vertically. That is
+what \code{tasks} primarily is for. If you don't need this feature you're
+better off using traditional \LaTeX\ lists and the \pkg{enumitem} package for
+customization.
+
+\subsection{Changes}
+The \sinceversion{1.0} step to version~1.0 brought some significant changes:
+\begin{itemize}
+ \item the option \option{counter-format} is deprecated. Labels can now be
+ set quite similar to the way they are set in \pkg{enumitem}. This also
+ made the \code{enumerate} option of the list template superfluous which has
+ been removed accordingly.
+ \item The commands \cs{NewTasks} and \cs{RenewTasks} have been renamed.
+ \item The multiple choice lists have been removed.
+ \item Custom definitions can be put in a \code{tasks.cfg} file which is
+ automatically loaded if available.
+\end{itemize}
+
+\section{License and Requirements}\label{sec:license}
+\license
+
+\Tasks\ requires the \bnd{l3kernel}~\cite{bnd:l3kernel} bundle,
+\needpackage{xparse} and \pkg{xtemplate}.
+
+\section{How it works}
+\subsection{Background}
+The \env{tasks} environment is similar to a list like \env{enumerate} but not
+the same. Here are some of the differences:
+\begin{tasks}[style=enumerate]
+ \task there is no pagebreak possible inside an item but only between items.
+ \task the enumeration default is a), b), c) \ldots
+ \task the body of the \env{tasks} environment is split at \emph{every}
+ occurrence of the item separator. For this reason the default separator
+ is not \cs*{item} but \cs{task} so it is unique to this environment only.
+ This directly leads to\ldots
+ \task \ldots\ the fact that the \env{tasks} environment cannot be nested.
+ You can, however, use an \env*{itemize} environment or another
+ \enquote{real} list in it.
+ \task A fifth difference: verbatim material cannot be used in it. You'll
+ have to use \cs*{string}, \cs*{texttt} or \cs*{detokenize}. If this
+ won't suffice then don't use \env{tasks}.
+\end{tasks}
+
+\begin{bewareofthedog}
+ The environments of \Tasks\ are what I like to call
+ \enquote{pseudo-environments}. This means like environments defined by the
+ package \pkg{environ}~\cite{pkg:environ} the body of the environment is read
+ as argument before it is processed. This is why verbatim material cannot be
+ used in \Tasks' lists.
+\end{bewareofthedog}
+
+\subsection{The Basics}
+\begin{environments}
+ \environment{tasks}[\oarg{options}\darg{num of columns}]
+ List like environment where the single items are introduced with
+ \cs{task}.
+\end{environments}
+Let's see an example:
+\begin{example}
+ % \Sample is defined to contain some sample text:
+ % \def\sample{This is some sample text we will use to create a somewhat
+ % longer text spanning a few lines.}
+ % \def\Sample{\sample\ \sample\par\sample}
+ Some text before the list.
+ \begin{tasks}
+ \task \Sample
+ \task \Sample
+ \task \Sample
+ \end{tasks}
+ And also some text after it.
+\end{example}
+
+The environment takes the optional argument \darg{num of columns} with which
+the number of columns used by the environment is specified.
+\begin{example}
+ \begin{tasks}(2)
+ \task \Sample
+ \task \sample\ \sample
+ \task \sample
+ \task \Sample
+ \task \sample\par\sample
+ \end{tasks}
+\end{example}
+
+\subsection{Items Spanning More Than One Column}
+Sometimes it may come in handy if an item is allowed to span more than one
+column. \Tasks\sinceversion{0.10} supports items using the remaining space by
+adding an optional\label{optional-star} star to \cs{task}:
+\begin{example}
+ \begin{tasks}(3)
+ \task \sample
+ \task* \sample
+ \task* \sample
+ \task \sample
+ \task \sample
+ \end{tasks}
+\end{example}
+
+\Tasks\sinceversion{0.10} also supports items that span \emph{all} columns in
+any case by adding an optional bang\label{optional-bang} to \cs{task}.
+\begin{example}
+ \begin{tasks}(3)
+ \task \sample
+ \task! \sample
+ \task! \sample
+ \task \sample
+ \task \sample
+ \end{tasks}
+\end{example}
+
+The optional star has itself an optional argument with parentheses where you
+can specify the number of columns the item is supposed to span:\label{debug}
+\begin{example}
+ \settasks{debug}
+ \begin{tasks}(4)
+ \task the first
+ \task the second
+ \task the third
+ \task the fourth
+ \task*(3) the fifth item is way too long for this and needs three columns
+ \task the sixth
+ \task the seventh
+ \task*(2) the eighth item is way too long for this and needs two columns
+ \task the nineth
+ \task the tenth
+ \end{tasks}
+\end{example}
+If there are not enough columns left (say two columns but you said
+\cs{task}\sarg\Darg{3}) the argument is ignored and the maximum number of
+remaining columns is used (two in case of our example).
+
+Both optional star and optional bang can be combined with the optional
+argument for a custom label:
+\begin{example}
+ \begin{tasks}(3)
+ \task \sample
+ \task* \sample
+ \task*[(x)] \sample
+ \task \sample
+ \task \sample
+ \end{tasks}
+\end{example}
+
+Forcing a new item line manually is also possible\sinceversion{0.9} using the
+following command:
+\begin{commands}
+ \command{startnewitemline}
+ Introduce a new line in a \env{tasks} environment.
+\end{commands}
+While this works it also needs a bit of care since the width of the items
+doesn't change which means in order to use the full width you'd have to use
+trickery like \cs*{rlap} which then means the danger of the item text sticking
+into the margin.
+
+\begin{example}
+ \begin{tasks}(4)
+ \task the first
+ \task the second
+ \task the third
+ \task the fourth
+ \task \rlap{the fifth item is way too long for this so we start a new row}
+ \startnewitemline
+ \task the sixth
+ \task the seventh
+ \task \rlap{the eighth item also is too long} \startnewitemline
+ \task the nineth
+ \task the tenth
+ \end{tasks}
+\end{example}
+
+\section{Available Options}\label{sec:tasks:options}
+
+The \Tasks\ package does not have any package options\changedversion{0.10}.
+
+The environment \env{tasks} has a number of options, though, namely the
+following ones that can be set using a setup command:
+\begin{commands}
+ \command{settasks}[\marg{options}]
+ Setup command for \Tasks.
+\end{commands}
+\begin{options}
+ \keyval{style}{instance}\Default
+ Choose the instance to be used. Read more on this in
+ section~\ref{sec:tasks}.
+ \keyval{label-format}{code}\Default
+ \changedversion{1.1a}Can be used to apply a formatting like, \eg,
+ \cs*{bfseries} to the labels. This may be code accepting the item as
+ mandatory argument.
+ \keyval{label}{code}\Default{\cs*{alph}\code{*)}}
+ \changedversion{1.0}Sets a custom label. The \code{*} is replaced by
+ \Marg{task}. This is heavily inspired by
+ \pkg{enumitem}'s~\cite{pkg:enumitem} \code{label} option.
+ \keyval{label-width}{dim}\Default{1em}
+ Sets the width of the item labels.
+ \keyval{label-offset}{dim}\Default{.3333em}
+ \sinceversion{0.7}Sets the offset, \ie, the distance between label and
+ item.
+ \keyval{item-format}{code}\Default
+ \sinceversion{0.11}Can be used to apply a formatting like, \eg,
+ \cs*{bfseries} to the items. This may be code accepting the item as
+ mandatory argument.
+ \keyval{item-indent}{dim}\Default{2.5em}
+ \sinceversion{0.9a}The indent of an item, \ie, the horizontal space
+ available for both label and label-offset. If
+ \[
+ \text{\code{indent}} =
+ \text{\code{label-width}} + \text{\code{label-offset}}
+ \]
+ the label will align with the textblock above (if
+ \keyis{label-align}{left} is set). Please see figure~\ref{fig:lengths}
+ for a sketch of the available lengths and how they are set.
+ \keyval{column-sep}{dim}\Default{0pt}
+ \sinceversion{0.10}A horizontal length that is inserted between columns ot
+ items.
+ \keychoice{label-align}{left,right,center}\Default{left}
+ \sinceversion{0.7}Determines how the labels are aligned within the
+ label-box whose width is set with \option{label-width}.
+ \keyval{before-skip}{skip}\Default{0pt}
+ Sets the skip before the list.
+ \keyval{after-skip}{skip}\Default{0pt}
+ Sets the skip after the list.
+ \keyval{after-item-skip}{skip}\Default{1ex plus 1ex minus 1ex}
+ \sinceversion{0.9}This vertical skip is inserted between rows of items.
+ \keybool{resume}\Default{false}
+ The enumeration will resume from a previous \env{tasks} environment. In
+ order to use this option properly you shouldn't mix different \env{tasks}
+ environments that both count their items.
+ \keyval{start}{integer}\Default{1}
+ \sinceversion{1.1}Set the starting value with which the list starts
+ counting.
+ \keyval{counter}{counter}\Default{task}
+ \sinceversion{1.2}The counter to be used to count the items.
+ \keybool{debug}\Default{false}
+ \sinceversion{0.10}If set to true \cs*{fboxsep} is set to \code{0pt}
+ inside the \env{tasks} environment and \cs*{fbox} is used to draw a frame
+ around the label boxes and the item boxes.
+\end{options}
+
+\begin{figure}
+ \centering
+ \begin{tikzpicture}[every node/.style={font=\footnotesize},scale=.5]
+ \coordinate (itemedge1) at (2,2) ;
+ \coordinate (itemedge2) at (13,2) ;
+ \draw
+ (itemedge1) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
+ \draw
+ (itemedge1) ++(-.5,0) coordinate(labeledge1)
+ -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
+ \draw (itemedge1) ++(-2,0) -- ++(0,-2) ;
+ \draw
+ (itemedge2) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
+ \draw
+ (itemedge2) ++(-.3,0) coordinate(labeledge2)
+ -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
+ \draw (itemedge2) ++(-2,0) -- ++(0,-2) ;
+ \draw[<->] (itemedge2) ++(-2,0) --node[above]{column sep} ++(-1,0) ;
+ \draw[<->] (0,-.5) --node[below]{item indent} (2,-.5) ;
+ \draw[<->] (2,-.5) --node[below]{item width} (10,-.5) ;
+ \draw[<->] (labeledge1) ++(0,1) --node[above]{label width} ++(-1,0) ;
+ \draw[<->] (labeledge1) --node[above]{label offset} ++(.5,0) ;
+ \end{tikzpicture}
+ \caption{A visual representation of the used lengths.}
+ \label{fig:lengths}
+\end{figure}
+
+Now the same list as above but with three columns and a different label:
+\begin{example}
+ \begin{tasks}[label=(\roman*),label-width=4ex](2)
+ \task \Sample
+ \task \sample\ \sample
+ \task \sample
+ \task \Sample
+ \task \sample\par\sample
+ \end{tasks}
+\end{example}
+
+Let's use it inside a question, \ie, inside \pkg{xsim}'s \env{exercise}
+environment~\cite{pkg:xsim}:
+\begin{example}
+ % since settings are local the following ones will be lost
+ % outside this example;
+ \settasks{
+ label = \theexercise.\arabic* ,
+ item-indent = 2em ,
+ label-width = 2em ,
+ label-offset = 0pt
+ }
+ \begin{exercise}
+ I have these two tasks for you. Shall we begin?
+ \begin{tasks}(2)
+ \task The first task: easy!
+ \task The second task: even more so!
+ \end{tasks}
+ \end{exercise}
+ \begin{solution}[print]
+ Now, let's see\ldots\ ah, yes:
+ \begin{tasks}
+ \task This is the first solution. Told you it was easy.
+ \task This is the second solution. And of course you knew that!
+ \end{tasks}
+ \end{solution}
+\end{example}
+
+Finally let's see what the \option{debug} option does (you could see it
+already on page~\pageref{debug}):
+\begin{example}
+ \settasks{debug}
+ \begin{tasks}(2)
+ \task \Sample
+ \task \Sample
+ \end{tasks}
+\end{example}
+
+\section{Available Instances}\label{sec:tasks:instances}
+There are currently three additional instances for the \code{tasks} object
+available:
+\begin{description}
+ \item[itemize] uses \cs*{labelitemi} as labels.
+ \item[enumerate] enumerates the items with 1., 2., \ldots
+ % \item[multiplechoice] a --~well~-- `multiple choice' list.
+\end{description}
+\begin{example}
+ \begin{tasks}[style=itemize](2)
+ \task that's just how\ldots
+ \task \ldots we expected
+ \end{tasks}
+ \begin{tasks}[style=enumerate](2)
+ \task that's just how\ldots
+ \task \ldots we expected
+ \end{tasks}
+\end{example}
+ % \begin{tasks}[style=multiplechoice](2)
+ % \task that's just how\ldots
+ % \task \ldots we expected
+ % \end{tasks}
+
+\section{Custom Labels}
+If you want to change a single label inside a list, you can use the optional
+argument of \cs{task}. This will temporarily overwrite the default label.
+\begin{example}[side-by-side]
+ \begin{tasks}[style=itemize]
+ \task a standard item
+ \task another one
+ \task[+] a different one
+ \task and another one
+ \end{tasks}
+\end{example}
+
+\begin{commands}
+ \command{tasksifmeasuringTF}[\marg{true}\marg{false}]
+ \sinceversion{1.2}This command used inside a label checks if the label is
+ typeset for measuring its width or if it is typeset \enquote{for
+ real}. Might be useful sometimes. There are also the variants
+ \cs{tasksifmeasuringT} and \cs{tasksifmeasuringF}.
+\end{commands}
+
+\section{New \code{tasks}-like Environments}
+It is possible to add custom environments that work like the \code{tasks}
+environment.
+\begin{commands}
+ \command{NewTasksEnvironment}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
+ Define environment \meta{name} that uses \meta{separator} to introduce a
+ new item. Default for \meta{separator} is \cs{task}, default for
+ \meta{cols} is \code{1}. The \meta{options} are the ones described in
+ section~\ref{sec:tasks:options}.
+ \command{RenewTasksEnvironment}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
+ Renew environment previously defined with \cs{NewTasksEnvironment}.
+\end{commands}
+The \env{tasks} environment is defined as follows:
+\begin{sourcecode}
+ \NewTasksEnvironment{tasks}
+\end{sourcecode}
+
+The separator does not have to be a control sequence:
+\begin{example}
+ % preamble:
+ % \usepackage{fontawesome}
+ \NewTasksEnvironment[label=\faThumbsOUp,label-width=15pt]{done}[*]
+ \begin{done}
+ * First task
+ * Second task
+ \end{done}
+\end{example}
+Although this might seem handy or even nice I strongly advice against using
+something different than a command sequence. Remember that the items will be
+split at \emph{every} occurrence of the separator. So in order to use the
+separator (here for example for a starred variant of a command) within an item
+it has to be hidden in braces. This is avoided of you use a command sequence
+which even doesn't have to be defined.
+
+Please also keep in mind that the separator still has an optional star
+argument (see~\pageref{optional-star}), an optional bang argument and the
+standard optional argument. Using \code{*} will prevent the optional star
+argument.
+
+\begin{example}
+ % preamble:
+ % \usepackage{fontawesome}
+ \NewTasksEnvironment[label=\faThumbsOUp,label-width=15pt]{done}[*]
+ \begin{done}(3)
+ * First task
+ * Second task
+ *! Third task spanning the full width available
+ * Fourth task
+ \end{done}
+\end{example}
+
+\section{Styling \Tasks}
+\Tasks\ uses \pkg{xtemplate} to declare additional instances for the lists.
+
+\subsection{The \code{tasks} Object}\label{sec:tasks}
+The object that's defined by \Tasks\ is the `tasks' object. This time there
+are four instances available for the one template (again `default') that was
+defined.
+
+\subsubsection{Available Options}
+This section only lists the options that can be used when defining an instance
+of the `default' template. The following subsections will give some examples
+of their usage.
+
+\begin{sourcecode}
+ \DeclareTemplateInterface{tasks}{default}{3}
+ {
+ % option : type = default
+ label : tokenlist = \alph*) ,
+ indent : length = 2.5em ,
+ label-format : tokenlist ,
+ label-width : length = 1em ,
+ label-offset : length = .3333em ,
+ after-item-skip : skip = 1ex plus 1ex minus 1ex
+ }
+\end{sourcecode}
+
+\subsubsection{Predefined Instances}
+This is rather brief this time:
+\begin{sourcecode}
+ % alphabetize: a) b) c)
+ \DeclareInstance{tasks}{alphabetize}{default}{}
+ % itemize
+ \DeclareInstance {tasks} {itemize} {default}
+ {
+ label-width = 1.125em ,
+ label = \labelitemi
+ }
+ % enumerate:
+ \DeclareInstance {tasks} {enumerate} {default}
+ { label = \arabic*. }
+\end{sourcecode}
+
+\clearpage
+\printbibliography
+
+\end{document}
Binary files old/doc/latex/tasks/tasks_en.pdf and new/doc/latex/tasks/tasks_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tasks/tasks_en.tex new/doc/latex/tasks/tasks_en.tex
--- old/doc/latex/tasks/tasks_en.tex 2016-05-04 23:01:14.000000000 +0200
+++ new/doc/latex/tasks/tasks_en.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,581 +0,0 @@
-% --------------------------------------------------------------------------
-% the TASKS package
-%
-% Horizontal columned lists.
-%
-% --------------------------------------------------------------------------
-% Clemens Niederberger
-% Web: https://github.com/cgnieder/tasks/
-% E-Mail: contact@mychemistry.eu
-% --------------------------------------------------------------------------
-% Copyright 2013-2014 Clemens Niederberger
-%
-% 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 Clemens Niederberger.
-% --------------------------------------------------------------------------
-% If you have any ideas, questions, suggestions or bugs to report, please
-% feel free to contact me.
-% --------------------------------------------------------------------------
-\documentclass[load-preamble+]{cnltx-doc}
-\usepackage{tasks}
-
-\setcnltx{
- package = {tasks} ,
- authors = Clemens Niederberger ,
- email = {contact@mychemistry.eu} ,
- url = {https://github.com/cgnieder/tasks/} ,
- info = {create horizontal columned lists} ,
- add-cmds = {
- checkedchoicebox ,
- choicebox,
- NewTasks,
- settasks,
- startnewitemline ,
- task
- } ,
- add-silent-cmds = {
- choice, correct,
- DeclareInstance, DeclareTemplateInterface,
- leftthumbsup,
- sample, Sample
- }
-}
-
-\BeforeBeginEnvironment{example}{\vspace{\baselineskip}}
-\AfterEndEnvironment{example}{\vspace{\baselineskip}}
-\BeforeBeginEnvironment{sourcecode}{\vspace{\baselineskip}}
-\AfterEndEnvironment{sourcecode}{\vspace{\baselineskip}}
-
-\newpackagename\ExSheets{ExSheets}
-\newpackagename\ExSheetslistings{ExSheets-listings}
-\newpackagename\cntformats{cntformats}
-\newpackagename\Tasks{tasks}
-
-% ----------------------------------------------------------------------------
-% other packages, bibliography, index
-\usepackage{xcoffins,tikz,wasysym,enumitem,booktabs,siunitx}
-\usepackage[accsupp]{acro}
-\DeclareAcronym{id}{
- short = id ,
- long = Identifier ,
- format = \scshape ,
- pdfstring = ID ,
- accsupp = ID
-}
-
-\usepackage{filecontents}
-\usepackage{csquotes}
-
-
-
-% ----------------------------------------------------------------------------
-% example definitions that have to be done in the preamble:
-\usepackage{exsheets}
-\usepackage{dingbat}
-\NewTasks[style=multiplechoice]{multiplechoice}[\choice](3)
-\newcommand*\correct{\PrintSolutionsTF{\checkedchoicebox}{\choicebox}}
-
-
-\newcommand*\sample{This is some sample text we will use to create a somewhat
- longer text spanning a few lines.}
-\newcommand*\Sample{\sample\ \sample\par\sample}
-
-\begin{document}
-
-\section{Motivation}
-Originally \Tasks\ has been an integral part of the
-\ExSheets\changedversion{0.7} package. However, users told me that it indeed
-could be useful to have it as a stand-alone package not having to load the
-whole \ExSheets\ beast just for having the \env{tasks} environment available.
-Since I agree with this the environment has been extracted into a package if
-its own, \Tasks. Since then \Tasks{} has been distributed as a package of its
-own but as part of the \ExSheets{} bundle\changedversion{0.10}. With v0.10 I
-decided to make it a completely independent package. So the relation to
-\ExSheets{} only is a historical one.
-
-The reason for the \env{tasks} environment is an unwritten agreement in German
-maths textbooks (exspecially in (junior) high school textbooks) to organize
-exercises in columns counting horizontally rather than vertically. That is
-what \code{tasks} primarily is for. If you don't need this feature you're
-better off using traditional \LaTeX{} lists and the \pkg{enumitem} package for
-customization.
-
-\section{License and Requirements}\label{sec:license}
-\license
-
-\Tasks\ requires the \bnd{l3kernel}~\cite{bnd:l3kernel} bundle,
-\needpackage{xparse}, \pkg{xtemplate} and \needpackage{l3keys2e} which are
-part of the \bnd{l3packages}~\cite{bnd:l3packages} bundle,
-\pkg{epic}~\cite{pkg:epic}, \pkg{cntformats}~\cite{pkg:cntformats}, and
-\pkg{environ}~\cite{pkg:environ}.
-
-
-\section{How it works}
-\subsection{The Basics}
-The \env{tasks} environment is similar to a list like \env{enumerate} but not
-the same. Here are some of the differences:
-\begin{itemize}
- \item A first difference: there is no pagebreak possible inside an item but
- only between items.
- \item A second difference: the enumeration default is a), b), c) \ldots
- \item A third difference: the body of the \env{tasks} environment is split
- at \emph{every} occurrence of the item separator. For this reason the
- default separator is not \cs*{item} but \cs{task} so it is unique to this
- environment only. This directly leads to\ldots
- \item \ldots{} a fourth difference: the \env{tasks} environment cannot be
- nested. You can, however, use an \env*{itemize} environment or another
- \enquote{real} list in it.
- \item A fifth difference: verbatim material cannot be used in it. You'll
- have to use \cs*{string}, \cs*{texttt} or \cs*{detokenize}. If this
- won't suffice then don't use \env{tasks}.
-% \item A sixth difference: %footnotes
-\end{itemize}
-
-\begin{environments}
- \environment{tasks}[\oarg{options}\darg{num of columns}]
- List like environment where the single items are introduced with
- \cs{task}.
-\end{environments}
-Let's see an example:
-\begin{example}
- % \Sample is defined to contain some sample text:
- % \def\sample{This is some sample text we will use to create a somewhat
- % longer text spanning a few lines.}
- % \def\Sample{\sample\ \sample\par\sample}
- Some text before the list.
- \begin{tasks}
- \task \Sample
- \task \Sample
- \task \Sample
- \end{tasks}
- And also some text after it.
-\end{example}
-
-The environment takes the optional argument \darg{num of columns} with which
-the number of columns used by the environment is specified.
-\begin{example}
- \begin{tasks}(2)
- \task \Sample
- \task \sample\ \sample
- \task \sample
- \task \Sample
- \task \sample\par\sample
- \end{tasks}
-\end{example}
-
-\subsection{Items Spanning More Than One Column}
-Sometimes it may come in handy if an item is allowed to span more than one
-column. \Tasks\sinceversion{0.10} supports items using the remaining space by
-adding an optional\label{optional-star} star to \cs{task}:
-\begin{example}
- \begin{tasks}(3)
- \task \sample
- \task* \sample
- \task* \sample
- \task \sample
- \task \sample
- \end{tasks}
-\end{example}
-
-\Tasks\sinceversion{0.10} also supports items that span \emph{all} columns in
-any case by adding an optional bang\label{optional-bang} to \cs{task}.
-\begin{example}
- \begin{tasks}(3)
- \task \sample
- \task! \sample
- \task! \sample
- \task \sample
- \task \sample
- \end{tasks}
-\end{example}
-
-The optional star has itself an optional argument with parentheses where you
-can specify the number of columns the item is supposed to span:\label{debug}
-\begin{example}
- \settasks{debug}
- \begin{tasks}(4)
- \task the first
- \task the second
- \task the third
- \task the fourth
- \task*(3) the fifth item is way too long for this and needs three columns
- \task the sixth
- \task the seventh
- \task*(2) the eighth item is way too long for this and needs two columns
- \task the nineth
- \task the tenth
- \end{tasks}
-\end{example}
-If there are not enough columns left (say two columns but you said
-\cs{task}\sarg\Darg{3}) the argument is ignored and the maximum number of
-remaining columns is used (two in case of our example).
-
-Both optional star and optional bang can be combined with the optional
-argument for a custom label:
-\begin{example}
- \begin{tasks}(3)
- \task \sample
- \task* \sample
- \task*[(x)] \sample
- \task \sample
- \task \sample
- \end{tasks}
-\end{example}
-
-Forcing a new item line manually is also possible\sinceversion{0.9} using the
-following command:
-\begin{commands}
- \command{startnewitemline}
- Introduce a new line in a \env{tasks} environment.
-\end{commands}
-\begin{example}
- \begin{tasks}(4)
- \task the first
- \task the second
- \task the third
- \task the fourth
- \task \rlap{the fifth item is way too long for this so we start a new row}
- \startnewitemline
- \task the sixth
- \task the seventh
- \task \rlap{the eighth item also is too long} \startnewitemline
- \task the nineth
- \task the tenth
- \end{tasks}
-\end{example}
-
-While this works it also needs a bit of care since the width of the items
-doesn't change which means in order to use the full width you'd have to use
-trickery like \cs*{rlap} which then means the danger of the item text sticking
-into the margin\ldots
-
-\section{Available Options}\label{sec:tasks:options}
-
-The \Tasks{} package does not have any package options\changedversion{0.10}.
-
-The environment \env{tasks} has a number of options, though, namely the
-following ones that can be set using a setup command:
-\begin{commands}
- \command{settasks}[\marg{options}]
- Setup command for \Tasks.
-\end{commands}
-\begin{options}
- \keyval{style}{instance}\Default
- Choose the instance to be used. Read more on this in
- section~\ref{sec:tasks}.
- \keyval{counter-format}{counter specs}\Default{tsk[a])}
- \sinceversion{0.9}Sets a custom label. The letters \code{tsk} are
- replaced with the task-counter. An optional argument directly following
- these letters specifies the counter format: \code{1}: \cs*{arabic},
- \code{a}: \cs*{alph}, \code{A}: \cs*{Alph}, \code{r}: \cs*{roman} and
- \code{R}: \cs*{Roman}.
- \keyval{label-format}{code}\Default
- \changedversion{0.9}Can be used to apply a formatting like, \eg,
- \cs*{bfseries} to the labels.
- \keyval{label}{code}\Default
- \changedversion{0.9}Overwrite the automatic label to a custom one.
- \keyval{label-width}{dim}\Default{1em}
- Sets the width of the item labels.
- \keyval{label-offset}{dim}\Default{.3333em}
- \sinceversion{0.7}Sets the offset, \ie, the distance between label and
- item.
- \keyval{item-format}{code}\Default
- \sinceversion{0.11}Can be used to apply a formatting like, \eg,
- \cs*{bfseries} to the items. This may be a macro accepting the item as
- mandatory argument.
- \keyval{item-indent}{dim}\Default{2.5em}
- \sinceversion{0.9a}The indent of an item, \ie, the horizontal space
- available for both label and label-offset. If
- \[
- \text{\code{indent}} =
- \text{\code{label-width}} + \text{\code{label-offset}}
- \]
- the label will align with the textblock above (if
- \keyis{label-align}{left} is set). Please see figure~\ref{fig:lengths}
- for a sketch of the available lengths and how they are set.
- \keyval{column-sep}{dim}\Default{0pt}
- \sinceversion{0.10}A horizontal length that is inserted between columns ot
- items.
- \keychoice{label-align}{left,right,center}\Default{left}
- \sinceversion{0.7}Determines how the labels are aligned within the
- label-box whose width is set with \option{label-width}.
- \keyval{before-skip}{skip}\Default{0pt}
- Sets the skip before the list.
- \keyval{after-skip}{skip}\Default{0pt}
- Sets the skip after the list.
- \keyval{after-item-skip}{skip}\Default{1ex plus 1ex minus 1ex}
- \sinceversion{0.9}This vertical skip is inserted between rows of items.
- \keybool{resume}\Default{false}
- The enumeration will resume from a previous \env{tasks} environment. In
- order to use this option properly you shouldn't mix different \env{tasks}
- environments that both count their items.
- \keybool{debug}\Default{false}
- \sinceversion{0.10}If set to true \cs*{fboxsep} is set to \code{0pt}
- inside the \env{tasks} environment and \cs*{fbox} is used to draw a frame
- around the label boxes and the item boxes.
-\end{options}
-
-\begin{figure}
- \centering
- \begin{tikzpicture}[every node/.style={font=\footnotesize},scale=.5]
- \coordinate (itemedge1) at (2,2) ;
- \coordinate (itemedge2) at (13,2) ;
- \draw
- (itemedge1) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
- \draw
- (itemedge1) ++(-.5,0) coordinate(labeledge1)
- -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
- \draw (itemedge1) ++(-2,0) -- ++(0,-2) ;
- \draw
- (itemedge2) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
- \draw
- (itemedge2) ++(-.3,0) coordinate(labeledge2)
- -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
- \draw (itemedge2) ++(-2,0) -- ++(0,-2) ;
- \draw[<->] (itemedge2) ++(-2,0) --node[above]{column sep} ++(-1,0) ;
- \draw[<->] (0,-.5) --node[below]{item indent} (2,-.5) ;
- \draw[<->] (2,-.5) --node[below]{item width} (10,-.5) ;
- \draw[<->] (labeledge1) ++(0,1) --node[above]{label width} ++(-1,0) ;
- \draw[<->] (labeledge1) --node[above]{item offset} ++(.5,0) ;
- \end{tikzpicture}
- \caption{A visual representation of the used lengths.}
- \label{fig:lengths}
-\end{figure}
-
-Now the same list as above but with three columns and a different label:
-\begin{example}
- \begin{tasks}[counter-format=(tsk[r]),label-width=4ex](2)
- \task \Sample
- \task \sample\ \sample
- \task \sample
- \task \Sample
- \task \sample\par\sample
- \end{tasks}
-\end{example}
-% \begin{tasks}[counter-format=(tsk[r]),label-width=4ex](3)
-% \task \Sample
-% \task \sample\ \sample
-% \task \sample
-% \task \Sample
-% \task \sample\par\sample
-% \end{tasks}
-
-Let's use it inside a question, \ie, inside \ExSheets' \env{question}
-environment:
-\begin{example}
- % since settings are local the following ones will be lost
- % outside this example;
- \settasks{
- counter-format = qu.tsk ,
- item-indent = 2em ,
- label-width = 2em ,
- label-offset = 0pt
- }
- \begin{question}[type=exam]{4}
- I have these two tasks for you. Shall we begin?
- \begin{tasks}(2)
- \task The first task: easy!
- \task The second task: even more so!
- \end{tasks}
- \end{question}
- \begin{solution}[print]
- Now, let's see\ldots\ ah, yes:
- \begin{tasks}
- \task This is the first solution. Told you it was easy.
- \task This is the second solution. And of course you knew that!
- \end{tasks}
- \end{solution}
-\end{example}
-
-Finally let's see what the \option{debug} option does (you could see it
-already on page~\pageref{debug}):
-\begin{example}
- \settasks{debug}
- \begin{tasks}(2)
- \task \Sample
- \task \Sample
- \end{tasks}
-\end{example}
-
-\section{Available Instances}\label{sec:tasks:instances}
-There are currently three additional instances for the \code{tasks} object
-available:
-\begin{description}
- \item[itemize] uses \cs*{labelitemi} as labels.
- \item[enumerate] enumerates the items with 1., 2., \ldots
- \item[multiplechoice] a --~well~-- `multiple choice' list.
-\end{description}
-\begin{example}
- \begin{tasks}[style=itemize](2)
- \task that's just how\ldots
- \task \ldots we expected
- \end{tasks}
- \begin{tasks}[style=enumerate](2)
- \task that's just how\ldots
- \task \ldots we expected
- \end{tasks}
- \begin{tasks}[style=multiplechoice](2)
- \task that's just how\ldots
- \task \ldots we expected
- \end{tasks}
-\end{example}
-
-\section{Custom Labels}
-If you want to change a single label inside a list, you can use the optional
-argument of \cs{task}. This will temporarily overwrite the default label.
-\begin{example}[side-by-side]
- \begin{tasks}[style=itemize]
- \task a standard item
- \task another one
- \task[+] a different one
- \task and another one
- \end{tasks}
-\end{example}
-
-\section{New Tasks}
-It is possible to add custom environments that work like the \code{tasks}
-environment.
-\begin{commands}
- \command{NewTasks}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
- Define environment \meta{name} that uses \meta{separator} to introduce a
- new item. Default for \meta{separator} is \cs{task}, default for
- \meta{cols} is \code{1}. The \meta{options} are the ones described in
- section~\ref{sec:tasks:options}.
- \command{RenewTasks}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
- Renew environment previously defined with \cs{NewTasks}.
-\end{commands}
-The \env{tasks} environment is defined as follows:
-\begin{sourcecode}
- \NewTasks{tasks}
-\end{sourcecode}
-
-The separator does not have to be a control sequence:
-\begin{example}
- % preamble:
- % \usepackage{dingbat}
- \NewTasks[label=\footnotesize\leftthumbsup,label-width=1.3em]{done}[*]
- \begin{done}
- * First task
- * Second task
- \end{done}
-\end{example}
-Although this might seem handy or even nice I strongly advice against using
-something different than a command sequence. Remember that the items will be
-split at \emph{every} occurrence of the separator. So in order to use the
-separator (here for example for a starred variant of a command) within an item
-it has to be hidden in braces. This is avoided of you use a command sequence
-which even doesn't have to be defined.
-
-Please also keep in mind that the separator still has an optional star
-argument (see~\pageref{optional-star}), an optional bang argument and the
-standard optional argument. Using \code{*} will prevent the optional star
-argument.
-
-\begin{example}
- % preamble:
- % \usepackage{dingbat}
- \NewTasks[label=\footnotesize\leftthumbsup,label-width=1.3em]{done}[*]
- \begin{done}(3)
- * First task
- * Second task
- *! Third task spanning the full width available
- * Fourth task
- \end{done}
-\end{example}
-
-Let's say you want a \env*{multiplechoice} environment that has three columns
-in its default state. You could do something like this:
-\begin{example}
- % preamble:
- % \NewTasks[style=multiplechoice]{multiplechoice}[\choice](3)
- % \newcommand*\correct{\PrintSolutionsTF{\checkedchoicebox}{\choicebox}}
- %
- % \PrintSolutionsTF and the {question} environment are provided
- % by the ExSheets package
- \begin{question}
- \begin{multiplechoice}
- \choice First choice
- \choice Second choice
- \choice[\correct] Third choice
- \end{multiplechoice}
- \end{question}
- \begin{solution}[print]
- \begin{multiplechoice}
- \choice First choice
- \choice Second choice
- \choice[\correct] Third choice
- \end{multiplechoice}
- \end{solution}
-\end{example}
-
-The last example shows you two additional commands:
-\begin{commands}
- \command{choicebox}[\quad\choicebox]
- Print an empty square.
- \command{checkedchoicebox}[\quad\checkedchoicebox]
- Print a crossed-out square.
-\end{commands}
-
-
-\section{Styling \Tasks}
-Equivalent to the styling of \ExSheets\ \Tasks\ uses \pkg{xtemplate} to
-declare additional instances for the lists.
-
-\subsection{The \code{tasks} Object}\label{sec:tasks}
-The object that's defined by \Tasks\ is the `tasks' object. This time there
-are four instances available for the one template (again `default') that was
-defined.
-
-\subsubsection{Available Options}
-This section only lists the options that can be used when defining an instance
-of the `default' template. The following subsections will give some examples
-of their usage.
-
-\begin{sourcecode}
- \DeclareTemplateInterface{tasks}{default}{3}
- {
- % option : type = default
- enumerate : boolean = true ,
- label : tokenlist ,
- indent : length = 2.5em ,
- counter-format : tokenlist = tsk[a]) ,
- label-format : tokenlist ,
- label-width : length = 1em ,
- label-offset : length = .3333em ,
- after-item-skip : skip = 1ex plus 1ex minus 1ex
- }
-\end{sourcecode}
-
-\subsubsection{Predefined Instances}
-This is rather brief this time:
-\begin{sourcecode}
- % ALPHABETIZE: a) b) c)
- \DeclareInstance{tasks}{alphabetize}{default}{}
- % available when `load-tasks=true':
- % ITEMIZE:
- \DeclareInstance{tasks}{itemize}{default}
- {
- enumerate = false ,
- label-width = 1.125em
- }
- % ENUMERATE:
- \DeclareInstance{tasks}{enumerate}{default}
- { counter-format = tsk. }
- % MULTIPLECHOICE:
- \DeclareInstance{tasks}{multiplechoice}{default}
- {
- enumerate = false ,
- label = \choicebox ,
- }
-\end{sourcecode}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tasks.doc.tlpobj new/tlpkg/tlpobj/tasks.doc.tlpobj
--- old/tlpkg/tlpobj/tasks.doc.tlpobj 2019-02-28 04:06:46.000000000 +0100
+++ new/tlpkg/tlpobj/tasks.doc.tlpobj 2020-03-22 01:55:34.000000000 +0100
@@ -1,9 +1,9 @@
name tasks.doc
category Package
-revision 41851
+revision 54449
shortdesc doc files of tasks
relocated 1
-docfiles size=119
+docfiles size=120
RELOC/doc/latex/tasks/README
- RELOC/doc/latex/tasks/tasks_en.pdf
- RELOC/doc/latex/tasks/tasks_en.tex
+ RELOC/doc/latex/tasks/tasks-manual.pdf
+ RELOC/doc/latex/tasks/tasks-manual.tex
++++++ tasks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tasks/tasks.cfg new/tex/latex/tasks/tasks.cfg
--- old/tex/latex/tasks/tasks.cfg 2016-05-04 23:01:14.000000000 +0200
+++ new/tex/latex/tasks/tasks.cfg 2020-03-21 22:17:24.000000000 +0100
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% the TASKS package
%
-% Horizontal columned lists.
+% lists with columns filled horizontally
%
% --------------------------------------------------------------------------
% Clemens Niederberger
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013-2016 Clemens Niederberger
+% Copyright 2013--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,29 +25,5 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% further instances for the `tasks' environment
-\ProvidesFile{tasks.cfg}
- [%
- \csname c_tasks_date_tl\endcsname\space
- v\csname c_tasks_version_tl\endcsname\space
- tasks instances%
- ]
-
-% ITEMIZE:
-\DeclareInstance {tasks} {itemize} {default}
- {
- enumerate = false ,
- label-width = 1.125em
- }
-
-% ENUMERATE:
-\DeclareInstance {tasks} {enumerate} {default}
- { counter-format = tsk. }
-
-% MULTIPLECHOICE
-\DeclareInstance {tasks} {multiplechoice} {default}
- {
- enumerate = false ,
- label = \choicebox
- }
-
+%
+% fill this file with your custom definitions:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tasks/tasks.sty new/tex/latex/tasks/tasks.sty
--- old/tex/latex/tasks/tasks.sty 2016-08-15 00:00:01.000000000 +0200
+++ new/tex/latex/tasks/tasks.sty 2020-03-21 22:17:24.000000000 +0100
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% the TASKS package
%
-% Horizontal columned lists.
+% lists with columns filled horizontally
%
% --------------------------------------------------------------------------
% Clemens Niederberger
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013-2016 Clemens Niederberger
+% Copyright 2013--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,63 +25,110 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\RequirePackage { expl3 , xparse , epic , cntformats , xtemplate , environ }
+\RequirePackage {expl3,xparse,xtemplate}
\ExplSyntaxOn
-\tl_const:Nn \c_tasks_name_tl {tasks}
-\tl_const:Nn \c_tasks_date_tl {2016/08/13}
-\tl_const:Nn \c_tasks_version_tl {0.12}
-\tl_const:Nn \c_tasks_info_tl {Horizontal columned lists}
-
+\tl_const:Nn \c_tasks_date_tl {2020/03/21}
+\tl_const:Nn \c_tasks_version_major_number_tl {1}
+\tl_const:Nn \c_tasks_version_minor_number_tl {2}
+\tl_const:Nn \c_tasks_version_subrelease_tl {}
+\tl_const:Nx \c_tasks_version_number_tl
+ {
+ \c_tasks_version_major_number_tl .
+ \c_tasks_version_minor_number_tl
+ }
+\tl_const:Nx \c_tasks_version_tl
+ {
+ \c_tasks_version_number_tl
+ \c_tasks_version_subrelease_tl
+ }
+\tl_const:Nn \c_tasks_info_tl {lists~ with~ columns~ filled~ horizontally}
+
\ProvidesExplPackage
- {\c_tasks_name_tl}
+ {tasks}
{\c_tasks_date_tl}
{\c_tasks_version_tl}
- {\c_tasks_info_tl \c_space_tl (CN)}
+ {\c_tasks_info_tl}
% --------------------------------------------------------------------------
% variants of kernel functions:
-\cs_generate_variant:Nn \tl_if_eq:nnTF { V }
-\cs_generate_variant:Nn \tl_if_eq:nnT { V }
+\cs_generate_variant:Nn \tl_if_eq:nnTF {V}
+\cs_generate_variant:Nn \tl_if_eq:nnT {V}
+\cs_generate_variant:Nn \coffin_attach:NnnNnnnn {NnnNx}
+\cs_generate_variant:Nn \tl_set_rescan:Nnn {NnV}
+\cs_generate_variant:Nn \tl_set:Nn {cV}
+\cs_generate_variant:Nn \hbox_set:Nn {NV}
+\cs_generate_variant:Nn \msg_warning:nnnn {nnV,nnnx}
+\cs_generate_variant:Nn \tl_replace_once:Nnn {Nne}
+
+% --------------------------------------------------------------------------
+\msg_new:nnn {tasks} {width-too-small}
+ {
+ The~ width~ of~ `#1'~ is~ too~ small~ \msg_line_context: .~
+ Please~ set~ it~ at~ least~ to~ #2 pt.
+ }
+
+\msg_new:nnn {tasks} {no-item}
+ {
+ You've~ placed \\ \\
+ #1 \\ \\
+ before~ the~ first~ #2~ \msg_line_context: .~ I~ will~ throw~ it~ away~
+ and~ ignore~ it~ for~ the~ rest~ of~ the~ list.
+ }
+
+\msg_new:nnn {tasks} {deprecated}
+ {
+ You've~ tried~ setting~ #1~ `#2'~ \msg_line_context: .~ However,~
+ #1~ `#2'~ is~ deprecated.~
+ \tl_if_blank:nF {#3} {Please~ use~ #1~ `#3'~ instead.~}
+ Refer~ to~ the~ manual~ for~ details.
+ }
+
+% --------------------------------------------------------------------------
+\cs_new_protected:Npn \tasks_deprecated:NN #1#2
+ {
+ \cs_undefine:N #1
+ \cs_new:Npn #1
+ { \msg_warning:nnnnn {tasks} {deprecated} {command} {#1} {#2} #2 }
+ }
% --------------------------------------------------------------------------
% variables:
\seq_new:N \l__tasks_seq
-\int_new:N \l__tasks_depth_int
-\int_new:N \g__tasks_int
\int_new:N \g__tasks_total_items_int
\int_new:N \l__tasks_columns_int
-\int_new:N \l__tasks_rows_int
+\int_new:N \g__tasks_rows_int
\int_new:N \g__tasks_current_col_num_int
\int_new:N \g__tasks_current_row_num_int
\int_new:N \l__tasks_item_columns_int
+\int_new:N \g__tasks_env_int
+\int_new:N \l__tasks_start_int
-\bool_new:N \l__tasks_enumerate_bool
\bool_new:N \l__tasks_resume_bool
\bool_new:N \l__tasks_load_tasks_bool
\bool_new:N \l__tasks_label_width_bool
\bool_new:N \l__tasks_item_indent_bool
\bool_new:N \l__tasks_label_offset_bool
\bool_new:N \l__tasks_custom_label_bool
+\bool_new:N \l__tasks_custom_label_format_bool
\bool_new:N \l__tasks_custom_after_item_skip_bool
\bool_new:N \l__tasks_debug_bool
\bool_new:N \l__tasks_item_full_line_bool
\bool_new:N \l__tasks_item_rest_of_line_bool
+\bool_new:N \l__tasks_measuring_bool
\tl_new:N \l__tasks_instance_tl
\tl_new:N \l__tasks_label_tl
\tl_new:N \l__tasks_custom_label_tl
-\tl_new:N \l__tasks_label_pattern_tl
-\tl_new:N \l__tasks_custom_label_pattern_tl
\tl_new:N \l__tasks_label_format_tl
\tl_new:N \l__tasks_custom_label_format_tl
+\tl_new:N \l__tasks_counter_tl
\tl_new:N \l__tasks_item_format_tl
\tl_new:N \l__tasks_custom_item_format_tl
\tl_new:N \l__tasks_item_fill_left_tl
\tl_new:N \l__tasks_item_fill_right_tl
\tl_new:N \l__tasks_label_align_tl
-% \tl_new:N \task
\tl_new:N \l__tasks_item_tl
\tl_new:N \l__tasks_tmp_label_tl
@@ -93,6 +140,9 @@
\dim_new:N \l__tasks_label_offset_dim
\dim_new:N \l__tasks_label_default_offset_dim
\dim_new:N \l__tasks_column_sep_dim
+\dim_new:N \l__tasks_correction_dim
+
+\dim_new:N \l__tasks_full_width_dim
\skip_new:N \l__tasks_after_item_skip
\skip_new:N \l__tasks_custom_after_item_skip
@@ -102,14 +152,15 @@
\coffin_new:N \l__tasks_item_coffin
\coffin_new:N \l__tasks_label_coffin
-\NewCounterPattern* [ tasks ] { task } { tsk }
-\ReadCounterFrom [ tasks ] { task } \g__tasks_int
+\newcounter {task}
% temporary variables:
\int_new:N \l__tasks_tmpa_int
\int_new:N \l__tasks_tmpb_int
\tl_new:N \l__tasks_tmpa_tl
\coffin_new:N \l__tasks_tmpa_coffin
+\box_new:N \l__tasks_tmpa_box
+\bool_new:N \l__tasks_tmpa_bool
\cs_new:Npn \__tasks_debug:n #1
{
@@ -118,37 +169,45 @@
{ \use:n {#1} }
}
-% --------------------------------------------------------------------------
-% collect the tasks:
-\cs_new_protected:Npn \__tasks_collect_tasks:nww #1#2 \end #3
+\prg_new_conditional:Npnn \tasks_if_measuring: {p,T,F,TF}
{
- \tl_put_right:Nn \l__tasks_body_tl {#1}
- \end {#3}
- \tl_if_eq:nnF {#1} {#3}
- { \__tasks_collect_tasks:nww {#1} }
+ \bool_if:NTF \l__tasks_measuring_bool
+ { \prg_return_true: }
+ { \prg_return_false: }
}
+\DeclareExpandableDocumentCommand \tasksifmeasuringTF {+m+m}
+ { \tasks_if_measuring:TF {#1} {#2} }
+
+\DeclareExpandableDocumentCommand \tasksifmeasuringT {+m}
+ { \tasks_if_measuring:T {#1} }
+
+\DeclareExpandableDocumentCommand \tasksifmeasuringF {+m}
+ { \tasks_if_measuring:F {#1} }
+
+% --------------------------------------------------------------------------
% #1: instance
% #2: number of columns
% #3: item separator
% #4: environment body
-\cs_new_protected:Npn \__tasks:nnnn #1#2#3#4
+\cs_new_protected:Npn \tasks_environment:nnnn #1#2#3#4
{
\bool_if:NT \l__tasks_debug_bool { \dim_set:Nn \fboxsep {0pt} }
\seq_set_split:Nnn \l__tasks_seq {#3} {#4}
% remove the first (empty) item:
\seq_pop_left:NN \l__tasks_seq \l__tasks_tmpa_tl
- \tl_if_blank:VF \l__tasks_tmpa_tl { \@noitemerr }
+ \tl_if_blank:VF \l__tasks_tmpa_tl
+ { \msg_warning:nnVn {tasks}{no-item} \l__tasks_tmpa_tl {#3} }
\int_gset:Nn \g__tasks_total_items_int
{ \seq_count:N \l__tasks_seq }
\UseInstance {tasks} {#1}
{ \g__tasks_total_items_int }
{#2}
- { \l__tasks_custom_label_pattern_tl }
+ { }
% just to be sure:
\seq_clear:N \l__tasks_seq
}
-\cs_generate_variant:Nn \__tasks:nnnn { VnnV }
+\cs_generate_variant:Nn \tasks_environment:nnnn {V}
% #1: label
% #2: item format
@@ -169,17 +228,31 @@
\dim_set:Nn \l__tasks_item_width_dim
{
\bool_if:NTF \l__tasks_item_full_line_bool
- { \linewidth }
+ { \l__tasks_full_width_dim }
{
(
- \linewidth
+ \l__tasks_full_width_dim
- \l__tasks_columns_int \l__tasks_column_sep_dim
+ \l__tasks_column_sep_dim
) / \l__tasks_columns_int
}
- - \l__tasks_depth_int \l__tasks_item_indent_dim
+ - \l__tasks_item_indent_dim
\bool_if:NT \l__tasks_debug_bool { -2\fboxrule }
}
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \l__tasks_columns_int \l__tasks_item_width_dim
+ + \l__tasks_columns_int \l__tasks_column_sep_dim
+ - \l__tasks_column_sep_dim
+ + \l__tasks_columns_int \l__tasks_item_indent_dim
+ \bool_if:NT \l__tasks_debug_bool { +\l__tasks_columns_int\fboxrule }
+ \bool_if:NT \l__tasks_debug_bool { +\l__tasks_columns_int\fboxrule }
+ }
+ \dim_compare:nNnT
+ { \l_tmpa_dim }
+ >
+ { \l__tasks_full_width_dim }
+ { \dim_sub:Nn \l__tasks_item_width_dim { \l__tasks_correction_dim } }
\__tasks_gset_rows_num:NN
\g__tasks_total_items_int
\l__tasks_columns_int
@@ -188,35 +261,33 @@
\int_compare:nNnT
{ \g__tasks_current_col_num_int } > { \l__tasks_columns_int }
{
- \int_gset:Nn \g__tasks_current_col_num_int { 1 }
- \int_incr:N \g__tasks_current_row_num_int
+ \int_gset:Nn \g__tasks_current_col_num_int {1}
+ \int_gincr:N \g__tasks_current_row_num_int
}
+ % if the next item fills rest of line:
\bool_if:NT \l__tasks_item_rest_of_line_bool
{
+ % number of remaining columns:
\int_set:Nn \l__tasks_tmpa_int
{ \l__tasks_columns_int - \g__tasks_current_col_num_int + 1 }
- \int_compare:nNnTF { \l__tasks_item_columns_int } = { 0 }
- {
- \int_set:Nn \l__tasks_tmpb_int { \l__tasks_tmpa_int - 1 } % 8
- }
+ % check requested column number and adjust:
+ \int_compare:nNnF { \l__tasks_item_columns_int } = {0}
{
\int_compare:nNnTF
{ \l__tasks_tmpa_int } > { \l__tasks_item_columns_int }
{ \int_set_eq:NN \l__tasks_tmpa_int \l__tasks_item_columns_int }
{ \int_zero:N \l__tasks_item_columns_int }
- \bool_if:nT
- {
- \l__tasks_item_rest_of_line_bool &&
- !\int_compare_p:nNn { \l__tasks_item_columns_int} = { 0 }
- }
+ \bool_lazy_and:nnT
+ { \l__tasks_item_rest_of_line_bool }
+ { !\int_compare_p:nNn { \l__tasks_item_columns_int } = {0} }
{
\int_gadd:Nn \g__tasks_current_col_num_int
- { \l__tasks_item_columns_int -1 }
+ { \l__tasks_item_columns_int -1 }
\int_gadd:Nn \g__tasks_total_items_int
- { \l__tasks_item_columns_int -1 }
+ { \l__tasks_item_columns_int - 1 }
}
- \int_set:Nn \l__tasks_tmpb_int { \l__tasks_tmpa_int -1 }
}
+ \int_set:Nn \l__tasks_tmpb_int { \l__tasks_tmpa_int - 1 }
\dim_set:Nn \l__tasks_item_width_dim
{
\l__tasks_tmpa_int \l__tasks_item_width_dim
@@ -231,7 +302,10 @@
{
\vcoffin_set:Nnn \l__tasks_tmpa_coffin
{ \l__tasks_item_width_dim }
- { \__tasks_setup: #2 {#3} \strut }
+ {
+ \__tasks_setup:
+ #2 { #3 \mode_if_horizontal:T { \strut } }
+ }
\__tasks_debug:n
{
\coffin_typeset:Nnnnn \l__tasks_tmpa_coffin
@@ -243,14 +317,15 @@
{
\vcoffin_set:Nnn \l__tasks_tmpa_coffin
{
- \l__tasks_label_width_dim
- \bool_if:NT \l__tasks_debug_bool {-2\fboxrule }
+ \dim_abs:n { \l__tasks_label_width_dim }
+ \bool_if:NT \l__tasks_debug_bool {+2\fboxrule }
}
{
\noindent
- \tl_use:N \l__tasks_item_fill_left_tl
- \strut #1
- \tl_use:N \l__tasks_item_fill_right_tl
+ \l__tasks_item_fill_left_tl
+ #1
+ \l__tasks_item_fill_right_tl
+ \strut
}
\__tasks_debug:n
{
@@ -260,50 +335,49 @@
}
% attach the label box at the left of the item box, shifted by
% \l__tasks_label_offset_dim :
- \coffin_attach:NnnNnnnn
- \l__tasks_item_coffin {l} {T}
- \l__tasks_label_coffin {l} {T}
- {
- \dim_compare:nNnTF
- { \l__tasks_item_indent_dim }
- <
- { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
+ \dim_compare:nNnTF { \l__tasks_label_width_dim } < {0pt}
+ {
+ \coffin_attach:NnnNnnnn
+ \l__tasks_item_coffin {l} {T}
+ \l__tasks_label_coffin {r} {T}
+ { - \l__tasks_label_offset_dim }
{0pt}
- { - \l__tasks_label_width_dim - \l__tasks_label_offset_dim }
- } { 0pt }
+ }
+ {
+ \coffin_attach:NnnNnnnn
+ \l__tasks_item_coffin {l} {T}
+ \l__tasks_label_coffin {l} {T}
+ {
+ - \l__tasks_label_offset_dim - \l__tasks_label_width_dim
+ \bool_if:NT \l__tasks_debug_bool {-2\fboxrule }
+ }
+ {0pt}
+ }
% when a new row starts enter vertical mode:
- \int_compare:nNnT { \g__tasks_current_col_num_int } = { 1 }
+ \int_compare:nNnT { \g__tasks_current_col_num_int } = {1}
{ \skip_vertical:N \c_zero_skip }
% skip horizontally by \l__tasks_item_indent_dim
\noindent
\skip_horizontal:N \l__tasks_item_indent_dim
% typeset the item (with the attached label protruding to the left):
- \coffin_typeset:Nnnnn \l__tasks_item_coffin
- {l}
- {T}
- {0pt}
- {0pt}
- \bool_if:nT
- {
- \l__tasks_item_full_line_bool ||
- (
- \l__tasks_item_rest_of_line_bool &&
- \int_compare_p:nNn { \l__tasks_item_columns_int } = { 0 }
- )
+ \coffin_typeset:Nnnnn \l__tasks_item_coffin {l} {T} {0pt} {0pt}
+ \bool_lazy_or:nnT
+ { \l__tasks_item_full_line_bool }
+ {
+ \bool_lazy_and_p:nn
+ { \l__tasks_item_rest_of_line_bool }
+ { \int_compare_p:nNn { \l__tasks_item_columns_int } = {0} }
}
{ \tasks_new_row: }
- % are we between items in a row? The skip by \l__tasks_column_sep_dim :
+ % are we between items in a row? Then skip by \l__tasks_column_sep_dim :
\int_compare:nNnT
{ \g__tasks_current_col_num_int } < { \l__tasks_columns_int }
{ \skip_horizontal:N \l__tasks_column_sep_dim }
% if we ended a row and a new row is still to come skip vertically by
% \l__tasks_after_item_skip :
- \bool_if:nT
- {
- ( \int_compare_p:nNn { \g__tasks_current_col_num_int } = { \l__tasks_columns_int } )
- &&
- ( \int_compare_p:n { \g__tasks_current_row_num_int != \l__tasks_rows_int } )
- }
+ \bool_lazy_and:nnT
+ { \int_compare_p:nNn { \g__tasks_current_col_num_int } = { \l__tasks_columns_int } }
+ { \int_compare_p:n { \g__tasks_current_row_num_int != \g__tasks_rows_int } }
{ \skip_vertical:N \l__tasks_after_item_skip }
% clean up:
\coffin_clear:N \l__tasks_item_coffin
@@ -312,35 +386,23 @@
\bool_set_false:N \l__tasks_item_full_line_bool
\bool_set_false:N \l__tasks_item_rest_of_line_bool
}
-\cs_generate_variant:Nn \__tasks_task:nnn { VVV }
+\cs_generate_variant:Nn \__tasks_task:nnn {VVV}
\cs_new_protected:Npn \__tasks_setup:
{
- \dim_set:Nn \parskip { 0pt }
- \skip_set:Nn \parfillskip { 0pt plus 1fil }
+ \dim_set:Nn \parskip {0pt}
+ \skip_set:Nn \parfillskip {0pt plus 1fil}
\dim_set_eq:NN \parskip \parsep
\dim_set_eq:NN \parindent \listparindent
\noindent
- \dim_compare:nNnT
- { \l__tasks_item_indent_dim }
- <
- { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
- {
- \skip_horizontal:n
- {
- \l__tasks_label_offset_dim
- + \l__tasks_label_width_dim
- - \l__tasks_item_indent_dim
- }
- }
\strut
}
\cs_new_protected:Npn \__tasks_gset_rows_num:NN #1#2
{
- \int_gset:Nn \l__tasks_rows_int { \int_div_truncate:nn {#1} {#2} }
- \int_compare:nNnT { \int_mod:nn {#1} {#2} } > { 0 }
- { \int_gincr:N \l__tasks_rows_int }
+ \int_gset:Nn \g__tasks_rows_int { \int_div_truncate:nn {#1} {#2} }
+ \int_compare:nNnT { \int_mod:nn {#1} {#2} } > {0}
+ { \int_gincr:N \g__tasks_rows_int }
}
\cs_new_protected:Npn \__tasks_label_align:n #1
@@ -349,28 +411,27 @@
{
{left}
{
- \tl_clear:N \l__tasks_item_fill_left_tl
- \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill
+ \tl_clear:N \l__tasks_item_fill_left_tl
+ \tl_set:Nn \l__tasks_item_fill_right_tl {\hfill}
}
{right}
{
- \tl_set_eq:NN \l__tasks_item_fill_left_tl \hfill
- \tl_clear:N \l__tasks_item_fill_right_tl
+ \tl_set:Nn \l__tasks_item_fill_left_tl {\hfill}
+ \tl_clear:N \l__tasks_item_fill_right_tl
}
{center}
{
- \tl_set_eq:NN \l__tasks_item_fill_left_tl \hfill
- \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill
+ \tl_set:Nn \l__tasks_item_fill_left_tl {\hfill}
+ \tl_set:Nn \l__tasks_item_fill_right_tl {\hfill}
}
}
{
- \tl_clear:N \l__tasks_item_fill_left_tl
- \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill
+ \tl_clear:N \l__tasks_item_fill_left_tl
+ \tl_set:Nn \l__tasks_item_fill_right_tl {\hfill}
}
}
-\cs_generate_variant:Nn \__tasks_label_align:n { V }
-\__tasks_label_align:n {left}
-
+\cs_generate_variant:Nn \__tasks_label_align:n {V}
+
% --------------------------------------------------------------------------
% the `tasks' object:
% #1: number of items
@@ -380,15 +441,13 @@
% the `default' template interface:
\DeclareTemplateInterface {tasks} {default} {3}
{
- enumerate : boolean = true ,
- label : tokenlist ,
- indent : length = 2.5em ,
- counter-format : tokenlist = tsk[a]) ,
- label-format : tokenlist ,
- label-width : length = 1em ,
- label-offset : length = .3333em ,
- item-format : tokenlist ,
- after-item-skip : skip = 1ex plus 1ex minus 1ex
+ label : tokenlist = \alph*) ,
+ indent : length = 2.5em ,
+ label-format : tokenlist ,
+ label-width : length = 11pt ,
+ label-offset : length = .3333em ,
+ item-format : tokenlist ,
+ after-item-skip : skip = 1ex plus 1ex minus 1ex
}
% in the next three commands we want a really unlikely to occur marker; for
@@ -400,10 +459,8 @@
% the `default' template code:
\DeclareTemplateCode {tasks} {default} {3}
{
- enumerate = \l__tasks_enumerate_bool ,
label = \l__tasks_label_tl ,
indent = \l__tasks_item_default_indent_dim ,
- counter-format = \l__tasks_label_pattern_tl ,
label-format = \l__tasks_label_format_tl ,
label-width = \l__tasks_label_default_width_dim ,
label-offset = \l__tasks_label_default_offset_dim ,
@@ -430,41 +487,24 @@
\l__tasks_label_offset_dim
\l__tasks_label_default_offset_dim
}
- % \dim_compare:nNnT
- % { \l__tasks_item_indent_dim }
- % <
- % { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
- % {
- % \dim_set:Nn \l__tasks_item_indent_dim
- % { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
- % }
\bool_if:NT \l__tasks_custom_after_item_skip_bool
{
\skip_set_eq:NN
\l__tasks_after_item_skip
\l__tasks_custom_after_item_skip
}
- \bool_if:NT \l__tasks_custom_label_bool
- {
- \tl_set_eq:NN
- \l__tasks_label_tl
- \l__tasks_custom_label_tl
- \bool_set_false:N \l__tasks_enumerate_bool
- }
\__tasks_label_align:V \l__tasks_label_align_tl
% need this for enumerate list:
- \bool_if:nT { !\l__tasks_resume_bool && \l__tasks_enumerate_bool }
- { \int_gzero:N \g__tasks_int }
+ \bool_if:NF \l__tasks_resume_bool
+ {
+ \setcounter
+ { \l__tasks_counter_tl }
+ { \int_eval:n { \l__tasks_start_int -1 } }
+ }
\int_set:Nn \l__tasks_columns_int {#2}
% set all the items in their own coffins and join with the ground:
\int_gzero:N \g__tasks_current_col_num_int
- \int_set:Nn \g__tasks_current_row_num_int {1}
- \tl_if_blank:VF \l__tasks_custom_label_pattern_tl
- {
- \tl_set_eq:NN
- \l__tasks_label_pattern_tl
- \l__tasks_custom_label_pattern_tl
- }
+ \int_gset:Nn \g__tasks_current_row_num_int {1}
\tl_if_blank:VF \l__tasks_custom_label_format_tl
{
\tl_set_eq:NN
@@ -477,27 +517,55 @@
\l__tasks_item_format_tl
\l__tasks_custom_item_format_tl
}
+ % prepare counter according to given format:
+ \tl_set:Nx \l__tasks_tmpa_tl
+ {
+ \bool_if:NTF \l__tasks_custom_label_bool
+ { \tl_to_str:V \l__tasks_custom_label_tl }
+ { \tl_to_str:V \l__tasks_label_tl }
+ }
+ \bool_set_false:N \l__tasks_tmpa_bool
+ \tl_if_in:NnT \l__tasks_tmpa_tl {*}
+ {
+ \tl_replace_once:Nne \l__tasks_tmpa_tl {*} {{ \l__tasks_counter_tl }}
+ \bool_set_true:N \l__tasks_tmpa_bool
+ }
+ \tl_set_rescan:NnV \l__tasks_tmpa_tl {} \l__tasks_tmpa_tl
+ \bool_if:NT \l__tasks_tmpa_bool
+ { \tl_set:cV { the \l__tasks_counter_tl } \l__tasks_tmpa_tl }
+ \dim_compare:nNnT
+ { \l__tasks_item_indent_dim }
+ <
+ { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
+ {
+ \msg_warning:nnnx {tasks}
+ {width-too-small}
+ {item-indent}
+ { \dim_to_decimal:n { \l__tasks_label_offset_dim + \l__tasks_label_width_dim } }
+ }
+ % do the tasks:
\seq_map_inline:Nn \l__tasks_seq
{
\__tasks_read_item:www ##1 \q_stop
- \bool_if:NTF \l__tasks_enumerate_bool
- {
- \tl_if_eq:VnT \l__tasks_tmp_label_tl { $tasks$default$label$ }
- {
- \int_gincr:N \g__tasks_int
- \SaveCounterPatternFrom [tasks]
- \l__tasks_tmpa_tl
- \l__tasks_label_tl
- \l__tasks_label_pattern_tl
- \cs_gset:Npx \@currentlabel { \l__tasks_label_tl }
- }
- }
- {
- \tl_if_blank:VT \l__tasks_label_tl
- { \tl_set_eq:NN \l__tasks_label_tl \labelitemi }
+ \refstepcounter { \l__tasks_counter_tl }
+ \tl_set:Nx \l__tasks_label_tl { { \exp_not:V \l__tasks_tmpa_tl } }
+ \bool_if:NTF \l__tasks_custom_label_format_bool
+ { \tl_put_left:NV \l__tasks_label_tl \l__tasks_custom_label_format_tl }
+ { \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl }
+ % check if the label width is big enough:
+ \bool_set_true:N \l__tasks_measuring_bool
+ \hbox_set:NV \l__tasks_tmpa_box \l__tasks_label_tl
+ \dim_compare:nNnT
+ { \box_wd:N \l__tasks_tmpa_box }
+ >
+ { \l__tasks_label_width_dim }
+ {
+ \msg_warning:nnnx {tasks}
+ {width-too-small}
+ {label-width}
+ { \dim_to_decimal:n { \box_wd:N \l__tasks_tmpa_box } }
}
- \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl
- % \tl_put_left:NV \l__tasks_item_tl \l__tasks_item_format_tl
+ \bool_set_false:N \l__tasks_measuring_bool
\tl_if_eq:VnTF \l__tasks_tmp_label_tl { $tasks$default$label$ }
{
\__tasks_task:VVV
@@ -517,13 +585,13 @@
\cs_new_protected:Npn \__tasks_read_item:www
{
- \peek_meaning_remove:NTF !
+ \peek_charcode_remove:NTF !
{
\bool_set_true:N \l__tasks_item_full_line_bool
\__tasks_read_item_aux:ww
}
{
- \peek_meaning_remove:NTF *
+ \peek_charcode_remove:NTF *
{
\bool_set_true:N \l__tasks_item_rest_of_line_bool
\__tasks_read_item_rest_of_line:ww
@@ -554,109 +622,72 @@
\cs_new_protected:Npn \__tasks_read_item_aux_ii:ww [#1]#2 \q_stop
{
- \tl_set:Nn \l__tasks_tmp_label_tl {#1}
- \tl_if_eq:nnF { #1 } { $tasks$default$label$ }
- { \tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl }
+ \tl_if_eq:nnTF {#1} {$tasks$default$label$}
+ { \tl_set:Nn \l__tasks_tmp_label_tl {#1} }
+ {
+ \tl_set:Nn \l__tasks_tmp_label_tl {{#1}}
+ \tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl
+ }
\tl_set:Nx \l__tasks_item_tl { \tl_trim_spaces:n {#2} }
}
\__tasks_restore_dollar:
% --------------------------------------------------------------------------
-% choice box:
-\bool_new:N \l__tasks_choice_checked_bool
-\dim_new:N \l__tasks_choice_width_dim
-\dim_set:Nn \l__tasks_choice_width_dim { 1.25ex }
-\dim_new:N \l__tasks_choice_linewidth_dim
-\dim_set:Nn \l__tasks_choice_linewidth_dim { .3pt }
-\dim_new:N \l__tasks_choice_checkwidth_dim
-\dim_set:Nn \l__tasks_choice_checkwidth_dim { .5pt }
-\dim_new:N \l__tasks_choice_raise_dim
-\dim_set:Nn \l__tasks_choice_raise_dim { .1ex }
-
-\cs_new_protected:Npn \tasks_choice:
- {
- \leavevmode
- \group_begin:
- \bool_set_false:N \l__tasks_choice_checked_bool
- \box_move_up:nn
- { \l__tasks_choice_raise_dim }
- { \hbox:n { \__tasks_choice: } }
- \group_end:
- }
-
-\cs_new_protected:Npn \tasks_choice_checked:
- {
- \leavevmode
- \group_begin:
- \bool_set_true:N \l__tasks_choice_checked_bool
- \box_move_up:nn
- { \l__tasks_choice_raise_dim }
- { \hbox:n { \__tasks_choice: } }
- \group_end:
- }
-
-\cs_new_protected:Npn \__tasks_choice:
- {%
- \dim_set:Nn \unitlength { .1\l__tasks_choice_width_dim }
- \begin{picture}(10,0)
- \linethickness \l__tasks_choice_linewidth_dim
- \drawline(0,0)(0,10)(10,10)(10,0)(0,0)
- \linethickness \l__tasks_choice_checkwidth_dim
- \bool_if:NT \l__tasks_choice_checked_bool
- {
- \drawline(2,2)(8,8)
- \drawline(2,8)(8,2)
- }
- \end{picture}%
- }
-
-\providecommand* \choicebox { \tasks_choice: }
-\providecommand* \checkedchoicebox { \tasks_choice_checked: }
-
-% --------------------------------------------------------------------------
-% base instance:
-% ALPHABETIZE: a) b) c)
-\DeclareInstance {tasks} {alphabetize} {default} { }
-
\keys_define:nn {tasks/list}
{
- debug .bool_set:N = \l__tasks_debug_bool ,
- style .tl_set:N = \l__tasks_instance_tl ,
- style .initial:n = alphabetize ,
- counter-format .tl_set:N = \l__tasks_custom_label_pattern_tl ,
- label .code:n =
+ debug .bool_set:N = \l__tasks_debug_bool ,
+ break-correction .dim_set:N = \l__tasks_correction_dim ,
+ break-correction .initial:n = .00001pt ,
+ style .tl_set:N = \l__tasks_instance_tl ,
+ style .initial:n = alphabetize ,
+ counter-format .code:n =
+ \msg_warning:nnnnn {tasks} {deprecated} {option} {counter-format} {label}
+ \keys_set:nn {tasks/list} { label = #1 } ,
+ counter .tl_set:N = \l__tasks_counter_tl ,
+ counter .initial:n = task ,
+ label .code:n =
\bool_set_true:N \l__tasks_custom_label_bool
\tl_set:Nn \l__tasks_custom_label_tl {#1} ,
- label-format .tl_set:N = \l__tasks_custom_label_format_tl ,
- label-width .code:n =
+ label-format .code:n =
+ \bool_set_true:N \l__tasks_custom_label_format_bool
+ \tl_set:Nn \l__tasks_custom_label_format_tl {#1} ,
+ label-width .code:n =
\dim_set:Nn \l__tasks_label_width_dim {#1}
\bool_set_true:N \l__tasks_label_width_bool ,
- label-offset .code:n =
+ label-offset .code:n =
\dim_set:Nn \l__tasks_label_offset_dim {#1}
\bool_set_true:N \l__tasks_label_offset_bool ,
- label-align .tl_set:N = \l__tasks_label_align_tl ,
- item-format .tl_set:N = \l__tasks_custom_item_format_tl ,
- item-indent .code:n =
+ label-align .tl_set:N = \l__tasks_label_align_tl ,
+ item-format .tl_set:N = \l__tasks_custom_item_format_tl ,
+ item-indent .code:n =
\dim_set:Nn \l__tasks_item_indent_dim {#1}
\bool_set_true:N \l__tasks_item_indent_bool ,
- column-sep .dim_set:N = \l__tasks_column_sep_dim ,
- before-skip .skip_set:N = \l__tasks_before_list_skip ,
- after-skip .skip_set:N = \l__tasks_after_list_skip ,
+ column-sep .dim_set:N = \l__tasks_column_sep_dim ,
+ before-skip .skip_set:N = \l__tasks_before_list_skip ,
+ after-skip .skip_set:N = \l__tasks_after_list_skip ,
after-item-skip .code:n =
\bool_set_true:N \l__tasks_custom_after_item_skip_bool
\skip_set:Nn \l__tasks_custom_after_item_skip {#1} ,
- resume .bool_set:N = \l__tasks_resume_bool
+ resume .bool_set:N = \l__tasks_resume_bool ,
+ start .int_set:N = \l__tasks_start_int ,
+ start .initial:n = 1
}
% --------------------------------------------------------------------------
-% the generic environment:
-\NewEnviron {__tasks_env:} [3]
+
+\cs_new_protected:Npn \tasks_body:nnnn #1#2#3#4
{
- \if@inlabel
- \noindent\par\nobreak\vskip-\parskip\vskip-\baselineskip\hrule\@height\z@
- \fi
- \dim_compare:nNnF { \l__tasks_before_list_skip } = { 0pt }
+ \int_gincr:N \g__tasks_env_int
+ \legacy_if:nT {@inlabel}
+ {
+ \noindent\par
+ \nobreak
+ \vskip-\parskip
+ \vskip-\baselineskip
+ \hrule\@height\z@
+ }
+ \dim_compare:nNnF { \l__tasks_before_list_skip } = {0pt}
{ \vspace {\l__tasks_before_list_skip} }
\list {}
{
@@ -664,11 +695,11 @@
\dim_set:Nn \leftmargin {0pt}
\dim_set:Nn \rightmargin {0pt}
}
- \item \scan_stop:
- \int_incr:N \l__tasks_depth_int
- \__tasks:VnnV \l__tasks_instance_tl {#3} {#1} \BODY
+ \item \scan_stop:
+ \dim_set:Nn \l__tasks_full_width_dim { \linewidth }
+ \tasks_environment:Vnnn \l__tasks_instance_tl {#3} {#1} {#4}
\endlist
- \dim_compare:nNnF { \l__tasks_after_list_skip } = { 0pt }
+ \dim_compare:nNnF { \l__tasks_after_list_skip } = {0pt}
{ \vspace {\l__tasks_after_list_skip} }
}
@@ -693,37 +724,65 @@
% --------------------------------------------------------------------------
% the user environment:
-\NewDocumentCommand \NewTasks { O{}mO{\task}D(){1} }
+\NewDocumentCommand \NewTasksEnvironment { O{}mO{\task}D(){1} }
{
- \NewDocumentEnvironment {#2} { O{}D(){#4} }
- { \__tasks_env: {#3} { #1,##1 } {##2} }
- { \end__tasks_env: }
+ \NewDocumentEnvironment {#2} { O{}D(){#4}+b }
+ { \tasks_body:nnnn {#3} {#1,##1} {##2} {##3} }
+ { }
}
-\NewDocumentCommand \RenewTasks { O{}mO{\task}D(){1} }
+\NewDocumentCommand \RenewTasksEnvironment { O{}mO{\task}D(){1} }
{
- \RenewDocumentEnvironment {#2} { O{}D(){#4} }
- { \__tasks_env: {#3} { #1,##1 } {##2} }
- { \end__tasks_env: }
+ \RenewDocumentEnvironment {#2} { O{}D(){#4}+b }
+ { \tasks_body:nnnn {#3} {#1,##1} {##2} {##3} }
+ { }
}
+\tasks_deprecated:NN \NewTasks \NewTasksEnvironment
+\tasks_deprecated:NN \RenewTasks \RenewTasksEnvironment
+
% --------------------------------------------------------------------------
% default list:
-\NewTasks {tasks}
+\NewTasksEnvironment {tasks}
-\file_if_exist:nT {tasks.cfg} { \file_input:n {tasks.cfg} }
+% base instance:
+% ALPHABETIZE: a) b) c)
+\DeclareInstance {tasks} {alphabetize} {default} { }
+
+% ITEMIZE:
+\DeclareInstance {tasks} {itemize} {default}
+ {
+ label-width = 1.125em ,
+ label = \labelitemi
+ }
+
+% ENUMERATE:
+\DeclareInstance {tasks} {enumerate} {default}
+ { label = \arabic*. }
% --------------------------------------------------------------------------
% setup:
\cs_new_protected:Npn \tasks_setup:n #1
{ \keys_set:nn {tasks/list} {#1} }
-\NewDocumentCommand \settasks { m }
+\NewDocumentCommand \settasks { +m }
{ \tasks_setup:n {#1} }
+% default:
+ \__tasks_label_align:n {left}
+
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_if_exist:nT {tasks.cfg} { \file_input:n {tasks.cfg} }
+
+\AtBeginDocument
+ {
+ \@ifpackageloaded {hyperref}
+ { \tl_set:Nn \theHtask { \int_use:N \g__tasks_env_int . \thetask } }
+ {}
+ }
+\file_input_stop:
+% --------------------------------------------------------------------------
% HISTORY:
2013/01/19 v0.7 - extracted from `exsheets' package; this also lead to a
slightly new syntax and a few new options for it
@@ -734,11 +793,12 @@
* the former `label-format' is now `counter-format'
* new: `label-format'
- changed defaults for `label-width' and `label-offset'
- - ensure that the `after-item-skip' is only
- inserted in between rows
+ - ensure that the `after-item-skip' is only inserted in
+ between rows
- new option `after-item-skip'
- improvements when label are set with optional argument:
- * a provided but empty argument is now correctly recognized
+ * a provided but empty argument is now correctly
+ recognized
* the counter is _not_ stepped anymore for enumerated
lists when the optional argument is provided
- new command \startnewitemline that forces the next item to
@@ -776,3 +836,23 @@
together like one would expect: an item indent of 0pt will
align the complete item with the margin and the needed
overlap for the label is reserved
+2016/08/16 v0.13 - a negative value for label width will make the label
+ protrude to the margin
+2019/10/04 v1.0 - get rid of `cntformats', `environ' and `epic'
+ - no default multiple choice any more
+ - rename \NewTasks and \RenewTasks
+ - the option `counter-format' is deprecated
+2019/10/05 v1.0a - fix small bug in deprecation message
+2019/10/06 v1.0b - fix bug in `label-format' definition
+2019/10/07 v1.0c - fix bug in width warning
+ - fix bug in deprecation of `counter-format'
+2019/10/08 v1.0d - make \thetask usable; and correct \label/\ref
+2019/11/03 v1.1 - fix typo
+ - make \settasks' argument long
+ - new option `start'
+2020/01/11 v1.1a - allow `label-format' to end with command that needs an
+ argument
+2020/03/21 v1.2 - prefer lazy boolean evaluation
+ - \tasksifmeasuringTF
+ - new option `counter'
+ - rename manual files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tasks.tlpobj new/tlpkg/tlpobj/tasks.tlpobj
--- old/tlpkg/tlpobj/tasks.tlpobj 2019-02-28 04:06:46.000000000 +0100
+++ new/tlpkg/tlpobj/tasks.tlpobj 2020-03-22 01:55:34.000000000 +0100
@@ -1,19 +1,18 @@
name tasks
category Package
-revision 41851
+revision 54449
shortdesc Horizontally columned lists
relocated 1
longdesc The reason for the creation of the tasks environment was an
-longdesc unwritten agreement in German maths textbooks (exspecially
+longdesc unwritten agreement in German maths textbooks (especially
longdesc (junior) high school textbooks) to organize exercises in
longdesc columns counting horizontally rather than vertically. This is
longdesc what the tasks package helps to achieve.
-runfiles size=8
+runfiles size=9
RELOC/tex/latex/tasks/tasks.cfg
RELOC/tex/latex/tasks/tasks.sty
catalogue-contact-repository https://github.com/cgnieder/tasks/
catalogue-ctan /macros/latex/contrib/tasks
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics list list-enum expl3
-catalogue-version 0.12
+catalogue-version 1.2
++++++ tcolorbox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/CHANGES new/doc/latex/tcolorbox/CHANGES
--- old/doc/latex/tcolorbox/CHANGES 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/CHANGES 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -1084,3 +1084,33 @@
* new options: 'beamer hidden', 'beamer alerted', 'hide', 'alert'
* option 'only' moved from package to skins library
- new documentation section '13 Beamer Support'
+
+version 4.21 (2019/09/19)
+- bug fix (#71): 'shield externalize' should be effective on all tcolorbox layers
+- bug fix (#76): 'spread inwards', 'spread outwards', 'spread sidewards' gave
+ wrong results for some document geometry settings
+- new options (#75): 'tabulars', 'tabulars*'
+- library 'extras':
+ * bug fix: all 'extras ...' options from library 'hooks' took code instead of options
+ * new options (#73): 'minted options app', 'minted options pre',
+ 'listing options app', 'listing options pre'
+- library 'xparse':
+ * bug fix: options 'IfNoValueTF', 'IfValueTF', 'IfBooleanTF' failed
+ to recognize arguments in some code line breaks situations
+- library 'documentation':
+ TikZ path operation documentation (#65):
+ * new color name: 'Fade'
+ * new macros and environments: '\colFade', 'docPathOperation',
+ '\refPathOperation', '\refPathOperation*'
+ * new options: 'color fade', 'color path', 'doc label', 'doc head path',
+ 'before doc body path', 'after doc body path'
+ * new language string: 'path', 'paths'
+- documentation: checkerbox for opacity examples was too dark
+
+version 4.22 (2019/11/15)
+- bug fix (#79) in library 'xparse':
+ 'sidebyside adapt' did not respect color, font, and other options.
+- bug fix (#85) in library 'raster':
+ 'raster before skip' and 'raster after skip' did not accept glue anymore.
+- new initialization option (#80): 'reset counter on overlays'
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/README new/doc/latex/tcolorbox/README
--- old/doc/latex/tcolorbox/README 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/README 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
Binary files old/doc/latex/tcolorbox/tcolorbox-example-poster.pdf and new/doc/latex/tcolorbox/tcolorbox-example-poster.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox-example-poster.tex new/doc/latex/tcolorbox/tcolorbox-example-poster.tex
--- old/doc/latex/tcolorbox/tcolorbox-example-poster.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox-example-poster.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
Binary files old/doc/latex/tcolorbox/tcolorbox-example.pdf and new/doc/latex/tcolorbox/tcolorbox-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox-example.tex new/doc/latex/tcolorbox/tcolorbox-example.tex
--- old/doc/latex/tcolorbox/tcolorbox-example.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox-example.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
Binary files old/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf and new/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex new/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
--- old/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex new/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex 2019-09-19 22:45:10.000000000 +0200
@@ -1535,7 +1535,7 @@
\begin{docTcbKey}{opacityframe}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the frame opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacityframe}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacityframe}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[opacityframe=0.25,
colframe=red]
This is a \textbf{tcolorbox}.
@@ -1545,7 +1545,7 @@
\begin{docTcbKey}{opacityback}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the background opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacityback}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacityback}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[standard jigsaw,colframe=red,
opacityframe=0.5, opacityback=0.5]
This is a \textbf{tcolorbox}.
@@ -1556,7 +1556,7 @@
\begin{docTcbKey}{opacitybacktitle}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the title background opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacitybacktitle}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacitybacktitle}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[standard jigsaw,colframe=red,
opacityframe=0.5, opacitybacktitle=0.5,
title filled, title=This is a title]
@@ -1569,7 +1569,7 @@
\begin{docTcbKey}{opacityfill}{=\meta{fraction}}{style, no default, initially \texttt{1.0}}
Sets the fill opacity for frame, interior and optionally the title background
to the given \meta{fraction}.
-\begin{exdispExample*}{opacityfill}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacityfill}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[standard jigsaw,colframe=red,
opacityfill=0.7, title=This is a title]
This is a \textbf{tcolorbox}.
@@ -1582,7 +1582,7 @@
Sets the text opacity of the upper box part to the given \meta{fraction}.
\begin{exdispExample*}{opacityupper}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[enhanced,opacityupper=0.5,
- interior style={pattern=checkerboard light gray}]
+ interior style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{exdispExample*}
@@ -1593,7 +1593,7 @@
Sets the text opacity of the lower box part to the given \meta{fraction}.
\begin{exdispExample*}{opacitylower}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[enhanced,opacitylower=0.5,
- interior style={pattern=checkerboard light gray}]
+ interior style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
@@ -1605,7 +1605,7 @@
Sets the text opacity of the upper and the lower box part to the given \meta{fraction}.
\begin{exdispExample*}{opacitytext}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[enhanced,opacitytext=0.5,
- interior style={pattern=checkerboard light gray}]
+ interior style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
@@ -1620,14 +1620,14 @@
\begin{tcolorbox}[enhanced,opacitytitle=0.7,
coltitle=black,
fonttitle=\bfseries,title=This is a title,
- title style={pattern=checkerboard light gray}]
+ title style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{exdispExample*}
\end{docTcbKey}
-\begin{exdispExample*}{opacity_general}{segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacity_general}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[enhanced jigsaw,fonttitle=\bfseries,title=This is a title,
opacityframe=0.5,opacityback=0.25,opacitybacktitle=0.25,opacitytext=0.8,
colback=red!5!white,colframe=red!75!black,colbacktitle=yellow!20!red]
@@ -2336,6 +2336,55 @@
\end{exdispExample}
\end{docTcbKey}
+
+\clearpage
+
+\begin{docTcbKey}[][doc new={2019-09-19}]{tabulars}{=\meta{preamble}}{style}
+ This style sets \refKey{/tcb/before upper} and \refKey{/tcb/after upper}
+ and several geometry keys to support a |tabular*| with the
+ given \meta{preamble}.
+ The packages |array| and |colortbl| have to be loaded separately.
+\begin{exdispExample}{tabulars_1}
+% \usepackage{array}
+% \usepackage{colortbl} - or - \usepackage[table]{xcolor}
+\tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily,
+ colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white,
+ coltitle=black,center title}
+
+\begin{tcolorbox}[tabulars={@{\extracolsep{\fill}\hspace{5mm}}lrrrrr@{\hspace{5mm}}},
+ boxrule=0.5pt,title=My table]
+Group & One & Two & Three & Four & Sum\\\hline\hline
+Red & 1000.00 & 2000.00 & 3000.00 & 4000.00 & 10000.00\\\hline
+Green & 2000.00 & 3000.00 & 4000.00 & 5000.00 & 14000.00\\\hline
+Blue & 3000.00 & 4000.00 & 5000.00 & 6000.00 & 18000.00\\\hline\hline
+Sum & 6000.00 & 9000.00 & 12000.00 & 15000.00 & 42000.00
+\end{tcolorbox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc new={2019-09-19}]{tabulars*}{=\marg{code}\marg{preamble}}{style}
+ This is a variant of \refKey{/tcb/tabulars} which adds some \meta{code}
+ before the table starts.
+\begin{exdispExample}{tabulars_2}
+% \usepackage{array}
+% \usepackage{colortbl} - or - \usepackage[table]{xcolor}
+\tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily,
+ colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white,
+ coltitle=black,center title}
+
+\begin{tcolorbox}[tabulars*={\arrayrulewidth0.5mm\renewcommand\arraystretch{1.4}}%
+ {@{\extracolsep{\fill}\hspace{20mm}}lll@{\hspace{20mm}}},
+ title=My table]
+One & Two & Three \\\hline\hline
+1000.00 & 2000.00 & 3000.00\\\hline
+2000.00 & 3000.00 & 4000.00
+\end{tcolorbox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+
\clearpage
\begin{marker}
If \refKey{/tcb/tabularx} or \refKey{/tcb/tabularx*} are used, one cannot
@@ -2386,6 +2435,7 @@
\end{docTcbKey}
+
\clearpage
\begin{docTcbKey}{tikz upper}{\colOpt{=\meta{options}}}{style}
This style adds a centered |tikzpicture| environment to the start and end
@@ -3547,7 +3597,7 @@
The following styles have a considerable influence on how layered boxes
are processed. Note especially that nested boxes are getting a
\refKey{/tcb/reset} by default. You can change this, but be prepared for
-suprises if you do.
+surprises if you do.
If the defaults are \emph{not changed}, a |tcolorbox| gets its options
in the following order. Following options overwrite preceding options.
@@ -4287,6 +4337,11 @@
\refKey{/tcb/shield externalize} is deactivated automatically inside a |tikzpicture|.
\end{marker}
+\begin{marker}
+\refKey{/tcb/shield externalize} is applied for every following |tcolorbox|
+inside the current \TeX\ group and is not affected by \refKey{/tcb/reset}.
+\end{marker}
+
\begin{docTcbKey}{external}{=\meta{file name}}{no default, initially unset}
Convenience option which calls |\tikzsetnextfilename|\marg{file name}. Typically,
it may be used inside the option list of a |tcolorbox| to set the
@@ -4310,7 +4365,8 @@
\begin{docTcbKey}{reset}{}{no value, initially set}
Sets (nearly) all |tcolorbox| settings (including loaded libraries) back to their default values
\emph{plus} any settings given by \refCom{tcbsetforeverylayer}.
-\refKey{/tcb/savedelimiter} and \refKey{/tcb/capture} keep their values.
+\refKey{/tcb/savedelimiter}, \refKey{/tcb/capture}, and
+\refKey{/tcb/shield externalize} keep their values.
Also, all raster values (see \Vref{sec:raster}) are not resetted.
This option is useful for boxes in boxes where the inner box should not inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex new/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex 2019-09-19 22:45:10.000000000 +0200
@@ -131,6 +131,36 @@
\end{docEnvironment}
+
+
+\begin{docEnvironment}[doclang/environment content=operation description,
+ doc new=2019-09-18]{docPathOperation}{\oarg{options}\marg{name}\marg{parameters}}
+ Documents a \tikzname\ path operation with given \meta{name}.
+ The given \meta{options} are set with \refCom{tcbset}.
+ This \tikzname\ path operation takes mandatory or optional \meta{parameters}.
+ It is automatically indexed and can be referenced with
+ \refCom{refPathOperation}\marg{name}.
+\begin{dispExample}
+\begin{docPathOperation}{fooop}{\oarg{opt}(\meta{name})\colOpt{at(\meta{coord})}}
+ Imaginary path operation for illustration.
+\end{docPathOperation}
+\end{dispExample}
+\end{docEnvironment}
+
+
+\begin{docEnvironment}[doclang/environment content=command description,
+ doc new=2019-09-17]{docPathOperation*}{\oarg{options}\marg{name}\marg{parameters}}
+ Identical to \refEnv{docPathOperation}, but without index entry.
+\end{docEnvironment}
+
+
+
+
+
+
+
+
+
\begin{docCommand}{docValue}{\marg{name}}
Documents a value with given \meta{name}. Typically, this is a value for a key.
This value is automatically indexed.
@@ -144,6 +174,7 @@
Identical to \refCom{docValue}, but without index entry.
\end{docCommand}
+\clearpage
\begin{docCommand}[doc updated=2014-10-09]{docAuxCommand}{\marg{name}}
Documents an auxiliary or minor \LaTeX\ macro with given \meta{name}
@@ -170,7 +201,7 @@
Identical to \refCom{docAuxEnvironment}, but without index entry.
\end{docCommand}
-\clearpage
+
\begin{docCommand}{docAuxKey}{\oarg{key path}\marg{name}}
Documents an auxiliary key with given \meta{name} and an optional \meta{key path}.
@@ -208,6 +239,7 @@
Identical to \refCom{docLength}, but without index entry.
\end{docCommand}
+\clearpage
\begin{docCommand}{docColor}{\marg{name}}
Documents a color with given \meta{name}. The color is automatically indexed.
@@ -221,7 +253,7 @@
\end{docCommand}
-\clearpage
+
\begin{docCommand}{cs}{\marg{name}}
Macro from |ltxdoc| \cite{carlisle:2007a} to typeset a command word \meta{name}
where the backslash is prefixed. The library overwrites the original macro.
@@ -409,6 +441,24 @@
\end{docCommand}
+\begin{docCommand}[doc new=2019-09-17]{refPathOperation}{\marg{name}}
+ References a documented \tikzname\ path operation with given \meta{name}.
+ The page reference is suppressed if it links to the same page.
+\begin{dispExample}
+We have created \refPathOperation{fooop} as an example.
+\end{dispExample}
+\end{docCommand}
+
+\begin{docCommand}[doc new=2019-09-17]{refPathOperation*}{\marg{name}}
+ References a documented \tikzname\ path operation with given \meta{name}.
+ There is no page reference.
+\begin{dispExample}
+We have created \refPathOperation*{fooop} as an example.
+\end{dispExample}
+\end{docCommand}
+
+
+
\begin{docCommand}{refAux}{\marg{name}}
References some auxiliary environment, key, value, or color. The hyperlink color is
used, but there is no real link.
@@ -426,8 +476,8 @@
\end{dispExample}
\end{docCommand}
+\clearpage
-%
\begin{docCommand}{colDef}{\marg{text}}
Sets \meta{text} with the command color, see \refKey{/tcb/color command}.
\begin{dispExample}
@@ -442,7 +492,14 @@
\end{dispExample}
\end{docCommand}
-\clearpage
+
+\begin{docCommand}[doc new=2019-09-18]{colFade}{\marg{text}}
+ Sets \meta{text} with the fade color, see \refKey{/tcb/color fade}.
+\begin{dispExample}
+This is my \colFade{text}.
+\end{dispExample}
+\end{docCommand}
+
\begin{docCommand}[doc new=2014-09-19]{tcbdocmarginnote}{\oarg{options}\marg{text}}
Creates a |tcolorbox| note with the given \meta{text} inside the margin using
@@ -672,6 +729,10 @@
Sets the highlight color used by key definitions.
\end{docTcbKey}
+\begin{docTcbKey}[][doc new={2019-09-18}]{color path}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by \tikzname\ path operation definitions.
+\end{docTcbKey}
+
\begin{docTcbKey}{color value}{=\meta{color}}{no default, initially |Definition|}
Sets the highlight color used by value definitions.
\end{docTcbKey}
@@ -688,9 +749,9 @@
Sets the highlight color used by color definitions.
\end{docTcbKey}
-\begin{docTcbKey}{color definition}{=\meta{color}}{no default, initially |Definition|}
+\begin{docTcbKey}[][doc updated={2019-09-18}]{color definition}{=\meta{color}}{no default, initially |Definition|}
Sets the highlight color for \refKey{/tcb/color command}, \refKey{/tcb/color environment},
- \refKey{/tcb/color key}, \refKey{/tcb/color value}, \refKey{/tcb/color counter},
+ \refKey{/tcb/color key}, \refKey{/tcb/color path}, \refKey{/tcb/color value}, \refKey{/tcb/color counter},
\refKey{/tcb/color length}, and \refKey{/tcb/color color}.
\end{docTcbKey}
@@ -698,6 +759,12 @@
Sets the color used for optional arguments.
\end{docTcbKey}
+\begin{docTcbKey}{color fade}{=\meta{color}}{no default, initially |Fade|}
+ Sets the color used for faded text like \colFade{\textbackslash path}
+ in \refEnv{docPathOperation}.
+\end{docTcbKey}
+
+
\begin{docTcbKey}{color hyperlink}{=\meta{color}}{no default, initially |Hyperlink|}
Sets the color for all hyper-links, i.\,e. all internal and external links.
\end{docTcbKey}
@@ -759,11 +826,18 @@
Heading text in the index for lengths.
\end{langTcbKey}
-
\begin{langTcbKey}[][doc new={2014-09-19}]{new}{=\meta{text}}{no default, initially |New|}
Announcement text for new content.
\end{langTcbKey}
+\begin{langTcbKey}[][doc new={2019-09-18}]{path}{=\meta{text}}{no default, initially |path operation|}
+ Text used in the index for path operations.
+\end{langTcbKey}
+
+\begin{langTcbKey}[][doc new={2019-09-18}]{paths}{=\meta{text}}{no default, initially |Path operations|}
+ Heading text in the index for path operations.
+\end{langTcbKey}
+
\begin{langTcbKey}{pageshort}{=\meta{text}}{no default, initially |P.|}
Short text for page references.
\end{langTcbKey}
@@ -872,13 +946,27 @@
\end{dispExample}
\end{docTcbKey}
-\begin{docTcbKey}{doc head}{=\meta{options}}{no default, initially empty}
+\clearpage
+\begin{docTcbKey}[][doc new=2019-09-18]{doc head path}{=\meta{options}}{no default, initially empty}
+ Sets \meta{options} for the head line of \refEnv{docPathOperation} and \refEnv{docPathOperation*}.
+\begin{dispExample}
+\tcbset{doc head command={interior style={fill,left color=red!7!white,
+ right color=blue!7!white}}}
+
+\begin{docPathOperation*}{-{}-}{\meta{coordinate or cycle}}
+ This is the documentation of \refPathOperation{-{}-}.
+\end{docPathOperation*}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc updated=2019-09-18]{doc head}{=\meta{options}}{no default, initially empty}
Shortcut for setting the same \meta{options} for
\refKey{/tcb/doc head command}, \refKey{/tcb/doc head environment},
- and \refKey{/tcb/doc head key}.
+ \refKey{/tcb/doc head key}, and \refKey{/tcb/doc head path}.
\end{docTcbKey}
-\clearpage
+
The description texts of the main documentation environments \refEnv{docCommand},
\refEnv{docEnvironment}, \refEnv{docKey}, etc, are set in a compact form without
indention and |parskip=0pt|. This settings can overruled by using the following
@@ -916,7 +1004,7 @@
\end{dispExample}
\end{docTcbKey}
-
+\clearpage
\begin{docTcbKey}[][doc new=2015-10-09]{before doc body environment}{=\meta{code}}{no default, initially empty}
Executes \meta{code} before the description texts
of \refEnv{docEnvironment} and \refEnv{docEnvironment*}.
@@ -938,23 +1026,35 @@
of \refEnv{docKey} and \refEnv{docKey*}.
\end{docTcbKey}
-\begin{docTcbKey}[][doc new=2015-10-09]{before doc body}{=\meta{options}}{no default, initially empty}
+\begin{docTcbKey}[][doc new=2019-09-18]{before doc body path}{=\meta{code}}{no default, initially empty}
+ Executes \meta{code} before the description texts
+ of \refEnv{docPathOperation} and \refEnv{docPathOperation*}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-09-18]{after doc body path}{=\meta{code}}{no default, initially empty}
+ Executes \meta{code} after the description texts
+ of \refEnv{docPathOperation} and \refEnv{docPathOperation*}.
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc new and updated={2015-10-09}{2019-09-18}]{before doc body}{=\meta{options}}{no default, initially empty}
Shortcut for setting the same \meta{options} for
\refKey{/tcb/before doc body command}, \refKey{/tcb/before doc body environment},
- and \refKey{/tcb/before doc body key}.
+ \refKey{/tcb/before doc body key}, and \refKey{/tcb/before doc body path}.
\end{docTcbKey}
-\begin{docTcbKey}[][doc new=2015-10-09]{after doc body}{=\meta{options}}{no default, initially empty}
+\begin{docTcbKey}[][doc new and updated={2015-10-09}{2019-09-18}]{after doc body}{=\meta{options}}{no default, initially empty}
Shortcut for setting the same \meta{options} for
\refKey{/tcb/after doc body command}, \refKey{/tcb/after doc body environment},
- and \refKey{/tcb/after doc body key}.
+ \refKey{/tcb/after doc body key}, and \refKey{/tcb/after doc body path}.
\end{docTcbKey}
-\clearpage
+%\clearpage
\begin{docTcbKey}{doc description}{=\meta{text}}{no default, initially empty}
Sets a (short!) additional description \meta{text} for
- \refEnv{docCommand} or \refEnv{docEnvironment}. Such a description is
+ \refEnv{docCommand}, \refEnv{docEnvironment}, or \refEnv{docPathOperation}.
+ Such a description is
mandatory for \refEnv{docKey}.
\begin{dispExample}
\begin{docCommand*}[doc description=my description]{myCommandF}{\marg{argument}}
@@ -968,6 +1068,19 @@
\end{marker}
\end{docTcbKey}
+\clearpage
+\begin{docTcbKey}[][doc new={2019-09-18}]{doc label}{=\meta{text}}{no default, initially unset}
+ If used inside the option list of \refEnv{docCommand}, \refEnv{docEnvironment},
+ \refEnv{docKey}, or \refEnv{docPathOperation}, then \meta{text} is used
+ for labeling instead of the name of the definition.
+\begin{dispExample}
+\begin{docPathOperation*}[doc label=pathline]{-{}-}{\meta{coordinate or cycle}}
+ This is the documentation of \refPathOperation{pathline}.
+\end{docPathOperation*}
+\end{dispExample}
+\end{docTcbKey}
+
+
\begin{docTcbKey}{doc into index}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |false|, no index entries are written for the main documentation
environments. The same effect is achieved by using e.\,g.\ \refEnv{docCommand*}
@@ -1008,7 +1121,7 @@
\end{docTcbKey}
-\subsection{Predefined Colors of the Library}
+\subsection{Predefined Colors of the Library}\tcbdocmarginnote{\tcbdocupdated{2019-09-18}}
The following colors are predefined. They are used as default colors
in some library commands.
@@ -1018,6 +1131,7 @@
\dispColor{Definition},
\dispColor{ExampleFrame},
\dispColor{ExampleBack},
-\dispColor{Hyperlink}.
+\dispColor{Hyperlink},
+\dispColor{Fade}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex new/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex 2019-09-19 22:45:10.000000000 +0200
@@ -475,8 +475,8 @@
\subsection{Skin Code}
-The following option keys extend the options given in Subsection \ref{subsec:addcodeoptions}
-from page \pageref{subsec:addcodeoptions}.
+The following option keys extend the options given in Subsection~\ref{subsec:addcodeoptions}
+from page~\pageref{subsec:addcodeoptions}.
\begin{docTcbKey}{frame code app}{=\meta{graphical code}}{no default}
Appends the given \meta{graphical code} to \refKey{/tcb/frame code}.
@@ -575,3 +575,27 @@
Prepends the given \meta{options} to \refKey{/tcb/extras first and middle}.
\end{docTcbKey}
+
+\subsection{Listings}
+The following option keys extend the options given in
+Section~\ref{sec:listings}
+from page~\pageref{sec:listings}.
+
+
+\begin{docTcbKey}[][doc new=2019-07-11]{listing options app}{=\marg{options}}{no default}
+ Appends the given \meta{options} to \refKey{/tcb/listing options}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-07-11]{listing options pre}{=\marg{options}}{no default}
+ Prepends the given \meta{options} to \refKey{/tcb/listing options}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-07-11]{minted options app}{=\marg{options}}{no default}
+ Appends the given \meta{options} to \refKey{/tcb/minted options}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-07-11]{minted options pre}{=\marg{options}}{no default}
+ Prepends the given \meta{options} to \refKey{/tcb/minted options}.
+\end{docTcbKey}
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex new/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex 2018-12-07 23:51:38.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex 2019-11-15 22:42:38.000000000 +0100
@@ -106,6 +106,15 @@
be used to overrule a previous option.
\end{newTcbKey}
+
+\begin{newTcbKey}[][doc new=2019-10-18]{reset counter on overlays}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+For |beamer| slides, this invokes the |\resetcounteronoverlays| command
+for the box counter. The counter is automatically reset on subsequent
+overlay slides of a frame.
+Thereby, the counter will be the same on all slides of every frame.
+\end{newTcbKey}
+
+
\clearpage
\begin{newTcbKey}{number within}{=\meta{counter}}{no default, initially unset}
The automatic counter is set to zero, if \meta{counter} is increased.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.recording.tex new/doc/latex/tcolorbox/tcolorbox.doc.recording.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.recording.tex 2018-03-22 22:45:00.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.recording.tex 2019-09-19 22:45:10.000000000 +0200
@@ -15,6 +15,17 @@
Opens a file denoted by \meta{file name} for writing the records.
The default file name is |\jobname.records|.
See \Vref{sec:recording-exercises} for an example application.
+ \begin{marker}
+ In some situations, a not existing optional parameter may cause parsing
+ problems. If this happens (or just for precaution), use
+\begin{dispListing}
+\tcbstartrecording\relax
+\end{dispListing}
+ or
+\begin{dispListing}
+\tcbstartrecording[\jobname.records]
+\end{dispListing}
+ \end{marker}
\end{docCommand}
\begin{docCommand}[doc new=2014-11-28]{tcbrecord}{\marg{content}}
@@ -66,7 +77,7 @@
\inputpreamblelisting{L}
\begin{dispListing*}{breakable,before upper=}
-\tcbstartrecording
+\tcbstartrecording\relax
\begin{exercise}
Compute the derivative of the following function:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty new/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
--- old/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty 2019-09-19 22:45:10.000000000 +0200
@@ -54,6 +54,7 @@
\tcbset{skin=enhanced,
doc head={colback=yellow!10!white,interior style=fill},
doc head key={colback=magenta!5!white,interior style=fill},
+ doc head path={colback=blue!50!gray!7!white,interior style=fill},
color key=DarkViolet,
color value=Teal,
color color=Teal,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.skins.tex new/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.skins.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.skins.tex 2019-09-19 22:45:10.000000000 +0200
@@ -596,7 +596,7 @@
\end{boxTcbKey}
\begin{boxTcbKey}{yshifttext}{=\meta{length}}{no default, initially |0pt|}
-The text inside the main box by \meta{length} to give room for e.\,g.\ a sunken title.
+The text inside the main box is shifted by \meta{length} to give room for e.\,g.\ a sunken title.
\begin{exdispExample*}{yshifttext}{sbs,lefthand ratio=0.66}
\begin{tcolorbox}[enhanced,title=My title,
attach boxed title to top center=
@@ -1303,7 +1303,7 @@
\begin{docEnvironment}{tcbinvclipframe}{}
Defines a |Tikz| scope which clips to the \emph{outside} of the frame area path.
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\tcbset{enhanced jigsaw,fonttitle=\bfseries,opacityback=0.35,colback=blue!5!white,
frame style={left color=red!75!black,right color=red!10!yellow}}
@@ -2245,7 +2245,7 @@
applied a second time, the new \meta{tikz option list} is appended to the
current option list.
\begin{dispExample*}{sbs,lefthand ratio=0.66,
- segmentation style={pattern=checkerboard light gray}}
+ segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\tcbset{enhanced,colback=red!5!white,
colframe=red!75!black,fonttitle=\bfseries}
@@ -2837,7 +2837,7 @@
and \refSkin{enhanced jigsaw}.
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\newcommand{\ballexample}{\begin{tikzpicture}
\path[use as bounding box] (0,0.8) rectangle +(0.1,0.1);
\shadedraw [shading=ball] (0,0) circle (1cm);
@@ -2863,7 +2863,7 @@
\end{dispExample*}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\tcbset{enhanced,colback=red!10!white,coltitle=black,
frame style={left color=red!75!black,right color=red!10!yellow},
fonttitle=\bfseries,interior hidden,title hidden}
@@ -2879,7 +2879,7 @@
\end{dispExample*}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\newtcolorbox{mybox}{skin=enhancedmiddle jigsaw,leftrule=5mm,rightrule=5mm,
boxsep=0mm,top=0mm,bottom=0mm,
frame style={top color=blue,bottom color=red},interior hidden}
@@ -3047,7 +3047,7 @@
This is an abbreviation for setting |skin=standard jigsaw|.
\end{docTcbKey}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[standard jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3366,7 +3366,7 @@
This is an abbreviation for setting |skin=enhanced jigsaw|.
\end{docTcbKey}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[enhanced jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3416,7 +3416,7 @@
\end{docSkin}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[skin=enhancedfirst jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3459,7 +3459,7 @@
\end{docSkin}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[skin=enhancedmiddle jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3557,7 +3557,7 @@
\end{docSkin}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[skin=enhancedlast jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
Binary files old/doc/latex/tcolorbox/tcolorbox.pdf and new/doc/latex/tcolorbox/tcolorbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.tex new/doc/latex/tcolorbox/tcolorbox.tex
--- old/doc/latex/tcolorbox/tcolorbox.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -43,8 +43,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{4.20}%
-\def\datum{2019/03/02}%
+\def\version{4.22}%
+\def\datum{2019/11/15}%
\makeindex
\hypersetup{
@@ -58,11 +58,11 @@
%\tcbset{draftmode}
\tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.skins}
+%\includeonly{tcolorbox.doc.initoptions}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
-\include{tcolorbox.doc.abstract}
+\input{tcolorbox.doc.abstract}
\include{tcolorbox.doc.intro}
\include{tcolorbox.doc.quickref}
\include{tcolorbox.doc.coremacros}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tcolorbox.doc.tlpobj new/tlpkg/tlpobj/tcolorbox.doc.tlpobj
--- old/tlpkg/tlpobj/tcolorbox.doc.tlpobj 2019-03-03 02:24:52.000000000 +0100
+++ new/tlpkg/tlpobj/tcolorbox.doc.tlpobj 2019-11-16 01:54:47.000000000 +0100
@@ -1,9 +1,9 @@
name tcolorbox.doc
category Package
-revision 50206
+revision 52809
shortdesc doc files of tcolorbox
relocated 1
-docfiles size=2500
+docfiles size=2287
RELOC/doc/latex/tcolorbox/Basilica_5.png
RELOC/doc/latex/tcolorbox/CHANGES
RELOC/doc/latex/tcolorbox/README
++++++ tcolorbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbbreakable.code.tex new/tex/latex/tcolorbox/tcbbreakable.code.tex
--- old/tex/latex/tcolorbox/tcbbreakable.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbbreakable.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\let\tcb@parboxrestore@true=\tcb@parboxrestore
\let\tcb@parboxrestore@false\tcb@parbox@false@settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbdocumentation.code.tex new/tex/latex/tcolorbox/tcbdocumentation.code.tex
--- old/tex/latex/tcolorbox/tcbdocumentation.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbdocumentation.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{listings,skins,xparse,external}
@@ -33,9 +33,11 @@
\definecolor{ExampleFrame}{rgb}{0.628,0.705,0.942}
\definecolor{ExampleBack}{rgb}{0.963,0.971,0.994}
\definecolor{Hyperlink}{rgb}{0.281,0.275,0.485}
+\definecolor{Fade}{rgb}{0.5,0.5,0.5}
\def\colDef#1{\textcolor{\kvtcb@col@command}{#1}}
\def\colOpt#1{\textcolor{\kvtcb@col@opt}{#1}}
+\def\colFade#1{\textcolor{\kvtcb@col@fade}{#1}}
\lstdefinestyle{tcbdocumentation}{language={[LaTeX]TeX},
aboveskip={0\p@ \@plus 6\p@},
@@ -105,6 +107,8 @@
length/.store in=\kvtcb@text@length,
lengths/.store in=\kvtcb@text@lengths,
new/.store in=\kvtcb@text@new,
+ path/.store in=\kvtcb@text@path,
+ paths/.store in=\kvtcb@text@paths,
pageshort/.store in=\kvtcb@text@pageshort,
updated/.store in=\kvtcb@text@updated,
value/.store in=\kvtcb@text@value,
@@ -125,8 +129,10 @@
color counter/.store in=\kvtcb@col@counter,
color length/.store in=\kvtcb@col@length,
color color/.store in=\kvtcb@col@color,
+ color fade/.store in=\kvtcb@col@fade,
+ color path/.store in=\kvtcb@col@path,
color definition/.style={color command={#1},color environment={#1},color key={#1},
- color value={#1},color color={#1},color counter={#1},color length={#1}},
+ color value={#1},color color={#1},color counter={#1},color length={#1}, color path={#1}},
color option/.store in=\kvtcb@col@opt,
color hyperlink/.store in=\kvtcb@colhyper,
color frame/.store in=\kvtcb@colhyper,
@@ -145,15 +151,22 @@
doc head command/.style={doc@head@command/.style={#1}},
doc head environment/.style={doc@head@environment/.style={#1}},
doc head key/.style={doc@head@key/.style={#1}},
- doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1}},
+ doc head path/.style={doc@head@path/.style={#1}},
+ doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1},
+ doc head path={#1}},
+ doc label/.store in=\kvtcb@doc@label,
before doc body command/.store in=\kvtcb@doc@body@command@before,
after doc body command/.store in=\kvtcb@doc@body@command@after,
before doc body environment/.store in=\kvtcb@doc@body@environment@before,
after doc body environment/.store in=\kvtcb@doc@body@environment@after,
before doc body key/.store in=\kvtcb@doc@body@key@before,
after doc body key/.store in=\kvtcb@doc@body@key@after,
- before doc body/.style={before doc body command={#1},before doc body environment={#1},before doc body key={#1}},
- after doc body/.style={after doc body command={#1},after doc body environment={#1},after doc body key={#1}},
+ before doc body path/.store in=\kvtcb@doc@body@path@before,
+ after doc body path/.store in=\kvtcb@doc@body@path@after,
+ before doc body/.style={before doc body command={#1},before doc body environment={#1},
+ before doc body key={#1},before doc body path={#1}},
+ after doc body/.style={after doc body command={#1},after doc body environment={#1}
+ ,after doc body key={#1},after doc body path={#1}},
doc description/.store in=\kvtcb@doc@description,%
doc into index/.is if=tcb@doc@toindex,%
doc updated/.style={before upper={\tcbdocmarginnote{\tcbdocupdated{#1}}}},
@@ -182,6 +195,7 @@
counter=counter,counters=Counters,
environment content=environment content,
environment=environment,environments=Environments,
+ path=path operation,paths=Path operations,
index=Index,
key=key,keys=Keys,
length=length,lengths=Lengths,
@@ -259,6 +273,10 @@
\newrobustcmd{\tcbIndexPrintKeyC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}}
\def\tcb@Print@Key#1{\textcolor{\kvtcb@col@key}{\tcb@doc@bfseries\tcb@scantokens{#1}}}
+\newrobustcmd{\tcbIndexPrintPathCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@path}{\kvtcb@text@path}}
+\newrobustcmd{\tcbIndexPrintPathC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@path}}
+\def\tcb@Print@Path#1{\textcolor{\kvtcb@col@path}{\tcb@doc@bfseries\tcb@scantokens{#1}}}
+
\newrobustcmd{\tcbIndexPrintValCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@value}{\kvtcb@text@value}}
\newrobustcmd{\tcbIndexPrintValC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@value}}
\def\tcb@Print@Val#1{\textcolor{\kvtcb@col@value}{\tcb@doc@bfseries\tcb@scantokens{#1}}}
@@ -279,6 +297,7 @@
\def\tcb@index@Env#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\kvtcb@index@command{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi}
\def\tcb@index@Key#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}%
\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\kvtcb@index@command{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}%
+\def\tcb@index@Path#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintPathCA{#1}}\kvtcb@index@command{\kvtcb@text@paths\idx@level#1\idx@actual\tcbIndexPrintPathC{#1}}\fi}
\def\tcb@index@Val#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintValCA{#1}}\kvtcb@index@command{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi}
\def\tcb@index@Col#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintColCA{#1}}\kvtcb@index@command{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi}
\def\tcb@index@Count#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintCountCA{#1}}\kvtcb@index@command{\kvtcb@text@counters\idx@level#1\idx@actual\tcbIndexPrintCountC{#1}}\fi}
@@ -311,20 +330,20 @@
enlarge bottom by=-0.2\baselineskip,#1}
% main documentation environments
-\newenvironment{docCommand}[3][]{\tcbset{#1}%
+\newenvironment{docCommand}[3][]{\tcbset{doc label={#2},#1}%
\begin{tcb@manual@entry}%
\begin{tcb@doc@head}{doc@head@command}%
- \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\tcb@cs{#2}}\label{com:#2}{\ttfamily #3}%
+ \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\tcb@cs{#2}}\label{com:\kvtcb@doc@label}{\ttfamily #3}%
\tcb@doc@do@description%
\end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@command@before\ignorespaces}%
{\ifvmode\else\unskip\fi\kvtcb@doc@body@command@after\end{tcb@manual@entry}}
\newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup}
-\newenvironment{docEnvironment}[3][]{\tcbset{#1}%
+\newenvironment{docEnvironment}[3][]{\tcbset{doc label={#2},#1}%
\begin{tcb@manual@entry}%
\begin{tcb@doc@head}{doc@head@environment}%
- \strut\cs{begin}\brackets{\tcb@Print@Env{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:#2}{\ttfamily #3}\par%
+ \strut\cs{begin}\brackets{\tcb@Print@Env{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:\kvtcb@doc@label}{\ttfamily #3}\par%
\strut~~\meta{\kvtcb@text@envcontent}\par%
\strut\cs{end}\brackets{\tcb@Print@Env{#2}}%
\tcb@doc@do@description%
@@ -333,14 +352,14 @@
\newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup}
-\NewDocumentEnvironment{docKey}{ O{} +O{} m m +m }{\tcbset{#2,doc description={#5}}%
+\NewDocumentEnvironment{docKey}{ O{} +O{} m m +m }{\tcbset{doc label={#3},#2,doc description={#5}}%
\begin{tcb@manual@entry}%
\begin{tcb@doc@head}{doc@head@key}%
\ifblank{#1}{%
- \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:#3}{\ttfamily #4}%
+ \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:\kvtcb@doc@label}{\ttfamily #4}%
}{%
\tcb@Print@Key{/#1/#3}%
- \tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}%
+ \tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/\kvtcb@doc@label}{\ttfamily #4}%
}%
\tcb@doc@do@description%
\end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@key@before\ignorespaces}%
@@ -356,6 +375,18 @@
\newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}%
}
+\newenvironment{docPathOperation}[3][]{\tcbset{doc label={#2},#1}%
+ \begin{tcb@manual@entry}%
+ \begin{tcb@doc@head}{doc@head@path}%
+ \colFade{\tcb@cs{path ...}}\
+ \tcb@Print@Path{#2}\tcb@index@Path{#2}\protected@edef\@currentlabel{#2}\label{path:\kvtcb@doc@label}{\ttfamily #3}%
+ \ \colFade{\tcb@scantokens{...;}}
+ \tcb@doc@do@description%
+ \end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@path@before\ignorespaces}%
+ {\ifvmode\else\unskip\fi\kvtcb@doc@body@path@after\end{tcb@manual@entry}}
+
+\newenvironment{docPathOperation*}{\bgroup\tcb@doc@toindexfalse\begin{docPathOperation}}{\end{docPathOperation}\egroup}
+
\DeclareDocumentCommand\docAuxCommand{sm}{%
\tcb@Print@Com{#2}%
\IfBooleanTF{#1}{}{\tcb@index@Com{#2}}%
@@ -408,6 +439,7 @@
\def\refCom{\tcb@ref@doc{com}}
\def\refEnv{\tcb@ref@doc{env}}
\def\refKey{\tcb@ref@doc{key}}
+\def\refPathOperation{\tcb@ref@doc{path}}
\def\refAux#1{\textcolor{\kvtcb@colhyper}{\tcb@scantokens{#1}}}
\def\refAuxcs#1{\textcolor{\kvtcb@colhyper}{\tcb@cs{#1}}}
@@ -491,6 +523,7 @@
color option=Option,
color definition=Definition,
color hyperlink=Hyperlink,
+ color fade=Fade,
index command=\index,%
index format=pgf,
index default settings,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbexternal.code.tex new/tex/latex/tcolorbox/tcbexternal.code.tex
--- old/tex/latex/tcolorbox/tcbexternal.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbexternal.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{pro@cessing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbfitting.code.tex new/tex/latex/tcolorbox/tcbfitting.code.tex
--- old/tex/latex/tcolorbox/tcbfitting.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbfitting.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbhooks.code.tex new/tex/latex/tcolorbox/tcbhooks.code.tex
--- old/tex/latex/tcolorbox/tcbhooks.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbhooks.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbset{%
before upper app/.code={\appto\kvtcb@before@upper{#1}},%
@@ -74,10 +74,10 @@
title code app/.code={\appto\tcb@title@code{#1}},%
title code pre/.code={\preto\tcb@title@code{#1}},%
%
- extras unbroken pre/.code={\preto\tcb@extras@unbroken{#1}},%
- extras first pre/.code={\preto\tcb@extras@first{#1}},%
- extras middle pre/.code={\preto\tcb@extras@middle{#1}},%
- extras last pre/.code={\preto\tcb@extras@last{#1}},%
+ extras unbroken pre/.code={\preto\tcb@extras@unbroken{\tcbset{#1}}},%
+ extras first pre/.code={\preto\tcb@extras@first{\tcbset{#1}}},%
+ extras middle pre/.code={\preto\tcb@extras@middle{\tcbset{#1}}},%
+ extras last pre/.code={\preto\tcb@extras@last{\tcbset{#1}}},%
extras pre/.style={extras unbroken pre={#1},extras first pre={#1},extras middle pre={#1},extras last pre={#1}},%
extras broken pre/.style={extras first pre={#1},extras middle pre={#1},extras last pre={#1}},%
extras unbroken and first pre/.style={extras unbroken pre={#1},extras first pre={#1}},%
@@ -119,5 +119,10 @@
watermark text pre/.style={overlay pre={\tcb@drawspec@watermark@text{#1}}},
watermark text app on/.style args={#1 is #2}{overlay #1 app={\tcb@drawspec@watermark@text{#2}}},
watermark text pre on/.style args={#1 is #2}{overlay #1 pre={\tcb@drawspec@watermark@text{#2}}},
+ %
+ minted options app/.code={\appto\kvtcb@minted@options{,#1}},
+ minted options pre/.code={\preto\kvtcb@minted@options{#1,}},
+ listing options app/.code={\appto\kvtcb@listingoptions{,#1}},
+ listing options pre/.code={\preto\kvtcb@listingoptions{#1,}},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcblistings.code.tex new/tex/latex/tcolorbox/tcblistings.code.tex
--- old/tex/latex/tcolorbox/tcblistings.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcblistings.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{listings}[2007/02/22]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcblistingscore.code.tex new/tex/latex/tcolorbox/tcblistingscore.code.tex
--- old/tex/latex/tcolorbox/tcblistingscore.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcblistingscore.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{pro@cessing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcblistingsutf8.code.tex new/tex/latex/tcolorbox/tcblistingsutf8.code.tex
--- old/tex/latex/tcolorbox/tcblistingsutf8.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcblistingsutf8.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{listingsutf8}[2011/11/10]
\tcbuselibrary{listings}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbmagazine.code.tex new/tex/latex/tcolorbox/tcbmagazine.code.tex
--- old/tex/latex/tcolorbox/tcbmagazine.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbmagazine.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{breakable}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbminted.code.tex new/tex/latex/tcolorbox/tcbminted.code.tex
--- old/tex/latex/tcolorbox/tcbminted.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbminted.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{minted}[2011/09/17]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbposter.code.tex new/tex/latex/tcolorbox/tcbposter.code.tex
--- old/tex/latex/tcolorbox/tcbposter.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbposter.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbposter.code.tex: Code for posters
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{breakable,magazine,skins,fitting}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbprocessing.code.tex new/tex/latex/tcolorbox/tcbprocessing.code.tex
--- old/tex/latex/tcolorbox/tcbprocessing.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbprocessing.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbprocessing.code.tex: Code for conditional processing
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{pdftexcmds}
\RequirePackage{shellesc}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbraster.code.tex new/tex/latex/tcolorbox/tcbraster.code.tex
--- old/tex/latex/tcolorbox/tcbraster.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbraster.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
@@ -160,8 +160,8 @@
% sanitize
\tcbdimto\tcb@raster@width{\kvtcb@raster@width}%
\tcbdimto\tcb@raster@height{\kvtcb@raster@height}%
- \tcbdimto\tcb@raster@skip@before{\kvtcb@raster@skip@before}%
- \tcbdimto\tcb@raster@skip@after{\kvtcb@raster@skip@after}%
+ \tcbglueto\tcb@raster@skip@before{\kvtcb@raster@skip@before}%
+ \tcbglueto\tcb@raster@skip@after{\kvtcb@raster@skip@after}%
\tcbdimto\tcb@raster@skip@left{\kvtcb@raster@skip@left}%
\tcbdimto\tcb@raster@skip@right{\kvtcb@raster@skip@right}%
\tcbdimto\tcb@raster@xskip{\kvtcb@raster@xskip}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbskins.code.tex new/tex/latex/tcolorbox/tcbskins.code.tex
--- old/tex/latex/tcolorbox/tcbskins.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbskins.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{tikz}[2010/10/13]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex new/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
--- old/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{skins}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbtheorems.code.tex new/tex/latex/tcolorbox/tcbtheorems.code.tex
--- old/tex/latex/tcolorbox/tcbtheorems.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbtheorems.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{amsmath}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbvignette.code.tex new/tex/latex/tcolorbox/tcbvignette.code.tex
--- old/tex/latex/tcolorbox/tcbvignette.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbvignette.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbvignette.code.tex: Code for ornamental frames
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{skins}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbxparse.code.tex new/tex/latex/tcolorbox/tcbxparse.code.tex
--- old/tex/latex/tcolorbox/tcbxparse.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbxparse.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbxparse.code.tex: Code for xparse features
%%
%% -------------------------------------------------------------------------------------------
@@ -18,14 +18,14 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{xparse}[2013/12/31]
\tcbset{%
- IfNoValueTF/.code args={#1#2#3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
- IfValueTF/.code args={#1#2#3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
- IfBooleanTF/.code args={#1#2#3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+ IfNoValueTF/.code n args={3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+ IfValueTF/.code n args={3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+ IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm}
}
@@ -232,6 +232,19 @@
\def\tcb@sbs@content@right{\tcb@sbs@text@left\tcblower\box\tcb@lowerbox}
\def\tcb@sbs@content@both{\box\tcb@upperbox\tcblower\box\tcb@lowerbox}
+\def\tcb@sbs@save@upper{%
+ \colorlet{tcbcol@origin}{.}%
+ \tcb@set@color{tcbcolupper}%
+ \sbox{\tcb@upperbox}{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}%
+ \tcb@reset@color%
+}
+\def\tcb@sbs@save@lower{%
+ \colorlet{tcbcol@origin}{.}%
+ \tcb@set@color{tcbcollower}%
+ \sbox{\tcb@lowerbox}{\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}%
+ \tcb@reset@color%
+}
+
\tcbset{%
sidebyside adapt/.is choice,
sidebyside adapt/none/.style={%
@@ -241,19 +254,19 @@
},
sidebyside adapt/left/.style={%
sidebyside@adapt@process/.style={%
- code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\let\tcb@sbs@content\tcb@sbs@content@left},
+ code={\tcb@sbs@save@upper\let\tcb@sbs@content\tcb@sbs@content@left},
lefthand width=\wd\tcb@upperbox,
}%
},
sidebyside adapt/right/.style={%
sidebyside@adapt@process/.style={%
- code={\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@right},
+ code={\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@right},
righthand width=\wd\tcb@lowerbox,
}%
},
sidebyside adapt/both/.style={%
sidebyside@adapt@process/.style={%
- code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@both},
+ code={\tcb@sbs@save@upper\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@both},
text width=\wd\tcb@upperbox+\kvtcb@sbs@gap+\wd\tcb@lowerbox,
lefthand width=\wd\tcb@upperbox,
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcolorbox.sty new/tex/latex/tcolorbox/tcolorbox.sty
--- old/tex/latex/tcolorbox/tcolorbox.sty 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcolorbox.sty 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2019/03/02 version 4.20 text color boxes]
-\def\tcb@version{4.20}
+\ProvidesPackage{tcolorbox}[2019/11/15 version 4.22 text color boxes]
+\def\tcb@version{4.22}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -41,6 +41,7 @@
\newif\iftcb@fixedheight
\newif\iftcb@ignorenobreak
\newif\iftcb@checkpage
+\newif\iftcb@resetcounteronoverlays
\newbox\tcb@titlebox
\newbox\tcb@upperbox
@@ -62,6 +63,7 @@
\def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}}
\def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}}
+\def\tcbglueto#1#2{\edef#1{\the\glueexpr#2\relax}}
\def\tcb@defToTotalHeightStandard#1#2{\tcbdimto#1{\ht#2+\dp#2}}
\let\tcb@defToTotalHeight\tcb@defToTotalHeightStandard
@@ -431,9 +433,15 @@
left skip/.style={grow to left by={-\dimexpr#1\relax}},
right skip/.style={grow to right by={-\dimexpr#1\relax}},
leftright skip/.style={left skip={#1},right skip={#1}},
- spread inwards/.style={grow to left by=1in+\hoffset+\oddsidemargin+\@totalleftmargin+(#1),code={\if@twoside\tcbset{toggle enlargement}\fi}},
+ spread inwards/.style={%
+ if odd page={grow to left by=1in+\hoffset+\oddsidemargin+\@totalleftmargin+(#1)}%
+ {grow to right by=\paperwidth-\textwidth-1in-\hoffset-\evensidemargin+(#1)}%
+ },
spread inwards/.default=\z@,
- spread outwards/.style={grow to right by=\paperwidth-\textwidth-1in-\hoffset-\oddsidemargin+(#1),code={\if@twoside\tcbset{toggle enlargement}\fi}},
+ spread outwards/.style={%
+ if odd page={grow to right by=\paperwidth-\textwidth-1in-\hoffset-\oddsidemargin+(#1)}%
+ {grow to left by=1in+\hoffset+\evensidemargin+\@totalleftmargin+(#1)}%
+ },
spread outwards/.default=\z@,
move upwards/.style={before={\clearpage%
\lineskip\z@skip%
@@ -576,10 +584,23 @@
tabularx*/.style 2 args={%
boxsep=\z@,top=\z@,bottom=\z@,leftupper=\z@,rightupper=\z@,
toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm,
- before upper*={\arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}#1%
+ before upper*={%
+ \let\tcb@CT@arc@save\CT@arc@%
+ \arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}#1%
\tcb@hack@currenvir\tabularx{\linewidth}{#2}},
- after upper*=\endtabularx\arrayrulecolor{black}},
+ after upper*={\endtabularx\global\let\CT@arc@\tcb@CT@arc@save}%
+ },
tabularx/.style={tabularx*={}{#1}},
+ tabulars*/.style 2 args={%
+ boxsep=\z@,top=\z@,bottom=\z@,leftupper=\z@,rightupper=\z@,
+ toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm,
+ before upper*={%
+ \let\tcb@CT@arc@save\CT@arc@%
+ \arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}#1%
+ \begin{tabular*}{\linewidth}{#2}},
+ after upper*={\end{tabular*}\global\let\CT@arc@\tcb@CT@arc@save}
+ },
+ tabulars/.style={tabulars*={}{#1}},
tikz upper/.style={before upper*={\centering\tcb@shield@externalize\begin{tikzpicture}[{#1}]},after upper*=\end{tikzpicture}},%
tikz lower/.style={before lower*={\centering\tcb@shield@externalize\begin{tikzpicture}[{#1}]},after lower*=\end{tikzpicture}},%
tikznode upper/.style={before upper={\centering\tcb@shield@externalize\begin{tikzpicture}\node[{align=center,inner sep=\z@,outer sep=\z@,#1}]\bgroup},after upper={\egroup;\end{tikzpicture}}},%
@@ -1825,6 +1846,7 @@
auto counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@auto},
use counter from/.code={\edef\kvtcb@new@counter{\csname tcb@cnt@#1\endcsname}\let\tcb@proc@counter=\tcb@proc@counter@from},
no counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@no},
+ reset counter on overlays/.is if=tcb@resetcounteronoverlays,
%
number within/.store in=\kvtcb@new@numberwithin,
number format/.store in=\kvtcb@new@format,
@@ -1842,7 +1864,8 @@
blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}},%
blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\lstlistingname~\thetcbcounter}}}}},%
%
- reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear},
+ reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,
+ list inside=,list type=tcolorbox,init@hook@clear,reset counter on overlays=false},
}
\def\tcb@proc@counter@autoanduse#1{%
@@ -1885,6 +1908,13 @@
\long\def\tcb@proc@options@init#1#2{%
\tcbset{new/.cd,reset@new,#1}%
\tcb@proc@counter{#2}%
+ \iftcb@resetcounteronoverlays%
+ \ifcsname resetcounteronoverlays\endcsname%
+ \ifcsname tcb@cnt@#2\endcsname%
+ \resetcounteronoverlays{\csname tcb@cnt@#2\endcsname}%
+ \fi%
+ \fi%
+ \fi%
\ifx\kvtcb@new@listof\@empty%
\else%
\csedef{tcb@lstof@#2}{\kvtcb@new@listof}%
@@ -2136,12 +2166,13 @@
before title=,after title=,before upper=,after upper=,before lower=,after lower=,
sidebyside=false,sidebyside align=center,sidebyside gap=10mm,
lefthand ratio=0.5,check odd page=false,nophantom,
- shield externalize=false,list entry=,no label type,
+ list entry=,no label type,
opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,@opacitybacktitle=1.0,
subtitle style=,title filled=false,every float=,ignore nobreak=false,before nobreak=\noindent,
tcbox width=auto,
},
initialize@reset=reset@core,
+ shield externalize=false,
}
\def\tcbsetforeverylayer#1{\tcbset{initialize@reset={#1}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tcolorbox.tlpobj new/tlpkg/tlpobj/tcolorbox.tlpobj
--- old/tlpkg/tlpobj/tcolorbox.tlpobj 2019-03-03 02:24:55.000000000 +0100
+++ new/tlpkg/tlpobj/tcolorbox.tlpobj 2019-11-16 01:54:50.000000000 +0100
@@ -1,6 +1,6 @@
name tcolorbox
category Package
-revision 50206
+revision 52809
shortdesc Coloured boxes, for LaTeX examples and theorems, etc
relocated 1
longdesc This package provides an environment for coloured and framed
@@ -12,7 +12,7 @@
longdesc package supports saving and reuse of source code and text
longdesc parts. The package depends on the pgf, verbatim, environ, and
longdesc etoolbox packages.
-runfiles size=140
+runfiles size=141
RELOC/tex/latex/tcolorbox/blueshade.png
RELOC/tex/latex/tcolorbox/crinklepaper.png
RELOC/tex/latex/tcolorbox/goldshade.png
@@ -38,7 +38,7 @@
RELOC/tex/latex/tcolorbox/tcolorbox.sty
catalogue-contact-bugs https://github.com/T-F-S/tcolorbox/issues
catalogue-ctan /macros/latex/contrib/tcolorbox
-catalogue-date 2019-03-02 12:23:55 +0100
+catalogue-date 2019-11-15 14:22:02 +0100
catalogue-license lppl1.3
catalogue-topics boxing colour verbatim listing
-catalogue-version 4.20
+catalogue-version 4.22
++++++ testidx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/CHANGES new/doc/latex/testidx/CHANGES
--- old/doc/latex/testidx/CHANGES 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/CHANGES 2019-09-29 23:15:10.000000000 +0200
@@ -1,3 +1,11 @@
+v1.2 (2019-09-29):
+
+ * Added options ascii and noascii
+
+ * Added lonely sub-item
+
+ * Corrected description for seal
+
v1.1 (2017-08-11):
* Added more sample text, including examples starting with some
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/README new/doc/latex/testidx/README
--- old/doc/latex/testidx/README 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/README 2019-09-29 23:15:10.000000000 +0200
@@ -1,6 +1,6 @@
-LaTeX Package : testidx v1.1
+LaTeX Package : testidx v1.2
-Last Modified : 2017-08-11
+Last Modified : 2019-09-29
Author : Nicola Talbot
@@ -24,7 +24,8 @@
\end{document}
Note that the dummy indexing intentionally triggers multiple encap
-warnings for testing purposes.
+warnings for testing purposes. The package is designed to emulate
+common problems.
LICENCE
Binary files old/doc/latex/testidx/samples/sample-idx-a4.pdf and new/doc/latex/testidx/samples/sample-idx-a4.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-amsmath.pdf and new/doc/latex/testidx/samples/sample-idx-amsmath.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-babel-german.pdf and new/doc/latex/testidx/samples/sample-idx-babel-german.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-babel-german.tex new/doc/latex/testidx/samples/sample-idx-babel-german.tex
--- old/doc/latex/testidx/samples/sample-idx-babel-german.tex 2016-10-17 23:25:14.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-babel-german.tex 2019-09-29 23:15:10.000000000 +0200
@@ -18,7 +18,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{babel}
-\usepackage{testidx}
+\usepackage[ascii]{testidx}
\providecommand*\lettergroup[1]{%
\par\textbf{#1}\par
Binary files old/doc/latex/testidx/samples/sample-idx-german.pdf and new/doc/latex/testidx/samples/sample-idx-german.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-german.tex new/doc/latex/testidx/samples/sample-idx-german.tex
--- old/doc/latex/testidx/samples/sample-idx-german.tex 2016-10-17 23:25:14.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-german.tex 2019-09-29 23:15:10.000000000 +0200
@@ -18,7 +18,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{ngerman}
-\usepackage[german]{testidx}
+\usepackage[german,ascii]{testidx}
\providecommand*\lettergroup[1]{%
\par\textbf{#1}\par
Binary files old/doc/latex/testidx/samples/sample-idx-hyp.pdf and new/doc/latex/testidx/samples/sample-idx-hyp.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-letter.pdf and new/doc/latex/testidx/samples/sample-idx-letter.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-lua.pdf and new/doc/latex/testidx/samples/sample-idx-lua.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-lua.tex new/doc/latex/testidx/samples/sample-idx-lua.tex
--- old/doc/latex/testidx/samples/sample-idx-lua.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-lua.tex 2019-09-29 23:15:10.000000000 +0200
@@ -12,7 +12,7 @@
% arara: lualatex
% arara: xindy: {language: english, codepage: utf8,
% arara: --> log: sample-idx-lua.ilg,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-lua, texindy]}
% arara: lualatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx-subset.pdf and new/doc/latex/testidx/samples/sample-idx-subset.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-t1.pdf and new/doc/latex/testidx/samples/sample-idx-t1.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-utf8.pdf and new/doc/latex/testidx/samples/sample-idx-utf8.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-utf8.tex new/doc/latex/testidx/samples/sample-idx-utf8.tex
--- old/doc/latex/testidx/samples/sample-idx-utf8.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-utf8.tex 2019-09-29 23:15:10.000000000 +0200
@@ -11,7 +11,7 @@
%
% arara: pdflatex
% arara: xindy: {language: english, codepage: utf8,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-utf8, texindy]}
% arara: pdflatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx-xe-digraphs.pdf and new/doc/latex/testidx/samples/sample-idx-xe-digraphs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex new/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex
--- old/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex 2019-09-29 23:15:10.000000000 +0200
@@ -4,9 +4,9 @@
% with XeLaTeX and xindy using digraph glyphs.
% You can build this document using:
%
-% xelatex sample-idx-xe
-% xindy -M sample-idx-xe -M texindy -C utf8 -L english -t sample-idx-xe.ilg sample-idx-xe.idx
-% xelatex sample-idx-xe
+% xelatex sample-idx-xe-digraphs
+% xindy -M sample-idx-xe-digraphs -M texindy -C utf8 -L english -t sample-idx-xe-digraphs.ilg sample-idx-xe-digraphs.idx
+% xelatex sample-idx-xe-digraphs
%
% You may want to experiment with different languages.
%
@@ -14,7 +14,7 @@
%
% arara: xelatex
% arara: xindy: {language: english, codepage: utf8,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-xe-digraphs, texindy]}
% arara: xelatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx-xe.pdf and new/doc/latex/testidx/samples/sample-idx-xe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-xe.tex new/doc/latex/testidx/samples/sample-idx-xe.tex
--- old/doc/latex/testidx/samples/sample-idx-xe.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-xe.tex 2019-09-29 23:15:10.000000000 +0200
@@ -13,7 +13,7 @@
%
% arara: xelatex
% arara: xindy: {language: english, codepage: utf8,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-xe, texindy]}
% arara: xelatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx.pdf and new/doc/latex/testidx/samples/sample-idx.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-bib2gls-xe.pdf and new/doc/latex/testidx/samples/sample-idxgloss-bib2gls-xe.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-bib2gls.pdf and new/doc/latex/testidx/samples/sample-idxgloss-bib2gls.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-desc.pdf and new/doc/latex/testidx/samples/sample-idxgloss-desc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idxgloss-desc.tex new/doc/latex/testidx/samples/sample-idxgloss-desc.tex
--- old/doc/latex/testidx/samples/sample-idxgloss-desc.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idxgloss-desc.tex 2019-09-29 23:15:10.000000000 +0200
@@ -5,7 +5,7 @@
\usepackage[T1]{fontenc}
\usepackage[hidelinks]{hyperref}
-\usepackage[desc]{testidx-glossaries}
+\usepackage[desc,ascii]{testidx-glossaries}
\tstidxmakegloss
Binary files old/doc/latex/testidx/samples/sample-idxgloss-xe-digraphs.pdf and new/doc/latex/testidx/samples/sample-idxgloss-xe-digraphs.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-xindy.pdf and new/doc/latex/testidx/samples/sample-idxgloss-xindy.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss.pdf and new/doc/latex/testidx/samples/sample-idxgloss.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idxgloss.tex new/doc/latex/testidx/samples/sample-idxgloss.tex
--- old/doc/latex/testidx/samples/sample-idxgloss.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idxgloss.tex 2019-09-29 23:15:10.000000000 +0200
@@ -6,7 +6,7 @@
\usepackage[T1]{fontenc}
\usepackage{amssymb}
\usepackage[a4paper,left=.75in,right=1.6in]{geometry}
-\usepackage[verbose]{testidx-glossaries}
+\usepackage[verbose,ascii]{testidx-glossaries}
\renewcommand*{\glstreenamefmt}[1]{#1}
\renewcommand*{\glstreegroupheaderfmt}[1]{\textbf{#1}}
Binary files old/doc/latex/testidx/samples/sample-noidxgloss.pdf and new/doc/latex/testidx/samples/sample-noidxgloss.pdf differ
Binary files old/doc/latex/testidx/testidx-code.pdf and new/doc/latex/testidx/testidx-code.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-glossaries-diglyphs.tex new/doc/latex/testidx/testidx-glossaries-diglyphs.tex
--- old/doc/latex/testidx/testidx-glossaries-diglyphs.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-diglyphs.tex 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries-diglyphs.tex,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% 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/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex new/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex
--- old/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries-nodiglyphs.tex,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% 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/doc/latex/testidx/testidx-glossaries-samples.bib new/doc/latex/testidx/testidx-glossaries-samples.bib
--- old/doc/latex/testidx/testidx-glossaries-samples.bib 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-samples.bib 2019-09-29 23:15:10.000000000 +0200
@@ -27,6 +27,12 @@
description={particular areas or locations}
}
+@index{subitems,
+ category={word},
+ name={sub-items},
+ description={items that have a parent entry}
+}
+
@index{applications,
category={word},
description={computer programs}
@@ -877,7 +883,7 @@
@index{seal,
category={word},
- description={seal-dwelling fish-eating mammal with flippers}
+ description={sea-dwelling fish-eating mammal with flippers}
}
@index{sea,
@@ -1106,6 +1112,13 @@
description={attributes such as page size}
}
+@index{subitems.lonely,
+ name={lonely},
+ parent={subitems},
+ category={word},
+ description={a sub-item that doesn't have any siblings}
+}
+
@index{fontencoding.OT1,
name={OT1},
parent={fontencoding},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-glossaries-samples.tex new/doc/latex/testidx/testidx-glossaries-samples.tex
--- old/doc/latex/testidx/testidx-glossaries-samples.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-samples.tex 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries-samples.tex,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -45,6 +45,7 @@
\tstidxnewword{people}{human individuals (or fictional
anthropomorphisms)}
\tstidxnewword{places}{particular areas or locations}
+\tstidxnewword{sub-items}{items that have a parent entry}
\tstidxnewword{applications}{computer programs}
\tstidxnewword{environments}{a marked-up block within the document
that requires special action or formatting}
@@ -240,7 +241,7 @@
\tstidxnewword{thrilling}{exciting}
\tstidxnewword{quixotic}{impractically unselfish and idealist}
\tstidxnewword{sea}{large area of salt water}
-\tstidxnewword{seal}{seal-dwelling fish-eating mammal with flippers}
+\tstidxnewword{seal}{sea-dwelling fish-eating mammal with flippers}
\tstidxnewword{seaborne}{transported or travelling by sea}
\tstidxnewword{zither}{a type of stringed musical instrument}
\tstidxnewword{zealous}{having great enthusiasm for something}
@@ -513,6 +514,8 @@
is a popular method of describing aspects of chaos theory}
\tstidxnewartphrase{The}{End}{denotes the end of a
story, especially fairy tales}
+\tstidxnewsubword{sub-items}{lonely}{a sub-item that doesn't have
+any siblings}
\tstidxnewsubword{document}{properties}{attributes such as page size}
\tstidxnewsubword{font encoding}{OT1}{one of the original font
encodings supplied with \TeX}
Binary files old/doc/latex/testidx/testidx-manual.pdf and new/doc/latex/testidx/testidx-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-manual.tex new/doc/latex/testidx/testidx-manual.tex
--- old/doc/latex/testidx/testidx-manual.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-manual.tex 2019-09-29 23:15:10.000000000 +0200
@@ -27,12 +27,12 @@
\begin{document}
- \title{testidx.sty v1.1:
+ \title{testidx.sty v1.2:
dummy text for testing indexes}
\author{Nicola L.C. Talbot\\[10pt]
\url{http://www.dickimaw-books.com/}}
- \date{2017-08-11}
+ \date{2019-09-29}
\maketitle
\tableofcontents
@@ -41,7 +41,11 @@
The \styfmt{testidx} package is for testing indexes (\cs{index},
\env{theindex} and indexing applications, such as \app{makeindex}
-and \app{xindy}).
+and \app{xindy}). See also
+\href{http://tug.org/TUGboat/tb38-3/tb120talbot.pdf}{Testing
+indexes: \texttt{testidx.sty}} in
+\href{http://tug.org/TUGboat/Contents/contents38-3.html}{TUGboat issue 38:3, 2017}.
+
As with packages like \sty{lipsum} and \sty{blindtext}, this package
provides dummy text, but it's interspersed with \cs{index} commands.
The filler text is mostly English not lorum ipsum, as this makes it
@@ -112,13 +116,23 @@
\item Symbols and numbers that don't have a natural word order.
The numbers may or may not be ordered numerically, depending on the
indexing method.
+
+\item An item with just a single sub-item. (Perhaps the document
+author intended to index more sub-items but they weren't needed in
+the end.) Ideally this needs to be flagged and have the hierarchy
+removed. There are actually two lonely sub-items. The first is
+\qt{properties} as a sub-item of \qt{document}. In this case the
+parent \qt{document} has also been indexed and has a location. The
+second is \qt{lonely} as a sub-item of \qt{sub-items}. In this case
+the parent \qt{sub-items} hasn't been indexed and so doesn't have a
+location.
\end{itemize}
In addition, words containing extended Latin characters, digraphs and a
trigraph are indexed to help test various Latin alphabets, such as
Swedish, Icelandic, Welsh, Dutch, Polish and Hungarian. These may or
may not be recognised by indexing applications.
-Version 1.1 now comes with a supplementary package
+As from version 1.1, \sty{testidx} now comes with a supplementary package
\sty{testidx-glossaries} which provides a similar way of testing the
\sty{glossaries} or \sty{glossaries-extra} package.
@@ -150,6 +164,24 @@
to test how the indexing applications deal with this problem.
\end{important}
+Note that as from 2018, \LaTeX\ now automatically provides limited
+UTF-8 support even if the document doesn't load \sty{inputenc}. Therefore
+the above document will use the ASCII indexing tests with pre-2018
+\LaTeX, but will use the UTF-8 indexing tests with newer versions of
+the \LaTeX\ kernel (because \cs{inputencodingname} is now defined as
+\texttt{utf8}). If you specifically want to test ASCII indexing
+then you either need to switch to ASCII encoding:
+\begin{verbatim}
+\usepackage[ascii]{inputenc}
+\usepackage{makeidx}
+\usepackage{testidx}
+\end{verbatim}
+or use \sty{testidx}'s \pkgopt{ascii} option:
+\begin{verbatim}
+\usepackage{makeidx}
+\usepackage[ascii]{testidx}
+\end{verbatim}
+
If you want to use \app{xindy}, you'll need to define the
attributes (encaps) used in the dummy text. For example:
\begin{verbatim}
@@ -272,7 +304,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{ngerman}
-\usepackage[german]{testidx}
+\usepackage[german,ascii]{testidx}
\begin{filecontents*}{\jobname.ist}
quote '+'
@@ -302,7 +334,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{babel}
-\usepackage{testidx}
+\usepackage[ascii]{testidx}
\begin{filecontents*}{\jobname.ist}
quote '+'
@@ -324,7 +356,7 @@
\documentclass{report}
\usepackage[T1]{fontenc}
-\usepackage{testidx-glossaries}
+\usepackage[ascii]{testidx-glossaries}
\renewcommand*{\glstreenamefmt}[1]{#1}
@@ -358,6 +390,15 @@
The following package options are provided:
\begin{description}
+\item[\pkgopt{ascii}] Use only ASCII tests even if the document
+supports UTF-8. Any characters outside
+that range are produced with \LaTeX\ commands.
+
+\item[\pkgopt{noascii}] (Default.) Don't enforce ASCII tests. This option
+doesn't actually provide UTF-8 support but will simply
+determine whether or not to use ASCII tests depending on the
+document's input encoding.
+
\item[\pkgopt{german} or \pkgopt{ngerman}]
This redefines the indexing \qt{quote} character to use \texttt{+}
instead of the double-quote character. Remember to add this
@@ -412,6 +453,10 @@
\begin{definition}[\DescribeMacro\testidxSanitizeOff]
\cs{testidxSanitizeOff}
\end{definition}
+Note that as from \LaTeX\ 2019/10/01 UTF-8 characters are no longer
+expanded while they are written to the \texttt{.idx} file. This
+means that there may be no difference between \pkgopt{sanitize} and
+\pkgopt{nosanitize} depending on the \LaTeX\ kernel in use.
\item[\pkgopt{showmarks}]
(Default.) Show the location of the \cs{index} commands
@@ -1026,12 +1071,16 @@
\label{sec:exlatin}
The dummy text includes words or phrases that have extended
-Latin characters. There are two modes:
+Latin characters. (The document encoding should be correctly set
+before loading \sty{testidx}.) There are two modes:
\begin{description}
-\item[ASCII] This mode is on \emph{unless} you are using
-\XeLaTeX\ or \LuaLaTeX, or the document has loaded
-\sty{inputenc} with the encoding set to \pkgopt{utf8}.
+\item[ASCII] This mode is on by default \emph{unless} you are using
+\XeLaTeX\ or \LuaLaTeX, or the document has the encoding set to \pkgopt{utf8}.
+Note that with new versions of \LaTeX, \cs{inputencodingname} is now
+automatically defined as \pkgopt{utf8} by the kernel. You can
+explicitly switch this mode on with the \pkgopt{ascii} package
+option.
Example that will switch on ASCII mode:
\begin{verbatim}
@@ -1049,12 +1098,30 @@
\printindex
\end{document}
\end{verbatim}
+(With new versions of \LaTeX\ this document will start with
+\cs{inputencodingname} set to \texttt{utf8} and then it will be
+changed to \texttt{latin1} when \sty{inputenc} is loaded.)
+
+Alternatively use the \pkgopt{ascii} package option:
+\begin{verbatim}
+\documentclass{article}
+
+\usepackage{makeidx}
+\usepackage[ascii]{testidx}
+
+\makeindex
+
+\begin{document}
+\testidx
+
+\printindex
+\end{document}
+\end{verbatim}
-\item[UTF-8] This mode is on \emph{if} you are using
-\XeLaTeX\ or \LuaLaTeX, or if the document has loaded
-\sty{inputenc} with the encoding set to \pkgopt{utf8}.
+\item[UTF-8] This mode is on by default \emph{if} you are using
+\XeLaTeX\ or \LuaLaTeX, or if \cs{inputencodingname} is set to \pkgopt{utf8}.
-Example that will switch on UTF-8 mode:
+Example that will switch on UTF-8 mode (\XeLaTeX\ or \LuaLaTeX):
\begin{verbatim}
\documentclass{article}
@@ -1070,7 +1137,7 @@
\printindex
\end{document}
\end{verbatim}
-Or
+Or (\sty{inputenc} sets the encoding to UTF-8):
\begin{verbatim}
\documentclass{article}
@@ -1087,13 +1154,30 @@
\printindex
\end{document}
\end{verbatim}
+Or with new versions of the \LaTeX\ kernel (which automatically
+provides UTF-8 support):
+\begin{verbatim}
+\documentclass{article}
+
+\usepackage[T1]{fontenc}
+\usepackage{makeidx}
+\usepackage{testidx}
+
+\makeindex
+
+\begin{document}
+\testidx
+
+\printindex
+\end{document}
+\end{verbatim}
If the UTF-8 mode is on, you can additionally use the
\pkgopt{diglyphs} package option to replace the
\tstidxqt{ll}, \tstidxqt{ij} and \tstidxqt{dz} digraphs with
a single glyph, but you'll need a font that supports
those glyphs. (The trigraph \tstidxqt{dzw} and other digraphs,
-such as \tstidxqt{th} aren't affected by this option.) For example
+such as \tstidxqt{th} aren't affected by this option.) For example:
\begin{verbatim}
\documentclass{article}
@@ -1174,7 +1258,7 @@
\end{verbatim}
(where 3 is the page number).
-Since this can confuse the indexing application,
+Since this expansion can confuse the indexing application,
\styfmt{testidx} provides a \pkgopt{sanitize} package option
which will first sanitize the UTF-8 characters before
indexing them. This option is on by default for regular \LaTeX\ and
@@ -1188,6 +1272,13 @@
\cs{tstindex} is defined as) behaves with these characters, then
switch it off.
+\begin{important}
+As from \LaTeX\ 2019/10/01 this behaviour has changed and the UTF-8
+characters are no longer expanded while they are written to the
+\texttt{.idx} file. This means that the tests may produce different
+results depending on the \LaTeX\ kernel in use.
+\end{important}
+
Note that this \pkgopt{sanitize} option isn't adjusting the
definition of \cs{index} or \cs{tstindex}, but is essentially
pretending that the user is doing something like:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/testidx.doc.tlpobj new/tlpkg/tlpobj/testidx.doc.tlpobj
--- old/tlpkg/tlpobj/testidx.doc.tlpobj 2019-02-28 04:06:55.000000000 +0100
+++ new/tlpkg/tlpobj/testidx.doc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,9 +1,9 @@
name testidx.doc
category Package
-revision 45021
+revision 52213
shortdesc doc files of testidx
relocated 1
-docfiles size=1358
+docfiles size=1362
RELOC/doc/latex/testidx/CHANGES
RELOC/doc/latex/testidx/README
RELOC/doc/latex/testidx/samples/sample-idx-a4.pdf
++++++ testidx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/testidx/testidx-glossaries.sty new/tex/latex/testidx/testidx-glossaries.sty
--- old/tex/latex/testidx/testidx-glossaries.sty 2017-08-12 01:06:40.000000000 +0200
+++ new/tex/latex/testidx/testidx-glossaries.sty 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries.sty,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{testidx-glossaries}[2017/08/11 v1.1 (NLCT)]
+\ProvidesPackage{testidx-glossaries}[2019/09/29 v1.2 (NLCT)]
\newcommand*{\tstidx@glossariespkg}{glossaries}
\@ifpackageloaded{glossaries}
{%
@@ -2227,9 +2227,10 @@
any further sub-levels. Although \tstidxapp{xindy} allows more than
three levels (\tstidxapp{makeindex} doesn't), it's somewhat
\tstidxword{excessive} to go below a sub-sub-level.
- You'll have to add your own tests for anything deeper.%
-
+ You'll have to add your own tests for anything deeper.
+ Watch out for \tstidxsubword{sub-items}{lonely} sub-items.%
}
+
\let\@tidx@org@par@iii\@tidx@par@iii
\let\@tidx@par@iii\@tidx@gls@par@iii
\newcommand*{\@tidx@gls@par@iv}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/testidx/testidx.sty new/tex/latex/testidx/testidx.sty
--- old/tex/latex/testidx/testidx.sty 2017-08-12 01:06:40.000000000 +0200
+++ new/tex/latex/testidx/testidx.sty 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx.sty,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{testidx}[2017/08/11 v1.1 (NLCT)]
+\ProvidesPackage{testidx}[2019/09/29 v1.2 (NLCT)]
\RequirePackage{color}
\RequirePackage{ifxetex}
\RequirePackage{ifluatex}
@@ -54,13 +54,16 @@
\fi
\fi
}
-\newcommand*{\@tstidx@ifutfviii}[2]{%
+\newcommand*{\@@tstidx@ifutfviii}[2]{%
\@tstidx@ifxelua{#1}
{%
\ifx\inputencodingname\@tstidx@utfviii#1\else#2\fi
}%
}
\newcommand*{\@tstidx@utfviii}{utf8}
+\let\@tstidx@ifutfviii\@@tstidx@ifutfviii
+\DeclareOption{ascii}{\let\@tstidx@ifutfviii\@secondoftwo}
+\DeclareOption{noascii}{\let\@tstidx@ifutfviii\@@tstidx@ifutfviii}
\newcommand*{\tstidxprocessasciisort}{\tstidxprocessasciisortstrip}
\newcommand*{\testidxStripAccents}{%
\renewcommand*{\tstidxprocessasciisort}{\tstidxprocessasciisortstrip}%
@@ -2347,7 +2350,8 @@
any further sub-levels. Although \tstidxapp{xindy} allows more than
three levels (\tstidxapp{makeindex} doesn't), it's somewhat
\tstidxword{excessive} to go below a sub-sub-level.
- You'll have to add your own tests for anything deeper.%
+ You'll have to add your own tests for anything deeper.
+ Watch out for \tstidxsubword{sub-items}{lonely} sub-items.%
}
\tstidxnewblock*{\@tidx@openrangepar}
{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/testidx.tlpobj new/tlpkg/tlpobj/testidx.tlpobj
--- old/tlpkg/tlpobj/testidx.tlpobj 2019-02-28 04:06:56.000000000 +0100
+++ new/tlpkg/tlpobj/testidx.tlpobj 2019-09-30 01:54:47.000000000 +0200
@@ -1,6 +1,6 @@
name testidx
category Package
-revision 45021
+revision 52213
shortdesc Dummy text for testing index styles and indexing applications
relocated 1
longdesc This is a LaTeX package that provides a command to produce
@@ -17,7 +17,7 @@
RELOC/tex/latex/testidx/testidx.sty
catalogue-also blindtext
catalogue-ctan /macros/latex/contrib/testidx
-catalogue-date 2017-08-11 14:31:03 +0200
+catalogue-date 2019-09-29 17:34:08 +0200
catalogue-license lppl1.3
catalogue-topics index dummy-gen
-catalogue-version 1.1
+catalogue-version 1.2
++++++ tex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/initex.man1.pdf and new/texmf-dist/doc/man/man1/initex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tex.1 new/texmf-dist/doc/man/man1/tex.1
--- old/texmf-dist/doc/man/man1/tex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TEX 1 "16 June 2015" "Web2C 2019"
+.TH TEX 1 "6 August 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
@@ -182,6 +182,13 @@
.SH OPTIONS
This version of \*(TX understands the following command line options.
.TP
+.BI -cnf-line \ string
+Parse
+.I string
+as a
+.I texmf.cnf
+configuration line. See the Kpathsea manual.
+.TP
.B -enc
Enable the enc\*(TX extensions. This option is only effective in
combination with
@@ -488,7 +495,7 @@
.br
K. Berry,
.IR "Eplain: Expanded plain \*(TX" ,
-ftp://ftp.cs.umb.edu/pub/tex/eplain/doc.
+https://tug.org/eplain
.br
Michael Spivak,
.IR "The Joy of \*(OX" ,
@@ -496,6 +503,7 @@
.br
.I TUGboat
(the journal of the \*(TX Users Group).
+https://tug.org/TUGboat
.\"=====================================================================
.SH TRIVIA
\*(TX, pronounced properly, rhymes with ``blecchhh.'' The proper
Binary files old/texmf-dist/doc/man/man1/tex.man1.pdf and new/texmf-dist/doc/man/man1/tex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex.doc.tlpobj new/tlpkg/tlpobj/tex.doc.tlpobj
--- old/tlpkg/tlpobj/tex.doc.tlpobj 2019-03-27 02:26:40.000000000 +0100
+++ new/tlpkg/tlpobj/tex.doc.tlpobj 2020-03-14 01:43:39.000000000 +0100
@@ -1,6 +1,6 @@
name tex.doc
category TLCore
-revision 50602
+revision 54276
shortdesc doc files of tex
docfiles size=27
texmf-dist/doc/man/man1/initex.1
++++++ tex4ebook.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/README new/texmf-dist/doc/support/tex4ebook/README
--- old/texmf-dist/doc/support/tex4ebook/README 2019-03-21 21:57:24.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/README 2019-11-01 22:03:38.000000000 +0100
@@ -2,24 +2,22 @@
# Introduction
-`TeX4ebook` is bundle of Lua scripts and `LaTeX` packages for conversion of
-LaTeX files to ebook formats, for example `epub`, `mobi` and `epub3`. `tex4ht`
-is used as conversion engine.
+`TeX4ebook` is a tool for conversion from \LaTeX\ to
+ebook formats, such as EPUB, MOBI and EPUB 3.
+It is based on `TeX4ht`^[https://tug.org/tex4ht/],
+which provides instructions for the actual \LaTeX\ to HTML conversion,
+and on `make4ht`^[https://ctan.org/pkg/make4ht?lang=en].
-Note that while `mobi` is supported by Amazon Kindle, most widespread ebook
-reader, it doesn't support `mathml` and this means that math must re represented
-as images. The same is true for `epub`. This is not a good thing, especially
-for inline math, as you may experience wrong baselines. If your ebook contains
-math, the only correct solution is to produce `epub3`, as it supports `mathml`.
-The issue with `epub3` is, that majority of `e-ink` ebook readers doesn't
-support this format, reader applications exists mainly for Android and Apple
-devices. For books which contains mainly prose, all formats should be suitable,
-but `epub3` supports most features from web standards, such as `CSS`.
-As with `tex4ht`, the emphasis is on conversion of document's logical structure
-and metadata, basic visual appearance is preserved as well, but you should use
+The conversion is focused on the logical structure of the converted document
+and metadata. Basic visual appearance is preserved as well, but you should use
custom configurations if you want to make the document more visually appealing.
-You can include custom `CSS` or fonts in configuration files.
+You can include custom `CSS` or fonts in a configuration file.
+
+`TeX4ebook` supports the same features as `make4ht`, in particular build files and extensions.
+These may be used for post-processing of the generated HTML files, or to configure the image conversion.
+See the `make4ht` documentation to see the supported features.
+
## License
@@ -38,6 +36,7 @@
defined by `tex4ebook` in the document, or when your document uses a
package which causes a compilation error.
+
If you want to use `tex4ebook` commands, add this line to your document
preamble:
@@ -51,9 +50,13 @@
# Command line options
+`-a,--loglevel`
+
+: Set message log level. Possible values: debug, info, status, warning, error, fatal. Default: status.
+
`-c,--config`
-: specify custom config file for `tex4ht`
+: specify custom config file for `TeX4ht`
**example config file**: File `sample.cfg`
@@ -78,7 +81,11 @@
`-f,--format (default epub)`
-: Output format. Epub, Epub3 and Mobi formats are supported.
+: Output format. Possible values are `epub`, `epub3` and `mobi`.
+
+`-j,--jobname`
+
+: Specify the output file name, without file extension.
`-l,--lua`
@@ -97,7 +104,7 @@
`-s,--shell-escape`
-: Enable shell escape in htlatex run. This may be needed if you run external
+: Enable shell escape in the `htlatex` run. This is necessary for the execution of the external
commands from your source files.
`-t,--tidy`
@@ -112,12 +119,11 @@
`-v,--version`
: Print the version number.
-
# Configuration
-`tex4ebook` uses `tex4ht`^[http://www.tug.org/tex4ht/] for conversion from LaTeX
-to html. `tex4ht` is highly configurable using config files. Basic config file
+`TeX4ebook` uses `TeX4ht`^[http://www.tug.org/tex4ht/] for conversion from LaTeX
+to html. `TeX4ht` is highly configurable using config files. Basic config file
structure is
\Preamble{xhtml, comma separated list of options}
@@ -127,16 +133,16 @@
\EndPreamble
Basic info about command configurations can be found in a
-work-in-progres *tex4ht tutorial*^[https://github.com/michal-h21/helpers4ht/wiki/tex4ht-tutorial],
-*tex4ht documentation*^[http://www.tug.org/applications/tex4ht/mn11.html],
+work-in-progres *TeX4ht tutorial*^[https://github.com/michal-h21/helpers4ht/wiki/tex4ht-tutorial],
+*TeX4ht documentation*^[http://www.tug.org/applications/tex4ht/mn11.html],
and in series of blogposts on CV Radhakrishnan's blog:
-*Configure part 1*^[http://www.cvr.cc/?p=323],
-*Configure part 2*^[http://www.cvr.cc/?p=362],
-*Low level commands*^[http://www.cvr.cc/?p=482].
+*Configure part 1*^[https://web.archive.org/web/20180908234227/http://www.cvr.cc/?p=323],
+*Configure part 2*^[https://web.archive.org/web/20180908201057/http://www.cvr.cc/?p=362],
+*Low level commands*^[https://web.archive.org/web/20180909101325/http://cvr.cc/?p=482].
Available options for `\Preamble` command are listed in the article
-*TeX4ht: options*^[http://www.cvr.cc/?p=504]. *Comparison of tex4ebook and Pandoc output*^[https://github.com/richelbilderbeek/travis_tex_to_epub_example_1]
+*TeX4ht: options*^[https://web.archive.org/web/20180813043722/http://cvr.cc/?p=504]. *Comparison of tex4ebook and Pandoc output*^[https://github.com/richelbilderbeek/travis_tex_to_epub_example_1]
-Great source of tips for `tex4ht` configuring is *tex4ht tag on TeX.sx*^[http://tex.stackexchange.com/questions/tagged/tex4ht], there is also a *tag for tex4ebook*^[http://tex.stackexchange.com/questions/tagged/tex4ebook].
+A great source of tips for `TeX4ht` configuration is *tex4ht tag on TeX.sx*^[http://tex.stackexchange.com/questions/tagged/tex4ht]. There is also a *tag for tex4ebook*^[http://tex.stackexchange.com/questions/tagged/tex4ebook].
Examples of interesting questions are
*including images and fonts in ebooks*^[http://tex.stackexchange.com/a/213165/2891]
@@ -149,7 +155,7 @@
\Configure{UniqueIdentifier}{identifier}
-Every epub file should have unique identifier, like ISBN, DOI, URI etc.
+Every EPUB file should have unique identifier, like ISBN, DOI, URI etc.
Default identifier is URI, with value `http://example.com/\jobname`.
\Configure{@author}{\let\footnote\@gobble}
@@ -161,7 +167,7 @@
\Configure{OpfScheme}{URI}
Type of unique identifier, default type is URI. It is
-used only in `epub`, it is deprecated for `epub3`
+used only in the EPUB format, it is deprecated for EPUB 3.
\Configure{resettoclevels}{list of section types in descending order}
@@ -170,7 +176,7 @@
\Configure{DocumentLanguage}{language code}
-Each ePub file must declare the document language. It is inferred from `babel` main
+Each EPUB file must declare the document language. It is inferred from `babel` main
language by default, but you can configure it when it doesn't work correctly.
The `language code` should be in [ISO
639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) form.
@@ -203,11 +209,11 @@
\Configure{xmlns}{prefix}{uri}
-Add xml name space to `xhtml` files. Useful in `EPUB 3`
+Add `XML` name space to the generated `XHTML` files. Useful in `EPUB 3`.
-## Commands available in config files
+## Commands available in the config file
`\OpfRegisterFile[filename]`
@@ -244,53 +250,44 @@
# Troubleshooting
+## Fixed layout EPUB
+
+The basic support for the Fixed layout EPUB 3 can be enabled using the following configurations:
+
+ \Configure{OpfMetadata}{\HCode{<meta property="rendition:layout">pre-paginated</meta>}}
+ \Configure{OpfMetadata}{\HCode{<meta property="rendition:orientation">landscape</meta>}}
+ \Configure{OpfMetadata}{\HCode{<meta property="rendition:spread">none</meta>}}
+ \Configure{@HEAD}{\HCode{<meta name="viewport" content="width=1920, height=1080"/>\Hnewline}}
+
+Modify the dimensions in the `http://tug.org/mailman/listinfo/tex4ht] or on
+*TeX4ht mailing list*^[http://tug.org/mailman/listinfo/tex4ht] or on
*TeX.sx*^[http://tex.stackexchange.com/].
-
-
## Validation
In case of successful compilation, use command line tool `epubcheck`^[you need
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/changelog.tex new/texmf-dist/doc/support/tex4ebook/changelog.tex
--- old/texmf-dist/doc/support/tex4ebook/changelog.tex 2019-03-21 21:57:24.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/changelog.tex 2019-11-02 22:05:54.000000000 +0100
@@ -3,6 +3,118 @@
\begin{itemize}
\item
+ 2019/11/01
+
+ \begin{itemize}
+ \tightlist
+ \item
+ released version \texttt{0.3a}
+ \item
+ added \texttt{tex4ebook-} prefix to the output formats.
+ \item
+ removed unused files.
+ \end{itemize}
+\item
+ 2019/11/01
+
+ \begin{itemize}
+ \tightlist
+ \item
+ released version \texttt{0.3}
+ \end{itemize}
+\item
+ 2019/10/20
+
+ \begin{itemize}
+ \tightlist
+ \item
+ fixed the \texttt{TOC} cleanup in the \texttt{ePub\ 3} mode.
+ \item
+ added support for the \texttt{page-spread-left} and
+ \texttt{page-spreat-right} properties.
+ \end{itemize}
+\item
+ 2019/10/20
+
+ \begin{itemize}
+ \tightlist
+ \item
+ addapted to use the \texttt{make4ht} logging mechanism.
+ \end{itemize}
+\item
+ 2019/10/06
+
+ \begin{itemize}
+ \tightlist
+ \item
+ fixed bug with void elements parsing in the OPF file.
+ \item
+ undo \texttt{\textbackslash{}XeTeXcharclass} for the \texttt{:}
+ character when the OPF file is generated.
+ \end{itemize}
+\item
+ 2019/09/16
+
+ \begin{itemize}
+ \tightlist
+ \item
+ make the default build sequence before loading of the extensions.
+ Some extensions need to modify the build sequence.
+ \end{itemize}
+\item
+ 2019/08/28
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for reading input from \texttt{STDIN}.
+ \end{itemize}
+\item
+ 2019/08/27
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for the \texttt{-\/-jobname} command line option.
+ \end{itemize}
+\item
+ 2019/08/25
+
+ \begin{itemize}
+ \tightlist
+ \item
+ use the \texttt{mkparams.get\_args} function to retrieve the command
+ line options
+ \end{itemize}
+\item
+ 2019/07/24
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for the \texttt{\textbackslash{}author} command with
+ an optional argument
+ \end{itemize}
+\item
+ 2019/05/09
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for the \texttt{\textbackslash{}title} command with an
+ optional argument
+ \end{itemize}
+\item
+ 2019/04/04
+
+ \begin{itemize}
+ \tightlist
+ \item
+ register appendix chapters and section in the OPF file list
+ \item
+ fixed handling of appendices in the NCX table of contents
+ \end{itemize}
+\item
2019/03/21
\begin{itemize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/readme.tex new/texmf-dist/doc/support/tex4ebook/readme.tex
--- old/texmf-dist/doc/support/tex4ebook/readme.tex 2019-03-21 21:57:24.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/readme.tex 2019-11-01 22:03:38.000000000 +0100
@@ -1,29 +1,23 @@
\hypertarget{introduction}{%
\section{Introduction}\label{introduction}}
-\texttt{TeX4ebook} is bundle of Lua scripts and \texttt{LaTeX} packages
-for conversion of LaTeX files to ebook formats, for example
-\texttt{epub}, \texttt{mobi} and \texttt{epub3}. \texttt{tex4ht} is used
-as conversion engine.
-
-Note that while \texttt{mobi} is supported by Amazon Kindle, most
-widespread ebook reader, it doesn't support \texttt{mathml} and this
-means that math must re represented as images. The same is true for
-\texttt{epub}. This is not a good thing, especially for inline math, as
-you may experience wrong baselines. If your ebook contains math, the
-only correct solution is to produce \texttt{epub3}, as it supports
-\texttt{mathml}. The issue with \texttt{epub3} is, that majority of
-\texttt{e-ink} ebook readers doesn't support this format, reader
-applications exists mainly for Android and Apple devices. For books
-which contains mainly prose, all formats should be suitable, but
-\texttt{epub3} supports most features from web standards, such as
-\texttt{CSS}.
-
-As with \texttt{tex4ht}, the emphasis is on conversion of document's
-logical structure and metadata, basic visual appearance is preserved as
-well, but you should use custom configurations if you want to make the
-document more visually appealing. You can include custom \texttt{CSS} or
-fonts in configuration files.
+\texttt{TeX4ebook} is a tool for conversion from \LaTeX~to ebook
+formats, such as EPUB, MOBI and EPUB 3. It is based on
+\texttt{TeX4ht}\footnote{\url{https://tug.org/tex4ht/}}, which provides
+instructions for the actual \LaTeX~to HTML conversion, and on
+\texttt{make4ht}\footnote{\url{https://ctan.org/pkg/make4ht?lang=en}}.
+
+The conversion is focused on the logical structure of the converted
+document and metadata. Basic visual appearance is preserved as well, but
+you should use custom configurations if you want to make the document
+more visually appealing. You can include custom \texttt{CSS} or fonts in
+a configuration file.
+
+\texttt{TeX4ebook} supports the same features as \texttt{make4ht}, in
+particular build files and extensions. These may be used for
+post-processing of the generated HTML files, or to configure the image
+conversion. See the \texttt{make4ht} documentation to see the supported
+features.
\hypertarget{license}{%
\subsection{License}\label{license}}
@@ -67,8 +61,11 @@
\section{Command line options}\label{command-line-options}}
\begin{description}
+\item[\texttt{-a,-\/-loglevel}]
+Set message log level. Possible values: debug, info, status, warning,
+error, fatal. Default: status.
\item[\texttt{-c,-\/-config}]
-specify custom config file for \texttt{tex4ht}
+specify custom config file for \texttt{TeX4ht}
\end{description}
\textbf{example config file}: File \texttt{sample.cfg}
@@ -95,7 +92,10 @@
Defaulf build file filename is \texttt{filename.mk4}, use this option if
you use different filename.
\item[\texttt{-f,-\/-format\ (default\ epub)}]
-Output format. Epub, Epub3 and Mobi formats are supported.
+Output format. Possible values are \texttt{epub}, \texttt{epub3} and
+\texttt{mobi}.
+\item[\texttt{-j,-\/-jobname}]
+Specify the output file name, without file extension.
\item[\texttt{-l,-\/-lua}]
Use LuaLaTeX as TeX engine.
\item[\texttt{-m,-\/-mode\ (default\ default)}]
@@ -107,8 +107,8 @@
Resolution of generated images, for example math. It should meet
resolution of target devices, which is usually about 167 ppi.
\item[\texttt{-s,-\/-shell-escape}]
-Enable shell escape in htlatex run. This may be needed if you run
-external commands from your source files.
+Enable shell escape in the \texttt{htlatex} run. This is necessary for
+the execution of the external commands from your source files.
\item[\texttt{-t,-\/-tidy}]
process output html files with \texttt{HTML\ tidy} command\footnote{It
needs to be installed separately}.
@@ -121,8 +121,8 @@
\hypertarget{configuration}{%
\section{Configuration}\label{configuration}}
-\texttt{tex4ebook} uses \texttt{tex4ht}\footnote{\url{http://www.tug.org/tex4ht/}}
-for conversion from LaTeX to html. \texttt{tex4ht} is highly
+\texttt{TeX4ebook} uses \texttt{TeX4ht}\footnote{\url{http://www.tug.org/tex4ht/}}
+for conversion from LaTeX to html. \texttt{TeX4ht} is highly
configurable using config files. Basic config file structure is
\begin{verbatim}
@@ -134,19 +134,19 @@
\end{verbatim}
Basic info about command configurations can be found in a
-work-in-progres \emph{tex4ht tutorial}\footnote{\url{https://github.com/michal-h21/helpers4ht/wiki/tex4ht-tutorial}},
-\emph{tex4ht documentation}\footnote{\url{http://www.tug.org/applications/tex4ht/mn11.html}},
+work-in-progres \emph{TeX4ht tutorial}\footnote{\url{https://github.com/michal-h21/helpers4ht/wiki/tex4ht-tutorial}},
+\emph{TeX4ht documentation}\footnote{\url{http://www.tug.org/applications/tex4ht/mn11.html}},
and in series of blogposts on CV Radhakrishnan's blog: \emph{Configure
-part 1}\footnote{\url{http://www.cvr.cc/?p=323}}, \emph{Configure part
-2}\footnote{\url{http://www.cvr.cc/?p=362}}, \emph{Low level
-commands}\footnote{\url{http://www.cvr.cc/?p=482}}. Available options
-for \texttt{\textbackslash{}Preamble} command are listed in the article
-\emph{TeX4ht: options}\footnote{\url{http://www.cvr.cc/?p=504}}.
+part 1}\footnote{\url{https://web.archive.org/web/20180908234227/http://www.cvr.cc/?p=323}},
+\emph{Configure part 2}\footnote{\url{https://web.archive.org/web/20180908201057/http://www.cvr.cc/?p=362}},
+\emph{Low level commands}\footnote{\url{https://web.archive.org/web/20180909101325/http://cvr.cc/?p=482}}.
+Available options for \texttt{\textbackslash{}Preamble} command are
+listed in the article \emph{TeX4ht: options}\footnote{\url{https://web.archive.org/web/20180813043722/http://cvr.cc/?p=504}}.
\emph{Comparison of tex4ebook and Pandoc output}\footnote{\url{https://github.com/richelbilderbeek/travis_tex_to_epub_example_1}}
-Great source of tips for \texttt{tex4ht} configuring is \emph{tex4ht tag
-on TeX.sx}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4ht}},
-there is also a \emph{tag for tex4ebook}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4ebook}}.
+A great source of tips for \texttt{TeX4ht} configuration is \emph{tex4ht
+tag on TeX.sx}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4ht}}.
+There is also a \emph{tag for tex4ebook}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4ebook}}.
Examples of interesting questions are \emph{including images and fonts
in ebooks}\footnote{\url{http://tex.stackexchange.com/a/213165/2891}} or
@@ -161,7 +161,7 @@
\Configure{UniqueIdentifier}{identifier}
\end{verbatim}
-Every epub file should have unique identifier, like ISBN, DOI, URI etc.
+Every EPUB file should have unique identifier, like ISBN, DOI, URI etc.
Default identifier is URI, with value
\texttt{http://example.com/\textbackslash{}jobname}.
@@ -179,8 +179,8 @@
\Configure{OpfScheme}{URI}
\end{verbatim}
-Type of unique identifier, default type is URI. It is used only in
-\texttt{epub}, it is deprecated for \texttt{epub3}
+Type of unique identifier, default type is URI. It is used only in the
+EPUB format, it is deprecated for EPUB 3.
\begin{verbatim}
\Configure{resettoclevels}{list of section types in descending order}
@@ -194,7 +194,7 @@
\Configure{DocumentLanguage}{language code}
\end{verbatim}
-Each ePub file must declare the document language. It is inferred from
+Each EPUB file must declare the document language. It is inferred from
\texttt{babel} main language by default, but you can configure it when
it doesn't work correctly. The \texttt{language\ code} should be in
\href{https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes}{ISO 639-1}
@@ -243,11 +243,12 @@
\Configure{xmlns}{prefix}{uri}
\end{verbatim}
-Add xml name space to \texttt{xhtml} files. Useful in \texttt{EPUB\ 3}
+Add \texttt{XML} name space to the generated \texttt{XHTML} files.
+Useful in \texttt{EPUB\ 3}.
-\hypertarget{commands-available-in-config-files}{%
-\subsection{Commands available in config
-files}\label{commands-available-in-config-files}}
+\hypertarget{commands-available-in-the-config-file}{%
+\subsection{Commands available in the config
+file}\label{commands-available-in-the-config-file}}
\begin{description}
\item[\texttt{\textbackslash{}OpfRegisterFile{[}filename{]}}]
@@ -293,8 +294,44 @@
\hypertarget{troubleshooting}{%
\section{Troubleshooting}\label{troubleshooting}}
+\hypertarget{fixed-layout-epub}{%
+\subsection{Fixed layout EPUB}\label{fixed-layout-epub}}
+
+The basic support for the Fixed layout EPUB 3 can be enabled using the
+following configurations:
+
+\begin{verbatim}
+\Configure{OpfMetadata}{\HCode{<meta property="rendition:layout">pre-paginated</meta>}}
+\Configure{OpfMetadata}{\HCode{<meta property="rendition:orientation">landscape</meta>}}
+\Configure{OpfMetadata}{\HCode{<meta property="rendition:spread">none</meta>}}
+\Configure{@HEAD}{\HCode{<meta name="viewport" content="width=1920, height=1080"/>\Hnewline}}
+\end{verbatim}
+
+Modify the dimensions in the
+\texttt{\textless{}meta\ name="viewport\textgreater{}} element according
+to your needs.
+
+\hypertarget{math-issues}{%
+\subsection{Math issues}\label{math-issues}}
+
+Note that while \texttt{mobi} is supported by Amazon Kindle, most
+widespread ebook reader, it doesn't support \texttt{MathML}. This means
+that math must be represented as images. The same issue is true for the
+EPUB format as well. This is problematic especially for the inline math,
+as you may experience wrong vertical alignment of the math content and
+surrounding text. If your ebook contains math, a better solution is to
+produce the \texttt{epub3} format, as it supports \texttt{MathML}. The
+issue with EPUB 3 is that majority of \texttt{e-ink} ebook readers don't
+support it. Reader applications exists mainly for Android and Apple
+devices. For books which contains mainly prose, all formats should be
+suitable, but EPUB 3 supports most features from web standards, such as
+\texttt{CSS}.
+
+\hypertarget{compilation-errors}{%
+\subsection{Compilation errors}\label{compilation-errors}}
+
When compilation of the document breaks with error during \texttt{LaTeX}
-run, it may be caused by some problem in \texttt{tex4ht} configuration.
+run, it may be caused by some problem in \texttt{TeX4ht} configuration.
Comment out line \texttt{\textbackslash{}usepackage\{tex4ebook\}} in
your source file and run command:
@@ -303,9 +340,9 @@
\end{verbatim}
if same error as in \texttt{tex4ebook} run arises, the problem is in
-some \texttt{tex4ht} configuration. Try to identify the source of
+some \texttt{TeX4ht} configuration. Try to identify the source of
problem and if you cannot find the solution, make minimal example
-showing the error and ask for help either on \emph{tex4ht mailing
+showing the error and ask for help either on \emph{TeX4ht mailing
list}\footnote{\url{http://tug.org/mailman/listinfo/tex4ht}} or on
\emph{TeX.sx}\footnote{\url{http://tex.stackexchange.com/}}.
Binary files old/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf and new/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf new/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf
--- old/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf 2019-11-02 22:05:54.000000000 +0100
@@ -0,0 +1,4 @@
+show-warnings: no
+numeric-entities:yes
+new-inline-tags:span,a,math,mi, mo, mn ,abs ,and ,annotation ,annotation-xml ,apply ,approx ,arccos ,arccosh ,arccot ,arccoth ,arccsc ,arccsch ,arcsec ,arcsech ,arcsin ,arcsinh ,arctan ,arctanh ,arg ,bind ,bvar ,card ,cartesianproduct ,cbytes ,ceiling ,cerror ,ci ,cn ,codomain ,complexes ,compose ,condition ,conjugate ,cos ,cosh ,cot ,coth ,cs ,csc ,csch ,csymbol ,curl ,declare ,degree ,determinant ,diff ,divergence ,divide ,domain ,domainofapplication ,el ,emptyset ,eq ,equivalent ,eulergamma ,exists ,exp ,exponentiale ,factorial ,factorof ,false ,floor ,fn ,forall ,gcd ,geq ,grad ,gt ,ident ,image ,imaginary ,imaginaryi ,implies ,in ,infinity ,int ,integers ,intersect ,interval ,inverse ,lambda ,laplacian ,lcm ,leq ,limit ,list ,ln ,log ,logbase ,lowlimit ,lt ,maction ,malign ,maligngroup ,malignmark ,malignscope ,math ,matrix ,matrixrow ,max ,mean ,median ,menclose ,merror ,mfenced ,mfrac ,mfraction ,mglyph ,mi ,min ,minus ,mlabeledtr ,mlongdiv ,mmultiscripts ,mn ,mo ,mode ,moment ,momentabout ,mover ,mpadded ,mphantom ,mprescripts ,mroot ,mrow ,ms ,mscarries ,mscarry ,msgroup ,msline ,mspace ,msqrt ,msrow ,mstack ,mstyle ,msub ,msubsup ,msup ,mtable ,mtd ,mtext ,mtr ,munder ,munderover ,naturalnumbers ,neq ,none ,not ,notanumber ,note ,notin ,notprsubset ,notsubset ,or ,otherwise ,outerproduct ,partialdiff ,pi ,piece ,piecewise ,plus ,power ,primes ,product ,prsubset ,quotient ,rationals ,real ,reals ,reln ,rem ,root ,scalarproduct ,sdev ,sec ,sech ,selector ,semantics ,sep ,set ,setdiff ,share ,sin ,sinh ,subset ,sum ,tan ,tanh ,tendsto ,times ,transpose ,true ,union ,uplimit ,variance ,vector ,vectorproduct ,xor ,bdi ,command ,details ,dialog ,summary ,figure ,figcaption ,footer ,header ,mark ,meter ,progress ,ruby ,rt ,rp ,time ,wbr ,altGlyph ,altGlyphDef ,altGlyphItem ,animate ,animateColor ,animateMotion ,animateTransform ,circle ,clipPath ,color-profile ,cursor ,defs ,desc ,ellipse ,feBlend ,feColorMatrix ,feComponentTransfer ,feComposite ,feConvolveMatrix ,feDiffuseLighting ,feDisplacementMap ,feDistantLight ,feFlood ,feFuncA ,feFuncB ,feFuncG ,feFuncR ,feGaussianBlur ,feImage ,feMerge ,feMergeNode ,feMorphology ,feOffset ,fePointLight ,feSpecularLighting ,feSpotLight ,feTile ,feTurbulence ,filter ,font ,font-face ,font-face-format ,font-face-name ,font-face-src ,font-face-uri ,foreignObject ,g ,glyph ,glyphRef ,hkern ,image ,line ,linearGradient ,marker ,mask ,metadata ,missing-glyph ,mpath ,path ,pattern ,polygon ,polyline ,radialGradient ,rect ,script ,set ,stop ,style ,svg ,switch ,symbol ,text ,textPath ,title ,tref ,tspan ,use
+new-blocklevel-tags: aside,section,article,nav
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/tidyconf.conf new/texmf-dist/doc/support/tex4ebook/tidyconf.conf
--- old/texmf-dist/doc/support/tex4ebook/tidyconf.conf 2017-04-28 23:21:37.000000000 +0200
+++ new/texmf-dist/doc/support/tex4ebook/tidyconf.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-show-warnings: no
-numeric-entities:yes
-new-inline-tags:span,a,math,mi, mo, mn ,abs ,and ,annotation ,annotation-xml ,apply ,approx ,arccos ,arccosh ,arccot ,arccoth ,arccsc ,arccsch ,arcsec ,arcsech ,arcsin ,arcsinh ,arctan ,arctanh ,arg ,bind ,bvar ,card ,cartesianproduct ,cbytes ,ceiling ,cerror ,ci ,cn ,codomain ,complexes ,compose ,condition ,conjugate ,cos ,cosh ,cot ,coth ,cs ,csc ,csch ,csymbol ,curl ,declare ,degree ,determinant ,diff ,divergence ,divide ,domain ,domainofapplication ,el ,emptyset ,eq ,equivalent ,eulergamma ,exists ,exp ,exponentiale ,factorial ,factorof ,false ,floor ,fn ,forall ,gcd ,geq ,grad ,gt ,ident ,image ,imaginary ,imaginaryi ,implies ,in ,infinity ,int ,integers ,intersect ,interval ,inverse ,lambda ,laplacian ,lcm ,leq ,limit ,list ,ln ,log ,logbase ,lowlimit ,lt ,maction ,malign ,maligngroup ,malignmark ,malignscope ,math ,matrix ,matrixrow ,max ,mean ,median ,menclose ,merror ,mfenced ,mfrac ,mfraction ,mglyph ,mi ,min ,minus ,mlabeledtr ,mlongdiv ,mmultiscripts ,mn ,mo ,mode ,moment ,momentabout ,mover ,mpadded ,mphantom ,mprescripts ,mroot ,mrow ,ms ,mscarries ,mscarry ,msgroup ,msline ,mspace ,msqrt ,msrow ,mstack ,mstyle ,msub ,msubsup ,msup ,mtable ,mtd ,mtext ,mtr ,munder ,munderover ,naturalnumbers ,neq ,none ,not ,notanumber ,note ,notin ,notprsubset ,notsubset ,or ,otherwise ,outerproduct ,partialdiff ,pi ,piece ,piecewise ,plus ,power ,primes ,product ,prsubset ,quotient ,rationals ,real ,reals ,reln ,rem ,root ,scalarproduct ,sdev ,sec ,sech ,selector ,semantics ,sep ,set ,setdiff ,share ,sin ,sinh ,subset ,sum ,tan ,tanh ,tendsto ,times ,transpose ,true ,union ,uplimit ,variance ,vector ,vectorproduct ,xor ,bdi ,command ,details ,dialog ,summary ,figure ,figcaption ,footer ,header ,mark ,meter ,progress ,ruby ,rt ,rp ,time ,wbr ,altGlyph ,altGlyphDef ,altGlyphItem ,animate ,animateColor ,animateMotion ,animateTransform ,circle ,clipPath ,color-profile ,cursor ,defs ,desc ,ellipse ,feBlend ,feColorMatrix ,feComponentTransfer ,feComposite ,feConvolveMatrix ,feDiffuseLighting ,feDisplacementMap ,feDistantLight ,feFlood ,feFuncA ,feFuncB ,feFuncG ,feFuncR ,feGaussianBlur ,feImage ,feMerge ,feMergeNode ,feMorphology ,feOffset ,fePointLight ,feSpecularLighting ,feSpotLight ,feTile ,feTurbulence ,filter ,font ,font-face ,font-face-format ,font-face-name ,font-face-src ,font-face-uri ,foreignObject ,g ,glyph ,glyphRef ,hkern ,image ,line ,linearGradient ,marker ,mask ,metadata ,missing-glyph ,mpath ,path ,pattern ,polygon ,polyline ,radialGradient ,rect ,script ,set ,stop ,style ,svg ,switch ,symbol ,text ,textPath ,title ,tref ,tspan ,use
-new-blocklevel-tags: aside,section,article,nav
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex4ebook.doc.tlpobj new/tlpkg/tlpobj/tex4ebook.doc.tlpobj
--- old/tlpkg/tlpobj/tex4ebook.doc.tlpobj 2019-03-22 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/tex4ebook.doc.tlpobj 2019-11-03 01:55:06.000000000 +0100
@@ -1,11 +1,11 @@
name tex4ebook.doc
category Package
-revision 50512
+revision 52616
shortdesc doc files of tex4ebook
-docfiles size=30
+docfiles size=32
texmf-dist/doc/support/tex4ebook/README
texmf-dist/doc/support/tex4ebook/changelog.tex
texmf-dist/doc/support/tex4ebook/readme.tex
texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf
texmf-dist/doc/support/tex4ebook/tex4ebook-doc.tex
- texmf-dist/doc/support/tex4ebook/tidyconf.conf
+ texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf
++++++ tex4ebook.tar.xz ++++++
++++ 1773 lines of diff (skipped)
++++++ tex4ht.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex4ht.doc.tlpobj new/tlpkg/tlpobj/tex4ht.doc.tlpobj
--- old/tlpkg/tlpobj/tex4ht.doc.tlpobj 2019-04-10 01:39:40.000000000 +0200
+++ new/tlpkg/tlpobj/tex4ht.doc.tlpobj 2020-04-20 01:55:53.000000000 +0200
@@ -1,6 +1,6 @@
name tex4ht.doc
category Package
-revision 50884
+revision 54806
shortdesc doc files of tex4ht
docfiles size=195
texmf-dist/doc/generic/tex4ht/bugfixes.css
++++++ tex4ht.tar.xz ++++++
++++ 74201 lines of diff (skipped)
++++++ texapi.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texapi.doc.tlpobj new/tlpkg/tlpobj/texapi.doc.tlpobj
--- old/tlpkg/tlpobj/texapi.doc.tlpobj 2019-02-28 04:07:38.000000000 +0100
+++ new/tlpkg/tlpobj/texapi.doc.tlpobj 2020-03-04 23:53:53.000000000 +0100
@@ -1,6 +1,6 @@
name texapi.doc
category Package
-revision 24237
+revision 54080
shortdesc doc files of texapi
relocated 1
docfiles size=48
++++++ texapi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texapi.tlpobj new/tlpkg/tlpobj/texapi.tlpobj
--- old/tlpkg/tlpobj/texapi.tlpobj 2019-02-28 04:07:38.000000000 +0100
+++ new/tlpkg/tlpobj/texapi.tlpobj 2020-03-04 23:53:53.000000000 +0100
@@ -1,6 +1,6 @@
name texapi
category Package
-revision 24237
+revision 54080
shortdesc Macros to write format-independent packages
relocated 1
longdesc Texapi provides utility macros to write format-independent (and
@@ -14,7 +14,6 @@
runfiles size=8
RELOC/tex/generic/texapi/texapi.tex
catalogue-ctan /macros/generic/texapi
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
-catalogue-topics macro-supp
+catalogue-topics macro-supp etex
catalogue-version 1.04
++++++ texdoc.doc.tar.xz ++++++
++++ 1829 lines of diff (skipped)
++++++ texdoc.tar.xz ++++++
++++ 35629 lines of diff (skipped)
++++++ texdoc_cnf.dif ++++++
--- /var/tmp/diff_new_pack.IwSaIz/_old 2020-05-29 21:33:57.786040135 +0200
+++ /var/tmp/diff_new_pack.IwSaIz/_new 2020-05-29 21:33:57.790040147 +0200
@@ -1,7 +1,56 @@
---
- texmf-dist/texdoc/texdoc.cnf | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ texmf-dist/scripts/texdoc/texdoclib-search.tlu | 24 +++++++++++++-----------
+ texmf-dist/texdoc/texdoc.cnf | 7 +++++--
+ 2 files changed, 18 insertions(+), 13 deletions(-)
+--- texmf-dist/scripts/texdoc/texdoclib-search.tlu
++++ texmf-dist/scripts/texdoc/texdoclib-search.tlu 2020-05-13 14:26:48.218370971 +0000
+@@ -30,7 +30,7 @@ local vanilla -- is this a vanilla TL or
+
+ -- find the TeX Live root
+ local function get_tlroot()
+- local tlroot = kpse.expand_path('$TEXMFROOT') -- it should be exisitng one
++ local tlroot = kpse.expand_path('$TEXMFDIST') -- it should be exisitng one
+ get_tlroot = function() return tlroot end
+ return tlroot
+ end
+@@ -575,7 +575,8 @@ end
+
+ -- get pre-hashed tlpdb info from a cache file
+ get_tlpinfo_from_cache = function(filename)
+- s_meta, tlp_from_runfile, tlp_doclist = dofile(filename)
++-- s_meta, tlp_from_runfile, tlp_doclist = dofile(filename)
++ s_meta, tlp_from_runfile, tlp_doclist = { }
+ end
+
+ -- get pre-hashed tlpdb info from a pseudo-cache file
+@@ -685,16 +686,17 @@ local function init_tlp_database()
+ else
+ dbg_print('tlpdb',
+ 'Getting data from tlpdb file ' .. texlive_tlpdb)
+- get_tlpinfo_from_tlpdb(texlive_tlpdb)
++-- get_tlpinfo_from_tlpdb(texlive_tlpdb)
++ get_tlpinfo_from_tlpdb('/dev/null')
+ dbg_print('tlpdb', 'Writing data in cache file ' .. cache_file)
+- local ok, msg = mkdir_p(texdoc.util.path_parent(cache_file))
+- if not ok then
+- err_print('warning',
+- 'Failed to create cache file in %s:', cache_file)
+- err_print('warning', msg)
+- else
+- print_out_tlpinfo(cache_file)
+- end
++-- local ok, msg = mkdir_p(texdoc.util.path_parent(cache_file))
++-- if not ok then
++-- err_print('warning',
++-- 'Failed to create cache file in %s:', cache_file)
++-- err_print('warning', msg)
++-- else
++-- print_out_tlpinfo(cache_file)
++-- end
+ end
+ else
+ dbg_print('tlpdb', 'Using shipped tlpdb data.')
--- texmf-dist/texdoc/texdoc.cnf
+++ texmf-dist/texdoc/texdoc.cnf 2019-05-10 11:11:06.935408551 +0000
@@ -60,8 +60,11 @@
++++++ texdoctk.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/texdoctk.man1.pdf and new/texmf-dist/doc/man/man1/texdoctk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdoctk.doc.tlpobj new/tlpkg/tlpobj/texdoctk.doc.tlpobj
--- old/tlpkg/tlpobj/texdoctk.doc.tlpobj 2019-03-27 02:26:52.000000000 +0100
+++ new/tlpkg/tlpobj/texdoctk.doc.tlpobj 2020-03-26 23:29:44.000000000 +0100
@@ -1,6 +1,6 @@
name texdoctk.doc
category TLCore
-revision 50602
+revision 54557
shortdesc doc files of texdoctk
docfiles size=11
texmf-dist/doc/man/man1/texdoctk.1
++++++ texdoctk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texdoctk/texdoctk.pl new/texmf-dist/scripts/texdoctk/texdoctk.pl
--- old/texmf-dist/scripts/texdoctk/texdoctk.pl 2019-03-25 18:26:20.000000000 +0100
+++ new/texmf-dist/scripts/texdoctk/texdoctk.pl 2020-03-26 12:58:31.000000000 +0100
@@ -33,10 +33,21 @@
eval { require Tk; };
if ($@) {
- if (-x "/usr/bin/xmessage") {
- `xmessage -center -buttons Quit "The program texdoctk needs the package perl-tk, please install it!"`;
+ if ($IsWin32) {
+ $ENV{'RUNSCRIPT_ERROR_MESSAGE'} = "This Perl has no Perl/Tk module; aborting...";
+ my $vbsc = "";
+ $vbsc = `kpsewhich -format texmfscripts tl-errmess.vbs`;
+ if ($vbsc ne '') {
+ $vbsc =~ s!/!\\!g;
+ system("wscript $vbsc");
+ exit(0); # 0: prevent another error message from runscript
+ }
} else {
- printf STDERR "The program texdoctk needs the package perl-tk, please install it!\n";
+ if (-x "/usr/bin/xmessage") {
+ `xmessage -center -buttons Quit "The program texdoctk needs the package perl-tk, please install it!"`;
+ } else {
+ printf STDERR "The program texdoctk needs the package perl-tk, please install it!\n";
+ }
}
exit(1);
# that didn't work out, so warn the user and continue with text mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdoctk.tlpobj new/tlpkg/tlpobj/texdoctk.tlpobj
--- old/tlpkg/tlpobj/texdoctk.tlpobj 2019-03-27 02:26:52.000000000 +0100
+++ new/tlpkg/tlpobj/texdoctk.tlpobj 2020-03-26 23:29:44.000000000 +0100
@@ -1,6 +1,6 @@
name texdoctk
category TLCore
-revision 50602
+revision 54557
shortdesc Easy access to package documentation
longdesc A Perl/Tk-based GUI for easy access to package documentation
longdesc for TeX on Unix platforms; the databases it uses are based on
@@ -21,7 +21,6 @@
texmf-dist/texdoctk/texdocrc.defaults
texmf-dist/texdoctk/texdoctk.dat
catalogue-also texdoc
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics view-doc
catalogue-version 0.6.0
++++++ texdraw.doc.tar.xz ++++++
++++ 1714 lines of diff (skipped)
++++++ texdraw.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/blockdiagram.tex new/tex/generic/texdraw/blockdiagram.tex
--- old/tex/generic/texdraw/blockdiagram.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/blockdiagram.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% Block diagrams in TeXdraw
-% $Id: blockdiagram.tex,v 1.12 2019/03/28 texdraw-V2R0a $
+% $Id: blockdiagram.tex 1.15 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1993-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
\input txdtools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/texdraw.sty new/tex/generic/texdraw/texdraw.sty
--- old/tex/generic/texdraw/texdraw.sty 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/texdraw.sty 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw macros
-% $Id: texdraw.sty,v 2.4 2019/03/28 texdraw-V2R0a $
+% $Id: texdraw.sty 2.6 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
\NeedsTeXFormat{LaTeX2e}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/texdraw.tex new/tex/generic/texdraw/texdraw.tex
--- old/tex/generic/texdraw/texdraw.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/texdraw.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw macros
-% $Id: texdraw.tex,v 2.4 2019/03/28 texdraw-V2R0a $
+% $Id: texdraw.tex 2.7 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,16 +10,14 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
\def\setRevDate $#1 #2 #3${#2}
-\def\TeXdrawId{\setRevDate $Date: 2019/03/28 16:40:42 $ TeXdraw V2R0a}
+\def\TeXdrawId{\setRevDate $Date: 2019/04/18 14:10:45 $ TeXdraw V2R3}
% ===============================================================
@@ -29,7 +27,7 @@
% superimposed on the figure.
% (2) TeXdraw implements a \bsegment-\esegment environment which allows
% parameter changes and coordinate changes to be kept local. In
-% effect, these segments are self-contained relocatable procedures.
+% effect these segments are self-contained relocatable procedures.
% (3) TeX's macro facility can be used to modularize drawing units and
% produce more complex entities from simple elements.
% (4) The drawing can be positioned on the page like any other TeX box.
@@ -78,12 +76,12 @@
\def\btexdraw {\x@pix=0 \y@pix=0
\x@segoffpix=\x@pix \y@segoffpix=\y@pix
+ \let\p@sfile=\p@sundef
% Set the default values (define outside of the group so that \etexdraw can
% see the scaling parameters)
\t@exdrawdef
\setbox\t@xdbox=\vbox\bgroup\offinterlineskip
\global\d@bs=0 % pending segments
- \global\t@extonlytrue % no PS commands yet
\global\p@osinitfalse
\s@avemove \x@pix \y@pix % capture the initial position
\m@pendingfalse
@@ -93,34 +91,40 @@
% ====== End TeXdraw
% Write out a trailer, close the file, bring in the PostScript code as
-% a \special include file. The \special is offset to position on the page
-% to be (llx,ury) in PostScript coordinates.
+% a \special include file. The \special is offset on the page to be at
+% (llx,ury) in PostScript coordinates.
% The drawing is placed in a \vbox of appropriate size (zero depth). The
% temporary PostScript file is superimposed with offsets such that the
% lower lefthand corner of the drawing is aligned with the lower lefthand of
-% the box. Then, the position is temporarily offset to that corresponding
-% to (0 0) to place the TeX text. Note that TeX text goes on top of the
-% PostScript drawing.
-\def\etexdraw {\ift@extonly \else
- \t@drclose % close the PostScript file
- \fi
+% the box.
+\def\etexdraw {\p@sclose % close the PostScript file
\egroup % ends the \vbox \bgroup
- \ifdim \wd\t@xdbox>0pt
- \t@xderror {TeXdraw box non-zero size,
- possible extraneous text}%
- \fi
\vbox {\offinterlineskip
\pixtobp \xminpix \l@lxbp \pixtobp \yminpix \l@lybp
\pixtobp \xmaxpix \u@rxbp \pixtobp \ymaxpix \u@rybp
- \hbox{\t@xdinclude
- [{\l@lxbp},{\l@lybp}][{\u@rxbp},{\u@rybp}]{\p@sfile}}%
- \pixtodim \xminpix \t@xpos \pixtodim \yminpix \t@ypos
- \kern \t@ypos
- \hbox {\kern -\t@xpos
- \box\t@xdbox % TeX text
- \kern \t@xpos}%
- \kern -\t@ypos\relax}}
+ \ifx\p@sfile\p@sundef
+ \hbox{\t@xdempty
+ [{\l@lxbp},{\l@lybp}][{\u@rxbp},{\u@rybp}]}%
+ \else
+ \hbox{\t@xdinclude
+ [{\l@lxbp},{\l@lybp}][{\u@rxbp},{\u@rybp}]{\p@sfile}}%
+ \fi
+ \t@xdtext}%
+}
+% Superimpose TeX text. The position is temporarily offset to a position
+% corresponding to (0 0) to place the TeX text.
+\def\t@xdtext {
+ \ifdim \wd\t@xdbox>0pt
+ \t@xderror {TeXdraw box non-zero size, possible extraneous text}%
+ \fi
+ \pixtodim \xminpix \t@xpos \pixtodim \yminpix \t@ypos
+ \kern \t@ypos
+ \hbox {\kern -\t@xpos
+ \box\t@xdbox % TeX text
+ \kern \t@xpos}%
+ \kern -\t@ypos\relax
+}
% ===== Drawing scaling
% The units in any segment may be scaled arbitrarily. A unit scale is
@@ -161,10 +165,10 @@
\f@lushmove
\fi
\begingroup
- \x@segoffpix=\x@pix
- \y@segoffpix=\y@pix
- \setsegscale 1
- \global\advance \d@bs by 1\relax}
+ \x@segoffpix=\x@pix
+ \y@segoffpix=\y@pix
+ \setsegscale 1
+ \global\advance \d@bs by 1\relax}
\def\esegment {\endgroup
\ifnum \d@bs=0
\writetx {es}%
@@ -290,20 +294,20 @@
% Check if the argument starts with a left parenthesis
\def\htext #1{\def\testit {#1}%
\ifx \testit\l@paren
- \let\next=\h@move
+ \let\t@cmd=\h@move
\else
- \let\next=\h@text
+ \let\t@cmd=\h@text
\fi
- \next {#1}}
+ \t@cmd {#1}}
% Rotated text
\def\rtext td:#1 #2{\def\testit {#2}%
\ifx \testit\l@paren
- \let\next=\r@move
+ \let\t@cmd=\r@move
\else
- \let\next=\r@text
+ \let\t@cmd=\r@text
\fi
- \next td:#1 {#2}}
+ \t@cmd td:#1 {#2}}
% Vertical text
\def\vtext {\rtext td:90 }
@@ -626,7 +630,7 @@
% Need to be able to insert "%", "{" and "}" characters into the
% PostScript file.
% Define macros which have these characters with category "other".
-% We will assume, that these characters have the standard meanings --
+% We will assume that these characters have the standard meanings -
% after all, we use comments and braces in this code.
\catcode`\%=12
\def\p@b {%!} \def\p@p {%%}
@@ -693,8 +697,8 @@
\g@etargxy #2 #3 #4 \\#5#6% leading blank
\else
\def #6{#2}%
- \def\next {#3}%
- \ifx \next\empty \else
+ \def\a@rg {#3}%
+ \ifx \a@rg\empty \else
\t@xderror {TeXdraw: invalid coordinate}%
\fi
\fi}
@@ -725,8 +729,8 @@
% ===== Low level list decoding macros
% Pick off the first item -> #3, rest of string -> #4
\def\g@etitem #1 #2\\#3#4{\edef #4{#2}\edef #3{#1}}
-\def\a@pppix #1#2{\edef\next {#1}%
- \ifx \next\empty \else
+\def\a@pppix #1#2{\edef\a@rg {#1}%
+ \ifx \a@rg\empty \else
\coordtopix {#1}\t@pixa
\ifx #2\empty
\edef #2{\the\t@pixa}%
@@ -778,7 +782,7 @@
% Two flags are used. Both flags are local to a segment.
% - move pending: Set when a move has been invoked but the move command
-% has not been written out to the PostScript file
+% has not been written out to the PostScript file.
% - path in progress: Set when a PostScript path has been started but the
% path has not been terminated and stroked.
% (1) Moves are kept back. Using TeX's groups, a local flag and local
@@ -862,7 +866,7 @@
% \ifp@osinit indicates whether the next move should be captured as the
% initial values for \xminpix, \yminpix, \xmaxpix, and \ymaxpix. However,
% if a \f@lushmove is invoked, then we assume that the appropriate initial
-% values has already been set. The "mv" command in PostScript is defined
+% values have already been set. The "mv" command in PostScript is defined
% to stroke the current path (if any) and move to the pixel coordinates
% specified.
@@ -987,13 +991,26 @@
\advance \t@ypos by -#2 bp%
\t@xpos=#3 bp%
\advance \t@xpos by -#1 bp%
- \dp0=0pt \ht0=\t@ypos \wd0=\t@xpos
+ \dp0=0pt \ht0=\t@ypos \wd0=\t@xpos
\box0%
\endgroup}
\else
\let\t@xdinclude=\includegraphics
\fi
+% Leave space without including a PS file
+\def\t@xdempty [#1,#2][#3,#4]{%
+ \begingroup
+ \leavevmode
+ \setbox0=\hbox{}%
+ \t@ypos=#4 bp%
+ \advance \t@ypos by -#2 bp%
+ \t@xpos=#3 bp%
+ \advance \t@xpos by -#1 bp%
+ \dp0=0pt \ht0=\t@ypos \wd0=\t@xpos
+ \box0%
+ \endgroup}
+
% ===== Write to the PostScript file
% Macro to write PostScript commands to the temporary PostScript file
% To decrease the size of the PostScript file, moves are kept back to
@@ -1008,76 +1025,94 @@
% only for those commands which just change line parameters
% without drawing. This routine opens the file and writes the
% PS file header the first time it is called.
-% \w@rps : lowest level direct write to the PostScript file
+% \p@swr : lowest level direct write to the PostScript file
\def\writeps #1{\f@lushbs
\f@lushmove
\p@athtrue
\writetx {#1}}
-\def\writetx #1{\ift@extonly
- \global\t@extonlyfalse
- \t@xdpsfn \p@sfile
- \t@dropen \p@sfile
- \fi
- \w@rps {#1}}
-\def\w@rps #1{\immediate\write\drawfile {#1}}
+\def\writetx #1{\p@sopen
+ \ifx\p@sfile\p@sundef \else
+ \p@swr {#1}%
+ \fi}
+\def\p@swr #1{\immediate\write\drawfile {#1}}
-% ===== Open a PostScript file
+% ===== Open/Close a PostScript file
% Open a PostScript file, write the definitions used by TeXdraw.
-\def\t@xdpsfn #1{%
- \global\advance \t@xdnum by 1
- \ifnum \t@xdnum<10
- \xdef #1{\jobname.ps\the\t@xdnum}
- \else
- \xdef #1{\jobname.p\the\t@xdnum}
+\xdef\p@sundef{UnDeFiNeD}
+\def\p@sopen {%
+ \ifx\p@sfile\p@sundef
+ \p@sopenI
+ \fi
+}
+% The code has a hook to avoid generating the PS file under certain
+% circumstances. The amsmath package sometimes sets an expression twice,
+% once to measure it and again to actually typeset it. In the first case,
+% \ifmeasuring@ is set to true. For that setting, the PS file is not
+% generated.
+\def\p@sopenI {%
+ \ifx\ifmeasuring@\iftrue \else % \ifmeasuring@ undefined or false
+ \global\advance \t@xdnum by 1
+ \ifnum \t@xdnum<10
+ \xdef \p@sfile{\jobname.ps\the\t@xdnum}%
+ \else
+ \xdef \p@sfile{\jobname.p\the\t@xdnum}%
+ \fi
+ \t@xdopen \p@sfile
+ \fi
+}
+
+\def\p@sclose {
+ \ifx\p@sfile\p@sundef \else
+ \t@xdclose
\fi
}
-\def\t@dropen #1{%
+\def\t@xdopen #1{%
\immediate\openout\drawfile=#1%
- \w@rps {\p@b PS-Adobe-3.0 EPSF-3.0}%
- \w@rps {\p@p BoundingBox: (atend)}%
- \w@rps {\p@p Title: TeXdraw drawing: #1}%
- \w@rps {\p@p Pages: 1}%
- \w@rps {\p@p Creator: \TeXdrawId}%
- \w@rps {\p@p CreationDate: \the\year/\the\month/\the\day}%
- \w@rps {50 dict begin}%
- \w@rps {/mv {stroke moveto} def}%
- \w@rps {/lv {lineto} def}%
- \w@rps {/st {currentpoint stroke moveto} def}%
- \w@rps {/sl {st setlinewidth} def}%
- \w@rps {/sd {st 0 setdash} def}%
- \w@rps {/sg {st setgray} def}%
- \w@rps {/bs {gsave} def /es {stroke grestore} def}%
- \w@rps {/fl \l@br gsave setgray fill grestore}%
- \w@rps { currentpoint newpath moveto\r@br\space def}%
- \w@rps {/fp {gsave setgray fill grestore st} def}%
- \w@rps {/cv {curveto} def}%
- \w@rps {/cr \l@br gsave currentpoint newpath 3 -1 roll 0 360 arc}%
- \w@rps { stroke grestore\r@br\space def}%
- \w@rps {/fc \l@br gsave setgray currentpoint newpath}%
- \w@rps { 3 -1 roll 0 360 arc fill grestore\r@br\space def}%
- \w@rps {/ar {gsave currentpoint newpath 5 2 roll arc stroke grestore} def}%
- \w@rps {/el \l@br gsave /svm matrix currentmatrix def}%
- \w@rps { currentpoint translate scale newpath 0 0 1 0 360 arc}%
- \w@rps { svm setmatrix stroke grestore\r@br\space def}%
- \w@rps {/fe \l@br gsave setgray currentpoint translate scale newpath}%
- \w@rps { 0 0 1 0 360 arc fill grestore\r@br\space def}%
- \w@rps {/av \l@br /hhwid exch 2 div def /hlen exch def}%
- \w@rps { /ah exch def /tipy exch def /tipx exch def}%
- \w@rps { currentpoint /taily exch def /tailx exch def}%
- \w@rps { /dx tipx tailx sub def /dy tipy taily sub def}%
- \w@rps { /alen dx dx mul dy dy mul add sqrt def}%
- \w@rps { /blen alen hlen sub def}%
- \w@rps { gsave tailx taily translate dy dx atan rotate}%
- \w@rps { (V) ah ne {blen 0 gt {blen 0 lineto} if} {alen 0 lineto} ifelse}%
- \w@rps { stroke blen hhwid neg moveto alen 0 lineto blen hhwid lineto}%
- \w@rps { (T) ah eq {closepath} if}%
- \w@rps { (W) ah eq {gsave 1 setgray fill grestore closepath} if}%
- \w@rps { (F) ah eq {fill} {stroke} ifelse}%
- \w@rps { grestore tipx tipy moveto\r@br\space def}%
- \w@rps {\p@sfactor\space \p@sfactor\space scale}%
- \w@rps {1 setlinecap 1 setlinejoin}%
- \w@rps {3 setlinewidth [] 0 setdash}%
- \w@rps {0 0 moveto}%
+ \p@swr {\p@b PS-Adobe-3.0 EPSF-3.0}%
+ \p@swr {\p@p BoundingBox: (atend)}%
+ \p@swr {\p@p Title: TeXdraw drawing: #1}%
+ \p@swr {\p@p Pages: 1}%
+ \p@swr {\p@p Creator: \TeXdrawId}%
+ \p@swr {\p@p CreationDate: \the\year/\the\month/\the\day}%
+ \p@swr {50 dict begin}%
+ \p@swr {/mv {stroke moveto} def}%
+ \p@swr {/lv {lineto} def}%
+ \p@swr {/st {currentpoint stroke moveto} def}%
+ \p@swr {/sl {st setlinewidth} def}%
+ \p@swr {/sd {st 0 setdash} def}%
+ \p@swr {/sg {st setgray} def}%
+ \p@swr {/bs {gsave} def /es {stroke grestore} def}%
+ \p@swr {/fl \l@br gsave setgray fill grestore}%
+ \p@swr { currentpoint newpath moveto\r@br\space def}%
+ \p@swr {/fp {gsave setgray fill grestore st} def}%
+ \p@swr {/cv {curveto} def}%
+ \p@swr {/cr \l@br gsave currentpoint newpath 3 -1 roll 0 360 arc}%
+ \p@swr { stroke grestore\r@br\space def}%
+ \p@swr {/fc \l@br gsave setgray currentpoint newpath}%
+ \p@swr { 3 -1 roll 0 360 arc fill grestore\r@br\space def}%
+ \p@swr {/ar {gsave currentpoint newpath 5 2 roll arc stroke grestore} def}%
+ \p@swr {/el \l@br gsave /svm matrix currentmatrix def}%
+ \p@swr { currentpoint translate scale newpath 0 0 1 0 360 arc}%
+ \p@swr { svm setmatrix stroke grestore\r@br\space def}%
+ \p@swr {/fe \l@br gsave setgray currentpoint translate scale newpath}%
+ \p@swr { 0 0 1 0 360 arc fill grestore\r@br\space def}%
+ \p@swr {/av \l@br /hhwid exch 2 div def /hlen exch def}%
+ \p@swr { /ah exch def /tipy exch def /tipx exch def}%
+ \p@swr { currentpoint /taily exch def /tailx exch def}%
+ \p@swr { /dx tipx tailx sub def /dy tipy taily sub def}%
+ \p@swr { /alen dx dx mul dy dy mul add sqrt def}%
+ \p@swr { /blen alen hlen sub def}%
+ \p@swr { gsave tailx taily translate dy dx atan rotate}%
+ \p@swr { (V) ah ne {blen 0 gt {blen 0 lineto} if} {alen 0 lineto} ifelse}%
+ \p@swr { stroke blen hhwid neg moveto alen 0 lineto blen hhwid lineto}%
+ \p@swr { (T) ah eq {closepath} if}%
+ \p@swr { (W) ah eq {gsave 1 setgray fill grestore closepath} if}%
+ \p@swr { (F) ah eq {fill} {stroke} ifelse}%
+ \p@swr { grestore tipx tipy moveto\r@br\space def}%
+ \p@swr {\p@sfactor\space \p@sfactor\space scale}%
+ \p@swr {1 setlinecap 1 setlinejoin}%
+ \p@swr {3 setlinewidth [] 0 setdash}%
+ \p@swr {0 0 moveto}%
}
% Notes:
@@ -1116,15 +1151,15 @@
% indicate. This is due to the fact that multiple move commands in
% a row are collapsed into a single move. The BoundingBox information
% includes the effect of the moves which were expunged.
-\def\t@drclose {%
+\def\t@xdclose {%
\bgroup
- \w@rps {stroke end showpage}%
- \w@rps {\p@p Trailer:}%
+ \p@swr {stroke end showpage}%
+ \p@swr {\p@p Trailer:}%
\pixtobp \xminpix \l@lxbp \pixtobp \yminpix \l@lybp
\pixtobp \xmaxpix \u@rxbp \pixtobp \ymaxpix \u@rybp
- \w@rps {\p@p BoundingBox: \l@lxbp\space \l@lybp\space
+ \p@swr {\p@p BoundingBox: \l@lxbp\space \l@lybp\space
\u@rxbp\space \u@rybp}%
- \w@rps {\p@p EOF}%
+ \p@swr {\p@p EOF}%
\egroup
\immediate\closeout\drawfile
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdexamp.latex new/tex/generic/texdraw/txdexamp.latex
--- old/tex/generic/texdraw/txdexamp.latex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdexamp.latex 1970-01-01 01:00:00.000000000 +0100
@@ -1,514 +0,0 @@
-% TeXdraw examples for latex
-
-% $Id: txdexamp.latex,v 2.1 2019/03/28 texdraw-V2R0a $
-
-% These examples are taken from the TeXdraw manual.
-
-% Peter Kabal
-% Department of Electrical Engineering
-% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
-
-% peter dot kabal at mcgill dot ca
-
-\documentclass [11pt]{article}
-\usepackage {texdraw}
-
-\input txdtools
-\let\et=\etexdraw
-\def\etexdraw{\drawbb\et}
-
-\begin{document}
-
-\noindent
-TeXdraw examples using LaTeX.
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \avec (0 0.8) \textref h:C v:B \htext (0 0.9){\sl y}
- \move (0 0) \avec (0.8 0) \textref h:L v:C \htext(0.9 0){\sl x}
- \move (0 1.0)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \drawdim{cm} \linewd 0.02
- \move(2 2) \lvec(3 3) \lvec(2 4) \lvec(1 3) \lvec(2 2)
- \textref h:C v:C \htext(2 3){$\sum \rho_n$}
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \drawdim in
- \linewd 0.03 \setgray 0.6 \arrowheadtype t:F \avec(0.5 0.5)
- \linewd 0.01 \setgray 0 \arrowheadtype t:V \avec(1.0 0.5)
- \linewd 0.015 \lpatt(0.067 0.1) \lvec (1.5 0)
- \linewd 0.02 \lpatt() \arrowheadtype t:T \avec(2.0 0.5)
- \arrowheadtype t:H \avec(2.5 0.5)
- \setgray 0.4 \arrowheadtype t:W \avec(3.0 0)
- \textref h:R v:T \htext (0.35 0.50){\tt t:F}
- \textref h:R v:T \htext (1.0 0.43){\tt t:V}
- \textref h:R v:T \htext (1.82 0.50){\tt t:T}
- \textref h:R v:T \htext (2.5 0.43){\tt t:H}
- \textref h:R v:B \htext (2.8 0){\tt t:W}
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \newcommand{\bdot}{\bsegment
- \fcir f:0 r:0.02
- \esegment}
- \newcommand{\Ttext}[1]{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
- \newcommand{\Btext}[1]{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
- \newcommand{\Ltext}[1]{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \newcommand{\Rtext}[1]{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \move (-1.5 0)
- \bsegment
- \move (+1.55 +0.45) \move (-1.55 -0.45) \move (0 0)
- \Ttext{Horizontal Text}
- \bdot \Btext{\tt h:C v:C}
- \move (-0.9 0) \bdot \Ltext{\tt h:L v:C}
- \move (+0.9 0) \bdot \Rtext{\tt h:R v:C}
- \move (0 +0.3) \bdot \Ttext{\tt h:C v:T}
- \move (0 -0.3) \bdot \Btext{\tt h:C v:B}
- \move (-0.9 -0.3) \bdot \Ltext{\tt h:L v:B}
- \lvec (-0.9 +0.3) \bdot \Ltext{\tt h:L v:T}
- \lvec (+0.9 +0.3) \bdot \Rtext{\tt h:R v:T}
- \lvec (+0.9 -0.3) \bdot \Rtext{\tt h:R v:B}
- \lvec (-0.9 -0.3)
- \esegment
- \newcommand{\atext}{\rtext td:45 }
- \newcommand{\ATtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:C v:B \atext (-0.06 +0.06){#1}
- \esegment}
- \newcommand{\ABtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:C v:T \atext (+0.060 -0.06){#1}
- \esegment}
- \newcommand{\ALtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:R v:C \atext (-0.08 -0.08){#1}
- \esegment}
- \newcommand{\ARtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:L v:C \atext (+0.08 +0.08){#1}
- \esegment}
- \move (+1.5 0)
- \bsegment
- \move (+1.33 +1.33) \move (-1.33 -1.33) \move (0 0)
- \setsegscale 0.707
- \ATtext{Rotated Text}
- \bdot \ABtext{\tt h:C v:C}
- \move (-0.9 -0.9) \bdot \ALtext{\tt h:L v:C}
- \move (+0.9 +0.9) \bdot \ARtext{\tt h:R v:C}
- \move (-0.3 +0.3) \bdot \ATtext{\tt h:C v:T}
- \move (+0.3 -0.3) \bdot \ABtext{\tt h:C v:B}
- \move (-0.6 -1.2) \bdot \ALtext{\tt h:L v:B}
- \lvec (-1.2 -0.6) \bdot \ALtext{\tt h:L v:T}
- \lvec (+0.6 +1.2) \bdot \ARtext{\tt h:R v:T}
- \lvec (+1.2 +0.6) \bdot \ARtext{\tt h:R v:B}
- \lvec (-0.6 -1.2)
- \esegment
-\end{texdraw}
-\end{center}
-
-\vfill
-\newpage
-
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \move(-0.75 -0.25) \lvec (-0.75 +0.5) \lvec (+0.75 +0.5)
- \lvec(+0.75 -0.25) \ifill f:0.9 % fill the region
- \move(0 0)
- \avec(-0.75 -0.25) \textref h:R v:C \htext{H-text}
- \move(0 0) \avec(-0.75 +0.25) \textref h:R v:B \htext{H-text}
- \move(0 0) \avec(0 +0.5) \textref h:L v:T \vtext{V-text}
- \move(0 0) \avec(+0.75 +0.25) \textref h:L v:B \htext{H-text}
- \move(0 0) \avec(+0.75 -0.25) \textref h:L v:C \htext{H-text}
- \move (-1.15 -0.3) \move (+1.15 +0.92) % increase the size of the drawing
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \linewd 0.02
- \fcir f:0.7 r:1
- \larc r:1 sd:45 ed:135
- \lvec ( 0.707 0.707) \move (0 0) \lvec (-0.707 +0.707)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \newcommand{\Ltext}[1]{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \newcommand{\Rtext}[1]{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \newcommand{\bdot}{\fcir f:0 r:0.02 }
- \newcommand{\Ldot}[1]{\bdot \Ltext{#1}}
- \newcommand{\Rdot}[1]{\bdot \Rtext{#1}}
- \move (-2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 1) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 1)(1 0)
- \esegment
- \move (0 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0.5 0.8) \Ldot{1}
- \lvec (1.5 0.8) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0.5 1)(1.5 1)(1 0)
- \esegment
- \move ( 2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 0) \Rdot{2} \lvec (1 1) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 0)(1 1)
- \esegment
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
-\move (0.5 0)
-\lvec (0 0.5) \clvec (0.5 0.85)(1 0.65)(1.5 1)
-\lvec (2 0.5) \clvec (1.5 0.15)(1 0.35)(0.5 0)
-\lfill f:0.8
-\end{texdraw}
-\end{center}
-
-\vfill
-\newpage
-
-
-\bigskip
-\newcommand{\tbox}[1]{\bsegment
- \lvec (0 +0.25) \lvec (0.75 +0.25)
- \lvec (0.75 -0.25) \lvec (0 -0.25) \lvec (0 0)
- \textref h:C v:C \htext (0.375 0){#1}
- \savepos (0.75 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\begin{center}
-\begin{texdraw}
- \ravec (1 0) \tbox{$H(z)$} \ravec (1 0)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\def\cavec (#1 #2)(#3 #4)(#5 #6){
- \clvec (#1 #2)(#3 #4)(#5 #6)
- \cossin (#3 #4)(#5 #6)\cosa\sina
- \rmove (0 0) % stroke the Bezier curve
- \bsegment
- \drawdim in \setsegscale 0.05
- \move ({-\cosa} -\sina) \avec (0 0)
- \esegment}
-
-\def\caw (#1 #2){
- \currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
-
-% The nominal wiggly curve is (0 0) (1+dx dy) (-dx -dy) (1 0)
-% Find the rotated offset (dx dy) -> (du dv)
- \rotatecoord (0.4 0.1)\cosa\sina \du\dv
-
-% calculate the length of the vector
- \vectlen ({\xa} \ya)(#1 #2)\len
-
-% draw the curve in normalized units
- \bsegment
- \setsegscale {\len}
- \realadd \cosa \du \tmpa \realadd \sina \dv \tmpb
- \cavec ({\tmpa} \tmpb)({-\du} -\dv)({\cosa} \sina)
- \esegment
-
- \move (#1 #2)}
-
-% rotate a coordinate (x y)
-% arguments: (x y) cosa sina x' y'
-% x' = cosa * x - sina * y; y' = sina * x + cosa * y
-\def\rotatecoord (#1 #2)#3#4#5#6{
- \getpos (#1 #2)\xarg\yarg
- \realmult \xarg {#3} \tmpa \realmult \yarg {#4} \tmpb
- \realadd \tmpa {-\tmpb} #5
- \realmult \xarg {#4} \tmpa \realmult \yarg {#3} \tmpb
- \realadd \tmpa \tmpb #6}
-
-\begin{center}
-\begin{texdraw}
- \arrowheadtype t:W
- \move (0 0)
- \cavec (1.4 0.1)(-0.4 -0.1)(1 0)
- \move (1 0) \caw (1 1) \htext{tip at \tt (1 1)}
- \move (1 0) \caw (2 1) \htext{tip at \tt (2 1)}
- \move (1 0) \caw (2 0) \htext{tip at \tt (2 0)}
- \move (0 1.13) \move (0 -0.04)
-\end{texdraw}
-\end{center}
-
-\vfill
-\newpage
-
-
-\bigskip
-\def\delay {\bsegment
- \setsegscale 0.3
- \lvec (0 +0.5) \lvec (1 +0.5) \lvec (1 -0.5)
- \lvec (0 -0.5) \lvec (0 0)
- \textref h:C v:C \htext (0.5 0){$z^{-1}$}
- \savepos (1 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\def\bdot {\fcir f:0 r:0.02 }
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.06 0){#1}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.06 0){#1}
- \esegment}
-\def\cradius {0.08}
-\def\pluss {\bsegment
- \setsegscale {\cradius}
- \move (-0.5 0) \lvec (+0.5 0)
- \move (0 -0.5) \lvec (0 +0.5)
- \esegment}
-\def\pcir {\lcir r:{\cradius} \pluss}
-\def\puttext (#1 #2)#3{\bsegment
- \setsegscale {\cradius}
- \textref h:C v:C \htext (#1 #2){#3}
- \esegment}
-\def\putwnw #1{\puttext (-1.7 +1.2){#1}}
-\def\putwsw #1{\puttext (-1.7 -1.2){#1}}
-\def\putn #1{\puttext ( 0 +2 ){#1}}
-\def\puts #1{\puttext ( 0 -2 ){#1}}
-\def\avectoc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \savepos (#1 #2)(*tx *ty)
- \bsegment
- \move (*tx *ty)
- \setsegscale {\cradius}
- \rmove ({-\cosa} -\sina)
- \savecurrpos (*ex *ey)
- \esegment
- \avec (*ex *ey)
- \move (#1 #2)}
-\def\avecfrc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \bsegment
- \setsegscale {\cradius}
- \move ({\cosa} \sina)
- \savecurrpos (*ex *ey)
- \esegment
- \move (*ex *ey)
- \avec (#1 #2)}
-
-\begin{center}
-\begin{texdraw}
-\drawdim in
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\pl {$\scriptscriptstyle +$} \def\mn {$\scriptscriptstyle -$}
-
-\move (0 +0.63) \move (0 -0.60) \move (0 0) % compensate for the text size
-
-% Input to the first stage
-\bsegment
- \Ltext{$x(n)$}
- \lvec (0.3 0) \bdot \lvec (0.3 +0.4)
- \move (0.3 0) \lvec (0.3 -0.4)
- \savepos (0.3 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% first lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.1 +0.4)
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_0(n)$}
- \move (2.0 +0.42) \Ttext {$f_1(n)$}
- \move (0.1 -0.4) \Btext {$b_0(n)$}
- \move (2.0 -0.4) \Btext {$b_1(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_1$}
- \textref h:L v:T \htext (1.15 -0.2){$K_1$}
- \savepos (2.1 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% center section
-\bsegment
- \textref h:C v:C
- \htext (0.3 +0.4){$\cdots$}
- \htext (0.3 -0.4){$\cdots$}
- \savepos (0.6 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% last lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.3 +0.4) \Rtext{$e(n)$}
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_{P-1}(n)$}
- \move (2.0 +0.42) \Ttext {$f_P(n)$}
- \move (0.1 -0.4) \Btext {$b_{P-1}(n)$}
- \move (2.0 -0.4) \Btext {$b_P(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_P$}
- \textref h:L v:T \htext (1.15 -0.2){$K_P$}
-\esegment
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\ds {\displaystyle}
-\def\ticklab (#1 #2)#3{\move(#1 #2)
- \bsegment
- \lvec (0 0.05)
- \textref h:C v:T \htext (0 -0.05){#3}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext ( 0.08 0){#1}
- \esegment}
-
-\move (2.4 -0.32) % move to set the size
-
-\move (0 0)
-% Axes
-\avec (0 1.4)
-\move (0 0) \avec (2.2 0) \Rtext{$\omega$}
-\ticklab (0 0) {0}
-\ticklab (0.8 0) {$\ds {\pi \over 2N} $}
-\ticklab (1.2 0) {$\omega_s$}
-\ticklab (1.6 0) {$\ds {\pi \over N} $}
-
-\linewd 0.025
-\move (0 1)
-\lvec (0.4 1)
-\lvec (0.44 0.998)
-\lvec (0.48 0.988)
-\lvec (0.52 0.973)
-\lvec (0.56 0.951)
-\lvec (0.60 0.923)
-\lvec (0.64 0.891)
-\lvec (0.68 0.852)
-\lvec (0.72 0.809)
-\lvec (0.76 0.760)
-\lvec (0.80 0.707)
-\lvec (0.84 0.649)
-\lvec (0.88 0.587)
-\lvec (0.92 0.522)
-\lvec (0.96 0.454)
-\lvec (1.00 0.382)
-\lvec (1.04 0.309)
-\lvec (1.08 0.233)
-\lvec (1.12 0.156)
-\lvec (1.16 0.078)
-\lvec (1.20 0)
-\lvec (1.9 0)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
-\arrowheadtype t:V \arrowheadsize l:0.08 w:0.04
-\linewd 0.01
-\setunitscale 1.5 % circle will have radius 1.5 inches
-
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.04){#1}
- \esegment}
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 0.04){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.04 0){#1}
- \esegment}
-\def\bdot {\fcir f:0 r:0.0133 }
-\def\vtick {\bsegment
- \move (0 -0.05) \lvec (0 0.05)
- \esegment}
-\def\htick {\bsegment
- \move (-0.05 0) \lvec ( 0.05 0)
- \esegment}
-\def\Hlen #1#2{\bsegment
- \vtick \avec ({#1} 0) \vtick \avec (0 0)
- \relsegscale 0.5
- \move ({#1} 0) \Ttext {#2}
- \esegment}
-\def\Vlen #1#2{\bsegment
- \htick \avec (0 {#1}) \htick \avec (0 0)
- \relsegscale 0.5
- \move (0 {#1}) \Ltext {#2}
- \esegment}
-
-\lcir r:1 % circle
-\move (-1.05 0) \lvec ( 1.05 0) % axes
-\move (0 -1.05) \lvec (0 1.05)
-
-\move (0 0) \lvec (0.707 0.707) \bdot
-\rmove (0.02 0.02) \textref h:L v:B \htext {X}
-\move (0.707 -0.707) \bdot
-\textref h:R v:T \htext(-0.02 -0.02){O}
-
-\move (0.5 0) % center of ellipse
-\bsegment
- \lellip rx:0.435 ry:0.804
- \bdot \Btext {$\beta_2$}
- \move (0 0.15) \Hlen {0.435}{$|\beta_1{+}\beta_3|$}
- \move (-0.7 0) \Vlen {0.804}{$|\beta_1{-}\beta_3|$}
-\esegment
-\end{texdraw}
-\end{center}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdexamp.tex new/tex/generic/texdraw/txdexamp.tex
--- old/tex/generic/texdraw/txdexamp.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdexamp.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,485 +0,0 @@
-% TeXdraw examples
-
-% $Id: txdexamp.tex,v 2.1 2019/03/28 texdraw-V2R0a $
-
-% These examples are taken from the TeXdraw manual. Note that the fonts
-% for text will be different from those in the manual -- here we use the
-% plain TeX defaults.
-
-% Peter Kabal
-% Department of Electrical Engineering
-% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
-
-% peter dot kabal at mcgill dot ca
-
-\input texdraw
-\input txdtools
-\let\et=\etexdraw
-\def\etexdraw{\drawbb\et}
-
-\noindent
-TeXdraw examples using plain TeX.
-
-\bigskip
-\centertexdraw{
- \avec (0 0.8) \textref h:C v:B \htext (0 0.9){\sl y}
- \move (0 0) \avec (0.8 0) \textref h:L v:C \htext(0.9 0){\sl x}
- \move (0 1.0)}
-
-\bigskip
-\centertexdraw{
- \drawdim{cm} \linewd 0.02
- \move(2 2) \lvec(3 3) \lvec(2 4) \lvec(1 3) \lvec(2 2)
- \textref h:C v:C \htext(2 3){$\sum \rho_n$}
-}
-
-\bigskip
-\centertexdraw{
- \drawdim in
- \linewd 0.03 \setgray 0.6 \arrowheadtype t:F \avec(0.5 0.5)
- \linewd 0.01 \setgray 0 \arrowheadtype t:V \avec(1.0 0.5)
- \linewd 0.015 \lpatt(0.067 0.1) \lvec (1.5 0)
- \linewd 0.02 \lpatt() \arrowheadtype t:T \avec(2.0 0.5)
- \arrowheadtype t:H \avec(2.5 0.5)
- \setgray 0.4 \arrowheadtype t:W \avec(3.0 0)
- \textref h:R v:T \htext (0.35 0.50){\tt t:F}
- \textref h:R v:T \htext (1.0 0.43){\tt t:V}
- \textref h:R v:T \htext (1.82 0.50){\tt t:T}
- \textref h:R v:T \htext (2.5 0.43){\tt t:H}
- \textref h:R v:B \htext (2.8 0){\tt t:W}
-}
-
-\bigskip
-\centertexdraw{
- \def\bdot {\bsegment
- \fcir f:0 r:0.02
- \esegment}
- \def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
- \def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
- \def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \move (-1.5 0)
- \bsegment
- \move (+1.55 +0.45) \move (-1.55 -0.45) \move (0 0)
- \Ttext{Horizontal Text}
- \bdot \Btext{\tt h:C v:C}
- \move (-0.9 0) \bdot \Ltext{\tt h:L v:C}
- \move (+0.9 0) \bdot \Rtext{\tt h:R v:C}
- \move (0 +0.3) \bdot \Ttext{\tt h:C v:T}
- \move (0 -0.3) \bdot \Btext{\tt h:C v:B}
- \move (-0.9 -0.3) \bdot \Ltext{\tt h:L v:B}
- \lvec (-0.9 +0.3) \bdot \Ltext{\tt h:L v:T}
- \lvec (+0.9 +0.3) \bdot \Rtext{\tt h:R v:T}
- \lvec (+0.9 -0.3) \bdot \Rtext{\tt h:R v:B}
- \lvec (-0.9 -0.3)
- \esegment
- \def\atext {\rtext td:45 }
- \def\ATtext #1{\bsegment
- \setsegscale 0.707
- \textref h:C v:B \atext (-0.06 +0.06){#1}
- \esegment}
- \def\ABtext #1{\bsegment
- \setsegscale 0.707
- \textref h:C v:T \atext (+0.060 -0.06){#1}
- \esegment}
- \def\ALtext #1{\bsegment
- \setsegscale 0.707
- \textref h:R v:C \atext (-0.08 -0.08){#1}
- \esegment}
- \def\ARtext #1{\bsegment
- \setsegscale 0.707
- \textref h:L v:C \atext (+0.08 +0.08){#1}
- \esegment}
- \move (+1.5 0)
- \bsegment
- \move (+1.33 +1.33) \move (-1.33 -1.33) \move (0 0)
- \setsegscale 0.707
- \ATtext{Rotated Text}
- \bdot \ABtext{\tt h:C v:C}
- \move (-0.9 -0.9) \bdot \ALtext{\tt h:L v:C}
- \move (+0.9 +0.9) \bdot \ARtext{\tt h:R v:C}
- \move (-0.3 +0.3) \bdot \ATtext{\tt h:C v:T}
- \move (+0.3 -0.3) \bdot \ABtext{\tt h:C v:B}
- \move (-0.6 -1.2) \bdot \ALtext{\tt h:L v:B}
- \lvec (-1.2 -0.6) \bdot \ALtext{\tt h:L v:T}
- \lvec (+0.6 +1.2) \bdot \ARtext{\tt h:R v:T}
- \lvec (+1.2 +0.6) \bdot \ARtext{\tt h:R v:B}
- \lvec (-0.6 -1.2)
- \esegment
-}
-
-\vfill
-\eject
-
-
-\bigskip
-\centertexdraw{
- \move(-0.75 -0.25) \lvec (-0.75 +0.5) \lvec (+0.75 +0.5)
- \lvec(+0.75 -0.25) \ifill f:0.9 % fill the region
- \move(0 0)
- \avec(-0.75 -0.25) \textref h:R v:C \htext{H-text}
- \move(0 0) \avec(-0.75 +0.25) \textref h:R v:B \htext{H-text}
- \move(0 0) \avec(0 +0.5) \textref h:L v:T \vtext{V-text}
- \move(0 0) \avec(+0.75 +0.25) \textref h:L v:B \htext{H-text}
- \move(0 0) \avec(+0.75 -0.25) \textref h:L v:C \htext{H-text}
- \move (-1.15 -0.3) \move (+1.15 +0.92) % increase the size of the drawing
-}
-
-\bigskip
-\centertexdraw{
- \linewd 0.02
- \fcir f:0.7 r:1
- \larc r:1 sd:45 ed:135
- \lvec ( 0.707 0.707) \move (0 0) \lvec (-0.707 +0.707)
-}
-
-\bigskip
-\centertexdraw{
- \def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \def\bdot {\fcir f:0 r:0.02 }
- \def\Ldot #1{\bdot \Ltext{#1}}
- \def\Rdot #1{\bdot \Rtext{#1}}
- \move (-2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 1) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 1)(1 0)
- \esegment
- \move (0 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0.5 0.8) \Ldot{1}
- \lvec (1.5 0.8) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0.5 1)(1.5 1)(1 0)
- \esegment
- \move ( 2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 0) \Rdot{2} \lvec (1 1) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 0)(1 1)
- \esegment
-}
-
-\bigskip
-\centertexdraw{
-\move (0.5 0)
-\lvec (0 0.5) \clvec (0.5 0.85)(1 0.65)(1.5 1)
-\lvec (2 0.5) \clvec (1.5 0.15)(1 0.35)(0.5 0)
-\lfill f:0.8
-}
-
-\vfill
-\eject
-
-
-\bigskip
-\def\tbox #1{\bsegment
- \lvec (0 +0.25) \lvec (0.75 +0.25)
- \lvec (0.75 -0.25) \lvec (0 -0.25) \lvec (0 0)
- \textref h:C v:C \htext (0.375 0){#1}
- \savepos (0.75 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\centertexdraw{
- \ravec (1 0) \tbox{$H(z)$} \ravec (1 0)
-}
-
-\bigskip
-\def\cavec (#1 #2)(#3 #4)(#5 #6){
- \clvec (#1 #2)(#3 #4)(#5 #6)
- \cossin (#3 #4)(#5 #6)\cosa\sina
- \rmove (0 0) % stroke the Bezier curve
- \bsegment
- \drawdim in \setsegscale 0.05
- \move ({-\cosa} -\sina) \avec (0 0)
- \esegment}
-
-\def\caw (#1 #2){
- \currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
-
-% The nominal wiggly curve is (0 0) (1+dx dy) (-dx -dy) (1 0)
-% Find the rotated offset (dx dy) -> (du dv)
- \rotatecoord (0.4 0.1)\cosa\sina \du\dv
-
-% calculate the length of the vector
- \vectlen ({\xa} \ya)(#1 #2)\len
-
-% draw the curve in normalized units
- \bsegment
- \setsegscale {\len}
- \realadd \cosa \du \tmpa \realadd \sina \dv \tmpb
- \cavec ({\tmpa} \tmpb)({-\du} -\dv)({\cosa} \sina)
- \esegment
-
- \move (#1 #2)}
-
-% rotate a coordinate (x y)
-% arguments: (x y) cosa sina x' y'
-% x' = cosa * x - sina * y; y' = sina * x + cosa * y
-\def\rotatecoord (#1 #2)#3#4#5#6{
- \getpos (#1 #2)\xarg\yarg
- \realmult \xarg {#3} \tmpa \realmult \yarg {#4} \tmpb
- \realadd \tmpa {-\tmpb} #5
- \realmult \xarg {#4} \tmpa \realmult \yarg {#3} \tmpb
- \realadd \tmpa \tmpb #6}
-
-\centertexdraw{
- \arrowheadtype t:W
- \move (0 0)
- \cavec (1.4 0.1)(-0.4 -0.1)(1 0)
- \move (1 0) \caw (1 1) \htext{tip at \tt (1 1)}
- \move (1 0) \caw (2 1) \htext{tip at \tt (2 1)}
- \move (1 0) \caw (2 0) \htext{tip at \tt (2 0)}
- \move (0 1.13) \move (0 -0.04)
-}
-
-\vfill
-\eject
-
-
-\bigskip
-\def\delay {\bsegment
- \setsegscale 0.3
- \lvec (0 +0.5) \lvec (1 +0.5) \lvec (1 -0.5)
- \lvec (0 -0.5) \lvec (0 0)
- \textref h:C v:C \htext (0.5 0){$z^{-1}$}
- \savepos (1 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\def\bdot {\fcir f:0 r:0.02 }
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.06 0){#1}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.06 0){#1}
- \esegment}
-\def\cradius {0.08}
-\def\pluss {\bsegment
- \setsegscale {\cradius}
- \move (-0.5 0) \lvec (+0.5 0)
- \move (0 -0.5) \lvec (0 +0.5)
- \esegment}
-\def\pcir {\lcir r:{\cradius} \pluss}
-\def\puttext (#1 #2)#3{\bsegment
- \setsegscale {\cradius}
- \textref h:C v:C \htext (#1 #2){#3}
- \esegment}
-\def\putwnw #1{\puttext (-1.7 +1.2){#1}}
-\def\putwsw #1{\puttext (-1.7 -1.2){#1}}
-\def\putn #1{\puttext ( 0 +2 ){#1}}
-\def\puts #1{\puttext ( 0 -2 ){#1}}
-\def\avectoc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \savepos (#1 #2)(*tx *ty)
- \bsegment
- \move (*tx *ty)
- \setsegscale {\cradius}
- \rmove ({-\cosa} -\sina)
- \savecurrpos (*ex *ey)
- \esegment
- \avec (*ex *ey)
- \move (#1 #2)}
-\def\avecfrc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \bsegment
- \setsegscale {\cradius}
- \move ({\cosa} \sina)
- \savecurrpos (*ex *ey)
- \esegment
- \move (*ex *ey)
- \avec (#1 #2)}
-
-\centertexdraw{
-\drawdim in
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\pl {$\scriptscriptstyle +$} \def\mn {$\scriptscriptstyle -$}
-
-\move (0 +0.63) \move (0 -0.60) \move (0 0) % compensate for the text size
-
-% Input to the first stage
-\bsegment
- \Ltext{$x(n)$}
- \lvec (0.3 0) \bdot \lvec (0.3 +0.4)
- \move (0.3 0) \lvec (0.3 -0.4)
- \savepos (0.3 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% first lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.1 +0.4)
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_0(n)$}
- \move (2.0 +0.42) \Ttext {$f_1(n)$}
- \move (0.1 -0.4) \Btext {$b_0(n)$}
- \move (2.0 -0.4) \Btext {$b_1(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_1$}
- \textref h:L v:T \htext (1.15 -0.2){$K_1$}
- \savepos (2.1 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% center section
-\bsegment
- \textref h:C v:C
- \htext (0.3 +0.4){$\cdots$}
- \htext (0.3 -0.4){$\cdots$}
- \savepos (0.6 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% last lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.3 +0.4) \Rtext{$e(n)$}
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_{P-1}(n)$}
- \move (2.0 +0.42) \Ttext {$f_P(n)$}
- \move (0.1 -0.4) \Btext {$b_{P-1}(n)$}
- \move (2.0 -0.4) \Btext {$b_P(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_P$}
- \textref h:L v:T \htext (1.15 -0.2){$K_P$}
-\esegment
-}
-
-\bigskip
-\centertexdraw{
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\ds {\displaystyle}
-\def\ticklab (#1 #2)#3{\move(#1 #2)
- \bsegment
- \lvec (0 0.05)
- \textref h:C v:T \htext (0 -0.05){#3}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext ( 0.08 0){#1}
- \esegment}
-
-\move (2.4 -0.32) % move to set the size
-
-\move (0 0)
-% Axes
-\avec (0 1.4)
-\move (0 0) \avec (2.2 0) \Rtext{$\omega$}
-\ticklab (0 0) {0}
-\ticklab (0.8 0) {$\ds {\pi \over 2N} $}
-\ticklab (1.2 0) {$\omega_s$}
-\ticklab (1.6 0) {$\ds {\pi \over N} $}
-
-\linewd 0.025
-\move (0 1)
-\lvec (0.4 1)
-\lvec (0.44 0.998)
-\lvec (0.48 0.988)
-\lvec (0.52 0.973)
-\lvec (0.56 0.951)
-\lvec (0.60 0.923)
-\lvec (0.64 0.891)
-\lvec (0.68 0.852)
-\lvec (0.72 0.809)
-\lvec (0.76 0.760)
-\lvec (0.80 0.707)
-\lvec (0.84 0.649)
-\lvec (0.88 0.587)
-\lvec (0.92 0.522)
-\lvec (0.96 0.454)
-\lvec (1.00 0.382)
-\lvec (1.04 0.309)
-\lvec (1.08 0.233)
-\lvec (1.12 0.156)
-\lvec (1.16 0.078)
-\lvec (1.20 0)
-\lvec (1.9 0)
-}
-
-\bigskip
-\centertexdraw{
-\arrowheadtype t:V \arrowheadsize l:0.08 w:0.04
-\linewd 0.01
-\setunitscale 1.5 % circle will have radius 1.5 inches
-
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.04){#1}
- \esegment}
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 0.04){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.04 0){#1}
- \esegment}
-\def\bdot {\fcir f:0 r:0.0133 }
-\def\vtick {\bsegment
- \move (0 -0.05) \lvec (0 0.05)
- \esegment}
-\def\htick {\bsegment
- \move (-0.05 0) \lvec ( 0.05 0)
- \esegment}
-\def\Hlen #1#2{\bsegment
- \vtick \avec ({#1} 0) \vtick \avec (0 0)
- \relsegscale 0.5
- \move ({#1} 0) \Ttext {#2}
- \esegment}
-\def\Vlen #1#2{\bsegment
- \htick \avec (0 {#1}) \htick \avec (0 0)
- \relsegscale 0.5
- \move (0 {#1}) \Ltext {#2}
- \esegment}
-
-\lcir r:1 % circle
-\move (-1.05 0) \lvec ( 1.05 0) % axes
-\move (0 -1.05) \lvec (0 1.05)
-
-\move (0 0) \lvec (0.707 0.707) \bdot
-\rmove (0.02 0.02) \textref h:L v:B \htext {X}
-\move (0.707 -0.707) \bdot
-\textref h:R v:T \htext(-0.02 -0.02){O}
-
-\move (0.5 0) % center of ellipse
-\bsegment
- \lellip rx:0.435 ry:0.804
- \bdot \Btext {$\beta_2$}
- \move (0 0.15) \Hlen {0.435}{$|\beta_1{+}\beta_3|$}
- \move (-0.7 0) \Vlen {0.804}{$|\beta_1{-}\beta_3|$}
-\esegment
-}
-
-\bye
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdps.tex new/tex/generic/texdraw/txdps.tex
--- old/tex/generic/texdraw/txdps.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdps.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw macros to access PostScript builtins
-% $Id: txdps.tex,v 1.8 2019/03/28 texdraw-V2R0a $
+% $Id: txdps.tex 1.10 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
\chardef\catamp=\the\catcode`\@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdtools.tex new/tex/generic/texdraw/txdtools.tex
--- old/tex/generic/texdraw/txdtools.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdtools.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw toolbox macros, useful for extended TeXdraw commands
-% $Id: txdtools.tex,v 1.9 2019/03/28 texdraw-V2R0a $
+% $Id: txdtools.tex 1.11 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
% These macros use temporary count registers defined by TeXdraw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdraw.tlpobj new/tlpkg/tlpobj/texdraw.tlpobj
--- old/tlpkg/tlpobj/texdraw.tlpobj 2019-04-01 02:25:03.000000000 +0200
+++ new/tlpkg/tlpobj/texdraw.tlpobj 2019-05-07 01:40:16.000000000 +0200
@@ -1,26 +1,25 @@
name texdraw
category Package
-revision 50660
+revision 51030
shortdesc Graphical macros, using embedded PostScript
relocated 1
longdesc TeXdraw is a set of macro definitions for TeX, which allow the
longdesc user to produce PostScript drawings from within TeX and LaTeX.
longdesc TeXdraw has been designed to be extensible. Drawing 'segments'
longdesc are relocatable, self-contained units. Using a combination of
-longdesc the TeX's grouping mechanism and the gsave/grestore mechanism
-longdesc in PostScript, drawing segments allow for local changes to the
+longdesc TeX's grouping mechanism and the gsave/grestore mechanism in
+longdesc PostScript, drawing segments allow for local changes to the
longdesc scaling and line parameters. Using TeX's macro definition
longdesc capability, new drawing commands can be constructed from
longdesc drawing segments.
-runfiles size=26
+runfiles size=19
RELOC/tex/generic/texdraw/blockdiagram.tex
RELOC/tex/generic/texdraw/texdraw.sty
RELOC/tex/generic/texdraw/texdraw.tex
- RELOC/tex/generic/texdraw/txdexamp.latex
- RELOC/tex/generic/texdraw/txdexamp.tex
RELOC/tex/generic/texdraw/txdps.tex
RELOC/tex/generic/texdraw/txdtools.tex
catalogue-ctan /graphics/texdraw
-catalogue-date 2019-03-30 09:24:26 +0100
+catalogue-date 2019-05-06 20:46:20 +0200
catalogue-license cc-by-4
catalogue-topics graphics-in-tex
+catalogue-version v2r3
++++++ texfot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/texfot.1 new/texmf-dist/doc/man/man1/texfot.1
--- old/texmf-dist/doc/man/man1/texfot.1 2017-08-08 22:43:00.000000000 +0200
+++ new/texmf-dist/doc/man/man1/texfot.1 2020-03-11 22:18:30.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "TEXFOT 1"
-.TH TEXFOT 1 "2017-07-25" "texfot" "Karl Berry"
+.TH TEXFOT 1 "2020-03-10" "texfot" "Karl Berry"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -149,12 +153,12 @@
\& # Sample basic invocation:
\& texfot pdflatex file.tex
\&
-\& # Ordinarily all output is copied to /tmp/fot before filtering;
-\& # that can be omitted:
-\& texfot pdflatex \-\-tee=/dev/null file.tex
+\& # Ordinarily all output is copied to /tmp/fot before filtering,
+\& # but that can be omitted:
+\& texfot \-\-tee=/dev/null lualatex file.tex
\&
\& # Example of more complex engine invocation:
-\& texfot lualatex \-\-recorder \*(Aq\enonstopmode\einput file\*(Aq
+\& texfot xelatex \-\-recorder \*(Aq\enonstopmode\einput file\*(Aq
.Ve
.PP
Aside from its own options, described below, \f(CW\*(C`texfot\*(C'\fR just runs the
@@ -190,9 +194,9 @@
Otherwise, if the line matches the list of regexps to show, show it.
.IP "5." 4
Otherwise, the default: if the line came from stdout, ignore it; if the
-line came from stderr, print it (to stdout). (This distinction is made
+line came from stderr, print it (to stdout). This distinction is made
because TeX engines write relatively few messages to stderr, and it's
-not unlikely that any such should be considered.
+likely that any such should be considered.
.Sp
It would be easy to add more options to allow for user additions to the
various regex lists, if that ever seems useful. Or email me (see end).
@@ -261,7 +265,11 @@
.IX Item "--no-quiet"
.PD
By default, the TeX command being invoked is reported on standard output.
-\&\f(CW\*(C`\-\-quiet\*(C'\fR omits that reporting.
+\&\f(CW\*(C`\-\-quiet\*(C'\fR omits that reporting. To get a completely silent run,
+redirect standard output: \f(CW\*(C`texfot\ ...\ >/dev/null\*(C'\fR. (The only
+messages to standard error should be errors from \f(CW\*(C`texfot\*(C'\fR itself, so it
+shouldn't be necessary to redirect that, but of course that can be done
+as well.)
.ie n .IP """\-\-stderr""" 4
.el .IP "\f(CW\-\-stderr\fR" 4
.IX Item "--stderr"
@@ -292,12 +300,12 @@
.SH "RATIONALE"
.IX Header "RATIONALE"
I wrote this because, in my work as a TUGboat editor
-(http://tug.org/TUGboat, journal submissions always welcome!), I end
-up running and rerunning many papers, many times each. It was too easy
-to lose warnings I needed to see in the mass of unvarying and
-uninteresting output from TeX, such as style files being read and fonts
-being used. I wanted to see all and only those messages which needed
-some action by me.
+(http://tug.org/TUGboat, journal submissions always welcome!), I run
+and rerun many documents, many times each. It was too easy to lose
+warnings I needed to see in the mass of unvarying and uninteresting
+output from TeX, such as style files being read and fonts being used. I
+wanted to see all and only those messages which needed some action by
+me.
.PP
I found some other programs of a similar nature, the LaTeX package
\&\f(CW\*(C`silence\*(C'\fR, and plenty of other (La)TeX wrappers, but it seemed none of
@@ -309,12 +317,10 @@
.PP
Here are some keywords if you want to explore other options:
texloganalyser, pydflatex, logfilter, latexmk, rubber, arara, and
-searching for \f(CW\*(C`log\*(C'\fR at http://ctan.org/search.
+searching for \f(CW\*(C`log\*(C'\fR at https://ctan.org/search.
.PP
\&\f(CW\*(C`texfot\*(C'\fR is written in Perl, and runs on Unix, and does not work on
-Windows. (If by some chance anyone wants to use this program on
-Windows, please make your own fork; I'm not interested in supporting
-that os.)
+Windows.
.PP
The name comes from the \f(CW\*(C`trip.fot\*(C'\fR and \f(CW\*(C`trap.fot\*(C'\fR files that are part
of Knuth's trip and trap torture tests, which record the online output
@@ -325,5 +331,5 @@
.IX Header "AUTHORS AND COPYRIGHT"
This script and its documentation were written by Karl Berry and both
are released to the public domain. Email \f(CW\*(C`karl@freefriends.org\*(C'\fR with
-bug reports. It has no home page beyond the package on \s-1CTAN:
-\&\s0http://www.ctan.org/pkg/texfot.
+bug reports. It has no home page beyond the package on \s-1CTAN:\s0
+https://ctan.org/pkg/texfot.
Binary files old/texmf-dist/doc/man/man1/texfot.man1.pdf and new/texmf-dist/doc/man/man1/texfot.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texfot.doc.tlpobj new/tlpkg/tlpobj/texfot.doc.tlpobj
--- old/tlpkg/tlpobj/texfot.doc.tlpobj 2019-02-28 04:07:43.000000000 +0100
+++ new/tlpkg/tlpobj/texfot.doc.tlpobj 2020-03-12 01:56:39.000000000 +0100
@@ -1,8 +1,8 @@
name texfot.doc
category Package
-revision 44991
+revision 54246
shortdesc doc files of texfot
-docfiles size=10
+docfiles size=13
texmf-dist/doc/man/man1/texfot.1
texmf-dist/doc/man/man1/texfot.man1.pdf
texmf-dist/doc/support/texfot/README
++++++ texfot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texfot/texfot.pl new/texmf-dist/scripts/texfot/texfot.pl
--- old/texmf-dist/scripts/texfot/texfot.pl 2017-08-08 22:43:00.000000000 +0200
+++ new/texmf-dist/scripts/texfot/texfot.pl 2020-03-11 22:18:30.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: texfot,v 1.37 2017/07/25 15:06:53 karl Exp $
+# $Id: texfot,v 1.40 2020/03/10 22:35:15 karl Exp $
# Invoke a TeX command, filtering all but interesting terminal output;
# do not look at the log or check any output files.
# Exit status is that of the subprogram.
@@ -8,7 +8,7 @@
#
# Public domain. Originally written 2014 by Karl Berry.
-my $ident = '$Id: texfot,v 1.37 2017/07/25 15:06:53 karl Exp $';
+my $ident = '$Id: texfot,v 1.40 2020/03/10 22:35:15 karl Exp $';
(my $prg = $0) =~ s,^.*/,,;
select STDERR; $| = 1; # no buffering
select STDOUT; $| = 1;
@@ -83,7 +83,7 @@
# It's not ideal to read all of stdout and then all of stderr; it would
# be better to intermix them in the original order of child output.
- # this is simpler than other ways of avoiding possible deadlock (such
+ # But this is simpler than other ways of avoiding possible deadlock (such
# as select, sysread, etc.).
&debug ("processing stdout from child");
&process_output (\*TEXOUT, "");
@@ -104,9 +104,10 @@
-# Read filehandle $FH; print lines that we want to stdout, prefixed by
-# $PREFIX. If $PREFIX is null, omit lines by default; if $PREFIX is
-# non-null, print lines by default.
+# Read filehandle $FH, printing lines that we want to stdout,
+# prefixed by $PREFIX.
+# If $PREFIX is null (happens for processing stdout), omit lines by default;
+# if $PREFIX is non-null (processing stderr), print lines by default.
#
sub process_output {
my ($fh,$prefix) = @_;
@@ -118,7 +119,8 @@
warn "\n" if $opt_debug; # get blank line without texfot: prefix
&debug ("looking at line: $_");
- &debug ("checking if have print_next (is $print_next)\n");
+
+ &debug ("checking if have print_next (= $print_next)\n");
if ($print_next) {
&debug (" printing next ($print_next)\n");
print $prefix;
@@ -132,8 +134,9 @@
LaTeX\ Warning:\ You\ have\ requested\ package
|LaTeX\ Font\ Warning:\ Some\ font\ shapes
|LaTeX\ Font\ Warning:\ Size\ substitutions
- |Package\ caption\ Warning:\ Unsupported\ document\ class
+ |Package\ caption\ Warning:\ Un(supported|known)\ document\ class
|Package\ fixltx2e\ Warning:\ fixltx2e\ is\ not\ required
+ |Package\ layouts\ Warning:\ Layout\ scale
|Package\ frenchb?\.ldf\ Warning:\ (Figures|The\ definition)
|\*\*\*\ Reloading\ Xunicode\ for\ encoding # spurious ***
|This\ is\ `?(epsf\.tex|.*\.sty|TAP) # so what
@@ -226,12 +229,12 @@
# Sample basic invocation:
texfot pdflatex file.tex
- # Ordinarily all output is copied to /tmp/fot before filtering;
- # that can be omitted:
- texfot pdflatex --tee=/dev/null file.tex
+ # Ordinarily all output is copied to /tmp/fot before filtering,
+ # but that can be omitted:
+ texfot --tee=/dev/null lualatex file.tex
# Example of more complex engine invocation:
- texfot lualatex --recorder '\nonstopmode\input file'
+ texfot xelatex --recorder '\nonstopmode\input file'
Aside from its own options, described below, C<texfot> just runs the
given command with the given arguments (same approach to command line
@@ -279,9 +282,9 @@
=item 5.
Otherwise, the default: if the line came from stdout, ignore it; if the
-line came from stderr, print it (to stdout). (This distinction is made
+line came from stderr, print it (to stdout). This distinction is made
because TeX engines write relatively few messages to stderr, and it's
-not unlikely that any such should be considered.
+likely that any such should be considered.
It would be easy to add more options to allow for user additions to the
various regex lists, if that ever seems useful. Or email me (see end).
@@ -346,7 +349,11 @@
=item C<--no-quiet>
By default, the TeX command being invoked is reported on standard output.
-C<--quiet> omits that reporting.
+C<--quiet> omits that reporting. To get a completely silent run,
+redirect standard output: S>. (The only
+messages to standard error should be errors from C<texfot> itself, so it
+shouldn't be necessary to redirect that, but of course that can be done
+as well.)
=item C<--stderr>
@@ -377,12 +384,12 @@
=head1 RATIONALE
I wrote this because, in my work as a TUGboat editor
-(Lhttp://tug.org/TUGboat, journal submissions always welcome!), I end
-up running and rerunning many papers, many times each. It was too easy
-to lose warnings I needed to see in the mass of unvarying and
-uninteresting output from TeX, such as style files being read and fonts
-being used. I wanted to see all and only those messages which needed
-some action by me.
+(Lhttp://tug.org/TUGboat, journal submissions always welcome!), I run
+and rerun many documents, many times each. It was too easy to lose
+warnings I needed to see in the mass of unvarying and uninteresting
+output from TeX, such as style files being read and fonts being used. I
+wanted to see all and only those messages which needed some action by
+me.
I found some other programs of a similar nature, the LaTeX package
C<silence>, and plenty of other (La)TeX wrappers, but it seemed none of
@@ -394,12 +401,10 @@
Here are some keywords if you want to explore other options:
texloganalyser, pydflatex, logfilter, latexmk, rubber, arara, and
-searching for C<log> at Lhttp://ctan.org/search.
+searching for C<log> at Lhttps://ctan.org/search.
C<texfot> is written in Perl, and runs on Unix, and does not work on
-Windows. (If by some chance anyone wants to use this program on
-Windows, please make your own fork; I'm not interested in supporting
-that os.)
+Windows.
The name comes from the C and C files that are part
of Knuth's trip and trap torture tests, which record the online output
@@ -412,6 +417,6 @@
This script and its documentation were written by Karl Berry and both
are released to the public domain. Email C with
bug reports. It has no home page beyond the package on CTAN:
-Lhttp://www.ctan.org/pkg/texfot.
+Lhttps://ctan.org/pkg/texfot.
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texfot.tlpobj new/tlpkg/tlpobj/texfot.tlpobj
--- old/tlpkg/tlpobj/texfot.tlpobj 2019-02-28 04:07:43.000000000 +0100
+++ new/tlpkg/tlpobj/texfot.tlpobj 2020-03-12 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name texfot
category Package
-revision 44991
+revision 54246
shortdesc Filter clutter from the output of a TeX run
longdesc The package provides a small Perl script to filter the online
longdesc output from a TeX run, attempting to show only those messages
@@ -10,7 +10,6 @@
runfiles size=4
texmf-dist/scripts/texfot/texfot.pl
catalogue-ctan /support/texfot
-catalogue-date 2017-08-08 20:53:45 +0200
catalogue-license pd
catalogue-topics comp-mgmt
-catalogue-version 1.37
+catalogue-version 1.40
++++++ texinfo.tar.xz ++++++
++++ 1733 lines of diff (skipped)
++++++ texlive-common.doc.tar.xz ++++++
Binary files old/doc/texlive/texlive-common/advanced-lnx.png and new/doc/texlive/texlive-common/advanced-lnx.png differ
Binary files old/doc/texlive/texlive-common/basic-w32.png and new/doc/texlive/texlive-common/basic-w32.png differ
Binary files old/doc/texlive/texlive-common/tlmgr-gui.png and new/doc/texlive/texlive-common/tlmgr-gui.png differ
Binary files old/doc/texlive/texlive-common/tlshell-macos.png and new/doc/texlive/texlive-common/tlshell-macos.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-common.doc.tlpobj new/tlpkg/tlpobj/texlive-common.doc.tlpobj
--- old/tlpkg/tlpobj/texlive-common.doc.tlpobj 2019-03-20 02:24:39.000000000 +0100
+++ new/tlpkg/tlpobj/texlive-common.doc.tlpobj 2020-03-09 00:29:07.000000000 +0100
@@ -1,9 +1,9 @@
name texlive-common.doc
category TLCore
-revision 50466
+revision 54176
shortdesc doc files of texlive-common
relocated 1
-docfiles size=131
+docfiles size=141
RELOC/doc/texlive/index.html
RELOC/doc/texlive/texlive-common/advanced-lnx.png
RELOC/doc/texlive/texlive-common/basic-w32.png
++++++ texlive-cz.doc.tar.xz ++++++
++++ 13578 lines of diff (skipped)
++++++ texlive-de.doc.tar.xz ++++++
++++ 9338 lines of diff (skipped)
++++++ texlive-en.doc.tar.xz ++++++
++++ 20673 lines of diff (skipped)
++++++ texlive-es.doc.tar.xz ++++++
++++ 24761 lines of diff (skipped)
++++++ texlive-fr.doc.tar.xz ++++++
++++ 17825 lines of diff (skipped)
++++++ texlive-it.doc.tar.xz ++++++
++++ 13433 lines of diff (skipped)
++++++ texlive-pl.doc.tar.xz ++++++
++++ 14167 lines of diff (skipped)
++++++ texlive-ru.doc.tar.xz ++++++
++++ 11019 lines of diff (skipped)
++++++ texlive-scripts-extra_scripts.dif ++++++
---
texmf-dist/scripts/texlive-extra/texconfig-dialog.sh | 14 +++--
texmf-dist/scripts/texlive-extra/texconfig-sys.sh | 1
texmf-dist/scripts/texlive-extra/texconfig.sh | 35 ------------
texmf-dist/scripts/texlive-extra/texlinks.sh | 53 ++++++++++++-------
4 files changed, 50 insertions(+), 53 deletions(-)
--- texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+++ texmf-dist/scripts/texlive-extra/texconfig-dialog.sh 2018-05-03 08:15:39.975645684 +0000
@@ -157,7 +157,14 @@ termCtl()
###############################################################################
menuMain()
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your TeX system using the
@@ -169,8 +176,9 @@ menuMain()
More likely these days, you're better off using tlmgr.
See http://tug.org/texlive/tlmgr.html.
-eof
- termCtl readln
+ eof
+ termCtl readln
+ fi
while :; do
logMessage='view logfile'
--- texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+++ texmf-dist/scripts/texlive-extra/texconfig-sys.sh 2018-05-03 08:15:39.975645684 +0000
@@ -30,4 +30,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG
+umask 022
exec texconfig ${1+"$@"}
--- texmf-dist/scripts/texlive-extra/texconfig.sh
+++ texmf-dist/scripts/texlive-extra/texconfig.sh 2009-09-02 12:47:26.000000000 +0000
@@ -40,7 +40,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$.$RANDOM
needsCleanup=false
lastUpdatedFile=
@@ -997,21 +997,6 @@ For more information about these \`featu
;;
formats)
- cat >&2 <http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
setupTmpDir
echo "$progname: analyzing old configuration..." >&2
fmtutil --catcfg > $tmpdir/pre
@@ -1037,22 +1022,6 @@ EOM
# "hyphen FORMAT"
hyphen)
- cat >&2 <http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
tcBatchHyphenFormat=$2
formatsForHyphen=`getFormatsForHyphen`
formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
@@ -1301,7 +1270,7 @@ Valid PAPER settings:
;;
rehash)
- mktexlsr
+ ( unset KPSE_DOT; mktexlsr )
;;
#
--- texmf-dist/scripts/texlive-extra/texlinks.sh
+++ texmf-dist/scripts/texlive-extra/texlinks.sh 2018-05-03 08:15:39.979645610 +0000
@@ -100,7 +100,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ (umask 077; mkdir -m 0700 "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
}
@@ -108,16 +108,18 @@ setupTmpDir()
# search a binary along $PATH:
check_for_binary()
{
- testbin=$1
- set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
- for i
- do
- if [ -x "$i/$testbin" ]; then
- echo "$i/$testbin"
- return 0
- fi
- done
- return 1
+# testbin=$1
+# set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
+# for i
+# do
+# if [ -x "$i/$testbin" ]; then
+# echo "$i/$testbin"
+# return 0
+# fi
+# done
+# return 1
+
+ type -p $1
}
@@ -208,8 +210,22 @@ search_symlinkdir()
upd_symlinkdir()
{
search_symlinkdir || return 0
- for i in `sed 's@ .*@@' cnf_file_ln.$$`; do
- install_link "$selfautoloc/$i" "$symlinkdir/$i"
+ set x `cat cnf_file_ln.$$` ; shift
+ while test $# != 0; do
+ fmt=$1; ini=$3; shift; shift; shift
+
+ # Some broken shells destroy the positional arguments when calling a
+ # shellfunction. Therefore, we save and restore them "by hand" in the
+ # main_args_while variable.
+ main_args_while="$@"
+
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
+ install_link "$selfautoloc/$fmt" "$symlinkdir/$fmt"
+
+ # restore positional arguments:
+ set x $main_args_while; shift
done
}
@@ -274,12 +290,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$.$RANDOM
setupTmpDir
cd "$tmpdir" || cleanup 1
- sed '/^[ ]*#/d; /^[ ]*$/d' $cnf_file \
- | awk '{print $1, $2}' > cnf_file_ln.$$
+ sed '/^[ ]*#/d; /^[ ]*$/d; s%\*%%' $cnf_file \
+ | awk '{print $1, $2, $NF}' > cnf_file_ln.$$
if test -z "$dirs"; then
if test $multiplatform = true; then
@@ -300,13 +316,16 @@ main()
# cnf_file_ln.$$ has lines with "format engine" pairs
set x `cat cnf_file_ln.$$`; shift
while test $# != 0; do
- fmt=$1; engine=$2; shift; shift
+ fmt=$1; engine=$2; ini=$3; shift; shift; shift
# Some broken shells destroy the positional arguments when calling a
# shellfunction. Therefore, we save and restore them "by hand" in the
# main_args_while variable.
main_args_while="$@"
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine$exeext"; then
case $unlink in
++++++ texlive-scripts_scripts.dif ++++++
---
texmf-dist/scripts/texlive/fmtutil-sys.sh | 1 +
texmf-dist/scripts/texlive/fmtutil.pl | 20 ++++++++++++++------
texmf-dist/scripts/texlive/updmap-sys.sh | 1 +
texmf-dist/scripts/texlive/updmap.pl | 16 ++++++++++------
4 files changed, 26 insertions(+), 12 deletions(-)
--- texmf-dist/scripts/texlive/fmtutil-sys.sh
+++ texmf-dist/scripts/texlive/fmtutil-sys.sh 2018-05-11 10:51:14.298775065 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texmf-dist/scripts/texlive/fmtutil.pl
+++ texmf-dist/scripts/texlive/fmtutil.pl 2018-05-11 10:51:51.546080553 +0000
@@ -10,16 +10,16 @@
# History:
# Original shell script (C) 2001 Thomas Esser, public domain
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
require "mktexlsr.pl";
TeX::Update->import();
}
@@ -70,7 +70,7 @@ TeXLive::TLUtils::prepend_own_path();
# this function checks by itself whether it is running on windows or not
reset_root_home();
-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -361,7 +361,14 @@ sub callback_build_formats {
TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
}
} else {
+ my ($uid, $gid);
$tmpdir = File::Temp::tempdir(CLEANUP => 1);
+ if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
+ my $cnt = chown $uid, $gid, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ $cnt = chmod 0770, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ }
}
# set up destination directory
$opts{'fmtdir'} ||= "$texmfvar/web2c";
@@ -599,6 +606,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else
if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure.
--- texmf-dist/scripts/texlive/updmap-sys.sh
+++ texmf-dist/scripts/texlive/updmap-sys.sh 2018-05-11 10:53:43.971984421 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec updmap --sys ${1+"$@"}
--- texmf-dist/scripts/texlive/updmap.pl
+++ texmf-dist/scripts/texlive/updmap.pl 2018-06-19 08:49:26.931648791 +0000
@@ -16,15 +16,17 @@
my $svnid = '$Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $';
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
+ require "mktexlsr.pl";
+ TeX::Update->import();
}
my $lastchdate = '$Date: 2019-06-07 18:36:59 +0200 (Fri, 07 Jun 2019) $';
@@ -46,7 +48,7 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
# see more comments at the definition of this function.
reset_root_home();
-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(my $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -398,6 +400,8 @@ sub main {
print "in $changes_config_file\n";
print "Do you really want to continue (y/N)? ";
my $answer = <STDIN>;
+ my $dosync = $ENV{'UPDMAPSYNC'};
+ $answer = "y" if !defined($dosync);
$answer = "n" if !defined($answer);
chomp($answer);
print "answer =$answer=\n";
++++++ texlive-sr.doc.tar.xz ++++++
++++ 8390 lines of diff (skipped)
++++++ texlive-zh-cn.doc.tar.xz ++++++
Binary files old/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf and new/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex
--- old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2019-03-20 05:14:54.000000000 +0100
+++ new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2020-03-23 01:06:36.000000000 +0100
@@ -13,14 +13,14 @@
\usepackage{tex-live-zh-cn, indentfirst}
\title{%
- {\huge \textit{\TeX\ Live 指南---2019}}%
+ {\huge \textit{\TeX\ Live 指南---2020}}%
}
\author{Karl Berry 编写 \\[3mm]
\url{https://tug.org/texlive/}
}
-\date{2019 年 4 月}
+\date{2020 年 3 月}
\begin{document}
\maketitle
@@ -61,7 +61,7 @@
至于 Windows,\TL{} 仅支持 Windows~7 或后续版本。
Windows Vista 可能可以继续工作,但 \TL{} 不能在 Windows XP
-或者更早的版本上运行。我们没有包含 64 位的 Windows
+或者更早的版本上运行。\TL{} 没有包含 64 位的 Windows
可执行文件,不过 32 位的可执行文件也能 64 位的系统上正常运行。
除了 \TL{} 以外,Windows 和 \MacOSX 用户还有其它的选择,请参考
@@ -71,7 +71,7 @@
\label{sec:basic}
你可以使用 \DVD{} 方式或者网络方式来安装 \TL{}
-(\url{http://tug.org/texlive/acquire.html})。
+(\url{https://tug.org/texlive/acquire.html})。
通过网络的安装程序本身非常小,它可以从网上下载所有的你所要求的软
件包。网络安装程序对仅使用 \TL{} 一小部分的用户来说非常适宜。
@@ -113,47 +113,52 @@
最后,\TeX\ (及其相关程序) 在处理文档时是可以写文件的,这个功能可以被各种
方式滥用。所以我们再一次强调最保险的是在新的子目录下处理未知的文档。
+安全的另一个方面是保证下载的内容与内容创建时一致。如果安装了 \prog{gpg}
+(GNU Privacy Guard) 程序,\prog{tlmgr} 程序 (第~\ref{sec:tlmgr}~节) 会自动
+对现在内容进行加密验证。\prog{gpg} 不和 \TL{} 一起分发,但可以参见
+\url{https://texlive.info/tlgpg/} 了解更多信息。
+
\subsection{获得帮助}
\label{sec:help}
\TeX{} 社群是活跃而友好的,几乎所有认真的提问都能得到回答。尽管如此,这种由志愿者
和业余用户组成的技术支持仍然显得不太正式,所以,在提问前最好做好功课。(如果你更喜欢
有保障的商业性技术支持,可以放弃 \TL{},改为购买商业 \TeX{} 系统,在
-\url{http://tug.org/interest.html#vendors} 上有一份销售商的列表。)
+\url{https://tug.org/interest.html#vendors} 上有一份销售商的列表。)
按照推荐使用的顺序,我们列出了这样一份资源列表:
\begin{description}
-\item [起步] 如果你刚刚接触 \TeX,\url{http://tug.org/begin.html}
+\item [起步] 如果你刚刚接触 \TeX,\url{https://tug.org/begin.html}
这个网页提供了这个系统的简短介绍。
\item [\TeX{} FAQ] 这套庞大的 \TeX{} FAQ 对各种各样的
问题——从最基础到最晦涩的——都给予了简明的回答,它在 \TL{} 的
\OnCD{texmf-dist/doc/generic/FAQ-en/},也可以在
-\url{http://www.tex.ac.uk/faq} 网站上找到。有问题时请先看看这里能否找
+\url{https://texfaq.org} 网站上找到。有问题时请先看看这里能否找
到解答。
\item [\TeX{} Catalogue] 如果你在寻找某个特定的宏包、字体、程序等等,\TeX{}
Catalogue 就是你首先该找的地方。这里是所有 \TeX{} 相关内容的一个巨大集合。参见
-\url{http://ctan.org/pkg/catalogue/}。
+\url{https://ctan.org/pkg/catalogue}。
-\item [\TeX{} 网上资源] \url{http://tug.org/interest.html}~页面上有
+\item [\TeX{} 网上资源] \url{https://tug.org/interest.html}~页面上有
许多和 \TeX{} 相关的链接,包括讨论这个系统方方面面的许多书籍、手册和文章。
\item [支持信息的归档] 最重要的 \TeX\ 技术支持论坛是
\LaTeX{} 社区网站 \url{http://latex-community.org/}, 问答网站
-\url{http://tex.stackexchange.com}, Usenet 的新闻组 \url{news:comp.text.tex}
+\url{https://tex.stackexchange.com}, Usenet 的新闻组 \url{news:comp.text.tex}
和邮件列表 \email{texhax@tug.org}。它们的内容归档中有多年以来的提问和回答供你
搜索。最后两种你可以用 \\
\url{http://groups.google.com/groups?group=comp.text.tex} 和 \\
-\url{http://tug.org/mail-archives/texhax} 进行查询。当然,一般性的搜索
-方式,比如用 \url{http://google.com} 找找,总没有坏处。
+\url{https://tug.org/mail-archives/texhax} 进行查询。当然,一般性的搜索
+方式也没有坏处。
-\item [提问] 如果你还是找不到答案,可以在 \url{http://latex-community.org/} 和
-\url{http://tex.stackexchange.com/} 网站上提问,通过 Google
+\item [提问] 如果你还是找不到答案,可以在 \url{https://latex.org} 和
+\url{https://tex.stackexchange.com/} 网站上提问,通过 Google
或者你的新闻组阅读器在 \dirname{comp.text.tex} 上提问,或者发送邮件到
\email{texhax@tug.org}。不过,在提问之前请先阅读 FAQ 上的这一条:
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=askquestion},
+\url{https://texfaq.org/FAQ-askquestion},
它能提高你获得回答的可能性。
\item [\TL{} 技术支持] 如果你需要报告 bug,或者提出对 \TL{} 的发行、安装或
@@ -182,17 +187,17 @@
\begin{description}
\item [\TL] 是一个完整的 \TeX{} 系统,它可以安装在本
-地磁盘上。主页: \url{http://tug.org/texlive/}。
+地磁盘上。主页: \url{https://tug.org/texlive/}。
\item [Mac\TeX] 在 \TL{} 的基础上增加了原生的 \MacOSX\ (目前 Apple 把它称作
macOS,但在这份文档中我们还沿用它的旧名字) 的安装程序和一些其它的
-Mac 应用程序。它的主页在 \url{http://tug.org/mactex/}。
+Mac 应用程序。它的主页在 \url{https://tug.org/mactex/}。
\item [pro\TeX{}t] 是 Windows 下的 \MIKTEX\ 发行版的一个增强版本。\ProTeXt\ 在
\MIKTEX\ 基础上增加了一些工具,简化了安装。它完全独立于 \TL{},有其
-自己的安装步骤。主页: \url{http://tug.org/protext}。
+自己的安装步骤。主页: \url{https://tug.org/protext}。
-\item [CTAN] 一份 \CTAN{} 仓库的快照 (\url{http://www.ctan.org/})。
+\item [CTAN] 一份 \CTAN{} 仓库的快照 (\url{https://ctan.org/})。
\end{description}
@@ -221,9 +226,6 @@
Windows 的特殊支持。
\end{ttdescription}
-上述目录之外,安装脚本和 (多种语言的) \filename{README} 文件也存放在发行版的顶层
-目录下。
-
至于文档,顶层目录下的 \OnCD{doc.html} 文件中提供的完整的链接会有帮助。
几乎所有内容的文档 (宏包、格式文件、字体、程序手册,man page, Info 文件等) 在
\dirname{texmf-dist/doc} 目录下,因为这些程序本身是属于 \dirname{texmf} 目录的。
@@ -238,6 +240,7 @@
\item{英语:} \OnCD{texmf-dist/doc/texlive/texlive-en}
\item{法语:} \OnCD{texmf-dist/doc/texlive/texlive-fr}
\item{意大利语:} \OnCD{texmf-dist/doc/texlive/texlive-it}
+\item{日语:} \OnCD{texmf-dist/doc/texlive/texlive-ja}
\item{波兰语:} \OnCD{texmf-dist/doc/texlive/texlive-pl}
\item{俄语:} \OnCD{texmf-dist/doc/texlive/texlive-ru}
\item{塞尔维亚语:} \OnCD{texmf-dist/doc/texlive/texlive-sr}
@@ -254,7 +257,7 @@
名称的对应关系。
所有这些目录树,包括个人的,都应该遵循 \TeX\ 目录结构 (\TDS,
-\url{http://tug.org/tds}),包括其中所有细小的子目录,否则文件就
+\url{https://tug.org/tds}),包括其中所有细小的子目录,否则文件就
可能找不到。第 \ref{sec:local-personal-macros} 节 (第
\pageref{sec:local-personal-macros} 页) 有更详细的介绍。这里描述的顺序和搜索的
优先级相反,也就是说,列在更靠后的目录树会被更优先搜索。
@@ -272,9 +275,9 @@
的目录。
\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。
这个变量根据不同的用户选择不同的主目录。
-\item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap+ 和
- \verb+fmtutil+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。
-\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap+、和 \verb+fmtutil+
+\item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap-user+ 和
+ \verb+fmtutil-user+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。
+\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap-sys+、和 \verb+fmtutil-sys+
这些程序存储个人修改过的配置文件。
\item [TEXMFCACHE] \ConTeXt\ MkIV 和 Lua\LaTeX\ 用来保存 (缓存的) 运行时
数据的目录树;缺省为 \code{TEXMFSYSVAR},如果该目录不可写,则使用
@@ -287,8 +290,8 @@
\item[全系统根目录] 可以包含多个 \TL{} 版本:
(在 Unix 下默认是 \texttt{/usr/local/texlive})
\begin{ttdescription}
- \item[2018] 上一个版本。
- \item[2019] 当前版本。
+ \item[2019] 上一个版本。
+ \item[2020] 当前版本。
\begin{ttdescription}
\item [bin] ~
\begin{ttdescription}
@@ -307,8 +310,8 @@
\item[用户主 (home) 目录] (\texttt{\$HOME} 或
\texttt{\%USERPROFILE\%})
\begin{ttdescription}
- \item[.texlive2018] 给上个版本的,个人生成和配置的数据。
- \item[.texlive2019] 给这个版本的,个人生成和配置的数据。
+ \item[.texlive2019] 给上个版本的,个人生成和配置的数据。
+ \item[.texlive2020] 给这个版本的,个人生成和配置的数据。
\begin{ttdescription}
\item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE}
\item [texmf-config] \envname{TEXMFCONFIG}
@@ -339,18 +342,18 @@
这是针对 \prog{etex}, \prog{latex} 或 \prog{pdflatex} 这些格式使用的缺省程序。
它的主页在 \url{http://www.pdftex.org/},文档在
\OnCD{texmf-dist/doc/pdftex/manual/pdftex-a.pdf}。可以在
-\OnCD{texmf-dist/doc/pdftex/manual/samplepdf/samplepdf.tex} 找到展示部分功能的例
+\OnCD{texmf-dist/doc/pdftex/samplepdftex/samplepdf.tex} 找到展示部分功能的例
子。
\item [Lua\TeX] 是 pdf\TeX\ 指定的后继者,而且对 pdf\TeX\ 保持大部分
(但不是完全地) 向下兼容。它也希望包含 Aleph (见后) 的功能,尽管未必能完美兼容。
-它内置的 Lua 语言解释器 (\url{http://www.lua.org}) 为许多棘手的 \TeX{}
+它内置的 Lua 语言解释器 (\url{https://lua.org}) 为许多棘手的 \TeX{}
问题提供了优雅的解决方案。当以 \filename{texlua} 命令执行时,它就像一个标准的
Lua 解释器一样工作,所以,Lua\TeX\ 在 \TL\ 中也被作为 Lua 程序的解释器。
见 \url{http://www.luatex.org} 和 \OnCD{texmf-dist/doc/luatex/luatex.pdf}。
\item [Xe\TeX] 通过第三方库,增加对 Unicode 输入文本和 OpenType 字体的支持,
-能够直接使用系统字体。参见 \url{http://tug.org/xetex}。
+能够直接使用系统字体。参见 \url{https://tug.org/xetex}。
\item [\OMEGA\ (Omega)] 基于 Unicode (16 位字符集),因而同时支持处理世界上
几乎所有的语言。它同时还支持所谓的 `\OMEGA{} Translation Processes' (OTP),
@@ -401,7 +404,7 @@
\label{sec:inst-start}
首先请找来一张 \TK{} 的 \DVD{},或者下载 \TL{} 的网络安装程序。参见
-\url{http://tug.org/texlive/acquire.html} 以了解更多关于获得这个软件的信息和方法。
+\url{https://tug.org/texlive/acquire.html} 以了解更多关于获得这个软件的信息和方法。
\begin{description}
\item [网络安装程序,.zip 或 .tar.gz 格式:] 在 \CTAN 的 \dirname{systems/texlive/tlnet}
@@ -418,8 +421,8 @@
\item [\TeX{} Collection \DVD:] 打开 \DVD\ 的 \dirname{texlive} 这个子目录。
在 Windows 下安装程序通常在插入 \DVD 后就自动启动了。要获得 \DVD 的
话可以加入一个 \TeX\ 用户组织 (推荐这么做,参见
-\url{http://tug.org/usergroups.html}) 或是单独购买 (通过
-\url{http://tug.org/store}),又或者是自己从 \ISO\ 镜像刻录。
+\url{https://tug.org/usergroups.html}) 或是单独购买 (通过
+\url{https://tug.org/store}),又或者是自己从 \ISO\ 镜像刻录。
在多数系统里你都可以直接挂载这个 \ISO{}。在从 \DVD\ 或者 \ISO{} 安装后,
如果还希望从 Internet 获得持续的更新,请看第 \ref{sec:dvd-install-net-updates}
节。
@@ -437,7 +440,7 @@
如果你需要用代理服务器来下载,Wget 的代理服务器设置可以使用 \filename{~/.wgetrc}
文件或者环境变量来指定
-(\url{http://www.gnu.org/software/wget/manual/html_node/Proxies.html}),
+(\url{https://www.gnu.org/software/wget/manual/html_node/Proxies.html}),
或者你使用的下载工具对应的配置文件。如果你是从 \DVD\ 或者 \ISO\ 镜像来安装就
没有关系了。
@@ -481,7 +484,7 @@
\label{sec:macosx}
如第~\ref{sec:tl-coll-dists}~节提到的,我们给 \MacOSX 准备了一套独立的
-发行版,叫做 Mac\TeX\ (\url{http://tug.org/mactex})。我们推荐使用原生的
+发行版,叫做 Mac\TeX\ (\url{https://tug.org/mactex})。我们推荐使用原生的
Mac\TeX\ 安装程序,而不是 \TL\ 自带的那个,因为原生的安装程序做了一些
针对 Mac 的调整,尤其是使用 \TeX{}Dist 数据结构方便在 \MacOSX 下的多个 \TeX\ 发
行版 (Mac\TeX, Fink, MacPorts, \ldots) 之间切换。
@@ -520,7 +523,7 @@
\begin{figure}[tb]
\begin{boxedverbatim}
-Installing TeX Live 2019 from: ...
+Installing TeX Live 2020 from: ...
Platform: x86_64-linux => 'GNU/Linux on x86_64'
Distribution: inst (compressed)
Directory for temporary files: /tmp
@@ -532,11 +535,11 @@
<S> Set installation scheme: scheme-full
<C> customizing installation collections
- 40 collections out of 41, disk space required: 5829 MB
+ 40 collections out of 41, disk space required: 6536 MB
<D> directories:
TEXDIR (the main TeX directory):
- /usr/local/texlive/2019
+ /usr/local/texlive/2020
...
<O> options:
@@ -623,12 +626,12 @@
===============================================================================
a [ ] Cygwin on Intel x86 (i386-cygwin)
b [ ] Cygwin on x86_64 (x86_64-cygwin)
- c [ ] MacOSX current (10.12-) on x86_64 (x86_64-darwin)
+ c [ ] MacOSX current (10.13-) on x86_64 (x86_64-darwin)
d [ ] MacOSX legacy (10.6-) on x86_64 (x86_64-darwinlegacy)
e [ ] FreeBSD on x86_64 (amd64-freebsd)
f [ ] FreeBSD on Intel x86 (i386-freebsd)
g [ ] GNU/Linux on ARM64 (aarch64-linux)
- h [ ] GNU/Linux on ARMhf (armhf-linux)
+ h [ ] GNU/Linux on ARMv6/RPi (armhf-linux)
i [ ] GNU/Linux on Intel x86 (i386-linux)
j [X] GNU/Linux on x86_64 (x86_64-linux)
k [ ] GNU/Linux on x86_64 with musl (x86_64-linuxmusl)
@@ -699,8 +702,8 @@
缺省的目录布局在第~\ref{sec:texmftrees}~节有过叙述,见
第~\pageref{sec:texmftrees}~页。在 Unix 下默认的安装目录是
-\dirname{/usr/local/texlive/2019} 而 Windows 下是
-|%SystemDrive%\texlive\2019|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
+\dirname{/usr/local/texlive/2020} 而 Windows 下是
+|%SystemDrive%\texlive\2020|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
发行版本一个,你可以通过修改搜索路径来在它们中间切换。
这个安装路径可以通过设置安装程序中的 \dirname{TEXDIR} 来修改。这个选项和其他选项
@@ -710,11 +713,11 @@
你也可以通过在运行安装程序以前修改特定的环境变量来改变安装目录,最常见的是
\envname{TEXLIVE\_INSTALL\_PREFIX} 或者 \envname{TEXLIVE\_INSTALL\_TEXDIR},参见
-|install-tl --help| 的文档 (\url{http://tug.org/texlive/doc/install-tl.html} 有
+|install-tl --help| 的文档 (\url{https://tug.org/texlive/doc/install-tl.html} 有
在线版本) 以了解完整的列表和更多的信息。
一个合理的选择是你自己主目录下的一个子目录,尤其在只有你一个人
-使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2019|'。
+使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2020|'。
我们建议在目录名称中保留年份,这样可以让你保留多个不同版本的
\TL{}。(你可能希望还维护一个类似 \dirname{/usr/local/texlive-cur}
@@ -771,7 +774,7 @@
\filename{texmf.cnf} 中定义。参见 2010 版新闻 (第~\ref{sec:2010news} 节)
以了解更多信息。
-\item[create format files:] 虽然创建不必要的格式文件会浪费一
+\item[create all format files:] 虽然创建不必要的格式文件会浪费一
点时间,也会多占一些磁盘空间,但
我们还是建议现在保持这个选项的选定状态,因为如果这次不生成,下次
用到的时候格式文件就会在用户个人的 \dirname{TEXMFVAR} 目录树内生
@@ -791,7 +794,8 @@
现有的文件,比如给它指定系统目录。最保险和推荐的做法还是不要
选择这个选项。
-\item[after installation \ldots\ \CTAN:] 从 \DVD\ 安装时,这个选项
+\item[after install, set CTAN as source for package updates:]
+从 \DVD\ 安装时,这个选项
被缺省启用,因为通常你会希望在此后通过 \CTAN\ 安装一年内更新的软件
包。禁用它唯一可能的原因是你只安装了 \DVD\ 内容的一部分,计划在以后
扩展安装。无论如何,安装程序时和安装后的更新的软件包仓库如果需要可
@@ -833,7 +837,7 @@
\item[-gui] 尽可能用 \GUI{} 模式的安装程序。它需要 Tcl/Tk 版本 8.5 以上。在
\MacOSX\ 上和 \TL{} 的 Windows 分发中已经满足这个条件了。原有的
\texttt{-gui=perltk} 和 \texttt{-gui=wizard} 选项需要安装了编译进 XFT 支持的
- Perl/Tk 模块 (\url{http://tug.org/texlive/distro.html#perltk});
+ Perl/Tk 模块 (\url{https://tug.org/texlive/distro.html#perltk});
如果找不到 Perl/Tk,安装程序就会在文本模式下出现。
\item[-no-gui] 强制使用文本模式安装程序。
@@ -860,7 +864,7 @@
\htmlanchor{opt-in-place}
\item[-in-place] (补充说明:除非你清楚自己要做什么,否则不要使用这个选项。)
如果你已经有一份用 rsync, svn, 或者其他方式安装的
-\TL{} (参见 \url{http://tug.org/texlive/acquire-mirror.html}) 那
+\TL{} (参见 \url{https://tug.org/texlive/acquire-mirror.html}) 那
这个选项会使用现有的,只执行必要的安装后操作。注意 \filename{tlpkg/texlive.tlpdb}
文件会被覆盖,你需要自己备份它。另外,文件的删除必须手动完成。所以
只在你知道自己在干什么的情况下才用它。这个选项不能在安装程序界面中
@@ -882,7 +886,7 @@
比如你可以选择这样的一个 \CTAN\ 镜像:
\url{http://ctan.example.org/tex-archive/systems/texlive/tlnet/},
当然你应该把 |ctan.example.org/tex-archive| 替换为具体镜像的
-域名和特定的顶层 \CTAN\ 路径 (\url{http://ctan.org/mirrors})
+域名和特定的顶层 \CTAN\ 路径 (\url{https://ctan.org/mirrors})
维护了一个 \CTAN\ 的镜像列表)。
如果给定的地址在本地磁盘上 (或者是路径或者是 \texttt{file:/}
@@ -914,18 +918,18 @@
这样:
\begin{sverbatim}
-PATH=/usr/local/texlive/2019/bin/i386-linux:$PATH; export PATH
-MANPATH=/usr/local/texlive/2019/texmf-dist/doc/man:$MANPATH; export MANPATH
-INFOPATH=/usr/local/texlive/2019/texmf-dist/doc/info:$INFOPATH; export INFOPATH
+PATH=/usr/local/texlive/2020/bin/i386-linux:$PATH; export PATH
+MANPATH=/usr/local/texlive/2020/texmf-dist/doc/man:$MANPATH; export MANPATH
+INFOPATH=/usr/local/texlive/2020/texmf-dist/doc/info:$INFOPATH; export INFOPATH
\end{sverbatim}
对于 csh 或者 tcsh,需要修改的文件通常是 \filename{$HOME/.cshrc},而
应该添加的内容类似:
\begin{sverbatim}
-setenv PATH /usr/local/texlive/2019/bin/i386-linux:$PATH
-setenv MANPATH /usr/local/texlive/2019/texmf-dist/doc/man:$MANPATH
-setenv INFOPATH /usr/local/texlive/2019/texmf-dist/doc/info:$INFOPATH
+setenv PATH /usr/local/texlive/2020/bin/i386-linux:$PATH
+setenv MANPATH /usr/local/texlive/2020/texmf-dist/doc/man:$MANPATH
+setenv INFOPATH /usr/local/texlive/2020/texmf-dist/doc/info:$INFOPATH
\end{sverbatim}
如果你已经在你的配置文件里写过了这样的路径设置,那就只需要
@@ -942,8 +946,8 @@
这个文件是否存在,如果有的话,添加下面这样的内容:
\begin{sverbatim}
-MANPATH_MAP /usr/local/texlive/2019/bin/i386-linux \
- /usr/local/texlive/2019/texmf-dist/doc/man
+MANPATH_MAP /usr/local/texlive/2020/bin/i386-linux \
+ /usr/local/texlive/2020/texmf-dist/doc/man
\end{sverbatim}
然后 2)~检查 \filename{/etc/environment} 是否定义了默认的搜索路径
@@ -968,7 +972,7 @@
从 \DVD{} 安装时会默认完成这一步,通过第~\ref{sec:options}~节介绍
的选项。
-如果自动镜像选择出现了问题,你可以从 \url{http://ctan.org/mirrors}
+如果自动镜像选择出现了问题,你可以从 \url{https://ctan.org/mirrors}
列表中自己指定一个 \CTAN\ 镜像。使用与上述一致的 \dirname{tlnet}
子目录路径。
@@ -980,7 +984,7 @@
在 Windows 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用,只要通过字体名称就可以了。
在 \MacOSX\ 下如果需要按字体名称查找则需要额外的步骤,参见 Mac\TeX\ 网页
-(\url{http://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex}
+(\url{https://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex}
软件包,需要把系统按如下配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。
为了进行配置,\pkgname{xetex} 安装后 (不管是初始安装还是后来安装的) 都会在
@@ -1028,7 +1032,7 @@
并写入第一个可写东风路径。在读取时,最后找到的匹配会被优先选择。
要了解更多信息,参见
-\url{http://wiki.contextgarden.net/Running_Mark_IV}。
+\url{https://wiki.contextgarden.net/Running_Mark_IV}。
\subsubsection{集成本地与个人宏文件}
\label{sec:local-personal-macros}
@@ -1044,7 +1048,7 @@
你又得再改。
对于这两个目录树而言,文件都应该放到合适的 \TeX\ 目录结构 (\TDS)
-子目录中,参见 \url{http://tug.org/tds} 或者
+子目录中,参见 \url{https://tug.org/tds} 或者
\filename{texmf-dist/web2c/texmf.cnf} 文件。比如一个 \LaTeX{} 文档类或者宏包应该
放在 \dirname{TEXMFLOCAL/tex/latex} 或者 \dirname{TEXMFHOME/tex/latex}
目录下,要不然就是它们的一个子目录下。
@@ -1073,7 +1077,7 @@
\XeTeX\ 或 Lua\TeX\ 是可行的替代方案 (参见第~\ref{sec:tex-extensions}~节),
它们能让你使用操作系统的字体而不必将它安装到 \TeX 中。
-如果你非得这么做,参见 \url{http://tug.org/fonts/fontinstall.html},
+如果你非得这么做,参见 \url{https://tug.org/fonts/fontinstall.html},
这是我们对整个过程最好的描述。
\subsection{测试安装是否成功}
@@ -1083,10 +1087,10 @@
美的文档和字体。
你可能马上需要的是一个用来编辑文件的前端程序。\TL{} 在 Windows 下只安装了
-\TeX{}works (\url{http://tug.org/texworks}),而 Mac\TeX\ 则安装了 TeXShop
-(\url{http://pages.uoregon.edu/koch/texshop}。在其他 Unix 系统下,由你自己选择编
+\TeX{}works (\url{https://tug.org/texworks}),而 Mac\TeX\ 则安装了 TeXShop
+(\url{https://pages.uoregon.edu/koch/texshop}。在其他 Unix 系统下,由你自己选择编
辑器。当然,存在很多选择,有些在下一小节列出了;还可以参见
-\url{http://tug.org/interest.html#editors}。任何纯文本编辑器都可以,不需要专门为
+\url{https://tug.org/interest.html#editors}。任何纯文本编辑器都可以,不需要专门为
\TeX{} 设计的。
这个小节后面给出了一些测试系统是否正常工作的基本步骤。我们这里使用的是 Unix 命令,
@@ -1149,8 +1153,8 @@
\Ucom{xpdf sample2e.pdf}
\end{alltt}
\cmdname{gv} 和 \cmdname{xpdf} 现在都不包含在 \TL{} 中,你
-必须单独安装它们。请分别参阅 \url{http://www.gnu.org/software/gv} 和
-\url{http://www.foolabs.com/xpdf}。(还有许多其他的 PDF 查看器。)
+必须单独安装它们。请分别参阅 \url{https://www.gnu.org/software/gv} 和
+\url{https://www.xpdfreader.com}。(还有许多其他的 PDF 查看器。)
Windows 下我们推荐 Sumatra PDF
(\url{https://www.sumatrapdfreader.org/free-pdf-reader.html})。
@@ -1185,42 +1189,42 @@
\subsection{其他可下载软件的链接}
如果你还是个 \TeX{} 新手,或者在编辑 \TeX{} 或 \LaTeX{} 文档时需要帮助,
-请访问 \url{http://tug.org/begin.html} 寻找引导性的资源。
+请访问 \url{https://tug.org/begin.html} 寻找引导性的资源。
这里是一些你可能会考虑安装的其他工具的链接。
\begin{description}
\item[Ghostscript] \url{https://ghostscript.com/}
-\item[Perl] \url{http://www.perl.org/} 与 CPAN 中的补充包,
- \url{http://www.cpan.org/}
-\item[ImageMagick] \url{http://www.imagemagick.com}, 用于图形处理和转换
-\item[NetPBM] \url{http://netpbm.sourceforge.net/}, 同样用于图形。
+\item[Perl] \url{https://perl.org/} 与 CPAN 中的补充包,
+ \url{https://cpan.org/}
+\item[ImageMagick] \url{https://imagemagick.org}, 用于图形处理和转换
+\item[NetPBM] \url{http://netpbm.sourceforge.net}, 同样用于图形。
\item[面向 \TeX\ 的编辑器] 有很广泛的选择,一般依用户个人的口味而定。这
里按字典序列出了一些 (部分是 Windows 才有的)。
\begin{itemize*}
\item \cmdname{GNU Emacs} 在 Windows 下也有原生版本,参见
- \url{http://www.gnu.org/software/emacs/emacs.html}。
+ \url{https://www.gnu.org/software/emacs/emacs.html}。
\item \cmdname{Emacs 的 Auc\TeX\ 包} 的 Windows 版本在 \CTAN\ 提供。
- AuC\TeX\ 的主页在 \url{http://www.gnu.org/software/auctex}。
+ AuC\TeX\ 的主页在 \url{https://www.gnu.org/software/auctex}。
\item \cmdname{SciTE} 在
- \url{http://www.scintilla.org/SciTE.html} 提供。
+ \url{https://www.scintilla.org/SciTE.html} 提供。
\item \cmdname{Texmaker} 是自由软件,在
- \url{http://www.xm1math.net/texmaker} 提供。
+ \url{https://www.xm1math.net/texmaker} 提供。
\item \cmdname{TeXstudio} 是 \cmdname{Texmaker} 的一个
- fork,引入了额外的功能;\url{http://texstudio.org}。
+ fork,引入了额外的功能;\url{https://texstudio.org}。
\item \cmdname{TeXnicCenter} 是自由软件,在
- \url{http://www.texniccenter.org} 提供,也随 pro\TeX{}t
+ \url{https://www.texniccenter.org} 提供,也随 pro\TeX{}t
发行版附带。
- \item \cmdname{TeXworks} 是自由软件,在 \url{http://tug.org/texworks} 提供,也
+ \item \cmdname{TeXworks} 是自由软件,在 \url{https://tug.org/texworks} 提供,也
作为 \TL{} 的一部分只在 Windows 被安装。
\item \cmdname{Vim} 是自由软件,在
- \url{http://www.vim.org} 提供。
+ \url{https://www.vim.org} 提供。
\item \cmdname{WinEdt} 是共享软件,在
- \url{http://tug.org/winedt} 或 \url{http://www.winedt.com} 提供。
- \item \cmdname{WinShell} 在 \url{http://www.winshell.de} 提供。
+ \url{https://tug.org/winedt} 或 \url{https://www.winedt.com} 提供。
+ \item \cmdname{WinShell} 在 \url{https://www.winshell.de} 提供。
\end{itemize*}
\end{description}
-关于这类软件包和程序,\url{http://tug.org/interest.html} 有一份更长的列表。
+关于这类软件包和程序,\url{https://tug.org/interest.html} 有一份更长的列表。
\section{特殊安装}
@@ -1313,18 +1317,19 @@
惯了原有的界面,我们仍然发行和维护 \prog{texconfig},现在但我们建议使用
\prog{tlmgr}。
-\subsection{\cmdname{tlmgr} 当前的 \GUI{} 界面}
+\subsection{\cmdname{tlmgr} 的 \GUI{} 界面}
\TL{} 包含多个 \prog{tlmgr} 的 \GUI{}。图~\ref{fig:tlshell} 展示了
\cmdname{tlshell},它是用 Tcl/Tk 编写的,在 Windows 和 \MacOSX{} 下直接就能用。
图~\ref{fig:tlcockpit} 展示了 \prog{tlcockpit},它需要 Java 版本~8 或者更高以及
JavaFX。这两个都是单独的安装包。
-\prog{tlmgr} 本身也可以用如下方法按 \GUI{} 模式执行 (图~\ref{fig:tlmgr-gui}):
+\prog{tlmgr} 还有一个原生的 \GUI{} 模式 (见图~\ref{fig:tlmgr-gui}):
\begin{alltt}
\Ucom{tlmgr -gui}
\end{alltt}
-\GUI\ 扩展需要 Perl/Tk,而这个模块已经不再包含在 \TL\ 的 Windows Perl 分发中了。
+但是 \GUI\ 扩展需要 Perl/Tk,而这个模块已经不再包含在 \TL\ 的 Windows Perl 分发
+中了。
\subsection{\cmdname{tlmgr} 命令行使用示例}
@@ -1358,12 +1363,12 @@
install: xetex-def
...
running mktexlsr
-mktexlsr: Updating /usr/local/texlive/2019/texmf-dist/ls-R...
+mktexlsr: Updating /usr/local/texlive/2020/texmf-dist/ls-R...
...
running fmtutil-sys --missing
...
Transcript written on xelatex.log.
-fmtutil: /usr/local/texlive/2019/texmf-var/web2c/xetex/xelatex.fmt installed.
+fmtutil: /usr/local/texlive/2020/texmf-var/web2c/xetex/xelatex.fmt installed.
\end{fverbatim}
如你所见,\prog{tlmgr} 会安装所有依赖的包,也会处理所有包括刷新文件名
@@ -1385,7 +1390,7 @@
sizes: 657941k
\end{fverbatim}
-最后也是最重要的,查阅 \url{http://tug.org/texlive/tlmgr.html}
+最后也是最重要的,查阅 \url{https://tug.org/texlive/tlmgr.html}
这里的完整文档,或者:
\begin{alltt}
\Ucom{tlmgr -help}
@@ -1400,11 +1405,9 @@
在 Windows 下,安装程序额外地做了以下一些事情:
\begin{description}
\item[菜单与快捷方式。] 在开始菜单上加入了新的`\TL{}'程序菜单,主要是一些
-\GUI{} 程序 (如 \prog{tlmgr}、\prog{texdoctk}、PS\_View (\prog{psv}),它是
-PostScript 预览程序) 和一些文档的菜单。
-\item[文件关联。] 如果启用,\prog{TeXworks}、\prog{Dviout}
-和 \prog{PS\_view} 会成为它们对应文件类型的默认程序,或者在
-这些文件类型的“用...打开”右键菜单中出现。
+\GUI{} 程序 (如 \prog{tlmgr}、\prog{texdoctk} 和一些文档的菜单。
+\item[文件关联。] 如果启用,\prog{TeXworks} 和 \prog{Dviout} 会成为它们对应文件
+类型的默认程序,或者在这些文件类型的“用...打开”右键菜单中出现。
\item[位图到 eps 转换器。] 许多位图格式会在它们的“用...打开”菜单中获得一个
\cmdname{bitmap2eps} 项目。Bitmap2eps 是一个使用 \cmdname{sam2p} 或
\cmdname{bmeps} 的简单脚本。
@@ -1430,14 +1433,6 @@
但它们不会通过环境变量和注册表设置来暴露所在的位置。它们不是完整的安装版,
也不会与任何 Perl 或 Ghostscript 系统安装程序冲突。
-\item[PS\_View。] 同时安装的还有 PS\_View,一款 \PS{} 和 PDF
-浏览器;见图~\ref{fig:psview}。
-
-\begin{figure}[tb]
-\centering \tlpng{psview}{.6\linewidth}
-\caption{PS\_View:可以获得很高的放大倍数!}\label{fig:psview}
-\end{figure}
-
\item[dviout。] 另外安装的还包括一款 DVI 预览程序 \prog{dviout}。
当你第一次使用 \cmdname{dviout} 预览文件时,因为没有安装屏幕显示字体,它
将生成字体。一段时间后,你所使用的大部分字体都将生成,随后,你将很少再看
@@ -1516,7 +1511,7 @@
你尝试处理一个包含大量字体的文档时可能会内存不足。
对 Cygwin,你可以按照 Cygwin 用户指南
-(\url{http://www.cygwin.com/cygwin-ug-net/setup-maxmem.html}) 中的办法
+(\url{https://cygwin.com/cygwin-ug-net/setup-maxmem.html}) 中的办法
增加可用内存量。
对 Windows,你必须创建一个文件,例如命名为 \code{moremem.reg},包含
@@ -1536,7 +1531,7 @@
\Webc{} 是一整套 \TeX{} 相关程序的集合:\TeX{} 本身、\MF{}、\MP{}、\BibTeX{},
等等。它是 \TL{} 的核心。\Webc{} 的主页及最新的手册等都在
-\url{http://tug.org/web2c}。
+\url{https://tug.org/web2c}。
我们简单的介绍一下它的历史:最早它是由 Tomas Rokicki 在 1987 年实现的,他开发了第一套
将 \TeX{} 系统的代码转换为 C 语言代码的系统,基于的是 Unix 下 change files
@@ -1581,11 +1576,15 @@
所有的程序都接受这些 \GNU 标准的选项:
\begin{ttdescription}
\item[-{}-help] 显示基本使用说明。
-\item[-{}-verbose] 显示详细的执行过程。
\item[-{}-version] 显示版本信息,然后退出。
\end{ttdescription}
-所有的 \Webc{} 程序均使用 \KPS{} (\url{http://tug.org/kpathsea}) 路径搜索库来查找文件,
+而大部分都接受:
+\begin{ttdescription}
+\item[-{}-verbose] 显示详细的执行过程。
+\end{ttdescription}
+
+所有的 \Webc{} 程序均使用 \KPS{} (\url{https://tug.org/kpathsea}) 路径搜索库来查找文件,
这套库结合环境变量和配置文件的
使用来优化大量 \TeX{} 文件的搜索。\Webc{} 可以在多于一套的目录树下执行查找,这可以方
便维护类似 \TeX{} 标准发行版和本地版本的扩展这样两套目录树。为了优化搜索的速度,每个目
@@ -1651,31 +1650,40 @@
\subsubsection{配置文件}
\KPS{} 读入\emph{运行时配置文件} \file{texmf.cnf} 来获得搜索路径和其他定义。
-而这个 \file{texmf.cnf} 存放的路径则是在 \envname{TEXMFCNF} 变量里定义的,
-但我们不建议设置这个 (或者任何) 环境变量。
+我们用 \envname{TEXMFCNF} 搜索路径来查找这些文件,但我们不建议设置这个 (或者任
+何) 环境变量来替代系统路径。
-作为代替,标准的安装将产生文件 \file{.../2019/texmf.cnf}。如果你必须修改缺省
+作为代替,标准的安装将产生文件 \file{.../2020/texmf.cnf}。如果你必须修改缺省
值 (一般不需要),这是修改的地方。主配置文件是
-\file{.../2019/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
+\file{.../2020/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
新后会丢失修改。
+此外,如果只希望把一个个人目录加入特定的搜索路径,设置环境变量是合理的:
+\begin{verbatim}
+ TEXINPUTS=.:/my/macro/dir:
+\end{verbatim}
+为保证这个设计可以一直被维护和兼容,在末尾加入一个 \samp{:} (Windows 下用 \samp{;})
+来加入系统路径,而不是完全替代系统路径 (参见第~\ref{sec:default-expansion}~节)。
+另一个选项是使用 \envname{TEXMFHOME} 树 (参见第~\ref{sec:directories}~节)。
+
搜索路径里\emph{所有的} \file{texmf.cnf} 文件都会被读入,而先读入的优先级更高。
比如搜索路径是 \verb|.:$TEXMF|,那么文件 \file{./texmf.cnf} 里面的值要比
\verb|$TEXMF/texmf.cnf| 里边的优先。
\begin{itemize*}
\item
- 以 \code{\%} 表示单行注释。
+ 以 \code{\%},要么在行首,要么在空白后面,表示单行注释。
\item
忽略空行。
\item
行末的 \bs{} 作为连接符,即把下一行直接接上。但保留下一行行首的空白。
\item
- 所有剩余的行格式如下:
-\begin{alltt}
- \var{variable}[.\var{progname}] [=] \var{value}
-\end{alltt}%
- \samp{=} 号和空白都是可选的。
+ 所有剩余的行格式如下:\\
+ \hspace*{2em}\texttt{\var{variable} \textrm{[}.\var{progname}\textrm{]}
+ \textrm{[}=\textrm{]} \var{value}}\\[1pt]
+ \samp{=} 号和空白都是可选的。
+ (但如果 \var{value} 以 \samp{.} 起始,最好的办法是用 \samp{=} 来避免 \samp{.}
+ 被识别为程序名称。)
\item
\ttvar{variable} (变量) 允许包含任何字符,除空白、\samp{=}、\samp{.}
之外。不过只用 \samp{A-Za-z\_} 是最保险的。
@@ -1683,11 +1691,17 @@
如果 \samp{.\var{progname}} (程序名) 存在,则该定义只对正在运行的名叫
\texttt{\var{progname}} 或 \texttt{\var{progname}.exe}
的程序起作用。这可以让给不同种类的 \TeX{} 程序设置不同的搜索路径。
-\item \var{value} (值) 允许任何 \code{\%} 与 \samp{@} 之外的字符出现。
- 不支持在等号右侧使用 \code{\$\var{var}.\var{prog}} 这样的写法。
- 如果在 Unix 下,\var{value} 中的 \samp{;}\ 字符会被转换为
- \samp{:}。如果你希望让 Unix, MS-DOS 和 Windows 里都用同一个
- \file{texmf.cnf},这会很有用。
+\item 就像字符串一样,\var{value} 可以包含任何字符。但是,实际上大部分
+ \file{texmf.cnf} 的值都和路径展开有关,而因为展开会用到多种特殊字符
+ (参见第~\ref{sec:cnf-special-chars}~节),比如大括号和逗号,所以它们
+ 不能用作路径名称。
+
+ 在 Unix 下 \var{value} 里的 \samp{;} 会被转换为 \samp{:},这样同一份
+ \file{texmf.cnf} 可以同时支持 Unix 和 Windows
+ 系统。这个转换适用于任何值,不仅仅是搜索路径,不过实际上 \samp{;}
+ 也不会在其他值里用到。
+
+ \code{\$\var{var}.\var{prog}} 的功能在右侧无效,你必须多用一个变量才行。
\item
在读入所有定义后再开始展开,所以你可以引用后边才定义的变量。
\end{itemize*}
@@ -1703,7 +1717,7 @@
\subsubsection{路径展开}
\label{sec:path-expansion}
-和 Unix shell 类似,\KPS{} 能够识别搜索路径中的特殊字符。比如一个复杂的路径
+和 Unix shell 类似,\KPS{} 能够识别搜索路径中的特殊字符。比如路径
\verb+~$USER/{foo,bar}//baz+,将展开为这样的子目录:在 \texttt{\$USER}
的主目录下的 \file{foo} 或 \file{bar} 目录中,且包含 \file{baz}
文件或目录。这种展开将在下面解释。
@@ -1740,7 +1754,7 @@
大括号展开是一项有用的特性,其作用是把 \verb+v{a,b}w+ 这样的转换为
\verb+vaw:vbw+,允许嵌套使用。通过把 \code{\$TEXMF} 赋值为一个括号列表,
-可以构造出多套 \TeX{} 层级结构。例如在 \file{texmf.cnf} 里有下面的定义
+可以构造出多套 \TeX{} 层级结构。在分发的 \file{texmf.cnf} 里有下面的定义
(简化的例子):
\begin{verbatim}
TEXMF = {$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFDIST}
@@ -1752,15 +1766,12 @@
%$
的时候,检查完当前目录后,依次检查的路径是
\code{\$TEXMFVAR/tex}, \code{\$TEXMF/tex}, \code{\$TEXMFLOCAL/tex}
-和 \code{\$TEXMF/tex} (后两个只在 \file{ls-R} 数据库中搜索)。这样维护
-两套并行的 \TeX{} 结构就很方便的,一套是``固定 (frozen)''的 (比如放在 \CD\ 上)
-而另一套是在新版本出现时就更新的。因为所有的定义里都用到了 \code{\$TEXMF},
-所以你可以确信时常更新的那个版本肯定是先被找到的。
+和 \code{\$TEXMFDIST/tex} (后两个只在 \file{ls-R} 数据库中搜索)。
\subsubsection{子目录展开}
\label{sec:subdirectory-expansion}
-在路径元素里的目录名称 \var{d} 后面接连使用两个或更多连续的斜杠,表示 \var{d} 的
+在路径元素里的目录名称 \var{d} 后面接连使用两个或更多连续的斜杠,表示 \var{d\/} 的
所有子目录:首先是直接处于 \var{d} 下的那些,然后是这些子目录的子目录,依此类推。
每层的目录出现的顺序是\emph{不一定}的。
@@ -1771,35 +1782,42 @@
可以在单个路径元素里使用多个 \samp{//},但出现在路径开头的 \samp{//}
将被忽略。
-\subsubsection{特殊字符与其意义:简要说明}
+\subsubsection{\file{texmf.cnf} 文件中的特殊字符简要说明}
+\label{sec:cnf-special-chars}
-下面的列表总结了 \KPS{} 配置文件中出现的特殊字符:
+下面的列表总结了 \KPS{} 配置文件中出现的特殊字符和构成:
% need a wider space for the item labels here.
\newcommand{\CODE}[1]{\makebox[3em][l]{\code{#1}}}
\begin{ttdescription}
-\item[\CODE{:}] 路径分隔符,在路径的前边或者末尾时表示默认的展开方式。\par
+\item[\CODE{:}] 路径分隔符,在路径的前边或者末尾,或者在中间重复出现时,
+表示默认的展开方式。\par
\item[\CODE{;}] 非 Unix 系统下的路径分隔符 (和 \code{:} 功能一样)。
\item[\CODE{\$}] 变量展开。
\item[\CODE{\string~}] 表示用户的个人主目录。
\item[\CODE{\char`\{...\char`\}}] Brace expansion.
+\item[\CODE{,}] 在路径展开时分隔项目。
\item[\CODE{//}] 子目录展开 (可以出现在除路径开头外的任意位置)。
\item[\CODE{\%}] 注释的起始。
-\item[\CODE{\bs}] 连接下一行的字符 (以支持跨行的设置项)。
+\item[\CODE{\bs}] 在行末连接下一行的字符,以支持跨行的设置项。
\item[\CODE{!!}] \emph{只}在数据库中搜索文件,\emph{不}搜寻磁盘。
\end{ttdescription}
+具体哪一个字符会被视为特殊字符还是不会,取决于它使用的上下文。这些规则在配置文件
+的多层的解析过程中都会体现 (包括解析、展开、搜索,\ldots),所以不能简短地说明。
+也没有通用的转义方法,尤其 \samp{\bs} 不是 \file{texmf.cnf} 文件中的“转义字符”。
+
+在选择安装使用的目录名时,避免使用这些字符里的任何一个最为保险。
\subsection{文件名数据库}
\label{sec:filename-database}
-\KPS{} 使用了一些方法来减少搜索时的磁盘访问次数。尽管如此,如果安装的文件足够多,在各
-个可能的目录下搜索某个文件仍然可能花上很长时间 (尤其是在必须遍历数百个字体目录的时候)。
-因此,\KPS{} 使用一个专门构建的纯文本``数据库''文件,这个文件叫做 \file{ls-R},它将
+\KPS{} 使用了一些方法来减少搜索时的磁盘访问次数。尽管如此,在 \TL{} 的标准安装,
+或者安装的文件足够多,在各个可能的目录下搜索某个文件仍然可能花上很长时间。因此,
+\KPS{} 使用一个专门构建的纯文本``数据库''文件,这个文件叫做 \file{ls-R},它将
文件和目录进行映射,避免对磁盘的大量搜索。
-第二个数据库 \file{aliases} 允许你给 \file{ls-R} 中的文件指定其他的名字。有助于
-帮助源文件符合 DOS 8.3 命名规范。
+第二个数据库 \file{aliases} 允许你给 \file{ls-R} 中的文件指定其他的名字。
\subsubsection{文件名数据库}
\label{sec:ls-R}
@@ -1850,7 +1868,7 @@
将查找的文件格式设置为 \ttvar{name}。默认情况下是通过文件名来猜测格式的。对于扩展名
有二义性的格式,比如 \MP{} 支持文件和 \cmdname{dvips} 配置文件,必须以 \KPS{} 已知
的名称指定格式,比如 \texttt{tex} 或 \texttt{enc files}。运行
- \texttt{kpsewhich -{}-help} 会显示格式的列表。
+ \texttt{kpsewhich -{}-help-formats} 会显示格式的列表。
\item[\texttt{-{}-mode=\var{string}}]\mbox{}\\
设置模式为 \ttvar{string},只影响 \samp{gf} 和 \samp{pk}
@@ -2123,9 +2141,41 @@
\texttt{hash\_extra} 是 \texttt{50000}。
\end{ttdescription}
-\noindent 当然,这项功能并非真正的动态内存和数组分配的替代,但考虑到动态分配在现在的 \TeX{}
+\noindent 这项功能并非真正的动态内存和数组分配的替代,但考虑到动态分配在现在的 \TeX{}
太难实现,才通过这些选项提供了一些灵活性。
+\htmlanchor{texmfdotdir}
+\subsection{\texttt{\$TEXMFDOTDIR}}
+\label{sec:texmfdotdir}
+
+在上述许多地方,我们使用了多个以 \code{.} 起始的搜索路径,以优先搜索当前路径,
+比如
+\begin{alltt}\small
+TEXINPUTS=.;$TEXMF/tex//
+\end{alltt}
+
+这是一种简化。我们在 \TL{} 分发的 \code{texmf.cnf} 文件使用的是
+\filename{$TEXMFDOTDIR} 而不是直接用 \samp{.},比如:
+\begin{alltt}\small
+TEXINPUTS=$TEXMFDOTDIR;$TEXMF/tex//
+\end{alltt}
+
+(在分发的文件中,第二个路径元素也比 \filename{$TEXMF/tex//} 稍微复杂一点。但
+差别不大;而且我们这里讨论的是 \filename{$TEXMFDOTDIR} 功能。)
+
+在路径定义中使用 \filename{$TEXMFDOTDIR} 而不是直接用 \samp{.} 的原因是让它可以
+被重新定义。比如一份复杂的文档可能由来自多个子目录的源文件组成。要支持这种情况
+你可以把 \filename{TEXMFDOTDIR} 设置为 \filename{.//},这样这些子目录就都会被
+搜索到。(警告:不要默认使用 \filename{.//};这个做法一般不常用,而且搜索任意文档
+的所有子目录有可能不够安全。)
+
+另一个例子是你可能完全不希望搜索当前路径,比如你安排所有的文件都通过具体的路径
+找到。那样你可以把 \filename{$TEXMFDOTDIR} 设置为如 \filename{/nonesuch} 这样
+不存在的目录。
+
+在我们的 \filename{texmf.cnf} 里设置的 \filename{$TEXMFDOTDIR} 的默认值就是
+\samp{.}。
+
\section{致谢}
\TL{} 是在几乎所有 \TeX{} 用户组织的协力下完成的。这个版本由 Karl Berry
@@ -2136,10 +2186,11 @@
\item 英国、德国、荷兰和波兰的 \TeX{} 用户组织
(分别为 TUG, DANTE e.V., NTG, 和 GUST),他们为所在
地区的 \TeX{} 社群提供了必备的技术和管理基础设施。请加入本地的 \TeX 用户组织!
-(参见 \url{http://tug.org/usergroups.html}。)
+(参见 \url{https://tug.org/usergroups.html}。)
-\item CTAN 团队,值得一提的是 Robin Fairbairns 和 Rainer Sch\"opf。他们负
-责分发 \TL{} 光盘镜像,为软件包更新提供支撑,\TL{} 正是基于这些软件包构建的。
+\item CTAN 团队 (\url{https://ctan.org}),值得一提的是 Robin Fairbairns 和
+Rainer Sch\"opf。他们负责分发 \TL{} 光盘镜像,为软件包更新提供支撑,\TL{} 正是
+基于这些软件包构建的。
\item Nelson Beebe,他为 \TL\ 提供了许多平台,自己也进行了详尽的测试,并在参考
文献上有无与伦比的贡献。
@@ -2162,14 +2213,16 @@
版本,年复一年。Eitan 于 2009 年 6 月过早地离开了我们,我们希望把这份文档
献给它,以志纪念。
-\item Hans Hagen,他对 \ConTeXt\ 宏包 (\url{http://pragma-ade.com}) 做了
-许多测试和修改,使之能够包含在 \TL{} 的框架下。
+\item Hans Hagen,他对 \ConTeXt\ 宏包 (\url{https://pragma-ade.com}) 做了
+许多测试和修改,使之能够包含在 \TL{} 的框架下,并持续推进 \TeX\ 的开发。
\item \Thanh, Martin Schr\"oder,和 pdf\TeX\ 团队,他们持续不断地改进 \TeX\
的功能。
\item Hartmut Henkel,他对 pdf\TeX\, Lua\TeX 等程序的开发起到了重要的贡献。
+\item Shunshaku Hirata,起始开发和坚持维护 DVIPDFM$x$。
+
\item Taco Hoekwater,他对 \MP{} 和 (Lua)\TeX\ (\url{http://luatex.org})
重要的开发使之焕发新的活力。他还参与了将 \ConTeXt\ 融入 \TL{}、给
Kpathsea 添加多线程功能,等等许多工作。
@@ -2187,7 +2240,9 @@
\item Jonathan Kew,他开发了非凡的 Xe\TeX{} 引擎并花了大量时间和精力集成到
\TL{} 中。以及 Mac\TeX 安装程序的早期版本,还有我们推荐的前端 \TeX{}works。
-\item Dick Koch 他维护了 Mac\TeX\ (\url{http://tug.org/mactex}) 这个和
+\item Hironori Kitagawa,对 p\TeX\ 和相关的支持进行了大量的工作。
+
+\item Dick Koch,他维护了 Mac\TeX\ (\url{https://tug.org/mactex}) 这个和
\TL{} 联系非常紧密的发行版本。
\item Reinhard Kotucha,他对 \TL{} 2008 的基础架构和安装程序起到了重要贡献,
@@ -2196,6 +2251,8 @@
\item Siep Kroonenberg,也因为他对 \TL{} 2008 基础架构和安装程序的重要贡献,
尤其是在 Windows 上。他还花了大量的时间更新手册,介绍了这些特性。
+\item Clerk Ma,对引擎的 bug 修正和扩展。
+
\item Mojca Miklavec, 为她在 \ConTeXt\ 上的工作、编译大量二进制文件和很多
其他的工作。
@@ -2203,6 +2260,9 @@
巨大的 \pkgname{pst-geo} 数据文件使我们得以包含它们,最重要的还是因为他在
\pkgname{hyperref} 宏包上优秀的工作。
+\item Phelype Oleinik,对 2020 年在多个引擎上实现组分隔的 \cs{input} 命令,以及
+更多的工作。
+
\item Petr Ol\v{s}ak,他非常认真地协调和检查所有的捷克语和斯洛伐克语资料。
\item Toshio Oshima,他提供了 Windows 下的 \cmdname{dviout} 预览工具。
@@ -2220,6 +2280,8 @@
\item Luigi Scarso,他坚持开发 MetaPost, Lua\TeX 等等许多。
+\item Andreas Scherer,他开发了 \texttt{cwebbin},\TL{} 使用的 CWEB 实现。
+
\item Tomasz Trzeciak,他为 Windows 开发提供了广泛的帮助。
\item Vladimir Volovich,他很大地帮助解决了许多移植和维护的问题,尤其是令我们能够
@@ -2235,6 +2297,10 @@
\item Graham Williams,他是 \TeX\ Catalogue 的发起者。
+\item Joseph Wright,他为让多个引擎获得相同的 primitive 功能进行了大量的工作。
+
+\item Hironobu Yamashita,对 p\TeX\ 和相关的支持进行了大量的工作。
+
\end{itemize*}
二进制版本的编译者:
@@ -2251,7 +2317,7 @@
\pkgname{i386-solaris}, \pkgname{x86\_64-solaris},
\pkgname{sparc-solaris}),
Norbert Preining (\pkgname{x86\_64-linux}).
-关于 \TL{} 编译进程的信息,请查阅 \url{http://tug.org/texlive/build.html}。
+关于 \TL{} 编译进程的信息,请查阅 \url{https://tug.org/texlive/build.html}。
这份手册的翻译者:
Denis Bitouzé \& Patrick Bideault (法语),
@@ -2263,7 +2329,7 @@
Boris Veytsman (俄语),
Zofia Walczak (波兰语),
Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
-\url{http://tug.org/texlive/doc.html}。
+\url{https://tug.org/texlive/doc.html}。
当然,最重要的感谢应该致予 Donald Knuth,感谢他发明了 \TeX,也感谢他将
\TeX\ 赠与全世界。
@@ -2276,7 +2342,7 @@
1993 年末荷兰 \TeX{} 用户组开始为 MS-DOS 用户开发 4All\TeX{} \CD{} 时,
我们就开始了相关的讨论,并希望在此时为所有的操作系统提供一个单一的、合理的 \CD{}。当时
那是一个过于宏伟的目标,但的确滋生了非常成功的 4All\TeX{} \CD{},同时 TUG
-技术委员会工作组也开始设计 \emph{\TeX{} 目录结构} (\url{http://tug.org/tds}),
+技术委员会工作组也开始设计 \emph{\TeX{} 目录结构} (\url{https://tug.org/tds}),
以指明如何创建一套一致而可控的集合,囊括所有 \TeX{} 相关的文件。\TDS{} 的完整草案在 1995
年 12 月的 \textsl{TUGboat} 上出版,并初步确定期望的产品将是在 \CD{} 上出现的范例
结构。你现在使用的这个发行版正是工作组审议的直接结果。4All\TeX{} \CD{} 的成功也说明
@@ -2295,8 +2361,9 @@
在第 5 版 (2000 年 3 月) 中检查并修正了 \CD{} 的许多部分,更新了数百个软件包。软件
包的详细说明现在存放在 XML 文件中。不过 \TeX\ Live 5 的首要变化还是移除了所有的非自由软
-件。\TL{} 的所有部分现在都在向 Debian Free Software Guidelines 兼容的方向改进,
-我们尽最大努力检查了所有软件包的授权协议,欢迎为我们指出错误。
+件。\TL{} 的所有部分现在都在向 Debian Free Software Guidelines
+(\url{https://debian.org/intro/free}) 兼容的方向改进,我们尽最大努力检查了所有软
+件包的授权协议,欢迎为我们指出错误。
第 6 版 (2001 年 7 月) 更新了许多内容。最重大的一项是新的安装形式,用户可以更精确
地选择所需的软件集合。与语言相关的集合也重新组织过了,这样一来,选定某个语言集合时会自
@@ -2350,7 +2417,7 @@
目录下搜索,根据 \envname{ENCFONTS} 变量中的路径设置。如果遇到有问题的文
件,\cmdname{updmap} 会提出警告。
-关于这种搜索方式的其他信息,请参见 \url{http://tug.org/texlive/mapenc.html}。
+关于这种搜索方式的其他信息,请参见 \url{https://tug.org/texlive/mapenc.html}。
\item 因为有人可能更愿意使用 \MIKTEX\ 而非 \Webc{} 系统,\TK\
现在包含了一套基于 \MIKTEX\ 的可安装 \CD,参见第~\ref{sec:overview-tl}~节
@@ -2424,11 +2491,11 @@
\optname{-enc} 参数启用这一支持 \Dash \emph{前提是构建好了格式文件}。enc\TeX\
提供了对输入输出通用的重新编码功能,实现对 Unicode (以 UTF-8 编码的形式)
的完整支持。参见 \OnCD{texmf-dist/doc/generic/enctex/} 和
-\url{http://www.olsak.net/enctex.html}。
+\url{http://olsak.net/enctex.html}。
\item 提供了 Aleph 这套新的 \TeX{} 引擎,它将 \eTeX\ 和 \OMEGA\ 合并到了一起。
关于 Aleph 的部分信息可以在 \OnCD{texmf-dist/doc/aleph/base}
-和 \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=aleph} 找到。Aleph
+和 \url{https://texfaq.org/FAQ-enginedev} 找到。Aleph
的 \LaTeX 格式文件称做 \textsf{lamed}。
\item 最新发布的 \LaTeX\ 包含了是新版的 LPPL 授权协议\Dash 这一协议已被
@@ -2436,12 +2503,12 @@
\filename{ltnews} 文件。
\item 包含了一个叫做 \cmdname{dvipng} 的新程序,用于将 DVI 转换为
-PNG 图像文件。参见 \url{http://www.ctan.org/pkg/dvipng}。
+PNG 图像文件。参见 \url{https://ctan.org/pkg/dvipng}。
\item 我们在作者 (Claudio Beccari) 的同意下,将 \pkgname{cbgreek} 包含的
字体数量减少到中等。去除了不可见、轮廓和透明版本的字体,这些字体几乎很少用到。而我们
的光盘镜像需要空间。完整版本当然还是在 CTAN 提供
-(\url{http://mirror.ctan.org/tex-archive/fonts/greek/cbfonts})。
+(\url{https://ctan.org/pkg/cbgreek-complete})。
\item 去掉了 \cmdname{oxdvi},改为只使用 \cmdname{xdvi}。
@@ -2518,11 +2585,11 @@
\subsubsection{2006--2007}
2006--2007 年,\TL{} 的一个重大变化是增加了 \XeTeX{},以 \texttt{xetex} 和
-\texttt{xelatex} 程序的形式提供。请参见 \url{http://scripts.sil.org/xetex}。
+\texttt{xelatex} 程序的形式提供。请参见 \url{https://scripts.sil.org/xetex}。
\MP{} 也有可观的更新,并计划在未来实现更多的改进
-(\url{http://tug.org/metapost/articles}),pdf\TeX{} 同样如此
-(\url{http://tug.org/applications/pdftex})。
+(\url{https://tug.org/metapost/articles}),pdf\TeX{} 同样如此
+(\url{https://tug.org/applications/pdftex})。
\TeX\ \filename{.fmt} (缓存格式) 文件和用于 MetaPost 和 \MF\ 的类似文件
现在存储在 \dirname{texmf/web2c} 的子目录中而不直接放在 \dirname{texmf/web2c}
@@ -2536,14 +2603,14 @@
仍然读取 \texttt{\%\&} 开头的行。)
当然,和往常一样,这一年里你能看到成百上千的宏包与程序得到更新。也和往常一样,
-进一步的更新请使用 CTAN (\url{http://mirror.ctan.org})。
+进一步的更新请使用 CTAN (\url{https://ctan.org})。
从内部角度上看,源代码树现在改为使用 Subversion 管理,并在我们的主页上提供了
到 Web 界面的链接,用于浏览代码树。我们希望它能成为未来几年中稳定的开发
平台。
末了,2006 年五月 Thomas Esser 宣布他将停止 te\TeX{}
-(\url{http://tug.org/tetex}) 的更新。这样一来,大家对 \TL{} 的兴趣大增,尤其是在
+(\url{https://tug.org/tetex}) 的更新。这样一来,大家对 \TL{} 的兴趣大增,尤其是在
\GNU/Linux 发行版中。(\TL{} 提供了一套新的 \texttt{tetex} 安装方案,
几乎和原有的 te\TeX{} 毫无二致。) 我们希望这些变化将最终转换为对整个 \TeX\
环境的改进,从而每个人都会受益。
@@ -2592,7 +2659,7 @@
升级。
最终 Donald Knuth 在他的 `\TeX\ tuneup of 2008' 中的更新也被包含在这次
-发布中。参见 \url{http://tug.org/TUGboat/Articles/tb29-2/tb92knut.pdf}。
+发布中。参见 \url{https://tug.org/TUGboat/Articles/tb29-2/tb92knut.pdf}。
\subsubsection{2009}
@@ -2607,18 +2674,18 @@
包含了新版本的 AMS \TypeI\ 字体,包括 Computer Modern:其中部分字形
随 Knuth 多年以来修改的 MetaFont 源代码更新,hinting 信息也更新了。
Euler 字体也整个由 Hermann Zapf 重新绘制了一遍 (参见
-\url{http://tug.org/TUGboat/Articles/tb29-2/tb92hagen-euler.pdf})。
+\url{https://tug.org/TUGboat/Articles/tb29-2/tb92hagen-euler.pdf})。
不过上述变化并没有改变字体的 metrics 文件。AMS 字体的主页在
-\url{http://www.ams.org/tex/amsfonts.html}。
+\url{https://www.ams.org/tex/amsfonts.html}。
现在 Windows 和 Mac\TeX\ 都包含了新的 \GUI{} 前端 \TeX{}works。至于其他
-的平台和更多的信息,请参见 \TeX{}works 的主页,\url{http://tug.org/texworks}。
+的平台和更多的信息,请参见 \TeX{}works 的主页,\url{https://tug.org/texworks}。
设计这个跨平台前端的灵感来自于 \MacOSX\ 下的 TeXShop 编辑器,目标就是
易用。
在许多平台下包含了 Asymptote 图形程序,它实现了一套与 MetaPost 约略
相似的文本图形描述语言,但包含了先进的 3D 支持等其他特性。它的主页在
-\url{http://asymptote.sourceforge.net}。
+\url{https://asymptote.sourceforge.net}。
单独的 \code{dvipdfm} 程序已被 \code{dvipdfmx} 所替代,如果以 \code{dvipdfm}
这个名字调用的时候,后者会以一种特殊的兼容性模式运行。\code{dvipdfmx}
@@ -2630,7 +2697,7 @@
另外这也是因为要编译出能在多种版本下都工作的二进制程序有些困难。
一些更不起眼的更新:我们现在使用 \pkgname{xz} 这套稳定的压缩方式来替代
-原有的 \pkgname{lzma} (\url{http://tukaani.org/xz/});在不和现有变量名
+原有的 \pkgname{lzma} (\url{https://tukaani.org/xz/});在不和现有变量名
冲突的情况下允许文件中使用 |$| 字符;Kpathsea 库现在支持多线程了 (其中
用到了 MetaPost);整个 \TL{} 的编译现在基于 Automake 了。
@@ -2650,7 +2717,7 @@
的 PDF 文件,但你也可以将 |\newcommand{\DoNotLoadEpstopdf}{}| (或
|\def...|) 放在 \cs{documentclass} 声明前以避免载入 \code{epstopdf}。
如果使用了 \pkgname{pst-pdf} 宏包,也不会载入它。要了解更多的细节,参
-见 \pkgname{epstopdf} 宏包的文档 (\url{http://ctan.org/pkg/epstopdf-pkg})。
+见 \pkgname{epstopdf} 宏包的文档 (\url{https://ctan.org/pkg/epstopdf-pkg})。
一个相关的变化是通过 \cs{write18} 特性从 \TeX\ 执行少量外部命令,现在
默认启用了。这些命令是 \code{repstopdf}, \code{makeindex}, \code{kpsewhich},
@@ -2673,16 +2740,16 @@
包含了这些新的程序:用于排版日文的 p\TeX\ 引擎和相关实用工具;支持了
Unicode \BibTeX\ 的 \BibTeX{}U 程序;\prog{chktex} 实用工具
-(\url{http://baruch.ev-en.org/proj/chktex})
+(\url{https://baruch.ev-en.org/proj/chktex})
用来检查 \AllTeX\ 文档;\prog{dvisvgm}
-(\url{http://dvisvgm.sourceforge.net}) 是 DVI 到 SVG 格式转换器。
+(\url{https://dvisvgm.de}) 是 DVI 到 SVG 格式转换器。
现在包含了这些新平台的可执行文件:\code{amd64-freebsd},
\code{amd64-kfreebsd}, \code{i386-freebsd}, \code{i386-kfreebsd},
\code{x86\_64-darwin}, \code{x86\_64-solaris}。
我们忘记注明的一个 \TL{} 2009 的修改是:许多 \TeX4ht 相关的可执行文件
-(\url{http://tug.org/tex4ht}) 被从二进制目录删除了。通用的 \code{mk4ht}
+(\url{https://tug.org/tex4ht}) 被从二进制目录删除了。通用的 \code{mk4ht}
程序可以用来运行这些 \code{tex4ht} 组合的任意一种。
最后,\TK\ \DVD\ 上的 \TL{} 发行不能再直接执行了 (听起来很奇怪)。
@@ -2767,7 +2834,7 @@
\cmdname{tlmgr}: 新的 \code{pinning} 操作以方便配置多个仓库;参见
\verb|tlmgr --help| 的对应章节,或者在线的
-\url{http://tug.org/texlive/doc/tlmgr.html#MULTIPLE-REPOSITORIES}。
+\url{https://tug.org/texlive/doc/tlmgr.html#MULTIPLE-REPOSITORIES}。
平台: \pkgname{armhf-linux}, \pkgname{mips-irix}, \pkgname{i386-netbsd}, 和
\pkgname{amd64-netbsd} 被重新加入;\pkgname{powerpc-aix} 被去除。
@@ -2784,10 +2851,10 @@
\cs{pdffakespace},它们可以帮助 PDF 文本重新排版 (reflowing),
Lua\TeX: 对于字体载入和断字 (hyphenation) 有明显的变化和修正。最大的增加时一个新
-的引擎,\code{luajittex} (\url{http://foundry.supelec.fr/projects/luajittex}) 和
-它的相关变体 \code{texluajit} 和 \code{texluajitc}。它使用的是一个即时编译的 Lua
-编译器 (在 \textsl{TUGboat} 文章 \url{http://tug.org/TUGboat/tb34-1/tb106scarso.pdf} 有详
-细介绍)。\code{luajittex} 还在开发中,所以并没有在所有平台提供,也比 \code{luatex}
+的引擎,\code{luajittex} 和它的相关变体 \code{texluajit} 和 \code{texluajitc}。
+它使用的是一个即时编译的 Lua 编译器 (在 \textsl{TUGboat} 文章
+\url{https://tug.org/TUGboat/tb34-1/tb106scarso.pdf} 有详细介绍)。\code{luajittex}
+还在开发中,所以并没有在所有平台提供,也比 \code{luatex}
要不稳定许多。我们及其作者都不建议使用它,除非为了试验 Lua 代码的即时编译 (JIT)
这样特殊的目的。
@@ -2854,14 +2921,14 @@
平台:\pkgname{*-kfreebsd} 被去除了,因为 \TeX\ Live 现在在这个平台下通过系统自
带的安装方式已经很容易获取了。
-部分额外平台提供了定制二进制包 (\url{http://tug.org/texlive/custom-bin.html})。
+部分额外平台提供了定制二进制包 (\url{https://tug.org/texlive/custom-bin.html})。
此外,为节省空间部分平台现在没有在 \DVD\ 中提供,但可以通过网络安装。
\subsubsection{2016}
Lua\TeX: 原生命令有大量改变,包括重命名和去除,还有一些节点结构的重整。这些修改
在 Han Hagen 的“Lua\TeX\ 0.90 对于 PDF 的后端改变及更多”
-(\url{http://tug.org/TUGboat/tb37-1/tb115hagen-pdf.pdf}) 一文中有详细的总结。如
+(\url{https://tug.org/TUGboat/tb37-1/tb115hagen-pdf.pdf}) 一文中有详细的总结。如
果要了解更多细节,参见 Lua\TeX\ 手册,
\OnCD{texmf-dist/doc/luatex/base/luatex.pdf}。
@@ -2905,8 +2972,8 @@
字体的用户提供了新的 \code{cjk-gs-integrate} 脚本。
基础架构:支持系统级别的 \code{tlmgr} 配置文件;校验包的完整性;如果有 GPG 还会
-校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。
-(如果没有 GPG 则跳过这一步。)
+校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。如果没有 GPG 则跳过
+这一步。
平台:\code{alpha-linux} 和 \code{mipsel-linux} 被移除了。
@@ -2946,7 +3013,7 @@
(\code{updmap-sys}, \code{fmtutil-sys}, 或者 \code{-sys} 选项),还是用
户模式 (\code{updmap-user}, \code{fmtutil-user}, 或者 \code{-user} 选项)
的时候会给出警告。这是为了减少常见的不小心启用用户模式而导致系统更新无法
-生效。细节请参见 \url{http://tug.org/texlive/scripts-sys-user.html}。
+生效。细节请参见 \url{https://tug.org/texlive/scripts-sys-user.html}。
\code{install-tl}: Mac 下的个人路径,比如 \envname{TEXMFHOME},现在默认设置为和
Mac\TeX\ 一样的 (|~/Library/...|)。增加了新选项 \code{-init-from-profile}
@@ -2968,13 +3035,13 @@
Kpathsea: 对于非系统目录缺省进行大小写不敏感的文件名匹配;可以通过设置
\code{texmf.cnf} 或者将 \code{texmf\_casefold\_search} 环境变量设置为~\code{0}
-来禁用。详细信息见 Kpathsea 手册 (\url{http://tug.org/kpathsea})。
+来禁用。详细信息见 Kpathsea 手册 (\url{https://tug.org/kpathsea})。
ep\TeX, eup\TeX: 新的原语 \cs{epTeXversion}。
Lua\TeX: 准备在 2019 年升级到 Lua 5.3: 大部分平台下都提供了一个
\code{luatex53} 程序,但必须被改名为 \code{luatex} 才能使用。或者使用
-\ConTeXt\ Garden (\url{http://wiki.contextgarden.net}) 的文件;那里有
+\ConTeXt\ Garden (\url{https://wiki.contextgarden.net}) 的文件;那里有
更多的信息。
MetaPost: 对错误的路径方向、TFM 和 PNG 输出的修正。
@@ -3009,9 +3076,7 @@
\item Windows: 不再支持 XP。
\end{itemize*}
-\htmlanchor{news}
-\subsection{当前版本:2019}
-\label{sec:tlcurrent}
+\subsection{2019}
Kpathsea: 更一致的括号展开和路径拆分;用来替代 \code{.} 的 \code{TEXMFDOTDIR}
新变量,以方便子目录搜索 (见 \code{texmf.cnf} 中的注释)。
@@ -3066,17 +3131,75 @@
平台支持:去除了 \code{sparc-solaris}。
+\htmlanchor{news}
+\subsection{当前版本:2020}
+\label{sec:tlcurrent}
+
+通用的更新: \begin{itemize}
+\item 所有 \TeX\ 引擎,包括 \texttt{tex} 的 \cs{input} 原语,现在都支持以组分隔
+的文件名参数,作为跟系统有关的扩展。标准的用空格或者标识符分隔的文件名的使用完全
+不受影响。按组分隔的参数一开始是 Lua\TeX\ 先实现的;现在它被推广到所有的引擎中了。
+ASCII 双引号字符 (\texttt{"}) 一开始会被从文件名中去掉,但在输入后不变。这个改变
+目前不会影响 \LaTeX{} 的 \cs{input} 命令,因为那是对标准 \cs{input} 原语重新定义
+的宏。
+
+\item \texttt{kpsewhich}、\texttt{tex}、\texttt{mf} 以及所有其他引擎的的
+新选项 \texttt{--cnf-line}, \texttt{tex},以支持通过命令行指定任意配置文件。
+
+\item 今年和往年对多个引擎添加的许多原语是为了让所有引擎都拥有一系列共通的功能
+(见 \textsl{\LaTeX\ News \#31}, \url{https://latex-project.org/news})。
+
+\end{itemize}
+
+ep\TeX, eup\TeX: 新的原语 \cs{Uchar}, \cs{Ucharcat},
+\cs{current(x)spacingmode}, \cs{ifincsname};更新 \cs{fontchar??} 和
+\cs{iffontchar}。只针对 eup\TeX{} 的:\cs{currentcjktoken}。
+
+Lua\TeX: 与 HarfBuzz 库的集成,作为新引擎 \texttt{luahbtex} (被用于
+\texttt{lualatex}) 和 \texttt{luajithbtex} 提供。新的原语:
+\cs{eTeXgluestretchorder}, \cs{eTeXglueshrinkorder}。
+
+pdf\TeX: 新的原语 \cs{pdfmajorversion};这个命令只改变 PDF 输出的版本号;它对
+任何 PDF 内容没有影响。\cs{pdfximage} 等类似命令现在以和 \cs{openin} 相同的方式
+来搜索图像文件了。
+
+p\TeX: 新的 \cs{ifjfont}, \cs{iftfont} 原语,它们也包含在 ep\TeX,
+up\TeX, eup\TeX\ 里。
+
+Xe\TeX: 对 \cs{Umathchardef}, \cs{XeTeXinterchartoks}, \cs{pdfsavepos} 的修正。
+
+Dvips: 位图字体的输出编码,以更好的支持复制粘贴
+(\url{https://tug.org/TUGboat/tb40-2/tb125rokicki-type3search.pdf})。
+
+Mac\TeX: Mac\TeX\ 和 \texttt{x86\_64-darwin} 现在需要 10.13 或者更新的系统
+(High~Sierra, Mojave, 和 Catalina);
+\texttt{x86\_64-darwinlegacy} 支持 10.6 和更新的系统。Mac\TeX\ 已经被公证
+(notarized) 命令行程序使用强化的运行时环境,因为 Apple 现在要求安装包必须提
+供这些。BibDesk 和 \TeX\ Live Utility 不再是 Mac\TeX\ 的一部分,因为它们没有
+被公证,但提供的 \filename{README} 文件里列出了获取它们的链接。
+
+\code{tlmgr} 和基础架构: \begin{itemize*}
+\item 在软件包无法现在时,自动重试一次。
+\item 新选项 \texttt{tlmgr check texmfdbs}, 用来检查每个目录树 \texttt{ls-R} 文件和
+\texttt{!!} 配置的一致性。
+\item 软件包容器使用带版本号的文件名,比如
+\texttt{tlnet/archive/\textsl{pkgname}.rNNN.tar.xz};对用户应该没有影响,但对于
+分发来说会是一个明显的改变。
+\item \texttt{catalogue-date} 信息不在从 \TeX~Catalogue 获得了,因为它通常和软件
+包更新没有关系。
+\end{itemize*}
+
\subsection{未来}
\TL{} 并不完美,也永远不会达到完美。我们希望继续发行新的版本,也希望提供
更多的帮助文档、更多的实用程序、更多的安装程序,当然还有更多更新的宏包与
字体,以及其他一切和 \TeX\ 有关的东西。这个工作是由志愿者在其空闲时间完成的,
-所以总有更多值得做的地方。请参见 \url{http://tug.org/texlive/contribute.html}。
+所以总有更多值得做的地方。请参见 \url{https://tug.org/texlive/contribute.html}。
请把更正、建议或者提供帮助的意愿发送到:
\begin{quote}
\email{tex-live@tug.org} \\
-\url{http://tug.org/texlive}
+\url{https://tug.org/texlive}
\end{quote}
\medskip
@@ -3110,6 +3233,6 @@
2009 年的简体中文版本由 Jiang Jiang 和 Jinsong Zhao 翻译。
-2010 到 2019 年的简体中文版本都由 Jiang Jiang 翻译。
+2010 到 2020 年的简体中文版本都由 Jiang Jiang 翻译。
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj
--- old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2019-03-21 02:24:33.000000000 +0100
+++ new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2020-03-23 01:56:48.000000000 +0100
@@ -1,9 +1,9 @@
name texlive-zh-cn.doc
category TLCore
-revision 50478
+revision 54490
shortdesc doc files of texlive-zh-cn
relocated 1
-docfiles size=292
+docfiles size=302
RELOC/doc/texlive/texlive-zh-cn/Makefile
RELOC/doc/texlive/texlive-zh-cn/README-live.ZH-CN
RELOC/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty
++++++ texlive.infra.doc.tar.xz ++++++
++++ 3595 lines of diff (skipped)
++++++ texlive.infra.tar.xz ++++++
++++ 6267 lines of diff (skipped)
++++++ texloganalyser.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texloganalyser/README new/texmf-dist/doc/support/texloganalyser/README
--- old/texmf-dist/doc/support/texloganalyser/README 2014-11-14 23:47:22.000000000 +0100
+++ new/texmf-dist/doc/support/texloganalyser/README 2020-03-24 21:54:13.000000000 +0100
@@ -1,8 +1,25 @@
-This is texloganalyser (Perl script), version 0.9
- Copyright 2006-2014 Thomas van Oudenhove
- License: BSD
+This is texloganalyser (Perl script), version 0.11
+ Copyright 2006-2020 Thomas van Oudenhove
+ License: BSD
-Usage: texloganalyser [--help|--version|-efhioprstuvw] <TeX log>
- Displays selective infos of LaTeX logs
+Usage: texloganalyser [--help|--version|-acefhilastnoprstuvw] <TeX log>
+ Displays selective infos of LaTeX logs
+
+These flags may be used:
+ a: displays number of warnings about bad boxes
+ c: displays the boxes warning by size (at the end)
+ e: displays the end of the log
+ f: outputs the LaTeX Font Infos
+ h: outputs only warnings about horizontal boxes
+ i: displays 'images' (pdf, [e]ps, png, jpg) used
+ n: displays page numbers
+ o: outputs only warnings about overfull boxes
+ p: outputs the LaTeX Packages infos
+ r: displays warnings about references
+ s: displays .sty and .cls files used
+ t: displays .tex files used
+ u: outputs only warnings about underfull boxes
+ v: outputs only warnings about vertical boxes
+ w: displays all Warnings
More documentation is available with `perldoc texloganalyser`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texloganalyser.doc.tlpobj new/tlpkg/tlpobj/texloganalyser.doc.tlpobj
--- old/tlpkg/tlpobj/texloganalyser.doc.tlpobj 2019-02-28 04:08:00.000000000 +0100
+++ new/tlpkg/tlpobj/texloganalyser.doc.tlpobj 2020-03-25 16:13:20.000000000 +0100
@@ -1,6 +1,6 @@
name texloganalyser.doc
category Package
-revision 35584
+revision 54526
shortdesc doc files of texloganalyser
docfiles size=1
texmf-dist/doc/support/texloganalyser/README
++++++ texloganalyser.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texloganalyser/texloganalyser new/texmf-dist/scripts/texloganalyser/texloganalyser
--- old/texmf-dist/scripts/texloganalyser/texloganalyser 2014-11-14 23:47:22.000000000 +0100
+++ new/texmf-dist/scripts/texloganalyser/texloganalyser 2020-03-24 21:54:13.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# This is texloganalyser, for parsing of TeX logs
-# Copyright (c) 2006-2014 Thomas van Oudenhove
+# Copyright (c) 2006-2020 Thomas van Oudenhove
# All rights reserved
# README - important notice:
@@ -38,8 +38,8 @@
use Getopt::Long;
Getopt::Long::Configure ("bundling");
-my $version = "0.9";
-my $copyright = "2006-2014";
+my $version = "0.11";
+my $copyright = "2006-2020";
my $opt = {
help => '',
version => '',
@@ -49,6 +49,7 @@
o => '',
u => '',
v => '',
+ c => '',
p => '',
f => '',
w => '',
@@ -65,6 +66,7 @@
'version' => \$opt->{version},
'last' => \$opt->{last},
'a' => \$opt->{a},
+ 'c' => \$opt->{c},
'h' => \$opt->{h},
'o' => \$opt->{o},
'u' => \$opt->{u},
@@ -105,8 +107,10 @@
sub analyze {
my $line;
+ my ($cbox, $chead);
my $output;
my $test = 0;
+ my $png = 0;
open my $source, "<", $texlog;
while (defined ($line = <$source>)) {
@@ -114,7 +118,9 @@
# default: display summary
summary($line);
# and page numbers ('n' option)
- pagenumber($line) if $opt->{n};
+ my $pn = pagenumber($line);
+ print '['.$pn.']' if ($opt->{n} and $pn);
+ $png = $pn if $pn;
if ($opt->{e}) {
if ($line =~ m/Here is how much/) {
@@ -124,7 +130,19 @@
$output .= $line if $test;
}
# look for boxes warnings
- if ($opt->{o} and $opt->{h}) {
+ if ($opt->{c} and $opt->{o} and $opt->{h}) {
+ if ($line =~ m/\\hbox/ and $line =~ m/Overfull/) {
+ $line =~ m/^Overfull \\hbox \((\d+\.\d+)pt too wide\) .*$/;
+ $cbox->{$1} = 'Page '.$png.': '.$line;
+ $chead = 'Overfull hboxes classified:';
+ }
+ } elsif ($opt->{c} and $opt->{u} and $opt->{h}) {
+ if ($line =~ m/\\hbox/ and $line =~ m/Underfull/) {
+ $line =~ m/^Underfull \\hbox \(badness (\d+)\) .*$/;
+ $cbox->{$1} = 'Page '.$png.': '.$line;
+ $chead = 'Underfull hboxes classified:';
+ }
+ } elsif ($opt->{o} and $opt->{h}) {
$output = $line if ($line =~ m/\\hbox/ and
$line =~ m/Overfull/);
} elsif ($opt->{u} and $opt->{h}) {
@@ -195,14 +213,21 @@
print "$output" if defined $output;
}
print "\n";
+ if ($opt->{c} and $opt->{h} and ($opt->{u} or $opt->{o})) {
+ print "$chead\n";
+ foreach my $key (sort {$a <=> $b} keys %{$cbox}) {
+ print $cbox->{$key};
+ }
+ print "\n";
+ }
print_abstract();
close $source;
}
sub pagenumber {
my $logline = shift;
- if ($logline =~ m/.*(\[[0-9]+)/) {
- print $1."]";
+ if ($logline =~ m/.*\[([0-9]+)(\]|$)/) {
+ return $1;
}
}
@@ -244,26 +269,28 @@
sub print_abstract {
print "The log contained ".$abstract->{warnings}." warnings";
- print " and $abstract->{badboxes} bad boxes" if $opt->{a};
- print ".\n";
+ print " and $abstract->{badboxes} bad boxes" if $opt->{a};
+ print ".\n";
}
sub printversion {
- print "This is texloganalyser, version $version\n";
+ print "This is texloganalyser (Perl script), version $version\n";
print "\t Copyright $copyright Thomas van Oudenhove\n";
+ print "\t License: BSD\n";
}
sub printhelp {
printversion();
- print "Usage: texloganalyser ".options()." <TeX log>\n";
+ print "\nUsage: texloganalyser ".options()." <TeX log>\n";
print "\t Displays selective infos of LaTeX logs\n";
- print "These flags may be used:\n";
+ print "\nThese flags may be used:\n";
print "\t a: displays number of warnings about bad boxes\n";
+ print "\t c: displays the boxes warning by size (at the end)\n";
print "\t e: displays the end of the log\n";
print "\t f: outputs the LaTeX Font Infos\n";
print "\t h: outputs only warnings about horizontal boxes\n";
print "\t i: displays 'images' (pdf, [e]ps, png, jpg) used\n";
- print "\t n: displays page numbers\n";
+ print "\t n: displays page numbers\n";
print "\t o: outputs only warnings about overfull boxes\n";
print "\t p: outputs the LaTeX Packages infos\n";
print "\t r: displays warnings about references\n";
@@ -271,8 +298,8 @@
print "\t t: displays .tex files used\n";
print "\t u: outputs only warnings about underfull boxes\n";
print "\t v: outputs only warnings about vertical boxes\n";
- print "\t w: displays all Warnings\n";
- print "You may want to have a look at `perldoc texloganalyser`.\n";
+ print "\t w: displays all Warnings\n\n";
+ print "More documentation is available with `perldoc texloganalyser`.\n";
}
__END__
@@ -288,7 +315,7 @@
=head2 SYNOPSIS
-texloganalyser [-aefhinoprstuvw] tex_log_file
+texloganalyser [-acefhinoprstuvw] tex_log_file
texloganalyser [--version]
@@ -310,6 +337,8 @@
=item B<-a>: counts number of badboxes.
+=item B<-c>: classify boxes warnings by size (needs h&o,u or v&o,u) at the end.
+
=item B<-e>: displays the end of the log, about the TeX's memory.
=item B<-f>: outputs the LaTeX Font Infos warnings and calculations.
@@ -350,10 +379,16 @@
Akim Demaille submitted a patch for 'last' option, June 2012.
+Paulo Ney de Souza had the idea of -c option to better handle hboxes, March 2020.
+
=head3 Changelog
=over
+=item v0.11: bug fix for -c option (regexp was too specific)
+
+=item v0.10: added option -c, to classify boxes warnings by size (Paulo Ney de Souza's idea).
+
=item v0.9: added option --last, if log file contains several compilations (Akim Demaille's patch).
=item v0.8: added options for page and bad boxes number (Markus Hennig's patch).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texloganalyser.tlpobj new/tlpkg/tlpobj/texloganalyser.tlpobj
--- old/tlpkg/tlpobj/texloganalyser.tlpobj 2019-02-28 04:08:00.000000000 +0100
+++ new/tlpkg/tlpobj/texloganalyser.tlpobj 2020-03-25 16:13:20.000000000 +0100
@@ -1,14 +1,13 @@
name texloganalyser
category Package
-revision 35584
+revision 54526
shortdesc Analyse TeX logs
-longdesc The perl script allows the user to extract (and display)
-longdesc elements of the log file
+longdesc This perl script allows the user to extract (and display)
+longdesc elements of the log file.
depend texloganalyser.ARCH
-runfiles size=3
+runfiles size=4
texmf-dist/scripts/texloganalyser/texloganalyser
catalogue-ctan /support/texloganalyser
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license bsd
catalogue-topics log-manip
-catalogue-version 0.9
+catalogue-version 0.11
++++++ texosquery.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texosquery/CHANGES new/texmf-dist/doc/support/texosquery/CHANGES
--- old/texmf-dist/doc/support/texosquery/CHANGES 2017-06-21 00:18:21.000000000 +0200
+++ new/texmf-dist/doc/support/texosquery/CHANGES 2020-02-04 23:21:35.000000000 +0100
@@ -1,3 +1,12 @@
+1.7 (2020/02/04):
+
+ * Renamed scratch variable to avoid conflict.
+
+ * The default version is now texosquery-jre8 since Java 7 has long
+ passed its end of life.
+
+ * Modified bash scripts to improve cygwin support.
+
1.6 (2017/06/20):
* Added new command line options:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texosquery/README.md new/texmf-dist/doc/support/texosquery/README.md
--- old/texmf-dist/doc/support/texosquery/README.md 2017-05-06 00:50:09.000000000 +0200
+++ new/texmf-dist/doc/support/texosquery/README.md 2020-02-04 23:21:35.000000000 +0100
@@ -2,6 +2,16 @@
Cross-platform Java application to query OS information designed for use in
TeX's shell escape mechanism.
+## Licence
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3
+for the details of that license.
+
+Copyright 2016-2020 Nicola Talbot
+
+## Description
+
The application can query the following:
- locale information
@@ -320,8 +330,8 @@
In addition to obeying `openin_any`, the file listing actions (such
as `--list`) for the JRE7 and 8 variants also prohibit listing the
-contents outside of the current working directory's path. This means
-that you can't, for example, list the contents of `..` (the current
+contents outside of the current working directory's path even if `openin_any=a`.
+This means that you can't, for example, list the contents of `..` (the current
working directory's parent) nor can you try walking the entire file
system. The `--walk` action additionally won't descend hidden
directories. This extra restriction is designed to prevent malicious
@@ -410,4 +420,3 @@
Author Home Page: http://www.dickimaw-books.com/
-License: LPPL 1.3+
Binary files old/texmf-dist/doc/support/texosquery/texosquery.pdf and new/texmf-dist/doc/support/texosquery/texosquery.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texosquery.doc.tlpobj new/tlpkg/tlpobj/texosquery.doc.tlpobj
--- old/tlpkg/tlpobj/texosquery.doc.tlpobj 2019-02-28 04:08:01.000000000 +0100
+++ new/tlpkg/tlpobj/texosquery.doc.tlpobj 2020-02-05 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name texosquery.doc
category Package
-revision 44656
+revision 53676
shortdesc doc files of texosquery
docfiles size=130
texmf-dist/doc/support/texosquery/CHANGES
++++++ texosquery.tar.xz ++++++
Binary files old/texmf-dist/scripts/texosquery/texosquery-jre5.jar and new/texmf-dist/scripts/texosquery/texosquery-jre5.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texosquery/texosquery-jre5.sh new/texmf-dist/scripts/texosquery/texosquery-jre5.sh
--- old/texmf-dist/scripts/texosquery/texosquery-jre5.sh 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/scripts/texosquery/texosquery-jre5.sh 2020-02-04 23:21:35.000000000 +0100
@@ -1,11 +1,15 @@
#!/bin/sh
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre5.jar)`
-else
- jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre5.jar`
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
+
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
fi
+
java -jar "$jarpath" "$@"
Binary files old/texmf-dist/scripts/texosquery/texosquery-jre8.jar and new/texmf-dist/scripts/texosquery/texosquery-jre8.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texosquery/texosquery-jre8.sh new/texmf-dist/scripts/texosquery/texosquery-jre8.sh
--- old/texmf-dist/scripts/texosquery/texosquery-jre8.sh 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/scripts/texosquery/texosquery-jre8.sh 2020-02-04 23:21:35.000000000 +0100
@@ -1,11 +1,15 @@
#!/bin/sh
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre8.jar)`
-else
- jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre8.jar`
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
+
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
fi
+
java -Djava.locale.providers=CLDR,JRE -jar "$jarpath" "$@"
Binary files old/texmf-dist/scripts/texosquery/texosquery.jar and new/texmf-dist/scripts/texosquery/texosquery.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texosquery/texosquery.sh new/texmf-dist/scripts/texosquery/texosquery.sh
--- old/texmf-dist/scripts/texosquery/texosquery.sh 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/scripts/texosquery/texosquery.sh 2020-02-04 23:21:35.000000000 +0100
@@ -1,11 +1,15 @@
#!/bin/sh
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery.jar)`
-else
- jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery.jar`
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
+
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
fi
+
java -jar "$jarpath" "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/texosquery/texosquery.cfg new/texmf-dist/tex/latex/texosquery/texosquery.cfg
--- old/texmf-dist/tex/latex/texosquery/texosquery.cfg 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/tex/latex/texosquery/texosquery.cfg 2020-02-04 23:21:35.000000000 +0100
@@ -18,27 +18,30 @@
% from your command line.
% * If the version number starts with "1.5" or "1.6" then
-% \TeXOSInvokerName must be texosquery-jre5
+% \TeXOSInvokerName must be texosquery-jre5
+% and \TeXOSQueryAllowRestricted must be commented out
%
% * If the version number starts with "1.7" then
-% \TeXOSInvokerName must be texosquery
+% \TeXOSInvokerName must be texosquery
+% and \TeXOSQueryAllowRestricted must be commented out
%
-% * If the version number starts with "1.8" then
-% \TeXOSInvokerName must be texosquery-jre8
+% * If the version number starts with "1.8" or above then
+% \TeXOSInvokerName must be texosquery-jre8
+% and \TeXOSQueryAllowRestricted should be uncommented if
+% texosquery-jre8 is on the restricted list. (This has been the
+% case since TeX Live 2017.)
% (bash users need to check that the .sh extension has been removed
% from the bash scripts.)
-\def\TeXOSInvokerName{texosquery}
+\def\TeXOSInvokerName{texosquery-jre8}
% 2. If the invoker name given in the definition above is on the
-% restricted list, uncomment the line below to allow it to be run
-% in restricted mode:
+% restricted list, the line below should be uncommented to allow it to be run
+% in restricted mode. Otherwise comment it out.
-%\TeXOSQueryAllowRestricted
+\TeXOSQueryAllowRestricted
-% Leave it commented out if the invoker name is not on the
-% restricted list.
\endinput
%%
%% End of file `texosquery.cfg'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/texosquery/texosquery.sty new/texmf-dist/tex/latex/texosquery/texosquery.sty
--- old/texmf-dist/tex/latex/texosquery/texosquery.sty 2017-06-21 00:18:21.000000000 +0200
+++ new/texmf-dist/tex/latex/texosquery/texosquery.sty 2020-02-04 23:21:35.000000000 +0100
@@ -44,7 +44,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{texosquery}[2017/06/20 v1.6 (NLCT)]
+\ProvidesPackage{texosquery}[2020/02/04 v1.7 (NLCT)]
\input{texosquery}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/texosquery/texosquery.tex new/texmf-dist/tex/latex/texosquery/texosquery.tex
--- old/texmf-dist/tex/latex/texosquery/texosquery.tex 2017-06-21 00:18:21.000000000 +0200
+++ new/texmf-dist/tex/latex/texosquery/texosquery.tex 2020-02-04 23:21:35.000000000 +0100
@@ -55,7 +55,7 @@
\@texosquery@restore@at
\expandafter\endinput
\fi
-\expandafter\def\csname ver@texosquery.tex\endcsname{2017/06/20 v1.6 (NLCT)}
+\expandafter\def\csname ver@texosquery.tex\endcsname{2020/02/04 v1.7 (NLCT)}
\ifx\@tracklang@pkgwarn\undefined
\ifx\PackageWarning\undefined
\def\@texosquery@warn#1{%
@@ -511,7 +511,7 @@
\catcode`\;=12\relax
\catcode`\%=12\relax
\everyeof{\noexpand}\relax
- \@texosquery@edef\x{\endgroup\def\noexpand#1{\TeXOSQueryInvoker{#2}}}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{\TeXOSQueryInvoker{#2}}}\@texosquery@tmp
\fi
}
\def\TeXOSQueryFromFile#1#2{%
@@ -537,7 +537,7 @@
\catcode`\;=12\relax
\catcode`\%=12\relax
\everyeof{\noexpand}\relax
- \@texosquery@edef\x{\endgroup\def\noexpand#1{\texosquery@input #2 }}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{\texosquery@input #2 }}\@texosquery@tmp
\fi
}
\def\texosquerycurrency#1{%
@@ -1024,7 +1024,7 @@
\def\texosquerydefpattern#1#2{%
\begingroup
\@texosquery@pattern@shortcuts
- \@texosquery@edef\x{\endgroup\def\noexpand#1{#2}}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{#2}}\@texosquery@tmp
}
\def\texosqueryfmtdatetime#1{%
\def\@texosquery@fmt@dt@pattern{#1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texosquery.tlpobj new/tlpkg/tlpobj/texosquery.tlpobj
--- old/tlpkg/tlpobj/texosquery.tlpobj 2019-02-28 04:08:01.000000000 +0100
+++ new/tlpkg/tlpobj/texosquery.tlpobj 2020-02-05 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name texosquery
category Package
-revision 44656
+revision 53676
shortdesc Cross-platform Java application to query OS information
longdesc This package provides a cross-platform Java application to
longdesc query OS information designed for use in TeX's shell escape
@@ -36,7 +36,6 @@
texmf-dist/tex/latex/texosquery/texosquery.tex
catalogue-contact-repository https://github.com/nlct/texosquery
catalogue-ctan /support/texosquery
-catalogue-date 2017-06-20 18:22:33 +0200
catalogue-license lppl1.3
catalogue-topics sys-supp
-catalogue-version 1.6
+catalogue-version 1.7
++++++ textcase.doc.tar.xz ++++++
Binary files old/doc/latex/textcase/textcase.pdf and new/doc/latex/textcase/textcase.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textcase.doc.tlpobj new/tlpkg/tlpobj/textcase.doc.tlpobj
--- old/tlpkg/tlpobj/textcase.doc.tlpobj 2019-02-28 04:08:05.000000000 +0100
+++ new/tlpkg/tlpobj/textcase.doc.tlpobj 2019-09-15 01:55:00.000000000 +0200
@@ -1,8 +1,8 @@
name textcase.doc
category Package
-revision 15878
+revision 52092
shortdesc doc files of textcase
relocated 1
-docfiles size=43
+docfiles size=49
RELOC/doc/latex/textcase/README
RELOC/doc/latex/textcase/textcase.pdf
++++++ textcase.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/textcase/textcase.sty new/tex/latex/textcase/textcase.sty
--- old/tex/latex/textcase/textcase.sty 2006-01-13 01:08:58.000000000 +0100
+++ new/tex/latex/textcase/textcase.sty 2019-09-14 23:37:06.000000000 +0200
@@ -7,16 +7,19 @@
%% textcase.dtx (with options: `package')
%%
%% Source File: textcase.dtx
-%% Copyright 1997 1998 David Carlisle
+%% Copyright 1997 1998 2019 David Carlisle
%%
%% This file may be distributed under the terms of the LPPL.
%% See 00readme.txt for details.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textcase}
- [2004/10/07 v0.07 Text only upper/lower case changing (DPC)]
+ [2019/09/14 v1.00 Text only upper/lower case changing (DPC)]
\def\@uclcnotmath#1#2#3#4{\begingroup
#1%
\def\({$}\let\)\(%
+ \let\UTF@two@octets@noexpand\@empty
+ \let\UTF@three@octets@noexpand\@empty
+ \let\UTF@four@octets@noexpand\@empty
\def\NoCaseChange##1{\noexpand\NoCaseChange{\noexpand##1}}%
\@nonchangecase\label
\@nonchangecase\ref
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textcase.tlpobj new/tlpkg/tlpobj/textcase.tlpobj
--- old/tlpkg/tlpobj/textcase.tlpobj 2019-02-28 04:08:05.000000000 +0100
+++ new/tlpkg/tlpobj/textcase.tlpobj 2019-09-15 01:55:00.000000000 +0200
@@ -1,6 +1,6 @@
name textcase
category Package
-revision 15878
+revision 52092
shortdesc Case conversion ignoring mathematics, etc
relocated 1
longdesc The textcase package offers commands \MakeTextUppercase and
@@ -15,7 +15,10 @@
longdesc ...\NoCaseChange{\end{foo}}...}
runfiles size=1
RELOC/tex/latex/textcase/textcase.sty
+catalogue-contact-bugs https://github.com/davidcarlisle/dpctex/issues
+catalogue-contact-repository https://github.com/davidcarlisle/dpctex
catalogue-ctan /macros/latex/contrib/textcase
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-14 18:41:18 +0200
catalogue-license lppl
catalogue-topics macro-supp
+catalogue-version 1.00
++++++ textpos.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/README new/doc/latex/textpos/README
--- old/doc/latex/textpos/README 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/README 2019-05-05 00:47:13.000000000 +0200
@@ -2,7 +2,7 @@
Textpos: absolute positioning of text on the LaTeX page
-------------------------------------------------------
-Version 1.8, 2016 June 7
+Version 1.9.1, 2019 April 15
This package facilitates placing boxes at absolute positions on the
LaTeX page. There are several reasons why this might be useful, but
@@ -17,6 +17,7 @@
For the change history, see textpos.html.
+The canonical CTAN URL for Textpos is https://ctan.org/pkg/textpos.
Textpos has a home page at http://purl.org/nxg/dist/textpos.
The source is hosted at bitbucket: https://bitbucket.org/nxg/textpos,
and there is an issues list there, for bug reports.
@@ -30,13 +31,12 @@
This package requires the services of Martin Schroeder's package
everyshi. You will need to download this package from CTAN first. See
-http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/ms/
-or one of the other CTAN hosts.
+https://www.ctan.org/pkg/everyshi.
Licence
-------
-This software is copyright, 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray.
+This software is copyright, 1999-2019, Norman Gray.
It is released under the terms of the [LaTeX Project Public License][lppl],
which is included in the file LICENCE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.8 new/doc/latex/textpos/VERSION-1.8
--- old/doc/latex/textpos/VERSION-1.8 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/VERSION-1.8 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-textpos-1.8, released 2016 June 7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.9.1 new/doc/latex/textpos/VERSION-1.9.1
--- old/doc/latex/textpos/VERSION-1.9.1 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/textpos/VERSION-1.9.1 2019-05-05 00:47:13.000000000 +0200
@@ -0,0 +1 @@
+textpos-1.9.1, released 2019 April 15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t1.tex new/doc/latex/textpos/examples/t1.tex
--- old/doc/latex/textpos/examples/t1.tex 2006-08-14 01:37:27.000000000 +0200
+++ new/doc/latex/textpos/examples/t1.tex 2019-05-05 00:47:13.000000000 +0200
@@ -14,6 +14,17 @@
\begin{document}
+\begin{textblock}{4}(0,0)
+ % make a grid on the page
+ \lineskip=0pt % abut boxes directly
+ \setbox1=\hbox to \TPHorizModule{\hfill \vrule height \TPVertModule}
+ \setbox0=\vbox to \TPVertModule{\noindent\copy1\copy1 \copy1 \vss\hrule}
+ \copy0
+ \copy0
+ \copy0
+ \copy0
+\end{textblock}
+
\begin{textblock}{3}(0,0)
\{3\}(0,0)
\end{textblock}
@@ -43,4 +54,13 @@
\{284.52756pt\}[0.5,0.5](50.0mm,2.5cm)
\end{textblock*}
+\TPReferencePosition{0.5,0.5}
+\begin{textblock}{1}(2,4)
+\{1\}(2,4)\hfil\break (refpos [0.5,0.5])
+\end{textblock}
+
+% The following is for testing the _experimental_ (in v1.9) discardcontent=true mode
+% \TPoptions{discardcontent=true}
+% Here is content
+
\end{document}
Binary files old/doc/latex/textpos/niepraschk-eso-pic.pdf and new/doc/latex/textpos/niepraschk-eso-pic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos-example.tex new/doc/latex/textpos/textpos-example.tex
--- old/doc/latex/textpos/textpos-example.tex 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/textpos-example.tex 2019-05-05 00:47:13.000000000 +0200
@@ -7,7 +7,7 @@
%% textpos.dtx (with options: `example')
%% Textpos: absolute positioning of text on the page
%%%% File: textpos.dtx
-%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray
+%%%% Copyright 1999-2019, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -22,14 +22,14 @@
%% The Current Maintainer of this work is Norman Gray http://nxg.me.uk
%%
%% This work consists of the files textpos.dtx and textpos.ins,
-%% and the derived file textpos.cls.
+%% and the derived file textpos.sty.
%%
%% Author: Norman Gray, norman@astro.gla.ac.uk.
%% Department of Physics and Astronomy, University of Glasgow, UK
%%
%% See the file LICENCE for a copy of the LPPL.
%%
-%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100
+%% Mercurial ident: 09ee0efc21ac (1.9.1+0), 2019-04-15 22:14 +0100
%%
\documentclass{article}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos.html new/doc/latex/textpos/textpos.html
--- old/doc/latex/textpos/textpos.html 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/textpos.html 2019-05-05 00:47:13.000000000 +0200
@@ -4,7 +4,7 @@
<title>Textpos</title>
<meta name="DC.subject" content="latex, textpos, absolute positioning"/>
<meta name="DC.title" content="Textpos"/>
-<meta name="DC.date" content="2016-06-07"/>
+<meta name="DC.date" content="2019-04-15"/>
<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/>
<link href="https://nxg.me.uk/norman" rev="author"/>
<link type="text/css" rel="stylesheet" href="style.css"/>
@@ -20,7 +20,7 @@
<span class="distpage">The textpos home page is at
<a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>;</span>
please quote this URL rather than the URL it resolves to.</p>
-<p>Version 1.8, 2016 June 7.</p>
+<p>Version 1.9.1, 2019 April 15.</p>
</div>
<p>This package facilitates placing boxes at absolute positions on the
@@ -73,14 +73,34 @@
<p class="distpage">The <code>textpos</code> home page is at <a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more up-to-date versions available there.</p>
<p><code>Textpos</code> is also available on CTAN:
-<a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/">/tex-archive/macros/latex/contrib/textpos/</a></p>
+<a href="https://www.ctan.org/pkg/textpos">macros/latex/contrib/textpos/</a></p>
<h2>History</h2>
<dl>
-<dt><strong>1.8, 2016 June 5</strong></dt>
+<dt><strong>1.9.1, 2019 April 15</strong></dt>
+<dd>
+<ul>
+<li>Added the <code>\TPReferencePosition</code> command, to change the
+default reference position away from <code>[0,0]</code>.</li>
+<li>Added the <em>experimental</em>
+<code>\TPoptions{discardcontent=true}</code> option, to improve
+compatibility with TikZ
+(see <a href="https://bitbucket.org/nxg/textpos/issues/6/">issue 6 in the repository</a>).
+Note: <em>This option may change or disappear in future versions</em>, and the author would be
+particular interested to get feedback regarding it.</li>
+<li>Documentation: added discussion of the implementation difference
+between relative and absolute mode, and when one is preferable to the other.</li>
+<li>Documentation: note that the showboxes option is intended only as
+a basic aid to layout.</li>
+<li>(Version 1.9 was partially released, but it contained an
+attribution error which could be most easily fixed by a minor version bump).</li>
+</ul>
+</dd>
+
+<dt>1.8, 2016 June 5</dt>
<dd><ul>
<li>Added the <code>\TPoptions</code> command, to switch modes on and
off within the document. Various documentation tweaks.</li>
@@ -90,6 +110,8 @@
This has now been rationalised, but the change <em>may</em> change
documents which relied on the previous behaviour.
Thanks to Richard Schreiber for the detailed bug report.</li>
+<li>In this release, I switched to more conventional dotted-integer, n.m.r,
+version numbers, from the LaTeX-style model with intermediate releases denoted by letters.</li>
</ul></dd>
<dt>1.7j, 2014 January 3</dt>
@@ -225,7 +247,7 @@
<div class="signature">
<a href="http://nxg.me.uk">Norman Gray</a><br/>
-2016 June 7
+2019 April 15
</div>
</body>
Binary files old/doc/latex/textpos/textpos.pdf and new/doc/latex/textpos/textpos.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.doc.tlpobj new/tlpkg/tlpobj/textpos.doc.tlpobj
--- old/tlpkg/tlpobj/textpos.doc.tlpobj 2019-02-28 04:08:07.000000000 +0100
+++ new/tlpkg/tlpobj/textpos.doc.tlpobj 2019-05-05 01:39:07.000000000 +0200
@@ -1,12 +1,12 @@
name textpos.doc
category Package
-revision 41331
+revision 50988
shortdesc doc files of textpos
relocated 1
-docfiles size=96
+docfiles size=98
RELOC/doc/latex/textpos/LICENCE
RELOC/doc/latex/textpos/README
- RELOC/doc/latex/textpos/VERSION-1.8
+ RELOC/doc/latex/textpos/VERSION-1.9.1
RELOC/doc/latex/textpos/examples/README.examples
RELOC/doc/latex/textpos/examples/t1.tex
RELOC/doc/latex/textpos/examples/t10.tex
++++++ textpos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/textpos/textpos.sty new/tex/latex/textpos/textpos.sty
--- old/tex/latex/textpos/textpos.sty 2016-06-10 00:53:55.000000000 +0200
+++ new/tex/latex/textpos/textpos.sty 2019-05-05 00:47:13.000000000 +0200
@@ -7,7 +7,7 @@
%% textpos.dtx (with options: `package')
%% Textpos: absolute positioning of text on the page
%%%% File: textpos.dtx
-%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray
+%%%% Copyright 1999-2019, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -22,18 +22,18 @@
%% The Current Maintainer of this work is Norman Gray http://nxg.me.uk
%%
%% This work consists of the files textpos.dtx and textpos.ins,
-%% and the derived file textpos.cls.
+%% and the derived file textpos.sty.
%%
%% Author: Norman Gray, norman@astro.gla.ac.uk.
%% Department of Physics and Astronomy, University of Glasgow, UK
%%
%% See the file LICENCE for a copy of the LPPL.
%%
-%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100
+%% Mercurial ident: 09ee0efc21ac (1.9.1+0), 2019-04-15 22:14 +0100
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{textpos}[2016/06/07 v1.8]
-\typeout{Package: textpos 2016/06/07 1.8, absolute positioning of text on the page}
+\ProvidesPackage{textpos}[2019/04/15 v1.9.1]
+\typeout{Package: textpos 2019/04/15 1.9.1, absolute positioning of text on the page}
\newif\ifTPshowboxes
\TPshowboxesfalse
@@ -52,6 +52,9 @@
\TP@chattertrue
\DeclareOption{quiet}{\TP@chatterfalse}
\DeclareOption{verbose}{\TP@chattertrue}
+\newif\ifTP@displayholdbox
+ \TP@displayholdboxtrue
+\DeclareOption{discardcontent}{\TP@displayholdboxfalse}
\ProcessOptions
\ifTP@abspos
\RequirePackage{everyshi}
@@ -62,6 +65,8 @@
\define@key{tp}{verbose}{\csname TP@chatter#1\endcsname}
\define@key{tp}{showboxes}{\csname TPshowboxes#1\endcsname}
\define@key{tp}{showtext}{\csname TP@showtext#1\endcsname}
+\define@key{tp}{discardcontent}{\csname @tempswa#1\endcsname
+ \if@tempswa\TP@displayholdboxfalse\else\TP@displayholdboxtrue\fi}
\def\TPoptions{\setkeys{tp}}
\def\TP@xfloat#1[#2]{
\par\def\@captype{#1}%
@@ -77,7 +82,7 @@
\newbox\TP@textbox
\ifTP@abspos
\newbox\TP@holdbox % starts off void
- \AtEndDocument{\ifvoid\TP@holdbox \else \hbox{}\fi}
+ \AtEndDocument{\ifTP@displayholdbox\ifvoid\TP@holdbox \else \hbox{}\fi\fi}
\fi
\newdimen\TPHorizModule
\newdimen\TPVertModule
@@ -180,6 +185,8 @@
\globaldefs=0 }{}%
\global\let\TP@checkdummycolorpackage\relax % don't come here again
}
+\def\TP@referenceposition{0,0}
+\def\TPReferencePosition#1{\def\TP@referenceposition{#1}}
\def\textblock#1{%
\@tempdima=#1\TPHorizModule
\ifvmode\else
@@ -193,7 +200,7 @@
\par % force us back into vertical mode
\fi
\fi
- \@ifnextchar[{\TP@textblock}{\TP@textblock[0,0]}%] bracematch
+ \@ifnextchar[{\TP@textblock}{\expandafter\TP@textblock\expandafter[\TP@referenceposition]}%] bracematch
}
\def\TP@textblockstar#1{%
\setlength{\@tempdima}{#1}
@@ -205,7 +212,7 @@
Alignment may work out wrongly.}%
\par % force us back into vertical mode
\fi
- \@ifnextchar[{\TP@textblock}{\TP@textblock[0,0]}%] bracematch
+ \@ifnextchar[{\TP@textblock}{\expandafter\TP@textblock\expandafter[\TP@referenceposition]}%] bracematch
}
\expandafter\let\csname textblock*\endcsname\TP@textblockstar
\newtoks\TP@tbargs
@@ -345,19 +352,19 @@
}%
\ifTP@abspos
\ifTP@overlay
- \EveryShipout{%
+ \EveryShipout{\ifTP@displayholdbox
\global\setbox\@cclv\vbox{%
\vbox to 0pt{\ifvbox\@cclv \unvbox\@cclv \else \box\@cclv \fi \vss}%
\unvbox\TP@holdbox % TP@holdbox is now void
- }
- }%
+ }%
+ \fi}%
\else
- \EveryShipout{%
+ \EveryShipout{\ifTP@displayholdbox
\global\setbox\@cclv\vbox{%
\unvbox\TP@holdbox
\ifvbox\@cclv \unvbox\@cclv \else \box\@cclv \fi
}%
- }%
+ \fi}%
\fi
\textblockorigin{0pt}{0pt}%
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.tlpobj new/tlpkg/tlpobj/textpos.tlpobj
--- old/tlpkg/tlpobj/textpos.tlpobj 2019-02-28 04:08:07.000000000 +0100
+++ new/tlpkg/tlpobj/textpos.tlpobj 2019-05-05 01:39:08.000000000 +0200
@@ -1,17 +1,20 @@
name textpos
category Package
-revision 41331
+revision 50988
shortdesc Place boxes at arbitrary positions on the LaTeX page
relocated 1
longdesc A package to facilitate placement of boxes at absolute
longdesc positions on the LaTeX page. There are several reasons why this
longdesc might be useful, an important one being to help the creation of
-longdesc large-format conference posters.
+longdesc large-format conference posters. The package depends on
+longdesc everyshi and keyval.
runfiles size=3
RELOC/tex/latex/textpos/textpos.sty
+catalogue-contact-bugs https://bitbucket.org/nxg/textpos/issues/
catalogue-contact-home http://purl.org/nxg/dist/textpos
+catalogue-contact-repository https://bitbucket.org/nxg/textpos/
catalogue-ctan /macros/latex/contrib/textpos
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2019-04-16 15:36:26 +0200
catalogue-license lppl1.3
catalogue-topics layout
-catalogue-version 1.8
+catalogue-version 1.9.1
++++++ texware.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvitype.1 new/texmf-dist/doc/man/man1/dvitype.1
--- old/texmf-dist/doc/man/man1/dvitype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/dvitype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH DVITYPE 1 "16 June 2015" "Web2C 2019"
+.TH DVITYPE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/dvitype.man1.pdf and new/texmf-dist/doc/man/man1/dvitype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pooltype.1 new/texmf-dist/doc/man/man1/pooltype.1
--- old/texmf-dist/doc/man/man1/pooltype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pooltype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH POOLTYPE 1 "16 June 2015" "Web2C 2019"
+.TH POOLTYPE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/pooltype.man1.pdf and new/texmf-dist/doc/man/man1/pooltype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texware.doc.tlpobj new/tlpkg/tlpobj/texware.doc.tlpobj
--- old/tlpkg/tlpobj/texware.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/texware.doc.tlpobj 2020-03-04 23:53:58.000000000 +0100
@@ -1,6 +1,6 @@
name texware.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of texware
docfiles size=13
texmf-dist/doc/man/man1/dvitype.1
++++++ thaispec.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thaispec/README.md new/doc/latex/thaispec/README.md
--- old/doc/latex/thaispec/README.md 2018-03-11 21:27:11.000000000 +0100
+++ new/doc/latex/thaispec/README.md 2019-07-10 22:28:34.000000000 +0200
@@ -11,27 +11,11 @@
## Prerequisite
Thai national fonts, i.e., SIPAFonts (See https://github.com/epsilonxe/sipafonts)
-## Recommendation
-Install TeX Gyre font family (Possibly included with your TeX distribution)
-
## Usage
-If you already have TeX Gyre font family, just simply add the preamble
+Just simply add the preamble
```
\usepackage{thaispec}
```
-Otherwise
-```
-\usepackage[texgyrefont=false]{thaispec}
-```
-This package allows you to input Thai characters directly to ```.tex``` file,
-and choose any Thai fonts to be used in the document.
-In order to choose the font, please make sure that the font is system wide, then use
-```
-\usepackage[thaifont = <SYSTEM THAI FONT NAME>]{thaispec}
-```
-Moreover, the package give you options to choose any system wide fonts for
-`mainfont`, `sansfont` and `monofont` too
-
For additional usage or more options, see the documentation.
## Credits
@@ -40,7 +24,7 @@
(See http://pioneer.netserv.chula.ac.th/~wdittaya/)
## License
-Copyright 2018 Ratthaprom Promkam
+Copyright Ratthaprom Promkam
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/thaispec/thaispec.pdf and new/doc/latex/thaispec/thaispec.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thaispec.doc.tlpobj new/tlpkg/tlpobj/thaispec.doc.tlpobj
--- old/tlpkg/tlpobj/thaispec.doc.tlpobj 2019-02-28 04:08:31.000000000 +0100
+++ new/tlpkg/tlpobj/thaispec.doc.tlpobj 2019-07-11 01:54:10.000000000 +0200
@@ -1,8 +1,8 @@
name thaispec.doc
category Package
-revision 46923
+revision 51598
shortdesc doc files of thaispec
relocated 1
-docfiles size=15
+docfiles size=22
RELOC/doc/latex/thaispec/README.md
RELOC/doc/latex/thaispec/thaispec.pdf
++++++ thaispec.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thaispec/thaispec.sty new/tex/latex/thaispec/thaispec.sty
--- old/tex/latex/thaispec/thaispec.sty 2018-03-11 21:27:11.000000000 +0100
+++ new/tex/latex/thaispec/thaispec.sty 2019-07-10 22:28:34.000000000 +0200
@@ -7,7 +7,7 @@
%% thaispec.dtx (with options: `thaispec.sty,package')
%%
%% thaispec.dtx
-%% Copyright 2018 Ratthaprom_Promkam
+%% Copyright 2019 Ratthaprom_Promkam
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -38,6 +38,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% By default the package set \texttt{thaifont} to \texttt{TH Sarabun New},
+%% while set \texttt{mainfont}, \texttt{sansfont} and \texttt{monofont} to \TeX\ Gyre fonts.
+%% In case \TeX\ Gyre font family is not system wide installed, the package should be loaded
+%% with the following option:
+%% \begin{minted}[frame=single]{LaTeX}
+%% \usepackage[texgyrefont = false]{thaispec}
+%% \end{minted}
%%\begin{lstlisting}[style=tex,numbers=left]
%%\documentclass{article}
%%\usepackage{thaispec}
@@ -58,7 +65,7 @@
%%
%%\end{lstlisting}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{thaispec}[2018/03/29 version 0.3 thaispec]
+\ProvidesPackage{thaispec}[2019/07/03 version 0.4 thaispec]
\RequirePackage{kvoptions}
\RequirePackage[no-math]{fontspec}
@@ -74,10 +81,8 @@
family=THL,
prefix=THL@
}
+
\DeclareStringOption[TH Sarabun New]{thaifont}[TH Sarabun New]
-\DeclareStringOption[TeX Gyre Termes]{mainfont}[TeX Gyre Termes]
-\DeclareStringOption[TeX Gyre Heros]{sansfont}[TeX Gyre Heros]
-\DeclareStringOption[TeX Gyre Cursor]{monofont}[TeX Gyre Cursor]
\DeclareVoidOption{math}{%
\RequirePackage{mathtools}
@@ -85,21 +90,19 @@
\RequirePackage{amsthm}
\RequirePackage{mathspec}
}
+
\DeclareVoidOption{thainum}{\renewcommand{\thesection}{\thainum{section}}}
-\DeclareBoolOption[true]{texgyrefont}
-\DeclareBoolOption[true]{thaithm}
\DeclareBoolOption[true]{sloppy}
\DeclareBoolOption[true]{thaispacing}
\DeclareBoolOption[true]{thaicaption}
+\DeclareBoolOption[false]{beamerthmcount}
\DeclareStringOption[default]{thmcount}[default]
\ProcessKeyvalOptions{THL}
-\newcommand{\testvar}{\THL@thmcount}
-
\XeTeXlinebreaklocale "th"
\XeTeXlinebreakskip = 0pt plus 0pt
\ifTHL@sloppy
@@ -107,13 +110,6 @@
\fi
\defaultfontfeatures{Mapping=tex-text}
-\ifTHL@texgyrefont
-\setmainfont{\THL@mainfont}
-\setsansfont{\THL@sansfont}
-\setmonofont{\THL@monofont}
-\else
-\setmainfont[Scale=1.23]{\THL@thaifont}
-\fi
\newfontfamily{\thaifont}[Scale=MatchUppercase,Mapping=tex-text]{\THL@thaifont}
@@ -130,14 +126,6 @@
\AtBeginDocument\captionsthai
\fi
-\@ifclassloaded{beamer}
-{}
-{%
-\ifTHL@thaispacing
-\onehalfspacing
-\fi
-}
-
\def\thaialph#1{\expandafter\thalph\csname c@#1\endcsname}
\def\thalph#1{%
\ifcase#1\or ก\or ข\or ค\or ง\or จ\or ฉ\or ช\or ซ\or
@@ -189,7 +177,45 @@
\def\today{\DTMfetchday{now}\ \dtmonth\ พ.ศ. \theyearbd}
}
-\ifTHL@thaithm
+\@ifclassloaded{beamer}
+{
+\let\theorem\relax
+\let\c@theorem\relax
+\let\lemma\relax
+\let\corollary\relax
+\let\definition\relax
+\let\example\relax
+\let\note\relax
+
+\ifTHL@beamerthmcount
+ \setbeamertemplate{theorems}[numbered]
+\fi
+
+}
+{%
+\ifTHL@thaispacing
+\onehalfspacing
+\fi
+}
+
+\@ifclassloaded{article}
+{
+\renewcommand{\THL@thmcount}{section}
+}
+{}
+
+\@ifclassloaded{book}
+{
+\renewcommand{\THL@thmcount}{chapter}
+}
+{}
+
+\@ifclassloaded{report}
+{
+\renewcommand{\THL@thmcount}{chapter}
+}
+{}
+
\@ifpackageloaded{amsthm}
{%
\IfStrEqCase{\THL@thmcount}{%
@@ -307,8 +333,8 @@
}%
}%
\xpatchcmd{\@thm}{\thm@headpunct{.}}{\thm@headpunct{}}{}{}
-}{}
-\fi
+}
+{}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thaispec.tlpobj new/tlpkg/tlpobj/thaispec.tlpobj
--- old/tlpkg/tlpobj/thaispec.tlpobj 2019-02-28 04:08:31.000000000 +0100
+++ new/tlpkg/tlpobj/thaispec.tlpobj 2019-07-11 01:54:10.000000000 +0200
@@ -1,6 +1,6 @@
name thaispec
category Package
-revision 46923
+revision 51598
shortdesc Thai Language Typesetting in XeLaTeX
relocated 1
longdesc This package allows you to input Thai characters directly to
@@ -13,7 +13,7 @@
RELOC/tex/latex/thaispec/thaispec.sty
catalogue-contact-home https://github.com/epsilonxe/LaTeX/tree/master/Packages/thaispec
catalogue-ctan /language/thai/thaispec
-catalogue-date 2018-05-13 08:10:59 +0200
+catalogue-date 2019-07-10 16:26:41 +0200
catalogue-license lppl1.3
catalogue-topics thai xetex
-catalogue-version 0.3
+catalogue-version 0.4
++++++ thalie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/CHANGELOG.md new/doc/latex/thalie/CHANGELOG.md
--- old/doc/latex/thalie/CHANGELOG.md 2019-02-25 23:22:07.000000000 +0100
+++ new/doc/latex/thalie/CHANGELOG.md 2019-07-31 23:01:54.000000000 +0200
@@ -1,3 +1,9 @@
+* thalie 0.10b (2019-07-31)
+
+ * Minor fixes and updates of examples.
+
+ -- Louis Paternault
+
* thalie 0.10a (2019-02-24)
* New translation: German (thanks Ekkart Kleinod).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/README.md new/doc/latex/thalie/README.md
--- old/doc/latex/thalie/README.md 2019-02-25 23:22:07.000000000 +0100
+++ new/doc/latex/thalie/README.md 2019-07-31 23:01:54.000000000 +0200
@@ -5,12 +5,12 @@
to divide a play into acts and scenes, to automatically build the dramatis
personae, etc.
-- Version 0.10a (2019-02-24)
+- Version 0.10b (2019-07-31)
- Usage and installation instruction are available in the [documentation](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.pdf).
- Examples
- - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.10a/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10a/examples/cyrano.tex))
- - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.10a/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10a/examples/domjuan.tex))
- - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.10a/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10a/examples/hamlet.tex))
+ - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.10b/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10b/examples/cyrano.tex))
+ - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.10b/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10b/examples/domjuan.tex))
+ - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.10b/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10b/examples/hamlet.tex))
License
-------
Binary files old/doc/latex/thalie/thalie.pdf and new/doc/latex/thalie/thalie.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.doc.tlpobj new/tlpkg/tlpobj/thalie.doc.tlpobj
--- old/tlpkg/tlpobj/thalie.doc.tlpobj 2019-02-28 04:08:31.000000000 +0100
+++ new/tlpkg/tlpobj/thalie.doc.tlpobj 2019-08-01 05:19:05.000000000 +0200
@@ -1,6 +1,6 @@
name thalie.doc
category Package
-revision 50129
+revision 51789
shortdesc doc files of thalie
relocated 1
docfiles size=111
++++++ thalie.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie.sty new/tex/latex/thalie/thalie.sty
--- old/tex/latex/thalie/thalie.sty 2019-02-25 23:22:07.000000000 +0100
+++ new/tex/latex/thalie/thalie.sty 2019-07-31 23:01:54.000000000 +0200
@@ -23,7 +23,7 @@
%% and the derived file thalie.sty.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{thalie}
- [2019/02/24 v0.10a A package to typeset drama plays]
+ [2019/07/31 v0.10b A package to typeset drama plays]
\RequirePackage{pgfkeys}
\RequirePackage{etoolbox}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.tlpobj new/tlpkg/tlpobj/thalie.tlpobj
--- old/tlpkg/tlpobj/thalie.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thalie.tlpobj 2019-08-01 05:19:05.000000000 +0200
@@ -1,6 +1,6 @@
name thalie
category Package
-revision 50129
+revision 51789
shortdesc Typeset drama plays
relocated 1
longdesc The package provides tools to typeset drama plays. It defines
@@ -19,7 +19,7 @@
catalogue-contact-home https://framagit.org/spalax/thalie
catalogue-contact-repository https://framagit.org/spalax/thalie
catalogue-ctan /macros/latex/contrib/thalie
-catalogue-date 2019-02-24 23:46:17 +0100
+catalogue-date 2019-07-31 20:47:03 +0200
catalogue-license lppl1.3
catalogue-topics drama-script
-catalogue-version 0.10a
+catalogue-version 0.10b
++++++ theoremref.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/theoremref.doc.tlpobj new/tlpkg/tlpobj/theoremref.doc.tlpobj
--- old/tlpkg/tlpobj/theoremref.doc.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/theoremref.doc.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name theoremref.doc
category Package
-revision 30640
+revision 54512
shortdesc doc files of theoremref
relocated 1
docfiles size=94
++++++ theoremref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/theoremref.tlpobj new/tlpkg/tlpobj/theoremref.tlpobj
--- old/tlpkg/tlpobj/theoremref.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/theoremref.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name theoremref
category Package
-revision 30640
+revision 54512
shortdesc References with automatic theorem names
relocated 1
longdesc The theoremref package provides variants of the \label and \ref
@@ -12,6 +12,5 @@
runfiles size=3
RELOC/tex/latex/theoremref/theoremref.sty
catalogue-ctan /macros/latex/contrib/theoremref
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lpplgpl2
+catalogue-license lppl gpl2
catalogue-topics label-ref maths-theorem
++++++ thesis-ekf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/README new/doc/latex/thesis-ekf/README
--- old/doc/latex/thesis-ekf/README 2018-11-28 22:25:50.000000000 +0100
+++ new/doc/latex/thesis-ekf/README 2020-01-06 00:11:26.000000000 +0100
@@ -1,5 +1,5 @@
thesis-ekf class
-Copyright 2014-2018 by Tibor Tomacs
+Copyright 2014-2020 by Tibor Tomacs
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -22,15 +22,19 @@
=============================================================
Files TEXMF Installation folder
-------------------------------------------------------------
+ eszterhazy-logo-de.eps tex/latex/thesis-ekf/
+ eszterhazy-logo-de.pdf tex/latex/thesis-ekf/
eszterhazy-logo-en.eps tex/latex/thesis-ekf/
eszterhazy-logo-en.pdf tex/latex/thesis-ekf/
eszterhazy-logo-hu.eps tex/latex/thesis-ekf/
eszterhazy-logo-hu.pdf tex/latex/thesis-ekf/
- README doc/latex/thesis-ekf/
thesis-ekf.cls tex/latex/thesis-ekf/
+
+ README doc/latex/thesis-ekf/
+ thesis-ekf.pdf doc/latex/thesis-ekf/
+
thesis-ekf.dtx source/latex/thesis-ekf/
thesis-ekf.ins source/latex/thesis-ekf/
- thesis-ekf.pdf doc/latex/thesis-ekf/
=============================================================
Thesis class for Eszterhazy Karoly University (Eger, Hungary).
\ No newline at end of file
Binary files old/doc/latex/thesis-ekf/thesis-ekf.pdf and new/doc/latex/thesis-ekf/thesis-ekf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj
--- old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2020-02-06 01:55:07.000000000 +0100
@@ -1,8 +1,8 @@
name thesis-ekf.doc
category Package
-revision 49269
+revision 53685
shortdesc doc files of thesis-ekf
relocated 1
-docfiles size=69
+docfiles size=62
RELOC/doc/latex/thesis-ekf/README
RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf
++++++ thesis-ekf.tar.xz ++++++
++++ 3429 lines of diff (skipped)
++++++ thesis-gwu.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/README.md new/doc/latex/thesis-gwu/README.md
--- old/doc/latex/thesis-gwu/README.md 2018-09-02 00:17:26.000000000 +0200
+++ new/doc/latex/thesis-gwu/README.md 2020-03-13 22:02:20.000000000 +0100
@@ -1,3 +1,6 @@
+Note: this README needs to be updated, as of 2020-03-02, but as of this commit, all LaTeX formatting is correct and confirmed by the GW library.
+
+
| Build Status | Latest Release | Version | Last Commit | Activity | CTAN | Citation |
| :--------------------------------------: | :--------------------------: | :----: | :------: | :------: | :----: | :-----: |
| [![Travis][travis_shield]][travis] | [![Github Release][release_shield]][github_release] | [![Github Version][version_shield]][github_version] | [![Github Last Commit][last_commit_shield]][github_last_commit] | [![Github commit activity][activity_shield]][github_activity] | [![CTAN][ctan_shield]][ctan] | [![DOI][ doi_shield ]][ doi ]
@@ -20,10 +23,14 @@
## [GWU Thesis](https://skulumani.github.io/2016/10/thesis-gwu)
-This is a [GWU SEAS](https://library.gwu.edu/seas) thesis template, it conforms to the University and SEAS formatting guidelines as of May 21 2018.
+This is a [GWU SEAS](https://library.gwu.edu/seas) thesis template, it conforms to the University and SEAS formatting guidelines as of March 3, 2020.
![screenshot](./doc/etd.png)
+### Overleaf
+
+The template is available on [Overleaf](https://www.overleaf.com/latex/templates/george-washington-university-thesis...).
+
### Installing
You can install this thesis class in one of two ways:
@@ -80,7 +87,7 @@
You also have total control over the various intricacies of LaTeX as it's on your system.
This also means you have the responsibility of ensuring it's working properly, and fixing it when it goes horribly wrong.
-Using and online service frees you from dealing with downloading, installing, updating, etc.
+Using an online service frees you from dealing with downloading, installing, updating, etc.
At the same time, you also are dependent on the internet and a working website in order to write your thesis.
If their website is compromised, crashes, gets DDoS'ed or the like, you may be in a difficult situation.
@@ -129,10 +136,11 @@
Simply, by removing the command or using the macros `\hidepreface` you can automatically remove them.
Your text can be included in individual `/tex/*.tex` files and included in the main document using `\include{./tex/chapter1.tex}`.
-This gives you the added benefit of using `\includeonly{chapter1.tex}` to compile only specific sections of your much larger thesis.
+This gives you the added benefit of using `\includeonly{chapter1.tex}` to compile only specific sections of your much larger thesis.
The class file already loads several common packages such as, `amsmath, graphicx, cleveref, hyperref` and others.
-You can add more packages but be aware that all package interactions **HAVE NOT** been tested.
+
+If you need to load other or more packages, we've split off a `required-packages.tex` file for you to edit; it gets `input`ted into the class file. However, be aware that all package interactions **HAVE NOT** been tested.
There is also some demonstration of typical commands, such as equations, figures, cross-referencing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/appendix-ex.tex new/doc/latex/thesis-gwu/tex/appendix-ex.tex
--- old/doc/latex/thesis-gwu/tex/appendix-ex.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/appendix-ex.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,38 @@
+% !TEX root = ../thesis-sample.tex
+\appendix
+\doublespacing
+\chapter{Appendix}
+This is an example of an appendix.
+The only difference is the use of \verb+\appendix+ command at the start of this \texttt{tex} file.
+This automatically changes the chapter and section headings.
+
+\section{A section}
+The easiest method.
+
+\begin{equation}\label{eq:sum}
+ x_k = \frac{a_k+b_k}{2}
+\end{equation}
+
+\section{False Position}
+\lipsum[20]
+
+
+\section{Starting the Appendices}
+Actually, using appendices is quite simple. Immediately after the end
+of the last chapter and before the start of the first appendix, simply
+enter the command \verb|\appendix|. This will tell \LaTeX~to change
+how it interprets the commands \verb|\chapter|, \verb|\section|,
+\textit{etc.}
+
+Each appendix is actually a chapter, so once the \verb|\appendix|
+command has been called, start a new appendix by simply using the
+\verb|\chapter| command.
+
+Note that the \verb|\appendix| command should be called only
+once--not before the start of each appendix.
+
+All the fancy referencing and tools still work.
+You only need to add the appendix command and all will be as it should be.
+
+\chapter{Another Appendix}
+\lipsum[24]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/conclusion.tex new/doc/latex/thesis-gwu/tex/conclusion.tex
--- old/doc/latex/thesis-gwu/tex/conclusion.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/conclusion.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,4 @@
+
+\chapter{Conclusions: four contributions related to measuring trust in vaccines} \label{chap:conclusions}
+
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/discussion.tex new/doc/latex/thesis-gwu/tex/discussion.tex
--- old/doc/latex/thesis-gwu/tex/discussion.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/discussion.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,9 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Discussion} \label{chap:discussion}
+
+\section{Practical discussion: Potential for low-cost targeting and tailoring}
+
+\section{Theoretical discussion: how to increase validity for measure of complex constructs}
+
+\section{Limitations and future work: context, improve part 3, links to behavior}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/frontmatter.tex new/doc/latex/thesis-gwu/tex/frontmatter.tex
--- old/doc/latex/thesis-gwu/tex/frontmatter.tex 2018-02-03 00:05:44.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/frontmatter.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,52 +1,79 @@
% !TEX root = ../thesis-sample.tex
% --------- FRONT MATTER PAGES ---------------------
+
% Title of the thesis
-\title{Thesis GWU Example Dissertation}
+\title{What's the Title of Your Dissertation?}
+% capitalize significant words!
% Author name
-\author{Shankar Kulumani}
+\author{Your Name Here}
% Previous degrees
-\bsdepartment{Astronautical Engineering}
-\bsschool{US Air Force Academy}
-\bsgrad{May 2009}
-
-\msdepartment{Aeronautical and Astronautical Engineering}
-\msschool{Purdue University}
-\msgrad{May 2013}
-\showmsdegree % you can show or hide the MS degree line
+\bachelordegree{Your Bachelor's degree}
+\bsdepartment{Your old department}
+\bsschool{Your alma mater}
+\bsgrad{Month YYYY} % "month year"
+
+\masterdegree{M.S.}
+\msdepartment{Your graduate old department}
+\msschool{Your graduate alma mater}
+\msgrad{Month YYYY} % "month year"
+% you can show or hide the MS degree line
+\showmsdegree
% \hidemsdegree
% PhD degree commands
% Committee
\showcommitteepage % hide this page if you're doing a MS thesis
%\hidecommitteepage
-\committee{ %
-Taeyoung Lee, Associate Professor of Engineering and Applied Science,\\
-Dissertation Director\\ % remember to add a space between committee members
-Full Name, Title, \\
-Dissertation Director/Dissertation Co-Director/Committee Member
-}
+
+% define COMMITTEE information
+
+% in general, note that administrative titles are not used, instead use "professorial titles"?
% Chair must be entered separately for formatting reasons.
-\chair{Tayeoung Lee}
-\chairtitle{Associate Professor of Mechanical and Aerospace Engineering}
-% Department
-\department{Mechanical and Aerospace Engineering}
+\chair{Professor A. Person}
+\department{Insert Department}
+\chairtitle{Amazing Professor of \insertdepartment}
+
+\phdschool{The School of Engineering and Applied Science}
+
+\committee{
+% director first
+\insertchair, \insertchairtitle, Dissertation Director
+
+% remember to add a space between committee members
+\vspace{\baselineskip}
+
+% you shouldn't write "The George Washington University" every time
+Full Name, Title, Dissertation Director/Dissertation Co-Director/Committee Member
-\phdgrad{December 1, 2018}
-\defensedate{December 1, 2018}
+\vspace{\baselineskip}
+
+Full Name, Title, Dissertation Director/Dissertation Co-Director/Committee Member
+
+\vspace{\baselineskip}
+
+Full Name, Title, Dissertation Director/Dissertation Co-Director/Committee Member
+\vspace{\baselineskip}
+
+% external examiner
+Name of External Examiner, Professorial Title, Name of External University (or Name, Job Title, Name of External Company), Committee Member % include university or company of any external examiner! but still "committee member"
+}
+
+\phdgrad{March 8, 2020} % Month DD, YYYY
+\defensedate{December 18, 2019} % Month DD, YYYY
% Year of completion for copyright page and perhaps other places
-\year=2018
+\year=2020
% Copyright page
%\copyrightholder{Someone else}
% Dedication
\dedication{ %
-Include a fancy quote or dedication
+\emph{Include a fancy quote or dedication.}
}
% Acknowledgments
@@ -57,8 +84,8 @@
}
% -----------------------------------------------------------------
-% Typically only one of Preface/Foreward/Prologue would be in your thesis.
-% To choose one simply delete the others and they will automatically dissappear
+% Typically only one of Preface/Foreword/Prologue would be in your thesis.
+% To choose one simply delete the others and they will automatically disappear
% Preface
\preface{
@@ -69,14 +96,14 @@
}
\prologue{
- This is the prologe.
+ This is the prologue.
It's another front matter page that offers additional detail into your work.
Typically, only one (preface OR prologue OR foreword) is used.
You can remove the other sections by deleting them inside \texttt{tex/frontmatter.tex} or using the appropriate show or hide commands.
}
\foreword[2]{
- This is the forword.
+ This is the foreword.
It's another front matter page that offers additional detail into your work.
Typically, only one (preface OR prologue OR foreword) is used.
You can remove the other sections by deleting them inside \texttt{tex/frontmatter.tex} or using the appropriate show or hide commands.
@@ -91,11 +118,11 @@
\showdedication
\showacknowledgments
\showpreface
-\showprologue
-\showforeword
+\hideprologue
+\hideforeword
-% ------------ TABLE OF CONTENTS ----------------------
% Commands to hide or show lists of figures, tables, etc.
+\showtableofcontents
\showlistoffigures
\showlistoftables
\hidenomenclature
@@ -103,12 +130,13 @@
% --------- ACRONYMS and SYMBOLS ------------------------------
% TODO Deprecate the entire acronym package and switch to glossaries
-% You can either use the acronymn or glossaries package (both work)
+% You can either use the acronym or glossaries package (both work)
% Definition of any abbreviations used.
\abbreviations{
\acro{CRTBP}{Circular Restricted Three Body Problem}
\acro{NSA}{National Security Agency}
\acro{SSME}{Space Shuttle Main Engine}
+ \acro{HIDEME}{Hide the pages for One of These Abbreviation Systems; this is from abbreviations}
}
% call an abbreviation using \ac{abbrev}
@@ -117,9 +145,9 @@
\acro{J}{Moment of Inertia}
}
-% if you want acronymn (simpler) then change these to show
-\hidelistofabbreviations
-\hidelistofsymbols
+% if you want acronym (simpler) then change these to show
+\showlistofabbreviations
+\showlistofsymbols
% if you want glossaries (more powerful) then leave above as hide
% GLOSSARIES package options - automatically turns off front pages from acronym package
@@ -137,6 +165,8 @@
% acronyms defined in glossaries
\newabbreviation{crtbp}{CRTBP}{Circular Restricted Three Body Problem}
\newabbreviation{lidar}{LIDAR}{Light Detection and Ranging}
+\newabbreviation{hideme}{HIDEME}{Hide One of These Abbreviation Systems; this is from Glossaries}
+
% defining abbreviations like this allows for autocompletion
\newglossaryentry{filo}{
name={FILO},
@@ -172,6 +202,7 @@
sort=F,
description={External Force}
}
+
% Some abstract text
\abstract{
This is the abstract.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/intro-example.tex new/doc/latex/thesis-gwu/tex/intro-example.tex
--- old/doc/latex/thesis-gwu/tex/intro-example.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/intro-example.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,102 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Now we know what they mean by ``advanced'' tactical training.} \label{chap:intro}
+
+Here's an acronym \ac{CRTBP} and a symbol \ac{F}, followed by some random text.
+Let's use an acronym from the \texttt{glossaries} package, \acrfull{crtbp} and \gls{F}.
+Now what are the possibilities of warp drive? Cmdr Riker's nervous system has been invaded by an unknown microorganism. The organisms fuse to the nerve, intertwining at the molecular level. That's why the transporter's biofilters couldn't extract it. The vertex waves show a K-complex corresponding to an REM state. The engineering section's critical. Destruction is imminent. Their robes contain ultritium, highly explosive, virtually undetectable by your transporter.
+
+Deflector power at maximum. Energy discharge in six seconds. Warp reactor core primary coolant failure. Fluctuate phaser resonance frequencies. Resistance is futile. Recommend we adjust shield harmonics to the upper EM band when proceeding. These appear to be some kind of power-wave-guide conduits which allow them to work collectively as they perform ship functions. Increase deflector modulation to upper frequency band.
+
+\section{Float environments}
+There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
+In addition, it offers the ability to ensure that this template actually follows the guidelines.
+
+\subsection{Figures}\label{ssec:figures}
+
+Here is a figure as shown in~\cref{fig:picard}.
+Notice how we're using the fancy referencing offered by the \verb+cleveref+ package.
+Instead of using the normal~\verb+\ref+ command we instead use~\verb+\cref+.
+The magic of \LaTeX automatically figures out that the previous reference points to a figure while~\cref{ssec:figures} points to a section.
+
+\begin{figure}
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/picard_yes.jpg}
+ \caption[Damage report!]{I'm afraid I still don't understand, sir.\label{fig:picard}}
+\end{figure}
+
+\subsection{Tables}\label{ssec:tables}
+
+Here's a table in~\cref{tab:table}
+
+\begin{table}
+\begin{center}
+ \begin{tabular}{ | l | l | l | p{5cm} |}
+ \hline
+ Day & Min Temp & Max Temp & Summary \\ \hline
+ Monday & 11C & 22C & A clear day with lots of sunshine.
+ However, the strong breeze will bring down the temperatures. \\ \hline
+ Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
+ across most of Scotland and Northern Ireland,
+ but rain reaching the far northwest. \\ \hline
+ Wednesday & 10C & 21C & Rain will still linger for the morning.
+ Conditions will improve by early afternoon and continue
+ throughout the evening. \\
+ \hline
+ \end{tabular}
+ \caption[Short caption for table]{Long caption for text \label{tab:table}}
+ \end{center}
+\end{table}
+
+\section{References and Citation}
+Here's we'll fill this section with some more interesting Star Trek text.
+Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
+
+Finally, we'll add a subfigure to demonstrate it's proper use.
+Many people use the package~\verb+subfigure+ but this is in fact, quite wrong.
+To begin, the~\verb+subfigure+ package has been deprecated, which one can check by going to \url{https://www.ctan.org/pkg/subfigure}{CTAN}.
+Instead, everyone should be using~\verb+subcaption+, just as this class file is already doing.
+Here, in~\cref{fig:xkcd}, we see two subfigures encapsulated in a larger figure environment.
+Luckily, with our fancy referencing we have access to both~\cref{fig:ext,fig:ksp} using the same commands.
+The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
+\begin{figure}[htbp]
+ \centering
+ \begin{subfigure}[htbp]{0.5\textwidth}
+ \includegraphics[width=\textwidth]{figures/file_extensions.png}
+ \caption{File Extensions} \label{fig:ext}
+ \end{subfigure}~ %add desired spacing between images, e. g. ~, \quad, \qquad, \hfill etc. %(or a blank line to force the subfigure onto a new line)
+ \begin{subfigure}[htbp]{0.5\textwidth}
+ \includegraphics[width=\textwidth]{figures/orbital_mechanics.png}
+ \caption{Kerbal Space Program} \label{fig:ksp}
+ \end{subfigure}
+ \caption[XKCD]{Some words of wisdom from Randall Munroe}
+ \label{fig:xkcd}
+\end{figure}
+
+\subsection{References}
+
+Lots of famous people tend to write famous papers~\cite{newton1999}.
+Were they famous because or in-spite of their papers?
+Regardless, they're famous now and we all should read them.
+Certain people are so famous and do such great work that they invent a whole new field of study with a single paper~\cite{kalman1960,shannon1949}
+
+\section{Math}
+
+Here are some nice equations~\cref{prob_def,prob_def_constrained}
+Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
+\begin{align}
+\label{prob_def}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\max_{s\subset W}\ P_{tr}(s) = \prod_{i=1}^{l-1} P_{tr}(s_j, s_{j+1}) \nonumber
+\end{align}
+
+Unidentified vessel travelling at sub warp speed, bearing 235.7. Fluctuations in energy readings from it, Captain. All transporters off. A strange set-up, but I'd say the graviton generator is depolarized. The dark colourings of the scrapes are the leavings of natural rubber, a type of non-conductive sole used by researchers experimenting with electricity. The molecules must have been partly de-phased by the anyon beam.
+\begin{align}
+\label{prob_def_constrained}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\text{subject to} \ P_{tr}(s)>\epsilon_{tr} \nonumber
+\end{align}
+
+We're acquainted with the wormhole phenomenon, but this... Is a remarkable piece of bio-electronic engineering by which I see much of the EM spectrum ranging from heat and infrared through radio waves, et cetera, and forgive me if I've said and listened to this a thousand times. This planet's interior heat provides an abundance of geothermal energy. We need to neutralize the homing signal.
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/intro.tex new/doc/latex/thesis-gwu/tex/intro.tex
--- old/doc/latex/thesis-gwu/tex/intro.tex 2017-12-22 00:58:11.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/intro.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,102 +1,15 @@
% !TEX root = ../thesis-sample.tex
-\chapter{Now we know what they mean by ``advanced'' tactical training.} \label{chap:intro}
+\chapter{Introduction} \label{chap:intro}
Here's an acronym \ac{CRTBP} and a symbol \ac{F}, followed by some random text.
Let's use an acronym from the \texttt{glossaries} package, \acrfull{crtbp} and \gls{F}.
-Now what are the possibilities of warp drive? Cmdr Riker's nervous system has been invaded by an unknown microorganism. The organisms fuse to the nerve, intertwining at the molecular level. That's why the transporter's biofilters couldn't extract it. The vertex waves show a K-complex corresponding to an REM state. The engineering section's critical. Destruction is imminent. Their robes contain ultritium, highly explosive, virtually undetectable by your transporter.
-
-Deflector power at maximum. Energy discharge in six seconds. Warp reactor core primary coolant failure. Fluctuate phaser resonance frequencies. Resistance is futile. Recommend we adjust shield harmonics to the upper EM band when proceeding. These appear to be some kind of power-wave-guide conduits which allow them to work collectively as they perform ship functions. Increase deflector modulation to upper frequency band.
-
-\section{Float environments}
-There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
-In addition, it offers the ability to ensure that this template actually follows the guidelines.
-
-\subsection{Figures}\label{ssec:figures}
-
-Here is a figure as shown in~\cref{fig:picard}.
-Notice how we're using the fancy referencing offered by the \verb+cleveref+ package.
-Instead of using the normal~\verb+\ref+ command we instead use~\verb+\cref+.
-The magic of \LaTeX automatically figures out that the previous reference points to a figure while~\cref{ssec:figures} points to a section.
-
-\begin{figure}
- \centering
- \includegraphics[width=0.5\textwidth]{figures/picard_yes.jpg}
- \caption[Damage report!]{I'm afraid I still don't understand, sir.\label{fig:picard}}
-\end{figure}
-
-\subsection{Tables}\label{ssec:tables}
-
-Here's a table in~\cref{tab:table}
-
-\begin{table}
-\begin{center}
- \begin{tabular}{ | l | l | l | p{5cm} |}
- \hline
- Day & Min Temp & Max Temp & Summary \\ \hline
- Monday & 11C & 22C & A clear day with lots of sunshine.
- However, the strong breeze will bring down the temperatures. \\ \hline
- Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
- across most of Scotland and Northern Ireland,
- but rain reaching the far northwest. \\ \hline
- Wednesday & 10C & 21C & Rain will still linger for the morning.
- Conditions will improve by early afternoon and continue
- throughout the evening. \\
- \hline
- \end{tabular}
- \caption[Short caption for table]{Long caption for text \label{tab:table}}
- \end{center}
-\end{table}
-
-\section{References and Citation}
-Here's we'll fill this section with some more interesting Star Trek text.
-Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
-
-Finally, we'll add a subfigure to demonstrate it's proper use.
-Many people use the package~\verb+subfigure+ but this is in fact, quite wrong.
-To begin, the~\verb+subfigure+ package has been deprecated, which one can check by going to \url{https://www.ctan.org/pkg/subfigure}{CTAN}.
-Instead, everyone should be using~\verb+subcaption+, just as this class file is already doing.
-Here, in~\cref{fig:xkcd}, we see two subfigures encapsulated in a larger figure environment.
-Luckily, with our fancy referencing we have access to both~\cref{fig:ext,fig:ksp} using the same commands.
-The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
-\begin{figure}[htbp]
- \centering
- \begin{subfigure}[htbp]{0.5\textwidth}
- \includegraphics[width=\textwidth]{figures/file_extensions.png}
- \caption{File Extensions} \label{fig:ext}
- \end{subfigure}~ %add desired spacing between images, e. g. ~, \quad, \qquad, \hfill etc. %(or a blank line to force the subfigure onto a new line)
- \begin{subfigure}[htbp]{0.5\textwidth}
- \includegraphics[width=\textwidth]{figures/orbital_mechanics.png}
- \caption{Kerbal Space Program} \label{fig:ksp}
- \end{subfigure}
- \caption[XKCD]{Some words of wisdom from Randall Munroe}
- \label{fig:xkcd}
-\end{figure}
-
-\subsection{References}
-
-Lots of famous people tend to write famous papers~\cite{newton1999}.
-Were they famous because or in-spite of their papers?
-Regardless, they're famous now and we all should read them.
-Certain people are so famous and do such great work that they invent a whole new field of study with a single paper~\cite{kalman1960,shannon1949}
-
-\section{Math}
-
-Here are some nice equations~\cref{prob_def,prob_def_constrained}
-Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
-\begin{align}
-\label{prob_def}
-&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
-&\max_{s\subset W}\ P_{tr}(s) = \prod_{i=1}^{l-1} P_{tr}(s_j, s_{j+1}) \nonumber
-\end{align}
-
-Unidentified vessel travelling at sub warp speed, bearing 235.7. Fluctuations in energy readings from it, Captain. All transporters off. A strange set-up, but I'd say the graviton generator is depolarized. The dark colourings of the scrapes are the leavings of natural rubber, a type of non-conductive sole used by researchers experimenting with electricity. The molecules must have been partly de-phased by the anyon beam.
-\begin{align}
-\label{prob_def_constrained}
-&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
-&\text{subject to} \ P_{tr}(s)>\epsilon_{tr} \nonumber
-\end{align}
-
-We're acquainted with the wormhole phenomenon, but this... Is a remarkable piece of bio-electronic engineering by which I see much of the EM spectrum ranging from heat and infrared through radio waves, et cetera, and forgive me if I've said and listened to this a thousand times. This planet's interior heat provides an abundance of geothermal energy. We need to neutralize the homing signal.
-
+\section{Opinions of socio-technical systems can affect system success}
+asdf
+\section{Vaccination: urgent social failure of technology}
+asdf
+\section{Contributions}
+asdf
+\section{Layout}
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/litreview.tex new/doc/latex/thesis-gwu/tex/litreview.tex
--- old/doc/latex/thesis-gwu/tex/litreview.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/litreview.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,26 @@
+% !TEX root = ../thesis-sample.tex
+\chapter{What can we learn from prior literature on measuring trust in vaccines on social media?}\label{chap:litreview}
+This section details four items in the literature that impact our contributions. First, it details the aspects of trust in vaccines that affect our contribution to measure it on social media; next it presents synergistic opportunity to incorporate surveys into social media monitoring; third it describes checklist of construct validity; last it shows gap in discriminant validity.
+\section{Trust in vaccines is complex but valuable to measure}
+asdf
+\section{Social media monitoring has speed, scale; surveys have construct validity}
+asdf
+\section{Combining two data sources to measure something involves a discussion of construct validity}
+
+Four steps relating to training data
+\subsection{Clear definition and operationalization}
+asdf
+\subsection{Reliability}
+asdf
+\subsection{Face validity}
+asdf
+\subsection{Content validity}
+asdf
+\subsection{Predictive and concurrent validity is well-understood in social media monitoring}
+asdf
+\subsection{Social media research often stops with convergent validity}
+sadf
+\subsection{Discriminant validity is a gap in social media monitoring}
+asdf
+\section{The literature contains three gaps:}
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/manual-ex.tex new/doc/latex/thesis-gwu/tex/manual-ex.tex
--- old/doc/latex/thesis-gwu/tex/manual-ex.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/manual-ex.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,322 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Leveraging the household sector’s ideas} \label{chap:ECAST}
+
+\section{Introduction}
+A new paradigm of innovation recognizes the efforts of individuals within the general public, or “household sector” (von Hippel, 2017), who feel strongly enough about a problem to create and share their ideas for free. Scholars theorize that this process is highly personal or “local” (von Hippel, 2017, 2005). Individuals view—or formulate (Lüthje et al., 2005; Shah and Tripsas, 2007)—the problem through their perceptions and experiences. Their choice of knowledge to apply is also informed by their background (Franke et al., 2013; Jeppesen and Lakhani, 2010). The resulting combinations of formulations and knowledge can be valuable to those who cannot draw on the same material (Afuah and Tucci, 2012; Franke et al., 2013; Prahalad, 2004)—they are “distant” from it. Additionally, these individuals represent a significant portion of the general public (de Jong, 2016; von Hippel et al., 2012, 2011), contributing across a wide range of domains like baby products (Poetz and Schreier, 2012), mountain bikes (Lüthje et al., 2005), and medical devices (Lettl et al., 2009; von Hippel, 2017).
+
+Despite the household sector’s potential for capability and capacity, organizations have struggled to leverage them alongside their internal efforts. In fact, organizations judge most contributions from the innovative public to be of little value. For example, BP’s call for ideas after the Deepwater Horizon oil spill in the Gulf of Mexico received 120,000 contributions (Gulf Coast Ecosystem Restoration Council, 2010) to seal the well or clean up the affected waterways (Goldenberg, 2011). According to BP, however, the public’s effort “yielded very little in terms of results” (Goldenberg, 2011) and did not translate into a solution that went “all the way” (Alexy et al., 2012, p. 117) to implementation. These scenarios highlight the current inability to bridge the public-organization gap successfully. Organizations can prompt a large amount of free effort from the public. However, their efforts are wasted if the problem is mismatched for the public’s strengths, or their resulting contributions are not—or cannot—be translated into the organization’s context.
+
+This work is an attempt to bridge that gap. The literature has theorized that the public’s local knowledge (Afuah and Tucci, 2012; Franke et al., 2013; Jeppesen and Lakhani, 2010) and local formulation (Lüthje et al., 2005) of the problem are drivers for quality. Scholars have also explored how a contribution that is distant or lacks enough depth can be misjudged (di Gangi et al., 2010; di Gangi and Wasko, 2009; Piezunka and Dahlander, 2014), even if it solves the problem. In this paper, we studied how the constructs of local knowledge, local formulation, and depth influence the substance of the public’s contributions, based on their impact within the focal organization.
+
+To answer this question, we selected a setting where the public’s contributions to a problem were meaningful to the focal organization. National Aeronautics and Space Administration (NASA)’s Asteroid Initiative was a program tasked with consolidating asteroid activities in the agency, as well as engaging with individuals and entities outside of the NASA’s established planetary defense community. We observed this program and its events across several years. Here, our data captured NASA’s change in perception of public contributions over time. Our data also captured the public’s solving processes and contributions to a mission design problem in a citizen forum—an event that played a crucial role in the perception change. Our analysis linked these two: we connected the public’s solving dynamics to this change in perception by unpacking how and when the public created contributions that were deemed substantive by NASA.
+
+While current theory implies direct links between the public’s problem-solving strengths and the substance of their contribution, we find only partially support for these relationships. As anticipated by theory, an individual’s use of their local knowledge correlated directly to the substance of their contribution. In contrast, the impact of an individual’s local formulation was more nuanced. Local formulation—reformulating the NASA problem in their own terms—increased the substance of their contribution because it increased the depth of said contribution. That is, the relationship between substance and formulation was fully mediated by depth of the contribution. Lastly, the interaction of local knowledge and local formulation consistently reduced the likelihood of a substantive contribution.
+
+Our findings contribute to understanding how organizations can leverage the public’s problem-solving efforts alongside their own (Chatterji and Fabrizio, 2011; Goucher-Lambert and Cagan, 2019; Lifshitz-Assaf, 2018; Lüthje et al., 2005; Szajnfarber and Vrolijk, 2018). We unpacked how the public created their most valuable contributions (Acar, 2019; Stock et al., 2016) to a problem that the focal organization considered important. We also studied the interaction of problem-solving constructs that are rarely examined at the same time (Gralla et al., 2016). More broadly, this work is an existence proof that the free innovation paradigm can be directed.
+
+We organized this paper as follows: first, we review the literature on local knowledge, local formulation, and depth of contributions. Next, we describe our setting, the data stemming from it, as well as the methods used in our analysis. Then, we present our results, and discuss these in the context of our setting and the existing literature. We conclude by explaining the limitations of the study, as well as outlining potential areas of future work.
+
+
+
+\section{General Usage}
+The way to invoke usage of this template is to put
+\begin{verbatim}
+\documentclass{thesis-gwu.cls}
+\end{verbatim}
+at the beginning of your preamble.
+This can also work if the \texttt{thesis-gwu.cls} file is not in the same directory as your \texttt{.tex} file.
+To do so, just give the relative path.
+\begin{verbatim}
+\documentclass{./tex/thesis-gwu.cls}
+\end{verbatim}
+
+Much like a usual article or report in \LaTeX, the user specifies the primary information about the document in the preamble with commands like
+\begin{verbatim}
+\author{Shankar Kulumani}
+\chair{Taeyoung Lee}
+\end{verbatim}
+At the beginning of the document, the title page will automatically be created and inserted at the beginning of the document.
+If you forget to declare any of the required fields, it will generate a title page with a message such as ``Insert an author!''
+
+However, the template does a lot more in the preamble than just create a title page.
+The preamble (that is, whatever comes before \texttt{begin\{document\}} in the primary \texttt{.tex} file) is also the place for the user to specify a dedication, any acknowledgments, a foreword, \textit{etc.}
+This is done in a manner very similar manner to declaring the author, title, and so on. Suppose that someone wants to have a simple dedication ``To Mom'', the following command is all that is needed.
+\begin{verbatim}
+\dedication{To Mom}
+\end{verbatim}
+This will cause the document to have a dedication page with the
+corresponding text.
+If the \texttt{dedication} command is not present, there will not be a dedication page.
+All the work of either having or not having a dedication has been compressed into a single command!
+Things other than simple text \emph{are} allowed in the dedication, so feel free to put equations or whatever inside there.
+There are a few more commands that can be used to customize the appearance of the dedication page, and also for the other preamble text pages, but that is left to~\cref{ssec:dedication}.
+
+\section{Front Matter}
+The \LaTeX term ``frontmatter'' refers to all of the pages that occur before the beginning of the first chapter.
+It is usually made clear to the reader because the pages in the front matter are numbered with lower-case Roman numerals instead of Arabic numerals.
+
+The present template, \texttt{thesis-gwu.cls} attempts to remove as much work associated with the front matter as possible.
+The template inserts all of the front matter pages automatically, so that there is
+not even a need to use a command like \verb+\maketitle+.
+The first thing after \verb+\begin{document}+ should be the start of the first
+chapter.
+
+\subsection{Identifiers}
+The template is not able to read minds, of course, so there needs to be some way of inputting the relevant information.
+This section covers how to specify the author, title, and so on.
+For the most part, this works just like any other \LaTeX~document, but a dissertation has a few more identifiers than most documents (How many books or reports have a
+committee?).
+So there are a few extra commands provided by this template, and they work \emph{almost} exactly like the standard commands.
+
+\begin{table}
+ \caption{ \label{tab:identifiers}
+ List of all identifier commands}
+ \centering
+ \small
+ \begin{tabular}{l @{\hspace{16pt}} l @{\hspace{16pt}} p{6cm}}
+ \hline \hline
+ \textsc{Item} & \textsc{Usage} & \textsc{Comment} \\
+ \hline
+ Author & \verb|\author{...}|
+ & Works as in standard \LaTeX \\
+ Chair & \verb|\chair{...}|
+ & Name of chair \emph{without} any title or affiliation. This
+ appears only on the abstract page, and only if there is no
+ co-chair. \\
+ Co-chair & \verb|\cochair{...}|
+ & Names of all co-chairs \emph{without} any titles or
+ affiliations. This appears only on the abstract page. Note
+ that by convention, it is not chair \emph{and} co-chair, but
+ just two co-chairs. \\
+ Committee & \verb|\committee{...}|
+ & Formatted names of committee members \emph{with} the
+ appropriate titles and university names. This will appear
+ only on the title page. \\
+ Department & \verb|\department{...}|
+ & Title of department of student \\
+ Title & \verb|\title{...}|
+ & Works as in standard \LaTeX \\
+ Year & \verb|\year=2012|
+ & Year that dissertation will be \emph{completed} \\
+ \hline \hline
+ \end{tabular}
+\end{table}
+
+A full list of the identifiers is given in Table \cref{tab:identifiers}.
+You're free to adjust/delete these commands as desired.
+
+
+
+\subsection{Frontispiece and Copyright}
+
+By default, the template assumes that there should be a copyright page, and the copyright holder is the author.
+To prevent the copyright page from appearing, use the command \verb|\hidecopyright|.
+To assign the copyright to someone other than the author, use the following command.
+\begin{verbatim}
+\copyrightholder{Someone Else}
+\end{verbatim}
+
+
+\subsection{Text Pages} \label{ssec:dedication}
+The handling of the first few pages after the title page is one of the best features of this template.
+The pages that occur between the copyright page and the abstract page all consist of short pieces of text that are usually a single paragraph.
+The text for each of these pages is set up using a command of the same name.
+Generally, only one of the front matter pages is used.
+\begin{verbatim}
+\foreword{This is going to be the best dissertation ever.}
+\end{verbatim}
+Usually the contents of each of these pages will be longer than a single sentence, and thus it should be noted that each of these commands allows most types of \LaTeX~input.
+For example, the following is perfectly acceptable input--at least as far as the template is concerned.
+\begin{verbatim}
+\foreword{This is going to be the \emph{best}. \\
+ \begin{center} Really, really. \end{center}}
+\end{verbatim}
+
+As I mentioned before, a given page will appear in the document if and only if the corresponding command is used.
+The order in which the pages appear does not depend on the order the commands are used in the preamble.
+You can also prevent the pages from appearing by using commands like \verb|\hideforeword|.
+
+The style of each page can also be set by the user.
+By default, each page will appear with a bold, italic heading corresponding to the name
+of the page.
+However, there are five other formats, which can be controlled using an optional argument.
+For example, the following command creates a dedication page with no heading (\textit{i.e.}~it does not say ``Dedication'' on the page) but with lines above and below the dedication text.
+\begin{verbatim}
+\dedication[4]{To Mom}
+\end{verbatim}
+A complete list of the available styles is given in \cref{tab:fronstyle}.
+The style of each page can be set independently, but it is also possible to change which style is used by default.
+\begin{verbatim}
+\frontpagestyle{6}
+\end{verbatim}
+This would make all of the commands that were called without optional
+inputs to create pages using style 6.
+
+\begin{table}
+ \caption{ \label{tab:fronstyle}
+ List of styles for frontmatter text pages}
+ \centering
+ \begin{tabular}{c @{\hspace{16pt}} p{8cm}}
+ \hline \hline
+ \textsc{Style} & \textsc{Description} \\
+ \hline
+ 1 & Justified text with no header or lines \\
+ 2 & Justified text with bold italic header and no lines \\
+ 3 & Justified text, capitalized header, no lines \\
+ 4 & Justified text with lines and no header \\
+ 5 & Justified text with bold italic header and lines \\
+ 6 & Justified text with capitalized header and lines \\
+ other & Centered text with no header or lines \\
+ \hline \hline
+ \end{tabular}
+\end{table}
+
+
+
+\subsection{Lists of Things} \label{ssec:lists}
+Suffice it to say that this template handles the Table of Contents appropriately, but this section is also meant to address the List of Figures, List of Tables, \textit{etc}. According to the guidelines, a corresponding list must appear if there is more than one figure, table, map, program, illustration, or appendix.
+The template assumes that the dissertation will contain at least two figures and tables.
+If, for example, there is only one figure,
+\begin{verbatim}
+\hidelistoffigures
+\end{verbatim}
+must be put in the preamble.
+There are similar commands to hide/show all of the front matter pages.
+These can be used at will as desired.
+
+\subsection{Glossary of Terms}\label{ssec:glossary}
+Here is an example.
+\Gls{linux} is a computer operating system, and its completely free and open.
+
+A \gls{matrix}, denoted \gls{M}.
+Lots of \glspl{matrix}.
+\Glspl{matrix} are a rectangular array of quantities.
+No indexing, linking, or formatting: \glsentrytext{matrix}.
+The identity \gls{matrix}['s] diagonal consists of ones.
+
+First use: \gls{filo}.
+Next use: \gls{filo}.
+Full form: \acrfull{filo}.
+
+
+\subsection{Acronymns and Symbols}\label{ssec:acronymns}
+The other type of list that can occur is for abbreviations of various types.
+This is a somewhat convenient feature, particularly there are a lot of acronyms in the dissertation.
+This template utilizes the \texttt{acronym} or \texttt{glossaries} packages, but eventually I would like to migrate to the use of \texttt{glossaries} which is continuing to be supported and deprecate the use of \texttt{acronym}, for now both are supported.
+
+\subsubsection{\texttt{acronymn} usage - try to avoid using this as it's not the best}
+In the preamble put a command like the following.
+\begin{verbatim}
+\abbreviations{
+ \acro{CFD}{Computational Fluid Dynamics}
+ \acro{LOA}{List of Abbreviations}
+ \acro{H2O}[$\mathrm{H_2O}$]{water}}
+\end{verbatim}
+This will define a bunch of abbreviations that can be used.
+When you want to use one of the acronyms within the text, simply use the \verb|\ac| command to refer to the abbreviation you want.
+This will automatically spell out what the abbreviation stands for on the first use and only print out the abbreviation on subsequent uses.
+
+\subsubsection{\texttt{glossaries} usage - much improved and more powerful}
+In addition, you can utilize the much more powerful \texttt{glossaries} package.
+You can define symbols, acronymns, or full glossary entries as desired.
+Each acronymn is defined using the following:
+\begin{verbatim}
+\newacronym{crtb}{CRTBP}{Circular Restricted Three Body Problem}
+\end{verbatim}
+Here we can use an acronym, such as \gls{crtbp}.
+Or display the full name, \gls{crtbp}.
+
+\section{Float environments}
+There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
+In addition, it offers the ability to ensure that this template actually follows the guidelines.
+
+\subsection{Figures}\label{ssec:figures}
+
+Here is a figure as shown in~\cref{fig:picard}.
+Notice how we're using the fancy referencing offered by the \verb+cleveref+ package.
+Instead of using the normal~\verb+\ref+ command we instead use~\verb+\cref+.
+The magic of \LaTeX automatically figures out that the previous reference points to a figure while~\cref{ssec:figures} points to a section.
+
+\begin{figure}
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/picard_yes.jpg}
+
+ \caption[Damage report!]{Glad to have a thesis class\label{fig:picard}}
+\end{figure}
+
+Here's another figure that demonstrates the use of \texttt{tikz} and the externalization library.
+\begin{figure}
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[
+ xlabel={$x$},
+ ylabel={$y$},
+ ]
+ \addplot {x^2};
+ \end{axis}
+ \end{tikzpicture}
+ \caption{Externajhjhjhjjhi\label{fig:tikz}}
+\end{figure}
+
+\subsection{Tables}\label{ssec:tables}
+
+Here's a table in~\cref{tab:table}
+
+\begin{table}
+\begin{center}
+ \begin{tabular}{ | l | l | l | p{5cm} |}
+ \hline
+ Day & Min Temp & Max Temp & Summary \\ \hline
+ Monday & 11C & 22C & A clear day with lots of sunshine.
+ However, the strong breeze will bring down the temperatures. \\ \hline
+ Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
+ across most of Scotland and Northern Ireland,
+ but rain reaching the far northwest. \\ \hline
+ Wednesday & 10C & 21C & Rain will still linger for the morning.
+ Conditions will improve by early afternoon and continue
+ throughout the evening. \\
+ \hline
+ \end{tabular}
+ \caption[Short caption for table]{Long caption for text \label{tab:table}}
+ \end{center}
+\end{table}
+
+\section{References and Citation}
+Finally, we'll add a subfigure to demonstrate it's proper use.
+Many people use the package~\verb+subfigure+ but this is in fact, quite wrong.
+To begin, the~\verb+subfigure+ package has been deprecated, which one can check by going to \url{https://www.ctan.org/pkg/subfigure}{CTAN}.
+Instead, everyone should be using~\verb+subcaption+, just as this class file is already doing.
+Here, in~\cref{fig:xkcd}, we see two subfigures encapsulated in a larger figure environment.
+Luckily, with our fancy referencing we have access to both~\cref{fig:ext,fig:ksp} using the same commands.
+The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
+
+
+\subsection{References}
+
+Lots of famous people tend to write famous papers~\cite{newton1999}.
+Were they famous because or in-spite of their papers?
+Regardless, they're famous now and we all should read them.
+Certain people are so famous and do such great work that they invent a whole new field of study with a single paper~\cite{kalman1960,shannon1949}
+
+\section{Math}
+
+Here are some nice equations~\cref{prob_def,prob_def_constrained}
+\begin{align}
+\label{prob_def}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\max_{s\subset W}\ P_{tr}(s) = \prod_{i=1}^{l-1} P_{tr}(s_j, s_{j+1}) \nonumber
+\end{align}
+
+Here's another equation.
+\begin{align}
+\label{prob_def_constrained}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\text{subject to} \ P_{tr}(s)>\epsilon_{tr} \nonumber
+\end{align}
+
+
+
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/manual.tex new/doc/latex/thesis-gwu/tex/manual.tex
--- old/doc/latex/thesis-gwu/tex/manual.tex 2018-07-10 23:07:37.000000000 +0200
+++ new/doc/latex/thesis-gwu/tex/manual.tex 2020-03-13 22:02:20.000000000 +0100
@@ -214,7 +214,7 @@
\acro{H2O}[$\mathrm{H_2O}$]{water}}
\end{verbatim}
This will define a bunch of abbreviations that can be used.
-When you want to use one of the acronyms within the text, simply use the \verb|\ac| command to refer to the abbreviation you want.
+When you want to use one of the acronyms within the text, simply use the \verb|\ac| command to refer to the abbreviation you want.
This will automatically spell out what the abbreviation stands for on the first use and only print out the abbreviation on subsequent uses.
\subsubsection{\texttt{glossaries} usage - much improved and more powerful}
@@ -224,9 +224,14 @@
\begin{verbatim}
\newacronym{crtb}{CRTBP}{Circular Restricted Three Body Problem}
\end{verbatim}
-Here we can use an acronym, such as \gls{crtbp}.
+Here we can use an acronym, such as \gls{crtbp}.
Or display the full name, \gls{crtbp}.
+Here's an \verb|\ac| acronym \ac{CRTBP}, followed by some random text, but \ac{HIDEME}
+
+
+Let's use an acronym from the \texttt{glossaries} package, \acrfull{crtbp} and \gls{F} but \acrfull{hideme}.
+
\section{Float environments}
There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
In addition, it offers the ability to ensure that this template actually follows the guidelines.
@@ -263,22 +268,25 @@
Here's a table in~\cref{tab:table}
\begin{table}
-\begin{center}
+ \centering
+ %\resizebox{\textwidth}{!}{
\begin{tabular}{ | l | l | l | p{5cm} |}
\hline
- Day & Min Temp & Max Temp & Summary \\ \hline
+ Day & Min Temp & Max Temp & Summary \\
+ \hline
Monday & 11C & 22C & A clear day with lots of sunshine.
- However, the strong breeze will bring down the temperatures. \\ \hline
- Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
+ However, the strong breeze will bring down the temperatures. \\
+ \hline
+ Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
across most of Scotland and Northern Ireland,
- but rain reaching the far northwest. \\ \hline
- Wednesday & 10C & 21C & Rain will still linger for the morning.
+ but rain reaching the far northwest. \hfill \\
+ \hline
+ Wednesday & 10C & 21C & Rain will still linger for the morning. \hfill
Conditions will improve by early afternoon and continue
- throughout the evening. \\
+ throughout the evening.\\
\hline
\end{tabular}
\caption[Short caption for table]{Long caption for text \label{tab:table}}
- \end{center}
\end{table}
\section{References and Citation}
@@ -291,7 +299,7 @@
The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
\begin{figure}[htbp]
\centering
- \begin{subfigure}[htbp]{0.5\textwidth}
+ \begin{subfigure}[htbp]{0.4\textwidth}
\includegraphics[width=\textwidth]{figures/file_extensions.png}
\caption{File Extensions} \label{fig:ext}
\end{subfigure}~ %add desired spacing between images, e. g. ~, \quad, \qquad, \hfill etc. %(or a blank line to force the subfigure onto a new line)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/methods.tex new/doc/latex/thesis-gwu/tex/methods.tex
--- old/doc/latex/thesis-gwu/tex/methods.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/methods.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,10 @@
+\chapter{Methods: injecting construct validity into social media monitoring with a survey}\label{chap:methods}
+
+This study’s contribution achieves all items on the validity checklist on the construct of trust in vaccines. Our method involves three parts. First, we leverage a survey on social media annotation to establish a reliable measure of trust in vaccines of Twitter, that fulfills face, content, predictive, and concurrent validity. Second, we expand this measure to an NLP classifier, achieving predictive and concurrent validity at the scale of big data. Third, we evaluate our classifier using the principles of convergent and discriminant validity.
+
+\section{Survey for attitudes and annotations to establish a measure}
+asdf
+\section{Reliable measure to NLP classifier with concurrent validity}
+asdf
+\section{Convergent and discriminant validation vs. existing standards}
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/prevmethods.tex new/doc/latex/thesis-gwu/tex/prevmethods.tex
--- old/doc/latex/thesis-gwu/tex/prevmethods.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/prevmethods.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,8 @@
+% !TEX root = ../thesis-sample.tex
+\chapter{Social media monitoring fails at measuring similar constructs without these methods. What can we learn?}\label{chap:prevmethods}
+
+\section{Traditional methods with NLP alone have succeeded in related but different problems}
+asdf
+\section{Lessons learned from attempts measuring similar constructs}
+asdf
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/results-example.tex new/doc/latex/thesis-gwu/tex/results-example.tex
--- old/doc/latex/thesis-gwu/tex/results-example.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/results-example.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,19 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Another sample chapter}\label{chap:ipsum}
+
+This chapter has several paragraphs of random text.
+This ensures our table of contents is correct and demonstrates how to use a multi-file \LaTeX document.
+
+\lipsum[1]
+
+\section{A section}
+\lipsum[10]
+
+\subsection{A subsection}
+\lipsum[9]
+
+\subsubsection{A subsubsection}
+\lipsum[11]
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/results.tex new/doc/latex/thesis-gwu/tex/results.tex
--- old/doc/latex/thesis-gwu/tex/results.tex 2017-12-22 00:58:11.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/results.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,19 +1,8 @@
-% !TEX root = ../thesis-sample.tex
-
-\chapter{Another sample chapter}\label{chap:ipsum}
-
-This chapter has several paragraphs of random text.
-This ensures our table of contents is correct and demonstrates how to use a multi-file \LaTeX document.
-
-\lipsum[1]
-
-\section{A section}
-\lipsum[10]
-
-\subsection{A subsection}
-\lipsum[9]
-
-\subsubsection{A subsubsection}
-\lipsum[11]
-
+\chapter{Results: we show a validated measure of trust in vaccines}\label{chap:results}
+\section{Establish a reliable measure with a survey, showing face-, content-, … through concurrent- validity}
+asdf
+\section{Extrapolate that reliable measure to big data, getting predictive and concurrent validity}
+asdf
+\section{Show convergence and divergence which compete our checklist of a valid measure}
+\section{Recap: Our measure obtains all items on our validity checklist}
Binary files old/doc/latex/thesis-gwu/thesis-sample.pdf and new/doc/latex/thesis-gwu/thesis-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/thesis-sample.tex new/doc/latex/thesis-gwu/thesis-sample.tex
--- old/doc/latex/thesis-gwu/thesis-sample.tex 2018-07-10 23:07:37.000000000 +0200
+++ new/doc/latex/thesis-gwu/thesis-sample.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,26 +1,21 @@
-\documentclass[thesis]{thesis-gwu}[2018/05/21]
+\documentclass[thesis]{thesis-gwu}[2020/02/03]
+
% this package is only used to generate some random text.
% it is not needed in a true document
\usepackage{lipsum}
-\input{tex/frontmatter}
-% this will speed up your tikz figures by building them once to another directory
-\usepackage{pgfplots}
-\usepgfplotslibrary{external}
-\tikzexternalize
-\tikzsetexternalprefix{cache/}
+\input{tex/frontmatter}
%% DOCUMENT AREA
\begin{document}
-
-\include{tex/manual}
-\include{tex/results}
+\include{tex/manual} % here is a manual on how to use the template
+\include{tex/results-example}
\bibliographystyle{plain}
\bibliography{thesis-bib}
% appendices must appear after
-\include{tex/appendix}
+\include{tex/appendix-ex}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-gwu.doc.tlpobj new/tlpkg/tlpobj/thesis-gwu.doc.tlpobj
--- old/tlpkg/tlpobj/thesis-gwu.doc.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thesis-gwu.doc.tlpobj 2020-03-14 01:43:43.000000000 +0100
@@ -1,9 +1,9 @@
name thesis-gwu.doc
category Package
-revision 48537
+revision 54287
shortdesc doc files of thesis-gwu
relocated 1
-docfiles size=139
+docfiles size=152
RELOC/doc/latex/thesis-gwu/LICENSE.md
RELOC/doc/latex/thesis-gwu/README.md
RELOC/doc/latex/thesis-gwu/figures/data.png
@@ -11,10 +11,19 @@
RELOC/doc/latex/thesis-gwu/figures/orbital_mechanics.png
RELOC/doc/latex/thesis-gwu/figures/picard_yes.jpg
RELOC/doc/latex/thesis-gwu/figures/tumblr_lrvyd1GuNe1r3aueno1_400.jpg
+ RELOC/doc/latex/thesis-gwu/tex/appendix-ex.tex
RELOC/doc/latex/thesis-gwu/tex/appendix.tex
+ RELOC/doc/latex/thesis-gwu/tex/conclusion.tex
+ RELOC/doc/latex/thesis-gwu/tex/discussion.tex
RELOC/doc/latex/thesis-gwu/tex/frontmatter.tex
+ RELOC/doc/latex/thesis-gwu/tex/intro-example.tex
RELOC/doc/latex/thesis-gwu/tex/intro.tex
+ RELOC/doc/latex/thesis-gwu/tex/litreview.tex
+ RELOC/doc/latex/thesis-gwu/tex/manual-ex.tex
RELOC/doc/latex/thesis-gwu/tex/manual.tex
+ RELOC/doc/latex/thesis-gwu/tex/methods.tex
+ RELOC/doc/latex/thesis-gwu/tex/prevmethods.tex
+ RELOC/doc/latex/thesis-gwu/tex/results-example.tex
RELOC/doc/latex/thesis-gwu/tex/results.tex
RELOC/doc/latex/thesis-gwu/thesis-bib.bib
RELOC/doc/latex/thesis-gwu/thesis-sample.pdf
++++++ thesis-gwu.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thesis-gwu/thesis-gwu.cls new/tex/latex/thesis-gwu/thesis-gwu.cls
--- old/tex/latex/thesis-gwu/thesis-gwu.cls 2018-09-02 00:17:26.000000000 +0200
+++ new/tex/latex/thesis-gwu/thesis-gwu.cls 2020-03-13 22:02:20.000000000 +0100
@@ -50,13 +50,14 @@
%% 2011.04.09 @Derek Dalle : Convert rac.sty --> thesis.umich.cls
%% 2016.09.24 @Shankar Kulumani : First attempt to modify for GWU
%% 2018.01.20 @Shankar Kulumani : Setup titlesec for modifying headings
+%% 2020.02.26 @Michael Smith : 2020 update for GWU template
%% ---- HEADERS --------------------------------------------------------
% This prevents the compiler from running on old versions of LaTeX.
\NeedsTeXFormat{LaTeX2e}
-% This command gives the name of the class.
-\ProvidesClass{thesis-gwu}[2018/08/31 v1.6.1 GWU Thesis template]
+% This command gives the name of the class and dates it
+\ProvidesClass{thesis-gwu}[2020/02/26 v1.7.0 GWU Thesis template]
%% ---- OPTIONS PROCESSING ---------------------------------------------
% Define three switches for the the thesis format types.
@@ -115,6 +116,7 @@
% if you call debug option then use the thesis option but not report
\DeclareOption{debug}{\@gwu@debugtrue\@gwu@thesistrue}
+% \@gwu@debugtrue % uncomment for debug mode
% Declare an option for the index.
\DeclareOption{index}{\@gwu@indextrue}
@@ -140,124 +142,9 @@
\@gwu@indexfalse
\fi
-
%% ---- PACKAGE LOADING ------------------------------------------------
+\input{required-packages}
-% This class uses the geometry.sty package to set the margins.
-\if@gwu@debug
- % Show margins
- \RequirePackage[top=1in,bottom=1in,left=1.25in, right=1.25in,
- showframe]{geometry}
-\else
- % Use the standard margins for the thesis version.
- \RequirePackage[top=1in,bottom=1in,left=1.25in, right=1.25in]{geometry}
-\fi
-
-% Obsolete package check
-\RequirePackage[l2tabu,orthodox]{nag}
-
-% This loads the required math packages.
-\RequirePackage[binary-units=true]{siunitx}
-\RequirePackage{amsmath}
-\RequirePackage{amsfonts}
-\RequirePackage{amssymb}
-\RequirePackage{mathtools}
-\RequirePackage{amsthm}
-
-% This loads the proper graphics package.
-\RequirePackage{graphicx}
-
-% Better spacing for text
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{lmodern}
-\RequirePackage{microtype}
-\RequirePackage{bm}
-
-\RequirePackage{mathptmx}
-
-% Add package for managing section headings
-\RequirePackage[]{titlesec}
-
-% This is useful for complex figures.
-\RequirePackage{subcaption}
-
-% Compress multiple citations
-% \RequirePackage{cite}
-
-% This package allows the ability to create a 'code' environment.
-\RequirePackage{verbatim}
-
-% This hopefully tells verbatim to leave my damn quotes alone.
-% \RequirePackage{upquote}
-
-% This package enables the use of proper single quotes in text.
-% \RequirePackage{textcomp}
-
-% This package is used to set line spacing.
-\RequirePackage{setspace}
-
-% This package is used to make nomenclature tables that can span pages.
-% \RequirePackage{longtable}
-
-% This package allows conditional testing of varibles.
-\RequirePackage{ifthen}
-
-% This package is used for silly letter spacing
-\RequirePackage{soul}
-
-% This package is used to generate alternate environments.
-\RequirePackage{float}
-
-% This package is for the index, if it is to be used.
-\if@gwu@index
- \RequirePackage{makeidx}
- \makeindex
-\fi
-
-% This is the package for special headers and footers.
-\RequirePackage{fancyhdr}
-
-% some extra packages to help with debugging
-\if@gwu@debug
- \RequirePackage[final]{showlabels} % show labels for referencing
- \RequirePackage{refcheck} % check for unused references/labels
-\fi
-
-%% ---- HYPERREF ----------------------------------------------------------
-% This loads a package that allows extra colors for links.
-\RequirePackage[]{color}
-% Custom color for references.
-% \definecolor{DarkGreen}{rgb}{0,0.6,0}
-
-% This will make labels and references hyperlinks.
-\if@gwu@backref%
- % Use references in the bibliography.
- \RequirePackage[pagebackref=true]{hyperref}%
-\else%
- % Do not use back references.
- \RequirePackage{hyperref}%
-\fi
-
- \hypersetup{%
- unicode=false, % non-Latin characters in Acrobat’s bookmarks
- pdftoolbar=true, % show Acrobat’s toolbar?
- pdfmenubar=true, % show Acrobat’s menu?
- pdffitwindow=false, % window fit to page when opened
- pdfstartview={FitV}, % fits the width of the page to the window
- pdfnewwindow=true, % links in new PDF window
- colorlinks=false, % false: boxed links; true: colored links
- bookmarksdepth=3,
- bookmarksopen=true,
- }%
-
-% Cleveref referencing - must happen after hyperref
-\AtEndOfClass{\RequirePackage[noabbrev,capitalize]{cleveref}}%
-
-% Glossaries package - must come after hypperef
-% This package is used for the list of abbreviations
-\RequirePackage[printonlyused]{acronym}%
-\RequirePackage[abbreviations,symbols,shortcuts=none,automake]{glossaries-extra}%
%% ---- FORMATTING -----------------------------------------------------
% Set the page style to fancy.
\pagestyle{fancy}
@@ -321,6 +208,7 @@
}
%%-------- GLOSSARIES STYLES------------------------------------
+
% define a new glossary style for acronymns and symbols
\renewcommand*{\glossarysection}[2][]{%
{\centering\bfseries{#2}\par}%
@@ -338,18 +226,22 @@
\renewcommand*{\glossarypreamble}{\vspace{4ex}}%
\renewcommand*{\glossaryheader}{}%
}
+
%% ---- TITLE PAGE -----------------------------------------------------
% The fields to be used for the title page
\renewcommand{\@title}{Insert a Title!}
\renewcommand{\@author}{Insert an Author!}
-\newcommand{\@bsdepartment}{Insert a BS department name!}
-\newcommand{\@bsschool}{Insert BS school!}
-\newcommand{\@bsgrad}{BS Grad date!}
-
-\newcommand{\@msdepartment}{Insert a MS department name!}
-\newcommand{\@msschool}{Insert MS school!}
-\newcommand{\@msgrad}{MS Grad date!}
+% and other fields
+\newcommand{\@bachelordegree}{Insert a Bachelor's degree!}
+\newcommand{\@bsdepartment}{Insert a Bachelor's department name!}
+\newcommand{\@bsschool}{Insert Bachelor's school!}
+\newcommand{\@bsgrad}{Bachelor's Grad date!}
+
+\newcommand{\@masterdegree}{Insert a Master's degree!}
+\newcommand{\@msdepartment}{Insert a Master's department name!}
+\newcommand{\@msschool}{Insert Master's school!}
+\newcommand{\@msgrad}{Master's Grad date!}
\newcommand{\@degree}{Doctor of Philosophy}
\newcommand{\@department}{Insert a Department Name!}
@@ -358,12 +250,14 @@
\newcommand{\@chairtitle}{Professor of INSERT Title!}
\newcommand{\@cochair}{}
\newcommand{\@phdgrad}{PhD Grad date!}
+\newcommand{\@phdschool}{Insert PhD school}
\newcommand{\@defensedate}{Insert defense date!}
% Commands to set the titlepage fields
\renewcommand{\title}[1]{\renewcommand{\@title}{#1}\@gwu@titlepagetrue}
\renewcommand{\author}[1]{\renewcommand{\@author}{#1}}
+\newcommand{\bachelordegree}[1]{\renewcommand{\@bachelordegree}{#1}}
\newcommand{\bsdepartment}[1]{\renewcommand{\@bsdepartment}{#1}}
\newcommand{\bsschool}[1]{\renewcommand{\@bsschool}{#1}}
\newcommand{\bsgrad}[1]{\renewcommand{\@bsgrad}{#1}}
@@ -371,6 +265,7 @@
\newcommand{\showmsdegree}{\@gwu@msdegreetrue}
\newcommand{\hidemsdegree}{\@gwu@msdegreefalse}
+\newcommand{\masterdegree}[1]{\renewcommand{\@masterdegree}{#1}}
\newcommand{\msdepartment}[1]{\renewcommand{\@msdepartment}{#1}}
\newcommand{\msschool}[1]{\renewcommand{\@msschool}{#1}}
\newcommand{\msgrad}[1]{\renewcommand{\@msgrad}{#1}}
@@ -382,15 +277,18 @@
\newcommand{\chairtitle}[1]{\renewcommand{\@chairtitle}{#1}}
\newcommand{\cochair}[1]{\renewcommand{\@cochair}{#1}}
\newcommand{\phdgrad}[1]{\renewcommand{\@phdgrad}{#1}}
+\newcommand{\phdschool}[1]{\renewcommand{\@phdschool}{#1}}
\newcommand{\defensedate}[1]{\renewcommand{\@defensedate}{#1}}
% Commands for the user to be able to use the defined fields.
\newcommand{\inserttitle}{\@title}
\newcommand{\insertauthor}{\@author}
+\newcommand{\insertbachelordegree}{\@bachelordegree}
\newcommand{\insertbsdepartment}{\@bsdepartment}
\newcommand{\insertbsschool}{\@bsschool}
\newcommand{\insertbsgrad}{\@bsgrad}
+\newcommand{\insertmasterdegree}{\@masterdegree}
\newcommand{\insertmsdepartment}{\@msdepartment}
\newcommand{\insertmsschool}{\@msschool}
\newcommand{\insertmsgrad}{\@msgrad}
@@ -403,6 +301,7 @@
\newcommand{\insertcochair}{\@cochair}
\newcommand{\insertyear}{\number\year}
\newcommand{\insertphdgrad}{\@phdgrad}
+\newcommand{\insertphdschool}{\@phdschool}
\newcommand{\insertdefensedate}{\@defensedate}
% This redefines the title page to automatically have all of the
@@ -429,19 +328,19 @@
%\vfill %
% previous degrees
\if@gwu@msdegree
- B.S. in \insertbsdepartment, \insertbsgrad, \insertbsschool \\
- M.S. in \insertmsdepartment, \insertmsgrad, \insertmsschool \\[2\baselineskip]
+ \insertbachelordegree \space in \insertbsdepartment, \insertbsgrad, \insertbsschool \\
+ \insertmasterdegree \space in \insertmsdepartment, \insertmsgrad, \insertmsschool \\[2\baselineskip]
\else
- B.S. in \insertbsdepartment, \insertbsgrad, \insertbsschool \\[2\baselineskip]
+ \insertbachelordegree \space in \insertbsdepartment, \insertbsgrad, \insertbsschool \\[2\baselineskip]
\fi
% Text from guidelines
A Dissertation submitted to \\[3\baselineskip] %
The Faculty of \\
- The School of Engineering and Applied Science \\
+ \insertphdschool \\
of The George Washington University \\
in partial satisfaction of the requirements \\
for the degree of \insertdegree \\[3\baselineskip]
- \insertphdgrad \\[4\baselineskip]
+ \insertphdgrad \\[3\baselineskip]
% insert doctoral advisor
Dissertation directed by \\[1\baselineskip]
\insertchair \\
@@ -488,22 +387,22 @@
\frntpg
\begin{doublespace}
\noindent
- The School of Engineering and Applied Science of The George Washington
+ \insertphdschool \space of The George Washington
University certifies that \insertauthor~has passed the Final Examination for the
- degree of \insertdegree~as of \insertdefensedate. This is the
- final and approved form of the dissertation.
+ degree of \insertdegree~as of \insertdefensedate. This is the final and approved form of the dissertation.
\end{doublespace}
\begin{center}
\begin{singlespace}
- {\normalsize\bfseries\inserttitle} \\[1\baselineskip]
+ \vspace{\baselineskip}
+ {\normalsize\bfseries\inserttitle} \\[3\baselineskip]
\insertauthor \\[3\baselineskip]
\end{singlespace}
\end{center}
% Non-justified content
\begin{flushleft}
% Heading for the committee
- Dissertation Research Committee: \\[2ex] %
+ Dissertation Research Committee: \\[4ex] %
% Horizontal spacing
\hspace{5em} %
% Insert the committee (in a box).
@@ -571,18 +470,22 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ %\vspace*{\stretch{2}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{2}}{ %
% Style 2: Bold heading at top of page. Doublespacing for text
% Center on the page.
% Heading
- \begin{center}\textbf{\normalsize{#3}}\end{center}
+ \begin{center}\textbf{\normalsize{#3}}
+ \vspace{\baselineskip}
+ \end{center}
\begin{doublespace}
\par #1
\end{doublespace}
% Vertical rubber space
- \vspace*{\stretch{1}} %
+ % \vspace*{\stretch{1}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{3}}{ %
% Style 3: Spread caps heading
@@ -603,7 +506,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ %\vspace*{\stretch{2}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{4}}{ %
% Style 4: lined
@@ -626,7 +530,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ %\vspace*{\stretch{2}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{5}}{ %
% Style 5: bold italic heading with lines
@@ -653,7 +558,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ % \vspace*{\stretch{2}}
+ \vspace*{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{6}}{ %
% Style 6: lined with spread caps header
@@ -680,7 +586,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ % \vspace*{\stretch{2}} %
+ \vspace*{\baselineskip} %
}{ %
% Default style: centered
% Vertical rubber space
@@ -694,7 +601,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{1}} %
+ \vspace*{\baselineskip} %
+ % \vspace*{\stretch{2}} %
}}}}}} %
}
@@ -954,16 +862,36 @@
\newcommand{\hideglossariesglossaryofterms}{\@gwu@glossaryoftermsfalse\@gwu@tableofcontentsfalse}
%% ---- TABLE OF CONTENTS ----------------------------------------------
-% This sets the formatting for chapter entries in the table of contents.
-\renewcommand*\l@chapter[2]{ %
- % First add some vertical space.
- \vskip 1ex plus 1pt minus 1pt
- % Format the spacing and use dots between title and number.
- \@dottedtocline{1}{0em}{1.2em} %
- % This sets the formatting for the chapter name and page number.
- {\textbf{#1}}{\textbf{#2}} %
- % Add some space below, too.
- \vskip 1ex}
+% this overwrites the tocloft defaults.
+% definitely could be less hacky, but unsure of how to properly do this or respect the other formatting below
+% including [titles] when loading tocloft also turns off the indentation needed!
+\renewcommand{\cfttoctitlefont}{\hfill\normalsize\bfseries}
+\renewcommand{\cftbeforetoctitleskip}{-2ex}
+\renewcommand{\cftaftertoctitleskip}{5ex}
+\renewcommand{\contentsname}{Table of Contents}
+\renewcommand{\cftaftertoctitle}{\hfill}
+\renewcommand{\cftloftitlefont}{\newpage\hfill\bfseries\normalsize}
+\renewcommand{\cftafterloftitle}{\hfill}
+\renewcommand{\cftbeforeloftitleskip}{0ex}
+\renewcommand{\cftafterloftitleskip}{5ex}
+\renewcommand{\cftlottitlefont}{\newpage\hfill\bfseries\normalsize}
+\renewcommand{\cftafterlottitle}{\hfill}
+\renewcommand{\cftbeforelottitleskip}{0ex}
+\renewcommand{\cftafterlottitleskip}{5ex}
+% add 'chapter' preceding the section num in TOC
+\renewcommand{\cftchappresnum}{\chaptername\space}
+\renewcommand{\cftchapaftersnum}{:}
+\setlength{\cftchapnumwidth}{\widthof{Appendix AAA~ }}
+% but change "chapter" to 'appendix' by hacking the \appendix command
+% patching "appendix" per https://texfaq.org/FAQ-patch
+\let\OldAppendix\appendix
+\renewcommand{\appendix}{
+\OldAppendix
+\addtocontents{toc}{%
+ \protect\renewcommand{\protect\cftchappresnum}{\appendixname\space}
+ }
+}
+
% These lines set the spacing for other table of contents entries.
\renewcommand*{\l@section}{\@dottedtocline{2}{2.5em}{2em}}
@@ -988,7 +916,7 @@
% Add the title
\begin{center}{\normalsize\textbf{Table of Contents}}\end{center} %
% Add some space after the title.
- \vspace{2ex} %
+ \vspace{1ex} %
% Start the automatic table of contents features.
\begin{singlespace} %
\@starttoc{toc}\if@restonecol\twocolumn\fi %
@@ -1176,7 +1104,7 @@
%\begin{minipage}{0.8\textwidth} \vspace{1in} \end{minipage} \\ %
\fi %
% Add the title
- \begin{center}{\normalsize\textbf{List of Abbreviations}}\\[2\baselineskip] \end{center}%
+ \begin{center}{\normalsize\textbf{List of Abbreviations}}\\[3\baselineskip] \end{center}%
% Add some space after the title.
% \vspace{1ex} %
% Start the automatic abbreviations feature.
@@ -1403,7 +1331,7 @@
\let\@tex@bibliography\bibliography
% Change the bibliography header.
-\renewcommand*{\bibname}{\centerline{\normalsize Bibliography}}
+\renewcommand*{\bibname}{\centering{\normalsize Bibliography}}
% Create a new command for the bibliography.
\renewcommand*{\bibliography}[1]{ %
@@ -1551,5 +1479,4 @@
\twocolumn %
\fi %
}
-}
-
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-gwu.tlpobj new/tlpkg/tlpobj/thesis-gwu.tlpobj
--- old/tlpkg/tlpobj/thesis-gwu.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thesis-gwu.tlpobj 2020-03-14 01:43:43.000000000 +0100
@@ -1,6 +1,6 @@
name thesis-gwu
category Package
-revision 48537
+revision 54287
shortdesc Thesis class for George Washington University School of Engineering and Applied Science
relocated 1
longdesc This class is an attempt to create a standard format for GWU
@@ -14,7 +14,6 @@
catalogue-contact-home https://github.com/skulumani/thesis-gwu
catalogue-contact-repository https://github.com/skulumani/thesis-gwu
catalogue-ctan /macros/latex/contrib/thesis-gwu
-catalogue-date 2018-08-31 23:05:31 +0200
catalogue-license gpl3
catalogue-topics dissertation class
-catalogue-version 1.6.1
+catalogue-version 1.7.0
++++++ thmtools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thmtools/README new/doc/latex/thmtools/README
--- old/doc/latex/thmtools/README 2008-02-18 01:22:07.000000000 +0100
+++ new/doc/latex/thmtools/README 2019-12-23 22:35:29.000000000 +0100
@@ -12,5 +12,11 @@
hyperref/autoref compatibility
a way of restating entire theorems with a single macro call
-License: LPPL 1.3a; maintained by ulmi@absatzen.de
+License: LPPL 1.3c
+
+Currently the package has no maintainer ... and is looking for one!
+
+Previous Maintainer was Ulrich M. Schwarz, ulmi@absatzen.de
+
+
$Id: README,v 1.1 2008/02/17 21:13:58 ulmi Exp ulmi $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thmtools/VERSION.tex new/doc/latex/thmtools/VERSION.tex
--- old/doc/latex/thmtools/VERSION.tex 2014-04-22 23:16:07.000000000 +0200
+++ new/doc/latex/thmtools/VERSION.tex 2019-12-23 22:35:29.000000000 +0100
@@ -1 +1,2 @@
-\def\x #1-#2-#3 #4 v#5\@{\def\VERSION{#1/#2/#3 v#5}}\x 2014-04-21 20:11:26 +0200 v66\@
\ No newline at end of file
+% set by hand as I don't use CVS
+\def\x #1-#2-#3 #4 v#5\@{\def\VERSION{#1/#2/#3 v#5}}\x 2019-12-22 00:00:00 +0200 v68\@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thmtools/changes.txt new/doc/latex/thmtools/changes.txt
--- old/doc/latex/thmtools/changes.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thmtools/changes.txt 2019-12-23 22:35:29.000000000 +0100
@@ -0,0 +1,6 @@
+2019-12-22 Frank Mittelbach
+
+ * thm-kv.dtx:
+ removed dependency on etexcmds package
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmtools.doc.tlpobj new/tlpkg/tlpobj/thmtools.doc.tlpobj
--- old/tlpkg/tlpobj/thmtools.doc.tlpobj 2019-02-28 04:08:34.000000000 +0100
+++ new/tlpkg/tlpobj/thmtools.doc.tlpobj 2019-12-24 01:55:05.000000000 +0100
@@ -1,12 +1,13 @@
name thmtools.doc
category Package
-revision 33624
+revision 53219
shortdesc doc files of thmtools
relocated 1
-docfiles size=75
+docfiles size=76
RELOC/doc/latex/thmtools/COPYING
RELOC/doc/latex/thmtools/README
RELOC/doc/latex/thmtools/TODO
RELOC/doc/latex/thmtools/VERSION.tex
+ RELOC/doc/latex/thmtools/changes.txt
RELOC/doc/latex/thmtools/thmtools-manual.tex
RELOC/doc/latex/thmtools/thmtools.pdf
++++++ thmtools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/aliasctr.sty new/tex/latex/thmtools/aliasctr.sty
--- old/tex/latex/thmtools/aliasctr.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/aliasctr.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {aliasctr}[2014/04/21 v66]
+\ProvidesPackage {aliasctr}[2019/12/22 v68]
\def\aliasctr@f@llow#1#2\@nil#3{%
\ifx#1\@elt
\noexpand #3%
@@ -37,7 +36,7 @@
\let\@elt\relax
\expandafter\@cons\aliasctr@@truelist{{#1}}%
\egroup}
-\RequirePackage{remreset}
+\@ifundefined{@removefromreset}{\RequirePackage{remreset}}{}
\renewcommand*\@removefromreset[2]{\bgroup
\edef\aliasctr@@truelist{\aliasctr@follow{#2}}%
\expandafter\let\csname c@#1\endcsname\@removefromreset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/parseargs.sty new/tex/latex/thmtools/parseargs.sty
--- old/tex/latex/thmtools/parseargs.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/parseargs.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {parseargs}[2014/04/21 v66]
+\ProvidesPackage {parseargs}[2019/12/22 v68]
\newtoks\@parsespec
\def\parse@endquark{\parse@endquark}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-amsthm.sty new/tex/latex/thmtools/thm-amsthm.sty
--- old/tex/latex/thmtools/thm-amsthm.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-amsthm.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-amsthm}[2014/04/21 v66]
+\ProvidesPackage {thm-amsthm}[2019/12/22 v68]
\providecommand\thmt@space{ }
\define@key{thmstyle}{spaceabove}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-autoref.sty new/tex/latex/thmtools/thm-autoref.sty
--- old/tex/latex/thmtools/thm-autoref.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-autoref.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-autoref}[2014/04/21 v66]
+\ProvidesPackage {thm-autoref}[2019/12/22 v68]
\RequirePackage{thm-patch, aliasctr, parseargs, keyval}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-beamer.sty new/tex/latex/thmtools/thm-beamer.sty
--- old/tex/latex/thmtools/thm-beamer.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-beamer.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-beamer}[2014/04/21 v66]
+\ProvidesPackage {thm-beamer}[2019/12/22 v68]
\newif\ifthmt@hasoverlay
\def\thmt@parsetheoremargs#1{%
\parse{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-kv.sty new/tex/latex/thmtools/thm-kv.sty
--- old/tex/latex/thmtools/thm-kv.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-kv.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-kv}[2014/04/21 v66]
+\ProvidesPackage {thm-kv}[2019/12/22 v68]
\let\@xa\expandafter
\let\@nx\noexpand
@@ -79,7 +78,7 @@
\unless \ifcsname KVS@#1@handler\endcsname
\kv@error@unknownkey {#1}{#2}%
\else
- \kv@handled@true
+ \kv@handled@true
\csname KVS@#1@handler\endcsname {#2}{#3}\relax
\ifkv@handled@ \else
\kv@error@unknownkey {#1}{#2}%
@@ -104,7 +103,7 @@
\csname @safe@activestrue\endcsname
\@xa\let\csname ifincsname\@xa\endcsname\csname iftrue\endcsname
\edef\KVS@temp{\endgroup
- \noexpand\KVS@ProcessorDefault{#1}{\etex@unexpanded{#2}}%
+ \noexpand\KVS@ProcessorDefault{#1}{\unexpanded{#2}}%
}%
\KVS@temp
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-listof.sty new/tex/latex/thmtools/thm-listof.sty
--- old/tex/latex/thmtools/thm-listof.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-listof.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-listof}[2014/04/21 v66]
+\ProvidesPackage {thm-listof}[2019/12/22 v68]
\let\@xa=\expandafter
\let\@nx=\noexpand
\RequirePackage{thm-patch,keyval,kvsetkeys}
@@ -83,6 +82,7 @@
\define@key{thmt-listof}{show}[\thmt@allenvs]{\showtheorems{#1}}
\define@key{thmt-listof}{ignoreall}[true]{\ignoretheorems{\thmt@allenvs}}
\define@key{thmt-listof}{showall}[true]{\showtheorems{\thmt@allenvs}}
+\define@key{thmt-listof}{title}{\def\listtheoremname{#1}}
\providecommand\thmt@listnumwidth{2.3em}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-llncs.sty new/tex/latex/thmtools/thm-llncs.sty
--- old/tex/latex/thmtools/thm-llncs.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-llncs.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-llncs}[2014/04/21 v66]
+\ProvidesPackage {thm-llncs}[2019/12/22 v68]
\@ifclasslater{llncs}{2010/04/15}{}{%
\PackageWarningNoLine{thmtools}{%
LLNCS.cls too old, not supported by thmtools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-ntheorem.sty new/tex/latex/thmtools/thm-ntheorem.sty
--- old/tex/latex/thmtools/thm-ntheorem.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-ntheorem.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-ntheorem}[2014/04/21 v66]
+\ProvidesPackage {thm-ntheorem}[2019/12/22 v68]
\providecommand\thmt@space{ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-patch.sty new/tex/latex/thmtools/thm-patch.sty
--- old/tex/latex/thmtools/thm-patch.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-patch.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-patch}[2014/04/21 v66]
+\ProvidesPackage {thm-patch}[2019/12/22 v68]
\RequirePackage{parseargs}
\newif\ifthmt@isstarred
@@ -56,7 +55,7 @@
\csname thmt@#1@postheadhook\endcsname
\thmt@generic@postheadhook
\thmt@local@postheadhook
- \let\@parsecmd\@empty
+ \let\@parsecmd\ignorespaces
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-restate.sty new/tex/latex/thmtools/thm-restate.sty
--- old/tex/latex/thmtools/thm-restate.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-restate.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-restate}[2014/04/21 v66]
+\ProvidesPackage {thm-restate}[2019/12/22 v68]
\RequirePackage{thmtools}
\let\@xa\expandafter
\let\@nx\noexpand
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmdef-mdframed.sty new/tex/latex/thmtools/thmdef-mdframed.sty
--- old/tex/latex/thmtools/thmdef-mdframed.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmdef-mdframed.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmdef-mdframed}[2014/04/21 v66]
+\ProvidesPackage {thmdef-mdframed}[2019/12/22 v68]
\define@key{thmdef}{mdframed}[{}]{%
\thmt@trytwice{}{%
\RequirePackage{mdframed}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmdef-shaded.sty new/tex/latex/thmtools/thmdef-shaded.sty
--- old/tex/latex/thmtools/thmdef-shaded.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmdef-shaded.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmdef-shaded}[2014/04/21 v66]
+\ProvidesPackage {thmdef-shaded}[2019/12/22 v68]
\define@key{thmdef}{shaded}[{}]{%
\thmt@trytwice{}{%
\RequirePackage{shadethm}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmdef-thmbox.sty new/tex/latex/thmtools/thmdef-thmbox.sty
--- old/tex/latex/thmtools/thmdef-thmbox.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmdef-thmbox.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmdef-thmbox}[2014/04/21 v66]
+\ProvidesPackage {thmdef-thmbox}[2019/12/22 v68]
\define@key{thmdef}{thmbox}[L]{%
\thmt@trytwice{%
\let\oldproof=\proof
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmtools.sty new/tex/latex/thmtools/thmtools.sty
--- old/tex/latex/thmtools/thmtools.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmtools.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmtools}[2014/04/21 v66]
+\ProvidesPackage {thmtools}[2019/12/22 v68]
\DeclareOption{debug}{%
\def\thmt@debug{\typeout}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/unique.sty new/tex/latex/thmtools/unique.sty
--- old/tex/latex/thmtools/unique.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/unique.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi@absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {unique}[2014/04/21 v66]
+\ProvidesPackage {unique}[2019/12/22 v68]
\DeclareOption{unq}{%
\newwrite\uniq@channel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmtools.tlpobj new/tlpkg/tlpobj/thmtools.tlpobj
--- old/tlpkg/tlpobj/thmtools.tlpobj 2019-02-28 04:08:34.000000000 +0100
+++ new/tlpkg/tlpobj/thmtools.tlpobj 2019-12-24 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name thmtools
category Package
-revision 33624
+revision 53219
shortdesc Extensions to theorem environments
relocated 1
longdesc The bundle provides several packages for commonly-needed
@@ -28,7 +28,6 @@
RELOC/tex/latex/thmtools/thmtools.sty
RELOC/tex/latex/thmtools/unique.sty
catalogue-ctan /macros/latex/exptl/thmtools
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
-catalogue-topics maths-theorem
-catalogue-version 66
+catalogue-license lppl1.3c
+catalogue-topics maths maths-theorem
+catalogue-version 68
++++++ thucoursework.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/Makefile new/doc/latex/thucoursework/Makefile
--- old/doc/latex/thucoursework/Makefile 2018-05-20 23:30:42.000000000 +0200
+++ new/doc/latex/thucoursework/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-# Makefile for thucoursework
-
-# Compiling method: xelatex/pdflatex
-PACKAGE = thucoursework
-INSTALL_PACKAGE = install-tl-unx.tar.gz
-INSTALL_DIR = ./install-texlive
-# automatic configuration of mirror
-REMOTE_INSTALLER_URL = http://mirror.ctan.org/systems/texlive/tlnet
-# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex -halt-on-error -interaction=nonstopmode
-
-
-.PHONY: doc all archive pre_install_dep install_dep after_install_dep clean test
-
-all: after_install_dep iihw.pdf ithw.pdf
-
-pre_install_dep: $(INSTALL_PACKAGE)
-
-after_install_dep: install_dep
- # tricky, to make variable assignment in recipe, and to execute shell command and assign the print result to a variable.
- $(eval PLATFORM1=`$(INSTALL_DIR)/install-tl --print-platform`)
- $(eval PLATFORM2=$(shell echo $(PLATFORM1)))
- $(eval PLATFORM3=$(shell pwd))
- $(eval export PATH :=$(PLATFORM3)/texlive/bin/$(PLATFORM2):$(PATH))
- echo $$PATH
- # to make tlmgr work, we need perl
- tlmgr install xkeyval matlab-prettifier caption doublestroke xcolor listings l3kernel l3packages ms ulem fontspec environ trimspaces booktabs moreenum mathtools oberdiek enumitem fmtcount etoolbox latex-bin
-install_dep: pre_install_dep
- mkdir -p $(INSTALL_DIR)
- tar -zxvf $(INSTALL_PACKAGE) -C $(INSTALL_DIR) --strip-components 1
- $(INSTALL_DIR)/install-tl -profile tl.profile
-
-$(INSTALL_PACKAGE):
- wget $(REMOTE_INSTALLER_URL)/$(INSTALL_PACKAGE)
-
-clean:
- rm -fr $(INSTALL_DIR)
- rm -f *.idx *.ilg *.glo *.gls *.hd *.ind *.log *.out *.synctex.gz *.toc *.aux
-
-iihw.pdf: iihw.tex after_install_dep
- pdflatex iihw.tex
-
-ithw.pdf: ithw.tex after_install_dep
- xelatex ithw.tex
-
-archive:
- # make tar.gz which is submitted to ctan.org
- # first copy the necessary files to the dist dir
- cp README.md iihw.pdf ithw.pdf iihw.tex ithw.tex matlabscript.m pdf_normal.eps thucoursework.dtx thucoursework.pdf Makefile thucoursework/
- # then tar it
- COPYFILE_DISABLE=1 tar -zcvf thucoursework.tar.gz thucoursework/
-doc : $(PACKAGE).pdf
-
-$(PACKAGE).pdf : $(PACKAGE).dtx
- #latexmk $(LATEXXMKOPTS) $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- xelatex $(PACKAGE).dtx
- xelatex -synctex=1 $(PACKAGE).dtx
-
-test:
- # first clear out root texlive bin dir
- $(eval export PATH := /bin:/usr/bin)
- echo $$PATH
- $(eval PLATFORM1=`$(INSTALL_DIR)/install-tl --print-platform`)
- $(eval PLATFORM2=$(shell echo $(PLATFORM1)))
- $(eval PLATFORM3=$(shell pwd))
- $(eval export PATH := $(PLATFORM3)/texlive/bin/$(PLATFORM2):$(PATH))
- echo $$PATH
- tlmgr --version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/README.md new/doc/latex/thucoursework/README.md
--- old/doc/latex/thucoursework/README.md 2018-05-20 23:30:42.000000000 +0200
+++ new/doc/latex/thucoursework/README.md 2020-02-24 15:30:44.000000000 +0100
@@ -1,5 +1,6 @@
# THU coursework Template
-[![Build Status](https://www.travis-ci.org/zhaofeng-shu33/THU-coursework-template.svg?branch=master)](https://www.travis-ci.org/zhaofeng-shu33/THU-coursework-template)
+[![Build Status](https://travis-ci.com/zhaofeng-shu33/THU-coursework-template.svg?branch=master)](https://travis-ci.com/zhaofeng-shu33/THU-coursework-template)
+
LaTeX package for students in Tsinghua University to write coursework more efficiently, also can be used by students from other university.
Notice that the package itself does not import ctex package, to use it with Chinese writing, see example file `ithw.tex` for detail.
@@ -39,9 +40,9 @@
## Contributors
- TA xiangxiangxu revised this template, zhaofeng-shu33 made it a latex package.
+ [Xiangxiang Xu](https://xiangxiangxu.com/) revised this template, zhaofeng-shu33 made it a latex package.
## License
- see [LICENSE.md](LICENSE.md) for detail.
+ This project is licensed by The LaTeX Project Public License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/dtx-style.sty new/doc/latex/thucoursework/dtx-style.sty
--- old/doc/latex/thucoursework/dtx-style.sty 2018-05-20 23:30:42.000000000 +0200
+++ new/doc/latex/thucoursework/dtx-style.sty 2020-02-24 15:30:44.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 by zhaofeng-shu33 <616545598@qq.com>
+%% Copyright (C) 2020 by zhaofeng-shu33 <616545598@qq.com>
%%
%% 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/thucoursework/iihw.pdf and new/doc/latex/thucoursework/iihw.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/iihw.tex new/doc/latex/thucoursework/iihw.tex
--- old/doc/latex/thucoursework/iihw.tex 2018-04-02 00:28:35.000000000 +0200
+++ new/doc/latex/thucoursework/iihw.tex 2020-02-24 15:30:44.000000000 +0100
@@ -9,7 +9,6 @@
\usepackage{moreenum}
\usepackage{mathtools}
\usepackage{url}
-\usepackage[outdir=./]{epstopdf}
\usepackage{graphicx}
\usepackage{subcaption}
\usepackage{booktabs} % toprule
@@ -36,7 +35,7 @@
\rule{\textwidth}{1pt}
\begin{itemize}
\item {\bf Acknowledgments: \/}
- This template takes some materials from course CSE 547/Stat 548 of Washington University: \small{\url{https://courses.cs.washington.edu/courses/cse547/17sp/index.html}}.
+ This template takes some materials from course CSE 547/Stat 548, University of Washington: \small{\url{https://courses.cs.washington.edu/courses/cse547/17sp/index.html}}.
If you refer to other materials in your homework, please list here.
\item {\bf Collaborators: \/}
@@ -120,7 +119,7 @@
\item You may need to add figure and source codes in your homework. Figure \ref{fig:1} is an example that compares the empirical distribution (histogram) and probability density function of the Gaussian random variable.
\begin{figure}[htbp]
\centering
- \includegraphics[width = 0.8\textwidth]{pdf_normal.eps}
+ \includegraphics[width = 0.8\textwidth]{pdf_normal.pdf}
\caption{Gaussian PDF and histogram of samples}
\label{fig:1}
\end{figure}
Binary files old/doc/latex/thucoursework/ithw.pdf and new/doc/latex/thucoursework/ithw.pdf differ
Binary files old/doc/latex/thucoursework/pdf_normal.pdf and new/doc/latex/thucoursework/pdf_normal.pdf differ
Binary files old/doc/latex/thucoursework/thucoursework.pdf and new/doc/latex/thucoursework/thucoursework.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thucoursework.doc.tlpobj new/tlpkg/tlpobj/thucoursework.doc.tlpobj
--- old/tlpkg/tlpobj/thucoursework.doc.tlpobj 2019-02-28 04:08:35.000000000 +0100
+++ new/tlpkg/tlpobj/thucoursework.doc.tlpobj 2020-02-25 01:54:55.000000000 +0100
@@ -1,10 +1,9 @@
name thucoursework.doc
category Package
-revision 47781
+revision 53891
shortdesc doc files of thucoursework
relocated 1
-docfiles size=179
- RELOC/doc/latex/thucoursework/Makefile
+docfiles size=154
RELOC/doc/latex/thucoursework/README.md
RELOC/doc/latex/thucoursework/dtx-style.sty
RELOC/doc/latex/thucoursework/iihw.pdf
@@ -13,5 +12,5 @@
RELOC/doc/latex/thucoursework/ithw.tex
RELOC/doc/latex/thucoursework/matlabscript.m
RELOC/doc/latex/thucoursework/pdf_normal.eps
- RELOC/doc/latex/thucoursework/thucoursework.hd
+ RELOC/doc/latex/thucoursework/pdf_normal.pdf
RELOC/doc/latex/thucoursework/thucoursework.pdf
++++++ thucoursework.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thucoursework/iidef.sty new/tex/latex/thucoursework/iidef.sty
--- old/tex/latex/thucoursework/iidef.sty 2018-05-20 23:30:42.000000000 +0200
+++ new/tex/latex/thucoursework/iidef.sty 2020-02-24 15:30:44.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 by zhaofeng-shu33 <616545598@qq.com>
+%% Copyright (C) 2020 by zhaofeng-shu33 <616545598@qq.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{iidef}
-[2018/04/09 2.4 Tsinghua University Coursework Template]
+[2020/02/23 2.5.1 Tsinghua University Coursework Template]
%% configuration of nested enumerate env
\RequirePackage{enumitem}
%% set hwcount key-value option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thucoursework.tlpobj new/tlpkg/tlpobj/thucoursework.tlpobj
--- old/tlpkg/tlpobj/thucoursework.tlpobj 2019-02-28 04:08:35.000000000 +0100
+++ new/tlpkg/tlpobj/thucoursework.tlpobj 2020-02-25 01:54:55.000000000 +0100
@@ -1,6 +1,6 @@
name thucoursework
category Package
-revision 47781
+revision 53891
shortdesc Coursework template for Tsinghua University
relocated 1
longdesc A LaTeX package for students of Tsinghua University to write
@@ -14,7 +14,6 @@
catalogue-contact-development https://github.com/zhaofeng-shu33
catalogue-contact-repository https://github.com/zhaofeng-shu33/THU-coursework-template
catalogue-ctan /macros/latex/contrib/thucoursework
-catalogue-date 2018-05-20 08:52:27 +0200
catalogue-license lppl1.3
catalogue-topics doc-templ chinese
-catalogue-version 2.5
+catalogue-version 2.5.1
++++++ thuthesis.doc.tar.xz ++++++
++++ 43703 lines of diff (skipped)
++++++ thuthesis.tar.xz ++++++
++++ 7917 lines of diff (skipped)
++++++ tie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tie.1 new/texmf-dist/doc/man/man1/tie.1
--- old/texmf-dist/doc/man/man1/tie.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tie.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TIE 1 "7 April 2010" "Web2C 2019"
+.TH TIE 1 "7 April 2010" "Web2C 2020"
.\"=====================================================================
.SH NAME
tie \- merge or apply WEB change files
Binary files old/texmf-dist/doc/man/man1/tie.man1.pdf and new/texmf-dist/doc/man/man1/tie.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tie.doc.tlpobj new/tlpkg/tlpobj/tie.doc.tlpobj
--- old/tlpkg/tlpobj/tie.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/tie.doc.tlpobj 2020-03-04 23:53:58.000000000 +0100
@@ -1,6 +1,6 @@
name tie.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of tie
docfiles size=6
texmf-dist/doc/man/man1/tie.1
++++++ tikz-dependency.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-dependency.doc.tlpobj new/tlpkg/tlpobj/tikz-dependency.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-dependency.doc.tlpobj 2019-02-28 04:08:39.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-dependency.doc.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-dependency.doc
category Package
-revision 42454
+revision 54512
shortdesc doc files of tikz-dependency
relocated 1
docfiles size=212
++++++ tikz-dependency.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-dependency.tlpobj new/tlpkg/tlpobj/tikz-dependency.tlpobj
--- old/tlpkg/tlpobj/tikz-dependency.tlpobj 2019-02-28 04:08:39.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-dependency.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-dependency
category Package
-revision 42454
+revision 54512
shortdesc A library for drawing dependency graphs
relocated 1
longdesc The package provides a library that draws together existing
@@ -14,7 +14,6 @@
RELOC/tex/latex/tikz-dependency/pgfmanual.prettyprinter.code.tex
RELOC/tex/latex/tikz-dependency/tikz-dependency.sty
catalogue-ctan /graphics/pgf/contrib/tikz-dependency
-catalogue-date 2018-02-07 16:05:00 +0100
-catalogue-license lpplgpl2
+catalogue-license lppl gpl2
catalogue-topics linguistic tree pgf-tikz
catalogue-version 1.2