step2doc-reform_v0.0.2

1 files changed, 36 insertions, 49 deletions

diff --git a/lib/sdp/ao_defaults.d b/lib/sdp/ao_defaults.d
index 166871b..04f5506 100644
--- a/lib/sdp/ao_defaults.d
+++ b/lib/sdp/ao_defaults.d
@@ -167,37 +167,40 @@ template SiSUheader() {
 }
 /+ regex flags +/
 template SiSUrgxInitFlags() {
-  int[string] flag_type = [
-    "make_headings"        : 0,
-    "header_make"          : 0,
-    "header_metadata"      : 0,
-    "heading"              : 0,
-    "heading_biblio"       : 0,
-    "para"                 : 0,
-    "blocks"               : 0, // 0..2 generic
-    "code"                 : 0, // 0..2
-    "poem"                 : 0, // 0..2
-    "table"                : 0, // 0..2
-    "group"                : 0, // 0..2
-    "block"                : 0, // 0..2
-    "quote"                : 0, // 0..2
-    "verse_new"            : 0,
-    "curly_code"           : 0,
-    "curly_poem"           : 0,
-    "curly_table"          : 0,
-    "curly_group"          : 0,
-    "curly_block"          : 0,
-    "curly_quote"          : 0,
-    "tic_code"             : 0,
-    "tic_poem"             : 0,
-    "tic_table"            : 0,
-    "tic_group"            : 0,
-    "tic_block"            : 0,
-    "tic_quote"            : 0,
-    "ocn_status"           : 0, // 0 ocn; 1 no ocn; 2 no ocn & dummy headings
-    "ocn_status_multi_obj" : 0, // 0 ocn; 1 no ocn; 2 no ocn & dummy headings
-    "book_index"           : 0,
-  ];
+  int[string] flags_type_init() {
+    int[string] flags_type_init = [
+      "make_headings"        : 0,
+      "header_make"          : 0,
+      "header_metadata"      : 0,
+      "heading"              : 0,
+      "heading_biblio"       : 0,
+      "para"                 : 0,
+      "blocks"               : 0, // 0..2 generic
+      "code"                 : 0, // 0..2
+      "poem"                 : 0, // 0..2
+      "table"                : 0, // 0..2
+      "group"                : 0, // 0..2
+      "block"                : 0, // 0..2
+      "quote"                : 0, // 0..2
+      "verse_new"            : 0,
+      "curly_code"           : 0,
+      "curly_poem"           : 0,
+      "curly_table"          : 0,
+      "curly_group"          : 0,
+      "curly_block"          : 0,
+      "curly_quote"          : 0,
+      "tic_code"             : 0,
+      "tic_poem"             : 0,
+      "tic_table"            : 0,
+      "tic_group"            : 0,
+      "tic_block"            : 0,
+      "tic_quote"            : 0,
+      "obj_cite_number_status"           : 0, // 0 obj_cite_number; 1 no obj_cite_number; 2 no obj_cite_number & dummy headings
+      "obj_cite_number_status_multi_obj" : 0, // 0 obj_cite_number; 1 no obj_cite_number; 2 no obj_cite_number & dummy headings
+      "book_index"           : 0,
+    ];
+    return flags_type_init;
+  }
 }
 template SiSUbiblio() {
   auto biblio_entry_tags_jsonstr =  `{
@@ -229,31 +232,15 @@ template SiSUbiblio() {
     "short_name"                       : "",
     "id"                               : ""
   }`; // is: book, article, magazine, newspaper, blog, other
-  auto biblio_tag_map = [
-    "au"                               : "author_raw",
-    "ed"                               : "editor_raw",
-    "ti"                               : "fulltitle",
-    "lng"                              : "language",
-    "jo"                               : "journal",
-    "vol"                              : "volume",
-    "edn"                              : "edition",
-    "yr"                               : "year",
-    "pl"                               : "place",
-    "pb"                               : "publisher",
-    "pub"                              : "publisher",
-    "pg"                               : "pages",
-    "pgs"                              : "pages",
-    "sn"                               : "short_name"
-  ]; // is: book, article, magazine, newspaper, blog, other
 }
 template InternalMarkup() {
-  struct InternalMarkup {
+  struct InlineMarkup {
     auto en_a_o = "【"; auto en_a_c = "】";
     auto en_b_o = "〖"; auto en_b_c = "〗";
     // auto segname_prefix_auto_num_extract = "c";
     // auto segname_prefix_auto_num_provide = "s";
     // auto segname_prefix_auto_num_other = "x";
-    // auto ocn_id_char = "";                                              //'o'; now as before; remove for html5
+    // auto obj_cite_number_id_char = "";                                              //'o'; now as before; remove for html5
     // auto note = "note_";
     // auto note_ref = "noteref_";
     // auto note_astx = "note_astx_";