From ce36d1adbc5be2327f06e85f256ed9d96a9224af Mon Sep 17 00:00:00 2001
From: Lionel Dricot <git@ploum.eu>
Date: Sun, 20 Mar 2022 11:29:06 +0100
Subject: [PATCH] NewHTML: add title before pictures

---
 offpunk.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/offpunk.py b/offpunk.py
index 24b7ef9..9f9cb5e 100755
--- a/offpunk.py
+++ b/offpunk.py
@@ -919,6 +919,8 @@ class HtmlRenderer(AbstractRenderer):
                 self.s_indent = indent
             if reverse:
                 self.r_indent = reverse
+            else:
+                self.r_indent = ""
 
 
         def endindent(self):
@@ -942,20 +944,9 @@ class HtmlRenderer(AbstractRenderer):
                 self.final_text += "\n"
                 self.new_paragraph = True
 
-        @debug
-        def add_block(self,intext):
-            if intext.strip("\n") != "":
-                self._endline(newline=False)
-                self.final_text += self.current_indent + intext
-            #for l in intext.splitlines():
-            #    self.final_text += l
-            self._endline()
-                #self.new_paragraph = True
-
-        @debug
-        def add_text(self,intext):
+        def _title_first(self,intext):
             if self.title:
-                if not self.title[:(self.width-1)] in intext:
+                if not self.title == intext:
                     self.open_color("blue")
                     self.open_color("bold")
                     self.open_color("underline")
@@ -963,6 +954,21 @@ class HtmlRenderer(AbstractRenderer):
                     self.close_all()
                     self.newparagraph()
                 self.title = None
+
+        @debug
+        # Beware, blocks are not wrapped and left untouched!
+        # They are mostly useful for pictures
+        def add_block(self,intext):
+            # We always add the title before a block
+            self._title_first(None)
+            if intext.strip("\n") != "":
+                self._endline(newline=False)
+                self.final_text += self.current_indent + intext
+            self._endline()
+
+        @debug
+        def add_text(self,intext):
+            self._title_first(intext)
             lines = []
             last = self.last_line + intext
             self.last_line = ""