diff options
Diffstat (limited to 'src/sdp/ao_abstract_doc_source.d')
-rw-r--r-- | src/sdp/ao_abstract_doc_source.d | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d index cd121c5..ed4e637 100644 --- a/src/sdp/ao_abstract_doc_source.d +++ b/src/sdp/ao_abstract_doc_source.d @@ -7,16 +7,13 @@ template SiSUdocAbstraction() { private: struct SiSUdocAbstraction { /+ ↓ abstraction imports +/ - import - ao_defaults, // sdp/ao_defaults.d - ao_object_setter, // sdp/ao_object_setter.d - ao_rgx; // sdp/ao_rgx.d + import ao_object_setter; /+ ↓ abstraction mixins +/ mixin ObjectSetter; mixin InternalMarkup; + mixin SiSUrgxInit; /+ ↓ abstraction struct init +/ /+ initialize +/ - auto rgx = Rgx(); ObjGenericComposite[][string] the_table_of_contents_section; ObjGenericComposite[] the_document_head_section, the_document_body_section, the_bibliography_section, the_glossary_section, the_blurb_section; ObjGenericComposite[] the_dom_tail_section; @@ -3104,7 +3101,6 @@ template SiSUdocAbstraction() { } } body { - auto rgx = Rgx(); obj_txt["munge"]=obj_txt_in; obj_txt["munge"]=replaceFirst(obj_txt["munge"], rgx.para_attribs, ""); obj_txt["munge"]=replaceFirst(obj_txt["munge"], rgx.obj_cite_number_off_all, ""); @@ -3124,7 +3120,6 @@ template SiSUdocAbstraction() { } } body { - auto rgx = Rgx(); obj_txt["munge"]=obj_txt_in; obj_txt["munge"]=replaceFirst(obj_txt["munge"], rgx.heading, ""); obj_txt["munge"]=replaceFirst(obj_txt["munge"], rgx.obj_cite_number_off_all, ""); @@ -3222,6 +3217,7 @@ template SiSUdocAbstraction() { } } struct ObjInlineMarkup { + auto rgx = Rgx(); auto munge = ObjInlineMarkupMunge(); string[string] obj_txt; auto obj_inline_markup_and_anchor_tags(O,K,Ma)( @@ -3732,7 +3728,6 @@ template SiSUdocAbstraction() { } } body { - auto rgx = Rgx(); if (matchFirst(obj_txt_in, rgx.para_bullet)) { _obj_attributes =" \"bullet\": \"true\"," ~ " \"indent_hang\": 0," @@ -4447,6 +4442,7 @@ template SiSUdocAbstraction() { int lv, lv0, lv1, lv2, lv3, lv4, lv5, lv6, lv7; int obj_cite_number; int[string] p_; // p_ parent_ + auto rgx = Rgx(); ObjGenericComposite node_location_emitter(Lv,Ta,N,C,P,I)( Lv lev_markup_number, Ta segment_anchor_tag, @@ -4464,7 +4460,6 @@ template SiSUdocAbstraction() { static assert(is(typeof(ptr_) == int)); static assert(is(typeof(is_) == string)); } - auto rgx = Rgx(); assert(is_ != "heading"); assert(to!int(obj_cite_number_) >= 0); } @@ -4533,7 +4528,6 @@ template SiSUdocAbstraction() { static assert(is(typeof(is_) == string)); static assert(is(typeof(html_segnames_ptr) == int)); } - auto rgx = Rgx(); assert(is_ == "heading"); assert(to!int(obj_cite_number_) >= 0); assert( @@ -4547,7 +4541,6 @@ template SiSUdocAbstraction() { } } body { - auto rgx = Rgx(); int obj_cite_number = to!int(obj_cite_number_); switch (to!int(lev_markup_number)) { // switch (to!string(lv)) { case 0: |