housekeepingdoc-reform_v0.5.0

1 files changed, 16 insertions, 12 deletions

diff --git a/org/output_xmls.org b/org/output_xmls.org
index 1e4f91a..4a40323 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -103,7 +103,7 @@ string special_characters_text(string _txt){
 }
 #+END_SRC
 
-**** special characters text
+**** special characters
 
 #+name: xhtml_format_objects
 #+BEGIN_SRC d
@@ -413,7 +413,7 @@ auto epub3_seg_head(M)(
 #+BEGIN_SRC d
 auto tail() {
   string o;
-  o = format(q"┋  </div>
+  o = format(q"┋
   <a name="bottom" id="bottom"></a>
   <a name="end" id="end"></a>
 </body>
@@ -443,8 +443,8 @@ auto inline_images(O,M)(
     _img_pth = "../../../image/";
   }
   if (_txt.match(rgx.inline_image)) {
-    _txt = _txt.replaceAll(
-        rgx.inline_image,
+    _txt = _txt
+      .replaceAll(rgx.inline_image,
         ("$1<img src=\""
           ~ _img_pth
           ~ "$3\" width=\"$4\" height=\"$5\" naturalsizeflag=\"0\" align=\"bottom\" border=\"0\" /> $6"))
@@ -563,17 +563,17 @@ auto inline_notes_scroll(O,M)(
   if (obj.has.inline_notes_reg) {
     _txt = font_face(_txt);
     _txt = _txt.replaceAll(
-      rgx.inline_notes_delimiter_al_regular_number_note,
+      rgx.inline_notes_al_regular_number_note,
       ("<a href=\"#note_$1\"><note id=\"noteref_$1\">&#160;<sup>$1</sup> </note></a>")
     );
   }
   debug(markup_endnotes) {
-    if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
+    if (_txt.match(rgx.inline_notes_al_regular_number_note)) {
       writeln(__LINE__, " (missed) markup endnote: ", obj.metainfo.is_a, ": ", obj.text);
     }
   }
   debug(markup) {
-    if (_txt.match(rgx.inline_notes_delimiter_al_regular_number_note)) {
+    if (_txt.match(rgx.inline_notes_al_regular_number_note)) {
       writeln(__LINE__, " (missed) markup endnote: ", obj.metainfo.is_a, ": ", obj.text);
     }
   }
@@ -594,7 +594,7 @@ auto inline_notes_seg(O,M)(
   if (obj.has.inline_notes_reg) {
     _txt = font_face(_txt);
     /+ need markup for text, and separated footnote +/
-    foreach(m; _txt.matchAll(rgx.inline_notes_delimiter_al_regular_number_note)) {
+    foreach(m; _txt.matchAll(rgx.inline_notes_al_regular_number_note)) {
       _endnotes ~= format(
         "%s%s%s%s\n  %s%s%s%s%s\n  %s\n%s",
         "<p class=\"endnote\">",
@@ -611,10 +611,10 @@ auto inline_notes_seg(O,M)(
       );
     }
     _txt = _txt.replaceAll(
-      rgx.inline_notes_delimiter_al_regular_number_note,
+      rgx.inline_notes_al_regular_number_note,
       ("<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)) {
+  } else if (_txt.match(rgx.inline_notes_al_regular_number_note)) {
     debug(markup) {
       writeln(__LINE__, " endnote: ", obj.metainfo.is_a, ": ", obj.text);
     }
@@ -2426,7 +2426,11 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
       }
     }
   }
-  toc ~= format(q"┋  </navMap>
+  toc ~= format(q"┋
+    </navPoint>
+    </navPoint>
+    </navPoint>
+  </navMap>
 </ncx>┋");
   return toc;
 }
@@ -2822,7 +2826,7 @@ void epub3_write_output_files(W,I)(
     ? zip_data.write(contents.dup)
     : zip_data.write(contents.dup
       .replaceAll(rgx.spaces_line_start, "")
-      .replaceAll(rgx.newline, "")
+      .replaceAll(rgx.newline, " ")
       .strip
     );
     zip_arc_member_file.expandedData = zip_data.toBytes();