From e280a374991a3a6db3c40fd1fa03a2d9c6fa66eb Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 6 Jun 2017 17:58:10 -0400 Subject: naming mostly --- org/default_paths.org | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'org/default_paths.org') diff --git a/org/default_paths.org b/org/default_paths.org index e3026b7..3a250a0 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -35,7 +35,7 @@ template SiSUpathsSRC() { auto rgx = Rgx(); auto SiSUpathsSRC(D,Fn)( D _pwd, - Fn _fn_src, + Fn _fn_src_and_relative_path, ) { struct SisuSrcPaths { auto pwd() { @@ -44,10 +44,10 @@ template SiSUpathsSRC() { auto language() { // use command line info as well? string _k; - if (auto m = _fn_src.match(rgx.language_code_and_filename)) { + if (auto m = _fn_src_and_relative_path.match(rgx.language_code_and_filename)) { _k = m.captures[1]; } else { - _k = "en"; + _k = "xx"; // original default was "en" but is not known } return _k; } @@ -70,10 +70,10 @@ template SiSUpathsSRC() { return text_root.chainPath(language).array; } auto doc_src_with_relative_path() { - return pwd.chainPath(_fn_src).array; + return pwd.chainPath(_fn_src_and_relative_path).array; } auto doc_src_fn() { - return _fn_src.baseName.array; + return _fn_src_and_relative_path.baseName.array; } } return SisuSrcPaths(); -- cgit v1.2.3