aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/ao_abstract_doc_source.org44
-rw-r--r--org/ao_defaults.org322
-rw-r--r--org/sdp.org2
-rw-r--r--src/sdp/ao_abstract_doc_source.d44
-rw-r--r--src/sdp/ao_defaults.d6
-rw-r--r--src/sdp/ao_rgx.d302
-rw-r--r--views/version.txt2
7 files changed, 419 insertions, 303 deletions
diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index 6fa984e..d1bc79b 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -700,6 +700,7 @@ if ((type["heading"] == State.on)
} else if (to!int(an_object["lev_markup_number"]) < 4) {
segment_object_belongs_to = "";
}
+ _anchor_tag=to!string(obj_cite_number);
the_table_of_contents_section = obj_im.table_of_contents_gather_headings(
an_object,
dochead_make_aa,
@@ -2844,6 +2845,49 @@ struct ObjInlineMarkupMunge {
rgx.inline_notes_curly_sp_plus,
(mkup.en_a_o ~ "+" ~ " $1" ~ mkup.en_a_c)
);
+ /+ url matched +/
+ if (auto m = matchAll(obj_txt_in, rgx.inline_url)) {
+ /+ link: naked url: http://url +/
+ if (match(obj_txt_in, rgx.inline_link_naked_url)) {
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_naked_url,
+ ("$1" ~ mkup.lnk_o ~ " $2 " ~ mkup.lnk_c ~ mkup.url_o ~ "$2" ~ mkup.url_c ~ "$3") // ("$1{ $2 }$2$3")
+ );
+ }
+ /+ link with helper for endnote including the url:
+ {~^ link which includes url as footnote }http://url
+ maps to:
+ { link which includes url as footnote }http://url~{ { http://url }http://url }~
+ +/
+ if (match(obj_txt_in, rgx.inline_link_endnote_url_helper)) {
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_endnote_url_helper_punctuated,
+ (mkup.lnk_o ~ " $1 " ~ mkup.lnk_c ~ mkup.url_o ~ "$2" ~ mkup.url_c ~ "~{ " ~ mkup.lnk_o ~ " $2 " ~ mkup.lnk_c ~ mkup.url_o ~ "$2" ~ mkup.url_c ~ " }~$3") // ("{ $1 }$2~{ { $2 }$2 }~$3")
+ );
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_endnote_url_helper,
+ (mkup.lnk_o ~ " $1 " ~ 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 }$2 }~")
+ );
+ }
+ /+ link with regular markup:
+ { linked text or image }http://url
+ +/
+ if (match(obj_txt_in, rgx.inline_link_markup_regular)) {
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_markup_regular,
+ ("$1" ~ mkup.lnk_o ~ " $2 " ~ mkup.lnk_c ~ mkup.url_o ~ "$3" ~ mkup.url_c ~ "$4") // ("$1{ $2 }$3$4")
+ );
+ }
+ }
+ /+ endnotes (regular) +/
obj_txt_in =
replaceAll(
obj_txt_in,
diff --git a/org/ao_defaults.org b/org/ao_defaults.org
index 23e3a00..4ed98a6 100644
--- a/org/ao_defaults.org
+++ b/org/ao_defaults.org
@@ -433,8 +433,10 @@ template SiSUbiblio() {
#+BEGIN_SRC d
template InternalMarkup() {
struct InlineMarkup {
- auto en_a_o = "【"; auto en_a_c = "】";
- auto en_b_o = "〖"; auto en_b_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: ']~';
+ auto lnk_o = "┥"; auto lnk_c = "┝";
+ auto url_o = "┤"; auto url_c = "├";
string _indent_spaces ="";
string indent_by_spaces_provided(int indent) {
switch (indent) {
@@ -489,38 +491,38 @@ http://dlang.org/phobos/std_regex.html
#+name: ao_rgx
#+BEGIN_SRC d
/+ misc +/
-static flag_action = ctRegex!(`^(--[a-z][a-z0-9-]+)$`);
-static flag_action_str = ctRegex!(` (--[a-z][a-z0-9-]+)`);
-static within_quotes = ctRegex!(`"(.+?)"`);
-static make_heading_delimiter = ctRegex!(`[;][ ]*`);
-static arr_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");
-static newline_eol_delimiter = ctRegex!("\n");
-static newline_eol_strip_preceeding = ctRegex!("[ ]*\n");
-static newline_eol_delimiter_only = ctRegex!("^\n");
-static line_delimiter_ws_strip = ctRegex!("[ ]*\n[ ]*");
-static para_delimiter = ctRegex!("\n[ ]*\n+");
-static levels_markup = ctRegex!(`^[A-D1-4]$`);
-static levels_numbered = ctRegex!(`^[0-9]$`);
-static levels_numbered_headings = ctRegex!(`^[0-7]$`);
+static true_dollar = ctRegex!(`\$`, "gm");
+static flag_action = ctRegex!(`^(--[a-z][a-z0-9-]+)$`);
+static flag_action_str = ctRegex!(` (--[a-z][a-z0-9-]+)`);
+static within_quotes = ctRegex!(`"(.+?)"`);
+static make_heading_delimiter = ctRegex!(`[;][ ]*`);
+static arr_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");
+static newline_eol_delimiter = ctRegex!("\n");
+static newline_eol_strip_preceeding = ctRegex!("[ ]*\n");
+static newline_eol_delimiter_only = ctRegex!("^\n");
+static line_delimiter_ws_strip = ctRegex!("[ ]*\n[ ]*");
+static para_delimiter = ctRegex!("\n[ ]*\n+");
+static levels_markup = ctRegex!(`^[A-D1-4]$`);
+static levels_numbered = ctRegex!(`^[0-9]$`);
+static levels_numbered_headings = ctRegex!(`^[0-7]$`);
#+END_SRC
** filename (and path) matching (including markup insert file) :insert:file:path:filename:
#+name: ao_rgx
#+BEGIN_SRC d
-static src_pth = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
-static src_fn =
+static src_pth = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
+static src_fn =
ctRegex!(`^([a-zA-Z0-9._-]+/)*(?P<fn_src>(?P<fn_base>[a-zA-Z0-9._-]+)[.](?P<fn_src_suffix>ss[tm]))$`);
-static src_fn_master = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ssm)$`);
-static src_fn_text = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]sst)$`);
-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])$`);
-/+ insert markup file +/
+static src_fn_master = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ssm)$`);
+static src_fn_text = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]sst)$`);
+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])$`);
#+END_SRC
** comments :comment:
@@ -528,8 +530,8 @@ static insert_src_fn_ssi_or_sst = ctRegex!(`^<<\s*(?P<path>[a-zA-Z0-9._-]+/)*(?
#+name: ao_rgx
#+BEGIN_SRC d
/+ comments +/
-static comment = ctRegex!(`^%+ `);
-static comments = ctRegex!(`^%+ |^%+$`);
+static comment = ctRegex!(`^%+ `);
+static comments = ctRegex!(`^%+ |^%+$`);
#+END_SRC
** native header :native:header:
@@ -537,18 +539,18 @@ static comments = ctRegex!(`^%+ |^%+$`);
#+name: ao_rgx
#+BEGIN_SRC d
/+ header +/
-static main_headers =
+static main_headers =
ctRegex!(`^(?:creator|title|rights|date|original|classify|identifier|notes|publisher|make|links)$`, "m");
-static native_header = ctRegex!(`^@([a-z_]+):(?:\s|$)`);
-static native_header_make = ctRegex!(`^@(make):(?:\s|$)`);
-static native_header_meta =
+static native_header = ctRegex!(`^@([a-z_]+):(?:\s|$)`);
+static native_header_make = ctRegex!(`^@(make):(?:\s|$)`);
+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_meta_title = ctRegex!(`^@title:\s`, "m");
-static variable_doc_title = ctRegex!(`@title`);
-static variable_doc_author = ctRegex!(`@author|@creator`);
-static raw_author_munge = ctRegex!(`(\S.+?),\s+(.+)`,"i");
+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_meta_title = ctRegex!(`^@title:\s`, "m");
+static variable_doc_title = ctRegex!(`@title`);
+static variable_doc_author = ctRegex!(`@author|@creator`);
+static raw_author_munge = ctRegex!(`(\S.+?),\s+(.+)`,"i");
#+END_SRC
** subheader :native:subheader:
@@ -556,16 +558,16 @@ static raw_author_munge = ctRegex!(`(\S.+?),\s+(.+)`,"i");
#+name: ao_rgx
#+BEGIN_SRC d
/+ head +/
-static native_subhead_creator = ctRegex!(`^(?:author|translator|illustrator)$`, "m");
-static native_subhead_title = ctRegex!(`^(?:main|sub(?:title)?|full|language|edition|note)$`, "m");
-static native_subhead_rights = ctRegex!(`^(?:copyright|illustrations|license|cover)$`, "m");
-static native_subhead_date = ctRegex!(`^(?:published|created|issued|available|valid|modified|added_to_site)$`, "m");
-static native_subhead_original = ctRegex!(`^(?:title|language|source)$`, "m");
-static native_subhead_classify = ctRegex!(`^(?:topic_register|subject|keywords|loc|dewey)$`, "m");
-static native_subhead_identifier = ctRegex!(`^(?:oclc|pg|isbn)$`, "m");
-static native_subhead_notes = ctRegex!(`^(?:abstract|description)$`, "m");
-static native_subhead_publisher = ctRegex!(`^(?:name)$`, "m");
-static native_subhead_make = ctRegex!(`^(?:cover_image|home_button_image|home_button_text|footer|headings|num_top|num_depth|breaks|substitute|bold|italics|emphasis|texpdf_font|css)$`, "m");
+static native_subhead_creator = ctRegex!(`^(?:author|translator|illustrator)$`, "m");
+static native_subhead_title = ctRegex!(`^(?:main|sub(?:title)?|full|language|edition|note)$`, "m");
+static native_subhead_rights = ctRegex!(`^(?:copyright|illustrations|license|cover)$`, "m");
+static native_subhead_date = ctRegex!(`^(?:published|created|issued|available|valid|modified|added_to_site)$`, "m");
+static native_subhead_original = ctRegex!(`^(?:title|language|source)$`, "m");
+static native_subhead_classify = ctRegex!(`^(?:topic_register|subject|keywords|loc|dewey)$`, "m");
+static native_subhead_identifier = ctRegex!(`^(?:oclc|pg|isbn)$`, "m");
+static native_subhead_notes = ctRegex!(`^(?:abstract|description)$`, "m");
+static native_subhead_publisher = ctRegex!(`^(?:name)$`, "m");
+static native_subhead_make = ctRegex!(`^(?:cover_image|home_button_image|home_button_text|footer|headings|num_top|num_depth|breaks|substitute|bold|italics|emphasis|texpdf_font|css)$`, "m");
#+END_SRC
** heading & paragraph operators :paragraph:operator:
@@ -573,26 +575,27 @@ static native_subhead_make = ctRegex!(`^(?:cover_image|home_button_
#+name: ao_rgx
#+BEGIN_SRC d
/+ heading & paragraph operators +/
-static heading_a = ctRegex!(`^:?[A][~] `, "m");
-static heading = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
-static heading_seg_and_above = ctRegex!(`^:?([A-D1])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
-static heading_marker = ctRegex!(`^:?([A-D1-4])[~]`);
-static heading_anchor_tag = ctRegex!(`^:?[A-D1-4][~]([a-z0-9_.-]+) `,"i");
-static heading_identify_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(?:(?:(?:chapter|article|section|clause)\s+[0-9.]+)|(?:[0-9]+))`,"i"); // unless dob.obj =~/^:?[A-D1-4]~\s+(?:|(?:chapter|article|section|clause)\s+)([0-9.]+)/i
-static heading_extract_named_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(chapter|article|section|clause)\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`,"i");
-static heading_extract_unnamed_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`);
-static heading_marker_missing_tag = ctRegex!(`^:?([A-D1-4])[~] `);
-static heading_title = ctRegex!(`^:?[A-D1-4][~][a-z0-9_.-]*[?]?\s+(.+?)$`);
-static heading_all = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+(.+?)$`); // test, particularly [2] name/hashtag which may or may not be, does this affect title [3]
-static heading_backmatter = ctRegex!(`^:?1[~][!](glossary|bibliography|biblio|blurb)\s+`,"i");
-static heading_biblio = ctRegex!(`^:?(1)[~][!](biblio(?:graphy)?|references?)`);
-static heading_glossary = ctRegex!(`^:?(1)[~][!](glossary)`);
-static heading_blurb = ctRegex!(`^:?(1)[~][!](blurb)`);
-static para_bullet = ctRegex!(`^_[*] `);
-static para_bullet_indent = ctRegex!(`^_([1-9])[*] `);
-static para_indent = ctRegex!(`^_([1-9]) `);
-static para_indent_hang = ctRegex!(`^_([0-9])_([0-9]) `);
-static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
+static heading_a = ctRegex!(`^:?[A][~] `, "m");
+static heading = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
+static heading_seg_and_above = ctRegex!(`^:?([A-D1])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
+static heading_marker = ctRegex!(`^:?([A-D1-4])[~]`);
+static heading_anchor_tag = ctRegex!(`^:?[A-D1-4][~]([a-z0-9_.-]+) `,"i");
+static heading_identify_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(?:(?:(?:chapter|article|section|clause)\s+[0-9.]+)|(?:[0-9]+))`,"i");
+ // unless dob.obj =~/^:?[A-D1-4]~\s+(?:|(?:chapter|article|section|clause)\s+)([0-9.]+)/i
+static heading_extract_named_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(chapter|article|section|clause)\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`,"i");
+static heading_extract_unnamed_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`);
+static heading_marker_missing_tag = ctRegex!(`^:?([A-D1-4])[~] `);
+static heading_title = ctRegex!(`^:?[A-D1-4][~][a-z0-9_.-]*[?]?\s+(.+?)$`);
+static heading_all = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+(.+?)$`); // test, particularly [2] name/hashtag which may or may not be, does this affect title [3]
+static heading_backmatter = ctRegex!(`^:?1[~][!](glossary|bibliography|biblio|blurb)\s+`,"i");
+static heading_biblio = ctRegex!(`^:?(1)[~][!](biblio(?:graphy)?|references?)`);
+static heading_glossary = ctRegex!(`^:?(1)[~][!](glossary)`);
+static heading_blurb = ctRegex!(`^:?(1)[~][!](blurb)`);
+static para_bullet = ctRegex!(`^_[*] `);
+static para_bullet_indent = ctRegex!(`^_([1-9])[*] `);
+static para_indent = ctRegex!(`^_([1-9]) `);
+static para_indent_hang = ctRegex!(`^_([0-9])_([0-9]) `);
+static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
#+END_SRC
** blocked markup :block:tic:
@@ -600,8 +603,8 @@ static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
#+name: ao_rgx
#+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_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)");
+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_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)");
#+END_SRC
** blocked markup tics :block:tic:
@@ -609,14 +612,14 @@ static block_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)");
#+name: ao_rgx
#+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_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)");
-static block_tic_block_open = ctRegex!("^`{3} (block)");
-static block_tic_quote_open = ctRegex!("^`{3} (quote)");
-static block_tic_table_open = ctRegex!("^`{3} (table)");
-static block_tic_close = ctRegex!("^(`{3})$","m");
+static block_tic_open = ctRegex!("^`{3} (code([.][a-z][0-9a-z_]+)?|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)");
+static block_tic_block_open = ctRegex!("^`{3} (block)");
+static block_tic_quote_open = ctRegex!("^`{3} (quote)");
+static block_tic_table_open = ctRegex!("^`{3} (table)");
+static block_tic_close = ctRegex!("^(`{3})$","m");
#+END_SRC
** blocked markup curly :block:curly:
@@ -624,19 +627,19 @@ static block_tic_close = ctRegex!("^(`{3})$","m");
#+name: ao_rgx
#+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_code_open = ctRegex!(`^(code([.][a-z][0-9a-z_]+)?[{].*?$)`);
-static block_curly_code_close = ctRegex!(`^([}]code)`);
-static block_curly_poem_open = ctRegex!(`^(poem[{].*?$)`);
-static block_curly_poem_close = ctRegex!(`^([}]poem)`);
-static block_curly_group_open = ctRegex!(`^(group[{].*?$)`);
-static block_curly_group_close = ctRegex!(`^([}]group)`);
-static block_curly_block_open = ctRegex!(`^(block[{].*?$)`);
-static block_curly_block_close = ctRegex!(`^([}]block)`);
-static block_curly_quote_open = ctRegex!(`^(quote[{].*?$)`);
-static block_curly_quote_close = ctRegex!(`^([}]quote)`);
-static block_curly_table_open = ctRegex!(`^(table[{].*?$)`);
-static block_curly_table_close = ctRegex!(`^([}]table)`);
+static block_curly_open = ctRegex!(`^((code([.][a-z][0-9a-z_]+)?|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[{].*?$)`);
+static block_curly_poem_close = ctRegex!(`^([}]poem)`);
+static block_curly_group_open = ctRegex!(`^(group[{].*?$)`);
+static block_curly_group_close = ctRegex!(`^([}]group)`);
+static block_curly_block_open = ctRegex!(`^(block[{].*?$)`);
+static block_curly_block_close = ctRegex!(`^([}]block)`);
+static block_curly_quote_open = ctRegex!(`^(quote[{].*?$)`);
+static block_curly_quote_close = ctRegex!(`^([}]quote)`);
+static block_curly_table_open = ctRegex!(`^(table[{].*?$)`);
+static block_curly_table_close = ctRegex!(`^([}]table)`);
#+END_SRC
** inline markup font face mod :inline:font:face:
@@ -644,48 +647,65 @@ static block_curly_table_close = ctRegex!(`^([}]table)`);
#+name: ao_rgx
#+BEGIN_SRC d
/+ inline markup font face mod +/
-static inline_emphasis = ctRegex!(`\*\{(?P<text>.+?)\}\*`);
-static inline_bold = ctRegex!(`!\{(?P<text>.+?)\}!`);
-static inline_italics = ctRegex!(`/\{(?P<text>.+?)\}/`);
-static inline_superscript = ctRegex!(`\^\{(?P<text>.+?)\}\^`);
-static inline_subscript = ctRegex!(`,\{(?P<text>.+?)\},`);
-static inline_strike = ctRegex!(`-\{(?P<text>.+?)\}-`);
-static inline_insert = ctRegex!(`\+\{(?P<text>.+?)\}\+`);
-static inline_mono = ctRegex!(`#\{(?P<text>.+?)\}#`);
+static inline_emphasis = ctRegex!(`\*\{(?P<text>.+?)\}\*`);
+static inline_bold = ctRegex!(`!\{(?P<text>.+?)\}!`);
+static inline_italics = ctRegex!(`/\{(?P<text>.+?)\}/`);
+static inline_superscript = ctRegex!(`\^\{(?P<text>.+?)\}\^`);
+static inline_subscript = ctRegex!(`,\{(?P<text>.+?)\},`);
+static inline_strike = ctRegex!(`-\{(?P<text>.+?)\}-`);
+static inline_insert = ctRegex!(`\+\{(?P<text>.+?)\}\+`);
+static inline_mono = ctRegex!(`#\{(?P<text>.+?)\}#`);
#+END_SRC
-** inline markup footnotes :inline:footnote:
+** inline markup footnotes endnotes :inline:footnote:
#+name: ao_rgx
#+BEGIN_SRC d
-/+ inline markup footnotes +/
-static true_dollar = ctRegex!(`\$`, "gm");
-static inline_notes_al = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)】`, "mg");
-static inline_notes_al_gen = ctRegex!(`【.+?】`, "m");
-static inline_notes_curly_gen = ctRegex!(`~\{.+?\}~`, "m");
-static inline_notes_curly = ctRegex!(`~\{\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");
-static inline_notes_delimiter_al_regular = ctRegex!(`【(.+?)】`, "m");
-static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "m");
-static inline_al_delimiter_open_asterisk = ctRegex!(`【\*`, "m");
-static inline_al_delimiter_open_plus = ctRegex!(`【\+`, "m");
-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_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_al = ctRegex!(`(?P<text>.+?)【(?:[*+ ]*)(?P<note>.+?)】`, "mg");
-static inline_text_and_note_curly = ctRegex!(`(?P<text>.+?)(?:(?:[~])[{][*+ ]*)(?P<note>.+?)(?:[}][~])`, "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");
-static inline_text_and_note_square = ctRegex!(`(.+?)~\[\s*(.+?)\]~`, "mg");
-static inline_note_square_delimiters = ctRegex!(`(~\[\s*)(.+?)(\]~)`, "mg");
-static note_ref = ctRegex!(`^\S+?noteref_([0-9]+)`, "mg"); // {^{73.}^}#noteref_73
+/+ inline markup footnotes endnotes +/
+static inline_notes_curly_gen = ctRegex!(`~\{.+?\}~`, "m");
+static inline_notes_curly = ctRegex!(`~\{\s*(.+?)\}~`, "mg");
+static inline_curly_delimiter_open_and_close_regular = ctRegex!(`~\{\s*|\s*\}~`, "m");
+static inline_notes_delimiter_curly_regular = ctRegex!(`~\{[ ]*(.+?)\}~`, "m");
+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_note_curly_delimiters = ctRegex!(`(~\{[*+]?\s*)(.+?)(\}~)`, "mg");
+static inline_notes_square = ctRegex!(`~\[\s*(.+?)\]~`, "mg");
+static inline_text_and_note_square_sp = ctRegex!(`(.+?)~\[[*+]+\s+(.+?)\]~`, "mg");
+static inline_text_and_note_square = ctRegex!(`(.+?)~\[\s*(.+?)\]~`, "mg");
+static inline_note_square_delimiters = ctRegex!(`(~\[\s*)(.+?)(\]~)`, "mg");
+static inline_curly_delimiter_open_regular = ctRegex!(`~\{\s*`, "m");
+static inline_curly_delimiter_close_regular = ctRegex!(`\s*\}~`, "m");
+static inline_text_and_note_curly = ctRegex!(`(?P<text>.+?)(?:(?:[~])[{][*+ ]*)(?P<note>.+?)(?:[}][~])`, "mg");
+static note_ref = ctRegex!(`^\S+?noteref_([0-9]+)`, "mg"); // {^{73.}^}#noteref_73
+#+END_SRC
+
+** inline (internal program) markup footnotes endnotes :inline:footnote:
+
+#+name: ao_rgx
+#+BEGIN_SRC d
+/+ inline markup footnotes endnotes +/
+static inline_notes_al = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)】`, "mg");
+static inline_notes_al_gen = ctRegex!(`【.+?】`, "m");
+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");
+static inline_notes_delimiter_al_regular = ctRegex!(`【(.+?)】`, "m");
+static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "m");
+static inline_al_delimiter_open_asterisk = ctRegex!(`【\*`, "m");
+static inline_al_delimiter_open_plus = ctRegex!(`【\+`, "m");
+static inline_text_and_note_al = ctRegex!(`(?P<text>.+?)【(?:[*+ ]*)(?P<note>.+?)】`, "mg");
+#+END_SRC
+
+** links/ urls :inline:footnote:
+
+#+name: ao_rgx
+#+BEGIN_SRC d
+static inline_url = ctRegex!(`((?:https?|git):\/\/\S+)`, "mg");
+static inline_link_naked_url = ctRegex!(`(^|[ ])((?:https?|git):\/\/\S+?)([.,;:?!]?(?:[ ]|$))`, "mg");
+static inline_link_markup_regular = ctRegex!(`(^|[ ])\{\s*(.+?)\s*\}((?:https?|git):\/\/\S+?)([.,;:?!]?(?:[ ]|$))`, "mg");
+static inline_link_endnote_url_helper_punctuated = ctRegex!(`\{~\^\s+(.+?)\}((?:https?|git):\/\/\S+?)([.,;:?!]?(?:[ ]|$))`, "mg");
+static inline_link_endnote_url_helper = ctRegex!(`\{~\^\s+(.+?)\}((?:https?|git):\/\/\S+)`, "mg");
#+END_SRC
** inline markup book index :inline:bookindex:
@@ -693,9 +713,9 @@ static note_ref = ctRegex!(`^\S+?noteref_([0-9]+)`,
#+name: ao_rgx
#+BEGIN_SRC d
/+ inline markup book index +/
-static book_index = ctRegex!(`^=\{\s*(.+?)\}$`, "m");
-static book_index_open = ctRegex!(`^=\{\s*([^}]+?)$`);
-static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); // strip
+static book_index = ctRegex!(`^=\{\s*(.+?)\}$`, "m");
+static book_index_open = ctRegex!(`^=\{\s*([^}]+?)$`);
+static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); // strip
#+END_SRC
** no obj_cite_number object :ocn:off:object:
@@ -703,9 +723,9 @@ static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); // strip
#+name: ao_rgx
#+BEGIN_SRC d
/+ no obj_cite_number object +/
-static obj_cite_number_off = ctRegex!(`~#$`, "m");
-static obj_cite_number_off_dh = ctRegex!(`-#$`, "m");
-static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m");
+static obj_cite_number_off = ctRegex!(`~#$`, "m");
+static obj_cite_number_off_dh = ctRegex!(`-#$`, "m");
+static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m");
#+END_SRC
** no obj_cite_number block :ocn:off:block:
@@ -713,10 +733,10 @@ static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m");
#+name: ao_rgx
#+BEGIN_SRC d
/+ no obj_cite_number block +/
-static obj_cite_number_off_block = ctRegex!(`^--~#$`);
-static obj_cite_number_off_block_dh = ctRegex!(`^---#$`);
-static obj_cite_number_off_block_close = ctRegex!(`^--\+#$`);
-static obj_cite_number_block_marks = ctRegex!(`^--[+~-]#$`);
+static obj_cite_number_off_block = ctRegex!(`^--~#$`);
+static obj_cite_number_off_block_dh = ctRegex!(`^---#$`);
+static obj_cite_number_off_block_close = ctRegex!(`^--\+#$`);
+static obj_cite_number_block_marks = ctRegex!(`^--[+~-]#$`);
#+END_SRC
** ignore outside code blocks :block:code:
@@ -732,12 +752,12 @@ static skip_from_regular_parse = ctRegex!(`^(--[+~-]#|-[\\]{2}-|=[.\\]{2}=)$`
#+name: ao_rgx
#+BEGIN_SRC d
/+ line & page breaks +/
-static break_line_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!(`』`);
-static parent = ctRegex!(`([0-7]):([0-9]+)`);
+static break_line_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!(`』`);
+static parent = ctRegex!(`([0-7]):([0-9]+)`);
#+END_SRC
** json :json:
@@ -745,7 +765,7 @@ static parent = ctRegex!(`([0-7]):([0-9]+)`);
#+name: ao_rgx
#+BEGIN_SRC d
/+ json +/
-static tailing_comma = ctRegex!(`,$`, "m");
+static tailing_comma = ctRegex!(`,$`, "m");
#+END_SRC
** biblio tags :biblio:tags:
@@ -753,8 +773,8 @@ static tailing_comma = ctRegex!(`,$`, "m");
#+name: ao_rgx
#+BEGIN_SRC d
/+ 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|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)$`);
#+END_SRC
** bookindex split :bookindex:split:
@@ -762,10 +782,10 @@ static biblio_abbreviations = ctRegex!(`^(au|ed|ti|lng|jo|vol|edn|yr|pl|pb|
#+name: ao_rgx
#+BEGIN_SRC d
/+ bookindex split +/
-static bi_main_terms_split = ctRegex!(`\s*;\s*`);
-static bi_main_term_plus_rest_split = ctRegex!(`\s*:\s*`);
+static bi_main_terms_split = ctRegex!(`\s*;\s*`);
+static bi_main_term_plus_rest_split = ctRegex!(`\s*:\s*`);
static bi_sub_terms_plus_obj_cite_number_offset_split = ctRegex!(`\s*\|\s*`);
-static bi_term_and_obj_cite_numbers_match = ctRegex!(`^(.+?)\+(\d+)`);
+static bi_term_and_obj_cite_numbers_match = ctRegex!(`^(.+?)\+(\d+)`);
#+END_SRC
* +set colors for terminal+ (unused) :colors:terminal:
diff --git a/org/sdp.org b/org/sdp.org
index d69262b..afd2be5 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -24,7 +24,7 @@ struct Version {
int minor;
int patch;
}
-enum ver = Version(0, 9, 0);
+enum ver = Version(0, 9, 1);
#+END_SRC
* sdp.d sisu document parser :sdp.d:
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index 1677aed..f60fa60 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -525,6 +525,7 @@ template SiSUdocAbstraction() {
} else if (to!int(an_object["lev_markup_number"]) < 4) {
segment_object_belongs_to = "";
}
+ _anchor_tag=to!string(obj_cite_number);
the_table_of_contents_section = obj_im.table_of_contents_gather_headings(
an_object,
dochead_make_aa,
@@ -2345,6 +2346,49 @@ template SiSUdocAbstraction() {
rgx.inline_notes_curly_sp_plus,
(mkup.en_a_o ~ "+" ~ " $1" ~ mkup.en_a_c)
);
+ /+ url matched +/
+ if (auto m = matchAll(obj_txt_in, rgx.inline_url)) {
+ /+ link: naked url: http://url +/
+ if (match(obj_txt_in, rgx.inline_link_naked_url)) {
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_naked_url,
+ ("$1" ~ mkup.lnk_o ~ " $2 " ~ mkup.lnk_c ~ mkup.url_o ~ "$2" ~ mkup.url_c ~ "$3") // ("$1{ $2 }$2$3")
+ );
+ }
+ /+ link with helper for endnote including the url:
+ {~^ link which includes url as footnote }http://url
+ maps to:
+ { link which includes url as footnote }http://url~{ { http://url }http://url }~
+ +/
+ if (match(obj_txt_in, rgx.inline_link_endnote_url_helper)) {
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_endnote_url_helper_punctuated,
+ (mkup.lnk_o ~ " $1 " ~ mkup.lnk_c ~ mkup.url_o ~ "$2" ~ mkup.url_c ~ "~{ " ~ mkup.lnk_o ~ " $2 " ~ mkup.lnk_c ~ mkup.url_o ~ "$2" ~ mkup.url_c ~ " }~$3") // ("{ $1 }$2~{ { $2 }$2 }~$3")
+ );
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_endnote_url_helper,
+ (mkup.lnk_o ~ " $1 " ~ 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 }$2 }~")
+ );
+ }
+ /+ link with regular markup:
+ { linked text or image }http://url
+ +/
+ if (match(obj_txt_in, rgx.inline_link_markup_regular)) {
+ obj_txt_in =
+ replaceAll(
+ obj_txt_in,
+ rgx.inline_link_markup_regular,
+ ("$1" ~ mkup.lnk_o ~ " $2 " ~ mkup.lnk_c ~ mkup.url_o ~ "$3" ~ mkup.url_c ~ "$4") // ("$1{ $2 }$3$4")
+ );
+ }
+ }
+ /+ endnotes (regular) +/
obj_txt_in =
replaceAll(
obj_txt_in,
diff --git a/src/sdp/ao_defaults.d b/src/sdp/ao_defaults.d
index d8c1e24..f1c05ac 100644
--- a/src/sdp/ao_defaults.d
+++ b/src/sdp/ao_defaults.d
@@ -384,8 +384,10 @@ template SiSUbiblio() {
}
template InternalMarkup() {
struct InlineMarkup {
- auto en_a_o = "【"; auto en_a_c = "】";
- auto en_b_o = "〖"; auto en_b_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: ']~';
+ auto lnk_o = "┥"; auto lnk_c = "┝";
+ auto url_o = "┤"; auto url_c = "├";
string _indent_spaces ="";
string indent_by_spaces_provided(int indent) {
switch (indent) {
diff --git a/src/sdp/ao_rgx.d b/src/sdp/ao_rgx.d
index c58aeca..68a16c1 100644
--- a/src/sdp/ao_rgx.d
+++ b/src/sdp/ao_rgx.d
@@ -4,174 +4,180 @@
template RgxInit() {
struct Rgx {
/+ misc +/
- static flag_action = ctRegex!(`^(--[a-z][a-z0-9-]+)$`);
- static flag_action_str = ctRegex!(` (--[a-z][a-z0-9-]+)`);
- static within_quotes = ctRegex!(`"(.+?)"`);
- static make_heading_delimiter = ctRegex!(`[;][ ]*`);
- static arr_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");
- static newline_eol_delimiter = ctRegex!("\n");
- static newline_eol_strip_preceeding = ctRegex!("[ ]*\n");
- static newline_eol_delimiter_only = ctRegex!("^\n");
- static line_delimiter_ws_strip = ctRegex!("[ ]*\n[ ]*");
- static para_delimiter = ctRegex!("\n[ ]*\n+");
- static levels_markup = ctRegex!(`^[A-D1-4]$`);
- static levels_numbered = ctRegex!(`^[0-9]$`);
- static levels_numbered_headings = ctRegex!(`^[0-7]$`);
- static src_pth = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
- static src_fn =
+ static true_dollar = ctRegex!(`\$`, "gm");
+ static flag_action = ctRegex!(`^(--[a-z][a-z0-9-]+)$`);
+ static flag_action_str = ctRegex!(` (--[a-z][a-z0-9-]+)`);
+ static within_quotes = ctRegex!(`"(.+?)"`);
+ static make_heading_delimiter = ctRegex!(`[;][ ]*`);
+ static arr_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");
+ static newline_eol_delimiter = ctRegex!("\n");
+ static newline_eol_strip_preceeding = ctRegex!("[ ]*\n");
+ static newline_eol_delimiter_only = ctRegex!("^\n");
+ static line_delimiter_ws_strip = ctRegex!("[ ]*\n[ ]*");
+ static para_delimiter = ctRegex!("\n[ ]*\n+");
+ static levels_markup = ctRegex!(`^[A-D1-4]$`);
+ static levels_numbered = ctRegex!(`^[0-9]$`);
+ static levels_numbered_headings = ctRegex!(`^[0-7]$`);
+ static src_pth = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
+ static src_fn =
ctRegex!(`^([a-zA-Z0-9._-]+/)*(?P<fn_src>(?P<fn_base>[a-zA-Z0-9._-]+)[.](?P<fn_src_suffix>ss[tm]))$`);
- static src_fn_master = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ssm)$`);
- static src_fn_text = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]sst)$`);
- 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])$`);
- /+ insert markup file +/
+ static src_fn_master = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ssm)$`);
+ static src_fn_text = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]sst)$`);
+ 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])$`);
/+ comments +/
- static comment = ctRegex!(`^%+ `);
- static comments = ctRegex!(`^%+ |^%+$`);
+ static comment = ctRegex!(`^%+ `);
+ static comments = ctRegex!(`^%+ |^%+$`);
/+ header +/
- static main_headers =
+ static main_headers =
ctRegex!(`^(?:creator|title|rights|date|original|classify|identifier|notes|publisher|make|links)$`, "m");
- static native_header = ctRegex!(`^@([a-z_]+):(?:\s|$)`);
- static native_header_make = ctRegex!(`^@(make):(?:\s|$)`);
- static native_header_meta =
+ static native_header = ctRegex!(`^@([a-z_]+):(?:\s|$)`);
+ static native_header_make = ctRegex!(`^@(make):(?:\s|$)`);
+ 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_meta_title = ctRegex!(`^@title:\s`, "m");
- static variable_doc_title = ctRegex!(`@title`);
- static variable_doc_author = ctRegex!(`@author|@creator`);
- static raw_author_munge = ctRegex!(`(\S.+?),\s+(.+)`,"i");
+ 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_meta_title = ctRegex!(`^@title:\s`, "m");
+ static variable_doc_title = ctRegex!(`@title`);
+ static variable_doc_author = ctRegex!(`@author|@creator`);
+ static raw_author_munge = ctRegex!(`(\S.+?),\s+(.+)`,"i");
/+ head +/
- static native_subhead_creator = ctRegex!(`^(?:author|translator|illustrator)$`, "m");
- static native_subhead_title = ctRegex!(`^(?:main|sub(?:title)?|full|language|edition|note)$`, "m");
- static native_subhead_rights = ctRegex!(`^(?:copyright|illustrations|license|cover)$`, "m");
- static native_subhead_date = ctRegex!(`^(?:published|created|issued|available|valid|modified|added_to_site)$`, "m");
- static native_subhead_original = ctRegex!(`^(?:title|language|source)$`, "m");
- static native_subhead_classify = ctRegex!(`^(?:topic_register|subject|keywords|loc|dewey)$`, "m");
- static native_subhead_identifier = ctRegex!(`^(?:oclc|pg|isbn)$`, "m");
- static native_subhead_notes = ctRegex!(`^(?:abstract|description)$`, "m");
- static native_subhead_publisher = ctRegex!(`^(?:name)$`, "m");
- static native_subhead_make = ctRegex!(`^(?:cover_image|home_button_image|home_button_text|footer|headings|num_top|num_depth|breaks|substitute|bold|italics|emphasis|texpdf_font|css)$`, "m");
+ static native_subhead_creator = ctRegex!(`^(?:author|translator|illustrator)$`, "m");
+ static native_subhead_title = ctRegex!(`^(?:main|sub(?:title)?|full|language|edition|note)$`, "m");
+ static native_subhead_rights = ctRegex!(`^(?:copyright|illustrations|license|cover)$`, "m");
+ static native_subhead_date = ctRegex!(`^(?:published|created|issued|available|valid|modified|added_to_site)$`, "m");
+ static native_subhead_original = ctRegex!(`^(?:title|language|source)$`, "m");
+ static native_subhead_classify = ctRegex!(`^(?:topic_register|subject|keywords|loc|dewey)$`, "m");
+ static native_subhead_identifier = ctRegex!(`^(?:oclc|pg|isbn)$`, "m");
+ static native_subhead_notes = ctRegex!(`^(?:abstract|description)$`, "m");
+ static native_subhead_publisher = ctRegex!(`^(?:name)$`, "m");
+ static native_subhead_make = ctRegex!(`^(?:cover_image|home_button_image|home_button_text|footer|headings|num_top|num_depth|breaks|substitute|bold|italics|emphasis|texpdf_font|css)$`, "m");
/+ heading & paragraph operators +/
- static heading_a = ctRegex!(`^:?[A][~] `, "m");
- static heading = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
- static heading_seg_and_above = ctRegex!(`^:?([A-D1])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
- static heading_marker = ctRegex!(`^:?([A-D1-4])[~]`);
- static heading_anchor_tag = ctRegex!(`^:?[A-D1-4][~]([a-z0-9_.-]+) `,"i");
- static heading_identify_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(?:(?:(?:chapter|article|section|clause)\s+[0-9.]+)|(?:[0-9]+))`,"i"); // unless dob.obj =~/^:?[A-D1-4]~\s+(?:|(?:chapter|article|section|clause)\s+)([0-9.]+)/i
- static heading_extract_named_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(chapter|article|section|clause)\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`,"i");
- static heading_extract_unnamed_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`);
- static heading_marker_missing_tag = ctRegex!(`^:?([A-D1-4])[~] `);
- static heading_title = ctRegex!(`^:?[A-D1-4][~][a-z0-9_.-]*[?]?\s+(.+?)$`);
- static heading_all = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+(.+?)$`); // test, particularly [2] name/hashtag which may or may not be, does this affect title [3]
- static heading_backmatter = ctRegex!(`^:?1[~][!](glossary|bibliography|biblio|blurb)\s+`,"i");
- static heading_biblio = ctRegex!(`^:?(1)[~][!](biblio(?:graphy)?|references?)`);
- static heading_glossary = ctRegex!(`^:?(1)[~][!](glossary)`);
- static heading_blurb = ctRegex!(`^:?(1)[~][!](blurb)`);
- static para_bullet = ctRegex!(`^_[*] `);
- static para_bullet_indent = ctRegex!(`^_([1-9])[*] `);
- static para_indent = ctRegex!(`^_([1-9]) `);
- static para_indent_hang = ctRegex!(`^_([0-9])_([0-9]) `);
- static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
+ static heading_a = ctRegex!(`^:?[A][~] `, "m");
+ static heading = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
+ static heading_seg_and_above = ctRegex!(`^:?([A-D1])[~]([a-z0-9_.-]*[?]?)\s+`,"i");
+ static heading_marker = ctRegex!(`^:?([A-D1-4])[~]`);
+ static heading_anchor_tag = ctRegex!(`^:?[A-D1-4][~]([a-z0-9_.-]+) `,"i");
+ static heading_identify_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(?:(?:(?:chapter|article|section|clause)\s+[0-9.]+)|(?:[0-9]+))`,"i");
+ // unless dob.obj =~/^:?[A-D1-4]~\s+(?:|(?:chapter|article|section|clause)\s+)([0-9.]+)/i
+ static heading_extract_named_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+(chapter|article|section|clause)\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`,"i");
+ static heading_extract_unnamed_anchor_tag = ctRegex!(`^:?[A-D1-4][~]\s+((?:[0-9]+.)*[0-9]+)(?:[.:;, ]|$)`);
+ static heading_marker_missing_tag = ctRegex!(`^:?([A-D1-4])[~] `);
+ static heading_title = ctRegex!(`^:?[A-D1-4][~][a-z0-9_.-]*[?]?\s+(.+?)$`);
+ static heading_all = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+(.+?)$`); // test, particularly [2] name/hashtag which may or may not be, does this affect title [3]
+ static heading_backmatter = ctRegex!(`^:?1[~][!](glossary|bibliography|biblio|blurb)\s+`,"i");
+ static heading_biblio = ctRegex!(`^:?(1)[~][!](biblio(?:graphy)?|references?)`);
+ static heading_glossary = ctRegex!(`^:?(1)[~][!](glossary)`);
+ static heading_blurb = ctRegex!(`^:?(1)[~][!](blurb)`);
+ static para_bullet = ctRegex!(`^_[*] `);
+ static para_bullet_indent = ctRegex!(`^_([1-9])[*] `);
+ static para_indent = ctRegex!(`^_([1-9]) `);
+ static para_indent_hang = ctRegex!(`^_([0-9])_([0-9]) `);
+ static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
/+ 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_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)");
+ 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_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)");
/+ blocked markup tics +/
- static block_tic_open = ctRegex!("^`{3} (code([.][a-z][0-9a-z_]+)?|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)");
- static block_tic_block_open = ctRegex!("^`{3} (block)");
- static block_tic_quote_open = ctRegex!("^`{3} (quote)");
- static block_tic_table_open = ctRegex!("^`{3} (table)");
- static block_tic_close = ctRegex!("^(`{3})$","m");
+ static block_tic_open = ctRegex!("^`{3} (code([.][a-z][0-9a-z_]+)?|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)");
+ static block_tic_block_open = ctRegex!("^`{3} (block)");
+ static block_tic_quote_open = ctRegex!("^`{3} (quote)");
+ static block_tic_table_open = ctRegex!("^`{3} (table)");
+ static block_tic_close = ctRegex!("^(`{3})$","m");
/+ blocked markup curly +/
- static block_curly_open = ctRegex!(`^((code([.][a-z][0-9a-z_]+)?|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[{].*?$)`);
- static block_curly_poem_close = ctRegex!(`^([}]poem)`);
- static block_curly_group_open = ctRegex!(`^(group[{].*?$)`);
- static block_curly_group_close = ctRegex!(`^([}]group)`);
- static block_curly_block_open = ctRegex!(`^(block[{].*?$)`);
- static block_curly_block_close = ctRegex!(`^([}]block)`);
- static block_curly_quote_open = ctRegex!(`^(quote[{].*?$)`);
- static block_curly_quote_close = ctRegex!(`^([}]quote)`);
- static block_curly_table_open = ctRegex!(`^(table[{].*?$)`);
- static block_curly_table_close = ctRegex!(`^([}]table)`);
+ static block_curly_open = ctRegex!(`^((code([.][a-z][0-9a-z_]+)?|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[{].*?$)`);
+ static block_curly_poem_close = ctRegex!(`^([}]poem)`);
+ static block_curly_group_open = ctRegex!(`^(group[{].*?$)`);
+ static block_curly_group_close = ctRegex!(`^([}]group)`);
+ static block_curly_block_open = ctRegex!(`^(block[{].*?$)`);
+ static block_curly_block_close = ctRegex!(`^([}]block)`);
+ static block_curly_quote_open = ctRegex!(`^(quote[{].*?$)`);
+ static block_curly_quote_close = ctRegex!(`^([}]quote)`);
+ static block_curly_table_open = ctRegex!(`^(table[{].*?$)`);
+ static block_curly_table_close = ctRegex!(`^([}]table)`);
/+ inline markup font face mod +/
- static inline_emphasis = ctRegex!(`\*\{(?P<text>.+?)\}\*`);
- static inline_bold = ctRegex!(`!\{(?P<text>.+?)\}!`);
- static inline_italics = ctRegex!(`/\{(?P<text>.+?)\}/`);
- static inline_superscript = ctRegex!(`\^\{(?P<text>.+?)\}\^`);
- static inline_subscript = ctRegex!(`,\{(?P<text>.+?)\},`);
- static inline_strike = ctRegex!(`-\{(?P<text>.+?)\}-`);
- static inline_insert = ctRegex!(`\+\{(?P<text>.+?)\}\+`);
- static inline_mono = ctRegex!(`#\{(?P<text>.+?)\}#`);
- /+ inline markup footnotes +/
- static true_dollar = ctRegex!(`\$`, "gm");
- static inline_notes_al = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)】`, "mg");
- static inline_notes_al_gen = ctRegex!(`【.+?】`, "m");
- static inline_notes_curly_gen = ctRegex!(`~\{.+?\}~`, "m");
- static inline_notes_curly = ctRegex!(`~\{\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");
- static inline_notes_delimiter_al_regular = ctRegex!(`【(.+?)】`, "m");
- static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "m");
- static inline_al_delimiter_open_asterisk = ctRegex!(`【\*`, "m");
- static inline_al_delimiter_open_plus = ctRegex!(`【\+`, "m");
- 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_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_al = ctRegex!(`(?P<text>.+?)【(?:[*+ ]*)(?P<note>.+?)】`, "mg");
- static inline_text_and_note_curly = ctRegex!(`(?P<text>.+?)(?:(?:[~])[{][*+ ]*)(?P<note>.+?)(?:[}][~])`, "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");
- static inline_text_and_note_square = ctRegex!(`(.+?)~\[\s*(.+?)\]~`, "mg");
- static inline_note_square_delimiters = ctRegex!(`(~\[\s*)(.+?)(\]~)`, "mg");
- static note_ref = ctRegex!(`^\S+?noteref_([0-9]+)`, "mg"); // {^{73.}^}#noteref_73
+ static inline_emphasis = ctRegex!(`\*\{(?P<text>.+?)\}\*`);
+ static inline_bold = ctRegex!(`!\{(?P<text>.+?)\}!`);
+ static inline_italics = ctRegex!(`/\{(?P<text>.+?)\}/`);
+ static inline_superscript = ctRegex!(`\^\{(?P<text>.+?)\}\^`);
+ static inline_subscript = ctRegex!(`,\{(?P<text>.+?)\},`);
+ static inline_strike = ctRegex!(`-\{(?P<text>.+?)\}-`);
+ static inline_insert = ctRegex!(`\+\{(?P<text>.+?)\}\+`);
+ static inline_mono = ctRegex!(`#\{(?P<text>.+?)\}#`);
+ /+ inline markup footnotes endnotes +/
+ static inline_notes_curly_gen = ctRegex!(`~\{.+?\}~`, "m");
+ static inline_notes_curly = ctRegex!(`~\{\s*(.+?)\}~`, "mg");
+ static inline_curly_delimiter_open_and_close_regular = ctRegex!(`~\{\s*|\s*\}~`, "m");
+ static inline_notes_delimiter_curly_regular = ctRegex!(`~\{[ ]*(.+?)\}~`, "m");
+ 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_note_curly_delimiters = ctRegex!(`(~\{[*+]?\s*)(.+?)(\}~)`, "mg");
+ static inline_notes_square = ctRegex!(`~\[\s*(.+?)\]~`, "mg");
+ static inline_text_and_note_square_sp = ctRegex!(`(.+?)~\[[*+]+\s+(.+?)\]~`, "mg");
+ static inline_text_and_note_square = ctRegex!(`(.+?)~\[\s*(.+?)\]~`, "mg");
+ static inline_note_square_delimiters = ctRegex!(`(~\[\s*)(.+?)(\]~)`, "mg");
+ static inline_curly_delimiter_open_regular = ctRegex!(`~\{\s*`, "m");
+ static inline_curly_delimiter_close_regular = ctRegex!(`\s*\}~`, "m");
+ static inline_text_and_note_curly = ctRegex!(`(?P<text>.+?)(?:(?:[~])[{][*+ ]*)(?P<note>.+?)(?:[}][~])`, "mg");
+ static note_ref = ctRegex!(`^\S+?noteref_([0-9]+)`, "mg"); // {^{73.}^}#noteref_73
+ /+ inline markup footnotes endnotes +/
+ static inline_notes_al = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)】`, "mg");
+ static inline_notes_al_gen = ctRegex!(`【.+?】`, "m");
+ 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");
+ static inline_notes_delimiter_al_regular = ctRegex!(`【(.+?)】`, "m");
+ static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "m");
+ static inline_al_delimiter_open_asterisk = ctRegex!(`【\*`, "m");
+ static inline_al_delimiter_open_plus = ctRegex!(`【\+`, "m");
+ static inline_text_and_note_al = ctRegex!(`(?P<text>.+?)【(?:[*+ ]*)(?P<note>.+?)】`, "mg");
+ static inline_url = ctRegex!(`((?:https?|git):\/\/\S+)`, "mg");
+ static inline_link_naked_url = ctRegex!(`(^|[ ])((?:https?|git):\/\/\S+?)([.,;:?!]?(?:[ ]|$))`, "mg");
+ static inline_link_markup_regular = ctRegex!(`(^|[ ])\{\s*(.+?)\s*\}((?:https?|git):\/\/\S+?)([.,;:?!]?(?:[ ]|$))`, "mg");
+ static inline_link_endnote_url_helper_punctuated = ctRegex!(`\{~\^\s+(.+?)\}((?:https?|git):\/\/\S+?)([.,;:?!]?(?:[ ]|$))`, "mg");
+ static inline_link_endnote_url_helper = ctRegex!(`\{~\^\s+(.+?)\}((?:https?|git):\/\/\S+)`, "mg");
/+ inline markup book index +/
- static book_index = ctRegex!(`^=\{\s*(.+?)\}$`, "m");
- static book_index_open = ctRegex!(`^=\{\s*([^}]+?)$`);
- static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); // strip
+ static book_index = ctRegex!(`^=\{\s*(.+?)\}$`, "m");
+ static book_index_open = ctRegex!(`^=\{\s*([^}]+?)$`);
+ static book_index_close = ctRegex!(`^(.*?)\}$`, "m"); // strip
/+ no obj_cite_number object +/
- static obj_cite_number_off = ctRegex!(`~#$`, "m");
- static obj_cite_number_off_dh = ctRegex!(`-#$`, "m");
- static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m");
+ static obj_cite_number_off = ctRegex!(`~#$`, "m");
+ static obj_cite_number_off_dh = ctRegex!(`-#$`, "m");
+ static obj_cite_number_off_all = ctRegex!(`[~-]#$`, "m");
/+ no obj_cite_number block +/
- static obj_cite_number_off_block = ctRegex!(`^--~#$`);
- static obj_cite_number_off_block_dh = ctRegex!(`^---#$`);
- static obj_cite_number_off_block_close = ctRegex!(`^--\+#$`);
- static obj_cite_number_block_marks = ctRegex!(`^--[+~-]#$`);
+ static obj_cite_number_off_block = ctRegex!(`^--~#$`);
+ static obj_cite_number_off_block_dh = ctRegex!(`^---#$`);
+ static obj_cite_number_off_block_close = ctRegex!(`^--\+#$`);
+ static obj_cite_number_block_marks = ctRegex!(`^--[+~-]#$`);
/+ ignore outside code blocks +/
static skip_from_regular_parse = ctRegex!(`^(--[+~-]#|-[\\]{2}-|=[.\\]{2}=)$`); // not structural info
/+ line & page breaks +/
- static break_line_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!(`』`);
- static parent = ctRegex!(`([0-7]):([0-9]+)`);
+ static break_line_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!(`』`);
+ static parent = ctRegex!(`([0-7]):([0-9]+)`);
/+ json +/
- static tailing_comma = ctRegex!(`,$`, "m");
+ 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|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)$`);
/+ bookindex split +/
- static bi_main_terms_split = ctRegex!(`\s*;\s*`);
- static bi_main_term_plus_rest_split = ctRegex!(`\s*:\s*`);
+ static bi_main_terms_split = ctRegex!(`\s*;\s*`);
+ static bi_main_term_plus_rest_split = ctRegex!(`\s*:\s*`);
static bi_sub_terms_plus_obj_cite_number_offset_split = ctRegex!(`\s*\|\s*`);
- static bi_term_and_obj_cite_numbers_match = ctRegex!(`^(.+?)\+(\d+)`);
+ static bi_term_and_obj_cite_numbers_match = ctRegex!(`^(.+?)\+(\d+)`);
}
}
diff --git a/views/version.txt b/views/version.txt
index 80a3477..5e919e9 100644
--- a/views/version.txt
+++ b/views/version.txt
@@ -4,4 +4,4 @@ struct Version {
int minor;
int patch;
}
-enum ver = Version(0, 9, 0);
+enum ver = Version(0, 9, 1);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 11:43:43 +0000