1 files changed, 4 insertions, 11 deletions

diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index a7d3d84..a2673fa 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -158,10 +158,7 @@ Process markup document, create document abstraction.
 
 #+name: abs_imports
 #+BEGIN_SRC d
-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;
 #+END_SRC
 
 *** mixins                                                         :mixins:
@@ -170,6 +167,7 @@ import
 #+BEGIN_SRC d
 mixin ObjectSetter;
 mixin InternalMarkup;
+mixin SiSUrgxInit;
 #+END_SRC
 
 *** initialize                                                 :initialize:
@@ -177,7 +175,6 @@ mixin InternalMarkup;
 #+name: abs_init_struct
 #+BEGIN_SRC d
 /+ 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;
@@ -3787,7 +3784,6 @@ struct ObjInlineMarkupMunge {
     }
   }
   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, "");
@@ -3807,7 +3803,6 @@ struct ObjInlineMarkupMunge {
     }
   }
   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, "");
@@ -3912,6 +3907,7 @@ struct ObjInlineMarkupMunge {
 #+name: ao_emitters_obj_inline_markup
 #+BEGIN_SRC d
 struct ObjInlineMarkup {
+  auto rgx = Rgx();
   auto munge = ObjInlineMarkupMunge();
   string[string] obj_txt;
 #+END_SRC
@@ -4494,7 +4490,6 @@ struct ObjAttributes {
     }
   }
   body {
-    auto rgx = Rgx();
     if (matchFirst(obj_txt_in, rgx.para_bullet)) {
       _obj_attributes =" \"bullet\": \"true\","
       ~ " \"indent_hang\": 0,"
@@ -5383,6 +5378,7 @@ struct NodeStructureMetadata {
   int lv, lv0, lv1, lv2, lv3, lv4, lv5, lv6, lv7;
   int obj_cite_number;
   int[string] p_; // p_ parent_
+  auto rgx = Rgx();
 #+END_SRC
 
 ***** TODO node metadata emitter
@@ -5406,7 +5402,6 @@ struct NodeStructureMetadata {
       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);
   }
@@ -5481,7 +5476,6 @@ struct NodeStructureMetadata {
       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(
@@ -5495,7 +5489,6 @@ struct NodeStructureMetadata {
     }
   }
   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: