summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-12-13 22:19:27 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-12-13 22:19:27 +0000
commit636e968b2d572750b0f4ec86ad3194375c4344e8 (patch)
treec5a7a48755814a77c21015ae4fbfca8afaa2b8d8
parent39109ece01b0a29d2006e0d1364c30892bba60be (diff)
luatex: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@57131 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog3
-rw-r--r--Build/source/texk/web2c/luatexdir/lang/texlang.c4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index df08c7c87c0..b18c96f90f3 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,6 @@
+2020-12-13 Luigi Scarso <luigi.scarso@gmail.com>
+ * fixed Hyphenation issue regarding frozen glyph nodes (M.F. Krüger)
+
2020-12-12 Luigi Scarso <luigi.scarso@gmail.com>
* fixed luatex segfault with huge romannumeral overfull (H. Hagen)
* automake (GNU automake) 1.16.3
diff --git a/Build/source/texk/web2c/luatexdir/lang/texlang.c b/Build/source/texk/web2c/luatexdir/lang/texlang.c
index 453d51404c6..ba7614ffafc 100644
--- a/Build/source/texk/web2c/luatexdir/lang/texlang.c
+++ b/Build/source/texk/web2c/luatexdir/lang/texlang.c
@@ -1055,7 +1055,7 @@ void hnj_hyphenation(halfword head, halfword tail)
if (explicit_hyphen == true) {
/*tex we are not at the start, so we only need to look ahead */
halfword t = vlink(r) ;
- if ((automatic_hyphen_mode_par == 0 || automatic_hyphen_mode_par == 1) && (t != null) && ((type(t) == glyph_node) && (character(t) != ex_hyphen_char_par))) {
+ if ((automatic_hyphen_mode_par == 0 || automatic_hyphen_mode_par == 1) && (t != null) && ((type(t) == glyph_node) && is_simple_character(t) && (character(t) != ex_hyphen_char_par))) {
/*tex we have a word already but the next character may not be a hyphen too */
r = compound_word_break(r, char_lang(r));
if (compound_hyphen) {
@@ -1069,7 +1069,7 @@ void hnj_hyphenation(halfword head, halfword tail)
}
} else {
/*tex we jump over the sequence of hyphens */
- while ((t != null) && (type(t) == glyph_node) && (character(t) == ex_hyphen_char_par)) {
+ while ((t != null) && (type(t) == glyph_node) && is_simple_character(t) && (character(t) == ex_hyphen_char_par)) {
r = t ;
t = vlink(r) ;
}
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 6b0f5bcc71c..9853536478f 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 7388
+#define luatex_svn_revision 7389