aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/meta
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc_reform/meta')
-rw-r--r--src/doc_reform/meta/metadoc_from_src.d138
1 files changed, 69 insertions, 69 deletions
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index de2df2b..5df5e87 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -438,11 +438,11 @@ template DocReformDocAbstraction() {
}
}
if (!line.empty) {
- obj_type_status = _check_ocn_status_(line, obj_type_status);
+ obj_type_status = line._check_ocn_status_(obj_type_status);
}
if (obj_type_status["code"] == TriState.on) {
/+ block object: code +/
- _code_block_(line, an_object, obj_type_status);
+ line._code_block_(an_object, obj_type_status);
continue;
} else if (!matchFirst(line, rgx.skip_from_regular_parse)) {
/+ object other than "code block" object
@@ -458,7 +458,7 @@ template DocReformDocAbstraction() {
obj_type_status["biblio_section"] = State.on;
obj_type_status["blurb_section"] = State.off;
if (opt_action.backmatter && opt_action.section_biblio) {
- _biblio_block_(line, obj_type_status, bib_entry, biblio_entry_str_json, biblio_arr_json);
+ line._biblio_block_(obj_type_status, bib_entry, biblio_entry_str_json, biblio_arr_json);
debug(bibliobuild) {
writeln("- ", biblio_entry_str_json);
writeln("-> ", biblio_arr_json.length);
@@ -534,7 +534,7 @@ template DocReformDocAbstraction() {
tag_assoc[comp_obj_heading_.tags.anchor_tag_html]["seg_lv4"] = comp_obj_heading_.tags.in_segment_html;
tag_assoc[comp_obj_heading_.tags.segment_anchor_tag_epub]["seg_lv1_to_4"] = comp_obj_heading_.tags.segment_anchor_tag_epub;
} else {
- _para_match_(line, an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
+ line._para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
comp_obj_para = comp_obj_para.init;
comp_obj_para.metainfo.is_of_part = "backmatter";
comp_obj_para.metainfo.is_of_section = "glossary";
@@ -673,7 +673,7 @@ template DocReformDocAbstraction() {
tag_assoc[comp_obj_heading_.tags.anchor_tag_html]["seg_lv4"] = comp_obj_heading_.tags.in_segment_html;
tag_assoc[comp_obj_heading_.tags.segment_anchor_tag_epub]["seg_lv1_to_4"] = comp_obj_heading_.tags.segment_anchor_tag_epub;
} else {
- _para_match_(line, an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
+ line._para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
comp_obj_para = comp_obj_para.init;
comp_obj_para.metainfo.is_of_part = "backmatter";
comp_obj_para.metainfo.is_of_section = "blurb";
@@ -695,23 +695,23 @@ template DocReformDocAbstraction() {
continue;
} else if (obj_type_status["quote"] == TriState.on) {
/+ within block object: quote +/
- line = _doc_header_and_make_substitutions_(line, conf_make_meta);
- line = _doc_header_and_make_substitutions_fontface_(line, conf_make_meta);
- _quote_block_(line, an_object, obj_type_status);
+ line = line._doc_header_and_make_substitutions_(conf_make_meta);
+ line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
+ line._quote_block_(an_object, obj_type_status);
continue;
/+ within block object: group +/
} else if (obj_type_status["group"] == TriState.on) {
/+ within block object: group +/
- line = _doc_header_and_make_substitutions_(line, conf_make_meta);
- line = _doc_header_and_make_substitutions_fontface_(line, conf_make_meta);
+ line = line._doc_header_and_make_substitutions_(conf_make_meta);
+ line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
line = line
.replaceAll(rgx.para_delimiter, mkup.br_paragraph ~ "$1");
- _group_block_(line, an_object, obj_type_status);
+ line._group_block_(an_object, obj_type_status);
continue;
} else if (obj_type_status["block"] == TriState.on) {
/+ within block object: block +/
- line = _doc_header_and_make_substitutions_(line, conf_make_meta);
- line = _doc_header_and_make_substitutions_fontface_(line, conf_make_meta);
+ line = line._doc_header_and_make_substitutions_(conf_make_meta);
+ line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
if (auto m = line.match(rgx.spaces_line_start)) {
line = line
.replaceAll(rgx.spaces_line_start, (m.captures[1]).translate([ ' ' : mkup.nbsp ]));
@@ -720,15 +720,15 @@ template DocReformDocAbstraction() {
line = line
.replaceAll(rgx.spaces_multiple, (m.captures[1]).translate([ ' ' : mkup.nbsp ]));
}
- _block_block_(line, an_object, obj_type_status);
+ line._block_block_(an_object, obj_type_status);
continue;
} else if (obj_type_status["poem"] == TriState.on) {
/+ within block object: poem +/
- _poem_block_(line, an_object, obj_type_status, cntr, object_number_poem, conf_make_meta, tag_in_seg);
+ line._poem_block_(an_object, obj_type_status, cntr, object_number_poem, conf_make_meta, tag_in_seg);
continue;
} else if (obj_type_status["table"] == TriState.on) {
/+ within block object: table +/
- _table_block_(line, an_object, obj_type_status, conf_make_meta);
+ line._table_block_(an_object, obj_type_status, conf_make_meta);
continue;
} else {
/+ not within a block group +/
@@ -745,7 +745,7 @@ template DocReformDocAbstraction() {
processing.remove("verse");
object_number_poem["start"] = obj_cite_digits.object_number.to!string;
}
- _start_block_(line, obj_type_status, object_number_poem);
+ line._start_block_(obj_type_status, object_number_poem);
continue;
} else if (!line.empty) {
/+ line not empty +/
@@ -776,7 +776,7 @@ template DocReformDocAbstraction() {
|| line.matchFirst(rgx.book_index_open)
|| obj_type_status["book_index"] == State.on ) {
/+ book_index +/
- _book_index_(line, book_idx_tmp, an_object, obj_type_status, opt_action);
+ line._book_index_(book_idx_tmp, an_object, obj_type_status, opt_action);
} else {
/+ not book_index +/
an_object_key="body_nugget";
@@ -804,7 +804,7 @@ template DocReformDocAbstraction() {
if ((conf_make_meta.make.headings.length > 2)
&& (obj_type_status["make_headings"] == State.off)) {
/+ heading found +/
- _heading_found_(line, conf_make_meta.make.headings, heading_match_str, heading_match_rgx, obj_type_status);
+ line._heading_found_(conf_make_meta.make.headings, heading_match_str, heading_match_rgx, obj_type_status);
}
if ((obj_type_status["make_headings"] == State.on)
&& ((line_occur["para"] == State.off)
@@ -812,7 +812,7 @@ template DocReformDocAbstraction() {
&& ((obj_type_status["para"] == State.off)
&& (obj_type_status["heading"] == State.off))) {
/+ heading make set +/
- line = _heading_make_set_(line, line_occur, heading_match_rgx, obj_type_status);
+ line = line._heading_make_set_(line_occur, heading_match_rgx, obj_type_status);
}
/+ TODO node info: all headings identified at this point,
- extract node info here??
@@ -822,14 +822,14 @@ template DocReformDocAbstraction() {
+/
if (line.matchFirst(rgx.heading)) {
/+ heading match +/
- line = _doc_header_and_make_substitutions_(line, conf_make_meta);
- _heading_matched_(line, line_occur, an_object, an_object_key, lv, collapsed_lev, obj_type_status, conf_make_meta);
+ line = line._doc_header_and_make_substitutions_(conf_make_meta);
+ line._heading_matched_(line_occur, an_object, an_object_key, lv, collapsed_lev, obj_type_status, conf_make_meta);
} else if (line_occur["para"] == State.off) {
/+ para match +/
an_object_key="body_nugget";
- line = _doc_header_and_make_substitutions_(line, conf_make_meta);
- line = _doc_header_and_make_substitutions_fontface_(line, conf_make_meta);
- _para_match_(line, an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
+ line = line._doc_header_and_make_substitutions_(conf_make_meta);
+ line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
+ line._para_match_(an_object, an_object_key, indent, bullet, obj_type_status, line_occur);
}
} else if (line_occur["heading"] > State.off) {
/+ heading +/
@@ -843,8 +843,8 @@ template DocReformDocAbstraction() {
debug(para) {
writeln(an_object_key, "-> ", line);
}
- line = _doc_header_and_make_substitutions_(line, conf_make_meta);
- line = _doc_header_and_make_substitutions_fontface_(line, conf_make_meta);
+ line = line._doc_header_and_make_substitutions_(conf_make_meta);
+ line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
an_object[an_object_key] ~= " " ~ line;
++line_occur["para"];
}
@@ -1049,7 +1049,7 @@ template DocReformDocAbstraction() {
comp_obj_para.has.inline_links = substantive_obj_misc_tuple[sObj.links];
comp_obj_para.has.image_without_dimensions = substantive_obj_misc_tuple[sObj.image_no_dimensions];
the_document_body_section ~= comp_obj_para;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
_common_reset_(line_occur, an_object, obj_type_status);
indent=[
"hang_position" : 0,
@@ -1697,7 +1697,7 @@ template DocReformDocAbstraction() {
return images_;
}
string[] segnames_lv0_to_4;
- auto _image_dimensions(M,O)(M manifest_matter, O obj) {
+ auto _image_dimensions(O,M)(O obj, M manifest_matter) {
if (obj.has.image_without_dimensions) {
import std.math;
import imageformats;
@@ -1774,10 +1774,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
}
obj = _links(obj);
}
@@ -1802,10 +1802,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
}
obj = _links(obj);
}
@@ -1846,13 +1846,13 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
} else if (obj.metainfo.is_a == "para") {
_images ~= extract_images(obj.text);
- obj = _image_dimensions(manifest_matter, obj);
+ obj = _image_dimensions(obj, manifest_matter);
}
obj = _links(obj);
}
@@ -1890,10 +1890,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
}
obj = _links(obj);
}
@@ -1926,10 +1926,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
} else if (obj.metainfo.is_a == "glossary") {
obj_cite_digits = ocn_emit(OCNstatus.on);
obj.metainfo.ocn = obj_cite_digits.object_number;
@@ -1966,10 +1966,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
} else if (obj.metainfo.is_a == "bibliography") {
obj_cite_digits = ocn_emit(OCNstatus.on);
obj.metainfo.ocn = obj_cite_digits.object_number;
@@ -2013,10 +2013,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
} else if (obj.metainfo.is_a == "bookindex") {
obj_cite_digits = ocn_emit(OCNstatus.bkidx);
obj.metainfo.ocn = obj_cite_digits.object_number;
@@ -2059,10 +2059,10 @@ template DocReformDocAbstraction() {
|| (opt_action.epub)
|| (opt_action.sqlite_discrete)
|| (opt_action.sqlite_update)) {
- obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
- obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
+ obj = obj.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup);
+ obj = obj.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed);
}
- obj = obj_heading_ancestors(obj, lv_ancestors_txt);
+ obj = obj.obj_heading_ancestors(lv_ancestors_txt);
} else if (obj.metainfo.is_a == "blurb") {
obj_cite_digits = ocn_emit(OCNstatus.off);
obj.metainfo.object_number_off = obj_cite_digits.off;
@@ -2189,9 +2189,9 @@ template DocReformDocAbstraction() {
comp_obj_heading_.metainfo.parent_lev_markup = 0;
comp_obj_heading_.metainfo.dom_structure_markedup_tags_status = dom_structure_markedup_tags_status.dup;
comp_obj_heading_.metainfo.dom_structure_collapsed_tags_status = dom_structure_collapsed_tags_status.dup;
- comp_obj_heading_ = obj_dom_structure_set_markup_tags(comp_obj_heading_, dom_structure_markedup_tags_status, 0);
- comp_obj_heading_ = obj_dom_set_collapsed_tags(comp_obj_heading_, dom_structure_collapsed_tags_status, 0);
- comp_obj_heading_ = obj_heading_ancestors(comp_obj_heading_, lv_ancestors_txt);
+ comp_obj_heading_ = comp_obj_heading_.obj_dom_structure_set_markup_tags(dom_structure_markedup_tags_status, 0);
+ comp_obj_heading_ = comp_obj_heading_.obj_dom_set_collapsed_tags(dom_structure_collapsed_tags_status, 0);
+ comp_obj_heading_ = comp_obj_heading_.obj_heading_ancestors(lv_ancestors_txt);
// the_dom_tail_section ~= comp_obj_heading_; // remove tail for now, decide on later
auto document_the = [
"head": the_document_head_section,
@@ -2779,7 +2779,7 @@ template DocReformDocAbstraction() {
comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star];
comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links];
the_document_body_section ~= comp_obj_block;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
}
object_reset(an_object);
processing.remove("verse");
@@ -2842,7 +2842,7 @@ template DocReformDocAbstraction() {
comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star];
comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links];
the_document_body_section ~= comp_obj_block;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
object_reset(an_object);
processing.remove("verse");
++cntr;
@@ -2888,7 +2888,7 @@ template DocReformDocAbstraction() {
comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star];
comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links];
the_document_body_section ~= comp_obj_block;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
object_number_poem["end"] = obj_cite_digits.object_number.to!string;
object_reset(an_object);
processing.remove("verse");
@@ -2951,7 +2951,7 @@ template DocReformDocAbstraction() {
comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star];
comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links];
the_document_body_section ~= comp_obj_block;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
object_reset(an_object);
processing.remove("verse");
++cntr;
@@ -3247,8 +3247,8 @@ template DocReformDocAbstraction() {
comp_obj_block.tags.epub_segment_anchor_tag_is = tag_in_seg["seg_lv1_to_4"];
comp_obj_block.metainfo.o_n_book_index = obj_cite_digits.bkidx;
comp_obj_block.metainfo.object_number_type = obj_cite_digits.type;
- comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]);
- comp_obj_block = table_substantive_munge_special(comp_obj_block, an_object["substantive"]);
+ comp_obj_block = comp_obj_block.table_instructions(an_object["table_head"]);
+ comp_obj_block = comp_obj_block.table_substantive_munge_special(an_object["substantive"]);
the_document_body_section ~= comp_obj_block;
object_reset(an_object);
processing.remove("verse");
@@ -3321,7 +3321,7 @@ template DocReformDocAbstraction() {
comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star];
comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links];
the_document_body_section ~= comp_obj_block;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
obj_type_status["blocks"] = TriState.off;
obj_type_status["quote"] = TriState.off;
object_reset(an_object);
@@ -3370,7 +3370,7 @@ template DocReformDocAbstraction() {
comp_obj_block.has.inline_notes_star = substantive_obj_misc_tuple[sObj.notes_star];
comp_obj_block.has.inline_links = substantive_obj_misc_tuple[sObj.links];
the_document_body_section ~= comp_obj_block;
- tag_assoc = inline_para_link_anchor(an_object, tag_in_seg, tag_assoc);
+ tag_assoc = an_object.inline_para_link_anchor(tag_in_seg, tag_assoc);
obj_type_status["blocks"] = TriState.off;
obj_type_status["group"] = TriState.off;
object_reset(an_object);
@@ -3543,8 +3543,8 @@ template DocReformDocAbstraction() {
comp_obj_block.tags.epub_segment_anchor_tag_is = tag_in_seg["seg_lv1_to_4"];
comp_obj_block.metainfo.o_n_book_index = obj_cite_digits.bkidx;
comp_obj_block.metainfo.object_number_type = obj_cite_digits.type;
- comp_obj_block = table_instructions(comp_obj_block, an_object["table_head"]);
- comp_obj_block = table_substantive_munge(comp_obj_block, an_object["substantive"]);
+ comp_obj_block = comp_obj_block.table_instructions(an_object["table_head"]);
+ comp_obj_block = comp_obj_block.table_substantive_munge(an_object["substantive"]);
the_document_body_section ~= comp_obj_block;
obj_type_status["blocks"] = TriState.off;
obj_type_status["table"] = TriState.off;
@@ -4171,7 +4171,7 @@ template DocReformDocAbstraction() {
_table_cols = col.split(rgx.table_col_delimiter);
_table ~= _table_cols;
}
- table_object = table_array_munge(table_object, _table);
+ table_object = table_object.table_array_munge(_table);
return table_object;
}
auto table_substantive_munge_special(O,T)(
@@ -4187,7 +4187,7 @@ template DocReformDocAbstraction() {
_table_cols = col.split(rgx.table_col_delimiter_special);
_table ~= _table_cols;
}
- table_object = table_array_munge(table_object, _table);
+ table_object = table_object.table_array_munge(_table);
return table_object;
}
/+ abstraction functions ↑ +/