aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/doc_reform/io_in/read_source_files.d24
-rw-r--r--src/doc_reform/io_out/latex.d32
-rw-r--r--src/doc_reform/io_out/odt.d18
-rw-r--r--src/doc_reform/io_out/package.d1
-rw-r--r--src/doc_reform/io_out/sqlite.d10
-rw-r--r--src/doc_reform/io_out/xmls.d66
-rw-r--r--src/doc_reform/meta/conf_make_meta_json.d1
-rw-r--r--src/doc_reform/meta/conf_make_meta_structs.d1
-rw-r--r--src/doc_reform/meta/conf_make_meta_yaml.d1
-rw-r--r--src/doc_reform/meta/doc_debugs.d1
-rw-r--r--src/doc_reform/meta/metadoc.d2
-rw-r--r--src/doc_reform/meta/metadoc_from_src.d26
-rw-r--r--src/doc_reform/meta/metadoc_harvest.d1
-rw-r--r--src/doc_reform/meta/metadoc_show_config.d1
-rw-r--r--src/doc_reform/meta/metadoc_show_make.d1
-rw-r--r--src/doc_reform/meta/metadoc_show_metadata.d1
-rw-r--r--src/doc_reform/meta/metadoc_show_summary.d1
-rw-r--r--src/doc_reform/meta/package.d1
-rwxr-xr-xsrc/doc_reform/spine.d2
19 files changed, 85 insertions, 106 deletions
diff --git a/src/doc_reform/io_in/read_source_files.d b/src/doc_reform/io_in/read_source_files.d
index 933868b..bf8702b 100644
--- a/src/doc_reform/io_in/read_source_files.d
+++ b/src/doc_reform/io_in/read_source_files.d
@@ -44,23 +44,21 @@ static template spineRawMarkupContent() {
auto raw = MarkupRawUnit();
string[] insert_file_list;
string[] images_list;
- auto t
+ Tuple!(char[], char[][], string[], string[]) t
= raw.markupSourceHeaderContentRawLineTupleArray(source_txt_str);
auto header_raw = t[0];
auto sourcefile_body_content = t[1];
if (fn_src.match(rgx.src_fn_master)) { // filename with path needed if master file (.ssm) not otherwise
auto ins = Inserts();
- auto tu
+ Tuple!(char[][], string[], string[]) tu
= ins.scan_master_src_for_insert_files_and_import_content(_opt_action, sourcefile_body_content, fn_src);
- static assert(!isTypeTuple!(tu));
sourcefile_body_content = tu[0];
insert_file_list = tu[1].dup;
images_list = tu[2].dup;
} else if (_opt_action.source || _opt_action.pod) {
auto ins = Inserts();
- auto tu
+ Tuple!(char[][], string[], string[]) tu
= ins.scan_master_src_for_insert_files_and_import_content(_opt_action, sourcefile_body_content, fn_src);
- static assert(!isTypeTuple!(tu));
images_list = tu[2].dup;
}
string header_type = "";
@@ -127,14 +125,14 @@ static template spineRawMarkupContent() {
auto source_txt_str = readInMarkupSource(fn_src);
return source_txt_str;
}
- auto markupSourceHeaderContentRawLineTupleArray(in string source_txt_str) @safe {
+ Tuple!(char[], char[][], string[], string[]) markupSourceHeaderContentRawLineTupleArray(in string source_txt_str) @safe {
string[] file_insert_list = [];
string[] images_list = [];
char[][] hc = header0Content1(source_txt_str);
char[] header = hc[0];
char[] source_txt = hc[1];
- auto source_line_arr = markupSourceLineArray(source_txt);
- auto t = tuple(
+ char[][] source_line_arr = markupSourceLineArray(source_txt);
+ Tuple!(char[], char[][], string[], string[]) t = tuple(
header,
source_line_arr,
file_insert_list,
@@ -151,8 +149,8 @@ static template spineRawMarkupContent() {
"not a dr markup filename: «" ~
fn_src_insert ~ "»"
);
- auto source_txt_str = readInMarkupSource(fn_src_insert);
- auto source_line_arr = markupSourceLineArray(source_txt_str);
+ string source_txt_str = readInMarkupSource(fn_src_insert);
+ char[][] source_line_arr = markupSourceLineArray(source_txt_str);
return source_line_arr;
}
}
@@ -236,13 +234,13 @@ static template spineRawMarkupContent() {
}
}
} // end src subdoc (inserts) loop
- auto t = tuple(
+ Tuple!(char[][], string[]) t = tuple(
contents_insert,
_images
);
return t;
}
- auto scan_master_src_for_insert_files_and_import_content(O)(
+ Tuple!(char[][], string[], string[]) scan_master_src_for_insert_files_and_import_content(O)(
O _opt_action,
char[][] sourcefile_body_content,
string fn_src
@@ -332,7 +330,7 @@ static template spineRawMarkupContent() {
writeln(__LINE__);
writeln(contents.length);
}
- auto t = tuple(
+ Tuple!(char[][], string[], string[]) t = tuple(
contents,
insert_file_list,
images
diff --git a/src/doc_reform/io_out/latex.d b/src/doc_reform/io_out/latex.d
index a97a697..ceab202 100644
--- a/src/doc_reform/io_out/latex.d
+++ b/src/doc_reform/io_out/latex.d
@@ -569,24 +569,24 @@ auto tablarize(O)(
string _tablenote;
foreach(row_idx, row; _table_rows) {
_table_cols = row.split(rgx.table_delimiter_col);
- _table ~= "";
- foreach(col_idx, cell; _table_cols) {
- if ((_table_cols.length == 1)
- && (_table_rows.length <= row_idx+2)) { // check row_idx+2 (rather than == ++row_idx)
- _tablenote ~= cell;
- } else {
- // // _table ~= "\\bfseries ";
- // _table ~= cell;
- // _table ~= (_table_cols.length > (col_idx + 1)) ? "&" : "";
- _table ~= format(q"┃%s%s┃",
- cell,
- (_table_cols.length > (col_idx + 1)) ? "&" : ""
- );
- }
+ _table ~= "";
+ foreach(col_idx, cell; _table_cols) {
+ if ((_table_cols.length == 1)
+ && (_table_rows.length <= row_idx+2)) { // check row_idx+2 (rather than == ++row_idx)
+ _tablenote ~= cell;
+ } else {
+ // // _table ~= "\\bfseries ";
+ // _table ~= cell;
+ // _table ~= (_table_cols.length > (col_idx + 1)) ? "&" : "";
+ _table ~= format(q"┃%s%s┃",
+ cell,
+ (_table_cols.length > (col_idx + 1)) ? "&" : ""
+ );
}
- _table ~= "\\\\";
}
- auto t = tuple(
+ _table ~= "\\\\";
+ }
+ Tuple!(string, string) t = tuple(
_table,
_tablenote,
);
diff --git a/src/doc_reform/io_out/odt.d b/src/doc_reform/io_out/odt.d
index 6e792a5..1a553d1 100644
--- a/src/doc_reform/io_out/odt.d
+++ b/src/doc_reform/io_out/odt.d
@@ -243,13 +243,13 @@ template formatODT() {
.replaceAll(rgx.inline_strike, "<del>$1</del>")
.replaceAll(rgx.inline_insert, "<ins>$1</ins>")
.replaceAll(rgx.inline_cite, "<cite>$1</cite>")
- .replaceAll(rgx.inline_emphasis, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃","$1"))
- .replaceAll(rgx.inline_bold, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃","$1"))
- .replaceAll(rgx.inline_italics, format(q"┃<text:span text:style-name="Span_italic">%s</text:span>┃","$1"))
- .replaceAll(rgx.inline_underscore, format(q"┃<text:span text:style-name="Span_underscore">%s</text:span>┃","$1"))
+ .replaceAll(rgx.inline_emphasis, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃", "$1"))
+ .replaceAll(rgx.inline_bold, format(q"┃<text:span text:style-name="Span_bold">%s</text:span>┃", "$1"))
+ .replaceAll(rgx.inline_italics, format(q"┃<text:span text:style-name="Span_italic">%s</text:span>┃", "$1"))
+ .replaceAll(rgx.inline_underscore, format(q"┃<text:span text:style-name="Span_underscore">%s</text:span>┃", "$1"))
.replaceAll(rgx.inline_superscript, format(q"┃<text:span text:style-name="Span_superscript">%s</text:span>┃","$1"))
- .replaceAll(rgx.inline_subscript, format(q"┃<text:span text:style-name="Span_subscript">%s</text:span>┃","$1"))
- .replaceAll(rgx.inline_mono, format(q"┃<text:span text:style-name="Span_monospace">%s</text:span>┃","$1"));
+ .replaceAll(rgx.inline_subscript, format(q"┃<text:span text:style-name="Span_subscript">%s</text:span>┃", "$1"))
+ .replaceAll(rgx.inline_mono, format(q"┃<text:span text:style-name="Span_monospace">%s</text:span>┃", "$1"));
return _txt;
}
auto _obj_num(O)(O obj) @safe { // NOT USED YET
@@ -519,7 +519,7 @@ template formatODT() {
_o_txt_odt = _block;
return _o_txt_odt;
}
- auto tablarize(O)(
+ Tuple!(string, string) tablarize(O)(
const O obj,
string _txt,
) @safe {
@@ -547,7 +547,7 @@ template formatODT() {
}
_table ~= "</table:table-row>";
}
- auto t = tuple(
+ Tuple!(string, string) t = tuple(
_table,
_tablenote,
);
@@ -563,7 +563,7 @@ template formatODT() {
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "table");
string _o_txt_odt = markup(obj);
- auto t = tablarize(obj, _o_txt_odt);
+ Tuple!(string, string) t = tablarize(obj, _o_txt_odt);
string _note = t[1];
_o_txt_odt = format(q"┃
<table:table table:name="Table%s" table:style-name="Table1">
diff --git a/src/doc_reform/io_out/package.d b/src/doc_reform/io_out/package.d
index 1f11046..6bc66ea 100644
--- a/src/doc_reform/io_out/package.d
+++ b/src/doc_reform/io_out/package.d
@@ -10,7 +10,6 @@ public import
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
// std.uni,
std.utf;
diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d
index 0995fe1..c779e00 100644
--- a/src/doc_reform/io_out/sqlite.d
+++ b/src/doc_reform/io_out/sqlite.d
@@ -406,7 +406,7 @@ template SQLiteFormatAndLoadObject() {
}
return _txt;
}
- auto 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);
}
}
- auto t = tuple(
+ Tuple!(string, string) t = tuple(
_txt,
_endnotes,
);
@@ -582,7 +582,7 @@ template SQLiteFormatAndLoadObject() {
assert(obj.metainfo.is_of_section == "body");
assert(obj.metainfo.is_of_type == "block");
assert(obj.metainfo.is_a == "table");
- auto _tablarize(O)(
+ Tuple!(string, string) _tablarize(O)(
const O obj,
string _txt,
) {
@@ -617,14 +617,14 @@ template SQLiteFormatAndLoadObject() {
}
_table ~= "</tr>";
}
- auto t = tuple(
+ Tuple!(string, string) t = tuple(
_table,
_tablenote,
);
return t;
}
string _txt = munge_html(doc_matters, obj);
- auto t = _tablarize(obj, _txt);
+ Tuple!(string, string) t = _tablarize(obj, _txt);
_txt = t[0];
string _note = t[1];
string o = format(q"┃<p class="%s">
diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d
index 4cb7507..739c379 100644
--- a/src/doc_reform/io_out/xmls.d
+++ b/src/doc_reform/io_out/xmls.d
@@ -176,9 +176,7 @@ template outputXHTMLs() {
_db,
);
} else {
- _form = format(q"┃%s┃",
- "",
- );
+ _form = format(q"┃%s┃", "");
}
o = format(q"┃<div class="flex-menu-option">%s
</div>┃",
@@ -467,7 +465,7 @@ template outputXHTMLs() {
}
return _txt;
}
- auto inline_notes_seg(O,M)(
+ Tuple!(string, string[]) inline_notes_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -525,7 +523,7 @@ template outputXHTMLs() {
writeln(__LINE__, " endnote: ", obj.metainfo.is_a, ": ", obj.text);
}
}
- auto t = tuple(
+ Tuple!(string, string[]) t = tuple(
_txt,
_endnotes,
);
@@ -754,7 +752,7 @@ template outputXHTMLs() {
string o = heading(_txt, obj, doc_matters);
return o;
}
- auto heading_seg(O,M)(
+ Tuple!(string, string[]) heading_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -765,7 +763,7 @@ template outputXHTMLs() {
_txt = t[0];
string[] _endnotes = t[1];
string o = heading(_txt, obj, doc_matters, _xml_type);
- auto u = tuple(
+ Tuple!(string, string[]) u = tuple(
o,
_endnotes,
);
@@ -830,7 +828,7 @@ template outputXHTMLs() {
string o = para(_txt, obj, doc_matters);
return o;
}
- auto para_seg(O,M)(
+ Tuple!(string, string[]) para_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -841,7 +839,7 @@ template outputXHTMLs() {
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = para(_txt, obj, doc_matters);
- auto u = tuple(
+ Tuple!(string, string[]) u = tuple(
o,
_endnotes,
);
@@ -893,7 +891,7 @@ template outputXHTMLs() {
string o = quote(_txt, obj, doc_matters);
return o;
}
- auto quote_seg(O,M)(
+ Tuple!(string, string[]) quote_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -904,7 +902,7 @@ template outputXHTMLs() {
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = quote(_txt, obj, doc_matters);
- auto u = tuple(
+ Tuple!(string, string[]) u = tuple(
o,
_endnotes,
);
@@ -957,7 +955,7 @@ template outputXHTMLs() {
string o = group(_txt, obj, doc_matters);
return o;
}
- auto group_seg(O,M)(
+ Tuple!(string, string[]) group_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -968,7 +966,7 @@ template outputXHTMLs() {
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = group(_txt, obj, doc_matters);
- auto u = tuple(
+ Tuple!(string, string[]) u = tuple(
o,
_endnotes,
);
@@ -1017,7 +1015,7 @@ template outputXHTMLs() {
string o = block(_txt, obj, doc_matters);
return o;
}
- auto block_seg(O,M)(
+ Tuple!(string, string[]) block_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -1028,7 +1026,7 @@ template outputXHTMLs() {
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = block(_txt, obj, doc_matters);
- auto u = tuple(
+ Tuple!(string, string[]) u = tuple(
o,
_endnotes,
);
@@ -1077,7 +1075,7 @@ template outputXHTMLs() {
string o = verse(_txt, obj, doc_matters);
return o;
}
- auto verse_seg(O,M)(
+ Tuple!(string, string[]) verse_seg(O,M)(
string _txt,
const O obj,
M doc_matters,
@@ -1088,13 +1086,13 @@ template outputXHTMLs() {
_txt = t[0].to!string;
string[] _endnotes = t[1];
string o = verse(_txt, obj, doc_matters);
- auto u = tuple(
+ Tuple!(string, string[]) u = tuple(
o,
_endnotes,
);
return u;
}
- auto tablarize(O)(
+ Tuple!(string, string) tablarize(O)(
string _txt,
const O obj,
) @safe {
@@ -1104,24 +1102,24 @@ template outputXHTMLs() {
string _tablenote;
foreach(row_idx, row; _table_rows) {
_table_cols = row.split(rgx.table_delimiter_col);
- _table ~= "<tr>";
- foreach(col_idx, cell; _table_cols) {
- if ((_table_cols.length == 1)
- && (_table_rows.length <= row_idx+2)) {
- _tablenote ~= cell;
- } else {
- string _col_is = (row_idx == 0 && obj.table.heading) ? "th" : "td";
- string _align = ("style=\"text-align:"
- ~ ((obj.table.column_aligns[col_idx] == "l")
- ? "left\"" : "right\""));
- _table ~= "<" ~ _col_is ~ " width=\"" ~ obj.table.column_widths[col_idx].to!string ~ "%\" " ~ _align ~ ">";
- _table ~= cell;
- _table ~= "</" ~ _col_is ~ ">";
- }
+ _table ~= "<tr>";
+ foreach(col_idx, cell; _table_cols) {
+ if ((_table_cols.length == 1)
+ && (_table_rows.length <= row_idx+2)) {
+ _tablenote ~= cell;
+ } else {
+ string _col_is = (row_idx == 0 && obj.table.heading) ? "th" : "td";
+ string _align = ("style=\"text-align:"
+ ~ ((obj.table.column_aligns[col_idx] == "l")
+ ? "left\"" : "right\""));
+ _table ~= "<" ~ _col_is ~ " width=\"" ~ obj.table.column_widths[col_idx].to!string ~ "%\" " ~ _align ~ ">";
+ _table ~= cell;
+ _table ~= "</" ~ _col_is ~ ">";
}
- _table ~= "</tr>";
}
- auto t = tuple(
+ _table ~= "</tr>";
+ }
+ Tuple!(string, string) t = tuple(
_table,
_tablenote,
);
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 95f9c2a..4f33108 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -11,7 +11,6 @@ static template contentJSONtoSpineStruct() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.utf,
std.conv : to;
diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 7f220aa..c1d6f2c 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -6,7 +6,6 @@ import
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.utf,
std.conv : to;
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 1467fea..69ec567 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -12,7 +12,6 @@ static template contentYAMLtoSpineStruct() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.utf,
std.conv : to;
diff --git a/src/doc_reform/meta/doc_debugs.d b/src/doc_reform/meta/doc_debugs.d
index 4a9a591..2815e4f 100644
--- a/src/doc_reform/meta/doc_debugs.d
+++ b/src/doc_reform/meta/doc_debugs.d
@@ -18,7 +18,6 @@ template spineDebugs() {
std.range,
std.regex,
std.string,
- std.traits,
std.typecons,
std.utf,
std.conv : to;
diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index e45139d..0db5d96 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -52,7 +52,6 @@ template spineAbstraction() {
}
auto _header_body_insertfilelist_imagelist
= spineRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn);
- static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist));
static assert(_header_body_insertfilelist_imagelist.length==4);
if ((_opt_action.debug_do)
|| (_opt_action.very_verbose)
@@ -95,7 +94,6 @@ template spineAbstraction() {
_manifest,
true,
);
- static assert(!isTypeTuple!(da));
static assert(da.length==2);
auto doc_abstraction = da[docAbst.doc_abstract_obj]; /+ head ~ toc ~ body ~ endnotes_seg ~ glossary ~ bibliography ~ bookindex ~ blurb; +/
auto _doc_has_struct = da[docAbst.doc_has];
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 5e61237..99de32c 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -1186,7 +1186,6 @@ template docAbstraction() {
/+ ↓ post loop markup document/text +/
auto en_tuple
= note_section.endnote_objects(obj_cite_digits, opt_action);
- static assert(!isTypeTuple!(en_tuple));
auto the_endnotes_section = en_tuple[0];
obj_cite_digits = en_tuple[1];
debug(endnotes) {
@@ -1338,7 +1337,6 @@ template docAbstraction() {
opt_action,
);
destroy(bookindex_unordered_hashes);
- static assert(!isTypeTuple!(bi_tuple));
auto the_bookindex_section = bi_tuple[0];
obj_cite_digits = bi_tuple[1];
debug(bookindex) {
@@ -4327,7 +4325,7 @@ template docAbstraction() {
}
return obj_txt_in;
}
- auto footnotes_endnotes_markup_and_number_or_stars()(string obj_txt_in, bool reset_note_numbers) @safe {
+ Tuple!(string, bool, bool, bool) footnotes_endnotes_markup_and_number_or_stars()(string obj_txt_in, bool reset_note_numbers) @safe {
/+ endnotes (regular) +/
bool flg_notes_reg = false;
bool flg_notes_star = false;
@@ -4383,7 +4381,7 @@ template docAbstraction() {
} else {
obj_txt_out = obj_txt_in;
}
- auto t = tuple(
+ Tuple!(string, bool, bool, bool) t = tuple(
obj_txt_out,
flg_notes_reg,
flg_notes_star,
@@ -4391,7 +4389,7 @@ template docAbstraction() {
);
return t;
}
- private auto object_notes_and_links_()(
+ private Tuple!(string, bool, bool, bool, bool, bool) object_notes_and_links_()(
string obj_txt_in,
bool reset_note_numbers=false
) @safe {
@@ -4425,7 +4423,7 @@ template docAbstraction() {
obj_txt_in = obj_txt_in
.replaceAll(rgx.para_inline_link_anchor, "┃$1┃");
}
- auto ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
+ Tuple!(string, bool, bool, bool) ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
obj_txt_out = ftn[0];
debug(footnotes) {
writeln(obj_txt_out, tail);
@@ -4438,7 +4436,7 @@ template docAbstraction() {
writeln(m.hit);
}
}
- auto t = tuple(
+ Tuple!(string, bool, bool, bool, bool, bool) t = tuple(
obj_txt_out,
ftn[1],
ftn[2],
@@ -4449,7 +4447,7 @@ template docAbstraction() {
return t;
}
auto init() {
- auto t = object_notes_and_links_("");
+ Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_("");
return t;
}
invariant() {
@@ -4462,7 +4460,7 @@ template docAbstraction() {
.replaceFirst(rgx.heading, "")
.replaceFirst(rgx.object_number_off_all, "")
.strip;
- auto t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
+ Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
debug(munge) {
writeln(__LINE__);
writeln(obj_txt_in);
@@ -4477,7 +4475,7 @@ template docAbstraction() {
obj_txt["munge"]=(obj_txt_in)
.replaceFirst(rgx.para_attribs, "")
.replaceFirst(rgx.object_number_off_all, "");
- auto t = object_notes_and_links_(obj_txt["munge"]);
+ Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
debug(munge) {
writeln(__LINE__);
writeln(obj_txt_in);
@@ -4494,21 +4492,21 @@ template docAbstraction() {
}
auto munge_group(string obj_txt_in) @safe {
obj_txt["munge"]=obj_txt_in;
- auto t = object_notes_and_links_(obj_txt["munge"]);
+ Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
return t;
}
invariant() {
}
auto munge_block()(string obj_txt_in) @safe {
obj_txt["munge"]=obj_txt_in;
- auto t = object_notes_and_links_(obj_txt["munge"]);
+ Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
return t;
}
invariant() {
}
auto munge_verse()(string obj_txt_in) @safe {
obj_txt["munge"]=obj_txt_in;
- auto t = object_notes_and_links_(obj_txt["munge"]);
+ Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
return t;
}
invariant() {
@@ -4618,7 +4616,7 @@ template docAbstraction() {
obj_notes_and_links["image_no_dimensions"] = x[5];
break;
}
- auto t = tuple(
+ Tuple!(string, string, bool, bool, bool, bool) t = tuple(
obj_txt["munge"],
anchor_tag,
obj_notes_and_links["notes_reg"],
diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d
index 362ba34..4bb62ae 100644
--- a/src/doc_reform/meta/metadoc_harvest.d
+++ b/src/doc_reform/meta/metadoc_harvest.d
@@ -13,7 +13,6 @@ template spineMetaDocHarvest() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.uni,
std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_config.d b/src/doc_reform/meta/metadoc_show_config.d
index 6e18516..b71fbab 100644
--- a/src/doc_reform/meta/metadoc_show_config.d
+++ b/src/doc_reform/meta/metadoc_show_config.d
@@ -12,7 +12,6 @@ template spineShowConfig() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.uni,
std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_make.d b/src/doc_reform/meta/metadoc_show_make.d
index ed334d0..e656a29 100644
--- a/src/doc_reform/meta/metadoc_show_make.d
+++ b/src/doc_reform/meta/metadoc_show_make.d
@@ -12,7 +12,6 @@ template spineShowMake() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.uni,
std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_metadata.d b/src/doc_reform/meta/metadoc_show_metadata.d
index e860452..0bd6854 100644
--- a/src/doc_reform/meta/metadoc_show_metadata.d
+++ b/src/doc_reform/meta/metadoc_show_metadata.d
@@ -12,7 +12,6 @@ template spineShowMetaData() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.uni,
std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_summary.d b/src/doc_reform/meta/metadoc_show_summary.d
index 71d8d87..9f2e34b 100644
--- a/src/doc_reform/meta/metadoc_show_summary.d
+++ b/src/doc_reform/meta/metadoc_show_summary.d
@@ -13,7 +13,6 @@ template spineMetaDocSummary() {
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
std.uni,
std.utf,
diff --git a/src/doc_reform/meta/package.d b/src/doc_reform/meta/package.d
index 2981b6a..89334c0 100644
--- a/src/doc_reform/meta/package.d
+++ b/src/doc_reform/meta/package.d
@@ -10,7 +10,6 @@ public import
std.regex,
std.stdio,
std.string,
- std.traits,
std.typecons,
// std.uni,
std.utf,
diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index 2ee081c..134854e 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -759,7 +759,6 @@ void main(string[] args) {
writeln("--->\nstepX commence → (document abstraction)");
}
auto t = spineAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct);
- static assert(!isTypeTuple!(t));
static assert(t.length==2);
auto doc_abstraction = t[dAM.abstraction];
auto doc_matters = t[dAM.matters];
@@ -875,7 +874,6 @@ void main(string[] args) {
writeln("--->\nstepX commence → (document abstraction)");
}
auto t = spineAbstraction!()(_env, program_info, _opt_action, manifest, _make_and_meta_struct);
- static assert(!isTypeTuple!(t));
static assert(t.length==2);
auto doc_abstraction = t[dAM.abstraction];
auto doc_matters = t[dAM.matters];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 09:55:14 +0000