aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/metaverse.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2020-01-25 13:34:47 -0500
committerRalph Amissah <ralph@amissah.com>2020-02-26 09:59:18 -0500
commited71ef0ac032456c882bea44b04c02863cb90a46 (patch)
treeb6a27cbb13a31a2e3e436aa9d75d125aa586a2c5 /org/metaverse.org
parentaddress compilation issues with dmd (v2.090.0) (diff)
code ctRegex calls, tidying
Diffstat (limited to 'org/metaverse.org')
-rw-r--r--org/metaverse.org62
1 files changed, 31 insertions, 31 deletions
diff --git a/org/metaverse.org b/org/metaverse.org
index c1d4442..d6a21bd 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -44,7 +44,7 @@ template docAbstraction() {
Mf manifested,
bool _new_doc
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
/+ ↓ abstraction init +/
<<abs_init_rest>>
/+ abstraction init ↑ +/
@@ -162,7 +162,7 @@ import
#+BEGIN_SRC d
mixin ObjectSetter;
mixin InternalMarkup;
-mixin spineRgxInit;
+mixin spineRgxIn;
#+END_SRC
*** initialize :initialize:
@@ -429,7 +429,7 @@ enum DomTags { none, open, close, close_and_open, open_still, }
return object_citation_number.ocn_emitter(ocn_status_flag);
}
@safe static auto inline_markup_faces(L)(L line) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto mkup = InlineMarkup();
line = replaceAll!(m => mkup.quote_o ~ m[1] ~ mkup.quote_c)(line, rgx.within_quotes);
line = replaceAll!(m => mkup.mono ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.mono)(line, rgx.inline_mark_mono);
@@ -440,7 +440,7 @@ enum DomTags { none, open, close, close_and_open, open_still, }
return line;
}
@safe static string links_and_images()(string obj_txt) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto mkup = InlineMarkup();
if (obj_txt.match(rgx.smid_inline_url_generic)) {
if (
@@ -497,7 +497,7 @@ enum sObj { content, anchor_tag, notes_reg, notes_star, links, image_no_dimensio
string[string] tag_in_seg,
string[string][string] tag_assoc
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (auto m = an_object["substantive"].match(rgx.inline_link_anchor)) {
if (m.captures[1] !in tag_assoc) {
tag_assoc[(m.captures[1])]["seg_lv4"] = tag_in_seg["seg_lv4"];
@@ -535,7 +535,7 @@ scope(exit) {
#+NAME: abs_init_rest
#+BEGIN_SRC d
-mixin spineRgxInitFlags;
+mixin spineRgxDocStructFlags;
mixin spineNode;
auto node_para_int_ = node_metadata_para_int;
auto node_para_str_ = node_metadata_para_str;
@@ -3146,7 +3146,7 @@ functions used in document abstraction
char[] line,
int[string] obj_type_status,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (!(line.empty)
&& (obj_type_status["ocn_status_off_for_multiple_objects"] == OCN_off_block_status.off)
) {
@@ -3274,7 +3274,7 @@ functions used in document abstraction
#+NAME: abs_functions_block
#+BEGIN_SRC d
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
#+END_SRC
******* code
@@ -3551,7 +3551,7 @@ functions used in document abstraction
return ref string[string] an_object,
return ref int[string] obj_type_status
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (obj_type_status["curly_code"] == TriState.on) {
if (line.matchFirst(rgx.block_curly_code_close)) {
debug(codecurly) { // code (curly) close
@@ -3656,7 +3656,7 @@ final string biblio_tag_map_()(string abr) {
) {
mixin spineBiblio;
auto jsn = BibJsnStr();
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (line.matchFirst(rgx.heading_biblio)
&& obj_type_status["para"] != State.on
&& obj_type_status["group"] != State.on
@@ -3787,7 +3787,7 @@ final string biblio_tag_map_()(string abr) {
string[string] an_object,
return ref int[string] obj_type_status
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (obj_type_status["curly_quote"] == TriState.on) {
if (line.matchFirst(rgx.block_curly_quote_close)) {
debug(quote) { // quote (curly) close
@@ -3835,7 +3835,7 @@ final string biblio_tag_map_()(string abr) {
string[string] an_object,
return ref int[string] obj_type_status
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (obj_type_status["curly_group"] == State.on) {
if (line.matchFirst(rgx.block_curly_group_close)) {
debug(group) {
@@ -3884,7 +3884,7 @@ final string biblio_tag_map_()(string abr) {
string[string] an_object,
return ref int[string] obj_type_status
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (obj_type_status["curly_block"] == TriState.on) {
if (line.matchFirst(rgx.block_curly_block_close)) {
debug(block) { // block (curly) close
@@ -3935,7 +3935,7 @@ why extra object stuff only in poem/verse?
CMM conf_make_meta,
string[string] tag_in_seg,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (obj_type_status["curly_poem"] == TriState.on) {
if (line.matchFirst(rgx.block_curly_poem_close)) {
if (an_object_key in an_object
@@ -4196,7 +4196,7 @@ you need:
return ref int[string] obj_type_status,
return ref CMM conf_make_meta,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (obj_type_status["curly_table"] == TriState.on) {
if (line.matchFirst(rgx.block_curly_table_close)) {
debug(table) { // table (curly) close
@@ -4333,7 +4333,7 @@ process and use an_object["table_head"] (then empty it)
"code block status: closed"
);
assertions_flag_types_block_status_none_or_closed(obj_type_status);
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
#+END_SRC
****** make: quote block
@@ -4674,7 +4674,7 @@ process and use an_object["table_head"] (then empty it)
return ref int[string] obj_type_status,
B opt_action,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (auto m = line.match(rgx.book_index)) { /+ match book_index +/
debug(bookindexmatch) {
writefln(
@@ -4731,7 +4731,7 @@ process and use an_object["table_head"] (then empty it)
return ref Regex!(char)[string] heading_match_rgx,
return ref int[string] obj_type_status
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if ((_make_unmarked_headings.length > 2)
&& (obj_type_status["make_headings"] == State.off)) { /+ headings found +/
debug(headingsfound) {
@@ -4883,7 +4883,7 @@ process and use an_object["table_head"] (then empty it)
return ref int[string] obj_type_status,
return ref CMM conf_make_meta,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (auto m = line.match(rgx.heading)) { /+ heading match +/
++line_occur["heading"];
obj_type_status["heading"] = State.on;
@@ -5041,7 +5041,7 @@ process and use an_object["table_head"] (then empty it)
return ref int[string] obj_type_status,
return ref int[string] line_occur,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (line_occur["para"] == State.off) {
line = font_faces_line(line);
/+ para matches +/
@@ -5094,7 +5094,7 @@ process and use an_object["table_head"] (then empty it)
@safe char[] font_faces_line()(
char[] textline,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto mkup = InlineMarkup();
if (textline.match(rgx.inline_faces_line)) {
textline = textline
@@ -5132,7 +5132,7 @@ process and use an_object["table_head"] (then empty it)
return ref ObjGenericComposite table_object,
H table_head,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
table_object.metainfo.is_of_part = "body";
table_object.metainfo.is_of_section = "body";
table_object.metainfo.is_of_type = "block";
@@ -5163,7 +5163,7 @@ process and use an_object["table_head"] (then empty it)
return ref ObjGenericComposite table_object,
return ref T table_array,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto mng = InlineMarkup();
string _table_substantive;
ulong col_num;
@@ -5293,7 +5293,7 @@ process and use an_object["table_head"] (then empty it)
return ref ObjGenericComposite table_object,
return ref T table_substantive,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto munge = ObjInlineMarkupMunge();
string[] _table_rows = (table_substantive).split(rgx.table_row_delimiter);
string[] _table_cols;
@@ -5315,7 +5315,7 @@ process and use an_object["table_head"] (then empty it)
return ref ObjGenericComposite table_object,
return ref T table_substantive,
) {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto munge = ObjInlineMarkupMunge();
string[] _table_rows = (table_substantive).split(rgx.table_row_delimiter_special);
string[] _table_cols;
@@ -5396,7 +5396,7 @@ process and use an_object["table_head"] (then empty it)
int n_foot, n_foot_reg, n_foot_sp_asterisk, n_foot_sp_plus;
string asterisks_, plus_;
string obj_txt_out, tail, note;
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto mkup = InlineMarkup();
int stage_reset_note_numbers = true;
private auto initialize_note_numbers() {
@@ -5762,7 +5762,7 @@ process and use an_object["table_head"] (then empty it)
#+NAME: meta_emitters_obj_inline_markup
#+BEGIN_SRC d
static struct ObjInlineMarkup {
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto munge = ObjInlineMarkupMunge();
string[string] obj_txt;
static string anchor_tag = "";
@@ -6480,7 +6480,7 @@ struct BookIndexNuggetHash {
);
}
}
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
if (!bookindex_section.empty) {
auto bi_main_terms_split_arr
= bookindex_section.split(rgx.bi_main_terms_split);
@@ -6571,7 +6571,7 @@ struct BookIndexReportIndent {
#+BEGIN_SRC d
struct BookIndexReportSection {
int mkn, skn;
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
static auto munge = ObjInlineMarkupMunge();
#+END_SRC
@@ -6788,7 +6788,7 @@ struct NotesSection {
string[string] object_notes;
int previous_count;
int mkn;
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
#+END_SRC
***** { gather notes for endnote section struct open
@@ -7142,7 +7142,7 @@ struct NodeStructureMetadata {
int lv, lv0, lv1, lv2, lv3, lv4, lv5, lv6, lv7;
int obj_cite_digit;
int[string] p_; // p_ parent_
- static auto rgx = Rgx();
+ static auto rgx = RgxI();
#+END_SRC
****** node metadata emitter