diff options
Diffstat (limited to 'org/ocda.org')
| -rw-r--r-- | org/ocda.org | 30 | 
1 files changed, 15 insertions, 15 deletions
| 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_" | 
