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' --- 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 +++++++++++++++++------------------ 5 files changed, 120 insertions(+), 120 deletions(-) (limited to 'src/doc_reform/output') diff --git a/src/doc_reform/output/epub3.d b/src/doc_reform/output/epub3.d index e02637c..a49bb5d 100644 --- a/src/doc_reform/output/epub3.d +++ b/src/doc_reform/output/epub3.d @@ -16,25 +16,25 @@ template outputEPub3() { mixin outputXHTMLs; string epub3_mimetypes() { string o; - o = format(q"┋application/epub+zip┋") ~ "\n"; + o = format(q"┃application/epub+zip┃") ~ "\n"; return o; } string epub3_container_xml() { string o; - o = format(q"┋┋") ~ "\n"; - o ~= format(q"┋┃") ~ "\n"; + o ~= format(q"┃ - ┋") ~ "\n\n"; + ┃") ~ "\n\n"; return o; } 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), @@ -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

\n

sources / git

\n

www.sisudoc.org

"; } string o; - o = format(q"┋
+ o = format(q"┃
%s -
┋", +
┃", _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"┃
@@ -171,17 +171,17 @@ template outputXHTMLs() {
- ┋", + ┃", _action, _db, ); } else { - _form = format(q"┋%s┋", + _form = format(q"┃%s┃", "", ); } - o = format(q"┋
%s -
┋", + o = format(q"┃
%s +
┃", _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%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() { <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> </head> <body lang="%s"> - <a name="top" id="top"></a>┋", + <a name="top" id="top"></a>┃", 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"┃ <a name="bottom" id="bottom"></a> <a name="end" id="end"></a> </body> - </html>┋"); + </html>┃"); 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"┋ <p class="minitoc" indent="h%si%s"> + format(q"┃ <p class="minitoc" indent="h%si%s"> ۰ <a href="%s">%s</a> </p> - ┋", + ┃", indent, indent, link, @@ -555,42 +555,42 @@ template outputXHTMLs() { toc = ""; prev = ""; } else { - toc = format(q"┋<a href="toc.html" target="_top"> + toc = format(q"┃<a href="toc.html" target="_top"> <div class="toc-button menu"> <svg viewbox="0 0 100 100"> <path d="M4,10h24c1.104,0,2-0.896,2-2s-0.896-2-2-2H4C2.896,6,2,6.896,2,8S2.896,10,4,10z M28,14H4c-1.104,0-2,0.896-2,2 s0.896,2,2,2h24c1.104,0,2-0.896,2-2S29.104,14,28,14z M28,22H4c-1.104,0-2,0.896-2,2s0.896,2,2,2h24c1.104,0,2-0.896,2-2 S29.104,22,28,22z"/> </svg> </div> - </a>┋", + </a>┃", ); } if (obj.tags.segname_prev == "") { prev = ""; } else { - prev = format(q"┋<a href="%s.html" target="_top"> + prev = format(q"┃<a href="%s.html" target="_top"> <div class="prev-next-button previous"> <svg viewbox="0 0 100 100"> <path class="arrow" d="M 50,0 L 60,10 L 20,50 L 60,90 L 50,100 L 0,50 Z" transform=" translate(15,0)"> </svg> </div> - </a>┋", + </a>┃", obj.tags.segname_prev, ); } if (obj.tags.segname_next == "") { next = ""; } else { - next = format(q"┋<a href="%s.html" target="_top"> + next = format(q"┃<a href="%s.html" target="_top"> <div class="prev-next-button next"> <svg viewbox="0 0 100 100"> <path class="arrow" d="M 50,0 L 60,10 L 20,50 L 60,90 L 50,100 L 0,50 Z "transform="translate(85,100) rotate(180) "> </svg> </div> - </a>┋", + </a>┃", obj.tags.segname_next, ); } - string _toc_pre_next = format(q"┋ <div class="flex-menu-option"> + string _toc_pre_next = format(q"┃ <div class="flex-menu-option"> <div class="nav-bar"> %s %s @@ -598,19 +598,19 @@ template outputXHTMLs() { </div> </div> </div> - </div>┋", + </div>┃", toc, prev, next, ); - string _pre_next = format(q"┋ <div class="flex-menu-option"> + string _pre_next = format(q"┃ <div class="flex-menu-option"> <div class="nav-bar"> %s %s </div> </div> </div> - </div>┋", + </div>┃", prev, next, ); @@ -646,13 +646,13 @@ template outputXHTMLs() { ? "" : "<a name=\"" ~ obj.tags.heading_lev_anchor_tag ~ "\"></a>"; if (!(obj.metainfo.identifier.empty)) { - o = format(q"┋%s + o = format(q"┃%s <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <h%s class="%s" id="%s"><a name="%s"></a>%s%s %s </h%s> - </div>┋", + </div>┃", _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 <div class="substance"> <h%s class="%s">%s%s %s </h%s> - </div>┋", + </div>┃", _horizontal_rule, obj.metainfo.heading_lev_markup, obj.metainfo.is_a, @@ -726,12 +726,12 @@ template outputXHTMLs() { _txt = _txt.replaceFirst(rgx.inline_link_anchor, "<a name=\"$1\"></a>"); if (!(obj.metainfo.identifier.empty)) { - o = format(q"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" indent="h%si%s" id="%s">%s %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <p class="%s" indent="h%si%s">%s %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" id="%s"> %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <p class="%s"> %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" id="%s"> %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <p class="%s"> %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" id="%s">%s</p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <p class="%s">%s</p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" id="%s">%s</p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <p class="%s">%s</p> - </div>┋", + </div>┃", obj.metainfo.is_a, _txt ); @@ -1078,7 +1078,7 @@ template outputXHTMLs() { _txt = t[0]; string _note = t[1]; string o; - o = format(q"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <p class="%s" id="%s">%s <table summary="normal text css" width="95%%" border="0" bgcolor="white" cellpadding="2" align="center"> @@ -1086,7 +1086,7 @@ template outputXHTMLs() { </table> %s </p> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> <pre><p class="%s" id="%s">%s</p></pre> - </div>┋", + </div>┃", 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"┋ <div class="substance"> + o = format(q"┃ <div class="substance"> <pre><p class="%s">%s</p></pre> - </div>┋", + </div>┃", obj.metainfo.is_a, _txt ); -- cgit v1.2.3