cleaning (one hash key renamed)

1 files changed, 2 insertions, 94 deletions

diff --git a/org/ao_defaults.org b/org/ao_defaults.org
index 2677f78..b7a59a1 100644
--- a/org/ao_defaults.org
+++ b/org/ao_defaults.org
@@ -431,78 +431,8 @@ template SiSUbiblio() {
 #+BEGIN_SRC d
 template InternalMarkup() {
   struct InlineMarkup {
-  // endnote en_a_o: '~{'; en_a_c: '}~'
-    auto en_a_o = "【"; auto en_a_c = "】";
-  // endnote en_b_o: '~['; en_b_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 obj_cite_number_id_char = "";                                              //'o'; now as before; remove for html5
-    // auto note = "note_";
-    // auto note_ref = "noteref_";
-    // auto note_astx = "note_astx_";
-    // auto note_ref_astx = "noteref_astx_";
-    // auto note_plus = "note_plus_";
-    // auto note_ref_plus = "noteref_plus_";
-    // auto meta_o = "〔@"; auto meta_c = "〕";
-    // auto lv_o_0 = 0;
-    // auto lv_o_1 = 1;
-    // auto lv_o_2 = 2;
-    // auto lv_o_3 = 3;
-    // auto lv_o_4 = 4;
-    // auto lv_o_5 = 5;
-    // auto lv_o_6 = 6;
-    // auto lv_o_7 = 7;
-    // auto lv_o_8 = 8;
-    // auto lv_o_9 = 9;
-    // auto lv_o = "〔"; auto lv_c = "〕";
-    // auto bl_o = "〔"; auto bl_c = "〕";          // block text mark
-    // auto gr_o = "〔"; auto gr_c = "〕";          // group text mark #REPLACE & RETIRE
-    // auto id_o = "〔"; auto id_c = "〕";          // object id mark
-    // auto tc_o = "『"; auto tc_c = "』";          // table row mark #Mx[:tc_c]="』\n"
-    // auto tc_p = "┆'"
-    // auto pa_o = "〔"; auto pa_c = "〕";          // affects paragraph mark
-    // auto mk_o = "〔"; auto mk_c = "〕";          // generic mark
-    // auto gl_o = "〔"; auto gl_c = "〕";          // glyph
-    // auto fa_o = "〔"; auto fa_o_c = "¤"; auto fa_c_o = "¤"; auto fa_c = "〕";
-    // auto idx_o = "▩"; auto idx_c = "▩";
-    // auto nbsp = "░";                                              // '▭ '
-    // auto br_line = "╱";                                              // lB ▌  9612 ┘ ¶
-    // auto br_nl = "╲";                                              // lB ▌ 』  ┘
-    // auto br_paragraph = "█";                                              // FB █  9608 # PP ∥  8741 #▐  #'┘' #'¶' #FB █  9608  lB ▌  9612   RB ▐  9616
-    // auto br_obj = "break_obj";
-    // auto br_page_line = "▭";
-    // auto br_page = "┼";
-    // auto br_page_new = "╋";
-    // auto lnk_o = "⌠";          lnk_c = "⌡";           // '⌈' '⌋' '⌠' '⌡' #Mx[:lnk_o= '◁'; Mx[:lnk_c= '▷' #‹ ›
-    // auto url_o = "◘"; auto url_c = "◙";
-    // auto rel_o = "⌈"; auto rel_c = "⌋";
-    // auto tag_o = "⌊"; auto tag_c = "⌉";
-    // auto sm_set_o = "◢"; auto sm_set_c = "◣";
-    // auto sm_subset_o = "◢"; auto sm_subset_c = "◣";
-    // auto vline = "┆";                                              //   ¦ |
-    // auto src_bold_o = "!{"; auto src_bold_c = "}!";
-    // auto src_italics_o = "/{"; auto src_italics_c = "}/";
-    // auto src_underscore_o = "_{"; auto src_underscore_c = "}_";
-    // auto src_cite_o = ""{"; auto src_cite_c = "}"";
-    // auto src_insert_o = "+{"; auto src_insert_c = "}+";
-    // auto src_strike_o = "-{"; auto src_strike_c = "}-";
-    // auto src_superscript_o = "^{"; auto src_superscript_c = "}^";
-    // auto src_subscript_o = ";{"; auto src_subscript_c = "}'"
-    // auto src_hilite_o = "*{"; auto src_hilite_c = "}*";
-    // auto src_monospace_o = "#{"; auto src_monospace_c = "}#";
-    // auto srcrgx_bold_o = "\\!\\{";  auto srcrgx_bold_c = "\\}\\!";
-    // auto srcrgx_italics_o = "\\/\\{";  auto srcrgx_italics_c = "\\}\\/";
-    // auto srcrgx_underscore_o = "_\\{"; auto srcrgx_underscore_c = "\\}_";
-    // auto srcrgx_cite_o = "\"\\{"; auto srcrgx_cite_c = "\\}\"";
-    // auto srcrgx_insert_o = "\\+\\{";  auto srcrgx_insert_c = "\\}\\+";
-    // auto srcrgx_strike_o = "\\-\\{";  auto srcrgx_strike_c = "\\}\\-";
-    // auto srcrgx_superscript_o = "\\^\\{";  auto srcrgx_superscript_c = "\\}\\^";
-    // auto srcrgx_subscript_o = ",\\{"; auto srcrgx_subscript_c = "\\},";
-    // auto srcrgx_hilite_o = "\\*\\{";  auto srcrgx_hilite_c = "\\}\\*";
-    // auto srcrgx_monospace_o = "\\#\\{";  auto srcrgx_monospace_c = "\\}\\#";
-    // ⊹
+    auto en_a_o = "【"; auto en_a_c = "】";  // endnote en_a_o: '~{'; en_a_c: '}~'
+    auto en_b_o = "〖"; auto en_b_c = "〗";  // endnote en_b_o: '~['; en_b_c: ']~'
   }
 }
 #+END_SRC
@@ -521,12 +451,10 @@ http://dlang.org/phobos/std_regex.html
 /+ misc +/
 static flag_action               = ctRegex!(`^(--[a-z][a-z0-9-]+)$`);
 static flag_action_str           = ctRegex!(` (--[a-z][a-z0-9-]+)`);
-// static arr_delimiter             = ctRegex!(`\s*[;]\s*`);
 static within_quotes             = ctRegex!(`"(.+?)"`);
 static make_heading_delimiter    = ctRegex!(`[;][ ]*`);
 static arr_delimiter             = ctRegex!(`[ ]*[;][ ]*`);
 static name_delimiter            = ctRegex!(`^([^,]+)[ ]*,[ ]+(.+?)$`);
-// static name_delimiter            = ctRegex!(`^(.+?)[ ]*,[ ]*(.+?)$`);
 static book_index_go             = ctRegex!("([0-9]+)(?:-[0-9]+)?");
 static trailing_comma            = ctRegex!(",[ ]*$");
 static trailing_linebreak        = ctRegex!(",[ ]{1,2}\\\\\\\\\n[ ]{4}$","m");
@@ -552,10 +480,7 @@ static src_fn_text               = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<fil
 static src_fn_insert             = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ssi)$`);
 static src_fn_find_inserts       = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[im])$`);
 static insert_src_fn_ssi_or_sst  = ctRegex!(`^<<\s*(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[ti])$`);
