[latex3-commits] [git/LaTeX3-latex3-latex2e] OR-lab: Merge branch 'develop' into OR-lab. Added some information latex-lab in ltnews35 (50711f7c)

Frank Mittelbach frank.mittelbach at latex-project.org
Thu Mar 10 17:03:08 CET 2022


Repository : https://github.com/latex3/latex2e
On branch  : OR-lab
Link       : https://github.com/latex3/latex2e/commit/50711f7cb7e8022f20093bc4adf6342b453ce378

>---------------------------------------------------------------

commit 50711f7cb7e8022f20093bc4adf6342b453ce378
Merge: e68db0dc 8fc20f32
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Mar 10 17:03:08 2022 +0100

    Merge branch 'develop' into OR-lab.
    Added some information latex-lab in ltnews35
    
    # Conflicts:
    #       required/latex-lab/build.lua
    #       required/latex-lab/latex-lab.ins


>---------------------------------------------------------------

50711f7cb7e8022f20093bc4adf6342b453ce378
 base/changes.txt                                   |  28 +-
 base/doc/ltnews35.tex                              |  81 +-
 base/doc/usrguide3.tex                             |  58 +-
 base/latexrelease.dtx                              |  38 +-
 base/latexrelease.ins                              |   2 +-
 base/ltcmd.dtx                                     |  34 +-
 base/ltexpl.dtx                                    |  12 +-
 base/ltfinal.dtx                                   |  34 +-
 base/ltvers.dtx                                    |  20 +-
 base/testfiles-legacy/utf8-test-002.lvt            |   6 +
 .../utf8-test-002.tlg}                             |   6 +-
 base/testfiles-lthooks/ltcmdhooks-001.tlg          |  14 +
 base/testfiles-lthooks/lthooks-000.tlg             |  14 +
 base/testfiles-lthooks/lthooks-001.tlg             |  30 +
 base/testfiles-lthooks/lthooks-002.tlg             |  30 +
 base/testfiles-lthooks/lthooks-003.tlg             |  16 +
 base/testfiles-lthooks/lthooks-004.tlg             |  16 +
 base/testfiles-lthooks/lthooks-005.tlg             |  16 +
 base/testfiles-lthooks/lthooks-006.tlg             |  16 +
 base/testfiles-lthooks/lthooks-007.tlg             |  30 +
 base/testfiles-lthooks/lthooks-008.tlg             |  18 +-
 base/testfiles-lthooks/lthooks-009.tlg             |  14 +
 base/testfiles-lthooks/lthooks-011.tlg             |  56 ++
 base/testfiles-lthooks/lthooks-013.tlg             |  14 +
 base/testfiles-lthooks/lthooks-021.tlg             |  14 +
 base/testfiles-lthooks/lthooks-legacy.tlg          |  14 +
 base/testfiles-lthooks2/lthooks2-002.tlg           |  14 +
 base/testfiles-lthooks2/lthooks2-005.tlg           |  28 +
 .../github-0621.lvt                                |   0
 .../github-0621.tlg                                |   0
 .../tlb0077.luatex.tlg                             |   0
 base/{testfiles => testfiles-search}/tlb0077.lvt   |   0
 base/{testfiles => testfiles-search}/tlb0077.tlg   |   0
 base/{testfiles => testfiles-search}/tlb1315.lvt   |   0
 base/{testfiles => testfiles-search}/tlb1315.tlg   |   0
 base/testfiles/github-0479-often.luatex.tlg        |   2 +
 base/testfiles/github-0479-often.tlg               |   2 +
 base/testfiles/github-0479-often.xetex.tlg         |   2 +
 base/testfiles/github-0479b.lvt                    |   2 +-
 base/testfiles/github-0479c.lvt                    |  19 +-
 base/testfiles/helpers/german.sty                  | 614 ---------------
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |   4 +
 .../tlb-latexrelease-rollback-003-often.tlg        |   4 +
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |   4 +
 ...lb-latexrelease-rollback-2020-10-01.luatex.tlg} |  23 +-
 .../tlb-latexrelease-rollback-2020-10-01.lvt       |  12 +
 ...lg => tlb-latexrelease-rollback-2020-10-01.tlg} |  23 +-
 ...tlb-latexrelease-rollback-2020-10-01.xetex.tlg} |  23 +-
 ...lb-latexrelease-rollback-2021-06-01.luatex.tlg} |  91 +--
 .../tlb-latexrelease-rollback-2021-06-01.lvt       |  12 +
 ...lg => tlb-latexrelease-rollback-2021-06-01.tlg} |  90 +--
 ...tlb-latexrelease-rollback-2021-06-01.xetex.tlg} |  89 +--
 ...lb-latexrelease-rollback-2021-11-15.luatex.tlg} | 143 ++--
 .../tlb-latexrelease-rollback-2021-11-15.lvt       |  12 +
 ...lg => tlb-latexrelease-rollback-2021-11-15.tlg} | 142 ++--
 ...tlb-latexrelease-rollback-2021-11-15.xetex.tlg} | 141 ++--
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |   2 +
 base/testfiles/tlb-rollback-004-often.tlg          |   2 +
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |   2 +
 base/testfiles/tlb-rollback-005.luatex.tlg         |   2 +
 base/testfiles/tlb-rollback-005.tlg                |   2 +
 base/testfiles/tlb-rollback-005.xetex.tlg          |   2 +
 base/update-lthooks-tests.sh                       |   0
 base/update-rollback-tests.sh                      |   8 +
 base/utf8ienc.dtx                                  |  46 +-
 .../latex2e-first-aid-for-external-files.dtx       |  24 +
 required/latex-lab/build.lua                       |   1 +
 required/latex-lab/changes.txt                     |   6 +
 required/latex-lab/latex-lab-prototype.dtx         | 827 +++++++++++++++++++++
 required/latex-lab/latex-lab.ins                   |   9 +-
 .../latex-lab/testfiles/latex-lab-prototype000.lvt |   6 +-
 .../testfiles/latex-lab-prototype000.tlg}          |   2 +-
 .../latex-lab/testfiles/latex-lab-prototype001.lvt |  30 +
 .../latex-lab/testfiles/latex-lab-prototype001.tlg |  46 ++
 .../testfiles/latex-lab-prototype001b.lvt          |  31 +
 .../testfiles/latex-lab-prototype001b.tlg          |  46 ++
 .../latex-lab/testfiles/latex-lab-prototype002.lvt |  90 +++
 .../latex-lab/testfiles/latex-lab-prototype002.tlg |  21 +
 .../testfiles/latex-lab-prototype002b.lvt          |  91 +++
 .../testfiles/latex-lab-prototype002b.tlg          |  21 +
 80 files changed, 2283 insertions(+), 1161 deletions(-)

diff --cc base/doc/ltnews35.tex
index f87d5c55,c2f5e360..4154cc08
--- a/base/doc/ltnews35.tex
+++ b/base/doc/ltnews35.tex
@@@ -186,7 -186,7 +186,37 @@@ and also in the documentation of the \p
  
  \section{The \pkg{latex-lab} bundle}
  
--\emph{write about it}
++We added a new \pkg{latex-lab}oratory bundle in which we place new
++code that is going to be available only through a
++\cs{DocumentMetadata} declaration and that is\Dash most
++importantly\Dash work under development and subject to
++change without further notice. This means, that commands and interfaces provided there may
++get altered or removed again after some public testing.  The code can
++be accessed through the \cs{DocumentMetadata} key \texttt{testphase}.
++Currently supported values are \texttt{phase-I} and \texttt{phase-II}
++that enable code of the tagged PDF project (phase-I is frozen and
++phase-II the phase we are currently working on).  With
++\begin{verbatim}
++\DocumentMetadata{testphase=phase-II}
++\end{verbatim}
++you currently enable tagging for paragraphs and footnotes, more
++document elements will follow soon.
++
++For more detailed testing it is also possible to pass other values to
++\texttt{testphase}, for example, the first incarnation of a template
++design interface based on \pkg{l3keys} can be accessed through the
++value \texttt{prototype}, thus
++\begin{verbatim}
++\DocumentMetadata{testphase={phase-II,prototype}}
++\end{verbatim}
++will enable all of phase-II plus the draft template interface (which
++is not yet integrated in phase-II).
++
++Eventually, code will move (once considered stable) from the
++testphase into the \LaTeX{} kernel itself. Tagging will continue to
++require a \cs{DocumentMetadata} declaration, but you will then be able
++to drop the \texttt{testphase} key setting.
++
  
  
  
