renaming, refactoring.

git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@249 4cde692c-a291-49d1-8350-778aa11640f8
This commit is contained in:
jvr 2002-05-17 20:04:05 +00:00
parent 155aa7569f
commit 7ce02ea9df

View File

@ -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.18 2002-05-17 19:58:49 jvr Exp $ # $Id: cffLib.py,v 1.19 2002-05-17 20:04:05 jvr Exp $
# #
import struct, sstruct import struct, sstruct
@ -263,7 +263,9 @@ def buildConverters(table):
return d return d
class XMLConverter: class BaseConverter:
def read(self, parent, value):
return value
def xmlWrite(self, xmlWriter, name, value): def xmlWrite(self, xmlWriter, name, value):
xmlWriter.begintag(name) xmlWriter.begintag(name)
xmlWriter.newline() xmlWriter.newline()
@ -271,7 +273,7 @@ class XMLConverter:
xmlWriter.endtag(name) xmlWriter.endtag(name)
xmlWriter.newline() xmlWriter.newline()
class PrivateDictConverter(XMLConverter): class PrivateDictConverter(BaseConverter):
def read(self, parent, value): def read(self, parent, value):
size, offset = value size, offset = value
file = parent.file file = parent.file
@ -282,13 +284,13 @@ class PrivateDictConverter(XMLConverter):
pr.decompile(data) pr.decompile(data)
return pr return pr
class SubrsConverter(XMLConverter): class SubrsConverter(BaseConverter):
def read(self, parent, value): def read(self, parent, value):
file = parent.file file = parent.file
file.seek(parent.offset + value) # Offset(self) file.seek(parent.offset + value) # Offset(self)
return CharStringIndex(file, name="SubrsIndex") return CharStringIndex(file, name="SubrsIndex")
class CharStringsConverter(XMLConverter): class CharStringsConverter(BaseConverter):
def read(self, parent, value): def read(self, parent, value):
file = parent.file file = parent.file
charset = parent.charset charset = parent.charset
@ -361,7 +363,7 @@ def parseCharset(numGlyphs, file, strings, isCID, format):
return charset return charset
class FDArrayConverter(XMLConverter): class FDArrayConverter(BaseConverter):
def read(self, parent, value): def read(self, parent, value):
file = parent.file file = parent.file
file.seek(value) file.seek(value)
@ -402,9 +404,7 @@ class FDSelectConverter:
pass pass
class ROSConverter: class ROSConverter(BaseConverter):
def read(self, parent, value):
return value
def xmlWrite(self, xmlWriter, name, value): def xmlWrite(self, xmlWriter, name, value):
registry, order, supplement = value registry, order, supplement = value
xmlWriter.simpletag(name, [('registry', registry), ('order', order), xmlWriter.simpletag(name, [('registry', registry), ('order', order),