summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-05-12 22:12:56 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-05-12 22:12:56 +0000
commitfc724ee279505d44d850bcbf5f01766814448230 (patch)
treeea3ad9da462a3d8649ff61c9cd393f876bc73ecb /Build
parent50fb60ed1d9bee477b59a77d8e0ebd993265ac64 (diff)
dvipdfm-x: patch from H. Kitagawa
git-svn-id: svn://tug.org/texlive/trunk@41072 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/cidtype2.c10
2 files changed, 12 insertions, 3 deletions
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 <h_kitagawa2001@yahoo.co.jp>
+
+ * cidtype2.c: Fix bugs in horizontal-vertical mixed scripts by
+ TrueType fonts.
+
2016-05-08 Masamichi HOSODA <trueroad@trueroad.jp>
* 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) {