From 5f6caf585c7ccaac0a4310987c85fdcfd3bcff3d Mon Sep 17 00:00:00 2001
From: Ralph Amissah
Date: Tue, 29 Jan 2019 17:00:31 -0500
Subject: =?UTF-8?q?format=20delimiter=20s/=C2=B6/=E2=94=8B/g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
org/default_paths.org | 2 +-
org/default_regex.org | 2 +-
org/meta_abstraction.org | 2 +-
org/output_sqlite.org | 52 ++++++-------
org/output_xmls.org | 186 +++++++++++++++++++++++------------------------
5 files changed, 122 insertions(+), 122 deletions(-)
(limited to 'org')
diff --git a/org/default_paths.org b/org/default_paths.org
index 6d38825..68c7da8 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -1030,7 +1030,7 @@ template DocReformPathsUrl() {
return _doc_root;
}
string html_seg(string html_segname, string obj_id) { // TODO bespoke for sqlite
- string _url = format(q"¶%s/%s/html/%s/%s.html#%s¶",
+ string _url = format(q"┋%s/%s/html/%s/%s.html#%s┋",
doc_root,
doc_matters.src.language,
doc_matters.src.filename_base,
diff --git a/org/default_regex.org b/org/default_regex.org
index 5705fb2..e02c3a3 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -517,7 +517,7 @@ static inline_link_fn_suffix = ctRegex!(`¤(.+?)(\.fnSu
static inline_seg_link = ctRegex!(`(¤)(?:.+?)\.fnSuffix`, "mg");
static mark_internal_site_lnk = ctRegex!(`¤`, "mg");
static quotation_mark_sql_insert_delimiter = ctRegex!("[']", "mg");
-static quotation_mark_various = ctRegex!(q"¶['‘’“”"`´¨]¶", "mg");
+static quotation_mark_various = ctRegex!(q"┋['‘’“”"`´¨]┋", "mg");
#+END_SRC
*** inline markup font face mod :inline:font:face:
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index 10eeddd..10153c8 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -2316,7 +2316,7 @@ auto _links(O)(O obj) {
obj.stow.link ~= obj.text.matchFirst(rgx.inline_link_stow_uri)[2];
obj.text = obj.text.replaceFirst(
rgx.inline_link_stow_uri,
- format(q"¶┥%s┝┤%s├¶", "$1", i)
+ format(q"┋┥%s┝┤%s├┋", "$1", i)
);
}
}
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 06e7f01..13b8702 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -158,13 +158,13 @@ template SQLiteFormatAndLoadObject() {
template SQLiteTablesReCreate() {
string SQLiteTablesReCreate()() {
string _sql_instruct;
- _sql_instruct = format(q"¶
+ _sql_instruct = format(q"┋
<>
<>
<>
<>
<>
- ¶",);
+ ┋",);
return _sql_instruct;
}
}
@@ -224,13 +224,13 @@ template SQLiteTablesCreate() {
template SQLiteTablesReCreate() {
string SQLiteTablesReCreate()() {
string _sql_instruct;
- _sql_instruct = format(q"¶
+ _sql_instruct = format(q"┋
<>
<>
<>
<>
<>
- ¶",);
+ ┋",);
return _sql_instruct;
}
}
@@ -735,9 +735,9 @@ auto html_heading(M,O)(
) {
string _txt = munge_html(doc_matters, obj);
_txt = inline_markup(doc_matters, obj, _txt);
- string o = format(q"¶
+ string o = format(q"┋
%s
-
¶",
+
┋",
obj.metainfo.is_a,
_txt,
);
@@ -755,9 +755,9 @@ auto html_heading(M,O)(
) {
string o;
string _txt = munge_html(doc_matters, obj);
- o = format(q"¶
+ o = format(q"┋
%s
- ¶",
+ ┋",
obj.metainfo.heading_lev_markup,
obj.metainfo.is_a,
_txt,
@@ -778,9 +778,9 @@ auto html_para(M,O)(
string _txt = munge_html(doc_matters, obj);
_txt = (obj.attrib.bullet) ? ("● " ~ _txt) : _txt;
_txt = inline_markup(doc_matters, obj, _txt);
- string o = format(q"¶
+ string o = format(q"┋
%s
-
¶",
+ ┋",
obj.metainfo.is_a,
obj.attrib.indent_hang,
obj.attrib.indent_base,
@@ -799,9 +799,9 @@ auto html_quote(M,O)(
auto ref const O obj,
) {
string _txt = munge_html(doc_matters, obj);
- string o = format(q"¶
+ string o = format(q"┋
%s
-
¶",
+ ┋",
obj.metainfo.is_a,
_txt
);
@@ -818,9 +818,9 @@ auto html_group(M,O)(
auto ref const O obj,
) {
string _txt = munge_html(doc_matters, obj);
- string o = format(q"¶
+ string o = format(q"┋
%s
-
¶",
+ ┋",
obj.metainfo.is_a,
_txt
);
@@ -837,8 +837,8 @@ auto html_block(M,O)(
auto ref const O obj,
) {
string _txt = munge_html(doc_matters, obj);
- string o = format(q"¶
- %s
¶",
+ string o = format(q"┋
+ %s
┋",
obj.metainfo.is_a,
_txt.stripRight
);
@@ -855,7 +855,7 @@ auto html_verse(M,O)(
auto ref const O obj,
) {
string _txt = munge_html(doc_matters, obj);
- string o = format(q"¶%s
¶",
+ string o = format(q"┋%s
┋",
obj.metainfo.is_a,
_txt
);
@@ -871,7 +871,7 @@ auto html_code(O)(
auto ref const O obj,
) {
string _txt = html_special_characters_code(obj.text);
- string o = format(q"¶%s
¶",
+ string o = format(q"┋%s
┋",
obj.metainfo.is_a,
_txt
);
@@ -932,12 +932,12 @@ auto html_table(M,O)(
auto t = _tablarize(obj, _txt);
_txt = t[0];
string _note = t[1];
- string o = format(q"¶
+ string o = format(q"┋
%s
- ¶",
+ ┋",
obj.metainfo.is_a,
_txt,
_note
@@ -1571,7 +1571,7 @@ CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register);
#+name: sqlite_formatted_delete
#+BEGIN_SRC d
string _uid = doc_matters.src.doc_uid;
-string _delete_uid = format(q"¶
+string _delete_uid = format(q"┋
#+END_SRC
***** DELETE FROM ... WHERE
@@ -1588,7 +1588,7 @@ WHERE uid_metadata_and_text = '%s';
#+name: sqlite_formatted_delete
#+BEGIN_SRC d
-¶",
+┋",
_uid,
_uid,
);
@@ -1608,7 +1608,7 @@ either:
#+name: sqlite_formatted_insertions_doc_objects
#+BEGIN_SRC d
-string _insert_doc_objects_row = format(q"¶
+string _insert_doc_objects_row = format(q"┋
#+END_SRC
***** INSERT INTO
@@ -1649,7 +1649,7 @@ string _insert_doc_objects_row = format(q"¶
#+name: sqlite_formatted_insertions_doc_objects
#+BEGIN_SRC d
-¶",
+┋",
_uid,
obj.metainfo.ocn,
obj.metainfo.identifier,
@@ -1668,7 +1668,7 @@ string _insert_doc_objects_row = format(q"¶
#+name: sqlite_formatted_insertions_doc_matters_metadata
#+BEGIN_SRC d
string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid);
-string _insert_metadata = format(q"¶
+string _insert_metadata = format(q"┋
#+END_SRC
***** INSERT INTO
@@ -1787,7 +1787,7 @@ string _insert_metadata = format(q"¶
#+name: sqlite_formatted_insertions_doc_matters_metadata
#+BEGIN_SRC d
-¶",
+┋",
_uid,
SQLinsertDelimiter!()(doc_matters.src.filename),
SQLinsertDelimiter!()(doc_matters.src.docname_composite_unique_per_src_doc),
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 979534c..27069fd 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -167,7 +167,7 @@ auto header_metadata(M)(
) {
string _publisher="Publisher"; // TODO
string o;
- o = format(q"¶
+ o = format(q"┋
@@ -182,7 +182,7 @@ auto header_metadata(M)(
-¶",
+┋",
doc_matters.conf_make_meta.meta.title_full,
doc_matters.conf_make_meta.meta.creator_author,
_publisher,
@@ -222,9 +222,9 @@ auto site_info_button(M)(
_locations = "doc-reform
\nsources / git
\nwww.sisudoc.org
";
}
string o;
- o = format(q"¶┋",
_locations,
);
return o;
@@ -243,7 +243,7 @@ auto inline_search_form(M)(
string o;
string _form;
if (doc_matters.opt.action.workon) {
- _form = format(q"¶
+ _form = format(q"┋
- ¶",
+ ┋",
_action,
_db,
);
} else {
- _form = format(q"¶%s¶",
+ _form = format(q"┋%s┋",
"",
);
}
- o = format(q"¶¶",
+ o = format(q"┋┋",
_form,
);
return o;
@@ -282,17 +282,17 @@ auto html_head(M)(
) {
string _manifest = "";
if (doc_matters.opt.action.workon) {
- _manifest = format(q"¶
+ _manifest = format(q"┋
[ document manifest ]
- ¶",
+ ┋",
);
}
string o;
- o = format(q"¶
+ o = format(q"┋
@@ -314,7 +314,7 @@ if (doc_matters.opt.action.workon) {
- %s%s¶",
+ %s%s┋",
doc_matters.conf_make_meta.meta.title_full,
(doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
: ", " ~ doc_matters.conf_make_meta.meta.creator_author,
@@ -340,27 +340,27 @@ if (doc_matters.opt.action.workon) {
auto epub3_seg_head(M)(
M doc_matters,
) {
- string html_base = format(q"¶
-¶",
+ string html_base = format(q"┋
+┋",
);
- string html_simple = format(q"¶
+ string html_simple = format(q"┋
¶",
+ lang="%s" xml:lang="%s">┋",
doc_matters.src.language,
doc_matters.src.language,
);
- string html_strict = format(q"¶
¶",
+ lang="%s" xml:lang="%s">┋",
doc_matters.src.language,
doc_matters.src.language,
);
string o;
- o = format(q"¶%s
+ o = format(q"┋%s
%s%s
@@ -383,7 +383,7 @@ auto epub3_seg_head(M)(
-¶",
+┋",
html_simple,
doc_matters.conf_make_meta.meta.title_full,
(doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
@@ -413,11 +413,11 @@ auto epub3_seg_head(M)(
#+BEGIN_SRC d
auto tail() {
string o;
- o = format(q"¶
+ o = format(q"┋
-¶");
+┋");
return o;
}
#+END_SRC
@@ -678,10 +678,10 @@ string lev4_heading_subtoc(O,M)(
text = font_face(text);
auto link = m.captures[3].to!string;
lev4_subtoc ~= subtoc.replaceFirst(rgx.inline_link_subtoc,
- format(q"¶
+ format(q"┋
۰ %s
-¶",
+┋",
indent,
indent,
link,
@@ -707,42 +707,42 @@ auto nav_pre_next_svg(O,M)(
toc = "";
prev = "";
} else {
- toc = format(q"¶
+ toc = format(q"┋
- ¶",
+ ┋",
);
}
if (obj.tags.segname_prev == "") {
prev = "";
} else {
- prev = format(q"¶
+ prev = format(q"┋
- ¶",
+ ┋",
obj.tags.segname_prev,
);
}
if (obj.tags.segname_next == "") {
next = "";
} else {
- next = format(q"¶
+ next = format(q"┋
- ¶",
+ ┋",
obj.tags.segname_next,
);
}
- string _toc_pre_next = format(q"¶
-¶",
+┋",
toc,
prev,
next,
);
- string _pre_next = format(q"¶
-¶",
+┋",
prev,
next,
);
@@ -805,13 +805,13 @@ auto heading(O)(
? ""
: "";
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶%s
+ o = format(q"┋%s
¶",
+ ┋",
_horizontal_rule,
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
@@ -825,12 +825,12 @@ auto heading(O)(
obj.metainfo.heading_lev_markup,
);
} else {
- o = format(q"¶%s
+ o = format(q"┋%s
%s%s
%s
-
¶",
+ ┋",
_horizontal_rule,
obj.metainfo.heading_lev_markup,
obj.metainfo.is_a,
@@ -904,12 +904,12 @@ auto para(O)(
_txt = _txt.replaceFirst(rgx.inline_link_anchor,
"");
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶ ┋",
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
obj.metainfo.is_a,
@@ -920,11 +920,11 @@ auto para(O)(
_txt
);
} else {
- o = format(q"¶ ┋",
obj.metainfo.is_a,
obj.attrib.indent_hang,
obj.attrib.indent_base,
@@ -992,12 +992,12 @@ auto quote(O)(
_txt = font_face(_txt);
string o;
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶ ┋",
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
obj.metainfo.is_a,
@@ -1005,11 +1005,11 @@ auto quote(O)(
_txt
);
} else {
- o = format(q"¶ ┋",
obj.metainfo.is_a,
_txt
);
@@ -1074,12 +1074,12 @@ auto group(O)(
_txt = font_face(_txt);
string o;
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶ ┋",
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
obj.metainfo.is_a,
@@ -1087,11 +1087,11 @@ auto group(O)(
_txt
);
} else {
- o = format(q"¶ ┋",
obj.metainfo.is_a,
_txt
);
@@ -1157,10 +1157,10 @@ auto block(O)(
_txt = font_face(_txt);
string o;
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶ ┋",
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
obj.metainfo.is_a,
@@ -1168,9 +1168,9 @@ auto block(O)(
_txt.stripRight
);
} else {
- o = format(q"¶ ┋",
obj.metainfo.is_a,
_txt.stripRight
);
@@ -1236,10 +1236,10 @@ auto verse(O)(
_txt = font_face(_txt);
string o;
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶ ┋",
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
obj.metainfo.is_a,
@@ -1247,9 +1247,9 @@ auto verse(O)(
_txt
);
} else {
- o = format(q"¶ ┋",
obj.metainfo.is_a,
_txt
);
@@ -1313,10 +1313,10 @@ auto code(O)(
assert(obj.metainfo.is_a == "code");
string o;
if (!(obj.metainfo.identifier.empty)) {
- o = format(q"¶ ┋",
obj.metainfo.identifier,
(obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier,
obj.metainfo.is_a,
@@ -1324,9 +1324,9 @@ auto code(O)(
_txt
);
} else {
- o = format(q"¶ ┋",
obj.metainfo.is_a,
_txt
);
@@ -1401,7 +1401,7 @@ auto table(O)(
_txt = t[0];
string _note = t[1];
string o;
- o = format(q"¶
+ o = format(q"┋
%s
@@ -1409,7 +1409,7 @@ auto table(O)(
%s
-
¶",
+
┋",
obj.metainfo.object_number,
obj.metainfo.object_number,
obj.metainfo.is_a,
@@ -2115,7 +2115,7 @@ template outputEPub3() {
#+BEGIN_SRC d
string epub3_mimetypes() {
string o;
- o = format(q"¶application/epub+zip¶") ~ "\n";
+ o = format(q"┋application/epub+zip┋") ~ "\n";
return o;
}
#+END_SRC
@@ -2128,13 +2128,13 @@ string epub3_mimetypes() {
#+BEGIN_SRC d
string epub3_container_xml() {
string o;
- o = format(q"¶¶") ~ "\n";
- o ~= format(q"¶┋") ~ "\n";
+ o ~= format(q"┋
-¶") ~ "\n\n";
+┋") ~ "\n\n";
return o;
}
#+END_SRC
@@ -2152,7 +2152,7 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
auto xhtml_format = outputXHTMLs();
auto pth_epub3 = DocReformPathsEPUB!()(doc_matters.output_path, doc_matters.src.language);
string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO sort uuid in doc_matters!
- string content = format(q"¶
+ string content = format(q"┋
-¶",
+┋",
_uuid,
xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_full),
xhtml_format.special_characters_text(doc_matters.conf_make_meta.meta.title_main),
@@ -2204,8 +2204,8 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
// TODO sort jpg & png
content ~= " " ~ "" ~ "\n ";
foreach (image; doc_matters.srcs.image_list) {
- content ~= format(q"¶
-¶",
+ content ~= format(q"┋
+┋",
image.baseName.stripExtension,
(pth_epub3.doc_oebps_image(doc_matters.src.filename)).chompPrefix("OEBPS/"),
image,
@@ -2348,7 +2348,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
auto markup = InlineMarkup();
auto rgx = Rgx();
enum DomTags { none, open, close, close_and_open, open_still, }
- string toc = format(q"¶
+ string toc = format(q"┋