diff options
Diffstat (limited to 'src/doc_reform/meta')
| -rw-r--r-- | src/doc_reform/meta/metadoc_from_src.d | 10 | ||||
| -rw-r--r-- | src/doc_reform/meta/rgx.d | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 5df5e87..2dfd746 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -712,13 +712,9 @@ template DocReformDocAbstraction() { /+ within block object: block +/ line = line._doc_header_and_make_substitutions_(conf_make_meta); line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta); - if (auto m = line.match(rgx.spaces_line_start)) { + if (auto m = line.match(rgx.spaces_keep)) { line = line - .replaceAll(rgx.spaces_line_start, (m.captures[1]).translate([ ' ' : mkup.nbsp ])); - } - if (auto m = line.match(rgx.spaces_multiple)) { - line = line - .replaceAll(rgx.spaces_multiple, (m.captures[1]).translate([ ' ' : mkup.nbsp ])); + .replaceAll(rgx.spaces_keep, (m.captures[1]).translate([ ' ' : mkup.nbsp ])); } line._block_block_(an_object, obj_type_status); continue; @@ -1743,7 +1739,7 @@ template DocReformDocAbstraction() { obj.stow.link ~= obj.text.matchFirst(rgx.inline_link_stow_uri)[2]; obj.text = obj.text.replaceFirst( rgx.inline_link_stow_uri, - format(q"¶┥%s┝┤%s├¶", "$1", i) + format(q"┋┥%s┝┤%s├┋", "$1", i) ); } } diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d index dcfc245..df294e8 100644 --- a/src/doc_reform/meta/rgx.d +++ b/src/doc_reform/meta/rgx.d @@ -200,6 +200,7 @@ static template DocReformRgxInit() { static newline = ctRegex!("\n", "mg"); static strip_br = ctRegex!("^<br>\n|<br>\n*$"); static space = ctRegex!(`[ ]`, "mg"); + static spaces_keep = ctRegex!(`(?P<keep_spaces>^[ ]+|[ ]{2,})`, "mg"); // code, verse, block static spaces_line_start = ctRegex!(`^(?P<opening_spaces>[ ]+)`, "mg"); static spaces_multiple = ctRegex!(`(?P<multiple_spaces>[ ]{2,})`, "mg"); static two_spaces = ctRegex!(`[ ]{2}`, "mg"); @@ -269,7 +270,7 @@ static template DocReformRgxInit() { static inline_seg_link = ctRegex!(`(¤)(?:.+?)\.fnSuffix`, "mg"); static mark_internal_site_lnk = ctRegex!(`¤`, "mg"); static quotation_mark_sql_insert_delimiter = ctRegex!("[']", "mg"); - static quotation_mark_various = ctRegex!(q"¶['‘’“”"`´¨]¶", "mg"); + static quotation_mark_various = ctRegex!(q"┋['‘’“”"`´¨]┋", "mg"); /+ inline markup font face mod +/ static inline_faces = ctRegex!(`(?P<markup>(?P<mod>[*!_^,+#-])\{(?P<text>.+?)\}[*!_^,+#-])`, "mg"); static inline_emphasis = ctRegex!(`\*\{(?P<text>.+?)\}\*`, "mg"); |