aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/default_misc.org2
-rw-r--r--org/ocda.org30
-rw-r--r--src/doc_reform/io_out/defaults.d2
-rw-r--r--src/doc_reform/meta/defaults.d2
-rw-r--r--src/doc_reform/meta/metadoc_from_src.d30
5 files changed, 33 insertions, 33 deletions
diff --git a/org/default_misc.org b/org/default_misc.org
index 2442c78..0359668 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -225,7 +225,7 @@ template InternalMarkup() {
string en_a_o = "【"; string en_a_c = "】";
string en_b_o = "〖"; string en_b_c = "〗";
string quote_o = "“"; string quote_c = "”";
- string ff_o = "┨"; string ff_c = "┣"; // fontface
+ string ff_i = "⑆"; string ff_o = "┨"; string ff_c = "┣"; // fontface
string lnk_o = "┥"; string lnk_c = "┝";
string url_o = "┤"; string url_c = "├";
string emph = "*";
diff --git a/org/ocda.org b/org/ocda.org
index 8c6a06c..94960ea 100644
--- a/org/ocda.org
+++ b/org/ocda.org
@@ -628,10 +628,10 @@ enum DomTags { none, open, close, close_and_open, open_still, }
static auto rgx = RgxI();
static auto mkup = InlineMarkup();
line = replaceAll!(m => mkup.quote_o ~ m[1] ~ mkup.quote_c)(line, rgx.within_quotes);
- line = replaceAll!(m => "⑆" ~ mkup.mono ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.mono)(line, rgx.inline_mark_mono);
- line = replaceAll!(m => "⑆" ~ mkup.cite ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.cite)(line, rgx.inline_mark_cite);
+ line = replaceAll!(m => mkup.ff_i ~ mkup.mono ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.mono)(line, rgx.inline_mark_mono);
+ line = replaceAll!(m => mkup.ff_i ~ mkup.cite ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.cite)(line, rgx.inline_mark_cite);
foreach (regx; [rgx.inline_mark_emphasis, rgx.inline_mark_bold, rgx.inline_mark_underscore, rgx.inline_mark_italics, rgx.inline_mark_superscript, rgx.inline_mark_subscript, rgx.inline_mark_strike, rgx.inline_mark_insert]) {
- line = replaceAll!(m => "⑆" ~ m["mark"] ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ m["mark"])(line, regx);
+ line = replaceAll!(m => mkup.ff_i ~ m["mark"] ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ m["mark"])(line, regx);
}
return line;
}
@@ -1943,7 +1943,7 @@ if (biblio_ordered.length > 0) {
out_ = format("%s \"%s\"%s%s%s%s%s%s%s%s%s.",
((entry["author"].str.empty) ? entry["editor"].str : entry["author"].str),
entry["fulltitle"].str,
- ((entry["journal"].str.empty) ? "" : ", " ~ mkup.italic ~ mkup.ff_o ~ entry["journal"].str ~ mkup.ff_c ~ mkup.italic),
+ ((entry["journal"].str.empty) ? "" : ", " ~ mkup.ff_i ~ mkup.italic ~ mkup.ff_o ~ entry["journal"].str ~ mkup.ff_c ~ mkup.italic),
((entry["volume"].str.empty) ? "" : ", " ~ entry["volume"].str),
((entry["in"].str.empty) ? "" : ", " ~ entry["in"].str),
((!(entry["author"].str.empty) && (!(entry["editor"].str.empty))) ? entry["editor"].str : ""),
@@ -5406,16 +5406,16 @@ if (pith["block_is"] == eN.blk_is.quote) {
textline = textline
.replaceFirst(rgx.inline_emphasis_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.emph, mkup.ff_o, "$1", mkup.ff_c, mkup.emph, "$2"))
+ mkup.ff_i, mkup.emph, mkup.ff_o, "$1", mkup.ff_c, mkup.emph, "$2"))
.replaceFirst(rgx.inline_bold_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.bold, mkup.ff_o, "$1", mkup.ff_c, mkup.bold, "$2"))
+ mkup.ff_i, mkup.bold, mkup.ff_o, "$1", mkup.ff_c, mkup.bold, "$2"))
.replaceFirst(rgx.inline_underscore_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.underscore, mkup.ff_o, "$1", mkup.ff_c, mkup.underscore, "$2"))
+ mkup.ff_i, mkup.underscore, mkup.ff_o, "$1", mkup.ff_c, mkup.underscore, "$2"))
.replaceFirst(rgx.inline_italics_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.italic, mkup.ff_o, "$1", mkup.ff_c, mkup.italic, "$2"));
+ mkup.ff_i, mkup.italic, mkup.ff_o, "$1", mkup.ff_c, mkup.italic, "$2"));
}
return textline;
}
@@ -7046,7 +7046,7 @@ struct BookIndexReportSection {
string[dchar] transTable = [' ' : "_"];
foreach (mainkey; mainkeys) {
bi_tmp_tags = [""];
- bi_tmp = "⑆" ~ mkup.bold ~ mkup.ff_o ~ mainkey ~ mkup.ff_c ~ mkup.bold ~ " ";
+ bi_tmp = mkup.ff_i ~ mkup.bold ~ mkup.ff_o ~ mainkey ~ mkup.ff_c ~ mkup.bold ~ " ";
buffer.clear();
bi_tmp_tags ~= translate(mainkey, transTable);
auto bkidx_lnk(string locs) {
@@ -7168,7 +7168,7 @@ struct NotesSection {
) {
debug(endnotes_build) {
writeln(
- "{^", mkup.ff_o, m["char"], ".", mkup.ff_c, "^}"
+ "{", mkup.ff_i, mkup.superscript, mkup.ff_o, m["char"], ".", mkup.ff_c, mkup.superscript, "}"
~ mkup.mark_internal_site_lnk,
tag_in_seg["seg_lv4"],
".fnSuffix#noteref_\n ", m["char"], " ",
@@ -7178,12 +7178,12 @@ struct NotesSection {
object_notes["anchor"] ~= "note_" ~ m["char"] ~ "』";
object_notes["notes"] ~= (tag_in_seg["seg_lv4"].empty)
? (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
~ m["char"]) ~ " "
~ m["note"] ~ "』"
)
: (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
~ mkup.mark_internal_site_lnk
~ tag_in_seg["seg_lv4"]
~ ".fnSuffix#noteref_"
@@ -7197,7 +7197,7 @@ struct NotesSection {
) {
debug(endnotes_build) {
writeln(
- "{^", mkup.ff_o, m["num"], ".", mkup.ff_c, "^}"
+ "{", mkup.ff_i, mkup.superscipt, mkup.ff_o, m["num"], ".", mkup.ff_c, "^}"
~ mkup.mark_internal_site_lnk,
tag_in_seg["seg_lv4"],
".fnSuffix#noteref_\n ", m["num"], " ",
@@ -7207,12 +7207,12 @@ struct NotesSection {
object_notes["anchor"] ~= "note_" ~ m["num"] ~ "』";
object_notes["notes"] ~= (tag_in_seg["seg_lv4"].empty)
? (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
~ m["num"]) ~ " "
~ m["note"] ~ "』"
)
: (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
~ mkup.mark_internal_site_lnk
~ tag_in_seg["seg_lv4"]
~ ".fnSuffix#noteref_"
diff --git a/src/doc_reform/io_out/defaults.d b/src/doc_reform/io_out/defaults.d
index 3e33edc..2ee19cb 100644
--- a/src/doc_reform/io_out/defaults.d
+++ b/src/doc_reform/io_out/defaults.d
@@ -58,7 +58,7 @@ template InternalMarkup() {
string en_a_o = "【"; string en_a_c = "】";
string en_b_o = "〖"; string en_b_c = "〗";
string quote_o = "“"; string quote_c = "”";
- string ff_o = "┨"; string ff_c = "┣"; // fontface
+ string ff_i = "⑆"; string ff_o = "┨"; string ff_c = "┣"; // fontface
string lnk_o = "┥"; string lnk_c = "┝";
string url_o = "┤"; string url_c = "├";
string emph = "*";
diff --git a/src/doc_reform/meta/defaults.d b/src/doc_reform/meta/defaults.d
index f6b4d20..575f966 100644
--- a/src/doc_reform/meta/defaults.d
+++ b/src/doc_reform/meta/defaults.d
@@ -169,7 +169,7 @@ template InternalMarkup() {
string en_a_o = "【"; string en_a_c = "】";
string en_b_o = "〖"; string en_b_c = "〗";
string quote_o = "“"; string quote_c = "”";
- string ff_o = "┨"; string ff_c = "┣"; // fontface
+ string ff_i = "⑆"; string ff_o = "┨"; string ff_c = "┣"; // fontface
string lnk_o = "┥"; string lnk_c = "┝";
string url_o = "┤"; string url_c = "├";
string emph = "*";
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 164a0dd..3d8a61d 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -356,10 +356,10 @@ template docAbstraction() {
static auto rgx = RgxI();
static auto mkup = InlineMarkup();
line = replaceAll!(m => mkup.quote_o ~ m[1] ~ mkup.quote_c)(line, rgx.within_quotes);
- line = replaceAll!(m => "⑆" ~ mkup.mono ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.mono)(line, rgx.inline_mark_mono);
- line = replaceAll!(m => "⑆" ~ mkup.cite ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.cite)(line, rgx.inline_mark_cite);
+ line = replaceAll!(m => mkup.ff_i ~ mkup.mono ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.mono)(line, rgx.inline_mark_mono);
+ line = replaceAll!(m => mkup.ff_i ~ mkup.cite ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ mkup.cite)(line, rgx.inline_mark_cite);
foreach (regx; [rgx.inline_mark_emphasis, rgx.inline_mark_bold, rgx.inline_mark_underscore, rgx.inline_mark_italics, rgx.inline_mark_superscript, rgx.inline_mark_subscript, rgx.inline_mark_strike, rgx.inline_mark_insert]) {
- line = replaceAll!(m => "⑆" ~ m["mark"] ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ m["mark"])(line, regx);
+ line = replaceAll!(m => mkup.ff_i ~ m["mark"] ~ mkup.ff_o ~ m["text"] ~ mkup.ff_c ~ m["mark"])(line, regx);
}
return line;
}
@@ -1436,7 +1436,7 @@ template docAbstraction() {
out_ = format("%s \"%s\"%s%s%s%s%s%s%s%s%s.",
((entry["author"].str.empty) ? entry["editor"].str : entry["author"].str),
entry["fulltitle"].str,
- ((entry["journal"].str.empty) ? "" : ", " ~ mkup.italic ~ mkup.ff_o ~ entry["journal"].str ~ mkup.ff_c ~ mkup.italic),
+ ((entry["journal"].str.empty) ? "" : ", " ~ mkup.ff_i ~ mkup.italic ~ mkup.ff_o ~ entry["journal"].str ~ mkup.ff_c ~ mkup.italic),
((entry["volume"].str.empty) ? "" : ", " ~ entry["volume"].str),
((entry["in"].str.empty) ? "" : ", " ~ entry["in"].str),
((!(entry["author"].str.empty) && (!(entry["editor"].str.empty))) ? entry["editor"].str : ""),
@@ -4263,16 +4263,16 @@ template docAbstraction() {
textline = textline
.replaceFirst(rgx.inline_emphasis_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.emph, mkup.ff_o, "$1", mkup.ff_c, mkup.emph, "$2"))
+ mkup.ff_i, mkup.emph, mkup.ff_o, "$1", mkup.ff_c, mkup.emph, "$2"))
.replaceFirst(rgx.inline_bold_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.bold, mkup.ff_o, "$1", mkup.ff_c, mkup.bold, "$2"))
+ mkup.ff_i, mkup.bold, mkup.ff_o, "$1", mkup.ff_c, mkup.bold, "$2"))
.replaceFirst(rgx.inline_underscore_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.underscore, mkup.ff_o, "$1", mkup.ff_c, mkup.underscore, "$2"))
+ mkup.ff_i, mkup.underscore, mkup.ff_o, "$1", mkup.ff_c, mkup.underscore, "$2"))
.replaceFirst(rgx.inline_italics_line,
format(q"┃%s%s%s%s%s%s%s┃",
- "⑆", mkup.italic, mkup.ff_o, "$1", mkup.ff_c, mkup.italic, "$2"));
+ mkup.ff_i, mkup.italic, mkup.ff_o, "$1", mkup.ff_c, mkup.italic, "$2"));
}
return textline;
}
@@ -5543,7 +5543,7 @@ template docAbstraction() {
string[dchar] transTable = [' ' : "_"];
foreach (mainkey; mainkeys) {
bi_tmp_tags = [""];
- bi_tmp = "⑆" ~ mkup.bold ~ mkup.ff_o ~ mainkey ~ mkup.ff_c ~ mkup.bold ~ " ";
+ bi_tmp = mkup.ff_i ~ mkup.bold ~ mkup.ff_o ~ mainkey ~ mkup.ff_c ~ mkup.bold ~ " ";
buffer.clear();
bi_tmp_tags ~= translate(mainkey, transTable);
auto bkidx_lnk(string locs) {
@@ -5648,7 +5648,7 @@ template docAbstraction() {
) {
debug(endnotes_build) {
writeln(
- "{^", mkup.ff_o, m["char"], ".", mkup.ff_c, "^}"
+ "{", mkup.ff_i, mkup.superscript, mkup.ff_o, m["char"], ".", mkup.ff_c, mkup.superscript, "}"
~ mkup.mark_internal_site_lnk,
tag_in_seg["seg_lv4"],
".fnSuffix#noteref_\n ", m["char"], " ",
@@ -5658,12 +5658,12 @@ template docAbstraction() {
object_notes["anchor"] ~= "note_" ~ m["char"] ~ "』";
object_notes["notes"] ~= (tag_in_seg["seg_lv4"].empty)
? (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
~ m["char"]) ~ " "
~ m["note"] ~ "』"
)
: (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
~ mkup.mark_internal_site_lnk
~ tag_in_seg["seg_lv4"]
~ ".fnSuffix#noteref_"
@@ -5677,7 +5677,7 @@ template docAbstraction() {
) {
debug(endnotes_build) {
writeln(
- "{^", mkup.ff_o, m["num"], ".", mkup.ff_c, "^}"
+ "{", mkup.ff_i, mkup.superscipt, mkup.ff_o, m["num"], ".", mkup.ff_c, "^}"
~ mkup.mark_internal_site_lnk,
tag_in_seg["seg_lv4"],
".fnSuffix#noteref_\n ", m["num"], " ",
@@ -5687,12 +5687,12 @@ template docAbstraction() {
object_notes["anchor"] ~= "note_" ~ m["num"] ~ "』";
object_notes["notes"] ~= (tag_in_seg["seg_lv4"].empty)
? (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_"
~ m["num"]) ~ " "
~ m["note"] ~ "』"
)
: (links_and_images(
- "{" ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
+ "{" ~ mkup.ff_i ~ mkup.superscript ~ mkup.ff_o ~ m["num"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}"
~ mkup.mark_internal_site_lnk
~ tag_in_seg["seg_lv4"]
~ ".fnSuffix#noteref_"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:55:29 +0000