From 2660db249780e6ec90bf63c43bc1e85785a88cf3 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 30 Apr 2019 19:22:32 -0400 Subject: regex, meta_abstraction, naming of some regex submatches --- src/doc_reform/output/rgx.d | 22 +++++++++++----------- src/doc_reform/output/xmls.d | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/doc_reform/output') diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d index 2ddc57f..7c1247a 100644 --- a/src/doc_reform/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -72,7 +72,7 @@ static template DocReformOutputRgxInit() { static inline_image_info = ctRegex!(`☼?(?P[a-zA-Z0-9._-]+?\.(?:jpg|gif|png)),w(?P\d+)h(?P\d+)`, "mg"); static inline_link_anchor = ctRegex!(`┃(?P\S+?)┃`, "mg"); // TODO *~text_link_anchor static inline_link_ = ctRegex!(`┥(?P.+?)┝┤(?P.+?)├`, "mg"); - static inline_link = ctRegex!(`┥(?P.+?)┝┤(?P\S+?)├`, "mg"); + static inline_link = ctRegex!(`┥(?P.+?)┝┤(?P#?(\S+?))├`, "mg"); static inline_link_empty = ctRegex!(`┥(?P.+?)┝┤├`, "mg"); static inline_link_number = ctRegex!(`┥(?P.+?)┝┤(?P[0-9]+)├`, "mg"); // not used static inline_link_number_only = ctRegex!(`(┥.+?┝)┤(?P[0-9]+)├`, "mg"); @@ -92,16 +92,16 @@ static template DocReformOutputRgxInit() { /+ inline markup font face mod +/ static inline_mark_faces = ctRegex!(`(?P(?P[*!/_^,+#"-])\{(?P.+?)\}[*!/_^,+#"-])`, "mg"); static inline_mark_faces_to_mod = ctRegex!(`(?P[*!/_^,+#"-])\{(?P.+?)\}([*!/_^,+#"-])`, "mg"); - static inline_mark_emphasis = ctRegex!(`([*])\{(?P.+?)\}[*]`, "mg"); - static inline_mark_bold = ctRegex!(`([!])\{(?P.+?)\}[!]`, "mg"); - static inline_mark_underscore = ctRegex!(`([_])\{(?P.+?)\}[_]`, "mg"); - static inline_mark_italics = ctRegex!(`([/])\{(?P.+?)\}[/]`, "mg"); - static inline_mark_superscript = ctRegex!(`(\^)\{(?P.+?)\}\^`, "mg"); - static inline_mark_subscript = ctRegex!(`([,])\{(?P.+?)\}[,]`, "mg"); - static inline_mark_strike = ctRegex!(`([-])\{(?P.+?)\}[-]`, "mg"); - static inline_mark_insert = ctRegex!(`([+])\{(?P.+?)\}[+]`, "mg"); - static inline_mark_mono = ctRegex!(`([#])\{(?P.+?)\}[#]`, "mg"); - static inline_mark_cite = ctRegex!(`(["])\{(?P.+?)\}["]`, "mg"); + static inline_mark_emphasis = ctRegex!(`(?P[*])\{(?P.+?)\}[*]`, "mg"); + static inline_mark_bold = ctRegex!(`(?P[!])\{(?P.+?)\}[!]`, "mg"); + static inline_mark_underscore = ctRegex!(`(?P[_])\{(?P.+?)\}[_]`, "mg"); + static inline_mark_italics = ctRegex!(`(?P[/])\{(?P.+?)\}[/]`, "mg"); + static inline_mark_superscript = ctRegex!(`(?P\^)\{(?P.+?)\}\^`, "mg"); + static inline_mark_subscript = ctRegex!(`(?P[,])\{(?P.+?)\}[,]`, "mg"); + static inline_mark_strike = ctRegex!(`(?P[-])\{(?P.+?)\}[-]`, "mg"); + static inline_mark_insert = ctRegex!(`(?P[+])\{(?P.+?)\}[+]`, "mg"); + static inline_mark_mono = ctRegex!(`(?P[#])\{(?P.+?)\}[#]`, "mg"); + static inline_mark_cite = ctRegex!(`(?P["])\{(?P.+?)\}["]`, "mg"); static inline_mark_fontface_clean = ctRegex!(`[*!_/^,+#■"-]\{|\}[*!_/^,+#■"-]`, "mg"); static inline_faces_line = ctRegex!(`^[*!/_]_ (?P.+?)((?: [\\]{2}|[~]#){0,2}$)`); static inline_emphasis_line = ctRegex!(`^\*_ (?P.+?)(?P(?: [\\]{2}|[~]#){0,2}$)`); diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index ffcbd1a..e494bab 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -356,7 +356,7 @@ template outputXHTMLs() { if (obj.has.inline_links) { if (obj.metainfo.is_a != "code") { _txt = replaceAll!(m => - m[1] ~ "┤" ~ to!string((obj.stow.link[m[2].to!ulong])).encode ~ "├" + m[1] ~ "┤" ~ to!string((obj.stow.link[m["num"].to!ulong])).encode ~ "├" )(_txt, rgx.inline_link_number_only); } if ((_txt.match(rgx.mark_internal_site_lnk)) -- cgit v1.2.3