From d18c6be61b70598e9c605db92103bf4e1054f15e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Jun 2017 17:46:46 -0400
Subject: headings & toc, monospace and links, fix

---
 org/ao_doc_abstraction.org | 7 ++++++-
 org/default_misc.org       | 1 +
 org/default_regex.org      | 1 +
 org/output_xmls.org        | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'org')

diff --git a/org/ao_doc_abstraction.org b/org/ao_doc_abstraction.org
index a81e658..6a807a2 100644
--- a/org/ao_doc_abstraction.org
+++ b/org/ao_doc_abstraction.org
@@ -4409,6 +4409,8 @@ struct ObjInlineMarkupMunge {
     debug(asserts) {
       static assert(is(typeof(obj_txt_in) == string));
     }
+    auto mng = InlineMarkup();
+    obj_txt_in = obj_txt_in.replaceAll(rgx.inline_mono, (mng.mono ~ "{$1}" ~ mng.mono));
     /+ url matched +/
     if (obj_txt_in.match(rgx.inline_url_generic)) {
       /+ link: naked url: http://url +/
@@ -4457,6 +4459,7 @@ struct ObjInlineMarkupMunge {
         );
       }
     }
+    obj_txt_in = obj_txt_in.replaceAll(rgx.inline_mono_box, ("#{$1}#"));
     return obj_txt_in;
   }
 #+END_SRC
@@ -5064,7 +5067,9 @@ struct ObjInlineMarkup {
         _anchor_tag,
       );
       lev4_subtoc[segment_anchor_tag_that_object_belongs_to]
-      ~= obj_["lev_markup_number"] ~ "~ " ~ subtoc_txt_.to!string.strip;
+      ~= munge.url_links(obj_["lev_markup_number"]
+           ~ "~ " ~ subtoc_txt_.to!string.strip
+         );
       toc_txt_= munge.url_links(toc_txt_);
       indent=[
         "hang_position" : obj_["lev_markup_number"].to!int,
diff --git a/org/default_misc.org b/org/default_misc.org
index 5bbaa43..b87a1f3 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -597,6 +597,7 @@ template InternalMarkup() {
     auto tc_o = "┏";
     auto tc_c = "┚";
     auto tc_p = "┆";
+    auto mono = "■";
     string indent_by_spaces_provided(int indent, string _indent_spaces ="░░") {
       _indent_spaces = replicate(_indent_spaces, indent);
       return _indent_spaces;
diff --git a/org/default_regex.org b/org/default_regex.org
index f2e4105..dc9c4ab 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -461,6 +461,7 @@ static inline_subscript                               = ctRegex!(`,\{(?P<text>.+
 static inline_strike                                  = ctRegex!(`-\{(?P<text>.+?)\}-`, "mg");
 static inline_insert                                  = ctRegex!(`\+\{(?P<text>.+?)\}\+`, "mg");
 static inline_mono                                    = ctRegex!(`#\{(?P<text>.+?)\}#`, "mg");
+static inline_mono_box                                = ctRegex!(`■\{(?P<text>.+?)\}■`, "mg");
 static inline_cite                                    = ctRegex!(`"\{(?P<text>.+?)\}"`, "mg");
 static inline_faces_line                              = ctRegex!(`^[*!/_]_ (?P<text>.+?)((?: [\\]{2}|[~]#){0,2}$)`);
 static inline_emphasis_line                           = ctRegex!(`^\*_ (?P<text>.+?)((?: [\\]{2}|[~]#){0,2}$)`);
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 328872c..c402a43 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -472,6 +472,7 @@ auto heading(O)(
   || (obj.heading_lev_markup == 0 || obj.heading_lev_markup > 4)) {
     _horizontal_rule = "";
   }
+  _txt = font_face(_txt);
   string o;
   if (obj.obj_cite_number.empty) {
     o = format(q"¶%s
-- 
cgit v1.2.3