make 8-bit chars work in CFF Notice and Copyright fields
git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@301 4cde692c-a291-49d1-8350-778aa11640f8
This commit is contained in:
parent
ff6a25cdb9
commit
e2ca9b5a4f
@ -1,7 +1,7 @@
|
|||||||
"""cffLib.py -- read/write tools for Adobe CFF fonts."""
|
"""cffLib.py -- read/write tools for Adobe CFF fonts."""
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Id: cffLib.py,v 1.26 2002-07-23 16:42:11 jvr Exp $
|
# $Id: cffLib.py,v 1.27 2002-09-09 14:18:39 jvr Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
import struct, sstruct
|
import struct, sstruct
|
||||||
@ -385,6 +385,7 @@ class GlobalSubrsIndex(Index):
|
|||||||
sel = fdSelect[index]
|
sel = fdSelect[index]
|
||||||
return self[index], sel
|
return self[index], sel
|
||||||
|
|
||||||
|
|
||||||
class SubrsIndex(GlobalSubrsIndex):
|
class SubrsIndex(GlobalSubrsIndex):
|
||||||
compilerClass = SubrsCompiler
|
compilerClass = SubrsCompiler
|
||||||
|
|
||||||
@ -570,6 +571,12 @@ class SimpleConverter:
|
|||||||
def xmlRead(self, (name, attrs, content), parent):
|
def xmlRead(self, (name, attrs, content), parent):
|
||||||
return attrs["value"]
|
return attrs["value"]
|
||||||
|
|
||||||
|
class Latin1Converter(SimpleConverter):
|
||||||
|
def xmlRead(self, (name, attrs, content), parent):
|
||||||
|
s = unicode(attrs["value"], "utf-8")
|
||||||
|
return s.encode("latin-1")
|
||||||
|
|
||||||
|
|
||||||
def parseNum(s):
|
def parseNum(s):
|
||||||
try:
|
try:
|
||||||
value = int(s)
|
value = int(s)
|
||||||
@ -840,8 +847,8 @@ topDictOperators = [
|
|||||||
((12, 30), 'ROS', ('SID','SID','number'), None, ROSConverter()),
|
((12, 30), 'ROS', ('SID','SID','number'), None, ROSConverter()),
|
||||||
((12, 20), 'SyntheticBase', 'number', None, None),
|
((12, 20), 'SyntheticBase', 'number', None, None),
|
||||||
(0, 'version', 'SID', None, None),
|
(0, 'version', 'SID', None, None),
|
||||||
(1, 'Notice', 'SID', None, None),
|
(1, 'Notice', 'SID', None, Latin1Converter()),
|
||||||
((12, 0), 'Copyright', 'SID', None, None),
|
((12, 0), 'Copyright', 'SID', None, Latin1Converter()),
|
||||||
(2, 'FullName', 'SID', None, None),
|
(2, 'FullName', 'SID', None, None),
|
||||||
((12, 38), 'FontName', 'SID', None, None),
|
((12, 38), 'FontName', 'SID', None, None),
|
||||||
(3, 'FamilyName', 'SID', None, None),
|
(3, 'FamilyName', 'SID', None, None),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user