From 10ec5e96d65b58dbe915c2d622b0bfb8abbd122b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 21 Dec 2019 11:38:05 -0500 Subject: reduce use of auto, much with tuples --- src/doc_reform/io_out/defaults.d | 2 +- src/doc_reform/io_out/epub3.d | 6 +++--- src/doc_reform/io_out/html.d | 6 +++--- src/doc_reform/io_out/latex.d | 6 +++--- src/doc_reform/io_out/metadata.d | 4 ++-- src/doc_reform/io_out/odt.d | 2 +- src/doc_reform/io_out/sqlite.d | 6 +++--- src/doc_reform/io_out/xmls.d | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/doc_reform/io_out') diff --git a/src/doc_reform/io_out/defaults.d b/src/doc_reform/io_out/defaults.d index 887c1be..4dd8021 100644 --- a/src/doc_reform/io_out/defaults.d +++ b/src/doc_reform/io_out/defaults.d @@ -35,7 +35,7 @@ template InternalMarkup() { string tc_p = "┆"; string img = "☼"; string sep = "␣"; - string on_o = "「"; auto on_c = "」"; + string on_o = "「"; string on_c = "」"; string mk_bullet = "● "; static string indent_by_spaces_provided(int indent, string _indent_spaces ="░░") { _indent_spaces = replicate(_indent_spaces, indent); diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d index 35a31cd..4de98a1 100644 --- a/src/doc_reform/io_out/epub3.d +++ b/src/doc_reform/io_out/epub3.d @@ -131,7 +131,7 @@ template outputEPub3() { 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(" @@ -211,7 +211,7 @@ template outputEPub3() { 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"┃ @@ -303,7 +303,7 @@ template outputEPub3() { ) { // @trusted mixin spineOutputRgxInit; auto xhtml_format = outputXHTMLs(); - auto rgx = Rgx(); + static auto rgx = Rgx(); string[] doc; string segment_filename; string[] top_level_headings = ["","","",""]; diff --git a/src/doc_reform/io_out/html.d b/src/doc_reform/io_out/html.d index 458533c..8598ca5 100644 --- a/src/doc_reform/io_out/html.d +++ b/src/doc_reform/io_out/html.d @@ -19,7 +19,7 @@ template outputHTML() { ) @safe { mixin spineOutputRgxInit; auto xhtml_format = outputXHTMLs(); - auto rgx = Rgx(); + static auto rgx = Rgx(); string[] doc_html; string[] doc; string suffix = ".html"; @@ -211,7 +211,7 @@ template outputHTML() { 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; @@ -468,7 +468,7 @@ template outputHTML() { 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); diff --git a/src/doc_reform/io_out/latex.d b/src/doc_reform/io_out/latex.d index 52707db..cfa347c 100644 --- a/src/doc_reform/io_out/latex.d +++ b/src/doc_reform/io_out/latex.d @@ -9,7 +9,7 @@ template outputLaTeX() { std.conv : to; mixin InternalMarkup; // watch mixin spineOutputRgxInit; - auto rgx = Rgx(); + static auto rgx = Rgx(); mixin spineLanguageCodes; auto lang = Lang(); auto paper() { @@ -1180,8 +1180,8 @@ string table(O,M)( f.writeln(latex_content.content); f.writeln(latex_content.tail); foreach (image; doc_matters.srcs.image_list) { - auto fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image; - auto fn_src_out_file = pth_latex.latex_path_stuff ~ "/" ~ image; + string fn_src_in = doc_matters.src.image_dir_path ~ "/" ~ image; + string fn_src_out_file = pth_latex.latex_path_stuff ~ "/" ~ image; if (exists(fn_src_in)) { fn_src_in.copy(fn_src_out_file); } diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index b935734..8201926 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -1,9 +1,9 @@ -module spine.io_out.metadata; +module doc_reform.io_out.metadata; template outputMetadata() { void outputMetadata(T)( T doc_matters) @safe { import std.file; import std.format; - import spine.io_out; + import doc_reform.io_out; mixin InternalMarkup; string[] metadata_; string theme_dark_0 = format(q"┃ diff --git a/src/doc_reform/io_out/odt.d b/src/doc_reform/io_out/odt.d index 09bcf65..23eb947 100644 --- a/src/doc_reform/io_out/odt.d +++ b/src/doc_reform/io_out/odt.d @@ -604,7 +604,7 @@ template outputODT() { doc_reform.io_out.xmls_css; mixin InternalMarkup; mixin spineOutputRgxInit; - auto rgx = Rgx(); + static auto rgx = Rgx(); // mixin outputXmlODT; string odt_head(I)(I doc_matters) @safe { string _has_tables = format(q"┃ diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d index f9a17d4..e83a75f 100644 --- a/src/doc_reform/io_out/sqlite.d +++ b/src/doc_reform/io_out/sqlite.d @@ -128,7 +128,7 @@ template SQLiteDbRun() { } } template SQLinsertDelimiter() { - auto SQLinsertDelimiter(string _txt) { + string SQLinsertDelimiter(string _txt) { _txt = _txt .replaceAll(rgx.quotation_mark_sql_insert_delimiter, "$0$0"); return _txt; @@ -406,7 +406,7 @@ template SQLiteFormatAndLoadObject() { } return _txt; } - Tuple!(string, string) inline_notes_seg(M,O)( + Tuple!(string, string[]) inline_notes_seg(M,O)( M doc_matters, const O obj, string _txt, @@ -439,7 +439,7 @@ template SQLiteFormatAndLoadObject() { writeln(__LINE__, " endnote: ", obj.metainfo.is_a, ": ", obj.text); } } - Tuple!(string, string) t = tuple( + Tuple!(string, string[]) t = tuple( _txt, _endnotes, ); diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index b14a7bf..1d58e27 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -458,9 +458,9 @@ template outputXHTMLs() { return _txt; } 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) { @@ -554,7 +554,7 @@ template outputXHTMLs() { _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; } string lev4_heading_subtoc(O,M)( -- cgit v1.2.3