From fc724ee279505d44d850bcbf5f01766814448230 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 12 May 2016 22:12:56 +0000 Subject: dvipdfm-x: patch from H. Kitagawa git-svn-id: svn://tug.org/texlive/trunk@41072 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 5 +++++ Build/source/texk/dvipdfm-x/cidtype2.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index d6af5307706..cb10d0e3ecc 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2016-05-10 Hironori Kitagawa + + * cidtype2.c: Fix bugs in horizontal-vertical mixed scripts by + TrueType fonts. + 2016-05-08 Masamichi HOSODA * dvi.c, dvipdfmx.c, dvipdfmx.h, special.c: Add new specials to handle diff --git a/Build/source/texk/dvipdfm-x/cidtype2.c b/Build/source/texk/dvipdfm-x/cidtype2.c index ba8b4c93b77..a7cad383a74 100644 --- a/Build/source/texk/dvipdfm-x/cidtype2.c +++ b/Build/source/texk/dvipdfm-x/cidtype2.c @@ -653,10 +653,14 @@ CIDFont_type2_dofont (CIDFont *font) c = h_used_chars[i]; break; } + } + for (i = 8191; i >= 0; i--) { if (v_used_chars && v_used_chars[i] != 0) { - last_cid = i * 8 + 7; - c = v_used_chars[i]; - break; + if (i * 8 + 7 >= last_cid) { + c = (i * 8 + 7 > last_cid) ? (v_used_chars[i]) : (c | v_used_chars[i]); + last_cid = i * 8 + 7; + break; + } } } if (last_cid > 0) { -- cgit v1.2.3