diff options
Diffstat (limited to 'src/doc_reform/io_in')
| -rw-r--r-- | src/doc_reform/io_in/paths_source.d | 20 | ||||
| -rw-r--r-- | src/doc_reform/io_in/read_config_files.d | 8 | ||||
| -rw-r--r-- | src/doc_reform/io_in/read_source_files.d | 10 | 
3 files changed, 19 insertions, 19 deletions
| diff --git a/src/doc_reform/io_in/paths_source.d b/src/doc_reform/io_in/paths_source.d index f3b1e8a..85738d1 100644 --- a/src/doc_reform/io_in/paths_source.d +++ b/src/doc_reform/io_in/paths_source.d @@ -14,8 +14,8 @@ import    doc_reform.meta.defaults,    doc_reform.meta.rgx;  template PodManifest() { -  mixin spineRgxInit; -  static auto rgx = Rgx(); +  mixin spineRgxIn; +  static auto rgx = RgxI();    @safe auto PodManifest(O)(      O       _opt_actions,      string  _pth="" @@ -67,9 +67,9 @@ template PodManifest() {    }  }  template PathMatters() { -  mixin spineRgxInit; +  mixin spineRgxIn;    mixin InternalMarkup; -  static auto rgx  = Rgx(); +  static auto rgx  = RgxI();    static auto mkup = InlineMarkup();    @safe auto PathMatters(O,E)(      O        _opt_actions, @@ -409,8 +409,8 @@ template PathMatters() {    }  }  template ConfigFilePaths() { -  mixin spineRgxInit; -  static auto rgx = Rgx(); +  mixin spineRgxIn; +  static auto rgx = RgxI();    @safe auto ConfigFilePaths(M,E)(      M      _manifested,      E      _env, @@ -531,8 +531,8 @@ template ConfigFilePaths() {    }  }  template spinePathsSRC() { -  mixin spineRgxInit; -  static auto rgx = Rgx(); +  mixin spineRgxIn; +  static auto rgx = RgxI();    @safe auto spinePathsSRC(D,Fn)(      D   _pwd,      Fn  _fn_src_and_path, @@ -582,8 +582,8 @@ template spinePathsSRC() {  template spinePathsPods() { -  mixin spineRgxInit; -  static auto rgx = Rgx(); +  mixin spineRgxIn; +  static auto rgx = RgxI();    string _suffix = ".zip";    auto spinePathsPods(M)(M doc_matters) {      string _base_dir_pod = (doc_matters.output_path.length > 0) diff --git a/src/doc_reform/io_in/read_config_files.d b/src/doc_reform/io_in/read_config_files.d index 4889e4f..9daf362 100644 --- a/src/doc_reform/io_in/read_config_files.d +++ b/src/doc_reform/io_in/read_config_files.d @@ -13,8 +13,8 @@ import  template readConfigSite() {    @system final auto readConfigSite(C)(C _conf_file_details) { -    mixin spineRgxInit; -    static auto rgx = Rgx(); +    mixin spineRgxIn; +    static auto rgx = RgxI();      string conf_filename = "NONE";      string config_file_str;      string default_config_file_str = format(q"┃ @@ -117,8 +117,8 @@ static template readConfigDoc() {      doc_reform.io_in.paths_source,      doc_reform.meta.rgx;    @system final auto readConfigDoc(M,E)(M _manifested, E _env) { -    mixin spineRgxInit; -    static auto rgx = Rgx(); +    mixin spineRgxIn; +    static auto rgx = RgxI();      string config_file_str;      string conf_filename = "NONE";      auto _conf_file_details = ConfigFilePaths!()(_manifested, _env); diff --git a/src/doc_reform/io_in/read_source_files.d b/src/doc_reform/io_in/read_source_files.d index 041ec91..7d826a9 100644 --- a/src/doc_reform/io_in/read_source_files.d +++ b/src/doc_reform/io_in/read_source_files.d @@ -11,8 +11,8 @@ template spineRawMarkupContent() {      doc_reform.meta,      doc_reform.io_in.paths_source,      doc_reform.meta.rgx; -  mixin spineRgxInit; -  static auto rgx = Rgx(); +  mixin spineRgxIn; +  static auto rgx = RgxI();    string[] _images=[];    @safe string[] _extract_images(S)(S content_block) {      string[] images_; @@ -125,7 +125,7 @@ template spineRawMarkupContent() {        return source_line_arr;      }      @safe string markupSourceReadIn(in string fn_src) { -      static auto rgx = Rgx(); +      static auto rgx = RgxI();        enforce(          fn_src.match(rgx.src_pth_sst_or_ssm),          "not a dr markup filename: «" ~ @@ -173,7 +173,7 @@ template spineRawMarkupContent() {        char[][] markup_sourcefile_insert_content,        string   fn_src      ) { -      mixin spineRgxInitFlags; +      mixin spineRgxDocStructFlags;        char[][] contents_insert;        int[string] type1 = flags_type_init;        auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm); @@ -259,7 +259,7 @@ template spineRawMarkupContent() {        string   fn_src      ) {        import std.algorithm; -      mixin spineRgxInitFlags; +      mixin spineRgxDocStructFlags;        char[][] contents;        int[string] type = flags_type_init;        auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm); | 
