1 files changed, 18 insertions, 20 deletions

diff --git a/src/sdp/output_xhtmls.d b/src/sdp/output_xhtmls.d
index 804b82f..b85123e 100644
--- a/src/sdp/output_xhtmls.d
+++ b/src/sdp/output_xhtmls.d
@@ -25,7 +25,8 @@ template outputXHTMLs() {
     create_zip_file,
     defaults,
     output_rgx,
-    output_xhtmls;
+    output_xhtmls,
+    paths_output;
   mixin SiSUoutputRgxInit;
   struct outputXHTMLs {
     auto rgx = Rgx();
@@ -146,7 +147,6 @@ template outputXHTMLs() {
       string o;
       o = format(q"¶  <a name="bottom" id="bottom"></a>
       <a name="end" id="end"></a>
-    </div>
     </body>
     </html>¶");
       return o;
@@ -204,7 +204,7 @@ template outputXHTMLs() {
       if (obj.inline_notes_reg) {
         _txt = (_txt).replaceAll(
           rgx.inline_notes_delimiter_al_regular_number_note,
-          ("<a href=\"#note_$1\"><note id=\"noteref_$1\">&#160;<sup>$1</sup>&#160;</note></a>")
+          ("<a href=\"#note_$1\"><note id=\"noteref_$1\">&#160;<sup>$1</sup> </note></a>")
         );
       }
       debug(markup_endnotes) {
@@ -251,7 +251,7 @@ template outputXHTMLs() {
         }
         _txt = (_txt).replaceAll(
           rgx.inline_notes_delimiter_al_regular_number_note,
-          ("<a href=\"#note_$1\"><note id=\"noteref_$1\">&#160;<sup>$1</sup>&#160;</note></a>")
+          ("<a href=\"#note_$1\"><note id=\"noteref_$1\">&#160;<sup>$1</sup> </note></a>")
         );
       } else if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
         debug(markup) {
@@ -305,14 +305,19 @@ template outputXHTMLs() {
       string                     _txt,
     ) {
       auto tags = _xhtml_anchor_tags(obj.anchor_tags);
+      string _horizontal_rule = "<hr />";
+      if  (obj.heading_lev_markup == 0) {
+        _horizontal_rule = "";
+      }
       string o;
       if (obj.obj_cite_number.empty) {
-        o = format(q"¶<br /><hr /><br />
+        o = format(q"¶%s
       <div class="substance">
         <h%s class="%s">%s
           %s
         </h%s>
       </div>¶",
+          _horizontal_rule,
           obj.heading_lev_markup,
           obj.is_a,
           tags,
@@ -320,13 +325,14 @@ template outputXHTMLs() {
           obj.heading_lev_markup,
         );
       } else {
-        o = format(q"¶<br /><hr /><br />
+        o = format(q"¶%s
       <div class="substance">
         <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
         <h%s class="%s" id="%s"><a name="%s"></a>%s
           %s
         </h%s>
       </div>¶",
+        _horizontal_rule,
         obj.obj_cite_number,
         obj.obj_cite_number,
         obj.heading_lev_markup,
@@ -541,25 +547,21 @@ template outputXHTMLs() {
       string o;
       if (obj.obj_cite_number.empty) {
         o = format(q"¶  <div class="substance">
-      <p class="%s">
-        %s
-      </p>
+      <p class="%s">%s</p>
     </div>¶",
           obj.is_a,
-          _txt
+          _txt.stripRight
         );
       } else {
         o = format(q"¶  <div class="substance">
       <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
-      <p class="%s" id="%s">
-        %s
-      </p>
+      <p class="%s" id="%s">%s</p>
     </div>¶",
           obj.obj_cite_number,
           obj.obj_cite_number,
           obj.is_a,
           obj.obj_cite_number,
-          _txt
+          _txt.stripRight
         );
       }
       return o;
@@ -600,9 +602,7 @@ template outputXHTMLs() {
       string o;
       if (obj.obj_cite_number.empty) {
           o = format(q"¶  <div class="substance">
-            <p class="%s">
-    %s
-          </p>
+            <p class="%s">%s</p>
         </div>¶",
           obj.is_a,
           _txt
@@ -610,9 +610,7 @@ template outputXHTMLs() {
       } else {
         o = format(q"¶  <div class="substance">
           <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label>
-          <p class="%s" id="%s">
-    %s
-          </p>
+          <p class="%s" id="%s">%s</p>
         </div>¶",
           obj.obj_cite_number,
           obj.obj_cite_number,