From 03b9a93a133d854a3f7a8043984aded34728edf6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 7 Dec 2022 03:01:15 +0000 Subject: CTAN sync 202212070301 --- .../datetime2-icelandic/datetime2-icelandic.dtx | 43 +++++++++--------- .../datetime2-icelandic/datetime2-icelandic.ins | 2 +- .../datetime2-icelandic/datetime2-icelandic.pdf | Bin 81343 -> 74008 bytes macros/latex/contrib/ednotes/README-lineno.txt | 1 - macros/latex/contrib/ednotes/README-ncctools.txt | 1 - macros/latex/contrib/ednotes/ednmath0.sty | 1 - macros/latex/contrib/ednotes/edtable.sty | 1 - macros/latex/contrib/ednotes/lineno.pdf | 1 - macros/latex/contrib/ednotes/lineno.sty | 1 - macros/latex/contrib/ednotes/lineno.tex | 1 - macros/latex/contrib/ednotes/lnosuppl.pdf | 1 - macros/latex/contrib/ednotes/ltabptch.sty | 1 - macros/latex/contrib/ednotes/ltabtest.tex | 1 - macros/latex/contrib/ednotes/ulineno.pdf | 1 - macros/latex/contrib/ednotes/ulineno.tex | 1 - macros/latex/contrib/ednotes/vplref.sty | 1 - macros/latex/contrib/univie-ling/README | 7 +++ .../biblatex-univie-ling/univie-ling.bbx | 2 +- .../biblatex-univie-ling/univie-ling.cbx | 2 +- .../doc/templates/template-expose-deutsch.pdf | Bin 132481 -> 132362 bytes .../doc/templates/template-expose-english.pdf | Bin 127717 -> 127593 bytes .../doc/templates/template-handout-deutsch.pdf | Bin 200629 -> 200629 bytes .../doc/templates/template-handout-english.pdf | Bin 200633 -> 200633 bytes .../doc/templates/template-paper-deutsch.pdf | Bin 171995 -> 171884 bytes .../doc/templates/template-paper-english.pdf | Bin 167016 -> 167168 bytes .../doc/templates/template-thesis-deutsch.pdf | Bin 189870 -> 189870 bytes .../doc/templates/template-thesis-english.pdf | Bin 186018 -> 186018 bytes .../doc/templates/template-wlg-article.pdf | Bin 372057 -> 372057 bytes .../contrib/univie-ling/doc/univie-ling-expose.pdf | Bin 457745 -> 457756 bytes .../contrib/univie-ling/doc/univie-ling-expose.tex | 6 ++- .../univie-ling/doc/univie-ling-handout.pdf | Bin 447505 -> 447543 bytes .../univie-ling/doc/univie-ling-handout.tex | 6 ++- .../contrib/univie-ling/doc/univie-ling-paper.pdf | Bin 453751 -> 453798 bytes .../contrib/univie-ling/doc/univie-ling-paper.tex | 6 ++- .../contrib/univie-ling/doc/univie-ling-thesis.pdf | Bin 458731 -> 458741 bytes .../contrib/univie-ling/doc/univie-ling-thesis.tex | 6 ++- .../contrib/univie-ling/doc/univie-ling-wlg.pdf | Bin 344520 -> 344521 bytes .../contrib/univie-ling/doc/univie-ling-wlg.tex | 2 +- .../latex/contrib/univie-ling/doc/univie-ling.pdf | Bin 364169 -> 364385 bytes .../latex/contrib/univie-ling/doc/univie-ling.tex | 2 +- .../contrib/univie-ling/tex/univie-ling-expose.cls | 11 +++-- .../univie-ling/tex/univie-ling-handout.cls | 14 +++--- .../contrib/univie-ling/tex/univie-ling-paper.cls | 11 +++-- .../contrib/univie-ling/tex/univie-ling-thesis.cls | 11 +++-- .../contrib/univie-ling/tex/univie-ling-wlg.cls | 2 +- macros/xetex/latex/xduts/xduts.dtx | 50 ++++++++++++++++----- macros/xetex/latex/xduts/xduts.pdf | Bin 307600 -> 316974 bytes 47 files changed, 123 insertions(+), 73 deletions(-) delete mode 120000 macros/latex/contrib/ednotes/README-lineno.txt delete mode 120000 macros/latex/contrib/ednotes/README-ncctools.txt delete mode 120000 macros/latex/contrib/ednotes/ednmath0.sty delete mode 120000 macros/latex/contrib/ednotes/edtable.sty delete mode 120000 macros/latex/contrib/ednotes/lineno.pdf delete mode 120000 macros/latex/contrib/ednotes/lineno.sty delete mode 120000 macros/latex/contrib/ednotes/lineno.tex delete mode 120000 macros/latex/contrib/ednotes/lnosuppl.pdf delete mode 120000 macros/latex/contrib/ednotes/ltabptch.sty delete mode 120000 macros/latex/contrib/ednotes/ltabtest.tex delete mode 120000 macros/latex/contrib/ednotes/ulineno.pdf delete mode 120000 macros/latex/contrib/ednotes/ulineno.tex delete mode 120000 macros/latex/contrib/ednotes/vplref.sty (limited to 'macros') diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.dtx b/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.dtx index 560bcdb1d2..c8dc7570e1 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.dtx +++ b/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.dtx @@ -19,7 +19,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2018 Nicola Talbot, all rights reserved. +% Copyright (C) 2018-2022 Nicola Talbot, all rights reserved. % (New maintainer add relevant lines here.) % \fi % \iffalse @@ -30,8 +30,6 @@ \usepackage{graphicx} \usepackage{fontspec} \usepackage[colorlinks, - bookmarks, - hyperindex=false, pdfauthor={Nicola L.C. Talbot}, pdftitle={datetime2.sty Icelandic Module}]{hyperref} @@ -40,13 +38,10 @@ \CheckSum{300} -\renewcommand*{\usage}[1]{\hyperpage{#1}} -\renewcommand*{\main}[1]{\hyperpage{#1}} -\IndexPrologue{\section*{\indexname}\markboth{\indexname}{\indexname}} \setcounter{IndexColumns}{2} \newcommand*{\sty}[1]{\textsf{#1}} -\newcommand*{\opt}[1]{\texttt{#1}\index{#1=\texttt{#1}|main}} +\newcommand*{\opt}[1]{\texttt{#1}} \RecordChanges \PageIndex @@ -62,12 +57,12 @@ % %\title{Icelandic Module for datetime2 Package} %\author{Nicola L. C. Talbot (inactive)} -%\date{2018-04-24 (v1.1)} +%\date{2022-12-06 (v1.2)} %\maketitle % %This module is currently unmaintained and may be subject to change. -%If you want to volunteer to take over maintanance, contact me at -%\url{http://www.dickimaw-books.com/contact.html} +%If you want to volunteer to take over maintenance, contact me at +%\url{https://www.dickimaw-books.com/contact.html} % %\begin{abstract} %This is the Icelandic language module for the \sty{datetime2} @@ -103,9 +98,7 @@ %\StopEventually{% %\clearpage %\phantomsection -%\addcontentsline{toc}{section}{Change History}% %\PrintChanges -%\addcontentsline{toc}{section}{\indexname}% %\PrintIndex} %\section{The Code} %\iffalse @@ -120,7 +113,7 @@ %\changes{1.0}{2015-03-30}{Initial release} % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{icelandic-utf8}[2018/04/24 v1.1] +\ProvidesDateTimeModule{icelandic-utf8}[2022/12/06 v1.2] % \end{macrocode} %\begin{macro}{\DTMicelandicordinal} % \begin{macrocode} @@ -133,6 +126,7 @@ % %\begin{macro}{\DTMicelandicmonthname} % Icelandic month names. +%\changes{1.2}{2022-12-06}{corrected desember} % \begin{macrocode} \newcommand*{\DTMicelandicmonthname}[1]{% \ifcase#1 @@ -159,7 +153,7 @@ \or nóvember% \or - desembe% + desember% \fi } % \end{macrocode} @@ -167,6 +161,7 @@ % %\begin{macro}{\DTMicelandicMonthname} % As above but capitalize. +%\changes{1.2}{2022-12-06}{corrected Desember} % \begin{macrocode} \newcommand*{\DTMicelandicMonthname}[1]{% \ifcase#1 @@ -193,7 +188,7 @@ \or Nóvember% \or - Desembe% + Desember% \fi } % \end{macrocode} @@ -223,7 +218,7 @@ %\changes{1.0}{2015-03-30}{Initial release} % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{icelandic-ascii}[2018/04/24 v1.1] +\ProvidesDateTimeModule{icelandic-ascii}[2022/12/06 v1.2] % \end{macrocode} % %If abbreviated dates are supported, short month names should be @@ -238,6 +233,7 @@ % %\begin{macro}{\DTMicelandicmonthname} % Icelandic month names. +%\changes{1.2}{2022-12-06}{corrected desember} % \begin{macrocode} \newcommand*{\DTMicelandicmonthname}[1]{% \ifcase#1 @@ -264,13 +260,14 @@ \or n\protect\'ovember% \or - desembe% + desember% \fi } % \end{macrocode} %\end{macro} % %\begin{macro}{\DTMicelandicMonthname} +%\changes{1.2}{2022-12-06}{corrected Desember} % As above but capitalize. % \begin{macrocode} \newcommand*{\DTMicelandicMonthname}[1]{% @@ -298,7 +295,7 @@ \or N\protect\'ovember% \or - Desembe% + Desember% \fi } % \end{macrocode} @@ -322,15 +319,19 @@ % % Identify Module % \begin{macrocode} -\ProvidesDateTimeModule{icelandic}[2018/04/24 v1.1] +\ProvidesDateTimeModule{icelandic}[2022/12/06 v1.2] % \end{macrocode} % Need to find out if XeTeX or LuaTeX are being used. +%\changes{1.2}{2022-12-06}{switched to iftex} % \begin{macrocode} -\RequirePackage{ifxetex,ifluatex} +\RequirePackage{iftex} % \end{macrocode} % XeTeX and LuaTeX natively support UTF-8, so load % \texttt{icelandic-utf8} if either of those engines are used % otherwise load \texttt{icelandic-ascii}. +% Modern LaTeX kernels have much better support for UTF-8, so +% a test could also be added to determine if \cs{inputencoding} is +% \texttt{utf8}. % \begin{macrocode} \ifxetex \RequireDateTimeModule{icelandic-utf8} @@ -543,7 +544,7 @@ }% {% time style \renewcommand*\DTMdisplaytime[3]{% - \number##1 + \number##1 % space intended \DTMicelandictimesep\DTMtwodigits{##2}% \ifDTMshowseconds\DTMicelandictimesep\DTMtwodigits{##3}\fi }% diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.ins b/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.ins index c2d0571be5..664141dbb6 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.ins +++ b/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.ins @@ -3,7 +3,7 @@ \preamble datetime2-icelandic.dtx - Copyright 2018 Nicola Talbot + Copyright 2018-2022 Nicola Talbot This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.pdf b/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.pdf index 501065608f..bbc2d84004 100644 Binary files a/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.pdf and b/macros/latex/contrib/datetime2-contrib/datetime2-icelandic/datetime2-icelandic.pdf differ diff --git a/macros/latex/contrib/ednotes/README-lineno.txt b/macros/latex/contrib/ednotes/README-lineno.txt deleted file mode 120000 index 221ce513c3..0000000000 --- a/macros/latex/contrib/ednotes/README-lineno.txt +++ /dev/null @@ -1 +0,0 @@ -../lineno/README.txt \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/README-ncctools.txt b/macros/latex/contrib/ednotes/README-ncctools.txt deleted file mode 120000 index 72801284d4..0000000000 --- a/macros/latex/contrib/ednotes/README-ncctools.txt +++ /dev/null @@ -1 +0,0 @@ -../ncctools/README \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/ednmath0.sty b/macros/latex/contrib/ednotes/ednmath0.sty deleted file mode 120000 index 6f003def2a..0000000000 --- a/macros/latex/contrib/ednotes/ednmath0.sty +++ /dev/null @@ -1 +0,0 @@ -../lineno/ednmath0.sty \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/edtable.sty b/macros/latex/contrib/ednotes/edtable.sty deleted file mode 120000 index 5fd6f55bc8..0000000000 --- a/macros/latex/contrib/ednotes/edtable.sty +++ /dev/null @@ -1 +0,0 @@ -../lineno/edtable.sty \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/lineno.pdf b/macros/latex/contrib/ednotes/lineno.pdf deleted file mode 120000 index f9c5aa554a..0000000000 --- a/macros/latex/contrib/ednotes/lineno.pdf +++ /dev/null @@ -1 +0,0 @@ -../lineno/lineno.pdf \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/lineno.sty b/macros/latex/contrib/ednotes/lineno.sty deleted file mode 120000 index e1237aa9e4..0000000000 --- a/macros/latex/contrib/ednotes/lineno.sty +++ /dev/null @@ -1 +0,0 @@ -../lineno/lineno.sty \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/lineno.tex b/macros/latex/contrib/ednotes/lineno.tex deleted file mode 120000 index 1999019713..0000000000 --- a/macros/latex/contrib/ednotes/lineno.tex +++ /dev/null @@ -1 +0,0 @@ -../lineno/lineno.tex \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/lnosuppl.pdf b/macros/latex/contrib/ednotes/lnosuppl.pdf deleted file mode 120000 index 156457faed..0000000000 --- a/macros/latex/contrib/ednotes/lnosuppl.pdf +++ /dev/null @@ -1 +0,0 @@ -../lineno/lnosuppl.pdf \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/ltabptch.sty b/macros/latex/contrib/ednotes/ltabptch.sty deleted file mode 120000 index 97da5876bf..0000000000 --- a/macros/latex/contrib/ednotes/ltabptch.sty +++ /dev/null @@ -1 +0,0 @@ -../ltabptch/ltabptch.sty \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/ltabtest.tex b/macros/latex/contrib/ednotes/ltabtest.tex deleted file mode 120000 index 3d22890963..0000000000 --- a/macros/latex/contrib/ednotes/ltabtest.tex +++ /dev/null @@ -1 +0,0 @@ -../ltabptch/ltabtest.tex \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/ulineno.pdf b/macros/latex/contrib/ednotes/ulineno.pdf deleted file mode 120000 index ebecb60c7d..0000000000 --- a/macros/latex/contrib/ednotes/ulineno.pdf +++ /dev/null @@ -1 +0,0 @@ -../lineno/ulineno.pdf \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/ulineno.tex b/macros/latex/contrib/ednotes/ulineno.tex deleted file mode 120000 index 1c05855f15..0000000000 --- a/macros/latex/contrib/ednotes/ulineno.tex +++ /dev/null @@ -1 +0,0 @@ -../lineno/ulineno.tex \ No newline at end of file diff --git a/macros/latex/contrib/ednotes/vplref.sty b/macros/latex/contrib/ednotes/vplref.sty deleted file mode 120000 index 83051c5f97..0000000000 --- a/macros/latex/contrib/ednotes/vplref.sty +++ /dev/null @@ -1 +0,0 @@ -../lineno/vplref.sty \ No newline at end of file diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README index d021520e3b..d4475fd00a 100644 --- a/macros/latex/contrib/univie-ling/README +++ b/macros/latex/contrib/univie-ling/README @@ -90,6 +90,13 @@ also have a look at the example files. == CHANGES == +V. 2.2 (2022-12-06): + - univie-ling-handout: + - univie-ling-expose: + - univie-ling-paper: + - univie-ling-thesis: + * Fix boolean option parsing. + V. 2.1 (2022-10-21): - univie-ling-wlg: * Add a sans (Source Sans Pro or MyriadPro) and monospaced (DejaVu Sans Mono) diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx index 1564b3a9ee..4616550d7e 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx @@ -37,7 +37,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.bbx}[2022/10/21 v.2.1 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2022/12/06 v.2.2 biblatex bibliography style] % Load base style (authoryear-comp) \RequireBibliographyStyle{authoryear-comp} diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx index a643cacf26..07302bfd02 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx @@ -35,7 +35,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.cbx}[2022/10/21 v.2.1 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2022/12/06 v.2.2 biblatex citation style] \RequireCitationStyle{authoryear-comp} diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf index 570c4e2e3b..3cf3ba7df5 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf index 23b602db8c..6ed5755308 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf index f578a135e8..2b2750538a 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf index c0451d826f..8340708802 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf index 0b089403c9..6c6f229e21 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf index 3a7992cdf7..ab061e3dc8 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf index 0719df2af3..60db4a8d95 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf index d5baf32825..acae0f2a38 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf index 99040225d2..dac6e55281 100644 Binary files a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf and b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf index f1f8ad6505..ad0815f797 100644 Binary files a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf and b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex index f7984c7280..a01b21de18 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.1, 2022/10/21} +\date{Version 2.2, 2022/12/06} \maketitle @@ -341,6 +341,10 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2022/12/06 (v.\,2.2) + \begin{itemize} + \item Fix boolean option parsing. + \end{itemize} \item 2022/10/21 (v.\,2.1) \begin{itemize} \item Fix \joption{polyglossia} option. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf index 7350488fd3..9f6035a79b 100644 Binary files a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf and b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex index 15d5a07eab..8b1e24bcfe 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.1, 2022/10/21} +\date{Version 2.2, 2022/12/06} \maketitle @@ -385,6 +385,10 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2022/12/06 (v.\,2.2) + \begin{itemize} + \item Fix boolean option parsing. + \end{itemize} \item 2022/10/21 (v.\,2.1) \begin{itemize} \item Fix \joption{polyglossia} option. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf index f7025aba1a..1ded7d368c 100644 Binary files a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf and b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex index c3b67f8602..bd6ec13c39 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.1, 2022/10/21} +\date{Version 2.2, 2022/12/06} \maketitle @@ -374,6 +374,10 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2022/12/06 (v.\,2.2) + \begin{itemize} + \item Fix boolean option parsing. + \end{itemize} \item 2022/10/21 (v.\,2.1) \begin{itemize} \item Fix \joption{polyglossia} option. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf index 6997a5f366..6751971d22 100644 Binary files a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf and b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex index cdec8d14ad..301b9f3698 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.1, 2022/10/21} +\date{Version 2.2, 2022/12/06} \maketitle @@ -404,6 +404,10 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2022/12/06 (v.\,2.2) + \begin{itemize} + \item Fix boolean option parsing. + \end{itemize} \item 2022/10/21 (v.\,2.1) \begin{itemize} \item Fix \joption{polyglossia} option. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf index 527c0b2d59..b7e956b0b1 100644 Binary files a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf and b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex index ee433f9e13..20501223a7 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.1, 2022/10/21} +\date{Version 2.2, 2022/12/06} \maketitle diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf index 3d19d59c0f..f6e2dd22b9 100644 Binary files a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf and b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf differ diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.tex b/macros/latex/contrib/univie-ling/doc/univie-ling.tex index 0f6e3da8f8..0d7c440ac5 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling.tex @@ -42,7 +42,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.1, 2022/10/21} +\date{Version 2.2, 2022/12/06} \maketitle diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls index 570067b9c8..87859d9e05 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-expose}[2022/10/21 v.2.1 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2022/12/06 v.2.2 Univie Linguistic Exposes (JSp)] %% ============================================================ @@ -61,7 +61,8 @@ % all= % Load all (most) packages all.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uve@biblatextrue \@uve@captionptrue \@uve@refsptrue @@ -95,7 +96,8 @@ % fontenc= % customize font encoding fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { + { \str_if_eq:NNTF { #1 } { none } + { \@uve@usefontencfalse }{ \def\uve@fontenc{#1} @@ -109,7 +111,8 @@ % polyglossia= % Load polyglossia polyglossia.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uve@psfontsfalse \@uve@otffontstrue \@uve@polyglossiatrue diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls index 8327970b1f..7c761464f4 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls @@ -33,7 +33,7 @@ \NeedsTeXFormat{LaTeX2e}[1997/06/01] -\ProvidesClass{univie-ling-handout}[2022/10/21 v.2.1 Univie Ling handout class (JSp)] +\ProvidesClass{univie-ling-handout}[2022/12/06 v.2.2 Univie Ling handout class (JSp)] %% ============================================================ %% CLASS OPTIONS @@ -113,7 +113,8 @@ % all= % Load all (most) packages all.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uvh@biblatextrue \@uvh@captionptrue \@uvh@refsptrue @@ -143,7 +144,8 @@ % bwlogo= % Print monochrome logo? bwlogo.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}} \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}} }{ @@ -171,7 +173,8 @@ % fontenc= % customize font encoding fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { + { \str_if_eq:NNTF { #1 } { none } + { \@uvh@usefontencfalse }{ \def\uvh@fontenc{#1} @@ -197,7 +200,8 @@ % polyglossia= % Load polyglossia polyglossia.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uvh@psfontsfalse \@uvh@otffontstrue \@uvh@polyglossiatrue diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls index 639c8d0423..08eb9e55fe 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-paper}[2022/10/21 v.2.1 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2022/12/06 v.2.2 Univie Linguistic Papers (JSp)] %% ============================================================ @@ -62,7 +62,8 @@ % all= % Load all (most) packages all.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uvp@biblatextrue \@uvp@captionptrue \@uvp@refsptrue @@ -96,7 +97,8 @@ % fontenc= % customize font encoding fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { + { \str_if_eq:NNTF { #1 } { none } + { \@uvp@usefontencfalse }{ \def\uvp@fontenc{#1} @@ -110,7 +112,8 @@ % polyglossia= % Load polyglossia polyglossia.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uvp@psfontsfalse \@uvp@otffontstrue \@uvp@polyglossiatrue diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls index 016c21d1be..166d8e93d5 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-thesis}[2022/10/21 v.2.1 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2022/12/06 v.2.2 Univie Linguistic Theses (JSp)] %% ============================================================ @@ -66,7 +66,8 @@ % all= % Load all (most) packages all.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uvt@biblatextrue \@uvt@captionptrue \@uvt@refsptrue @@ -104,7 +105,8 @@ % fontenc= % customize font encoding fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { + { \str_if_eq:NNTF { #1 } { none } + { \@uvt@usefontencfalse }{ \def\uvt@fontenc{#1} @@ -122,7 +124,8 @@ % polyglossia= % Load polyglossia polyglossia.code:n = - { \bool_if:nTF {#1} { + { \str_if_eq:NNTF { #1 } { true } + { \@uvt@psfontsfalse \@uvt@otffontstrue \@uvt@polyglossiatrue diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls index 988bb4b588..6abba2c5a5 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls @@ -33,7 +33,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-wlg}[2022/10/21 v.2.1 Univie WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2022/12/06 v.2.2 Univie WLG journal layout (JSp)] %% ============================================================ diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx index ac9c27edf9..b1177cd4a3 100644 --- a/macros/xetex/latex/xduts/xduts.dtx +++ b/macros/xetex/latex/xduts/xduts.dtx @@ -1,14 +1,14 @@ % \iffalse %<*driver> \ProvidesFile{xduts.dtx} -[2022/12/03 v3.1.0.0 Xidian University TeX Suite] +[2022/12/06 v3.1.1.2 Xidian University TeX Suite] % %\NeedsTeXFormat{LaTeX2e} %\RequirePackage{expl3} %\ProvidesExplPackage{xdufont} %\ProvidesExplClass{xdupgthesis} %\ProvidesExplClass{xduugthesis} -% {2022/12/03}{3.1.0.0} +% {2022/12/06}{3.1.1.2} % {Xidian University Font package} % {Xidian University Postgraduate Thesis document class} % {Xidian University Undergraduate Thesis document class} @@ -141,6 +141,12 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} \makeatother \RenewDocumentCommand{\floatpagefraction}{}{.8} \usepackage[nolinks]{qrcode} +\changes{v3.1.1.1}{2022/12/04}{手册首页增加水印} +\usepackage[firstpageonly=true]{draftwatermark} +\DraftwatermarkOptions{angle=45,fontsize=40pt,color={gray9!25}} +\ExplSyntaxOn +\SetWatermarkText{\prg_replicate:nn{18}{\prg_replicate:nn{6}{\xduts{}~}\xduts\\[30pt]}} +\ExplSyntaxOff \begin{document} \changes{v2.18.1.1}{2022/12/01}{隐藏源码、版本和索引} \OnlyDescription @@ -1644,14 +1650,35 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % 和《Good things come in little packages: An introduction to writing .ins and .dtx files》\footurl{https://www.tug.org/TUGboat/tb29-2/tb92pakin.pdf} % 提供了很大帮助。 % 在文档的编写过程中,参考了\filex{ctex.dtx}、\filex{fduthesis.dtx}、\filex{njuthesis.dtx}和\filex{thuthesis.dtx}。 +% \changes{v3.1.1.2}{2022/12/06}{增加QQ支付二维码} % \changes{v2.16.1.2}{2022/11/27}{修正文档中图片引用间距} % \changes{v2.15.0.1}{2022/11/26}{增加赞助二维码} % \section{赞助} % 如果觉得\xduts{}对您有所帮助,可以扫描\figrefx{fig:zanzhu}中的二维码来赞助\xduts{},赞助主要用于给作者补充营养。 +% \ExplSyntaxOn +% \str_set_convert:Nnnn \l_xduts_qq_qr_str {% +% 68747470733A2F2F692E7169616E62616F2E71712E636F6D2F77616C6C65742F737172636F64% +% 652E68746D3F6D3D74656E70617926613D3126753D313138333133313434372661633D434145% +% 517438365574415159343457366E415934414549675A4755775A6D51314D6A55784E3249354E% +% 32566A4D4455794E445A684D32457A4D6A45325A6A55314E7A512533445F7878785F7369676E% +% 266E3D4361726F6C26663D77616C6C6574 } { utf8/hex } { } +% \newcommand{\qqqr}{\str_use:N \l_xduts_qq_qr_str} +% \str_set_convert:Nnnn \l_xduts_alipay_qr_str {% +% 68747470733A2F2F71722E616C697061792E636F6D2F666B7831353935393164716575747463% +% 77626175726235} { utf8/hex } { } +% \newcommand{\alipayqr}{\str_use:N \l_xduts_alipay_qr_str} +% \str_set_convert:Nnnn \l_xduts_wxp_qr_str {% +% 7778703A2F2F6632663074504D4D506D3161616467483665396162527030446E317746337344% +% 6C6468764350382D66765346424577} { utf8/hex } { } +% \newcommand{\wxpqr}{\str_use:N \l_xduts_wxp_qr_str} +% \ExplSyntaxOff % \begin{figure}[h] % \centering -% \subcaptionbox{支付宝}{\textcolor[RGB]{22,120,255}{\qrcode[height=4cm]{https://qr.alipay.com/fkx159591dqeuttcwbaurb5}}}\qquad\qquad -% \subcaptionbox{微信支付}{\textcolor[RGB]{7,193,96}{\qrcode[height=4cm]{wxp://f2f0Pkqu8eK5cgsln6RSPWFQi4SGT\_bM8hMuuIp2vk7Y0Zc}}} +% \mbox{}\hfill +% \subcaptionbox{支付宝}{\textcolor[RGB]{22,120,255}{\qrcode[height=4cm]{\alipayqr}}}\hfill +% \subcaptionbox{微信支付}{\textcolor[RGB]{7,193,96}{\qrcode[height=4cm]{\wxpqr}}}\hfill +% \subcaptionbox{QQ支付}{\textcolor[RGB]{18,184,246}{\qrcode[height=4cm]{\qqqr}}} +% \hfill\mbox{} % \caption{赞助二维码} % \label{fig:zanzhu} % \end{figure} @@ -4858,9 +4885,10 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} % \end{macrocode} % \end{macro} % \begin{macro}{\DeclareCaptionFont,\captionsetup*} -% \changes{v3.0.0.0}{2022/12/03}{设置算法caption格式} -% \changes{v2.18.0.0}{2022/11/28}{设置算法caption对齐方式} -% \changes{v2.17.0.0}{2022/11/28}{设置算法caption格式} +% \changes{v3.1.1.0}{2022/12/04}{修正\pkgx{algorithm}算法caption格式设置} +% \changes{v3.0.0.0}{2022/12/03}{设置\pkgx{algorithm}算法caption格式} +% \changes{v2.18.0.0}{2022/11/28}{设置\pkgx{algorithm}算法caption对齐方式} +% \changes{v2.17.0.0}{2022/11/28}{设置\pkgx{algorithm}算法caption格式} % \changes{v1.0.4.0}{2022/04/15}{设置\pkgx{algorithm}算法标签与标题字体字号及标签与后面标题之间的间距} % \changes{v1.1.3.0}{2022/04/15}{修正\pkgx{algorithm}算法标签字体系列} % \changes{v2.6.0.0}{2022/06/25}{设置\pkgx{algorithm}算法Caption字号是否为五号} @@ -4884,7 +4912,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} \tl_if_eq:NnTF \l_@@_alg_cap_format_tl { hang } { \captionsetup* [ algorithm ] { format = hang } } { \captionsetup* [ algorithm ] { format = plain } } - \captionsetup* [ ruled ] { strut = 0 } + \captionsetup* [ ruled ] { strut = off } \tl_if_eq:NnTF \l_@@_ft_cap_align_tl { left } { \captionsetup* [ algorithm ] @@ -4897,10 +4925,8 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1} { singlelinecheck = false, justification = centerlast } } { - \cs_set_eq:NN \floatc@ruled \floatc@plain - \captionsetup* [ ruled ] { slc = 1 } - \captionsetup* [ algorithm ] - { singlelinecheck = true, justification = justified } + \captionsetup* [ ruled ] { singlelinecheck = true } + \captionsetup* [ algorithm ] { justification = justified } } } } diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf index 19527913c3..47438abbe0 100644 Binary files a/macros/xetex/latex/xduts/xduts.pdf and b/macros/xetex/latex/xduts/xduts.pdf differ -- cgit v1.2.3