remove ./data for now, else relatively minor

1 files changed, 91 insertions, 91 deletions

diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index a27a18a..853134f 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -67,9 +67,9 @@ import
   doc_reform.meta.defaults,
   doc_reform.meta.rgx;
 mixin DocReformRgxInit;
-static auto _rgx = Rgx();
+static auto rgx = Rgx();
 mixin InternalMarkup;
-auto _mkup = InlineMarkup();
+auto mkup = InlineMarkup();
 #+END_SRC
 
 ** struct Generic ConfComposite
@@ -79,43 +79,43 @@ auto _mkup = InlineMarkup();
 string url_markup(string line) {
   string line_ = line
     .replaceAll(
-      _rgx.smid_inline_link_markup_regular,
+      rgx.smid_inline_link_markup_regular,
       ("$1"
-        ~ _mkup.lnk_o ~ "$2" ~ _mkup.lnk_c
-        ~ _mkup.url_o ~ "$3" ~ _mkup.url_c
+        ~ mkup.lnk_o ~ "$2" ~ mkup.lnk_c
+        ~ mkup.url_o ~ "$3" ~ mkup.url_c
       ) // ("$1{ $2 }$3$4")
     )
     .replaceAll(
-        _rgx.smid_inline_link_naked_url,
+        rgx.smid_inline_link_naked_url,
         ("$1"
-          ~ _mkup.lnk_o ~ "$2" ~ _mkup.lnk_c
-          ~ _mkup.url_o ~ "$2" ~ _mkup.url_c
+          ~ mkup.lnk_o ~ "$2" ~ mkup.lnk_c
+          ~ mkup.url_o ~ "$2" ~ mkup.url_c
         ) // ("$1{ $2 }$2$3")
     )
     .replaceAll(
-       _rgx.arr_delimiter,
-       _mkup.br_line
+       rgx.arr_delimiter,
+       mkup.br_line
     );
   return line_;
 }
 struct ConfCompositeMakeStr {
-  string bold;
-  string breaks;
-  string cover_image;
-  string css;
-  string emphasis;
-  string[] footer;
-  string[] headings;
-  string[] home_button_image;
-  string home_button_text = "{Doc Reform}http://www.doc-reform.org;"
+  string     bold;
+  string     breaks;
+  string     cover_image;
+  string     css;
+  string     emphasis;
+  string[]   footer;
+  string[]   headings;
+  string[]   home_button_image;
+  string     home_button_text = "{Doc Reform}http://www.doc-reform.org;"
     ~ " {www.doc-reform.org}http://www.doc-reform.org;"
     ~ " {sources / git}https://git.doc-reform.org/software/doc-reform";
-  string italics;
-  string auto_num_top_at_level;
-  int auto_num_top_lv               = 9;
-  int auto_num_depth                = 2;
+  string     italics;
+  string     auto_num_top_at_level;
+  int        auto_num_top_lv           = 9;
+  int        auto_num_depth            = 2;
   string[][] substitute;
-  string texpdf_font;
+  string     texpdf_font;
 }
 struct confCompositeMakeBuild {
   string[] bold(string _mk) {
@@ -189,23 +189,23 @@ struct confCompositeMakeBuild {
 #+name: meta_defaults_template_structs
 #+BEGIN_SRC d
 struct ConfCompositeMakeInit {
-  string[] bold;
-  string breaks;
-  string cover_image;
-  string css;
-  string[] emphasis;
-  string[] footer;
-  string[] headings;
-  string[] home_button_image;
-  string home_button_text = "{Doc Reform}http://www.doc-reform.org;"
+  string[]   bold;
+  string     breaks;
+  string     cover_image;
+  string     css;
+  string[]   emphasis;
+  string[]   footer;
+  string[]   headings;
+  string[]   home_button_image;
+  string     home_button_text = "{Doc Reform}http://www.doc-reform.org;"
     ~ " {www.doc-reform.org}http://www.doc-reform.org;"
     ~ " {sources / git}https://git.doc-reform.org/software/doc-reform";
   string[] italics;
-  string auto_num_top_at_level;
-  int auto_num_top_lv               = 9;
-  int auto_num_depth                = 2;
+  string     auto_num_top_at_level;
+  int        auto_num_top_lv               = 9;
+  int        auto_num_depth                = 2;
   string[][] substitute;
-  string texpdf_font;
+  string     texpdf_font;
 }
 #+END_SRC
 
@@ -255,53 +255,53 @@ struct ConfCompositeSiteLocal {
 #+name: meta_defaults_template_structs
 #+BEGIN_SRC d
 struct MetaComposite {
-  string classify_dewey;
-  string classify_keywords;
-  string classify_loc;
-  string classify_subject;
-  string classify_topic_register;
-  string creator_author;
-  string creator_author_email;
-  string creator_illustrator;
-  string creator_translator;
-  string date_added_to_site;
-  string date_available;
-  string date_created;
-  string date_issued;
-  string date_modified;
-  string date_published;
-  string date_valid;
-  string identifier_isbn;
-  string identifier_oclc;
-  string identifier_pg;
-  string language_document;
-  string language_document_char;
-  string links;
-  string notes_abstract;
-  string notes_description;
-  string original_language;
-  string original_language_char;
-  string original_publisher;
-  string original_source;
-  string original_title;
-  string publisher;
-  string rights_copyright;
-  string rights_copyright_audio;
-  string rights_copyright_cover;
-  string rights_copyright_illustrations;
-  string rights_copyright_photographs;
-  string rights_copyright_text;
-  string rights_copyright_translation;
-  string rights_copyright_video;
-  string rights_license;
-  string title_edition;
-  string title_full;
-  string title_language;
-  string title_main;
-  string title_note;
-  string title_short;
-  string title_sub;
-  string title_subtitle;
+  string   classify_dewey;
+  string   classify_keywords;
+  string   classify_loc;
+  string   classify_subject;
+  string   classify_topic_register;
+  string   creator_author;
+  string   creator_author_email;
+  string   creator_illustrator;
+  string   creator_translator;
+  string   date_added_to_site;
+  string   date_available;
+  string   date_created;
+  string   date_issued;
+  string   date_modified;
+  string   date_published;
+  string   date_valid;
+  string   identifier_isbn;
+  string   identifier_oclc;
+  string   identifier_pg;
+  string   language_document;
+  string   language_document_char;
+  string   links;
+  string   notes_abstract;
+  string   notes_description;
+  string   original_language;
+  string   original_language_char;
+  string   original_publisher;
+  string   original_source;
+  string   original_title;
+  string   publisher;
+  string   rights_copyright;
+  string   rights_copyright_audio;
+  string   rights_copyright_cover;
+  string   rights_copyright_illustrations;
+  string   rights_copyright_photographs;
+  string   rights_copyright_text;
+  string   rights_copyright_translation;
+  string   rights_copyright_video;
+  string   rights_license;
+  string   title_edition;
+  string   title_full;
+  string   title_language;
+  string   title_main;
+  string   title_note;
+  string   title_short;
+  string   title_sub;
+  string   title_subtitle;
 }
 #+END_SRC
 
@@ -446,7 +446,7 @@ static template contentJSONtoDocReformStruct() {
   ConfCompositePlus _struct_composite;
   auto contentJSONtoDocReformStruct(C,J)(C _struct_composite, J _json, string _identifier) {
     mixin DocReformRgxInit;
-    static auto _rgx = Rgx();
+    static auto rgx = Rgx();
     debug (json) {
       writeln(">> --------------------------- >>");
       foreach (tag0; _json.object.byKeyValue) {
@@ -503,7 +503,7 @@ if ("make" in _json.object) {
     if (_json.object["make"]["footer"].type().to!string == "string") {
       char[][] __match_footer_array
         = (cast(char[]) _json.object["make"]["footer"].str)
-          .split(_rgx.make_heading_delimiter);
+          .split(rgx.make_heading_delimiter);
       _struct_composite.make_str.footer = __match_footer_array.to!(string[]);
     } else if (_json.object["make"]["footer"].type().to!string == "array") {
       string[] _match_footer_array;
@@ -517,7 +517,7 @@ if ("make" in _json.object) {
     if (_json.object["make"]["headings"].type().to!string == "string") {
      char[][] __match_headings_array
         = (cast(char[]) _json.object["make"]["headings"].str)
-          .split(_rgx.make_heading_delimiter);
+          .split(rgx.make_heading_delimiter);
       _struct_composite.make_str.headings = __match_headings_array.to!(string[]);
     } else if (_json.object["make"]["headings"].type().to!string == "array") {
       string[] _match_headings_array;
@@ -531,7 +531,7 @@ if ("make" in _json.object) {
     if (_json.object["make"]["home_button_image"].type().to!string == "string") {
      char[][] __match_home_button_image_array
         = (cast(char[]) _json.object["make"]["home_button_image"].str)
-          .split(_rgx.make_heading_delimiter);
+          .split(rgx.make_heading_delimiter);
       _struct_composite.make_str.home_button_image = __match_home_button_image_array.to!(string[]);
     } else if (_json.object["make"]["home_button_image"].type().to!string == "array") {
       string[] _match_home_button_image_array;
@@ -643,7 +643,7 @@ if ("webserv" in _json.object) {
     && (_json.object["webserv"]["url_root"].type().to!string == "string")
   ) {
     _struct_composite.conf.webserv_url_doc_root = _json.object["webserv"]["url_root"].str;
-    if (auto m = _struct_composite.conf.webserv_url_doc_root.match(_rgx.webserv_url_doc_root)) {
+    if (auto m = _struct_composite.conf.webserv_url_doc_root.match(rgx.webserv_url_doc_root)) {
       _struct_composite.conf.webserv_url_domain = m.captures[2].to!string;
       _struct_composite.conf.webserv_url_doc_path = m.captures[3].to!string;
     }
@@ -981,9 +981,9 @@ if (_struct_composite.meta.creator_author.empty) {
   }
   string[] authors_arr;
   string[] authors_raw_arr
-    = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter);
+    = _struct_composite.meta.creator_author.split(rgx.arr_delimiter);
   foreach (author_raw; authors_raw_arr) {
-    authors_arr ~= author_raw.replace(_rgx.raw_author_munge, "$2 $1");
+    authors_arr ~= author_raw.replace(rgx.raw_author_munge, "$2 $1");
   }
   _struct_composite.meta.creator_author = join(authors_arr, ", ").chomp.chomp;
 }