Rename repeatOffset to aux
To be used for other purposes soon.
diff --git a/Lib/fontTools/ttLib/tables/otBase.py b/Lib/fontTools/ttLib/tables/otBase.py
index adf4fc6..758aa3c 100644
--- a/Lib/fontTools/ttLib/tables/otBase.py
+++ b/Lib/fontTools/ttLib/tables/otBase.py
@@ -551,7 +551,7 @@
else:
# conv.repeat is a propagated count
countValue = reader.getCount(conv.repeat)
- for i in range(countValue + conv.repeatOffset):
+ for i in range(countValue + conv.aux):
l.append(conv.read(reader, font, table))
table[conv.name] = l
else:
@@ -582,7 +582,7 @@
if conv.repeat:
if value is None:
value = []
- countValue = len(value) - conv.repeatOffset
+ countValue = len(value) - conv.aux
if conv.repeat in table:
ref = table[conv.repeat]
table[conv.repeat] = None
diff --git a/Lib/fontTools/ttLib/tables/otConverters.py b/Lib/fontTools/ttLib/tables/otConverters.py
index 0ddc04d..81d78c9 100644
--- a/Lib/fontTools/ttLib/tables/otConverters.py
+++ b/Lib/fontTools/ttLib/tables/otConverters.py
@@ -8,7 +8,7 @@
the results are assigned to the corresponding class in otTables.py."""
converters = []
convertersByName = {}
- for tp, name, repeat, repeatOffset, descr in tableSpec:
+ for tp, name, repeat, aux, descr in tableSpec:
if name.startswith("ValueFormat"):
assert tp == "uint16"
converterClass = ValueFormat
@@ -22,13 +22,13 @@
else:
converterClass = converterMapping[tp]
tableClass = tableNamespace.get(name)
- conv = converterClass(name, repeat, repeatOffset, tableClass)
+ conv = converterClass(name, repeat, aux, tableClass)
if name in ["SubTable", "ExtSubTable"]:
conv.lookupTypes = tableNamespace['lookupTypes']
# also create reverse mapping
for t in conv.lookupTypes.values():
for cls in t.values():
- convertersByName[cls.__name__] = Table(name, repeat, repeatOffset, cls)
+ convertersByName[cls.__name__] = Table(name, repeat, aux, cls)
converters.append(conv)
assert not convertersByName.has_key(name)
convertersByName[name] = conv
@@ -40,10 +40,10 @@
"""Base class for converter objects. Apart from the constructor, this
is an abstract class."""
- def __init__(self, name, repeat, repeatOffset, tableClass):
+ def __init__(self, name, repeat, aux, tableClass):
self.name = name
self.repeat = repeat
- self.repeatOffset = repeatOffset
+ self.aux = aux
self.tableClass = tableClass
self.isCount = name.endswith("Count")
self.isPropagatedCount = name in ["ClassCount", "Class2Count"]
@@ -226,7 +226,7 @@
class SubTable(Table):
def getConverter(self, tableType, lookupType):
tableClass = self.lookupTypes[tableType][lookupType]
- return self.__class__(self.name, self.repeat, self.repeatOffset, tableClass)
+ return self.__class__(self.name, self.repeat, self.aux, tableClass)
class ExtSubTable(LTable, SubTable):
@@ -237,8 +237,8 @@
class ValueFormat(IntValue):
- def __init__(self, name, repeat, repeatOffset, tableClass):
- BaseConverter.__init__(self, name, repeat, repeatOffset, tableClass)
+ def __init__(self, name, repeat, aux, tableClass):
+ BaseConverter.__init__(self, name, repeat, aux, tableClass)
self.which = name[-1] == "2"
def read(self, reader, font, tableDict):
format = reader.readUShort()