link url matching

- smid: sisu markup identify
- inline_link_markup_regular matches series of
  marked up urls, e.g.
  { link txt }http://url, { link txt }http://url

4 files changed, 21 insertions, 21 deletions

diff --git a/src/sdp/output/epub3.d b/src/sdp/output/epub3.d
index 15e3d35..321ef9b 100644
--- a/src/sdp/output/epub3.d
+++ b/src/sdp/output/epub3.d
@@ -413,24 +413,24 @@ template outputEPub3() {
               switch (obj.is_a) {
               case "quote":
                 auto t = xhtml_format.quote_seg(obj, _txt, suffix);
-                doc_epub3[segment_filename] ~= to!string(t[0]);
+                doc_epub3[segment_filename] ~= t[0].to!string;
                 doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "group":
                 auto t = xhtml_format.group_seg(obj, _txt, suffix);
-                doc_epub3[segment_filename] ~= to!string(t[0]);
+                doc_epub3[segment_filename] ~= t[0].to!string;
                 doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "block":
                 auto t = xhtml_format.block_seg(obj, _txt, suffix);
-                doc_epub3[segment_filename] ~= to!string(t[0]);
+                doc_epub3[segment_filename] ~= t[0].to!string;
                 doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "poem":
                 break;
               case "verse":
                 auto t = xhtml_format.verse_seg(obj, _txt, suffix);
-                doc_epub3[segment_filename] ~= to!string(t[0]);
+                doc_epub3[segment_filename] ~= t[0].to!string;
                 doc_epub3_endnotes[segment_filename] ~= t[1];
                 break;
               case "code":
diff --git a/src/sdp/output/html.d b/src/sdp/output/html.d
index 10539a5..35e3027 100644
--- a/src/sdp/output/html.d
+++ b/src/sdp/output/html.d
@@ -241,13 +241,13 @@ template outputHTML() {
               doc_html[segment_filename] ~= top_level_heading;
             }
             auto t = xhtml_format.heading_seg(obj, _txt, suffix);
-            doc_html[segment_filename] ~= to!string(t[0]);
+            doc_html[segment_filename] ~= t[0].to!string;
             doc_html[segment_filename] ~= xhtml_format.lev4_heading_subtoc(obj);
             doc_html_endnotes[segment_filename] ~= t[1];
             break;
           case 5: .. case 7:
             auto t = xhtml_format.heading_seg(obj, _txt, suffix);
-            doc_html[segment_filename] ~= to!string(t[0]);
+            doc_html[segment_filename] ~= t[0].to!string;
             doc_html_endnotes[segment_filename] ~= t[1];
             break;
           case 8: .. case 9:
@@ -271,7 +271,7 @@ template outputHTML() {
               switch (obj.is_a) {
               case "toc":
                 auto t = xhtml_format.para_seg(obj, _txt, suffix);
-                doc_html[segment_filename] ~= to!string(t[0]);
+                doc_html[segment_filename] ~= t[0].to!string;
                 break;
               default:
                 if ((doc_matters.opt.action.debug_do)) {
@@ -293,7 +293,7 @@ template outputHTML() {
               switch (obj.is_a) {
               case "para":
                 auto t = xhtml_format.para_seg(obj, _txt, suffix);
-                doc_html[segment_filename] ~= to!string(t[0]);
+                doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               default:
@@ -307,24 +307,24 @@ template outputHTML() {
               switch (obj.is_a) {
               case "quote":
                 auto t = xhtml_format.quote_seg(obj, _txt, suffix);
-                doc_html[segment_filename] ~= to!string(t[0]);
+                doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "group":
                 auto t = xhtml_format.group_seg(obj, _txt, suffix);
-                doc_html[segment_filename] ~= to!string(t[0]);
+                doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "block":
                 auto t = xhtml_format.block_seg(obj, _txt, suffix);
-                doc_html[segment_filename] ~= to!string(t[0]);
+                doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "poem":
                 break;
               case "verse":
                 auto t = xhtml_format.verse_seg(obj, _txt, suffix);
-                doc_html[segment_filename] ~= to!string(t[0]);
+                doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "code":
diff --git a/src/sdp/output/rgx.d b/src/sdp/output/rgx.d
index 4bfa72a..0227902 100644
--- a/src/sdp/output/rgx.d
+++ b/src/sdp/output/rgx.d
@@ -96,7 +96,7 @@ static template SiSUoutputRgxInit() {
     static table_delimiter_col                           = ctRegex!("[ ]*[┊][ ]*", "mg");
     static table_delimiter_row                           = ctRegex!("[ ]*\n", "mg");
     static xhtml_ampersand                            = ctRegex!(`[&]`);      // &
-    static xhtml_quotation                            = ctRegex!(`[&]`);      // "
+    static xhtml_quotation                            = ctRegex!(`["]`);      // "
     static xhtml_less_than                            = ctRegex!(`[<]`);      // &lt;
     static xhtml_greater_than                         = ctRegex!(`[>]`);      // &gt;
     static xhtml_line_break                           = ctRegex!(` [\\]{2}`); // <br />
diff --git a/src/sdp/output/xmls.d b/src/sdp/output/xmls.d
index 58ae237..7dd6a60 100644
--- a/src/sdp/output/xmls.d
+++ b/src/sdp/output/xmls.d
@@ -444,10 +444,10 @@ template outputXHTMLs() {
       lev4_subtoc ~= "  <div class=\"nav\">\n";
       foreach (subtoc; obj.lev4_subtoc) {
         if (auto m = subtoc.match(rgx.inline_link_subtoc)) {
-          auto indent = to!string(m.captures[1]);
-          auto text = to!string(m.captures[2]);
+          auto indent = m.captures[1].to!string;
+          auto text = m.captures[2].to!string;
           text = font_face(text);
-          auto link = to!string(m.captures[3]);
+          auto link = m.captures[3].to!string;
           lev4_subtoc ~= subtoc.replaceFirst(rgx.inline_link_subtoc,
             format(q"¶    <p class="minitoc" indent="h%si%s">
           <a href="%s">%s</a>
@@ -670,7 +670,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
     ) {
       auto t = inline_markup_seg(obj, _txt, _suffix);
-      _txt = to!string(t[0]);
+      _txt = t[0].to!string;
       string[] _endnotes = t[1];
       string o = para(obj, _txt);
       auto u = tuple(
@@ -726,7 +726,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
     ) {
       auto t = inline_markup_seg(obj, _txt, _suffix);
-      _txt = to!string(t[0]);
+      _txt = t[0].to!string;
       string[] _endnotes = t[1];
       string o = quote(obj, _txt);
       auto u = tuple(
@@ -782,7 +782,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
     ) {
       auto t = inline_markup_seg(obj, _txt, _suffix);
-      _txt = to!string(t[0]);
+      _txt = t[0].to!string;
       string[] _endnotes = t[1];
       string o = group(obj, _txt);
       auto u = tuple(
@@ -834,7 +834,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
     ) {
       auto t = inline_markup_seg(obj, _txt, _suffix);
-      _txt = to!string(t[0]);
+      _txt = t[0].to!string;
       string[] _endnotes = t[1];
       string o = block(obj, _txt);
       auto u = tuple(
@@ -886,7 +886,7 @@ template outputXHTMLs() {
       string                     _suffix = ".html",
     ) {
       auto t = inline_markup_seg(obj, _txt, _suffix);
-      _txt = to!string(t[0]);
+      _txt = t[0].to!string;
       string[] _endnotes = t[1];
       string o = verse(obj, _txt);
       auto u = tuple(