[poppler] 2 commits - fofi/FoFiTrueType.cc

[Albert Astals Cid]

 fofi/FoFiTrueType.cc |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e9a066c3a53cc1cb73dd43a243390ae4e3c76ca3
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Mar 28 23:33:37 2012 +0200

    Fix another typo in macGlyphNames

diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc
index d94cb0e..c777d02 100644
--- a/fofi/FoFiTrueType.cc
+++ b/fofi/FoFiTrueType.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
 // Copyright (C) 2007 Koji Otani <sho at bbr.jp>
 // Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright (C) 2008, 2009 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2009, 2012 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare at gmail.com>
 // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
 // Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
@@ -234,7 +234,7 @@ static const char *macGlyphNames[258] = {
   "AE",             "Oslash",         "infinity",       "plusminus",
   "lessequal",      "greaterequal",   "yen",            "mu",
   "partialdiff",    "summation",      "product",        "pi",
-  "integral",       "ordfeminine",    "ordmasculine",   "Ohm",
+  "integral",       "ordfeminine",    "ordmasculine",   "Omega",
   "ae",             "oslash",         "questiondown",   "exclamdown",
   "logicalnot",     "radical",        "florin",         "approxequal",
   "increment",      "guillemotleft",  "guillemotright", "ellipsis",
commit 3d277b230e806a648fcc6d9e7af39370aa89c2ae
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Feb 18 09:19:51 2012 +1030

    Fix typo in "mu" glyph name in truetype 'post' table standard mac ordering
    
    The standard mac ordering table is at:
    
    https://developer.apple.com/fonts/ttrefman/rm06/Chap6post.html

diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc
index d0bc800..d94cb0e 100644
--- a/fofi/FoFiTrueType.cc
+++ b/fofi/FoFiTrueType.cc
@@ -19,6 +19,7 @@
 // Copyright (C) 2008, 2009 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare at gmail.com>
 // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
+// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -231,7 +232,7 @@ static const char *macGlyphNames[258] = {
   "paragraph",      "germandbls",     "registered",     "copyright",
   "trademark",      "acute",          "dieresis",       "notequal",
   "AE",             "Oslash",         "infinity",       "plusminus",
-  "lessequal",      "greaterequal",   "yen",            "mu1",
+  "lessequal",      "greaterequal",   "yen",            "mu",
   "partialdiff",    "summation",      "product",        "pi",
   "integral",       "ordfeminine",    "ordmasculine",   "Ohm",
   "ae",             "oslash",         "questiondown",   "exclamdown",