diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/default_misc.org | 3 | ||||
| -rw-r--r-- | org/default_paths.org | 22 | ||||
| -rw-r--r-- | org/default_regex.org | 1 |
3 files changed, 14 insertions, 12 deletions
diff --git a/org/default_misc.org b/org/default_misc.org index d96e2bb..ab7033f 100644 --- a/org/default_misc.org +++ b/org/default_misc.org @@ -291,7 +291,8 @@ template InternalMarkup() { string tc_c = "┚"; string tc_p = "┆"; string img = "☼"; - string sep = "␣"; // "~"; + string sep = "␣"; // "~";"␣"; // "~"; + string uid_sep = ":"; string on_o = "「"; string on_c = "」"; string mk_bullet = "● "; static string indent_by_spaces_provided(int indent, string _indent_spaces ="░░") { diff --git a/org/default_paths.org b/org/default_paths.org index 3af1019..6db48af 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -246,12 +246,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 ~ mkup.sep ~ lng; + _uid = filename_base ~ "." ~ filename_extension ~ mkup.uid_sep ~ lng; } else { - _uid = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng; + _uid = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ "." ~ filename_extension ~ mkup.uid_sep ~ lng; } } else { - _uid = mkup.sep ~ filename_base ~ "." ~ filename_extension ~ mkup.sep ~ lng; + _uid = mkup.uid_sep ~ filename_base ~ "." ~ filename_extension ~ mkup.uid_sep ~ lng; } return _uid; } @@ -261,7 +261,7 @@ template PathMatters() { if (pod_name_with_path.baseName == filename_base) { _uid = filename_base ~ "." ~ lng; } else { - _uid = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ "." ~ lng; + _uid = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ "." ~ lng; } } else { _uid = "_" ~ filename_base ~ "." ~ lng; @@ -271,18 +271,18 @@ template PathMatters() { @safe string docname_composite_unique_per_src_doc() { string _fn; if (pod_name_with_path.baseName == filename_base) { - _fn = filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng; + _fn = filename_base ~ mkup.uid_sep ~ filename_extension ~ mkup.uid_sep ~ lng; } else if (!(pod_name_with_path.empty)) { - _fn = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng; + _fn = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension ~ mkup.uid_sep ~ lng; } else { - _fn = "_" ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension ~ mkup.sep ~ lng; + _fn = "_" ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension ~ mkup.uid_sep ~ lng; } return _fn; } @safe string docname_composite_unique_per_src_pod() { /+ z pod name if any + src filename (without lng code) - filename ~ mkup.sep ~ lng + filename ~ mkup.uid_sep ~ lng * unique per src pod used by - pod (multilingual collection) @@ -290,11 +290,11 @@ template PathMatters() { +/ string _fn; if (pod_name_with_path.baseName == filename_base) { - _fn = filename_base ~ mkup.sep ~ filename_extension; + _fn = filename_base ~ mkup.uid_sep ~ filename_extension; } else if (!(pod_name_with_path.empty)) { - _fn = pod_name_with_path.baseName ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension; + _fn = pod_name_with_path.baseName ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension; } else { - _fn = "_" ~ mkup.sep ~ filename_base ~ mkup.sep ~ filename_extension; + _fn = "_" ~ mkup.uid_sep ~ filename_base ~ mkup.uid_sep ~ filename_extension; } return _fn; } diff --git a/org/default_regex.org b/org/default_regex.org index a768a65..4ddaeca 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -50,6 +50,7 @@ static template spineRgxIn() { /+ misc +/ // static true_dollar = ctRegex!(`\$`, "gm"); static sep = ctRegex!(`␣`, "gm"); +static uid_sep = ctRegex!(`:`, "gm"); // ctRegex!(`␣`, "gm"); static flag_action = ctRegex!(`^(--[a-z][a-z0-9-]+)$`); static within_quotes = ctRegex!(`"(.+?)"`, "m"); static yaml_tag_is_str = ctRegex!(`:str$`); |