-// static insert_ssi_or_sst_fn      = ctRegex!(`^<<\s*[a-zA-Z0-9._-]+[.]ss[ti]`);
-// static ssm_fn                    = ctRegex!(`^[a-zA-Z0-9._-]+[.]ssm$`);
 /+ insert markup file +/
-// static insert_src_fn_ssi_or_sst  = ctRegex!(`^<<\s*([a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[ti])$`);
 #+END_SRC
 
 ** comments                                                         :comment:
@@ -580,7 +505,6 @@ static native_header_meta               =
   ctRegex!(`^@(?:creator|title|rights|date|original|classify|identifier|notes|publisher|links):(?:\s|$)`);
 static native_header_main               = ctRegex!(`^@(?P<header>[a-z_]+):\s*(?P<content>.*)`, "m");
 static native_header_sub                = ctRegex!(`^[ ]*:(?P<subheader>[a-z_]+):\s+(?P<content>.+)`, "m");
-// static native_header_sub                = ctRegex!(`^[ ]+:([a-z_]+):\s`);
 static native_header_meta_title         = ctRegex!(`^@title:\s`, "m");
 static variable_doc_title               = ctRegex!(`@title`);
 static variable_doc_author              = ctRegex!(`@author|@creator`);
@@ -634,7 +558,6 @@ static para_attribs       = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
 #+BEGIN_SRC d
 /+ blocked markup +/
 static block_open                = ctRegex!("^((code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)[{].*?$)|^`{3} (code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)");
