From ca57754c411a97cf9b09cd74473099451bcf1248 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sun, 5 May 2019 12:25:22 -0400
Subject: url encoding

---
 src/doc_reform/output/rgx.d  | 1 +
 src/doc_reform/output/xmls.d | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/doc_reform/output')

diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d
index 7c1247a..c9e9516 100644
--- a/src/doc_reform/output/rgx.d
+++ b/src/doc_reform/output/rgx.d
@@ -82,6 +82,7 @@ static template DocReformOutputRgxInit() {
     static inline_a_url                                   = ctRegex!(`(┤)([^\s┥┝┤├]+)(├)`, "mg");
     static url                                            = ctRegex!(`https?://`, "mg");
     static uri                                            = ctRegex!(`(?:https?|git)://`, "mg");
+    static uri_identify_components                        = ctRegex!(`(?P<type>(?:https?|git)://)(?P<path>\S+?/)(?P<file>[^/]+)$`, "mg");
     static inline_link_subtoc                             = ctRegex!(`^(?P<level>[5-7])~ ┥(?P<text>.+?)┝┤(?P<link>.+?)├`, "mg");
     static fn_suffix                                      = ctRegex!(`\.fnSuffix`, "mg");
     static inline_link_fn_suffix                          = ctRegex!(`¤(.+?)(\.fnSuffix)`, "mg");
diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d
index e494bab..f27b0f4 100644
--- a/src/doc_reform/output/xmls.d
+++ b/src/doc_reform/output/xmls.d
@@ -356,7 +356,11 @@ template outputXHTMLs() {
       if (obj.has.inline_links) {
         if  (obj.metainfo.is_a != "code") {
           _txt = replaceAll!(m =>
-              m[1] ~ "┤" ~ to!string((obj.stow.link[m["num"].to!ulong])).encode ~ "├"
+              m[1] ~ "┤"
+              ~ (replaceAll!(n =>
+                  n["type"] ~ n["path"] ~ (n["file"].encodeComponent)
+                )((obj.stow.link[m["num"].to!ulong]).to!string, rgx.uri_identify_components))
+              ~ "├"
             )(_txt, rgx.inline_link_number_only);
         }
         if ((_txt.match(rgx.mark_internal_site_lnk))
-- 
cgit v1.2.3