[latex3-commits] [git/LaTeX3-latex3-latex2e] gh427: fix for #427 (7cbe2db5)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Dec 27 18:08:38 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : gh427
Link : https://github.com/latex3/latex2e/commit/7cbe2db52168a687bfc2ad80cef744da907d638d
>---------------------------------------------------------------
commit 7cbe2db52168a687bfc2ad80cef744da907d638d
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Dec 27 18:08:38 2020 +0100
fix for #427
>---------------------------------------------------------------
7cbe2db52168a687bfc2ad80cef744da907d638d
base/changes.txt | 6 +
base/doc/ltnews33.tex | 9 +
base/letter.dtx | 12 +-
base/testfiles/github-0427.lvt | 24 ++
base/testfiles/{tlb0056.tlg => github-0427.tlg} | 284 +++++++++++-------------
5 files changed, 183 insertions(+), 152 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 6e6a82ec..ed38b420 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2020-12-27 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * letter.dtx (subsubsection{Page breaking control}):
+ The \opening argument was splitting name and address using \\
+ but did not allow to use \\[...] for this (gh/427)
+
2020-10-26 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltmiscen.dtx (subsection{Environments}):
diff --git a/base/doc/ltnews33.tex b/base/doc/ltnews33.tex
index c0b7c72b..c29bd938 100644
--- a/base/doc/ltnews33.tex
+++ b/base/doc/ltnews33.tex
@@ -128,8 +128,17 @@ it always starts out in vertical mode.
\githubissue{385}
+\subsection{Allow extra space between name and address in \pkg{letter} class}
+
+\emph{to be written}
+%
+\githubissue{427}
+
+
+
\subsection{\ldots}
+\emph{to be written}
%
\githubissue{xxx}
diff --git a/base/letter.dtx b/base/letter.dtx
index 7b31dfbb..9d00e0a9 100644
--- a/base/letter.dtx
+++ b/base/letter.dtx
@@ -45,7 +45,7 @@
%<*driver>
\ProvidesFile{letter.drv}
%</driver>
- [2020/03/11 v1.3b
+ [2020/12/27 v1.3c
%<+letter> Standard LaTeX document class]
% \end{macrocode}
%
@@ -1019,7 +1019,15 @@
\@date \end{tabular}\par}%
\fi
\vspace{2\parskip}%
- {\raggedright \toname \\ \toaddress \par}%
+% \end{macrocode}
+% If the address field used \verb=\\[...]= then we have
+% \cs{toaddress} starting with the bracket argument as the split
+% was done simply at \verb=\\=. So we add \cs{expandafter} here so
+% that is will be used and not typeset. A better fix would be to do
+% a proper parsing but \ldots
+% \changes{v1.3c}{2020/12/28}{Add \cs{expandafter} (gh/427)}
+% \begin{macrocode}
+ {\raggedright \toname \expandafter\\\toaddress \par}%
\vspace{2\parskip}%
#1\par\nobreak}
% \end{macrocode}
diff --git a/base/testfiles/github-0427.lvt b/base/testfiles/github-0427.lvt
new file mode 100644
index 00000000..7917b742
--- /dev/null
+++ b/base/testfiles/github-0427.lvt
@@ -0,0 +1,24 @@
+\documentclass{letter}
+
+\input{test2e}
+
+\showoutput
+
+\begin{document}
+
+\START
+
+
+\begin{letter}{First line\\[1ex]
+ Second line\\
+ Third line\\
+ Fourth line\\[1ex]
+ Fifth line\\
+ Sixth line\\
+ Seventh line}
+
+ \opening{Dear Sirs,}
+ Blah Blah Blah\dots
+ \closing{Best\\[1ex] regards\\[1ex] Frank}
+\end{letter}
+\end{document}
diff --git a/base/testfiles/tlb0056.tlg b/base/testfiles/github-0427.tlg
similarity index 63%
copy from base/testfiles/tlb0056.tlg
copy to base/testfiles/github-0427.tlg
index 244c6cd3..50873099 100644
--- a/base/testfiles/tlb0056.tlg
+++ b/base/testfiles/github-0427.tlg
@@ -1,8 +1,5 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-Author: Per Hedegaard
-Format: LaTeX2e<1993/12/24>
-Main Class: letter
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <7> on input line ....
LaTeX Font Info: External font `cmex10' loaded for size
@@ -20,26 +17,22 @@ Completed box being shipped out [1]
...\glue 0.0 plus 0.00006fil
...\write-{}
...\glue(\topskip) 3.16669
-...\hbox(6.83331+1.94444)x345.0, glue set 270.3887fil
+...\hbox(6.83331+1.94444)x345.0, glue set 286.38875fil
....\glue(\leftskip) 0.0 plus 1.0fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 J
+....\OT1/cmr/m/n/10 M
....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 n
....\kern-0.27779
-....\OT1/cmr/m/n/10 u
-....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 r
....\OT1/cmr/m/n/10 y
....\glue 3.33333 plus 1.66666 minus 1.11111
....\OT1/cmr/m/n/10 2
....\OT1/cmr/m/n/10 0
....\OT1/cmr/m/n/10 ,
....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 2
+....\OT1/cmr/m/n/10 0
....\OT1/cmr/m/n/10 1
-....\OT1/cmr/m/n/10 9
-....\OT1/cmr/m/n/10 9
-....\OT1/cmr/m/n/10 4
+....\OT1/cmr/m/n/10 6
....\penalty 10000
....\glue(\parfillskip) 0.0
....\glue(\rightskip) 0.0
@@ -47,77 +40,94 @@ Completed box being shipped out [1]
...\glue 0.0
...\glue(\parskip) 6.99997
...\glue(\baselineskip) 3.11111
-...\hbox(6.94444+1.94444)x345.0, glue set 142.68051fil
+...\hbox(6.94444+0.0)x345.0, glue set 152.52774fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 P
-....\kern-0.27779
-....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 F
+....\OT1/cmr/m/n/10 i
....\OT1/cmr/m/n/10 r
+....\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 H
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 i
+....\OT1/cmr/m/n/10 n
....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 d
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0 plus 1.0fil
+...\glue -6.99997
+...\glue 4.30554
+...\glue(\parskip) 6.99997
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x345.0, glue set 147.77774fil
+....\hbox(0.0+0.0)x0.0
+....\OT1/cmr/m/n/10 S
....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 g
-....\kern -1.25 (for accent)
-....\OT1/cmr/m/n/10 ^^W
-....\kern -6.25002 (for accent)
-....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 c
+....\OT1/cmr/m/n/10 o
+....\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 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 plus 1.0fil
...\glue -6.99997
...\glue(\parskip) 6.99997
-...\glue(\baselineskip) 2.73613
-...\hbox(7.31943+1.94444)x345.0, glue set 131.52768fil
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x345.0, glue set 150.54163fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 ^^_
+....\OT1/cmr/m/n/10 T
+....\OT1/cmr/m/n/10 h
+....\OT1/cmr/m/n/10 i
....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 s
-....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 e
....\OT1/cmr/m/n/10 d
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 L
-....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 b
-....\kern0.27779
+....\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 plus 1.0fil
+...\glue -6.99997
+...\glue(\parskip) 6.99997
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x345.0, glue set 148.24995fil
+....\hbox(0.0+0.0)x0.0
+....\OT1/cmr/m/n/10 F
+....\kern-0.83334
....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 u
....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 o
-....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 y
+....\OT1/cmr/m/n/10 h
+....\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 plus 1.0fil
...\glue -6.99997
+...\glue 4.30554
...\glue(\parskip) 6.99997
-...\glue(\baselineskip) 3.11111
-...\hbox(6.94444+0.0)x345.0, glue set 128.88881fil
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x345.0, glue set 152.15273fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 N
+....\OT1/cmr/m/n/10 F
....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 l
-....\OT1/cmr/m/n/10 s
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 B
-....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 f
+....\OT1/cmr/m/n/10 t
....\OT1/cmr/m/n/10 h
-....\OT1/cmr/m/n/10 r
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 I
-....\OT1/cmr/m/n/10 n
-....\OT1/cmr/m/n/10 s
-....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 l
....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 u
-....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 n
....\OT1/cmr/m/n/10 e
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -125,76 +135,58 @@ Completed box being shipped out [1]
...\glue -6.99997
...\glue(\parskip) 6.99997
...\glue(\baselineskip) 5.05556
-...\hbox(6.94444+1.94444)x345.0, glue set 127.55548fil
+...\hbox(6.94444+0.0)x345.0, glue set 151.52773fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 U
-....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 S
....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 v
-....\kern-0.27779
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 s
-....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 s
-....\OT1/cmr/m/n/10 p
-....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 k
-....\kern-0.27779
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 h
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 5
+....\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 plus 1.0fil
...\glue -6.99997
...\glue(\parskip) 6.99997
-...\glue(\baselineskip) 3.11111
-...\hbox(6.94444+1.94444)x345.0, glue set 124.65268fil
+...\glue(\baselineskip) 5.05556
+...\hbox(6.94444+0.0)x345.0, glue set 145.97218fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 D
-....\OT1/cmr/m/n/10 K
-....\OT1/cmr/m/n/10 -
-....\discretionary
-....\OT1/cmr/m/n/10 2
-....\OT1/cmr/m/n/10 1
-....\OT1/cmr/m/n/10 0
-....\OT1/cmr/m/n/10 0
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 C
-....\OT1/cmr/m/n/10 o
-....\OT1/cmr/m/n/10 p
-....\kern0.27779
+....\OT1/cmr/m/n/10 S
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 v
+....\kern-0.27779
....\OT1/cmr/m/n/10 e
....\OT1/cmr/m/n/10 n
+....\kern-0.27779
+....\OT1/cmr/m/n/10 t
....\OT1/cmr/m/n/10 h
-....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 g
-....\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 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 plus 1.0fil
...\glue 13.99994
...\glue 0.0
...\glue(\parskip) 6.99997
-...\glue(\baselineskip) 3.22224
-...\hbox(6.83331+1.94444)x345.0, glue set 302.99995fil
+...\glue(\baselineskip) 5.16669
+...\hbox(6.83331+1.94444)x345.0, glue set 301.69438fil
....\hbox(0.0+0.0)x0.0
....\OT1/cmr/m/n/10 D
....\OT1/cmr/m/n/10 e
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 r
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 P
-....\kern-0.27779
-....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 S
+....\OT1/cmr/m/n/10 i
....\OT1/cmr/m/n/10 r
+....\OT1/cmr/m/n/10 s
....\OT1/cmr/m/n/10 ,
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -202,48 +194,28 @@ Completed box being shipped out [1]
...\penalty 10000
...\glue(\parskip) 6.99997
...\glue(\baselineskip) 3.11111
-...\hbox(6.94444+1.94444)x345.0, glue set 178.44421fil
+...\hbox(6.94444+0.0)x345.0, glue set 263.74982fil
....\hbox(0.0+0.0)x0.0
-....\OT1/cmr/m/n/10 T
+....\OT1/cmr/m/n/10 B
+....\OT1/cmr/m/n/10 l
+....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 h
-....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 s
....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 B
....\OT1/cmr/m/n/10 l
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 r
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 i
-....\OT1/cmr/m/n/10 s
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 n
-....\OT1/cmr/m/n/10 o
-....\OT1/cmr/m/n/10 t
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 c
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 n
-....\kern-0.27779
-....\OT1/cmr/m/n/10 t
-....\OT1/cmr/m/n/10 r
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 d
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 o
-....\OT1/cmr/m/n/10 n
-....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 h
-....\OT1/cmr/m/n/10 e
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\OT1/cmr/m/n/10 p
+....\OT1/cmr/m/n/10 B
+....\OT1/cmr/m/n/10 l
....\OT1/cmr/m/n/10 a
-....\OT1/cmr/m/n/10 g
-....\OT1/cmr/m/n/10 e
-....\OT1/cmr/m/n/10 !
+....\OT1/cmr/m/n/10 h
+....\OT1/cmr/m/n/10 .
+....\kern 1.66666
+....\OT1/cmr/m/n/10 .
+....\kern 1.66666
+....\OT1/cmr/m/n/10 .
+....\kern 1.66666
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
....\glue(\rightskip) 0.0
@@ -252,16 +224,24 @@ Completed box being shipped out [1]
...\glue 0.0
...\glue(\parskip) 6.99997
...\glue(\lineskip) 1.0
-...\hbox(34.77216+29.77214)x345.0, glue set 172.5fil
+...\hbox(51.02213+46.02213)x345.0, glue set 172.5fil
....\mathon
-....\vbox(34.77216+29.77214)x172.5
-.....\hbox(6.94444+1.94444)x172.5, glue set 59.01385fil
+....\vbox(51.02213+46.02213)x172.5
+.....\hbox(6.83331+0.0)x172.5, glue set 76.56943fil
......\hbox(0.0+0.0)x0.0
......\OT1/cmr/m/n/10 B
......\OT1/cmr/m/n/10 e
......\OT1/cmr/m/n/10 s
......\OT1/cmr/m/n/10 t
-......\glue 3.33333 plus 1.66666 minus 1.11111
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0 plus 1.0fil
+.....\glue 0.0
+.....\glue 4.30554
+.....\glue(\parskip) 0.0
+.....\glue(\baselineskip) 5.05556
+.....\hbox(6.94444+1.94444)x172.5, glue set 70.36108fil
+......\hbox(0.0+0.0)x0.0
......\OT1/cmr/m/n/10 r
......\OT1/cmr/m/n/10 e
......\OT1/cmr/m/n/10 g
@@ -273,22 +253,26 @@ Completed box being shipped out [1]
......\glue(\parfillskip) 0.0 plus 1.0fil
......\glue(\rightskip) 0.0 plus 1.0fil
.....\glue 0.0
-.....\glue 41.99982
+.....\glue 4.30554
.....\glue(\parskip) 0.0
-.....\glue(\baselineskip) 1.6556
-.....\hbox(8.39996+3.60004)x172.5, glue set 59.6944fil
+.....\glue(\baselineskip) 3.11111
+.....\hbox(6.94444+0.0)x172.5, glue set 73.52774fil
......\hbox(0.0+0.0)x0.0
-......\OT1/cmr/m/n/10 M
+......\OT1/cmr/m/n/10 F
+......\kern-0.83334
+......\OT1/cmr/m/n/10 r
......\OT1/cmr/m/n/10 a
-......\OT1/cmr/m/n/10 l
-......\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 O
-......\OT1/cmr/m/n/10 l
-......\OT1/cmr/m/n/10 s
-......\OT1/cmr/m/n/10 e
......\OT1/cmr/m/n/10 n
+......\OT1/cmr/m/n/10 k
+......\penalty 10000
+......\glue(\parfillskip) 0.0 plus 1.0fil
+......\glue(\rightskip) 0.0 plus 1.0fil
+.....\glue 0.0
+.....\glue 41.99982
+.....\glue(\parskip) 0.0
+.....\glue(\baselineskip) 3.60004
+.....\hbox(8.39996+3.60004)x172.5, glue set 86.25fil
+......\hbox(0.0+0.0)x0.0
......\rule(8.39996+3.60004)x0.0
......\penalty 10000
......\glue(\parfillskip) 0.0 plus 1.0fil
@@ -311,4 +295,4 @@ Completed box being shipped out [1]
......\glue 0.0
......\glue 0.0 plus 1.0fill
...\glue 0.0 plus 1.0fil minus 1.0fil
-(tlb0056.aux)
+(github-0427.aux)
More information about the latex3-commits
mailing list.