-// static block_open_less_code      = ctRegex!("^(((poem|group|block|quote|table)[{].*?$)|`{3} (poem|group|block|quote|table))");
 static block_poem_open                = ctRegex!("^((poem[{].*?$)|`{3} poem)");
 #+END_SRC
 
@@ -644,7 +567,6 @@ static block_poem_open                = ctRegex!("^((poem[{].*?$)|`{3} poem)");
 #+BEGIN_SRC d
 /+ blocked markup tics +/
 static block_tic_open            = ctRegex!("^`{3} (code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)");
-// static block_tic_open_less_code  = ctRegex!("^`{3} (poem|group|block|quote|table)");
 static block_tic_code_open       = ctRegex!("^`{3} (code)([.][a-z][0-9a-z_]+)?");
 static block_tic_poem_open       = ctRegex!("^`{3} (poem)");
 static block_tic_group_open      = ctRegex!("^`{3} (group)");
@@ -660,7 +582,6 @@ static block_tic_close           = ctRegex!("^(`{3})$","m");
 #+BEGIN_SRC d
 /+ blocked markup curly +/
 static block_curly_open          = ctRegex!(`^((code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)[{].*?$)`);
-// static block_curly_open_less_code = ctRegex!(`^((poem|group|block|quote|table)[{].*?$)`);
 static block_curly_code_open     = ctRegex!(`^(code([.][a-z][0-9a-z_]+)?[{].*?$)`);
 static block_curly_code_close    = ctRegex!(`^([}]code)`);
 static block_curly_poem_open     = ctRegex!(`^(poem[{].*?$)`);
@@ -700,7 +621,6 @@ static inline_notes_al                       = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)
 static inline_notes_al_gen                   = ctRegex!(`【.+?】`, "m");
 static inline_notes_curly_gen                = ctRegex!(`~\{.+?\}~`, "m");
 static inline_notes_curly                    = ctRegex!(`~\{\s*(.+?)\}~`, "mg");
-// static inline_notes_curly                    = ctRegex!(`~\{(?:[*+]\s+|\s*)(.+?)\}~`, "mg");
 static inline_al_delimiter_open_regular             = ctRegex!(`【`, "m");
 static inline_al_delimiter_close_regular            = ctRegex!(`】`, "m");
 static inline_al_delimiter_open_and_close_regular   = ctRegex!(`【|】`, "m");
@@ -712,19 +632,11 @@ static inline_curly_delimiter_open_regular             = ctRegex!(`~\{\s*`, "m")
 static inline_curly_delimiter_close_regular            = ctRegex!(`\s*\}~`, "m");
 static inline_curly_delimiter_open_and_close_regular   = ctRegex!(`~\{\s*|\s*\}~`, "m");
 static inline_notes_delimiter_curly_regular            = ctRegex!(`~\{[ ]*(.+?)\}~`, "m");
-// static inline_notes_curly_regular            = ctRegex!(`(?:[~][{][ ]*)(.+?)(?:[}][~])`, "m");
-// static inline_notes_curly_regular            = ctRegex!(`~\{\s*(.+?)\}~`, "m");
-// static inline_notes_curly                    = ctRegex!(`~\{(?:[*+]\s+|\s*)(.+?)\}~`, "mg");
 static inline_notes_curly_sp                 = ctRegex!(`~\{[*+]+\s+(.+?)\}~`, "m");
 static inline_notes_curly_sp_asterisk        = ctRegex!(`~\{[*]+\s+(.+?)\}~`, "m");
 static inline_notes_curly_sp_plus            = ctRegex!(`~\{[+]+\s+(.+?)\}~`, "m");
