[latex3-commits] [latex3/latex2e] lab-review-02: add implementation for verse (correct indentation) (b5fea54e)
github at latex-project.org
github at latex-project.org
Thu Jun 22 00:31:32 CEST 2023
Repository : https://github.com/latex3/latex2e
On branch : lab-review-02
Link : https://github.com/latex3/latex2e/commit/b5fea54e654cf5318cf3bb9409e8c5ac753fe087
>---------------------------------------------------------------
commit b5fea54e654cf5318cf3bb9409e8c5ac753fe087
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Thu Jun 22 00:31:32 2023 +0200
add implementation for verse (correct indentation)
>---------------------------------------------------------------
b5fea54e654cf5318cf3bb9409e8c5ac753fe087
required/latex-lab/changes.txt | 1 +
required/latex-lab/latex-lab-block-tagging.dtx | 32 +++-
required/latex-lab/testfiles-LM/LM-2-2.lvt | 6 +-
.../testfiles-block-tagging/blocks-list-01.lvt | 22 +--
.../testfiles-block-tagging/blocks-list-01b.lvt | 21 ---
.../blocks-verse-01.luatex.tlg | 178 +++++++++++++++++++++
.../testfiles-block-tagging/blocks-verse-01.lvt | 18 +++
.../testfiles-block-tagging/blocks-verse-01.tlg | 160 ++++++++++++++++++
8 files changed, 387 insertions(+), 51 deletions(-)
diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt
index 4baeffb0..394c546c 100644
--- a/required/latex-lab/changes.txt
+++ b/required/latex-lab/changes.txt
@@ -1,5 +1,6 @@
2023-06-21 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
* latex-lab-sec.dtx: redefine \part only if it defined (letter.cls ...)
+ * latex-lab-block-tagging: add definition for verse
2023-06-07 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
* latex-lab-block-tagging.dtx corrected tagging of caption
diff --git a/required/latex-lab/latex-lab-block-tagging.dtx b/required/latex-lab/latex-lab-block-tagging.dtx
index 63145d92..f3562b03 100644
--- a/required/latex-lab/latex-lab-block-tagging.dtx
+++ b/required/latex-lab/latex-lab-block-tagging.dtx
@@ -26,8 +26,8 @@
% \fi
%
-\def\ltblocksversion{v0.8d}
-\def\ltblocksdate{2023/06/07}
+\def\ltblocksversion{v0.8e}
+\def\ltblocksdate{2023/06/21}
%
% \title{Prototype reimplementation of \LaTeXe{}'s block environments using templates}
@@ -1143,8 +1143,6 @@
% \end{macro}
%
%
-%
-%
% \subsubsection{Standard list environments}
%
%
@@ -1173,8 +1171,32 @@
% \end{environment}
%
%
+% \subsubsection{verse environment}
%
-%
+% \begin{environment}{verse}
+% The verse environment has not special tagging currently. It is
+% defined as a simple standard list and takes the tagging from there.
+% But it must be redefined so that \cs{itemindent} is correctly set.
+% \begin{macrocode}
+\AddToHook{begindocument/before}{
+ \RenewDocumentEnvironment{verse}{ !O{} }
+ {
+ \let\\\@centercr
+ \UseInstance{blockenv}{list}
+ {
+ item-indent=-1.5em,
+ parindent=-1.5em,
+ item-skip=0pt,
+ rightmargin=\leftmargin,
+ leftmargin=\leftmargin+1.5em,
+ #1
+ }
+ \item\relax
+ }
+ { \endblockenv }
+ }
+% \end{macrocode}
+% \end{environment}
%
%
% \begin{environment}{list}
diff --git a/required/latex-lab/testfiles-LM/LM-2-2.lvt b/required/latex-lab/testfiles-LM/LM-2-2.lvt
index 7ea08cfa..90da0565 100644
--- a/required/latex-lab/testfiles-LM/LM-2-2.lvt
+++ b/required/latex-lab/testfiles-LM/LM-2-2.lvt
@@ -46,10 +46,8 @@
\item
The title comes out as a text-unit without further structure!
\item Sectioning: see \texttt{latex-lab-sec}.
-\item
- \texttt{verse} is not faithfully implemented (has an indent on the
- first line) and it should not be implemented as a list, but rather as
- a standalone block, I think.
+\item \texttt{verse} should not be implemented as a list, but rather as a
+ standalone block, I think.
\end{itemize}
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-list-01.lvt b/required/latex-lab/testfiles-block-tagging/blocks-list-01.lvt
index b6d6611b..8401f25d 100644
--- a/required/latex-lab/testfiles-block-tagging/blocks-list-01.lvt
+++ b/required/latex-lab/testfiles-block-tagging/blocks-list-01.lvt
@@ -18,22 +18,7 @@
\ShowCommand\verse
-\iffalse
-\makeatletter
-\renewenvironment{verse}[1][]
- {\let\\\@centercr
-%\tracingall
-\list[#1]{}{\itemsep \z@
- \itemindent -1.5em%
- \listparindent\itemindent
- \rightmargin \leftmargin
-% \parsep 13pt
- \advance\leftmargin 1.5em}%
-%\tracingnone
-\item\relax}
- {\endlist}
-\makeatother
-\fi
+
\begin{document}
@@ -107,8 +92,3 @@ Text inbetween separated\hrulefill
\begin{flushleft} Hello \end{flushleft}
Text after separated\hrulefill
-
-
-
-
-
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-list-01b.lvt b/required/latex-lab/testfiles-block-tagging/blocks-list-01b.lvt
index bd5cfbdf..2e0c3039 100644
--- a/required/latex-lab/testfiles-block-tagging/blocks-list-01b.lvt
+++ b/required/latex-lab/testfiles-block-tagging/blocks-list-01b.lvt
@@ -19,22 +19,6 @@
\ShowCommand\verse
-\makeatletter
-\RenewDocumentEnvironment{verse} {!O{} }
-{
- \let\\\@centercr
- \list[#1]{}{\itemsep \z@
- \itemindent -1.5em%
- \listparindent\itemindent
- \rightmargin \leftmargin
- \parsep 13pt
- \advance\leftmargin 1.5em
- }%
- \item\relax
-}
-{\endlist}
-
-\makeatother
\begin{document}
@@ -107,8 +91,3 @@ Text inbetween separated\dotfill
\begin{flushleft} Hello \end{flushleft}
Text after separated\dotfill
-
-
-
-
-
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-verse-01.luatex.tlg b/required/latex-lab/testfiles-block-tagging/blocks-verse-01.luatex.tlg
new file mode 100644
index 00000000..a0e6ee68
--- /dev/null
+++ b/required/latex-lab/testfiles-block-tagging/blocks-verse-01.luatex.tlg
@@ -0,0 +1,178 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0, direction TLT
+.\hbox(0.0+0.0)x0.0, direction TLT
+..\kern-72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT
+...\kern-72.26999
+...\hbox(0.0+0.0)x0.0, direction TLT
+....\latelua0{ltx.__pdf.backend_ThisPage_gpush(tex.count["g_shipout_readonly_int"])}
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0, direction TLT
+....\hbox(0.0+0.0)x345.0, direction TLT
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 459.95087fil, direction TLT
+...\latelua0{ltx.__pdf.Page.Resources.ExtGState=true}
+...\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])}
+...\write-{}
+...\glue(\topskip) 5.69446
+...\hbox(4.30554+0.0)x345.0, glue set 308.8888fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 7.69446
+...\hbox(4.30554+0.0)x345.0, glue set 323.8888fil, direction TLT
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty -51
+...\glue 10.0 plus 4.0 minus 5.0
+...\glue -10.0 plus -4.0 minus -5.0
+...\glue 6.0 plus 2.0 minus 4.0
+...\glue(\parskip) 4.0 plus 2.0 minus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x279.99992, glue set 271.94434fil, shifted 40.00005, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x-15.00002, direction TLT
+.....\glue -40.00005
+.....\hbox(0.0+0.0)x20.00003, glue set 20.00003fil, direction TLT
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\hbox(0.0+0.0)x0.0, direction TLT
+.......\glue 0.0 plus 1.0fil
+.......\hbox(0.0+0.0)x0.0, direction TLT
+.....\glue 5.0
+....\penalty 0
+....\OT1/cmr/m/n/10 H
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+1.94444)x279.99992, glue set 183.33307fil, shifted 40.00005, direction TLT
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -4.0 plus -2.0 minus -1.0
+...\glue(\parskip) 4.0 plus 2.0 minus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 3.11111
+...\hbox(6.94444+0.0)x279.99992, glue set 271.94434fil, shifted 40.00005, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x-15.00002, direction TLT
+....\OT1/cmr/m/n/10 H
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+1.94444)x279.99992, glue set 183.33307fil, shifted 40.00005, direction TLT
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.0
+...\glue -1.94444
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0, direction TLT
+...\hbox(6.44444+0.0)x345.0, glue set 170.0fil, direction TLT
+....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+.\kern0.0
+.\kern-633.0
+.\hbox(0.0+0.0)x0.0, direction TLT
+.\kern633.0
+(blocks-verse-01.aux)
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-verse-01.lvt b/required/latex-lab/testfiles-block-tagging/blocks-verse-01.lvt
new file mode 100644
index 00000000..74d5f0e8
--- /dev/null
+++ b/required/latex-lab/testfiles-block-tagging/blocks-verse-01.lvt
@@ -0,0 +1,18 @@
+\DocumentMetadata{testphase={block-tagging}}
+\input{regression-test}
+\documentclass{article}
+
+\begin{document}
+\START \showoutput
+
+xxxx\\xxxx
+
+\begin{verse}
+ Hallo
+ \newline line long line long line
+\\
+ Hallo
+ \newline line long line long line
+\end{verse}
+
+\end{document}
diff --git a/required/latex-lab/testfiles-block-tagging/blocks-verse-01.tlg b/required/latex-lab/testfiles-block-tagging/blocks-verse-01.tlg
new file mode 100644
index 00000000..2ef5dad1
--- /dev/null
+++ b/required/latex-lab/testfiles-block-tagging/blocks-verse-01.tlg
@@ -0,0 +1,160 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\hbox(0.0+0.0)x0.0
+..\kern -72.26999
+..\vbox(0.0+0.0)x0.0, glue set 72.26999fil
+...\kern -72.26999
+...\hbox(0.0+0.0)x0.0
+....\glue 0.0 plus 1.0fil minus 1.0fil
+...\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue 16.0
+.\vbox(617.0+0.0)x345.0, shifted 62.0
+..\vbox(12.0+0.0)x345.0, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x345.0
+....\hbox(0.0+0.0)x345.0
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 459.95087fil
+...\write-{}
+...\glue(\topskip) 5.69446
+...\hbox(4.30554+0.0)x345.0, glue set 308.8888fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 7.69446
+...\hbox(4.30554+0.0)x345.0, glue set 323.8888fil
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 x
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty -51
+...\glue 10.0 plus 4.0 minus 5.0
+...\glue -10.0 plus -4.0 minus -5.0
+...\glue 6.0 plus 2.0 minus 4.0
+...\glue(\parskip) 4.0 plus 2.0 minus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x279.99992, glue set 271.94432fil, shifted 40.00005
+....\hbox(0.0+0.0)x-15.00002
+.....\glue -40.00005
+.....\hbox(0.0+0.0)x20.00003, glue set 20.00003fil
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\hbox(0.0+0.0)x0.0
+.......\glue 0.0 plus 1.0fil
+.......\hbox(0.0+0.0)x0.0
+.....\glue 5.0
+....\penalty 0
+....\OT1/cmr/m/n/10 H
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+1.94444)x279.99992, glue set 183.33307fil, shifted 40.00005
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -4.0 plus -2.0 minus -1.0
+...\glue(\parskip) 4.0 plus 2.0 minus 1.0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 3.11111
+...\hbox(6.94444+0.0)x279.99992, glue set 271.94432fil, shifted 40.00005
+....\hbox(0.0+0.0)x-15.00002
+....\OT1/cmr/m/n/10 H
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\penalty 10000
+....\glue 0.0 plus 1.0fil
+....\penalty -10000
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+1.94444)x279.99992, glue set 183.33307fil, shifted 40.00005
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 g
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 e
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.0
+...\glue -1.94444
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x345.0
+...\hbox(6.44444+0.0)x345.0, glue set 170.0fil
+....\glue 0.0 plus 1.0fil
+....\OT1/cmr/m/n/10 1
+....\glue 0.0 plus 1.0fil
+.\kern 0.0
+.\kern -633.0
+.\hbox(0.0+0.0)x0.0
+.\kern 633.0
+(blocks-verse-01.aux)
More information about the latex3-commits
mailing list.