From 3e3a1a76ce4d0abe75277afb2937539fc0e9a4e6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 27 May 2019 23:35:01 -0400
Subject: remove ./data for now, else relatively minor

---
 org/default_paths.org | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'org/default_paths.org')

diff --git a/org/default_paths.org b/org/default_paths.org
index 26e28f5..eeed332 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -31,7 +31,9 @@ import std.array,
   std.regex,
   std.stdio,
   std.conv : to;
-import doc_reform.meta.rgx;
+import
+  doc_reform.meta.defaults,
+  doc_reform.meta.rgx;
 <<template_paths_src>>
 <<template_paths_pod>>
 <<template_paths_pod_shallow>>
@@ -113,7 +115,9 @@ pod
 #+BEGIN_SRC d
 template PathMatters() {
   mixin DocReformRgxInit;
-  static auto rgx = Rgx();
+  mixin InternalMarkup;
+  static auto rgx  = Rgx();
+  static auto mkup = InlineMarkup();
   auto PathMatters(O,E)(
     O        _opt_actions,
     E        _env,
@@ -206,7 +210,6 @@ template PathMatters() {
         string _fns = _fns; // required here by dmd & not by ldc (for D:2078)
         auto _opt_actions = _opt_actions;
         auto _env = _env;
-        string _sep = "␣";
         struct SRC_ {
           bool is_pod() {
             return (_manifest.pod_manifest_path.length > 0) ? true : false;
@@ -240,12 +243,12 @@ template PathMatters() {
             string _uid;
             if (is_pod && !(pod_name_with_path.empty)) {
               if (pod_name_with_path.baseName == filename_base) {
-                _uid = filename_base ~ "." ~ filename_extension ~ _sep ~ lng;
+                _uid = filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng;
               } else {
-                _uid = pod_name_with_path.baseName ~ _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng;
+                _uid = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng;
               }
             } else {
-              _uid = _sep ~ filename_base ~ "." ~ filename_extension ~ _sep ~ lng;
+              _uid = mkup.sep ~ filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng;
             }
             return _uid;
           }
@@ -259,18 +262,18 @@ template PathMatters() {
           +/
             string _fn;
             if (pod_name_with_path.baseName == filename_base) {
-              _fn = filename_base ~ _sep ~ filename_extension ~ _sep ~ lng;
+              _fn = filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng;
             } else if (!(pod_name_with_path.empty)) {
-              _fn = pod_name_with_path.baseName ~ _sep ~ filename_base ~ _sep ~ filename_extension ~ _sep ~ lng;
+              _fn = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng;
             } else {
-              _fn = "_" ~ _sep ~ filename_base ~ _sep ~ filename_extension ~ _sep ~ lng;
+              _fn = "_" ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng;
             }
             return _fn;
           }
           string docname_composite_unique_per_src_pod() {
           /+
             z pod name if any + src filename (without lng code)
-             filename ~ _sep ~ lng
+             filename ~ mkup.sep ~ lng
              * unique per src pod
              used by
              - pod (multilingual collection)
@@ -278,11 +281,11 @@ template PathMatters() {
           +/
             string _fn;
             if (pod_name_with_path.baseName == filename_base) {
-              _fn = filename_base ~ _sep ~ filename_extension;
+              _fn = filename_base ~ mkup.sep ~ filename_extension;
             } else if (!(pod_name_with_path.empty)) {
-              _fn = pod_name_with_path.baseName ~ _sep ~ filename_base ~ _sep ~ filename_extension;
+              _fn = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension;
             } else {
-              _fn = "_" ~ _sep ~ filename_base ~ _sep ~ filename_extension;
+              _fn = "_" ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension;
             }
             return _fn;
           }
-- 
cgit v1.2.3