[FOray-commit] SF.net SVN: foray:[11882] trunk/foray/foray-font/src/main/java/org/foray/ font

Revision: 11882
          http://sourceforge.net/p/foray/code/11882
Author:   victormote
Date:     2021-01-29 19:11:51 +0000 (Fri, 29 Jan 2021)
Log Message:
-----------
Fix some font encoding-related problems.

Modified Paths:
--------------
    trunk/foray/foray-font/src/main/java/org/foray/font/ConsumerFont4a.java
    trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/ConsumerFont4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/ConsumerFont4a.java	2021-01-29 18:17:41 UTC (rev 11881)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/ConsumerFont4a.java	2021-01-29 19:11:51 UTC (rev 11882)
@@ -274,6 +274,14 @@
     private Encoding getBestEncoding(final int codePoint) {
         Encoding trialEncoding = null;
         final Encoding internalEncoding = this.font.getInternalEncoding();
+        if (internalEncoding.canEncode(codePoint)) {
+            return internalEncoding;
+        }
+
+
+
+
+
         if (! (internalEncoding instanceof PsEncoding)) {
             /* Cmap4a encodings should be able to handle any character in the
              * font's character set. */

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java	2021-01-29 18:17:41 UTC (rev 11881)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java	2021-01-29 19:11:51 UTC (rev 11882)
@@ -143,13 +143,10 @@
             final String encodingName = this.metricsFile.getEncoding();
             PsEncoding encoding = null;
             final PsServer psServer = this.getRegisteredFont().getFontServer().getPsServer();
-            if (encodingName.equals("StandardEncoding")
-                    || encodingName.equals("AdobeStandardEncoding")) {
-                encoding = psServer.getPredefinedEncoding(PsEncoding.Predefined.WIN_ANSI);
+            final PsEncoding.Predefined predefined = PsEncoding.Predefined.findByName(encodingName);
+            if (predefined != null) {
+                encoding = psServer.getPredefinedEncoding(predefined);
             }
-            if (getRegisteredFont().getConfiguredFontName().equals("Symbol")) {
-                encoding = psServer.getPredefinedEncoding(PsEncoding.Predefined.SYMBOL);
-            }
             this.setInternalEncoding(encoding);
         }
         this.setCharSet(this.metricsFile.getCharSet());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.