WIP

ferenda/pdfanalyze.py

@@ -129,13 +129,7 @@ def paginate(self, paginatepath=None, force=False):
             physical = "%s#page=%s" % (page.src.split(os.sep)[-1], page.number)
             pageskip = page.number - lastpagenumber
             lastpagenumber = page.number
-            if isinstance(currentpage, int):
-                currentpage += pageskip
-            elif util.is_roman(currentpage):
-                lower = currentpage.islower()
-                currentpage = util.to_roman(util.from_roman(currentpage)+pageskip, lower=lower)
-                if lower:
-                    currentpage = currentpage.lower()
+            currentpage = util.increment(currentpage, pageskip)
             pageguess = self.guess_pagenumber(page, currentpage)
             if pageguess is None:
                 if len(page) > 0:

ferenda/pdfreader.py

@@ -643,7 +643,7 @@ def _parse_xml_make_textbox(self, element, nextelement, after_footnote, lastbox,
         nextfont = self.fontspec[int(nextelement.get('font'))] if nextelement is not None and nextelement.get('font') else None
         if self.detect_footnotes:
             if (len(textelements) and
-                textelements[0].strip().isdigit() and
+                (textelements[0].strip().isdigit() and
                 # check both previous box and next (for catching footnote markers in the foooter)
                 (lastfont and
                  lastfont.family == thisfont['family'] and
@@ -658,7 +658,7 @@ def _parse_xml_make_textbox(self, element, nextelement, after_footnote, lastbox,
                     thisfont['size'] < nextfont['size'] and
                     -5 < int(nextelement.get("left")) - (int(element.get("left")) + int(element.get("width"))) < 10 and # is really close to
                     0 < (int(nextelement.get("top")) + int(nextelement.get("height"))) - (int(element.get("top")) + int(element.get("height"))) < 20) # is slightly lower than
-            ):
+            )):
                 # this must be a footnote -- alter tag to show that it
                 # should be rendered with superscript
                 if textelements[0].tag is None:
@@ -670,12 +670,12 @@ def _parse_xml_make_textbox(self, element, nextelement, after_footnote, lastbox,
 
                 # is it in the main text, ie immediately
                 # following the last textbox? Then append it to that textbox 
-                if abs(lastbox.right - int(attribs['left'])) < 3:
+                if lastbox and abs(lastbox.right - int(attribs['left'])) < 3:
                     # return a Box that the caller will merge with current
                     attribs['fontid'] = attribs.pop('font')
                     attribs['merge-with-current'] = True
                     return Textbox(textelements, **attribs)
-                elif min([x.left for x in page]) - int(attribs['left']) < 3:
+                elif min([x.left for x in page] + [0]) - int(attribs['left']) < 3:
                     # then create a new textbox and let
                     # the after_footnote magic append more
                     # textboxes to it. Note: we don't use