From 6d337554a5354b5ac3825f8103a90476edea46ac Mon Sep 17 00:00:00 2001
From: Ralph Amissah
Date: Wed, 10 Apr 2019 14:25:38 -0400
Subject: =?UTF-8?q?text=20format=20delimiter,=20use:=20"=E2=94=83"=20inste?=
=?UTF-8?q?ad=20of=20"=E2=94=8B"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- gdc has compilation issue with the "┋" character,
not worth arguing, make internal marker changes
(can be changed again)
- text format delimiter
rg -l "┋" org/. | xargs sed -i 's/┋/┃/g'
---
org/default_paths.org | 2 +-
org/default_regex.org | 4 +-
org/meta_abstraction.org | 22 ++--
org/output_sqlite.org | 52 ++++-----
org/output_xmls.org | 186 ++++++++++++++++-----------------
src/doc_reform/meta/metadoc_from_src.d | 22 ++--
src/doc_reform/meta/rgx.d | 4 +-
src/doc_reform/output/epub3.d | 56 +++++-----
src/doc_reform/output/paths_output.d | 2 +-
src/doc_reform/output/rgx.d | 4 +-
src/doc_reform/output/sqlite.d | 48 ++++-----
src/doc_reform/output/xmls.d | 130 +++++++++++------------
12 files changed, 266 insertions(+), 266 deletions(-)
diff --git a/org/default_paths.org b/org/default_paths.org
index 5ba5a43..26e28f5 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -1034,7 +1034,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 849b9b0..f4c2952 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -537,7 +537,7 @@ static inline_text_and_note_al_ = ctRegex!(`(.+?(?:【[*+]
static inline_image = ctRegex!(`(?P┥)☼(?P(?P[a-zA-Z0-9._-]+?\.(?:jpg|gif|png)),w(?P\d+)h(?P\d+))\s*(?P.*?┝┤.*?├)`, "mg");
static inline_image_without_dimensions = ctRegex!(`(?P┥)☼(?P(?P[a-zA-Z0-9._-]+?\.(?:jpg|gif|png)),w(?P0)h(?P0))\s*(?P.*?┝┤.*?├)`, "mg");
static inline_image_info = ctRegex!(`☼?(?P[a-zA-Z0-9._-]+?\.(?:jpg|gif|png)),w(?P\d+)h(?P\d+)`, "mg");
-static inline_link_anchor = ctRegex!(`┋(?P\S+?)┋`, "mg"); // TODO *~text_link_anchor
+static inline_link_anchor = ctRegex!(`┃(?P\S+?)┃`, "mg"); // TODO *~text_link_anchor
static inline_link_ = ctRegex!(`┥(?P.+?)┝┤(?P.+?)├`, "mg");
static inline_link = ctRegex!(`┥(?P.+?)┝┤(?P\S+?)├`, "mg");
static inline_link_empty = ctRegex!(`┥(?P.+?)┝┤├`, "mg");
@@ -555,7 +555,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 87051c4..890519e 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -2356,7 +2356,7 @@ auto _image_dimensions(O,M)(O obj, M manifest_matter) {
}
obj.text = obj.text.replaceFirst(
rgx.inline_image_without_dimensions,
- format(q"┋%s☼%s,w%sh%s %s┋",
+ format(q"┃%s☼%s,w%sh%s %s┃",
"$1",
"$3",
_w.to!string,
@@ -2395,7 +2395,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)
);
}
}
@@ -5076,10 +5076,10 @@ auto font_faces_line(T)(
static auto mkup = InlineMarkup();
if (textline.match(rgx.inline_faces_line)) {
textline = textline
- .replaceFirst(rgx.inline_emphasis_line, format(q"┋%s%s%s%s%s%s┋", mkup.emph, mkup.ff_o, "$1", mkup.ff_c, mkup.emph, "$2"))
- .replaceFirst(rgx.inline_bold_line, format(q"┋%s%s%s%s%s%s┋", mkup.bold, mkup.ff_o, "$1", mkup.ff_c, mkup.bold, "$2"))
- .replaceFirst(rgx.inline_underscore_line, format(q"┋%s%s%s%s%s%s┋", mkup.underscore, mkup.ff_o, "$1", mkup.ff_c, mkup.underscore, "$2"))
- .replaceFirst(rgx.inline_italics_line, format(q"┋%s%s%s%s%s%s┋", mkup.italic, mkup.ff_o, "$1", mkup.ff_c, mkup.italic, "$2"));
+ .replaceFirst(rgx.inline_emphasis_line, format(q"┃%s%s%s%s%s%s┃", mkup.emph, mkup.ff_o, "$1", mkup.ff_c, mkup.emph, "$2"))
+ .replaceFirst(rgx.inline_bold_line, format(q"┃%s%s%s%s%s%s┃", mkup.bold, mkup.ff_o, "$1", mkup.ff_c, mkup.bold, "$2"))
+ .replaceFirst(rgx.inline_underscore_line, format(q"┃%s%s%s%s%s%s┃", mkup.underscore, mkup.ff_o, "$1", mkup.ff_c, mkup.underscore, "$2"))
+ .replaceFirst(rgx.inline_italics_line, format(q"┃%s%s%s%s%s%s┃", mkup.italic, mkup.ff_o, "$1", mkup.ff_c, mkup.italic, "$2"));
}
return textline;
}
@@ -5551,7 +5551,7 @@ static struct ObjInlineMarkupMunge {
}
if (auto m = obj_txt_in.match(rgx.para_inline_link_anchor)) {
obj_txt_in = obj_txt_in
- .replaceAll(rgx.para_inline_link_anchor, "┋$1┋");
+ .replaceAll(rgx.para_inline_link_anchor, "┃$1┃");
}
auto ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
obj_txt_out = ftn[0];
@@ -6134,7 +6134,7 @@ private:
heading_number_auto_composite
= (conf_make_meta.make.auto_num_depth.to!uint == 3
&& auto_heading_numbering[3])
- ? (format(q"┋%s.%s.%s.%s┋",
+ ? (format(q"┃%s.%s.%s.%s┃",
heading_num[0].to!string,
heading_num[1].to!string,
heading_num[2].to!string,
@@ -6146,7 +6146,7 @@ private:
= ((conf_make_meta.make.auto_num_depth.to!uint >= 2)
&& (conf_make_meta.make.auto_num_depth.to!uint <= 3)
&& auto_heading_numbering[2])
- ? (format(q"┋%s.%s.%s┋",
+ ? (format(q"┃%s.%s.%s┃",
heading_num[0].to!string,
heading_num[1].to!string,
heading_num[2].to!string
@@ -6157,7 +6157,7 @@ private:
= ((conf_make_meta.make.auto_num_depth.to!uint >= 1)
&& (conf_make_meta.make.auto_num_depth.to!uint <= 3)
&& auto_heading_numbering[1])
- ? (format(q"┋%s.%s┋",
+ ? (format(q"┃%s.%s┃",
heading_num[0].to!string,
heading_num[1].to!string
))
@@ -6169,7 +6169,7 @@ private:
= ((conf_make_meta.make.auto_num_depth.to!uint >= 0)
&& (conf_make_meta.make.auto_num_depth.to!uint <= 3)
&& auto_heading_numbering[0])
- ? (format(q"┋%s┋",
+ ? (format(q"┃%s┃",
heading_num[0].to!string
))
: "";
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 5faf244..6894c56 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -159,13 +159,13 @@ template SQLiteFormatAndLoadObject() {
template SQLiteTablesReCreate() {
string SQLiteTablesReCreate()() {
string _sql_instruct;
- _sql_instruct = format(q"┋
+ _sql_instruct = format(q"┃
<>
<>
<>
<>
<>
- ┋",);
+ ┃",);
return _sql_instruct;
}
}
@@ -225,13 +225,13 @@ template SQLiteTablesCreate() {
template SQLiteTablesReCreate() {
string SQLiteTablesReCreate()() {
string _sql_instruct;
- _sql_instruct = format(q"┋
+ _sql_instruct = format(q"┃
<>
<>
<>
<>
<>
- ┋",);
+ ┃",);
return _sql_instruct;
}
}
@@ -740,9 +740,9 @@ auto html_heading(M,O)(
assert(obj.metainfo.is_a == "heading");
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,
);
@@ -760,9 +760,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,
@@ -787,9 +787,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,
@@ -812,9 +812,9 @@ auto html_quote(M,O)(
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "quote");
string _txt = munge_html(doc_matters, obj);
- string o = format(q"┋
+ string o = format(q"┃
%s
-
┋",
+ ┃",
obj.metainfo.is_a,
_txt
);
@@ -835,9 +835,9 @@ auto html_group(M,O)(
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "group");
string _txt = munge_html(doc_matters, obj);
- string o = format(q"┋
+ string o = format(q"┃
%s
-
┋",
+ ┃",
obj.metainfo.is_a,
_txt
);
@@ -858,8 +858,8 @@ auto html_block(M,O)(
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "block");
string _txt = munge_html(doc_matters, obj);
- string o = format(q"┋
- %s
┋",
+ string o = format(q"┃
+ %s
┃",
obj.metainfo.is_a,
_txt.stripRight
);
@@ -880,7 +880,7 @@ auto html_verse(M,O)(
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "verse");
string _txt = munge_html(doc_matters, obj);
- string o = format(q"┋%s
┋",
+ string o = format(q"┃%s
┃",
obj.metainfo.is_a,
_txt
);
@@ -900,7 +900,7 @@ auto html_code(O)(
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "code");
string _txt = html_special_characters_code(obj.text);
- string o = format(q"┋%s
┋",
+ string o = format(q"┃%s
┃",
obj.metainfo.is_a,
_txt
);
@@ -965,12 +965,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
@@ -1604,7 +1604,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
@@ -1621,7 +1621,7 @@ WHERE uid_metadata_and_text = '%s';
#+name: sqlite_formatted_delete
#+BEGIN_SRC d
-┋",
+┃",
_uid,
_uid,
);
@@ -1641,7 +1641,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
@@ -1682,7 +1682,7 @@ string _insert_doc_objects_row = format(q"┋
#+name: sqlite_formatted_insertions_doc_objects
#+BEGIN_SRC d
-┋",
+┃",
_uid,
obj.metainfo.ocn,
obj.metainfo.identifier,
@@ -1701,7 +1701,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
@@ -1820,7 +1820,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 19d4f1e..faa273f 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -168,7 +168,7 @@ auto header_metadata(M)(
) {
string _publisher="Publisher"; // TODO
string o;
- o = format(q"┋
+ o = format(q"┃
@@ -183,7 +183,7 @@ auto header_metadata(M)(
-┋",
+┃",
doc_matters.conf_make_meta.meta.title_full,
doc_matters.conf_make_meta.meta.creator_author,
_publisher,
@@ -223,9 +223,9 @@ auto site_info_button(M)(
_locations = "doc-reform
\nsources / git
\nwww.sisudoc.org
";
}
string o;
- o = format(q"┋┃",
_locations,
);
return o;
@@ -244,7 +244,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;
@@ -283,17 +283,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"┃
@@ -315,7 +315,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,
@@ -341,27 +341,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
@@ -384,7 +384,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) ? ""
@@ -414,11 +414,11 @@ auto epub3_seg_head(M)(
#+BEGIN_SRC d
auto tail() {
string o;
- o = format(q"┋
+ o = format(q"┃
-┋");
+┃");
return o;
}
#+END_SRC
@@ -682,10 +682,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,
@@ -711,42 +711,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,
);
@@ -809,13 +809,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,
@@ -829,12 +829,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,
@@ -908,12 +908,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,
@@ -924,11 +924,11 @@ auto para(O)(
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
obj.attrib.indent_hang,
obj.attrib.indent_base,
@@ -996,12 +996,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,
@@ -1009,11 +1009,11 @@ auto quote(O)(
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -1078,12 +1078,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,
@@ -1091,11 +1091,11 @@ auto group(O)(
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -1161,10 +1161,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,
@@ -1172,9 +1172,9 @@ auto block(O)(
_txt.stripRight
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt.stripRight
);
@@ -1240,10 +1240,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,
@@ -1251,9 +1251,9 @@ auto verse(O)(
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -1317,10 +1317,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,
@@ -1328,9 +1328,9 @@ auto code(O)(
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -1405,7 +1405,7 @@ auto table(O)(
_txt = t[0];
string _note = t[1];
string o;
- o = format(q"┋
+ o = format(q"┃
%s
@@ -1413,7 +1413,7 @@ auto table(O)(
%s
-
┋",
+
┃",
obj.metainfo.object_number,
obj.metainfo.object_number,
obj.metainfo.is_a,
@@ -2119,7 +2119,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
@@ -2132,13 +2132,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
@@ -2156,7 +2156,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),
@@ -2208,8 +2208,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,
@@ -2352,7 +2352,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"┃
- ┋",
+ ┃",
_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),
@@ -86,8 +86,8 @@ template outputEPub3() {
// 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,
@@ -213,7 +213,7 @@ template outputEPub3() {
auto markup = InlineMarkup();
auto rgx = Rgx();
enum DomTags { none, open, close, close_and_open, open_still, }
- string toc = format(q"┋
+ string toc = format(q"┃
+ o = format(q"┃
@@ -110,7 +110,7 @@ template outputXHTMLs() {
- ┋",
+ ┃",
doc_matters.conf_make_meta.meta.title_full,
doc_matters.conf_make_meta.meta.creator_author,
_publisher,
@@ -144,9 +144,9 @@ template outputXHTMLs() {
_locations = "doc-reform
\nsources / git
\nwww.sisudoc.org
";
}
string o;
- o = format(q"┋┃",
_locations,
);
return o;
@@ -159,7 +159,7 @@ template outputXHTMLs() {
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;
@@ -192,17 +192,17 @@ template outputXHTMLs() {
) {
string _manifest = "";
if (doc_matters.opt.action.workon) {
- _manifest = format(q"┋
+ _manifest = format(q"┃
[ document manifest ]
- ┋",
+ ┃",
);
}
string o;
- o = format(q"┋
+ o = format(q"┃
@@ -224,7 +224,7 @@ template outputXHTMLs() {
- %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,
@@ -244,27 +244,27 @@ template outputXHTMLs() {
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
@@ -287,7 +287,7 @@ template outputXHTMLs() {
- ┋",
+ ┃",
html_simple,
doc_matters.conf_make_meta.meta.title_full,
(doc_matters.conf_make_meta.meta.creator_author.empty) ? ""
@@ -311,11 +311,11 @@ template outputXHTMLs() {
}
auto tail() {
string o;
- o = format(q"┋
+ o = format(q"┃
- ┋");
+ ┃");
return o;
}
auto inline_images(O,M)(
@@ -532,10 +532,10 @@ template outputXHTMLs() {
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,
@@ -555,42 +555,42 @@ template outputXHTMLs() {
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,
);
@@ -646,13 +646,13 @@ template outputXHTMLs() {
? ""
: "";
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,
@@ -666,12 +666,12 @@ template outputXHTMLs() {
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,
@@ -726,12 +726,12 @@ template outputXHTMLs() {
_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,
@@ -742,11 +742,11 @@ template outputXHTMLs() {
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
obj.attrib.indent_hang,
obj.attrib.indent_base,
@@ -795,12 +795,12 @@ template outputXHTMLs() {
_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,
@@ -808,11 +808,11 @@ template outputXHTMLs() {
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -858,12 +858,12 @@ template outputXHTMLs() {
_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,
@@ -871,11 +871,11 @@ template outputXHTMLs() {
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -922,10 +922,10 @@ template outputXHTMLs() {
_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,
@@ -933,9 +933,9 @@ template outputXHTMLs() {
_txt.stripRight
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt.stripRight
);
@@ -982,10 +982,10 @@ template outputXHTMLs() {
_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,
@@ -993,9 +993,9 @@ template outputXHTMLs() {
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
@@ -1078,7 +1078,7 @@ template outputXHTMLs() {
_txt = t[0];
string _note = t[1];
string o;
- o = format(q"┋
+ o = format(q"┃
%s
@@ -1086,7 +1086,7 @@ template outputXHTMLs() {
%s
-
┋",
+
┃",
obj.metainfo.object_number,
obj.metainfo.object_number,
obj.metainfo.is_a,
@@ -1107,10 +1107,10 @@ template outputXHTMLs() {
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,
@@ -1118,9 +1118,9 @@ template outputXHTMLs() {
_txt
);
} else {
- o = format(q"┋ ┃",
obj.metainfo.is_a,
_txt
);
--
cgit v1.2.3