[latex3-commits] [git/LaTeX3-latex3-latex2e] master: fix for issue #23 and #75 (224fbd1)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Sep 25 00:12:17 CEST 2018
Repository : https://github.com/latex3/latex2e
On branch : master
Link : https://github.com/latex3/latex2e/commit/224fbd16d17a016eb1db7a73430a86f3eb0cde73
>---------------------------------------------------------------
commit 224fbd16d17a016eb1db7a73430a86f3eb0cde73
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Sep 25 00:12:17 2018 +0200
fix for issue #23 and #75
>---------------------------------------------------------------
224fbd16d17a016eb1db7a73430a86f3eb0cde73
base/changes.txt | 5 ++
base/doc.dtx | 7 +-
base/testfiles/git-0023.lvt | 22 ++++++
base/testfiles/git-0023.tlg | 131 ++++++++++++++++++++++++++++++++++++
base/testfiles/git-0075.lvt | 26 ++++++++
base/testfiles/git-0075.tlg | 155 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 343 insertions(+), 3 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index e333e4c..2a7274e 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2018-09-25 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * doc.dtx (section*{Index}):
+ Guard against following \unskip (git/23) also fixes (git/75)
+
2018-09-24 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltspace.dtx (subsection{Horizontal space (and breaks)}):
diff --git a/base/doc.dtx b/base/doc.dtx
index 5225a9a..8ab528c 100644
--- a/base/doc.dtx
+++ b/base/doc.dtx
@@ -35,7 +35,7 @@
%<+package|shortvrb>\NeedsTeXFormat{LaTeX2e}[1994/12/01]
%<+package> \ProvidesPackage{doc}
%<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb> [2018/02/01 v2.1h
+%<+package|shortvrb> [2018/09/25 v2.1i
%<+package|shortvrb> Standard LaTeX documentation package (FMi)]
%\catcode`\<=12
%
@@ -3698,9 +3698,10 @@
% space before the referenced page numbers will be filled with
% dots, with a little white space interpolated at each end of the
% dots. If the line is broken the dots will show up on both lines.
+% \changes{v2.1i}{2018/09/25}{Guard against following \cs{unskip} (git/23)}
% \begin{macrocode}
-\def\dotfill{\leaders\hbox to.6em{\hss .\hss}\hskip\z@ plus 1fill}%
-\def\dotfil{\leaders\hbox to.6em{\hss .\hss}\hfil}%
+\def\dotfill{\leaders\hbox to.6em{\hss .\hss}\hskip\z@ plus 1fill\kern\z@}%
+\def\dotfil{\leaders\hbox to.6em{\hss .\hss}\hfil\kern\z@}%
\def\pfill{\unskip~\dotfill\penalty500\strut\nobreak
\dotfil~\ignorespaces}%
%</package>
diff --git a/base/testfiles/git-0023.lvt b/base/testfiles/git-0023.lvt
new file mode 100644
index 0000000..a6a1479
--- /dev/null
+++ b/base/testfiles/git-0023.lvt
@@ -0,0 +1,22 @@
+\documentclass [a4paper]{article}
+
+\let\dotfillLaTeXORI =\dotfill % < Save original LaTeX2e definition >
+
+\usepackage {doc}
+
+\input{test2e}
+
+\showoutput
+
+\begin{document}
+
+\START
+
+\begin{tabular}{ l l }% < tabular executes \unskip after the cell contents >
+BAD & GOOD \\
+One\dotfill & Two\dotfillLaTeXORI \\
+Column One & Column Two \\
+\end{tabular}
+
+
+\end{document}
diff --git a/base/testfiles/git-0023.tlg b/base/testfiles/git-0023.tlg
new file mode 100644
index 0000000..299df17
--- /dev/null
+++ b/base/testfiles/git-0023.tlg
@@ -0,0 +1,131 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <7> on input line ....
+LaTeX Font Info: External font `cmex10' loaded for size
+(Font) <5> on input line ....
+Completed box being shipped out [1]
+\vbox(682.0+0.0)x398.0
+.\glue 17.0
+.\vbox(665.0+0.0)x345.0, shifted 53.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
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(598.0+0.0)x345.0, glue set 566.93944fil
+...\write-{}
+...\glue(\topskip) 0.0
+...\hbox(20.5+15.5)x345.0, glue set 193.49974fil
+....\hbox(0.0+0.0)x15.0
+....\hbox(20.5+15.5)x136.50026
+.....\mathon
+.....\vbox(20.5+15.5)x136.50026
+......\hbox(8.39996+3.60004)x136.50026
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x67.5557, glue set 33.3334fil
+........\rule(8.39996+3.60004)x0.0
+........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 B
+........\OT1/cmr/m/n/10 A
+........\OT1/cmr/m/n/10 D
+........\glue 0.0 plus 1.0fil
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x68.94456, glue set 25.90282fil
+........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 G
+........\OT1/cmr/m/n/10 O
+........\OT1/cmr/m/n/10 O
+........\OT1/cmr/m/n/10 D
+........\glue 0.0 plus 1.0fil
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+......\glue(\lineskip) 0.0
+......\hbox(8.39996+3.60004)x136.50026
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x67.5557, glue set 37.77786fill
+........\rule(8.39996+3.60004)x0.0
+........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 O
+........\OT1/cmr/m/n/10 n
+........\OT1/cmr/m/n/10 e
+........\leaders 0.0 plus 1.0fill
+.........\hbox(1.05554+0.0)x6.00006, glue set 1.61115fil
+..........\glue 0.0 plus 1.0fil minus 1.0fil
+..........\OT1/cmr/m/n/10 .
+..........\glue 0.0 plus 1.0fil minus 1.0fil
+........\kern 0.0
+........\glue 0.0 plus 1.0fil
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x68.94456, glue set 37.77786fill
+........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 T
+........\OT1/cmr/m/n/10 w
+........\kern-0.27779
+........\OT1/cmr/m/n/10 o
+........\cleaders 0.0 plus 1.0fill
+.........\hbox(1.05554+0.0)x4.40002, glue set 0.81113fil
+..........\glue 0.0 plus 1.0fil minus 1.0fil
+..........\OT1/cmr/m/n/10 .
+..........\glue 0.0 plus 1.0fil minus 1.0fil
+........\kern 0.0
+........\glue 0.0 plus 1.0fil
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+......\glue(\lineskip) 0.0
+......\hbox(8.39996+3.60004)x136.50026
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x67.5557
+........\rule(8.39996+3.60004)x0.0
+........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 C
+........\OT1/cmr/m/n/10 o
+........\OT1/cmr/m/n/10 l
+........\OT1/cmr/m/n/10 u
+........\OT1/cmr/m/n/10 m
+........\OT1/cmr/m/n/10 n
+........\glue 3.33333 plus 1.66666 minus 1.11111
+........\OT1/cmr/m/n/10 O
+........\OT1/cmr/m/n/10 n
+........\OT1/cmr/m/n/10 e
+........\glue 0.0 plus 1.0fil
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x68.94456
+........\glue 6.0
+........\glue 0.00002
+........\OT1/cmr/m/n/10 C
+........\OT1/cmr/m/n/10 o
+........\OT1/cmr/m/n/10 l
+........\OT1/cmr/m/n/10 u
+........\OT1/cmr/m/n/10 m
+........\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 w
+........\kern-0.27779
+........\OT1/cmr/m/n/10 o
+........\glue 0.0 plus 1.0fil
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.....\mathoff
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue -5.0
+...\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, glue set 170.0fil
+...\glue 0.0 plus 1.0fil
+...\OT1/cmr/m/n/10 1
+...\glue 0.0 plus 1.0fil
+(git-0023.aux)
diff --git a/base/testfiles/git-0075.lvt b/base/testfiles/git-0075.lvt
new file mode 100644
index 0000000..32a31aa
--- /dev/null
+++ b/base/testfiles/git-0075.lvt
@@ -0,0 +1,26 @@
+\documentclass{article}
+
+\input{test2e}
+
+\usepackage{doc}
+
+\settowidth\textwidth{A long index entry line \quad }
+\setlength\parfillskip{0pt}
+
+\showoutput
+
+\begin{document}
+
+\START
+
+\noindent
+ A long index entry line \pfill 5, 7, 33, 101
+
+% the culprit:
+
+\DeclareRobustCommand{\nobreakspace}{\unskip\nobreak\ \ignorespaces}% ltugboat definition
+
+\noindent
+ A long index entry line \pfill 5, 7, 33, 101
+
+\end{document}
diff --git a/base/testfiles/git-0075.tlg b/base/testfiles/git-0075.tlg
new file mode 100644
index 0000000..3cc1a37
--- /dev/null
+++ b/base/testfiles/git-0075.tlg
@@ -0,0 +1,155 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+LaTeX Info: Redefining \nobreakspace on input line ....
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x176.47243
+.\glue 16.0
+.\vbox(617.0+0.0)x114.47243, shifted 62.0
+..\vbox(12.0+0.0)x114.47243, glue set 12.0fil
+...\glue 0.0 plus 1.0fil
+...\hbox(0.0+0.0)x114.47243
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x114.47243, glue set 503.94617fil
+...\write-{}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+1.94444)x114.47243, glue set 10.00002fill
+....\OT1/cmr/m/n/10 A
+....\glue 3.33333 plus 1.66498 minus 1.11221
+....\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 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\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 y
+....\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 3.33333 plus 1.66666 minus 1.11111
+....\leaders 0.0 plus 1.0fill
+.....\hbox(1.05554+0.0)x6.00006, glue set 1.61115fil
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\OT1/cmr/m/n/10 .
+......\glue 0.0 plus 1.0fil minus 1.0fil
+....\kern 0.0
+....\penalty 500
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 1.6556
+...\hbox(8.39996+3.60004)x114.47243, glue set 57.80565fil
+....\rule(8.39996+3.60004)x0.0
+....\penalty 10000
+....\leaders 0.0 plus 1.0fil
+.....\hbox(1.05554+0.0)x6.00006, glue set 1.61115fil
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\OT1/cmr/m/n/10 .
+......\glue 0.0 plus 1.0fil minus 1.0fil
+....\kern 0.0
+....\penalty 10000
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 5
+....\OT1/cmr/m/n/10 ,
+....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 7
+....\OT1/cmr/m/n/10 ,
+....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 3
+....\OT1/cmr/m/n/10 3
+....\OT1/cmr/m/n/10 ,
+....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 1
+....\OT1/cmr/m/n/10 0
+....\OT1/cmr/m/n/10 1
+....\penalty 10000
+....\glue(\parfillskip) 0.0
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 1.45552
+...\hbox(6.94444+1.94444)x114.47243, glue set 10.00002fill
+....\OT1/cmr/m/n/10 A
+....\glue 3.33333 plus 1.66498 minus 1.11221
+....\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 i
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\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 y
+....\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 3.33333 plus 1.66666 minus 1.11111
+....\leaders 0.0 plus 1.0fill
+.....\hbox(1.05554+0.0)x6.00006, glue set 1.61115fil
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\OT1/cmr/m/n/10 .
+......\glue 0.0 plus 1.0fil minus 1.0fil
+....\kern 0.0
+....\penalty 500
+....\glue(\rightskip) 0.0
+...\penalty 300
+...\glue(\baselineskip) 1.6556
+...\hbox(8.39996+3.60004)x114.47243, glue set 57.80565fil
+....\rule(8.39996+3.60004)x0.0
+....\penalty 10000
+....\leaders 0.0 plus 1.0fil
+.....\hbox(1.05554+0.0)x6.00006, glue set 1.61115fil
+......\glue 0.0 plus 1.0fil minus 1.0fil
+......\OT1/cmr/m/n/10 .
+......\glue 0.0 plus 1.0fil minus 1.0fil
+....\kern 0.0
+....\penalty 10000
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 5
+....\OT1/cmr/m/n/10 ,
+....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 7
+....\OT1/cmr/m/n/10 ,
+....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 3
+....\OT1/cmr/m/n/10 3
+....\OT1/cmr/m/n/10 ,
+....\glue 3.33333 plus 2.08331 minus 0.88889
+....\OT1/cmr/m/n/10 1
+....\OT1/cmr/m/n/10 0
+....\OT1/cmr/m/n/10 1
+....\penalty 10000
+....\glue(\parfillskip) 0.0
+....\glue(\rightskip) 0.0
+...\glue -3.60004
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.55556
+..\hbox(6.44444+0.0)x114.47243, glue set 54.7362fil
+...\glue 0.0 plus 1.0fil
+...\OT1/cmr/m/n/10 1
+...\glue 0.0 plus 1.0fil
+(git-0075.aux)
More information about the latex3-commits
mailing list