From 56817dc4fac133c2e72d90570859e215b155ccc6 Mon Sep 17 00:00:00 2001 From: luigi Date: Sat, 16 Apr 2016 12:45:56 +0000 Subject: [PATCH] no longer fallback to index when we have tounicodes (HH) git-svn-id: https://foundry.supelec.fr/svn/luatex/trunk@5939 0b2b3880-5936-4365-a048-eb17d2e5a6bf --- source/texk/web2c/luatexdir/font/tounicode.w | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/texk/web2c/luatexdir/font/tounicode.w b/source/texk/web2c/luatexdir/font/tounicode.w index c213eee72..441a10dd5 100644 --- a/source/texk/web2c/luatexdir/font/tounicode.w +++ b/source/texk/web2c/luatexdir/font/tounicode.w @@ -285,16 +285,19 @@ static void set_cid_glyph_unicode(long index, glyph_unicode_entry * gp, internal_font_number f) { char *s; - if (font_tounicode(f) && - (s = get_charinfo_tounicode(char_info(f, (int) index))) != NULL) { - gp->code = UNI_EXTRA_STRING; - gp->unicode_seq = xstrdup(s); + if (font_tounicode(f)) { + if ((s = get_charinfo_tounicode(char_info(f, (int) index))) != NULL) { + gp->code = UNI_EXTRA_STRING; + gp->unicode_seq = xstrdup(s); + } else { + /* no fallback as we're providing them ourselves */ + } } else { - gp->code = index; /* fallback */ + /* fallback */ + gp->code = index; } } - @ @c int write_tounicode(PDF pdf, char **glyph_names, char *name) { -- 2.11.4.GIT