-// static inline_text_and_note_curly            = ctRegex!(`(.+?)~\{(?:[*+]\s+|\s*)(.+?)\}~`, "mg");
 static inline_text_and_note_al               = ctRegex!(`(?P<text>.+?)【(?:[*+ ]*)(?P<note>.+?)】`, "mg");
 static inline_text_and_note_curly            = ctRegex!(`(?P<text>.+?)(?:(?:[~])[{][*+ ]*)(?P<note>.+?)(?:[}][~])`, "mg");
-// static inline_text_and_note_curly            = ctRegex!(`(?P<text>.+?)~\{(?:[*+]\s+|\s*)(?P<note>.+?)\}~`, "mg");
-// static inline_text_and_note_curly_sp         = ctRegex!(`(.+?)~\{[*+]+\s+(.+?)\}~`, "mg");
-// static inline_text_and_note_curly_sp_asterisk = ctRegex!(`(.+?)~\{[*]+\s+(.+?)\}~`, "mg");
-// static inline_text_and_note_curly_sp_plus    = ctRegex!(`(.+?)~\{[+]+\s+(.+?)\}~`, "mg");
 static inline_note_curly_delimiters          = ctRegex!(`(~\{[*+]?\s*)(.+?)(\}~)`, "mg");
 static inline_notes_square                   = ctRegex!(`~\[\s*(.+?)\]~`, "mg");
 static inline_text_and_note_square_sp        = ctRegex!(`(.+?)~\[[*+]+\s+(.+?)\]~`, "mg");
@@ -761,7 +673,6 @@ static obj_cite_number_off_all               = ctRegex!(`[~-]#$`, "m");
 static obj_cite_number_off_block             = ctRegex!(`^--~#$`);
 static obj_cite_number_off_block_dh          = ctRegex!(`^---#$`);
 static obj_cite_number_off_block_close       = ctRegex!(`^--\+#$`);
-// static auto_obj_cite_number_ignore           = ctRegex!(`^[+~*$-]{3,}$`); // reminder
 static obj_cite_number_block_marks           = ctRegex!(`^--[+~-]#$`);
 #+END_SRC
 
@@ -779,12 +690,10 @@ static skip_from_regular_parse    = ctRegex!(`^(--[+~-]#|-[\\]{2}-|=[.\\]{2}=)$`
 #+BEGIN_SRC d
 /+ line & page breaks +/
 static break_line_within_object  = ctRegex!(`[\\]{2}( |$)`);
-// static break_line_break_within_object  = ctRegex!(`( |^)[\\]{2}( |$)`);
 static break_page                = ctRegex!(`^-[\\]{2}-$`);
 static break_page_new            = ctRegex!(`^=[\\]{2}=$`);
 static break_page_line_across    = ctRegex!(`^=[.]{2}=$`);
 static break_string              = ctRegex!(`』`);
-// ancestry, parent
 static parent                    = ctRegex!(`([0-7]):([0-9]+)`);
 #+END_SRC
 
@@ -803,7 +712,6 @@ static tailing_comma             = ctRegex!(`,$`, "m");
 /+ biblio tags +/
 static biblio_tags               = ctRegex!(`^(is|au|author_raw|author|author_arr|editor_raw|ed|editor_arr|ti|title|subtitle|fulltitle|lng|language|trans|src|jo|journal|in|vol|volume|edn|edition|yr|year|pl|place|pb|pub|publisher|url|pg|pages|note|short_name|id):\s+(.+)`);
 static biblio_abbreviations      = ctRegex!(`^(au|ed|ti|lng|jo|vol|edn|yr|pl|pb|pub|pg|pgs|sn)$`);
-// static biblio_tags               = ctRegex!(`^(is|author_raw|author|author_arr|editor_raw|editor_arr|title|subtitle|fulltitle|language|trans|src|journal|in|volume|edition|year|place|publisher|url|pages|note|short_name|id):\s+(.+)`);
 #+END_SRC
 
 ** bookindex split                                          :bookindex:split: