More general changes, and get mobidedrm and kindlekey to work on Mac.

This commit is contained in:
Apprentice Harper
2020-10-14 16:23:49 +01:00
parent e31752e334
commit 781268e17e
32 changed files with 479 additions and 497 deletions

View File

@@ -73,7 +73,7 @@ class PParser(object):
else:
end = min(self.docSize, end)
foundat = -1
for j in xrange(pos, end):
for j in range(pos, end):
item = self.flatdoc[j]
if item.find('=') >= 0:
(name, argres) = item.split('=',1)
@@ -101,7 +101,7 @@ class PParser(object):
def getData(self, path):
result = None
cnt = len(self.flatdoc)
for j in xrange(cnt):
for j in range(cnt):
item = self.flatdoc[j]
if item.find('=') >= 0:
(name, argt) = item.split('=')
@@ -113,7 +113,7 @@ class PParser(object):
result = argres
break
if (len(argres) > 0) :
for j in xrange(0,len(argres)):
for j in range(0,len(argres)):
argres[j] = int(argres[j])
return result
@@ -127,7 +127,7 @@ class PParser(object):
name = item
argres = []
if (len(argres) > 0) :
for j in xrange(0,len(argres)):
for j in range(0,len(argres)):
argres[j] = int(argres[j])
if (name.endswith(path)):
result = argres
@@ -136,7 +136,7 @@ class PParser(object):
def getDataTemp(self, path):
result = None
cnt = len(self.temp)
for j in xrange(cnt):
for j in range(cnt):
item = self.temp[j]
if item.find('=') >= 0:
(name, argt) = item.split('=')
@@ -149,7 +149,7 @@ class PParser(object):
self.temp.pop(j)
break
if (len(argres) > 0) :
for j in xrange(0,len(argres)):
for j in range(0,len(argres)):
argres[j] = int(argres[j])
return result
@@ -220,15 +220,15 @@ def convert2SVG(gdict, flat_xml, pageid, previd, nextid, svgDir, raw, meta_array
if (pp.gid != None):
mlst.append('<defs>\n')
gdefs = pp.getGlyphs()
for j in xrange(0,len(gdefs)):
for j in range(0,len(gdefs)):
mlst.append(gdefs[j])
mlst.append('</defs>\n')
img = pp.getImages()
if (img != None):
for j in xrange(0,len(img)):
for j in range(0,len(img)):
mlst.append(img[j])
if (pp.gid != None):
for j in xrange(0,len(pp.gid)):
for j in range(0,len(pp.gid)):
mlst.append('<use xlink:href="#gl%d" x="%d" y="%d" />\n' % (pp.gid[j], pp.gx[j], pp.gy[j]))
if (img == None or len(img) == 0) and (pp.gid == None or len(pp.gid) == 0):
xpos = "%d" % (pp.pw // 3)