From 24c9ed3645178a6ee2abbd9201fa4643dba068e2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 14 May 2019 11:35:24 -0400 Subject: review, reduce use of auto --- src/doc_reform/output/xmls.d | 64 ++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 35 deletions(-) (limited to 'src/doc_reform/output/xmls.d') diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index 90f4e7d..25733b1 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -16,8 +16,8 @@ template outputXHTMLs() { struct outputXHTMLs { static auto rgx = Rgx(); string div_delimit( - string part, - return ref string previous_part + string part, + return ref string previous_part ){ string delimit = ""; string delimit_ = ""; @@ -90,7 +90,7 @@ template outputXHTMLs() { } return tags; } - auto header_metadata(M)( + string header_metadata(M)( M doc_matters, ) { string _publisher="Publisher"; // TODO @@ -127,7 +127,7 @@ template outputXHTMLs() { ); return o; } - auto site_info_button(M)( + string site_info_button(M)( M doc_matters, ) { string _locations; @@ -151,7 +151,7 @@ template outputXHTMLs() { ); return o; } - auto inline_search_form(M)( + string inline_search_form(M)( M doc_matters, ) { string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; @@ -186,7 +186,7 @@ template outputXHTMLs() { ); return o; } - auto html_head(M)( + string html_head(M)( M doc_matters, string type, ) { @@ -241,7 +241,7 @@ template outputXHTMLs() { ); return o; } - auto epub3_seg_head(M)( + string epub3_seg_head(M)( M doc_matters, ) { string html_base = format(q"┃ @@ -309,7 +309,7 @@ template outputXHTMLs() { ); return o; } - auto tail() { + string tail() { string o; o = format(q"┃ @@ -318,7 +318,7 @@ template outputXHTMLs() { ┃"); return o; } - auto inline_images(O,M)( + string inline_images(O,M)( string _txt, const O obj, M doc_matters, @@ -345,7 +345,7 @@ template outputXHTMLs() { } return _txt; } - auto inline_links(O,M)( + string inline_links(O,M)( string _txt, const O obj, M doc_matters, @@ -436,7 +436,7 @@ template outputXHTMLs() { } return _txt; } - auto inline_notes_scroll(O,M)( + string inline_notes_scroll(O,M)( string _txt, const O obj, M doc_matters, @@ -500,7 +500,7 @@ template outputXHTMLs() { ); return t; } - auto inline_markup_scroll(O,M)( + string inline_markup_scroll(O,M)( string _txt, const O obj, M doc_matters, @@ -641,7 +641,7 @@ template outputXHTMLs() { } return bar(); } - auto heading(O)( + string heading(O)( string _txt, const O obj, string _xml_type = "html", @@ -650,7 +650,7 @@ template outputXHTMLs() { assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); assert(obj.metainfo.is_of_type == "para"); assert(obj.metainfo.is_a == "heading"); - auto tags = _xhtml_anchor_tags(obj); + string tags = _xhtml_anchor_tags(obj); string heading_lev_anchor_tag; string _horizontal_rule = "
"; if ((_xml_type != "html") @@ -705,13 +705,12 @@ template outputXHTMLs() { } return o; } - auto heading_scroll(O,M)( + string heading_scroll(O,M)( string _txt, const O obj, M doc_matters, string _suffix = ".html", ) { - auto tags = _xhtml_anchor_tags(obj); _txt = inline_markup_scroll(_txt, obj, doc_matters, _suffix); string o = heading(_txt, obj); return o; @@ -733,7 +732,7 @@ template outputXHTMLs() { ); return u; } - auto para(O)( + string para(O)( string _txt, const O obj, ) { @@ -741,7 +740,7 @@ template outputXHTMLs() { assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); assert(obj.metainfo.is_of_type == "para"); assert(obj.metainfo.is_a == "para" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); - auto tags = _xhtml_anchor_tags(obj); + string tags = _xhtml_anchor_tags(obj); _txt = font_face(_txt); string o; _txt = (obj.attrib.bullet) ? ("●  " ~ _txt) : _txt; @@ -778,13 +777,12 @@ template outputXHTMLs() { } return o; } - auto para_scroll(O,M)( + string para_scroll(O,M)( string _txt, const O obj, M doc_matters, string _suffix = ".html", ) { - auto tags = _xhtml_anchor_tags(obj); _txt = inline_markup_scroll(_txt, obj, doc_matters, _suffix); string o = para(_txt, obj); return o; @@ -806,7 +804,7 @@ template outputXHTMLs() { ); return u; } - auto quote(O)( + string quote(O)( string _txt, const O obj, ) { @@ -841,13 +839,12 @@ template outputXHTMLs() { } return o; } - auto quote_scroll(O,M)( + string quote_scroll(O,M)( string _txt, const O obj, M doc_matters, string _suffix = ".html", ) { - auto tags = _xhtml_anchor_tags(obj); _txt = inline_markup_scroll(_txt, obj, doc_matters, _suffix); string o = quote(_txt, obj); return o; @@ -869,7 +866,7 @@ template outputXHTMLs() { ); return u; } - auto group(O)( + string group(O)( string _txt, const O obj, ) { @@ -904,14 +901,13 @@ template outputXHTMLs() { } return o; } - auto group_scroll(O,M)( + string group_scroll(O,M)( string _txt, const O obj, M doc_matters, string _suffix = ".html", string _xml_type = "html", ) { - auto tags = _xhtml_anchor_tags(obj); _txt = inline_markup_scroll(_txt, obj, doc_matters, _suffix); string o = group(_txt, obj); return o; @@ -933,7 +929,7 @@ template outputXHTMLs() { ); return u; } - auto block(O)( + string block(O)( string _txt, const O obj, ) { @@ -964,14 +960,13 @@ template outputXHTMLs() { } return o; } - auto block_scroll(O,M)( + string block_scroll(O,M)( string _txt, const O obj, M doc_matters, string _suffix = ".html", string _xml_type = "html", ) { - auto tags = _xhtml_anchor_tags(obj); _txt = inline_markup_scroll(_txt, obj, doc_matters, _suffix); string o = block(_txt, obj); return o; @@ -993,7 +988,7 @@ template outputXHTMLs() { ); return u; } - auto verse(O)( + string verse(O)( string _txt, const O obj, ) { @@ -1024,14 +1019,13 @@ template outputXHTMLs() { } return o; } - auto verse_scroll(O,M)( + string verse_scroll(O,M)( string _txt, const O obj, M doc_matters, string _suffix = ".html", string _xml_type = "html", ) { - auto tags = _xhtml_anchor_tags(obj); _txt = inline_markup_scroll(_txt, obj, doc_matters, _suffix); string o = verse(_txt, obj); return o; @@ -1086,7 +1080,7 @@ template outputXHTMLs() { ); return t; } - auto table(O)( + string table(O)( string _txt, const O obj, ) { @@ -1094,7 +1088,7 @@ template outputXHTMLs() { assert(obj.metainfo.is_of_section == "body"); assert(obj.metainfo.is_of_type == "block"); assert(obj.metainfo.is_a == "table"); - auto tags = _xhtml_anchor_tags(obj); + string tags = _xhtml_anchor_tags(obj); _txt = font_face(_txt); auto t = tablarize(_txt, obj); _txt = t[0]; @@ -1119,7 +1113,7 @@ template outputXHTMLs() { ); return o; } - auto code(O)( + string code(O)( string _txt, const O obj, ) { -- cgit v1.2.3