Mailing-List: contact commits-help@xmlgraphics.apache.org; run by ezmlm
Precedence: bulk
Reply-To: general@xmlgraphics.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1395896 -
 /xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/fonts/Glyphs.java
Date: Tue, 09 Oct 2012 08:04:42 -0000
To: commits@xmlgraphics.apache.org
From: jeremias@apache.org
Message-Id: <20121009080442.CD7A523888FE@eris.apache.org>

Author: jeremias
Date: Tue Oct  9 08:04:42 2012
New Revision: 1395896

URL: http://svn.apache.org/viewvc?rev=1395896&view=rev
Log:
Reverted revision 990212 and instead deprecated Glyphs.MAC_GLYPH_NAMES for backwards-compatibility with Apache FOP 1.0.

Modified:
    xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/fonts/Glyphs.java

Modified: xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/fonts/Glyphs.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/fonts/Glyphs.java?rev=1395896&r1=1395895&r2=1395896&view=diff
==============================================================================
--- xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/fonts/Glyphs.java (original)
+++ xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/fonts/Glyphs.java Tue Oct  9 08:04:42 2012
@@ -45,6 +45,71 @@ public final class Glyphs {
     public static final String NOTDEF = ".notdef";
 
     /**
+     * Glyph names for Mac encoding
+     * @deprecated That array was supposed to represent the standard Macintosh ordering
+     *      of glyphs in a TrueType font (it does NOT correspond to the MacRoman encoding).
+     *      In addition some entries are incorrect.
+     */
+    @Deprecated
+    public static final String[] MAC_GLYPH_NAMES = {
+        /* 0x00 */
+        Glyphs.NOTDEF, ".null", "CR", "space", "exclam", "quotedbl", "numbersign",
+                "dollar", "percent", "ampersand", "quotesingle", "parenleft",
+                "parenright", "asterisk", "plus", "comma", /* 0x10 */
+        "hyphen", "period", "slash", "zero", "one", "two", "three", "four",
+                  "five", "six", "seven", "eight", "nine", "colon",
+                  "semicolon", "less", /* 0x20 */
+        "equal", "greater", "question", "at", "A", "B", "C", "D", "E", "F",
+                 "G", "H", "I", "J", "K", "L", /* 0x30 */
+        "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
+             "bracketleft", "backslash", /* 0x40 */
+        "bracketright", "asciicircum", "underscore", "grave", "a", "b", "c",
+                        "d", "e", "f", "g", "h", "i", "j", "k", "l",
+                        /* 0x50 */
+        "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+             "braceleft", "bar", /* 0x60 */
+        "braceright", "asciitilde", "Adieresis", "Aring", "Ccedilla",
+                      "Eacute", "Ntilde", "Odieresis", "Udieresis", "aacute",
+                      "agrave", "acircumflex", "adieresis", "atilde",
+                      "aring", "ccedilla", /* 0x70 */
+        "eacute", "egrave", "ecircumflex", "edieresis", "iacute", "igrave",
+                  "icircumflex", "idieresis", "ntilde", "oacute", "ograve",
+                  "ocircumflex", "odieresis", "otilde", "uacute", "ugrave",
+                  /* 0x80 */
+        "ucircumflex", "udieresis", "dagger", "degree", "cent", "sterling",
+                       "section", "bullet", "paragraph", "germandbls",
+                       "registered", "copyright", "trademark", "acute",
+                       "dieresis", "notequal", /* 0x90 */
+        "AE", "Oslash", "infinity", "plusminus", "lessequal", "greaterequal",
+              "yen", "mu", "partialdiff", "Sigma", "Pi", "pi", "integral",
+              "ordfeminine", "ordmasculine", "Omega", /* 0xa0 */
+        "ae", "oslash", "questiondown", "exclamdown", "logicalnot",
+              "radical", "florin", "approxequal", "Delta", "guillemotleft",
+              "guillemotright", "ellipsis", "nbspace", "Agrave", "Atilde",
+              "Otilde", /* 0xb0 */
+        "OE", "oe", "endash", "emdash", "quotedblleft", "quotedblright",
+              "quoteleft", "quoteright", "divide", "lozenge", "ydieresis",
+              "Ydieresis", "fraction", "currency", "guilsinglleft",
+              "guilsinglright", /* 0xc0 */
+        "fi", "fl", "daggerdbl", "periodcentered", "quotesinglbase",
+              "quotedblbase", "perthousand", "Acircumflex", "Ecircumflex",
+              "Aacute", "Edieresis", "Egrave", "Iacute", "Icircumflex",
+              "Idieresis", "Igrave", /* 0xd0 */
+        "Oacute", "Ocircumflex", "applelogo", "Ograve", "Uacute",
+                  "Ucircumflex", "Ugrave", "dotlessi", "circumflex", "tilde",
+                  "macron", "breve", "dotaccent", "ring", "cedilla",
+                  "hungarumlaut", /* 0xe0 */
+        "ogonek", "caron", "Lslash", "lslash", "Scaron", "scaron", "Zcaron",
+                  "zcaron", "brokenbar", "Eth", "eth", "Yacute", "yacute",
+                  "Thorn", "thorn", "minus", /* 0xf0 */
+        "multiply", "onesuperior", "twosuperior", "threesuperior", "onehalf",
+                    "onequarter", "threequarters", "franc", "Gbreve",
+                    "gbreve", "Idot", "Scedilla", "scedilla", "Cacute",
+                    "cacute", "Ccaron", /* 0x100 */
+        "ccaron", "dmacron"
+    };
+
+    /**
      * Glyph names for tex8r encoding
      */
     public static final String[] TEX8R_GLYPH_NAMES = {
@@ -729,6 +794,7 @@ public final class Glyphs {
      * @deprecated User getUnicodeCodePointsForGlyphName instead. This method only returns the
      *          first Unicode code point it finds.
      */
+    @Deprecated
     public static String glyphToString(String name) {
         for (int i = 0; i < UNICODE_GLYPHS.length; i += 2) {
             if (UNICODE_GLYPHS[i + 1].equals(name)) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org