[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh271: fix for #271 (a144635f)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Feb 10 20:12:40 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : hotfix/gh271
Link : https://github.com/latex3/latex2e/commit/a144635f4ee6b700028bb9ec2028cfbe329df939
>---------------------------------------------------------------
commit a144635f4ee6b700028bb9ec2028cfbe329df939
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Feb 10 20:12:40 2020 +0100
fix for #271
>---------------------------------------------------------------
a144635f4ee6b700028bb9ec2028cfbe329df939
base/changes.txt | 13 ++++
base/ltfssini.dtx | 14 ++---
base/lttextcomp.dtx | 9 +--
base/testfiles/github-0271.luatex.tlg | 70 ++++++++++++++++++++++
base/testfiles/github-0271.lvt | 25 ++++++++
base/testfiles/{tlb1217.tlg => github-0271.tlg} | 60 +++++++++----------
.../{tlb1217.tlg => github-0271.xetex.tlg} | 57 ++++++++----------
7 files changed, 175 insertions(+), 73 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index cb0dab51..707e2b24 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,19 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+
+2020-02-10 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+2020-02-10 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltfssini.dtx:
+ Renamed \@reservedb to \reserved at b
+ Renamed \@reservedc to \reserved at c
+
+ * lttextcomp.dtx (subsection{Sub-encoding 2):
+ Use \@tabacckludge for tabbing where necessary if defining \capitalacute
+ and friends for Unicode engines (gh/271)
+
#########################
# 2020-02-02 PL 1 Release
#########################
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index 320c5a18..404bc84b 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssini.dtx}
- [2020/02/05 v3.1g LaTeX Kernel (NFSS Initialisation)]
+ [2020/02/10 v3.1h LaTeX Kernel (NFSS Initialisation)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -703,9 +703,9 @@
% because we now need to use \cs{csname} and this way the code will
% be a little faster.
% \begin{macrocode}
- \expandafter\let\expandafter\@reservedb
+ \expandafter\let\expandafter\reserved at b
\csname mdseries@\target at meta@family at value\endcsname
- \expandafter\let\expandafter\@reservedc
+ \expandafter\let\expandafter\reserved at c
\csname bfseries@\target at meta@family at value\endcsname
% \end{macrocode}
% This here is now identical to the nested \cs{ifx} block from the
@@ -714,11 +714,11 @@
% loop when a match was found.
% \begin{macrocode}
\expandafter\ifx\csname mdseries@#1\endcsname\f at series
- \let\target at series@value\@reservedb
+ \let\target at series@value\reserved at b
\else\expandafter\ifx\csname bfseries@#1\endcsname\f at series
- \let\target at series@value\@reservedc
- \else\ifx\f at series\mddef at ult \let\target at series@value\@reservedb
- \else\ifx\f at series\bfdef at ult \let\target at series@value\@reservedc
+ \let\target at series@value\reserved at c
+ \else\ifx\f at series\mddef at ult \let\target at series@value\reserved at b
+ \else\ifx\f at series\bfdef at ult \let\target at series@value\reserved at c
\fi\fi\fi\fi
\fi
\fi
diff --git a/base/lttextcomp.dtx b/base/lttextcomp.dtx
index c918a836..ed37b9d9 100644
--- a/base/lttextcomp.dtx
+++ b/base/lttextcomp.dtx
@@ -33,7 +33,7 @@
%
%
\ProvidesFile{lttextcomp.dtx}
- [2020/01/25 v1.0b LaTeX Kernel (text companion symbols)]
+ [2020/02/10 v1.0c LaTeX Kernel (text companion symbols)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -564,18 +564,19 @@
% \end{macrocode}
%
% In Unicode engines we just execute the simple accents:
+% \changes{v1.0c}{2020/02/10}{Use \cs{@tabacckludge} for tabbing where necessary (gh/271)}
% \begin{macrocode}
\else
- \def\capitalacute{\'}
+ \def\capitalacute{\@tabacckludge'}
\def\capitalbreve{\u}
\def\capitalcaron{\v}
\def\capitalcedilla{\c}
\def\capitalcircumflex{\^}
\def\capitaldieresis{\"}
\def\capitaldotaccent{\.}
- \def\capitalgrave{\`}
+ \def\capitalgrave{\@tabacckludge`}
\def\capitalhungarumlaut{\H}
- \def\capitalmacron{\=}
+ \def\capitalmacron{\@tabacckludge=}
\def\capitalnewtie{\t}
\def\capitalogonek{\k}
\def\capitalring{\r}
diff --git a/base/testfiles/github-0271.luatex.tlg b/base/testfiles/github-0271.luatex.tlg
new file mode 100644
index 00000000..5964e00e
--- /dev/null
+++ b/base/testfiles/github-0271.luatex.tlg
@@ -0,0 +1,70 @@
+This is a generated file for the LaTeX2e 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
+.\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)x46.66673, glue set 529.94342fil, direction TLT
+...\write-{}
+...\glue(\topskip) 1.60004
+...\hbox(8.39996+3.60004)x46.66673, direction TLT
+....\hbox(0.0+0.0)x0.0, direction TLT
+.....\hbox(0.0+0.0)x0.0, direction TLT
+......\glue 0.0
+......\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
+......\glue 0.0 plus 1.0fil minus 1.0fil
+....\glue 0.0
+....\hbox(8.39996+3.60004)x46.66673, direction TLT
+.....\rule(8.39996+3.60004)x0.0
+.....\kern0.0 (accent)
+.....\OT1/cmr/m/n/10 ^^V
+.....\kern-5.00002 (accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.....\kern0.0 (accent)
+.....\OT1/cmr/m/n/10 ^^S
+.....\kern-5.00002 (accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.....\kern0.0 (accent)
+.....\OT1/cmr/m/n/10 ^^R
+.....\kern-5.00002 (accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.....\kern0.0 (accent)
+.....\OT1/cmr/m/n/10 ^^S
+.....\kern-5.00002 (accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.....\kern0.0 (accent)
+.....\OT1/cmr/m/n/10 ^^R
+.....\kern-5.00002 (accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+.....\kern0.0 (accent)
+.....\OT1/cmr/m/n/10 ^^V
+.....\kern-5.00002 (accent)
+.....\OT1/cmr/m/n/10 a
+...\penalty -51
+...\glue 10.0 plus 3.0 minus 5.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)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
+(github-0271.aux)
diff --git a/base/testfiles/github-0271.lvt b/base/testfiles/github-0271.lvt
new file mode 100644
index 00000000..fe402997
--- /dev/null
+++ b/base/testfiles/github-0271.lvt
@@ -0,0 +1,25 @@
+\documentclass{article}
+
+
+\input{test2e}
+
+
+\begin{document}
+
+\START
+
+\showoutput
+
+\begin{tabbing}
+ \a= a \a'a \a`a
+ \capitalacute a \capitalgrave a \capitalmacron a
+\end{tabbing}
+
+\end{document}
+
+\makeatletter
+ \def\capitalacute{\@tabacckludge'}
+ \def\capitalgrave{\@tabacckludge`}
+ \def\capitalmacron{\@tabacckludge=}
+\makeatother
+
diff --git a/base/testfiles/tlb1217.tlg b/base/testfiles/github-0271.tlg
similarity index 56%
copy from base/testfiles/tlb1217.tlg
copy to base/testfiles/github-0271.tlg
index 2bb28db1..c17c3e85 100644
--- a/base/testfiles/tlb1217.tlg
+++ b/base/testfiles/github-0271.tlg
@@ -1,7 +1,5 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-Author: Denis Roegel
-Main Style: article
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\glue 16.0
@@ -11,10 +9,10 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x96.75014, glue set 529.94339fil
+..\vbox(550.0+0.0)x46.66673, glue set 529.94339fil
...\write-{}
...\glue(\topskip) 1.60004
-...\hbox(8.39996+3.60004)x96.75014
+...\hbox(8.39996+3.60004)x46.66673
....\hbox(0.0+0.0)x0.0
.....\hbox(0.0+0.0)x0.0
......\glue 0.0
@@ -27,40 +25,40 @@ Completed box being shipped out [1]
......\penalty 0
......\glue 0.0 plus 1.0fil minus 1.0fil
....\glue 0.0
-....\hbox(8.39996+3.60004)x96.75014
+....\hbox(8.39996+3.60004)x46.66673
.....\rule(8.39996+3.60004)x0.0
-.....\OT1/cmr/m/n/10 u
-.....\OT1/cmr/m/n/10 n
+.....\kern 0.0 (for accent)
+.....\OT1/cmr/m/n/10 ^^V
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\glue 3.33333 plus 1.66666 minus 1.11111
-.....\kern -0.27779 (for accent)
+.....\kern 0.0 (for accent)
.....\OT1/cmr/m/n/10 ^^S
-.....\kern -4.72223 (for accent)
-.....\OT1/cmr/m/n/10 e
-.....\OT1/cmr/m/n/10 l
-.....\kern -0.27779 (for accent)
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue 3.33333 plus 1.66666 minus 1.11111
+.....\kern 0.0 (for accent)
.....\OT1/cmr/m/n/10 ^^R
-.....\kern -4.72223 (for accent)
-.....\OT1/cmr/m/n/10 e
-.....\OT1/cmr/m/n/10 v
-.....\kern-0.27779
-.....\OT1/cmr/m/n/10 e
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\glue 3.33333 plus 1.66666 minus 1.11111
-.....\OT1/cmr/m/n/10 e
-.....\OT1/cmr/m/n/10 t
+.....\kern 0.00063 (for accent)
+.....\hbox(6.06004+0.0)x4.99878, shifted -0.00104
+......\TS1/cmr/m/n/10 ^^A
+.....\kern -4.9994 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\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 n
+.....\kern 0.00063 (for accent)
+.....\hbox(6.06004+0.0)x4.99878, shifted -0.00104
+......\TS1/cmr/m/n/10 ^^@
+.....\kern -4.9994 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\glue 3.33333 plus 1.66666 minus 1.11111
-.....\OT1/cmr/m/n/10 m
+.....\kern 0.00063 (for accent)
+.....\hbox(6.4151+0.0)x4.99878, shifted -0.00104
+......\TS1/cmr/m/n/10 ^^I
+.....\kern -4.9994 (for accent)
.....\OT1/cmr/m/n/10 a
-.....\kern -1.11111 (for accent)
-.....\OT1/cmr/m/n/10 ^
-.....\kern -3.8889 (for accent)
-.....\OT1/cmr/m/n/10 ^^P
-.....\OT1/cmr/m/n/10 t
-.....\OT1/cmr/m/n/10 r
-.....\OT1/cmr/m/n/10 e
...\penalty -51
...\glue 10.0 plus 3.0 minus 5.0
...\glue -3.60004
@@ -72,4 +70,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(tlb1217.aux)
+(github-0271.aux)
diff --git a/base/testfiles/tlb1217.tlg b/base/testfiles/github-0271.xetex.tlg
similarity index 59%
copy from base/testfiles/tlb1217.tlg
copy to base/testfiles/github-0271.xetex.tlg
index 2bb28db1..d8e69c87 100644
--- a/base/testfiles/tlb1217.tlg
+++ b/base/testfiles/github-0271.xetex.tlg
@@ -1,7 +1,5 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-Author: Denis Roegel
-Main Style: article
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\glue 16.0
@@ -11,10 +9,10 @@ Completed box being shipped out [1]
...\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x96.75014, glue set 529.94339fil
+..\vbox(550.0+0.0)x46.66673, glue set 529.94339fil
...\write-{}
...\glue(\topskip) 1.60004
-...\hbox(8.39996+3.60004)x96.75014
+...\hbox(8.39996+3.60004)x46.66673
....\hbox(0.0+0.0)x0.0
.....\hbox(0.0+0.0)x0.0
......\glue 0.0
@@ -27,40 +25,37 @@ Completed box being shipped out [1]
......\penalty 0
......\glue 0.0 plus 1.0fil minus 1.0fil
....\glue 0.0
-....\hbox(8.39996+3.60004)x96.75014
+....\hbox(8.39996+3.60004)x46.66673
.....\rule(8.39996+3.60004)x0.0
-.....\OT1/cmr/m/n/10 u
-.....\OT1/cmr/m/n/10 n
+.....\kern 0.0 (for accent)
+.....\OT1/cmr/m/n/10 ^^V
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\glue 3.33333 plus 1.66666 minus 1.11111
-.....\kern -0.27779 (for accent)
+.....\kern 0.0 (for accent)
.....\OT1/cmr/m/n/10 ^^S
-.....\kern -4.72223 (for accent)
-.....\OT1/cmr/m/n/10 e
-.....\OT1/cmr/m/n/10 l
-.....\kern -0.27779 (for accent)
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
+.....\glue 3.33333 plus 1.66666 minus 1.11111
+.....\kern 0.0 (for accent)
.....\OT1/cmr/m/n/10 ^^R
-.....\kern -4.72223 (for accent)
-.....\OT1/cmr/m/n/10 e
-.....\OT1/cmr/m/n/10 v
-.....\kern-0.27779
-.....\OT1/cmr/m/n/10 e
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\glue 3.33333 plus 1.66666 minus 1.11111
-.....\OT1/cmr/m/n/10 e
-.....\OT1/cmr/m/n/10 t
+.....\kern 0.0 (for accent)
+.....\OT1/cmr/m/n/10 ^^S
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\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 n
+.....\kern 0.0 (for accent)
+.....\OT1/cmr/m/n/10 ^^R
+.....\kern -5.00002 (for accent)
+.....\OT1/cmr/m/n/10 a
.....\glue 3.33333 plus 1.66666 minus 1.11111
-.....\OT1/cmr/m/n/10 m
+.....\kern 0.0 (for accent)
+.....\OT1/cmr/m/n/10 ^^V
+.....\kern -5.00002 (for accent)
.....\OT1/cmr/m/n/10 a
-.....\kern -1.11111 (for accent)
-.....\OT1/cmr/m/n/10 ^
-.....\kern -3.8889 (for accent)
-.....\OT1/cmr/m/n/10 ^^P
-.....\OT1/cmr/m/n/10 t
-.....\OT1/cmr/m/n/10 r
-.....\OT1/cmr/m/n/10 e
...\penalty -51
...\glue 10.0 plus 3.0 minus 5.0
...\glue -3.60004
@@ -72,4 +67,4 @@ Completed box being shipped out [1]
...\glue 0.0 plus 1.0fil
...\OT1/cmr/m/n/10 1
...\glue 0.0 plus 1.0fil
-(tlb1217.aux)
+(github-0271.aux)
More information about the latex3-commits
mailing list.