[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh205: fix for #205 (f1e59e1f)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Nov 3 23:19:40 CET 2019
Repository : https://github.com/latex3/latex2e
On branch : hotfix/gh205
Link : https://github.com/latex3/latex2e/commit/f1e59e1f58064d91b98f93031997b73896d1b0b9
>---------------------------------------------------------------
commit f1e59e1f58064d91b98f93031997b73896d1b0b9
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Nov 3 23:19:40 2019 +0100
fix for #205
>---------------------------------------------------------------
f1e59e1f58064d91b98f93031997b73896d1b0b9
base/changes.txt | 4 +
base/doc.dtx | 22 ++++--
base/testfiles/github-0205.luatex.tlg | 134 ++++++++++++++++++++++++++++++++++
base/testfiles/github-0205.lvt | 28 +++++++
base/testfiles/github-0205.tlg | 101 +++++++++++++++++++++++++
base/testfiles/github-0205.xetex.tlg | 119 ++++++++++++++++++++++++++++++
6 files changed, 400 insertions(+), 8 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 7186e6cc..71a464f6 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2019-11-03 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * doc.dtx: set up \verbvisiblespace (gh/205)
+
2019-11-03 David Carlisle <David.Carlisle at latex-project.org>
* ltfiles.dtx: More filename normalisation: avoid adding
diff --git a/base/doc.dtx b/base/doc.dtx
index 971bb605..9771ee18 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/09/25 v2.1i
+%<+package|shortvrb> [2019/11/03 v2.1j
%<+package|shortvrb> Standard LaTeX documentation package (FMi)]
%\catcode`\<=12
%
@@ -2000,6 +2000,11 @@
% |\MacroFont|.
% \begin{macrocode}
\def\verbatim{\@beginparpenalty \predisplaypenalty \@verbatim
+% \end{macrocode}
+%
+% \changes{v2.1j}{2019/11/03}{Kernel now sets up \cs{verbvisiblespace} (gh/205)}
+% \begin{macrocode}
+ \@setupverbvisiblespace
\MacroFont \frenchspacing \@vobeyspaces \@xverbatim}
% \end{macrocode}
% We deal in a similar way with the star form of this environment.
@@ -2121,13 +2126,14 @@
% \changes{v1.8b}{1993/09/21}{Changed to conform to new LaTeX verbatim,
% which has better error trapping.}
% See \cite{art:verbatim} for commentary.
-% \begin{macrocode}
-\def\@sverb#1{%
- \catcode`#1\active \lccode`\~`#1%
- \gdef\verb at balance@group{\verb at egroup
- \@latex at error{Illegal use of \noexpand\verb command}\@ehc}%
- \aftergroup\verb at balance@group
- \lowercase{\let~\verb at egroup}}
+% \changes{v2.1j}{2019/11/03}{Use the kernel definition, no change needed (gh/205)}
+% \begin{macrocode}
+%\def\@sverb#1{%
+% \catcode`#1\active \lccode`\~`#1%
+% \gdef\verb at balance@group{\verb at egroup
+% \@latex at error{Illegal use of \noexpand\verb command}\@ehc}%
+% \aftergroup\verb at balance@group
+% \lowercase{\let~\verb at egroup}}
% \end{macrocode}
% \end{macro}
%
diff --git a/base/testfiles/github-0205.luatex.tlg b/base/testfiles/github-0205.luatex.tlg
new file mode 100644
index 00000000..e0863e91
--- /dev/null
+++ b/base/testfiles/github-0205.luatex.tlg
@@ -0,0 +1,134 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+> \verbvisiblespace=macro:
+->\protect \verbvisiblespace .
+l. ...\show\verbvisiblespace
+> \asciispace =\long macro:
+->\char 32 .
+<recently read> \asciispace
+l. ...\expandafter\show\csname asciispace \endcsname
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0, direction TLT
+.\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
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 496.94693fil, direction TLT
+...\write-{}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+1.11111)x345.0, glue set 265.22253fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\hbox(0.0+0.0)x0.0, direction TLT
+....\OT1/cmtt/m/n/10 x
+....\hbox(2.19444+1.11111)x5.24995, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\OT1/cmtt/m/n/10 x
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+....\hbox(0.0+0.0)x0.0, direction TLT
+....\hbox(2.19444+1.11111)x5.24995, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995, direction TLT
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 3.94444
+...\hbox(6.94444+1.11111)x345.0, glue set 263.40546fil, 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 S
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 e
+....\OT1/cmtt/m/n/10
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 t
+....\hbox(1.29167+0.0)x0.99997, direction TLT
+.....\kern0.59998
+.....\rule(1.29167+*)x0.4
+....\vbox(0.4+0.0)x3.00003, direction TLT
+.....\rule(0.4+0.0)x3.00003
+....\hbox(1.29167+0.0)x0.4, direction TLT
+.....\rule(1.29167+*)x0.4
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue 10.0 plus 4.0 minus 5.0
+...\glue 0.0 plus 1.0
+...\penalty 0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 6.0139
+...\hbox(3.87498+0.99998)x345.0, glue set 316.65033fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x0.0, direction TLT
+.....\glue 0.0
+.....\glue 0.0
+.....\glue -5.0
+.....\hbox(0.0+0.0)x0.0, direction TLT
+.....\glue 5.0
+....\penalty 0
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9 x
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9 x
+....\hbox(0.0+0.0)x0.0, direction TLT
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 0
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.0
+...\glue -0.99998
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 30.0
+..\hbox(0.0+0.0)x345.0, direction TLT
+(github-0205.aux)
diff --git a/base/testfiles/github-0205.lvt b/base/testfiles/github-0205.lvt
new file mode 100644
index 00000000..f7e9b545
--- /dev/null
+++ b/base/testfiles/github-0205.lvt
@@ -0,0 +1,28 @@
+\documentclass{article}
+
+\usepackage{doc}
+
+%\DeclareRobustCommand\verbvisiblespace{{\fontfamily{lmtt}\selectfont\char"2423}}
+
+\pagestyle{empty}
+
+\input{test2e}
+
+\showoutput
+
+\begin{document}
+
+\START
+
+\verb*|x x| and \verb*| |
+
+\show\verbvisiblespace
+\expandafter\show\csname asciispace \endcsname
+
+Some\verbvisiblespace text\textvisiblespace and
+
+\begin{verbatim*}
+ x x
+\end{verbatim*}
+\end{document}
+
diff --git a/base/testfiles/github-0205.tlg b/base/testfiles/github-0205.tlg
new file mode 100644
index 00000000..fa6d2845
--- /dev/null
+++ b/base/testfiles/github-0205.tlg
@@ -0,0 +1,101 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+> \verbvisiblespace=macro:
+->\protect \asciispace .
+l. ...\show\verbvisiblespace
+> \asciispace =\long macro:
+->\char 32 .
+<recently read> \asciispace
+l. ......andafter\show\csname asciispace \endcsname
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\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
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 496.94691fil
+...\write-{}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+1.11111)x345.0, glue set 265.22255fil
+....\hbox(0.0+0.0)x15.0
+....\hbox(0.0+0.0)x0.0
+....\OT1/cmtt/m/n/10 x
+....\OT1/cmtt/m/n/10
+....\OT1/cmtt/m/n/10
+....\OT1/cmtt/m/n/10
+....\OT1/cmtt/m/n/10 x
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\hbox(0.0+0.0)x0.0
+....\OT1/cmtt/m/n/10
+....\OT1/cmtt/m/n/10
+....\OT1/cmtt/m/n/10
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 3.94444
+...\hbox(6.94444+0.0)x345.0, glue set 265.87762fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 S
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 t
+....\hbox(1.29167+0.0)x0.99997
+.....\kern 0.59998
+.....\rule(1.29167+*)x0.4
+....\vbox(0.4+0.0)x3.00003
+.....\rule(0.4+0.0)x3.00003
+....\hbox(1.29167+0.0)x0.4
+.....\rule(1.29167+*)x0.4
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue 10.0 plus 4.0 minus 5.0
+...\glue 0.0 plus 1.0
+...\penalty 0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 7.12502
+...\hbox(3.87498+0.99998)x345.0, glue set 316.65033fil
+....\hbox(0.0+0.0)x0.0
+.....\glue 0.0
+.....\glue 0.0
+.....\glue -5.0
+.....\hbox(0.0+0.0)x0.0
+.....\glue 5.0
+....\penalty 0
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9 x
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9 x
+....\hbox(0.0+0.0)x0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 0
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.0
+...\glue -0.99998
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 30.0
+..\hbox(0.0+0.0)x345.0
+(github-0205.aux)
diff --git a/base/testfiles/github-0205.xetex.tlg b/base/testfiles/github-0205.xetex.tlg
new file mode 100644
index 00000000..dc6706a1
--- /dev/null
+++ b/base/testfiles/github-0205.xetex.tlg
@@ -0,0 +1,119 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+> \verbvisiblespace=macro:
+->\protect \verbvisiblespace .
+l. ...\show\verbvisiblespace
+> \asciispace =\long macro:
+->\char 32 .
+<recently read> \asciispace
+l. ......andafter\show\csname asciispace \endcsname
+Completed box being shipped out [1]
+\vbox(633.0+0.0)x407.0
+.\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
+..\glue 25.0
+..\glue(\lineskip) 0.0
+..\vbox(550.0+0.0)x345.0, glue set 496.94691fil
+...\write-{}
+...\glue(\topskip) 3.05556
+...\hbox(6.94444+1.11111)x345.0, glue set 265.22255fil
+....\hbox(0.0+0.0)x15.0
+....\hbox(0.0+0.0)x0.0
+....\OT1/cmtt/m/n/10 x
+....\hbox(2.19444+1.11111)x5.24995
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\OT1/cmtt/m/n/10 x
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\glue 3.33333 plus 1.66666 minus 1.11111
+....\hbox(0.0+0.0)x0.0
+....\hbox(2.19444+1.11111)x5.24995
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\hbox(2.19444+1.11111)x5.24995
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+.....\OT1/cmtt/m/n/10
+.....\glue 0.0 plus 1.0fil minus 1.0fil
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 3.94444
+...\hbox(6.94444+1.11111)x345.0, glue set 263.40546fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 S
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 e
+....\OT1/cmtt/m/n/10
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 t
+....\hbox(1.29167+0.0)x0.99997
+.....\kern 0.59998
+.....\rule(1.29167+*)x0.4
+....\vbox(0.4+0.0)x3.00003
+.....\rule(0.4+0.0)x3.00003
+....\hbox(1.29167+0.0)x0.4
+.....\rule(1.29167+*)x0.4
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 n
+....\OT1/cmr/m/n/10 d
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 10000
+...\glue 10.0 plus 4.0 minus 5.0
+...\glue 0.0 plus 1.0
+...\penalty 0
+...\glue(\parskip) 0.0
+...\glue(\baselineskip) 6.0139
+...\hbox(3.87498+0.99998)x345.0, glue set 316.65033fil
+....\hbox(0.0+0.0)x0.0
+.....\glue 0.0
+.....\glue 0.0
+.....\glue -5.0
+.....\hbox(0.0+0.0)x0.0
+.....\glue 5.0
+....\penalty 0
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9 x
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9
+....\OT1/cmtt/m/n/9 x
+....\hbox(0.0+0.0)x0.0
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\penalty 0
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.0
+...\glue -0.99998
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 30.0
+..\hbox(0.0+0.0)x345.0
+(github-0205.aux)
More information about the latex3-commits
mailing list