Temporary fix for an encoding mismatch (WinAnsiEncoding vs. ISOLatin1). The hyphen...

Submitted by: Arnd Beissner <arnd.beissner@cappelino.de>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195877 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/render/ps/PSRenderer.java b/src/org/apache/fop/render/ps/PSRenderer.java
index 0d9abeaba57b07ce836eac527f4d74a3ba9dfb63..63a030900ceee2421c4776578274d3c097c8861b 100644 (file)
--- a/src/org/apache/fop/render/ps/PSRenderer.java
+++ b/src/org/apache/fop/render/ps/PSRenderer.java
@@ -1,6 +1,6 @@
 /*
  * $Id$
- * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 2001-2003 The Apache Software Foundation. All rights reserved.
  * For details on use and redistribution please refer to the
  * LICENSE file included with these sources.
  */
@@ -74,7 +74,8 @@ TODO-List:
   add a color to grayscale conversion for bitmaps to make output smaller (See
   PCLRenderer)
 - enhanced font support and font embedding
-- support different character encodings
+- fix character encodings (Helvetica uses WinAnsiEncoding internally but is
+  encoded as ISOLatin1 in PS)
 - try to implement image transparency
 - Add PPD support
 - fix border painting (see table.fo)
@@ -706,10 +707,15 @@ public class PSRenderer extends AbstractRenderer {
         for (int i = 0; i < l; i++) {
             char ch = s.charAt(i);
             char mch = fs.mapChar(ch);
-            if (mch > 127) {
+
+            /**@todo Do this in a clean way */
+            // temp fix abe: map ascii '-' to ISO latin 1 hyphen char
+            if (mch == '-') {
+              sb = sb.append("\\" + Integer.toOctalString(173));
+            } else /* fix ends */ if (mch > 127) {
                 sb = sb.append("\\" + Integer.toOctalString(mch));
             } else {
-                String escape = "\\()[]{}";
+                final String escape = "\\()[]{}";
                 if (escape.indexOf(mch) >= 0) {
                     sb.append("\\");
                 }