aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/source
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc_reform/source')
-rw-r--r--src/doc_reform/source/paths_source.d34
-rw-r--r--src/doc_reform/source/read_source_files.d10
2 files changed, 22 insertions, 22 deletions
diff --git a/src/doc_reform/source/paths_source.d b/src/doc_reform/source/paths_source.d
index 1131b20..70e2fc4 100644
--- a/src/doc_reform/source/paths_source.d
+++ b/src/doc_reform/source/paths_source.d
@@ -19,7 +19,7 @@ template PodManifest() {
) {
struct ManifestFile_ {
string pod_manifest_filename() {
- return "sisupod.manifest";
+ return "pod.manifest";
}
string pod_manifest_path() {
string _manifest_path;
@@ -102,9 +102,9 @@ template PathMatters() {
auto collection_root() {
auto _collection_root = asNormalizedPath(chainPath(_manifest.pod_manifest_path, "..")).array;
if (auto m = (_collection_root).match(rgx.src_pth_pod_root)) {
- // consider testing for last dir in path name being sisupod, and giving warning if not
+ // consider testing for last dir in path name being pod, and giving warning if not
} else {
- writeln("WARNING, collection_root not named \"sisupod\"");
+ writeln("WARNING, collection_root not named \"pod\"");
}
return _collection_root;
}
@@ -217,7 +217,7 @@ template PathMatters() {
filename ~ _sep ~ lng
* unique per src pod
used by
- - sisupod (multilingual collection)
+ - pod (multilingual collection)
- sqlite discrete index (multilingual collection)
+/
string _fn;
@@ -243,7 +243,7 @@ template PathMatters() {
string _dir;
if (
auto m = (absolute_path_to_src)
- .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/sisupod/" ~ filename.stripExtension))
+ .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/pod/" ~ filename.stripExtension))
) {
_dir = asNormalizedPath(path_and_fn.chainPath("../../")).array;
assert(_dir == m.captures["dir"]);
@@ -261,7 +261,7 @@ template PathMatters() {
string _dir;
if (
auto m = (absolute_path_to_src)
- .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/sisupod/" ~ filename.stripExtension))
+ .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/pod/" ~ filename.stripExtension))
) {
_dir = asNormalizedPath(path_and_fn.chainPath("../../")).array;
} else {
@@ -278,7 +278,7 @@ template PathMatters() {
_dir = asNormalizedPath(m.captures["pth"]).array;
} else if (
auto m = (absolute_path_to_src)
- .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/sisupod/" ~ filename.stripExtension))
+ .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/pod/" ~ filename.stripExtension))
) {
_dir = asNormalizedPath(path_and_fn.chainPath("../")).array;
} else {
@@ -324,7 +324,7 @@ template PathMatters() {
string _dir;
if (
auto m = (absolute_path_to_src)
- .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/sisupod/" ~ filename.stripExtension))
+ .match(regex(r"[/](?P<dir>(?:[a-zA-Z0-9._-]+))/pod/" ~ filename.stripExtension))
) {
_dir = m.captures["dir"];
} else {
@@ -542,21 +542,21 @@ template DocReformPathsSRC() {
}
-template DocReformPathsSisupods() {
+template DocReformPathsPods() {
mixin DocReformRgxInit;
static auto rgx = Rgx();
string _suffix = ".zip";
- auto DocReformPathsSisupods(Dm)(Dm doc_matters) {
+ auto DocReformPathsPods(Dm)(Dm doc_matters) {
string _base_dir_pod = (doc_matters.output_path.length > 0)
- ? doc_matters.output_path ~ "/sisupod"
- : "/sisupod";
+ ? doc_matters.output_path ~ "/pod"
+ : "/pod";
string _base_dir_doc = "sisudoc";
struct _PodPaths {
string base_filename_(string fn_src) {
auto pth = fn_src.baseName.stripExtension;
return pth;
}
- string sisupod_dir_() {
+ string pod_dir_() {
auto pth = _base_dir_pod;
return pth;
}
@@ -564,7 +564,7 @@ template DocReformPathsSisupods() {
auto pth = _base_dir_doc;
return pth;
}
- string sisupod_filename_(string fn_src) {
+ string pod_filename_(string fn_src) {
string pth = _base_dir_pod.chainPath(base_filename_(fn_src) ~ _suffix).array;
return pth;
}
@@ -591,9 +591,9 @@ template DocReformPathsSisupods() {
}
return _pods();
}
- auto sisupod_filename(string fn_src) {
- auto pth_1_ = sisupod_filename_(fn_src);
- auto pth_2_ = sisupod_filename_(fn_src);
+ auto pod_filename(string fn_src) {
+ auto pth_1_ = pod_filename_(fn_src);
+ auto pth_2_ = pod_filename_(fn_src);
struct _pods {
auto zpod() {
return pth_1_;
diff --git a/src/doc_reform/source/read_source_files.d b/src/doc_reform/source/read_source_files.d
index 374c113..ae6f32e 100644
--- a/src/doc_reform/source/read_source_files.d
+++ b/src/doc_reform/source/read_source_files.d
@@ -52,7 +52,7 @@ static template DocReformRawMarkupContent() {
sourcefile_body_content = tu[0];
insert_file_list = tu[1].dup;
images_list = tu[2].dup;
- } else if (_opt_action.source || _opt_action.sisupod) {
+ } else if (_opt_action.source || _opt_action.pod) {
auto ins = Inserts();
auto tu
= ins.scan_master_src_for_insert_files_and_import_content(_opt_action, sourcefile_body_content, fn_src);
@@ -217,7 +217,7 @@ static template DocReformRawMarkupContent() {
markup_sourcesubfile_insert_content.length
);
}
- if (_opt_action.source || _opt_action.sisupod) {
+ if (_opt_action.source || _opt_action.pod) {
_images ~= _extract_images(markup_sourcesubfile_insert_content);
}
auto ins = Inserts();
@@ -235,7 +235,7 @@ static template DocReformRawMarkupContent() {
type1["header_make"] = 0;
type1["header_meta"] = 0;
contents_insert ~= line; // images to extract for image list?
- if (_opt_action.source || _opt_action.sisupod) {
+ if (_opt_action.source || _opt_action.pod) {
auto _image_linelist = _extract_images(line);
if (_image_linelist.length > 0) {
_images ~= _image_linelist;
@@ -305,7 +305,7 @@ static template DocReformRawMarkupContent() {
fn_src_insert.to!string
);
contents ~= contents_insert_tu[0]; // images to extract for image list?
- if (_opt_action.source || _opt_action.sisupod) {
+ if (_opt_action.source || _opt_action.pod) {
auto _image_linelist = _extract_images(contents_insert_tu[0]);
if (_image_linelist.length > 0) {
_images ~= _image_linelist;
@@ -323,7 +323,7 @@ static template DocReformRawMarkupContent() {
+/
} else {
contents ~= line;
- if (_opt_action.source || _opt_action.sisupod) {
+ if (_opt_action.source || _opt_action.pod) {
auto _image_linelist = _extract_images(line);
if (_image_linelist.length > 0) {
_images ~= _image_linelist;