Author: jahewson
Date: Fri Nov 6 18:08:52 2015
New Revision: 1713005
URL: http://svn.apache.org/viewvc?rev=1713005&view=rev
Log:
PDFBOX-2950: handle ROS cmap lookup differently
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1713005&r1=1713004&r2=1713005&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Fri Nov 6 18:08:52 2015
@@ -227,13 +227,14 @@ public class PDType0Font extends PDFont
// c) Construct a second CMap name by concatenating the ROS in the
format "R-O-UCS2"
// d) Obtain the CMap with the constructed name
// e) Map the CID according to the CMap from step d), producing a
Unicode value
-
+
+ // todo: not sure how to interpret the PDF spec here, do we always
override? or only when Identity-H/V?
String strName = null;
- if (name == null && isDescendantCJK)
+ if (isDescendantCJK)
{
- strName = cMap.getRegistry() + "-" +
- cMap.getOrdering() + "-" +
- cMap.getSupplement();
+ strName = descendantFont.getCIDSystemInfo().getRegistry() +
"-" +
+ descendantFont.getCIDSystemInfo().getOrdering() +
"-" +
+ descendantFont.getCIDSystemInfo().getSupplement();
}
else if (name != null)
{
