[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Gh568 (#667) (174f7a66)

Mon Sep 13 19:44:53 CEST 2021

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/174f7a665856bc44898c23a08045ebaff1a8d962

>---------------------------------------------------------------

commit 174f7a665856bc44898c23a08045ebaff1a8d962
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Sep 13 19:44:53 2021 +0200

    Gh568 (#667)
    
    * fix for #568
    
    * Fix typo
    
    * change \ij to improve hyphenation with OT1 fonts


>---------------------------------------------------------------

174f7a665856bc44898c23a08045ebaff1a8d962
 base/changes.txt                      |  7 ++++++-
 base/doc/ltnews34.tex                 |  6 +++++-
 base/ltoutenc.dtx                     | 10 +++++----
 base/testfiles-legacy/github-0658.tlg | 39 +++++++++++++++++++----------------
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index ac013b6a..584cbb69 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -8,7 +8,12 @@ are not part of the distribution.
 
 2021-09-12  David Carlisle  <David.Carlisle at latex-project.org>
 
-	* ltfntcmd.dtx: guard definition in \text at command with \unexpanded \gh/665
+	* ltfntcmd.dtx: guard definition in \text at command with \unexpanded (gh/665)
+
+2021-09-12  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltoutenc.dtx (subsection{Definitions for the OT1 encoding}):
+	Move zero skip between i and j for hyphenation (gh/658)
 
 2021-09-10  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index a8078e94..7be637f1 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -554,11 +554,14 @@ U+0132.
 However, when using \texttt{OT1} or \texttt{T1} encoded fonts in
 \pdfTeX, the upper or lower casing with \cs{MakeUppercase} and
 \cs{MakeLowercase} would always fail regardless of the input method.
-This has now been corrected.
+This has now been corrected. At the same time we improved the
+hyphenation results for words containing this ligature (when
+typesetting is done in \texttt{OT1} encoding).
 %
 \githubissue{658}
 
 
+
 \subsection{Improve handling of legacy \cs{bfdefault} changes}
 
 In the past, changes to the font series defaults were made by directly
@@ -595,6 +598,7 @@ so that \# does not generate an error.
 %
 \githubissue{665}
 
+
 \subsection{???}
 
 %
diff --git a/base/ltoutenc.dtx b/base/ltoutenc.dtx
index eb2ecd1e..14518d2f 100644
--- a/base/ltoutenc.dtx
+++ b/base/ltoutenc.dtx
@@ -44,7 +44,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltoutenc.dtx}
-             [2021/04/29 v2.0v LaTeX Kernel (font encodings)]
+             [2021/09/12 v2.0w LaTeX Kernel (font encodings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutenc.dtx}
@@ -1783,12 +1783,14 @@
 %      {Added \cs{ij} and \cs{IJ} from babel. (pr/3771)}
 %    The dutch language uses the letter `ij'. It is available in
 %    \texttt{T1} encoded fonts, but not in the \texttt{OT1} encoded
-%    fonts. Therefor we fake it for the \texttt{OT1} encoding.
+%    fonts. Therefore we fake it for the \texttt{OT1} encoding.
+% \changes{v2.0w}{2021/09/12}{Move zero skip between
+%        i and j for hyphenation (gh/658)}
 %    \begin{macrocode}
 \DeclareTextCommand{\ij}{OT1}{%
-  \nobreak\hskip\z at skip i\kern-0.02em j\nobreak\hskip\z at skip}
+  \nobreak\hskip\z at skip i\kern-0.02em\nobreak\hskip\z at skip j}
 \DeclareTextCommand{\IJ}{OT1}{%
-  \nobreak\hskip\z at skip I\kern-0.02em J\nobreak\hskip\z at skip}
+  \nobreak\hskip\z at skip I\kern-0.02em\nobreak\hskip\z at skip J}
 %    \end{macrocode}
 %    In the OT1 encoding, \pounds~and \$ share a slot.
 % \changes{v1.9y}{2000/01/30}{Use \cs{hmode at bgroup} where applicable
diff --git a/base/testfiles-legacy/github-0658.tlg b/base/testfiles-legacy/github-0658.tlg
index 8ffc42eb..176150ea 100644
--- a/base/testfiles-legacy/github-0658.tlg
+++ b/base/testfiles-legacy/github-0658.tlg
@@ -11,15 +11,18 @@ Underfull \hbox (badness 10000) in paragraph at lines 18--18
 \hbox(6.94444+0.0)x6.0
 .\OT1/cmr/m/n/10 b
 .\glue(\rightskip) 0.0
-Overfull \hbox (6.29997pt too wide) in paragraph at lines 18--18
-\OT1/cmr/m/n/10 ij c
-\hbox(6.67859+1.94444)x6.0, glue set - 1.0
+Underfull \hbox (badness 10000) in paragraph at lines 18--18
+\OT1/cmr/m/n/10 ij
+\hbox(6.67859+1.94444)x6.0
 .\OT1/cmr/m/n/10 i
 .\kern -0.20004
-.\OT1/cmr/m/n/10 j
 .\penalty 10000
 .\glue 0.0
-.\glue 3.33333 plus 1.66666 minus 1.11111
+.\OT1/cmr/m/n/10 j
+.\glue(\rightskip) 0.0
+Underfull \hbox (badness 10000) in paragraph at lines 18--18
+\OT1/cmr/m/n/10 c
+\hbox(4.30554+0.0)x6.0
 .\OT1/cmr/m/n/10 c
 .\glue(\rightskip) 0.0
 LaTeX Font Info:    External font `cmex10' loaded for size
@@ -57,7 +60,7 @@ 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 378.5739fil
+..\vbox(550.0+0.0)x345.0, glue set 366.57518fil
 ...\write-{}
 ...\glue(\topskip) 3.16669
 ...\hbox(6.83331+1.94444)x345.0, glue set 312.48338fil
@@ -65,18 +68,17 @@ Completed box being shipped out [1]
 ....\glue 0.0
 ....\OT1/cmr/m/n/10 I
 ....\kern -0.20004
-....\OT1/cmr/m/n/10 J
 ....\penalty 10000
 ....\glue 0.0
+....\OT1/cmr/m/n/10 J
 ....\glue 3.33333 plus 1.66498 minus 1.11221
 ....\penalty 10000
 ....\glue 0.0
 ....\OT1/cmr/m/n/10 i
 ....\kern -0.20004
-....\OT1/cmr/m/n/10 j
 ....\penalty 10000
 ....\glue 0.0
-....\kern 0.0
+....\OT1/cmr/m/n/10 j
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -89,18 +91,17 @@ Completed box being shipped out [1]
 ....\glue 0.0
 ....\OT1/cmr/m/n/10 I
 ....\kern -0.20004
-....\OT1/cmr/m/n/10 J
 ....\penalty 10000
 ....\glue 0.0
+....\OT1/cmr/m/n/10 J
 ....\glue 3.33333 plus 1.66498 minus 1.11221
 ....\penalty 10000
 ....\glue 0.0
 ....\OT1/cmr/m/n/10 i
 ....\kern -0.20004
-....\OT1/cmr/m/n/10 j
 ....\penalty 10000
 ....\glue 0.0
-....\kern 0.0
+....\OT1/cmr/m/n/10 j
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -109,10 +110,10 @@ Completed box being shipped out [1]
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
 ...\glue(\lineskip) 1.0
-...\hbox(22.65277+17.65277)x345.0, glue set 324.0fil
+...\hbox(28.65277+23.65277)x345.0, glue set 324.0fil
 ....\hbox(0.0+0.0)x15.0
 ....\mathon
-....\vbox(22.65277+17.65277)x6.0
+....\vbox(28.65277+23.65277)x6.0
 .....\hbox(4.30554+0.0)x6.0
 ......\hbox(0.0+0.0)x0.0
 ......\OT1/cmr/m/n/10 a
@@ -123,17 +124,19 @@ Completed box being shipped out [1]
 ......\OT1/cmr/m/n/10 b
 ......\glue(\rightskip) 0.0
 .....\glue(\baselineskip) 5.32141
-.....\hbox(6.67859+1.94444)x6.0, glue set - 1.0
+.....\hbox(6.67859+1.94444)x6.0
 ......\OT1/cmr/m/n/10 i
 ......\kern -0.20004
-......\OT1/cmr/m/n/10 j
 ......\penalty 10000
 ......\glue 0.0
-......\glue 3.33333 plus 1.66666 minus 1.11111
+......\OT1/cmr/m/n/10 j
+......\glue(\rightskip) 0.0
+.....\glue(\baselineskip) 5.75002
+.....\hbox(4.30554+0.0)x6.0
 ......\OT1/cmr/m/n/10 c
 ......\glue(\rightskip) 0.0
 .....\penalty 150
-.....\glue(\baselineskip) 3.11111
+.....\glue(\baselineskip) 5.05556
 .....\hbox(6.94444+0.0)x6.0, glue set 0.44443fil
 ......\OT1/cmr/m/n/10 d
 ......\penalty 10000



