Index: src/java/org/apache/fop/render/ps/PSFontUtils.java
===================================================================
--- src/java/org/apache/fop/render/ps/PSFontUtils.java (revision 891141)
+++ src/java/org/apache/fop/render/ps/PSFontUtils.java (working copy)
@@ -156,6 +156,10 @@
//ignore (no encoding redefinition)
} else if ("ZapfDingbatsEncoding".equals(tf.getEncodingName())) {
//ignore (no encoding redefinition)
+ } else if ("AdobeStandardCyrillicEncoding".equals(tf.getEncodingName())) {
+ if (!tracker.isResourceSupplied(ADOBECYRILLIC_ENCODING_RESOURCE)) {
+ defineAdobeCyrillicEncoding(gen);
+ }
} else {
if (tf instanceof Base14Font) {
//Our Base 14 fonts don't use the default encoding
Index: src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
===================================================================
--- src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (revision 891141)
+++ src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (working copy)
@@ -140,9 +140,12 @@
//Encoding
if (afm != null) {
String encoding = afm.getEncodingScheme();
+ //System.out.println(encoding);
singleFont.setUseNativeEncoding(true);
if ("AdobeStandardEncoding".equals(encoding)) {
singleFont.setEncoding(CodePointMapping.STANDARD_ENCODING);
+ } else if ("AdobeStandardCyrillic".equals(encoding)) {
+ singleFont.setEncoding(CodePointMapping.ADOBE_CYRILLIC_ENCODING);
} else {
String effEncodingName;
if ("FontSpecific".equals(encoding)) {
Index: src/java/org/apache/fop/fonts/type1/PFMFile.java
===================================================================
--- src/java/org/apache/fop/fonts/type1/PFMFile.java (revision 891141)
+++ src/java/org/apache/fop/fonts/type1/PFMFile.java (working copy)
@@ -310,6 +310,8 @@
break;
case 128:
return "Shift-JIS (Japanese)";
+ case 204:
+ return "AdobeStandardCyrillic";
default:
log.warn("Unknown charset detected (" + dfCharSet
+ ", 0x" + Integer.toHexString(dfCharSet)
Index: src/codegen/fonts/encodings.xml
===================================================================
--- src/codegen/fonts/encodings.xml (revision 891141)
+++ src/codegen/fonts/encodings.xml (working copy)
@@ -1647,7 +1647,231 @@
-