change blank line insertion at a few places and fix recursion bug for </var>

diff --git a/Lib/htmllib.py b/Lib/htmllib.py
index 38312c6670850d6fc1dce0eba4b71c4b069630df..55914299e1a81c5a317c77394d33cd821d563bb2 100644 (file)
--- a/Lib/htmllib.py
+++ b/Lib/htmllib.py
@@ -227,7 +227,7 @@ class HTMLParser(SGMLParser):
         self.formatter.push_margin('blockquote')
 
     def end_blockquote(self):
-        self.formatter.end_paragraph(0)
+        self.formatter.end_paragraph(1)
         self.formatter.pop_margin()
 
     # --- List Elements
@@ -279,11 +279,11 @@ class HTMLParser(SGMLParser):
         self.end_ul()
 
     def start_dl(self, attrs):
-        self.formatter.end_paragraph(0)
+        self.formatter.end_paragraph(1)
         self.list_stack.append(['dl', '', 0])
 
     def end_dl(self):
-        self.ddpop()
+        self.ddpop(1)
         if self.list_stack: del self.list_stack[-1]
 
     def do_dt(self, attrs):
@@ -294,8 +294,8 @@ class HTMLParser(SGMLParser):
         self.formatter.push_margin('dd')
         self.list_stack.append(['dd', '', 0])
 
-    def ddpop(self):
-        self.formatter.end_paragraph(0)
+    def ddpop(self, bl=0):
+        self.formatter.end_paragraph(bl)
         if self.list_stack:
             if self.list_stack[-1][0] == 'dd':
                del self.list_stack[-1]
@@ -320,11 +320,11 @@ class HTMLParser(SGMLParser):
     def start_samp(self, attrs): self.start_tt(attrs)
     def end_samp(self): self.end_tt()
 
-    def start_string(self, attrs): self.start_b(attrs)
-    def end_b(self): self.end_b()
+    def start_strong(self, attrs): self.start_b(attrs)
+    def end_strong(self): self.end_b()
 
     def start_var(self, attrs): self.start_i(attrs)
-    def end_var(self): self.end_var()
+    def end_var(self): self.end_i()
 
     # Typographic Elements