Hello community,
here is the log from the commit of package texlive-specs-g for openSUSE:Factory checked in at 2020-05-29 21:17:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-g (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-g.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-g"
Fri May 29 21:17:19 2020 rev:39 rq:806889 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.changes 2019-11-07 23:10:22.960125967 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-g.new.3606/texlive-specs-g.changes 2020-05-29 21:25:29.800525745 +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
+
+-------------------------------------------------------------------
New:
----
ddphonism.doc.tar.xz
ddphonism.tar.xz
derivative.doc.tar.xz
derivative.tar.xz
domitian.doc.tar.xz
domitian.tar.xz
dotlessi.doc.tar.xz
dotlessi.tar.xz
dpcircling.doc.tar.xz
dpcircling.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-g.spec ++++++
++++ 13235 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-g.new.3606/texlive-specs-g.spec
++++++ datetime2-breton.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-breton/datetime2-breton.pdf and new/doc/latex/datetime2-breton/datetime2-breton.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-breton.doc.tlpobj new/tlpkg/tlpobj/datetime2-breton.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-breton.doc.tlpobj 2019-02-28 03:31:15.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-breton.doc.tlpobj 2019-11-06 01:54:16.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-breton.doc
category Package
-revision 47030
+revision 52647
shortdesc doc files of datetime2-breton
relocated 1
docfiles size=70
++++++ datetime2-breton.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf new/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf
--- old/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf 2018-03-19 22:49:40.000000000 +0100
+++ new/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf 2019-11-05 22:35:56.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-breton.dtx (with options: `datetime2-breton-ascii.ldf,package')
%%
%% datetime2-breton.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{breton-ascii}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-ascii}[2019/11/05 v1.2]
\newcommand*{\DTMbretonordinal}[1]{%
\number#1
\ifnum#1=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf new/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
--- old/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf 2018-03-19 22:49:40.000000000 +0100
+++ new/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf 2019-11-05 22:35:56.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-breton.dtx (with options: `datetime2-breton-utf8.ldf,package')
%%
%% datetime2-breton.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{breton-utf8}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-utf8}[2019/11/05 v1.2]
\newcommand*{\DTMbretonordinal}[1]{%
\number#1
\ifnum#1=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-breton/datetime2-breton.ldf new/tex/latex/datetime2-breton/datetime2-breton.ldf
--- old/tex/latex/datetime2-breton/datetime2-breton.ldf 2018-03-19 22:49:40.000000000 +0100
+++ new/tex/latex/datetime2-breton/datetime2-breton.ldf 2019-11-05 22:35:56.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-breton.dtx (with options: `datetime2-breton.ldf,package')
%%
%% datetime2-breton.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{breton}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton}[2019/11/05 v1.2]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{breton-utf8}
@@ -62,8 +62,8 @@
\DTMdefkey{breton}{timezonesep}{\renewcommand*{\DTMbretontimezonesep}{#1}}
\DTMdefkey{breton}{datesep}{\renewcommand*{\DTMbretondatesep}{#1}}
\DTMdefkey{breton}{timesep}{\renewcommand*{\DTMbretontimesep}{#1}}
-\DTMdefchoicekey{breton}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{breton}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMbretonfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMbretonfmtordsuffix}[1]{%
@@ -108,7 +108,7 @@
\DTMifbool{breton}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -149,7 +149,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMbretontimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMbretontimesep\DTMtwodigits{##3}\fi
}%
@@ -161,7 +161,7 @@
\DTMifbool{breton}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-breton.tlpobj new/tlpkg/tlpobj/datetime2-breton.tlpobj
--- old/tlpkg/tlpobj/datetime2-breton.tlpobj 2019-02-28 03:31:15.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-breton.tlpobj 2019-11-06 01:54:16.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-breton
category Package
-revision 47030
+revision 52647
shortdesc Breton language module for the datetime2 package
relocated 1
longdesc This module provides the "breton" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
RELOC/tex/latex/datetime2-breton/datetime2-breton.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-breton
-catalogue-date 2018-03-19 17:33:02 +0100
+catalogue-date 2019-11-05 13:35:56 +0100
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.1
+catalogue-version 1.2
++++++ datetime2-english.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-english/CHANGES new/doc/latex/datetime2-english/CHANGES
--- old/doc/latex/datetime2-english/CHANGES 2016-03-11 00:23:23.000000000 +0100
+++ new/doc/latex/datetime2-english/CHANGES 2019-10-21 23:00:42.000000000 +0200
@@ -1,3 +1,7 @@
+v1.05 (2019-10-21):
+
+ * Renamed scratch variables to avoid conflict
+
v1.04 (2016-03-09):
* Added "dowdaysep" option to en-GB, en-AU, en-NZ, en-GG,
Binary files old/doc/latex/datetime2-english/datetime2-english-sample.pdf and new/doc/latex/datetime2-english/datetime2-english-sample.pdf differ
Binary files old/doc/latex/datetime2-english/datetime2-english.pdf and new/doc/latex/datetime2-english/datetime2-english.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-english.doc.tlpobj new/tlpkg/tlpobj/datetime2-english.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-english.doc.tlpobj 2019-02-28 03:31:17.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-english.doc.tlpobj 2019-10-22 16:40:35.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-english.doc
category Package
-revision 39991
+revision 52479
shortdesc doc files of datetime2-english
relocated 1
docfiles size=161
++++++ datetime2-english.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-AU.ldf new/tex/latex/datetime2-english/datetime2-en-AU.ldf
--- old/tex/latex/datetime2-english/datetime2-en-AU.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-AU.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-AU.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-AU}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-AU}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenAUdowdaysep}{\space}
\newcommand*{\DTMenAUdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-AU}{showyear}[true]{}
\DTMsetbool{en-AU}{showyear}{true}
\newcommand*{\DTMenAUfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-AU}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-AU}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenAUfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenAUfmtordsuffix}[1]{%
@@ -82,11 +82,11 @@
\DTMtexorpdfstring{\protect\textsc{##1}}{##1}}%
\fi
}
-\DTMdefchoicekey{en-AU}{zone}[\val\nr]%
+\DTMdefchoicekey{en-AU}{zone}[\@dtm@val\@dtm@nr]%
{std,standard,dst,daylight,central,central-western,western%
eastern,christmas,lord-howe,cocos,keeling,clear}%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@nr\relax
% std
\appto\DTMenAUzonemaps{\DTMenAUstdzonemaps}%
\DTMenAUstdzonemaps
@@ -158,7 +158,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenAUfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-AU}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -193,7 +193,7 @@
\DTMifbool{en-AU}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -246,7 +246,7 @@
\DTMifbool{en-AU}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-CA.ldf new/tex/latex/datetime2-english/datetime2-en-CA.ldf
--- old/tex/latex/datetime2-english/datetime2-en-CA.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-CA.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-CA.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-CA}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-CA}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenCAmonthdaysep}{\space}
\newcommand*{\DTMenCAdowmonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-CA}{showyear}[true]{}
\DTMsetbool{en-CA}{showyear}{true}
\newcommand*{\DTMenCAfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-CA}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-CA}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenCAfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenCAfmtordsuffix}[1]{%
@@ -82,11 +82,11 @@
\DTMtexorpdfstring{\protect\textsc{##1}}{##1}}%
\fi
}
-\DTMdefchoicekey{en-CA}{zone}[\val\nr]%
+\DTMdefchoicekey{en-CA}{zone}[\@dtm@val\@dtm@nr]%
{std,standard,dst,daylight,newfoundland,atlantic,eastern,central,mountain,%
pacific,clear}%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@nr\relax
% std
\appto\DTMenCAzonemaps{\DTMenCAstdzonemaps}%
\DTMenCAstdzonemaps
@@ -188,7 +188,7 @@
\DTMifbool{en-CA}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -241,7 +241,7 @@
\DTMifbool{en-CA}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-GB.ldf new/tex/latex/datetime2-english/datetime2-en-GB.ldf
--- old/tex/latex/datetime2-english/datetime2-en-GB.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-GB.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-GB.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-GB}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-GB}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenGBdowdaysep}{\space}
\newcommand*{\DTMenGBdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-GB}{showyear}[true]{}
\DTMsetbool{en-GB}{showyear}{true}
\newcommand*{\DTMenGBfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-GB}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-GB}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenGBfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenGBfmtordsuffix}[1]{%
@@ -123,7 +123,7 @@
\DTMifbool{en-GB}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-GB}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-GG.ldf new/tex/latex/datetime2-english/datetime2-en-GG.ldf
--- old/tex/latex/datetime2-english/datetime2-en-GG.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-GG.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-GG.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-GG}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-GG}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenGGdowdaysep}{\space}
\newcommand*{\DTMenGGdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-GG}{showyear}[true]{}
\DTMsetbool{en-GG}{showyear}{true}
\newcommand*{\DTMenGGfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-GG}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-GG}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenGGfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenGGfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenGGfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-GG}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-GG}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-GG}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-IE.ldf new/tex/latex/datetime2-english/datetime2-en-IE.ldf
--- old/tex/latex/datetime2-english/datetime2-en-IE.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-IE.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-IE.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-IE}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-IE}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenIEdowdaysep}{\space}
\newcommand*{\DTMenIEdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-IE}{showyear}[true]{}
\DTMsetbool{en-IE}{showyear}{true}
\newcommand*{\DTMenIEfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-IE}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-IE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenIEfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenIEfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIEfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-IE}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-IE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-IE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-IM.ldf new/tex/latex/datetime2-english/datetime2-en-IM.ldf
--- old/tex/latex/datetime2-english/datetime2-en-IM.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-IM.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-IM.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-IM}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-IM}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenIMdowdaysep}{\space}
\newcommand*{\DTMenIMdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-IM}{showyear}[true]{}
\DTMsetbool{en-IM}{showyear}{true}
\newcommand*{\DTMenIMfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-IM}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-IM}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenIMfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenIMfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIMfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-IM}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-IM}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-IM}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-JE.ldf new/tex/latex/datetime2-english/datetime2-en-JE.ldf
--- old/tex/latex/datetime2-english/datetime2-en-JE.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-JE.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-JE.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-JE}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-JE}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenJEdowdaysep}{\space}
\newcommand*{\DTMenJEdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-JE}{showyear}[true]{}
\DTMsetbool{en-JE}{showyear}{true}
\newcommand*{\DTMenJEfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-JE}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-JE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenJEfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenJEfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenJEfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-JE}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-JE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-JE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-MT.ldf new/tex/latex/datetime2-english/datetime2-en-MT.ldf
--- old/tex/latex/datetime2-english/datetime2-en-MT.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-MT.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-MT.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-MT}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-MT}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenMTdowdaysep}{\space}
\newcommand*{\DTMenMTdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-MT}{showyear}[true]{}
\DTMsetbool{en-MT}{showyear}{true}
\newcommand*{\DTMenMTfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-MT}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-MT}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenMTfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenMTfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenMTfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-MT}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-MT}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-MT}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-NZ.ldf new/tex/latex/datetime2-english/datetime2-en-NZ.ldf
--- old/tex/latex/datetime2-english/datetime2-en-NZ.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-NZ.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-NZ.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-NZ}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-NZ}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenNZdowdaysep}{\space}
\newcommand*{\DTMenNZdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-NZ}{showyear}[true]{}
\DTMsetbool{en-NZ}{showyear}{true}
\newcommand*{\DTMenNZfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-NZ}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-NZ}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenNZfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenNZfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenNZfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-NZ}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-NZ}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-NZ}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-US.ldf new/tex/latex/datetime2-english/datetime2-en-US.ldf
--- old/tex/latex/datetime2-english/datetime2-en-US.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-US.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-US.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-US}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-US}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenUSmonthdaysep}{\space}
\newcommand*{\DTMenUSdowmonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-US}{showyear}[true]{}
\DTMsetbool{en-US}{showyear}{true}
\newcommand*{\DTMenUSfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-US}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-US}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenUSfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenUSfmtordsuffix}[1]{%
@@ -82,11 +82,11 @@
\DTMtexorpdfstring{\protect\textsc{##1}}{##1}}%
\fi
}
-\DTMdefchoicekey{en-US}{zone}[\val\nr]%
+\DTMdefchoicekey{en-US}{zone}[\@dtm@val\@dtm@nr]%
{std,standard,dst,daylight,atlantic,eastern,central,mountain,%
pacific,alaska,hawaii-aleutian,hawaii,aleutian,samoa,charmorro,clear}%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@nr\relax
% std
\appto\DTMenUSzonemaps{\DTMenUSstdzonemaps}%
\DTMenUSstdzonemaps
@@ -210,7 +210,7 @@
\DTMifbool{en-US}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -263,7 +263,7 @@
\DTMifbool{en-US}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-english-base.ldf new/tex/latex/datetime2-english/datetime2-english-base.ldf
--- old/tex/latex/datetime2-english/datetime2-english-base.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-english-base.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-english-base.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{english-base}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{english-base}[2019/10/21 v1.05 (NLCT)]
\newcommand*{\DTMenglishordinal}[1]{%
\number#1 % space intended
\DTMenglishfmtordsuffix{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-english.ldf new/tex/latex/datetime2-english/datetime2-english.ldf
--- old/tex/latex/datetime2-english/datetime2-english.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-english.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-english.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{english}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{english}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\DTMnewstyle
{english}% label
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-english.tlpobj new/tlpkg/tlpobj/datetime2-english.tlpobj
--- old/tlpkg/tlpobj/datetime2-english.tlpobj 2019-02-28 03:31:17.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-english.tlpobj 2019-10-22 16:40:35.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-english
category Package
-revision 39991
+revision 52479
shortdesc English language module for the datetime2 package
relocated 1
longdesc This module provides the following styles that can be set using
@@ -28,7 +28,7 @@
RELOC/tex/latex/datetime2-english/datetime2-english-base.ldf
RELOC/tex/latex/datetime2-english/datetime2-english.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-english
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-21 13:10:15 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.04
+catalogue-version 1.05
++++++ datetime2-german.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-german/README.md new/doc/latex/datetime2-german/README.md
--- old/doc/latex/datetime2-german/README.md 2017-10-05 02:41:45.000000000 +0200
+++ new/doc/latex/datetime2-german/README.md 2019-12-14 23:26:29.000000000 +0100
@@ -10,7 +10,6 @@
This module is maintained.
Current maintainer is Sebastian Friedl.
-Thanks to Jürgen Spitzmüller for his valuable advice while developing Version 2.0 of this module.
## Installation
@@ -20,12 +19,12 @@
Documentation:
- pdflatex datetime2-german.dtx
- makeindex -s gind.ist datetime2-german.idx
- makeindex -s gglo.ist -o datetime2-german.gls datetime2-german.glo
- pdflatex datetime2-german.dtx
- pdflatex datetime2-german.dtx
+ lualatex datetime2-german-doc.dtx
+ makeindex -s gind.ist datetime2-german-doc.idx
+ makeindex -s gglo.ist -o datetime2-german-doc.gls datetime2-german-doc.glo
+ lualatex datetime2-german-doc.dtx
+ lualatex datetime2-german-doc.dtx
-Move `datetime2-german.pdf` and `README` to `TEXMF/doc/latex/datetime2-contrib/datetime2-german/`
+Move `datetime2-german-doc.pdf` and `README.md` to `TEXMF/doc/latex/datetime2-contrib/datetime2-german/`
-This material is subject to the LaTeX Project Public License. See [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt "Show the current version of the LPPL") for the details of that license.
+This material is subject to the LaTeX Project Public License. See [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt "Show the current version of the LPPL") or `LICENSE.txt` for the details of that license.
Binary files old/doc/latex/datetime2-german/datetime2-german-doc.pdf and new/doc/latex/datetime2-german/datetime2-german-doc.pdf differ
Binary files old/doc/latex/datetime2-german/datetime2-german.pdf and new/doc/latex/datetime2-german/datetime2-german.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-german.doc.tlpobj new/tlpkg/tlpobj/datetime2-german.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-german.doc.tlpobj 2019-02-28 03:31:18.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-german.doc.tlpobj 2019-12-15 01:53:40.000000000 +0100
@@ -1,8 +1,8 @@
name datetime2-german.doc
category Package
-revision 45800
+revision 53125
shortdesc doc files of datetime2-german
relocated 1
-docfiles size=80
+docfiles size=35
RELOC/doc/latex/datetime2-german/README.md
- RELOC/doc/latex/datetime2-german/datetime2-german.pdf
+ RELOC/doc/latex/datetime2-german/datetime2-german-doc.pdf
++++++ datetime2-german.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-de-AT.ldf new/tex/latex/datetime2-german/datetime2-de-AT.ldf
--- old/tex/latex/datetime2-german/datetime2-de-AT.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-de-AT.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% datetime2-german.dtx (with options: `datetime2-de-AT.ldf,package')
+%% datetime2-de-AT.dtx (with options: `datetime2-de-AT.ldf,package')
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,14 +46,14 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{de-AT}[2017/11/13 v2.1]
-\RequireDateTimeModule{german}
+\ProvidesDateTimeModule{de-AT}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMdeATdowdaysep}{,\space}
\newcommand*{\DTMdeATdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMdeATmonthyearsep}{\space}
\newcommand*{\DTMdeATdatetimesep}{,\space}
\newcommand*{\DTMdeATtimezonesep}{\space}
-\newcommand*{\DTMdeATdatesep}{-}
+\newcommand*{\DTMdeATdatesep}{.}
\newcommand*{\DTMdeATtimesep}{:}
\DTMdefkey{de-AT}{dowdaysep}{\renewcommand*{\DTMdeATdowdaysep}{#1}}
\DTMdefkey{de-AT}{daymonthsep}{\renewcommand*{\DTMdeATdaymonthsep}{#1}}
@@ -167,19 +171,28 @@
{de-AT-numeric}% label
{% date style
\renewcommand*\DTMdisplaydate[4]{%
- \DTMifbool{de-AT}{showyear}%
+ \ifDTMshowdow
+ \ifnum##4>-1
+ \DTMifbool{de-AT}{abbr}%
+ {\DTMgermanshortweekdayname{##4}}%
+ {\DTMgermanweekdayname{##4}}%
+ \DTMdeATdowdaysep
+ \fi
+ \fi
+ %
+ \DTMifbool{de-AT}{showdayofmonth}%
{%
- \number##1 % space intended
- \DTMdeATdatesep%
+ \DTMtwodigits{##3}%
+ \DTMdeATdatesep
}%
{}%
- %
\DTMtwodigits{##2}%
- %
- \DTMifbool{de-AT}{showdayofmonth}%
+ \DTMdeATdatesep%
+ \DTMifbool{de-AT}{showyear}%
{%
- \DTMdeATdatesep%
- \DTMtwodigits{##3}%
+ \DTMifbool{de-AT}{abbr}%
+ {\DTMtwodigits{##1}}%
+ {\number##1 }% space intended
}%
{}%
}%
@@ -219,20 +232,19 @@
\renewcommand*{\DTMDisplay}{\DTMdisplay}%
}
\DTMifcaseregional
-{}% do nothing
-{\DTMsetstyle{de-AT}}%
-{\DTMsetstyle{de-AT-numeric}}%
+ {}% do nothing
+ {\DTMsetstyle{de-AT}}%
+ {\DTMsetstyle{de-AT-numeric}}%
\ifcsundef{date\CurrentTrackedDialect}
{%
\ifundef\dategerman
- {% do nothing
- }%
+ {}% do nothing
{%
\def\dategerman{%
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{german}}%
- {\DTMsetstyle{german-numeric}}%
+ {\DTMsetstyle{de-AT}}%
+ {\DTMsetstyle{de-AT-numeric}}%
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-de-CH.ldf new/tex/latex/datetime2-german/datetime2-de-CH.ldf
--- old/tex/latex/datetime2-german/datetime2-de-CH.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-de-CH.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% datetime2-german.dtx (with options: `datetime2-de-CH.ldf,package')
+%% datetime2-de-CH.dtx (with options: `datetime2-de-CH.ldf,package')
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,8 +46,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{de-CH}[2017/11/13 v2.1]
-\RequireDateTimeModule{german}
+\ProvidesDateTimeModule{de-CH}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMdeCHdowdaysep}{,\space}
\newcommand*{\DTMdeCHdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMdeCHmonthyearsep}{\space}
@@ -173,7 +177,7 @@
\DTMifbool{de-CH}{abbr}%
{\DTMgermanshortweekdayname{##4}}%
{\DTMgermanweekdayname{##4}}%
-\DTMdeCHdowdaysep
+ \DTMdeCHdowdaysep
\fi
\fi
%
@@ -187,7 +191,9 @@
\DTMdeCHdatesep%
\DTMifbool{de-CH}{showyear}%
{%
- \number##1 % space intended
+ \DTMifbool{de-CH}{abbr}%
+ {\DTMtwodigits{##1}}%
+ {\number##1 }% space intended
}%
{}%
}%
@@ -228,20 +234,19 @@
\renewcommand*{\DTMDisplay}{\DTMdisplay}%
}
\DTMifcaseregional
-{}% do nothing
-{\DTMsetstyle{de-CH}}%
-{\DTMsetstyle{de-CH-numeric}}%
+ {}% do nothing
+ {\DTMsetstyle{de-CH}}%
+ {\DTMsetstyle{de-CH-numeric}}%
\ifcsundef{date\CurrentTrackedDialect}
{%
\ifundef\dategerman
- {% do nothing
- }%
+ {}% do nothing
{%
\def\dategerman{%
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{german}}%
- {\DTMsetstyle{german-numeric}}%
+ {\DTMsetstyle{de-CH}}%
+ {\DTMsetstyle{de-CH-numeric}}%
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-de-DE.ldf new/tex/latex/datetime2-german/datetime2-de-DE.ldf
--- old/tex/latex/datetime2-german/datetime2-de-DE.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-de-DE.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% datetime2-german.dtx (with options: `datetime2-de-DE.ldf,package')
+%% datetime2-de-DE.dtx (with options: `datetime2-de-DE.ldf,package')
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,8 +46,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{de-DE}[2017/11/13 v2.1]
-\RequireDateTimeModule{german}
+\ProvidesDateTimeModule{de-DE}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMdeDEdowdaysep}{,\space}
\newcommand*{\DTMdeDEdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMdeDEmonthyearsep}{\space}
@@ -90,9 +94,7 @@
\DTMifbool{de-DE}{showyear}%
{%
\DTMdeDEmonthyearsep%
- \DTMifbool{de-DE}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}%
@@ -117,9 +119,7 @@
\DTMifbool{de-DE}{showyear}%
{%
\DTMdeDEmonthyearsep%
- \DTMifbool{de-DE}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}
@@ -233,19 +233,18 @@
}
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{de-DE}}
- {\DTMsetstyle{de-DE-numeric}}
+ {\DTMsetstyle{de-DE}}%
+ {\DTMsetstyle{de-DE-numeric}}%
\ifcsundef{date\CurrentTrackedDialect}
{%
\ifundef\dategerman
- {% do nothing
- }%
+ {}% do nothing
{%
\def\dategerman{%
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{german}}%
- {\DTMsetstyle{german-numeric}}%
+ {\DTMsetstyle{de-DE}}%
+ {\DTMsetstyle{de-DE-numeric}}%
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-ascii.ldf new/tex/latex/datetime2-german/datetime2-german-ascii.ldf
--- old/tex/latex/datetime2-german/datetime2-german-ascii.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-ascii.ldf 1970-01-01 01:00:00.000000000 +0100
@@ -1,225 +0,0 @@
-%%
-%% This is file `datetime2-german-ascii.ldf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% datetime2-german.dtx (with options: `datetime2-german-ascii.ldf,package')
-%%
-%% datetime2-german.dtx
-%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license of (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% Current maintainer of the work is Sebastian Friedl
-%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{german-ascii}[2017/11/13 v2.1]
-\newcommand*{\DTMgermanordinal}[1]{%
- \number#1
-}
-\newcommand*{\DTMgermanmonthname}[1]{%
- \ifcase#1
- \or
- Januar%
- \or
- Februar%
- \or
- M\protect\"arz%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMdeATmonthname}[1]{%
- \ifcase#1
- \or
- J\protect\"anner%
- \or
- Februar%
- \or
- M\protect\"arz%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMgermanshortmonthname}[1]{%
- \ifcase#1
- \or
- Jan.%
- \or
- Feb.%
- \or
- M\protect\"arz%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeATshortmonthname}[1]{%
- \ifcase#1
- \or
- J\protect\"an.%
- \or
- Feb.%
- \or
- M\protect\"arz%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeCHshortmonthname}[1]{%
-\ifcase#1
-\or
-Jan.%
-\or
-Febr.%
-\or
-M\protect\"arz%
-\or
-April%
-\or
-Mai%
-\or
-Juni%
-\or
-Juli%
-\or
-Aug.%
-\or
-Sept.%
-\or
-Okt.%
-\or
-Nov.%
-\or
-Dez.%
-\fi
-}
-\newcommand*{\DTMgermanweekdayname}[1]{%
- \ifcase#1
- Montag%
- \or
- Dienstag%
- \or
- Mittwoch%
- \or
- Donnerstag%
- \or
- Freitag%
- \or
- Samstag%
- \or
- Sonntag%
- \fi
-}
-\newcommand*{\DTMgermanshortweekdayname}[1]{%
- \ifcase#1
- Mo%
- \or
- Di%
- \or
- Mi%
- \or
- Do%
- \or
- Fr%
- \or
- Sa%
- \or
- So%
- \fi
-}
-\endinput
-%%
-%% End of file `datetime2-german-ascii.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf new/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf
--- old/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -0,0 +1,192 @@
+%%
+%% This is file `datetime2-german-base-ascii.ldf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% datetime2-german-base-ascii.dtx (with options: `datetime2-german-base-ascii.ldf,package')
+%%
+%% datetime2-german.dtx
+%% Copyright 2015 Nicola Talbot
+%% Copyright 2017-19 Sebastian Friedl
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% Current maintainer of the work is Sebastian Friedl
+%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\ProvidesDateTimeModule{german-base-ascii}[2019/12/13 v3.0]
+\newcommand*{\DTMgermanmonthname}[1]{%
+ \ifcase#1
+ \or
+ Januar%
+ \or
+ Februar%
+ \or
+ M\protect\"arz%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMdeATmonthname}[1]{%
+ \ifcase#1
+ \or
+ J\protect\"anner%
+ \or
+ Februar%
+ \or
+ M\protect\"arz%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMgermanshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Feb.%
+ \or
+ M\protect\"arz%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeATshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ J\protect\"an.%
+ \or
+ Feb.%
+ \or
+ M\protect\"arz%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeCHshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Febr.%
+ \or
+ M\protect\"arz%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\endinput
+%%
+%% End of file `datetime2-german-base-ascii.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf new/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf
--- old/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -0,0 +1,192 @@
+%%
+%% This is file `datetime2-german-base-utf8.ldf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% datetime2-german-base-utf8.dtx (with options: `datetime2-german-base-utf8.ldf,package')
+%%
+%% datetime2-german.dtx
+%% Copyright 2015 Nicola Talbot
+%% Copyright 2017-19 Sebastian Friedl
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% Current maintainer of the work is Sebastian Friedl
+%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\ProvidesDateTimeModule{german-base-utf8}[2019/12/13 v3.0]
+\newcommand*{\DTMgermanmonthname}[1]{%
+ \ifcase#1
+ \or
+ Januar%
+ \or
+ Februar%
+ \or
+ März%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMdeATmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jänner%
+ \or
+ Februar%
+ \or
+ März%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMgermanshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Feb.%
+ \or
+ März%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeATshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jän.%
+ \or
+ Feb.%
+ \or
+ März%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeCHshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Febr.%
+ \or
+ März%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\endinput
+%%
+%% End of file `datetime2-german-base-utf8.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-base.ldf new/tex/latex/datetime2-german/datetime2-german-base.ldf
--- old/tex/latex/datetime2-german/datetime2-german-base.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-base.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -0,0 +1,103 @@
+%%
+%% This is file `datetime2-german-base.ldf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% datetime2-german-base.dtx (with options: `datetime2-german-base.ldf,package')
+%%
+%% datetime2-german.dtx
+%% Copyright 2015 Nicola Talbot
+%% Copyright 2017-19 Sebastian Friedl
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% Current maintainer of the work is Sebastian Friedl
+%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\ProvidesDateTimeModule{german-base}[2019/12/13 v3.0]
+\newcommand*{\DTMgermanordinal}[1]{%
+ \number#1
+}
+\newcommand*{\DTMgermanweekdayname}[1]{%
+ \ifcase#1
+ Montag%
+ \or
+ Dienstag%
+ \or
+ Mittwoch%
+ \or
+ Donnerstag%
+ \or
+ Freitag%
+ \or
+ Samstag%
+ \or
+ Sonntag%
+ \fi
+}
+\newcommand*{\DTMgermanshortweekdayname}[1]{%
+ \ifcase#1
+ Mo%
+ \or
+ Di%
+ \or
+ Mi%
+ \or
+ Do%
+ \or
+ Fr%
+ \or
+ Sa%
+ \or
+ So%
+ \fi
+}
+\newcommand*{\DTMgermanzonemaps}{%
+ \DTMdefzonemap{01}{00}{MEZ}%
+ \DTMdefzonemap{02}{00}{MESZ}%
+}
+\RequirePackage{ifxetex, ifluatex}
+\ifxetex
+ \RequireDateTimeModule{german-base-utf8}
+\else
+ \ifluatex
+ \RequireDateTimeModule{german-base-utf8}
+ \else
+ \RequireDateTimeModule{german-base-ascii}
+ \fi
+\fi
+\endinput
+%%
+%% End of file `datetime2-german-base.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-utf8.ldf new/tex/latex/datetime2-german/datetime2-german-utf8.ldf
--- old/tex/latex/datetime2-german/datetime2-german-utf8.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-utf8.ldf 1970-01-01 01:00:00.000000000 +0100
@@ -1,225 +0,0 @@
-%%
-%% This is file `datetime2-german-utf8.ldf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% datetime2-german.dtx (with options: `datetime2-german-utf8.ldf,package')
-%%
-%% datetime2-german.dtx
-%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license of (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% Current maintainer of the work is Sebastian Friedl
-%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{german-utf8}[2017/11/13 v2.1]
-\newcommand*{\DTMgermanordinal}[1]{%
- \number#1
-}
-\newcommand*{\DTMgermanmonthname}[1]{%
- \ifcase#1
- \or
- Januar%
- \or
- Februar%
- \or
- März%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMdeATmonthname}[1]{%
- \ifcase#1
- \or
- Jänner%
- \or
- Februar%
- \or
- März%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMgermanshortmonthname}[1]{%
- \ifcase#1
- \or
- Jan.%
- \or
- Feb.%
- \or
- März%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeATshortmonthname}[1]{%
- \ifcase#1
- \or
- Jän.%
- \or
- Feb.%
- \or
- März%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeCHshortmonthname}[1]{%
- \ifcase#1
- \or
- Jan.%
- \or
- Febr.%
- \or
- März%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMgermanweekdayname}[1]{%
- \ifcase#1
- Montag%
- \or
- Dienstag%
- \or
- Mittwoch%
- \or
- Donnerstag%
- \or
- Freitag%
- \or
- Samstag%
- \or
- Sonntag%
- \fi
-}
-\newcommand*{\DTMgermanshortweekdayname}[1]{%
- \ifcase#1
- Mo%
- \or
- Di%
- \or
- Mi%
- \or
- Do%
- \or
- Fr%
- \or
- Sa%
- \or
- So%
- \fi
-}
-\endinput
-%%
-%% End of file `datetime2-german-utf8.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german.ldf new/tex/latex/datetime2-german/datetime2-german.ldf
--- old/tex/latex/datetime2-german/datetime2-german.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,17 +46,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{german}[2017/11/13 v2.1]
-\RequirePackage{ifxetex,ifluatex}
-\ifxetex
- \RequireDateTimeModule{german-utf8}
-\else
- \ifluatex
- \RequireDateTimeModule{german-utf8}
- \else
- \RequireDateTimeModule{german-ascii}
- \fi
-\fi
+\ProvidesDateTimeModule{german}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMgermandowdaysep}{,\space}
\newcommand*{\DTMgermandaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMgermanmonthyearsep}{\space}
@@ -99,9 +94,7 @@
\DTMifbool{german}{showyear}%
{%
\DTMgermanmonthyearsep%
- \DTMifbool{german}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}%
@@ -126,9 +119,7 @@
\DTMifbool{german}{showyear}%
{%
\DTMgermanmonthyearsep%
- \DTMifbool{german}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}%
@@ -240,11 +231,6 @@
}%
\renewcommand*{\DTMDisplay}{\DTMdisplay}%
}
-\newcommand*{\DTMgermanzonemaps}{%
- \DTMdefzonemap{01}{00}{MEZ}%
- \DTMdefzonemap{02}{00}{MESZ}%
-}
-
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{german}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-german.tlpobj new/tlpkg/tlpobj/datetime2-german.tlpobj
--- old/tlpkg/tlpobj/datetime2-german.tlpobj 2019-02-28 03:31:18.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-german.tlpobj 2019-12-15 01:53:40.000000000 +0100
@@ -1,21 +1,21 @@
name datetime2-german
category Package
-revision 45800
+revision 53125
shortdesc German language module for the datetime2 package
relocated 1
longdesc This module provides the "german" style that can be set using
longdesc \DTMsetstyle provided by datetime2.sty.
-runfiles size=10
+runfiles size=11
RELOC/tex/latex/datetime2-german/datetime2-de-AT.ldf
RELOC/tex/latex/datetime2-german/datetime2-de-CH.ldf
RELOC/tex/latex/datetime2-german/datetime2-de-DE.ldf
- RELOC/tex/latex/datetime2-german/datetime2-german-ascii.ldf
- RELOC/tex/latex/datetime2-german/datetime2-german-utf8.ldf
+ RELOC/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf
+ RELOC/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf
+ RELOC/tex/latex/datetime2-german/datetime2-german-base.ldf
RELOC/tex/latex/datetime2-german/datetime2-german.ldf
-catalogue-contact-bugs https://github.com/SFr682k/datetime2-german/issues
-catalogue-contact-repository https://github.com/SFr682k/datetime2-german
+catalogue-contact-bugs https://gitlab.com/SFr682k/datetime2-german/issues
+catalogue-contact-repository https://gitlab.com/SFr682k/datetime2-german
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-german
-catalogue-date 2017-11-13 22:45:08 +0100
catalogue-license lppl1.3c
catalogue-topics date-time multilingual
-catalogue-version 2.1
+catalogue-version 3.0
++++++ datetime2-it-fulltext.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj new/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj 2019-02-28 03:31:20.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj 2020-04-19 18:09:42.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-it-fulltext.doc
category Package
-revision 38093
+revision 54779
shortdesc doc files of datetime2-it-fulltext
relocated 1
docfiles size=44
++++++ datetime2-it-fulltext.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj new/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj
--- old/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj 2019-02-28 03:31:20.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj 2020-04-19 18:09:42.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-it-fulltext
category Package
-revision 38093
+revision 54779
shortdesc Italian full text styles for the datetime2 package
relocated 1
longdesc Italian date and time styles that use words for the numbers and
@@ -10,12 +10,12 @@
longdesc The necessary packages are datetime2, itnumpar, ifxetex, and
longdesc ifluatex. This package is the translation and adaptation of
longdesc datetime2-en-fulltext.
+depend iftex
runfiles size=10
RELOC/tex/latex/datetime2-it-fulltext/datetime2-it-fulltext-ascii.ldf
RELOC/tex/latex/datetime2-it-fulltext/datetime2-it-fulltext-utf8.ldf
RELOC/tex/latex/datetime2-it-fulltext/datetime2-it-fulltext.sty
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-it-fulltext
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
catalogue-version 1.6
++++++ datetime2-scottish.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-scottish/datetime2-scottish.pdf and new/doc/latex/datetime2-scottish/datetime2-scottish.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj new/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj 2019-02-28 03:31:22.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj 2019-09-16 01:54:06.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-scottish.doc
category Package
-revision 36625
+revision 52101
shortdesc doc files of datetime2-scottish
relocated 1
docfiles size=71
++++++ datetime2-scottish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf new/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf
--- old/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf 2015-03-25 22:53:50.000000000 +0100
+++ new/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf 2019-09-15 22:46:00.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-scottish.dtx (with options: `datetime2-scottish-ascii.ldf,package')
%%
%% datetime2-scottish.dtx
-%% Copyright 2015 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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{scottish-ascii}[2015/03/25 v1.0]
+\ProvidesDateTimeModule{scottish-ascii}[2019/09/14 v1.0]
\newcommand*{\DTMscottishordinal}[1]{%
\number#1 % space intended
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf new/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf
--- old/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf 2015-03-25 22:53:50.000000000 +0100
+++ new/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf 2019-09-15 22:46:00.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-scottish.dtx (with options: `datetime2-scottish-utf8.ldf,package')
%%
%% datetime2-scottish.dtx
-%% Copyright 2015 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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{scottish-utf8}[2015/03/25 v1.0]
+\ProvidesDateTimeModule{scottish-utf8}[2019/09/14 v1.0]
\newcommand*{\DTMscottishordinal}[1]{%
\number#1 % space intended
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-scottish/datetime2-scottish.ldf new/tex/latex/datetime2-scottish/datetime2-scottish.ldf
--- old/tex/latex/datetime2-scottish/datetime2-scottish.ldf 2015-03-25 22:53:50.000000000 +0100
+++ new/tex/latex/datetime2-scottish/datetime2-scottish.ldf 2019-09-15 22:46:00.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-scottish.dtx (with options: `datetime2-scottish.ldf,package')
%%
%% datetime2-scottish.dtx
-%% Copyright 2015 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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{scottish}[2015/03/25 v1.0]
+\ProvidesDateTimeModule{scottish}[2019/09/14 v1.0]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{scottish-utf8}
@@ -108,7 +108,7 @@
\DTMifbool{scottish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMscottishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -171,7 +171,7 @@
\DTMifbool{scottish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMscottishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -218,7 +218,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{scottish}}%
- {\DTMsetstyle{scottish-numeric}}
+ {\DTMsetstyle{scottish-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-scottish.tlpobj new/tlpkg/tlpobj/datetime2-scottish.tlpobj
--- old/tlpkg/tlpobj/datetime2-scottish.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-scottish.tlpobj 2019-09-16 01:54:06.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-scottish
category Package
-revision 36625
+revision 52101
shortdesc Scottish Gaelic Language Module for the datetime2 Package
relocated 1
longdesc This module provides the "scottish" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf
RELOC/tex/latex/datetime2-scottish/datetime2-scottish.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-scottish
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-14 22:47:55 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-serbian.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-serbian/README new/doc/latex/datetime2-serbian/README
--- old/doc/latex/datetime2-serbian/README 2015-04-01 22:41:35.000000000 +0200
+++ new/doc/latex/datetime2-serbian/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-Serbian Language Module for datetime2 Package
-
-Author: Nicola L. C. Talbot (inactive)
-
-Licence: LPPL
-
-Required Packages: datetime2, tracklang
-
-This module is unmaintained. If you want to volunteer to take over
-the maintenance contact me at www.dickimaw-books.com/contact.html
-
-Example usage:
-
-\documentclass{article}
-\usepackage[serbian]{datetime2}
-\begin{document}
-\today
-\end{document}
-
-\documentclass[serbian]{article}
-\usepackage{babel}
-\usepackage[useregional]{datetime2}
-\begin{document}
-\today
-\end{document}
-
-\documentclass{article}
-\usepackage{polyglossia}
-\setmainlanguage{serbian}
-\usepackage[serbian]{datetime2}
-\begin{document}
-\today
-\end{document}
-
-INSTALLATION
-============
-
-xelatex datetime2-serbian.ins
-
-Move all *.ldf files to
-TEXMF/tex/latex/datetime2-contrib/datetime2-serbian/
-
-Documentation:
-
-xelatex datetime2-serbian.dtx
-makeindex -s gind.ist datetime2-serbian.idx
-makeindex -s gglo.ist -o datetime2-serbian.gls datetime2-serbian.glo
-xelatex datetime2-serbian.dtx
-xelatex datetime2-serbian.dtx
-
-Move datetime2-serbian.pdf and README to
-TEXMF/doc/latex/datetime2-contrib/datetime2-serbian/
-
-This material is subject to the LaTeX Project Public License.
-See http://www.ctan.org/license/lppl1.3 for the details of that
-license.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-serbian/README.md new/doc/latex/datetime2-serbian/README.md
--- old/doc/latex/datetime2-serbian/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/datetime2-serbian/README.md 2019-11-22 23:20:04.000000000 +0100
@@ -0,0 +1,95 @@
+Serbian Language Module for datetime2 CTAN Package
+==================================================
+
+**Current maintainer:** Andrej Radović
+
+**Authors:** Andrej Radović (r.andrej@gmail.com), Nicola L. C. Talbot (inactive)
+
+**Licence:** LPPL
+
+**Required Packages:** `datetime2`, `tracklang`
+
+Styles
+------
+
+This module provides the following styles:
+
+### Latin:
+* serbian - regionless style
+* sr-Latn - Serbian, Serbia
+* sr-Latn-RS - Serbian, Serbia
+* sr-Latn-ME - Serbian, Montenegro
+* sr-Latn-BA - Serbian, Bosnia and Herzegovina
+
+### Cyrillic
+* serbianc - regionless style
+* sr-Cyrl - Serbian, Serbia
+* sr-Cyrl-RS - Serbian, Serbia
+* sr-Cyrl-ME - Serbian, Montenegro
+* sr-Cyrl-BA - Serbian, Bosnia and Herzegovina
+
+Notes:
+------
+
+The regional settings still don't work, but `serbian` and `serbianc` work just
+fine.
+The package is still in development.
+
+Example usage:
+--------------
+
+### Generic w/ `babel`
+ \documentclass{article}
+ \usepackage[serbian]{datetime2}
+ \begin{document}
+ \today
+ \end{document}
+
+### Generic w/ `babel`
+
+ \documentclass[serbian]{article}
+ \usepackage{babel}
+ \usepackage[useregional]{datetime2}
+ \begin{document}
+ \today
+ \end{document}
+
+### Generic w/ `polyglossia`
+
+ \documentclass{article}
+ \usepackage{polyglossia}
+ \setmainlanguage{serbian}
+ \usepackage[serbian]{datetime2}
+ \begin{document}
+ \today
+ \end{document}
+
+
+Installation
+------------
+
+Extract the language definition files first:
+
+Run LuaLaTeX over the file `datetime2-serbian.ins`:
+
+ lualatex datetime2-serbian.ins
+
+Move all `*.ldf` files to
+
+ TEXMF/tex/latex/datetime2-contrib/datetime2-serbian/
+
+ Then, you can compile the documentation yourself by executing
+
+ lualatex datetime2-serbian.dtx
+ makeindex -s ginddt2s.ist datetime2-serbian.idx
+ makeindex -s gglodt2s.ist -o datetime2-serbian.gls datetime2-serbian.glo
+ lualatex datetime2-serbian.dtx
+ lualatex datetime2-serbian.dtx
+
+or just use the precompiled documentation shipped with the source files.
+In both cases, copy the files `datetime2-serbian.pdf` and `README.md` to
+`TEXMF/doc/latex/datetime2-contrib/datetime2-serbian/`.
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3 for the details of that
+license.
Binary files old/doc/latex/datetime2-serbian/datetime2-serbian.pdf and new/doc/latex/datetime2-serbian/datetime2-serbian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj new/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj 2019-11-23 01:54:20.000000000 +0100
@@ -1,8 +1,8 @@
name datetime2-serbian.doc
category Package
-revision 36699
+revision 52893
shortdesc doc files of datetime2-serbian
relocated 1
-docfiles size=23
- RELOC/doc/latex/datetime2-serbian/README
+docfiles size=71
+ RELOC/doc/latex/datetime2-serbian/README.md
RELOC/doc/latex/datetime2-serbian/datetime2-serbian.pdf
++++++ datetime2-serbian.tar.xz ++++++
++++ 4782 lines of diff (skipped)
++++++ datetime2-slovak.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-slovak/datetime2-slovak.pdf and new/doc/latex/datetime2-slovak/datetime2-slovak.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj new/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-slovak.doc
category Package
-revision 36700
+revision 52281
shortdesc doc files of datetime2-slovak
relocated 1
-docfiles size=22
+docfiles size=19
RELOC/doc/latex/datetime2-slovak/README
RELOC/doc/latex/datetime2-slovak/datetime2-slovak.pdf
++++++ datetime2-slovak.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf new/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf
--- old/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf 2019-10-04 22:48:18.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovak.dtx (with options: `datetime2-slovak-ascii.ldf,package')
%%
%% datetime2-slovak.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovak-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovak-ascii}[2019/10/04 v1.1]
\newcommand*{\DTMslovakordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf new/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf
--- old/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf 2019-10-04 22:48:18.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovak.dtx (with options: `datetime2-slovak-utf8.ldf,package')
%%
%% datetime2-slovak.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovak-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovak-utf8}[2019/10/04 v1.1]
\newcommand*{\DTMslovakordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovak/datetime2-slovak.ldf new/tex/latex/datetime2-slovak/datetime2-slovak.ldf
--- old/tex/latex/datetime2-slovak/datetime2-slovak.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovak/datetime2-slovak.ldf 2019-10-04 22:48:18.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovak.dtx (with options: `datetime2-slovak.ldf,package')
%%
%% datetime2-slovak.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovak}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovak}[2019/10/04 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{slovak-utf8}
@@ -83,7 +83,7 @@
\DTMifbool{slovak}{showyear}%
{%
\DTMslovakmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -100,7 +100,7 @@
\DTMifbool{slovak}{showyear}%
{%
\DTMslovakmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -115,7 +115,7 @@
\DTMifbool{slovak}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovaktimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -166,7 +166,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMslovaktimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMslovaktimesep\DTMtwodigits{##3}\fi
}%
@@ -178,7 +178,7 @@
\DTMifbool{slovak}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovaktimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -204,7 +204,7 @@
\DTMifcaseregional
{}% do nothing
-{\DTMsetstyle{slovak}}
+{\DTMsetstyle{slovak}}%
{\DTMsetstyle{slovak-numeric}}
\ifcsundef{date\CurrentTrackedDialect}
{%
@@ -225,7 +225,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{slovak}}%
- {\DTMsetstyle{slovak-numeric}}
+ {\DTMsetstyle{slovak-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovak.tlpobj new/tlpkg/tlpobj/datetime2-slovak.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovak.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovak.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-slovak
category Package
-revision 36700
+revision 52281
shortdesc Slovak language module for the datetime2 package
relocated 1
longdesc This module provides the "slovak" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf
RELOC/tex/latex/datetime2-slovak/datetime2-slovak.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-slovak
-catalogue-date 2018-01-07 11:26:57 +0100
+catalogue-date 2019-10-04 19:11:51 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-slovene.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-slovene/datetime2-slovene.pdf and new/doc/latex/datetime2-slovene/datetime2-slovene.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj new/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-slovene.doc
category Package
-revision 36700
+revision 52282
shortdesc doc files of datetime2-slovene
relocated 1
-docfiles size=21
+docfiles size=19
RELOC/doc/latex/datetime2-slovene/README
RELOC/doc/latex/datetime2-slovene/datetime2-slovene.pdf
++++++ datetime2-slovene.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf new/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf
--- old/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf 2019-10-04 22:48:33.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovene.dtx (with options: `datetime2-slovene-ascii.ldf,package')
%%
%% datetime2-slovene.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovene-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovene-ascii}[2019/10/04 v1.1]
\newcommand*{\DTMsloveneordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf new/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf
--- old/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf 2019-10-04 22:48:33.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovene.dtx (with options: `datetime2-slovene-utf8.ldf,package')
%%
%% datetime2-slovene.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovene-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovene-utf8}[2019/10/04 v1.1]
\newcommand*{\DTMsloveneordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovene/datetime2-slovene.ldf new/tex/latex/datetime2-slovene/datetime2-slovene.ldf
--- old/tex/latex/datetime2-slovene/datetime2-slovene.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovene/datetime2-slovene.ldf 2019-10-04 22:48:33.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovene.dtx (with options: `datetime2-slovene.ldf,package')
%%
%% datetime2-slovene.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovene}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovene}[2019/10/04 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{slovene-utf8}
@@ -83,7 +83,7 @@
\DTMifbool{slovene}{showyear}%
{%
\DTMslovenemonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -100,7 +100,7 @@
\DTMifbool{slovene}{showyear}%
{%
\DTMslovenemonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -115,7 +115,7 @@
\DTMifbool{slovene}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovenetimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -166,7 +166,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMslovenetimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMslovenetimesep\DTMtwodigits{##3}\fi
}%
@@ -178,7 +178,7 @@
\DTMifbool{slovene}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovenetimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -204,7 +204,7 @@
\DTMifcaseregional
{}% do nothing
-{\DTMsetstyle{slovene}}
+{\DTMsetstyle{slovene}}%
{\DTMsetstyle{slovene-numeric}}
\ifcsundef{date\CurrentTrackedDialect}
{%
@@ -225,7 +225,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{slovene}}%
- {\DTMsetstyle{slovene-numeric}}
+ {\DTMsetstyle{slovene-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovene.tlpobj new/tlpkg/tlpobj/datetime2-slovene.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovene.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovene.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-slovene
category Package
-revision 36700
+revision 52282
shortdesc Slovene language module for the datetime2 package
relocated 1
longdesc This module provides the "slovene" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf
RELOC/tex/latex/datetime2-slovene/datetime2-slovene.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-slovene
-catalogue-date 2018-01-07 11:25:01 +0100
+catalogue-date 2019-10-04 19:30:17 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-turkish.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-turkish/datetime2-turkish.pdf and new/doc/latex/datetime2-turkish/datetime2-turkish.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj new/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj 2019-10-11 01:54:24.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-turkish.doc
category Package
-revision 36700
+revision 52331
shortdesc doc files of datetime2-turkish
relocated 1
-docfiles size=21
+docfiles size=19
RELOC/doc/latex/datetime2-turkish/README
RELOC/doc/latex/datetime2-turkish/datetime2-turkish.pdf
++++++ datetime2-turkish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf new/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf
--- old/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf 2019-10-10 22:44:17.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-turkish.dtx (with options: `datetime2-turkish-ascii.ldf,package')
%%
%% datetime2-turkish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{turkish-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{turkish-ascii}[2019/10/10 v1.1]
\newcommand*{\DTMturkishordinal}[1]{%
\number#1
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf new/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf
--- old/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf 2019-10-10 22:44:17.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-turkish.dtx (with options: `datetime2-turkish-utf8.ldf,package')
%%
%% datetime2-turkish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{turkish-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{turkish-utf8}[2019/10/10 v1.1]
\newcommand*{\DTMturkishordinal}[1]{%
\number#1
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-turkish/datetime2-turkish.ldf new/tex/latex/datetime2-turkish/datetime2-turkish.ldf
--- old/tex/latex/datetime2-turkish/datetime2-turkish.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-turkish/datetime2-turkish.ldf 2019-10-10 22:44:17.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-turkish.dtx (with options: `datetime2-turkish.ldf,package')
%%
%% datetime2-turkish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{turkish}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{turkish}[2019/10/10 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{turkish-utf8}
@@ -83,7 +83,7 @@
\DTMifbool{turkish}{showyear}%
{%
\DTMturkishmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -99,7 +99,7 @@
\DTMifbool{turkish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMturkishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -140,7 +140,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMturkishtimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMturkishtimesep\DTMtwodigits{##3}\fi
}%
@@ -152,7 +152,7 @@
\DTMifbool{turkish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMturkishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -199,7 +199,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{turkish}}%
- {\DTMsetstyle{turkish-numeric}}
+ {\DTMsetstyle{turkish-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-turkish.tlpobj new/tlpkg/tlpobj/datetime2-turkish.tlpobj
--- old/tlpkg/tlpobj/datetime2-turkish.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-turkish.tlpobj 2019-10-11 01:54:24.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-turkish
category Package
-revision 36700
+revision 52331
shortdesc Turkish language module for the datetime2 package
relocated 1
longdesc This module provides the "turkish" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf
RELOC/tex/latex/datetime2-turkish/datetime2-turkish.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-turkish
-catalogue-date 2018-01-07 12:06:25 +0100
+catalogue-date 2019-10-10 13:05:36 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-usorbian.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-usorbian/datetime2-usorbian.pdf and new/doc/latex/datetime2-usorbian/datetime2-usorbian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj new/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj 2019-10-14 01:54:01.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-usorbian.doc
category Package
-revision 36700
+revision 52375
shortdesc doc files of datetime2-usorbian
relocated 1
-docfiles size=22
+docfiles size=20
RELOC/doc/latex/datetime2-usorbian/README
RELOC/doc/latex/datetime2-usorbian/datetime2-usorbian.pdf
++++++ datetime2-usorbian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf new/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf
--- old/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf 2019-10-13 23:53:20.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-usorbian.dtx (with options: `datetime2-usorbian-ascii.ldf,package')
%%
%% datetime2-usorbian.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{usorbian-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{usorbian-ascii}[2019/10/10 v1.1]
\newcommand*{\DTMusorbianordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf new/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf
--- old/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf 2019-10-13 23:53:20.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-usorbian.dtx (with options: `datetime2-usorbian-utf8.ldf,package')
%%
%% datetime2-usorbian.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{usorbian-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{usorbian-utf8}[2019/10/10 v1.1]
\newcommand*{\DTMusorbianordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf new/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf
--- old/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf 2019-10-13 23:53:20.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-usorbian.dtx (with options: `datetime2-usorbian.ldf,package')
%%
%% datetime2-usorbian.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{usorbian}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{usorbian}[2019/10/10 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{usorbian-utf8}
@@ -92,7 +92,7 @@
\DTMifbool{usorbian}{showyear}%
{%
\DTMusorbianmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -108,7 +108,7 @@
\DTMifbool{usorbian}{showyear}%
{%
\DTMusorbianmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -123,7 +123,7 @@
\DTMifbool{usorbian}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMusorbiantimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -174,7 +174,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMusorbiantimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMusorbiantimesep\DTMtwodigits{##3}\fi
}%
@@ -186,7 +186,7 @@
\DTMifbool{usorbian}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMusorbiantimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -233,7 +233,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{usorbian}}%
- {\DTMsetstyle{usorbian-numeric}}
+ {\DTMsetstyle{usorbian-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-usorbian.tlpobj new/tlpkg/tlpobj/datetime2-usorbian.tlpobj
--- old/tlpkg/tlpobj/datetime2-usorbian.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-usorbian.tlpobj 2019-10-14 01:54:01.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-usorbian
category Package
-revision 36700
+revision 52375
shortdesc Upper Sorbian language module for the datetime2 package
relocated 1
longdesc This module provides the "usorbian" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf
RELOC/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-usorbian
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-10 13:19:18 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-welsh.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-welsh/datetime2-welsh.pdf and new/doc/latex/datetime2-welsh/datetime2-welsh.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj new/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj 2019-10-29 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-welsh.doc
category Package
-revision 36636
+revision 52553
shortdesc doc files of datetime2-welsh
relocated 1
docfiles size=71
++++++ datetime2-welsh.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf new/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf
--- old/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf 2015-03-26 22:52:35.000000000 +0100
+++ new/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf 2019-10-28 21:56:57.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-welsh.dtx (with options: `datetime2-welsh-ascii.ldf,package')
%%
%% datetime2-welsh.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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,10 +39,10 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{welsh-ascii}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh-ascii}[2019/10/28 v1.1]
\newcommand*{\DTMwelshordinal}[1]{%
- \number#1
- \ifnum#1=1
+ \number#1 % space intended
+ \ifnum#1=1 % space intended
\DTMwelshfmtordsuffix{a\protect\~{n}}%
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf new/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf
--- old/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf 2015-03-26 22:52:35.000000000 +0100
+++ new/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf 2019-10-28 21:56:57.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-welsh.dtx (with options: `datetime2-welsh-utf8.ldf,package')
%%
%% datetime2-welsh.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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,10 +39,10 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{welsh-utf8}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh-utf8}[2019/10/28 v1.1]
\newcommand*{\DTMwelshordinal}[1]{%
- \number#1
- \ifnum#1=1
+ \number#1 % space intended
+ \ifnum#1=1 % space intended
\DTMwelshfmtordinal{añ}%
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-welsh/datetime2-welsh.ldf new/tex/latex/datetime2-welsh/datetime2-welsh.ldf
--- old/tex/latex/datetime2-welsh/datetime2-welsh.ldf 2015-03-26 22:52:35.000000000 +0100
+++ new/tex/latex/datetime2-welsh/datetime2-welsh.ldf 2019-10-28 21:56:57.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-welsh.dtx (with options: `datetime2-welsh.ldf,package')
%%
%% datetime2-welsh.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-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 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{welsh}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh}[2019/10/28 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{welsh-utf8}
@@ -62,8 +62,8 @@
\DTMdefkey{welsh}{timezonesep}{\renewcommand*{\DTMwelshtimezonesep}{#1}}
\DTMdefkey{welsh}{datesep}{\renewcommand*{\DTMwelshdatesep}{#1}}
\DTMdefkey{welsh}{timesep}{\renewcommand*{\DTMwelshtimesep}{#1}}
-\DTMdefchoicekey{welsh}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{welsh}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMwelshfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMwelshfmtordsuffix}[1]{%
@@ -121,7 +121,7 @@
\DTMifbool{welsh}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMwelshtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -184,7 +184,7 @@
\DTMifbool{welsh}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMwelshtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -231,7 +231,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{welsh}}%
- {\DTMsetstyle{welsh-numeric}}
+ {\DTMsetstyle{welsh-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-welsh.tlpobj new/tlpkg/tlpobj/datetime2-welsh.tlpobj
--- old/tlpkg/tlpobj/datetime2-welsh.tlpobj 2019-02-28 03:31:25.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-welsh.tlpobj 2019-10-29 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-welsh
category Package
-revision 36636
+revision 52553
shortdesc Welsh language module for the datetime2 package
relocated 1
longdesc This module provides the "welsh" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf
RELOC/tex/latex/datetime2-welsh/datetime2-welsh.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-welsh
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-28 19:41:12 +0100
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ dccpaper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/README.md new/doc/latex/dccpaper/README.md
--- old/doc/latex/dccpaper/README.md 2019-03-08 23:22:53.000000000 +0100
+++ new/doc/latex/dccpaper/README.md 2020-01-15 22:48:33.000000000 +0100
@@ -1,9 +1,12 @@
# The dccpaper bundle: LaTeX classes for submissions to IJDC and IDCC
-The dccpaper bundle consists of two very similar classes.
+The dccpaper bundle consists of three very similar classes.
+
+ijdc-v14.cls corresponds to the template used by the
+[International Journal of Digital Curation], beginning with volume 14.
ijdc-v9.cls corresponds to the template used by the
-[International Journal of Digital Curation], beginning with volume 9.
+[International Journal of Digital Curation] for volumes 9 to 13 inclusive.
idcc.cls corresponds to the template used for the
[International Digital Curation Conference], beginning with IDCC15.
@@ -71,7 +74,7 @@
## Licence
-Copyright 2019 Digital Curation Centre, University of Edinburgh.
+Copyright 2020 Digital Curation Centre, University of Edinburgh.
This work consists of the image files dccpaper-by.eps and
dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile.
Binary files old/doc/latex/dccpaper/dccpaper.pdf and new/doc/latex/dccpaper/dccpaper.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dccpaper.doc.tlpobj new/tlpkg/tlpobj/dccpaper.doc.tlpobj
--- old/tlpkg/tlpobj/dccpaper.doc.tlpobj 2019-03-09 02:24:23.000000000 +0100
+++ new/tlpkg/tlpobj/dccpaper.doc.tlpobj 2020-03-24 01:57:18.000000000 +0100
@@ -1,9 +1,9 @@
name dccpaper.doc
category Package
-revision 50294
+revision 54512
shortdesc doc files of dccpaper
relocated 1
-docfiles size=68
+docfiles size=82
RELOC/doc/latex/dccpaper/README.md
RELOC/doc/latex/dccpaper/dccpaper-apacite.bib
RELOC/doc/latex/dccpaper/dccpaper-biblatex.bib
++++++ dccpaper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/dccpaper-base.sty new/tex/latex/dccpaper/dccpaper-base.sty
--- old/tex/latex/dccpaper/dccpaper-base.sty 2019-03-08 23:22:53.000000000 +0100
+++ new/tex/latex/dccpaper/dccpaper-base.sty 2020-01-15 22:48:33.000000000 +0100
@@ -14,31 +14,115 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/03/08 v1.8}
+\def\Version{2020/01/15 v2.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{dccpaper-base}
[\Version\space Common class code for IJDC and IDCC papers.]
\RequirePackage[british]{babel}
-\RequirePackage{etoolbox}
+\RequirePackage{etoolbox,xpatch}
\RequirePackage{iftex}
\ifPDFTeX
\RequirePackage[T1]{fontenc}
- \IfFileExists{newtxtext.sty}{%
- \RequirePackage{newtxtext,newtxmath}
- }{%
- \RequirePackage{mathptmx}}
- \IfFileExists{tgheros.sty}{%
- \ifx\undefined\qhv@scale
- \RequirePackage[scale=0.92]{tgheros}\else
- \def\qhv@scale{0.92}\fi
+ \ifdefstring{\dccp@variant}{baskerville}{%
+ \IfFileExists{baskervillef.sty}{
+ \RequirePackage[scaled=.95]{baskervillef}
+ \RequirePackage[baskerville,vvarbb]{newtxmath}
+ }{
+ \IfFileExists{Baskervaldx.sty}{
+ \RequirePackage[scaled=.95]{baskervaldx}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{
+ \IfFileExists{baskervald.sty}{
+ \RequirePackage{baskervald}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{}
+ }
+ }
+ \IfFileExists{lsr.pfb}{%
+ \renewcommand{\sfdefault}{hls}
+ \def\hls@scale{0.805}
+ }{%
+ \IfFileExists{GoSans.sty}{%
+ \RequirePackage[scale=.8]{GoSans}
+ }{%
+ \RequirePackage[scaled=0.82]{helvet}}}
}{%
- \RequirePackage[scaled=0.92]{helvet}}
- \renewcommand{\ttdefault}{cmtt}
+ \IfFileExists{newtxtext.sty}{%
+ \RequirePackage{newtxtext,newtxmath}
+ }{%
+ \RequirePackage{mathptmx}}
+ \IfFileExists{tgheros.sty}{%
+ \ifx\undefined\qhv@scale
+ \RequirePackage[scale=0.92]{tgheros}\else
+ \def\qhv@scale{0.92}\fi
+ }{%
+ \RequirePackage[scaled=0.92]{helvet}}
+ \renewcommand{\ttdefault}{cmtt}
+ }
\else
\RequirePackage{fontspec}
- \IfFileExists{newtxtext.sty}{%
- \setmainfont{TeXGyreTermesX}
- \RequirePackage{newtxmath}
+ \ifdefstring{\dccp@variant}{baskerville}{%
+ \IfFontExistsTF{Baskerville}{%
+ \setmainfont{Baskerville}
+ \RequirePackage[baskerville,vvarbb]{newtxmath}
+ }{%
+ \IfFileExists{baskervillef.sty}{%
+ \setmainfont[Scale=.95]{BaskervilleF}
+ \RequirePackage[baskerville,vvarbb]{newtxmath}
+ }{%
+ \IfFileExists{Baskervaldx.sty}{%
+ \setmainfont[Scale=.95]{baskervaldx}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{%
+ \IfFileExists{baskervald.sty}{%
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{baskervald}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{}
+ }
+ }
+ }
+ \IfFontExistsTF{Lucida Sans}{%
+ \setsansfont[Scale=.805]{Lucida Sans}
+ }{
+ \IfFontExistsTF{LucidaSansOT}{%
+ \setsansfont[Scale=.805]{LucidaSansOT}
+ }{%
+ \IfFileExists{GoSans.sty}{%
+ \RequirePackage[scale=.8]{GoSans}
+ }{%
+ \@ifpackageloaded{fontenc}{}{%
+ \appto\sffamily{\fontencoding{T1}\selectfont}
+ }
+ \RequirePackage[scaled=0.82]{helvet}
+ }
+ }
+ }
+ }{%
+ \IfFileExists{newtxtext.sty}{%
+ \setmainfont{TeXGyreTermesX}
+ \RequirePackage{newtxmath}
+ }{%
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{mathptmx}
+ }
+ \IfFontExistsTF{texgyreheros-regular.otf}{%
+ \setsansfont{texgyreheros}%
+ [ Extension = .otf
+ , UprightFont = *-regular
+ , ItalicFont = *-italic
+ , BoldFont = *-bold
+ , BoldItalicFont = *-bolditalic
+ , Scale = 0.92
+ ]
+ }{%
+ \IfFileExists{newtxtext.sty}{%
+ \appto\sffamily{\fontencoding{T1}\selectfont}%
+ }{}
+ \RequirePackage[scaled=0.92]{helvet}
+ }
+ }
+ \@ifpackageloaded{newtxmath}{%
\DeclareSymbolFont{oldoperators}{OT1}{ntxtlf}{m}{n}
\SetSymbolFont{oldoperators}{bold}{OT1}{ntxtlf}{b}{n}
\AtBeginDocument{%
@@ -84,25 +168,7 @@
\DeclareMathAccent{\dot}{\mathalpha}{oldoperators}{"5F}%
\DeclareMathAccent{\mathring}{\mathalpha}{oldoperators}{"17}%
\DeclareMathSymbol{\mathdollar}{\mathord}{operators}{"24}%
- }
- }{%
- \RequirePackage[T1]{fontenc}
- \RequirePackage{mathptmx}
- }
- \IfFontExistsTF{texgyreheros-regular.otf}{%
- \setsansfont{texgyreheros}%
- [ Extension = .otf
- , UprightFont = *-regular
- , ItalicFont = *-italic
- , BoldFont = *-bold
- , BoldItalicFont = *-bolditalic
- , Scale = 0.92
- ]
- }{%
- \IfFileExists{newtxtext.sty}{%
- \appto\sffamily{\fontencoding{T1}\selectfont}%
- }{}
- \RequirePackage[scaled=0.92]{helvet}
+ }%
}
\fi
\RequirePackage{graphicx}
@@ -219,8 +285,8 @@
}
}
-\pretocmd{\date}{\begingroup\let\footnote\@gobble}{}{}%
-\apptocmd{\date}{%
+\xpretocmd{\date}{\begingroup\let\footnote\@gobble}{}{}%
+\xapptocmd{\date}{%
\begingroup
\renewcommand{\thanks}[1]{}
\protected@xdef\thedate{#1}
@@ -254,12 +320,16 @@
\def\dccp@dates{\emph{Received} #1}}
\newcommand*{\revised}[1]{%
\appto\dccp@dates{%
- \space\space\space\textbar\space\space\space
+ \space\space\space
+ \ifdefstring{\dccp@variant}{baskerville}{$\sim$}{\textbar}%
+ \space\space\space
\emph{Revision received} #1}%
}
\newcommand*{\accepted}[1]{%
\appto\dccp@dates{%
- \space\space\space\textbar\space\space\space
+ \space\space\space
+ \ifdefstring{\dccp@variant}{baskerville}{$\sim$}{\textbar}%
+ \space\space\space
\emph{Accepted} #1}%
}
\let\dccp@conf=\empty
@@ -298,7 +368,8 @@
\def\@oddhead{%
\begin{minipage}{\textwidth}%
\centering
- \LARGE\bfseries\color{struct}%
+ \ifdefstring{\dccp@variant}{baskerville}{\huge\sffamily}{\LARGE\bfseries}%
+ \color{struct}%
\ifx\dccp@type\dccp@editorial
\dccp@publ@long
\else
@@ -379,7 +450,8 @@
}%
\let\NormalHead=\@oddhead
\def\@oddfoot{\begin{minipage}[b]{\textwidth}
- \centering\bfseries\normalsize\color{struct}
+ \centering\ifdefstring{\dccp@variant}{baskerville}{\sffamily}{\bfseries}%
+ \normalsize\color{struct}
\ifx\dccp@type\dccp@editorial
\dccp@publ@long
\else
@@ -437,7 +509,7 @@
\null\nobreak\vspace*{-0.528\baselineskip}%
\begingroup
\centering
- {\Large\thetitle\par}
+ {\Large\ifdefstring{\dccp@variant}{baskerville}{\bfseries}{}\thetitle\par}
\vspace{0.7\baselineskip}
\AuthorBlock\par
\vspace{1.7\baselineskip}
@@ -847,7 +919,7 @@
\endgroup
}
%%
-%% Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
%%
%%
%% End of file `dccpaper-base.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/idcc.cls new/tex/latex/dccpaper/idcc.cls
--- old/tex/latex/dccpaper/idcc.cls 2019-03-08 23:22:53.000000000 +0100
+++ new/tex/latex/dccpaper/idcc.cls 2020-01-15 22:48:33.000000000 +0100
@@ -14,7 +14,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/03/08 v1.8}
+\def\Version{2020/01/15 v2.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{idcc}
[\Version\space Class for submissions to the International Digital Curation Conference.]
@@ -36,12 +36,14 @@
\DeclareOption{bof}{\def\dccp@type{Birds of a Feather}\dcp@proposaltrue}
\DeclareOption{workshop}{\def\dccp@type{Workshop}\dcp@proposaltrue}
\DeclareOption{practice}{\def\dccp@type{Practice Paper}\dcp@proposaltrue}
+\def\dccp@variant{baskerville}
\DeclareOption{15}{%
\def\dccp@publ@short{IDCC15}
\def\dccp@publ@msg{The 10th \dccp@publ@long\ takes place on 9--12 February
2015 in London. URL: \url{http://www.dcc.ac.uk/events/idcc15/}}
\def\dccp@subject{10th \dccp@publ@long, 2015}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{16}{%
\def\dccp@publ@short{IDCC16}
@@ -49,6 +51,7 @@
2016 in Amsterdam. URL: \url{http://www.dcc.ac.uk/events/idcc16/}}
\def\dccp@subject{11th \dccp@publ@long, 2016}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{17}{%
\def\dccp@publ@short{IDCC17}
@@ -56,6 +59,7 @@
2017 in Edinburgh. URL: \url{http://www.dcc.ac.uk/events/idcc17/}}
\def\dccp@subject{12th \dccp@publ@long, 2017}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{18}{%
\def\dccp@publ@short{IDCC18}
@@ -63,12 +67,14 @@
2018 in Barcelona. URL: \url{http://www.dcc.ac.uk/events/idcc18/}}
\def\dccp@subject{13th \dccp@publ@long, 2018}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{19}{%
\def\dccp@publ@short{IDCC19}
\def\dccp@publ@msg{The 14th \dccp@publ@long\ takes place on 4--7 February
2019 in Melbourne. URL: \url{http://www.dcc.ac.uk/events/idcc19/}}
\def\dccp@subject{14th \dccp@publ@long, 2019}
+ \def\dccp@variant{times}
}
\DeclareOption{20}{%
\def\dccp@publ@short{IDCC20}
@@ -99,7 +105,7 @@
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
%%
%%
%% End of file `idcc.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/ijdc-v14.cls new/tex/latex/dccpaper/ijdc-v14.cls
--- old/tex/latex/dccpaper/ijdc-v14.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/dccpaper/ijdc-v14.cls 2020-01-15 22:48:33.000000000 +0100
@@ -0,0 +1,62 @@
+%%
+%% This is file `ijdc-v14.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% dccpaper.dtx (with options: `ijdc14')
+%%
+%% ----------------------------------------------------------------
+%% The dccpaper bundle: Classes for submissions to IJDC and IDCC
+%% Author: Alex Ball
+%% E-mail: a.ball@ukoln.ac.uk
+%% License: Released under the LaTeX Project Public License v1.3c or later
+%% See: http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+\def\Version{2020/01/15 v2.0}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{ijdc-v14}
+ [\Version\space Class for submissions to the International Journal of Digital Curation, volume 14 onwards.]
+\def\dccp@type{General Article}
+\def\dccp@editorial{Editorial}
+\newif\ifdcp@proposal
+\DeclareOption{editorial}{\let\dccp@type=\dccp@editorial%
+ \AtBeginDocument{% Editorials use Roman numerals for page numbers
+ \pagenumbering{roman}%
+ \renewcommand{\thelastpage}{\@roman\c@lastpage}%
+ }%
+}
+\DeclareOption{paper}{\def\dccp@type{Research Paper}}
+\DeclareOption{preprint}{\def\dccp@type{Conference Preprint}}
+\DeclareOption{article}{\def\dccp@type{General Article}}
+\ProcessOptions\relax
+
+\def\dccp@publ@long{International Journal of Digital Curation}
+\def\dccp@publ@short{IJDC}
+\def\dccp@publ@msg{The \emph{\dccp@publ@long} is an international journal
+committed to scholarly excellence and dedicated to the advancement of digital
+curation across a wide range of sectors. The \dccp@publ@short\ is published by
+the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
+1746-8256. URL: \url{http://www.ijdc.net/}}
+\def\dccp@titlefoot@bib{%
+ \dccp@publ@long\\
+ \thedate, Vol.\ \thevolume, Iss.\ \theissue, \thepage--\thelastpage.%
+}
+\def\dccp@titlefoot@doi{%
+ \url{https://doi.org/\thedoi}\\
+ DOI: \thedoi
+}
+\def\dccp@normhead@doi{doi:\thedoi}
+\def\dccp@subject{\dccp@publ@long, \thedate, Vol.\ \thevolume, Iss.\ \theissue}
+
+\def\dccp@variant{baskerville}
+
+\LoadClass[a4paper,12pt,twoside]{article}
+
+\RequirePackage{dccpaper-base}
+%%
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
+%%
+%%
+%% End of file `ijdc-v14.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/ijdc-v9.cls new/tex/latex/dccpaper/ijdc-v9.cls
--- old/tex/latex/dccpaper/ijdc-v9.cls 2019-03-08 23:22:53.000000000 +0100
+++ new/tex/latex/dccpaper/ijdc-v9.cls 2020-01-15 22:48:33.000000000 +0100
@@ -14,10 +14,10 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/03/08 v1.8}
+\def\Version{2020/01/15 v2.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ijdc-v9}
- [\Version\space Class for submissions to the International Journal of Digital Curation, volume 9 onwards.]
+ [\Version\space Class for submissions to the International Journal of Digital Curation, volumes 9--13 inclusive.]
\def\dccp@type{General Article}
\def\dccp@editorial{Editorial}
\newif\ifdcp@proposal
@@ -28,6 +28,7 @@
}%
}
\DeclareOption{paper}{\def\dccp@type{Peer-Reviewed Paper}}
+\DeclareOption{preprint}{\def\dccp@type{Conference Preprint}}
\DeclareOption{article}{\def\dccp@type{General Article}}
\ProcessOptions\relax
@@ -49,11 +50,13 @@
\def\dccp@normhead@doi{doi:\thedoi}
\def\dccp@subject{\dccp@publ@long, \thedate, Vol.\ \thevolume, Iss.\ \theissue}
+\def\dccp@variant{times}
+
\LoadClass[a4paper,12pt,twoside]{article}
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
%%
%%
%% End of file `ijdc-v9.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dccpaper.tlpobj new/tlpkg/tlpobj/dccpaper.tlpobj
--- old/tlpkg/tlpobj/dccpaper.tlpobj 2019-03-09 02:24:23.000000000 +0100
+++ new/tlpkg/tlpobj/dccpaper.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,24 +1,25 @@
name dccpaper
category Package
-revision 50294
+revision 54512
shortdesc Typeset papers for the International Journal of Digital Curation
relocated 1
-longdesc The LaTeX class ijdc-v9 produces camera-ready papers and
+longdesc The LaTeX class ijdc-v14 produces camera-ready papers and
longdesc articles suitable for inclusion in the International Journal of
-longdesc Digital Curation, with applicability from volume 9 onwards. The
-longdesc similar idcc class can be used for submissions to the
-longdesc International Digital Curation Conference, beginning with the
-longdesc 2015 conference.
-runfiles size=25
+longdesc Digital Curation, with applicability from volume 14 onwards; a
+longdesc legacy class ijdc-v9 is provided for papers and articles
+longdesc written for volumes 9-13. The similar idcc class can be used
+longdesc for submissions to the International Digital Curation
+longdesc Conference, beginning with the 2015 conference.
+runfiles size=28
RELOC/tex/latex/dccpaper/dccpaper-base.sty
RELOC/tex/latex/dccpaper/dccpaper-by.eps
RELOC/tex/latex/dccpaper/dccpaper-by.pdf
RELOC/tex/latex/dccpaper/idcc.cls
+ RELOC/tex/latex/dccpaper/ijdc-v14.cls
RELOC/tex/latex/dccpaper/ijdc-v9.cls
catalogue-contact-bugs https://github.com/DigitalCurationCentre/dccpaper/issues
catalogue-contact-repository https://github.com/DigitalCurationCentre/dccpaper
catalogue-ctan /macros/latex/contrib/dccpaper
-catalogue-date 2019-03-08 18:49:03 +0100
-catalogue-license lppl1.3ccc-by-4
+catalogue-license lppl1.3c cc-by-4
catalogue-topics journalpub confproc class
-catalogue-version 1.8
+catalogue-version 2.0
++++++ dehyph-exptl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj new/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj
--- old/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,6 +1,6 @@
name dehyph-exptl.doc
category Package
-revision 50772
+revision 54512
shortdesc doc files of dehyph-exptl
relocated 1
docfiles size=54
++++++ dehyph-exptl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dehyph-exptl.tlpobj new/tlpkg/tlpobj/dehyph-exptl.tlpobj
--- old/tlpkg/tlpobj/dehyph-exptl.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dehyph-exptl.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,6 +1,6 @@
name dehyph-exptl
category Package
-revision 50772
+revision 54512
shortdesc Experimental hyphenation patterns for the German language
relocated 1
longdesc The package provides experimental hyphenation patterns for the
@@ -14,8 +14,8 @@
longdesc Babel und hyphsubst aus dem Oberdiek-Bundel verwendet werden.
depend hyphen-base
depend hyph-utf8
-execute AddHyphen name=german-x-2019-04-04 synonyms=german-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehypht-x-2019-04-04.tex file_patterns=hyph-de-1901.pat.txt file_exceptions=hyph-de-1901.hyp.txt
-execute AddHyphen name=ngerman-x-2019-04-04 synonyms=ngerman-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehyphn-x-2019-04-04.tex file_patterns=hyph-de-1996.pat.txt file_exceptions=hyph-de-1996.hyp.txt
+execute AddHyphen name=german-x-2019-04-04 synonyms=german-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehypht-x-2019-04-04.tex file_patterns=hyph-de-1901.pat.txt file_exceptions=
+execute AddHyphen name=ngerman-x-2019-04-04 synonyms=ngerman-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehyphn-x-2019-04-04.tex file_patterns=hyph-de-1996.pat.txt file_exceptions=
runfiles size=143
RELOC/tex/generic/dehyph-exptl/dehyphn-x-2019-04-04.pat
RELOC/tex/generic/dehyph-exptl/dehyphn-x-2019-04-04.tex
@@ -25,7 +25,6 @@
RELOC/tex/generic/dehyph-exptl/dehyphts-x-2019-04-04.tex
catalogue-contact-home http://projekte.dante.de/Trennmuster/WebHome
catalogue-ctan /language/hyphenation/dehyph-exptl
-catalogue-date 2019-04-04 14:10:17 +0200
-catalogue-license mitlppl
+catalogue-license mit lppl
catalogue-topics hyphenation german
catalogue-version 0.6
++++++ denisbdoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/README.md new/doc/latex/denisbdoc/README.md
--- old/doc/latex/denisbdoc/README.md 2017-01-03 00:40:41.000000000 +0100
+++ new/doc/latex/denisbdoc/README.md 2020-03-27 22:12:57.000000000 +0100
@@ -1,8 +1,8 @@
-denisbdoc - A personal package for documenting classes and packages, v. 0.7
+denisbdoc - A personal package for documenting classes and packages, v. 0.8
===========================================================================
-**The (quick 'n dirty) `denisbdoc` package is just for documenting the classes
-I've written.**
+**The sole purpose of this (quick 'n dirty) `denisbdoc` package is for
+documenting the classes written by its author (Denis Bitouz'e).**
The class is supplied in `.dtx` format. If you want to unpack the `.dtx`
yourself, running:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/denisbdoc.xdy new/doc/latex/denisbdoc/denisbdoc.xdy
--- old/doc/latex/denisbdoc/denisbdoc.xdy 2016-10-30 22:47:55.000000000 +0100
+++ new/doc/latex/denisbdoc/denisbdoc.xdy 2020-03-27 22:12:57.000000000 +0100
@@ -29,7 +29,7 @@
\providecommand*\lettergroup[1]{%
\belowpdfbookmark{#1}{\csuse{DBD@index@symbolic@name}:#1}%
\par\indexheading{#1}{\csuse{DBD@index@symbolic@name}}\par
- \nopagebreak
+ % \nopagebreak
}
~n"
:close "~n~n\end{theindex}~n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/denisbdoc.doc.tlpobj new/tlpkg/tlpobj/denisbdoc.doc.tlpobj
--- old/tlpkg/tlpobj/denisbdoc.doc.tlpobj 2019-02-28 03:31:42.000000000 +0100
+++ new/tlpkg/tlpobj/denisbdoc.doc.tlpobj 2020-03-28 01:55:10.000000000 +0100
@@ -1,6 +1,6 @@
name denisbdoc.doc
category Package
-revision 42829
+revision 54584
shortdesc doc files of denisbdoc
relocated 1
docfiles size=3
++++++ denisbdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/denisbdoc/denisbdoc.sty new/tex/latex/denisbdoc/denisbdoc.sty
--- old/tex/latex/denisbdoc/denisbdoc.sty 2017-01-03 00:40:41.000000000 +0100
+++ new/tex/latex/denisbdoc/denisbdoc.sty 2020-03-27 22:12:57.000000000 +0100
@@ -6,16 +6,17 @@
%%
%% denisbdoc.dtx (with options: `package')
%% -----------------------------------------------------------------------------
-%% denisbdoc --- A personal dirty package for documenting packages, version 0.7
+%% denisbdoc --- A personal dirty package for documenting personal classes,
+%% version 0.8
%%
%% Maintained by Denis Bitouz'e
-%% E-mail: denis.bitouze@lmpa.univ-littoral.fr
+%% E-mail: denis.bitouze@univ-littoral.fr
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% -----------------------------------------------------------------------------
%%
\RequirePackage{expl3,l3keys2e,xparse}
-\ProvidesExplPackage {denisbdoc} {2017/01/01} {0.7}
+\ProvidesExplPackage {denisbdoc} {2020/03/27} {0.8}
{A personal package for documenting packages}
\@ifpackagelater { expl3 } { 2012/11/21 }
{ }
@@ -33,42 +34,61 @@
yad .bool_gset:N = \g__denisbdoc_yad_bool,
gzt .bool_gset:N = \g__denisbdoc_gzt_bool,
nwejm .bool_gset:N = \g__denisbdoc_nwejm_bool,
+ studentreport .bool_gset:N = \g__denisbdoc_studentreport_bool,
+ lscape .bool_gset:N = \g__denisbdoc_lscape_bool,
}
\ProcessKeysOptions { denisbdoc }
\PassOptionsToPackage{obeyspaces}{url}
\sys_if_engine_pdftex:TF
- {
- \RequirePackage[T1]{fontenc}
- \RequirePackage[utf8]{inputenc}
- }{
- \RequirePackage{fontspec}
- }
+{
+ \RequirePackage{cmap}
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage[utf8]{inputenc}
+}{
+ \RequirePackage{fontspec}
+}
\RequirePackage{xpatch}%
\AtEndPreamble{%
\RequirePackage{mweights}%
}%
-\RequirePackage{parskip}%
\RequirePackage{fixfoot}%
-\RequirePackage{marginnote}
-\RequirePackage[inline]{enumitem}%
+\newif\if@DBD@beamer@not@loaded@
+\@DBD@beamer@not@loaded@true
+\@ifclassloaded{beamer}{\@DBD@beamer@not@loaded@false}{\@DBD@beamer@not@loaded@true}
+\if@DBD@beamer@not@loaded@
+\RequirePackage{parskip}%
+ \RequirePackage{marginnote}
+ \RequirePackage{mparhack}
+ \RequirePackage[inline]{enumitem}
+\fi%
\RequirePackage{afterpage}%
\RequirePackage{calc}%
\RequirePackage{siunitx}%
\RequirePackage{booktabs}%
\RequirePackage{multirow}%
\RequirePackage[xr]{zref}%
-\RequirePackage[multiple]{footmisc}%
-\RequirePackage{rotating}%
-\RequirePackage{pdflscape}%
+\if@DBD@beamer@not@loaded@
+ \RequirePackage[multiple]{footmisc}%
+ \RequirePackage{rotating}%
+\fi%
+\bool_if:nTF {\g__denisbdoc_lscape_bool} {%
+ \RequirePackage{lscape}%
+}{%
+ \RequirePackage{pdflscape}%
+}
\RequirePackage{xspace}%
\RequirePackage{accsupp}
+\RequirePackage{newunicodechar}
\RequirePackage{hologo}%
\RequirePackage{xifthen}%
\RequirePackage{refcount}%
+\RequirePackage{etoolbox}%
\RequirePackage{iflang}%
\RequirePackage{ifpdf}%
\RequirePackage{amssymb}%
-\RequirePackage{tocvsec2}%
+\if@DBD@beamer@not@loaded@
+ \RequirePackage{tocvsec2}%
+\fi
\RequirePackage{ltxcmds}%
\RequirePackage{csquotes}%
\RequirePackage{tikz}%
@@ -94,7 +114,6 @@
\__denisbdoc_printbibliography_ORI[heading=bibintoc,#1]%
\pagestyle{ordinary}%
}%
- }{%
}%
}%
}{%
@@ -104,8 +123,10 @@
\RequirePackage{babel}%
\RequirePackage[nodayofweek]{datetime}%
\RequirePackage{subcaption}%
-\RequirePackage{tocbibind}%
-\RequirePackage[xindy]{imakeidx}
+\if@DBD@beamer@not@loaded@
+ \RequirePackage{tocbibind}%
+ \RequirePackage[xindy]{imakeidx}
+\fi%
\RequirePackage{varioref}%
\@ifpackageloaded{tcolorbox}{%
}{%
@@ -115,13 +136,16 @@
}{%
\RequirePackage[hyperfootnotes=false,hyperindex=false]{hyperref}%
}%
-\RequirePackage{attachfile2} \@ifpackageloaded{nameref}{%
+\RequirePackage{attachfile2}%
+\@ifpackageloaded{nameref}{%
}{%
\RequirePackage{nameref}%
}%
\@ifpackageloaded{hypcap}{%
}{%
- \RequirePackage[all]{hypcap}%
+ \if@DBD@beamer@not@loaded@
+ \RequirePackage[all]{hypcap}%
+ \fi%
}%
\@ifpackageloaded{bookmark}{%
}{%
@@ -132,6 +156,15 @@
% \RequirePackage{glossaries}%
\RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}%
\makeglossaries%
+ \newglossaryentry{zip}{%
+ name=zip,%
+ category={format},%
+ description={format~ de~ fichier~ permettant~ l'archivage~ (utilisation~
+ d'un~ seul~ fichier~ pour~ stocker~ plusieurs~ fichiers)~ et~ la~
+ compression~ de~ donn^^c3^^a9es~ (diminution~ de~ l'espace~ occup^^c3^^a9~ sur~ le~
+ support~ num^^c3^^a9rique)~ sans~ perte~ de~ qualit^^c3^^a9},%
+ text={zip}%
+ }%
\setglossarystyle{indexhypergroup}%
\setabbreviationstyle[acronym]{long-short-sc}%
\newcommand*{\formatfont}[1]{\textsc{#1}}%
@@ -147,22 +180,24 @@
}{%
\RequirePackage{cleveref}%
}%
-\def\hdpindex#1#2{%
- \csname\ifx\\#1\\relax\else#1\fi\endcsname{%
- \hyperpage{#2}%
- }%
-}
-\let\HDorg@wrglossary\@wrglossary
-\def\@wrglossary#1{%
- \let\HDorg@encapchar\encapchar
- \def\encapchar##1\encapchar##2\@nil{%
- \HDorg@encapchar
- hdpindex{##1}%
- }%
- \HDorg@wrglossary{#1\encapchar\encapchar\@nil}%
-}
+\if@DBD@beamer@not@loaded@
+ \def\hdpindex#1#2{%
+ \csname\ifx\\#1\\relax\else#1\fi\endcsname{%
+ \hyperpage{#2}%
+ }%
+ }
+ \let\HDorg@wrglossary\@wrglossary
+ \def\@wrglossary#1{%
+ \let\HDorg@encapchar\encapchar
+ \def\encapchar##1\encapchar##2\@nil{%
+ \HDorg@encapchar
+ hdpindex{##1}%
+ }%
+ \HDorg@wrglossary{#1\encapchar\encapchar\@nil}%
+ }
+\fi%
\renewcommand{\acrpluralsuffix}{}
-\ltx@iffilelater{frenchb.ldf}{2016/03/20}{%
+\ltx@iffilelater{french.ldf}{2016/03/20}{%
}{%
\DeclareRobustCommand*{\NoAutoSpacing}{\FBAutoSpaceGuillfalse%
\ifFB@active@punct\noautospace@beforeFDP\shorthandoff{;:!?}\fi%
@@ -175,12 +210,6 @@
\tcbuselibrary{listingsutf8}
\else
\tcbuselibrary{listings}
-\pdftex_if_engine:TF
- {
- \lstMakeShortInline[style=dbtex]|
- }{
- \lstMakeShortInline[style=dbtex]^^c3^^97
- }
\fi
\tcbuselibrary{%
documentation,theorems,breakable,skins,xparse%
@@ -204,11 +233,16 @@
}
}
\tcbset{doc marginnote={if odd page or oneside={flushright upper}{flushright upper}}}
-\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
-\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
\reversemarginpar
-\DeclareTotalTCBox{\commandshell}{ v }
-{ commandshell}{#1}
+\pretocmd{\tcbdocmarginnote}{%
+ \patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
+ \patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
+ \reversemarginpar%
+}{}{}
+\@ifpackageloaded{geometry}{%
+ \geometry{marginparwidth=.65in}%
+}{}
+\DeclareTotalTCBox{\commandshell}{ v }{ commandshell}{#1}
\newtcblisting{listingshell}[1][]{%
% colback=black,
% colupper=white,
@@ -236,6 +270,7 @@
}
\usetikzlibrary{trees,backgrounds,fit,calc,positioning}
\attachfilesetup{color=Hyperlink}
+\if@DBD@beamer@not@loaded@
\newcommand{\indexmark}[1]{\hypertarget{index:#1}{#1}\markboth{#1}{#1}}
\newcommand{\targetindexentry}[1]{\indexmark{#1}}
\newcounter{targeti}
@@ -249,14 +284,15 @@
\index{exemple!#1|example}%
}
\newcommand{\indexsee}[2]{\index{#1|see{#2}}}
-\xpretocmd{\printindex}{\def\DBD@index@symbolic@name{#1}}{}{}
+ \xpretocmd{\printindex}{\edef\DBD@index@symbolic@name{#1}}{}{\aaa}
+ % \xpretocmd{\printindex}{\edef\DBD@index@symbolic@name{#1}}{}{\aaa}
\xpatchcmd{\indexprologue}{#2}{%
#2
\par\bigskip
\csuse{DBD@indexnavigation@\csuse{DBD@index@symbolic@name}}%
-}{}{}%
-\newif\if@DBD@no@first@letter@
-\@DBD@no@first@letter@false
+}{}{\aaa}%
+ \newif\if@DBD@no@first@letter@
+ \@DBD@no@first@letter@false
\newcommand*{\indexheading}[2]{%
\hypertarget{#2:#1}{\textbf{#1}}%
\protected@write\@auxout{}{\string\DBD@indexgroup{#1}{#2}}%
@@ -272,7 +308,7 @@
\fi
\hyperlink{#2:#1}{\textbf{#1}}%
}%
-}
+}%
\DeclareUrlCommand\urldirectory{\urlstyle{tt}}
\ExplSyntaxOn
\tl_const:Nn \c__denisbdoc_examples_path_tl {../exemples}
@@ -302,6 +338,8 @@
\colorlet{en-arborescence}{red!20}
\colorlet{a-plat}{blue!20}
\colorlet{texcs}{blue}
+\colorlet{directive}{texcs}
+\colorlet{mandatory-argument}{red}
\colorlet{environment}{teal}
\colorlet{key}{purple}
\colorlet{value}{violet}
@@ -317,7 +355,7 @@
\lstdefinelanguage[extLaTeX]{TeX}[LaTeX]{TeX}{%
moretexcs={%
footnotesize,huge,Huge,large,Large,LARGE,large,Large,scriptsize,tiny,%
- includegraphics,cite,ttwplink,vref,LTXtable,tableofcontents,frontmatter,mainmatter,%
+ includegraphics,cite,ttwplink,cref,vref,LTXtable,tableofcontents,frontmatter,mainmatter,%
part,chapter,section,subsection,subsubsection,paragraph,subparagraph,RequirePackage,%
listoftables,listoffigures,lstlistingname,si,SI,ohm,num,space,shorthandon,shorthandoff,%
abstractname,appendixname,contentsname,listfigurename,listtablename,indexname,%
@@ -327,9 +365,9 @@
@pnumwidth,bookmarksetup,DeclareTextCommand,text,iiint,NewPairedDelimiter,%
norm,lnorm,llnorm,lpnorm,supnorm,abs,prt,brk,brc,lrangle,leqgeq,%
norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*,%
- pdfobjcompresslevel,chaptermark%
+ pdfobjcompresslevel,chaptermark,PassOptionsToClass%
},%
- morekeywords=[1]{% Environments' names
+ morekeywords={[1]% Environments' names
tabular,tabulary,math,document,minipage,eqnarray,eqnarray*,align,align*,%
equation,gather,multline,flalign,equation*,gather*,multline*,flalign*,%
itemize,itemize*,enumerate,enumerate*,description,description*,%
@@ -355,7 +393,7 @@
acrfullpl,Acrfullpl,%
Acrlong*,acronymtype,printacronyms,printsymbols%
},%
- % Environments' names
+ % Mandatory arguments (other than environments' names)
morekeywords={%
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
@@ -376,11 +414,58 @@
{%
% S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros)
moretexcs={%
- printbibliography,SetCiteCommand,autocite,addbibresource,fullcite,%
- textcite,cite,citeauthor%
+ cite,Cite,parencite,Parencite,footcite,footcitetext,%
+ smartcite,Smartcite,%
+ textcite,Textcite,supercite,cites,Cites,parencites,%
+ Parencites,footcitesfootcitetexts,textcites,Textcites,%
+ supercites,autocite,Autocite,autocite*,Autocite*,autocites,%
+ Autocites,citeauthor,Citeauthor,citetitle,citetitle*,%
+ citeyear,citeurl,parentext,brackettext,nocite,fullcite,%
+ footfullcite,volcite,Volcite,pvolcite,Pvolcite,fvolcite,%
+ ftvolcite,tvolcite,Tvolcite,avolcite,Avolcite,notecite,%
+ Notecite,pnotecite,Pnotecite,fnotecite,citename,citelist,%
+ citefield,printbibliography,bibliography,citedate,%
+ ExecuteBibliographyOptions,defbibnote,psq,psqq,addbibresource%
+ },%
+ % morekeywords={%
+ % @article,@book,@inbook,@bookinbook,@suppbook,@booklet,@collection,%
+ % @conference,@incollection,@suppcollection,@manual,@misc,@online,%
+ % @patent,@periodical,@suppperiodical,@proceedings,@inproceedings,%
+ % @reference,@inreference,@report,@thesis,@unpublished,@masterthesis,%
+ % @phdthesis,%
+ % @Article,@Book,@Inbook,@Bookinbook,@Suppbook,@Booklet,@Collection,%
+ % @conference,@Incollection,@Suppcollection,@Manual,@Misc,@Online,%
+ % @patent,@Periodical,@Suppperiodical,@Proceedings,@Inproceedings,%
+ % @reference,@Inreference,@Report,@Thesis,@Unpublished,@Masterthesis,%
+ % @Phdthesis,%
+ % @ARTICLE,@BOOK,@INBOOK,@BOOKINBOOK,@SUPPBOOK,@BOOKLET,@COLLECTION,%
+ % @CONFERENCE,@INCOLLECTION,@SUPPCOLLECTION,@MANUAL,@MISC,@ONLINE,%
+ % @PATENT,@PERIODICAL,@SUPPPERIODICAL,@PROCEEDINGS,@INPROCEEDINGS,%
+ % @REFERENCE,@INREFERENCE,@REPORT,@THESIS,@UNPUBLISHED,@MASTERTHESIS,%
+ % @PHDTHESIS,%
+ % @string,@String,@STRING,@comment%
+ % },%
+ % directives
+ directives={%
+ article,book,inbook,bookinbook,suppbook,booklet,collection,%
+ conference,incollection,suppcollection,manual,misc,online,%
+ patent,periodical,suppperiodical,proceedings,inproceedings,%
+ reference,inreference,report,thesis,unpublished,masterthesis,%
+ phdthesis,%
+ Article,Book,Inbook,Bookinbook,Suppbook,Booklet,Collection,%
+ conference,Incollection,Suppcollection,Manual,Misc,Online,%
+ patent,Periodical,Suppperiodical,Proceedings,Inproceedings,%
+ reference,Inreference,Report,Thesis,Unpublished,Masterthesis,%
+ Phdthesis,%
+ ARTICLE,BOOK,INBOOK,BOOKINBOOK,SUPPBOOK,BOOKLET,COLLECTION,%
+ CONFERENCE,INCOLLECTION,SUPPCOLLECTION,MANUAL,MISC,ONLINE,%
+ PATENT,PERIODICAL,SUPPPERIODICAL,PROCEEDINGS,INPROCEEDINGS,%
+ REFERENCE,INREFERENCE,REPORT,THESIS,UNPUBLISHED,MASTERTHESIS,%
+ PHDTHESIS,%
+ string,String,STRING,comment%
},%
- % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels
- morekeywords={%
+ % Mots-cl^^c3^^a9s de niveau 1 : attributs et options de biblatex
+ morekeywords=[2]{%
abstract,addendum,afterword,annotation,annotator,author,authortype,%
bookauthor,bookpagination,booksubtitle,booktitle,booktitleaddon,%
chapter,commentator,date,doi,edition,editor,editora,editorb,%
@@ -400,35 +485,74 @@
archiveprefix,journal,key,pdf,primaryclass,school,address,%
%
backend,style,citestyle,bibstyle,sorting,maxnames,minnames,maxitems,minitems,%
- backref,abbreviate,firstinits,prenote,postnote,useprefix%
+ backref,abbreviate,firstinits,prenote,postnote,useprefix,autopunct%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 3 : valeurs des attributs identifi^^c3^^a9es
+ morekeywords=[3]{%
+ submitted,inpress,danish dutch,american,USenglish,english,%
+ british,UKenglish,canadian,australian,newzealand,finnish,french,%
+ francais,canadien,german,ngerman,austrian,naustrian,greek,%
+ italian,norsk,nynorsk,brazil,portuges,spanish,swedish,%
+ %
+ biber,numeric,numeric-comp,numeric-verb,alphabetic,%
+ alphabetic-verb,authoryear,authoryear-comp,authoryear-ibid,%
+ authoryear-icomp,authortitle,authortitle-comp,authortitle-ibid,%
+ authortitle-icomp,authortitle-terse,authortitle-tcomp,%
+ authortitle-ticomp,verbose,verbose-ibid,verbose-note,%
+ verbose-inote,verbose-trad1,verbose-trad2,verbose-trad3,%
+ reading,draft,debug,%
+ inline,footnote,superscript,plain,%
+ nyt,ynt,none,false%
+ },%
+ alsoletter={-123},%
+ sensitive,%
+ delim=*[directive]@
+ %
+}[keywords,directives,tex,comments]%
+\lstdefinelanguage[csquotes]{TeX}[LaTeX]{TeX}%
+{%
+ % S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros)
+ moretexcs={%
+ enquote,textelp,textins,blockcquote,SetCiteCommand%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels
+ morekeywords={%
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
morekeywords=[2]{%
% title,
- heading,refsegment%
},%
% Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
morekeywords=[3]{%
- bibintoc,skipbib,chapter%
+ skipbib%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 4 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
+ morekeywords=[4]{%
},%
sensitive%
}[keywords,tex,comments]%
-\lstdefinelanguage[csquotes]{TeX}[LaTeX]{TeX}%
+\lstdefinelanguage[colophon]{TeX}[LaTeX]{TeX}%
{%
% S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros)
moretexcs={%
- enquote,textelp,textins,blockcquote%
+ colophontitle,colophontitlestyle,colophontitlesize,colophonmidspace,%
+ colophonpagestyle,colophontitlealign,colophonpretitlehook,colophonposttitlehook,%
+ colophonparstyle,colophonparsize,colophonparlead,colophonnofirstindent,colophonpreparhook,%
+ colophonpostparhook,colophonparalign,colophonnofullpage,colophonnoclrdblpg,colophonclrpg,%
+ colophontopspace,colophonbotspace%
},%
% Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels
morekeywords={%
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
morekeywords=[2]{%
- % title,
+ colophon,
},%
% Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
morekeywords=[3]{%
- skipbib%
+ titlestyle,titlesize,aftertitle,pagestyle,titlealign,%
+ parstyle,parsize,parlead,nofirstindent,nofullpage,noclrdblpg,%
+ clrpg,topspace,botspace%
},%
% Mots-cl^^c3^^a9s de niveau 4 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
morekeywords=[4]{%
@@ -513,7 +637,12 @@
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
morekeywords=[2]{%
- breaklinks,colorlinks,bookmarks,pdfborderstyle,pdfborder,all%
+ breaklinks,colorlinks,bookmarks,pdfborderstyle,pdfborder,all,pdfencoding,final,%
+ hidelinks,linktoc,%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
+ morekeywords=[3]{%
+ unicode%
},%
sensitive%
}[keywords,tex,comments]%
@@ -524,7 +653,7 @@
laboratory,dedication,frontepigraph,keywords,subject,expression,tableofcontents,submissiondate,%
maketitle,makedisclaimer,makekeywords,makelaboratory,makeabstract,makededications,%
makefrontepigraphs,makebackcover,ordernumber,chapter*,disclaimer,newglssymbol,yadsetup,%
- comue,%
+ comue,newcorporation%
% acknowledgements,frenchabstract,foreword,preface,caution,
},%
% Environments' names
@@ -543,7 +672,7 @@
address,telephone,fax,email,type,acronym,heading,nowarning,noerror,nofrontcover,role,%
hyperfootnotes,hyperindex,plainpages,pdfpagemode,pdfpagelayout,locale,gray,frametitle,%
graphicx,adjustbox,setspace,xcolor,datatool,titleps,draftwatermark,babel,datetime,%
- bookmark,fncychap,localtocs,localbibs,localbibs*%
+ bookmark,fncychap,localtocs,localtocs/depth,localbibs,localbibs*%
},%
morekeywords=[3]{% Values of key-value lists
single,onehalf,double,doctor,yadsymbolstyle,%
@@ -567,7 +696,7 @@
comonitor*,supervisor,supervisor*,academicfield,doctoralschool,keywords,%
ordernumber,committeepresident,committeepresident*,speciality%
},%
- alsoletter={!-*1234560}%
+ alsoletter={!-*1234560/}%
}%
\lstdefinelanguage[gzt]{TeX}[LaTeX]{TeX}{%
moretexcs={% Control sequences' names
@@ -582,7 +711,7 @@
vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,%
gztverb,th,epigraph%
},%
- % Environments' names
+ % Mandatory arguments (other than environments' names)
morekeywords={%
gzt,gztarticle%
},%
@@ -620,11 +749,13 @@
printauthorsdetails,date,title,author,maketitle,item,printbibliography,%
vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,%
nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,%
- DeclareMathOperator,BinaryOperators,dif,articlesetup%
+ DeclareMathOperator,BinaryOperators,dif,articlesetup,%
+ bbN,bbZ,bbD,bbQ,bbR,bbC,bbK,%
+ newenumeration%
},%
- % Environments' names
+ % Mandatory arguments (other than environments' names)
morekeywords={%
- nwejm,nwejmart,assertions,hypotheses%
+ nwejm,nwejmart,%
},%
morekeywords=[1]{% Environments' names
abstract,minitoclist,bookreview,bookadvertisement,%
@@ -632,14 +763,15 @@
theorem,theoreme,corollary,corollaire,conjecture,proposition,%
lemma,lemme,axiom,axiome,definition,remark,remarque,example,exemple,notation,%
theorem*,theoreme*,corollary*,corollaire*,conjecture*,proposition*,proof,preuve,%
- lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*%
+ lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*,%
+ assertions,hypotheses%
},%
morekeywords=[2]{% Keys of key-value lists
number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,%
abstract,frenchtitle,englishtitle,% title,label,%
pictogram,list,help,diameter,textwidth,xshift,yshift,%
affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright,%
- gradient%
+ gradient,title/french,style,title,title-plural,singular,plural,label%
},%
morekeywords=[3]{% Values of key-value lists
true,false,theorem,definition,proof%
@@ -647,6 +779,25 @@
morekeywords=[4]{% Class and packages options
pagegrid,forprinter,cover,forauthors,%
},%
+ alsoletter={!-*1234560/}%
+}%
+\lstdefinelanguage[studentreport]{TeX}[LaTeX]{TeX}{%
+ moretexcs={% Control sequences' names
+ reportsetup,daterange,professionaladvisor,academicadvisor,companylogo%
+ },%
+ % Mandatory arguments (other than environments' names)
+ morekeywords={%
+ },%
+ morekeywords=[1]{% Environments' names
+ },%
+ morekeywords=[2]{% Keys of key-value lists
+ institute,subinstitute,subsubinstitute,year,10pt,11pt,12pt,internship,project,layout,%
+ strings,pretitle,company,advisor,advisors,before~start~date,before~end~date,date,%
+ logos,logosheights,,%
+ },%
+ morekeywords=[3]{% Values of key-value lists
+ ulco,iutlco,gte,gim,%
+ },%
alsoletter={!-*1234560}%
}%
\lstdefinelanguage{bash}[]{sh}%
@@ -666,33 +817,35 @@
\ttfamily%
\DeclareFontShape{T1}{lmtt}{bx}{it}{<-> ssub * lmtt/b/sl}{}%
}
-\xapptocmd{\@chapter}{%
- \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbtablist}{\protect\addvspace{10\p@}}%
-}{}{}
+\if@DBD@beamer@not@loaded@
+\ifcsdef{@chapter}{
+ \xapptocmd{\@chapter}{%
+ \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbtablist}{\protect\addvspace{10\p@}}%
+ }{}{}
+}{}
+\fi%
\sisetup{locale=FR,detect-all}
-\lstdefinestyle{dbtex}{%
+\lstdefinestyle{pre-dbtex}{%
escapechar=",
language=[LaTeX]TeX,
alsolanguage=[extLaTeX]TeX,
- alsolanguage=[glossaries]TeX,
- alsolanguage=[biblatex]TeX,
+ % alsolanguage=[glossaries]TeX,
+ % alsolanguage=[biblatex]TeX,
alsolanguage=[csquotes]TeX,
- alsolanguage=[tcolorbox]TeX,
- alsolanguage=[listings]TeX,
- alsolanguage=[xcolor]TeX,
- alsolanguage=[hyperref]TeX,
- alsolanguage=[yad]TeX,
- alsolanguage=[gzt]TeX,
- alsolanguage=[nwejm]TeX,
+ % alsolanguage=[tcolorbox]TeX,
+ % alsolanguage=[listings]TeX,
+ % alsolanguage=[xcolor]TeX,
+ % alsolanguage=[hyperref]TeX,
texcsstyle=*\color{texcs},
breaklines=true,
basicstyle=\normalfont\ttfamily,
commentstyle=\color{comment}\itshape,
- keywordstyle={\color{environment}},
+ directivestyle={\color{directive}},
+ keywordstyle={\color{red}},
keywordstyle={[1]\color{environment}},
keywordstyle={[2]\color{key}},
keywordstyle={[3]\color{value}},
@@ -708,13 +861,54 @@
aboveskip=\c__denisbdoc_listings_aboveskip_skip,
belowskip=\c__denisbdoc_listings_belowskip_skip
}%
+\bool_if:nT {\g__denisbdoc_yad_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[yad]TeX,%
+ alsolanguage=[colophon]TeX,%
+ moretexcs={printbibliography,autocite},%
+ }
+}
+\bool_if:nT {\g__denisbdoc_gzt_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[gzt]TeX,%
+ }
+}
+\bool_if:nT {\g__denisbdoc_nwejm_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[nwejm]TeX,%
+ }
+}
+\bool_if:nT {\g__denisbdoc_studentreport_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[studentreport]TeX,%
+ }
+}
\lstset{style=dbtex}
+\sys_if_engine_pdftex:TF
+{
+ \ExplSyntaxOff
+ \lstMakeShortInline[style=dbtex]|
+ \ExplSyntaxOn
+}{
+ \lstMakeShortInline[style=dbtex]^^c3^^97
+}
\tcbset{dbtcb/.style={%
breakable,
fonttitle=\bfseries,
enlarge~top~by=1mm,
separator~sign~dash,
- label~separator=-
+ label~separator=-,
+ before~title={%
+ \hypersetup{hidelinks}%
+ \tcbset{%
+ color~definition=white,
+ color~hyperlink=white,
+ }%
+ }%
}%
}%
\tcbset{%
@@ -787,83 +981,89 @@
\index{expression!en~anglais!\enquote{\foreignlanguage{english}{\translate{#2}}}}%
}
}
-\expandafter\AtBeginDocument\expandafter{%
- \expandafter\def\expandafter\theindex\expandafter{\theindex}%
-}
-\expandafter\AtBeginDocument\expandafter{%
- \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}%
-}
-\ExplSyntaxOff
-\def\imki@finalmessage#1{}% since you're using latexmk
-\def\imki@startidx#1#2{%
- \if@filesw
+\@ifclassloaded{beamer}{%
+}{%
+ \expandafter\AtBeginDocument\expandafter{%
+ \expandafter\def\expandafter\theindex\expandafter{\theindex}%
+ }
+ \expandafter\AtBeginDocument\expandafter{%
+ \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}%
+ }
+ \ExplSyntaxOff
+ \def\imki@finalmessage#1{}% since you're using latexmk
+ \def\imki@startidx#1#2{%
+ \if@filesw
\def\index{\@bsphack
\@ifnextchar [{\@index}{\@index[\imki@jobname]}}
\expandafter\newwrite\csname #1@idxfile\endcsname
\immediate\openout \csname #1@idxfile\endcsname #1.#2\relax
\typeout{Writing index file #1.#2}%
- \fi}
-\xpatchcmd\imki@makeindex
+ \fi}
+ \xpatchcmd\imki@makeindex
{\imki@startidx\imki@name}
{\imki@startidx\imki@name\imki@extout}
{}{}
-\xpatchcmd\imki@build
+ \xpatchcmd\imki@build
{\imki@dokey\imki@title}
{\imki@dokey\imki@title
- \imki@dokey\imki@extin
- \imki@dokey\imki@extout}
+ \imki@dokey\imki@extin
+ \imki@dokey\imki@extout}
{}{}
-\xpatchcmd{\imki@putindex}
+ \xpatchcmd{\imki@putindex}
{\imki@options}
{\c_space_tl~ -o~ #1.\imki@extin\imki@options}
{}{}
-\xpatchcmd{\imki@putindex}
+ \xpatchcmd{\imki@putindex}
{.idx}
{.\imki@extout}
{}{}
-\xpatchcmd{\imki@putindex}
+ \xpatchcmd{\imki@putindex}
{.ind}
{.\imki@extin}
{}{}
-\def\imki@extout{idx}\def\imki@extin{ind}
-\define@key{imki}{extout}{\def\imki@extout{#1}}
-\define@key{imki}{extin}{\def\imki@extin{#1}}
-\ExplSyntaxOn
-\cs_new_protected:Nn \__denisbdoc_alert:n
-{
- \begingroup
- \color{red}
- #1
- \endgroup
+ \def\imki@extout{idx}\def\imki@extin{ind}
+ \define@key{imki}{extout}{\def\imki@extout{#1}}
+ \define@key{imki}{extin}{\def\imki@extin{#1}}
}%
-\NewDocumentCommand \alert {m}
-{
- \__denisbdoc_alert:n {#1}
-}%
-\DeclareDocumentCommand \changes { smmm } {
- \IfBooleanTF {#1}
+\ExplSyntaxOn
+\@ifclassloaded{beamer}{%
+}{%
+ \cs_new_protected:Nn \__denisbdoc_alert:n
{
- \tl_set:Nn \l_tmpa_tl {\alert{#4}}
- }{
- \tl_set:Nn \l_tmpa_tl {#4}
+ \begingroup
+ \color{red}
+ #1
+ \endgroup
+ }%
+ \NewDocumentCommand \alert {m}
+ {
+ \__denisbdoc_alert:n {#1}
+ }%
+ \DeclareDocumentCommand \changes { smmm } {
+ \IfBooleanTF {#1}
+ {
+ \tl_set:Nn \l_tmpa_tl {\alert{#4}}
+ }{
+ \tl_set:Nn \l_tmpa_tl {#4}
+ }
+ \ifx\@onlypreamble\@notprerr
+ \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl}
+ \else
+ \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble}
+ \fi
}
- \ifx\@onlypreamble\@notprerr
- \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl}
- \else
- \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble}
- \fi
-}
-\DeclareDocumentCommand \PrintChanges { O{} } {
- \indexprologue{#1}
- \def\imki@indexlevel{\chapter}
- \printindex[\jobname-changes]
- \def\imki@indexlevel{\chapter*}
-}
+ \DeclareDocumentCommand \PrintChanges { !O{} } {
+ \indexprologue{#1}
+ \def\imki@indexlevel{\chapter}
+ \printindex[\jobname-changes]
+ \def\imki@indexlevel{\chapter*}
+ }
+}%
\IfLanguageName{french}{%
\DeclarePlainStyle{^^c2^^ab~}{~^^c2^^bb}%
{^^e2^^80^^9c}{^^e2^^80^^9d}
}{}%
-\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { http://www.ctan.org/pkg/ } }
+\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { http://ctan.org/pkg/ } }
\cs_new_protected:Npn \__denisbdoc_package_format:nn #1#2
{
#2{\sffamily#1}
@@ -900,15 +1100,15 @@
}
{#4}
}
-\NewDocumentCommand{\package}{ s t+ O{} m O{package} O{} O{} } {
+\NewDocumentCommand{\package}{ s t+ O{} m !O{package} !O{} !O{} } {
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7}
}
-\NewDocumentCommand{\Package}{ s t+ O{} m O{package} O{} O{} } {
+\NewDocumentCommand{\Package}{ s t+ O{} m !O{package} !O{} !O{} } {
\IfLanguageName{french}{package~}{}%
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7}
\IfLanguageName{english}{~package}{}%
}
-\NewDocumentCommand{\class}{ s t+ O{} m O{} O{} O{} } {
+\NewDocumentCommand{\class}{ s t+ O{} m !O{} !O{} !O{} } {
\IfLanguageName{french}{%
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7}
}{}%
@@ -916,7 +1116,7 @@
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}
}{}%
}
-\NewDocumentCommand{\Class}{ s t+ O{} m O{} O{} O{} } {
+\NewDocumentCommand{\Class}{ s t+ O{} m !O{} !O{} !O{} } {
\IfLanguageName{french}{%
classe~%
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7}
@@ -962,34 +1162,10 @@
}
\NewDocumentCommand{\Folder}{ m }
{%
- \IfLanguageName{french}{r^^c3^^a9pertoire~}{}%
+ \IfLanguageName{french}{dossier~}{}%
\__denisbdoc_file:n {#1}%
\IfLanguageName{english}{~directory}{}%
}%
-\NewDocumentCommand \ie { s } {%
- \IfBooleanTF {#1}
- {
- \IfLanguageName{french}{%
- c'est-\`{a}-dire
- }{}%
- \IfLanguageName{english}{%
- id est
- }{}%
- }
- {
- \IfLanguageName{french}{%
- c.-^^c3^^a0-d
- }{}%
- \IfLanguageName{english}{%
- i.e
- }{}%
- \@ifnextchar.%
- {
- }{
- .\xspace
- }%
- }
-}
\NewDocumentCommand{\program}{ m }
{
\__denisbdoc_file:n {#1}%
@@ -1096,7 +1272,7 @@
{
\hyperref[sec-comm-oblig]{%
\textcolor{red!75!black}{
- % \pdftex_if_engine:TF
+ % \sys_if_engine_pdftex:TF
% {
% % \string!
% \ding{52}
@@ -1111,9 +1287,17 @@
\fi%
}%
}
-\NewDocumentCommand{\mandatory}{ }
+\cs_new_protected:Nn \__denisbdoc_mandatory_no_link:
{
- \__denisbdoc_mandatory: {}
+ \textcolor{red!75!black}{
+ \faLock
+ }
+}
+\NewDocumentCommand{\mandatory}{ s }
+{
+ \IfBooleanTF {#1}
+ { \__denisbdoc_mandatory_no_link: {} }
+ { \__denisbdoc_mandatory: {} }
}%
\NewDocumentCommand{\unixtldirectory}{}
{
@@ -1247,12 +1431,15 @@
}
}
\pdfsuppresswarningpagegroup=1
+\newunicodechar{^^e3^^80^^88}{$\langle$}
+\newunicodechar{^^e3^^80^^89}{$\rangle$}
\cs_new_protected:Nn \__denisbdoc_meta:nn
{
\bgroup%
\normalfont
\ttfamily%
- \textcolor{#1}{$\langle$\emph{#2}$\rangle$}%
+ \itshape%
+ \textcolor{#1}{$\langle$#2$\rangle$}%
\egroup%
}
\AtBeginDocument{%
@@ -1260,12 +1447,12 @@
\__denisbdoc_meta:nn {#1}{#2}
}
}%
-\NewTCBListing{preamblecode}{ O{} }{%
+\NewTCBListing{preamblecode}{ !O{} }{%
codes,%
drop~lifted~shadow,
#1%
}
-\NewTCBListing{bodycode}{ O{} }{%
+\NewTCBListing{bodycode}{ !O{} }{%
codes,%
#1%
}
@@ -1296,9 +1483,14 @@
#3,
}%
\tl_new:N \g__denisbdoc_number_within_tl
-\tl_set:Nn \g__denisbdoc_number_within_tl {chapter}
+\ifcsdef{chapter}{
+ \tl_set:Nn \g__denisbdoc_number_within_tl {chapter}
+}{
+ \tl_set:Nn \g__denisbdoc_number_within_tl {section}
+}
\@ifclassloaded{gztarticle}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}%
\@ifclassloaded{nwejmart}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}%
+\@ifclassloaded{beamer}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}%
\newtcbtheorem[list~inside=dbwarninglist,number~within=\g__denisbdoc_number_within_tl,crefname={avertissement}{avertissements}]{dbwarning}{Avertissement}{%
colback=red!5!white,
colframe=red!75!black,
@@ -1361,7 +1553,7 @@
{
menufont = \sffamily ,
menusep = ${}\to{}$
- }% \end{macrocode}
+ }
\menuentryset{inputsep=>}
\tl_const:Nn \c__denisbdoc_yat_class_name_tl {yathesis}
\tl_const:Nn \c__denisbdoc_configuration_directory_string_tl {configuration}
@@ -1474,8 +1666,8 @@
\def\program#1{#1}
}
\ExplSyntaxOff
-%% Copyright (C) 2015, 2016, 2017 by
-%% Denis Bitouz'e
+%% Copyright (C) 2015-2020 by
+%% Denis Bitouz'e
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/denisbdoc.tlpobj new/tlpkg/tlpobj/denisbdoc.tlpobj
--- old/tlpkg/tlpobj/denisbdoc.tlpobj 2019-02-28 03:31:42.000000000 +0100
+++ new/tlpkg/tlpobj/denisbdoc.tlpobj 2020-03-28 01:55:10.000000000 +0100
@@ -1,13 +1,12 @@
name denisbdoc
category Package
-revision 42829
+revision 54584
shortdesc A personal dirty package for documenting packages
relocated 1
longdesc A personal dirty package for documenting packages.
-runfiles size=13
+runfiles size=15
RELOC/tex/latex/denisbdoc/denisbdoc.sty
catalogue-ctan /macros/latex/contrib/denisbdoc
-catalogue-date 2017-01-01 22:02:36 +0100
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics doc-supp
-catalogue-version 0.7
+catalogue-version 0.8
++++++ detex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/detex.man1.pdf and new/texmf-dist/doc/man/man1/detex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/detex.doc.tlpobj new/tlpkg/tlpobj/detex.doc.tlpobj
--- old/tlpkg/tlpobj/detex.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/detex.doc.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,6 +1,6 @@
name detex.doc
category TLCore
-revision 50602
+revision 54512
shortdesc doc files of detex
docfiles size=8
texmf-dist/doc/man/man1/detex.1
++++++ diagbox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/diagbox/README new/doc/latex/diagbox/README
--- old/doc/latex/diagbox/README 2016-02-25 23:37:50.000000000 +0100
+++ new/doc/latex/diagbox/README 2020-02-09 23:07:33.000000000 +0100
@@ -1,6 +1,6 @@
The diagbox package
-Copyright (C) 2011--2016 by Leo Liu
+Copyright (C) 2011--2020 by Leo Liu
The diagbox package is used for making table heads with diagonal lines.
And it is compatible with old slashbox package with many improvements.
Binary files old/doc/latex/diagbox/diagbox.pdf and new/doc/latex/diagbox/diagbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagbox.doc.tlpobj new/tlpkg/tlpobj/diagbox.doc.tlpobj
--- old/tlpkg/tlpobj/diagbox.doc.tlpobj 2019-02-28 03:31:46.000000000 +0100
+++ new/tlpkg/tlpobj/diagbox.doc.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,8 +1,8 @@
name diagbox.doc
category Package
-revision 42843
+revision 54080
shortdesc doc files of diagbox
relocated 1
-docfiles size=70
+docfiles size=61
RELOC/doc/latex/diagbox/README
RELOC/doc/latex/diagbox/diagbox.pdf
++++++ diagbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/diagbox/diagbox.sty new/tex/latex/diagbox/diagbox.sty
--- old/tex/latex/diagbox/diagbox.sty 2017-01-03 00:50:34.000000000 +0100
+++ new/tex/latex/diagbox/diagbox.sty 2020-03-04 00:05:10.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2011--2016 by Leo Liu
+%% Copyright (C) 2011--2020 by Leo Liu
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,11 +20,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{diagbox}
- [2016/12/28 v2.2 Making table heads with diagonal lines]
+ [2020/02/09 v2.3 Making table heads with diagonal lines]
\RequirePackage{keyval}
\RequirePackage{pict2e}
-\RequirePackage{fp}
-\FPmessagesfalse
\RequirePackage{calc}
\RequirePackage{array}
\newbox\diagbox@boxa
@@ -71,10 +69,10 @@
\setlength{\diagbox@outsepr}{#1}}
\define@key{diagbox}{leftsep}{%
\setlength{\diagbox@insepl}{#1}%
- \setlength{\diagbox@outsepl}{-(#1)}}
+ \setlength{\diagbox@outsepl}{(#1)*-1}}
\define@key{diagbox}{rightsep}{%
\setlength{\diagbox@insepr}{#1}%
- \setlength{\diagbox@outsepr}{-(#1)}}
+ \setlength{\diagbox@outsepr}{(#1)*-1}}
\define@key{diagbox}{trim}{%
\@tfor\@reserveda:=#1\do{%
\ifcsname diagbox@insep\@reserveda\endcsname
@@ -161,12 +159,18 @@
\end{tabular}}}
\let\diagbox@triple@setbox@SW\diagbox@triple@setbox@NW
\def\diagbox@triple@setbox@SE#1#2#3{%
- \setbox\diagbox@boxa=\hbox{%
- \begin{tabular}{@{\hspace{\diagbox@insepl}}l@{}}#1\end{tabular}}%
- \setbox\diagbox@boxm=\hbox{%
- \begin{tabular}{@{}r@{\hspace{\diagbox@insepr}}}#2\end{tabular}}%
- \setbox\diagbox@boxb=\hbox{%
- \begin{tabular}{@{}r@{\hspace{\diagbox@insepr}}}#3\end{tabular}}}
+\setbox\diagbox@boxa=\hbox{%
+ \begin{tabular}{@{\hspace{\diagbox@insepl}}>{\diagbox@font}l@{}}
+ #1
+ \end{tabular}}%
+\setbox\diagbox@boxm=\hbox{%
+ \begin{tabular}{@{}>{\diagbox@font}r@{\hspace{\diagbox@insepr}}}
+ #2
+ \end{tabular}}%
+\setbox\diagbox@boxb=\hbox{%
+ \begin{tabular}{@{}>{\diagbox@font}r@{\hspace{\diagbox@insepr}}}
+ #3
+ \end{tabular}}}
\let\diagbox@triple@setbox@NE\diagbox@triple@setbox@SE
\def\diagbox@triple@pict@NW{%
\put(0,0) {\makebox(0,0)[bl]{\box\diagbox@boxa}}
@@ -202,6 +206,166 @@
\def\diagbox@part{triple}%
\setkeys{diagbox}{dir=NW,#1}%
\@nameuse{diagbox@triple@setbox@\diagbox@dir}{#2}{#3}{#4}%
+ \diagbox@solve@equations
+ $\vcenter{\hbox{\diagbox@pict}}$%
+ \endgroup}
+\newcommand\diagbox[3][]{%
+ \@ifnextchar\bgroup
+ {\diagbox@triple{#1}{#2}{#3}}{\diagbox@double{#1}{#2}{#3}}}
+\expandafter\xdef\csname ver@slashbox.\@pkgextension\endcsname{9999/99/99}
+\def\slashbox{%
+ \def\diagbox@slashbox@options{dir=SW,}%
+ \slashbox@}
+\def\backslashbox{%
+ \def\diagbox@slashbox@options{dir=NW,}%
+ \slashbox@}
+\newcommand\slashbox@[1][]{%
+ \ifx\relax#1\relax\else
+ \edef\diagbox@slashbox@options{%
+ \unexpanded\expandafter{\diagbox@slashbox@options}%
+ \unexpanded{width=#1,}}%
+ \fi
+ \slashbox@@}
+\newcommand\slashbox@@[3][]{%
+ \edef\diagbox@slashbox@options{%
+ \unexpanded\expandafter{\diagbox@slashbox@options}%
+ \unexpanded{trim=#1,}}%
+ \expandafter\diagbox\expandafter[\diagbox@slashbox@options]{#2}{#3}}
+\ifcsname\detokenize{fp_eval:n}\endcsname
+\csname fi\endcsname
+\ExplSyntaxOn
+\cs_new_protected:Npn \__diagbox_solve_equations:
+ {
+ \fp_set:Nn \l__diagbox_xa_fp
+ { \dim_to_fp:n { \wd \diagbox@boxa } }
+ \fp_set:Nn \l__diagbox_ya_fp
+ { \dim_to_fp:n { \ht \diagbox@boxa + \dp \diagbox@boxa } }
+ \fp_set:Nn \l__diagbox_xb_fp
+ { \dim_to_fp:n { \wd \diagbox@boxb } }
+ \fp_set:Nn \l__diagbox_yb_fp
+ { \dim_to_fp:n { \ht \diagbox@boxb + \dp \diagbox@boxb } }
+ \fp_set:Nn \l__diagbox_xm_fp
+ { \dim_to_fp:n { \wd \diagbox@boxm } }
+ \fp_set:Nn \l__diagbox_ym_fp
+ { \dim_to_fp:n { \ht \diagbox@boxm + \dp \diagbox@boxm } }
+ \fp_set:Nn \l__diagbox_s_fp { \l__diagbox_xb_fp + \l__diagbox_xm_fp }
+ \fp_set:Nn \l__diagbox_t_fp { \l__diagbox_ya_fp + \l__diagbox_ym_fp }
+ \fp_set_eq:NN \l__diagbox_delta_fp \c_nan_fp
+ \dim_compare:nNnTF \diagbox@wd = \c_zero_dim
+ { \__diagbox_calculate_width: }
+ { \fp_set:Nn \l__diagbox_x_fp { \dim_to_fp:n { \diagbox@wd } } }
+ \dim_compare:nNnTF \diagbox@ht = \c_zero_dim
+ { \__diagbox_calculate_height: }
+ { \fp_set:Nn \l__diagbox_y_fp { \dim_to_fp:n { \diagbox@ht } } }
+ \edef \x { \fp_use:N \l__diagbox_x_fp }
+ \edef \y { \fp_use:N \l__diagbox_y_fp }
+ \edef \xm { \fp_use:N \l__diagbox_xm_fp }
+ \edef \ym { \fp_use:N \l__diagbox_ym_fp }
+ \edef \xxm { \fp_eval:n { \l__diagbox_x_fp - \l__diagbox_xm_fp } }
+ \edef \yym { \fp_eval:n { \l__diagbox_y_fp - \l__diagbox_ym_fp } }
+ }
+\cs_new_protected:Npn \__diagbox_calculate_width:
+ {
+ \fp_zero:N \l__diagbox_x_fp
+ \fp_compare:nNnT \l__diagbox_yb_fp < \l__diagbox_t_fp
+ {
+ \__diagbox_calculate_coefficient:
+ \fp_if_nan:nF { \l__diagbox_sqrt_fp }
+ {
+ \fp_set:Nn \l__diagbox_x_fp
+ {
+ ( \l__diagbox_u_fp + \l__diagbox_v_fp + \l__diagbox_sqrt_fp ) /
+ ( 2 ( \l__diagbox_t_fp - \l__diagbox_yb_fp ) )
+ }
+ }
+ }
+ \fp_compare:nNnF \l__diagbox_x_fp > \c_zero_fp
+ {
+ \fp_set:Nn \l__diagbox_x_fp
+ { 2 ( max( \l__diagbox_xa_fp , \l__diagbox_xb_fp ) + \l__diagbox_xm_fp ) }
+ \msg_warning:nnxx { diagbox } { calculate-error }
+ { width } { \fp_use:N \l__diagbox_x_fp }
+ }
+ \diagbox@wd = \fp_to_dim:N \l__diagbox_x_fp \scan_stop:
+ }
+\cs_new_protected:Npn \__diagbox_calculate_height:
+ {
+ \fp_zero:N \l__diagbox_y_fp
+ \fp_compare:nNnT \l__diagbox_xa_fp < \l__diagbox_s_fp
+ {
+ \__diagbox_calculate_coefficient:
+ \fp_if_nan:nF { \l__diagbox_sqrt_fp }
+ {
+ \fp_set:Nn \l__diagbox_y_fp
+ {
+ ( \l__diagbox_u_fp - \l__diagbox_v_fp - \l__diagbox_sqrt_fp ) /
+ ( 2 ( \l__diagbox_xa_fp - \l__diagbox_s_fp ) )
+ }
+ }
+ }
+ \fp_compare:nNnF \l__diagbox_y_fp > \c_zero_fp
+ {
+ \fp_set:Nn \l__diagbox_y_fp
+ { 2 ( max( \l__diagbox_ya_fp , \l__diagbox_yb_fp ) + \l__diagbox_ym_fp ) }
+ \msg_warning:nnxx { diagbox } { calculate-error }
+ { height } { \fp_use:N \l__diagbox_y_fp }
+ }
+ \diagbox@ht = \fp_to_dim:N \l__diagbox_y_fp \scan_stop:
+ }
+\cs_new_protected:Npn \__diagbox_calculate_coefficient:
+ {
+ \fp_if_nan:nT { \l__diagbox_delta_fp }
+ { \__diagbox_calculate_coefficient_aux: }
+ }
+\cs_new_protected:Npn \__diagbox_calculate_coefficient_aux:
+ {
+ \fp_set:Nn \l__diagbox_u_fp
+ {
+ \l__diagbox_xa_fp * \l__diagbox_ym_fp -
+ \l__diagbox_xm_fp * \l__diagbox_yb_fp
+ }
+ \fp_set:Nn \l__diagbox_v_fp
+ {
+ \l__diagbox_s_fp * \l__diagbox_t_fp -
+ \l__diagbox_xa_fp * \l__diagbox_yb_fp
+ }
+ \fp_set:Nn \l__diagbox_delta_fp
+ {
+ ( \l__diagbox_u_fp + \l__diagbox_v_fp )^2 +
+ 4 * \l__diagbox_xa_fp * ( \l__diagbox_t_fp - \l__diagbox_yb_fp ) *
+ ( \l__diagbox_xm_fp * ( \l__diagbox_yb_fp - \l__diagbox_ym_fp ) -
+ \l__diagbox_xb_fp * \l__diagbox_ym_fp )
+ }
+ \fp_compare:nNnTF \l__diagbox_delta_fp < \c_zero_fp
+ { \fp_set_eq:NN \l__diagbox_sqrt_fp \c_nan_fp }
+ { \fp_set:Nn \l__diagbox_sqrt_fp { sqrt(\l__diagbox_delta_fp) } }
+ }
+\cs_new_eq:NN \diagbox@solve@equations \__diagbox_solve_equations:
+\fp_new:N \l__diagbox_xa_fp
+\fp_new:N \l__diagbox_ya_fp
+\fp_new:N \l__diagbox_xb_fp
+\fp_new:N \l__diagbox_yb_fp
+\fp_new:N \l__diagbox_xm_fp
+\fp_new:N \l__diagbox_ym_fp
+\fp_new:N \l__diagbox_x_fp
+\fp_new:N \l__diagbox_y_fp
+\fp_new:N \l__diagbox_s_fp
+\fp_new:N \l__diagbox_t_fp
+\fp_new:N \l__diagbox_u_fp
+\fp_new:N \l__diagbox_v_fp
+\fp_new:N \l__diagbox_sqrt_fp
+\fp_new:N \l__diagbox_delta_fp
+\msg_new:nnn { diagbox } { calculate-error }
+ {
+ Cannot~calculate~proper~#1~of~triple~diagbox~
+ \msg_line_context:. \\
+ Use~#2pt~instead.
+ }
+\file_input_stop:
+\fi
+\RequirePackage{fp}
+\FPmessagesfalse
+\def\diagbox@solve@equations{%
\edef\xa{\strip@pt\wd\diagbox@boxa}%
\edef\ya{\strip@pt\dimexpr\ht\diagbox@boxa+\dp\diagbox@boxa\relax}%
\edef\xb{\strip@pt\wd\diagbox@boxb}%
@@ -216,47 +380,40 @@
\FPmul\dj\xa\ym
\FPsub\u\dj\di
\FPupn{v}{bj ci * bi cj * -}%
- \FPupn{delta}{bi dj * bj di * - cj ci - * 4 * %
- v u + copy * %
- - 2 swap root}%
+ \FPupn{delta}{bi dj * bj di * - cj ci - * 4 * v u + copy * -}%
+ \newif\ifdeltapositive
+ \FPifneg\delta \deltapositivefalse \else \deltapositivetrue \fi
+ \FPset\x{0}%
+ \FPset\y{0}%
\ifdim\diagbox@wd=\z@
- \FPupn{x}{2 bj bi - delta v u - + / /}%
+ \ifdim\bi\p@>\bj\p@\ifdeltapositive
+ \FPupn{x}{2 bj bi - 2 delta root v u - + / /}%
+ \fi\fi
+ \ifdim\x\p@=\z@
+ \FPupn{x}{xa xm + xb xm + max 2 *}%
+ \PackageWarning{diagbox}{Cannot calculate proper width of triple diagbox.\MessageBreak
+ Use \x pt instead.}%
+ \fi
\diagbox@wd=\x\p@
\else
\edef\x{\strip@pt\diagbox@wd}%
\fi
\ifdim\diagbox@ht=\z@
- \FPupn{y}{2 cj ci - delta v u + - / /}%
+ \ifdim\ci\p@<\cj\p@\ifdeltapositive
+ \FPupn{y}{2 cj ci - 2 delta root v u + - / /}%
+ \fi\fi
+ \ifdim\y\p@=\z@
+ \FPupn{y}{ya ym + yb ym + max 2 *}%
+ \PackageWarning{diagbox}{Cannot calculate proper height of triple diagbox.\MessageBreak
+ Use \y pt instead.}%
+ \fi
\diagbox@ht=\y\p@
\else
\edef\y{\strip@pt\diagbox@ht}%
\fi
\FPsub\xxm\x\xm
\FPsub\yym\y\ym
- $\vcenter{\hbox{\diagbox@pict}}$%
- \endgroup}
-\newcommand\diagbox[3][]{%
- \@ifnextchar\bgroup
- {\diagbox@triple{#1}{#2}{#3}}{\diagbox@double{#1}{#2}{#3}}}
-\expandafter\xdef\csname ver@slashbox.\@pkgextension\endcsname{9999/99/99}
-\def\slashbox{%
- \def\diagbox@slashbox@options{dir=SW,}%
- \slashbox@}
-\def\backslashbox{%
- \def\diagbox@slashbox@options{dir=NW,}%
- \slashbox@}
-\newcommand\slashbox@[1][]{%
- \ifx\relax#1\relax\else
- \edef\diagbox@slashbox@options{%
- \unexpanded\expandafter{\diagbox@slashbox@options}%
- \unexpanded{width=#1,}}%
- \fi
- \slashbox@@}
-\newcommand\slashbox@@[3][]{%
- \edef\diagbox@slashbox@options{%
- \unexpanded\expandafter{\diagbox@slashbox@options}%
- \unexpanded{trim=#1,}}%
- \expandafter\diagbox\expandafter[\diagbox@slashbox@options]{#2}{#3}}
+}
\endinput
%%
%% End of file `diagbox.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagbox.tlpobj new/tlpkg/tlpobj/diagbox.tlpobj
--- old/tlpkg/tlpobj/diagbox.tlpobj 2019-02-28 03:31:46.000000000 +0100
+++ new/tlpkg/tlpobj/diagbox.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,6 +1,6 @@
name diagbox
category Package
-revision 42843
+revision 54080
shortdesc Table heads with diagonal lines
relocated 1
longdesc The package's principal command, \diagbox, takes two arguments
@@ -11,11 +11,10 @@
longdesc with the slashbox package, which it supersedes. diagbox depends
longdesc on e-TeX as well as the packages array, calc, fp, keyval, and
longdesc pict2e.
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/diagbox/diagbox.sty
catalogue-contact-repository https://github.com/leo-liu/tex-pkg
catalogue-ctan /macros/latex/contrib/diagbox
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics table
-catalogue-version 2.2
+catalogue-version 2.4
++++++ diffcoeff.doc.tar.xz ++++++
++++ 7944 lines of diff (skipped)
++++++ diffcoeff.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/diffcoeff/diffcoeff.sty new/tex/latex/diffcoeff/diffcoeff.sty
--- old/tex/latex/diffcoeff/diffcoeff.sty 2019-03-10 22:02:00.000000000 +0100
+++ new/tex/latex/diffcoeff/diffcoeff.sty 2019-12-28 23:24:07.000000000 +0100
@@ -9,7 +9,7 @@
%
\RequirePackage{expl3}
\RequirePackage{xparse,l3keys2e,xtemplate}
-\ProvidesExplPackage {diffcoeff} {2019/03/10} {3.1}
+\ProvidesExplPackage {diffcoeff} {2019/12/28} {3.2}
{Write differential coefficients consistently and easily.}
%
\keys_define:nn { diffcoeff }
@@ -116,7 +116,7 @@
}
{
\AssignTemplateKeys
-
+
\bool_if:NF\l__diffcoeff_integ_bool
{
\int_compare:nNnT { \l__diffcoeff_format_int } > { 1 }
@@ -260,20 +260,22 @@
% differential
% #1 variant; #2 = space in mu before d (0--9)
% note \group_end placement for \vec{x} etc
-\NewDocumentCommand \dl { d.. m }
+\NewDocumentCommand \dl { d.. t- m }
{
\group_begin:
\bool_set_true:N \l__diffcoeff_integ_bool
\bool_set_true:N \l__diffcoeff_single_var_bool
\seq_set_from_clist:Nn \l__diffcoeff_orders_seq { 1 }
\tl_set:Nn \l__diffcoeff_tot_order_tl { 1 }
- \IfValueT { #1 } { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
+ \IfValueTF { #1 }
+ { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
+ { \tl_set:Nn \l__diffcoeff_type_tl { } }
\UseInstance { derivative } { ord\l__diffcoeff_type_tl }
\l__diffcoeff_orders_seq \l__diffcoeff_tot_order_tl
\c_empty_tl \c_empty_seq \c_empty_tl
- \tl_if_in:NnTF \c__diffcoeff_digits_tl { #2 }
- { \mkern #2 mu \l__diffcoeff_op_tl \group_end: }
- { \l__diffcoeff_op_tl \group_end: #2 }
+ \tl_if_in:NnTF \c__diffcoeff_digits_tl { #3 }
+ { \mkern \IfBooleanT #2 { - }#3 mu \l__diffcoeff_op_tl \group_end: }
+ { \l__diffcoeff_op_tl \group_end: {} #3 }
}
\NewDocumentCommand \negmu {} { \mkern -1 mu }
\NewDocumentCommand \nilmu {} { \mkern 0 mu }
@@ -285,7 +287,7 @@
% #5(tl) = diff'iand; #6( / ) = slash boolean
% #7(clist) = vars of diff.; #8(tl) = pt of eval./vars held const
% #9(tl) = as #8 (for backwards compat)
-\NewDocumentCommand \diff{ d.. s O{1} o m t/ m !O{#9} g }
+\NewDocumentCommand \diff { d.. s O{1} o m t/ m !O{#9} g }
{
\group_begin:
\tl_set:Nn \l__diffcoeff_differentiand_tl { #5 }
@@ -322,9 +324,11 @@
\l__diffcoeff_tot_order_tl
}
}
- \IfValueT { #1 } { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
- \int_zero:N \l__diffcoeff_format_int
+ \IfValueTF { #1 }
+ { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
+ { \tl_set:Nn \l__diffcoeff_type_tl { } }
% append? slash?
+ \int_zero:N \l__diffcoeff_format_int
\IfBooleanT #2 { \int_incr:N \l__diffcoeff_format_int }
\IfBooleanT #6 { \int_add:Nn \l__diffcoeff_format_int { 2 } }
@@ -614,7 +618,7 @@
\DeclareInstance { derivative } { ord } { DERIV } { }
\bool_if:NTF \g__diffcoeff_ISO_bool
{
- \diffdef {}
+ \diffdef { }
{
op-symbol = \mathrm{d},
op-order-sep = 0 mu ,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diffcoeff.tlpobj new/tlpkg/tlpobj/diffcoeff.tlpobj
--- old/tlpkg/tlpobj/diffcoeff.tlpobj 2019-03-11 02:24:53.000000000 +0100
+++ new/tlpkg/tlpobj/diffcoeff.tlpobj 2019-12-29 01:55:35.000000000 +0100
@@ -1,6 +1,6 @@
name diffcoeff
category Package
-revision 50320
+revision 53244
shortdesc Write differential coefficients easily and consistently
relocated 1
longdesc diffcoeff.sty allows the easy and consistent writing of
@@ -19,8 +19,8 @@
runfiles size=7
RELOC/tex/latex/diffcoeff/diffcoeff-doc.def
RELOC/tex/latex/diffcoeff/diffcoeff.sty
+catalogue-also derivative
catalogue-ctan /macros/latex/contrib/diffcoeff
-catalogue-date 2019-03-10 08:30:44 +0100
catalogue-license lppl1.3c
catalogue-topics maths
-catalogue-version 3.1
+catalogue-version 3.2
++++++ dnp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dnp.tlpobj new/tlpkg/tlpobj/dnp.tlpobj
--- old/tlpkg/tlpobj/dnp.tlpobj 2019-02-28 03:32:08.000000000 +0100
+++ new/tlpkg/tlpobj/dnp.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,6 +1,6 @@
name dnp
category Package
-revision 45701
+revision 54074
shortdesc subfont numbers for DNP font encoding
relocated 1
longdesc part of the CJK package, ctan.org/pkg/cjk
++++++ doclicense.doc.tar.xz ++++++
Binary files old/doc/latex/doclicense/doclicense.pdf and new/doc/latex/doclicense/doclicense.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doclicense.doc.tlpobj new/tlpkg/tlpobj/doclicense.doc.tlpobj
--- old/tlpkg/tlpobj/doclicense.doc.tlpobj 2019-04-09 01:38:21.000000000 +0200
+++ new/tlpkg/tlpobj/doclicense.doc.tlpobj 2020-04-16 01:56:55.000000000 +0200
@@ -1,8 +1,8 @@
name doclicense.doc
category Package
-revision 50871
+revision 54758
shortdesc doc files of doclicense
relocated 1
-docfiles size=107
+docfiles size=90
RELOC/doc/latex/doclicense/README
RELOC/doc/latex/doclicense/doclicense.pdf
++++++ doclicense.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-brazilian.ldf new/tex/latex/doclicense/doclicense-brazilian.ldf
--- old/tex/latex/doclicense/doclicense-brazilian.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-brazilian.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-brazilian.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{Essa obra tem a licença}%
+\@namedef{doclicense@lang@word@license}{}%
+
+\@namedef{doclicense@lang@lic@CC@code}{pt}%
+%% Using: https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{Atribuição 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Atribuição-SemDerivações 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Atribuição-NãoComercial 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Brasil}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Atribuição 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Atribuição-SemDerivações 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Atribuição-NãoComercial 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Atribuição-NãoComercial-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Atribuição-NãoComercial-SemDerivações 4.0 Internacional}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-catalan.ldf new/tex/latex/doclicense/doclicense-catalan.ldf
--- old/tex/latex/doclicense/doclicense-catalan.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-catalan.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -1,13 +1,13 @@
\ProvidesFile{doclicense-catalan.ldf}
-\@namedef{doclicense@lang@thisDoc}{Aquesta obra està sota una llicència}%
+\@namedef{doclicense@lang@thisDoc}{Aquesta obra està subjecta a una llicència de}%
\@namedef{doclicense@lang@word@license}{}%
\@namedef{doclicense@lang@lic@CC@code}{ca}%
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Reconeixement 3.0 No adaptada}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Reconeixement-CompartirIgual 3.0 No adaptada}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-chinese-gbk.ldf new/tex/latex/doclicense/doclicense-chinese-gbk.ldf
--- old/tex/latex/doclicense/doclicense-chinese-gbk.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-chinese-gbk.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{����Ʒ����}%
+\@namedef{doclicense@lang@word@license}{�������������}%
+
+\@namedef{doclicense@lang@lic@CC@code}{zh}%
+%% Using:https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 ͨ��}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{�����ڰ�Ȩ����}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{����-��ͬ��ʽ���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{����-��ֹ���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{����-����ҵ��ʹ�� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{����-����ҵ��ʹ��-��ͬ��ʽ���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{����-����ҵ��ʹ��-��ֹ���� 3.0 �й���½}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{����-��ͬ��ʽ���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{����-��ֹ���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{����-����ҵ��ʹ�� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{����-����ҵ��ʹ��-��ͬ��ʽ���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{����-����ҵ��ʹ��-��ֹ���� 4.0 ����}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-chinese-utf8.ldf new/tex/latex/doclicense/doclicense-chinese-utf8.ldf
--- old/tex/latex/doclicense/doclicense-chinese-utf8.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-chinese-utf8.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{本作品采用}%
+\@namedef{doclicense@lang@word@license}{许可协议进行许可}%
+
+\@namedef{doclicense@lang@lic@CC@code}{zh}%
+%% Using:https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{仅限于版权贡献}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{署名-禁止演绎 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{署名-非商业性使用 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{署名-非商业性使用-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{署名-非商业性使用-禁止演绎 3.0 中国大陆}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{署名 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{署名-相同方式共享 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{署名-禁止演绎 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{署名-非商业性使用 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{署名-非商业性使用-相同方式共享 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{署名-非商业性使用-禁止演绎 4.0 国际}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-chinese.ldf new/tex/latex/doclicense/doclicense-chinese.ldf
--- old/tex/latex/doclicense/doclicense-chinese.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-chinese.ldf 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-\ProvidesFile{doclicense-chinese.ldf}
-
-\@namedef{doclicense@lang@thisDoc}{本作品采用}%
-\@namedef{doclicense@lang@word@license}{许可协议进行许可}%
-
-\@namedef{doclicense@lang@lic@CC@code}{zh}%
-%% Using:https://en.wikipedia.org/wiki/ISO_639-1
-
-\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{仅限于版权贡献}%
-
-\@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{署名-禁止演绎 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{署名-非商业性使用 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{署名-非商业性使用-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{署名-非商业性使用-禁止演绎 3.0 未本地化版本}%
-
-\@namedef{doclicense@lang@lic@CC@by@4.0}{署名 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{署名-相同方式共享 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{署名-禁止演绎 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{署名-非商业性使用 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{署名-非商业性使用-相同方式共享 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{署名-非商业性使用-禁止演绎 4.0 国际}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-english.ldf new/tex/latex/doclicense/doclicense-english.ldf
--- old/tex/latex/doclicense/doclicense-english.ldf 2015-06-23 01:43:59.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-english.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution 3.0 Unported}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike 3.0 Unported}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-french.ldf new/tex/latex/doclicense/doclicense-french.ldf
--- old/tex/latex/doclicense/doclicense-french.ldf 2016-04-25 00:06:36.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-french.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -11,7 +11,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universel}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution 3.0 non transpos\'e}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution - Partage dans les m\^emes conditions 3.0 non transpos\'e}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-galician.ldf new/tex/latex/doclicense/doclicense-galician.ldf
--- old/tex/latex/doclicense/doclicense-galician.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-galician.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Recoñecemento 3.0 España}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Recoñecemento-CompartirIgual 3.0 España}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-german.ldf new/tex/latex/doclicense/doclicense-german.ldf
--- old/tex/latex/doclicense/doclicense-german.ldf 2015-06-23 01:43:59.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-german.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -10,7 +10,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universell}%
-% \@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+% \@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
\@namedef{doclicense@lang@lic@CC@by@3.0}{Namensnennung 3.0 Deutschland}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Namensnennung -- Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-italian.ldf new/tex/latex/doclicense/doclicense-italian.ldf
--- old/tex/latex/doclicense/doclicense-italian.ldf 2018-02-17 23:37:32.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-italian.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -10,7 +10,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universale}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribuzione 3.0 Italia}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribuzione -- Condividi allo stesso modo 3.0 Italia}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-polish.ldf new/tex/latex/doclicense/doclicense-polish.ldf
--- old/tex/latex/doclicense/doclicense-polish.ldf 2018-06-10 22:49:47.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-polish.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -10,7 +10,7 @@
\@namedef{doclicense@lang@lic@CC@zero@1.0}{Przekazanie do Domeny Publicznej (CC0 1.0)}%
% https://creativecommons.org/publicdomain/zero/1.0/deed.pl
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Zaświadczenie Domeny Publicznej}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Zaświadczenie Domeny Publicznej}%
% https://creativecommons.org/choose/publicdomain-2?lang=pl
\@namedef{doclicense@lang@lic@CC@by@3.0}{Uznanie autorstwa 3.0 Polska(CC BY 3.0 PL)}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-portuguese.ldf new/tex/latex/doclicense/doclicense-portuguese.ldf
--- old/tex/latex/doclicense/doclicense-portuguese.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-portuguese.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,14 +7,14 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Atribuição 3.0 Portugal}%
-\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgua 3.0 Portugal}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Atribuição-SemDerivações 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Atribuição-NãoComercial 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Portugal}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivaçõe 3.0 Portugal}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by@4.0}{Atribuição 4.0 Internacional}%
\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-russian.ldf new/tex/latex/doclicense/doclicense-russian.ldf
--- old/tex/latex/doclicense/doclicense-russian.ldf 2018-02-17 23:37:32.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-russian.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Универсальная}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
+\@namedef{doclicense@lang@lic@CC@pd@null}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution (Атрибуция) 3.0 Непортированная}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike (Атрибуция — На тех же условиях) 3.0 Непортированная}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-spanish.ldf new/tex/latex/doclicense/doclicense-spanish.ldf
--- old/tex/latex/doclicense/doclicense-spanish.ldf 2018-02-17 23:37:32.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-spanish.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Reconocimiento 3.0 España}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Reconocimiento-CompartirIgual 3.0 España}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense.sty new/tex/latex/doclicense/doclicense.sty
--- old/tex/latex/doclicense/doclicense.sty 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense.sty 2020-04-12 23:31:05.000000000 +0200
@@ -1,7 +1,7 @@
%% See file 'doclicense.dtx' for copyright and license.
\NeedsTeXFormat{LaTeX2e}[1998/12/01]
\ProvidesPackage{doclicense}
- [2019/04/07 v1.9.0 Support for putting documents under a license]
+ [2020/04/12 v1.10.1 Support for putting documents under a license]
%% ^^A nag warned about the center environment and it really messes up spacing.
%% Parameters (((
@@ -24,15 +24,17 @@
\RequirePackage{etoolbox} %% \ifcsdef
\RequirePackage{xspace}
\RequirePackage{verbatim}
-\RequirePackage{enumitem}
+%% )))
-%% \setlistdepth{4} seems not to be needed. Try without it to avoid changing global variables.
-%% Enumeration scheme was chosen to match the html page once.
-\newlist{doclicense@enumerate}{enumerate}{4}
-\setlist[doclicense@enumerate,1]{label = (\alph*)}
-\setlist[doclicense@enumerate,2]{label = (\arabic*)}
-\setlist[doclicense@enumerate,3]{label = (\Alph*)}
-\setlist[doclicense@enumerate,4]{label = (\roman*)}
+%% Custom enumerate list with adjusted labels
+%% that match the license text convetions
+\newenvironment{doclicense@enumerate}{%
+ \begin{enumerate}
+ \renewcommand{\labelenumi}{(\alph{enumi})}%
+ \renewcommand{\labelenumii}{(\arabic{enumii})}%
+ \renewcommand{\labelenumiii}{(\Alph{enumiii})}%
+ \renewcommand{\labelenumiv}{(\roman{enumiv})}%
+}{\end{enumerate}}
\ifthenelse{
\equal{\doclicense@hyphenation}{}
@@ -261,7 +263,6 @@
\ifthenelse{\equal{\doclicense@imagemodifier}{-jp}}{%
\renewcommand{\doclicense@icon}{\ccbyncjp}
}{}
- \renewcommand{\doclicense@imagemodifier}{}
}{}
\ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
\renewcommand{\doclicense@icon}{\ccbyncsa}
@@ -294,11 +295,11 @@
\ifthenelse{\equal{\doclicense@modifier}{pd}}{
\renewcommand{\doclicense@icon}{\ccpd}
\renewcommand{\doclicense@imagemodifier}{}
- \doclicense@setVersion[1.0]
+ \doclicense@setVersion[null]
\edef\doclicenseURL{%
\doclicense@baseUrlCC/%
- licenses/publicdomain/%
- \doclicense@versionUsed\doclicense@UrlLangPart}
+ licenses/publicdomain%
+ \doclicense@UrlLangPart}
}{}
\ifcsdef{doclicense@lang@lic@\doclicense@type%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doclicense.tlpobj new/tlpkg/tlpobj/doclicense.tlpobj
--- old/tlpkg/tlpobj/doclicense.tlpobj 2019-04-09 01:38:21.000000000 +0200
+++ new/tlpkg/tlpobj/doclicense.tlpobj 2020-04-16 01:56:55.000000000 +0200
@@ -1,6 +1,6 @@
name doclicense
category Package
-revision 50871
+revision 54758
shortdesc Support for putting documents under a license
relocated 1
longdesc This package allows you to put your document under a license
@@ -8,17 +8,19 @@
longdesc or image of the license. Currently, only Creative Commons is
longdesc supported, but this package is designed to handle all kinds of
longdesc licenses.
-runfiles size=178
+runfiles size=180
RELOC/tex/latex/doclicense/doclicense-UKenglish.ldf
RELOC/tex/latex/doclicense/doclicense-USenglish.ldf
RELOC/tex/latex/doclicense/doclicense-acadian.ldf
RELOC/tex/latex/doclicense/doclicense-american.ldf
RELOC/tex/latex/doclicense/doclicense-australian.ldf
+ RELOC/tex/latex/doclicense/doclicense-brazilian.ldf
RELOC/tex/latex/doclicense/doclicense-british.ldf
RELOC/tex/latex/doclicense/doclicense-canadian.ldf
RELOC/tex/latex/doclicense/doclicense-canadien.ldf
RELOC/tex/latex/doclicense/doclicense-catalan.ldf
- RELOC/tex/latex/doclicense/doclicense-chinese.ldf
+ RELOC/tex/latex/doclicense/doclicense-chinese-gbk.ldf
+ RELOC/tex/latex/doclicense/doclicense-chinese-utf8.ldf
RELOC/tex/latex/doclicense/doclicense-english.ldf
RELOC/tex/latex/doclicense/doclicense-french.ldf
RELOC/tex/latex/doclicense/doclicense-galician.ldf
@@ -71,7 +73,6 @@
catalogue-contact-bugs https://github.com/ypid/latex-packages/issues
catalogue-contact-repository https://github.com/ypid/latex-packages/tree/master/doclicense
catalogue-ctan /macros/latex/contrib/doclicense
-catalogue-date 2019-04-07 21:52:28 +0200
catalogue-license lppl1.3
catalogue-topics licence-mgmt
-catalogue-version 1.9.0
+catalogue-version 1.10.1
++++++ download.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/download/README new/doc/latex/download/README
--- old/doc/latex/download/README 2013-05-27 03:18:37.000000000 +0200
+++ new/doc/latex/download/README 2019-10-02 23:17:13.000000000 +0200
@@ -1,7 +1,7 @@
%% download - download files with LaTeX
%%
-%% Copyright (C) 2012-2013 by Simon Sigurdhsson
-%%
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson
+%%
%% 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.
@@ -9,15 +9,15 @@
%% 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 Simon Sigurdhsson.
-%%
+%%
%% This work consists of the file download.tex
%% and the derived file download.sty.
-This is version 1.0 of the download package, a package which allows
+This is version 1.2 of the download package, a package which allows
LaTeX to download files using wget or cURL.
The following files are enclosed.
Binary files old/doc/latex/download/download.pdf and new/doc/latex/download/download.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/download.doc.tlpobj new/tlpkg/tlpobj/download.doc.tlpobj
--- old/tlpkg/tlpobj/download.doc.tlpobj 2019-02-28 03:32:16.000000000 +0100
+++ new/tlpkg/tlpobj/download.doc.tlpobj 2019-10-03 01:55:14.000000000 +0200
@@ -1,8 +1,8 @@
name download.doc
category Package
-revision 30695
+revision 52257
shortdesc doc files of download
relocated 1
-docfiles size=37
+docfiles size=65
RELOC/doc/latex/download/README
RELOC/doc/latex/download/download.pdf
++++++ download.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/download/download.sty new/tex/latex/download/download.sty
--- old/tex/latex/download/download.sty 2013-05-27 03:18:37.000000000 +0200
+++ new/tex/latex/download/download.sty 2019-10-02 23:17:13.000000000 +0200
@@ -1,7 +1,7 @@
%% This is file `download.sty', generated from `download.tex' (key `package').
%% download - download files with LaTeX
%%
-%% Copyright (C) 2012-2013 by Simon Sigurdhsson
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,7 +20,7 @@
\RequirePackage{expl3,l3keys2e,pdftexcmds,xparse}
\ProvidesExplPackage{download}
- {2013/04/08}{1.1}{download files with LaTeX}
+ {2019/10/01}{1.2}{download files with LaTeX}
\msg_new:nnnn{download}{no-write18}{Could~not~use~\string\write18!}
{Please~run~`latex`~with~the~`--shell-escape`~flag.}
\msg_new:nnnn{download}{no-engine}{Could~not~find~any~engine!}
@@ -31,9 +31,9 @@
\msg_new:nnn{download}{use-wget}{Using~wget.}
\msg_new:nnn{download}{use-ariaII}{Using~aria2.}
\msg_new:nnn{download}{use-axel}{Using~axel.}
-\prg_new_conditional:Nnn\__download_if_shellescape:{F}{
+\prg_new_protected_conditional:Nnn\__download_if_shellescape:{F}{
\if_cs_exist:N\pdf@shellescape
- \if_int_compare:w\pdf@shellescape=\c_one
+ \if_int_compare:w\pdf@shellescape=\c_one_int
\prg_return_true:
\else:
\prg_return_false:
@@ -42,7 +42,7 @@
\prg_return_true:
\fi:
}
-\cs_new:Npn\__download_rm:n#1{
+\cs_new_protected:Npn\__download_rm:n#1{
\immediate\write18{rm~#1}
}
\prg_new_conditional:Npnn\__download_if_executable_test:n#1{TF,T,F,p}{
@@ -54,35 +54,35 @@
\prg_return_false:
}
}
-\cs_new:Npn\__download_curl_do:nn#1#2{
+\cs_new_protected:Npn\__download_curl_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{curl~-L~-s~#2}
}{
\immediate\write18{curl~-L~-s~-o~#1~#2}
}
}
-\cs_new:Npn\__download_wget_do:nn#1#2{
+\cs_new_protected:Npn\__download_wget_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{wget~-q~-nc~#2}
}{
\immediate\write18{wget~-q~-nc~-O~#1~#2}
}
}
-\cs_new:Npn\__download_ariaII_do:nn#1#2{
+\cs_new_protected:Npn\__download_ariaII_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{aria2c~-q~--auto-file-renaming=false~#2}
}{
\immediate\write18{aria2c~-q~--auto-file-renaming=false~-o~#1~#2}
}
}
-\cs_new:Npn\__download_axel_do:nn#1#2{
+\cs_new_protected:Npn\__download_axel_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{axel~-q~#2}
}{
\immediate\write18{axel~-q~-o~#1~#2}
}
}
-\prg_new_conditional:Nnn\__download_if_auto_test:{F,TF}{
+\prg_new_protected_conditional:Nnn\__download_if_auto_test:{F,TF}{
\__download_if_executable_test:nTF{wget}{
\prg_return_true:
}{
@@ -101,7 +101,7 @@
}
}
}
-\cs_new:Npn\__download_auto_do:nn#1#2{
+\cs_new_protected:Npn\__download_auto_do:nn#1#2{
\__download_if_executable_test:nTF{wget}{
\msg_info:nn{download}{use-wget}
\__download_wget_do:nn{#1}{#2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/download.tlpobj new/tlpkg/tlpobj/download.tlpobj
--- old/tlpkg/tlpobj/download.tlpobj 2019-02-28 03:32:16.000000000 +0100
+++ new/tlpkg/tlpobj/download.tlpobj 2019-10-03 01:55:14.000000000 +0200
@@ -1,6 +1,6 @@
name download
category Package
-revision 30695
+revision 52257
shortdesc Allow LaTeX to download files using an external process
relocated 1
longdesc The package allows the user to download files (using cURL or
@@ -12,7 +12,7 @@
runfiles size=2
RELOC/tex/latex/download/download.sty
catalogue-ctan /macros/latex/contrib/download
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-02 09:51:27 +0200
catalogue-license lppl1.3
catalogue-topics ext-code
-catalogue-version 1.1
+catalogue-version 1.2
++++++ draftwatermark.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/README new/doc/latex/draftwatermark/README
--- old/doc/latex/draftwatermark/README 2012-01-07 23:38:54.000000000 +0100
+++ new/doc/latex/draftwatermark/README 2020-03-14 21:58:33.000000000 +0100
@@ -1,16 +1,17 @@
-The "draftwatermark" package extends LaTeX providing a means to add a
-textual gray or colored watermark on every page or on the first page
-of a document. Typical usage may consist in writing words such as
-"DRAFT" or "CONFIDENTIAL" across document pages. The package may
-remind in some sense "draftcopy" by Dr. Juergen Vollmer, but its
-implementation is much lighter (as the reduced code footprint shows)
-and does not rely on postscript specials, making the package fully
-compatible with pdfLaTeX. The package depends on package "everypage"
-by the same author.
+The "draftwatermark" package extends LaTeX providing a means to add a textual
+gray or colored watermark on every page or on the first page of a
+document. Typical usage may consist in writing words such as "DRAFT" or
+"CONFIDENTIAL" across document pages. The package may remind in some sense
+"draftcopy" by Dr. Juergen Vollmer, but its implementation is lighter (as the
+reduced code footprint shows) and does not rely on postscript specials, making
+the package fully compatible with pdfLaTeX, xelatex and lualatex. The package
+depends on package "everypage" by the same author.
+The package focus is on simplicity, for complex layouts please consider
+scrlayer.sty in the KOMA script bundle.
-The "draftwatermark" package is copyright 2006, 2012 by Sergio
-Callegari
+The "draftwatermark" package is copyright 2006, 2012, 2020 by Sergio Callegari
+
It comprises this README file, as well as files
draftwatermark.dtx
Binary files old/doc/latex/draftwatermark/draftwatermark.pdf and new/doc/latex/draftwatermark/draftwatermark.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark.tex new/doc/latex/draftwatermark/test_draftwatermark.tex
--- old/doc/latex/draftwatermark/test_draftwatermark.tex 2012-01-07 23:38:54.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-%%
-%% This is file `test_draftwatermark.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% draftwatermark.dtx (with options: `samplecode')
-%%
-\documentclass{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{mathptmx}
-\usepackage{draftwatermark}
-\title{Sample document for the draftwatermark package}
-
-\begin{document}
-\maketitle
-
-\section{One}
-This text is here just to fill in some space. This text is here just to
-fill in some space. This text is here just to fill in some space. This
-text is here just to fill in some space. This text is here just to fill in
-some space. This text is here just to fill in some space. This text is
-here just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space.
-
-\section{Two}
-
-Also this text is here just to fill in some space. Also this text is here
-just to fill in some space. Also this text is here just to fill in some
-space. Also this text is here just to fill in some space. Also this text
-is here just to fill in some space. Also this text is here just to fill in
-some space. Also this text is here just to fill in some space. Also this
-text is here just to fill in some space. Also this text is here just to
-fill in some space. Also this text is here just to fill in some
-space. Also this text is here just to fill in some space. Also this text
-is here just to fill in some space. Also this text is here just to fill in
-some space. Also this text is here just to fill in some space. Also this
-text is here just to fill in some space. Also this text is here just to
-fill in some space. Also this text is here just to fill in some space.
-
-\end{document}
-\endinput
-%%
-%% End of file `test_draftwatermark.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark1.tex new/doc/latex/draftwatermark/test_draftwatermark1.tex
--- old/doc/latex/draftwatermark/test_draftwatermark1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark1.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,45 @@
+%%
+%% This is file `test_draftwatermark1.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-modern')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage[firstpageonly, color={[gray]{0.5}}]{draftwatermark}
+\usepackage{mathptmx}
+\usepackage{lipsum}
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark1.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark2.tex new/doc/latex/draftwatermark/test_draftwatermark2.tex
--- old/doc/latex/draftwatermark/test_draftwatermark2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark2.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,48 @@
+%%
+%% This is file `test_draftwatermark2.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-legacy')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage[firstpage]{draftwatermark}
+\usepackage{mathptmx}
+\usepackage{lipsum}
+
+\SetWatermarkLightness{0.5}
+
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark2.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark3.tex new/doc/latex/draftwatermark/test_draftwatermark3.tex
--- old/doc/latex/draftwatermark/test_draftwatermark3.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark3.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,48 @@
+%%
+%% This is file `test_draftwatermark3.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-anchor')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage[firstpage, anchor=tr, color=red,
+ pos={\dimexpr\paperwidth-5mm, 5mm},
+ angle=-45, fontsize=32pt]{draftwatermark}
+\usepackage{mathptmx}
+\usepackage{lipsum}
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\DraftwatermarkOptions{text=\bfseries DRAFT}
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark3.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark4.tex new/doc/latex/draftwatermark/test_draftwatermark4.tex
--- old/doc/latex/draftwatermark/test_draftwatermark4.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark4.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,58 @@
+%%
+%% This is file `test_draftwatermark4.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-custom')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage{draftwatermark}
+\usepackage{mathptmx}
+\usepackage[scaled]{helvet}
+\usepackage{lipsum}
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\newsavebox\wmbox
+\savebox\wmbox{%
+ {\color[rgb]{1,0.8,0.8}\sffamily \fbox{DRAFT}}}
+\newcommand\MyWM{%
+ \ifodd\thepage
+ \hspace*{\dimexpr \paperwidth -\wd\wmbox-10mm}%
+ \usebox{\wmbox}%
+ \else
+ \usebox{\wmbox}%
+ \fi}
+
+\DraftwatermarkOptions{anchor=lt, pos={5mm, 5mm}, markcmd=\MyWM}
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark4.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/draftwatermark.doc.tlpobj new/tlpkg/tlpobj/draftwatermark.doc.tlpobj
--- old/tlpkg/tlpobj/draftwatermark.doc.tlpobj 2019-02-28 03:32:19.000000000 +0100
+++ new/tlpkg/tlpobj/draftwatermark.doc.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,9 +1,12 @@
name draftwatermark.doc
category Package
-revision 37498
+revision 54317
shortdesc doc files of draftwatermark
relocated 1
-docfiles size=25
+docfiles size=50
RELOC/doc/latex/draftwatermark/README
RELOC/doc/latex/draftwatermark/draftwatermark.pdf
- RELOC/doc/latex/draftwatermark/test_draftwatermark.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark1.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark2.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark3.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark4.tex
++++++ draftwatermark.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/draftwatermark/draftwatermark.sty new/tex/latex/draftwatermark/draftwatermark.sty
--- old/tex/latex/draftwatermark/draftwatermark.sty 2015-06-12 01:05:22.000000000 +0200
+++ new/tex/latex/draftwatermark/draftwatermark.sty 2020-03-14 21:58:33.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% IMPORTANT NOTICE:
%%
-%% Copyright 2006
+%% Copyright 2006, 2020
%% Sergio Callegari
%%
%% ---------------------------------------------
@@ -32,79 +32,183 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{draftwatermark}%
- [2015/02/19 1.2 Put a gray textual watermark on document pages]
+ [2020/03/14 2.0 Put a gray textual watermark on document pages]
+
+\RequirePackage{kvoptions}
\RequirePackage{everypage}[2007/06/20]
\RequirePackage{graphicx}
\RequirePackage{color}
-\newif\if@sc@wm@first
-\@sc@wm@firstfalse
-\newif\if@sc@wm@stamp
-\@sc@wm@stamptrue
-\DeclareOption{firstpage}{%
- \@sc@wm@firsttrue}
-\DeclareOption{nostamp}{%
- \@sc@wm@stampfalse}
-\DeclareOption{final}{%
- \@sc@wm@stampfalse}
-\DeclareOption{stamp}{%
- \@sc@wm@stamptrue}
-\ProcessOptions
-\newlength\sc@wm@hcenter
-\newlength\sc@wm@vcenter
-\newlength\sc@wm@fontsize
-%% defaults
-\def\sc@wm@angle{45}
-\def\sc@wm@colormodel{[gray]}
-\def\sc@wm@colorspecs{0.8}
-\def\sc@wm@scale{1}
-\setlength\sc@wm@hcenter{.5\paperwidth}
-\setlength\sc@wm@vcenter{.5\paperheight}
-\setlength\sc@wm@fontsize{5cm}
-\def\sc@wm@text{DRAFT}
-\newcommand\SetWatermarkAngle[1]{%
- \def\sc@wm@angle{#1}}
-\newcommand\SetWatermarkColor{}
-\def\SetWatermarkColor#1#{\sc@setWatermarkColor{#1}}
-\def\sc@setWatermarkColor#1#2{%
- \def\sc@wm@colormodel{#1}%
- \def\sc@wm@colorspecs{#2}}
-\newcommand\SetWatermarkLightness[1]{%
- \SetWatermarkColor[gray]{#1}}
-\newcommand\SetWatermarkFontSize[1]{%
- \setlength\sc@wm@fontsize{#1}}
-\newcommand\SetWatermarkScale[1]{%
- \def\sc@wm@scale{#1}}
+
+\DeclareBoolOption[false]{firstpageonly}
+\define@key{draftwatermark}{firstpage}[true]{%
+ \csname draftwatermark@firstpageonly#1\endcsname}
+\DeclareBoolOption[true]{stamp}
+\DeclareComplementaryOption{nostamp}{stamp}
+\DeclareComplementaryOption{final}{stamp}
+\DeclareStringOption[45]{angle}
+\DeclareStringOption[1]{scale}
+\DeclareStringOption[DRAFT]{text}
+\DeclareStringOption[0.5\paperwidth]{hpos}
+\DeclareStringOption[0.5\paperheight]{vpos}
+\DeclareStringOption[0.25\paperwidth]{fontsize}
+\DeclareStringOption[gray]{colormodel}
+\DeclareStringOption[0.8]{colorspec}
+\DeclareStringOption[c]{hanchor}
+\DeclareStringOption[m]{vanchor}
+\DeclareStringOption[\DraftwatermarkStdMark]{markcmd}
+\define@key{draftwatermark}{pos}{%
+ \draftwatermark@processpos #1\@nil}
+\define@key{draftwatermark}{anchor}{%
+ \draftwatermark@processanchor{#1}}
+\define@key{draftwatermark}{color}{%
+ \draftwatermark@processcolor #1\@nil}
+
+\def\draftwatermark@processpos#1,#2\@nil{%
+ \def\draftwatermark@hpos{#1}%
+ \def\draftwatermark@vpos{#2}}
+
+\def\draftwatermark@processanchor#1{%
+ \def\draftwatermark@tempa{#1}
+ \@onelevel@sanitize \draftwatermark@tempa
+ \expandafter \@tfor \expandafter \draftwatermark@tempb
+ \expandafter :\expandafter =\draftwatermark@tempa
+ \do
+ {%
+ \if \draftwatermark@tempb l%
+ \def \draftwatermark@hanchor{l}%
+ \else \if \draftwatermark@tempb c%
+ \def \draftwatermark@hanchor{c}%
+ \else \if \draftwatermark@tempb r%
+ \def \draftwatermark@hanchor{r}%
+ \else \if \draftwatermark@tempb t%
+ \def \draftwatermark@vanchor{t}%
+ \else \if \draftwatermark@tempb m%
+ \def \draftwatermark@vanchor{m}%
+ \else \if \draftwatermark@tempb b%
+ \def \draftwatermark@vanchor{b}
+ \else
+ \PackageError{draftwatermark}{%
+ Illegal anchor directive `\draftwatermark@tempb'}%
+ {Directive has been ingnored.}%
+ \fi\fi\fi\fi\fi\fi
+ }}
+
+\def\draftwatermark@processcolor{%
+ \@ifnextchar[
+ \draftwatermark@processcolor@ii\draftwatermark@processcolor@i}
+
+\def\draftwatermark@processcolor@i#1\@nil{%
+ \def\draftwatermark@colormodel{}%
+ \def\draftwatermark@colorspec{#1}}
+
+\def\draftwatermark@processcolor@ii[#1]#2\@nil{%
+ \def\draftwatermark@colormodel{#1}%
+ \def\draftwatermark@colorspec{#2}}
+
+\ProcessKeyvalOptions*
+\DisableKeyvalOption{draftwatermark}{firstpageonly}
+\DisableKeyvalOption{draftwatermark}{firstpage}
+
+\newcommand\DraftwatermarkOptions[1]{\setkeys{draftwatermark}{#1}}
+
+\newcommand\SetWatermarkAngle[1]{\DraftwatermarkOptions{angle=#1}}
+\newcommand\SetWatermarkFontSize[1]{\DraftwatermarkOptions{fontsize=#1}}
+\newcommand\SetWatermarkScale[1]{\DraftwatermarkOptions{scale=#1}}
\newcommand\SetWatermarkHorCenter[1]{%
- \setlength\sc@wm@hcenter{#1}}
+ \DraftwatermarkOptions{hpos=#1, hanchor=c}}
\newcommand\SetWatermarkVerCenter[1]{%
- \setlength\sc@wm@vcenter{#1}}
-\newcommand\SetWatermarkText[1]{%
- \def\sc@wm@text{#1}}
-\newcommand\sc@watermark{%
- \setlength{\@tempdimb}{\sc@wm@hcenter}%
- \setlength{\@tempdimc}{-\sc@wm@vcenter}%
- \put(\strip@pt\@tempdimb,\strip@pt\@tempdimc){%
- \makebox(0,0){\rotatebox{\sc@wm@angle}{%
- \scalebox{\sc@wm@scale}{%
- \expandafter\expandafter\expandafter\textcolor
- \expandafter\sc@wm@colormodel\expandafter{\sc@wm@colorspecs}{%
- \fontsize{\sc@wm@fontsize}{1.2\sc@wm@fontsize}
- \selectfont
- \sc@wm@text}}}}}}
-\newcommand\sc@wm@print[1]{%
- \if@sc@wm@stamp
- \setbox\@tempboxa\vbox to \z@{%
- \vskip -1in \moveleft 1in \vbox{%
- \hbox to \z@{%
- #1\hss}}\vss}
- \dp\@tempboxa\z@
- \box\@tempboxa
+ \DraftwatermarkOptions{vpos=#1, vanchor=m}}
+\newcommand\SetWatermarkText[1]{\DraftwatermarkOptions{text=#1}}
+\newcommand\SetWatermarkColor[2][]{%
+ \DraftwatermarkOptions{colormodel=#1, colorspec=#2}}
+\newcommand\SetWatermarkLightness[1]{%
+ \DraftwatermarkOptions{colormodel=gray, colorspec=#1}}
+
+\newcommand\DraftwatermarkStdMark{%
+ \rotatebox{\draftwatermark@angle}{%
+ \scalebox{\draftwatermark@scale}{%
+ \begingroup
+ \ifx\draftwatermark@colormodel\@empty
+ \color{\draftwatermark@colorspec}%
+ \else
+ \color[\draftwatermark@colormodel]{\draftwatermark@colorspec}%
+ \fi
+ \setlength{\@tempdima}{\draftwatermark@fontsize}%
+ \fontsize{\@tempdima}{1.2\@tempdima}\selectfont
+ \draftwatermark@text
+ \endgroup}}}
+
+\newcommand\draftwatermark@printwm[1]{%
+ \sbox\@tempboxa{#1}%
+ \setlength{\@tempdima}{\draftwatermark@hpos}%
+ \setlength{\@tempdimb}{\draftwatermark@vpos}%
+ \let \draftwatermark@tempa \draftwatermark@hanchor
+ \@onelevel@sanitize \draftwatermark@tempa
+ \expandafter\def\expandafter\draftwatermark@tempb
+ \expandafter{\expandafter\@car \draftwatermark@tempa\@nil}
+ \if \draftwatermark@tempb r%
+ \addtolength\@tempdima{-\wd\@tempboxa}%
+ \else\if \draftwatermark@tempb c%
+ \addtolength\@tempdima{-0.5\wd\@tempboxa}%
+ \else\if \draftwatermark@tempb l%
+ \relax
+ \else
+ \PackageError{draftwatermark}{%
+ Illegal anchor directive `\draftwatermark@tempb'}%
+ {Anchoring to left side.}%
+ \fi\fi\fi
+ \let \draftwatermark@tempa \draftwatermark@vanchor
+ \@onelevel@sanitize \draftwatermark@tempa
+ \expandafter\def\expandafter\draftwatermark@tempb
+ \expandafter{\expandafter\@car \draftwatermark@tempa\@nil}
+ \if \draftwatermark@tempb b%
+ \addtolength\@tempdimb{-\ht\@tempboxa}%
+ \addtolength\@tempdimb{-\dp\@tempboxa}%
+ \else\if \draftwatermark@tempb m%
+ \addtolength\@tempdimb{-0.5\ht\@tempboxa}%
+ \addtolength\@tempdimb{-0.5\dp\@tempboxa}%
+ \else\if \draftwatermark@tempb t%
+ \relax
+ \else
+ \PackageError{draftwatermark}{%
+ Illegal anchor directive `\draftwatermark@tempb'}%
+ {Anchoring to top side.}%
+ \fi\fi\fi
+ \vbox to 0pt {
+ \vspace*{-1in}%
+ \vspace*{\@tempdimb}%
+ \hbox to 0pt {%
+ \hspace*{-1in}%
+ \hspace*{\@tempdima}%
+ \usebox\@tempboxa
+ \hss}%
+ \vss}}
+
+\newcommand\draftwatermark@print[1]{%
+ \ifdraftwatermark@stamp
+ \draftwatermark@printwm{#1}%
\fi}
-\if@sc@wm@first
-\AddThispageHook{\sc@wm@print{\sc@watermark}}
+\ifdraftwatermark@firstpageonly
+ \AddThispageHook{\draftwatermark@print{\draftwatermark@markcmd}}
\else
-\AddEverypageHook{\sc@wm@print{\sc@watermark}}
+ \AddEverypageHook{\draftwatermark@print{\draftwatermark@markcmd}}
\fi
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
\endinput
%%
%% End of file `draftwatermark.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/draftwatermark.tlpobj new/tlpkg/tlpobj/draftwatermark.tlpobj
--- old/tlpkg/tlpobj/draftwatermark.tlpobj 2019-02-28 03:32:19.000000000 +0100
+++ new/tlpkg/tlpobj/draftwatermark.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,6 +1,6 @@
name draftwatermark
category Package
-revision 37498
+revision 54317
shortdesc Put a grey textual watermark on document pages
relocated 1
longdesc The package provides a means to add a textual, light grey
@@ -10,12 +10,11 @@
longdesc similar function to that of draftcopy, but its implementation
longdesc is output device independent, and made very simple by relying
longdesc on everypage.
-runfiles size=1
+runfiles size=2
RELOC/tex/latex/draftwatermark/draftwatermark.sty
catalogue-also eso-pic
catalogue-contact-repository https://github.com/callegar/LaTeX-draftwatermark
catalogue-ctan /macros/latex/contrib/draftwatermark
-catalogue-date 2017-05-22 12:38:58 +0200
catalogue-license lppl1.3
catalogue-topics editorial watermark
-catalogue-version 1.2
+catalogue-version 2.0
++++++ droid.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/CHANGES new/doc/fonts/droid/CHANGES
--- old/doc/fonts/droid/CHANGES 2011-09-13 01:12:57.000000000 +0200
+++ new/doc/fonts/droid/CHANGES 2019-06-25 23:26:46.000000000 +0200
@@ -1,20 +1,37 @@
-Changelog for version 1.1:
- - clean comfortaa-fixlatin.etx
+VERSION 3.2:
+ - Fix ligatures for hyphens
+ - Fix TDS packaging
-Changelog for version 1.2:
- - clean comfortaa-fixlatin.etx (again...)
+VERSION 3.1:
+ - Fix OT1 encoding with italic/slanted shapes
+ - Fix packaging according to CTAN guidelines
-Changelog for version 1.3:
- - fix metrics bugs in TS1 encoding
- - fix documentation
- - add samples PDFs
-
-Changelog for version 2.0:
- - complete rewrite of the fontinst driver file
- - rename .vf and .tfm files based on the pattern <font>-<encoding>
- - fix NFSS shape for upright italic variant ("ui" instead of "up")
- - modify paths of the archive: documentation is now in doc/fonts/droid/
+VERSION 3.0:
+ - Update .ttf files to latest version available in Android Git tree
+ - Complete rewrite of the TeX metric file generation (otftotfm is now
+ used instead of fontinst)
+ - Support for XeLaTeX and LuaLaTeX
+ - Drop faked smallcaps support
+ - Fix kerning with uppercase Greek diacritics
+ - Add "scaled" alias option
+
+VERSION 2.1:
+ - fix bug in font scaling
+
+VERSION 2.0:
+ - complete rewrite of the fontinst driver file
+ - rename .vf and .tfm files based on the pattern <font>-<encoding>
+ - fix NFSS shape for upright italic variant ("ui" instead of "up")
+ - modify paths of the archive: documentation is now in doc/fonts/droid/
and sources in source/fonts/droid/
-Changelog for version 2.0:
- - fix bug in font scaling
+VERSION 1.3:
+ - fix metrics bugs in TS1 encoding
+ - fix documentation
+ - add samples PDFs
+
+VERSION 1.2:
+ - clean droid-fixlatin.etx (again...)
+
+VERSION 1.1:
+ - clean droid-fixlatin.etx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/README new/doc/fonts/droid/README
--- old/doc/fonts/droid/README 2011-09-13 01:12:57.000000000 +0200
+++ new/doc/fonts/droid/README 2019-06-25 23:26:46.000000000 +0200
@@ -1,25 +1,25 @@
--------------------
- Droid, version 2.1
+ Droid, version 3.1
--------------------
The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
Matteson, as a commission from Google to create a set of system fonts for its
Android platform. The goal was to provide optimal quality and comfort on a
mobile handset when rendered in application menus, web browsers and for other
-screen text. The Droid family of fonts consists of Droid Serif, Droid Sans and
-Droid Sans Mono, licensed under the Apache License version 2.0, and available in
-the Android Git at
-http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/...
-as TrueType files.
+screen text. It consists of Droid Serif, Droid Sans and Droid Sans Mono.
-This package provides support for this font family in LaTeX. It includes the
-original TrueType fonts, as well as Type 1 versions, converted for this package
-using FontForge for full support with Dvips.
+The font family is available in the Android Git tree as TrueType-flavored
+OpenType files licensed under the Apache License version 2.0.
-Notice that this package does not support the Droid Pro family sold by Ascender.
+This package provides support for Droid in LaTeX, including XeLaTeX and
+LuaLaTeX. It includes the original OpenType fonts, as well as Type 1 versions,
+converted for this package using FontForge for full support with LaTeX and
+Dvips.
-Installation and usage instructions are described in
-doc/latex/droid/droid.pdf.
+Notice that this package does not support the Droid Pro family sold by
+Ascender. Notice also that the Noto font family is considered to be the
+successor for Droid, with better Unicode coverage and more weights and shapes
+available.
This package is released under the LaTeX Project Public License, either version
1.3c or above, with the exception of the .ttf and .pfb files, released under the
Binary files old/doc/fonts/droid/droid-samples.pdf and new/doc/fonts/droid/droid-samples.pdf differ
Binary files old/doc/fonts/droid/droid.pdf and new/doc/fonts/droid/droid.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droid.tex new/doc/fonts/droid/droid.tex
--- old/doc/fonts/droid/droid.tex 2011-09-13 01:12:57.000000000 +0200
+++ new/doc/fonts/droid/droid.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,283 +0,0 @@
-%% droid.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% 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 Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage{droid}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{varioref}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
- pdftitle={LaTeX support for Droid},%
- pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Droid\\Version~2.1}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
-\name{Matteson}, as a commission from Google to create a set of system fonts for
-its Android platform. The goal was to provide optimal quality and comfort on a
-mobile handset when rendered in application menus, web browsers and for other
-screen text. The Droid family of fonts consists of {\fdrfamily Droid Serif},
-{\fdsfamily Droid Sans} and {\fdmfamily Droid Sans Mono} (see
-figure~\vref{styles}), licensed under the Apache License version~2.0, and
-available in the Android \program{Git} tree~\cite{droid} as TrueType files.
-
-\begin{figure}
- \centering
- {%
- \fdrfamily%
- Droid Serif Regular\\
- {\itshape Droid Serif Italic}\\
- {\bfseries Droid Serif Bold}\\
- {\bfseries\itshape Droid Serif Bold Italic}\\
- }
- {%
- \fdsfamily%
- Droid Sans Regular\\
- {\bfseries Droid Sans Bold}\\
- }
- {%
- \fdmfamily%
- Droid Sans Mono Regular
- }
- \caption{Available styles for Droid}
- \label{styles}
-\end{figure}
-
-This package provides support for this font family in \LaTeX{}. It includes the
-original TrueType fonts, as well as Type~1 versions, converted for this package
-using \program{FontForge} for full support with \program{Dvips}.
-
-Notice that this package does not support the Droid Pro family sold by
-Ascender~\cite{droidpro}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|droid.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
- directories to your \path|texmf/| directory (either your local or global
- \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
- aware of the new files.
-\item Run \command{updmap --enable Map droid.map} to make \program{Dvips},
- \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Droid}
-
-Several macro packages, described in table~\vref{packages}, are provided to use these font
-families with \LaTeX.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- font name&family&package&switch command\\
- \midrule
- Droid Serif&fdr&\package{droidserif}&\code{\char`\\fdrfamily}\\
- Droid Sans&fds&\package{droidsans}&\code{\char`\\fdsfamily}\\
- Droid Sans Mono&fdm&\package{droidmono}&\code{\char`\\fdmfamily}\\
- \bottomrule
- \end{tabular}
- \caption{\LaTeX{} style files provided by the droid package}
- \label{packages}
-\end{table}
-For each family package, the provided commands \code{\char`\\fdrfamily},
-\code{\char`\\fdsfamily} and \code{\char`\\fdmfamily} will switch the current
-font to Droid Serif, Droid Sans and Droid Sans Mono respectively. You need not
-necessarily use all three font families together (even though this is supported,
-see below).
-
-\subsubsection{Using the Droid font families together}
-
-To make the use of the three Droid fonts families together most easy, a further
-macro package \package{droid} is provided:
-\begin{verbatim}
-\usepackage{droid}
-\end{verbatim}
-This will set Droid Serif, Droid Sans and Droid Sans Mono as the three main text
-font families.
-
-\subsubsection{Using each font family separately}
-
-You can set \LaTeX{} to use Droid Serif only as standard font throughout the
-whole document by passing the \code{default} option to the \package{droidserif}
-package:
-\begin{verbatim}
-\usepackage[default]{droidserif}
-\end{verbatim}
-
-As well, you can set \LaTeX{} to use Droid Sans as standard font with the
-\code{default} option to the \package{droidsans} package:
-\begin{verbatim}
-\usepackage[default]{droidsans}
-\end{verbatim}
-To set Droid Sans as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{droidsans}
-\end{verbatim}
-
-Finally, to set Droid Sans Mono as the default typewriter font:
-\begin{verbatim}
-\usepackage[defaultmono]{droidmono}
-\end{verbatim}
-
-\paragraph{Font scaling}
-
-The font can be up- and downscaled by any factor. This can be used to make the
-Droid fonts more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
-the font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{droidserif}
-\usepackage[scale=0.95]{droidsans}
-\usepackage[scale=0.95]{droidmono}
-\end{verbatim}
-
-\subsection{Encodings}
-
-The following encodings are supported:
-\begin{description}
-\item[Latin] OT1, T1, TS1 (partial)
-\item[Cyrillic] T2A, T2B, T2C, X2
-\item[Greek] LGR (monotonic only)
-\end{description}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{droid}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between these two encoding
-in table~\vref{kerning}.
-\begin{table}
-\centering
- \begin{tabular}{ll}
- \toprule
- OT1-encoded&{\fdsfamily Te T\'e}\\
- \midrule
- T1-encoded&{\fdsfamily\fontencoding{T1}\selectfont Te T\'e}\\
- \bottomrule
- \end{tabular}
- \caption{Kerning with OT1 and T1 encodings}
- \label{kerning}
-\end{table}
-It is therefore advised to always use the Droid fonts in any encoding than OT1
-when typing diacritics.
-
-\subsection{Available weights and variants}
-
-Table~\vref{nfss} lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- family&encoding&series&shape\\
- \midrule
- \multirow{4}{*}{fdr}&OT1,T1,&\multirow{4}{*}{m, b (bx)}&\multirow{3}{*}{n, it, sl, ui, sc, scit, scsl, scui}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, it, sl, ui\\
- \midrule
- \multirow{4}{*}{fds}&OT1,T1,&\multirow{4}{*}{m, b (bx)}&\multirow{3}{*}{n, sl (it), sc, scsl (scit)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, sl (it)\\
- \midrule
- \multirow{4}{*}{fdm}&OT1,T1,&\multirow{4}{*}{m}&\multirow{3}{*}{n, sl (it), sc, scsl (scit)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, sl (it)\\
- \bottomrule
- \end{tabular}
- \caption{Available font series and shapes for Droid}
- \label{nfss}
-\end{table}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-Samples of the font are available in the
-\href{run:droidserif-samples.pdf}{\path|droidserif-samples.pdf|},
-\href{run:droidsans-samples.pdf}{\path|droidsans-samples.pdf|}, and
-\href{run:droidsansmono-samples.pdf}{\path|droidsansmono-samples.pdf|} files.
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Droid \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Apache License Version~2.0~\cite{asl}.
-
-\begin{thebibliography}{9}
-\bibitem{droid}
- \url{http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts}
-\bibitem{droidpro} \url{http://www.DroidFonts.com/}
-\bibitem{keyval}
- \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{asl} \url{http://www.apache.org/licenses/LICENSE-2.0.html}
-\end{thebibliography}
-
-\end{document}
Binary files old/doc/fonts/droid/droidsans-samples.pdf and new/doc/fonts/droid/droidsans-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droidsans-samples.tex new/doc/fonts/droid/droidsans-samples.tex
--- old/doc/fonts/droid/droidsans-samples.tex 2011-05-09 01:17:01.000000000 +0200
+++ new/doc/fonts/droid/droidsans-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-%% droidsans-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% 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 Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidsans}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fds}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fds}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fds}{#1}{#2} \greekSample}%
-
- {\fontfamily{fds}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Sans Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\section*{Droid Sans Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scsl}
-
-\end{document}
Binary files old/doc/fonts/droid/droidsansmono-samples.pdf and new/doc/fonts/droid/droidsansmono-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droidsansmono-samples.tex new/doc/fonts/droid/droidsansmono-samples.tex
--- old/doc/fonts/droid/droidsansmono-samples.tex 2011-05-09 01:17:01.000000000 +0200
+++ new/doc/fonts/droid/droidsansmono-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-%% droidsansmono-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% 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 Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidmono}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fdm}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fdm}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fdm}{#1}{#2} \greekSample}%
-
- {\fontfamily{fdm}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Sans Mono}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\end{document}
Binary files old/doc/fonts/droid/droidserif-samples.pdf and new/doc/fonts/droid/droidserif-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droidserif-samples.tex new/doc/fonts/droid/droidserif-samples.tex
--- old/doc/fonts/droid/droidserif-samples.tex 2011-08-27 00:20:49.000000000 +0200
+++ new/doc/fonts/droid/droidserif-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-%% droidserif-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% 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 Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidserif}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fdr}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fdr}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fdr}{#1}{#2} \greekSample}%
-
- {\fontfamily{fdr}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Serif Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{it}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{ui}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scit}
-
-\fontSample{m}{scsl}
-
-\fontSample{m}{scui}
-
-\section*{Droid Serif Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{it}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{ui}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scit}
-
-\fontSample{b}{scsl}
-
-\fontSample{b}{scui}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/manifest.txt new/doc/fonts/droid/manifest.txt
--- old/doc/fonts/droid/manifest.txt 2011-08-27 00:20:49.000000000 +0200
+++ new/doc/fonts/droid/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,557 +0,0 @@
-./README
-./tex/latex/droid/droidsans.sty
-./tex/latex/droid/droidserif.sty
-./tex/latex/droid/ot1fdr.fd
-./tex/latex/droid/ts1fdr.fd
-./tex/latex/droid/x2fdm.fd
-./tex/latex/droid/ot1fdm.fd
-./tex/latex/droid/x2fdr.fd
-./tex/latex/droid/lgrfdm.fd
-./tex/latex/droid/t2afds.fd
-./tex/latex/droid/t1fds.fd
-./tex/latex/droid/t2bfdm.fd
-./tex/latex/droid/t1fdr.fd
-./tex/latex/droid/droid.sty
-./tex/latex/droid/t2cfdr.fd
-./tex/latex/droid/ot1fds.fd
-./tex/latex/droid/t2afdm.fd
-./tex/latex/droid/t1fdm.fd
-./tex/latex/droid/ts1fdm.fd
-./tex/latex/droid/lgrfdr.fd
-./tex/latex/droid/ts1fds.fd
-./tex/latex/droid/droidmono.sty
-./tex/latex/droid/t2cfds.fd
-./tex/latex/droid/t2bfdr.fd
-./tex/latex/droid/lgrfds.fd
-./tex/latex/droid/x2fds.fd
-./tex/latex/droid/t2cfdm.fd
-./tex/latex/droid/t2bfds.fd
-./tex/latex/droid/t2afdr.fd
-./doc/fonts/droid/README
-./doc/fonts/droid/droidsansmono-samples.pdf
-./doc/fonts/droid/droidsans-samples.tex
-./doc/fonts/droid/droid.tex
-./doc/fonts/droid/droidserif-samples.pdf
-./doc/fonts/droid/CHANGES
-./doc/fonts/droid/droidsansmono-samples.tex
-./doc/fonts/droid/droidserif-samples.tex
-./doc/fonts/droid/droid.pdf
-./doc/fonts/droid/droidsans-samples.pdf
-./source/fonts/droid/droidsans-drv.tex
-./source/fonts/droid/ttf2type1.pe
-./source/fonts/droid/droid-map.tex
-./source/fonts/droid/droid-drv.tex
-./source/fonts/droid/Makefile
-./source/fonts/droid/droid-04.etx
-./source/fonts/droid/droid-02.etx
-./source/fonts/droid/droid-03.etx
-./source/fonts/droid/droid-01.etx
-./source/fonts/droid/droidserif-drv.tex
-./source/fonts/droid/droid-fixgreek.mtx
-./source/fonts/droid/droidsansmono-drv.tex
-./source/fonts/droid/droid-fixlatin.mtx
-./source/fonts/droid/droid-fixtextcomp.mtx
-./source/fonts/droid/droid-fixcyrillic.mtx
-./manifest.txt
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-02.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-02.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-04.tfm
-./fonts/tfm/public/droid/DroidSansMono-01.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSans-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-03.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-x2.tfm
-./fonts/tfm/public/droid/DroidSans-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-01.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSansMono-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-01.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-02.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-01.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-02.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-04.tfm
-./fonts/tfm/public/droid/DroidSansMono-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-01.tfm
-./fonts/tfm/public/droid/DroidSans-04.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-ts1.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-03.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t2b.tfm
-./fonts/tfm/public/droid/DroidSansMono-03.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-04.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-02.tfm
-./fonts/tfm/public/droid/DroidSans-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-01.tfm
-./fonts/tfm/public/droid/DroidSans-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSans-01.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-03.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t1.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-03.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSansMono-02.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-t2a.tfm
-./fonts/tfm/public/droid/DroidSansMono-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t2c.tfm
-./fonts/map/dvips/droid/droid.map
-./fonts/vf/public/droid/DroidSans-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-ts1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Regular-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Regular-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSans-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t2b.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-ot1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Regular-lgr.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSansMono-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-lgr.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-x2.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-Bold-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-x2.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Bold-x2.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t2a.vf
-./fonts/vf/public/droid/DroidSans-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSans-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-x2.vf
-./fonts/vf/public/droid/DroidSans-Bold-t2c.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSansMono-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-lgr.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-ts1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-lgr.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-ts1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t2a.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSans-t1.vf
-./fonts/truetype/public/droid/DroidSerif-Italic.ttf
-./fonts/truetype/public/droid/DroidSerif-Bold.ttf
-./fonts/truetype/public/droid/DroidSans-Bold.ttf
-./fonts/truetype/public/droid/DroidSerif-BoldItalic.ttf
-./fonts/truetype/public/droid/DroidSans.ttf
-./fonts/truetype/public/droid/DroidSansMono.ttf
-./fonts/truetype/public/droid/DroidSerif-Regular.ttf
-./fonts/afm/public/droid/DroidSerif-Bold.afm
-./fonts/afm/public/droid/DroidSerif-BoldItalic.afm
-./fonts/afm/public/droid/DroidSans.afm
-./fonts/afm/public/droid/DroidSans-Bold.afm
-./fonts/afm/public/droid/DroidSansMono.afm
-./fonts/afm/public/droid/DroidSerif-Italic.afm
-./fonts/afm/public/droid/DroidSerif-Regular.afm
-./fonts/enc/dvips/droid/droid-04.enc
-./fonts/enc/dvips/droid/droid-01.enc
-./fonts/enc/dvips/droid/droid-02.enc
-./fonts/enc/dvips/droid/droid-03.enc
-./fonts/type1/public/droid/DroidSerif-Regular.pfb
-./fonts/type1/public/droid/DroidSans.pfb
-./fonts/type1/public/droid/DroidSerif-Italic.pfb
-./fonts/type1/public/droid/DroidSans-Bold.pfb
-./fonts/type1/public/droid/DroidSerif-Bold.pfb
-./fonts/type1/public/droid/DroidSansMono.pfb
-./fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/droid.doc.tlpobj new/tlpkg/tlpobj/droid.doc.tlpobj
--- old/tlpkg/tlpobj/droid.doc.tlpobj 2019-02-28 03:32:49.000000000 +0100
+++ new/tlpkg/tlpobj/droid.doc.tlpobj 2020-03-24 01:57:20.000000000 +0100
@@ -1,17 +1,10 @@
name droid.doc
category Package
-revision 23912
+revision 54512
shortdesc doc files of droid
relocated 1
-docfiles size=205
+docfiles size=211
RELOC/doc/fonts/droid/CHANGES
RELOC/doc/fonts/droid/README
+ RELOC/doc/fonts/droid/droid-samples.pdf
RELOC/doc/fonts/droid/droid.pdf
- RELOC/doc/fonts/droid/droid.tex
- RELOC/doc/fonts/droid/droidsans-samples.pdf
- RELOC/doc/fonts/droid/droidsans-samples.tex
- RELOC/doc/fonts/droid/droidsansmono-samples.pdf
- RELOC/doc/fonts/droid/droidsansmono-samples.tex
- RELOC/doc/fonts/droid/droidserif-samples.pdf
- RELOC/doc/fonts/droid/droidserif-samples.tex
- RELOC/doc/fonts/droid/manifest.txt
++++++ droid.tar.xz ++++++
++++ 151313 lines of diff (skipped)
++++++ dsserif.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/dsserif/README new/doc/fonts/dsserif/README
--- old/doc/fonts/dsserif/README 2018-05-02 22:46:57.000000000 +0200
+++ new/doc/fonts/dsserif/README 2020-01-13 00:29:21.000000000 +0100
@@ -19,7 +19,10 @@
Files provided "as is", with no warranties.
-Current version: 1.00 2018-05-01
+Current version: 1.01 2020-01-04
+
+Changes in version 1.01
+Corrections to DSSerif.map
Please send comments and bug reports or suggestions for improvement to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dsserif.doc.tlpobj new/tlpkg/tlpobj/dsserif.doc.tlpobj
--- old/tlpkg/tlpobj/dsserif.doc.tlpobj 2019-02-28 03:32:57.000000000 +0100
+++ new/tlpkg/tlpobj/dsserif.doc.tlpobj 2020-03-24 01:57:22.000000000 +0100
@@ -1,6 +1,6 @@
name dsserif.doc
category Package
-revision 47570
+revision 54512
shortdesc doc files of dsserif
relocated 1
docfiles size=72
++++++ dsserif.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/dsserif/DSSerif.map new/fonts/map/dvips/dsserif/DSSerif.map
--- old/fonts/map/dvips/dsserif/DSSerif.map 2018-05-02 22:46:57.000000000 +0200
+++ new/fonts/map/dvips/dsserif/DSSerif.map 2020-01-13 00:29:21.000000000 +0100
@@ -1,4 +1,4 @@
DSSerif DSSerif \z@
\hfill\minipage[t]{\dimexpr\linewidth-\dtk@extern@mpwidth-1em\relax}\vspace{0pt}
\else
- \par\begingroup
+ \ifdtk@extern@inline\else\par\fi\begingroup
\fi
\fi
\dtk@extern@align
@@ -210,7 +212,7 @@
\ifdim\dtk@extern@mpwidth>\z@
\endminipage
\else
- \par\endgroup
+ \ifdtk@extern@inline\else\par\fi\endgroup
\fi
\fi
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-full.clo new/tex/latex/dtk/dtk-full.clo
--- old/tex/latex/dtk/dtk-full.clo 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-full.clo 2019-10-28 21:59:14.000000000 +0100
@@ -14,10 +14,10 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2019/01/31 v0.1l dtk class options for full mode (RN)]
+ [2019/10/25 v0.1n dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Die geladene Version der Dokumentenklasse `scrbook' \MessageBreak
(\KOMAScriptVersion) ist zu alt. \MessageBreak
Gefordert ist die Version 2015/09/29 oder jünger. \MessageBreak
@@ -205,14 +205,10 @@
\makeatletter
\ifdim\wd\DTK@tempbox>\z@
\scantokens{\protected@edef\x{%
- \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}%
+ \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}\@empty}%
\x
\else
- \ifDTK@korr@
- \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}%
- \else
- \sindex[autoren]{#2#1@#1 #2!\relax}%
- \fi
+ \sindex[autoren]{#2#1@#1 #2!\relax}%
\fi
\endgroup
}%
@@ -244,8 +240,7 @@
\filename@parse{#1}%
\edef\jobname{\filename@base}%
\@ifundefined{filename@ext}%
- {\IfFileExists{\jobname.tex}%
- {\edef\DTK@local@inputname{\jobname.tex}}{}}%
+ {\edef\DTK@local@inputname{\filename@base.tex}}%
{\edef\DTK@local@inputname{#1}}%
\let\AtBeginDocument=\AtEmbeddedBeginDocument
\let\AtEndDocument=\AtEmbeddedEndDocument
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-logos.sty new/tex/latex/dtk/dtk-logos.sty
--- old/tex/latex/dtk/dtk-logos.sty 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-logos.sty 2019-10-28 21:59:14.000000000 +0100
@@ -4,7 +4,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2018
+%% Copyright (C) 2019
%% Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%
%
% -------------------------------------
-\ProvidesPackage{dtk-logos}[2018/10/19 v. 1.06 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2019/10/15 v. 1.09 Dante Edition: Logos (hv)]
%
\newif\if@dtk@newengine \@dtk@newenginetrue
\RequirePackage{ifluatex,ifxetex}
@@ -52,13 +52,23 @@
}%
\endgroup
}
+
+
\def\LaTeXTeX{\hologo{(La)TeX}}
+
+\def\AmS{\textsf{AMS}}
+\let\AMS\AmS
+%{\ifluatex\mathversion{XITS}\fi%
+% $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}% $
+\def\amsmath{\AMS\textsf{math}}
\def\AmSLaTeX{\mbox{\textsf{AMS}-\hologo{LaTeX}}}
\def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
\def\biber{\hologo{biber}}
\def\Biber{\Hologo{biber}}
-\def\BibTeX{\hologo{BibTeX}}
-\def\BibTeXacht{\hologo{BibTeX8}}
+\def\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX}
+\def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
+\def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
+\def\@@BibTeX8{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
\def\ConTeXt{\hologo{ConTeXt}}
\let\context\ConTeXt
\def\emTeX{\hologo{emTeX}}
@@ -108,8 +118,6 @@
\def\XeLaTeX{\hologo{XeLaTeX}}
\def\XeTeX{\hologo{XeTeX}}
%%
-\def\AmS{{\ifluatex\mathversion{XITS}\fi%
- $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}% $
%
\newcommand\BibTool{\textsc{Bib\hskip-.1em
T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
@@ -127,6 +135,7 @@
\providecommand\TUGboat{\textsl{TUGboat}}
\let\DANTE\dantelogo
\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
+\def\pgftikz{\textsf{pgf/Ti\textit{k}Z}}
\def\TeXLive{\TeX{}Live\xspace}
\def\BibLaTeX{Bib\hologo{LaTeX}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-new-engines.clo new/tex/latex/dtk/dtk-new-engines.clo
--- old/tex/latex/dtk/dtk-new-engines.clo 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-new-engines.clo 2019-10-20 23:02:00.000000000 +0200
@@ -18,7 +18,7 @@
\typeout{NEW-ENGINE}
-\RequirePackage{fontspec}
+\RequirePackage[no-math]{fontspec}
\RequirePackage{unicode-math}
\ifluatex
@@ -41,13 +41,22 @@
* File `dtk-fonts.cfg' used.^^J%
*************************************}%
}{%
+ \typeout{*************************************^^J%
+ * Using libertinus-otf *^^J%
+ *************************************}%
\RequirePackage{libertinus-otf}%
\def\DTKrmFontName{Libertinus Serif}%
\def\DTKsfFontName{Libertinus Sans Serif}%
% \setmathfont{XITSMath}[Scale=0.9,math-style=TeX,bold-style=TeX]%
\def\DTKmathFontName{Libertinus Math}%
- \setmonofont{AnonymousPro}[Scale=MatchLowercase,FakeStretch=0.87,
- RawFeature=-tlig]%
+ \setmonofont{AnonymousPro}[
+ Scale = MatchLowercase,FakeStretch=0.87,
+ RawFeature = -tlig,
+ UprightFont =*-Regular,
+ BoldFont = *-Bold,
+ BoldItalicFont = *-BoldItalic,
+ ItalicFont = *-Italic,
+ Extension = .ttf]%
\def\DTKttFontName{Anonymous Pro}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-url.sty new/tex/latex/dtk/dtk-url.sty
--- old/tex/latex/dtk/dtk-url.sty 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-url.sty 2019-12-04 23:22:32.000000000 +0100
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-2019
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,17 +14,19 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2016/04/23 v1.2 Urls for DTK (HO,hv)]
-%% 1.1 hv
+\ProvidesPackage{dtk-url}[2019/12/04 v1.5 Urls (qrcode) for DTK (HO,hv,rn)]
\RequirePackage{url}[2006/04/12]
+\RequirePackage{xcolor}
+\RequirePackage{xkeyval}
+\RequirePackage{hvqrurl}
% Konfiguration:
\newcommand*{\DTK@UrlSetup}{\urlstyle{tt}}
\newcommand*{\DTK@UrlCtanSetup}{}
\newcommand*{\DTK@UrlEmailSetup}{}
\newcommand*{\DTK@UrlCtanPrefix}{CTAN:}
-\newcommand*{\DTK@UrlCtanServerPrefix}{http://mirror.ctan.org/}
+\newcommand*{\DTK@UrlCtanServerPrefix}{https://mirror.ctan.org/}
\newcommand*{\DTK@UrlFile}{\jobname.urls}
% Schalter \ifDTK@Url@ legt fest, wann die URLs aktiv sein sollen
@@ -180,4 +182,5 @@
{\@percentchar#1}%
}%
}
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk.bbx new/tex/latex/dtk/dtk.bbx
--- old/tex/latex/dtk/dtk.bbx 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk.bbx 2019-08-09 23:03:53.000000000 +0200
@@ -180,6 +180,51 @@
\usebibmacro{finentry}}
%
+\DeclareBibliographyDriver{book}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator+others}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title}%
+ \newunit
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ \newunit
+ \printfield{volumes}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{publisher+location+date}%
+ \newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}%
+}
+
+
+
+
+
%\setlength\labelnumberwidth{1.5em}
%\setlength\biblabelsep{1em}
\defbibenvironment{dtk@bib}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk.cls new/tex/latex/dtk/dtk.cls
--- old/tex/latex/dtk/dtk.cls 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk.cls 2019-12-04 23:22:32.000000000 +0100
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-2019
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -28,11 +28,17 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.08a}
-\def\DTKversiondate{2019/01/31}
+\def\DTKversion{2.08g}
+\def\DTKversiondate{2019/12/04}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
-\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
+\@ifpackagelater{iftex}{2019/10/24}{%
+ \RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex}
+}{%
+ \RequirePackage{iftex}
+}
+\RequirePackage{luatex85}
+
\newcommand*\DTK@engine{}
\ifluatex
@@ -155,6 +161,9 @@
\widowpenalty = 10000 %
\raggedbottom
+\setlength\textfloatsep{10.0pt plus 1pt minus 1pt}
+\setlength\intextsep{6.0pt plus .5pt minus .5pt}
+
\setcounter{secnumdepth}{\numexpr\partnumdepth-1\relax}
\setcounter{tocdepth}{\chapternumdepth}
@@ -166,13 +175,13 @@
\RequirePackage[english,main=ngerman]{babel}
\defineshorthand{"|}{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Shorthand `\string"|' wird nicht unterstützt! Entferne `\string"|'%
}{}%
}
\newcommand*\DTK@FontNameMissing{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Eines der Makros `\string\DTKrmFontName', `\string\DTKsfFontName',
\MessageBreak
`\string\DTKttFontName' oder `\string\DTKmathFontName'
@@ -368,13 +377,13 @@
\@ifundefined{ifDTKrecord}{\newif\ifDTKrecord \DTKrecordfalse}{}
\newcommand*\address[3]{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro \string\address\space existiert nicht mehr!\MessageBreak
Nimm stattdessen \string\Author%
\string{Vorn.\string}\string{Nachn.\string}\string{Adr.\string}}{}%
}%
\def\author#1{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro \string\author\space existiert nicht mehr!\MessageBreak
Nimm stattdessen \string\Author%
\string{Vorn.\string}\string{Nachn.\string}\string{Adr.\string}}{}%
@@ -404,7 +413,7 @@
\AfterEndPreamble{% "etoolbox"
\def\bibliography#1{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro `\string\bibliography' wird nicht unterstützt!\MessageBreak
Verwende stattdessen `\string\addbibresource\string{#1.bib\string}'
\MessageBreak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtk.tlpobj new/tlpkg/tlpobj/dtk.tlpobj
--- old/tlpkg/tlpobj/dtk.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dtk.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,6 +1,6 @@
name dtk
category Package
-revision 50789
+revision 54080
shortdesc Document class for the journal of DANTE
relocated 1
longdesc The bundle provides a class and style file for typesetting "Die
@@ -22,7 +22,6 @@
catalogue-contact-bugs https://github.com/rolfn/dtk/issues
catalogue-contact-repository https://github.com/rolfn/dtk
catalogue-ctan /usergrps/dante/dtk
-catalogue-date 2019-04-05 18:58:50 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics journalpub class
-catalogue-version 2.08a
+catalogue-version 2.08g
++++++ dtl.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dt2dv.man1.pdf and new/texmf-dist/doc/man/man1/dt2dv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dv2dt.man1.pdf and new/texmf-dist/doc/man/man1/dv2dt.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtl.doc.tlpobj new/tlpkg/tlpobj/dtl.doc.tlpobj
--- old/tlpkg/tlpobj/dtl.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/dtl.doc.tlpobj 2019-11-19 01:55:39.000000000 +0100
@@ -1,6 +1,6 @@
name dtl.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of dtl
docfiles size=21
texmf-dist/doc/man/man1/dt2dv.1
++++++ dtxdescribe.doc.tar.xz ++++++
Binary files old/doc/latex/dtxdescribe/dtxdescribe.pdf and new/doc/latex/dtxdescribe/dtxdescribe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxdescribe.doc.tlpobj new/tlpkg/tlpobj/dtxdescribe.doc.tlpobj
--- old/tlpkg/tlpobj/dtxdescribe.doc.tlpobj 2019-03-24 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/dtxdescribe.doc.tlpobj 2019-07-17 01:53:07.000000000 +0200
@@ -1,8 +1,8 @@
name dtxdescribe.doc
category Package
-revision 50532
+revision 51652
shortdesc doc files of dtxdescribe
relocated 1
-docfiles size=87
+docfiles size=83
RELOC/doc/latex/dtxdescribe/README.txt
RELOC/doc/latex/dtxdescribe/dtxdescribe.pdf
++++++ dtxdescribe.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtxdescribe/dtxdescribe.sty new/tex/latex/dtxdescribe/dtxdescribe.sty
--- old/tex/latex/dtxdescribe/dtxdescribe.sty 2019-03-22 21:48:45.000000000 +0100
+++ new/tex/latex/dtxdescribe/dtxdescribe.sty 2019-07-16 23:13:53.000000000 +0200
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dtxdescribe}
- [2019/03/22 v1.01 Describe additional object types in dtx source files.]
+ [2019/07/16 v1.02 Describe additional object types in source files.]
@@ -93,6 +93,15 @@
+
+\AtBeginDocument{
+ \@ifpackageloaded{makeidx}{}{
+ \@ifpackageloaded{splitidx}{}{
+ \RequirePackage{makeidx}
+ \makeindex
+ }}
+}
+
\RequirePackage{etoolbox}[2011/01/03]%
\RequirePackage{xparse}
@@ -112,55 +121,60 @@
\RequirePackage{xstring}
\AtBeginDocument{
-\pdfstringdefDisableCommands{
-\def\quad{ }
-\def\\{ }
-\def\pkg#1{#1}
-\def\ctr#1{#1}
-\def\bool#1{#1}
-\def\optn#1{#1}
-\def\env#1{#1}
-\def\cs#1{\textbackslash#1}
-\def\,{ }
-\def\LuaLaTeX{LuaLaTeX}
-\def\XeLaTeX{XeLaTeX}
-\def\TeX{TeX}
-\def\LaTeX{LaTeX}
-\def\LaTeXe{LaTeX2e}
-\def\LuaTeX{LuaTeX}
-\def\LuaLaTeX{LuaLaTeX}
-\def\XeTeX{XeTeX}
-\def\AmS{AMS}
-\def\Dash{ --- }
-\def\dash{ -- }
-\def\Slash{/}
-\def\prog#1{\detokenize{#1}}
-\def\progcode#1{#1}
-\def\filenm#1{\detokenize{#1}}
-\def\brand#1{#1}
-\def\acro#1{#1}
-\def\HTML{HTML}
-\def\ODT{ODT}
-\def\SVG{SVG}
-\def\PNG{PNG}
-\def\GIF{GIF}
-\def\JPG{JPG}
-\def\EPS{EPS}
-\def\PDF{PDF}
-\def\DVI{DVI}
-\def\UTF{UTF}
-\def\URL{URL}
-\def\element#1{#1}
-\def\attribute#1{#1}
-\def\HTML{HTML}
-\def\HTMLfive{HTML5}
-\def\CSS{CSS}
-\def\CSSthree{CSS3}
-\def\EPUB{EPUB}
-\def\TOC{TOC}
-\def\LOF{LOF}
-\def\LOT{LOT}
-}
+ \@ifpackageloaded{hyperref}{
+ \pdfstringdefDisableCommands{%
+ \def\quad{ }%
+ \def\\{ }%
+ \def\pkg#1{#1}%
+ \def\ctr#1{#1}%
+ \def\bool#1{#1}%
+ \def\optn#1{#1}%
+ \def\env#1{#1}%
+ \def\cs#1{\textbackslash#1}%
+ \def\,{ }%
+ \def\LuaLaTeX{LuaLaTeX}%
+ \def\XeLaTeX{XeLaTeX}%
+ \def\TeX{TeX}%
+ \def\LaTeX{LaTeX}%
+ \def\LaTeXe{LaTeX2e}%
+ \def\LuaTeX{LuaTeX}%
+ \def\LuaLaTeX{LuaLaTeX}%
+ \def\XeTeX{XeTeX}%
+ \def\AmS{AMS}%
+ \def\Dash{ --- }%
+ \def\dash{ -- }%
+ \def\Slash{/}%
+ \def\prog#1{\detokenize{#1}}%
+ \def\progcode#1{#1}%
+ \def\filenm#1{\detokenize{#1}}%
+ \def\brand#1{#1}%
+ \def\acro#1{#1}%
+ \def\HTML{HTML}%
+ \def\ODT{ODT}%
+ \def\SVG{SVG}%
+ \def\PNG{PNG}%
+ \def\GIF{GIF}%
+ \def\JPG{JPG}%
+ \def\EPS{EPS}%
+ \def\PDF{PDF}%
+ \def\DVI{DVI}%
+ \def\UTF{UTF}%
+ \def\URL{URL}%
+ \def\element#1{#1}%
+ \def\attribute#1{#1}%
+ \def\HTML{HTML}%
+ \def\HTMLfive{HTML5}%
+ \def\CSS{CSS}%
+ \def\CSSthree{CSS3}%
+ \def\EPUB{EPUB}%
+ \def\TOC{TOC}%
+ \def\LOF{LOF}%
+ \def\LOT{LOT}%
+ }
+ }
+ {
+ \newcommand*{\hyperpage}[1]{#1}
+ }
}
@@ -178,21 +192,88 @@
\end{picture}
}
+\@ifpackageloaded{doc}{
+ \newcommand*{\DTXD@gobble}{2}
+}{
+ \newcommand*{\DTXD@gobble}{0}
+}
+
\setlength{\marginparsep}{1em}
\setlength{\marginparpush}{.7ex}
\setlength{\parindent}{0em}
\setlength{\parskip}{2ex}
+\ifdef{\IndexMin}
+ {\setlength{\IndexMin}{40ex}}
+ {\newlength{\IndexMin}}
+
+\@ifclassloaded{ltxdoc}{}{
+ \def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
+ \def\cmd@to@cs#1#2{\char\number`#2\relax}
+ \DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+ \providecommand\marg[1]{%
+ {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
+ \providecommand\oarg[1]{%
+ {\ttfamily[}\meta{#1}{\ttfamily]}}
+ \providecommand\parg[1]{%
+ {\ttfamily(}\meta{#1}{\ttfamily)}}
+ \providecommand\url{\texttt}
+}
-\setlength{\IndexMin}{40ex}
+\AtBeginDocument{
+ \@ifpackageloaded{doc}{}{
+ \newenvironment*{macro}[1]{%
+ \PackageError{dtxdescribe}
+ {The 'macro' environment is only\MessageBreak
+ available when using the doc package\MessageBreak
+ with a .dtx source file}
+ {This environment only makes sense for .dtx source.}
+ }{}
+ \newenvironment*{environment}[1]{%
+ \PackageError{dtxdescribe}
+ {The 'environment' environment is only\MessageBreak
+ available when using the doc package\MessageBreak
+ with a .dtx source file}
+ {This environment only makes sense for .dtx source.}
+ }{}
+ \def\MacroFont{\fontencoding\encodingdefault
+ \fontfamily\ttdefault
+ \fontseries\mddefault
+ \fontshape\updefault
+ \small}%
+ \@ifundefined{actualchar}{\def\actualchar{@}}{}
+ \@ifundefined{quotechar}{\def\quotechar{"}}{}
+ \@ifundefined{levelchar}{\def\levelchar{!}}{}
+ \@ifundefined{encapchar}{\def\encapchar{|}}{}
+ \@ifundefined{verbatimchar}{\def\verbatimchar{+}}{}
+ \setlength\marginparpush{0pt} \setlength\marginparwidth{8pc}
+ \reversemarginpar
+ \DeclareRobustCommand\meta[1]{%
+ \ensuremath\langle
+ \ifmmode \expandafter \nfss@text \fi
+ {%
+ \meta@font@select
+ \edef\meta@hyphen@restore
+ {\hyphenchar\the\font\the\hyphenchar\font}%
+ \hyphenchar\font\m@ne
+ \language\l@nohyphenation
+ #1\/%
+ \meta@hyphen@restore
+ }\ensuremath\rangle
+ }
+ \def\meta@font@select{\itshape}
+ }
+}
+\providecommand*{\PrintEnvName}{}
\renewcommand*{\PrintEnvName}[1]
{\strut{\scriptsize{}Env}\quad\MacroFont#1\ }
\newcommand*{\DTXD@printtype}[1]
{\raggedleft\strut{\scriptsize\sffamily#1}\quad\MacroFont}
+\providecommand{\usage}{}
\renewcommand{\usage}[1]{\textit{\hyperpage{#1}}}
\let\DTXD@origwrindex\@wrindex
@@ -277,6 +358,7 @@
}
+\providecommand*{\DescribeMacro}{}
\renewcommand*{\DescribeMacro}[2][]{%
\@bsphack%
\@ifundefined{@captype}{% not float?
@@ -305,6 +387,7 @@
\ignorespaces%
}
+\providecommand*{\DescribeEnv}{}
\renewcommand*{\DescribeEnv}[2][]
{\DTXD@margintagindex{#1}{#2}{Env}{environment}{usage}}
@@ -371,6 +454,7 @@
\@bsphack%
\leavevmode%
\marginpar{%
+ \raggedleft%
\ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }
\texttt{#2}%
}%
@@ -395,12 +479,14 @@
}%
}%
\@esphack%
+\ignorespaces%
}
\newcommand*{\DescribeOther}[2][]{%
\@ifundefined{@captype}{% not float?
\@bsphack%
\leavevmode%
\marginpar{%
+ \raggedleft%
\ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }%
#2%
}%
@@ -417,6 +503,7 @@
\DTXD@origwrindex{#1\actualchar[#1]:\levelchar#2\encapchar usage}%
}%
\@esphack%
+\ignorespaces%
}
@@ -573,10 +660,9 @@
\newcommand*{\dtxexampleresultname}{Result:}
-
\NewDocumentEnvironment{dtxexample}{s +O{} m}
{% start dtxexample
-\VerbatimOut[gobble=2,tabsize=4]{dtxexample_cut.tex}%
+\VerbatimOut[gobble=\DTXD@gobble,tabsize=4]{dtxexample_cut.tex}%
}% start dtxexample
{% end dtxexample
\endVerbatimOut
@@ -645,11 +731,11 @@
\newcommand*{\fqqquad}{\hspace*{3em}}
\DefineVerbatimEnvironment{sourceverb}{Verbatim}
- {gobble=2,tabsize=4,xleftmargin=2em}
+ {gobble=\DTXD@gobble,tabsize=4,xleftmargin=2em}
\BeforeBeginEnvironment{sourceverb}{\vspace*{-.5\parskip}}
-\DefineVerbatimEnvironment{fsourceverb}{Verbatim}
- {gobble=2,tabsize=4,xleftmargin=2em,frame=lines}
+ \DefineVerbatimEnvironment{fsourceverb}{Verbatim}
+ {gobble=\DTXD@gobble,tabsize=4,xleftmargin=2em,frame=lines}
\BeforeBeginEnvironment{fsourceverb}{\vspace*{-.5\parskip}}
\newenvironment{sourcedisplay}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxdescribe.tlpobj new/tlpkg/tlpobj/dtxdescribe.tlpobj
--- old/tlpkg/tlpobj/dtxdescribe.tlpobj 2019-03-24 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/dtxdescribe.tlpobj 2019-07-17 01:53:07.000000000 +0200
@@ -1,13 +1,15 @@
name dtxdescribe
category Package
-revision 50532
+revision 51652
shortdesc Describe additional object types in dtx source files
relocated 1
longdesc The doc package includes tools for describing macros and
-longdesc environments in LaTeX source dtx format. The package adds
-longdesc additional tools for describing booleans, lengths, counters,
-longdesc keys, packages, classes, options, files, commands, arguments,
-longdesc and other objects. Each item is given a margin tag similar to
+longdesc environments in LaTeX source .dtx format. The dtxdescribe
+longdesc package adds additional tools for describing booleans, lengths,
+longdesc counters, keys, packages, classes, options, files, commands,
+longdesc arguments, and other objects, and also works with the standard
+longdesc document classes as well, for those who do not wish to use the
+longdesc .dtx format. Each item is given a margin tag similar to
longdesc \DescribeEnv, and is listed in the index by itself and also by
longdesc category. Each item may be sorted further by an optional class.
longdesc All index entries except code lines are hyperlinked. The
@@ -26,7 +28,7 @@
catalogue-also doc
catalogue-contact-home http://bdtechconcepts.com
catalogue-ctan /macros/latex/contrib/dtxdescribe
-catalogue-date 2019-03-22 19:35:49 +0100
+catalogue-date 2019-07-16 13:01:49 +0200
catalogue-license lppl1.3
catalogue-topics doc-supp
-catalogue-version 1.01
+catalogue-version 1.02
++++++ dtxgen.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/dtxgen/README new/texmf-dist/doc/support/dtxgen/README
--- old/texmf-dist/doc/support/dtxgen/README 2015-09-21 00:31:59.000000000 +0200
+++ new/texmf-dist/doc/support/dtxgen/README 2019-07-18 22:34:08.000000000 +0200
@@ -1,13 +1,11 @@
-|
--------:|:--------------------------------------
- script:| dtxgen - generate template for LaTeX self-extracting .dtx file
- type:| bash
- author:| Wybo Dekker
- email:| wybo@dekkerdocumenten.nl
-version:| 1.07
-license:| Released under the GNU General Public License
-
+ script: dtxgen - generate template for LaTeX self-extracting .dtx file
+ type: bash
+ author: Wybo Dekker
+ email: wybo@dekkerdocumenten.nl
+version: 1.08
+license: GNU General Public License
+--------------------------------------------------------------------------------
dtxgen creates a template for a self-extracting .dtx file, based on the model described by
-U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for
+[Joseph Wright](www.texdev.net/2009/10/06/a-model-dtx-file/). It is useful for
those who plan to create a new Documented LaTeX Source (.dtx) file.
Binary files old/texmf-dist/doc/support/dtxgen/dtxgen.pdf and new/texmf-dist/doc/support/dtxgen/dtxgen.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxgen.doc.tlpobj new/tlpkg/tlpobj/dtxgen.doc.tlpobj
--- old/tlpkg/tlpobj/dtxgen.doc.tlpobj 2019-02-28 03:33:00.000000000 +0100
+++ new/tlpkg/tlpobj/dtxgen.doc.tlpobj 2019-07-20 01:53:10.000000000 +0200
@@ -1,7 +1,7 @@
name dtxgen.doc
category Package
-revision 38419
+revision 51663
shortdesc doc files of dtxgen
-docfiles size=13
+docfiles size=15
texmf-dist/doc/support/dtxgen/README
texmf-dist/doc/support/dtxgen/dtxgen.pdf
++++++ dtxgen.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/dtxgen/dtxgen new/texmf-dist/scripts/dtxgen/dtxgen
--- old/texmf-dist/scripts/dtxgen/dtxgen 2015-09-21 00:31:59.000000000 +0200
+++ new/texmf-dist/scripts/dtxgen/dtxgen 2019-07-18 22:34:08.000000000 +0200
@@ -1,28 +1,28 @@
#!/bin/bash
-version=1.07
-myname=$(basename "$0")
+Version=1.08
+Myname="${0##*/}"
-<<'DOC'
+:<<'DOC'
= dtxgen - generate template for LaTeX self-extracting .dtx file
= Synopsis
dtxgen [options] basename.[sty,cls]
-Options:
+== Options
-h,--help print short help and exit
-H,--Help print full documentation via less and exit
-V,--version print version and exit
-s,--short short, one-liner, package description
-d,--date initial version's date. Default: current date
--m,--mail your email address. Default: $MAIL
--n,--name your name. Default: $NAME
+-m,--mail your email address. Default: |$EMAIL|
+-n,--name your name. Default: |$NAME|
-c,--class (class packs only) class to be preloaded. Default: article
-q,--quiet run quietly
= Description
dtxgen creates a template for a self-extracting .dtx file, based on the model described by
-U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for
+[Joseph Wright](www.texdev.net/2009/10/06/a-model-dtx-file/). It is useful for
those who plan to create a new Documented LaTeX Source (.dtx) file.
Usage example:
@@ -94,21 +94,20 @@
install install in the local TeX tree (uses sudo)
zip produce a zip file ready for upload to CTAN
-= Author and copyright
-Author Wybo Dekker
-Email U{Wybo@dekkerdocumenten.nl}{wybo@dekkerdocumenten.nl}
-License Released under the U{www.gnu.org/copyleft/gpl.html}{GNU General Public License}
+= Author
+[Wybo Dekker](wybo@dekkerdocumenten.nl)
+
+= Copyright
+Released under the [GNU General Public License](www.gnu.org/copyleft/gpl.html)
DOC
- die() { echo -e "$myname: $Err${*}$Nor" 1>&2; exit 1; }
- help() { sed -n '/^= Synopsis/,/^= /p' "$0"|sed '1s/.*/Usage:/;/^= /d'; exit; }
-helpall() { sed -n '/^<<.DOC.$/,/^DOC$/p' "$0"|sed -n '1d;$d;p'|less; exit; }
-version() { echo $version; exit; }
-install() { which instscript>&/dev/null && instscript --zip --pdf --markdown "$myname"; exit; }
-
-Nor='\e[0m' # reset color ]
-Err='\e[31;1m' # light red ]
-[[ ${BASH_VERSINFO[0]} -ge 4 ]] || die "Need bash version >= 4 (you have $BASH_VERSION)"
+# check executables and versions of bash and getopt
+((BASH_VERSINFO>=4)) || die "Need bash version >= 4"
+for i in getopt make; do
+ command -v "$i" &> /dev/null || die "$i: command not found"
+done
+i=$(getopt -T)
+{ (($?==4)) && [[ -z $i ]]; } || die "Your getopt is not GNU"
# using the label in arg 2, read template from my self, filter it
# through the script in arg 1, and write the output to the file in arg 3.
@@ -116,11 +115,22 @@
function createfile {
file=$3
test "$file" = "" && file=$2
- sed -n "/^<<'$2'/,/^$2/p" "$0" |tail -n +2 |head -n -1 |sed "$1" >"$file"
+ sed -n "/^:<<'$2'/,/^$2/p" "$0" |tail -n +2 |head -n -1 |sed "$1" >"$file"
}
+REd='\e[38;5;9m'
+ die() { local i; for i; do echo -e "$Myname: $REd$i"; done 1>&2; exit 1; }
+helpsrt() { sed -n '/^= Synopsis/,/^= /p' "$0"|sed '1d;$d'; exit; }
+instscr() { instscript --zip --pdf "$Myname"; exit; }
+
+# shellcheck disable=SC2154
+helpall() { sed -n "/^:<<'DOC'$/,/^DOC/p" "$0"|sed -n '1d;$d;p'|
+ less -Ps"$Myname-${Version/./·} documentation - type h for help, q to quit."
+ exit
+ }
+
if ! options=$(getopt \
- -n "$myname" \
+ -n "$Myname" \
-o s:n:m:c:d:hHVqI \
-l short:,name:,mail:,class:,date:,help,Help,version,quiet -- "$@"
); then exit 1; fi
@@ -129,13 +139,14 @@
while [ $# -gt 0 ]; do
case $1 in
(-h|--help) # print short help and exit
- help
+ helpsrt
;;
(-H|--Help) # print full documentation via less and exit
helpall
;;
(-V|--version) # print version and exit
- version
+ echo $Version
+ exit
;;
(-s|--short) # short, one-liner, package description
short=$2
@@ -145,7 +156,7 @@
date=$2
shift 2
;;
- (-m|--mail) # your email address. Default: $MAIL
+ (-m|--mail) # your email address. Default: $EMAIL
mail=$2
shift 2
;;
@@ -161,7 +172,7 @@
quiet=--quiet
shift
;;
- (-I) install
+ (-I) instscr
;;
(--) shift
break
@@ -206,7 +217,7 @@
shrt=$(sed 's/\\[[:alpha:]]\\+{\\([^}]*\\)}/\\1/g;s/\\//g' <<<"$short")
# Any \'s in the short description need to be duplicated for the script:
-short=$(sed 's/\\/\\\\/g' <<<"$short")
+short="${short//\\/\\\\}"
test -z "$mail" && die "author's email not set - use option or environment variable EMAIL"
test -z "$name" && die "author's name not set - use option or environment variable NAME"
@@ -224,20 +235,16 @@
[See]='http://www.latex-project.org/lppl.txt'
)
-readme=()
-
for i in $kopl $base Author E-mail License See; do
- readme+="$(printf "%*s:| %s°" $colw "$i" "${rm[$i]}")"
+ readme+="$(printf "%*s:| %s\\\\n" $colw "$i" "${rm[$i]}")"
done
# make sed script replacing the variables in the templates:
sedscript=''
-for i in readme base year ext mail use typ Typ name date short shrt lcl; do
- eval v="\$$i"
- test $quiet || echo "$i $v"|sed 's/\\\\/\\/g;s=°=\n=g'
- sedscript="${sedscript}s=%$i%=$v=g;"
+for i in base year ext mail use typ Typ name date short shrt lcl readme; do
+ test $quiet || eval "echo -e \"$i \$$i\""|sed 's/\\\\/\\/g'
+ eval "sedscript+=\"s=%$i%=\$$i=g;\""
done
-sedscript+='s=°=\n=g'
createfile "$sedscript" Makefile
createfile "$sedscript" DTX "$base.dtx"
@@ -245,7 +252,7 @@
exit 0
# ---- TEMPLATES: ----
-<<'Makefile'
+:<<'Makefile'
NAME = %base%
SHELL = bash
PWD = $(shell pwd)
@@ -280,7 +287,7 @@
rm $(NAME)
Makefile
-<<'DTX'
+:<<'DTX'
% \iffalse meta-comment
% vim: textwidth=75
%<*internal>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxgen.tlpobj new/tlpkg/tlpobj/dtxgen.tlpobj
--- old/tlpkg/tlpobj/dtxgen.tlpobj 2019-02-28 03:33:00.000000000 +0100
+++ new/tlpkg/tlpobj/dtxgen.tlpobj 2019-07-20 01:53:10.000000000 +0200
@@ -1,6 +1,6 @@
name dtxgen
category Package
-revision 38419
+revision 51663
shortdesc Creates a template for a self-extracting .dtx file
longdesc The bash script dtxgen creates a template for a self-extracting
longdesc .dtx file. It is useful for those who plan to create a new
@@ -9,7 +9,7 @@
runfiles size=4
texmf-dist/scripts/dtxgen/dtxgen
catalogue-ctan /support/dtxgen
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-18 06:31:32 +0200
catalogue-license gpl
catalogue-topics file-mgmt
-catalogue-version 1.07
+catalogue-version 1.08
++++++ ducksay.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ducksay/README.md new/doc/latex/ducksay/README.md
--- old/doc/latex/ducksay/README.md 2019-01-08 22:54:40.000000000 +0100
+++ new/doc/latex/ducksay/README.md 2020-02-01 23:14:47.000000000 +0100
@@ -9,7 +9,7 @@
This work is "maintained" (as per LPPL maintenance status) by
Jonathan P. Spratte.
-Copyright (C) 2017-2019 by Jonathan P. Spratte
+Copyright (C) 2017-2020 by Jonathan P. Spratte
The package draws ASCII art of animals saying a specified message. The following
macros are available:
Binary files old/doc/latex/ducksay/ducksay.pdf and new/doc/latex/ducksay/ducksay.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ducksay.doc.tlpobj new/tlpkg/tlpobj/ducksay.doc.tlpobj
--- old/tlpkg/tlpobj/ducksay.doc.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/ducksay.doc.tlpobj 2020-02-02 01:58:13.000000000 +0100
@@ -1,8 +1,8 @@
name ducksay.doc
category Package
-revision 49691
+revision 53631
shortdesc doc files of ducksay
relocated 1
-docfiles size=127
+docfiles size=119
RELOC/doc/latex/ducksay/README.md
RELOC/doc/latex/ducksay/ducksay.pdf
++++++ ducksay.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.animals.tex new/tex/latex/ducksay/ducksay.animals.tex
--- old/tex/latex/ducksay/ducksay.animals.tex 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.animals.tex 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -32,7 +32,9 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
-\AddAnimal{duck}%>>>
+\ProvidesFile{ducksay.animals.tex}
+ [\ducksay@date\space v\ducksay@version\space ducksay animals]
+\AddAnimal{duck}%>>=
{ \
\ __
>(' )
@@ -40,42 +42,42 @@
/(
/ `----/
\ ~=- /
- ~^~^~^~^~^~^~^}%<<<
-\AddAnimal{small-duck}%>>>
+ ~^~^~^~^~^~^~^}%=<<
+\AddAnimal{small-duck}%>>=
{ \
\
>()_
- (__)__ _}%<<<
-\AddAnimal{duck-family}%>>>
+ (__)__ _}%=<<
+\AddAnimal{duck-family}%>>=
{ \
\ __
>(' )
)/
/(
/ `----/ -()_ >()_
- __\__~=-_/__ _(__)__(__)__ _}%<<<
-\AddAnimal{cow}%>>>
+ __\__~=-_/__ _(__)__(__)__ _}%=<<
+\AddAnimal{cow}%>>=
{ \ ^__^
\ (oo)\_______
(__)\ )\/\
||----w |
- || ||}%<<<
-\AddAnimal{head-in}%>>>
+ || ||}%=<<
+\AddAnimal{head-in}%>>=
{ \
\ ^__^ /
(oo)\_______/ ________
(__)\ )=( ___|_ \____
||----w | \ \ \____ |
- || || || ||}%<<<
-\AddAnimal{sodomized}%>>>
+ || || || ||}%=<<
+\AddAnimal{sodomized}%>>=
{ \ _
\ (_)
^__^ / \
(oo)\_____/_\ \
(__)\ ) /
||----w ((
- || ||>>}%<<<
-\AddAnimal{tux}%>>>
+ || ||>>}%=<<
+\AddAnimal{tux}%>>=
{ \
\ .--.
|o_o |
@@ -83,44 +85,45 @@
// \ \
(| | )
/'\_ _/`\
- \___)=(___/}%<<<
-\AddAnimal{pig}%>>>
+ \___)=(___/}%=<<
+\AddAnimal{pig}%>>=
+ \ _//| .-~~~-.
\ _/oo } }-@
('')_ } |
`--'| { }--{ }
- //_/ /_/+%<<<
-\AddAnimal{frog}%>>>
+ //_/ /_/+%=<<
+\AddAnimal{frog}%>>=
{ \
\ (.)_(.)
_ ( _ ) _
/ \/`-----'\/ \
__\ ( ( ) ) /__
) /\ \._./ /\ (
- )_/ /|\ /|\ \_(}%<<<
-\AddAnimal{snowman}%>>>
+ )_/ /|\ /|\ \_(}%=<<
+\AddAnimal{snowman}%>>=
{ \
\_[_]_
(")
>-( : )-<
- (__:__)}%<<<
-\AddAnimal[tail-symbol=s]{hedgehog}%>>>
+ (__:__)}%=<<
+\AddAnimal[tail-symbol=s]{hedgehog}%>>=
{ s .\|//||\||.
s |/\/||/|//|/|
/. `|/\\|/||/||
- o__,_|//|/||\||'}%<<<
-\AddAnimal{kangaroo}%>>>
+ o__,_|//|/||\||'}%=<<
+\AddAnimal{kangaroo}%>>=
{ \
\ _,' ___
<__\__/ \
\_ / _\
\,\ / \\
// \\
- ,/' `\_,}%<<<
-\AddAnimal[tail-symbol=s,tail-count=3]{rabbit}%>>>
-{ s / \`\ __
- s | \ `\ /`/ \
- s \_/`\ \-"-/` /\ \
+ ,/' `\_,}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{rabbit}%>>=
+{ s
+ s / \`\ __
+ s | \ `\ /`/ \
+ \_/`\ \-"-/` /\ \
| | \ |
(d b) \_/
/ \
@@ -131,19 +134,19 @@
| \ \ / / |
\ \ \ / / /
`"`\ : /'"`
- `""`""`}%<<<
-\AddAnimal{bunny}%>>>
-{ \
- \ /
+ `""`""`}%=<<
+\AddAnimal{bunny}%>>=
+{ \
+ \ /
/\ /
( )
- .( o ).}%<<<
-\AddAnimal{small-rabbit}%>>>
+ .( o ).}%=<<
+\AddAnimal{small-rabbit}%>>=
{ \
\ _//
(')---.
- _/-_( )o}%<<<
-\AddAnimal[tail-symbol=s,tail-count=3]{dragon}%>>>
+ _/-_( )o}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{dragon}%>>=
{ s / \ //\
s |\___/| / \// \\
s /0 0 \__ / // | \ \
@@ -159,14 +162,14 @@
(( / )) .----~-.\ \-' .~ \ `. \^-.
///.----..> \ _ -~ `. ^-` ^-_
///-._ _ _ _ _ _ _}^ - - - - ~ ~-- ,.-~
- /.-~}%<<<
-\AddAnimal{dog}%>>>
+ /.-~}%=<<
+\AddAnimal{dog}%>>=
{ \ __
\ .-'\/\
"\ '------.
___/ ( .'_____
- '-----'"""'------"""""'}%<<<
-\AddAnimal{squirrel}%>>>
+ '-----'"""'------"""""'}%=<<
+\AddAnimal{squirrel}%>>=
{ \ ,;:;;,
\ , ;;;;;
.=', ;:;;:,
@@ -174,41 +177,41 @@
@=:__, \,;:;:'
_(\.= ;:;;'
`"_( _/="`
- `"'``}%<<<
-\AddAnimal{snail}%>>>
+ `"'``}%=<<
+\AddAnimal{snail}%>>=
{ \
\ .-""-.
oo ; .-. :
\\__..-: '.__.')._
- "-._.._'.__.-'_.."}%<<<
-\AddAnimal{unicorn}%>>>
-{ \
- \ /((((((\\\\
- ---====((((((((((\\\\\
- (( \\\\\\\
- ( (* _/ \\\\\\\
- \ / \ \\\\\\_ __,,__
- | | | "------"" ((\\\\
- o_| / / \ \\\\ \\\\\\\
- | ._ ( \ \\\\\\\\\\\\\\\\
- | / / / \\\\\\\ \\
- .______/\/ / / / \\\
- / __.____/ _/ ___----( /\
- / / / ________/:______,---' \ / \_
- / / \ \ \ \ \_ \
- ( < \ \ > / \ \
- \/ \\_ / / > )
- \_| / / / /
- _// _//
- /_| /_|}%<<<
-\AddAnimal[tail-count=3,tail-symbol=s]{whale}%>>>
+ "-._.._'.__.-'_.."}%=<<
+\AddAnimal{unicorn}%>>=
+{ \
+ \ /((((((\\\\
+ ---====((((((((((\\\\\
+ (( \\\\\\\
+ ( (* _/ \\\\\\\
+ \ / \ \\\\\\_ __,,__
+ | | | "-----"" ((\\\\
+ o_| / / \ \\\\ \\\\\\\
+ | ._ ( \ \\\\\\\\\\\\\\\\
+ | / / / \\\\\\\ \\
+ .______/\/ / / / \\\
+ / __.____/ _/ _( /\
+ / / / ________/:_ ___,,--' \ / \_
+ / / \ \ """"""" \ \ \_ \
+ ( < \ \ > / \ \
+ \/ \\_ / / > )
+ \_| / / / /
+ _// _//
+ /_| /_|}%=<<
+\AddAnimal[tail-count=3,tail-symbol=s]{whale}%>>=
{ s |-.
s .-""-._ \ \.--|
s / `-..__) ,-'
| . /
\--.__, .__.,'
- `-.___'._\_.'}%<<<
-\AddAnimal[tail-count=3]{yoda}%>>>
+ `-.___'._\_.'}%=<<
+\AddAnimal[tail-count=3]{yoda}%>>=
{ \
\ ____
\ _.' : `._
@@ -244,8 +247,8 @@
\ / .-" /. .'.' ;_:' ;
:-""-.`./-.' / `.___.'
\ `t ._ /
- "-.t-._:'}%<<<
-\AddAnimal[tail-count=3]{yoda-head}%>>>
+ "-.t-._:'}%=<<
+\AddAnimal[tail-count=3]{yoda-head}%>>=
{ \
\ ____
\ _.' : `._
@@ -261,16 +264,16 @@
.-j/'.; ;"""" / .'\"-.
.' /:`. : : /.".''; `.
.-" / ;`.". : ."." : "-.
- .+"-. : : ".".". ."." ;-._ \}%<<<
-\AddAnimal{small-yoda}%>>>
+ .+"-. : : ".".". ."." ;-._ \}%=<<
+\AddAnimal{small-yoda}%>>=
{ \
\
__.-._
'-._"7'
/'.-c
| /T
- _)_/LI}%<<<
-\AddAnimal{r2d2}%>>>
+ _)_/LI}%=<<
+\AddAnimal{r2d2}%>>=
{ \
\ ,-----.
,'_/_|_\_`.
@@ -283,8 +286,8 @@
| |_________| |
| |\_______/| |
/ \ / \ / \
- `---' `---' `---'}%<<<
-\AddAnimal{vader}%>>>
+ `---' `---' `---'}%=<<
+\AddAnimal{vader}%>>=
{ \ _.-'~~~~~~`-._
\ / || \
/ || \
@@ -298,15 +301,15 @@
/ \ /||||||\ / \
/_ \O========O/ _\
`--...__|`-._ _.-'|__...--'
- | `' |}%<<<
-\AddAnimal[tail-symbol=|,tail-count=1]{crusader}%>>>
+ | `' |}%=<<
+\AddAnimal[tail-symbol=|,tail-count=1]{crusader}%>>=
{ |
\[T]/}
\csname bool_if:cT\endcsname {l_ducksay_version_one_bool}
{\AnimalOptions{crusader}{tail-1=|,rel-align=c}}
\csname bool_if:cT\endcsname {l_ducksay_version_two_bool}
- {\AnimalOptions{crusader}{tail-1=|,body-align=c}}%<<<
-\AddAnimal[tail-count=3]{knight}%>>>
+ {\AnimalOptions{crusader}{tail-1=|,body-align=c}}%=<<
+\AddAnimal[tail-count=3]{knight}%>>=
{ \
\ ,-"""-.
\ | === |
@@ -327,7 +330,89 @@
\\ \ | /
\\ /V|V\
\|/ | \
- '--' `--`}%<<<
+ '--' `--`}%=<<
+\AddAnimal{ghost}%>>=
+{ \
+ \ .-.
+ (o o)
+ | O \
+ \ \
+ `~~~'}%=<<
+\AddAnimal{fairy}%>>=
+{ \
+ \ .oOOb
+ .. .oO O
+ '::; d O
+ ;;;;d ..oO
+ * ::O;;;'OooO
+~"\. dp'(O.o.
+ \op 'oOb
+ obU
+ dop
+ dop
+ PO
+ O 'b
+ l P.
+ / ;
+ '}%=<<
+\AddAnimal[tail-symbol=s]{only-tail}%>>=
+{ s
+ s}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{only-tail3}%>>=
+{ s
+ s
+ s}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{snake}
+{ s
+ s /^\/^\
+ s _|__| O |
+ /' \_/ \
+ \/ |_________/ \ \
+ \_/ \_______ \ \
+ `| | |\
+ / / _---_ | |
+ / / / __ "-_ ," |
+ | "--" / "-_ "--" ,"
+ "-_____-" "-___-"}
+\AddAnimal{cat}
++ \
+ \ _ ___ .--.
+ \`.|\..----...-'` `-._.-' .-'
+ / ' ` , __.-'
+ )/' _/ \ `-_, /
+ `-'" `"\_ ,_.-;_.-\_ ',
+ _.-'_./ {_.' ; /
+ {_.-``-' {_/+
+\AddAnimal{sleepy-cat}
+{ \
+ \ |\ _,,,---,,_ _._
+ /,`.-'`' -. )'._,'.-,)
+ |,4- ) )-,_. ,\ ( `-.-'
+ '---''(_/--' `-'\_)}
+\AddAnimal{schroedinger-dead}
+{ \
+ \ _.--"""--._
+ | |
+ | -|- |
+ | | |
+ | |
+ | Felix |
+ __|___________|__ _
+ o . . .
+ ~ . o o
+ . ~ .}
+\AddAnimal{schroedinger-alive}
+{ \
+ \ ,_ _
+ |\\__,'/
+ / _ _ | ,--.
+ ( @ @ ) / ,-'
+ \ _T_/-._( (
+ / `. \
+ | _ \ |
+ \ \ , / |
+ || |-_\__ /
+ ((_/`(____,-'}
%%
%%
%% End of file `ducksay.animals.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.code.v1.tex new/tex/latex/ducksay/ducksay.code.v1.tex
--- old/tex/latex/ducksay/ducksay.code.v1.tex 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.code.v1.tex 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -32,6 +32,8 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
+\ProvidesFile{ducksay.code.v1.tex}
+ [\ducksay@date\space v\ducksay@version\space ducksay code version 1]
\cs_new:Npn \ducksay_longest_line:n #1
{
\int_incr:N \l_ducksay_msg_height_int
@@ -131,8 +133,7 @@
\int_set:Nn \l_ducksay_msg_width_int { -\c_max_int }
\int_set:Nn \l_ducksay_msg_height_int { -\c_max_int }
\keys_set:nn { ducksay } { #1 }
- \tl_if_empty:NT \l_ducksay_animal_tl
- { \keys_set:nn { ducksay } { default_animal } }
+ \ducksay_default_or_random_animal:
\ducksay_print:nV { #2 } \l_ducksay_rel_align_tl
\group_end:
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.code.v2.tex new/tex/latex/ducksay/ducksay.code.v2.tex
--- old/tex/latex/ducksay/ducksay.code.v2.tex 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.code.v2.tex 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -32,6 +32,8 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
+\ProvidesFile{ducksay.code.v2.tex}
+ [\ducksay@date\space v\ducksay@version\space ducksay code version 2]
\RequirePackage{array,grabbox}
\msg_new:nnn { ducksay } { justify~unavailable }
{
@@ -50,6 +52,7 @@
\bool_new:N \l_ducksay_eat_arg_box_bool
\bool_new:N \l_ducksay_eat_arg_tab_verb_bool
\bool_new:N \l_ducksay_mirrored_body_bool
+\bool_new:N \l_ducksay_msg_eq_body_width_bool
\coffin_new:N \l_ducksay_body_coffin
\coffin_new:N \l_ducksay_bubble_close_coffin
\coffin_new:N \l_ducksay_bubble_open_coffin
@@ -77,6 +80,7 @@
,wd* .dim_set:N = \l_ducksay_msg_width_dim
,wd* .initial:n = -\c_max_dim
,wd* .value_required:n = true
+ ,wd-eq-body .bool_set:N = \l_ducksay_msg_eq_body_width_bool
,none .bool_set:N = \l_ducksay_no_body_bool
,no-bubble .bool_set:N = \l_ducksay_no_bubble_bool
,body-mirrored .bool_set:N = \l_ducksay_mirrored_body_bool
@@ -91,7 +95,9 @@
,body-align / l .meta:n = { body-to-msg = l , msg-to-body = l }
,body-align / c .meta:n = { body-to-msg = hc , msg-to-body = hc }
,body-align / r .meta:n = { body-to-msg = r , msg-to-body = r }
- ,body-align .initial:n = l
+ ,body-align .initial:n = l
+ ,body-bigger .int_set:N = \l_ducksay_body_bigger_int
+ ,body-bigger .initial:n = \c_zero_int
,msg-align .choice:
,msg-align / l .code:n = { \tl_set:Nn \l_ducksay_msg_align_tl { l } }
,msg-align / c .code:n = { \tl_set:Nn \l_ducksay_msg_align_tl { c } }
@@ -200,7 +206,7 @@
}
\cs_new:Npn \ducksay_calculate_msg_width_from_int:
{
- \hbox_set:Nn \l_ducksay_tmpa_box { \l_ducksay_msg_fount_tl M }
+ \hbox_set:Nn \l_ducksay_tmpa_box { { \l_ducksay_msg_fount_tl M } }
\dim_set:Nn \l_ducksay_msg_width_dim
{ \l_ducksay_msg_width_int \box_wd:N \l_ducksay_tmpa_box }
}
@@ -217,64 +223,79 @@
{
\end { tabular }
}
+\cs_new:Npn \ducksay_width_case_none_int_dim:nnn #1 #2 #3
+ {
+ \dim_compare:nNnTF { \l_ducksay_msg_width_dim } < { \c_zero_dim }
+ {
+ \int_compare:nNnTF { \l_ducksay_msg_width_int } < { \c_zero_int }
+ { #1 }
+ { #2 }
+ }
+ { #3 }
+ }
\cs_new:Npn \ducksay_digest_options:n #1
{
\group_begin:
\keys_set:nn { ducksay } { #1 }
- \tl_if_empty:NT \l_ducksay_animal_tl
- { \keys_set:nn { ducksay } { default_animal } }
- \bool_if:NTF \l_ducksay_eat_arg_box_bool
+ \ducksay_default_or_random_animal:
+ \bool_if:NF \l_ducksay_no_body_bool
{
- \dim_compare:nNnTF { \l_ducksay_msg_width_dim } < { \c_zero_dim }
+ \hcoffin_set:Nn \l_ducksay_body_coffin
{
- \int_compare:nNnTF { \l_ducksay_msg_width_int } < { \c_zero_int }
- {
- \cs_set_eq:NN
- \ducksay_eat_argument:w \ducksay_eat_argument_hbox:w
- }
+ \frenchspacing
+ \l_ducksay_body_fount_tl
+ \begin{tabular} { @{} l @{} }
+ \l_ducksay_animal_tl
+ \ducksay_make_body_bigger:
+ \relax
+ \end{tabular}
+ }
+ \bool_if:NT \l_ducksay_msg_eq_body_width_bool
+ {
+ \bool_lazy_and:nnT
+ { \int_compare_p:nNn \l_ducksay_msg_width_int < \c_zero_int }
+ { \dim_compare_p:nNn \l_ducksay_msg_width_dim < \c_zero_dim }
{
- \cs_set_eq:NN
- \ducksay_eat_argument:w \ducksay_eat_argument_vbox:w
- \ducksay_calculate_msg_width_from_int:
+ \dim_set:Nn \l_ducksay_msg_width_dim
+ { \coffin_wd:N \l_ducksay_body_coffin }
}
}
+ }
+ \bool_if:NTF \l_ducksay_eat_arg_box_bool
+ {
+ \ducksay_width_case_none_int_dim:nnn
+ { \ducksay_eat_argument_hbox:w }
{
- \cs_set_eq:NN \ducksay_eat_argument:w \ducksay_eat_argument_vbox:w
+ \ducksay_calculate_msg_width_from_int:
+ \ducksay_eat_argument_vbox:w
}
+ { \ducksay_eat_argument_vbox:w }
}
{
- \dim_compare:nNnTF { \l_ducksay_msg_width_dim } < { \c_zero_dim }
+ \ducksay_width_case_none_int_dim:nnn
{
- \int_compare:nNnTF { \l_ducksay_msg_width_int } < { \c_zero_int }
+ \tl_if_empty:NT \l_ducksay_msg_tabular_column_tl
{
- \tl_if_empty:NT \l_ducksay_msg_tabular_column_tl
+ \str_case:Vn \l_ducksay_msg_align_tl
{
- \str_case:Vn \l_ducksay_msg_align_tl
+ { l } { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l } }
+ { c } { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { c } }
+ { r } { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { r } }
+ { j }
{
- { l }
- { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l } }
- { c }
- { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { c } }
- { r }
- { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { r } }
- { j } {
- \msg_error:nn { ducksay } { justify~unavailable }
- \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l }
- }
+ \msg_error:nn { ducksay } { justify~unavailable }
+ \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l }
}
}
}
- {
- \ducksay_calculate_msg_width_from_int:
- \ducksay_evaluate_message_alignment_fixed_width_tabular:
- }
}
{
+ \ducksay_calculate_msg_width_from_int:
\ducksay_evaluate_message_alignment_fixed_width_tabular:
}
- \cs_set_eq:NN \ducksay_eat_argument:w \ducksay_eat_argument_tabular:w
+ { \ducksay_evaluate_message_alignment_fixed_width_tabular: }
+ \ducksay_eat_argument_tabular:w
}
- \ducksay_eat_argument:w
}
\cs_new:Npn \ducksay_set_bubble_top_kern:
{
@@ -294,6 +315,15 @@
\dim_set:Nn \l_ducksay_bubble_bottom_kern_dim
{ \dim_eval:n { \l_ducksay_bubble_bottom_kern_tl } }
}
+\cs_new:Npn \ducksay_make_body_bigger:
+ {
+ \int_step_function:nN \l_ducksay_body_bigger_int
+ \ducksay_make_body_bigger_aux:n
+ }
+\cs_new:Npn \ducksay_make_body_bigger_aux:n #1
+ {
+ \\
+ }
\cs_new_protected:Npn \ducksay_shipout:
{
\hcoffin_set:Nn \l_ducksay_msg_coffin { \box_use:N \l_ducksay_msg_box }
@@ -411,14 +441,6 @@
}
\bool_if:NF \l_ducksay_no_body_bool
{
- \hcoffin_set:Nn \l_ducksay_body_coffin
- {
- \frenchspacing
- \l_ducksay_body_fount_tl
- \begin{tabular} { @{} l @{} }
- \l_ducksay_animal_tl
- \end{tabular}
- }
\bool_if:NT \l_ducksay_mirrored_body_bool
{
\coffin_scale:Nnn \l_ducksay_body_coffin
@@ -464,10 +486,10 @@
\ducksay_eat_argument_tabular_inner:w
{
\group_begin:
- \tex_everyeof:D { \exp_not:N }
+ \__ducksay_everyeof:w { \exp_not:N }
\exp_after:wN
\group_end:
- \tex_scantokens:D { #1 }
+ \__ducksay_scantokens:w { #1 }
}
}
\NewDocumentCommand \ducksay_eat_argument_tabular_normal:w { +m }
@@ -475,26 +497,24 @@
\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox:w
{
\bool_if:NTF \l_ducksay_msg_strip_spaces_bool
- { \grabbox }
- { \grabbox* }
- \l_ducksay_msg_box [ \l_ducksay_msg_fount_tl ] \hbox \ducksay_shipout:
+ { \@grabbox }
+ { \@grabbox* }
+ {} \l_ducksay_msg_box \l_ducksay_msg_fount_tl \hbox {} \ducksay_shipout:
}
\cs_new_protected_nopar:Npn \ducksay_eat_argument_vbox:w
{
\ducksay_evaluate_message_alignment_fixed_width_vbox:
\bool_if:NTF \l_ducksay_msg_strip_spaces_bool
- { \grabbox }
- { \grabbox* }
- [
+ { \@grabbox }
+ { \@grabbox* }
+ {
\hsize \l_ducksay_msg_width_dim
\linewidth \hsize
- \l_ducksay_msg_fount_tl
\l_ducksay_msg_align_vbox_tl
\@afterindentfalse
\@afterheading
- ]
- \l_ducksay_msg_box
- \vbox \ducksay_shipout:
+ }
+ \l_ducksay_msg_box \l_ducksay_msg_fount_tl \vbox {} \ducksay_shipout:
}
\cs_generate_variant:Nn \coffin_join:NnnNnnnn { NVnNVnnn }
\cs_generate_variant:Nn \coffin_attach:NnnNnnnn { NVnNVnnn }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.sty new/tex/latex/ducksay/ducksay.sty
--- old/tex/latex/ducksay/ducksay.sty 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.sty 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -35,8 +35,8 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay@version{2.3}
-\def\ducksay@date{2019-01-13}
+\def\ducksay@version{2.5}
+\def\ducksay@date{2020-02-01}
\ProvidesExplPackage
{ducksay} {\ducksay@date}
@@ -46,6 +46,7 @@
\int_new:N \l_ducksay_msg_height_int
\int_new:N \l_ducksay_tail_symbol_count_int
\seq_new:N \l_ducksay_msg_lines_seq
+\seq_new:N \l_ducksay_defined_animals_seq
\tl_new:N \l_ducksay_align_tl
\tl_new:N \l_ducksay_msg_align_tl
\tl_new:N \l_ducksay_animal_tl
@@ -57,6 +58,7 @@
\tl_new:N \l_ducksay_tail_symbol_in_tl
\bool_new:N \l_ducksay_version_one_bool
\bool_new:N \l_ducksay_version_two_bool
+\bool_new:N \l_ducksay_random_animal_bool
\box_new:N \l_ducksay_tmpa_box
\regex_const:Nn \c_ducksay_textcolor_regex
{ \cO(?:\\textcolor\{(.*?)\}\{(.*?)\}) }
@@ -66,8 +68,6 @@
{ \cO(?:\\color\{(.*?)\}) }
\msg_new:nnn { ducksay } { load-time-only }
{ The~`#1`~key~is~to~be~used~only~during~package~load~time. }
-\msg_new:nnn { ducksay } { deprecated-key }
- { The~`\l_keys_key_tl`~key~is~deprecated.~Sorry~for~the~inconvenience. }
\keys_define:nn { ducksay }
{
,bubble .tl_set:N = \l_ducksay_bubble_tl
@@ -97,11 +97,19 @@
,tail-2 .initial:x = \c_backslash_str
,no-tail .meta:n = { tail-1 = { ~ }, tail-2 = { ~ } }
,think .meta:n = { tail-1 = { O }, tail-2 = { o } }
+ ,random .bool_set:N = \l_ducksay_random_animal_bool
,say .code:n =
{
\exp_args:Nx \DucksayOptions
{ tail-1 = { \c_backslash_str }, tail-2 = { \c_backslash_str } }
}
+ ,schroedinger .code:n =
+ {
+ \int_compare:nNnTF { \int_rand:n { 2 } } = \c_one_int
+ { \keys_set:nn { ducksay } { animal = schroedinger-dead } }
+ { \keys_set:nn { ducksay } { animal = schroedinger-alive } }
+ }
+ ,schroedinger .value_forbidden:n = true
,version .choice:
,version / 1 .code:n =
{
@@ -114,7 +122,6 @@
\bool_set_true:N \l_ducksay_version_two_bool
}
,version .initial:n = 2
- ,add-think .code:n = \msg_error:nn { ducksay } { deprecated-key }
}
\ProcessKeysOptions { ducksay }
\keys_define:nn { ducksay }
@@ -131,6 +138,9 @@
}
\cs_generate_variant:Nn \tl_replace_once:Nnn { NVn }
\cs_generate_variant:Nn \tl_replace_all:Nnn { NVn }
+\cs_generate_variant:Nn \keys_set:nn { nx }
+\cs_set_eq:NN \__ducksay_everyeof:w \tex_everyeof:D
+\cs_set_eq:NN \__ducksay_scantokens:w \tex_scantokens:D
\cs_new_protected:Npx \ducksay_replace_verb_newline:Nn #1 #2
{
\tl_replace_all:Nnn #1 { \char_generate:nn { 13 } { 12 } } { #2 }
@@ -191,18 +201,31 @@
#2 .code:n =
{
\exp_not:n { \tl_set_eq:NN \l_ducksay_animal_tl }
- \exp_after:wN \exp_not:N \cs:w l_ducksay_animal_#2_tl \cs_end:
+ \exp_not:c { l_ducksay_animal_#2_tl }
\exp_not:n { \exp_args:NV \DucksayOptions }
- \exp_after:wN
- \exp_not:N \cs:w l_ducksay_animal_#2_options_tl \cs_end:
+ \exp_not:c { l_ducksay_animal_#2_options_tl }
}
}
\tl_if_exist:cF { l_ducksay_animal_#2_options_tl }
{ \tl_new:c { l_ducksay_animal_#2_options_tl } }
\IfBooleanT { #4 }
{ \keys_define:nn { ducksay } { default_animal .meta:n = { #2 } } }
+ \seq_if_in:NnF \l_ducksay_defined_animals_seq { #2 }
+ { \seq_push:Nn \l_ducksay_defined_animals_seq { #2 } }
}
\cs_generate_variant:Nn \ducksay_add_animal_inner:nnnn { nnVn }
+\cs_new_protected:Npn \ducksay_default_or_random_animal:
+ {
+ \tl_if_empty:NT \l_ducksay_animal_tl
+ {
+ \bool_if:NTF \l_ducksay_random_animal_bool
+ {
+ \keys_set:nx { ducksay }
+ { \seq_rand_item:N \l_ducksay_defined_animals_seq }
+ }
+ { \keys_set:nn { ducksay } { default_animal } }
+ }
+ }
\NewDocumentCommand \DefaultAnimal { m }
{
\keys_define:nn { ducksay } { default_animal .meta:n = { #1 } }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ducksay.tlpobj new/tlpkg/tlpobj/ducksay.tlpobj
--- old/tlpkg/tlpobj/ducksay.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/ducksay.tlpobj 2020-02-02 01:58:13.000000000 +0100
@@ -1,6 +1,6 @@
name ducksay
category Package
-revision 49691
+revision 53631
shortdesc Draw ASCII art of animals saying a specified message
relocated 1
longdesc The package draws ASCII art of animals saying a specified
@@ -16,7 +16,6 @@
catalogue-contact-bugs https://github.com/Skillmon/ltx_ducksay/issues
catalogue-contact-repository https://github.com/Skillmon/ltx_ducksay
catalogue-ctan /macros/latex/contrib/ducksay
-catalogue-date 2019-01-13 14:34:53 +0100
catalogue-license lppl1.3c
catalogue-topics games graphics
-catalogue-version 2.3
+catalogue-version 2.5
++++++ duckuments.doc.tar.xz ++++++
Binary files old/doc/latex/duckuments/duckuments.pdf and new/doc/latex/duckuments/duckuments.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/duckuments.doc.tlpobj new/tlpkg/tlpobj/duckuments.doc.tlpobj
--- old/tlpkg/tlpobj/duckuments.doc.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/duckuments.doc.tlpobj 2019-10-04 01:54:00.000000000 +0200
@@ -1,9 +1,9 @@
name duckuments.doc
category Package
-revision 49936
+revision 52271
shortdesc doc files of duckuments
relocated 1
-docfiles size=130
+docfiles size=124
RELOC/doc/latex/duckuments/README.md
RELOC/doc/latex/duckuments/duckuments.pdf
RELOC/doc/latex/duckuments/example-image-duck-portrait.tex
++++++ duckuments.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/duckuments/duckuments.sty new/tex/latex/duckuments/duckuments.sty
--- old/tex/latex/duckuments/duckuments.sty 2019-02-04 22:36:40.000000000 +0100
+++ new/tex/latex/duckuments/duckuments.sty 2019-10-03 23:08:57.000000000 +0200
@@ -31,37 +31,15 @@
%% example-image-duck.tex and
%% example-image-duck-portrait.tex
%%
-\RequirePackage{xparse,letltxmacro,l3keys2e}
-\def\duckuments@version{0.4c}
-\def\duckuments@date{2019/02/03}
+\RequirePackage{xparse}[2019-05-03]
+\RequirePackage{letltxmacro,l3keys2e}
+\def\duckuments@version{0.5}
+\def\duckuments@date{2019-10-03}
\ProvidesExplPackage
{duckuments} {\duckuments@date}
{\duckuments@version} {minimal working duckuments}
-\bool_if:nF
- {
- \sys_if_engine_luatex_p:
- || \sys_if_engine_pdftex_p:
- || \sys_if_engine_xetex_p:
- }
- {%>>>
- \msg_new:nnnn { duckuments } { incompatible }
- {
- The~duckuments~package~is~currently~only~compatible~with~pdfTeX,~
- LuaTeX,~and~XeTeX!
- }
- {
- \ ~_____________________________\\
- \ (Quack!~Sorry~for~that.~Quack!)\\
- \ ~"""""""""""""""""""""""""""""\\
- \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ \ ~\ ~\ ~\ ~\string\ \\
- \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ \ ~\ ~\ ~\ ~\ ~>()_\\
- \ \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ \ ~\ ~\ ~\ ~\ ~\ ~(__)__
- }
- \msg_error:nn { duckuments } { incompatible }
- \endinput
- }%<<<
\file_if_exist:nF { example-image-duck.pdf }
- {%>>>
+ {%>>=
\str_if_eq:VnF \c_sys_jobname_str { example-image-duck }
{
\msg_new:nnnn { duckuments } { missing~file }
@@ -81,9 +59,9 @@
in~the~current~working~directory.
}
}
- }%<<<
+ }%=<<
\file_if_exist:nF { example-image-duck-portrait.pdf }
- {%>>>
+ {%>>=
\str_if_eq:VnF \c_sys_jobname_str { example-image-duck-portrait }
{
\msg_if_exist:nnF { duckuments } { missing~file }
@@ -106,7 +84,7 @@
in~the~current~working~directory.
}
}
- }%<<<
+ }%=<<
\newcommand*\duckuments@randoms{128}
\bool_new:N \l_duckuments_immediate_bool
\bool_new:N \l_duckuments_toc_bool
@@ -115,46 +93,98 @@
\bool_new:N \l_duckuments_blindduck_pars_bool
\seq_new:N \l_duckuments_range_seq
\int_new:N \g_duckuments_blindduck_start_int
-\int_gset:Nn \g_duckuments_blindduck_start_int { \c_one }
+\int_gset:Nn \g_duckuments_blindduck_start_int { \c_one_int }
\int_new:N \g_duckuments_blindduck_end_int
\regex_const:Nn \c_duckuments_example_regex
{
- example-image-duck
+ example-image-duck
|example-image-duck.pdf
|example-image-duck-portrait
|example-image-duck-portrait.pdf
}
\regex_const:Nn \c_duckuments_range_regex { (\d+|\d+-|-\d+|\d+-\d+|-) }
-\int_const:Nn \c_duckuments_blindduck_pars_int { \c_five }
+\int_const:Nn \c_duckuments_blindduck_pars_int { 5 }
+\sys_if_engine_pdftex:T
+ {
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \group_begin:
+ \pdfximage { #2 }
+ \exp_args:NNNo
+ \group_end:
+ \int_set:Nn #1 { \the \pdflastximagepages }
+ }
+ }
+\sys_if_engine_luatex:T
+ {
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \group_begin:
+ \saveimageresource { #2 }
+ \exp_args:NNNo
+ \group_end:
+ \int_set:Nn #1 { \lastsavedimageresourcepages }
+ }
+ }
+\sys_if_engine_xetex:T
+ {
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \int_set:Nn #1 { \XeTeXpdfpagecount " #2 " }
+ }
+ }
+\bool_lazy_any:nTF
+ {
+ { \sys_if_engine_luatex_p: }
+ { \sys_if_engine_pdftex_p: }
+ { \sys_if_engine_xetex_p: }
+ }
+ { \if_false: }
+ { \if_true: }
+ \group_begin:
+ \char_set_catcode_other:N \%
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \group_begin:
+ \char_set_catcode_other:N \%
+ \char_set_catcode_letter:N \:
+ \char_set_catcode_ignore:n { 32 }
+ \ior_shell_open:Nn \g_tmpa_ior { extractbb ~ -O ~ #2 }
+ \ior_map_inline:Nn \g_tmpa_ior
+ {
+ \__duckuments_set_to_pdf_page_count_aux_a:w ##1 %%Pages: \q_stop
+ }
+ \ior_close:N \g_tmpa_ior
+ \exp_args:NNNo
+ \group_end:
+ \int_set:Nn #1 { \int_use:N \l_tmpa_int }
+ }
+ \cs_new_protected:Npn \__duckuments_set_to_pdf_page_count_aux_a:w
+ #1 %%Pages: #2 \q_stop
+ {
+ \tl_if_empty:nT { #1 }
+ { \__duckuments_set_to_pdf_page_count_aux_b:w #2 \q_stop }
+ }
+ \cs_new_protected:Npn \__duckuments_set_to_pdf_page_count_aux_b:w
+ #1 %%Pages: \q_stop
+ {
+ \int_set:Nn \l_tmpa_int { #1 }
+ \ior_map_break:
+ }
+ \group_end:
+\fi:
\bool_if:nTF
{
\str_if_eq_p:Vn \c_sys_jobname_str { example-image-duck }
|| \str_if_eq_p:Vn \c_sys_jobname_str { example-image-duck-portrait }
}
- { \int_const:Nn \c_duckuments_example_pages_int { 1 } }
+ { \int_const:Nn \c_duckuments_example_pages_int { \c_one_int } }
{
\group_begin:
- \sys_if_engine_pdftex:T
- {
- \pdfximage{example-image-duck.pdf}
- \int_set:Nn \l_tmpa_int { \the\pdflastximagepages }
- \pdfximage{example-image-duck-portrait.pdf}
- \int_set:Nn \l_tmpb_int { \the\pdflastximagepages }
- }
- \sys_if_engine_luatex:T
- {
- \saveimageresource{example-image-duck.pdf}
- \int_set:Nn \l_tmpa_int { \lastsavedimageresourcepages }
- \saveimageresource{example-image-duck-portrait.pdf}
- \int_set:Nn \l_tmpb_int { \lastsavedimageresourcepages }
- }
- \sys_if_engine_xetex:T
- {
- \int_set:Nn \l_tmpa_int
- { \XeTeXpdfpagecount "example-image-duck.pdf" }
- \int_set:Nn \l_tmpb_int
- { \XeTeXpdfpagecount "example-image-duck-portrait.pdf" }
- }
+ \duckuments_set_to_pdf_page_count:Nn \l_tmpa_int
+ { example-image-duck.pdf }
+ \duckuments_set_to_pdf_page_count:Nn \l_tmpb_int
+ { example-image-duck-portrait.pdf }
\int_const:Nn \c_duckuments_example_pages_int
{ \int_min:nn { \l_tmpa_int } { \l_tmpb_int } }
\group_end:
@@ -199,7 +229,7 @@
\ \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~(__)__
}
\cs_new:Npn \duckuments_patch_see_duckumentation:
- {%>>>
+ {%>>=
\cs_set:Nn \msg_see_documentation_text:n
{
\\\\
@@ -209,10 +239,10 @@
documentation
}~for~further~information.
}
- }%<<<
+ }%=<<
\duckuments_patch_see_duckumentation:
\keys_define:nn { duckuments }
- {%>>>
+ {%>>=
,immediate .bool_set:N = \l_duckuments_immediate_bool
,immediate .default:n = true
,full .code:n =
@@ -246,20 +276,20 @@
,toc .default:n = true
,unknown .code:n =
{ \msg_error:nnx { duckuments } { option~unknown } { \l_keys_key_tl } }
- }%<<<
+ }%=<<
\ProcessKeysOptions { duckuments }
\keys_define:nn { duckuments }
- {%>>>
+ {%>>=
,toc .undefine:
,toc .bool_set:N = \l_duckuments_toc_bool
,toc .default:n = true
,unknown .code:n = \duckuments_blindduck_range_test:V \l_keys_key_tl
- }%<<<
+ }%=<<
\bool_if:NTF \l_duckuments_immediate_bool
{ \AtEndOfPackage { \duckuments_patch_includegraphics: } }
{ \AtBeginDocument { \duckuments_patch_includegraphics: } }
\NewDocumentCommand \duckument { O{} }
- {%>>>
+ {%>>=
\group_begin:
\keys_set:nn { duckuments } { #1 }
\bool_if:NT \l_duckuments_toc_bool { \tableofcontents }
@@ -274,17 +304,17 @@
\duckuments_list_example:n { enumerate }
\duckuments_list_example:n { description }
\group_end:
- }%<<<
+ }%=<<
\NewDocumentCommand \blindduck { O{} }
- {%>>>
+ {%>>=
\group_begin:
\keys_set:nn { duckuments } { #1 }
\duckuments@blindduck@text
\bool_if:NT \l_duckuments_blindduck_pars_bool { \par }
\group_end:
- }%<<<
+ }%=<<
\NewDocumentCommand \ducklist {s m}
- {%>>>
+ {%>>=
\begin{#2}
\IfBooleanTF { #1 }
{\ducklists@content@starred}
@@ -294,9 +324,9 @@
\ducklists@content
}
\end{#2}
- }%<<<
+ }%=<<
\NewDocumentCommand \ducklistlist { s m }
- {%>>>
+ {%>>=
\IfBooleanTF { #1 }
{ \duckuments@listlist@starred { #2 } }
{
@@ -304,12 +334,12 @@
{ \duckuments@listlist@starred { description } }
{ \duckuments@listlist{#2} }
}
- }%<<<
+ }%=<<
\newcommand*\duckenumerate{\ducklist{enumerate}}
\newcommand*\duckitemize{\ducklist{itemize}}
\newcommand*\duckdescription{\ducklist{description}}
\newcommand*\duckumentsCreateExampleFiles
- {%>>>
+ {%>>=
\iow_new:N \duckuments_example_file_iow
\iow_open:Nn \duckuments_example_file_iow { example-image-duck.tex }
\iow_now:Nn \duckuments_example_file_iow
@@ -340,15 +370,15 @@
\iow_now:Nn \duckuments_example_file_iow
{ \end{document} }
\iow_close:N \duckuments_example_file_iow
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks
- {%>>>
+ {%>>=
\@ifstar
{\duckumentsDrawRandomDucks@portrait}
{\duckumentsDrawRandomDucks@landscape}%
- }%<<<
+ }%=<<
\newcommand*\duckuments@headings[1]
- {%>>>
+ {%>>=
\ifcase#1\relax
\expandafter\chapter
\or \expandafter\section
@@ -358,9 +388,9 @@
\else \expandafter\@gobble
\fi
{\duckuments@headings@text{#1}}
- }%<<<
+ }%=<<
\newcommand*\duckuments@headings@level[1]
- {%>>>
+ {%>>=
(
\ifcase#1
chapter
@@ -370,20 +400,20 @@
\or paragraph
\fi
)
- }%<<<
+ }%=<<
\newcommand*\duckuments@ifinline[2][]
{ \bool_if:NTF \l_duckuments_math_inline_bool { #2 } { #1 } }
\newcommand*\duckuments@ifdisplay[2][]
{ \bool_if:NTF \l_duckuments_math_display_bool { #2 } { #1 } }
\cs_new_protected_nopar:Npn \duckuments_list_example:n #1
- {%>>>
+ {%>>=
\subsection{Example\ for\ ducks\ (#1)}
\ducklist { #1 }
\subsubsection{Nested\ ducks}
\ducklistlist { #1 }
- }%<<<
+ }%=<<
\NewDocumentCommand \duckuments@enquote { s +m }
- {%>>>
+ {%>>=
\IfBooleanTF { #1 }
{
\cs_if_exist_use:NTF
@@ -395,19 +425,19 @@
\enquote { { #2 } }
{``#2''}
}
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks@landscape[1][\duckuments@randoms]
- {%>>>
+ {%>>=
\foreach\x in {1,2,...,#1}
{\duckumentsDrawRandomDucks@draw{6.47214}{4}{3.23607}{2}}
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks@portrait[1][\duckuments@randoms]
- {%>>>
+ {%>>=
\foreach\x in {1,2,...,#1}
{\duckumentsDrawRandomDucks@draw{1.8541}{3}{.92705}{1.5}}
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks@draw[4]
- {%>>>
+ {%>>=
\begin{tikzpicture}
\draw[fill=gray!50,use~as~bounding~box] (0,0) rectangle (#1,#2);
\draw[gray,thin] (0,0) -- (#1,#2);
@@ -417,9 +447,9 @@
\node at (#3,#4) {\tikz\randuck;};
\draw[black] (0,0) rectangle (#1,#2);
\end{tikzpicture}
- }%<<<
+ }%=<<
\cs_new_protected_nopar:Npn \duckuments_patch_includegraphics:
- {%>>>
+ {%>>=
\@ifpackageloaded { graphicx }
{
\LetLtxMacro\duckuments@includegraphicsBAK\includegraphics
@@ -427,29 +457,29 @@
{ >{\duckuments_starred:n}s O{} o m }
{
\IfValueTF { ##3 }
- { \duckuments@includegraphicsBAK##1[##2][##3]{##4} }
+ { \duckuments@includegraphicsBAK##1[{##2}][{##3}]{##4} }
{
\regex_match:NnTF \c_duckuments_example_regex { ##4 }
{
- \duckuments_get_random_page:
\duckuments@includegraphicsBAK##1
- [page=\duckuments_random_page:,##2]
+ [{page=\duckuments_random_page:,##2}]
{ ##4 }
}
{
- \duckuments@includegraphicsBAK##1[##2]{##4}
+ \duckuments@includegraphicsBAK##1[{##2}]{##4}
}
}
}
}
{}
- }%<<<
+ }%=<<
\cs_new_protected:Npn \duckuments_blindduck_range_test:n #1
- {%>>>
+ {%>>=
\regex_match:NnTF \c_duckuments_range_regex { #1 }
{
\seq_set_split:Nnn \l_duckuments_range_seq { - } { #1 }
- \int_compare:nNnTF { 1 } = { \seq_count:N \l_duckuments_range_seq }
+ \int_compare:nNnTF
+ { \c_one_int } = { \seq_count:N \l_duckuments_range_seq }
{
\cs_set:Npn \duckuments@blindduck@text
{
@@ -460,13 +490,14 @@
{
\bool_set_true:N \l_duckuments_blindduck_pars_bool
\exp_args:Nx
- \tl_if_empty:nF { \seq_item:Nn \l_duckuments_range_seq { \c_one } }
+ \tl_if_empty:nF
+ { \seq_item:Nn \l_duckuments_range_seq { \c_one_int } }
{
\int_gset:Nn \g_duckuments_blindduck_start_int
- { \seq_item:Nn \l_duckuments_range_seq { \c_one } }
+ { \seq_item:Nn \l_duckuments_range_seq { \c_one_int } }
}
\exp_args:Nx
- \tl_if_empty:nTF { \seq_item:Nn \l_duckuments_range_seq { \c_two } }
+ \tl_if_empty:nTF { \seq_item:Nn \l_duckuments_range_seq { 2 } }
{
\int_gset_eq:NN
\g_duckuments_blindduck_end_int
@@ -474,7 +505,7 @@
}
{
\int_set:Nn \g_duckuments_blindduck_end_int
- { \seq_item:Nn \l_duckuments_range_seq { \c_two } }
+ { \seq_item:Nn \l_duckuments_range_seq { 2 } }
}
\duckuments_blindduck_set_text:xx
{ \int_use:N \g_duckuments_blindduck_start_int }
@@ -485,29 +516,29 @@
\exp_args:NnnV
\msg_error:nnn { duckuments } { option~unknown } \l_keys_key_tl
}
- }%<<<
+ }%=<<
\cs_generate_variant:Nn \duckuments_blindduck_range_test:n { V }
\cs_new:Npn \duckuments_blindduck_set_text:nn #1 #2
- {%>>>
+ {%>>=
\def \duckuments@blindduck@text
{
- \int_step_function:nnnN { #1 } { \c_one } { #2 }
+ \int_step_function:nnnN { #1 } { \c_one_int } { #2 }
\duckuments_blindduck_par_loop:n
\duckuments_blindduck_set_next_start:n { #2 }
}
- }%<<<
+ }%=<<
\cs_generate_variant:Nn \duckuments_blindduck_set_text:nn { xx }
\cs_new:Npn \duckuments_blindduck_set_next_start:n #1
- {%>>>
+ {%>>=
\int_gset:Nn \g_duckuments_blindduck_start_int
- { \int_mod:nn { #1 } { \c_duckuments_blindduck_pars_int } + \c_one }
- }%<<<
+ { \int_mod:nn { #1 } { \c_duckuments_blindduck_pars_int } + \c_one_int }
+ }%=<<
\cs_new:Npn \duckuments_blindduck_single_par:n #1
- {%>>>
+ {%>>=
\bool_if:nTF
{
\int_compare_p:nNn { #1 } > { \c_duckuments_blindduck_pars_int }
- || \int_compare_p:nNn { #1 } < { \c_one }
+ || \int_compare_p:nNn { #1 } < { \c_one_int }
}
{
\msg_error:nnxxxx { duckuments } { out~of~range }
@@ -518,128 +549,24 @@
{
\use:c { duckuments@blindduck@text@ \int_to_roman:n { #1 } }
}
- }%<<<
+ }%=<<
\cs_new:Npn \duckuments_blindduck_par_loop:n #1
- {%>>>
+ {%>>=
\duckuments_blindduck_single_par:n { #1 }
\par
- }%<<<
+ }%=<<
\cs_new_protected:Npn \duckuments_starred:n #1
- {%>>>
+ {%>>=
\IfBooleanTF { #1 }
{ \def\ProcessedArgument{*} }
{ \def\ProcessedArgument{} }
- }%<<<
-\sys_if_engine_xetex:TF
- {
- \int_new:N \g_duckuments_RCiv_i_int
- \int_new:N \g_duckuments_RCiv_j_int
- \int_new:N \g_duckuments_RCiv_keylength_int
- \int_new:N \g_duckuments_tmpa_int
- \int_const:Nn \c_duckuments_RCiv_Slength_int { 256 }
- \tl_new:N \l_duckuments_tmpa_tl
- \tl_new:N \l_duckuments_tmpb_tl
- \cs_new_protected_nopar:Npn \duckuments_RCiv_S_new:n #1
- { \int_new:c { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int } }
- \cs_new_protected_nopar:Npn \duckuments_RCiv_S_set:nn #1 #2
- { \int_gset:cn { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int } { #2 } }
- \cs_new_nopar:Npn \duckuments_RCiv_S_get:n #1
- { \int_use:c { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int } }
- \cs_new_protected_nopar:Npn \duckuments_RCiv_key_new:n #1
- { \int_new:c { g_duckuments_RCiv_key_ \int_eval:n { #1 } _int } }
- \cs_new_protected_nopar:Npn \duckuments_RCiv_key_set:nn #1 #2
- { \int_gset:cn { g_duckuments_RCiv_key_ \int_eval:n { #1 } _int } { #2 } }
- \cs_new_nopar:Npn \duckuments_RCiv_key_get:n #1
- { \int_use:c { g_duckuments_RCiv_key_ \int_eval:n { #1 } _int } }
- \int_step_inline:nnnn { 0 } { 1 } { 255 }
- {
- \duckuments_RCiv_S_new:n { #1 }
- \duckuments_RCiv_S_set:nn { #1 } { #1 }
- }
- \int_step_inline:nnnn { 0 } { 1 } { 4 }
- { \duckuments_RCiv_key_new:n { #1 } }
- \duckuments_RCiv_key_set:nn { 0 } { \c_sys_minute_int }
- \duckuments_RCiv_key_set:nn { 1 } { \c_sys_hour_int }
- \duckuments_RCiv_key_set:nn { 2 } { \c_sys_day_int }
- \duckuments_RCiv_key_set:nn { 3 } { \c_sys_month_int }
- \duckuments_RCiv_key_set:nn { 4 }
- { \int_mod:nn { \c_sys_year_int } { \c_duckuments_RCiv_Slength_int } }
- \int_gset:Nn \g_duckuments_RCiv_keylength_int { 5 }
- \str_map_inline:Nn \c_sys_jobname_str
- {
- \duckuments_RCiv_key_new:n { \g_duckuments_RCiv_keylength_int }
- \duckuments_RCiv_key_set:nn
- { \g_duckuments_RCiv_keylength_int }
- { \int_from_alph:n { #1 } }
- \int_gincr:N \g_duckuments_RCiv_keylength_int
- }
- \cs_new_protected_nopar:Npn \duckuments_swap_S_entries:nn #1 #2
- {
- \int_set_eq:Nc
- \g_duckuments_tmpa_int
- { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int }
- \int_set_eq:cc
- { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int }
- { g_duckuments_RCiv_S_ \int_eval:n { #2 } _int }
- \int_set_eq:cN
- { g_duckuments_RCiv_S_ \int_eval:n { #2 } _int }
- \g_duckuments_tmpa_int
- }
- \int_gset:Nn \g_duckuments_RCiv_keylength_int { 5 }
- \cs_new:Npn \duckuments_gadd_mod:Nnn #1 #2 #3
- { \int_gset:Nn #1 { \int_mod:nn { #1 + ( #2 ) } { #3 } } }
- \cs_new:Npn \duckuments_gadd_mod_Slength:Nn #1 #2
- {
- \duckuments_gadd_mod:Nnn #1
- { #2 } { \c_duckuments_RCiv_Slength_int }
- }
- \int_step_inline:nnnn { 0 } { 1 } { 255 }
- {
- \int_gset:Nn \g_duckuments_tmpa_int
- { \int_mod:nn { #1 } { \g_duckuments_RCiv_keylength_int } }
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_RCiv_j_int
- {
- \duckuments_RCiv_S_get:n { #1 }
- + \duckuments_RCiv_key_get:n { \g_duckuments_tmpa_int }
- }
- \duckuments_swap_S_entries:nn { #1 } { \g_duckuments_RCiv_j_int }
- }
- \int_gzero:N \g_duckuments_RCiv_i_int
- \int_gzero:N \g_duckuments_RCiv_j_int
- \cs_new_protected_nopar:Npn \duckuments_get_random_page:
- {
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_RCiv_i_int { \c_one }
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_RCiv_j_int
- { \duckuments_RCiv_S_get:n { \g_duckuments_RCiv_i_int } }
- \duckuments_swap_S_entries:nn
- { \g_duckuments_RCiv_i_int }
- { \g_duckuments_RCiv_j_int }
- \int_gset:Nn \g_duckuments_tmpa_int
- { \duckuments_RCiv_S_get:n { \g_duckuments_RCiv_i_int } }
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_tmpa_int
- { \duckuments_RCiv_S_get:n { \g_duckuments_RCiv_j_int } }
- \cs_set:Nx \duckuments_random_page:
- {
- \int_eval:n
- {
- \int_mod:nn
- { \duckuments_RCiv_S_get:n { \g_duckuments_tmpa_int } }
- { \c_duckuments_example_pages_int }
- + \c_one
- }
- }
- }
- \cs_new:Npn \duckuments_random_page: { 1 }
- }
- {
- \cs_new:Npn \duckuments_get_random_page: {}
- \cs_new:Npn \duckuments_random_page:
- { \int_rand:nn { 1 } { \c_duckuments_example_pages_int } }
- }
+ }%=<<
+\cs_new:Npn \duckuments_random_page:
+ { \int_rand:n { \c_duckuments_example_pages_int } }
\ExplSyntaxOff
\newcommand*\duckuments@blindduck@text{\duckuments@blindduck@text@i}
\newcommand*\duckuments@blindduck@text@i
- {%>>>
+ {%>>=
There once was a very smart but sadly blind duck. When it was still a small
duckling it was renowned for its good vision. But sadly as the duck grew
older it caught a sickness which caused its eyesight to worsen. It became so
@@ -651,26 +578,26 @@
do its research any longer. It called for its underduckling and said:
\duckuments@enquote{Go, find me the best eye ducktor there is. He shall
heal me from my disease!}%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@ii
- {%>>>
+ {%>>=
\duckuments@enquote{But my duck, how are you supposed to manage your daily
routines without my visual guidance}, replied the underduckling. The smart
duck's face turned grim in anger. \duckuments@enquote{You dare to talk
back?} The underduckling blushed ashamed. How could he have objections
after his duck gave strict orders? The underduckling was so embarrassed
about his own behaviour he had to solve an equation.%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@iii
- {%>>>
+ {%>>=
After the equation was solved and the underduckling prepared his leave for
the next day it fell asleep in a shaky mood. It did not know what the
journey had prepared for him and if he was prepared enough for it. His sleep
was restless. The dreams he had that night were not calm and bright as they
used to be for an innocent underduckling.%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@iv
- {%>>>
+ {%>>=
Before dawn the underduckling woke. He didn't have the feeling of being well
rested. But nonetheless he knew that this was the day he should leave.
Except saying goodbye to his beloved ones there was nothing holding him
@@ -678,34 +605,34 @@
inexperienced underduckling was ever sent on. He bid farewell to his mother,
all his brothers and sisters, and finally from his duck. The bag was
shouldered, the boots were tied, the underduckling left.%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@v
- {%>>>
+ {%>>=
As the underduckling went along he saw a tree. It was so tall he couldn't
even approximate its height. Oh, how small he felt. What should he, a small
duckling whose plumage was still fluffy, achieve in this vast, gigantic
world? He stuck his trembling wings under the straps of his backpack to calm
his shaking limbs. Where should he start his search? How should he survive
in the hostile nature surrounding the sheltered pond of his community?
- }%<<<
+ }%=<<
\newcommand*\duckuments@headings@text[1]
{A friendly duck at level #1 \duckuments@headings@level{#1}}
\newcommand*\ducklists@content
- {%>>>
+ {%>>=
\item First swims father drake
\item Then floats mother duck
\item After her paddles baby duckling
\item And over there bathes uncle canard
- }%<<<
+ }%=<<
\newcommand*\ducklists@content@starred
- {%>>>
+ {%>>=
\item[drake] is the swimming father
\item[duck] is the floating mother
\item[duckling] is the paddling baby
\item[canard] is the bathing uncle
- }%<<<
+ }%=<<
\newcommand*\duckuments@listlist[1]
- {%>>>
+ {%>>=
\begin{#1}
\item swimming father drake
\begin{#1}
@@ -722,9 +649,9 @@
\end{#1}
\item floating mother duck
\end{#1}%
- }%<<<
+ }%=<<
\newcommand*\duckuments@listlist@starred[1]
- {%>>>
+ {%>>=
\begin{#1}
\item[drake] is the swimming father
\begin{#1}
@@ -741,7 +668,7 @@
\end{#1}
\item[duck] is the floating mother
\end{#1}%
- }%<<<
+ }%=<<
%%
%%
%% End of file `duckuments.sty'.
Binary files old/tex/latex/duckuments/example-image-duck-portrait.pdf and new/tex/latex/duckuments/example-image-duck-portrait.pdf differ
Binary files old/tex/latex/duckuments/example-image-duck.pdf and new/tex/latex/duckuments/example-image-duck.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/duckuments.tlpobj new/tlpkg/tlpobj/duckuments.tlpobj
--- old/tlpkg/tlpobj/duckuments.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/duckuments.tlpobj 2019-10-04 01:54:00.000000000 +0200
@@ -1,6 +1,6 @@
name duckuments
category Package
-revision 49936
+revision 52271
shortdesc Create duckified dummy content
relocated 1
longdesc The package provides facilities to create duckified dummy
@@ -14,14 +14,14 @@
longdesc ducklist{enumerate} \duckdescription - ducklist{description}
longdesc \duckumentsCreateExampleFile \duckumentsDrawRandomDucks The
longdesc package works with pdfTeX, LuaTeX, and XeTeX.
-runfiles size=145
+runfiles size=147
RELOC/tex/latex/duckuments/duckuments.sty
RELOC/tex/latex/duckuments/example-image-duck-portrait.pdf
RELOC/tex/latex/duckuments/example-image-duck.pdf
catalogue-also lipsum tikzducks
catalogue-contact-repository https://github.com/Skillmon/ltx_duckuments
catalogue-ctan /macros/latex/contrib/duckuments
-catalogue-date 2019-02-03 22:30:55 +0100
+catalogue-date 2019-10-03 20:32:43 +0200
catalogue-license lppl1.3c
catalogue-topics macro-supp dummy-gen
-catalogue-version 0.4c
+catalogue-version 0.5
++++++ dutchcal.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dutchcal.doc.tlpobj new/tlpkg/tlpobj/dutchcal.doc.tlpobj
--- old/tlpkg/tlpobj/dutchcal.doc.tlpobj 2019-02-28 03:33:02.000000000 +0100
+++ new/tlpkg/tlpobj/dutchcal.doc.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,6 +1,6 @@
name dutchcal.doc
category Package
-revision 23448
+revision 54080
shortdesc doc files of dutchcal
relocated 1
docfiles size=1
++++++ dutchcal.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dutchcal.tlpobj new/tlpkg/tlpobj/dutchcal.tlpobj
--- old/tlpkg/tlpobj/dutchcal.tlpobj 2019-02-28 03:33:02.000000000 +0100
+++ new/tlpkg/tlpobj/dutchcal.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,13 +1,13 @@
name dutchcal
category Package
-revision 23448
+revision 54080
shortdesc A reworking of ESSTIX13, adding a bold version
relocated 1
longdesc This package reworks the mathematical calligraphic font
longdesc ESSTIX13, adding a bold version. LaTeX support files are
longdesc included. The new fonts may also be accessed from the most
-longdesc recent version of mathalfa. The fonts themselves are subject to
-longdesc the SIL OPEN FONT LICENSE, version 1.1.
+longdesc recent version of mathalpha. The fonts themselves are subject
+longdesc to the SIL OPEN FONT LICENSE, version 1.1.
execute addMap dutchcal.map
runfiles size=20
RELOC/fonts/afm/public/dutchcal/DutchCalBold.afm
@@ -24,7 +24,6 @@
RELOC/tex/latex/dutchcal/dutchcal.sty
RELOC/tex/latex/dutchcal/udutchcal.fd
catalogue-ctan /fonts/dutchcal
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-calligraphic font-type1
catalogue-version 1.0