diff options
Diffstat (limited to 'macros')
102 files changed, 708 insertions, 210 deletions
diff --git a/macros/latex-dev/required/l3kernel/CHANGELOG.md b/macros/latex-dev/required/l3kernel/CHANGELOG.md index 76ee35a0f1..fff85488a7 100644 --- a/macros/latex-dev/required/l3kernel/CHANGELOG.md +++ b/macros/latex-dev/required/l3kernel/CHANGELOG.md @@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2024-08-16] + +### Added +- Add quark (`\q_`) and scan mark (`\s_`) prefixes to naming scheme + (issue \#1565) + ## [2024-07-20] ### Fixed @@ -1753,7 +1759,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2024-07-20...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2024-08-16...HEAD +[2024-08-16]: https://github.com/latex3/latex3/compare/2024-07-20...2024-08-16 [2024-07-20]: https://github.com/latex3/latex3/compare/2024-06-19...2024-07-20 [2024-06-19]: https://github.com/latex3/latex3/compare/2024-05-27...2024-06-19 [2024-05-27]: https://github.com/latex3/latex3/compare/2024-05-08...2024-05-27 diff --git a/macros/latex-dev/required/l3kernel/README.md b/macros/latex-dev/required/l3kernel/README.md index 0afb38a9ba..5807a75274 100644 --- a/macros/latex-dev/required/l3kernel/README.md +++ b/macros/latex-dev/required/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2024-07-20 +Release 2024-08-16 Overview -------- diff --git a/macros/latex-dev/required/l3kernel/expl3.dtx b/macros/latex-dev/required/l3kernel/expl3.dtx index 64c65d0ff7..ad5cb365dd 100644 --- a/macros/latex-dev/required/l3kernel/expl3.dtx +++ b/macros/latex-dev/required/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2024-07-20}% +\def\ExplFileDate{2024-08-16}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % @@ -454,6 +454,15 @@ % implementation in \LaTeX3 means that |toks| are not required, and that % all operations for storing tokens can use the |tl| variable type. % +% There are two more special types of constants: +% \begin{arg-description} +% \item[q] constants of quark type; +% \item[s] constants of scan mark type. +% \end{arg-description} +% The \meta{type} part of quark and scan mark constants is omitted, and +% the \meta{module} part of general quarks and scan marks is often +% omitted too. +% % Experienced \TeX{} programmers will notice that some of the variable % types listed are native \TeX{} registers whilst others are not. In % general, the underlying \TeX{} implementation for a data structure may diff --git a/macros/latex-dev/required/l3kernel/expl3.pdf b/macros/latex-dev/required/l3kernel/expl3.pdf Binary files differindex cf3f79416b..870c791dc3 100644 --- a/macros/latex-dev/required/l3kernel/expl3.pdf +++ b/macros/latex-dev/required/l3kernel/expl3.pdf diff --git a/macros/latex-dev/required/l3kernel/interface3.pdf b/macros/latex-dev/required/l3kernel/interface3.pdf Binary files differindex 6c4ea0a544..49a901cdb2 100644 --- a/macros/latex-dev/required/l3kernel/interface3.pdf +++ b/macros/latex-dev/required/l3kernel/interface3.pdf diff --git a/macros/latex-dev/required/l3kernel/interface3.tex b/macros/latex-dev/required/l3kernel/interface3.tex index 0219809dab..1a5cc9564f 100644 --- a/macros/latex-dev/required/l3kernel/interface3.tex +++ b/macros/latex-dev/required/l3kernel/interface3.tex @@ -58,7 +58,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2024-07-20} +\date{Released 2024-08-16} \pagenumbering{roman} \maketitle diff --git a/macros/latex-dev/required/l3kernel/l3basics.dtx b/macros/latex-dev/required/l3kernel/l3basics.dtx index ad15d79653..8ef1f6a5be 100644 --- a/macros/latex-dev/required/l3kernel/l3basics.dtx +++ b/macros/latex-dev/required/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3bitset.dtx b/macros/latex-dev/required/l3kernel/l3bitset.dtx index 2b62c68b4a..5fc681a677 100644 --- a/macros/latex-dev/required/l3kernel/l3bitset.dtx +++ b/macros/latex-dev/required/l3kernel/l3bitset.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3bootstrap.dtx b/macros/latex-dev/required/l3kernel/l3bootstrap.dtx index 7f4eba752b..b3c8536420 100644 --- a/macros/latex-dev/required/l3kernel/l3bootstrap.dtx +++ b/macros/latex-dev/required/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3box.dtx b/macros/latex-dev/required/l3kernel/l3box.dtx index 532ec6a7d8..abe1ce302a 100644 --- a/macros/latex-dev/required/l3kernel/l3box.dtx +++ b/macros/latex-dev/required/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3cctab.dtx b/macros/latex-dev/required/l3kernel/l3cctab.dtx index 92f134aa93..56f831becf 100644 --- a/macros/latex-dev/required/l3kernel/l3cctab.dtx +++ b/macros/latex-dev/required/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3clist.dtx b/macros/latex-dev/required/l3kernel/l3clist.dtx index f8d1eeaea8..cfad9ac5a3 100644 --- a/macros/latex-dev/required/l3kernel/l3clist.dtx +++ b/macros/latex-dev/required/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % @@ -352,7 +352,7 @@ % Reverses the order of items stored in the \meta{clist~var}. % \end{function} % -% \begin{function}[added = 2014-07-18]{\clist_reverse:n} +% \begin{function}[added = 2014-07-18, EXP]{\clist_reverse:n} % \begin{syntax} % \cs{clist_reverse:n} \Arg{comma list} % \end{syntax} diff --git a/macros/latex-dev/required/l3kernel/l3coffins.dtx b/macros/latex-dev/required/l3kernel/l3coffins.dtx index afbd1bd394..82f234799e 100644 --- a/macros/latex-dev/required/l3kernel/l3coffins.dtx +++ b/macros/latex-dev/required/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3color.dtx b/macros/latex-dev/required/l3kernel/l3color.dtx index 117a468d21..e973fb5e7c 100644 --- a/macros/latex-dev/required/l3kernel/l3color.dtx +++ b/macros/latex-dev/required/l3kernel/l3color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3debug.dtx b/macros/latex-dev/required/l3kernel/l3debug.dtx index 4e578ee9b6..41456cf8da 100644 --- a/macros/latex-dev/required/l3kernel/l3debug.dtx +++ b/macros/latex-dev/required/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % @@ -69,7 +69,7 @@ % % Standard file identification. % \begin{macrocode} -\ProvidesExplFile{l3debug.def}{2024-07-20}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-08-16}{}{L3 Debugging support} % \end{macrocode} % % \begin{variable}{\s_@@_stop} diff --git a/macros/latex-dev/required/l3kernel/l3deprecation.dtx b/macros/latex-dev/required/l3kernel/l3deprecation.dtx index 697f235311..21d96b8f9c 100644 --- a/macros/latex-dev/required/l3kernel/l3deprecation.dtx +++ b/macros/latex-dev/required/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3doc.dtx b/macros/latex-dev/required/l3kernel/l3doc.dtx index 751d4f4e14..ecd473b837 100644 --- a/macros/latex-dev/required/l3kernel/l3doc.dtx +++ b/macros/latex-dev/required/l3kernel/l3doc.dtx @@ -71,7 +71,7 @@ and all files in that bundle must be distributed together. % This isn't included in the typeset documentation because it's a bit % ugly: %<*class> -\ProvidesExplClass{l3doc}{2024-07-20}{} +\ProvidesExplClass{l3doc}{2024-08-16}{} {L3 Experimental documentation class} %</class> % \fi @@ -84,7 +84,7 @@ and all files in that bundle must be distributed together. % require you to do updates, if the class changes.}} % % \author{\Team} -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % \maketitle % \tableofcontents % diff --git a/macros/latex-dev/required/l3kernel/l3doc.pdf b/macros/latex-dev/required/l3kernel/l3doc.pdf Binary files differindex 554a61ad50..b21ea4c767 100644 --- a/macros/latex-dev/required/l3kernel/l3doc.pdf +++ b/macros/latex-dev/required/l3kernel/l3doc.pdf diff --git a/macros/latex-dev/required/l3kernel/l3docstrip.dtx b/macros/latex-dev/required/l3kernel/l3docstrip.dtx index 199801ff3b..29503b2d55 100644 --- a/macros/latex-dev/required/l3kernel/l3docstrip.dtx +++ b/macros/latex-dev/required/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3docstrip.pdf b/macros/latex-dev/required/l3kernel/l3docstrip.pdf Binary files differindex 1ec928d673..be416819fd 100644 --- a/macros/latex-dev/required/l3kernel/l3docstrip.pdf +++ b/macros/latex-dev/required/l3kernel/l3docstrip.pdf diff --git a/macros/latex-dev/required/l3kernel/l3expan.dtx b/macros/latex-dev/required/l3kernel/l3expan.dtx index 499c94587e..714af5dc27 100644 --- a/macros/latex-dev/required/l3kernel/l3expan.dtx +++ b/macros/latex-dev/required/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3file.dtx b/macros/latex-dev/required/l3kernel/l3file.dtx index 039c4eecb8..9074a65921 100644 --- a/macros/latex-dev/required/l3kernel/l3file.dtx +++ b/macros/latex-dev/required/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3flag.dtx b/macros/latex-dev/required/l3kernel/l3flag.dtx index 690347426f..a25a02a2ca 100644 --- a/macros/latex-dev/required/l3kernel/l3flag.dtx +++ b/macros/latex-dev/required/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-assign.dtx b/macros/latex-dev/required/l3kernel/l3fp-assign.dtx index e1b3bc788b..2c988e21b4 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-assign.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-assign.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % \maketitle % % \begin{documentation} diff --git a/macros/latex-dev/required/l3kernel/l3fp-aux.dtx b/macros/latex-dev/required/l3kernel/l3fp-aux.dtx index 4c39e81f46..06c5304064 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-aux.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-basics.dtx b/macros/latex-dev/required/l3kernel/l3fp-basics.dtx index a93ff90291..5c8ee332b9 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-basics.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-basics.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-convert.dtx b/macros/latex-dev/required/l3kernel/l3fp-convert.dtx index 9b5b66f815..49d25cc51b 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-convert.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-expo.dtx b/macros/latex-dev/required/l3kernel/l3fp-expo.dtx index e9dcdf6646..ea6a3015cf 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-expo.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-expo.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-extended.dtx b/macros/latex-dev/required/l3kernel/l3fp-extended.dtx index 24f1e5c127..be1137c0d4 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-extended.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-extended.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-functions.dtx b/macros/latex-dev/required/l3kernel/l3fp-functions.dtx index 2c5eb9602f..7b28783cfa 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-functions.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-functions.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-logic.dtx b/macros/latex-dev/required/l3kernel/l3fp-logic.dtx index 9d39f4f67e..c1b9f68b9d 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-logic.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-logic.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-parse.dtx b/macros/latex-dev/required/l3kernel/l3fp-parse.dtx index 191ab2755c..8f8cc99ac4 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-parse.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-parse.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-random.dtx b/macros/latex-dev/required/l3kernel/l3fp-random.dtx index dd40704719..14a780a392 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-random.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-random.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-round.dtx b/macros/latex-dev/required/l3kernel/l3fp-round.dtx index ad20934215..d6097c3258 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-round.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-symbolic.dtx b/macros/latex-dev/required/l3kernel/l3fp-symbolic.dtx index 8223419f66..387d582d99 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-symbolic.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-symbolic.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-traps.dtx b/macros/latex-dev/required/l3kernel/l3fp-traps.dtx index 7f22a2d137..f2967021e3 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-traps.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-traps.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % \maketitle % % \begin{documentation} diff --git a/macros/latex-dev/required/l3kernel/l3fp-trig.dtx b/macros/latex-dev/required/l3kernel/l3fp-trig.dtx index b7b67c9445..297deb2449 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-trig.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-trig.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp-types.dtx b/macros/latex-dev/required/l3kernel/l3fp-types.dtx index d969f76bdc..b48c37d453 100644 --- a/macros/latex-dev/required/l3kernel/l3fp-types.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp-types.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fp.dtx b/macros/latex-dev/required/l3kernel/l3fp.dtx index 8e37a55799..d970d631eb 100644 --- a/macros/latex-dev/required/l3kernel/l3fp.dtx +++ b/macros/latex-dev/required/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3fparray.dtx b/macros/latex-dev/required/l3kernel/l3fparray.dtx index 9592671ae3..b20483a583 100644 --- a/macros/latex-dev/required/l3kernel/l3fparray.dtx +++ b/macros/latex-dev/required/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3int.dtx b/macros/latex-dev/required/l3kernel/l3int.dtx index 4b0d251cab..d9698e8516 100644 --- a/macros/latex-dev/required/l3kernel/l3int.dtx +++ b/macros/latex-dev/required/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3intarray.dtx b/macros/latex-dev/required/l3kernel/l3intarray.dtx index 4be0ca6be6..48b5b83ad1 100644 --- a/macros/latex-dev/required/l3kernel/l3intarray.dtx +++ b/macros/latex-dev/required/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3kernel-functions.dtx b/macros/latex-dev/required/l3kernel/l3kernel-functions.dtx index 5d5758a6af..cc6d8f6909 100644 --- a/macros/latex-dev/required/l3kernel/l3kernel-functions.dtx +++ b/macros/latex-dev/required/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3keys.dtx b/macros/latex-dev/required/l3kernel/l3keys.dtx index db580c525c..9225e1042d 100644 --- a/macros/latex-dev/required/l3kernel/l3keys.dtx +++ b/macros/latex-dev/required/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3legacy.dtx b/macros/latex-dev/required/l3kernel/l3legacy.dtx index b5ef896827..667b15003a 100644 --- a/macros/latex-dev/required/l3kernel/l3legacy.dtx +++ b/macros/latex-dev/required/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3luatex.dtx b/macros/latex-dev/required/l3kernel/l3luatex.dtx index aa7724a8ce..963fdcb032 100644 --- a/macros/latex-dev/required/l3kernel/l3luatex.dtx +++ b/macros/latex-dev/required/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3msg.dtx b/macros/latex-dev/required/l3kernel/l3msg.dtx index 66e7ac8282..c8569dd7ac 100644 --- a/macros/latex-dev/required/l3kernel/l3msg.dtx +++ b/macros/latex-dev/required/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3names.dtx b/macros/latex-dev/required/l3kernel/l3names.dtx index 1cb0d132ae..9231f409c1 100644 --- a/macros/latex-dev/required/l3kernel/l3names.dtx +++ b/macros/latex-dev/required/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3news.pdf b/macros/latex-dev/required/l3kernel/l3news.pdf Binary files differindex e9e7149b0d..13395a51a0 100644 --- a/macros/latex-dev/required/l3kernel/l3news.pdf +++ b/macros/latex-dev/required/l3kernel/l3news.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news01.pdf b/macros/latex-dev/required/l3kernel/l3news01.pdf Binary files differindex d85dfd045e..12f78fce05 100644 --- a/macros/latex-dev/required/l3kernel/l3news01.pdf +++ b/macros/latex-dev/required/l3kernel/l3news01.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news02.pdf b/macros/latex-dev/required/l3kernel/l3news02.pdf Binary files differindex 7bd350172e..d14e137d29 100644 --- a/macros/latex-dev/required/l3kernel/l3news02.pdf +++ b/macros/latex-dev/required/l3kernel/l3news02.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news03.pdf b/macros/latex-dev/required/l3kernel/l3news03.pdf Binary files differindex f1f3afb726..79ac19eeba 100644 --- a/macros/latex-dev/required/l3kernel/l3news03.pdf +++ b/macros/latex-dev/required/l3kernel/l3news03.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news04.pdf b/macros/latex-dev/required/l3kernel/l3news04.pdf Binary files differindex 4093837a05..e14577af81 100644 --- a/macros/latex-dev/required/l3kernel/l3news04.pdf +++ b/macros/latex-dev/required/l3kernel/l3news04.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news05.pdf b/macros/latex-dev/required/l3kernel/l3news05.pdf Binary files differindex c8000e8f0f..9317c56453 100644 --- a/macros/latex-dev/required/l3kernel/l3news05.pdf +++ b/macros/latex-dev/required/l3kernel/l3news05.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news06.pdf b/macros/latex-dev/required/l3kernel/l3news06.pdf Binary files differindex 1bd0875ea7..b63b3d6f7a 100644 --- a/macros/latex-dev/required/l3kernel/l3news06.pdf +++ b/macros/latex-dev/required/l3kernel/l3news06.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news07.pdf b/macros/latex-dev/required/l3kernel/l3news07.pdf Binary files differindex 452e18749b..53f05ea997 100644 --- a/macros/latex-dev/required/l3kernel/l3news07.pdf +++ b/macros/latex-dev/required/l3kernel/l3news07.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news08.pdf b/macros/latex-dev/required/l3kernel/l3news08.pdf Binary files differindex f985db2b44..c1afcce2d0 100644 --- a/macros/latex-dev/required/l3kernel/l3news08.pdf +++ b/macros/latex-dev/required/l3kernel/l3news08.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news09.pdf b/macros/latex-dev/required/l3kernel/l3news09.pdf Binary files differindex 50924df70c..9f5bad41a0 100644 --- a/macros/latex-dev/required/l3kernel/l3news09.pdf +++ b/macros/latex-dev/required/l3kernel/l3news09.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news10.pdf b/macros/latex-dev/required/l3kernel/l3news10.pdf Binary files differindex 4fb21174bd..92a888e33c 100644 --- a/macros/latex-dev/required/l3kernel/l3news10.pdf +++ b/macros/latex-dev/required/l3kernel/l3news10.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news11.pdf b/macros/latex-dev/required/l3kernel/l3news11.pdf Binary files differindex a06c363913..18b77565d4 100644 --- a/macros/latex-dev/required/l3kernel/l3news11.pdf +++ b/macros/latex-dev/required/l3kernel/l3news11.pdf diff --git a/macros/latex-dev/required/l3kernel/l3news12.pdf b/macros/latex-dev/required/l3kernel/l3news12.pdf Binary files differindex 09a1a6955c..dce8290061 100644 --- a/macros/latex-dev/required/l3kernel/l3news12.pdf +++ b/macros/latex-dev/required/l3kernel/l3news12.pdf diff --git a/macros/latex-dev/required/l3kernel/l3pdf.dtx b/macros/latex-dev/required/l3kernel/l3pdf.dtx index 34118c371a..e827001e9f 100644 --- a/macros/latex-dev/required/l3kernel/l3pdf.dtx +++ b/macros/latex-dev/required/l3kernel/l3pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3prefixes.csv b/macros/latex-dev/required/l3kernel/l3prefixes.csv index 339f6625fd..47cd011a5c 100644 --- a/macros/latex-dev/required/l3kernel/l3prefixes.csv +++ b/macros/latex-dev/required/l3kernel/l3prefixes.csv @@ -79,6 +79,7 @@ etex,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https: etl,etl,Jonathan P. Spratte,https://github.com/Skillmon/ltx_etl,git@github.com:Skillmon/ltx_etl.git,https://github.com/Skillmon/ltx_etl/issues,2021-08-16,2021-08-16, exp,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, expl,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, +expltools,expltools,VÃt Starý Novotný,https://github.com/witiko/expltools/,https://github.com/witiko/expltools.git,https://github.com/witiko/expltools/issues,2024-06-26,2024-06-26,Development tools for expl3 programmers exsheets,exsheets,Clemens Niederberger,https://bitbucket.org/cgnieder/exsheets/,git@bitbucket.org:cgnieder/exsheets.git,https://bitbucket.org/cgnieder/exsheets/issues,2013-03-16,2013-03-16, extblx,biblatex-ext,Moritz Wemheuer,https://github.com/moewew/biblatex-ext/,https://github.com/moewew/biblatex-ext.git,https://github.com/moewew/biblatex-ext/issues,2020-02-09,2020-02-09, exwf,exwrapfig,Takuto Asakura,https://github.com/wtsnjp/exwrapfig,https://github.com/wtsnjp/exwrapfig.git,https://github.com/wtsnjp/exwrapfig/issues,2018-06-07,2018-06-07, @@ -162,6 +163,7 @@ minibox,minibox,Will Robertson,,https://github.com/wspr/will2e.git,https://githu minus,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12, mix,media9,Alexander Grahn,,https://gitlab.com/agrahn/media9,https://gitlab.com/agrahn/media9/issues,2013-01-18,2020-04-15, mode,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, +moremath,moremath,Marcel Ilg,https://github.com/Mister00X/moremath,https://github.com/Mister00X/moremath.git,https://github.com/Mister00X/moremath/issues,2024-07-27,2024-07-27, morewrites,morewrites,Bruno Le Floch,https://github.com/blefloch/latex-morewrites,https://github.com/blefloch/latex-morewrites.git,https://github.com/blefloch/latex-morewrites/issues,2013-03-16,2015-09-22, msg,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27, msvg,media4svg,Alexander Grahn,,https://gitlab.com/agrahn/media4svg,https://gitlab.com/agrahn/media4svg/issues,2020-04-15,2020-04-15, diff --git a/macros/latex-dev/required/l3kernel/l3prefixes.pdf b/macros/latex-dev/required/l3kernel/l3prefixes.pdf Binary files differindex 908809cda4..9b3c4cde2a 100644 --- a/macros/latex-dev/required/l3kernel/l3prefixes.pdf +++ b/macros/latex-dev/required/l3kernel/l3prefixes.pdf diff --git a/macros/latex-dev/required/l3kernel/l3prg.dtx b/macros/latex-dev/required/l3kernel/l3prg.dtx index ac6131d6ff..69c66057d4 100644 --- a/macros/latex-dev/required/l3kernel/l3prg.dtx +++ b/macros/latex-dev/required/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3prop.dtx b/macros/latex-dev/required/l3kernel/l3prop.dtx index fd0d8e167d..5f60f31b81 100644 --- a/macros/latex-dev/required/l3kernel/l3prop.dtx +++ b/macros/latex-dev/required/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3quark.dtx b/macros/latex-dev/required/l3kernel/l3quark.dtx index ad78a12bd2..d4558e216b 100644 --- a/macros/latex-dev/required/l3kernel/l3quark.dtx +++ b/macros/latex-dev/required/l3kernel/l3quark.dtx @@ -32,7 +32,7 @@ % % \title{^^A % The \pkg{l3quark} module\\ Quarks and scan marks^^A -% } +% }\ifdefined\thechapter\label{sec:l3quarks}\fi % % \author{^^A % The \LaTeX{} Project\thanks @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3regex.dtx b/macros/latex-dev/required/l3kernel/l3regex.dtx index c3d5de27cb..b6ca0d5d2c 100644 --- a/macros/latex-dev/required/l3kernel/l3regex.dtx +++ b/macros/latex-dev/required/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3seq.dtx b/macros/latex-dev/required/l3kernel/l3seq.dtx index 413e20f8ca..2f0b223753 100644 --- a/macros/latex-dev/required/l3kernel/l3seq.dtx +++ b/macros/latex-dev/required/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3skip.dtx b/macros/latex-dev/required/l3kernel/l3skip.dtx index 9bea4c7b14..788abaf20c 100644 --- a/macros/latex-dev/required/l3kernel/l3skip.dtx +++ b/macros/latex-dev/required/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3sort.dtx b/macros/latex-dev/required/l3kernel/l3sort.dtx index a86f916d24..6c997672de 100644 --- a/macros/latex-dev/required/l3kernel/l3sort.dtx +++ b/macros/latex-dev/required/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3str-convert.dtx b/macros/latex-dev/required/l3kernel/l3str-convert.dtx index 4061895896..4da5cf1302 100644 --- a/macros/latex-dev/required/l3kernel/l3str-convert.dtx +++ b/macros/latex-dev/required/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3str.dtx b/macros/latex-dev/required/l3kernel/l3str.dtx index 2be2b105ce..787bbf6d87 100644 --- a/macros/latex-dev/required/l3kernel/l3str.dtx +++ b/macros/latex-dev/required/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3styleguide.pdf b/macros/latex-dev/required/l3kernel/l3styleguide.pdf Binary files differindex 6d9065124d..5ecb6ce5a4 100644 --- a/macros/latex-dev/required/l3kernel/l3styleguide.pdf +++ b/macros/latex-dev/required/l3kernel/l3styleguide.pdf diff --git a/macros/latex-dev/required/l3kernel/l3styleguide.tex b/macros/latex-dev/required/l3kernel/l3styleguide.tex index 985f20a68c..0500ec57cd 100644 --- a/macros/latex-dev/required/l3kernel/l3styleguide.tex +++ b/macros/latex-dev/required/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2024-07-20} +\date{Released 2024-08-16} \begin{document} diff --git a/macros/latex-dev/required/l3kernel/l3syntax-changes.pdf b/macros/latex-dev/required/l3kernel/l3syntax-changes.pdf Binary files differindex f7b4cf0d3d..2b92188b17 100644 --- a/macros/latex-dev/required/l3kernel/l3syntax-changes.pdf +++ b/macros/latex-dev/required/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex-dev/required/l3kernel/l3syntax-changes.tex b/macros/latex-dev/required/l3kernel/l3syntax-changes.tex index b9ffcb011a..8631fe09b8 100644 --- a/macros/latex-dev/required/l3kernel/l3syntax-changes.tex +++ b/macros/latex-dev/required/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 2024-07-20} +\date{Released 2024-08-16} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex-dev/required/l3kernel/l3sys.dtx b/macros/latex-dev/required/l3kernel/l3sys.dtx index 1db09f9550..861865c677 100644 --- a/macros/latex-dev/required/l3kernel/l3sys.dtx +++ b/macros/latex-dev/required/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3term-glossary.pdf b/macros/latex-dev/required/l3kernel/l3term-glossary.pdf Binary files differindex bb77c0a4c2..e70523067d 100644 --- a/macros/latex-dev/required/l3kernel/l3term-glossary.pdf +++ b/macros/latex-dev/required/l3kernel/l3term-glossary.pdf diff --git a/macros/latex-dev/required/l3kernel/l3term-glossary.tex b/macros/latex-dev/required/l3kernel/l3term-glossary.tex index fca2886337..b150aee1e9 100644 --- a/macros/latex-dev/required/l3kernel/l3term-glossary.tex +++ b/macros/latex-dev/required/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 2024-07-20} +\date{Released 2024-08-16} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex-dev/required/l3kernel/l3text-case.dtx b/macros/latex-dev/required/l3kernel/l3text-case.dtx index 134e2508b7..2a3702df85 100644 --- a/macros/latex-dev/required/l3kernel/l3text-case.dtx +++ b/macros/latex-dev/required/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3text-map.dtx b/macros/latex-dev/required/l3kernel/l3text-map.dtx index e3586164c5..431e033707 100644 --- a/macros/latex-dev/required/l3kernel/l3text-map.dtx +++ b/macros/latex-dev/required/l3kernel/l3text-map.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3text-purify.dtx b/macros/latex-dev/required/l3kernel/l3text-purify.dtx index d22ee1bc3e..051933eb9b 100644 --- a/macros/latex-dev/required/l3kernel/l3text-purify.dtx +++ b/macros/latex-dev/required/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3text.dtx b/macros/latex-dev/required/l3kernel/l3text.dtx index 9a4c4f244e..0680c19fed 100644 --- a/macros/latex-dev/required/l3kernel/l3text.dtx +++ b/macros/latex-dev/required/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx b/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx index 600da3985d..aa4ccae287 100644 --- a/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx +++ b/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3tl-build.dtx b/macros/latex-dev/required/l3kernel/l3tl-build.dtx index e484c5b1c5..a1e5b27ec8 100644 --- a/macros/latex-dev/required/l3kernel/l3tl-build.dtx +++ b/macros/latex-dev/required/l3kernel/l3tl-build.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3tl.dtx b/macros/latex-dev/required/l3kernel/l3tl.dtx index 84f2c36798..2c8de13fd3 100644 --- a/macros/latex-dev/required/l3kernel/l3tl.dtx +++ b/macros/latex-dev/required/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3token.dtx b/macros/latex-dev/required/l3kernel/l3token.dtx index c028310326..cf0f998103 100644 --- a/macros/latex-dev/required/l3kernel/l3token.dtx +++ b/macros/latex-dev/required/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/l3unicode.dtx b/macros/latex-dev/required/l3kernel/l3unicode.dtx index 532eb315d3..89450e18fe 100644 --- a/macros/latex-dev/required/l3kernel/l3unicode.dtx +++ b/macros/latex-dev/required/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-07-20} +% \date{Released 2024-08-16} % % \maketitle % diff --git a/macros/latex-dev/required/l3kernel/source3.pdf b/macros/latex-dev/required/l3kernel/source3.pdf Binary files differindex 6ccc2109c2..108054a452 100644 --- a/macros/latex-dev/required/l3kernel/source3.pdf +++ b/macros/latex-dev/required/l3kernel/source3.pdf diff --git a/macros/latex-dev/required/l3kernel/source3.tex b/macros/latex-dev/required/l3kernel/source3.tex index 228d3ca93c..9abacf7762 100644 --- a/macros/latex-dev/required/l3kernel/source3.tex +++ b/macros/latex-dev/required/l3kernel/source3.tex @@ -57,7 +57,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2024-07-20} +\date{Released 2024-08-16} \pagenumbering{roman} \maketitle diff --git a/macros/latex-dev/required/l3kernel/source3body.tex b/macros/latex-dev/required/l3kernel/source3body.tex index 8471296227..db5b907e7b 100644 --- a/macros/latex-dev/required/l3kernel/source3body.tex +++ b/macros/latex-dev/required/l3kernel/source3body.tex @@ -344,6 +344,19 @@ are never used by the core code. The nature of \TeX{} grouping means that as with any other scratch variable, these should only be set and used with no intervening third-party code. +There are two more special types of constants: +\begin{description} + \item[\texttt{q}] Quark constants. + \item[\texttt{s}] Scan mark constants. +\end{description} +Similarly, each quark or scan mark name starts with the module name, +but doesn't end with a variable type, because the type is already +marked by the prefix \texttt{q} or \texttt{s}. +Some general quarks and scan marks provided by \LaTeX3 don't start +with a module name, for example \cs{s_stop}. +See documentation of quarks and scan marks in Chapter~\ref{sec:l3quarks} +for more info. + \subsection{Terminological inexactitude} A word of warning. In this document, and others referring to the \pkg{expl3} diff --git a/macros/latex/contrib/harmony/README b/macros/latex/contrib/harmony/README index da777f5964..39f72b35f7 100644 --- a/macros/latex/contrib/harmony/README +++ b/macros/latex/contrib/harmony/README @@ -1,43 +1,26 @@ -harmony.sty 2007/05/04 +harmony 2024/08/01 -Copyright 2005 - 2007 +Copyright 2005 - 2024 Dagny Wegner <dagny.wegner@t-online.de> -Arnim Wegner <arnim.wegner@t-online.de> +Arnim Wegner <arnim.e.wegner@t-online.de> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. -The latest version of this license is in -http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions -of LaTeX version 2005/12/01 or later. - -This work has the LPPL maintenance status `maintained'. - -The Current Maintainers of this work are -Dagny Wegner and Arnim Wegner. This work consists of the files harmony.sty, harmony.tex, harmony.pdf, and Readme. -------------------------------------------------------- - -harmony.sty uses the packages ifthen and amssymb -and the fonts lcirclew10, musix11, and musix13. - -------------------------------------------------------- +harmony.sty uses the packages ifthen, mathtools and amssymb +and the fonts lcircle10, musix11 and musix13. harmony.sty is a LaTeX2e package for typesetting harmony symbols etc. in musicological texts; usage: cf. harmony.pdf. -Many commands in this package are only suitable -for size 12pt ! harmony.sty ist ein LaTeX2e-Package zum Setzen von Harmoniesymbolen etc. in musikwissenschaftlichen Texten; Benutzung: vgl. harmony.pdf. -Viele Befehle in diesem Package sind -nur für die Schriftgröße 12pt geeignet! diff --git a/macros/latex/contrib/harmony/harmony.pdf b/macros/latex/contrib/harmony/harmony.pdf Binary files differindex 4b523de911..b792390663 100644 --- a/macros/latex/contrib/harmony/harmony.pdf +++ b/macros/latex/contrib/harmony/harmony.pdf diff --git a/macros/latex/contrib/harmony/harmony.sty b/macros/latex/contrib/harmony/harmony.sty index ce528cf085..1145113c4d 100644 --- a/macros/latex/contrib/harmony/harmony.sty +++ b/macros/latex/contrib/harmony/harmony.sty @@ -1,29 +1,30 @@ -%% harmony.sty 2007/05/04 -%% Copyright 2005 - 2007 +%% harmony.sty 2024/08/01 +%% Copyright 2005 - 2024 %% Dagny Wegner <dagny.wegner@t-online.de> -%% Arnim Wegner <arnim.wegner@t-online.de> +%% Arnim Wegner <arnim.e.wegner@t-online.de> % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any % later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions -% of LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainers of this work are -% Dagny Wegner and Arnim Wegner. % % This work consists of the files harmony.sty, % harmony.tex, harmony.pdf, and Readme. % ================================================================================== +\ProvidesPackage{harmony}[2024/08/01] \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{harmony}[2007/05/04] \RequirePackage{ifthen} \RequirePackage{amssymb} +\RequirePackage{mathtools} % contains \overbracket +% +\newcounter{notekorr} +\DeclareOption{8pt}{\setcounter{notekorr}{800}} +\DeclareOption{9pt}{\setcounter{notekorr}{900}} +\DeclareOption{10pt}{\setcounter{notekorr}{1000}} +\DeclareOption{11pt}{\setcounter{notekorr}{1100}} +\DeclareOption{12pt}{\setcounter{notekorr}{1200}} +\DeclareOption{13pt}{\setcounter{notekorr}{1300}} +\DeclareOption{14pt}{\setcounter{notekorr}{1400}} \DeclareOption{sf}{\def\FAM{\sffamily}} \DeclareOption{rm}{\def\FAM{\rmfamily}} \ExecuteOptions{sf} @@ -43,14 +44,31 @@ \newbox\nbxg \newbox\nbxh \newbox\nbxi -\newfont{\KREIS}{lcirclew10} -\newfont{\NOTEN}{musix13} -\newfont{\noten}{musix11}% 2007/05/03 +\newcounter{notescl} +\newcounter{fontscl} % -\newcommand{\Ohne}[2][0em]{% +\ifthenelse{\value{notekorr}=0}% +{\ifthenelse{\@ptsize<-2}{\setcounter{notescl}{800}}{} +\ifthenelse{\equal{\@ptsize}{-2}}{\setcounter{notescl}{800}}{} +\ifthenelse{\equal{\@ptsize}{-1}}{\setcounter{notescl}{900}}{} +\ifthenelse{\equal{\@ptsize}{0}}{\setcounter{notescl}{1000}}{} +\ifthenelse{\equal{\@ptsize}{1}}{\setcounter{notescl}{1100}}{} +\ifthenelse{\equal{\@ptsize}{2}}{\setcounter{notescl}{1200}}{} +\ifthenelse{\equal{\@ptsize}{3}}{\setcounter{notescl}{1300}}{} +\ifthenelse{\equal{\@ptsize}{4}}{\setcounter{notescl}{1400}}{} +\ifthenelse{\@ptsize>4}{\setcounter{notescl}{1400}}{}} +{\setcounter{notescl}{\value{notekorr}}} +% +\newfont{\NOTEN}{musix13 scaled \value{notescl}} +\newfont{\noten}{musix11 scaled \value{notescl}} +\setcounter{fontscl}{\value{notescl}} +\addtocounter{fontscl}{1000} +\newfont{\KREIS}{lcircle10 scaled \value{fontscl}} +% +\newcommand{\Ohne}[2][0.17em]{% \setbox\nbxi=\hbox{% \FAM% -\setbox\nbxa=\hbox{\sl\large /}% +\setbox\nbxa=\hbox{\textsl\large\raisebox{0.2ex}{/}}% #2% \kern-0.8em% \kern#1% @@ -60,8 +78,14 @@ }% \unhbox\nbxi% } +\let\Sans\Ohne % \newcommand{\Dohne}{\Ohne{D}} +\let\Dsans\Dohne +\newcommand{\DohneR}{\framebox{\Dohne}} +\let\DsansR\DohneR +\newcommand{\Dohner}{\frame{\Dohne}} +\let\Dsansr\Dohner % \newcommand{\DD}{% \setbox\nbxi=\hbox{% @@ -73,6 +97,9 @@ \unhbox\nbxi% } % +\newcommand{\DDR}{\framebox{\DD}} +\newcommand{\DDr}{\frame{\DD}} +% \newcommand{\DS}{% \setbox\nbxi=\hbox{% \FAM% @@ -96,7 +123,7 @@ \newcommand{\DDohne}{% \setbox\nbxi=\hbox{% \FAM% -\setbox\nbxa=\hbox{\sl\large /}% +\setbox\nbxa=\hbox{\textsl\large\raisebox{0.25ex}{/}}% \raise0.2ex\hbox{D}% \kern-0.5em% \lower0.2ex\hbox{D}% @@ -107,17 +134,23 @@ }% \box\nbxi% } +\let\DDsans\DDohne +% +\newcommand{\DDohneR}{\framebox{\DDohne}} +\let\DDsansR\DDohneR +\newcommand{\DDohner}{\frame{\DDohne}} +\let\DDsansr\DDohner % \newcommand{\VM}{% \setbox\nbxg=\hbox{>}% \setbox\nbxh=\hbox to \wd\nbxg{% -\raise0.24ex\hbox{{\boldmath$\scriptscriptstyle{>}$\unboldmath}\hss}}% 2005/05/10 +\raise0.24ex\hbox{{\boldmath$\scriptscriptstyle{>}$\unboldmath}\hss}}% \box\nbxh} % \newcommand{\UB}{% \setbox\nbxg=\hbox{<}% \setbox\nbxh=\hbox to \wd\nbxg{% -\raise0.24ex\hbox{\boldmath$\scriptscriptstyle{<}$\unboldmath\hss}}% 2005/05/10 +\raise0.24ex\hbox{\boldmath$\scriptscriptstyle{<}$\unboldmath\hss}}% \box\nbxh} % \newcommand{\HAa}[3]{% @@ -243,6 +276,9 @@ {\HAc{#1}{#2}{#3}{#4}{#5}}% } % +\def\HHR.#1.#2.#3.#4.#5.{\framebox{\HH.#1.#2.#3.#4.#5.}}% +\def\HHr.#1.#2.#3.#4.#5.{\frame{\HH.#1.#2.#3.#4.#5.\hspace{0.17em}}}% +% \newcommand{\FERM}[2][0.1pt]{% \setbox\nbxi=\hbox{% \FAM% @@ -287,15 +323,13 @@ \kern-\tmpdima\box\nbxb% }} % -\newcommand{\Kr}[1]{% -\ifthenelse{\equal{\@ptsize}{2}}{\@tempcnta=110}% -{\ifthenelse{\equal{\@ptsize}{1}}{\@tempcnta=109}% -{\@tempcnta=108}}% +\newcommand{\Kr}[2][102]{% +\ifthenelse{#1>110}{\@tempcnta=110}% +{\ifthenelse{#1<100}{\@tempcnta=100}{\@tempcnta=#1}} \setbox\nbxi=\hbox{% -\FAM\small% \setbox\nbxa=\hbox{#1}% \setbox\nbxb=\hbox{\KREIS\char\@tempcnta}% -\setbox\nbxc=\hbox to \wd\nbxb{\hss #1\hss}% +\setbox\nbxc=\hbox to \wd\nbxb{\hss #2\hss}% \tmpdima=0.5\ht\nbxa% \advance\tmpdima by -0.4\dp\nbxa\relax% \copy\nbxc% @@ -332,8 +366,8 @@ {\raisebox{0.58ex}[8pt][2pt]{\kern-1pt\NOTEN\symbol{82}\kern0.3em}}}% {\kern0.05em\ueber{#1}{#2}\kern0.05em% }}} -% -\newcommand{\Ganz}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{9}}\kern1.35em}} +% Noten +\newcommand{\Ganz}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{9}}\kern1.5em}} \newcommand{\Halb}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{8}\kern0.936em% \raisebox{0.55ex}{\symbol{16}}}\kern0.2em}} \newcommand{\Vier}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{7}\kern0.955em% @@ -343,7 +377,7 @@ \newcommand{\Sech}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{7}\kern0.955em% \raisebox{0.55ex}{\symbol{16}}}\symbol{41}\kern0.9em}} \newcommand{\Zwdr}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{7}\kern0.955em% -\raisebox{0.55ex}{\symbol{16}}}\symbol{42}\kern0.9em}} +\raisebox{0.55ex}{\symbol{16}}\raisebox{1.3ex}{\symbol{16}}}\symbol{42}\kern0.9em}} \newcommand{\GaPa}{{\NOTEN\kern0.055em\raisebox{0.25ex}{\symbol{60}}\kern0.05em}} \newcommand{\HaPa}{{\NOTEN\kern0.055em\raisebox{0.25ex}{\symbol{60}}\kern0.05em}} \newcommand{\ViPa}{{\NOTEN\kern0.05em\raisebox{-0.8ex}{\symbol{62}}\kern0.955em}} @@ -351,28 +385,76 @@ \newcommand{\SePa}{{\NOTEN\kern0.15em\raisebox{-0.4ex}{\symbol{64}}\kern1.3em}} \newcommand{\ZwPa}{{\NOTEN\kern0.25em\raisebox{-0.8ex}{\symbol{65}}\kern1.4em}} \newcommand{\Pu}{{\NOTEN\kern-0.2em\raisebox{-0.5ex}{\symbol{24}}\kern1em}} -\newcommand{\AAcht}{\Vier\kern0.1em\Vier{\NOTEN\kern-1.72em\raisebox{3.1ex}% +\newcommand{\AAcht}{{\NOTEN\Vier\kern0.3em\Vier\kern-1.72em\raisebox{3.1ex}% {\symbol{61}\kern-0.87em\symbol{61}}}} -\newcommand{\AchtBL}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern0.09em}} -\newcommand{\SechBL}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\newcommand{\AchtBL}{{\NOTEN\Vier\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}}} +\newcommand{\AchtBR}{{\NOTEN\Vier\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}}} +\newcommand{\SechBL}{{\NOTEN\Vier\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% \kern-1.63em\raisebox{2.3ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern0.09em}} -\newcommand{\SechBl}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\newcommand{\SechBl}{{\NOTEN\Vier\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% \kern-1.63em\raisebox{2.3ex}{{\noten\kern0.9em\symbol{61}}}\kern0.09em}} -\newcommand{\AchtBR}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern-1em}} -\newcommand{\SechBR}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% -\kern-1.63em\raisebox{2.3ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern-1.01em}} -\newcommand{\SechBr}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% -\kern-1.63em\raisebox{2.3ex}{{\noten\kern-0.12em\symbol{61}}}\kern-0.3em}} -% etc. ... ! Define your own commands!
\ No newline at end of file +\newcommand{\SechBR}{{\NOTEN\Vier\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\kern-1.63em\raisebox{2.3ex}{\symbol{61}\kern-0.87em\symbol{61}}}} +\newcommand{\SechBr}{{\NOTEN\Vier\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\kern-1.63em\raisebox{2.3ex}{{\noten\kern-0.12em\symbol{61}}}\kern0.87em}} +% +\newcommand{\Blkn}[2]{\raisebox{#2}{{\NOTEN\kern#1\symbol{61}}}}% +% +\newcommand{\Overset}[3][0pt]{\ensuremath{\overset{\raisebox{#1}{\scriptsize\ensuremath{#2}}}{#3}}} +% +\newcommand\achteltriole{% + \ensuremath{\NOTEN% + \Overset[-1ex]% + {\text{\itshape\tiny\kern0.7em 3}}% + {\AchtBR\kern-1.1em\Vier\kern0.4em\AchtBL}% + }% +} +% +\newcommand\vierteltrioleA{% + \ensuremath{\NOTEN% + \Overset[-1ex]% + {\text{\itshape\tiny 3}}% + {\overbracket[0.45pt]{% + \rule{0pt}{2.4ex}\Vier\kern0.5em\Vier\kern0.5em\Vier\kern0.25em}% + }% + }% +} +% +\newcommand\vierteltrioleB{% + \ensuremath{\NOTEN% + \Overset% + {\raisebox{1ex}{% + \rule{0.45pt}{1ex}% + \kern0.25em\raisebox{0.88ex}{\kern-0.3em\rule{1.15em}{0.45pt}}% + \raisebox{0.53ex}{\text{\itshape\tiny 3}}% + \raisebox{0.88ex}{\rule{1.15em}{0.45pt}}% + \kern-0.05em\rule{0.45pt}{1ex}% + }}% + {\Vier\kern0.5em\Vier\kern0.5em\Vier\kern0.3em}% + }% +} +% +\newcommand\halbetrioleA{% + \ensuremath{\NOTEN% + \Overset[-1ex]% + {\text{\itshape\tiny 3}}% + {\overbracket[0.45pt]{% + \rule{0pt}{2.4ex}\Halb\kern0.5em\Halb\kern0.5em\Halb\kern0.25em}% + }% + }% +} +% +\newcommand\halbetrioleB{% + \ensuremath{\NOTEN% + \Overset% + {\raisebox{1ex}{% + \rule{0.45pt}{1ex}% + \kern0.25em\raisebox{0.88ex}{\kern-0.3em\rule{1.15em}{0.45pt}}% + \raisebox{0.53ex}{\text{\itshape\tiny 3}}% + \raisebox{0.88ex}{\rule{1.15em}{0.45pt}}% + \kern-0.05em\rule{0.45pt}{1ex}% + }}% + {\Halb\kern0.5em\Halb\kern0.5em\Halb\kern0.3em}% + }% +} +% ==================================================================================
\ No newline at end of file diff --git a/macros/latex/contrib/harmony/harmony.tex b/macros/latex/contrib/harmony/harmony.tex index 326aff42c3..7b163dc7ab 100644 --- a/macros/latex/contrib/harmony/harmony.tex +++ b/macros/latex/contrib/harmony/harmony.tex @@ -1,38 +1,29 @@ -%% harmony.sty 2007/05/04 -%% Copyright 2005 - 2007 +%% harmony.sty 2024/08/01 +%% Copyright 2005 - 2024 %% Dagny Wegner <dagny.wegner@t-online.de> -%% Arnim Wegner <arnim.wegner@t-online.de> +%% Arnim Wegner <arnim.e.wegner@t-online.de> % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any % later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions -% of LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainers of this work are -% Dagny Wegner and Arnim Wegner. % % This work consists of the files harmony.sty, % harmony.tex, harmony.pdf, and Readme. -%==================================================================================== -\documentclass[12pt,origlongtable,pdftex]{scrartcl} +% ================================================================================== +\documentclass[paper=a4,fontsize=12pt,origlongtable]{scrartcl} % \usepackage[ngerman]{babel} \usepackage[T1]{fontenc} \usepackage{mathpazo} -\usepackage[ansinew]{inputenc} \usepackage{array} \usepackage{longtable} -\usepackage[pdftex,a4paper]{hyperref} +\usepackage[pdftex]{hyperref} % -\usepackage{harmony} +\usepackage[12pt]{harmony} % options: 8pt 9pt 10pt 11pt 12pt 13pt 14pt % -\setlength{\textheight}{240mm} +\setlength{\voffset}{-10mm} +\setlength{\textheight}{255mm} \setlength{\overfullrule}{0pt} \setlength{\extrarowheight}{2ex} \setlength{\parindent}{0pt} @@ -49,45 +40,37 @@ pdfstartview = {Fit}, %------------------------------------------------------------------------------------- \begin{document} % -\title{harmony.sty} -\author{Dagny Wegner \and Arnim Wegner} -\date{2007/05/04} +\title{harmony} +\author{Dagny Wegner \and Arnim Wegner} +\date{2024/08/01} \maketitle % \vfill % \begin{center} -Copyright 2005 - 2007\\ +Copyright 2005 - 2024\\ Dagny Wegner <dagny.wegner@t-online.de>\\ -Arnim Wegner <arnim.wegner@t-online.de> +Arnim Wegner <arnim.e.wegner@t-online.de> \end{center} This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either +conditions of the \LaTeX\ Project Public License, either version 1.3 of this license or (at your option) any later version. -The latest version of this license is in -http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions -of LaTeX version 2005/12/01 or later. -This work has the LPPL maintenance status `maintained'. -The Current Maintainers of this work are -Dagny Wegner and Arnim Wegner. This work consists of the files harmony.sty, harmony.tex, harmony.pdf, and Readme. % \newpage % \begin{center} -This work was developed for the doctoral dissertation in musicology of\\ +The package harmony was first developed for the doctoral dissertation in\\ musicology of Dagny Wegner; cf. this dissertation for further examples.\\ -(Look at http://www.sub.uni-hamburg.de/opus/volltexte/2006/3047/ or -http://www.chmtl.indiana.edu/ddm/DNclassical.html)\\[2ex] -\textbf{Many commands in this package therefore are only suitable for size 12pt !} +(Look at https://ediss.sub.uni-hamburg.de/handle/ediss/1483)\\[1ex] +This package accepts the optional parameters 8pt, \dots ,14pt for the size\\ of the notes + independent of the fontsize of the document. \end{center} % -\vspace{2ex} -% -\begin{longtable}{|l|l|} +\vspace*{-5mm} +\begin{longtable}{|l|c|} % \caption*{\textbf{Usage and Examples}} \endfirsthead @@ -95,9 +78,11 @@ http://www.chmtl.indiana.edu/ddm/DNclassical.html)\\[2ex] \endhead % \hline -input & output\\ +Input & Output\\ \hline\hline \verb|\HH.X.u.v.w.z.|&\HH.X.u.v.w.z.\\ +\verb|\HHR.X.u.v.w.z.|&\HHR.X.u.v.w.z.\\ +\verb|\HHr.X.u.v.w.z.|&\HHr.X.u.v.w.z.\\ \verb|\HH.D.....|&\HH.D.....\\ \verb|\HH.D..7...|&\HH.D..7...\\ \verb|\HH.D.3....|&\HH.D.3....\\ @@ -105,19 +90,26 @@ input & output\\ \verb|\HH.D.3.9.7..|&\HH.D.3.9.7..\\ \verb|\HH.D.3.9.7.5.|&\HH.D.3.9.7.5.\\ \hline -\verb|\Dohne|&\Dohne\\ +\verb|\Dohne, \Dsans|&\Dohne\\ +\verb|\DohneR, \DsansR|&\DohneR\\ +\verb|\Dohner, \Dsansr|&\Dohner\\ \verb|\DD|&\DD\\ -\verb|\DDohne|&\DDohne\\ +\verb|\DDR|&\DDR\\ +\verb|\DDr|&\DDr\\ +\verb|\DDohne, \DDsans|&\DDohne\\ +\verb|\DDohneR, \DDsansR|&\DDohneR\\ +\verb|\DDohner. \DDsansr|&\DDohner\\ \verb|\DS|&\DS\\ \verb|\Ds|&\Ds\\ \verb|\UB|&\UB\\ \verb|\VM|&\VM\\ -\verb|\Ohne{D}|&\Ohne{D}\\ -\verb|\Ohne[3pt]{D}|&\Ohne[3pt]{D}\\ -\verb|\Ohne[-3pt]{D}|&\Ohne[-3pt]{D}\\ \hline \newpage \hline +\verb|\Ohne{D}, \Sans{D}|&\Ohne{D}\\ +\verb|\Ohne[3pt]{D}, \Sans[3pt]{D}|&\Ohne[3pt]{D}\\ +\verb|\Ohne[-3pt]{D}, \Sans[-3pt]{D}|&\Ohne[-3pt]{D}\\ +\hline \verb|\Fermi{X}|&\Fermi{X}\\ \verb|\Ferli{X}|&\Ferli{X}\\ \verb|\Ferli[5pt]{T}|&\Ferli[5pt]{T}\\ @@ -125,10 +117,9 @@ input & output\\ \hline \verb|\Umd{D}|&\Umd{D}\\ \verb|\Umd[5pt]{D}|&\Umd[5pt]{D}\\ -\hline \verb|\Kr{a:}|&\Kr{a:}\\ \verb|\Kr{f:} \Kr{g:}|&\Kr{f:} \Kr{g:}\\ -\verb|\Kr{\small fis:}|&\Kr{\small fis:}\\ +\verb|\Kr[105]{fis:} (#1: 100 - 110)|&\Kr[105]{fis:}\\[1ex] \hline \verb|\Takt{u}{v}|&\Takt{u}{v}\\ \verb|\Takt{3}{4}|&\Takt{3}{4}\\ @@ -142,12 +133,12 @@ input & output\\ \verb|\Umd{\HH.D.3.9.7.5.}|&\Umd{\HH.D.3.9.7.5.}\\ \verb|\Umd[5pt]{\HH.D.3.9.7.5.}|&\Umd[5pt]{\HH.D.3.9.7.5.}\\ \verb|\HH.\DDohne.5\VM.9\VM.7..|&\HH.\DDohne.5\VM.9\VM.7..\\ -\verb|\HH.\Ohne[0,1em]{Es}.5-3.7...|&\HH.\Ohne[0,1em]{Es}.5-3.7...\\ +\verb|\HH.\Ohne[0.1em]{Es}.5-3.7...|&\HH.\Ohne[0,1em]{Es}.5-3.7...\\ \verb|\Ferli[-1pt]{\HH.\DDohne.5\VM.9\VM.7..}|&\Ferli[-1pt]{\HH.\DDohne.5\VM.9\VM.7..}\\ \hline \newpage \hline -\verb|\Ganz|&\Ganz\\ +\verb|\Ganz|&\kern-0.1em\Ganz\\ \verb|\Halb|&\Halb\\ \verb|\Vier|&\Vier\\ \verb|\Acht|&\Acht\\ @@ -167,18 +158,28 @@ input & output\\ \verb|\SechBr|&\SechBr\\ \hline \verb|\Vier\AchtBL|&\Vier\AchtBL\\ +\verb|\Vier\kern0.2em\AchtBL|&\Vier\kern0.2em\AchtBL\\ \verb|\Vier\SechBL|&\Vier\SechBL\\ +\verb|\Vier\kern0.2em\SechBL|&\Vier\kern0.2em\SechBL\\ \verb|\Vier\SechBl|&\Vier\SechBl\\ +\verb|\Vier\kern0.2em\SechBl|&\Vier\kern0.2em\SechBl\\ \verb|\AchtBR\Vier|&\AchtBR\Vier\\ \verb|\SechBR\Vier|&\SechBR\Vier\\ \verb|\SechBr\Vier|&\SechBr\Vier\\ -\verb|\SechBr\Vier\SechBl|&\SechBr\Vier\SechBl\\ +\verb|\SechBr\Vier\kern0.2em\SechBl|&\SechBr\Vier\kern0.2em\SechBl\\ \verb|\AchtBR\AchtBR\AchtBL|&\AchtBR\AchtBR\AchtBL\\ -\verb|\AchtBR\kern-0.15em\AchtBR\kern-0.15em\AchtBL|% -&\AchtBR\kern-0.15em\AchtBR\kern-0.15em\AchtBL\\ \hline \newpage \hline +\verb|\Blkn{0em}{0ex}|&\Blkn{0ex}{0em}\\ +\verb|\AchtBR\Blkn{0.04em}{2.07ex}|&\AchtBR\Blkn{0.04em}{2.07ex}\\ +\hline +\verb|\achteltriole|&\kern-0.6em\achteltriole\\ +\verb|\vierteltrioleA|&\vierteltrioleA\\ +\verb|\vierteltrioleB|&\vierteltrioleB\\ +\verb|\halbetrioleA|&\halbetrioleA\\ +\verb|\halbetrioleB|&\halbetrioleB\\ +\hline \verb|\GaPa|&\GaPa\\ \verb|\HaPa|&\HaPa\\ \verb|\ViPa|&\ViPa\\ @@ -217,13 +218,13 @@ rm&rmfamily\\ \newcommand{\Str}[2][0.5]{\raise#1ex\hbox to #2em{\hrulefill}} \newcommand{\ST}{\h0.03h\Str[0.65]{0.27}\h0.03h} % -\h9h\Kr{g:}% +\h9h\Kr[103]{g:}% \h1h\HH.\DDohne.5\VM.9\VM.7..% \h0,5h\HH.D..6.4..% \h0,5h\HH.\DDohne.3.9\VM.7..% \h0,5h\HH.\Dohne.7.9\VM...% \h0,5h\HH.T.3....\\[1ex] -\h17h\Kr{d:}% +\h17h\Kr[102]{d:}% \h0,5h\Umd[1ex]{\HH.S.3....}% \h0,5h\HH.\DD.5\VM.7...% \h0,5h\HH.D..8\Str[0,65]{1,2}7\ST6\ST5.8\ST6\ST4\Str[0,65]{2}3.6\ST5\ST8% @@ -237,13 +238,13 @@ rm&rmfamily\\ \newcommand{\Str}[2][0.5]{\raise#1ex\hbox to #2em{\hrulefill}} \newcommand{\ST}{\h0.03h\Str[0.65]{0.27}\h0.03h} % -\h9h\Kr{g:}% +\h9h\Kr[103]{g:}% \h1h\HH.\DDohne.5\VM.9\VM.7..% \h0,5h\HH.D..6.4..% \h0,5h\HH.\DDohne.3.9\VM.7..% \h0,5h\HH.\Dohne.7.9\VM...% \h0,5h\HH.T.3....\\[1ex] -\h17h\Kr{d:}% +\h17h\Kr[102]{d:}% \h0,5h\Umd[1ex]{\HH.S.3....}% \h0,5h\HH.\DD.5\VM.7...% \h0,5h\HH.D..8\Str[0,65]{1,2}7\ST6\ST5.8\ST6\ST4\Str[0,65]{2}3.6\ST5\ST8% diff --git a/macros/latex/contrib/magicwatermark/README.md b/macros/latex/contrib/magicwatermark/README.md index 4bdaad4b2f..39615d2bb4 100644 --- a/macros/latex/contrib/magicwatermark/README.md +++ b/macros/latex/contrib/magicwatermark/README.md @@ -3,4 +3,4 @@ - Repository: https://github.com/ljguo1020/magicwatermark - License: The LaTeX Project Public License 1.3c -> magicwatermark is based on tikz and expl3, and can flexibly set backgrounds or watermarks. +magicwatermark is based on tikz and expl3, and can flexibly set backgrounds or watermarks. diff --git a/macros/latex/contrib/magicwatermark/doc/magicwatermark.pdf b/macros/latex/contrib/magicwatermark/doc/magicwatermark-cn.pdf Binary files differindex 04aa894cef..c43ac7ff92 100644 --- a/macros/latex/contrib/magicwatermark/doc/magicwatermark.pdf +++ b/macros/latex/contrib/magicwatermark/doc/magicwatermark-cn.pdf diff --git a/macros/latex/contrib/magicwatermark/doc/magicwatermark.tex b/macros/latex/contrib/magicwatermark/doc/magicwatermark-cn.tex index 9b610d9cab..883f2b6808 100644 --- a/macros/latex/contrib/magicwatermark/doc/magicwatermark.tex +++ b/macros/latex/contrib/magicwatermark/doc/magicwatermark-cn.tex @@ -169,7 +169,7 @@ \begin{center} {\Huge \textcolor{teal}{\texttt{magicwatermark}} å®åŒ…\footnote{\url{https://github.com/ljguo1020/magicwatermark}}} \\[.5cm] {\Large éƒæŽå†›<ljguo1020@gmail.com>} \\[.5cm] - {\Large V1.2A}\\[1cm] + {\Large V1.2B}\\[1cm] \begin{example}[] \MagicWatermark{ setup = { diff --git a/macros/latex/contrib/magicwatermark/doc/magicwatermark-en.pdf b/macros/latex/contrib/magicwatermark/doc/magicwatermark-en.pdf Binary files differnew file mode 100644 index 0000000000..30b84bd6cd --- /dev/null +++ b/macros/latex/contrib/magicwatermark/doc/magicwatermark-en.pdf diff --git a/macros/latex/contrib/magicwatermark/doc/magicwatermark-en.tex b/macros/latex/contrib/magicwatermark/doc/magicwatermark-en.tex new file mode 100644 index 0000000000..e6520fa330 --- /dev/null +++ b/macros/latex/contrib/magicwatermark/doc/magicwatermark-en.tex @@ -0,0 +1,400 @@ +\documentclass{article} + +\usepackage{lipsum} + +\usepackage{../magicwatermark} + +\usepackage[margin = 2.51828cm]{geometry} + + +\def\pkgname{\textcolor{teal}{\texttt{magicwatermark}}} +\usepackage{indentfirst} +\pagestyle{empty} + +\usepackage[UTF8, scheme=plain, fontset=none, heading=true, zihao=-4]{ctex} +%\setCJKmainfont[BoldFont={LXGWWenKai-Bold},ItalicFont={LXGWWenKai-Light}]{LXGWWenKai-Regular} +%\setCJKsansfont[BoldFont={LXGWWenKai-Bold}]{LXGWWenKai-Regular} +%\setCJKmonofont[BoldFont={LXGWWenKaiMono-Bold},ItalicFont={LXGWWenKaiMono-Light}]{LXGWWenKaiMono-Regular} + +\ctexset{ +% chapter={ +% format+=\raggedright, +% name = {第,部分}, +% afterskip = .5cm +% }, + section={ + format+=\raggedright, + afterskip = .5cm + }, + contentsname = {Table of contents} +} + +\usepackage{fontspec} +\IfFontExistsTF{calibri.ttf} +{ + \setmainfont{calibri.ttf}[ + BoldFont = calibrib.ttf, + ItalicFont = calibrii.ttf, + BoldItalicFont = calibriz.ttf + ] +} +{} + +\newcommand\blfootnote[1]{ + \begingroup + \renewcommand\thefootnote{}\footnote{#1} + \addtocounter{footnote}{-1} + \endgroup +} + +\usepackage[listings,breakable]{tcolorbox} + +\ExplSyntaxOn +\clist_new:N \l_function_variant_list %fuction variant list +\NewDocumentCommand{\function}{svo} % #1:function name #2: variant list +{ + \IfBooleanTF{#1} + { + \IfNoValueTF{#3} + { + \begin{tcolorbox}[width=\textwidth,left=1mm,right=1mm,top=1mm,bottom=1mm,sharp~corners,colback=white,boxrule=.5pt,colback=lime!30] + \texttt{Function}\hskip -2pt \Triangle\hskip -3pt \texttt{#2}\hfill \examplelabel* + \end{tcolorbox} + } + { + \clist_gset:Nn \l_function_variant_list {#3} + \begin{tcolorbox}[width=\textwidth,left=1mm,right=1mm,top=1mm,bottom=1mm,sharp~corners,colback=white,boxrule=.5pt,colback=lime!30] + \texttt{Function}\hskip -2pt \Triangle\hskip -3pt \texttt{#2\textcolor{gray}{(\clist_use:Nn \l_function_variant_list{|})}} \hfill \examplelabel* + \end{tcolorbox} + } + } + { + \IfNoValueTF{#3} + { + \def\functionn{ + \texttt{#2} + } + } + { + \clist_gset:Nn \l_function_variant_list {#3} + \def\functionn{ + \texttt{ + #2 + \textcolor{gray}{(\clist_use:Nn \l_function_variant_list{|})} + } + } + } + } + +} +\NewDocumentCommand{\examplelabel}{s} +{ + \IfBooleanTF{#1}{ + \raisebox{-0.5ex}{ + \tikz{ + \node[ball~color=purple,circle,outer~sep=0pt,scale=0.5] {\phantom{2}}; + }} + }{ + \raisebox{-0.5ex}{ + \tikz{ + \node[ball~color=cyan,circle,outer~sep=0pt,scale=0.5,font=\bfseries] {\theexample}; + }} + } +} +\ExplSyntaxOff +\def\Triangle{ % triangle icon + \raisebox{-0.3ex}{ + \tikz{ + \fill[scale=2,outer sep=0pt] (240:0.5ex) -- (0:0.5ex) -- (120:0.5ex); + } +}} +\newcounter{example} +\tcbset{ + example style/.style={ + sharp corners, + colback=white, + boxrule=.5pt, + breakable, + left=1mm,right=1mm,top=1mm,bottom=1mm, + fonttitle=\bfseries, + colbacktitle=lime!30, + coltitle=black, + % title={MagicWatermark}, + listing only + } +} + +\newtcblisting[use counter=example]{example}[1][]{ + listing options={ + style=tcblatex, + tabsize = 1, + language={[LaTeX]TeX}, + classoffset=0, + morekeywords = {MagicWatermark, foreach, includegraphics}, + keywordstyle={\color[RGB]{178,34,34}\bfseries}, + commentstyle={\color[RGB]{102,205,170}\itshape}, + classoffset=1, + morekeywords = {setup, pages, content, is, append, style}, + keywordstyle=\color{cyan!50!green}\bfseries, + }, + example style, + #1 + } + + +\MagicWatermark{ + setup = { + pages = {*}, + content = {P-\thepage}, + style = {shift = {(.5\textwidth, .5\textheight + \headheight + \headsep)}, scale = 3, text = cyan, font = \ttfamily} + }, + setup = { + pages = {even}, + style = {scale = 5, text = pink}, + content = {Watermark}, + is append + }, + setup = { + pages = {1}, + style = {text width = 1.7\paperwidth, rotate = 45, align = left, font = \Large\linespread{1}\selectfont, opacity = .1}, + content = { + \foreach \x in {0, ..., 500} {Magic Watermark } + }, + is append + } +} + + +\def\opt#1{\textcolor{magenta}{\texttt{#1}}} +\def\para#1{\textcolor[rgb]{0.13, 0.67, 0.8}{\texttt{#1}}} + +\usepackage[hidelinks]{hyperref} +\begin{document} + + +\vspace*{\fill} +\begin{center} + {\Huge The \textcolor{teal}{\texttt{magicwatermark}}\footnote{\url{https://github.com/ljguo1020/magicwatermark}} package\blfootnote{English version of the documentation by Jérémy Just <\url{jeremy@jejust.fr}>.}} \\[.5cm] + {\Large Guo Li Jun <ljguo1020@gmail.com>} \\[.5cm] + {\Large V1.2B}\\[1cm] +\begin{example}[] +\MagicWatermark{ + setup = { + pages = {*}, + content = {P-\thepage}, + style = {shift = {(.5\textwidth, .5\textheight + \headheight + \headsep)}, scale = 3, text = cyan, font = \ttfamily} + }, + setup = { + pages = {even}, + style = {scale = 5, text = pink}, + content = {Watermark}, + is append + }, + setup = { + pages = {1}, + style = {text width = 1.7\paperwidth, rotate = 45, align = left, font = \Large, opacity = .1}, + content = { + \foreach \x in {0, ..., 500} {Magic Watermark } + }, + is append + } +} +\end{example} +\end{center} + +\vspace*{\fill} + +\newpage + + +\linespread{1.3}\selectfont +\tableofcontents + +\section{Presentation} + +\pkgname{} is a new watermarking package. Tts first version was released on June 17\textsuperscript{th}, 2022, +but this update is a complete refactoring. + +\pkgname{} is based on \texttt{ti\textit{k}z} and \texttt{expl3}, which gives you a lot of flexibility +to add a background or a watermark to the pages of your document. + +\section{Use} + +The use of \pkgname{}, compared to other packages of similar functionality, is a lot easier, +as it provides a single command, \verb|\MagicWatermark|. +This command takes a parameter consisting in a number of \opt{setup} rules. +\begin{example}[] +\MagicWatermark{ + setup = {}, + setup = {}, + ... +} +\end{example} + +\opt{setup} internally accepts four key options to configure the presentation of the watermark. + +\subsection{pages} +\opt{pages} accepts a comma-separated list which defines the scope of the watermark,\linebreak[4] \textit{e.g.} \verb|pages = {2, 4, 5, 8-10}| indicates that the watermark is to appear on pages 2, 4, 5, 8, 9 and 10. + +\opt{pages} accepts a total of four configuration rules: +\begin{itemize} + \item \para{*}, indicating all pages; + \item \para{odd} and \para{even}, for odd/even pages; + \item a range, like \para{3-5} or \para{12-ii}; + \item expressions, such as \para{2X+1}, \para{2X\^{}2+X+1} (the variable \textbf{has to be} \para{X}). +\end{itemize} + +Here, we assume that the total number of pages is 24: +\begin{example}[title = pages machine rules] +pages = {*} => 1, 2, 3, ..., 24 +pages = {odd} => 1, 3, 5, ..., 23 +pages = {1, 3, 5-10} => 1, 3, 5, 6, 7, ..., 10 +pages = {1-5, 8, 20-ii} => 1, 2, ..., 5, 8, 20, 21, ..., 23 +pages = {3X + 1} => 1, 4, 7, 10, ..., 22 +\end{example} + +\subsection{tikz} + +\opt{tikz} is used to choose whether the watermark content will be placed +in a \texttt{tikz} \texttt{node} (see below). +The two possible values are \para{true} and \para{false}. The default is \para{true}. +When you choose to use \opt{tikz}, you need to load the \texttt{tikz} package manually. + +\subsection{content} + +\opt{content} is used to define the content of the watermark, when \opt{tikz} is enabled. +The given value is placed inside the \texttt{tikz} \texttt{node}; +for this reason, to take full avantage of this syntax, you need to have some knowledge +of the available \texttt{node} options. + +\subsection{style} + +\opt{style} is used to set the style of the \texttt{node} that holds the watermark content. +The default style is \para{inner~sep = 0pt, outer~sep = 0pt, opacity = .5, align = left}, +and is ignored when \opt{tikz} is disabled. + +\subsection{is append} + +\opt{is append} is used to choose whether or not to override the existing watermark on the +current page. The available values are \para{true} and \para{false}, the default is \para{false}. + + +\section{Examples} + +\begin{example}[title = Add page number to the top right corner of each pages:] +% \usepackage{tikz} +\MagicWatermark{ + setup = { + pages = {*}, + content = {P-\thepage}, + style = {shift = {(.5\textwidth, .5\textheight + \headheight + \headsep)}, scale = 3, text = cyan, font = \ttfamily} + } +} +\end{example} + +\begin{example}[title = Add text watermark at the center of even numbered pages:] +% \usepackage{tikz} +\MagicWatermark{ + setup = { + pages = {even}, + style = {scale = 5, text = pink}, + content = {Watermark}, + is append + } +} +\end{example} + +\begin{example}[title = Add a full page of text as watermark to the second to last page:] +% \usepackage{tikz} +\MagicWatermark{ + setup = { + pages = {2-i}, + style = {text width = 1.7\paperwidth, rotate = 45, align = left, font = \Large, opacity = .1}, + content = { + \foreach \x in {0, ..., 500} {Magic Watermark } + }, + is append + } +} +\end{example} + +\begin{example}[title = Use different watermarks for odd and even pages:] +% \usepackage{tikz} +\MagicWatermark{ + setup = { + pages = {even}, + style = {scale = 8, rotate = 45, text=red, align = center,font = \linespread{2}\selectfont}, + content = { + Even MagicWatermark\\ + Even MagicWatermark\\ + Even MagicWatermark\\ + Even MagicWatermark + } + }, + setup = { + pages = {odd}, + style = {scale = 6, rotate = -45, text = cyan, text width = 1.7\paperwidth, font = \linespread{1.5}\selectfont, align = center}, + content = { + \foreach \x in {0,...,5}{ + Odd MagicWatermark + } + } + } +} +\end{example} + +\begin{example}[title = Use an image as watermark:] +% \usepackage{tikz} +\MagicWatermark{ + setup = { + pages = {even}, + style = {opacity = 0.3}, + content = { + \includegraphics{example-image-a} + } + }, + setup = { + pages = {odd}, + style = {opacity = .3, rotate=45, text width = 3\paperwidth}, + content = { + \foreach \x in {0, ..., 20}{ + \foreach \y in {1, 2, 3} { + \includegraphics{example-image-b} + } \\ + } + } + } +} +\end{example} + +\begin{example}[title = Disable tikz] +\def\addhead#1#2{% + \expandafter\gdef\csname head@content@#1\endcsname{#2}% +} + +\def\printhead#1{% + \csname head@content@#1\endcsname% +} + +\addhead{2}{The only way to do great work is to love what you do.} +\addhead{3}{Success is not final, failure is not fatal: It is the courage to continue that counts.} +\addhead{4}{In the end, we will remember not the words of our enemies, but the silence of our friends.} +\addhead{5}{It does not matter how slowly you go as long as you do not stop.} + +\NewDocumentCommand{\mywatermark}{}{% + \begin{tikzpicture}[remember picture, overlay] + \node[yshift = -\headheight - \headsep, text = teal, font = \large] at (current page.north) {\printhead{\thepage}}; + \end{tikzpicture} +} + +\MagicWatermark{ + setup = { + pages = {2-5}, + tikz = false, + content = \mywatermark + } +} +\end{example} + + +\end{document} diff --git a/macros/latex/contrib/magicwatermark/magicwatermark.sty b/macros/latex/contrib/magicwatermark/magicwatermark.sty index d7b8647252..e40af7ea0b 100644 --- a/macros/latex/contrib/magicwatermark/magicwatermark.sty +++ b/macros/latex/contrib/magicwatermark/magicwatermark.sty @@ -1,6 +1,5 @@ -\ProvidesExplPackage{magicwatermark}{2024/06/11}{1.2A}{magic watermark, author} +\ProvidesExplPackage{magicwatermark}{2024/06/11}{1.2B}{magic watermark, author} -\RequirePackage{everypage-1x} \msg_new:nnn {magicwatermark}{ Unable to parse } { @@ -439,10 +438,12 @@ \group_begin: \AtBeginDocument{ \keys_set:nn { mw } { #1 } - \AddEverypageHook{ - \tl_if_exist:cT { g__mw_content_ \int_to_roman:n { \value{page} }_tl } - { - \tl_use:c { g__mw_content_ \int_to_roman:n { \value{page} } _tl } + \AddToHook{shipout/background}{ + \put(.5\paperwidth,-.5\paperheight){ + \tl_if_exist:cT { g__mw_content_ \int_to_roman:n { \value{page} }_tl } + { + \tl_use:c { g__mw_content_ \int_to_roman:n { \value{page} } _tl } + } } } } |