diff options
Diffstat (limited to 'src/doc_reform/source/paths_source.d')
| -rw-r--r-- | src/doc_reform/source/paths_source.d | 34 | 
1 files changed, 17 insertions, 17 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_;  | 
