Another tweak to handle page break paragraph joins better in class Draft.

 - Legacy-Id: 12840

Author: levkowetz

ietf/utils/draft.py

@@ -196,7 +196,7 @@ def _stripheaders(self):
         line = ""
         newpage = False
         sentence = False
-        shortline = False
+        shortprev = False
         blankcount = 0
         linecount = 0
         # two functions with side effects
@@ -238,7 +238,7 @@ def begpage(pages, page, newpage, line=None):
             if re.search("\f", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage)
                 continue
-            if re.search("^ *Internet.Draft.+   .+[12][0-9][0-9][0-9] *$", line, re.I):
+            if re.search("^ *Internet.Draft.+  .+[12][0-9][0-9][0-9] *$", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage, line)
                 continue
     #        if re.search("^ *Internet.Draft  +", line, re.I):
@@ -263,15 +263,17 @@ def begpage(pages, page, newpage, line=None):
                 sentence = True
             if re.search("[^ \t]", line):
                 if newpage:
-                    if sentence or shortline:
+                    # 33 is a somewhat arbitrary count for a 'short' line
+                    shortthis = len(line.strip()) < 33 # 33 is a somewhat arbitrary count for a 'short' line
+                    if sentence or (shortprev and not shortthis):
                         stripped += [""]
                 else:
                     if blankcount:
                         stripped += [""]*blankcount
                 blankcount = 0
                 sentence = False
                 newpage = False
-                shortline = len(line.strip()) < 18
+                shortprev = len(line.strip()) < 33 # 33 is a somewhat arbitrary count for a 'short' line
             if re.search("[.:]$", line):
                 sentence = True
             if re.search("^[ \t]*$", line):