[latex3-commits] [git/LaTeX3-latex3-latex2e] luatex-softhyphen: \hyphenchar -> \prehyphenchar in tlb3855 at LuaTeX (cc645dfc)

Marcel Fabian Krüger tex at 2krueger.de
Tue May 26 11:16:20 CEST 2020


Repository : https://github.com/latex3/latex2e
On branch  : luatex-softhyphen
Link       : https://github.com/latex3/latex2e/commit/cc645dfc247433a2d0476fe73c83892c68aaf3fd

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

commit cc645dfc247433a2d0476fe73c83892c68aaf3fd
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Tue May 26 11:11:57 2020 +0200

    \hyphenchar -> \prehyphenchar in tlb3855 at LuaTeX


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

cc645dfc247433a2d0476fe73c83892c68aaf3fd
 base/testfiles/tlb3855-20170101.luatex.tlg | 38 ++++++++++++------------
 base/testfiles/tlb3855-20170101.lvt        |  6 +++-
 base/testfiles/tlb3855.luatex.tlg          | 46 +++++++++++++++---------------
 base/testfiles/tlb3855.lvt                 |  6 +++-
 4 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/base/testfiles/tlb3855-20170101.luatex.tlg b/base/testfiles/tlb3855-20170101.luatex.tlg
index c26d4d30..5ad0129c 100644
--- a/base/testfiles/tlb3855-20170101.luatex.tlg
+++ b/base/testfiles/tlb3855-20170101.luatex.tlg
@@ -191,7 +191,7 @@ Don't change this file in any respect.
 ...\glue(\rightskip) 0.0
 ..\glue(\parskip) 0.0
 ..\glue(\baselineskip) 5.05556
-..\hbox(6.94444+1.94444)x276.00105, glue set 1.81674, direction TLT
+..\hbox(6.94444+1.94444)x276.00105, glue set 1.15007, direction TLT
 ...\localpar
 ....\localinterlinepenalty=0
 ....\localbrokenpenalty=0
@@ -202,13 +202,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -219,13 +219,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -236,13 +236,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -253,13 +253,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -270,12 +270,12 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
-...\OT1/cmr/m/n/10 -
+...\OT1/cmr/m/n/10 +
 ...\discretionary (penalty 50)
 ...\glue(\rightskip) 0.0
 ..\penalty 250
@@ -291,13 +291,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -308,13 +308,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -325,13 +325,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -342,13 +342,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
diff --git a/base/testfiles/tlb3855-20170101.lvt b/base/testfiles/tlb3855-20170101.lvt
index 3515e1e7..e419ea0f 100644
--- a/base/testfiles/tlb3855-20170101.lvt
+++ b/base/testfiles/tlb3855-20170101.lvt
@@ -11,7 +11,11 @@
 hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyp\-henation
 
 
-\hyphenchar\font`\+
+\ifx\prehyphenchar\undefined
+  \hyphenchar\font`\+
+\else
+  \prehyphenchar`\+
+\fi
 
 hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyp\-henation
 
diff --git a/base/testfiles/tlb3855.luatex.tlg b/base/testfiles/tlb3855.luatex.tlg
index af10365d..3deb0dd1 100644
--- a/base/testfiles/tlb3855.luatex.tlg
+++ b/base/testfiles/tlb3855.luatex.tlg
@@ -191,7 +191,7 @@ Don't change this file in any respect.
 ...\glue(\rightskip) 0.0
 ..\glue(\parskip) 0.0
 ..\glue(\baselineskip) 5.05556
-..\hbox(6.94444+1.94444)x276.00105, glue set 1.81674, direction TLT
+..\hbox(6.94444+1.94444)x276.00105, glue set 1.15007, direction TLT
 ...\localpar
 ....\localinterlinepenalty=0
 ....\localbrokenpenalty=0
@@ -202,13 +202,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -219,13 +219,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -236,13 +236,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -253,13 +253,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -270,12 +270,12 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
-...\OT1/cmr/m/n/10 -
+...\OT1/cmr/m/n/10 +
 ...\discretionary (penalty 50)
 ...\glue(\rightskip) 0.0
 ..\penalty 250
@@ -291,13 +291,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -308,13 +308,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -325,13 +325,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -342,13 +342,13 @@ Don't change this file in any respect.
 ...\kern-0.27779 (font)
 ...\OT1/cmr/m/n/10 y
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 p
 ...\OT1/cmr/m/n/10 h
 ...\OT1/cmr/m/n/10 e
 ...\OT1/cmr/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmr/m/n/10 -
+....< \OT1/cmr/m/n/10 +
 ...\OT1/cmr/m/n/10 a
 ...\OT1/cmr/m/n/10 t
 ...\OT1/cmr/m/n/10 i
@@ -435,7 +435,7 @@ Don't change this file in any respect.
 ...\glue(\spaceskip) 5.24995
 ...\OT1/cmtt/m/n/10 h
 ...\OT1/cmtt/m/n/10 y
-...\OT1/cmtt/m/n/10 -
+...\OT1/cmtt/m/n/10 +
 ...\discretionary (penalty 50)
 ...\glue(\rightskip) 0.0
 ..\penalty 400
@@ -444,15 +444,15 @@ Don't change this file in any respect.
 ...\OT1/cmtt/m/n/10 p
 ...\OT1/cmtt/m/n/10 h
 ...\discretionary (penalty 50)
-....< \OT1/cmtt/m/n/10 -
+....< \OT1/cmtt/m/n/10 +
 ...\OT1/cmtt/m/n/10 e
 ...\OT1/cmtt/m/n/10 n
 ...\discretionary (penalty 50)
-....< \OT1/cmtt/m/n/10 -
+....< \OT1/cmtt/m/n/10 +
 ...\OT1/cmtt/m/n/10 a
 ...\OT1/cmtt/m/n/10 t
 ...\discretionary (penalty 50)
-....< \OT1/cmtt/m/n/10 -
+....< \OT1/cmtt/m/n/10 +
 ...\OT1/cmtt/m/n/10 i
 ...\OT1/cmtt/m/n/10 o
 ...\OT1/cmtt/m/n/10 n
diff --git a/base/testfiles/tlb3855.lvt b/base/testfiles/tlb3855.lvt
index c3d4a0a1..170b158c 100644
--- a/base/testfiles/tlb3855.lvt
+++ b/base/testfiles/tlb3855.lvt
@@ -10,7 +10,11 @@
 hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyp\-henation
 
 
-\hyphenchar\font`\+
+\ifx\prehyphenchar\undefined
+  \hyphenchar\font`\+
+\else
+  \prehyphenchar`\+
+\fi
 
 hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyphenation hyp\-henation
 





More information about the latex3-commits mailing list.