From 646a01d5517aba87c4cb0a10841e8febc03f3ae0 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sat, 7 Nov 2020 23:25:55 +0000 Subject: sync with the upstream git-svn-id: svn://tug.org/texlive/trunk@56877 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/lang/texlang.c | 13 ++++++++++++- Build/source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/luatexdir/lang/texlang.c b/Build/source/texk/web2c/luatexdir/lang/texlang.c index 323d27c5865..48a242fa09b 100644 --- a/Build/source/texk/web2c/luatexdir/lang/texlang.c +++ b/Build/source/texk/web2c/luatexdir/lang/texlang.c @@ -983,7 +983,18 @@ void hnj_hyphenation(halfword head, halfword tail) halfword hyf_font; halfword end_word = r; wordstart = r; - assert(is_simple_character(wordstart)); + /*assert(is_simple_character(wordstart));*/ + if (!(is_simple_character(wordstart))){ + if (!(is_character(wordstart))) { + tex_error("the word doesn't start with a character", NULL); + } else if (is_ligature(wordstart)) { + tex_error("the word starts with a ligature", NULL); + } else if (is_ghost(wordstart)) { + tex_error("the word starts with a ghost glyph", NULL); + } else { + tex_error("the word doesn't start with a simple character", NULL); + } + } hyf_font = font(wordstart); if (hyphen_char(hyf_font) < 0) { /*tex For backward compatibility we set: */ diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index 33a7f462889..818cae4af73 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 7384 +#define luatex_svn_revision 7385 -- cgit v1.2.3