aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-08-10 06:23:36 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commitbdf20b225b1e8c5f5f37e9e9a2c52854c2789b03 (patch)
treeb70e9239aa4d99fcb52398b5a92bf81f459cff8d
parentconfig (& metadata) instruction tables (diff)
a couple of small fixes
-rw-r--r--org/default_regex.org2
-rw-r--r--org/meta_abstraction.org2
-rw-r--r--src/sdp/meta/metadoc_from_src.d2
-rw-r--r--src/sdp/meta/rgx.d2
4 files changed, 4 insertions, 4 deletions
diff --git a/org/default_regex.org b/org/default_regex.org
index f255bb6..a45f373 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -89,7 +89,7 @@ static comments = ctRegex!(`^%+ |^%+$`);
#+BEGIN_SRC d
/+ header +/
static make_simple_substitutions_rb = ctRegex!(`(?P<substitution>/(?P<match>.+?)/,[ ]*['"](?P<replace>.+?)['"])`);
-static make_simple_substitutions_d = ctRegex!(`(?P<substitution>``(?P<match>.+?)``,[ ]*['"](?P<replace>.+?)['"])`);
+static make_simple_substitutions_d = ctRegex!(`(?P<substitution>` ~ '`' ~ `(?P<match>.+?)` ~ '`' ~ `,[ ]*['"](?P<replace>.+?)['"])`);
#+END_SRC
** native headers
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index da74f39..63ac9ba 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -3704,7 +3704,7 @@ void _block_flag_line_empty_(B,N)(
comp_obj_poem_ocn.is_of = "block";
comp_obj_poem_ocn.is_a = "poem";
comp_obj_poem_ocn.ocn = obj_cite_digits.on;
- comp_obj_poem_ocn.obj_cite_number = (obj_cite_number_poem["start"], obj_cite_number_poem["end"]);
+ comp_obj_poem_ocn.obj_cite_number = (obj_cite_number_poem["start"] ~ "..." ~ obj_cite_number_poem["end"]);
comp_obj_poem_ocn.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; //
comp_obj_poem_ocn.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; //
comp_obj_poem_ocn.obj_cite_number_type = obj_cite_digits.type;
diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d
index e3cbe2d..5445333 100644
--- a/src/sdp/meta/metadoc_from_src.d
+++ b/src/sdp/meta/metadoc_from_src.d
@@ -2895,7 +2895,7 @@ template SiSUdocAbstraction() {
comp_obj_poem_ocn.is_of = "block";
comp_obj_poem_ocn.is_a = "poem";
comp_obj_poem_ocn.ocn = obj_cite_digits.on;
- comp_obj_poem_ocn.obj_cite_number = (obj_cite_number_poem["start"], obj_cite_number_poem["end"]);
+ comp_obj_poem_ocn.obj_cite_number = (obj_cite_number_poem["start"] ~ "..." ~ obj_cite_number_poem["end"]);
comp_obj_poem_ocn.obj_cite_number_off = (obj_cite_digits.off==0) ? "" : obj_cite_digits.off.to!string; //
comp_obj_poem_ocn.obj_cite_number_bkidx = (obj_cite_digits.bkidx==0) ? "" : obj_cite_digits.bkidx.to!string; //
comp_obj_poem_ocn.obj_cite_number_type = obj_cite_digits.type;
diff --git a/src/sdp/meta/rgx.d b/src/sdp/meta/rgx.d
index 135f923..90cf116 100644
--- a/src/sdp/meta/rgx.d
+++ b/src/sdp/meta/rgx.d
@@ -39,7 +39,7 @@ static template SiSUrgxInit() {
static comments = ctRegex!(`^%+ |^%+$`);
/+ header +/
static make_simple_substitutions_rb = ctRegex!(`(?P<substitution>/(?P<match>.+?)/,[ ]*['"](?P<replace>.+?)['"])`);
- static make_simple_substitutions_d = ctRegex!(`(?P<substitution>``(?P<match>.+?)``,[ ]*['"](?P<replace>.+?)['"])`);
+ static make_simple_substitutions_d = ctRegex!(`(?P<substitution>` ~ '`' ~ `(?P<match>.+?)` ~ '`' ~ `,[ ]*['"](?P<replace>.+?)['"])`);
/+ header +/
static main_headers =
ctRegex!(`^(?:creator|title|rights|date|original|classify|identifier|notes|publisher|make|links)$`, "m");