diff options
| -rw-r--r-- | org/out_sqlite.org | 12 | ||||
| -rw-r--r-- | src/sisudoc/outputs/io_out/sqlite_collection_db.d | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/org/out_sqlite.org b/org/out_sqlite.org index 418b2d3..b5c1772 100644 --- a/org/out_sqlite.org +++ b/org/out_sqlite.org @@ -1042,9 +1042,13 @@ string inline_notes_scroll(M,O)( const O obj, string _txt, ) { - if (obj.has.inline_notes_reg) { + /+ ↓ every note the text holds, of every series: numbered (1, 2 ...), special + (*, **), and the editor's (*1, +1 ...). Checks whether text contains any + notes, the pattern every other writer now uses. + +/ + if (_txt.match(rgx.inline_notes_al_all_note)) { string[] _endnotes; - foreach(m; _txt.matchAll(rgx.inline_notes_al_regular_number_note)) { + foreach(m; _txt.matchAll(rgx.inline_notes_al_all_note)) { _endnotes ~= "<p class=\"endnote\">" ~ "<sup>" ~ m.captures["num"] ~ ".</sup>" ~ m.captures["note"] @@ -1052,7 +1056,7 @@ string inline_notes_scroll(M,O)( } _txt = replaceAll!(m => (" " ~ "<sup>" ~ m["num"] ~ "</sup>")) - (_txt, rgx.inline_notes_al_regular_number_note) + (_txt, rgx.inline_notes_al_all_note) ~ _endnotes.join("\n"); } debug(markup_endnotes) { @@ -1176,6 +1180,7 @@ string html_quote(M,O)( assert(obj.metainfo.is_of_type == "block"); assert(obj.metainfo.is_a == "quote"); string _txt = munge_html(doc_matters, obj); + _txt = inline_markup(doc_matters, obj, _txt); string o = format(q"┃<p class="%s"> %s </p>┃", @@ -1246,6 +1251,7 @@ string html_verse(M,O)( assert(obj.metainfo.is_of_type == "block"); assert(obj.metainfo.is_a == "verse"); string _txt = munge_html(doc_matters, obj); + _txt = inline_markup(doc_matters, obj, _txt); string o = format(q"┃<p class="%s">%s</p>┃", obj.metainfo.is_a, _txt diff --git a/src/sisudoc/outputs/io_out/sqlite_collection_db.d b/src/sisudoc/outputs/io_out/sqlite_collection_db.d index 2a7fcd7..91bd8ab 100644 --- a/src/sisudoc/outputs/io_out/sqlite_collection_db.d +++ b/src/sisudoc/outputs/io_out/sqlite_collection_db.d @@ -640,9 +640,13 @@ template SQLiteFormatAndLoadObject() { const O obj, string _txt, ) { - if (obj.has.inline_notes_reg) { + /+ ↓ every note the text holds, of every series: numbered (1, 2 ...), special + (*, **), and the editor's (*1, +1 ...). Checks whether text contains any + notes, the pattern every other writer now uses. + +/ + if (_txt.match(rgx.inline_notes_al_all_note)) { string[] _endnotes; - foreach(m; _txt.matchAll(rgx.inline_notes_al_regular_number_note)) { + foreach(m; _txt.matchAll(rgx.inline_notes_al_all_note)) { _endnotes ~= "<p class=\"endnote\">" ~ "<sup>" ~ m.captures["num"] ~ ".</sup>" ~ m.captures["note"] @@ -650,7 +654,7 @@ template SQLiteFormatAndLoadObject() { } _txt = replaceAll!(m => (" " ~ "<sup>" ~ m["num"] ~ "</sup>")) - (_txt, rgx.inline_notes_al_regular_number_note) + (_txt, rgx.inline_notes_al_all_note) ~ _endnotes.join("\n"); } debug(markup_endnotes) { @@ -727,6 +731,7 @@ template SQLiteFormatAndLoadObject() { assert(obj.metainfo.is_of_type == "block"); assert(obj.metainfo.is_a == "quote"); string _txt = munge_html(doc_matters, obj); + _txt = inline_markup(doc_matters, obj, _txt); string o = format(q"┃<p class="%s"> %s </p>┃", @@ -779,6 +784,7 @@ template SQLiteFormatAndLoadObject() { assert(obj.metainfo.is_of_type == "block"); assert(obj.metainfo.is_a == "verse"); string _txt = munge_html(doc_matters, obj); + _txt = inline_markup(doc_matters, obj, _txt); string o = format(q"┃<p class="%s">%s</p>┃", obj.metainfo.is_a, _txt |