diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2019-01-13 14:19:04 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2019-05-17 16:59:38 -0400 |
| commit | 87d62f48d6c8a2ccf9807f56c23a6ca71d1102e6 (patch) | |
| tree | e367aff1a05f89104c7c81ac8a6c618a4f38b021 /src/doc_reform/output/rgx.d | |
| parent | 0.4.2 xmls output, internal (diff) | |
0.4.3 stow (most) uri/links in array, separate from object text
- munge independently
- no need to consider special munging of uri with text
- uri can easily be munged independently (encoded as need be)
Diffstat (limited to 'src/doc_reform/output/rgx.d')
| -rw-r--r-- | src/doc_reform/output/rgx.d | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d index 0bcb2b6..bfd2a4e 100644 --- a/src/doc_reform/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -65,9 +65,11 @@ static template DocReformOutputRgxInit() { static inline_image_without_dimensions = ctRegex!(`(?P<pre>┥)☼(?P<imginf>(?P<img>\S+?\.(?:jpg|gif|png)),w(?P<width>0)h(?P<height>0))\s*(?P<post>.*?┝┤.+?├)`, "mg"); static inline_link_anchor = ctRegex!(`┋(?P<anchor>\S+?)┋`, "mg"); static inline_link = ctRegex!(`┥(?P<text>.+?)┝┤(?P<link>\S+?)├`, "mg"); + static inline_link_number_only = ctRegex!(`(┥.+?┝)┤(?P<num>[0-9]+)├`, "mg"); + static inline_link_stow_uri = ctRegex!(`┥(?P<text>.+?)┝┤(?P<link>[^ 0-9#┥┝┤├][^ 0-9┥┝┤├]+)├`, "mg"); // will not stow (stowed links) or object number internal links static inline_link_hash = ctRegex!(`┥(?P<text>.+?)┝┤(?P<link>#(?P<segname>\S+?))├`, "mg"); static inline_link_clean = ctRegex!(`┤(?:.+?)├|[┥┝]`, "mg"); - static inline_a_url = ctRegex!(`(┤)(\S+?)(├)`, "mg"); + static inline_a_url = ctRegex!(`(┤)([^\s┥┝┤├]+)(├)`, "mg"); static url = ctRegex!(`https?://`, "mg"); static inline_link_subtoc = ctRegex!(`^(?P<level>[5-7])~ ┥(?P<text>.+?)┝┤(?P<link>.+?)├`, "mg"); static fn_suffix = ctRegex!(`\.fnSuffix`, "mg"); |