aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/in_markup_source_files.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/in_markup_source_files.org')
-rw-r--r--org/in_markup_source_files.org11
1 files changed, 8 insertions, 3 deletions
diff --git a/org/in_markup_source_files.org b/org/in_markup_source_files.org
index 68de6fb..f4ab434 100644
--- a/org/in_markup_source_files.org
+++ b/org/in_markup_source_files.org
@@ -925,9 +925,14 @@ template spineCarriedNames() {
enum size_t MAX_CARRIED_NAME_LENGTH = 255; /+ one path component +/
enum size_t MAX_CARRIED_PATH_LENGTH = 1024; /+ the whole path +/
enum size_t MAX_CARRIED_PATH_DEPTH = 10; /+ as read_zip_pod.d +/
- /+ ↓ allowed characters: a filename has no separator, a path has "/" +/
- static auto rgx_safe_carried_name = ctRegex!(`^[a-zA-Z0-9._ -]+$`);
- static auto rgx_safe_carried_path = ctRegex!(`^[a-zA-Z0-9._/ -]+$`);
+ /+ ↓ allowed characters: a filename has no separator, a path has "/".
+ "~" is here because it is spine's own uid separator (InlineMarkup.uid_sep),
+ which joins a pod name to a document name where the two differ, as in
+ sisu-manual~sisu_markup.en.ssp. It cannot occur in either half, every
+ filesystem of interest takes it, and it is unreserved in rfc 3986.
+ +/
+ static auto rgx_safe_carried_name = ctRegex!(`^[a-zA-Z0-9._ ~-]+$`);
+ static auto rgx_safe_carried_path = ctRegex!(`^[a-zA-Z0-9._/ ~-]+$`);
/+ ↓ the checks both rules share, "" when the name is acceptable +/
private string _carriedNameCommon(string _name) {
if (_name.length == 0) {