From d2e85a3aa36b991b2bebaeb6466e0617b421975a Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Wed, 15 Feb 2017 19:10:59 +0000
Subject: [PATCH] Apply draft parser patch from Henrik to improve the patch on
 trunk to combine paragraphs across page splits - this makes the country part
 of the parser find more countries  - Legacy-Id: 12848

---
 ietf/utils/draft.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index 4bc0365d0..603a63afa 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -196,7 +196,7 @@ class Draft():
         line = ""
         newpage = False
         sentence = False
-        shortline = False
+        shortprev = False
         blankcount = 0
         linecount = 0
         # two functions with side effects
@@ -238,7 +238,7 @@ class Draft():
             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,7 +263,9 @@ class Draft():
                 sentence = True
             if re.search("[^ \t]", line):
                 if newpage:
-                    if sentence or shortline:
+                    # 36 is a somewhat arbitrary count for a 'short' line
+                    shortthis = len(line.strip()) < 36 # 36 is a somewhat arbitrary count for a 'short' line
+                    if sentence or (shortprev and not shortthis):
                         stripped += [""]
                 else:
                     if blankcount:
@@ -271,7 +273,7 @@ class Draft():
                 blankcount = 0
                 sentence = False
                 newpage = False
-                shortline = len(line.strip()) < 18
+                shortprev = len(line.strip()) < 36 # 36 is a somewhat arbitrary count for a 'short' line
             if re.search("[.:]$", line):
                 sentence = True
             if re.search("^[ \t]*$", line):