aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/out_xmls.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2019-12-21 11:38:05 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2020-02-11 13:08:49 -0500
commit10ec5e96d65b58dbe915c2d622b0bfb8abbd122b (patch)
treef07e7b940b754a8133ff69c29596fcbcd327aef7 /org/out_xmls.org
parentxmls, minor, internal links (metadata, images) (diff)
reduce use of auto, much with tuples
Diffstat (limited to 'org/out_xmls.org')
-rw-r--r--org/out_xmls.org20
1 files changed, 10 insertions, 10 deletions
diff --git a/org/out_xmls.org b/org/out_xmls.org
index df095ec..9738c23 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -589,9 +589,9 @@ string inline_notes_scroll(O,M)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
Tuple!(string, string[]) inline_notes_seg(O,M)(
- string _txt,
- const O obj,
- M doc_matters,
+ string _txt,
+ const O obj,
+ M doc_matters,
) @safe {
string[] _endnotes;
if (obj.has.inline_notes_star) {
@@ -698,7 +698,7 @@ auto inline_markup_seg(O,M)(
_txt = inline_images(_txt, obj, doc_matters, _suffix, _xml_type); // TODO
_txt = inline_links(_txt, obj, doc_matters, _suffix, _xml_type); // TODO
}
- auto t = inline_notes_seg(_txt, obj, doc_matters);
+ Tuple!(string, string[]) t = inline_notes_seg(_txt, obj, doc_matters);
return t;
}
#+END_SRC
@@ -1529,7 +1529,7 @@ void scroll(D,M)(
) @safe {
mixin spineOutputRgxInit;
auto xhtml_format = outputXHTMLs();
- auto rgx = Rgx();
+ static auto rgx = Rgx();
string[] doc_html;
string[] doc;
string suffix = ".html";
@@ -1764,7 +1764,7 @@ void seg(D,M)(
M doc_matters,
) @safe {
mixin spineOutputRgxInit;
- auto rgx = Rgx();
+ static auto rgx = Rgx();
auto xhtml_format = outputXHTMLs();
string[][string] doc_html;
string[][string] doc_html_endnotes;
@@ -2069,7 +2069,7 @@ void seg_write_output(D,E,M)(
static assert(is(typeof(doc_html) == string[][string]));
}
mixin spineOutputRgxInit;
- auto rgx = Rgx();
+ static auto rgx = Rgx();
auto pth_html = spinePathsHTML!()(doc_matters.output_path, doc_matters.src.language);
auto xhtml_format = outputXHTMLs();
auto m = doc_matters.src.filename.matchFirst(rgx.src_fn);
@@ -2334,7 +2334,7 @@ string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) @sa
string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) @safe {
enum DomTags { none, open, close, close_and_open, open_still, }
auto markup = InlineMarkup();
- auto rgx = Rgx();
+ static auto rgx = Rgx();
string toc =format("<html xmlns=\"http://www.w3.org/1999/xhtml\"
xmlns:epub=\"http://www.idpf.org/2007/ops\">
<head>
@@ -2423,7 +2423,7 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) @safe {
int counter = 0;
string _uuid = "18275d951861c77f78acd05672c9906924c59f18a2e0ba06dad95959693e9bd8"; // TODO shared elsewhere
auto markup = InlineMarkup();
- auto rgx = Rgx();
+ static auto rgx = Rgx();
enum DomTags { none, open, close, close_and_open, open_still, }
string toc = format(q"┃<?xml version='1.0' encoding='utf-8'?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
@@ -2521,7 +2521,7 @@ void outputEPub3(D,I)(
) { // @trusted
mixin spineOutputRgxInit;
auto xhtml_format = outputXHTMLs();
- auto rgx = Rgx();
+ static auto rgx = Rgx();
string[] doc;
string segment_filename;
string[] top_level_headings = ["","","",""];