From fa4840ca74917d6402885b9b77c26e51b61fc68a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 19 Jun 2020 03:03:14 +0000 Subject: CTAN sync 202006190303 --- macros/latex/contrib/l3backend/CHANGELOG.md | 10 +- macros/latex/contrib/l3backend/README.md | 2 +- .../latex/contrib/l3backend/l3backend-basics.dtx | 12 +- macros/latex/contrib/l3backend/l3backend-box.dtx | 2 +- macros/latex/contrib/l3backend/l3backend-color.dtx | 118 +++++-------- macros/latex/contrib/l3backend/l3backend-draw.dtx | 190 +++++++-------------- .../latex/contrib/l3backend/l3backend-graphics.dtx | 2 +- .../latex/contrib/l3backend/l3backend-header.dtx | 2 +- macros/latex/contrib/l3backend/l3backend-pdf.dtx | 2 +- macros/latex/contrib/l3experimental/CHANGELOG.md | 9 +- macros/latex/contrib/l3experimental/README.md | 2 +- .../latex/contrib/l3experimental/l3benchmark.dtx | 4 +- .../latex/contrib/l3experimental/l3benchmark.pdf | Bin 314256 -> 314598 bytes macros/latex/contrib/l3experimental/l3cctab.dtx | 4 +- macros/latex/contrib/l3experimental/l3cctab.pdf | Bin 358345 -> 358686 bytes macros/latex/contrib/l3experimental/l3color.dtx | 113 ++++++------ macros/latex/contrib/l3experimental/l3color.pdf | Bin 353218 -> 350143 bytes .../latex/contrib/l3experimental/l3draw-boxes.dtx | 2 +- .../latex/contrib/l3experimental/l3draw-code.pdf | Bin 625435 -> 625280 bytes .../latex/contrib/l3experimental/l3draw-layers.dtx | 2 +- .../latex/contrib/l3experimental/l3draw-paths.dtx | 2 +- .../latex/contrib/l3experimental/l3draw-points.dtx | 2 +- .../latex/contrib/l3experimental/l3draw-scopes.dtx | 2 +- .../contrib/l3experimental/l3draw-softpath.dtx | 2 +- .../latex/contrib/l3experimental/l3draw-state.dtx | 31 +--- .../contrib/l3experimental/l3draw-transforms.dtx | 2 +- macros/latex/contrib/l3experimental/l3draw.dtx | 4 +- macros/latex/contrib/l3experimental/l3draw.pdf | Bin 491347 -> 491676 bytes macros/latex/contrib/l3experimental/l3galley.dtx | 4 +- macros/latex/contrib/l3experimental/l3galley.pdf | Bin 385746 -> 386087 bytes macros/latex/contrib/l3experimental/l3graphics.dtx | 4 +- macros/latex/contrib/l3experimental/l3graphics.pdf | Bin 363101 -> 363448 bytes macros/latex/contrib/l3experimental/l3pdf-code.pdf | Bin 278441 -> 278911 bytes macros/latex/contrib/l3experimental/l3pdf.dtx | 4 +- macros/latex/contrib/l3experimental/l3pdf.pdf | Bin 350783 -> 351127 bytes .../latex/contrib/l3experimental/l3str-format.dtx | 4 +- .../latex/contrib/l3experimental/l3str-format.pdf | Bin 344892 -> 345232 bytes .../latex/contrib/l3experimental/l3sys-shell.dtx | 4 +- .../latex/contrib/l3experimental/l3sys-shell.pdf | Bin 311722 -> 312062 bytes macros/latex/contrib/l3experimental/xcoffins.dtx | 4 +- macros/latex/contrib/l3experimental/xcoffins.pdf | Bin 372892 -> 373229 bytes macros/latex/contrib/l3experimental/xgalley.dtx | 4 +- macros/latex/contrib/l3experimental/xgalley.pdf | Bin 285677 -> 286017 bytes macros/latex/contrib/l3kernel/CHANGELOG.md | 14 +- macros/latex/contrib/l3kernel/README.md | 2 +- macros/latex/contrib/l3kernel/expl3.dtx | 189 +++++++++++++++----- macros/latex/contrib/l3kernel/expl3.pdf | Bin 584997 -> 585320 bytes macros/latex/contrib/l3kernel/interface3.pdf | Bin 1546695 -> 1545894 bytes macros/latex/contrib/l3kernel/interface3.tex | 2 +- macros/latex/contrib/l3kernel/l3alloc.dtx | 2 +- macros/latex/contrib/l3kernel/l3basics.dtx | 2 +- macros/latex/contrib/l3kernel/l3bootstrap.dtx | 2 +- macros/latex/contrib/l3kernel/l3box.dtx | 2 +- macros/latex/contrib/l3kernel/l3candidates.dtx | 156 +---------------- macros/latex/contrib/l3kernel/l3clist.dtx | 2 +- macros/latex/contrib/l3kernel/l3coffins.dtx | 2 +- macros/latex/contrib/l3kernel/l3color-base.dtx | 30 ++-- macros/latex/contrib/l3kernel/l3debug.dtx | 2 +- macros/latex/contrib/l3kernel/l3deprecation.dtx | 16 +- macros/latex/contrib/l3kernel/l3doc.dtx | 2 +- macros/latex/contrib/l3kernel/l3docstrip.dtx | 2 +- macros/latex/contrib/l3kernel/l3docstrip.pdf | Bin 263284 -> 263622 bytes macros/latex/contrib/l3kernel/l3expan.dtx | 2 +- macros/latex/contrib/l3kernel/l3file.dtx | 2 +- macros/latex/contrib/l3kernel/l3final.dtx | 2 +- macros/latex/contrib/l3kernel/l3flag.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-assign.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-aux.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-basics.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-convert.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-expo.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-extended.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-logic.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-parse.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-random.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-round.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-traps.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp-trig.dtx | 2 +- macros/latex/contrib/l3kernel/l3fp.dtx | 2 +- macros/latex/contrib/l3kernel/l3fparray.dtx | 2 +- macros/latex/contrib/l3kernel/l3int.dtx | 2 +- macros/latex/contrib/l3kernel/l3intarray.dtx | 2 +- .../latex/contrib/l3kernel/l3kernel-functions.dtx | 2 +- macros/latex/contrib/l3kernel/l3keys.dtx | 2 +- macros/latex/contrib/l3kernel/l3legacy.dtx | 2 +- macros/latex/contrib/l3kernel/l3luatex.dtx | 2 +- macros/latex/contrib/l3kernel/l3msg.dtx | 92 +++++++++- macros/latex/contrib/l3kernel/l3names.dtx | 2 +- macros/latex/contrib/l3kernel/l3news.pdf | Bin 379248 -> 379248 bytes macros/latex/contrib/l3kernel/l3news01.pdf | Bin 113529 -> 113529 bytes macros/latex/contrib/l3kernel/l3news02.pdf | Bin 140776 -> 140776 bytes macros/latex/contrib/l3kernel/l3news03.pdf | Bin 144784 -> 144784 bytes macros/latex/contrib/l3kernel/l3news04.pdf | Bin 107117 -> 107117 bytes macros/latex/contrib/l3kernel/l3news05.pdf | Bin 105090 -> 105090 bytes macros/latex/contrib/l3kernel/l3news06.pdf | Bin 140797 -> 140797 bytes macros/latex/contrib/l3kernel/l3news07.pdf | Bin 119092 -> 119092 bytes macros/latex/contrib/l3kernel/l3news08.pdf | Bin 152413 -> 152413 bytes macros/latex/contrib/l3kernel/l3news09.pdf | Bin 235323 -> 235323 bytes macros/latex/contrib/l3kernel/l3news10.pdf | Bin 147096 -> 147096 bytes macros/latex/contrib/l3kernel/l3news11.pdf | Bin 165956 -> 165956 bytes macros/latex/contrib/l3kernel/l3news12.pdf | Bin 199153 -> 199153 bytes macros/latex/contrib/l3kernel/l3prefixes.pdf | Bin 75645 -> 75645 bytes macros/latex/contrib/l3kernel/l3prg.dtx | 2 +- macros/latex/contrib/l3kernel/l3prop.dtx | 2 +- macros/latex/contrib/l3kernel/l3quark.dtx | 2 +- macros/latex/contrib/l3kernel/l3regex.dtx | 7 +- macros/latex/contrib/l3kernel/l3seq.dtx | 66 ++++++- macros/latex/contrib/l3kernel/l3skip.dtx | 2 +- macros/latex/contrib/l3kernel/l3sort.dtx | 2 +- macros/latex/contrib/l3kernel/l3str-convert.dtx | 2 +- macros/latex/contrib/l3kernel/l3str.dtx | 2 +- macros/latex/contrib/l3kernel/l3styleguide.pdf | Bin 280028 -> 280369 bytes macros/latex/contrib/l3kernel/l3styleguide.tex | 2 +- macros/latex/contrib/l3kernel/l3syntax-changes.pdf | Bin 228323 -> 228663 bytes macros/latex/contrib/l3kernel/l3syntax-changes.tex | 2 +- macros/latex/contrib/l3kernel/l3sys.dtx | 2 +- macros/latex/contrib/l3kernel/l3term-glossary.pdf | Bin 186544 -> 186883 bytes macros/latex/contrib/l3kernel/l3term-glossary.tex | 2 +- macros/latex/contrib/l3kernel/l3text-case.dtx | 2 +- macros/latex/contrib/l3kernel/l3text-purify.dtx | 2 +- macros/latex/contrib/l3kernel/l3text.dtx | 2 +- macros/latex/contrib/l3kernel/l3tl-analysis.dtx | 2 +- macros/latex/contrib/l3kernel/l3tl.dtx | 2 +- macros/latex/contrib/l3kernel/l3token.dtx | 2 +- macros/latex/contrib/l3kernel/l3unicode.dtx | 2 +- macros/latex/contrib/l3kernel/source3.pdf | Bin 5902693 -> 5904224 bytes macros/latex/contrib/l3kernel/source3.tex | 2 +- macros/latex/contrib/tudscr/README.md | 8 +- macros/latex/contrib/tudscr/doc/tudscr.pdf | Bin 1153970 -> 1096069 bytes macros/latex/contrib/tudscr/doc/tudscr_print.pdf | Bin 1138793 -> 1080508 bytes macros/latex/contrib/tudscr/doc/tudscrsource.pdf | Bin 1015159 -> 1053052 bytes .../contrib/tudscr/doc/tutorials/mathswap.pdf | Bin 121062 -> 121062 bytes .../contrib/tudscr/doc/tutorials/mathtype.pdf | Bin 138011 -> 138011 bytes .../contrib/tudscr/doc/tutorials/treatise.pdf | Bin 888937 -> 866428 bytes macros/latex/contrib/tudscr/source/doc/tudscr.tex | 2 +- macros/latex/contrib/tudscr/source/tudscr-area.dtx | 165 +++++++++++++----- macros/latex/contrib/tudscr/source/tudscr-comp.dtx | 8 +- .../latex/contrib/tudscr/source/tudscr-fonts.dtx | 137 +++++++++++++-- .../contrib/tudscr/source/tudscr-localization.dtx | 10 +- .../latex/contrib/tudscr/source/tudscr-version.dtx | 2 +- 140 files changed, 888 insertions(+), 673 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md index 4a6efebd0a..cbd624e024 100644 --- a/macros/latex/contrib/l3backend/CHANGELOG.md +++ b/macros/latex/contrib/l3backend/CHANGELOG.md @@ -6,6 +6,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-06-18] + +### Changed +- Use `scn` operator for separations +- Internal color model +- Internal performance enhancements + ## [2020-06-03] ### Fixed @@ -76,7 +83,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2020-06-03...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-06-18...HEAD +[2020-06-18]: https://github.com/latex3/latex3/compare/2020-06-03...2020-06-18 [2020-06-03]: https://github.com/latex3/latex3/compare/2020-05-05...2020-06-03 [2020-05-05]: https://github.com/latex3/latex3/compare/2020-03-12...2020-05-05 [2020-03-12]: https://github.com/latex3/latex3/compare/2020-02-23...2020-03-12 diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md index f03026a6b9..ca54b35b76 100644 --- a/macros/latex/contrib/l3backend/README.md +++ b/macros/latex/contrib/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2020-06-03 +Release 2020-06-18 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx index 26c516150a..80d8714358 100644 --- a/macros/latex/contrib/l3backend/l3backend-basics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -71,23 +71,23 @@ %<*package> \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2020-06-03}{} + {l3backend-dvipdfmx.def}{2020-06-18}{} {L3 backend support: dvipdfmx} % %<*dvips> - {l3backend-dvips.def}{2020-06-03}{} + {l3backend-dvips.def}{2020-06-18}{} {L3 backend support: dvips} % %<*dvisvgm> - {l3backend-dvisvgm.def}{2020-06-03}{} + {l3backend-dvisvgm.def}{2020-06-18}{} {L3 backend support: dvisvgm} % %<*pdfmode> - {l3backend-pdfmode.def}{2020-06-03}{} + {l3backend-pdfmode.def}{2020-06-18}{} {L3 backend support: PDF mode} % %<*xdvipdfmx> - {l3backend-xdvipdfmx.def}{2020-06-03}{} + {l3backend-xdvipdfmx.def}{2020-06-18}{} {L3 backend support: xdvipdfmx} % % diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx index 323756837e..ca94b19e9b 100644 --- a/macros/latex/contrib/l3backend/l3backend-box.dtx +++ b/macros/latex/contrib/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx index 2b3e4d3708..2c0dd47ea1 100644 --- a/macros/latex/contrib/l3backend/l3backend-color.dtx +++ b/macros/latex/contrib/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -78,7 +78,8 @@ % \begin{macro}{\@@_backend_pickup:w} % Allow for \LaTeXe{} color. Here, the possible input values are limited: % \texttt{dvips}-style colors can mainly be taken as-is with the exception -% spot ones (here we need a model and a tint). +% spot ones (here we need a model and a tint). The \texttt{x}-type expansion +% is there to cover the case where \pkg{xcolor} is in use. % \begin{macrocode} %<*package> \cs_new_protected:Npn \@@_backend_pickup:N #1 { } @@ -92,8 +93,8 @@ { \tl_set:Nx #1 { - spot ~ - \exp_after:wN \use:n \current@color \c_space_tl 1 + { spot } + { \exp_after:wN \use:n \current@color \c_space_tl 1 } } } { @@ -102,7 +103,7 @@ } } \cs_new_protected:Npn \@@_backend_pickup:w #1 ~ #2 \s_@@_stop #3 - { \tl_set:Nn #3 { #1 ~ #2 } } + { \tl_set:Nn #3 { {#1} {#2} } } } } % @@ -110,34 +111,27 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\@@_backend_cmyk:w} -% \begin{macro}{\@@_backend_gray:w} -% \begin{macro}{\@@_backend_rgb:w} -% \begin{macro}{\@@_backend_spot:w} -% \begin{macro}{\@@_backend_select:n, \@@_backend_select:x} +% \begin{macro} +% { +% \@@_backend_cmyk:n , +% \@@_backend_gray:n , +% \@@_backend_rgb:n , +% \@@_backend_spot:n , +% \@@_backend_select:n +% } % \begin{macro}{\@@_backend_reset:} % \begin{macro}{color.fc} % Push the data to the stack. In the case of \texttt{dvips} also reset the % drawing fill color in raw PostScript. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s_@@_stop - { - \@@_backend_select:x - { - cmyk~ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} - } - } -\cs_new_protected:Npn \@@_backend_gray:w #1 \s_@@_stop - { \@@_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \@@_backend_rgb:w #1 ~ #2 ~ #3 \s_@@_stop - { - \@@_backend_select:x - { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } - } -\cs_new_protected:Npn \@@_backend_spot:w #1 ~ #2 \s_@@_stop - { \@@_backend_select:n { #1 } } +\cs_new_protected:Npn \@@_backend_cmyk:n #1 + { \@@_backend_select:n { cmyk ~ #1 } } +\cs_new_protected:Npn \@@_backend_gray:n #1 + { \@@_backend_select:n { gray ~ #1 } } +\cs_new_protected:Npn \@@_backend_rgb:n #1 + { \@@_backend_select:n { rgb ~ #1 } } +\cs_new_protected:Npn \@@_backend_spot:n #1 + { \@@_backend_select:n {#1} } \cs_new_protected:Npn \@@_backend_select:n #1 { \__kernel_backend_literal:n { color~push~ #1 } @@ -146,17 +140,12 @@ % \group_insert_after:N \@@_backend_reset: } -\cs_generate_variant:Nn \@@_backend_select:n { x } \cs_new_protected:Npn \@@_backend_reset: { \__kernel_backend_literal:n { color~pop } } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} % % \begin{macrocode} % @@ -192,20 +181,20 @@ #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 \s_@@_stop #7 { \str_if_eq:nnTF {#2} { g } - { \tl_set:Nn #7 { gray ~ #1 } } + { \tl_set:Nn #7 { { gray } {#1} } } { \str_if_eq:nnTF {#4} { rg } - { \tl_set:Nn #7 { rgb ~ #1 ~ #2 ~ #3 } } + { \tl_set:Nn #7 { { rgb } { #1 ~ #2 ~ #3 } } } { \str_if_eq:nnTF {#5} { k } - { \tl_set:Nn #7 { cmyk ~ #1 ~ #2 ~ #3 ~ #4 } } + { \tl_set:Nn #7 { { cmyk } { #1 ~ #2 ~ #3 ~ #4 } } } { \str_if_eq:nnTF {#2} { cs } { - \tl_set:Nx #7 { spot ~ \use_none:n #1 ~ #5 } + \tl_set:Nx #7 { { spot } { \use_none:n #1 ~ #5 } } } { - \tl_set:Nn #7 { gray ~ 0 } + \tl_set:Nn #7 { { gray } { 0 } } } } } @@ -226,48 +215,28 @@ % \end{macrocode} % \end{variable} % -% \begin{macro}{\@@_backend_cmyk:w, \@@_backend_cmyk:nnnn} -% \begin{macro}{\@@_backend_gray:w, \@@_backend_gray:n} -% \begin{macro}{\@@_backend_rgb:w, \@@_backend_rgb:nnn} +% \begin{macro} +% { +% \@@_backend_cmyk:n , +% \@@_backend_gray:n , +% \@@_backend_rgb:n , +% \@@_backend_spot:n +% } % \begin{macro}{\@@_backend_spot:w} -% \begin{macro}{\@@_backend_select:n, \@@_backend_select:x} +% \begin{macro}{\@@_backend_select:n} % \begin{macro}{\@@_backend_reset:} % Simply dump the data, but allowing for \LuaTeX{}. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s_@@_stop - { - \use:x - { - \@@_backend_cmyk:nnnn - { \fp_eval:n {#1} } - { \fp_eval:n {#2} } - { \fp_eval:n {#3} } - { \fp_eval:n {#4} } - } - } -\cs_new_protected:Npn \@@_backend_cmyk:nnnn #1#2#3#4 - { - \@@_backend_select:n - { #1 ~ #2 ~ #3 ~ #4 ~ k ~ #1 ~ #2 ~ #3 ~ #4 ~ K } - } -\cs_new_protected:Npn \@@_backend_gray:w #1 \s_@@_stop - { \exp_args:Nx \@@_backend_gray:n { \fp_eval:n {#1} } } +\cs_new_protected:Npn \@@_backend_cmyk:n #1 + { \@@_backend_select:n { #1 ~ k ~ #1 ~ K } } \cs_new_protected:Npn \@@_backend_gray:n #1 { \@@_backend_select:n { #1 ~ g ~ #1 ~ G } } -\cs_new_protected:Npn \@@_backend_rgb:w #1~ #2 ~ #3 \s_@@_stop - { - \use:x - { - \@@_backend_rgb:nnn - { \fp_eval:n {#1} } - { \fp_eval:n {#2} } - { \fp_eval:n {#3} } - } - } -\cs_new_protected:Npn \@@_backend_rgb:nnn #1#2#3 - { \@@_backend_select:n { #1 ~ #2 ~ #3 ~ rg ~ #1 ~ #2 ~ #3 ~ RG } } +\cs_new_protected:Npn \@@_backend_rgb:n #1 + { \@@_backend_select:n { #1 ~ rg ~ #1 ~ RG } } +\cs_new_protected:Npn \@@_backend_spot:n #1 + { \@@_backend_spot:w #1 \s_@@_stop } \cs_new_protected:Npn \@@_backend_spot:w #1 ~ #2 \s_@@_stop - { \@@_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC } } + { \@@_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ scn ~ #2 ~ SCN } } \cs_new_protected:Npx \@@_backend_select:n #1 { \cs_if_exist:NTF \tex_pdfextension:D @@ -276,7 +245,6 @@ \exp_not:N \l__kernel_color_stack_int push {#1} \group_insert_after:N \exp_not:N \@@_backend_reset: } -\cs_generate_variant:Nn \@@_backend_select:n { x } \cs_new_protected:Npx \@@_backend_reset: { \cs_if_exist:NTF \tex_pdfextension:D @@ -289,8 +257,6 @@ % \end{macro} % \end{macro} % \end{macro} -% \end{macro} -% \end{macro} % % \begin{macrocode} % diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx index 6b235e4faa..6c82820a90 100644 --- a/macros/latex/contrib/l3backend/l3backend-draw.dtx +++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -313,7 +313,7 @@ { \dim_to_decimal_in_bp:n {#1} ~ setlinewidth } } \cs_new_protected:Npn \@@_backend_miterlimit:n #1 - { \@@_backend_literal:x { \fp_eval:n {#1} ~ setmiterlimit } } + { \@@_backend_literal:n { #1 ~ setmiterlimit } } \cs_new_protected:Npn \@@_backend_cap_butt: { \@@_backend_literal:n { 0 ~ setlinecap } } \cs_new_protected:Npn \@@_backend_cap_round: @@ -335,8 +335,8 @@ % % \begin{macro} % { -% \@@_backend_color_fill_cmyk:nnnn , -% \@@_backend_color_stroke_cmyk:nnnn +% \@@_backend_color_fill_cmyk:n , +% \@@_backend_color_stroke_cmyk:n % } % \begin{macro} % { @@ -345,63 +345,37 @@ % } % \begin{macro} % { -% \@@_backend_color_fill_rgb:nnn , -% \@@_backend_color_stroke_rgb:nnn -% } -% \begin{macro} -% { -% \@@_backend_color_fill:n, \@@_backend_color_fill:x, -% \@@_backend_color_stroke:n, \@@_backend_color_stroke:x +% \@@_backend_color_fill_rgb:n , +% \@@_backend_color_stroke_rgb:n % } +% \begin{macro}{\@@_backend_color_fill:n, \@@_backend_color_stroke:n} % For \texttt{dvips}, we can use the standard color stack to deal with % stroke color, but for fills have to switch to raw PostScript. This is % thus not handled by the stack, but the context is very restricted. See % also how fills are implemented. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4 - { - \@@_backend_color_fill:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - setcmykcolor - } - } -\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4 - { - \@@_backend_color_stroke:x - { - cmyk ~ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} - } - } -\cs_new_protected:Npn \@@_backend_color_fill_gray:n #1 - { \@@_backend_color_fill:x { \fp_eval:n {#1} ~ setgray } } +\cs_new_protected:Npn \@@_backend_color_fill_cmyk:n #1 + { \@@_backend_color_fill:n { #1 ~ setcmykcolor } } +\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:n #1 + { \@@_backend_color_stroke:n { cmyk ~ #1 } } \cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1 - { \@@_backend_color_stroke:x { gray ~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \@@_backend_color_fill_rgb:nnn #1#2#3 - { - \@@_backend_color_fill:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ setrgbcolor } - } -\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3 - { - \@@_backend_color_stroke:x - { rgb ~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } - } + { \@@_backend_color_fill:n { #1 ~ setgray } } +\cs_new_protected:Npn \@@_backend_color_fill_gray:n #1 + { \@@_backend_color_stroke:n { gray ~ #1 } } +\cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1 + { \@@_backend_color_fill:n { #1 ~ setrgbcolor } } +\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1 + { \@@_backend_color_stroke:n { rgb ~ #1 } } \cs_new_protected:Npn \@@_backend_color_fill:n #1 { \__kernel_backend_postscript:n { /color.fc ~ { #1 } ~ def } } -\cs_generate_variant:Nn \@@_backend_color_fill:n { x } \cs_new_protected:Npn \@@_backend_color_stroke:n #1 { \__kernel_backend_literal:n { color~push~#1 } \group_insert_after:N \@@_color_reset: } -\cs_generate_variant:Nn \@@_backend_color_stroke:n { x } % \end{macrocode} % \end{macro} % \end{macro} @@ -418,14 +392,7 @@ \cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4 { \@@_backend_literal:n - { - [ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - 0 ~ 0 - ] ~ - concat - } + { [ #1 ~ #2 ~ #3 ~ #4 ~ 0 ~ 0 ] ~ concat } } % \end{macrocode} % \end{macro} @@ -633,7 +600,7 @@ { \dim_to_decimal_in_bp:n {#1} ~ w } } \cs_new_protected:Npn \@@_backend_miterlimit:n #1 - { \@@_backend_literal:x { \fp_eval:n {#1} ~ M } } + { \@@_backend_literal:x { #1 ~ M } } \cs_new_protected:Npn \@@_backend_cap_butt: { \@@_backend_literal:n { 0 ~ J } } \cs_new_protected:Npn \@@_backend_cap_round: @@ -655,8 +622,8 @@ % % \begin{macro} % { -% \@@_backend_color_fill_cmyk:nnnn , -% \@@_backend_color_stroke_cmyk:nnnn +% \@@_backend_color_fill_cmyk:n , +% \@@_backend_color_stroke_cmyk:n % } % \begin{macro} % { @@ -665,46 +632,26 @@ % } % \begin{macro} % { -% \@@_backend_color_fill_rgb:nnn , -% \@@_backend_color_stroke_rgb:nnn +% \@@_backend_color_fill_rgb:n , +% \@@_backend_color_stroke_rgb:n % } % \begin{macro}{\@@_backend_color_select:n, \@@_backend_color_select:x} % \begin{macro}{\@@_backend_color_reset:} % Color has to be split between \texttt{(x)dvipdfmx} and the PDF engines % as there is no color stack for fill/stroke separation in the former. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4 - { - \@@_backend_color_select:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - k - } - } -\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4 - { - \@@_backend_color_select:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} ~ - k - } - } +\cs_new_protected:Npn \@@_backend_color_fill_cmyk:n #1 + { \@@_backend_color_select:n { #1 ~ k } } +\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:n #1 + { \@@_backend_color_select:n { #1 ~ K } } \cs_new_protected:Npn \@@_backend_color_fill_gray:n #1 - { \@@_backend_color_select:x { \fp_eval:n {#1} ~ g } } + { \@@_backend_color_select:n { #1 ~ g } } \cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1 - { \@@_backend_color_select:x { \fp_eval:n {#1} ~ G } } -\cs_new_protected:Npn \@@_backend_color_fill_rgb:nnn #1#2#3 - { - \@@_backend_color_select:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ rg } - } -\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3 - { - \@@_backend_color_select:x - { \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ RG } - } + { \@@_backend_color_select:n { #1 ~ G } } +\cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1 + { \@@_backend_color_select:n { #1 ~ rg } } +\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1 + { \@@_backend_color_select:n { #1 ~ RG } } %<*pdfmode> \cs_new_protected:Npx \@@_backend_color_select:n #1 { @@ -746,11 +693,7 @@ \cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4 { %<*pdfmode> - \__kernel_backend_matrix:x - { - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} - } + \__kernel_backend_matrix:n { #1 ~ #2 ~ #3 ~ #4 } % %<*dvipdfmx|xdvipdfmx> \@@_backend_cm_decompose:nnnnN {#1} {#2} {#3} {#4} @@ -904,13 +847,8 @@ \@@_backend_cm:nnnn {#2} {#3} {#4} {#5} % %<*dvipdfmx|xdvipdfmx> - \__kernel_backend_literal:x - { - pdf:btrans~matrix~ - \fp_eval:n {#2} ~ \fp_eval:n {#3} ~ - \fp_eval:n {#4} ~ \fp_eval:n {#5} ~ - 0 ~ 0 - } + \__kernel_backend_literal:n + { pdf:btrans~matrix~ #2 ~ #3 ~ #4 ~ #5 ~ 0 ~ 0 } % \hbox_overlap_right:n { \box_use:N #1 } %<*dvipdfmx|xdvipdfmx> @@ -1199,7 +1137,7 @@ \cs_new_protected:Npn \@@_backend_linewidth:n #1 { \@@_backend_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } } \cs_new_protected:Npn \@@_backend_miterlimit:n #1 - { \@@_backend_scope:x { stroke-miterlimit=" \fp_eval:n {#1} " } } + { \@@_backend_scope:x { stroke-miterlimit=" #1 " } } \cs_new_protected:Npn \@@_backend_cap_butt: { \@@_backend_scope:n { stroke-linecap="butt" } } \cs_new_protected:Npn \@@_backend_cap_round: @@ -1222,43 +1160,41 @@ % % \begin{macro} % { -% \@@_backend_color_fill_cmyk:nnnn , -% \@@_backend_color_stroke_cmyk:nnnn +% \@@_backend_color_fill_cmyk:n , +% \@@_backend_color_stroke_cmyk:n % } +% \begin{macro}{\@@_backend_color_fill_cmyk:w} % \begin{macro} % { % \@@_backend_color_fill_gray:n , % \@@_backend_color_stroke_gray:n % } +% \begin{macro}{\@@_backend_color_gray_aux:n} % \begin{macro} % { -% \@@_backend_color_fill_rgb:nnn , -% \@@_backend_color_stroke_rgb:nnn +% \@@_backend_color_fill_rgb:n , +% \@@_backend_color_stroke_rgb:n % } % \begin{macro}{\@@_backend_color_fill:nnn} % SVG fill color has to be covered outside of the stack, as for % \texttt{dvips}. Here, we are only allowed RGB colors so there is some % conversion to do. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_color_fill_cmyk:nnnn #1#2#3#4 +\cs_new_protected:Npn \@@_backend_color_fill_cmyk:n #1 + { \@@_backend_color_fill_cmyk:w #1 \s_@@_stop } +\cs_new_protected:Npn \@@_backend_color_fill_cmyk:w + #1 ~ #2 ~ #3 ~ #4 \s_@@_stop { \use:x { \@@_backend_color_fill:nnn - { \fp_eval:n { -100 * ( (#1) * ( 1 - (#4) ) - 1 ) } } - { \fp_eval:n { -100 * ( (#2) * ( 1 - (#4) ) + #4 - 1 ) } } - { \fp_eval:n { -100 * ( (#3) * ( 1 - (#4) ) + #4 - 1 ) } } - } - } -\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:nnnn #1#2#3#4 - { - \@@_backend_select:x - { - cmyk~ - \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ - \fp_eval:n {#3} ~ \fp_eval:n {#4} + { \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } } + { \fp_eval:n { -100 * ( 1 - min ( 1 , #2 + #4 ) ) } } + { \fp_eval:n { -100 * ( 1 - min ( 1 , #3 + #4 ) ) } } } } +\cs_new_protected:Npn \@@_backend_color_stroke_cmyk:n #1 + { \@@_backend_select:n { cmyk ~ #1 } } \cs_new_protected:Npn \@@_backend_color_fill_gray:n #1 { \use:x @@ -1271,7 +1207,7 @@ { \@@_backend_color_fill:nnn {#1} {#1} {#1} } \cs_new_protected:Npn \@@_backend_color_stroke_gray:n #1 { \@@_backend_select:x { gray~ \fp_eval:n {#1} } } -\cs_new_protected:Npn \@@_backend_color_fill_rgb:nnn #1#2#3 +\cs_new_protected:Npn \@@_backend_color_fill_rgb:n #1 { \use:x { @@ -1296,16 +1232,15 @@ " } } -\cs_new_protected:Npn \@@_backend_color_stroke_rgb:nnn #1#2#3 - { - \@@_backend_select:x - { rgb~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} } - } +\cs_new_protected:Npn \@@_backend_color_stroke_rgb:n #1 + { \@@_backend_select:n { rgb ~ #1 } } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\@@_backend_cm:nnnn} % The four arguments here are floats (the affine matrix), the last @@ -1316,14 +1251,7 @@ \@@_backend_scope:n { transform = - " - matrix - ( - \fp_eval:n {#1} , \fp_eval:n {#2} , - \fp_eval:n {#3} , \fp_eval:n {#4} , - 0pt , 0pt - ) - " + " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) " } } % \end{macrocode} diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx index dd19bba9a1..305d1759a1 100644 --- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx index 955f8a3b14..a66cb0f145 100644 --- a/macros/latex/contrib/l3backend/l3backend-header.dtx +++ b/macros/latex/contrib/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx index 5382b4a92c..e10ad17e8f 100644 --- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx +++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/CHANGELOG.md b/macros/latex/contrib/l3experimental/CHANGELOG.md index 8cf1b5f051..51a104cc70 100644 --- a/macros/latex/contrib/l3experimental/CHANGELOG.md +++ b/macros/latex/contrib/l3experimental/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-06-18] + +### Changed +- Internal color model +- Internal performance enhancements + ## [2020-06-03] ### Added @@ -133,7 +139,8 @@ this project uses date-based 'snapshot' version identifiers. - New `l3color` module using `xcolor`-like expression syntax - New `l3draw` module, based on `pgf` layer of the TikZ system -[Unreleased]: https://github.com/latex3/latex3/compare/2020-06-03...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-06-18...HEAD +[2020-06-18]: https://github.com/latex3/latex3/compare/2020-06-03...2020-06-18 [2020-06-03]: https://github.com/latex3/latex3/compare/2020-05-18...2020-06-03 [2020-05-18]: https://github.com/latex3/latex3/compare/2020-01-12...2020-05-18 [2020-01-12]: https://github.com/latex3/latex3/compare/2019-10-11...2020-01-12 diff --git a/macros/latex/contrib/l3experimental/README.md b/macros/latex/contrib/l3experimental/README.md index 8685228cdd..0a3e72316a 100644 --- a/macros/latex/contrib/l3experimental/README.md +++ b/macros/latex/contrib/l3experimental/README.md @@ -1,7 +1,7 @@ Experimental LaTeX3 Concepts ============================ -Release 2020-06-03 +Release 2020-06-18 Overview -------- diff --git a/macros/latex/contrib/l3experimental/l3benchmark.dtx b/macros/latex/contrib/l3experimental/l3benchmark.dtx index 2589bb9c6c..a5654f97cd 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.dtx +++ b/macros/latex/contrib/l3experimental/l3benchmark.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -130,7 +130,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3benchmark}{2020-06-03}{} +\ProvidesExplPackage{l3benchmark}{2020-06-18}{} {L3 Experimental benchmarking} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3benchmark.pdf b/macros/latex/contrib/l3experimental/l3benchmark.pdf index 72a9adab9b..6bfd2b5bec 100644 Binary files a/macros/latex/contrib/l3experimental/l3benchmark.pdf and b/macros/latex/contrib/l3experimental/l3benchmark.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3cctab.dtx b/macros/latex/contrib/l3experimental/l3cctab.dtx index 4d758c1ad4..4bda61148d 100644 --- a/macros/latex/contrib/l3experimental/l3cctab.dtx +++ b/macros/latex/contrib/l3experimental/l3cctab.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -179,7 +179,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3cctab}{2020-06-03}{} +\ProvidesExplPackage{l3cctab}{2020-06-18}{} {L3 Experimental category code tables} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3cctab.pdf b/macros/latex/contrib/l3experimental/l3cctab.pdf index e9dee31807..bd691d11c2 100644 Binary files a/macros/latex/contrib/l3experimental/l3cctab.pdf and b/macros/latex/contrib/l3experimental/l3cctab.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3color.dtx b/macros/latex/contrib/l3experimental/l3color.dtx index c7addda60b..8a87d390b4 100644 --- a/macros/latex/contrib/l3experimental/l3color.dtx +++ b/macros/latex/contrib/l3experimental/l3color.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -240,20 +240,9 @@ % \section{Core color representation} % % To allow data to be handled internally, \pkg{l3color} uses a simple -% representation of color, based on that used by the \pkg{dvips} program. -% This is a token list made up of the model name followed by one or more -% data entries, each separated by a \emph{space}. The valid forms are thus -% \begin{itemize} -% \item \texttt{gray \meta{gray}} Grayscale color with the \meta{gray} -% value running from $0$ (fully black) to $1$ (fully white) -% \item \texttt{cmyk \meta{cyan} \meta{magenta} \meta{yellow} \meta{black}}, -% each of which falls in the range $[0,1]$ -% \item \texttt{rgb \meta{red} \meta{green} \meta{blue}}, -% each of which falls in the range $[0,1]$ -% \item \texttt{spot \meta{name} \meta{tint}} A pre-defined spot color, -% where the \meta{name} should be a pre-defined string color name and the -% \meta{tint} should be in the range $[0,1]$. -% \end{itemize} +% representation of color, comprising two \meta{balanced text} entries, the first +% the \meta{model} and the second the \meta{values} given +% \emph{separated by spaces}. % % This core representation is produced when parsing color expressions. % @@ -286,7 +275,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3color}{2020-06-03}{} +\ProvidesExplPackage{l3color}{2020-06-18}{} {L3 Experimental color support} % % \end{macrocode} @@ -342,7 +331,7 @@ % \end{macro} % % \begin{macro}{\@@_extract:nNN, \@@_extract:VNN} -% \begin{macro}{\@@_extract:NNw} +% \begin{macro}{\@@_extract:NNnn} % Split the model and color from a named color, and store the two. No test % for the existence of the color: that is assumed to be the case (this % is internal only). Somewhat \enquote{old-fashioned} but should be quite @@ -351,13 +340,13 @@ \cs_new_protected:Npn \@@_extract:nNN #1#2#3 { \exp_after:wN \exp_after:wN \exp_after:wN - \@@_extract:NNw + \@@_extract:NNnn \exp_after:wN \exp_after:wN \exp_after:wN #2 \exp_after:wN \exp_after:wN \exp_after:wN #3 - \cs:w l_@@_named_ #1 _tl \cs_end: \s_@@_stop + \cs:w l_@@_named_ #1 _tl \cs_end: } \cs_generate_variant:Nn \@@_extract:nNN { V } -\cs_new_protected:Npn \@@_extract:NNw #1#2 #3 ~ #4 \s_@@_stop +\cs_new_protected:Npn \@@_extract:NNnn #1#2#3#4 { \tl_set:Nn #1 {#3} \tl_set:Nn #2 {#4} @@ -517,7 +506,7 @@ \@@_extract:nNN {#2} \l_@@_model_tl \l_@@_value_tl \@@_parse_loop:w #3 ! ! ! ! \s_@@_stop \tl_set:Nx \l_@@_internal_tl - { \l_@@_model_tl \c_space_tl \l_@@_value_tl } + { { \l_@@_model_tl } { \l_@@_value_tl } } \exp_args:NNNV \group_end: \tl_set:Nn #1 \l_@@_internal_tl } @@ -663,26 +652,30 @@ % Turn the input into internal form, also tidying up the number quickly. % \begin{macrocode} \cs_new:Npn \@@_parse_model_gray:w #1 , #2 \s_@@_stop - { gray ~ \@@_parse_number:n {#1} } + { { gray } { \@@_parse_number:n {#1} } } \cs_new:Npn \@@_parse_model_rgb:w #1 , #2 , #3 , #4 \s_@@_stop { - rgb ~ - \@@_parse_number:n {#1} ~ - \@@_parse_number:n {#2} ~ - \@@_parse_number:n {#3} + { rgb } + { + \@@_parse_number:n {#1} ~ + \@@_parse_number:n {#2} ~ + \@@_parse_number:n {#3} + } } \cs_new:Npn \@@_parse_model_cmyk:w #1 , #2 , #3 , #4 , #5 \s_@@_stop { - cmyk ~ - \@@_parse_number:n {#1} ~ - \@@_parse_number:n {#2} ~ - \@@_parse_number:n {#3} ~ - \@@_parse_number:n {#4} + { cmyk } + { + \@@_parse_number:n {#1} ~ + \@@_parse_number:n {#2} ~ + \@@_parse_number:n {#3} ~ + \@@_parse_number:n {#4} + } } \cs_new:Npn \@@_parse_model_spot:w #1 , #2 \s_@@_stop { - spot ~ - \@@_parse_spot_aux:w #1 ! 100 ! \s_@@_stop + { spot } + { \@@_parse_spot_aux:w #1 ! 100 ! \s_@@_stop } } \cs_new:Npn \@@_parse_spot_aux:w #1 ! #2 ! #3 \s_@@_stop { #1 ~ \fp_eval:n { #2 / 100 } } @@ -716,9 +709,11 @@ % \begin{macrocode} \cs_new:Npn \@@_parse_model_hsb:nnn #1#2#3 { - rgb ~ - \exp_args:Ne \@@_parse_model_hsb_aux:nnn - { \fp_eval:n { 6 * #1 } } {#2} {#3} + { rgb } + { + \exp_args:Ne \@@_parse_model_hsb_aux:nnn + { \fp_eval:n { 6 * #1 } } {#2} {#3} + } } \cs_new:Npn \@@_parse_model_hsb_aux:nnn #1#2#3 { @@ -758,17 +753,21 @@ { \@@_parse_model_HTML_aux:w #1 0 0 0 0 0 0 \s_@@_stop } \cs_new:Npn \@@_parse_model_HTML_aux:w #1#2#3#4#5#6#7 \s_@@_stop { - rgb ~ - \fp_eval:n { round(\int_from_hex:n {#1#2} / 255,5) } ~ - \fp_eval:n { round(\int_from_hex:n {#3#4} / 255,5) } ~ - \fp_eval:n { round(\int_from_hex:n {#5#6} / 255,5) } + { rgb } + { + \fp_eval:n { round(\int_from_hex:n {#1#2} / 255,5) } ~ + \fp_eval:n { round(\int_from_hex:n {#3#4} / 255,5) } ~ + \fp_eval:n { round(\int_from_hex:n {#5#6} / 255,5) } + } } \cs_new:Npn \@@_parse_model_RGB:w #1 , #2 , #3 , #4 \s_@@_stop { - rgb ~ - \fp_eval:n { round(#1 / 255,5) } ~ - \fp_eval:n { round(#2 / 255,5) } ~ - \fp_eval:n { round(#3 / 255,5) } + { rgb } + { + \fp_eval:n { round(#1 / 255,5) } ~ + \fp_eval:n { round(#2 / 255,5) } ~ + \fp_eval:n { round(#3 / 255,5) } + } } % \end{macrocode} % \end{macro} @@ -783,24 +782,24 @@ % \end{variable} % % \begin{macro}{\@@_check_model:N} -% \begin{macro}{\@@_check_model:w} +% \begin{macro}{\@@_check_model:nn} % Check that the model in use is the one required. % \begin{macrocode} \cs_new_protected:Npn \@@_check_model:N #1 { \tl_if_empty:NF \l_color_fixed_model_tl { - \exp_after:wN \@@_check_model:w #1 \s_@@_stop + \exp_after:wN \@@_check_model:nn #1 \tl_if_eq:NNF \l_@@_model_tl \l_color_fixed_model_tl { \@@_convert:VVN \l_@@_model_tl \l_color_fixed_model_tl \l_@@_value_tl } \tl_set:Nx #1 - { \l_color_fixed_model_tl \c_space_tl \l_@@_value_tl } + { { \l_color_fixed_model_tl } { \l_@@_value_tl } } } } -\cs_new_protected:Npn \@@_check_model:w #1 ~ #2 \s_@@_stop +\cs_new_protected:Npn \@@_check_model:nn #1#2 { \tl_set:Nn \l_@@_model_tl {#1} \tl_set:Nn \l_@@_value_tl {#2} @@ -818,7 +817,7 @@ \cs_new_protected:Npn \@@_select: { \tl_set_eq:cN { l_@@_named_ . _tl } \l_@@_current_tl - \@@_select:V \l_@@_current_tl + \@@_select:N \l_@@_current_tl } % \end{macrocode} % \end{macro} @@ -852,7 +851,7 @@ \cs_if_exist:cTF { @@_parse_model_ #1 :w } { \tl_set:Nx #3 - { \use:c { @@_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s_@@_stop } + { \use:c { @@_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \s_@@_stop } \@@_check_model:N #3 } { @@ -946,8 +945,7 @@ % \subsection{Diagnostics} % % \begin{macro}{\color_show:n} -% \begin{macro}{\@@_show:w} -% \begin{macro}{\@@_show_gray:w, \@@_show_rgb:w, \@@_show_cmyk:w} +% \begin{macro}{\@@_show:nn} % Extract the information about a color and format for the user: the approach % is similar to the keys module here. % \begin{macrocode} @@ -957,25 +955,20 @@ {#1} { \@@_if_defined:nTF {#1} - { \exp_last_unbraced:Nv \@@_show:w { l_@@_named_ #1 _tl } \s_@@_stop } + { \exp_last_unbraced:Nv \@@_show:nn { l_@@_named_ #1 _tl } } { } } { } { } } -\cs_new:Npn \@@_show:w #1 ~ #2 \s_@@_stop +\cs_new:Npn \@@_show:nn #1#2 { \msg_show_item_unbraced:nn { model } {#1} - \exp_args:Nnf \msg_show_item_unbraced:nn { value } - { \use:c { @@_show_ #1 :w } #2 \s_@@_stop } + \msg_show_item_unbraced:nn { value } {#2} } -\cs_new:Npn \@@_show_gray:w #1 \s_@@_stop { #1 } -\cs_new:Npn \@@_show_rgb:w #1 ~ #2 ~ #3 \s_@@_stop { #1 ,~ #2 ,~ #3 } -\cs_new:Npn \@@_show_cmyk:w #1 ~ #2 ~ #3 ~ #4 \s_@@_stop { #1 ,~ #2 ,~ #3 ,~ #4 } % \end{macrocode} % \end{macro} % \end{macro} -% \end{macro} % % \subsection{Messages} % diff --git a/macros/latex/contrib/l3experimental/l3color.pdf b/macros/latex/contrib/l3experimental/l3color.pdf index e0b2ff021e..26f43e0e1f 100644 Binary files a/macros/latex/contrib/l3experimental/l3color.pdf and b/macros/latex/contrib/l3experimental/l3color.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx index bca71310a1..8a20c1a348 100644 --- a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-code.pdf b/macros/latex/contrib/l3experimental/l3draw-code.pdf index 47c0c200a8..33c81c0e60 100644 Binary files a/macros/latex/contrib/l3experimental/l3draw-code.pdf and b/macros/latex/contrib/l3experimental/l3draw-code.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3draw-layers.dtx b/macros/latex/contrib/l3experimental/l3draw-layers.dtx index 690d02578f..1f1debc79e 100644 --- a/macros/latex/contrib/l3experimental/l3draw-layers.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-layers.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-paths.dtx b/macros/latex/contrib/l3experimental/l3draw-paths.dtx index a90ccb85d8..bf44643680 100644 --- a/macros/latex/contrib/l3experimental/l3draw-paths.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-paths.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-points.dtx b/macros/latex/contrib/l3experimental/l3draw-points.dtx index 5e54f11a70..6e578a694a 100644 --- a/macros/latex/contrib/l3experimental/l3draw-points.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-points.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx index a33447016e..b2cd3db445 100644 --- a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx index 40823c2cf3..943484d811 100644 --- a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-state.dtx b/macros/latex/contrib/l3experimental/l3draw-state.dtx index 42adda47ce..4f434d924b 100644 --- a/macros/latex/contrib/l3experimental/l3draw-state.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-state.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -124,7 +124,7 @@ % Pass through to the driver layer. % \begin{macrocode} \cs_new_protected:Npn \draw_miterlimit:n #1 - { \@@_backend_miterlimit:n { \fp_eval:n {#1} } } + { \exp_args:Nx \@@_backend_miterlimit:n { \fp_eval:n {#1} } } % \end{macrocode} % \end{macro} % @@ -156,13 +156,7 @@ % % \begin{macro}{\draw_color:n, \draw_color_fill:n, \draw_color_stroke:n} % \begin{macro}{\@@_color:nn} -% \begin{macro}{\@@_color_aux:nn, \@@_color_aux:Vn} -% \begin{macro}{\@@_color:nw} -% \begin{macro} -% { -% \@@_select_cmyk:nw, \@@_select_gray:nw, -% \@@_select_rgb:nw, \@@_split_select:nw -% } +% \begin{macro}{\@@_color:nnn} % Much the same as for core color support but calling the relevant % driver-level function. % \begin{macrocode} @@ -174,27 +168,14 @@ \cs_new_protected:Npn \@@_color:nn #1#2 { \color_parse:nN {#2} \l_@@_color_tmp_tl - \@@_color_aux:Vn \l_@@_color_tmp_tl {#1} + \exp_after:wN \@@_color:nnn \l_@@_color_tmp_tl {#1} } -\cs_new_protected:Npn \@@_color_aux:nn #1#2 - { \@@_color:nw {#2} #1 \s_@@_stop } -\cs_generate_variant:Nn \@@_color_aux:nn { V } -\cs_new_protected:Npn \@@_color:nw #1#2 ~ #3 \s_@@_stop - { \use:c { @@_color_ #2 :nw } {#1} #3 \s_@@_stop } -\cs_new_protected:Npn \@@_color_cmyk:nw #1#2 ~ #3 ~ #4 ~ #5 \s_@@_stop - { \use:c { @@_backend_color_ #1 _cmyk:nnnn } {#2} {#3} {#4} {#5} } -\cs_new_protected:Npn \@@_color_gray:nw #1#2 \s_@@_stop - { \use:c { @@_backend_color_ #1 _gray:n } {#2} } -\cs_new_protected:Npn \@@_color_rgb:nw #1#2 ~ #3 ~ #4 \s_@@_stop - { \use:c { @@_backend_color_ #1 _rgb:nnn } {#2} {#3} {#4} } -\cs_new_protected:Npn \@@_color_spot:nw #1#2 ~ #3 \s_@@_stop - { \use:c { @@_backend_color_ #1 _spot:nn } {#2} {#3} } +\cs_new_protected:Npn \@@_color:nnn #1#2#3 + { \use:c { @@_backend_color_ #3 _ #1 :n } {#2} } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} -% \end{macro} -% \end{macro} % % \begin{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx index 2b0ac7a84c..b995cf6fc9 100644 --- a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw.dtx b/macros/latex/contrib/l3experimental/l3draw.dtx index 66b0074a87..4ba0e2cb74 100644 --- a/macros/latex/contrib/l3experimental/l3draw.dtx +++ b/macros/latex/contrib/l3experimental/l3draw.dtx @@ -110,7 +110,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -1146,7 +1146,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3draw}{2020-06-03}{} +\ProvidesExplPackage{l3draw}{2020-06-18}{} {L3 Experimental core drawing support} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3draw.pdf b/macros/latex/contrib/l3experimental/l3draw.pdf index dd2d618601..a6cc55f4a1 100644 Binary files a/macros/latex/contrib/l3experimental/l3draw.pdf and b/macros/latex/contrib/l3experimental/l3draw.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3galley.dtx b/macros/latex/contrib/l3experimental/l3galley.dtx index 2ba61cdf1c..639e7ade99 100644 --- a/macros/latex/contrib/l3experimental/l3galley.dtx +++ b/macros/latex/contrib/l3experimental/l3galley.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -687,7 +687,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3galley}{2020-06-03}{} +\ProvidesExplPackage{l3galley}{2020-06-18}{} {L3 Experimental galley code} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3galley.pdf b/macros/latex/contrib/l3experimental/l3galley.pdf index e8ab5d7646..2070aa9727 100644 Binary files a/macros/latex/contrib/l3experimental/l3galley.pdf and b/macros/latex/contrib/l3experimental/l3galley.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3graphics.dtx b/macros/latex/contrib/l3experimental/l3graphics.dtx index 92d93a4c97..73517bfe80 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.dtx +++ b/macros/latex/contrib/l3experimental/l3graphics.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -241,7 +241,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3graphics}{2020-06-03}{} +\ProvidesExplPackage{l3graphics}{2020-06-18}{} {L3 Experimental graphics inclusion support} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3graphics.pdf b/macros/latex/contrib/l3experimental/l3graphics.pdf index 527b5d58a3..976b88a418 100644 Binary files a/macros/latex/contrib/l3experimental/l3graphics.pdf and b/macros/latex/contrib/l3experimental/l3graphics.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3pdf-code.pdf b/macros/latex/contrib/l3experimental/l3pdf-code.pdf index 582ddc3f73..82a5328fd3 100644 Binary files a/macros/latex/contrib/l3experimental/l3pdf-code.pdf and b/macros/latex/contrib/l3experimental/l3pdf-code.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3pdf.dtx b/macros/latex/contrib/l3experimental/l3pdf.dtx index b444b49524..1a21347ef3 100644 --- a/macros/latex/contrib/l3experimental/l3pdf.dtx +++ b/macros/latex/contrib/l3experimental/l3pdf.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -191,7 +191,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3pdf}{2020-06-03}{} +\ProvidesExplPackage{l3pdf}{2020-06-18}{} {L3 Experimental core PDF support} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3pdf.pdf b/macros/latex/contrib/l3experimental/l3pdf.pdf index 3c59c400f0..aa887d20cc 100644 Binary files a/macros/latex/contrib/l3experimental/l3pdf.pdf and b/macros/latex/contrib/l3experimental/l3pdf.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3str-format.dtx b/macros/latex/contrib/l3experimental/l3str-format.dtx index 5bdde51191..52902e21a8 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.dtx +++ b/macros/latex/contrib/l3experimental/l3str-format.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -167,7 +167,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3str-format}{2020-06-03}{} +\ProvidesExplPackage{l3str-format}{2020-06-18}{} {L3 Experimental string formatting} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3str-format.pdf b/macros/latex/contrib/l3experimental/l3str-format.pdf index 916298e882..df3c4c985a 100644 Binary files a/macros/latex/contrib/l3experimental/l3str-format.pdf and b/macros/latex/contrib/l3experimental/l3str-format.pdf differ diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.dtx b/macros/latex/contrib/l3experimental/l3sys-shell.dtx index 6ed71eb1ba..7da0422159 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.dtx +++ b/macros/latex/contrib/l3experimental/l3sys-shell.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -136,7 +136,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3sys-shell}{2020-06-03}{} +\ProvidesExplPackage{l3sys-shell}{2020-06-18}{} {L3 Experimental system shell functions} % % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.pdf b/macros/latex/contrib/l3experimental/l3sys-shell.pdf index 6f82415408..7a311ee701 100644 Binary files a/macros/latex/contrib/l3experimental/l3sys-shell.pdf and b/macros/latex/contrib/l3experimental/l3sys-shell.pdf differ diff --git a/macros/latex/contrib/l3experimental/xcoffins.dtx b/macros/latex/contrib/l3experimental/xcoffins.dtx index 9b4f9a1250..68776e0572 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.dtx +++ b/macros/latex/contrib/l3experimental/xcoffins.dtx @@ -56,7 +56,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -675,7 +675,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xcoffins}{2020-06-03}{} +\ProvidesExplPackage{xcoffins}{2020-06-18}{} {L3 Experimental design level coffins} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/xcoffins.pdf b/macros/latex/contrib/l3experimental/xcoffins.pdf index 3a81273337..d7a782681c 100644 Binary files a/macros/latex/contrib/l3experimental/xcoffins.pdf and b/macros/latex/contrib/l3experimental/xcoffins.pdf differ diff --git a/macros/latex/contrib/l3experimental/xgalley.dtx b/macros/latex/contrib/l3experimental/xgalley.dtx index ce329cf360..59be5e01ea 100644 --- a/macros/latex/contrib/l3experimental/xgalley.dtx +++ b/macros/latex/contrib/l3experimental/xgalley.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -734,7 +734,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2020-06-03}{} +\ProvidesExplPackage{xgalley}{2020-06-18}{} {L3 Experimental galley} \RequirePackage{xparse,xtemplate,l3galley} % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/xgalley.pdf b/macros/latex/contrib/l3experimental/xgalley.pdf index f73c94d31a..dfd4200570 100644 Binary files a/macros/latex/contrib/l3experimental/xgalley.pdf and b/macros/latex/contrib/l3experimental/xgalley.pdf differ diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index fce45da350..d487068859 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,17 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-06-18] + +### Changed +- Use `scn` operator for separations +- Internal color model +- Internal performance enhancements +- Moved `\msg_expandable_error:nn(nnnn)` to stable. +- Moved `\seq_indexed_map_inline:Nn` and `\seq_indexed_map_function:Nn` + to stable as `\seq_map_indexed_inline:Nn` and `\seq_map_indexed_function:Nn`. +- Internal changes to `expl3` to allow loading earlier in LaTeX2e. + ## [2020-06-03] ### Added @@ -693,7 +704,8 @@ this project uses date-based 'snapshot' version identifiers. - Step func­tions have been added for dim vari­ables, e.g. `\dim_step_in­line:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2020-06-03...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-06-18...HEAD +[2020-06-18]: https://github.com/latex3/latex3/compare/2020-06-03...2020-06-18 [2020-06-03]: https://github.com/latex3/latex3/compare/2020-05-15...2020-06-03 [2020-05-15]: https://github.com/latex3/latex3/compare/2020-05-14...2020-05-15 [2020-05-14]: https://github.com/latex3/latex3/compare/2020-05-11...2020-05-14 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index 0ccf0dd7b7..8ff01699d7 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2020-06-03 +Release 2020-06-18 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index e150269222..0710d88c5d 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> % -\def\ExplFileDate{2020-06-03}% +\def\ExplFileDate{2020-06-18}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -1156,23 +1156,40 @@ % % \begin{macro}{\ProvidesExplPackage, \ProvidesExplClass, \ProvidesExplFile} % For other packages and classes building on this one it is convenient -% not to need \cs{ExplSyntaxOn} each time. +% not to need \cs{ExplSyntaxOn} each time. All macros use the same +% internal one with the proper \LaTeXe{} command. % \begin{macrocode} -\protected\def\ProvidesExplPackage#1#2#3#4% - {% - \ProvidesPackage{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]% - \ExplSyntaxOn - }% -\protected\def\ProvidesExplClass#1#2#3#4% +\protected\def\ProvidesExplPackage + {\@expl@provides@file@@Nnnnnn\ProvidesPackage{Package}} +\protected\def\ProvidesExplClass + {\@expl@provides@file@@Nnnnnn\ProvidesClass{Document Class}} +\protected\def\ProvidesExplFile + {\@expl@provides@file@@Nnnnnn\ProvidesFile{File}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@expl@provides@file@@Nnnnnn, \@expl@provides@generic@@wnnw} +% We need to check the existence of the +% \cs[no-index]{Provides\meta{thing}}, since we need to load this very +% early in the \LaTeXe{} kernel. +% \begin{macrocode} +\protected\long\def\@expl@provides@file@@Nnnnnn#1#2#3#4#5#6% {% - \ProvidesClass{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]% + \ifnum0% + \ifdefined#11\fi + \ifx\relax#1\else1\fi + =11 + \expandafter#1% + \else + \@expl@provides@generic@@wnnw{#2}% + \fi + {#3}[{#4 \ifx\relax#5\relax\else v#5\space\fi #6}]% \ExplSyntaxOn - }% -\protected\def\ProvidesExplFile#1#2#3#4% + } +\protected\long\def\@expl@provides@generic@@wnnw#1\fi#2[#3]% {% - \ProvidesFile{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]% - \ExplSyntaxOn - }% + \immediate\write-1{#1: #2 #3}% + } % \end{macrocode} % \end{macro} % @@ -1198,24 +1215,35 @@ \fi % \end{macrocode} % -% If \pkg{expl3} was pre-loaded, we now have to deal with the fact that -% the syntax will not be activated for the package mode version: -% simply turn it on. We use \tn{@pushfilenameaux} as a marker: it's defined -% a little later. % \begin{macrocode} -\ifdefined\@pushfilenameaux - \ExplSyntaxOn -\fi +%<@@=expl> % \end{macrocode} % +% Here we can also detect whether we're reloading. This code goes into +% \texttt{expl3.ltx} and \texttt{expl3.sty}, the former loaded into the +% \LaTeXe{} format. When this code is loaded for the first time, the +% \cs{g_@@_reload_bool} boolean doesn't exist (\cs{else} branch of the +% \cs{ifcsname} below), so we create it. If the \cs{ifcsname} is true, +% then we do \cs{ExplSyntaxOn} (because when reloading, +% \texttt{expl3-code.tex} isn't read again), and set +% \cs{g_@@_reload_bool} to true. % \begin{macrocode} -%<@@=expl> +\ifcsname\detokenize{g_@@_reload_bool}\endcsname + \ExplSyntaxOn + \bool_gset_true:N \g_@@_reload_bool +\else + \bool_new:N \g_@@_reload_bool +\fi % \end{macrocode} % % \begin{variable}{\c_@@_def_ext_tl} -% Needed by \LaTeXe{}, and avoiding a re-load issue. +% Needed by \LaTeXe{}, and avoiding a re-load issue. Variables are +% best checked explicitly, rather than with \cs{g_@@_reload_bool} +% because some appear only in one of the code files, so +% \cs{g_@@_reload_bool} doesn't necessarily mean that the variable +% is already declared. % \begin{macrocode} -\cs_if_exist:NF \c_@@_def_ext_tl +\tl_if_exist:NF \c_@@_def_ext_tl { \tl_const:Nn \c_@@_def_ext_tl { def } } % \end{macrocode} % \end{variable} @@ -1255,7 +1283,7 @@ % \begin{variable}{\l_@@_options_clist} % \begin{macrocode} %<*!2ekernel> -\cs_if_exist:NF \l_@@_options_clist +\clist_if_exist:NF \l_@@_options_clist { \clist_new:N \l_@@_options_clist } \DeclareOption* { \clist_put_right:NV \l_@@_options_clist \CurrentOption } @@ -1295,19 +1323,74 @@ } % \end{macrocode} % -% A backend has to be in place by the start of the document: this has to be -% before global options are checked for use. The odd group stuff avoids -% needing to actually patch \tn{document}. +% \begin{macro}{\@expl@sys@load@backend@@@@} +% A backend has to be in place by the start of the document: this has +% to be before global options are checked for use. +% +% The \cs[no-index]{@expl@...@@@@} macros defined in this package are +% interfaces for \LaTeXe{}. There are currently (this will change +% with the next release of \LaTeXe{}) two possible cases, at this +% point of the code: either \cs{@expl@sys@load@backend@@@@} (and the +% others) already exist because they were defined in +% \texttt{ltexpl.ltx} (in \texttt{2ekernel} mode) or in +% \texttt{expl3.ltx} (in \texttt{package} mode). +% +% In \texttt{2ekernel} mode, if they exist we are using a future +% (2020-10-01) release of \LaTeXe{} and we don't need (and can't) +% patch \LaTeXe's internals because these commands are already there. +% Though if they don't exist in \texttt{2ekernel} mode, we're using +% an older version of the kernel, so we \emph{must} patch. +% +% In \texttt{package} mode, if these commands exist, then we are using +% a version of \LaTeXe{} with \textsf{expl3} preloaded (any version) +% and in any case patching is already done or the macros are in the +% format itself, so nothing to do. +% But if in \texttt{package} mode these macros don't exist, we have an +% even older version of \LaTeXe{} which doesn't even have +% \textsf{expl3} preloaded, so patching is necessary. +% +% All this means that in both \texttt{2ekernel} and \texttt{package} +% mode we have to check whether \cs{@expl@sys@load@backend@@@@} +% exists, and patch some \LaTeXe{} internals if it doesn't. +% +% In newer \LaTeXe{}, these macros have an empty definition in +% \texttt{ltexpl.dtx} in case something wrong happens while loading +% this file (\texttt{expl3.ltx}), so they can safely be used in the +% \LaTeXe{} kernel. +% +% \cs{@expl@sys@load@backend@@@@} is inserted right at the beginning +% of \cs{document}, but after closing the group started by \cs{begin}. +% When using \cs{tl_put_left:Nn} to patch the backend loading in +% \cs{document}, we need to make sure that it happens at group level +% zero, thus the strange |\endgroup...\begingroup| thing. +% +% This chunk of code should only be executed when loading +% \texttt{expl3.sty} in a \LaTeXe{} without \pkg{expl3} preloaded, so +% we check if \cs{@expl@sys@load@backend@@@@} exists. % \begin{macrocode} -%<*2ekernel> -\tl_put_left:Nn \document +\cs_if_exist:NF \@expl@sys@load@backend@@@@ + { + \tl_put_left:Nn \document + { + \endgroup + \@expl@sys@load@backend@@@@ + \begingroup + } + } +% \end{macrocode} +% +% Now we define it anyhow. +% \begin{macrocode} +\cs_gset_protected:Npn \@expl@sys@load@backend@@@@ { - \endgroup \str_if_exist:NF \c_sys_backend_str { \sys_load_backend:n { } } - \begingroup } -% +% \end{macrocode} +% \end{macro} +% +% Process package options. +% \begin{macrocode} %<*!2ekernel> \keys_set:nV { sys } \l_@@_options_clist \str_if_exist:NF \c_sys_backend_str @@ -1315,15 +1398,14 @@ % % \end{macrocode} % -% A test for pre-loading: does \tn{@pushfilenameaux} already exist. -% The alrady-loaded mechanism will handle everything now. % \begin{macrocode} %<*!2ekernel> -\cs_if_exist:NT \@pushfilenameaux +\bool_if:NT \g_@@_reload_bool { \cs_gset_eq:NN \__kernel_sys_configuration_load:n \__kernel_sys_configuration_load_std:n - \endinput + \ExplSyntaxOff + \file_input_stop: } % % \end{macrocode} @@ -1354,17 +1436,28 @@ % % \begin{macro}{\@pushfilename, \@popfilename} % \begin{macro}{\@@_status_pop:w} +% \begin{macro}{\@expl@push@filename@@@@} +% \begin{macro}{\@expl@push@filename@aux@@@@} +% \begin{macro}{\@expl@pop@filename@@@@} % The idea here is to use \LaTeXe{}'s \tn{@pushfilename} and % \tn{@popfilename} to track the current syntax status. This can be % achieved by saving the current status flag at each push to a stack, % then recovering it at the pop stage and checking if the code % environment should still be active. +% +% Here the code follows the same patching logic than above for +% \cs{@expl@sys@load@backend@@@@}. % \begin{macrocode} -\tl_put_left:Nn \@pushfilename +\cs_if_exist:NF \@expl@push@filename@@@@ + { + \tl_put_left:Nn \@pushfilename { \@expl@push@filename@@@@ } + \tl_put_right:Nn \@pushfilename { \@expl@push@filename@aux@@@@ } + } +\cs_gset_protected:Npn \@expl@push@filename@@@@ { \exp_args:Nx \__kernel_file_input_push:n { - \tl_to_str:N \@currname + \tl_to_str:N \@currname . \tl_to_str:N \@currext } \tl_put_left:Nx \l_@@_status_stack_tl @@ -1375,17 +1468,24 @@ } \ExplSyntaxOff } -\tl_put_right:Nn \@pushfilename { \@pushfilenameaux } % \end{macrocode} % This bit of trickery is needed to grab the name of the file being loaded % so we can record it. % \begin{macrocode} -\cs_set_protected:Npn \@pushfilenameaux #1#2#3 +\cs_gset_protected:Npn \@expl@push@filename@aux@@@@ #1#2#3 { \str_gset:Nn \g_file_curr_name_str {#3} #1 #2 {#3} } -\tl_put_right:Nn \@popfilename +% \end{macrocode} +% +% \begin{macrocode} +\cs_if_exist:NF \@expl@pop@filename@@@@ + { + \tl_put_right:Nn \@popfilename + { \@expl@pop@filename@@@@ } + } +\cs_gset_protected:Npn \@expl@pop@filename@@@@ { \__kernel_file_input_pop: \tl_if_empty:NTF \l_@@_status_stack_tl @@ -1407,6 +1507,9 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % \begin{variable}{\l_@@_status_stack_tl} % As \pkg{expl3} itself cannot be loaded with the code environment diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf index 1fa7547ef7..18721992ab 100644 Binary files a/macros/latex/contrib/l3kernel/expl3.pdf and b/macros/latex/contrib/l3kernel/expl3.pdf differ diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf index f4469c5223..8f3d8ec787 100644 Binary files a/macros/latex/contrib/l3kernel/interface3.pdf and b/macros/latex/contrib/l3kernel/interface3.pdf differ diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 82a9ce9aa6..2c600d4696 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 2020-06-03} +\date{Released 2020-06-18} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3alloc.dtx b/macros/latex/contrib/l3kernel/l3alloc.dtx index 9784c0abc8..4fdce60bdc 100644 --- a/macros/latex/contrib/l3kernel/l3alloc.dtx +++ b/macros/latex/contrib/l3kernel/l3alloc.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 3e56c6d86f..c871aeb759 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index fe25ffaf7f..8ff412298c 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index 90c1265942..a30bed22c7 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index 5b9533868c..a307cb02df 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -268,44 +268,6 @@ % % \section{Additions to \pkg{l3msg}} % -% In very rare cases it may be necessary to produce errors in an -% expansion-only context. The functions in this section should only be -% used if there is no alternative approach using \cs{msg_error:nnnnnn} -% or other non-expandable commands from the previous section. Despite -% having a similar interface as non-expandable messages, expandable -% errors must be handled internally very differently from normal error -% messages, as none of the tools to print to the terminal or the log -% file are expandable. As a result, short-hands such as |\{| or |\\| do -% not work, and messages must be very short (with default settings, -% they are truncated after approximately 50 characters). It is -% advisable to ensure that the message is understandable even when -% truncated, by putting the most important information up front. -% Another particularity of expandable messages is that they -% cannot be redirected or turned off by the user. -% -% \begin{function}[EXP, added = 2015-08-06, updated = 2019-02-28] -% { -% \msg_expandable_error:nnnnnn , -% \msg_expandable_error:nnnnn , -% \msg_expandable_error:nnnn , -% \msg_expandable_error:nnn , -% \msg_expandable_error:nn , -% \msg_expandable_error:nnffff , -% \msg_expandable_error:nnfff , -% \msg_expandable_error:nnff , -% \msg_expandable_error:nnf , -% } -% \begin{syntax} -% \cs{msg_expandable_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} -% \end{syntax} -% Issues an \enquote{Undefined error} message from \TeX{} itself -% using the undefined control sequence \cs{::error} then prints -% \enquote{! \meta{module}: }\meta{error message}, which should be -% short. With default settings, anything beyond approximately $60$ -% characters long (or bytes in some engines) is cropped. A leading -% space might be removed as well. -% \end{function} -% % \begin{function}[added = 2017-12-04]{\msg_show_eval:Nn, \msg_log_eval:Nn} % \begin{syntax} % \cs{msg_show_eval:Nn} \meta{function} \Arg{expression} @@ -520,26 +482,6 @@ % mappings. % \end{function} % -% \begin{function}[rEXP,added = 2018-05-03]{\seq_indexed_map_function:NN} -% \begin{syntax} -% \cs{seq_indexed_map_function:NN} \meta{seq~var} \meta{function} -% \end{syntax} -% Applies \meta{function} to every entry in the \meta{sequence -% variable}. The \meta{function} should have signature |:nn|. It -% receives two arguments for each iteration: the \meta{index} (namely -% |1| for the first entry, then |2| and so on) and the \meta{item}. -% \end{function} -% -% \begin{function}[added = 2018-05-03]{\seq_indexed_map_inline:Nn} -% \begin{syntax} -% \cs{seq_indexed_map_inline:Nn} \meta{seq~var} \Arg{inline function} -% \end{syntax} -% Applies \meta{inline function} to every entry in the \meta{sequence -% variable}. The \meta{inline function} should consist of code which -% receives the \meta{index} (namely |1| for the first entry, then |2| -% and so on) as~|#1| and the \meta{item} as~|#2|. -% \end{function} -% % \section{Additions to \pkg{l3sys}} % % \begin{variable}[added = 2018-05-02]{\c_sys_engine_version_str} @@ -958,56 +900,6 @@ %<@@=msg> % \end{macrocode} % -% \begin{macro}[EXP] -% { -% \msg_expandable_error:nnnnnn , -% \msg_expandable_error:nnnnn , -% \msg_expandable_error:nnnn , -% \msg_expandable_error:nnn , -% \msg_expandable_error:nn , -% \msg_expandable_error:nnffff , -% \msg_expandable_error:nnfff , -% \msg_expandable_error:nnff , -% \msg_expandable_error:nnf -% } -% \begin{macro}{\@@_expandable_error_module:nn} -% Pass to an auxiliary the message to display and the module name -% \begin{macrocode} -\cs_new:Npn \msg_expandable_error:nnnnnn #1#2#3#4#5#6 - { - \exp_args:Ne \@@_expandable_error_module:nn - { - \exp_args:Nc \exp_args:Noooo - { \c_@@_text_prefix_tl #1 / #2 } - { \tl_to_str:n {#3} } - { \tl_to_str:n {#4} } - { \tl_to_str:n {#5} } - { \tl_to_str:n {#6} } - } - {#1} - } -\cs_new:Npn \msg_expandable_error:nnnnn #1#2#3#4#5 - { \msg_expandable_error:nnnnnn {#1} {#2} {#3} {#4} {#5} { } } -\cs_new:Npn \msg_expandable_error:nnnn #1#2#3#4 - { \msg_expandable_error:nnnnnn {#1} {#2} {#3} {#4} { } { } } -\cs_new:Npn \msg_expandable_error:nnn #1#2#3 - { \msg_expandable_error:nnnnnn {#1} {#2} {#3} { } { } { } } -\cs_new:Npn \msg_expandable_error:nn #1#2 - { \msg_expandable_error:nnnnnn {#1} {#2} { } { } { } { } } -\cs_generate_variant:Nn \msg_expandable_error:nnnnnn { nnffff } -\cs_generate_variant:Nn \msg_expandable_error:nnnnn { nnfff } -\cs_generate_variant:Nn \msg_expandable_error:nnnn { nnff } -\cs_generate_variant:Nn \msg_expandable_error:nnn { nnf } -\cs_new:Npn \@@_expandable_error_module:nn #1#2 - { - \exp_after:wN \exp_after:wN - \exp_after:wN \@@_use_none_delimit_by_s_stop:w - \use:n { \::error ! ~ #2 : ~ #1 } \s_@@_stop - } -% \end{macrocode} -% \end{macro} -% \end{macro} -% % \begin{macro}{\msg_show_eval:Nn, \msg_log_eval:Nn, \@@_show_eval:nnN} % A short-hand used for \cs{int_show:n} and similar functions that % passes to \cs{tl_show:n} the result of applying |#1| (a @@ -1301,50 +1193,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro} -% { -% \seq_indexed_map_function:NN, \seq_indexed_map_inline:Nn, -% \@@_indexed_map:nNN, \@@_indexed_map:Nw -% } -% Similar to \cs{seq_map_function:NN} but we keep track of the item -% index as a |;|-delimited argument of \cs{@@_indexed_map:Nw}. -% \begin{macrocode} -\cs_new:Npn \seq_indexed_map_function:NN #1#2 - { - \@@_indexed_map:NN #1#2 - \prg_break_point:Nn \seq_map_break: { } - } -\cs_new_protected:Npn \seq_indexed_map_inline:Nn #1#2 - { - \int_gincr:N \g__kernel_prg_map_int - \cs_gset_protected:cpn - { @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1##2 {#2} - \exp_args:NNc \@@_indexed_map:NN #1 - { @@_map_ \int_use:N \g__kernel_prg_map_int :w } - \prg_break_point:Nn \seq_map_break: - { \int_gdecr:N \g__kernel_prg_map_int } - } -\cs_new:Npn \@@_indexed_map:NN #1#2 - { - \exp_after:wN \@@_indexed_map:Nw - \exp_after:wN #2 - \int_value:w 1 - \exp_after:wN \use_i:nn - \exp_after:wN ; - #1 - \prg_break: \@@_item:n { } \prg_break_point: - } -\cs_new:Npn \@@_indexed_map:Nw #1#2 ; #3 \@@_item:n #4 - { - #3 - #1 {#2} {#4} - \exp_after:wN \@@_indexed_map:Nw - \exp_after:wN #1 - \int_value:w \int_eval:w 1 + #2 ; - } -% \end{macrocode} -% \end{macro} -% % \subsection{Additions to \pkg{l3sys}} % % \begin{macrocode} @@ -1449,6 +1297,8 @@ % \end{macro} % \end{macro} % +% \subsection{Additions to \pkg{l3tl}} +% % \subsubsection{Building a token list} % % \begin{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 1a71aaf93f..a05860e286 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index 5051cd7fd3..b19b71f3f9 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color-base.dtx b/macros/latex/contrib/l3kernel/l3color-base.dtx index a042985a33..178cd98b19 100644 --- a/macros/latex/contrib/l3kernel/l3color-base.dtx +++ b/macros/latex/contrib/l3kernel/l3color-base.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -116,10 +116,9 @@ % number of data entries these require will depend on the number of % colors to be mixed. % \begin{texnote} -% The content of \cs{l_@@_current_tl} is space-separated as -% this allows it to be used directly in specials in many common cases. -% This internal representation is close to that used by the \texttt{dvips} -% program. +% The content of \cs{l_@@_current_tl} comprises two brace groups, the +% first containing the color model and the second containing the value(s) +% applicable in that model. % \end{texnote} % \end{variable} % @@ -142,7 +141,7 @@ %<*package> \@@_backend_pickup:N \l_@@_current_tl % - \@@_select:V \l_@@_current_tl + \@@_select:N \l_@@_current_tl } % \end{macrocode} % \end{macro} @@ -154,28 +153,25 @@ % \end{macrocode} % \end{variable} % -% \begin{macro}{\@@_select:n, \@@_select:V} -% \begin{macro}{\@@_select:w} +% \begin{macro}{\@@_select:N} +% \begin{macro}{\@@_select:nn} % Take an internal color specification and pass it to the driver. This code % is needed to ensure the current color but will also be used by the % higher-level experimental material. % \begin{macrocode} -\cs_new_protected:Npn \@@_select:n #1 - { \@@_select:w #1 \s_@@_stop } -\cs_generate_variant:Nn \@@_select:n { V } -\cs_new_protected:Npn \@@_select:w #1 ~ #2 \s_@@_stop - { \use:c { @@_backend_ #1 :w } #2 \s_@@_stop } +\cs_new_protected:Npn \@@_select:N #1 + { \exp_after:wN \@@_select:nn #1 } +\cs_new_protected:Npn \@@_select:nn #1#2 + { \use:c { @@_backend_ #1 :n } {#2} } % \end{macrocode} % \end{macro} % \end{macro} % % \begin{variable}{\l_@@_current_tl} -% As the setting data is used only -% for specials, and those are always space-separated, it makes most sense to -% hold the internal information in that form. +% The current color, with the model and % \begin{macrocode} \tl_new:N \l_@@_current_tl -\tl_set:Nn \l_@@_current_tl { gray~0 } +\tl_set:Nn \l_@@_current_tl { { gray } { 0 } } % \end{macrocode} % \end{variable} % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index f52b59a86e..3aa7eb3998 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index 647c6ac1f7..012e0d3208 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -930,6 +930,20 @@ % \end{macro} % \end{macro} % +% \subsection{Deprecated \pkg{l3seq} functions} +% +% \begin{macro}[EXP, deprecated = 2023-01-01] +% { +% \seq_indexed_map_inline:Nn, \seq_indexed_map_function:NN +% } +% \begin{macrocode} +\__kernel_patch_deprecation:nnNNpn { 2022-07-01 } { \seq_map_indexed_inline:Nn } +\cs_gset:Npn \seq_indexed_map_inline:Nn { \seq_map_indexed_inline:Nn } +\__kernel_patch_deprecation:nnNNpn { 2022-07-01 } { \seq_map_indexed_function:NN } +\cs_gset:Npn \seq_indexed_map_function:NN { \seq_map_indexed_function:NN } +% \end{macrocode} +% \end{macro} +% % \subsubsection{Deprecated \pkg{l3tl} functions} % % \begin{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 5a5a8714a9..ffb7269f49 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 2020-06-03} +% \date{Released 2020-06-18} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index 1651afd3e2..a334b443d0 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf index f9e4794c1c..52aaff704f 100644 Binary files a/macros/latex/contrib/l3kernel/l3docstrip.pdf and b/macros/latex/contrib/l3kernel/l3docstrip.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index bb8218281b..df60bcd3ab 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index e93d117612..c189e4bdd9 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3final.dtx b/macros/latex/contrib/l3kernel/l3final.dtx index 8592605324..5f3a74fb0d 100644 --- a/macros/latex/contrib/l3kernel/l3final.dtx +++ b/macros/latex/contrib/l3kernel/l3final.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 281ef1a9b7..de8f7b5046 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index c0dff40732..3ef09ee2c7 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 2020-06-03} +% \date{Released 2020-06-18} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index 46d089b2c6..adce22a426 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index 7d01b20929..fd1cffd494 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 15150ba29d..8c8d474918 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index 42597305e6..93835e8c71 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index 445f206b51..67960e47fe 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index 9f08120f3b..26c7ed784a 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index 442d10c798..28257218e7 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 2815ad4670..25e1d1cb9d 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index 15cdb3b3cd..281e5339d0 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 123c376a67..6c68c6181e 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 2020-06-03} +% \date{Released 2020-06-18} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index 28d41e3d06..dcf57a15f9 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 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index ff90a19626..81b652565a 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index 0338cc9e76..da04ae867c 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index 9e05786b9a..a3d0ca4a8f 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 3e4f8659c3..6ab5647a82 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index c15b4c7b9e..e63035f68e 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index 4032b44581..c9dd6209f6 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 0ff70d1465..0a71938f2b 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 6fe7da633c..56181c77b8 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index af1e78d3ed..f7182ea092 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -423,6 +423,46 @@ % all (see the discussion of message redirection). % \end{function} % +% \subsection{Expandable error messages} +% +% In very rare cases it may be necessary to produce errors in an +% expansion-only context. The functions in this section should only be +% used if there is no alternative approach using \cs{msg_error:nnnnnn} +% or other non-expandable commands from the previous section. Despite +% having a similar interface as non-expandable messages, expandable +% errors must be handled internally very differently from normal error +% messages, as none of the tools to print to the terminal or the log +% file are expandable. As a result, short-hands such as |\{| or |\\| do +% not work, and messages must be very short (with default settings, +% they are truncated after approximately 50 characters). It is +% advisable to ensure that the message is understandable even when +% truncated, by putting the most important information up front. +% Another particularity of expandable messages is that they +% cannot be redirected or turned off by the user. +% +% \begin{function}[EXP, added = 2015-08-06, updated = 2019-02-28] +% { +% \msg_expandable_error:nnnnnn , +% \msg_expandable_error:nnnnn , +% \msg_expandable_error:nnnn , +% \msg_expandable_error:nnn , +% \msg_expandable_error:nn , +% \msg_expandable_error:nnffff , +% \msg_expandable_error:nnfff , +% \msg_expandable_error:nnff , +% \msg_expandable_error:nnf , +% } +% \begin{syntax} +% \cs{msg_expandable_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \end{syntax} +% Issues an \enquote{Undefined error} message from \TeX{} itself +% using the undefined control sequence \cs{::error} then prints +% \enquote{! \meta{module}: }\meta{error message}, which should be +% short. With default settings, anything beyond approximately $60$ +% characters long (or bytes in some engines) is cropped. A leading +% space might be removed as well. +% \end{function} +% % \section{Redirecting messages} % % Each message has a \enquote{name}, which can be used to alter the behaviour @@ -2098,6 +2138,56 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}[EXP] +% { +% \msg_expandable_error:nnnnnn , +% \msg_expandable_error:nnnnn , +% \msg_expandable_error:nnnn , +% \msg_expandable_error:nnn , +% \msg_expandable_error:nn , +% \msg_expandable_error:nnffff , +% \msg_expandable_error:nnfff , +% \msg_expandable_error:nnff , +% \msg_expandable_error:nnf +% } +% \begin{macro}{\@@_expandable_error_module:nn} +% Pass to an auxiliary the message to display and the module name +% \begin{macrocode} +\cs_new:Npn \msg_expandable_error:nnnnnn #1#2#3#4#5#6 + { + \exp_args:Ne \@@_expandable_error_module:nn + { + \exp_args:Nc \exp_args:Noooo + { \c_@@_text_prefix_tl #1 / #2 } + { \tl_to_str:n {#3} } + { \tl_to_str:n {#4} } + { \tl_to_str:n {#5} } + { \tl_to_str:n {#6} } + } + {#1} + } +\cs_new:Npn \msg_expandable_error:nnnnn #1#2#3#4#5 + { \msg_expandable_error:nnnnnn {#1} {#2} {#3} {#4} {#5} { } } +\cs_new:Npn \msg_expandable_error:nnnn #1#2#3#4 + { \msg_expandable_error:nnnnnn {#1} {#2} {#3} {#4} { } { } } +\cs_new:Npn \msg_expandable_error:nnn #1#2#3 + { \msg_expandable_error:nnnnnn {#1} {#2} {#3} { } { } { } } +\cs_new:Npn \msg_expandable_error:nn #1#2 + { \msg_expandable_error:nnnnnn {#1} {#2} { } { } { } { } } +\cs_generate_variant:Nn \msg_expandable_error:nnnnnn { nnffff } +\cs_generate_variant:Nn \msg_expandable_error:nnnnn { nnfff } +\cs_generate_variant:Nn \msg_expandable_error:nnnn { nnff } +\cs_generate_variant:Nn \msg_expandable_error:nnn { nnf } +\cs_new:Npn \@@_expandable_error_module:nn #1#2 + { + \exp_after:wN \exp_after:wN + \exp_after:wN \@@_use_none_delimit_by_s_stop:w + \use:n { \::error ! ~ #2 : ~ #1 } \s_@@_stop + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macrocode} % % \end{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index 23472c2141..3a49253af6 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf index 68891b4cb4..b5ccaa4abd 100644 Binary files a/macros/latex/contrib/l3kernel/l3news.pdf and b/macros/latex/contrib/l3kernel/l3news.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf index 05d8f5b451..9df1d2e357 100644 Binary files a/macros/latex/contrib/l3kernel/l3news01.pdf and b/macros/latex/contrib/l3kernel/l3news01.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf index 4971e668a7..986447ba43 100644 Binary files a/macros/latex/contrib/l3kernel/l3news02.pdf and b/macros/latex/contrib/l3kernel/l3news02.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf index 92c4792497..b574f29d39 100644 Binary files a/macros/latex/contrib/l3kernel/l3news03.pdf and b/macros/latex/contrib/l3kernel/l3news03.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf index abfb4d4e06..bd28986715 100644 Binary files a/macros/latex/contrib/l3kernel/l3news04.pdf and b/macros/latex/contrib/l3kernel/l3news04.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf index 414e9c5ea2..98f1049a04 100644 Binary files a/macros/latex/contrib/l3kernel/l3news05.pdf and b/macros/latex/contrib/l3kernel/l3news05.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf index 86ca1299d2..09db992250 100644 Binary files a/macros/latex/contrib/l3kernel/l3news06.pdf and b/macros/latex/contrib/l3kernel/l3news06.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf index 7ad6cfd988..7c1d2e11a6 100644 Binary files a/macros/latex/contrib/l3kernel/l3news07.pdf and b/macros/latex/contrib/l3kernel/l3news07.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf index c9fd5acb04..fde17f4305 100644 Binary files a/macros/latex/contrib/l3kernel/l3news08.pdf and b/macros/latex/contrib/l3kernel/l3news08.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf index e5b0088c54..b088958a78 100644 Binary files a/macros/latex/contrib/l3kernel/l3news09.pdf and b/macros/latex/contrib/l3kernel/l3news09.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf index 76eee99422..bc0ccc14ec 100644 Binary files a/macros/latex/contrib/l3kernel/l3news10.pdf and b/macros/latex/contrib/l3kernel/l3news10.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf index efa6befc92..6a3bc0787d 100644 Binary files a/macros/latex/contrib/l3kernel/l3news11.pdf and b/macros/latex/contrib/l3kernel/l3news11.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf index 2e6b0bec70..573feb45f8 100644 Binary files a/macros/latex/contrib/l3kernel/l3news12.pdf and b/macros/latex/contrib/l3kernel/l3news12.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf index 16b24d95d7..fe9b65c217 100644 Binary files a/macros/latex/contrib/l3kernel/l3prefixes.pdf and b/macros/latex/contrib/l3kernel/l3prefixes.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index e699596a5b..52d6794833 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index 7158f5e848..a85becf5e3 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index c8e466b3cb..3368fa159b 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index e20a6ca6ec..30e355eada 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -914,13 +914,12 @@ % % \subsection{Helpers} % -% \begin{macro} -% {\@@_int_eval:w} +% \begin{macro}{\@@_int_eval:w} % Access the primitive: performance is key here, so we do not use % the slower route \emph{via} \cs{int_eval:n}. % \begin{macrocode} \cs_new_eq:NN \@@_int_eval:w \tex_numexpr:D -% \end{macrocode} +% \end{macrocode} % \end{macro} % % \begin{macro}{\@@_standard_escapechar:} diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index 7b2121719d..40d829f96c 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % @@ -578,6 +578,26 @@ % \meta{items} are returned from left to right. % \end{function} % +% \begin{function}[rEXP,added = 2018-05-03]{\seq_map_indexed_function:NN} +% \begin{syntax} +% \cs{seq_map_indexed_function:NN} \meta{seq~var} \meta{function} +% \end{syntax} +% Applies \meta{function} to every entry in the \meta{sequence +% variable}. The \meta{function} should have signature |:nn|. It +% receives two arguments for each iteration: the \meta{index} (namely +% |1| for the first entry, then |2| and so on) and the \meta{item}. +% \end{function} +% +% \begin{function}[added = 2018-05-03]{\seq_map_indexed_inline:Nn} +% \begin{syntax} +% \cs{seq_map_indexed_inline:Nn} \meta{seq~var} \Arg{inline function} +% \end{syntax} +% Applies \meta{inline function} to every entry in the \meta{sequence +% variable}. The \meta{inline function} should consist of code which +% receives the \meta{index} (namely |1| for the first entry, then |2| +% and so on) as~|#1| and the \meta{item} as~|#2|. +% \end{function} +% % \begin{function}[rEXP, updated = 2012-06-29]{\seq_map_break:} % \begin{syntax} % \cs{seq_map_break:} @@ -2018,6 +2038,50 @@ % \end{macrocode} % \end{macro} % +% \begin{macro} +% { +% \seq_map_indexed_function:NN, \seq_map_indexed_inline:Nn, +% \@@_map_indexed:nNN, \@@_map_indexed:Nw +% } +% Similar to \cs{seq_map_function:NN} but we keep track of the item +% index as a |;|-delimited argument of \cs{@@_map_indexed:Nw}. +% \begin{macrocode} +\cs_new:Npn \seq_map_indexed_function:NN #1#2 + { + \@@_map_indexed:NN #1#2 + \prg_break_point:Nn \seq_map_break: { } + } +\cs_new_protected:Npn \seq_map_indexed_inline:Nn #1#2 + { + \int_gincr:N \g__kernel_prg_map_int + \cs_gset_protected:cpn + { @@_map_ \int_use:N \g__kernel_prg_map_int :w } ##1##2 {#2} + \exp_args:NNc \@@_map_indexed:NN #1 + { @@_map_ \int_use:N \g__kernel_prg_map_int :w } + \prg_break_point:Nn \seq_map_break: + { \int_gdecr:N \g__kernel_prg_map_int } + } +\cs_new:Npn \@@_map_indexed:NN #1#2 + { + \exp_after:wN \@@_map_indexed:Nw + \exp_after:wN #2 + \int_value:w 1 + \exp_after:wN \use_i:nn + \exp_after:wN ; + #1 + \prg_break: \@@_item:n { } \prg_break_point: + } +\cs_new:Npn \@@_map_indexed:Nw #1#2 ; #3 \@@_item:n #4 + { + #3 + #1 {#2} {#4} + \exp_after:wN \@@_map_indexed:Nw + \exp_after:wN #1 + \int_value:w \int_eval:w 1 + #2 ; + } +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\seq_count:N, \seq_count:c} % \begin{macro}{\@@_count:w, \@@_count_end:w} % Since counting the items in a sequence is quite common, we optimize diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index d8a1466c2f..7b534be25c 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index f614da1a7e..9163b494d0 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 4000a2d1f7..6a910b8040 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 97d8fa5b43..a6fad22d02 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf index 3fbedfb171..73d3f8840b 100644 Binary files a/macros/latex/contrib/l3kernel/l3styleguide.pdf and b/macros/latex/contrib/l3kernel/l3styleguide.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index e4f0d040d8..915534ed11 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 2020-06-03} +\date{Released 2020-06-18} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf index f47d9fbf9e..15c831eb55 100644 Binary files a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf and b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index 4b9951bed1..4e280f75d2 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 2020-06-03} +\date{Released 2020-06-18} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 911986e5d8..8a27d4b78e 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf index e0b64a7edc..1a6beba13f 100644 Binary files a/macros/latex/contrib/l3kernel/l3term-glossary.pdf and b/macros/latex/contrib/l3kernel/l3term-glossary.pdf differ diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index 5b10a1457f..99464b67c9 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 2020-06-03} +\date{Released 2020-06-18} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index d2b228bb80..b8e534b4b6 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index 9509997cfd..2543dbebae 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index 65032dbe3b..00648a4b84 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 23bac06657..a5662491e1 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index d265802b0f..b10167ca25 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index b3780ba69e..d12c5deeed 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index 109d860637..28452d5a2c 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-06-03} +% \date{Released 2020-06-18} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf index 6f9dbc2238..4ea4120d6d 100644 Binary files a/macros/latex/contrib/l3kernel/source3.pdf and b/macros/latex/contrib/l3kernel/source3.pdf differ diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index c236ce8d47..985adb77b5 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 2020-06-03} +\date{Released 2020-06-18} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/tudscr/README.md b/macros/latex/contrib/tudscr/README.md index c0c90ecafa..d991ccbf71 100644 --- a/macros/latex/contrib/tudscr/README.md +++ b/macros/latex/contrib/tudscr/README.md @@ -4,7 +4,7 @@ Copyright (C) Falk Hanisch , 2012-2020 - tudscr 2020/01/14 v2.06f + tudscr 2020/06/18 v2.06g ---------------------------------------------------------------------------- @@ -53,6 +53,9 @@ Das Bundle beinhaltet: Versionen --------- +**v2.06g** (2020/06/18) ++ Bugfix für Änderung des Satzspiegels im Dokument + **v2.06f** (2020/01/14) + Anpassungen für Paket `scrbase v3.28` @@ -251,6 +254,9 @@ The bundle offers: Versions -------- +**v2.06g** (2020/06/18) ++ bug fix when changing type area within document + **v2.06f** (2020/01/14) + adaptions for package `scrbase v3.28` diff --git a/macros/latex/contrib/tudscr/doc/tudscr.pdf b/macros/latex/contrib/tudscr/doc/tudscr.pdf index c185ea1696..d35a4aa30f 100644 Binary files a/macros/latex/contrib/tudscr/doc/tudscr.pdf and b/macros/latex/contrib/tudscr/doc/tudscr.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tudscr_print.pdf b/macros/latex/contrib/tudscr/doc/tudscr_print.pdf index 25869aaf2b..6bf0c53f00 100644 Binary files a/macros/latex/contrib/tudscr/doc/tudscr_print.pdf and b/macros/latex/contrib/tudscr/doc/tudscr_print.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tudscrsource.pdf b/macros/latex/contrib/tudscr/doc/tudscrsource.pdf index 82ac3b089d..da1c9046af 100644 Binary files a/macros/latex/contrib/tudscr/doc/tudscrsource.pdf and b/macros/latex/contrib/tudscr/doc/tudscrsource.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf b/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf index 09fe12442b..67f888eb07 100644 Binary files a/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf and b/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf b/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf index 364aea0e73..d8dca34190 100644 Binary files a/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf and b/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf differ diff --git a/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf b/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf index f9f8d8dc7a..9821b329c0 100644 Binary files a/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf and b/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf differ diff --git a/macros/latex/contrib/tudscr/source/doc/tudscr.tex b/macros/latex/contrib/tudscr/source/doc/tudscr.tex index 0dc90c5597..2e9a84f445 100644 --- a/macros/latex/contrib/tudscr/source/doc/tudscr.tex +++ b/macros/latex/contrib/tudscr/source/doc/tudscr.tex @@ -29,7 +29,7 @@ \endgroup% } \faculty{\cdurl} -\date{14.01.2020} +\date{2020-06-18} \author{% Falk Hanisch% \expandafter\emailaddress\expandafter{\tudscrmail}% diff --git a/macros/latex/contrib/tudscr/source/tudscr-area.dtx b/macros/latex/contrib/tudscr/source/tudscr-area.dtx index 0c1c3f1f6b..0d5e1e0b25 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-area.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-area.dtx @@ -1,4 +1,4 @@ -% \CheckSum{2247} +% \CheckSum{2307} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden @@ -52,7 +52,7 @@ % \fi% % \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi -\ProvidesFile{tudscr-area.dtx}[2019/07/19 v2.06c TUD-Script\space% +\ProvidesFile{tudscr-area.dtx}[2020/06/18 v2.06g TUD-Script\space% (type or page area)% ] % @@ -291,6 +291,12 @@ % \changes{v2.05}{2015/11/29}{neu}^^A % \begin{macro}{\tud@cdgeometry@assignlayout} % \changes{v2.06}{2018/08/13}{neu}^^A +% \begin{macro}{\tud@cdgeometry@resetlayout} +% \changes{v2.06g}{2020/06/18}{neu, Bugfix für Änderung des Papierformates}^^A +% \begin{macro}{\tud@cdgeometry@papersize@store} +% \changes{v2.06g}{2020/06/18}{neu}^^A +% \begin{macro}{\tud@cdgeometry@papersize@last} +% \changes{v2.06g}{2020/06/18}{neu}^^A % \begin{length}{\tud@len@layoutwidth} % \changes{v2.05}{2016/04/03}{neu}^^A % \begin{length}{\tud@len@layoutheight} @@ -317,18 +323,6 @@ \newlength\tud@len@layoutheight \newlength\tud@len@layouthoffset \newlength\tud@len@layoutvoffset -% \end{macrocode} -% Mit \cs{tud@cdgeometry@assignlayout} wird die Layoutgröße, welche ggf. mit -% dem Paket \pkg{geometry} angegeben wurde, entsprechend gesetzt. -% \begin{macrocode} -\newcommand*\tud@cdgeometry@assignlayout{% - \ifdim\tud@len@layoutwidth<\p@\relax% - \setlength\tud@len@layoutwidth{\paperwidth}% - \fi% - \ifdim\tud@len@layoutheight<\p@\relax% - \setlength\tud@len@layoutheight{\paperheight}% - \fi% -} \newcommand*\tud@cdgeometry@set{% \tud@cdgeometry@assignlayout% \tud@if@v@lower{2.05}{% @@ -526,12 +520,57 @@ \setlength\tud@len@headsep{\dimexpr.707107\tud@len@headsep\relax}% \setlength\tud@len@footsep{\dimexpr.707107\tud@len@footsep\relax}% \fi% + \tud@cdgeometry@papersize@store% +} +% \end{macrocode} +% Mit \cs{tud@cdgeometry@assignlayout} wird die Layoutgröße, welche ggf. mit +% dem Paket \pkg{geometry} angegeben wurde, entsprechend gesetzt. +% \begin{macrocode} +\newcommand*\tud@cdgeometry@assignlayout{% + \ifdim\tud@len@layoutwidth<\p@\relax% + \setlength\tud@len@layoutwidth{\paperwidth}% + \fi% + \ifdim\tud@len@layoutheight<\p@\relax% + \setlength\tud@len@layoutheight{\paperheight}% + \fi% +} +% \end{macrocode} +% Das Verarbeiten des Parameters \prm{layout} von \pkg{geometry} ist etwas +% komplizierter. Normalerweise werden dessen Einstellungen bei einer einfachen +% Änderung des Satzspiegels beibehalten. Bei einer Änderung des Papierformates +% sind die damit gemachten Einstellungen nur bedingt weiterhin nutzbar. Die +% Offset-Werte bleiben in diesem Fall erhalten, das Layoutformat allerdings +% wird zurückgesetzt. Das aktuelle Papierformat wird nach der Prüfung auf eine +% Änderung in \cs{tud@cdgeometry@papersize@last} gesichert. +% \begin{macrocode} +\newcommand*\tud@cdgeometry@papersize@last{} +\newcommand*\tud@cdgeometry@papersize@store{% + \edef\tud@cdgeometry@papersize@last{\the\paperheight:\the\paperwidth}% +} +\newcommand*\tud@cdgeometry@resetlayout{% + \begingroup% + \edef\tud@res@a{\the\paperheight:\the\paperwidth}% + \def\tud@res@b{% + \endgroup% + \tud@cdgeometry@papersize@store% + }% + \ifx\tud@res@a\tud@cdgeometry@papersize@last\else% + \appto\tud@res@b{% + \setlength\tud@len@layoutwidth{\z@}% + \setlength\tud@len@layoutheight{\z@}% + \tud@x@geometry@fixmargins% + }% + \fi% + \tud@res@b% } % \end{macrocode} % \end{length}^^A \tud@len@layoutvoffset % \end{length}^^A \tud@len@layouthoffset % \end{length}^^A \tud@len@layoutheight % \end{length}^^A \tud@len@layoutwidth +% \end{macro}^^A \tud@cdgeometry@papersize@last +% \end{macro}^^A \tud@cdgeometry@papersize@store +% \end{macro}^^A \tud@cdgeometry@resetlayout % \end{macro}^^A \tud@cdgeometry@assignlayout % \end{macro}^^A \if@tud@cdgeometry@adjust % \end{macro}^^A \tud@cdgeometry@set @@ -630,11 +669,11 @@ % erfolgte, wird auf das Laden verzichtet (\cs{if@tud@cdgeometry@reset}). % \begin{macrocode} \if@atdocument% - \if@tud@cdgeometry@reset\else% + \if@tud@cdgeometry@reset\else% false \ifcase\tud@cdgeometry@num\relax% \tud@loadgeometry{current@typearea}% \@tud@x@geometry@fixmarginstrue% - \or% + \or% custom \tud@loadgeometry{current@custom}% \@tud@x@geometry@fixmarginstrue% \fi% @@ -913,6 +952,7 @@ % der einzelnen Seitenstile umzusetzen. Dabei werden auch etwaige Optionen von % \KOMAScript{} beachtet. Hierfür werden die originalen Befehle \cs{geometry} % und \cs{newgeometry} angepasst, weshalb diese vorher gesichert werden. +% \ToDo{erweiterte Möglichkeiten von \cs{newgeometry} dokumentieren}[v2.07] % \begin{macrocode} \newif\if@tud@x@geometry@enabled% \@tud@x@geometry@enabledtrue% @@ -955,7 +995,11 @@ \if@tud@x@geometry@enabled% \if@atdocument% \@tud@x@geometry@fixmarginstrue% - \tud@cdgeometry@reset{custom}% + \ifcase\tud@cdgeometry@num\relax% false + \tud@cdgeometry@reset{typearea}% + \or% custom + \tud@cdgeometry@reset{custom}% + \fi% \tud@cdgeometry@process% \fi% \fi% @@ -987,6 +1031,7 @@ % \end{macro}^^A \geometry % \begin{macro}{\tud@x@geometry@user} % \changes{v2.05}{2016/03/06}{neu}^^A +% \changes{v2.06g}{2020/06/18}{Bugfix für Änderung des Papierformates}^^A % \begin{parameter}{paper} % \begin{parameter}{papername} % \begin{parameter}{paperwidth} @@ -1023,9 +1068,15 @@ \let\tud@x@geometry@layout\@empty% \let\tud@x@geometry@parameter\@empty% \TUD@parameter@set{geometry}{#1}% +% \end{macrocode} +% Bei einer Änderung des Papierformates wird das Layoutformat zurückgesetzt. +% \begin{macrocode} + \tud@x@geometry@area@set{paper}% + \tud@cdgeometry@resetlayout% \ifx\tud@x@geometry@layout\@empty\else% \begingroup% \tud@x@geometry@area@set{layout}% + \tud@cdgeometry@assignlayout% \edef\tud@res@a{% \endgroup% \noexpand\setlength\noexpand\tud@len@layoutwidth{\the\paperwidth}% @@ -1033,17 +1084,36 @@ }% \tud@res@a% \fi% - \tud@x@geometry@area@set{paper}% \ifstr{#2}{newgeometry}{% \eappto\Gm@restore@org{% \noexpand\paperwidth=\the\paperwidth\relax% \noexpand\paperheight=\the\paperheight\relax% }% - \tud@x@geometry@getlayout{\tud@res@a}% - \epreto\tud@x@geometry@parameter{\tud@res@a,}% - \def\tud@res@a{\tud@cs@use{newgeometry}}% - \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}% - \edef\tud@x@geometry@init{\tud@x@geometry@parameter}% +% \end{macrocode} +% Wird der Befehl verwendet, wenn eigentlich \pkg{typearea} aktiv ist, so +% werden lediglich die Einstellungen zu \prm{paper} und \prm{layout} beachtet. +% Dies wird über die gepatchte Version von \cs{typearea} realisert. Siehe dazu +% \cs{tud@x@typearea@before} und \cs{tud@x@typearea@after} für Details. +% \begin{macrocode} + \ifcase\tud@cdgeometry@num\relax% + \typearea[current]{current}% + \ifx\tud@x@geometry@parameter\@empty\else% + \ClassWarning{\TUD@Class@Name}{% + It isn't possible to use \string\newgeometry with any\MessageBreak% + key except `paper' or `layout' when package `typearea'\MessageBreak% + is used with`cdgeometry=typearea'% + }% + \fi% +% \end{macrocode} +% Die Abarbeitung der gegebenen Parameter wird mit \cs{tud@cdgeometry@process} +% innerhalb von \cs{Gm@changelayout} realisiert. Letzteres Makro wird wiederum +% von der originalen Definition von \cs{newgeometry} aufgerufen. +% \begin{macrocode} + \else% + \def\tud@res@a{\tud@cs@use{newgeometry}}% + \expandafter\tud@res@a\expandafter{\tud@x@geometry@parameter}% + \edef\tud@x@geometry@init{\tud@x@geometry@parameter}% + \fi% }{% \eappto\tud@x@geometry@init{\tud@x@geometry@parameter}% }% @@ -1052,7 +1122,7 @@ % Das folgende Konstrukt ist aus der Idee entstanden, die Parameter \val{paper} % sowie \val{layout} des Paketes \pkg{geometry} auf die passenden Optionen von % \KOMAScript{} abbilden zu können und insbesondere Schnittmarken für alle -% Seitenstile bereitzustellen. % +% Seitenstile bereitzustellen.% % \ToDo{% % Leider ist aus der dem Versuch, eine halbwegs einheitliche Schnittstelle % zwischen den Paketen \pkg{typearea} und \pkg{geometry} zu schaffen, ein @@ -1101,8 +1171,12 @@ }% \@tempa#1,,\@nil% }% - \TUD@parameter@def{layoutwidth}{\setlength\tud@len@layoutwidth{#1}}% - \TUD@parameter@def{layoutheight}{\setlength\tud@len@layoutheight{#1}}% + \TUD@parameter@def{layoutwidth}{% + \tud@x@geometry@area@def{layout}{#1:\tud@len@layoutheight}% + }% + \TUD@parameter@def{layoutheight}{% + \tud@x@geometry@area@def{layout}{\tud@len@layoutwidth:#1}% + }% \TUD@parameter@def{layoutoffset}{% \def\@tempa##1,##2,##3\@nil{% \IfArgIsEmpty{##2}{% @@ -1202,25 +1276,27 @@ \fi% }% % \end{macrocode} -% Der Befehl \cs{tud@x@geometry@area@set} bewerkstelligt die Abarbeitung der -% zuvor gesammelten Schlüssel. +% Der Befehl \cs{tud@x@geometry@area@set} bewerkstelligt die sequentielle +% Abarbeitung der zuvor gesammelten Schlüssel. % \begin{macrocode} \newcommand*\tud@x@geometry@area@set[1]{% \letcs{\@tempa}{tud@x@geometry@#1}% \ifdefvoid{\@tempa}{}{% \def\@tempb##1:##2:##3\@nil{% - \begingroup% - \IfArgIsEmpty{##2}{% - \def\@tempb{\KOMAoption{paper}{##1}}% - }{% - \if@landscape% - \def\@tempb{\KOMAoption{paper}{##2:##1}}% - \else% - \def\@tempb{\KOMAoption{paper}{##1:##2}}% - \fi% - }% - \edef\@tempb{\endgroup\expandonce\@tempb}% - \@tempb% + \IfArgIsEmpty{##2}{% + \KOMAoption{paper}{##1}% + }{% +% \end{macrocode} +% \KOMAScript{} stellt sich ziemlich clever an und setzt das Papierformat in +% dieser Notation immer korrekt im Quer- oder Hochformat, unabhängig von der +% Reihenfolge der angegebenen Längen. Für den Parameter \prm{layout} ist dies +% jedoch unerwünscht, weshalb der verantwortliche Befehl deaktiviert wird. +% \emph{Dies geschieht hier direkt und nicht in einer Gruppe,} weil der Aufruf +% von \cs{tud@x@geometry@area@set}|{layout}| lokal erfolgt. +% \begin{macrocode} + \ifstr{#1}{layout}{\let\scr@setpaperorientation\relax}{}% + \KOMAoption{paper}{##1:##2}% + }% }% \def\@tempc##1{\@tempb##1::\@nil}% \expandafter\forcsvlist\expandafter\@tempc\expandafter{\@tempa}% @@ -1258,12 +1334,12 @@ \ifGm@pass% \let#1\@empty% \else% - \tud@cdgeometry@assignlayout% \begingroup% % \end{macrocode} % Das Setzen des Layouts erfolgt nur, wenn die dazugehörigen Längen \emph{nicht} % denen des Papierbogens entsprechen. % \begin{macrocode} + \tud@cdgeometry@assignlayout% \@tud@res@swafalse% \ifdim\tud@len@layoutwidth=\paperwidth\relax\else\@tud@res@swatrue\fi% \ifdim\tud@len@layoutheight=\paperheight\relax\else\@tud@res@swatrue\fi% @@ -2081,6 +2157,7 @@ % \begin{macro}{\typearea} % \begin{macro}{\areaset} % \begin{macro}{\storereareas} +% \changes{v2.06g}{2020/06/18}{Sichern der Längen für \prm{layout}}^^A % \begin{macro}{\tud@x@typearea@before} % \changes{v2.06}{2018/08/13}{neu}^^A % \begin{macro}{\tud@x@typearea@after} @@ -2094,6 +2171,7 @@ % der Präambel werden in \cs{tud@x@typearea@init} gesichert. % \begin{macrocode} \newcommand*\tud@x@typearea@before{% + \tud@cdgeometry@resetlayout% \tud@skip@store{paperheight}% \tud@skip@store{paperwidth}% \begingroup% @@ -2148,9 +2226,14 @@ \begingroup \tud@x@geometry@fixmargins% \tud@cs@use{storeareas}{#1}% + \def\tud@res@b##1{\unexpanded{\setlength##1}{\the##1}}% \edef\tud@res@a{% \endgroup% \etex@unexpanded{\def#1}{% + \tud@res@b{\tud@len@layoutwidth}% + \tud@res@b{\tud@len@layoutheight}% + \tud@res@b{\tud@len@layouthoffset}% + \tud@res@b{\tud@len@layoutvoffset}% \expandonce#1% \def\noexpand\tud@cdgeometry@num{\tud@cdgeometry@num}% }% diff --git a/macros/latex/contrib/tudscr/source/tudscr-comp.dtx b/macros/latex/contrib/tudscr/source/tudscr-comp.dtx index 4158956194..018ed3461c 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-comp.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-comp.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1453} +% \CheckSum{1454} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden @@ -52,7 +52,7 @@ % \fi % \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi -\ProvidesFile{tudscr-comp.dtx}[2020/01/14 v2.06f TUD-Script\space% +\ProvidesFile{tudscr-comp.dtx}[2020/06/18 v2.06g TUD-Script\space% % % \iffalse % @@ -383,6 +383,8 @@ % \changes{v2.06e}{2019/10/23}{neu}^^A % \begin{macro}{\tud@v@2.06f} % \changes{v2.06f}{2020/01/14}{neu}^^A +% \begin{macro}{\tud@v@2.06g} +% \changes{v2.06g}{2020/06/18}{neu}^^A % \begin{macro}{\tud@v@last} % \changes{v2.02}{2014/08/22}{neu}^^A % \changes{v2.03}{2015/01/13}{angepasst}^^A @@ -425,9 +427,11 @@ \csdef{tud@v@2.06d}{4} \csdef{tud@v@2.06e}{4} \csdef{tud@v@2.06f}{4} +\csdef{tud@v@2.06g}{4} \csdef{tud@v@last}{4} % \end{macrocode} % \end{macro}^^A \tud@v@last +% \end{macro}^^A \tud@v@2.06g % \end{macro}^^A \tud@v@2.06f % \end{macro}^^A \tud@v@2.06e % \end{macro}^^A \tud@v@2.06d diff --git a/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx b/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx index c0fb49b803..1d68079436 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-fonts.dtx @@ -1,4 +1,4 @@ -% \CheckSum{3124} +% \CheckSum{3183} % \iffalse meta-comment % % TUD-Script -- Corporate Design of Technische Universität Dresden @@ -52,7 +52,7 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi % \fi % -\ProvidesFile{tudscr-fonts.dtx}[2020/01/14 v2.06f TUD-Script\space% +\ProvidesFile{tudscr-fonts.dtx}[2020/06/18 v2.06g TUD-Script\space% % % \iffalse % @@ -1283,6 +1283,7 @@ % Danach erfolgt die Definition der Schriften des \CDs. % \begin{macrocode} \tud@cdfont@set% + \tud@cdfont@symbols@set% \tud@ttfont@set% \if@tud@x@mweights@enabled% \edef\bfseries@rm{\tud@cdfont@bf}% @@ -1323,6 +1324,7 @@ \tud@cs@restore{sffamily}% \tud@cs@restore{ttfamily}% \fi% + \tud@cdfont@symbols@reset% \fi% \if@tud@x@mweights@enabled% \edef\rmdef@ult{\rmdefault}% @@ -1449,6 +1451,122 @@ % \end{macro}^^A \tud@cdfont@md % \end{macro}^^A \tud@cdfont@@set % \end{macro}^^A \tud@cdfont@set +% \begin{macro}{\tud@cdfont@declare@symb} +% \changes{v2.07}{2020/01/22}{neu}^^A +% \begin{macro}{\tud@cdfont@symb@list} +% \changes{v2.07}{2020/01/22}{neu}^^A +% \begin{macro}{\tud@DeclareTextSymbol} +% \changes{v2.07}{2020/01/22}{neu}^^A +% Mit \cs{tud@cdfont@declare@symb} können Glyhen respektive einzelne Zeichen +% definiert werden, welche über das Makro \cs{tud@cdfont@symbols@set} nur zum +% Einsatz kommen, wenn \opt{cdfont=true} aktiviert wurde. Damit können gezielt +% Symbole in verschiedenen Kodierungen aus unterscihedlichen Schriftfamilien +% definiert werden. +% \begin{macrocode} +\newcommand*\tud@cdfont@symb@list{} +\newcommand*\tud@cdfont@declare@symb[4]{% + \listeadd\tud@cdfont@symb@list{#1}% + \tud@DeclareTextSymbol{#1}{#2}{#3}{#4}% +} +% \end{macrocode} +% Die an \cs{tud@cdfont@declare@symb} übergebenen Bezeichner für Auswahlbefehle +% erhalten \cs{tud@cdfont@symbol@\dots} als Präfix. Da so der ursprüngliche +% Befehlsname verändert wird, würde dieser Befehlsname auch verwendet werden, +% wenn dieser in einem fragilen Kontext genutzt wird (siehe \cs{@changed@cmd}). +% Deshalb wird im Anschluss der neue Befehl selbst robust definiert, damit +% eine spätere Expansion nach der Zuweisung mit \cs{tud@cs@letltx} nicht in +% \cs{tud@cdfont@symbol@\meta{symbol}} resultiert sondern in jedem Fall +% \cs{\meta{symbol}} erhalen bleibt. +% \begin{macrocode} +\newcommand*\tud@DeclareTextSymbol[4]{% + \begingroup% + \edef\tud@res@a{% + \endgroup% + \noexpand\DeclareTextCommand% + {\csname tud@cdfont@symbol@#1\endcsname}{#2}% + {\unexpanded{{\fontfamily{#3}\selectfont\char#4}}}% + \noexpand\DeclareTextCommandDefault% + {\csname tud@cdfont@symbol@#1\endcsname}% + {\noexpand\UseTextSymbol{#2}{\csname tud@cdfont@symbol@#1\endcsname}}% + }% + \tud@res@a% + \expandafter\robustify\csname tud@cdfont@symbol@#1\endcsname% +} +% \end{macrocode} +% \end{macro}^^A \tud@DeclareTextSymbol +% \end{macro}^^A \tud@cdfont@symb@list +% \end{macro}^^A \tud@cdfont@declare@symb +% \begin{macro}{\tud@cdfont@symbols@set} +% \changes{v2.07}{2020/01/22}{neu}^^A +% \begin{macro}{\tud@cdfont@symbols@toks} +% \changes{v2.07}{2020/01/22}{neu}^^A +% \begin{macro}{\tud@cdfont@symbols@set@cmd} +% \changes{v2.07}{2020/01/22}{neu}^^A +% \begin{macro}{\tud@cdfont@symbols@reset} +% \changes{v2.07}{2020/01/22}{neu}^^A +% Mit diesen Befehlen wird im zwischen Symbolen für die Schriften des \CDs, +% welche mit \cs{tud@cdfont@declare@symb} deklariert wurden, und den normalen +% gewechselt werden. +% \begin{macrocode} +\newtoks\tud@cdfont@symbols@toks +\newcommand*\tud@cdfont@symbols@set{% +% \end{macrocode} +% Die Sicherung der alten Definitionen erfolgt nur einmalig. Die Liste der +% Symbole wird durchlaufen und die erfolgten Definitionen werden umgesetzt. +% \begin{macrocode} + \expandafter\IfArgIsEmpty\expandafter{\the\tud@cdfont@symbols@toks}{% + \forlistloop\tud@cdfont@symbols@set@cmd\tud@cdfont@symb@list% +% \end{macrocode} +% Wird das Tokenregister abgerufen, soll es anschließend auch wieder geleert +% werden. +% \begin{macrocode} + \addto@hook\tud@cdfont@symbols@toks{\tud@cdfont@symbols@toks{}}% + }{}% +} +% \end{macrocode} +% Das Vorgehen zur Wiederherstellung im Token \cs{tud@cdfont@symbols@toks} +% definiert. +% \begin{macrocode} +\newcommand*\tud@cdfont@symbols@set@cmd[1]{% + \tud@cs@store{#1}% + \addto@hook\tud@cdfont@symbols@toks{\tud@cs@restore{#1}}% + \tud@cs@letltx{#1}{tud@cdfont@symbol@#1}% +} +% \end{macrocode} +% Für das Zurücksetzen muss lediglich das Tokenregister aufgerufen werden. +% \begin{macrocode} +\newcommand*\tud@cdfont@symbols@reset{\the\tud@cdfont@symbols@toks} +% \end{macrocode} +% \end{macro}^^A \tud@cdfont@symbols@reset +% \end{macro}^^A \tud@cdfont@symbols@set@cmd +% \end{macro}^^A \tud@cdfont@symbols@toks +% \end{macro}^^A \tud@cdfont@symbols@set +% \begin{macro}{\tud@cdfont@declare@textsymb} +% \changes{v2.07}{2020/01/22}{neu}^^A +% \begin{macro}{\tud@cdmath@symbol@textleftarrow} +% \begin{macro}{\tud@cdmath@symbol@textrightarrow} +% \begin{macro}{\tud@cdmath@symbol@textuparrow} +% \begin{macro}{\tud@cdmath@symbol@textdownarrow} +% \begin{macro}{\tud@cdmath@symbol@textlangle} +% \begin{macro}{\tud@cdmath@symbol@textrangle} +% Die Definition der Textsymbole für die \val{TS1}-Kodierung. +% \begin{macrocode} +\newcommand*\tud@cdfont@declare@textsymb{% + \tud@cdfont@declare@symb{textleftarrow}{TS1}{iwona}{24}% + \tud@cdfont@declare@symb{textrightarrow}{TS1}{iwona}{25}% + \tud@cdfont@declare@symb{textuparrow}{TS1}{iwona}{94}% + \tud@cdfont@declare@symb{textdownarrow}{TS1}{iwona}{95}% + \tud@cdfont@declare@symb{textlangle}{TS1}{iwona}{60}% + \tud@cdfont@declare@symb{textrangle}{TS1}{iwona}{62}% +} +% \end{macrocode} +% \end{macro}^^A \tud@cdmath@symbol@textrangle +% \end{macro}^^A \tud@cdmath@symbol@textlangle +% \end{macro}^^A \tud@cdmath@symbol@textdownarrow +% \end{macro}^^A \tud@cdmath@symbol@textuparrow +% \end{macro}^^A \tud@cdmath@symbol@textrightarrow +% \end{macro}^^A \tud@cdmath@symbol@textleftarrow +% \end{macro}^^A \tud@cdfont@declare@textsymb % \begin{macro}{\tud@font@skip@set} % \changes{v2.04}{2015/02/17}{neu}^^A % \begin{macro}{\tud@font@skip@@set} @@ -1607,17 +1725,10 @@ {OMS/iwona/\tud@res@a/n}% }% }{}% - \AtBeginDocument{% - \ifcsundef{textrightarrow}{}{% - \tud@cs@store{textrightarrow}% - \renewrobustcmd*{\textrightarrow}{% - \begingroup% - \if@tud@cdfont@active\fontfamily{iwona}\selectfont\fi% - \tud@cs@use{textrightarrow}% - \endgroup% - }% - }% - }% +% \end{macrocode} +% Nun folgen noch einzeln definierte Symbole. +% \begin{macrocode} + \tud@cdfont@declare@textsymb% \fi% % \end{macrocode} % Es werden mehrere Schalter zur expliziten Auswahl für die Schriftschnitte diff --git a/macros/latex/contrib/tudscr/source/tudscr-localization.dtx b/macros/latex/contrib/tudscr/source/tudscr-localization.dtx index d137660867..103eeee132 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-localization.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-localization.dtx @@ -609,7 +609,7 @@ \tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}% \tud@localization@german{\confirmationtext}{% Hiermit versichere ich, dass ich die vorliegende Arbeit - \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi + \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe. Es wurden keine anderen als die in der Arbeit angegebenen Hilfsmittel und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{} @@ -630,7 +630,7 @@ \tud@localization@german{\blockingname}{Sperrvermerk}% \tud@localization@german{\blockingtext}{% Diese Arbeit - \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi + \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi enth\"alt vertrauliche Informationen\ifx\@company\@empty\else , offengelegt durch \emph{\@company}\fi. Ver\"offentlichungen, Vervielf\"altigungen und Einsichtnahme~-- auch nur auszugsweise~-- @@ -832,8 +832,8 @@ \tud@localization@english{\confirmationname}{Statement of authorship}% \tud@localization@english{\confirmationtext}{% I hereby certify that I have authored this - \ifx\@@thesis\@empty thesis\else\@@thesis{} \fi - \ifx\@@title\@empty\else entitled \emph{\@@title} \fi + \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi + \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi independently and without undue assistance from third parties. No other than the resources and references indicated in this thesis have been used. I have marked @@ -854,7 +854,7 @@ \tud@localization@english{\blockingname}{Restriction note}% \tud@localization@english{\blockingtext}{% This \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi - \ifx\@@title\@empty\else entitled \emph{\@@title} \fi + \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi contains confidential data\ifx\@company\@empty\else , disclosed by \emph{\@company}\fi. Publications, duplications and inspections---even in part---are prohibited without explicit diff --git a/macros/latex/contrib/tudscr/source/tudscr-version.dtx b/macros/latex/contrib/tudscr/source/tudscr-version.dtx index f7bef28b00..eacc89deaf 100644 --- a/macros/latex/contrib/tudscr/source/tudscr-version.dtx +++ b/macros/latex/contrib/tudscr/source/tudscr-version.dtx @@ -128,7 +128,7 @@ %<*!(package|class)> \fi % - \TUD@Version@Check{2020/01/14 v2.06f TUD-Script} + \TUD@Version@Check{2020/06/18 v2.06g TUD-Script} \endgroup % \end{macrocode} % \end{macro}^^A \TUDScriptVersionNumber -- cgit v1.2.3