[latex3-commits] [git/LaTeX3-latex3-latex2e] firstaid-songs: add firstaid for songs package (9c41456b)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon Nov 28 15:39:56 CET 2022
Repository : https://github.com/latex3/latex2e
On branch : firstaid-songs
Link : https://github.com/latex3/latex2e/commit/9c41456b716ebf659fe1c69b98b930ccee0b73f8
>---------------------------------------------------------------
commit 9c41456b716ebf659fe1c69b98b930ccee0b73f8
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Nov 28 15:39:56 2022 +0100
add firstaid for songs package
>---------------------------------------------------------------
9c41456b716ebf659fe1c69b98b930ccee0b73f8
required/firstaid/changes.txt | 5 +
.../latex2e-first-aid-for-external-files.dtx | 22 +-
required/firstaid/testfiles/firstaid-songs.lvt | 17 ++
required/firstaid/testfiles/firstaid-songs.tlg | 267 +++++++++++++++++++++
4 files changed, 307 insertions(+), 4 deletions(-)
diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index 6376a30b..31e24397 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,3 +1,8 @@
+2022-11-28 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx (subsection{the songs package first aid}):
+ A first aid for songs after a change to \obeylines
+
2022-11-04 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* latex2e-first-aid-for-external-files.dtx (subsection{The unicode-math package first aid}):
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index 310e5da9..dda86ce0 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -425,13 +425,27 @@
\AddToHook{file/babel.sty/before}[firstaid]{\def\BabelCaseHack{}}
% \end{macrocode}
%
-% \begin{macrocode}
-%</kernel>
-% \end{macrocode}
-%
%
+% \subsection{The \pkg{songs} package first aid}
%
+% The songs package uses \cs{obeylines} and redefines \cs{par} for special effect.
+% this no longer works in LaTeX 2022-06-01 (gh issue 367). The following
+% fixes at least one failure.
+% \begin{macrocode}
+\AddToHook{file/songs.sty/after}[firstaid]{%
+ \FirstAidNeededT{songs}{sty}{2018/09/12 v3.1 Songs package}%
+ {%
+ \renewcommand\SB at obeylines{%
+ \let\obeyedline\SB at par%
+ \obeylines%
+ \let\@par\SB@@par%
+ }}%
+}
+% \end{macrocode}
%
+% \begin{macrocode}
+%</kernel>
+% \end{macrocode}
%
% \subsection{The \pkg{everysel} package first aid}
%
diff --git a/required/firstaid/testfiles/firstaid-songs.lvt b/required/firstaid/testfiles/firstaid-songs.lvt
new file mode 100644
index 00000000..529a0523
--- /dev/null
+++ b/required/firstaid/testfiles/firstaid-songs.lvt
@@ -0,0 +1,17 @@
+\documentclass{book}
+\input{regression-test}
+\usepackage[chorded]{songs}
+\begin{document}
+\START \showoutput
+\makeatletter\show\SB at obeylines
+\begin{songs}{}
+\songcolumns{1}
+\beginsong{Song}
+\beginverse
+D\[a]ies ist die erste Zeile vom M\[d]inibeispiel.
+Und h\[C]ier kommt Zeile zwei vom Minibeispiel, die \[G]allein stehen sollte.
+\endverse
+\endsong
+\end{songs}
+
+\end{document}
\ No newline at end of file
diff --git a/required/firstaid/testfiles/firstaid-songs.tlg b/required/firstaid/testfiles/firstaid-songs.tlg
new file mode 100644
index 00000000..22dc09f5
--- /dev/null
+++ b/required/firstaid/testfiles/firstaid-songs.tlg
@@ -0,0 +1,267 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+> \SB at obeylines=\long macro:
+->\let \obeyedline \SB at par \obeylines \let \@par \SB@@par .
+l. ...\makeatletter\show\SB at obeylines
+Completed box being shipped out [1]
+\vbox(627.36243+0.0)x380.0
+.\hbox(0.0+0.0)x0.0
+.\glue 22.0
+.\vbox(605.36243+0.0)x345.0, shifted 35.0
+..\vbox(12.0+0.0)x345.0, glue set 5.55556fil
+...\glue 0.0 plus 1.0fil
+...\hbox(6.44444+0.0)x345.0
+....\special{color push Black}
+....\hbox(6.44444+0.0)x345.0, glue set 339.99998fil
+.....\glue 0.0 plus 1.0fil
+.....\OT1/cmr/m/n/10 1
+....\special{color pop}
+..\glue 18.06749
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0
+...\write-{}
+...\glue(\topskip) 0.0
+...\hbox(550.0+0.0)x345.0
+....\vbox(550.0+0.0)x345.0, glue set 439.97853fil
+.....\rule(1.0+0.0)x345.0
+.....\penalty 10000
+.....\glue 5.0
+.....\vbox(15.0+3.0)x345.0
+......\hbox(15.0+3.0)x345.0
+.......\hbox(15.0+3.0)x39.79214
+........\special{color push gray .80}
+........\special{color push gray .80}
+........\hbox(15.0+3.0)x0.0, glue set - 39.79214fil
+.........\rule(15.0+3.0)x39.79214
+.........\glue 0.0 plus 1.0fil minus 1.0fil
+........\special{color pop}
+........\hbox(15.0+3.0)x39.79214
+.........\kern 3.0
+.........\special{color push Black}
+.........\hbox(12.0+0.0)x33.79214, glue set 24.2881fil
+..........\OT1/cmss/bx/n/17.28 1
+..........\glue 0.0 plus 1.0fil
+.........\special{color pop}
+.........\kern 3.0
+........\special{color pop}
+.......\kern 3.0
+.......\vbox(12.79997+0.0)x302.20786
+........\vbox(12.79997+0.0)x302.20786
+.........\hbox(9.99998+2.79999)x302.20786, glue set 136.52078fil
+..........\hbox(0.0+0.0)x0.0
+..........\OT1/cmss/m/sl/14.4 S
+..........\OT1/cmss/m/sl/14.4 o
+..........\OT1/cmss/m/sl/14.4 n
+..........\OT1/cmss/m/sl/14.4 g
+..........\penalty 10000
+..........\glue(\parfillskip) 0.0 plus 1.0fil
+..........\glue(\rightskip) 0.0 plus 1.0fil
+.........\kern 0.0
+.....\penalty 10000
+.....\glue 15.65936 plus 5.21979 minus 2.71439
+.....\glue 2.0 plus 4.0
+.....\penalty 10000
+.....\penalty 12345
+.....\glue(\parskip) 0.0
+.....\glue(\parskip) 0.0
+.....\hbox(22.87915+1.94444)x345.0, glue set 73.27765fil
+......\glue(\leftskip) 39.17863
+......\hbox(0.0+0.0)x-18.06749
+......\rule(22.87915+0.0)x0.0
+......\glue -39.17863
+......\glue 18.06749
+......\hbox(6.44444+0.0)x21.11115, glue set 10.00002fil
+.......\OT1/cmr/m/n/10 1
+.......\OT1/cmr/m/n/10 .
+.......\glue 3.33333 plus 1.66666 minus 1.11111
+.......\glue 0.0 plus 1.0fil
+......\OT1/cmr/m/n/10 D
+......\vbox(17.0+0.0)x11.16667
+.......\hbox(9.0+3.0)x7.97487
+........\hbox(9.0+3.0)x0.0
+........\OT1/cmss/m/sl/12 a
+........\kern 2.34993
+.......\glue(\baselineskip) -1.67859
+.......\hbox(6.67859+0.0)x11.16667
+........\kern 0.0
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 e
+........\OT1/cmr/m/n/10 s
+........\glue 0.0 plus 1.0fil
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 d
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 r
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 Z
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 v
+......\kern-0.27779
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 m
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 M
+......\vbox(17.0+1.94444)x46.44455
+.......\hbox(9.0+3.0)x8.37762
+........\hbox(9.0+3.0)x0.0
+........\OT1/cmss/m/sl/12 d
+........\kern 2.34993
+.......\glue(\baselineskip) -1.94444
+.......\hbox(6.94444+1.94444)x46.44455
+........\kern 0.0
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 n
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 b
+........\kern0.27779
+........\OT1/cmr/m/n/10 e
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 s
+........\OT1/cmr/m/n/10 p
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 e
+........\OT1/cmr/m/n/10 l
+........\OT1/cmr/m/n/10 .
+........\glue 0.0 plus 1.0fil
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0 plus 1.0fil
+.....\penalty 1000
+.....\glue(\parskip) 0.0
+.....\glue(\parskip) 0.0
+.....\glue(\baselineskip) 3.93471 plus 1.00006
+.....\hbox(17.0+1.94444)x345.0, glue set 11.15253fil
+......\glue(\leftskip) 39.17863
+......\hbox(0.0+0.0)x-18.06749
+......\OT1/cmr/m/n/10 U
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 d
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 h
+......\vbox(17.0+0.0)x11.1389
+.......\hbox(9.0+3.0)x9.8568
+........\hbox(9.0+3.0)x0.0
+........\OT1/cmss/m/sl/12 C
+........\kern 2.34993
+.......\glue(\baselineskip) -1.67859
+.......\hbox(6.67859+0.0)x11.1389
+........\kern 0.0
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 e
+........\OT1/cmr/m/n/10 r
+........\glue 0.0 plus 1.0fil
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 k
+......\kern-0.27779
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 m
+......\OT1/cmr/m/n/10 m
+......\kern-0.27779
+......\OT1/cmr/m/n/10 t
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 Z
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 z
+......\OT1/cmr/m/n/10 w
+......\kern-0.27779
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 i
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 v
+......\kern-0.27779
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 m
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 M
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 b
+......\kern0.27779
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 p
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 ,
+......\glue 3.33333 plus 2.08331 minus 0.88889
+......\OT1/cmr/m/n/10 d
+......\OT1/cmr/m/n/10 i
+......\OT1/cmr/m/n/10 e
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\vbox(17.0+0.0)x23.33339
+.......\hbox(9.0+3.0)x10.18318
+........\hbox(9.0+3.0)x0.0
+........\OT1/cmss/m/sl/12 G
+........\kern 2.34993
+.......\glue(\baselineskip) -1.94444
+.......\hbox(6.94444+0.0)x23.33339
+........\kern 0.0
+........\OT1/cmr/m/n/10 a
+........\OT1/cmr/m/n/10 l
+........\OT1/cmr/m/n/10 l
+........\OT1/cmr/m/n/10 e
+........\OT1/cmr/m/n/10 i
+........\OT1/cmr/m/n/10 n
+........\glue 0.0 plus 1.0fil
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 t
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 h
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 n
+......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 s
+......\OT1/cmr/m/n/10 o
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 l
+......\OT1/cmr/m/n/10 t
+......\OT1/cmr/m/n/10 e
+......\OT1/cmr/m/n/10 .
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0 plus 1.0fil
+.....\penalty 10000
+.....\glue 15.65936 plus 5.21979 minus 2.71439
+.....\glue 2.0 plus 4.0
+.....\vbox(0.0+0.0)x345.0
+......\hbox(0.0+0.0)x345.0, glue set 172.5fil
+.......\hbox(0.0+0.0)x0.0
+.......\penalty 10000
+.......\glue(\parfillskip) 0.0 plus 1.0fil
+.......\glue(\rightskip) 0.0 plus 1.0fil
+.....\penalty 10000
+.....\glue 2.0 plus 1.0
+.....\hbox(1.0+0.0)x345.0
+......\rule(1.0+*)x345.0
+.....\glue 0.0 plus 1.0fil
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+..\glue(\baselineskip) 25.29494
+..\hbox(0.0+0.0)x345.0
+...\special{color push Black}
+...\hbox(0.0+0.0)x345.0
+...\special{color pop}
+.\kern 0.0
+(firstaid-songs.aux)
More information about the latex3-commits
mailing list.