@@@ -350,10 -364,11 +394,7 @@@ lua.get_functions_table(
  
  
  
- \subsection{???}
- %
- \githubissue{???}
  
 -\subsection{???}
 -%
 -\githubissue{???}
 -
  
  \section{Code improvements}
  
@@@ -479,7 -510,7 +536,7 @@@ displaying different data in the foote
  \subsection{Croatian character support}
  
  The default \pkg{inputenc} support has been extended to support the 9 characters
--D\v Z, D\v z, d\v z, LJ, Lj, lj, NJ, Nj, nj, input as single UTF-8 codepoints
++D\v Z, D\v z, d\v z, LJ, Lj, lj, NJ, Nj, nj, input as single UTF-8 code points
  in the range U+01C4 to U+01CC.
  %
  \githubissue{gh/723}
@@@ -508,10 -539,10 +565,6 @@@ argument as their general purpose count
  
  
  
--\subsection{???}
--%
--\githubissue{???}
--
  
  \section{Bug fixes}
  
@@@ -546,7 -577,7 +599,7 @@@ is now fixed
  The package \pkg{amsopn} used to define \cs{operator at font} but this
  command is already provided by the \LaTeX{} format (for at least 14
  years). As a result the definition in \pkg{amsopn} is equivalent to a
--reset to the kernel definition, which is unnecessary and suprising if
++reset to the kernel definition, which is unnecessary and surprising if
  you alter the math setup (e.g., by loading a package) and at a later
  stage add \pkg{amsmath}, which then undoes part of your setup. For
  this reason the definition was taken out and
@@@ -567,7 -598,7 +620,7 @@@ after loading the package
  If \cs{shoveleft} started out with the words \enquote{plus} or
  \enquote{minus} it was misunderstood as part of a rubber length and
  led either to an error or was swallowed without trace.  By adding a
--\cs{relax} this errornous scanning into the argument of \cs{shoveleft}
++\cs{relax} this erroneous scanning into the argument of \cs{shoveleft}
  is now prevented.
  %
  \githubissue{714}
@@@ -630,10 -661,10 +683,6 @@@ The issue is now fixed and the graphic
  \sxissue{q/630167}
  
  
--\subsection{???}
--%
--\githubissue{???}
--
  
  
  \section{Changes to packages in the \pkg{tools} category}
diff --cc required/latex-lab/build.lua
index 4fb8c127,0f3ba4b9..101dfc81
--- a/required/latex-lab/build.lua
+++ b/required/latex-lab/build.lua
@@@ -14,8 -14,7 +14,9 @@@ maindir = "../..
  installfiles = {"*.ltx", "*.sty"}
  typesetfiles = {
                   "latex-lab-testphase.dtx",
 +                 "latex-lab-new-or.dtx",
 +                 "latex-lab-footnotes.dtx",
+                  "latex-lab-prototype.dtx",
                   "*-doc.tex",
  		 "*-code.tex",
  	       }
diff --cc required/latex-lab/latex-lab.ins
index 27700fac,1c7f5d98..eb0b066a
--- a/required/latex-lab/latex-lab.ins
+++ b/required/latex-lab/latex-lab.ins
@@@ -69,14 -68,9 +69,19 @@@ where one can also log issues in case t
  \generate{\file{phase-I-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{phase-I}}}
  \generate{\file{phase-II-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{phase-II}}}
  
 +\generate{\file{tagpdf-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{tagpdf}}}
 +\generate{\file{new-or-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{new-or}}}
 +
- 
 +% support files (the new-or code is a private package to make life easier)
 +
 +\generate{\file{latex-lab-testphase-new-or.sty}{\from{latex-lab-new-or.dtx}{code}}}
 +\generate{\file{latex-lab-footmisc.ltx}{\from{latex-lab-footnotes.dtx}{footmisc}}}
 +\generate{\file{latex-lab-footnotes.ltx}{\from{latex-lab-footnotes.dtx}{kernel}}}
 +
+ % for \DocumentMetadata trials
+ \generate{\file{prototype-latex-lab-testphase.ltx}{\from{latex-lab-prototype.dtx}{2ekernel}}}
+ 
+ % for standalone trials
+ \generate{\file{latex-lab-prototype.sty}{\from{latex-lab-prototype.dtx}{2ekernel}}}
++
  \endbatchfile
diff --cc required/latex-lab/testfiles/latex-lab-prototype002b.lvt
index 00000000,bbcb3288..b49df984
mode 000000,100644..100644
--- a/required/latex-lab/testfiles/latex-lab-prototype002b.lvt
+++ b/required/latex-lab/testfiles/latex-lab-prototype002b.lvt
@@@ -1,0 -1,91 +1,91 @@@
+ %
+ % Copyright (C) 2009,2017,2018,2022 LaTeX3 Project
+ %
+ 
 -\DocumentMetadata{testphase=prototype}
++\DocumentMetadata{testphase={phase-II,prototype}}
+ 
+ \documentclass{minimal}
+ \input{regression-test}
+ 
+ \RequirePackage[enable-debug]{expl3}
+ \ExplSyntaxOn
+ \debug_on:n { check-declarations , deprecation , log-functions }
+ \ExplSyntaxOff
+ 
+ \begin{document}
+ \START
+ \ExplSyntaxOn
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ \OMIT
+ \def\aaa{}\def\bbb{}\def\ccc{}
+ \prototype_declare_object:nn {obj}{0}
+ \prototype_declare_template:nnnn {obj}{tmpt1}
+ {
+   akey .tl_set:N  = \aaa ,
+   bkey .tl_set:N  = \bbb ,
+   ckey .tl_gset:N = \ccc ,
+ }
+ {
+   \typeout{(a:~\aaa)~(b:~\bbb)~(c:~\ccc)}
+ }
+ \prototype_declare_defaults:nnn {obj} {tmpt1} { bkey = fuzz }
+ \prototype_declare_instance:nnnn {obj}{tmpt1}{inst} {akey=foo}
+ \prototype_declare_instance:nnnn {obj}{tmpt1}{inst2}{akey=bar,bkey=baz,ckey=glob}
+ \TIMO
+ 
+ \TEST{Testing~TOKENLIST~keytype}{
+   \group_begin:
+     \prototype_use_instance:nn {obj}{inst}
+     \prototype_use_instance:nn {obj}{inst2}
+   \group_end:
+   \TYPE{(a:~\aaa)~(b:~\bbb)~(c:~\ccc)}
+ }
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ \OMIT
+ \prototype_declare_template:nnnn{obj}{tmpt2}
+ {
+   akey .code:n = \def\aaa{#1},
+ }
+ {
+   \TYPE{(a:~\aaa)}
+ }
+ 
+ \prototype_declare_instance:nnnn {obj}{tmpt2}{inst3} {akey=a!}
+ \TIMO
+ 
+ \TEST{Testing~CODE~keytype}{
+   \prototype_use_instance:nn{obj}{inst3}
+ }
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ \OMIT
+ \prototype_declare_template:nnnn{obj}{tmpt3}
+   {
+   ckey .choice: ,
+   ckey / xx .code:n = \def\ccc{keyx},
+   ckey / yy .code:n = \def\ccc{keyy},
+   ckey / unknown .code:n = \def\ccc{key?} ,
+   }
+ {
+   \typeout{(c:~\ccc)}
+ }
+ 
+ \prototype_declare_instance:nnnn {obj} {tmpt3}{inst4}{ckey=xx}
+ \prototype_declare_instance:nnnn {obj} {tmpt3}{inst5}{ckey=yy}
+ \prototype_declare_instance:nnnn {obj} {tmpt3}{inst6}{ckey=zz}
+ \TIMO
+ 
+ \TEST{Testing~CHOICE~keytype}{
+   \prototype_use_instance:nn{obj}{inst4}
+   \prototype_use_instance:nn{obj}{inst5}
+   \prototype_use_instance:nn{obj}{inst6}
+ }
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ \END





More information about the latex3-commits mailing list.