From 650ab89ea68c7c9df94a035b7a8771c291489f30 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 Sep 2016 11:04:51 -0400 Subject: make header_make available in creating abstract objects --- src/sdp/ao_abstract_doc_source.d | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'src/sdp/ao_abstract_doc_source.d') diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d index 603c025..9851759 100644 --- a/src/sdp/ao_abstract_doc_source.d +++ b/src/sdp/ao_abstract_doc_source.d @@ -237,7 +237,7 @@ template SiSUdocAbstraction() { continue; } else if (type["poem"] == TriState.on) { /+ within block object: poem +/ - poem_block(line, an_object, type, counter, obj_cite_number_poem); + poem_block(line, an_object, type, counter, obj_cite_number_poem, dochead_make_aa); continue; /+ within block object: group +/ } else if (type["group"] == TriState.on) { @@ -360,7 +360,7 @@ template SiSUdocAbstraction() { } } else if (type["blocks"] == TriState.closing) { /+ line empty, with blocks flag +/ - block_flag_line_empty(line, an_object, contents_the_objects, bookindex_unordered_hashes, obj_cite_number, node, counter, type, obj_cite_number_poem); // watch + block_flag_line_empty(line, an_object, contents_the_objects, bookindex_unordered_hashes, obj_cite_number, node, counter, type, obj_cite_number_poem, dochead_make_aa); // watch } else { /+ line empty +/ /+ line.empty, post contents, empty variables: +/ @@ -391,7 +391,7 @@ template SiSUdocAbstraction() { an_object["is"] ); // heading an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); ++heading_pointer; @@ -433,7 +433,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -504,7 +504,7 @@ template SiSUdocAbstraction() { * references / bibliography * book index +/ - obj_im.obj_inline_markup("doc_end_reset", ""); + obj_im.obj_inline_markup("doc_end_reset", "", dochead_make_aa); auto en_tuple = note_section.endnote_objects(obj_cite_number); static assert(!isTypeTuple!(en_tuple)); @@ -935,7 +935,8 @@ template SiSUdocAbstraction() { ref string[string] an_object, ref int[string] type, ref long counter, - string[string] obj_cite_number_poem + string[string] obj_cite_number_poem, + string[string][string] dochead_make_aa, ) { if (type["curly_poem"] == TriState.on) { if (matchFirst(line, rgx.block_curly_poem_close)) { @@ -968,7 +969,7 @@ template SiSUdocAbstraction() { } an_object["is"] = "verse"; an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1017,7 +1018,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1052,7 +1053,7 @@ template SiSUdocAbstraction() { processing.remove("verse"); an_object["is"] = "verse"; an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1101,7 +1102,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1264,7 +1265,8 @@ template SiSUdocAbstraction() { ref string node, ref long counter, ref int[string] type, - string[string] obj_cite_number_poem + string[string] obj_cite_number_poem, + string[string][string] dochead_make_aa, ) { // line.empty, post contents, empty variables --------------- assert( @@ -1293,7 +1295,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1353,7 +1355,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1385,7 +1387,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1416,7 +1418,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -1448,7 +1450,7 @@ template SiSUdocAbstraction() { an_object["is"] ); an_object["substantive"] = - obj_im.obj_inline_markup(an_object["is"], an_object["obj"]); + obj_im.obj_inline_markup(an_object["is"], an_object["obj"], dochead_make_aa); an_object["attrib"] = obj_att.obj_attributes(an_object["is"], an_object["obj"], node); contents_the_objects ~= @@ -2213,7 +2215,7 @@ template SiSUdocAbstraction() { // struct ObjInlineMarkup : AssertObjInlineMarkup { auto munge = ObjInlineMarkupMunge(); string[string] obj_txt; - string obj_inline_markup(string obj_is_, string obj_raw) + string obj_inline_markup(string obj_is_, string obj_raw, string[string][string] dochead_make_aa) in { } body { obj_txt["munge"]=obj_raw.dup; -- cgit v1.2.3