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/output_xmls.org | 186 ++++++++++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 93 deletions(-) (limited to 'org/output_xmls.org') 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

\n

sources / git

\n

www.sisudoc.org

"; } string o; - o = format(q"┋
+ o = format(q"┃
%s -
┋", +
┃", _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"┃
@@ -256,17 +256,17 @@ auto inline_search_form(M)(
- ┋", + ┃", _action, _db, ); } else { - _form = format(q"┋%s┋", + _form = format(q"┃%s┃", "", ); } - o = format(q"┋
%s -
┋", + o = format(q"┃
%s +
┃", _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%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)( <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) ? "" @@ -414,11 +414,11 @@ auto epub3_seg_head(M)( #+BEGIN_SRC d 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; } #+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"┋ <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, @@ -711,42 +711,42 @@ auto nav_pre_next_svg(O,M)( 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 @@ -754,19 +754,19 @@ auto nav_pre_next_svg(O,M)( </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, ); @@ -809,13 +809,13 @@ auto heading(O)( ? "" : "<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, @@ -829,12 +829,12 @@ auto heading(O)( 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, @@ -908,12 +908,12 @@ auto para(O)( _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, @@ -924,11 +924,11 @@ auto para(O)( _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, @@ -996,12 +996,12 @@ auto quote(O)( _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, @@ -1009,11 +1009,11 @@ auto quote(O)( _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,12 +1078,12 @@ auto group(O)( _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, @@ -1091,11 +1091,11 @@ auto group(O)( _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 ); @@ -1161,10 +1161,10 @@ auto block(O)( _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, @@ -1172,9 +1172,9 @@ auto block(O)( _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 ); @@ -1240,10 +1240,10 @@ auto verse(O)( _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, @@ -1251,9 +1251,9 @@ auto verse(O)( _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 ); @@ -1317,10 +1317,10 @@ auto code(O)( 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, @@ -1328,9 +1328,9 @@ auto code(O)( _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 ); @@ -1405,7 +1405,7 @@ auto table(O)( _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"> @@ -1413,7 +1413,7 @@ auto table(O)( </table> %s </p> -</div>┋", +</div>┃", 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"┋<?xml version='1.0' encoding='utf-8'?>┋") ~ "\n"; - o ~= format(q"┋<container version="1.0" + o = format(q"┃<?xml version='1.0' encoding='utf-8'?>┃") ~ "\n"; + o ~= format(q"┃<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container"> <rootfiles> <rootfile full-path="OEBPS/content.opf" media-type="application/oebps-package+xml" /> -</rootfiles>┋") ~ "\n</container>\n"; +</rootfiles>┃") ~ "\n</container>\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"┋ <?xml version='1.0' encoding='utf-8'?> + string content = format(q"┃ <?xml version='1.0' encoding='utf-8'?> <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID"> <metadata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -2183,7 +2183,7 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) { <link rel="stylesheet" href="%s" type="text/css" id="main-css" /> <!-- nav epub3 navigation --> <item id="nav" href="toc_nav.xhtml" media-type="application/xhtml+xml" properties="nav" /> -┋", +┃", _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 ~= " " ~ "<!-- Images -->" ~ "\n "; foreach (image; doc_matters.srcs.image_list) { - content ~= format(q"┋ <item id="%s" href="%s/%s" media-type="image/%s" /> -┋", + content ~= format(q"┃ <item id="%s" href="%s/%s" media-type="image/%s" /> +┃", 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"┋<?xml version='1.0' encoding='utf-8'?> + string toc = format(q"┃<?xml version='1.0' encoding='utf-8'?> <ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1"> <head> <!-- four required metadata items (for all NCX documents, @@ -2371,7 +2371,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) { <docAuthor> <text>%s</text> </docAuthor> -<navMap>┋", +<navMap>┃", doc_matters.conf_make_meta.meta.title_full, // title (doc_matters.conf_make_meta.meta.creator_author.empty) ? "" : " by " ~ doc_matters.conf_make_meta.meta.creator_author, // author @@ -2394,12 +2394,12 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) { case DomTags.close_and_open : ++counter; toc ~= "\n </navPoint>"; - toc ~= format(q"┋ + toc ~= format(q"┃ <navPoint class="chapter" id="navpoint" playOrder="%s"> <navLabel> <text>%s</text> </navLabel> - <content src="%s.xhtml%s" />┋", + <content src="%s.xhtml%s" />┃", counter, _txt, obj.tags.segment_anchor_tag_epub, @@ -2408,12 +2408,12 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) { break; case DomTags.open : ++counter; - toc ~= format(q"┋ + toc ~= format(q"┃ <navPoint class="chapter" id="navpoint" playOrder="%s"> <navLabel> <text>%s</text> </navLabel> - <content src="%s.xhtml%s" />┋", + <content src="%s.xhtml%s" />┃", counter, _txt, obj.tags.segment_anchor_tag_epub, @@ -2427,12 +2427,12 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) { } } } - toc ~= format(q"┋ + toc ~= format(q"┃ </navPoint> </navPoint> </navPoint> </navMap> -</ncx>┋"); +</ncx>┃"); return toc; } #+END_SRC @@ -2737,40 +2737,40 @@ void outputEPub3(D,I)( assert(obj.text.length > 0); if (obj.metainfo.heading_lev_markup <= 4) { oepbs_content_parts["manifest_documents"] ~= - format(q"┋ <item id="%s.xhtml" href="%s.xhtml" media-type="application/xhtml+xml" /> -┋", + format(q"┃ <item id="%s.xhtml" href="%s.xhtml" media-type="application/xhtml+xml" /> +┃", obj.tags.segment_anchor_tag_epub, obj.tags.segment_anchor_tag_epub, ); oepbs_content_parts["spine"] ~= - format(q"┋ <itemref idref="%s.xhtml" linear="yes" /> -┋", + format(q"┃ <itemref idref="%s.xhtml" linear="yes" /> +┃", obj.tags.segment_anchor_tag_epub, ); oepbs_content_parts["guide"] ~= - format(q"┋ <reference type="%s" href="%s" /> -┋", + format(q"┃ <reference type="%s" href="%s" /> +┃", obj.tags.segment_anchor_tag_epub, obj.tags.segment_anchor_tag_epub, ); } else if (obj.metainfo.heading_lev_markup > 4) { oepbs_content_parts["manifest_documents"] ~= - format(q"┋ <item id="%s.xhtml#%s" href="%s.xhtml#%s" media-type="application/xhtml+xml" /> -┋", + format(q"┃ <item id="%s.xhtml#%s" href="%s.xhtml#%s" media-type="application/xhtml+xml" /> +┃", obj.tags.segment_anchor_tag_epub, obj.metainfo.object_number, obj.tags.segment_anchor_tag_epub, obj.metainfo.object_number, ); oepbs_content_parts["spine"] ~= - format(q"┋ <itemref idref="%s.xhtml#%s" linear="yes" /> -┋", + format(q"┃ <itemref idref="%s.xhtml#%s" linear="yes" /> +┃", obj.tags.segment_anchor_tag_epub, obj.metainfo.object_number, ); oepbs_content_parts["guide"] ~= - format(q"┋ <reference type="%s#%s" href="%s#%s" /> -┋", + format(q"┃ <reference type="%s#%s" href="%s#%s" /> +┃", obj.tags.segment_anchor_tag_epub, obj.metainfo.object_number, obj.tags.segment_anchor_tag_epub, -- cgit v1.2.3