diff options
| author | Norbert Preining <norbert@preining.info> | 2019-10-22 03:01:55 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2019-10-22 03:01:55 +0000 |
| commit | 7bf461efa5036b361e9500c4ed5c675cc819652c (patch) | |
| tree | 23bb25035cc3b6e1c64748d1d5e11ce85f69fc9e /macros/latex/contrib | |
| parent | 7da4243862494d1fc7478956362f4da6d80f4f7e (diff) | |
CTAN sync 201910220301
Diffstat (limited to 'macros/latex/contrib')
107 files changed, 1109 insertions, 240 deletions
diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES b/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES index f754b79612..6ac7abc618 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES +++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES @@ -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, diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf Binary files differindex f51efa41f5..bc6176d7db 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf +++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx index 0b1376ca17..a98c719196 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx +++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx @@ -19,7 +19,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2015 Nicola Talbot, all rights reserved. +% Copyright (C) 2015-2019 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -62,7 +62,7 @@ % %\title{English Module for datetime2 Package} %\author{Nicola L. C. Talbot} -%\date{2016-03-09 (v1.04)} +%\date{2019-10-21 (v1.05)} %\maketitle % %\begin{abstract} @@ -617,7 +617,7 @@ %\changes{1.0}{2015-03-24}{Initial release} % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{english-base}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{english-base}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Since the main emphasize of the \sty{datetime2} package is to % provide expandable dates where possible, the commands here need to @@ -951,7 +951,7 @@ % % Identify Module % \begin{macrocode} -\ProvidesDateTimeModule{english}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{english}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load the base English module. % \begin{macrocode} @@ -1046,7 +1046,7 @@ %\fi % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-GB}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-GB}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -1171,9 +1171,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -1230,7 +1231,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 }% }% @@ -1288,7 +1289,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 }% }% @@ -1373,7 +1374,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-US}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-US}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -1497,9 +1498,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -1515,12 +1517,13 @@ % % Define a setting to change zone mappings. %\changes{1.03}{2016-01-23}{added zone option to en-US} +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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 @@ -1656,7 +1659,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 }% }% @@ -1713,7 +1716,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 }% }% @@ -1935,7 +1938,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-CA}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-CA}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -2059,9 +2062,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -2077,12 +2081,13 @@ % % Define a setting to change zone mappings. %\changes{1.03}{2016-01-23}{added zone option to en-CA} +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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 @@ -2191,7 +2196,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 }% }% @@ -2248,7 +2253,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 }% }% @@ -2436,7 +2441,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-AU}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-AU}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -2561,9 +2566,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -2579,12 +2585,13 @@ % % Define a setting to change zone mappings. %\changes{1.03}{2016-01-23}{added zone option to en-AU} +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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 @@ -2659,7 +2666,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenAUfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-AU}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -2694,7 +2701,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 }% }% @@ -2751,7 +2758,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 }% }% @@ -2957,7 +2964,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-NZ}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-NZ}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -3083,9 +3090,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -3107,7 +3115,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenNZfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-NZ}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -3142,7 +3150,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 }% }% @@ -3199,7 +3207,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 }% }% @@ -3286,7 +3294,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-GG}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-GG}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -3411,9 +3419,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -3435,7 +3444,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenGGfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-GG}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -3470,7 +3479,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 }% }% @@ -3527,7 +3536,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 }% }% @@ -3611,7 +3620,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-JE}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-JE}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -3736,9 +3745,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -3760,7 +3770,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenJEfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-JE}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -3795,7 +3805,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 }% }% @@ -3852,7 +3862,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 }% }% @@ -3936,7 +3946,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-IM}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-IM}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -4061,9 +4071,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -4085,7 +4096,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIMfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-IM}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -4120,7 +4131,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 }% }% @@ -4177,7 +4188,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 }% }% @@ -4261,7 +4272,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-MT}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-MT}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -4386,9 +4397,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -4410,7 +4422,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenMTfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-MT}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -4445,7 +4457,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 }% }% @@ -4502,7 +4514,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 }% }% @@ -4587,7 +4599,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-IE}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-IE}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -4711,9 +4723,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\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]{% @@ -4735,7 +4748,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIEfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-IE}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -4770,7 +4783,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 }% }% @@ -4827,7 +4840,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 --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins index 6767459acc..8e4726d226 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins +++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins @@ -3,7 +3,7 @@ \preamble 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 diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf Binary files differindex 189c2989a3..57fc0fa928 100644 --- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf +++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf diff --git a/macros/latex/contrib/datetime2/CHANGES b/macros/latex/contrib/datetime2/CHANGES index 3435b72e1f..e25ea54492 100644 --- a/macros/latex/contrib/datetime2/CHANGES +++ b/macros/latex/contrib/datetime2/CHANGES @@ -1,3 +1,7 @@ +1.5.4 (2019-10-21): + + * renamed scratch variables to avoid conflict + 1.5.3 (2018-07-20): * Bug fix: removed unwanted \relax inserted in negative time zones diff --git a/macros/latex/contrib/datetime2/README b/macros/latex/contrib/datetime2/README index 5f393336d8..6e9b85f4f1 100644 --- a/macros/latex/contrib/datetime2/README +++ b/macros/latex/contrib/datetime2/README @@ -1,6 +1,6 @@ -LaTeX Package : datetime2 v1.5.3 +LaTeX Package : datetime2 v1.5.4 -Last Modified : 2018-07-20 +Last Modified : 2019-10-21 Author : Nicola Talbot diff --git a/macros/latex/contrib/datetime2/datetime2.dtx b/macros/latex/contrib/datetime2/datetime2.dtx index 8791e302ed..401236b8d0 100644 --- a/macros/latex/contrib/datetime2/datetime2.dtx +++ b/macros/latex/contrib/datetime2/datetime2.dtx @@ -3,11 +3,11 @@ % Command line args: % -src "datetime2.sty\Z=>datetime2.sty" % -src "datetime2-calc.sty\Z=>datetime2-calc.sty" -% -author "Nicola Talbot" % -doc "datetime2-manual.tex" % -section "chapter" +% -author "Nicola Talbot" % datetime2 -% Created on 2018/7/20 12:36 +% Created on 2019/10/21 11:37 %\fi %\iffalse %<*package> @@ -30,7 +30,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2018 Nicola Talbot, all rights reserved. +% Copyright (C) 2019 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -91,11 +91,11 @@ % %\MakeShortVerb{"} % -%\title{datetime2 v1.5.3: +%\title{datetime2 v1.5.4: %date and time formats} %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}} % -%\date{2018-07-20} +%\date{2019-10-21} %\maketitle % %\begin{abstract} @@ -5686,7 +5686,7 @@ %\changes{1.0}{2015-03-24}{Initial release} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datetime2}[2018/07/20 v1.5.3 (NLCT) date and time formats] +\ProvidesPackage{datetime2}[2019/10/21 v1.5.4 (NLCT) date and time formats] % \end{macrocode} % Use \sty{tracklang} to find out what languages have been loaded. % \begin{macrocode} @@ -5985,11 +5985,12 @@ %\begin{option}{useregional} % Setting to determine whether or not to use the regional % settings (if any are loaded). +%\changes{1.5.4}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\define@choicekey{datetime2.sty}{useregional}[\val\nr]% +\define@choicekey{datetime2.sty}{useregional}[\@dtm@useregional@val\@dtm@useregional@nr]% {false,text,numeric,num}[text]% {% - \ifcase\nr\relax + \ifcase\@dtm@useregional@nr\relax \renewcommand*{\DTMifcaseregional}[3]{##1}% \or \renewcommand*{\DTMifcaseregional}[3]{##2}% @@ -8861,7 +8862,7 @@ %\section{datetime2-calc.sty code} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datetime2-calc}[2018/07/20 v1.5.3 (NLCT)] +\ProvidesPackage{datetime2-calc}[2019/10/21 v1.5.4 (NLCT)] % \end{macrocode} % Load other required packages % \begin{macrocode} @@ -9430,49 +9431,49 @@ %These are shared with the \sty{locale} package, so they may already %be defined. %\begin{macro}{\dtmMondayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmMondayIndex{0} % \end{macrocode} %\end{macro} % %\begin{macro}{\dtmTuesdayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmTuesdayIndex{1} % \end{macrocode} %\end{macro} % %\begin{macro}{\dtmWednesdayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmWednesdayIndex{2} % \end{macrocode} %\end{macro} % %\begin{macro}{\dtmThursdayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmThursdayIndex{3} % \end{macrocode} %\end{macro} % %\begin{macro}{\dtmFridayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmFridayIndex{4} % \end{macrocode} %\end{macro} % %\begin{macro}{\dtmSaturdayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmSaturdayIndex{5} % \end{macrocode} %\end{macro} % %\begin{macro}{\dtmSundayIndex} -%\changes{1.5.3}{??}{new} +%\changes{1.5.3}{2018-07-20}{new} % \begin{macrocode} \def\dtmSundayIndex{6} % \end{macrocode} diff --git a/macros/latex/contrib/datetime2/datetime2.ins b/macros/latex/contrib/datetime2/datetime2.ins index 91a29acb33..d839777cd7 100644 --- a/macros/latex/contrib/datetime2/datetime2.ins +++ b/macros/latex/contrib/datetime2/datetime2.ins @@ -1,10 +1,10 @@ -% datetime2.ins generated using makedtx version 1.2 2018/7/20 12:36 +% datetime2.ins generated using makedtx version 1.2 2019/10/21 11:37 \input docstrip \preamble datetime2.dtx - Copyright 2018 Nicola Talbot + Copyright 2019 Nicola Talbot This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/macros/latex/contrib/datetime2/datetime2.pdf b/macros/latex/contrib/datetime2/datetime2.pdf Binary files differindex a15e11feb4..e356981288 100644 --- a/macros/latex/contrib/datetime2/datetime2.pdf +++ b/macros/latex/contrib/datetime2/datetime2.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-babel.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-babel.pdf Binary files differindex 578625e683..f0c400e808 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-babel.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-babel.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-calc.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-calc.pdf Binary files differindex 02e2ba10da..2fb24bf61e 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-calc.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-calc.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-filedate.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-filedate.pdf Binary files differindex 3e2c3e54d2..d4c34cdf2f 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-filedate.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-filedate.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-hyperref.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-hyperref.pdf Binary files differindex b26477e0e4..1236d2fc42 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-hyperref.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-hyperref.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-journal.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-journal.pdf Binary files differindex 5fd3663335..be21e3c7ac 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-journal.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-journal.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-styles.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-styles.pdf Binary files differindex 76dbfd1e82..3ed5e296f3 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-styles.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-styles.pdf diff --git a/macros/latex/contrib/datetime2/samples/datetime2-sample-xe.pdf b/macros/latex/contrib/datetime2/samples/datetime2-sample-xe.pdf Binary files differindex bcf2d0b7ea..2e485f20ca 100644 --- a/macros/latex/contrib/datetime2/samples/datetime2-sample-xe.pdf +++ b/macros/latex/contrib/datetime2/samples/datetime2-sample-xe.pdf diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index 85fbfb5031..6b70a9cd60 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,22 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-10-21] + +### Added + +- Lua function `l3kernel.shellescape()` + +### Changed + +- Better coverage of (u)pTeX primitives following publication of + pTeX manual in English +- Trim spaces surrounding file names + +### Removed + +- HarfTeX primitives + ## [2019-10-14] ### Fixed @@ -562,7 +578,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-14...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-21...HEAD +[2019-10-21]: https://github.com/latex3/latex3/compare/2019-10-14...2019-10-21 [2019-10-14]: https://github.com/latex3/latex3/compare/2019-10-11...2019-10-14 [2019-10-11]: https://github.com/latex3/latex3/compare/2019-10-02...2019-10-11 [2019-10-02]: https://github.com/latex3/latex3/compare/2019-09-30...2019-10-02 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index 1ea787bc59..ffbbb81606 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2019-10-14 +Release 2019-10-21 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index 07dea81cb6..e9d6fd84ad 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf Binary files differindex 36a3ba6d70..973fa0880c 100644 --- a/macros/latex/contrib/l3kernel/expl3.pdf +++ b/macros/latex/contrib/l3kernel/expl3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf Binary files differindex 2e40d09a02..5295e1c0e2 100644 --- a/macros/latex/contrib/l3kernel/interface3.pdf +++ b/macros/latex/contrib/l3kernel/interface3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 15517a998e..7248ad387c 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3alloc.dtx b/macros/latex/contrib/l3kernel/l3alloc.dtx index edc3fb9ddc..4e8d1c4f59 100644 --- a/macros/latex/contrib/l3kernel/l3alloc.dtx +++ b/macros/latex/contrib/l3kernel/l3alloc.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -145,7 +145,11 @@ \exp_not:N \@@_reg:nNnN { box } \cs_if_exist:NTF \tex_luatexversion:D { \tex_chardef:D } - { \tex_mathchardef:D } + { + \cs_if_exist:NTF \tex_omathchardef:D + { \tex_omathchardef:D } + { \tex_mathchardef:D } + } \c_max_register_int #1 } diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 3046fbdf49..412dabcdc2 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -1508,11 +1508,17 @@ % \begin{variable}{\c_max_register_int} % This is here as this particular integer is needed both in package % mode and to bootstrap \pkg{l3alloc}, and is documented in \pkg{l3int}. +% \LuaTeX{} and those which contain parts of the Omega extensions have +% more registers available than \eTeX{}. % \begin{macrocode} \tex_ifdefined:D \tex_luatexversion:D \tex_chardef:D \c_max_register_int = 65 535 ~ \tex_else:D - \tex_mathchardef:D \c_max_register_int = 32 767 ~ + \tex_ifdefined:D \tex_omathchardef:D + \tex_omathchardef:D \c_max_register_int = 65535 ~ + \tex_else:D + \tex_mathchardef:D \c_max_register_int = 32767 ~ + \tex_fi:D \tex_fi:D % \end{macrocode} % \end{variable} diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index a5510eb607..015aa0d455 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index e99446ad46..c72c9fa587 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index 03b29462ea..bfbe86059b 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 6e99f0d28b..fb63bdac21 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index b40469d9cc..c0d393bbaa 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color-base.dtx b/macros/latex/contrib/l3kernel/l3color-base.dtx index 429e8068ed..9b80753bda 100644 --- a/macros/latex/contrib/l3kernel/l3color-base.dtx +++ b/macros/latex/contrib/l3kernel/l3color-base.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index d8a79ea4e0..898152fd13 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index e3f6389977..e3dd8581ee 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 84ab65f36f..5ad6932e9e 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -79,7 +79,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index ed00bd90f6..1ecd193852 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf Binary files differindex 84b1b5744f..1e80cda2fc 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.pdf +++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index ea5de20428..c06f0c2981 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index 6f39937f85..19807253e3 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -69,6 +69,11 @@ % using |"| tokens if they contain spaces: as a result, |"| tokens are % \emph{not} permitted in file names. % +% Spaces are trimmed at the beginning and end of the file name: +% this reflects the fact that some file systems do not allow or interact +% unpredictably with spaces in these positions. When no extension is given, +% this will trim spaces from the start of the name only. +% % \section{Input--output stream management} % % As \TeX{} engines have a limited number of input and output streams, direct @@ -2362,6 +2367,10 @@ % \begin{macro}[rEXP]{\__kernel_file_name_expand_N_type:Nw} % \begin{macro}[rEXP]{\__kernel_file_name_expand_group:nw} % \begin{macro}[rEXP]{\__kernel_file_name_expand_space:w} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces:n} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces:nw} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces_aux:n} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces_aux:w} % Expanding the file name without expanding active characters is done % using the same token-by-token approach as for example case changing. % The finale outcome only need be \texttt{e}-type expandable, so there @@ -2369,8 +2378,11 @@ % \begin{macrocode} \cs_new:Npn \__kernel_file_name_sanitize:n #1 { - \__kernel_file_name_expand_loop:w #1 - \q_recursion_tail \q_recursion_stop + \exp_args:Ne \__kernel_file_name_trim_spaces:n + { + \__kernel_file_name_expand_loop:w #1 + \q_recursion_tail \q_recursion_stop + } } \cs_new:Npn \__kernel_file_name_expand_loop:w #1 \q_recursion_stop { @@ -2419,6 +2431,31 @@ \exp_not:N \__kernel_file_name_expand_loop:w } % \end{macrocode} +% Spaces need to be trimmed from the start of the name and from the end of +% any extension. However, the name we are passed might not have an extension: +% that means we have to look for one. If there is no extension, we still use +% the standard trimming function but deliberately prevent any spaces being +% removed at the end. +% \begin{macrocode} +\cs_new:Npn \__kernel_file_name_trim_spaces:n #1 + { \__kernel_file_name_trim_spaces:nw {#1} #1 . \q_nil . \q_stop } +\cs_new:Npn \__kernel_file_name_trim_spaces:nw #1#2 . #3 . #4 \q_stop + { + \quark_if_nil:nTF {#3} + { + \exp_args:Ne \__kernel_file_name_trim_spaces_aux:n + { \tl_trim_spaces:n { #1 \s_stop } } + } + { \tl_trim_spaces:n {#1} } + } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:n #1 + { \__kernel_file_name_trim_spaces_aux:w #1 } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:w #1 \s_stop {#1} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} diff --git a/macros/latex/contrib/l3kernel/l3final.dtx b/macros/latex/contrib/l3kernel/l3final.dtx index d30b1ff554..1854521b7d 100644 --- a/macros/latex/contrib/l3kernel/l3final.dtx +++ b/macros/latex/contrib/l3kernel/l3final.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 044e1cf744..809e4f57ae 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index a042a9f010..0fc8aab6b6 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index 3fdc8a731b..437f05d0e3 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index dacd276344..81d6720ef6 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 5c36e99032..f0279aeb49 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index b037145d19..9fa0d3c9fe 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index fba15dc56a..a244448ff5 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index ac5ed471b5..d1a58ad433 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index 45360c47ea..89347e5ef0 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 4029ad9398..37434dd256 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index 5f59d49e3c..1cdf625a2d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index a40cf74bda..ab486d81dc 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index 19b5c894bf..a1d63f396b 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index 779e38c1ad..ad4011b6d5 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index 326374b8e7..4476f0377e 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index ca0f8c0bba..52d769c49a 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -1285,12 +1285,11 @@ } \cs_generate_variant:Nn \int_const:Nn { c } \if_int_odd:w 0 - \cs_if_exist:NT \tex_luatexversion:D { 1 } - \cs_if_exist:NT \tex_disablecjktoken:D - { \if_int_compare:w \tex_jis:D "2121 = "3000 ~ 1 \fi: } - \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ - \cs_if_exist:NTF \tex_disablecjktoken:D - { \cs_new_eq:NN \@@_constdef:Nw \tex_kchardef:D } + \cs_if_exist:NT \tex_luatexversion:D { 1 } + \cs_if_exist:NT \tex_omathchardef:D { 1 } + \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ + \cs_if_exist:NTF \tex_omathchardef:D + { \cs_new_eq:NN \@@_constdef:Nw \tex_omathchardef:D } { \cs_new_eq:NN \@@_constdef:Nw \tex_chardef:D } \@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~ \else: diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 66d2c25ce0..dad25796c3 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index c321be6548..ed13c7b993 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index 53370f6f23..b1533c8f20 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index a5ac73c890..c5528a7889 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 03b5544016..199db4a628 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -183,6 +183,13 @@ % Resets the timer used by |l3kernel.elapsetime|. % \end{function} % +% \begin{function}{l3kernel.shellescape} +% \begin{syntax} +% |l3kernel.shellescape(|\meta{cmd}|)| +% \end{syntax} +% Executes the \meta{cmd} and prints to the log as for \pdfTeX{}. +% \end{function} +% % \begin{function}{l3kernel.strcmp} % \begin{syntax} % |l3kernel.strcmp(|\meta{str one}, \meta{str two}|)| @@ -311,6 +318,7 @@ local md5 = md5 local os = os local string = string local tex = tex +local texio = texio local unicode = unicode % \end{macrocode} % @@ -326,10 +334,12 @@ local md5_sum = md5.sum local open = io.open local os_clock = os.clock local os_date = os.date +local os_exec = os.execute local setcatcode = tex.setcatcode local sprint = tex.sprint local cprint = tex.cprint local write = tex.write +local write_nl = texio.write_nl % \end{macrocode} % % Newer Con\TeX{}t releases replace the |unicode| library by |utf|. @@ -492,6 +502,23 @@ l3kernel.strcmp = strcmp % \end{macrocode} % \end{macro} % +% \begin{macro}{l3kernel.shellescape} +% Replicating the \pdfTeX{} log interaction for shell escape. +% \begin{macrocode} +local function shellescape(cmd) + local status,msg = os_exec(cmd) + if status == nil then + write_nl("log","runsystem(" .. cmd .. ")...(" .. msg .. ")\n") + elseif status == 0 then + write_nl("log","runsystem(" .. cmd .. ")...executed\n") + else + write_nl("log","runsystem(" .. cmd .. ")...failed " .. (msg or "") .. "\n") + end +end +l3kernel.shellescape = shellescape +% \end{macrocode} +% \end{macro} +% % \subsection{Generic \Lua{} and font support} % % \begin{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index 9dd5a55d58..64608fb541 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index e93f8c5db1..72a8af0373 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -571,6 +571,7 @@ \@@_primitive:NN \pdflastximagepages \tex_pdflastximagepages:D \@@_primitive:NN \pdflinkmargin \tex_pdflinkmargin:D \@@_primitive:NN \pdfliteral \tex_pdfliteral:D + \@@_primitive:NN \pdfmajorversion \tex_pdfmajorversion:D \@@_primitive:NN \pdfminorversion \tex_pdfminorversion:D \@@_primitive:NN \pdfnames \tex_pdfnames:D \@@_primitive:NN \pdfobj \tex_pdfobj:D @@ -1108,21 +1109,19 @@ \@@_primitive:NN \Uunderdelimiter \tex_Uunderdelimiter:D \@@_primitive:NN \Uvextensible \tex_Uvextensible:D % \end{macrocode} -% Primitives from Harf\TeX{}. -% \begin{macrocode} - \@@_primitive:NN \harftexrevision \tex_harftexrevision:D - \@@_primitive:NN \harftexversion \tex_harftexversion:D -% \end{macrocode} % Primitives from \pTeX{}. % \begin{macrocode} \@@_primitive:NN \autospacing \tex_autospacing:D \@@_primitive:NN \autoxspacing \tex_autoxspacing:D + \@@_primitive:NN \disinhibitglue \tex_disinhibitglue:D \@@_primitive:NN \dtou \tex_dtou:D \@@_primitive:NN \epTeXinputencoding \tex_epTeXinputencoding:D \@@_primitive:NN \epTeXversion \tex_epTeXversion:D \@@_primitive:NN \euc \tex_euc:D + \@@_primitive:NN \hfi \tex_hfi:D \@@_primitive:NN \ifdbox \tex_ifdbox:D \@@_primitive:NN \ifddir \tex_ifddir:D + \@@_primitive:NN \ifmbox \tex_ifmbox:D \@@_primitive:NN \ifmdir \tex_ifmdir:D \@@_primitive:NN \iftbox \tex_iftbox:D \@@_primitive:NN \iftdir \tex_iftdir:D @@ -1139,22 +1138,33 @@ \@@_primitive:NN \kansujichar \tex_kansujichar:D \@@_primitive:NN \kcatcode \tex_kcatcode:D \@@_primitive:NN \kuten \tex_kuten:D + \@@_primitive:NN \lastnodechar \tex_lastnodechar:D + \@@_primitive:NN \lastnodesubtype \tex_lastnodesubtype:D \@@_primitive:NN \noautospacing \tex_noautospacing:D \@@_primitive:NN \noautoxspacing \tex_noautoxspacing:D + \@@_primitive:NN \pagefistretch \tex_pagefistretch:D \@@_primitive:NN \postbreakpenalty \tex_postbreakpenalty:D \@@_primitive:NN \prebreakpenalty \tex_prebreakpenalty:D \@@_primitive:NN \ptexminorversion \tex_ptexminorversion:D \@@_primitive:NN \ptexrevision \tex_ptexrevision:D \@@_primitive:NN \ptexversion \tex_ptexversion:D + \@@_primitive:NN \readpapersizespecial \tex_readpapersizespecial:D + \@@_primitive:NN \scriptbaselineshiftfactor + \tex_scriptbaselineshiftfactor:D + \@@_primitive:NN \scriptscriptbaselineshiftfactor + \tex_scriptscriptbaselineshiftfactor:D \@@_primitive:NN \showmode \tex_showmode:D \@@_primitive:NN \sjis \tex_sjis:D \@@_primitive:NN \tate \tex_tate:D \@@_primitive:NN \tbaselineshift \tex_tbaselineshift:D + \@@_primitive:NN \textbaselineshiftfactor + \tex_textbaselineshiftfactor:D \@@_primitive:NN \tfont \tex_tfont:D \@@_primitive:NN \xkanjiskip \tex_xkanjiskip:D \@@_primitive:NN \xspcode \tex_xspcode:D \@@_primitive:NN \ybaselineshift \tex_ybaselineshift:D \@@_primitive:NN \yoko \tex_yoko:D + \@@_primitive:NN \vfi \tex_vfi:D % \end{macrocode} % Primitives from \upTeX{}. % \begin{macrocode} @@ -1168,6 +1178,17 @@ \@@_primitive:NN \uptexrevision \tex_uptexrevision:D \@@_primitive:NN \uptexversion \tex_uptexversion:D % \end{macrocode} +% Omega primitives provided by \pTeX{} (listed separately mainly to allow +% understanding of their source). +% \begin{macrocode} + \@@_primitive:NN \odelcode \tex_odelcode:D + \@@_primitive:NN \odelimiter \tex_odelimiter:D + \@@_primitive:NN \omathaccent \tex_omathaccent:D + \@@_primitive:NN \omathchar \tex_omathchar:D + \@@_primitive:NN \omathchardef \tex_omathchardef:D + \@@_primitive:NN \omathcode \tex_omathcode:D + \@@_primitive:NN \oradical \tex_oradical:D +% \end{macrocode} % End of the \enquote{just the names} part of the source. % \begin{macrocode} %</initex|names|package> diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf Binary files differindex 53f533d99c..44b47156ee 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.pdf +++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index a70270880b..835d005860 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index fac6ffaf3d..570b7a7ade 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index 1fb098ed19..dbe2e6e817 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index 0bc5f5cb00..deda64aa3a 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index 0c7c33e475..b376d5644e 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index 69174666e7..86cc965c91 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index 682caff3ae..bea3f77030 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 2fe91d7f9e..e6b49a4d39 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 1cda403937..09ed5b723e 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf Binary files differindex 511b22fec9..6c53631dcd 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.pdf +++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index 47db34fc94..c2c12020e6 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf Binary files differindex 30ee597ba0..a373517264 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index c990f1cfc8..41230dd97c 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 06ef4cd731..c2a6e79142 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -556,7 +556,7 @@ \cs_new_protected:Npn \sys_shell_now:n #1 { \lua_now:e - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { @@ -575,7 +575,7 @@ \cs_new_protected:Npn \sys_shell_shipout:n #1 { \lua_shipout_e:n - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf Binary files differindex 029d33af41..fe3e68b4bc 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf +++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index d7ec25e4c0..4bd29c2daa 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index aaaea4a2fa..fe34f9698e 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index 8d810681a9..5e8551a7b1 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index ba41227682..3ac24900ee 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index fe60c0c7e5..45bedf0cbf 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf Binary files differindex 76d72e9730..d4e1544019 100644 --- a/macros/latex/contrib/l3kernel/source3.pdf +++ b/macros/latex/contrib/l3kernel/source3.pdf diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index 81167d41d8..d13109340f 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/onedown/ODw-danish.trsl b/macros/latex/contrib/onedown/ODw-danish.trsl index fb83c04e50..0f8c9dbbc7 100644 --- a/macros/latex/contrib/onedown/ODw-danish.trsl +++ b/macros/latex/contrib/onedown/ODw-danish.trsl @@ -4,7 +4,7 @@ % %% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare % -\ProvideDictionaryFor{danish}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{danish}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1.} \NewDictTranslation{2nd-(ODw)}{2.} @@ -123,7 +123,7 @@ \NewDictTranslation{redoubled-(ODw)}{redubbelt} \NewDictTranslation{Redoubled-(ODw)}{Redubbelt} \NewDictTranslation{redouble-(ODw)}{redubbelt} -\NewDictTranslation{Redouble-(ODw)}{Redubbelt} +\NewDictTranslation{ReDouble-(ODw)}{Redubbelt} \NewDictTranslation{semi forcing-(ODw)}{semi forcing} \NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing} \NewDictTranslation{sf-(ODw)}{sf} @@ -140,8 +140,8 @@ \NewDictTranslation{Third Suit Forcing-(ODw)}{Tredje Farve Forcing} \NewDictTranslation{total points-(ODw)}{total points} \NewDictTranslation{Total Points-(ODw)}{Total Points} -\NewDictTranslation{tp-(ODw)}{sp} -\NewDictTranslation{TP-(ODw)}{SP} +\NewDictTranslation{tp-(ODw)}{tp} +\NewDictTranslation{TP-(ODw)}{TP} \NewDictTranslation{trial bid-(ODw)}{trial bid} \NewDictTranslation{Trial bid-(ODw)}{Trial bid} \NewDictTranslation{trick-(ODw)}{træk} diff --git a/macros/latex/contrib/onedown/ODw-dutch.trsl b/macros/latex/contrib/onedown/ODw-dutch.trsl index c9b3256be1..d2ab2df5c8 100644 --- a/macros/latex/contrib/onedown/ODw-dutch.trsl +++ b/macros/latex/contrib/onedown/ODw-dutch.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer % -\ProvideDictionaryFor{dutch}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{dutch}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1ste} \NewDictTranslation{2nd-(ODw)}{2de} @@ -119,15 +119,15 @@ \NewDictTranslation{Q-(ODw)}{V} \NewDictTranslation{queen-(ODw)}{vrouw} \NewDictTranslation{Queen-(ODw)}{Vrouw} -\NewDictTranslation{ReDbl-(ODw)}{ReDbl} +\NewDictTranslation{ReDbl-(ODw)}{ReDblt} \NewDictTranslation{redoubled-(ODw)}{geredoubleerd} \NewDictTranslation{Redoubled-(ODw)}{Geredoubleerd} \NewDictTranslation{redouble-(ODw)}{redoublet} -\NewDictTranslation{Redouble-(ODw)}{Redoublet} +\NewDictTranslation{ReDouble-(ODw)}{Redoublet} \NewDictTranslation{semi forcing-(ODw)}{semi-mancheforcing} \NewDictTranslation{Semi Forcing-(ODw)}{Semi-MancheForcing} -\NewDictTranslation{sf-(ODw)}{sf} -\NewDictTranslation{SF-(ODw)}{SF} +\NewDictTranslation{sf-(ODw)}{smf} +\NewDictTranslation{SF-(ODw)}{SMF} \NewDictTranslation{s-(ODw)}{z} \NewDictTranslation{S-(ODw)}{Z} \NewDictTranslation{south-(ODw)}{zuid} diff --git a/macros/latex/contrib/onedown/ODw-english.trsl b/macros/latex/contrib/onedown/ODw-english.trsl index 6060e38966..052acb217c 100644 --- a/macros/latex/contrib/onedown/ODw-english.trsl +++ b/macros/latex/contrib/onedown/ODw-english.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer % -\ProvideDictionaryFor{english}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{english}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1st} \NewDictTranslation{2nd-(ODw)}{2nd} diff --git a/macros/latex/contrib/onedown/ODw-fallback.trsl b/macros/latex/contrib/onedown/ODw-fallback.trsl index 135f8b3427..7c79d06de3 100644 --- a/macros/latex/contrib/onedown/ODw-fallback.trsl +++ b/macros/latex/contrib/onedown/ODw-fallback.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer % -\ProvideDictionaryFor{fallback}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{fallback}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1st} \NewDictTranslation{2nd-(ODw)}{2nd} diff --git a/macros/latex/contrib/onedown/ODw-french.trsl b/macros/latex/contrib/onedown/ODw-french.trsl index b1d5a7e4fd..5a9ec7e8c1 100644 --- a/macros/latex/contrib/onedown/ODw-french.trsl +++ b/macros/latex/contrib/onedown/ODw-french.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g. \GetTranslation{dealer-(ODw)} to get donneur % -\ProvideDictionaryFor{french}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{french}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1er} \NewDictTranslation{2nd-(ODw)}{2e} @@ -28,8 +28,8 @@ \NewDictTranslation{Bid-(ODw)}{Enchère} \NewDictTranslation{board-(ODw)}{etui} \NewDictTranslation{Board-(ODw)}{Etui} -\NewDictTranslation{brd-(ODw)}{bte} -\NewDictTranslation{Brd-(ODw)}{Bte} +\NewDictTranslation{brd-(ODw)}{etui} +\NewDictTranslation{Brd-(ODw)}{Etui} \NewDictTranslation{by-(ODw)}{pour} \NewDictTranslation{call-(ODw)}{annonce} \NewDictTranslation{Call-(ODw)}{Annonce} diff --git a/macros/latex/contrib/onedown/ODw-german.trsl b/macros/latex/contrib/onedown/ODw-german.trsl index 35ac8e3de7..b1cd730f37 100644 --- a/macros/latex/contrib/onedown/ODw-german.trsl +++ b/macros/latex/contrib/onedown/ODw-german.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g. \GetTranslation{dealer-(ODw)} to get teiler % -\ProvideDictionaryFor{german}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{german}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1.} \NewDictTranslation{2nd-(ODw)}{2.} @@ -38,7 +38,7 @@ \NewDictTranslation{Contract-(ODw)}{Kontrakt} \NewDictTranslation{contr-(ODw)}{kontr} \NewDictTranslation{Contr-(ODw)}{Kontr} -\NewDictTranslation{Dbl-(ODw)}{Kontra} +\NewDictTranslation{Dbl-(ODw)}{Kntr} \NewDictTranslation{dealer-(ODw)}{teiler} \NewDictTranslation{Dealer-(ODw)}{Teiler} \NewDictTranslation{deal!-(ODw)}{aust} @@ -119,11 +119,11 @@ \NewDictTranslation{Q-(ODw)}{D} \NewDictTranslation{queen-(ODw)}{dame} \NewDictTranslation{Queen-(ODw)}{Dame} -\NewDictTranslation{ReDbl-(ODw)}{ReKontra} +\NewDictTranslation{ReDbl-(ODw)}{ReKntr} \NewDictTranslation{redoubled-(ODw)}{rekontriert} \NewDictTranslation{Redoubled-(ODw)}{Rekontriert} \NewDictTranslation{redouble-(ODw)}{rekontra} -\NewDictTranslation{Redouble-(ODw)}{Rekontra} +\NewDictTranslation{ReDouble-(ODw)}{ReKontra} \NewDictTranslation{semi forcing-(ODw)}{semi forcing} \NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing} \NewDictTranslation{sf-(ODw)}{sf} diff --git a/macros/latex/contrib/onedown/ODw-norwegian.trsl b/macros/latex/contrib/onedown/ODw-norwegian.trsl index d8169b4715..894ad713dc 100644 --- a/macros/latex/contrib/onedown/ODw-norwegian.trsl +++ b/macros/latex/contrib/onedown/ODw-norwegian.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare % -\ProvideDictionaryFor{norwegian}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{norwegian}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1.} \NewDictTranslation{2nd-(ODw)}{2.} @@ -123,7 +123,7 @@ \NewDictTranslation{redoubled-(ODw)}{redoblet} \NewDictTranslation{Redoubled-(ODw)}{Redoblet} \NewDictTranslation{redouble-(ODw)}{redoblet} -\NewDictTranslation{Redouble-(ODw)}{Redoblet} +\NewDictTranslation{ReDouble-(ODw)}{Redoblet} \NewDictTranslation{semi forcing-(ODw)}{RundKrav} \NewDictTranslation{Semi Forcing-(ODw)}{RundKrav} \NewDictTranslation{sf-(ODw)}{rk} @@ -140,8 +140,8 @@ \NewDictTranslation{Third Suit Forcing-(ODw)}{Tredje Farge Forcing} \NewDictTranslation{total points-(ODw)}{totalt poeng} \NewDictTranslation{Total Points-(ODw)}{Totalt Poeng} -\NewDictTranslation{tp-(ODw)}{sp} -\NewDictTranslation{TP-(ODw)}{SP} +\NewDictTranslation{tp-(ODw)}{tp} +\NewDictTranslation{TP-(ODw)}{TP} \NewDictTranslation{trial bid-(ODw)}{prøving bud} \NewDictTranslation{Trial bid-(ODw)}{Prøving bud} \NewDictTranslation{trick-(ODw)}{trekk} diff --git a/macros/latex/contrib/onedown/ODw-spanish.trsl b/macros/latex/contrib/onedown/ODw-spanish.trsl new file mode 100644 index 0000000000..db88594dd7 --- /dev/null +++ b/macros/latex/contrib/onedown/ODw-spanish.trsl @@ -0,0 +1,160 @@ +% this is file ODw-spanish.trsl from the OneDown bundle +% +% Entries with a "!" denote an abreviated form +% +% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get donneur +% +\ProvideDictionaryFor{spanish}{ODw}[V0.51-2019/10/15] + +\NewDictTranslation{1st-(ODw)}{1er} +\NewDictTranslation{2nd-(ODw)}{2do} +\NewDictTranslation{3rd-(ODw)}{3er} +\NewDictTranslation{4th-(ODw)}{4th} +\NewDictTranslation{ace-(ODw)}{as} +\NewDictTranslation{Ace-(ODw)}{As} +\NewDictTranslation{all-(ODw)}{todos} +\NewDictTranslation{All-(ODw)}{Todos} +\NewDictTranslation{all!-(ODw)}{todos} +\NewDictTranslation{All!-(ODw)}{Todos} +\NewDictTranslation{all pass-(ODw)}{todos pasan} +\NewDictTranslation{All pass-(ODw)}{Todos pasan} +\NewDictTranslation{a-(ODw)}{a} +\NewDictTranslation{A-(ODw)}{A} +\NewDictTranslation{ap-(ODw)}{tp} +\NewDictTranslation{AP-(ODw)}{TP} +\NewDictTranslation{award-(ODw)}{premio} +\NewDictTranslation{Award-(ODw)}{Premio} +\NewDictTranslation{bid-(ODw)}{contrato} +\NewDictTranslation{Bid-(ODw)}{Contrato} +\NewDictTranslation{board-(ODw)}{estuche} +\NewDictTranslation{Board-(ODw)}{Estuche} +\NewDictTranslation{brd-(ODw)}{est} +\NewDictTranslation{Brd-(ODw)}{Est} +\NewDictTranslation{by-(ODw)}{por} +\NewDictTranslation{call-(ODw)}{annonce} +\NewDictTranslation{Call-(ODw)}{Annonce} +\NewDictTranslation{-card-(ODw)}{-carta} +\NewDictTranslation{contract-(ODw)}{contrato final} +\NewDictTranslation{Contract-(ODw)}{Contrato final} +\NewDictTranslation{contr-(ODw)}{ctrf} +\NewDictTranslation{Contr-(ODw)}{Ctrf} +\NewDictTranslation{Dbl-(ODw)}{Dbl} +\NewDictTranslation{dealer-(ODw)}{dador} +\NewDictTranslation{Dealer-(ODw)}{Dador} +\NewDictTranslation{deal!-(ODw)}{donne} +\NewDictTranslation{Deal!-(ODw)}{Donne} +\NewDictTranslation{deal-(ODw)}{donne} +\NewDictTranslation{Deal-(ODw)}{Donne} +\NewDictTranslation{declarer-(ODw)}{declarante} +\NewDictTranslation{Declarer-(ODw)}{Declarante} +\NewDictTranslation{decl-(ODw)}{decl} +\NewDictTranslation{Decl-(ODw)}{Decl} +\NewDictTranslation{distribution points-(ODw)}{puntos de distribución} +\NewDictTranslation{Distribution Points-(ODw)}{Puntos de Distribución} +\NewDictTranslation{doubled-(ODw)}{doblado} +\NewDictTranslation{Doubled-(ODw)}{Doblado} +\NewDictTranslation{double-(ODw)}{doblo} +\NewDictTranslation{Double-(ODw)}{Doblo} +\NewDictTranslation{dp-(ODw)}{pd} +\NewDictTranslation{DP-(ODw)}{PD} +\NewDictTranslation{east-(ODw)}{este} +\NewDictTranslation{East-(ODw)}{Este} +\NewDictTranslation{e-(ODw)}{e} +\NewDictTranslation{E-(ODw)}{E} +\NewDictTranslation{fourth suit forcing-(ODw)}{cuarto palo forcing} +\NewDictTranslation{Fourth Suit Forcing-(ODw)}{Cuarto Palo Forcing} +\NewDictTranslation{fsf-(ODw)}{4th\,pf} +\NewDictTranslation{FSF-(ODw)}{4th\,PF} +\NewDictTranslation{game forcing-(ODw)}{forcing a manga} +\NewDictTranslation{Game Forcing-(ODw)}{Forcing a Manga} +\NewDictTranslation{GF-(ODw)}{FG} +\NewDictTranslation{gf-(ODw)}{fg} +\NewDictTranslation{hand-(ODw)}{mano} +\NewDictTranslation{Hand-(ODw)}{Mano} +\NewDictTranslation{hcp-(ODw)}{ph} +\NewDictTranslation{HCP-(ODw)}{PH} +\NewDictTranslation{high card points-(ODw)}{puntos de honores} +\NewDictTranslation{High Card Points-(ODw)}{Puntos de Honores} +\NewDictTranslation{hlp-(ODw)}{hl} +\NewDictTranslation{HLP-(ODw)}{HL} +\NewDictTranslation{jack-(ODw)}{jaco} +\NewDictTranslation{Jack-(ODw)}{Jaco} +\NewDictTranslation{j-(ODw)}{j} +\NewDictTranslation{J-(ODw)}{J} +\NewDictTranslation{king-(ODw)}{rey} +\NewDictTranslation{King-(ODw)}{Rey} +\NewDictTranslation{k-(ODw)}{r} +\NewDictTranslation{K-(ODw)}{R} +\NewDictTranslation{lead!-(ODw)}{ent.} +\NewDictTranslation{Lead!-(ODw)}{Ent.} +\NewDictTranslation{lead-(ODw)}{entame} +\NewDictTranslation{Lead-(ODw)}{Entame} +\NewDictTranslation{length points-(ODw)}{points de longueur} +\NewDictTranslation{Length Points-(ODw)}{Points de Longueur} +\NewDictTranslation{lp-(ODw)}{pl} +\NewDictTranslation{LP-(ODw)}{PL} +\NewDictTranslation{new minor forcing-(ODw)}{neuvo menor forcing} +\NewDictTranslation{New Minor Forcing-(ODw)}{Neuvo Menor Forcing} +\NewDictTranslation{nmf-(ODw)}{nmf} +\NewDictTranslation{NMF-(ODw)}{NMF} +\NewDictTranslation{n-(ODw)}{n} +\NewDictTranslation{N-(ODw)}{N} +\NewDictTranslation{none-(ODw)}{nadie} +\NewDictTranslation{None-(ODw)}{Nadie} +\NewDictTranslation{none!-(ODw)}{nadie} +\NewDictTranslation{None!-(ODw)}{Nadie} +\NewDictTranslation{north-(ODw)}{norte} +\NewDictTranslation{North-(ODw)}{Norte} +\NewDictTranslation{no trump-(ODw)}{sin triunfo} +\NewDictTranslation{No Trump-(ODw)}{Sin Triunfo} +\NewDictTranslation{Nr-(ODw)}{\textnumero} +\NewDictTranslation{Nr.-(ODw)}{\textnumero.} +\NewDictTranslation{nt-(ODw)}{st} +\NewDictTranslation{NT-(ODw)}{S\kern-0.01emT} +\NewDictTranslation{pass-(ODw)}{paso} +\NewDictTranslation{Pass-(ODw)}{Paso} +\NewDictTranslation{pass!-(ODw)}{p} +\NewDictTranslation{Pass!-(ODw)}{P} +\NewDictTranslation{q-(ODw)}{d} +\NewDictTranslation{Q-(ODw)}{D} +\NewDictTranslation{queen-(ODw)}{dama} +\NewDictTranslation{Queen-(ODw)}{Dama} +\NewDictTranslation{ReDbl-(ODw)}{ReDbl} +\NewDictTranslation{redoubled-(ODw)}{redoblado} +\NewDictTranslation{Redoubled-(ODw)}{Redoblado} +\NewDictTranslation{redouble-(ODw)}{redoblo} +\NewDictTranslation{Redouble-(ODw)}{Redoblo} +\NewDictTranslation{semi forcing-(ODw)}{semi forcing} +\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing} +\NewDictTranslation{SF-(ODw)}{SF} +\NewDictTranslation{sf-(ODw)}{sf} +\NewDictTranslation{s-(ODw)}{s} +\NewDictTranslation{S-(ODw)}{S} +\NewDictTranslation{south-(ODw)}{sur} +\NewDictTranslation{South-(ODw)}{Sur} +\NewDictTranslation{suiter-(ODw)}{color} +\NewDictTranslation{Suiter-(ODw)}{Color} +\NewDictTranslation{suit-(ODw)}{palo} +\NewDictTranslation{Suit-(ODw)}{Palo} +\NewDictTranslation{third suit forcing-(ODw)}{tercer palo forcing} +\NewDictTranslation{Third Suit Forcing-(ODw)}{Tercer Palo Forcing} +\NewDictTranslation{total points-(ODw)}{puntos de honor-distribución} +\NewDictTranslation{Total Points-(ODw)}{Puntos de Honor-Distribución} +\NewDictTranslation{TP-(ODw)}{PHD} +\NewDictTranslation{tp-(ODw)}{phd} +\NewDictTranslation{trial bid-(ODw)}{trial bid} +\NewDictTranslation{Trial bid-(ODw)}{Trial bid} +\NewDictTranslation{trick-(ODw)}{baza} +\NewDictTranslation{Trick-(ODw)}{Baza} +\NewDictTranslation{tsf-(ODw)}{3er\,pf} +\NewDictTranslation{TSF-(ODw)}{3er\,PF} +\NewDictTranslation{vulnerable-(ODw)}{vulnerable} +\NewDictTranslation{Vulnerable-(ODw)}{Vulnerable} +\NewDictTranslation{vul-(ODw)}{vul} +\NewDictTranslation{Vul-(ODw)}{Vul} +\NewDictTranslation{west-(ODw)}{oeste} +\NewDictTranslation{West-(ODw)}{Oeste} +\NewDictTranslation{w-(ODw)}{o} +\NewDictTranslation{W-(ODw)}{O} +% +\endinput diff --git a/macros/latex/contrib/onedown/ODw-swedish.trsl b/macros/latex/contrib/onedown/ODw-swedish.trsl index 336c5a4d3d..5426b5e797 100644 --- a/macros/latex/contrib/onedown/ODw-swedish.trsl +++ b/macros/latex/contrib/onedown/ODw-swedish.trsl @@ -4,7 +4,7 @@ % Thanks to Per Karlberg % retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare % -\ProvideDictionaryFor{swedish}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{swedish}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1:a} \NewDictTranslation{2nd-(ODw)}{2:a} diff --git a/macros/latex/contrib/onedown/ODw-turkish.trsl b/macros/latex/contrib/onedown/ODw-turkish.trsl index e4f8683394..384fa6dfb1 100644 --- a/macros/latex/contrib/onedown/ODw-turkish.trsl +++ b/macros/latex/contrib/onedown/ODw-turkish.trsl @@ -4,7 +4,7 @@ % % retrieve with e.g. \GetTranslation{dealer-(ODw)} to get kâğıdı % -\ProvideDictionaryFor{turkish}{ODw}[V0.50-2019/02/21] +\ProvideDictionaryFor{turkish}{ODw}[V0.51-2019/10/15] \NewDictTranslation{1st-(ODw)}{1.} \NewDictTranslation{2nd-(ODw)}{2.} diff --git a/macros/latex/contrib/onedown/README b/macros/latex/contrib/onedown/README index a72c13ed32..e4e096028c 100644 --- a/macros/latex/contrib/onedown/README +++ b/macros/latex/contrib/onedown/README @@ -1,11 +1,11 @@ -------------------------------------------------------------------------- -The OneDown package v1.3 - 2019/02/21 +The OneDown package v1.4 - 2019/10/15 A package to typeset diagrams for the game of bridge -------------------------------------------------------------------------- Jacob Wiersma Web: -E-Mail: jack46@online.de +E-Mail: jack@schuli-wirsi.de -------------------------------------------------------------------------- Copyright 2018 Jacob Wiersma @@ -33,6 +33,7 @@ the files - ODw-danish.trsl ODw-english.trsl ODw-french.trsl ODw-norwegian.trsl ODw-turkish.trsl ODw-dutch.trsl ODw-fallback.trsl ODw-german.trsl ODw-swedish.trsl + ODw-spanish.trsl the directory examples with the files - onedown-examples.pdf onedown-ref.pdf @@ -67,11 +68,17 @@ be generated. Use this option at your own risk. MORE DOCUMENTATION - examples/onedown-examples.pdf - examples/onedown-ref.pdf +These are in english. To get PDFs which shows the (output of) onedown commands +in your language run + pdflatex '\AtBeginDocument{\def\RefLang{french}}\input{onedown-ref.tex}' +or + pdflatex '\AtBeginDocument{\def\ExLang{norsk}}\input{onedown-examples.tex}' +This works for all supported languages -------------------------------------------------------------------------- DESCRIPTION This packages provides macros to typeset bridge diagrams, including hands -(stand alone or arround a compass), bidding tables (stand alone or in +(stand alone or around a compass), bidding tables (stand alone or in connection with hands/compass), trick tables and expert quizes. -------------------------------------------------------------------------- REQUIREMENTS diff --git a/macros/latex/contrib/onedown/examples/onedown-examples.pdf b/macros/latex/contrib/onedown/examples/onedown-examples.pdf Binary files differdeleted file mode 100644 index 9bc5e63247..0000000000 --- a/macros/latex/contrib/onedown/examples/onedown-examples.pdf +++ /dev/null diff --git a/macros/latex/contrib/onedown/examples/onedown-examples.tex b/macros/latex/contrib/onedown/examples/onedown-examples.tex index d572b06cd2..1e5f5b57ad 100644 --- a/macros/latex/contrib/onedown/examples/onedown-examples.tex +++ b/macros/latex/contrib/onedown/examples/onedown-examples.tex @@ -1,6 +1,6 @@ %% %% onedown-examples.tex -%% April 16, 2018 +%% Oct 04, 2019 %% Requires the onedown bundle %% Part of the OneDown bundle (mirror.ctan.org/onedown) %% author: J. Wiersma @@ -17,9 +17,17 @@ \usepackage[T1]{fontenc} % \usepackage{subfiles}% can compile stand-alone/combined -\usepackage[dutch,norsk,% - turkish,shorthands=,% avoid problems with ':', '=' and '!' - german,english]{babel}% introduce possible languages +\usepackage[% + danish,% + dutch,% + french,% + german,% + norsk,% + spanish,es-noshorthands,% unset active chars to avoid problems with '.' '’' '"' '~' '<' and '>' + swedish,% + turkish,shorthands=,% unset active chars to avoid problems with ':', '=' and '!' + english,% +]{babel}% introduce all known languages, default is english %\usepackage[mono=false]{libertine}% verbatim needs option mono=false % linertine screws verbatim, at least I don't know how to handle that @@ -104,8 +112,15 @@ \def\SubFile#1{\def\FileName{#1}\newpage\section{#1}\subfile{#1}} \addtolength{\textheight}{1.5cm} - +\def\ExLang{english} \begin{document} +% when compiled with: +% pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}' +% you'll get the onedown commands expansions in YourLanguage +% YourLanguage can be any language out of: +% english, danish, dutch, french, german, norsk, spanish, swedish, turkish +% +\expandafter\selectlanguage\expandafter{\ExLang} \pdfbookmark[1]{Title}{Title} \title{Examples for the\\\OneDown package% \footnote{This file is part of the \OneDown bundle. To generate this file, @@ -137,6 +152,12 @@ sections bear the file name, which can also be found in the list below. The examples are produced using the \textsf{tcolorbox} package. This enables us to show the code and the output of it side by side. +The explanatory text is always in the English language. But you can show the output of all commands +in any of the supported languages.\\ +These are: english, danish, dutch, french, german, norsk, spanish, swedish, turkish. \\ +You obtain this output in \emph{YourLanguage} by compiling onedown-ref.tex with: \\[0.2em] + +\verb|pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-examples.tex}'| \par\vspace{1\baselineskip} \setlength\columnseprule{.8pt}% rule between cols \begin{multicols}{3}[{\centering \textbf{\Large List of Examples}}] diff --git a/macros/latex/contrib/onedown/examples/onedown-ref.pdf b/macros/latex/contrib/onedown/examples/onedown-ref.pdf Binary files differdeleted file mode 100644 index c59b80f641..0000000000 --- a/macros/latex/contrib/onedown/examples/onedown-ref.pdf +++ /dev/null diff --git a/macros/latex/contrib/onedown/examples/onedown-ref.tex b/macros/latex/contrib/onedown/examples/onedown-ref.tex index 44930e12e0..6d16724130 100644 --- a/macros/latex/contrib/onedown/examples/onedown-ref.tex +++ b/macros/latex/contrib/onedown/examples/onedown-ref.tex @@ -1,4 +1,41 @@ -\documentclass[onedown-examples]{subfiles} +%% +%% onedown-ref.tex +%% Oct 04, 2019 +%% Requires the onedown bundle +%% Part of the OneDown bundle (mirror.ctan.org/onedown) +%% author: J. Wiersma +%%--------NOTE------------------------------------------- +%% USAGE: (pdf)latex onedown-ref.tex +%%------------------------------------------------------- + +\documentclass[a4paper,fontsize=11pt]{scrartcl} +\usepackage{scrlayer-scrpage} +% +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +% +\usepackage[% + danish,% + dutch,% + french,% + german,% + norsk,% + spanish,es-noshorthands,% unset active chars to avoid problems with '.' '’' '"' '~' '<' and '>' + swedish,% + turkish,shorthands=,% unset active chars to avoid problems with ':', '=' and '!' + english,% +]{babel}% introduce all known languages, default is english + +\usepackage{onedown}% our own style to set bridge stuff +\usepackage[a4paper, total={185mm, 257mm},left=12mm,top=20mm]{geometry} +\newcommand\OneDown{\textcolor{red}{\smaller\bfseries\textsc{OneDown}}\xspace} +\usepackage{shortvrb} +\MakeShortVerb{\|} +\usepackage{enumitem}% +%\fi +% +%%% +% \usepackage[Q=yes]{examplep} \makeatletter \def\verbatim@font{\ttfamily\bfseries @@ -19,9 +56,16 @@ % \definecolor{optbackgr}{named}{lightgray} \newcommand\Oarg[1]{\colorbox{optbackgr}{\texttt{#1}}} - +% default language to show the onedown command +\def\RefLang{english} \begin{document} - +% when compiled with: +% pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}' +% you'll get the onedown commands expansions in YourLanguage +% YourLanguage can be any language out of: +% english, danish, dutch, french, german, norsk, spanish, swedish, turkish +% +\expandafter\selectlanguage\expandafter{\RefLang} \larger \newgeometry{total={150mm, 265mm},left=25mm,top=15mm} \pagestyle{empty} @@ -37,8 +81,14 @@ angles |<...>|. Optional tokens of a command appear with a different background color, like \Oarg{*!}. Output of a tokenized |\macro*!| is shown as: \quad|\macro|\Oarg{*!}|: \macro, \macro*, \macro!, \macro*!|\\ -All output is shown for the English language. - +The explanatory text is always in the English language. But you can show the output of all commands +in any of the supported languages.\\ +These are: english, danish, dutch, french, german, norsk, spanish, swedish, turkish. \\ +You obtain this output in \emph{YourLanguage} by compiling onedown-ref.tex with: \\[0.5em] +% +\verb|pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'| +\\[0.7em] +\centerline{\textbf{This document shows the commands for the \emph{\RefLang}\ language}} \begin{description}[itemsep=-0.3em] \item[ace]: \ace \item[Ace\Oarg{*!}]: \Ace, \Ace*, \Ace!, \Ace*! @@ -118,7 +168,7 @@ To denote the rank \suit{T}, one has to use the uppercase letter |T|. \item[eastwest]: \eastwest \item[Eastwest\Oarg{*!}]: \EastWest, \EastWest*, \EastWest!, \EastWest*! -\item[expertquiz\Oarg{*!}\Q{[comment]}{award}]\\ +\item[expertquiz\Oarg{*!}\Q{[comment]{award}}]\\ Typesets a quiz, showing a predefined hand and a predefined bidding diagram. The star version centers the output. The token |!| forces a newline between hand and bidding @@ -460,6 +510,7 @@ These macros, called in a bidding table\ldots 8 & {\Pass*!} & {\Double*!} & {\Redouble*!} & {\Allpass*!} \\ 9 & {\pass} & {\double} & {\redouble} & {\allpass} \\ \end{tabular}\\ + \end{document} \endinput diff --git a/macros/latex/contrib/onedown/onedown.dtx b/macros/latex/contrib/onedown/onedown.dtx index 9e5e53941d..89f6d5034b 100644 --- a/macros/latex/contrib/onedown/onedown.dtx +++ b/macros/latex/contrib/onedown/onedown.dtx @@ -24,10 +24,10 @@ \ProvidesFile{onedown.dtx} %</driver> %<package>\NeedsTeXFormat{LaTeX2e}[2014/05/01] -%<package>\def\ODwstyleversion{1.3}\def\ODwstyledate{2019/02/21} +%<package>\def\ODwstyleversion{1.4}\def\ODwstyledate{2019/10/15} %<package>\ProvidesPackage{onedown} %<package> [\ODwstyledate\space v\ODwstyleversion\space -%<package> Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2018] +%<package> Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2019] % %<*driver> %\documentclass[a4paper,12pt,draft]{ltxdoc}% with draft no hyperrefs @@ -37,7 +37,7 @@ % \usepackage[T1]{fontenc} \usepackage[german,dutch,french,swedish,english,shorthands=]{babel} -\usepackage{onedown}[2018/10/31] +\usepackage{onedown}[2019/10/15] \usepackage[normalem]{ulem}% for strikeout todos that are done \usepackage{needspace}% keep contiguous lines on one page \usepackage[inline]{enumitem}% Control various parameters of lists @@ -209,7 +209,7 @@ %</driver> % \fi % -% \CheckSum{3731} +% \CheckSum{3771} % % \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 @@ -272,7 +272,7 @@ % - Made ODw@OtherFont local where necessary.\\ % - Redefined columntypes.\\ % - Made 'T' a code for '10'.\\ -% - Adapted the translate macro to enable both 1H and 1\cmd{\He} etc. \\ +% - Adapted the 'translate' macro to enable both 1H and 1\cmd{\He} etc. \\ % - Enhanced the documentation.} % % \changes{v0.6}{2018/03/14}{\\ @@ -290,9 +290,9 @@ % % \changes{v0.7a}{2018/03/24}{\\ % - Major change: Removed all \cmd{\bidXX} and \cmd{\bidXXpair} commands.\\ -% - The biddings can now be shown with \cmd{\showXX+} (with token '+').\\ +% - The biddings can now be shown with \cmd{\showXX+} (with token '\texttt{+}').\\ % - The macros \cmd{\hand-} and the bidding environments suppress their -% output with token '-'} +% output with token '\texttt{-}'} % % \changes{v0.8}{2018/04/11}{\\ % - Added package \packname{verbatimbox} to adjust verbatim font easily.\\ @@ -357,16 +357,35 @@ % \cmd{\ODw@LongCalls}\\ % - In command \cmd{\suit} changed 'JW \cmd{\ODw@GameSize}' into % '\cmd{\ODw@GameSize}'} -% \changes{v1.3}{2019/02/21}{\\ +% \changes{v1.3a}{2019/02/21}{\\ % - Added \cmd{\HLP} \\ % - Changed/Added in all relevant ODw-lang.trsl: \\ -% - FP into F and fp into f (entry HCP/hcp) \\ -% - Figuren-Punkte into Figurenpunkte and figuren-punkte into figurenpunkte \\ -% - FL into L and f{}l into l \\ -% - \cmd{\NewDictTranslation\\ -% \{HLP-(ODw)\}\{FL\}} (e.g. for german) +% - 'V0.4' into 'V0.4-2018/12/01' \\ +% - 'FP' into 'F' , 'fp' into 'f' (entry HCP/hcp) \\ +% - 'Figuren-Punkte' into 'Figurenpunkte' , 'figuren-punkte' into 'figurenpunkte' \\ +% - 'FL' into 'L' , 'f{}l' into 'l' \\ +% - \cmd{\NewDictTranslation\\ \{HLP-(ODw)\}\{FL\}} (german) +% } +% \changes{v1.3b}{2019/03/16}{\\ +% - Added setdefaults to the list of User Commands \\ +% - Corrected \cmd{\setdefaults} in onedown-examples: \\ +% - changed [~] into \{\} \\ +% - Adapted/corrected onedown-ref and onedown-examples \\ +% - Added color 'gray' for special effects +% } +% \changes{v1.4}{2019/10/12}{\\ +% - Made \emph{onedown-ref} independent of \emph{onedown-examples} and \emph{subfiles} \\ +% - Corrected some mistakes ODw-*.trsl files, all \texttt{V0.51-2019/10/15} \\ +% - Added macro \cmd{\Ten} to get rid of the extra enlargment by 'scalefnt' in \cmd{\gamefont} +% - Added support for the spanish language \\ +% - Made onedown-ref.tex and onedown-examples.tex multilangual. We can output the onedown +% commands in all supported languages. \\ +% - \cmd{\DeclareSymbolFont \\ \{symbols\}\{OMS\} \{txsy\}\{m\}\{n\}} interferes with package \packname{newtxmath}. +% I renamed \emph{symbols} into \textbf{ODw@symbols} and \emph{symbolsC} into \textbf{ODw@symbolsC} +% to solve this. % } % ^^A Note: ^^21 denotes the exclamation mark (!) +% ^^A Note: Char ' is not allowed within changes % % \DoNotIndex{\newcommand,\newenvironment,\BODY,\boolean,\IfEqCase,\IfInteger, % \DeclareFontSubstitution,\dimexpr,\ifcat,\ifmmode,\IfValueT, @@ -442,7 +461,7 @@ % ^^A The frustrating ltxdoc also obfuscates this simple thing! % \thispagestyle{empty} % } -% \author{Jacob Wiersma \\ \url{jack46@online.de}} +% \author{Jacob Wiersma \\ \url{jack@schuli-wirsi.de}} % \date{v\ODwstyleversion~from \ODwstyledate} % % \maketitle @@ -670,10 +689,11 @@ pdflatex --shell-escape onedown.dtx % As said before, the package loads its options using the % \meta{key}=\meta{val} syntax. These options deal with: % \begin{itemize} -% \item[colors] \verb:colors=0|1|2|4A|4B:\\ +% \item[colors] \verb:colors=0|1|2|3|4A|4B:\\ % The color in which the card symbols will % be printed. The color options are \textbf{0} (black only), \textbf{1} -% (black and white) \textbf{2} (black and red), \textbf{4A} (green, orange, +% (black and white) \textbf{2} (black and red), \textbf{3} (grey (for special effects)), +% \textbf{4A} (green, orange, % red and blue), \textbf{4B} (black, orange, red and green). We also % defined some synonyms, as shown in the table below. % \par @@ -685,12 +705,16 @@ pdflatex --shell-escape onedown.dtx % (synonyms: |b+w|) % \item[x=2:] {\setdefaults{colors=2} \Cl, \Di, \He and \Sp} % (synonyms: |b+r|) +% \item[x=3:] {\setdefaults{colors=3} \Cl, \Di, \He and \Sp} +% (synonyms: |gray|, |grey|) % \item[x=4A:] {\setdefaults{colors=4A} \Cl, \Di, \He and \Sp} % (synonyms: |4a|, |fourA|) % \item[x=4B:] {\setdefaults{colors=4B} \Cl, \Di, \He and \Sp} % (synonyms: |4b|, |fourB|) % \end{itemize} -% The default is |colors=2| for printing in black and red. +% The default is |colors=2| for printing in black and red. Please note, that |colors=3| is not +% meant to typeset the whole document. You can use it if you want e.g. to repeat something and want +% it to be less apparent. % \item[err, warn] \verb:err=on|off:\qquad\verb:warn=|on|off:\\ % These options regulate which messages are to be output. These % messages have to do with the consistency of cards in @@ -712,7 +736,7 @@ pdflatex --shell-escape onedown.dtx % \subsubsection{Active Characters: a Warning}\label{Languages} % % \OneDown uses the \packname{tranlation} package to automatically -% translate oft appearing brigde terms like e.g.\ \emph{declarer}. It does +% translate often appearing brigde terms like e.g.\ \emph{declarer}. It does % so by looking up these terms in the special |ODw|-dictionary for the % active language. The current \OneDown version supports English, German, % Dutch, French, most Scadinavian languages and Turkish. Some dictionaries @@ -875,7 +899,9 @@ pdflatex --shell-escape onedown.dtx % \DescribeMacro{\eastwest}\MacroDef*+{eastwest}[\hfill \eastwest] % The next 4 macros typeset the \emph{unit} of the points when valuing a % bridge hand. If one or more of these items do not appear in your bridge -% world, don't argue them, Just don't use them! +% world, don't argue them, Just don't use them! They are meant to specify +% \emph{High Card Points}, \emph{High Card + Length Points}, \emph{Length Points}, +% \emph{Distribution Points} and \emph{Total Points} respectively. % \par\vspace{0.5\baselineskip}\noindent % \DescribeMacro{\HCP}\MacroDef*+{HCP}[\hfill \HCP] % \par\noindent @@ -1426,7 +1452,7 @@ pdflatex --shell-escape onedown.dtx % other & otherfont \\\hline % \\ % key & value \\\hline -% colors & 0|1|\underline{2}|4A|4B \\ +% colors & 0|1|\underline{2}|3|4A|4B \\ % warn & \underline{off}|on \\ % err & off|\underline{on} \\ % \hline @@ -1661,6 +1687,7 @@ pdflatex --shell-escape onedown.dtx % \subsection{ToDo} % % \begin{itemize}[itemsep=-2mm] +% \item Add the High Points to card diagrams (like Turnier in KA) % \item Check if |\def\xspace{}| is also needed in bidding...? % \item Make a template for showing 16 hands on 1 DIN A4 (3x5+1 or 4x4 % landscape) e.g as handout for the hands on slides. @@ -2131,32 +2158,34 @@ pdflatex --shell-escape onedown.dtx % % Code stolen from txfonts.sty. % It works smoothly: thank you guys! +% Because of an interference with package newtxmath I had to rename +% symbols into ODw@symbols and symbolsC into ODw@symbolsC % -\DeclareSymbolFont{symbols}{OMS}{txsy}{m}{n} -\SetSymbolFont{symbols}{bold}{OMS}{txsy}{bx}{n} +\DeclareSymbolFont{ODw@symbols}{OMS}{txsy}{m}{n} +\SetSymbolFont{ODw@symbols}{bold}{OMS}{txsy}{bx}{n} \DeclareFontSubstitution{OMS}{txsy}{m}{n} -\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} -\SetSymbolFont{symbolsC}{bold}{U}{txsyc}{bx}{n} +\DeclareSymbolFont{ODw@symbolsC}{U}{txsyc}{m}{n} +\SetSymbolFont{ODw@symbolsC}{bold}{U}{txsyc}{bx}{n} \DeclareFontSubstitution{U}{txsyc}{m}{n} % \end{macrocode} % \begin{macro}{\ODw@spadesuit} % \begin{macrocode} -\DeclareMathSymbol{\ODw@spadesuit}{\mathord}{symbols}{127} +\DeclareMathSymbol{\ODw@spadesuit}{\mathord}{ODw@symbols}{127} % \end{macrocode} % \end{macro} % \begin{macro}{\ODw@varheart} % \begin{macrocode} -\DeclareMathSymbol{\ODw@varheart}{\mathord}{symbolsC}{114} +\DeclareMathSymbol{\ODw@varheart}{\mathord}{ODw@symbolsC}{114} % \end{macrocode} % \end{macro} % \begin{macro}{\ODw@vardiamond} % \begin{macrocode} -\DeclareMathSymbol{\ODw@vardiamond}{\mathord}{symbolsC}{113} +\DeclareMathSymbol{\ODw@vardiamond}{\mathord}{ODw@symbolsC}{113} % \end{macrocode} % \end{macro} % \begin{macro}{\ODw@clubsuit} % \begin{macrocode} -\DeclareMathSymbol{\ODw@clubsuit}{\mathord}{symbols}{124} +\DeclareMathSymbol{\ODw@clubsuit}{\mathord}{ODw@symbols}{124} % \end{macrocode} % \end{macro} % @@ -2172,6 +2201,8 @@ pdflatex --shell-escape onedown.dtx % |colors=0| means mono-color (black only), synonyms of key 0 are |mono| % and |black|. |colors=1| means black and white, a synonym is |b+w|. % |colors=2| means bi-color (black and red), with synonym |b+r|. +% |colors=3| means grey, with synonyms |gray| and |grey|. This 'color' is meant for special +% effects, e.g. for making unimportant parts less visible % |colors=4A| gives qua-color (green, orange, red and blue); synonyms are % |fourA| and |4a|. Finally |colors=4B| defines the second qua-color (black, % orange, red and green) with synonyms |fourB| and |4b|. @@ -2236,6 +2267,22 @@ pdflatex --shell-escape onedown.dtx \ODw@set{colors/b+r/.code={\pgfkeys{/ODw/colors=2}}} % \ODw@set{% + colors/3/.code={% + \ODw@monochromefalse% + \renewrobustcmd\Cl{\textcolor{gray}% + {\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}% + \renewrobustcmd\Di{\textcolor{gray}% + {\,[0.3]\ensuremath{\ODw@vardiamond}}\xspace}% + \renewrobustcmd\He{\textcolor{gray}% + {\,[0.3]\ensuremath{\ODw@varheart}}\xspace}% + \renewrobustcmd\Sp{\textcolor{gray}% + {\,[0.3]\ensuremath{\ODw@spadesuit}}\xspace}% + }% +} +\ODw@set{colors/grey/.code={\pgfkeys{/ODw/colors=3}}} +\ODw@set{colors/gray/.code={\pgfkeys{/ODw/colors=3}}} +% +\ODw@set{% colors/4A/.code={% \ODw@monochromefalse% \renewrobustcmd\Cl{\textcolor{green}% @@ -5343,6 +5390,19 @@ pdflatex --shell-escape onedown.dtx % \end{macro} % \end{macro} % +% \begin{macro}{\Ten} +% \begin{macrocode} +\newcommand{\Ten}{% + \bgroup% +%JW \ODw@GameFont% + 10% + \egroup% + \xspace% +}% Ten +% \end{macrocode} +% \end{macro} + +% % \subsubsection{Vulnerability} % % These macros retrieve the translations of the 4 alternative forms of the diff --git a/macros/latex/contrib/onedown/onedown.pdf b/macros/latex/contrib/onedown/onedown.pdf Binary files differindex 5824bb113c..c503a27925 100644 --- a/macros/latex/contrib/onedown/onedown.pdf +++ b/macros/latex/contrib/onedown/onedown.pdf diff --git a/macros/latex/contrib/xkcdcolors/README.md b/macros/latex/contrib/xkcdcolors/README.md index 2cd3f17100..f96d17a782 100644 --- a/macros/latex/contrib/xkcdcolors/README.md +++ b/macros/latex/contrib/xkcdcolors/README.md @@ -7,3 +7,6 @@ Afterward, he processed the data and sorted the names for each color by populari He obtained a nice list of around 950 color names. It's not at all surprising that a lot of people forged `CloudyBlue`, but some color is really surprising, like for example `BabyPoopGreen` or `DullPink`... +### LICENSE + +This package use Randall Munroe's file [rgb.txt](https://xkcd.com/color/rgb.txt) which is distributed under [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/). You can use that license or [LPPL 1.3c](https://www.latex-project.org/lppl/lppl-1-3c/) diff --git a/macros/latex/contrib/xkcdcolors/lppl-1-3c_license.txt b/macros/latex/contrib/xkcdcolors/lppl-1-3c_license.txt new file mode 100644 index 0000000000..2244313901 --- /dev/null +++ b/macros/latex/contrib/xkcdcolors/lppl-1-3c_license.txt @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % 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 M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + diff --git a/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf Binary files differindex f1574d99f7..59fc42c734 100644 --- a/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf +++ b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf diff --git a/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex index f0f3d57fa8..884790b5cf 100644 --- a/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex +++ b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex @@ -1,4 +1,14 @@ \documentclass[12pt]{article} +% +% Manual for the package `xkcdcolors` +% Copyright (c) Romano Giannetti 2019 +% License: LPPL 1.3c (https://ctan.org/license/lppl1.3c) +% +% The colors are created using +% Randall Munroe's .txt file: https://xkcd.com/color/rgb.txt +% That file explicitly state a CC0 1.0 , see +% https://creativecommons.org/publicdomain/zero/1.0/ +% \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{doc} @@ -11,7 +21,7 @@ \def\ancho{3.5cm} \coordinate (top) at (\ancho,1); \draw[thick, draw=black, fill=#1] (0,0) rectangle (top); - \node[align=center, anchor=north west, text width=\ancho] at (0,0) {\strut\hspace{0pt} #1}; + \node[align=center, anchor=north west, text width=\ancho] at (0,0) {\strut\hspace{0pt}\relax #1}; \end{tikzpicture} } \title{\texttt{xkcdcolors} package} @@ -36,7 +46,7 @@ To use the package, just load the package with: \noindent and enjoy all your new colors --- with a prepended \texttt{xkcd} to avoid clash with standard colors. For example: \begin{verbatim} - \textcolor{xkcdPinyPurple}{this is Pinky Purple} + \textcolor{xkcdPinkyPurple}{this is Pinky Purple} \end{verbatim} \noindent will render as \textcolor{xkcdPinkyPurple}{this is Pinky Purple}. diff --git a/macros/latex/contrib/xkcdcolors/xkcdcolors.sty b/macros/latex/contrib/xkcdcolors/xkcdcolors.sty index 7cac7e4037..b10470c431 100644 --- a/macros/latex/contrib/xkcdcolors/xkcdcolors.sty +++ b/macros/latex/contrib/xkcdcolors/xkcdcolors.sty @@ -1,15 +1,23 @@ +% \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1996/06/01] -\ProvidesPackage{xkcdcolors}[2019/10/20 v1.0 Provide names for xkcd colors] +\ProvidesPackage{xkcdcolors}[2019/10/21 v1.0.1 Provide names for xkcd colors] \RequirePackage{xcolor} +% \end{macrocode} % -% Created by Romano Giannetti <romano.giannetti@gmail.com>. Same license of -% the original txt file: http://creativecommons.org/publicdomain/zero/1.0/ -% you can also distribute it under LPPL (LaTeX) license +% Created by Romano Giannetti <romano.giannetti@gmail.com>. +% Using Randall Munroe's .txt file: https://xkcd.com/color/rgb.txt +% That file explicitly state a CC0 1.0 , see +% https://creativecommons.org/publicdomain/zero/1.0/ +% +% This file is distributable under the same CC0 1.0 license, OR +% Copyright (c) Romano Giannetti 2019 +% License: LPPL 1.3c (https://ctan.org/license/lppl1.3c) % % Original color set by Randall Munroe % See http://xkcd.com/color/rgb/ % - +% \begin{macrocode} +% \definecolorset{HTML}{xkcd}{}{% CloudyBlue,ACC2D9;% DarkPastelGreen,56AE57;% @@ -961,4 +969,4 @@ Green,15B01A;% Purple,7E1E9C} \endinput - +% \end{macrocode} |