aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/default_paths.org155
-rw-r--r--org/imports.org2
-rw-r--r--org/meta_debugs.org14
-rw-r--r--org/output_sqlite.org9
-rw-r--r--org/output_xmls.org190
-rw-r--r--org/sdp.org16
-rw-r--r--org/source_files_read.org (renamed from org/meta_read_source_files.org)16
7 files changed, 189 insertions, 213 deletions
diff --git a/org/default_paths.org b/org/default_paths.org
index b8ff2a4..5b7141a 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -18,13 +18,13 @@
* 0. source paths :module:sdp:paths_source:
** 0. module template
-#+BEGIN_SRC d :tangle ../src/sdp/output/paths_source.d
+#+BEGIN_SRC d :tangle ../src/sdp/source/paths_source.d
/++
read configuration files<BR>
- read config files<BR>
meta_config_files.d
+/
-module sdp.output.paths_source;
+module sdp.source.paths_source;
import std.array,
std.file,
std.path,
@@ -49,11 +49,10 @@ template PodManifest() {
P _pth
) {
struct ManifestFile_ {
- auto pod_manifest_filename() {
- string _manifest_file = "sisupod.manifest";
- return _manifest_file;
+ string pod_manifest_filename() {
+ return "sisupod.manifest";
}
- auto pod_manifest_path() {
+ string pod_manifest_path() {
string _manifest_path;
if ((isValidPath(_pth) && exists(_pth)!=0 && _pth.isDir)
&& (exists(_pth.chainPath(pod_manifest_filename).array)!=0
@@ -115,11 +114,11 @@ sisupod
template PathMatters() {
mixin SiSUrgxInit;
static auto rgx = Rgx();
- auto PathMatters(O,E,P,F)(
- O _opt_actions,
- E _env,
- P _pth,
- F _fns = "",
+ auto PathMatters(O,E)(
+ O _opt_actions,
+ E _env,
+ string _pth,
+ string _fns = "",
char[][] _manifest_fn_list = [[]],
) {
auto _manifest = PodManifest!()(_pth);
@@ -145,15 +144,13 @@ template PathMatters() {
}
return Opt_();
}
- auto src_is_pod() {
- auto _src_is_pod = (_manifest.pod_manifest_path.length > 0) ? true : false;
- return _src_is_pod;
+ bool src_is_pod() {
+ return (_manifest.pod_manifest_path.length > 0) ? true : false;
}
auto pod() {
struct Pod_ {
- auto src_is_pod() {
- auto _src_is_pod = (_manifest.pod_manifest_path.length > 0) ? true : false;
- return _src_is_pod;
+ bool src_is_pod() {
+ return (_manifest.pod_manifest_path.length > 0) ? true : false;
}
auto collection_root() {
auto _collection_root = asNormalizedPath(chainPath(_manifest.pod_manifest_path, "..")).array;
@@ -164,34 +161,34 @@ template PathMatters() {
}
return _collection_root;
}
- auto manifest_filename() {
+ string manifest_filename() {
return _manifest.pod_manifest_filename;
}
- auto manifest_path() {
+ string manifest_path() {
return _manifest.pod_manifest_path;
}
- auto pod_name() { // TODO decide what returned if src_is_pod == false
+ string pod_name() {
return _manifest.pod_manifest_path.baseName;
}
- auto manifest_file_with_path() {
+ string manifest_file_with_path() {
return _manifest.pod_manifest_file_with_path;
}
- auto config_sisu_document_make_dirs() { // TODO sisu_document_make
+ string[] config_sisu_document_make_dirs() {
string[] _config_dirs;
return _config_dirs;
}
- auto config_local_site_dirs() { // TODO sisu_document_make
+ string[] config_local_site_dirs() {
string[] _config_dirs;
return _config_dirs;
}
- auto image_dirs() { // TODO
+ string[] image_dirs() {
string[] _image_dirs;
return _image_dirs;
}
auto manifest_list_of_filenames() {
return _manifest_fn_list;
}
- auto manifest_list_of_languages() {
+ string[] manifest_list_of_languages() {
string[] _lngs;
foreach (filename_; manifest_list_of_filenames) {
string _k = "en";
@@ -211,41 +208,32 @@ template PathMatters() {
auto _env = _env;
string _sep = "␣";
struct SRC_ {
- auto is_pod() {
- auto _src_is_pod = (_manifest.pod_manifest_path.length > 0) ? true : false;
- return _src_is_pod;
+ bool is_pod() {
+ return (_manifest.pod_manifest_path.length > 0) ? true : false;
}
- auto path_and_fn() {
+ string path_and_fn() {
return _fns;
}
- auto pod_name() { /+ work on +/
- auto _pod_name = (is_pod)
- ? _manifest.pod_manifest_path
- : "";
- return _pod_name;
+ string pod_name() {
+ return (is_pod) ? _manifest.pod_manifest_path : "";
}
- auto filename() {
- auto _fn = (path_and_fn).baseName;
- return _fn;
+ string filename() {
+ return path_and_fn.baseName;
}
- auto filename_base() {
- auto _fn = filename.stripExtension;
- return _fn;
+ string filename_base() {
+ return filename.stripExtension;
}
- auto filename_extension() {
- auto _ext = filename.match(rgx.src_pth_sst_or_ssm).captures["extension"];
- return _ext;
+ string filename_extension() {
+ return filename.match(rgx.src_pth_sst_or_ssm).captures["extension"];
}
- auto lng() {
+ string lng() {
string _k;
if (auto m = path_and_fn.match(rgx.language_code_and_filename)) {
_k = m.captures[1];
- } else {
- _k = "en";
- }
+ } else {_k = "en"; }
return _k;
}
- auto docname_composite_unique_per_src_doc() {
+ string docname_composite_unique_per_src_doc() {
/+
z pod name if any + src filename + lng code
filename ~ "." ~ lng
@@ -263,7 +251,7 @@ template PathMatters() {
}
return _fn;
}
- auto docname_composite_unique_per_src_pod() {
+ string docname_composite_unique_per_src_pod() {
/+
z pod name if any + src filename (without lng code)
filename ~ _sep ~ lng
@@ -282,18 +270,16 @@ template PathMatters() {
}
return _fn;
}
- auto language() {
+ string language() {
return lng();
}
- auto file_with_absolute_path() {
- string _pth = _env["pwd"].chainPath(path_and_fn).array;
- return _pth;
+ string file_with_absolute_path() {
+ return _env["pwd"].chainPath(path_and_fn).array;
}
- auto absolute_path_to_src() {
- string _pth = (_env["pwd"].chainPath(path_and_fn)).dirName.array;
- return _pth;
+ string absolute_path_to_src() {
+ return (_env["pwd"].chainPath(path_and_fn)).dirName.array;
}
- auto base_dir() {
+ string base_dir() {
string _dir;
if ( // TODO this should catch generated --source sisupod, untested, needs manifest
auto m = (absolute_path_to_src)
@@ -311,7 +297,7 @@ template PathMatters() {
}
return _dir;
}
- auto base_parent_dir_path() {
+ string base_parent_dir_path() {
string _dir;
if ( // TODO this should catch generated --source sisupod, untested, needs manifest
auto m = (absolute_path_to_src)
@@ -323,7 +309,7 @@ template PathMatters() {
}
return _dir;
}
- auto base_dir_path() { // looks like there is work to do
+ string base_dir_path() {
string _dir;
if (
auto m = (absolute_path_to_src)
@@ -343,11 +329,11 @@ template PathMatters() {
}
return _dir;
}
- auto media_dir_path() { // TODO rework, can base directly on src fn path
+ string media_dir_path() {
string _dir = asNormalizedPath(base_dir_path.chainPath("media")).array;
return _dir;
}
- auto image_dir_path() {
+ string image_dir_path() {
string _paths;
string[] _possible_img_pths = [ "./image", "../image", "../../image" ];
string _img_pth_found = "";
@@ -372,8 +358,7 @@ template PathMatters() {
return _img_pth_found;
}
auto conf_dir_path() {
- auto _dir = asNormalizedPath(base_dir_path.chainPath("conf")).array;
- return _dir;
+ return asNormalizedPath(base_dir_path.chainPath("conf")).array;
}
auto base_parent_dir() {
string _dir;
@@ -390,18 +375,16 @@ template PathMatters() {
}
return _dir;
}
- auto config_dirs() { // TODO
+ string[] config_dirs() {
string[] _config_dirs;
if (is_pod) {
- } else {
- }
+ } else {}
return _config_dirs;
}
- auto image_dirs() { // TODO
+ string[] image_dirs() {
string[] _image_dirs;
if (is_pod) {
- } else {
- }
+ } else {}
return _image_dirs;
}
}
@@ -453,15 +436,15 @@ template ConfigFilePaths() {
E _env,
) {
struct ConfFilePaths {
- auto config_filename_document_toml() {
+ string config_filename_document_toml() {
return "sisu_document_make";
}
- auto config_filename_site_toml() {
+ string config_filename_site_toml() {
return "config_local_site";
}
auto possible_config_path_locations() {
struct _ConfFilePaths {
- auto sisu_document_make() {
+ string[] sisu_document_make() {
/+ FIX clean up conf paths ↓ +/
/+ config local site (file system only, not in pod) +/
/+ return paths +/
@@ -504,7 +487,7 @@ template ConfigFilePaths() {
+/
return _possible_config_path_locations;
}
- auto config_local_site() {
+ string[] config_local_site() {
/+ FIX clean up conf paths ↓ +/
/+ config local site (file system only, not in pod) +/
string _dot_pwd = asNormalizedPath(chainPath(to!string(_env["pwd"]), ".sisu")).array;
@@ -617,7 +600,7 @@ template SiSUpathsSRC() {
auto pwd() {
return _pwd;
}
- auto language() {
+ string language() {
// use command line info as well?
string _k;
if (auto m = _fn_src_and_path.match(rgx.language_code_and_filename)) {
@@ -627,7 +610,7 @@ template SiSUpathsSRC() {
}
return _k;
}
- auto doc_root() {
+ string doc_root() {
return "sisudoc";
}
auto media_root() {
@@ -944,13 +927,9 @@ template SiSUoutPaths() {
) {
struct _PathsStruct {
string output_root() {
- string out_root_;
- if (output_pth_root.length > 0) {
- out_root_ = output_pth_root;
- } else {
- out_root_ = "sisugen";
- }
- return out_root_;
+ return (output_pth_root.length > 0)
+ ? output_pth_root
+ : "sisugen";
}
string output_base() {
return asNormalizedPath(output_root.chainPath(lng)).array;
@@ -965,13 +944,9 @@ template SiSUoutPathSQLite() {
) {
struct _PathsStruct {
string output_root() {
- string out_root_;
- if (output_pth_root.length > 0) {
- out_root_ = output_pth_root;
- } else {
- out_root_ = "sisugen";
- }
- return out_root_;
+ return (output_pth_root.length > 0)
+ ? output_pth_root
+ : "sisugen";
}
string output_base() {
return asNormalizedPath(output_root).array;
@@ -1006,7 +981,7 @@ template SiSUoutPathsFnPd() {
- else if pod_name != file_name
- pod_name.file_name
+/
- auto _fn_src = fn_src_pth.baseName.stripExtension;
+ string _fn_src = fn_src_pth.baseName.stripExtension;
string _output_base_name;
if (!(pod_name.empty)) {
if (pod_name == _fn_src) {
diff --git a/org/imports.org b/org/imports.org
index 64bc4c3..d82da9e 100644
--- a/org/imports.org
+++ b/org/imports.org
@@ -73,7 +73,7 @@ public import
// std.uni,
std.utf;
public import
- sdp.output.paths_source,
+ sdp.source.paths_source,
sdp.output.defaults,
sdp.output.paths_output,
sdp.output.rgx;
diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index 8542a32..1807ec8 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -26,8 +26,8 @@ module sdp.meta.doc_debugs;
template SiSUdebugs() {
<<debug_imports>>
auto SiSUdebugs(S,T)(
- auto return ref const S contents,
- auto return ref T doc_matters,
+ const S contents,
+ T doc_matters,
) {
mixin SiSUrgxInit;
mixin InternalMarkup;
@@ -136,8 +136,8 @@ debug(dumpdoc) {
#+BEGIN_SRC d
debug(checkdoc) {
void out_segnames(S,T)(
- auto return ref const S contents,
- auto return ref T doc_matters,
+ const S contents,
+ T doc_matters,
) {
foreach (key; doc_matters.xml.keys_seq.seg) {
if (contents[key].length > 1) {
@@ -159,7 +159,7 @@ debug(checkdoc) {
#+BEGIN_SRC d
debug(checkdoc) {
void out_toc(S)(
- auto return ref const S contents,
+ const S contents,
string key,
) {
if (contents[key].length > 1) {
@@ -183,7 +183,7 @@ debug(checkdoc) {
#+BEGIN_SRC d
debug(checkdoc) {
void out_endnotes(S)(
- auto return ref const S contents,
+ const S contents,
string key,
) {
if (contents[key].length > 1) {
@@ -205,7 +205,7 @@ debug(checkdoc) {
#+BEGIN_SRC d
debug(checkdoc) {
void out_bookindex(S)(
- auto return ref const S contents,
+ const S contents,
string key,
) {
if (contents[key].length > 1) {
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index e8a29bf..dc76da4 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -1223,10 +1223,11 @@ CREATE TABLE doc_objects (
seg VARCHAR(256) NULL,
lev_an VARCHAR(1),
lev SMALLINT NULL,
- t_of VARCHAR(16),
- t_is VARCHAR(16),
+ is_of_type VARCHAR(16),
+ is_a VARCHAR(16),
node VARCHAR(16) NULL,
parent VARCHAR(16) NULL,
+ last_decendant VARCHAR(16) NULL, /* headings only */
digest_clean CHAR(256),
digest_all CHAR(256),
types CHAR(1) NULL
@@ -1276,8 +1277,8 @@ _insert_doc_objects_row = format(q"¶
clean,
body,
lev,
- t_of,
- t_is
+ is_of_type,
+ is_a
)
#+END_SRC
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 122b15c..0aa50d5 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -98,8 +98,8 @@ string div_delimit(
#+name: xhtml_format_objects
#+BEGIN_SRC d
string special_characters(O)(
- auto ref const O obj,
- string _txt
+ const O obj,
+ string _txt
){
_txt = (_txt)
.replaceAll(rgx.xhtml_ampersand, "&#38;")
@@ -421,10 +421,10 @@ auto tail() {
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto inline_images(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "seg",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "seg",
) {
string _img_pth;
if (_xml_type == "epub") {
@@ -450,10 +450,10 @@ auto inline_images(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto inline_links(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "seg",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "seg",
) {
if (obj.has.inline_links) {
if ((_txt.match(rgx.mark_internal_site_lnk))
@@ -502,8 +502,8 @@ auto inline_links(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto inline_notes_scroll(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
if (obj.has.inline_notes_reg) {
_txt = font_face(_txt);
@@ -531,8 +531,8 @@ auto inline_notes_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto inline_notes_seg(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
string[] _endnotes;
if (obj.has.inline_notes_reg) {
@@ -576,9 +576,9 @@ auto inline_notes_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto inline_markup_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
) {
_txt = inline_images(obj, _txt, _suffix, "scroll");
_txt = inline_links(obj, _txt, _suffix, "scroll");
@@ -592,10 +592,10 @@ auto inline_markup_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto inline_markup_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "seg",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "seg",
) {
_txt = inline_images(obj, _txt, _suffix, _xml_type);
_txt = inline_links(obj, _txt, _suffix, _xml_type);
@@ -610,7 +610,7 @@ auto inline_markup_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
string lev4_heading_subtoc(O)(
- auto ref const O obj,
+ const O obj,
) {
char[] lev4_subtoc;
lev4_subtoc ~= " <div class=\"nav\">\n";
@@ -642,7 +642,7 @@ string lev4_heading_subtoc(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto nav_pre_next_svg(O)(
- auto ref const O obj,
+ const O obj,
) {
string prev, next, toc;
if (obj.tags.segment_anchor_tag == "toc") {
@@ -726,9 +726,9 @@ auto nav_pre_next_svg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto heading(O)(
- auto ref const O obj,
- string _txt,
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
string _horizontal_rule = "<hr />";
@@ -781,9 +781,9 @@ auto heading(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto heading_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -797,10 +797,10 @@ auto heading_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto heading_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0];
@@ -820,8 +820,8 @@ auto heading_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto para(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = font_face(_txt);
@@ -865,9 +865,9 @@ auto para(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto para_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -881,10 +881,10 @@ auto para_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto para_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
@@ -904,8 +904,8 @@ auto para_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto quote(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
_txt = font_face(_txt);
string o;
@@ -941,9 +941,9 @@ auto quote(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto quote_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -957,10 +957,10 @@ auto quote_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto quote_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
@@ -980,8 +980,8 @@ auto quote_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto group(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
_txt = font_face(_txt);
string o;
@@ -1017,10 +1017,10 @@ auto group(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto group_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1034,10 +1034,10 @@ auto group_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto group_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
@@ -1057,8 +1057,8 @@ auto group_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto block(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
_txt = font_face(_txt);
string o;
@@ -1090,10 +1090,10 @@ auto block(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto block_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1107,10 +1107,10 @@ auto block_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto block_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
@@ -1130,8 +1130,8 @@ auto block_seg(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto verse(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
_txt = font_face(_txt);
string o;
@@ -1163,10 +1163,10 @@ auto verse(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto verse_scroll(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = inline_markup_scroll(obj, _txt, _suffix);
@@ -1180,10 +1180,10 @@ auto verse_scroll(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto verse_seg(O)(
- auto ref const O obj,
- string _txt,
- string _suffix = ".html",
- string _xml_type = "html",
+ const O obj,
+ string _txt,
+ string _suffix = ".html",
+ string _xml_type = "html",
) {
auto t = inline_markup_seg(obj, _txt, _suffix, _xml_type);
_txt = t[0].to!string;
@@ -1202,8 +1202,8 @@ auto verse_seg(O)(
#+name: xhtml_format_objects_code
#+BEGIN_SRC d
auto code(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
string o;
if (obj.metainfo.object_number.empty) {
@@ -1243,8 +1243,8 @@ align="left|right|center"
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto tablarize(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
string[] _table_rows = (_txt).split(rgx.table_delimiter_row);
string[] _table_cols;
@@ -1282,8 +1282,8 @@ auto tablarize(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto table(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
auto tags = _xhtml_anchor_tags(obj.tags.anchor_tags);
_txt = font_face(_txt);
@@ -1317,8 +1317,8 @@ auto table(O)(
#+name: xhtml_format_objects
#+BEGIN_SRC d
auto endnote(O)(
- auto ref const O obj,
- string _txt,
+ const O obj,
+ string _txt,
) {
string o;
o = format(q"¶ <p class="%s" indent="h%si%s">
@@ -1354,8 +1354,8 @@ template outputHTML() {
#+name: output_html_scroll
#+BEGIN_SRC d
void scroll(D,I)(
- auto ref const D doc_abstraction,
- auto ref I doc_matters,
+ const D doc_abstraction,
+ I doc_matters,
) {
mixin SiSUoutputRgxInit;
auto xhtml_format = outputXHTMLs();
@@ -1535,8 +1535,8 @@ void scroll_write_output(M,C)(
#+name: output_html_seg
#+BEGIN_SRC d
void seg(D,M)(
- auto ref const D doc_abstraction,
- auto ref M doc_matters,
+ const D doc_abstraction,
+ M doc_matters,
) {
mixin SiSUoutputRgxInit;
auto rgx = Rgx();
@@ -2216,8 +2216,8 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
#+name: output_epub3_xhtml_seg
#+BEGIN_SRC d
void outputEPub3(D,I)(
- auto ref const D doc_abstraction,
- auto ref I doc_matters,
+ const D doc_abstraction,
+ I doc_matters,
) {
mixin SiSUoutputRgxInit;
auto xhtml_format = outputXHTMLs();
diff --git a/org/sdp.org b/org/sdp.org
index fe34840..b26f317 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -26,7 +26,7 @@ struct Version {
int minor;
int patch;
}
-enum ver = Version(0, 26, 3);
+enum ver = Version(0, 26, 4);
#+END_SRC
** compilation restrictions (supported compilers)
@@ -120,11 +120,11 @@ import
sdp.meta.conf_make_meta_json,
sdp.meta.defaults,
sdp.meta.doc_debugs,
- sdp.meta.read_config_files,
- sdp.meta.read_source_files,
sdp.meta.rgx,
- sdp.output.hub,
- sdp.output.paths_source;
+ sdp.source.paths_source,
+ sdp.source.read_config_files,
+ sdp.source.read_source_files,
+ sdp.output.hub;
#+END_SRC
****** notes
@@ -141,7 +141,7 @@ import
[[./meta_conf_make_meta.org][meta_conf_make_meta]]
[[./meta_defaults.org][meta_defaults]]
[[./meta_output_debugs.org][meta_output_debugs]]
-[[./meta_read_source_files.org][meta_read_source_files]]
+[[./source_read_files.org][source_read_files]]
[[./compile_time_info.org][compile time info]]
[[./output.org][output]]
[[./sdp.org][sdp]]
@@ -201,7 +201,7 @@ static auto rgx = Rgx();
scope(success) {
debug(checkdoc) {
writefln(
- "~ run complete, ok ~ (sdp-%s.%s.%s, %s v%s, %s %s)",
+ "~ run complete, ok ~ (sdp-%s.%s.%s, %s D:%s, %s %s)",
ver.major, ver.minor, ver.patch,
__VENDOR__, __VERSION__,
bits, os,
@@ -740,7 +740,7 @@ template SiSUabstraction() {
#+END_SRC
** 1. raw file content split, doc: _header_, _content_ +(lists: subdocs? images?) >>
-- [[./meta_read_source_files.org][meta_read_source_files]]
+- [[./source_read_files.org][source_read_files]]
- read in the _marked up source document_ and
- split the document into:
diff --git a/org/meta_read_source_files.org b/org/source_files_read.org
index b726631..899e628 100644
--- a/org/meta_read_source_files.org
+++ b/org/source_files_read.org
@@ -21,21 +21,21 @@
#+BEGIN_SRC d
import
sdp.meta,
- sdp.output.paths_source,
+ sdp.source.paths_source,
std.file,
std.path;
#+END_SRC
-* A. get _config file_ (read in) :module:sdp:meta_read_config_files:
+* A. get _config file_ (read in) :module:sdp:source_read_config_files:
** 0. module template
-#+BEGIN_SRC d :tangle ../src/sdp/meta/read_config_files.d
+#+BEGIN_SRC d :tangle ../src/sdp/source/read_config_files.d
/++
read configuration files<BR>
- read config files<BR>
meta_config_files.d
+/
-module sdp.meta.read_config_files;
+module sdp.source.read_config_files;
<<meta_config_file_in>>
<<meta_config_file_toml>>
<<meta_config_file_hub>>
@@ -272,16 +272,16 @@ static template configReadDocTOML() {
}
#+END_SRC
-* B. get _markup source_, read file :module:sdp:meta_read_source_files:
+* B. get _markup source_, read file :module:sdp:source_read_source_files:
** 0. module template (includes tuple)
-#+BEGIN_SRC d :tangle ../src/sdp/meta/read_source_files.d
+#+BEGIN_SRC d :tangle ../src/sdp/source/read_source_files.d
/++
- module meta_read_source_files;<BR>
+ module source_read_source_files;<BR>
- open markup files<BR>
- if master file scan for addional files to import/insert
+/
-module sdp.meta.read_source_files;
+module sdp.source.read_source_files;
static template SiSUrawMarkupContent() {
import
sdp.meta.rgx;