[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: use "up" for \upshape provide \normalshape make sure \usefont picks up the font without adjustments in shape or series fix comands using \accent (1ec6f741)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Nov 4 18:09:41 CET 2019
Repository : https://github.com/latex3/latex2e
On branch : nfssaxes
Link : https://github.com/latex3/latex2e/commit/1ec6f74149b2762d9110d9ee577617f585181a66
>---------------------------------------------------------------
commit 1ec6f74149b2762d9110d9ee577617f585181a66
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Nov 4 18:09:41 2019 +0100
use "up" for \upshape
provide \normalshape
make sure \usefont picks up the font without adjustments in shape or series
fix comands using \accent
>---------------------------------------------------------------
1ec6f74149b2762d9110d9ee577617f585181a66
base/doc.dtx | 4 +-
base/nfssaxes.tex | 87 +++++-
base/slides.dtx | 8 +-
base/testfiles-search/tlb-nfssaxes-001.lvt | 3 +-
base/testfiles-search/tlb-nfssaxes-001.tlg | 3 +-
base/testfiles-search/tlb-nfssaxes-007.lvt | 25 ++
base/testfiles-search/tlb-nfssaxes-007.tlg | 7 +
base/testfiles/github-robust-0123.luatex.tlg | 2 +-
base/testfiles/github-robust-0123.tlg | 2 +-
base/testfiles/github-robust-0123.xetex.tlg | 2 +-
base/testfiles/tlb2133.luatex.tlg | 318 ++++++++++++++++++++++
base/testfiles/tlb2133.lvt | 25 +-
base/testfiles/tlb2133.tlg | 112 ++++++--
base/testfiles/{tlb2133.tlg => tlb2133.xetex.tlg} | 112 ++++++--
14 files changed, 618 insertions(+), 92 deletions(-)
diff --git a/base/doc.dtx b/base/doc.dtx
index 971bb605..bb7975d2 100644
--- a/base/doc.dtx
+++ b/base/doc.dtx
@@ -1453,13 +1453,13 @@
\usefont\encodingdefault
\ttdefault
\mddefault
- \updefault
+ \shapedefault
}%
\else
\def\MacroFont{\fontencoding\encodingdefault
\fontfamily\ttdefault
\fontseries\mddefault
- \fontshape\updefault
+ \fontshape\shapedefault
\small}%
\fi
}{}
diff --git a/base/nfssaxes.tex b/base/nfssaxes.tex
index 1e52b6e5..c0491d50 100644
--- a/base/nfssaxes.tex
+++ b/base/nfssaxes.tex
@@ -608,6 +608,7 @@
% \end{macro}
+
% \begin{macro}{\merge at font@series@}
% This now defines the new \cs{f at series}:
% \begin{macrocode}
@@ -621,6 +622,7 @@
% dies if \texttt{\#3} starts with a conditional and in the
% definition of \cs{AmSfont} that is actually the case.
% \begin{macrocode}
+%\ifcat\expandafter X\detokenize{#1}X%
\def\@reserveda{#3}%
\ifx\@reserveda\@empty
\set at target@series{#2}%
@@ -628,7 +630,11 @@
% \end{macrocode}
% Otherwise we check if the desired result for the series
% (\texttt{\#1}) exists for the font family and the current shape.
+% As the \texttt{.fd} is perhaps not loaded yet, we first
+% have to do that, otherwise the test would fail even if the face
+% is actually available.
% \begin{macrocode}
+ \maybe at load@fontshape
\edef\@reserveda{\f at encoding /\f at family /#1/\f at shape}%
\ifcsname \@reserveda \endcsname
% \end{macrocode}
@@ -660,7 +666,7 @@
}
% \end{macrocode}
% It is possible that the previous font and the new one are
-% actually identical (and the font wasn not found because it still
+% actually identical (and the font was not found because it still
% needs loading) in which case a warning would look rather odd. So
% we make a quick check for that (which is the reason why we defined
% \cs{@reserveda} above.
@@ -675,13 +681,14 @@
% \end{macrocode}
% \end{macro}
+\def\maybe at load@fontshape{\begingroup\try at load@fontshape\endgroup}
% \begin{macro}{\set at target@series}
% \begin{macro}{\series at drop@one at m}
% The combined series value determined by the mapping may still
% contain an \texttt{m} that we have to remove (as the \texttt{.fd}
% files use \texttt{c} not \texttt{mc} to denote a medium weight
-% condensed series. We do this in all branches above because a user
+% condensed series, etc.). We do this in all branches above because a user
% might have written
%\begin{verbatim}
\DeclareFontSeriesChangeRule {m}{sc}{msc}{mc}
@@ -805,6 +812,7 @@
%\DeclareFontShapeChangeRule {n}{sw} {sw} {}
%\DeclareFontShapeChangeRule {n}{sc} {sc} {}
\DeclareFontShapeChangeRule {n}{ulc} {n} {}
+\DeclareFontShapeChangeRule {n}{up} {n} {}
% \end{macrocode}
%
% \begin{macrocode}
@@ -819,6 +827,7 @@
% \begin{macrocode}
\DeclareFontShapeChangeRule {it}{sc} {scit} {scsl}
\DeclareFontShapeChangeRule {it}{ulc} {it} {}
+\DeclareFontShapeChangeRule {it}{up} {n} {}
% \end{macrocode}
%
% \begin{macrocode}
@@ -828,6 +837,7 @@
%\DeclareFontShapeChangeRule {sl}{sw} {sw} {}
\DeclareFontShapeChangeRule {sl}{sc} {scsl} {scit}
\DeclareFontShapeChangeRule {sl}{ulc} {sl} {}
+\DeclareFontShapeChangeRule {sl}{up} {n} {}
% \end{macrocode}
%
% \begin{macrocode}
@@ -837,15 +847,17 @@
\DeclareFontShapeChangeRule {sc}{sw} {scsw} {sw}
%\DeclareFontShapeChangeRule {sc}{sc} {sc} {}
\DeclareFontShapeChangeRule {sc}{ulc} {n} {}
+\DeclareFontShapeChangeRule {sc}{up} {sc} {}
% \end{macrocode}
%
% \begin{macrocode}
-\DeclareFontShapeChangeRule {scit}{n} {sc} {}
+%\DeclareFontShapeChangeRule {scit}{n} {n} {}
\DeclareFontShapeChangeRule {scit}{it} {scit} {}
\DeclareFontShapeChangeRule {scit}{sl} {scsl} {scit}
\DeclareFontShapeChangeRule {scit}{sw} {scsw} {sc} % or scit?
\DeclareFontShapeChangeRule {scit}{sc} {scit} {}
\DeclareFontShapeChangeRule {scit}{ulc} {it} {}
+\DeclareFontShapeChangeRule {scit}{up} {sc} {}
% \end{macrocode}
% The previous rule assumes that if \texttt{scit} exists then
% \texttt{it} exists as well. If not, the mechanism will save
@@ -857,21 +869,23 @@
% that this isn't worth the effort.
%
% \begin{macrocode}
-\DeclareFontShapeChangeRule {scsl}{n} {sc} {}
+%\DeclareFontShapeChangeRule {scsl}{n} {n} {}
\DeclareFontShapeChangeRule {scsl}{it} {scit} {scsl}
\DeclareFontShapeChangeRule {scsl}{sl} {scsl} {}
\DeclareFontShapeChangeRule {scsl}{sw} {scsw} {sc} % or scsl?
\DeclareFontShapeChangeRule {scsl}{sc} {scsl} {}
\DeclareFontShapeChangeRule {scsl}{ulc} {sl} {}
+\DeclareFontShapeChangeRule {scsl}{up} {sc} {}
% \end{macrocode}
%
% \begin{macrocode}
-\DeclareFontShapeChangeRule {scsw}{n} {sc} {}
+%\DeclareFontShapeChangeRule {scsw}{n} {n} {}
\DeclareFontShapeChangeRule {scsw}{it} {scit} {scsw}
\DeclareFontShapeChangeRule {scsw}{sl} {scsl} {}
\DeclareFontShapeChangeRule {scsw}{sw} {scsw} {}
\DeclareFontShapeChangeRule {scsw}{sc} {scsw} {}
\DeclareFontShapeChangeRule {scsw}{ulc} {sw} {}
+\DeclareFontShapeChangeRule {scsw}{up} {sc} {}
% \end{macrocode}
%
% \begin{macrocode}
@@ -881,6 +895,7 @@
%\DeclareFontShapeChangeRule {sw}{sw} {sw} {}
\DeclareFontShapeChangeRule {sw}{sc} {scsw} {}
\DeclareFontShapeChangeRule {sw}{ulc} {sw} {}
+\DeclareFontShapeChangeRule {sw}{up} {n} {}
% \end{macrocode}
@@ -919,13 +934,16 @@
%
% \begin{macro}{\merge at font@shape@}
-% Same game now, except that we look at shapes not series values.
+% Same game now, except that we look at shapes not series values
+% and we can set the shape without the complication of dropping
+% ``m''s from the name as we had to for the series.
% \begin{macrocode}
\def\merge at font@shape@#1#2#3\@nil{%
\def\@reserveda{#3}%
\ifx\@reserveda\@empty
\edef\f at shape{#2}%
\else
+ \maybe at load@fontshape
\edef\@reserveda{\f at encoding /\f at family /\f at series/#1}%
\ifcsname \@reserveda\endcsname
\edef\f at shape{#1}%
@@ -957,6 +975,7 @@
% \end{macrocode}
% I use \cs{protected} here not \cs{DeclareRobustCommand} to avoid
% extra status lines that would change test results in the test suite.
+%
% \begin{macrocode}
\protected\def\upshape
{\not at math@alphabet\upshape\relax
@@ -979,6 +998,13 @@
}
% \end{macrocode}
%
+% Perhaps one should also provide \cs{normalseries}?
+% \begin{macrocode}
+ \protected\def\normalshape
+ {\not at math@alphabet\normalshape\relax
+ \fontshape\shapedefault\selectfont}%
+% \end{macrocode}
+%
% The \textsf{fontaxes} package also implements two further shapes,
% namely \cs{swshape} and \cs{sscshape}. They could now easily be
% integrated by specifying a few further table entries such as
@@ -996,6 +1022,28 @@
% work in full.
%
%
+% \begin{macrocode}
+\def\updefault{up}
+\def\shapedefault{n}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareRobustCommand\usefont[4]{%
+% \end{macrocode}
+% \cs{fontencoding} needs to do some setup work so we call that,
+% but family, series and shape use be used as is so we directly set
+% them. If we would call \cs{fontseries} or \cs{fontshape} as it
+% was done in the past, they would now interact with the existing
+% series and shape which is not desired if we intend to use an
+% explicit font shape!
+% \begin{macrocode}
+ \fontencoding{#1}%
+ \edef\f at family{#2}%
+ \edef\f at series{#3}%
+ \edef\f at shape{#4}\selectfont
+ \ignorespaces}
+% \end{macrocode}
+%
%
% \subsubsection{Packages that need checking or updating}
%
@@ -1524,7 +1572,7 @@
% \cs{fontseries}.
% \begin{macrocode}
\ifx\target at series@value\@empty \else
- \begingroup\try at load@fontshape\endgroup
+ \maybe at load@fontshape
% \end{macrocode}
% Updating the series in this case means directly changing
% \cs{f at series} to the target value. We don't want to go through
@@ -1562,7 +1610,7 @@
\fi\fi
\fontfamily\sfdefault
\ifx\target at series@value\@empty \else
- \begingroup\try at load@fontshape\endgroup
+ \maybe at load@fontshape
\let\f at series\target at series@value
\fi
\selectfont}
@@ -1588,7 +1636,7 @@
\fi\fi
\fontfamily\ttdefault
\ifx\target at series@value\@empty \else
- \begingroup\try at load@fontshape\endgroup
+ \maybe at load@fontshape
\let\f at series\target at series@value
\fi
\selectfont}
@@ -1601,6 +1649,27 @@
+% \begin{macro}{\add at accent}
+%
+% \begin{macrocode}
+\def\add at accent#1#2{\hmode at bgroup
+ \let\hmode at start@before at group\@firstofone
+ \setbox\@tempboxa\hbox{#2%
+ \global\mathchardef\accent at spacefactor\spacefactor}%
+% \end{macrocode}
+% The accent primitive doesn't allow things \cs{begingroup} to
+% interfere between accent and base character. Therefore we need to
+% avoid that. As we don't have to load the fontshape in this case
+% (as that happened in the box above if necessary, we simply
+% disable that part of the code temporaily.
+% We also ignore \cs{ignorespaces} which has the same issue and may
+% show up as part of \cs{normalfont} if that is used.
+% \begin{macrocode}
+ \let\maybe at load@fontshape\relax
+ \let\ignorespaces\relax
+ \accent#1 #2\egroup\spacefactor\accent at spacefactor}
+ % \end{macrocode}
+% \end{macro}
diff --git a/base/slides.dtx b/base/slides.dtx
index 54cfaa20..c532db44 100644
--- a/base/slides.dtx
+++ b/base/slides.dtx
@@ -53,7 +53,7 @@
%<*driver>
\ProvidesFile{slides.drv}
%</driver>
- [2016/03/29 v2.4a
+ [2019/11/04 v2.4b
%<+class> Standard LaTeX document class]
%<+cmd> SLiTeX definitions]
% \end{macrocode}
@@ -419,6 +419,12 @@
\def\sldefault{sl}
\def\bfdefault{bx}
% \end{macrocode}
+% As |\fontshape| gets redefined we need to make sure that the default
+% for |\upshape| is no longer \texttt{up} but again \texttt{n}.
+% \changes{v2.4b}{2019/11/04}{Explicitly set \cs{updefault}}
+% \begin{macrocode}
+\def\updefault{n}
+% \end{macrocode}
%
%
% Since the number of parameters to set are very large it seems
diff --git a/base/testfiles-search/tlb-nfssaxes-001.lvt b/base/testfiles-search/tlb-nfssaxes-001.lvt
index 7f21036a..e5ca2fe5 100644
--- a/base/testfiles-search/tlb-nfssaxes-001.lvt
+++ b/base/testfiles-search/tlb-nfssaxes-001.lvt
@@ -24,7 +24,8 @@ Test
\showresult{shape}\scshape after scshape
\showresult{shape}\itshape after itshape
\showresult{shape}\upshape after upshape
-\showresult{shape}\upshape after upshape
+\showresult{shape}\upshape after upshape % no change any longer
+\showresult{shape}\ulcshape after ulcshape
\showresult{shape}\slshape after slshape
\showresult{shape}\scshape after scshape
\showresult{shape}\upshape after upshape
diff --git a/base/testfiles-search/tlb-nfssaxes-001.tlg b/base/testfiles-search/tlb-nfssaxes-001.tlg
index 18a1fde0..a022df3c 100644
--- a/base/testfiles-search/tlb-nfssaxes-001.tlg
+++ b/base/testfiles-search/tlb-nfssaxes-001.tlg
@@ -8,7 +8,8 @@ LaTeX Font Warning: Font shape `T1/lmr/m/scit' undefined
(Font) using `T1/lmr/m/scsl' instead on input line ....
\itshape -> scsl
\upshape -> sc
-\upshape -> n
+\upshape -> sc
+\ulcshape -> n
\slshape -> sl
\scshape -> scsl
\upshape -> sc
diff --git a/base/testfiles-search/tlb-nfssaxes-007.lvt b/base/testfiles-search/tlb-nfssaxes-007.lvt
new file mode 100644
index 00000000..b912dd0e
--- /dev/null
+++ b/base/testfiles-search/tlb-nfssaxes-007.lvt
@@ -0,0 +1,25 @@
+\documentclass{article}
+
+\input{test2e}
+
+
+\makeatletter
+\def\showfont#1{\typeout{#1: \f at encoding/\f at family/\f at series/\f at shape}}
+\makeatother
+
+
+\renewcommand\rmdefault{qpl}
+
+\begin{document}
+
+\START
+
+\showfont{start}
+
+\bfseries\normalfont \showfont{bfseries}
+\scshape\normalfont \showfont{scshape}
+\itshape\normalfont \showfont{itshape}
+
+\scshape\itshape\normalfont \showfont{scshape+itshape}
+
+\END
diff --git a/base/testfiles-search/tlb-nfssaxes-007.tlg b/base/testfiles-search/tlb-nfssaxes-007.tlg
new file mode 100644
index 00000000..3fa92605
--- /dev/null
+++ b/base/testfiles-search/tlb-nfssaxes-007.tlg
@@ -0,0 +1,7 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+start: OT1/qpl/m/n
+bfseries: OT1/qpl/m/n
+scshape: OT1/qpl/m/n
+itshape: OT1/qpl/m/n
+scshape+itshape: OT1/qpl/m/n
diff --git a/base/testfiles/github-robust-0123.luatex.tlg b/base/testfiles/github-robust-0123.luatex.tlg
index c21a2e32..5edf7ee9 100644
--- a/base/testfiles/github-robust-0123.luatex.tlg
+++ b/base/testfiles/github-robust-0123.luatex.tlg
@@ -2049,7 +2049,7 @@ and I'll forget about whatever was undefined.
---------------------------------------
\upbracefill -> \upbracefill
---------------------------------------
-\updefault -> n
+\updefault -> up
---------------------------------------
\updownarrow -> \updownarrow
---------------------------------------
diff --git a/base/testfiles/github-robust-0123.tlg b/base/testfiles/github-robust-0123.tlg
index 8c247c65..2ed7e440 100644
--- a/base/testfiles/github-robust-0123.tlg
+++ b/base/testfiles/github-robust-0123.tlg
@@ -2033,7 +2033,7 @@ l. ......fter\show\csname Downarrow\space\endcsname
---------------------------------------
\upbracefill -> \upbracefill
---------------------------------------
-\updefault -> n
+\updefault -> up
---------------------------------------
\updownarrow -> \updownarrow
---------------------------------------
diff --git a/base/testfiles/github-robust-0123.xetex.tlg b/base/testfiles/github-robust-0123.xetex.tlg
index 61958234..ab0c9d22 100644
--- a/base/testfiles/github-robust-0123.xetex.tlg
+++ b/base/testfiles/github-robust-0123.xetex.tlg
@@ -2049,7 +2049,7 @@ and I'll forget about whatever was undefined.
---------------------------------------
\upbracefill -> \upbracefill
---------------------------------------
-\updefault -> n
+\updefault -> up
---------------------------------------
\updownarrow -> \updownarrow
---------------------------------------
diff --git a/base/testfiles/tlb2133.luatex.tlg b/base/testfiles/tlb2133.luatex.tlg
new file mode 100644
index 00000000..4d30dcf0
--- /dev/null
+++ b/base/testfiles/tlb2133.luatex.tlg
@@ -0,0 +1,318 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+(tlb2133.aux)
+LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
+LaTeX Font Info: ... okay on input line ....
+LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line ....
+LaTeX Font Info: ... okay on input line ....
+LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line ....
+LaTeX Font Info: ... okay on input line ....
+LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
+LaTeX Font Info: ... okay on input line ....
+LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line ....
+LaTeX Font Info: ... okay on input line ....
+LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
+LaTeX Font Info: ... okay on input line ....
+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 431.95386fil, direction TLT
+...\write-{}
+...\glue(\topskip) 0.78398
+...\hbox(9.21602+2.49939)x345.0, glue set 280.51208fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 e
+....\T1/cmr/m/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern-1.11084 (accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.5827, direction TLT
+.....\T1/cmr/m/n/10 ^^D
+....\kern-3.88794 (accent)
+....\T1/cmr/m/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 0.53848
+...\hbox(8.96213+2.49939)x345.0, glue set 263.0719fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 i
+....\T1/cmr/m/n/10 g
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern-1.11084 (accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.32881, direction TLT
+.....\T1/cmr/m/n/10 ^^D
+....\kern-3.88794 (accent)
+....\T1/cmr/m/n/10 i
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 o
+....\kern-0.27771 (font)
+....\T1/cmr/m/n/10 w
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.00244
+...\hbox(7.49817+2.49939)x345.0, glue set 229.469fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 e
+....\T1/cmr/m/n/10 w
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern0.27771 (accent)
+....\T1/cmr/m/n/10 ^^D
+....\kern-5.27649 (accent)
+....\T1/cmr/m/n/10 n
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/m/n/10 )
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 o
+....\kern-0.27771 (font)
+....\T1/cmr/m/n/10 w
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 1.23596
+...\hbox(8.26465+2.49939)x345.0, glue set 239.7304fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 l
+....\T1/cmr/m/n/10 a
+....\T1/cmr/m/n/10 r
+....\T1/cmr/m/n/10 g
+....\T1/cmr/m/n/10 e
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 ^^D
+....\T1/cmr/m/n/12 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 t
+....\T1/cmr/m/n/10 i
+....\T1/cmr/m/n/10 l
+....\T1/cmr/m/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 b
+....\T1/cmr/m/n/10 a
+....\T1/cmr/m/n/10 d
+....\T1/cmr/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) 0.28459
+...\hbox(9.21602+2.49939)x345.0, glue set 284.95544fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern0.03706 (accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.5827, direction TLT
+.....\T1/cmr/m/n/10 ^^D
+....\kern-5.03584 (accent)
+....\T1/cmr/m/sl/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.6134
+...\hbox(6.8872+0.0)x345.0, glue set 297.05893fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 t
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 ^^D
+....\T1/cmr/m/sl/10 l
+....\kern0.39346 (italic)
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 2.78398
+...\hbox(9.21602+2.49939)x345.0, glue set 279.40125fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern0.03706 (accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.5827, direction TLT
+.....\T1/cmr/m/n/10 ^^D
+....\kern-5.03584 (accent)
+....\T1/cmr/m/sl/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 0.2707
+...\hbox(9.2299+2.49939)x345.0, glue set 280.70648fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 b
+....\kern-0.27771 (font)
+....\T1/cmr/m/n/10 x
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern-0.90256 (accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.59659, direction TLT
+.....\T1/cmr/m/n/10 ^^D
+....\kern-4.09622 (accent)
+....\T1/cmr/bx/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 0.2707
+...\hbox(9.2299+2.49939)x345.0, glue set 282.65045fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 b
+....\T1/cmr/m/n/10 f
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\kern-0.90256 (accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.59659, direction TLT
+.....\T1/cmr/m/n/10 ^^D
+....\kern-4.09622 (accent)
+....\T1/cmr/bx/n/10 l
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.59952
+...\hbox(6.9011+0.0)x345.0, glue set 295.1474fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\T1/cmr/m/n/10 X
+....\glue(\spaceskip) 3.33252 plus 1.66458 minus 1.11194
+....\T1/cmr/m/n/10 t
+....\T1/cmr/m/n/10 b
+....\T1/cmr/m/n/10 f
+....\glue(\spaceskip) 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 ^^D
+....\kern0.0 (italic)
+....\T1/cmr/bx/n/10 l
+....\kern0.0 (italic)
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue 0.0 plus 1.0fil
+...\glue 0.0
+...\glue 0.0 plus 0.0001fil
+..\glue(\baselineskip) 23.5849
+..\hbox(6.4151+0.0)x345.0, glue set 170.00061fil, direction TLT
+...\glue 0.0 plus 1.0fil
+...\T1/cmr/m/n/10 1
+...\glue 0.0 plus 1.0fil
+(tlb2133.aux)
diff --git a/base/testfiles/tlb2133.lvt b/base/testfiles/tlb2133.lvt
index 58c6e847..298b3a44 100644
--- a/base/testfiles/tlb2133.lvt
+++ b/base/testfiles/tlb2133.lvt
@@ -19,6 +19,7 @@
\START
+
\begin{document}
\fontencoding{T1}\selectfont
@@ -31,37 +32,31 @@
\setbox0 \hbox {\large l }
% OK:
- X sel \"{\selectfont l}
+ X sel \"{\selectfont l} (ok)
% BAD (ignorespaces):
- X ig \"{\ignorespaces i}
-
- % BAD (ignorespaces in usefont in normalfont):
- X nor \"{\normalfont n}
+ X ig \"{\ignorespaces i} (now ok)
- \def\usefont#1#2#3#4{\fontencoding{#1}\fontfamily{#2}%
- \fontseries{#3}\fontshape{#4}\selectfont}
-
- % OK:
- X new \"{\normalfont n}
+ % OK: (ignorespaces in usefont in normalfont):
+ X new \"{\normalfont n} (ok) (now ok)
% BAD (Why ???):
- X lar \"{\large l}
+ X large \"{\large l} (still bad)
% OK:
- X sl \"{\sl l}
+ X sl \"{\sl l} (ok)
% BAD (group, maybe fixable?):
X tsl \"{\textsl{l}}
% OK:
- X nsl \"{\normalfont\fontshape{sl}\selectfont l}
+ X nsl \"{\normalfont\fontshape{sl}\selectfont l} (ok)
% OK:
- X bx \"{\fontseries{bx}\selectfont l}
+ X bx \"{\fontseries{bx}\selectfont l} (ok)
% OK:
- X bf \"{\bf l}
+ X bf \"{\bf l} (ok)
% BAD (group, maybe fixable?):
X tbf \"{\textbf{l}}
diff --git a/base/testfiles/tlb2133.tlg b/base/testfiles/tlb2133.tlg
index 78672596..2a290768 100644
--- a/base/testfiles/tlb2133.tlg
+++ b/base/testfiles/tlb2133.tlg
@@ -22,10 +22,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)x345.0, glue set 419.95514fil
+..\vbox(550.0+0.0)x345.0, glue set 431.95386fil
...\write-{}
...\glue(\topskip) 0.78398
-...\hbox(9.21602+0.0)x345.0, glue set 301.89575fil
+...\hbox(9.21602+2.49939)x345.0, glue set 280.51208fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -38,41 +38,44 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -3.88794 (for accent)
....\T1/cmr/m/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.1128
-...\hbox(6.8872+1.94397)x345.0, glue set 300.28503fil
+...\glue(\baselineskip) 0.53848
+...\hbox(8.96213+2.49939)x345.0, glue set 263.0719fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
....\T1/cmr/m/n/10 i
....\T1/cmr/m/n/10 g
....\glue 3.33252 plus 1.66626 minus 1.11084
-....\T1/cmr/m/n/10 ^^D
+....\kern -1.11084 (for accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.32881
+.....\T1/cmr/m/n/10 ^^D
+....\kern -3.88794 (for accent)
....\T1/cmr/m/n/10 i
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\baselineskip) 3.16882
-...\hbox(6.8872+0.0)x345.0, glue set 290.81512fil
-....\hbox(0.0+0.0)x15.0
-....\T1/cmr/m/n/10 X
-....\glue 3.33252 plus 1.66458 minus 1.11194
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
....\T1/cmr/m/n/10 n
....\T1/cmr/m/n/10 o
-....\T1/cmr/m/n/10 r
+....\kern-0.27771
+....\T1/cmr/m/n/10 w
....\glue 3.33252 plus 1.66626 minus 1.11084
-....\T1/cmr/m/n/10 ^^D
-....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.1128
-...\hbox(6.8872+0.0)x345.0, glue set 293.06458fil
+...\glue(\baselineskip) 2.00244
+...\hbox(7.49817+2.49939)x345.0, glue set 229.469fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -84,27 +87,56 @@ Completed box being shipped out [1]
....\T1/cmr/m/n/10 ^^D
....\kern -5.27649 (for accent)
....\T1/cmr/m/n/10 n
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/m/n/10 )
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 o
+....\kern-0.27771
+....\T1/cmr/m/n/10 w
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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.73535
-...\hbox(8.26465+0.0)x345.0, glue set 295.88335fil
+...\glue(\baselineskip) 1.23596
+...\hbox(8.26465+2.49939)x345.0, glue set 239.7304fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
....\T1/cmr/m/n/10 l
....\T1/cmr/m/n/10 a
....\T1/cmr/m/n/10 r
+....\T1/cmr/m/n/10 g
+....\T1/cmr/m/n/10 e
....\glue 3.33252 plus 1.66626 minus 1.11084
....\T1/cmr/m/n/10 ^^D
....\T1/cmr/m/n/12 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 t
+....\T1/cmr/m/n/10 i
+....\T1/cmr/m/n/10 l
+....\T1/cmr/m/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 b
+....\T1/cmr/m/n/10 a
+....\T1/cmr/m/n/10 d
+....\T1/cmr/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) 2.78398
-...\hbox(9.21602+0.0)x345.0, glue set 306.33911fil
+...\glue(\baselineskip) 0.28459
+...\hbox(9.21602+2.49939)x345.0, glue set 284.95544fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -116,11 +148,16 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -5.03584 (for accent)
....\T1/cmr/m/sl/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.1128
+...\glue(\baselineskip) 2.6134
...\hbox(6.8872+0.0)x345.0, glue set 297.05893fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
@@ -137,7 +174,7 @@ Completed box being shipped out [1]
....\glue(\rightskip) 0.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\baselineskip) 2.78398
-...\hbox(9.21602+0.0)x345.0, glue set 300.78491fil
+...\hbox(9.21602+2.49939)x345.0, glue set 279.40125fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -150,12 +187,17 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -5.03584 (for accent)
....\T1/cmr/m/sl/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.7701
-...\hbox(9.2299+0.0)x345.0, glue set 302.09015fil
+...\glue(\baselineskip) 0.2707
+...\hbox(9.2299+2.49939)x345.0, glue set 280.70648fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -168,12 +210,17 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -4.09622 (for accent)
....\T1/cmr/bx/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.7701
-...\hbox(9.2299+0.0)x345.0, glue set 304.03412fil
+...\glue(\baselineskip) 0.2707
+...\hbox(9.2299+2.49939)x345.0, glue set 282.65045fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -185,11 +232,16 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -4.09622 (for accent)
....\T1/cmr/bx/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.0989
+...\glue(\baselineskip) 2.59952
...\hbox(6.9011+0.0)x345.0, glue set 295.1474fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
diff --git a/base/testfiles/tlb2133.tlg b/base/testfiles/tlb2133.xetex.tlg
similarity index 70%
copy from base/testfiles/tlb2133.tlg
copy to base/testfiles/tlb2133.xetex.tlg
index 78672596..2a290768 100644
--- a/base/testfiles/tlb2133.tlg
+++ b/base/testfiles/tlb2133.xetex.tlg
@@ -22,10 +22,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)x345.0, glue set 419.95514fil
+..\vbox(550.0+0.0)x345.0, glue set 431.95386fil
...\write-{}
...\glue(\topskip) 0.78398
-...\hbox(9.21602+0.0)x345.0, glue set 301.89575fil
+...\hbox(9.21602+2.49939)x345.0, glue set 280.51208fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -38,41 +38,44 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -3.88794 (for accent)
....\T1/cmr/m/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.1128
-...\hbox(6.8872+1.94397)x345.0, glue set 300.28503fil
+...\glue(\baselineskip) 0.53848
+...\hbox(8.96213+2.49939)x345.0, glue set 263.0719fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
....\T1/cmr/m/n/10 i
....\T1/cmr/m/n/10 g
....\glue 3.33252 plus 1.66626 minus 1.11084
-....\T1/cmr/m/n/10 ^^D
+....\kern -1.11084 (for accent)
+....\hbox(6.63332+0.0)x4.99878, shifted -2.32881
+.....\T1/cmr/m/n/10 ^^D
+....\kern -3.88794 (for accent)
....\T1/cmr/m/n/10 i
-....\penalty 10000
-....\glue(\parfillskip) 0.0 plus 1.0fil
-....\glue(\rightskip) 0.0
-...\glue(\parskip) 0.0 plus 1.0
-...\glue(\baselineskip) 3.16882
-...\hbox(6.8872+0.0)x345.0, glue set 290.81512fil
-....\hbox(0.0+0.0)x15.0
-....\T1/cmr/m/n/10 X
-....\glue 3.33252 plus 1.66458 minus 1.11194
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
....\T1/cmr/m/n/10 n
....\T1/cmr/m/n/10 o
-....\T1/cmr/m/n/10 r
+....\kern-0.27771
+....\T1/cmr/m/n/10 w
....\glue 3.33252 plus 1.66626 minus 1.11084
-....\T1/cmr/m/n/10 ^^D
-....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.1128
-...\hbox(6.8872+0.0)x345.0, glue set 293.06458fil
+...\glue(\baselineskip) 2.00244
+...\hbox(7.49817+2.49939)x345.0, glue set 229.469fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -84,27 +87,56 @@ Completed box being shipped out [1]
....\T1/cmr/m/n/10 ^^D
....\kern -5.27649 (for accent)
....\T1/cmr/m/n/10 n
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/m/n/10 )
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 n
+....\T1/cmr/m/n/10 o
+....\kern-0.27771
+....\T1/cmr/m/n/10 w
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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.73535
-...\hbox(8.26465+0.0)x345.0, glue set 295.88335fil
+...\glue(\baselineskip) 1.23596
+...\hbox(8.26465+2.49939)x345.0, glue set 239.7304fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
....\T1/cmr/m/n/10 l
....\T1/cmr/m/n/10 a
....\T1/cmr/m/n/10 r
+....\T1/cmr/m/n/10 g
+....\T1/cmr/m/n/10 e
....\glue 3.33252 plus 1.66626 minus 1.11084
....\T1/cmr/m/n/10 ^^D
....\T1/cmr/m/n/12 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 s
+....\T1/cmr/m/n/10 t
+....\T1/cmr/m/n/10 i
+....\T1/cmr/m/n/10 l
+....\T1/cmr/m/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 b
+....\T1/cmr/m/n/10 a
+....\T1/cmr/m/n/10 d
+....\T1/cmr/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) 2.78398
-...\hbox(9.21602+0.0)x345.0, glue set 306.33911fil
+...\glue(\baselineskip) 0.28459
+...\hbox(9.21602+2.49939)x345.0, glue set 284.95544fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -116,11 +148,16 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -5.03584 (for accent)
....\T1/cmr/m/sl/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.1128
+...\glue(\baselineskip) 2.6134
...\hbox(6.8872+0.0)x345.0, glue set 297.05893fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
@@ -137,7 +174,7 @@ Completed box being shipped out [1]
....\glue(\rightskip) 0.0
...\glue(\parskip) 0.0 plus 1.0
...\glue(\baselineskip) 2.78398
-...\hbox(9.21602+0.0)x345.0, glue set 300.78491fil
+...\hbox(9.21602+2.49939)x345.0, glue set 279.40125fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -150,12 +187,17 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -5.03584 (for accent)
....\T1/cmr/m/sl/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.7701
-...\hbox(9.2299+0.0)x345.0, glue set 302.09015fil
+...\glue(\baselineskip) 0.2707
+...\hbox(9.2299+2.49939)x345.0, glue set 280.70648fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -168,12 +210,17 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -4.09622 (for accent)
....\T1/cmr/bx/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 2.7701
-...\hbox(9.2299+0.0)x345.0, glue set 304.03412fil
+...\glue(\baselineskip) 0.2707
+...\hbox(9.2299+2.49939)x345.0, glue set 282.65045fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
....\glue 3.33252 plus 1.66458 minus 1.11194
@@ -185,11 +232,16 @@ Completed box being shipped out [1]
.....\T1/cmr/m/n/10 ^^D
....\kern -4.09622 (for accent)
....\T1/cmr/bx/n/10 l
+....\glue 3.33252 plus 1.66626 minus 1.11084
+....\T1/cmr/m/n/10 (
+....\T1/cmr/m/n/10 o
+....\T1/cmr/m/n/10 k
+....\T1/cmr/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) 5.0989
+...\glue(\baselineskip) 2.59952
...\hbox(6.9011+0.0)x345.0, glue set 295.1474fil
....\hbox(0.0+0.0)x15.0
....\T1/cmr/m/n/10 X
More information about the latex3-commits
mailing list