xmls, sqlite more with footnotes/endnotes

1 files changed, 11 insertions, 59 deletions

diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index 77172e2..a35bcf1 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -510,15 +510,6 @@ string munge_html(M,O)(
   string _notes;
   string _urls;
   string _txt = _html_font_face(_html_special_characters(obj.text));
-  if (_txt.matchFirst(rgx.inline_notes_al_gen)) {
-    foreach (m; _txt.matchAll(rgx.inline_notes_al_gen_text)) {
-      _notes ~= "\n" ~ m["text"];
-    }
-    _txt = _txt.replaceAll(rgx.inline_notes_al_gen_ref, "<sup>$1</sup> ");
-  }
-  if (_notes.length > 0) {
-    _txt ~= _notes;
-  }
   { /+ debug +/
     if (doc_matters.opt.action.debug_do
     && doc_matters.opt.action.verbose) {
@@ -732,11 +723,17 @@ string inline_notes_scroll(M,O)(
   string           _txt,
 ) {
   if (obj.has.inline_notes_reg) {
-    // _txt = font_face(_txt);
-    _txt = _txt.replaceAll(
-      rgx.inline_notes_al_regular_number_note,
-      ("<a href=\"#note_$1\"><note id=\"noteref_$1\">&#160;<sup>$1</sup> </note></a>")
-    );
+    string[] _endnotes;
+    foreach(m; _txt.matchAll(rgx.inline_notes_al_regular_number_note)) {
+      _endnotes ~= "<p class=\"endnote\">"
+      ~ "<sup>" ~ m.captures["num"] ~ ".</sup>"
+      ~ m.captures["note"]
+      ~ "</p>";
+    }
+    _txt = replaceAll!(m =>
+      ("&#160;" ~ "<sup>" ~ m["num"] ~ "</sup>"))
+        (_txt, rgx.inline_notes_al_regular_number_note)
+      ~ _endnotes.join("\n");
   }
   debug(markup_endnotes) {
     if (_txt.match(rgx.inline_notes_al_regular_number_note)) {
@@ -752,51 +749,6 @@ string inline_notes_scroll(M,O)(
 }
 #+END_SRC
 
-******** seg
-
-#+NAME: sanitize_and_munge_inline_html
-#+BEGIN_SRC d
-Tuple!(string, string[]) inline_notes_seg(M,O)(
-               M     doc_matters,
-  const        O     obj,
-  string             _txt,
-) {
-  string[] _endnotes;
-  if (obj.has.inline_notes_reg) {
-    /+ need markup for text, and separated footnote +/
-    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\">",
-        "<a href=\"#noteref_",
-        m.captures[1],
-        "\">",
-        "<note id=\"note_",
-        m.captures[1],
-        "\">&#160;<sup>",
-        m.captures[1],
-        ".</sup></note></a>",
-        m.captures[2],
-        "</p>"
-      );
-    }
-    _txt = _txt.replaceAll(
-      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_al_regular_number_note)) {
-    debug(markup) {
-      writeln(__LINE__, " endnote: ", obj.metainfo.is_a, ": ", obj.text);
-    }
-  }
-  Tuple!(string, string[]) t = tuple(
-    _txt,
-    _endnotes,
-  );
-  return t;
-}
-#+END_SRC
-
 ******* inline markup
 
 #+NAME: sanitize_and_munge_inline_html