aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/compile_time_info.org6
-rw-r--r--org/default_misc.org8
-rw-r--r--org/default_paths.org16
-rw-r--r--org/default_regex.org8
-rw-r--r--org/default_shared.org6
-rw-r--r--org/doc_reform.org59
-rw-r--r--org/imports.org8
-rw-r--r--org/meta_abstraction.org16
-rw-r--r--org/meta_conf_make_meta.org23
-rw-r--r--org/meta_debugs.org6
-rw-r--r--org/output_hub.org54
-rw-r--r--org/output_sqlite.org24
-rw-r--r--org/output_src_pod.org6
-rw-r--r--org/output_xmls.org12
-rw-r--r--org/output_xmls_css.org6
-rw-r--r--org/output_zip.org6
-rw-r--r--org/source_files_read.org8
-rwxr-xr-xsrc/doc_reform/doc_reform.d7
-rw-r--r--src/doc_reform/meta/conf_make_meta_json.d3
-rw-r--r--src/doc_reform/meta/conf_make_meta_toml.d6
-rw-r--r--src/doc_reform/meta/metadoc_from_src.d8
-rw-r--r--src/doc_reform/output/hub.d10
-rw-r--r--src/doc_reform/source/paths_source.d8
-rw-r--r--views/version.txt2
24 files changed, 165 insertions, 151 deletions
diff --git a/org/compile_time_info.org b/org/compile_time_info.org
index 7f0a10f..2733994 100644
--- a/org/compile_time_info.org
+++ b/org/compile_time_info.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -23,7 +23,7 @@ version(Windows) {} else { ... }
** 0. module template :module:compile_time_info:
-#+begin_src d :tangle ../src/doc_reform/conf/compile_time_info.d
+#+begin_src d :tangle "../src/doc_reform/conf/compile_time_info.d"
/++
compile_time_info
+/
diff --git a/org/default_misc.org b/org/default_misc.org
index 336f5ab..d4576a6 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -18,7 +18,7 @@
** 0. module template
#+name: tangle_defaults
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/defaults.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/defaults.d"
/++
default settings
+/
@@ -173,7 +173,7 @@ template DocReformBiblio() {
** 0. module template
#+name: tangle_defaults
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/defaults.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/defaults.d"
/++
default settings
+/
diff --git a/org/default_paths.org b/org/default_paths.org
index 3031a00..07f1176 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -17,7 +17,7 @@
* 0. source paths
** 0. module template :module:paths_source:
-#+BEGIN_SRC d :tangle ../src/doc_reform/source/paths_source.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/source/paths_source.d"
/++
read configuration files<BR>
- read config files<BR>
@@ -304,7 +304,7 @@ template PathMatters() {
assert(_dir == absolute_path_to_src
.match(rgx.src_base_parent_dir_name).captures["dir"]);
}
- if ((_opt_actions.debug_do)) {
+ if (_opt_actions.debug_do) {
writeln("--> (base_dir) ", _dir);
}
return _dir;
@@ -336,7 +336,7 @@ template PathMatters() {
} else {
_dir = asNormalizedPath(path_and_fn.chainPath("../../")).array;
}
- if ((_opt_actions.debug_do)) {
+ if (_opt_actions.debug_do) {
writeln("--> (base_dir_path) ", _dir);
}
return _dir;
@@ -382,7 +382,7 @@ template PathMatters() {
} else {
_dir = (absolute_path_to_src).match(rgx.src_base_parent_dir_name).captures["dir"];
}
- if ((_opt_actions.debug_do)) {
+ if (_opt_actions.debug_do) {
writeln("--> (base_parent_dir) ", _dir);
}
return _dir;
@@ -660,7 +660,7 @@ template DocReformPathsPods() {
mixin DocReformRgxInit;
static auto rgx = Rgx();
string _suffix = ".zip";
- auto DocReformPathsPods(Dm)(Dm doc_matters) {
+ auto DocReformPathsPods(M)(M doc_matters) {
string _base_dir_pod = (doc_matters.output_path.length > 0)
? doc_matters.output_path ~ "/pod"
: "/pod";
@@ -904,7 +904,7 @@ template DocReformPathsPods() {
* 1. output paths
** 0. module template :module:paths_output:
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/paths_output.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/paths_output.d"
/++
default settings
+/
diff --git a/org/default_regex.org b/org/default_regex.org
index da2ff4d..1496696 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -30,7 +30,7 @@ http://dlang.org/phobos/std_regex.html
** 0. module template :module:
#+name: tangle_meta_rgx
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/rgx.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/rgx.d"
/++
regex: regular expressions used in sisu document parser
+/
@@ -380,7 +380,7 @@ http://dlang.org/phobos/std_regex.html
** 0. module template :module:output:
#+name: tangle_meta_rgx
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/rgx.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/rgx.d"
/++
regex: regular expressions used in sisu document parser
+/
diff --git a/org/default_shared.org b/org/default_shared.org
index 54a2f4f..9ec0387 100644
--- a/org/default_shared.org
+++ b/org/default_shared.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -17,7 +17,7 @@
* 0. shared
** 0. module template :module:shared:
-#+BEGIN_SRC d :tangle ../src/doc_reform/share/defaults.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/share/defaults.d"
/++
shared default settings
+/
diff --git a/org/doc_reform.org b/org/doc_reform.org
index be82dc2..acc21e9 100644
--- a/org/doc_reform.org
+++ b/org/doc_reform.org
@@ -4,34 +4,37 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
[[../maker.org][maker.org makefile]] [[./][org/]]
+
* 0. version.txt (set version) :version:
** set program version
+- set program version
-#+BEGIN_SRC d :tangle ../views/version.txt
+#+BEGIN_SRC d :tangle "../views/version.txt"
/+ obt - org generated file +/
struct Version {
int major;
int minor;
int patch;
}
-enum ver = Version(0, 3, 2);
+enum ver = Version(0, 3, 3);
#+END_SRC
** compilation restrictions (supported compilers)
+- set compilation restrictions
http://dlang.org/spec/version.html#predefined-versions
-#+BEGIN_SRC d :tangle ../views/version.txt
+#+BEGIN_SRC d :tangle "../views/version.txt"
version (Posix) {
version (DigitalMars) {
} else version (LDC) {
@@ -62,7 +65,7 @@ version (Posix) {
- by sourcefiles contents identifier
- by zip filename
-#+BEGIN_SRC d :tangle ../src/doc_reform/doc_reform.d :shebang #!/usr/bin/env rdmd
+#+BEGIN_SRC d :tangle "../src/doc_reform/doc_reform.d" :shebang #!/usr/bin/env rdmd
module doc_reform.sisu_document_parser;
import
doc_reform.conf.compile_time_info,
@@ -182,6 +185,7 @@ mixin(import("version.txt"));
#+END_SRC
***** pre main mixins
+
#+NAME: mixin_pre_main
#+BEGIN_SRC d
mixin CompileTimeInfo;
@@ -233,11 +237,8 @@ scope(failure) {
*** getopt args for loop :args:getopt:
-look into using getopt
-[[http://dlang.org/phobos/std_getopt.html][getopt]]
-[[http://dlang.org/library/std/getopt.html][getopt]]
-
-**** getopt
+**** set getopt options
+- set getopt options
#+NAME: doc_reform_args
#+BEGIN_SRC d
@@ -314,10 +315,9 @@ auto helpInfo = getopt(args,
"sqlite-db-create", "--sqlite-db-create create db, create tables", &opts["sqlite-db-create"],
"sqlite-db-drop", "--sqlite-db-drop drop tables & db", &opts["sqlite-db-drop"],
"sqlite-db-recreate", "--sqlite-db-recreate create db, create tables", &opts["sqlite-db-recreate"],
- // "sqlite-db-populate", "--sqlite-db-populate create db & tables, insert specified", &opts["sqlite-db-populate"],
- "sqlite-delete", "--sqlite process sqlite output", &opts["sqlite-delete"],
- "sqlite-insert", "--sqlite process sqlite output", &opts["sqlite-insert"],
- "sqlite-update", "--sqlite process sqlite output", &opts["sqlite-update"],
+ "sqlite-delete", "--sqlite-delete process sqlite output", &opts["sqlite-delete"],
+ "sqlite-insert", "--sqlite-insert process sqlite output", &opts["sqlite-insert"],
+ "sqlite-update", "--sqlite-update process sqlite output", &opts["sqlite-update"],
"text", "--text process text output", &opts["text"],
"txt", "--txt process text output", &opts["text"],
"verbose|v", "--verbose output to terminal", &opts["verbose"],
@@ -346,6 +346,7 @@ if (helpInfo.helpWanted) {
#+END_SRC
**** getopt hash to struct
+- move getopt options to struct
#+NAME: doc_reform_args
#+BEGIN_SRC d
@@ -587,6 +588,7 @@ auto _opt_action = OptActions();
#+END_SRC
**** env
+- environmental info
#+NAME: doc_reform_args
#+BEGIN_SRC d
@@ -761,6 +763,7 @@ if ((doc_matters.opt.action.debug_do)
*** 2. _output processing_ (post abstraction processing)
**** 0. abstraction _print summary_ :abstraction:summary:
+- abstraction summary
#+NAME: doc_reform_each_file_do_debugs_checkdoc
#+BEGIN_SRC d
@@ -829,7 +832,7 @@ break; // terminate, stop
* 2. _document abstraction functions_ :module:doc_reform:abstraction:
** 0. module template
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc.d"
module doc_reform.meta.metadoc;
template DocReformAbstraction() {
<<imports_doc_reform>>
@@ -855,8 +858,9 @@ template DocReformAbstraction() {
}
#+END_SRC
-** 1. raw file content split, doc: _header_, _content_ +(lists: subdocs? images?)
-- [[./source_read_files.org][source_read_files]]
+** Output & Harvest pre-processing
+*** 1. raw file content split, doc: _header_, _content_ +(lists: subdocs? images?)
+- [[./source_read_files.org][source_read_files]] return tuple: header; body; insert file list; image list
- read in the _marked up source document_ and
- split the document into:
@@ -907,8 +911,8 @@ debug(header_and_body) {
}
#+END_SRC
-** 2. _document metadata_ & _make instructions_ (struct from toml)
-- [[./meta_conf_make_meta.org][meta_conf_make_meta]]
+*** 2. _document metadata_ & _make instructions_ (struct from toml)
+- [[./meta_conf_make_meta.org][meta_conf_make_meta]] return tuple: document metadata; make instructions
- read _document header_, split into:
- metadata
@@ -940,8 +944,8 @@ if ((_opt_action.debug_do)
}
#+END_SRC
-** 3. _document abstraction, tuple_ (output-pre-processing) [#A]
-- [[./meta_abstraction.org][meta_abstraction]]
+*** 3. _document abstraction, tuple_ (output-pre-processing) [#A]
+- [[./meta_abstraction.org][meta_abstraction]] return tuple: document abstraction; abstraction keys; segnames; image list
- prepare the document abstraction used in downstream processing
@@ -988,10 +992,10 @@ if ((_opt_action.debug_do)
}
#+END_SRC
-** 4. _document matters_ (doc info gathered, various sources) [#A]
-
-- prepare document_matters, miscellany about processing and the document of use
- in downstream processing
+*** 4. _document matters_ (doc info gathered, various sources) [#A]
+- gather doc matters
+ - prepare document_matters, miscellany about processing and the document of
+ use in downstream processing
#+NAME: doc_reform_each_file_do_document_matters
#+BEGIN_SRC d
@@ -1087,8 +1091,9 @@ if ((_opt_action.debug_do)
* 3. document abstraction _summary_ :module:doc_reform:metadoc_summary:
** 0. module template
+- document summary from abstraction
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc_summary.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_summary.d"
module doc_reform.meta.metadoc_summary;
template DocReformAbstractionSummary() {
auto DocReformAbstractionSummary(S,T)(
diff --git a/org/imports.org b/org/imports.org
index e513e81..b3f366d 100644
--- a/org/imports.org
+++ b/org/imports.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -16,7 +16,7 @@
* 1. imports for meta :meta:
** package dir
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/package.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/package.d"
module doc_reform.meta;
<<imports_for_meta_general>>
#+END_SRC
@@ -46,7 +46,7 @@ public import
* 2. imports for output :output:
** package dir
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/package.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/package.d"
module doc_reform.output;
<<imports_for_output_general>>
#+END_SRC
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index 92cab2d..8b8fe79 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -20,7 +20,7 @@ Process markup document, create document abstraction.
** 0. module template :module:metadoc_from_src:
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/metadoc_from_src.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_from_src.d"
/++
document abstraction:
abstraction of sisu markup for downstream processing
@@ -4963,8 +4963,10 @@ auto table_instructions(O,H)(
table_object.has.inline_notes_star = false;
table_object.has.inline_links = false;
if (auto m = table_head.matchFirst(rgx.table_head_instructions)) {
- table_object.table.heading = ((m["c_heading"].length > 0) && (m["c_heading"] == "h")) ? true : false;
- table_object.table.number_of_columns = ((m["c_num"].length > 0) && (m["c_num"].to!int > 0)) ? m["c_num"].to!int : 0; // double check, may be obsolete
+ table_object.table.heading
+ = ((m["c_heading"].length > 0) && (m["c_heading"] == "h")) ? true : false;
+ table_object.table.number_of_columns
+ = ((m["c_num"].length > 0) && (m["c_num"].to!int > 0)) ? m["c_num"].to!int : 0;
foreach (cw; m["c_widths"].matchAll(rgx.table_col_widths)) {
auto x = cw.hit.matchFirst(rgx.table_col_widths_and_alignment);
table_object.table.column_widths ~= x["width"].to!int;
@@ -5060,7 +5062,7 @@ auto table_array_munge(O,T)(
}
if (table_object.table.number_of_columns == 0
&& table_object.table.column_widths.length > 0) {
- writeln(__LINE__, " ERROR");
+ writeln(__LINE__, " ERROR");
}
if (table_object.table.number_of_columns > 0
&& table_object.table.column_widths.length == 0) {
@@ -7759,7 +7761,7 @@ set abstracted objects for downstream processing
** 0. module template
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/object_setter.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/object_setter.d"
/++
object setter:
setting of sisu objects for downstream processing
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index a45d7d0..f7b6fd1 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -43,7 +43,7 @@ import doc_reform.meta.conf_make_meta_structs;
** struct ConfComposite
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_structs.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_structs.d"
module doc_reform.meta.conf_make_meta_structs;
<<meta_defaults_template_structs>>
#+END_SRC
@@ -422,7 +422,7 @@ auto config_jsonstr = `{
* 1. JSON to DocReformStruct :module:conf_make_meta:json:
** 0. module template
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_json.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_json.d"
/++
json headers<BR>
extract json header return json
@@ -990,7 +990,8 @@ if (_struct_composite.meta.creator_author.empty) {
}
}
string[] authors_arr;
- auto authors_raw_arr = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter);
+ auto authors_raw_arr
+ = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter);
foreach (author_raw; authors_raw_arr) {
authors_arr ~= author_raw.replace(_rgx.raw_author_munge, "$2 $1");
}
@@ -1057,7 +1058,7 @@ if (_struct_composite.meta.title_main.empty) {
* 2. TOML returns DocReformStruct (via JSON) :module:conf_make_meta:struct:
** 0. parse TOML config return JSON
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_toml.d"
/++
extract native/orig header return associative array<BR>
@@ -1086,7 +1087,7 @@ static template configParseTOMLreturnJSON() {
** 1. parse TOML config to JSON return DocReformStruct
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_toml.d"
static template configParseTOMLreturnDocReformStruct() {
import
toml,
@@ -1101,7 +1102,8 @@ static template configParseTOMLreturnDocReformStruct() {
){
TOMLDocument _doc = parseTOML(cast(string)(_document_struct.content));
auto _doc_json = toJSON(_doc);
- _make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
+ _make_and_meta_struct
+ = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
return _make_and_meta_struct;
}
}
@@ -1109,7 +1111,7 @@ static template configParseTOMLreturnDocReformStruct() {
** 2. parse TOML header to JSON then Struct
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/conf_make_meta_toml.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_toml.d"
static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
import
std.exception,
@@ -1141,7 +1143,8 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
_doc = parseTOML(cast(string)(header_src));
}
auto _doc_json = toJSON(_doc);
- auto _header_and_make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header");
+ auto _header_and_make_and_meta_struct
+ = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header");
return _header_and_make_and_meta_struct;
}
}
diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index b507a4e..8412048 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -17,7 +17,7 @@
* 1. abstraction debugs :module:doc_reform:meta_doc_debugs:
** 0. module template
-#+BEGIN_SRC d :tangle ../src/doc_reform/meta/doc_debugs.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/meta/doc_debugs.d"
/++
output debugs
+/
diff --git a/org/output_hub.org b/org/output_hub.org
index 9cad03e..3fa0cb8 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -18,7 +18,7 @@
* 0. output hub [#A]
** module template :module:
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/hub.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/hub.d"
/++
output hub<BR>
check & generate output types requested
@@ -74,7 +74,8 @@ import doc_reform.output,
#+END_SRC
** outputs
-*** source: _sisusrc_ &/or _pod_ :source:pod:
+*** files
+**** source: _sisusrc_ &/or _pod_ :source:pod:
- [[./output_pod.org][output_pod]]
#+name: output_scheduled_task
@@ -86,19 +87,7 @@ if (sched == outTask.pod) {
}
#+END_SRC
-*** sqlite :sqlite:
-**** discrete
-
-#+name: output_scheduled_task
-#+BEGIN_SRC d
-if (sched == outTask.sqlite) {
- msg.v("sqlite processing... ");
- SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters, doc_abstraction);
- msg.vv("sqlite done");
-}
-#+END_SRC
-
-*** epub :epub:
+**** epub :epub:
#+name: output_scheduled_task
#+BEGIN_SRC d
@@ -109,8 +98,8 @@ if (sched == outTask.epub) {
}
#+END_SRC
-*** html :html:
-**** scroll :scroll:
+**** html :html:
+***** scroll :scroll:
#+name: output_scheduled_task
#+BEGIN_SRC d
@@ -121,7 +110,7 @@ if (sched == outTask.html_scroll) {
}
#+END_SRC
-**** seg :seg:
+***** seg :seg:
#+name: output_scheduled_task
#+BEGIN_SRC d
@@ -132,7 +121,7 @@ if (sched == outTask.html_seg) {
}
#+END_SRC
-**** css, images etc :css:images:
+***** css, images etc :css:images:
#+name: output_scheduled_task
#+BEGIN_SRC d
@@ -143,9 +132,20 @@ if (sched == outTask.html_stuff) {
}
#+END_SRC
-* output options
-** sqlite collection :sqlite:
-*** update / populate :update:
+**** sqlite discrete :sqlite:
+
+#+name: output_scheduled_task
+#+BEGIN_SRC d
+if (sched == outTask.sqlite) {
+ msg.v("sqlite processing... ");
+ SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters, doc_abstraction);
+ msg.vv("sqlite done");
+}
+#+END_SRC
+
+*** db:sql
+**** sqlite collection :sqlite:
+***** update / populate :update:
#+name: output_shared_sqlite_db
#+BEGIN_SRC d
@@ -160,8 +160,8 @@ if (doc_matters.opt.action.sqlite_update) {
}
#+END_SRC
-*** no markup source files to process
-**** drop :drop:
+***** no markup source files to process
+****** drop :drop:
#+name: output_options_op
#+BEGIN_SRC d
@@ -176,7 +176,7 @@ if ((opt_action.sqlite_db_drop)) {
}
#+END_SRC
-**** create :create:
+****** create :create:
#+name: output_options_op
#+BEGIN_SRC d
diff --git a/org/output_sqlite.org b/org/output_sqlite.org
index 3e7938a..7d49461 100644
--- a/org/output_sqlite.org
+++ b/org/output_sqlite.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -22,7 +22,7 @@
*** hub
**** collection
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
module doc_reform.output.sqlite;
<<output_imports>>
import d2sqlite3;
@@ -57,7 +57,7 @@ template SQLiteHubBuildTablesAndPopulate() {
**** discrete
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteHubDiscreteBuildTablesAndPopulate() {
void SQLiteHubDiscreteBuildTablesAndPopulate(M,D)(
M doc_matters,
@@ -85,7 +85,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() {
*** db run
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteDbRun() {
void SQLiteDbRun(Db,St,O)(
Db db,
@@ -126,7 +126,7 @@ template SQLiteDbRun() {
*** munge
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLinsertDelimiter() {
auto SQLinsertDelimiter(string _txt) {
_txt = _txt
@@ -154,7 +154,7 @@ template SQLiteFormatAndLoadObject() {
*** sqlite instructions
**** create
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteTablesReCreate() {
string SQLiteTablesReCreate()() {
string _sql_instruct;
@@ -172,7 +172,7 @@ template SQLiteTablesReCreate() {
**** delete
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteDeleteDocument() {
string SQLiteDeleteDocument(M)(
M doc_matters,
@@ -185,7 +185,7 @@ template SQLiteDeleteDocument() {
**** insert
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteInsertMetadata() {
string SQLiteInsertMetadata(M)(
M doc_matters,
@@ -198,7 +198,7 @@ template SQLiteInsertMetadata() {
**** insert doc objects loop
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteInsertDocObjectsLoop() {
string SQLiteInsertDocObjectsLoop(M,D)(
M doc_matters,
@@ -216,7 +216,7 @@ template SQLiteInsertDocObjectsLoop() {
**** tables create
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteTablesCreate() {
void SQLiteTablesCreate(E,O)(E env, O opt_action) {
import d2sqlite3;
@@ -249,7 +249,7 @@ template SQLiteTablesCreate() {
**** tables drop
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/sqlite.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d"
template SQLiteDbDrop() {
void SQLiteDbDrop(O)(O opt_action) {
writeln("db drop");
diff --git a/org/output_src_pod.org b/org/output_src_pod.org
index 0767cfd..13f0fb9 100644
--- a/org/output_src_pod.org
+++ b/org/output_src_pod.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -19,7 +19,7 @@
* pod
** module template :module:
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/source_pod.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/source_pod.d"
module doc_reform.output.source_pod;
template DocReformPod() {
<<output_imports>>
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 5a39bfd..c58f775 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -1,14 +1,14 @@
#+TITLE: doc_reform output xmls
#+DESCRIPTION: documents - structuring, publishing in multiple formats & search
-#+FILETAGS: :doc_reform:output:xmls:
+#+FILETAGS: :doc_reform:output:xml:
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -20,7 +20,7 @@
** format xhtml objects :format:
*** 0. module template :module:
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/xmls.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/xmls.d"
module doc_reform.output.xmls;
template outputXHTMLs() {
<<output_imports>>
@@ -1426,7 +1426,7 @@ auto endnote(M,O)(
* _html_ [#A] :html:
** module template :module:
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/html.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/html.d"
module doc_reform.output.html;
template outputHTML() {
<<output_imports>>
@@ -2020,7 +2020,7 @@ void images_cp(M)(
** module template :module:
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/epub3.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/epub3.d"
module doc_reform.output.epub3;
template outputEPub3() {
<<output_imports>>
diff --git a/org/output_xmls_css.org b/org/output_xmls_css.org
index 6793a22..ec319a4 100644
--- a/org/output_xmls_css.org
+++ b/org/output_xmls_css.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -19,7 +19,7 @@
* 0. output css defaults :module:doc_reform:output_xmls_css:
** 0. module template
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/xmls_css.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/xmls_css.d"
/++
default css settings
+/
diff --git a/org/output_zip.org b/org/output_zip.org
index 43100d6..647a93c 100644
--- a/org/output_zip.org
+++ b/org/output_zip.org
@@ -4,11 +4,11 @@
#+DESCRIPTION: documents - structuring, publishing in multiple formats & search
#+KEYWORDS
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+FILETAGS: :doc_reform:rel:output:
@@ -20,7 +20,7 @@
* _zip_ :module:doc_reform:create_zip_file:
** module template
-#+BEGIN_SRC d :tangle ../src/doc_reform/output/create_zip_file.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/output/create_zip_file.d"
module doc_reform.output.create_zip_file;
template createZipFile() {
import std.file;
diff --git a/org/source_files_read.org b/org/source_files_read.org
index 798b370..e08355a 100644
--- a/org/source_files_read.org
+++ b/org/source_files_read.org
@@ -4,11 +4,11 @@
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+LANGUAGE: en
-#+STARTUP: indent content
+#+STARTUP: indent content hideblocks hidestars
#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
-#+PROPERTY: header-args :padline no :exports code :noweb yes
+#+PROPERTY: header-args :padline no :exports code :cache no :noweb yes
#+EXPORT_SELECT_TAGS: export
#+EXPORT_EXCLUDE_TAGS: noexport
#+TAGS: assert(a) class(c) debug(d) mixin(m) doc_reform(s) tangle(T) template(t) WEB(W) noexport(n)
@@ -28,7 +28,7 @@ import
* A. get _config file_ (read in)
** 0. module template :module:config_files:
-#+BEGIN_SRC d :tangle ../src/doc_reform/source/read_config_files.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/source/read_config_files.d"
/++
read configuration files<BR>
- read config files<BR>
@@ -266,7 +266,7 @@ static template configReadDocTOML() {
* B. get _markup source_, read file :module:source_files:
** 0. module template (includes tuple)
-#+BEGIN_SRC d :tangle ../src/doc_reform/source/read_source_files.d
+#+BEGIN_SRC d :tangle "../src/doc_reform/source/read_source_files.d"
/++
module source_read_source_files;<BR>
- open markup files<BR>
diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d
index 48608f6..081c95c 100755
--- a/src/doc_reform/doc_reform.d
+++ b/src/doc_reform/doc_reform.d
@@ -131,10 +131,9 @@ void main(string[] args) {
"sqlite-db-create", "--sqlite-db-create create db, create tables", &opts["sqlite-db-create"],
"sqlite-db-drop", "--sqlite-db-drop drop tables & db", &opts["sqlite-db-drop"],
"sqlite-db-recreate", "--sqlite-db-recreate create db, create tables", &opts["sqlite-db-recreate"],
- // "sqlite-db-populate", "--sqlite-db-populate create db & tables, insert specified", &opts["sqlite-db-populate"],
- "sqlite-delete", "--sqlite process sqlite output", &opts["sqlite-delete"],
- "sqlite-insert", "--sqlite process sqlite output", &opts["sqlite-insert"],
- "sqlite-update", "--sqlite process sqlite output", &opts["sqlite-update"],
+ "sqlite-delete", "--sqlite-delete process sqlite output", &opts["sqlite-delete"],
+ "sqlite-insert", "--sqlite-insert process sqlite output", &opts["sqlite-insert"],
+ "sqlite-update", "--sqlite-update process sqlite output", &opts["sqlite-update"],
"text", "--text process text output", &opts["text"],
"txt", "--txt process text output", &opts["text"],
"verbose|v", "--verbose output to terminal", &opts["verbose"],
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 484747a..248c9d2 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -543,7 +543,8 @@ static template contentJSONtoDocReformStruct() {
}
}
string[] authors_arr;
- auto authors_raw_arr = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter);
+ auto authors_raw_arr
+ = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter);
foreach (author_raw; authors_raw_arr) {
authors_arr ~= author_raw.replace(_rgx.raw_author_munge, "$2 $1");
}
diff --git a/src/doc_reform/meta/conf_make_meta_toml.d b/src/doc_reform/meta/conf_make_meta_toml.d
index 1cf935b..46bd6a3 100644
--- a/src/doc_reform/meta/conf_make_meta_toml.d
+++ b/src/doc_reform/meta/conf_make_meta_toml.d
@@ -36,7 +36,8 @@ static template configParseTOMLreturnDocReformStruct() {
){
TOMLDocument _doc = parseTOML(cast(string)(_document_struct.content));
auto _doc_json = toJSON(_doc);
- _make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
+ _make_and_meta_struct
+ = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, _document_struct.filename); // struct from json
return _make_and_meta_struct;
}
}
@@ -71,7 +72,8 @@ static template docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct() {
_doc = parseTOML(cast(string)(header_src));
}
auto _doc_json = toJSON(_doc);
- auto _header_and_make_and_meta_struct = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header");
+ auto _header_and_make_and_meta_struct
+ = contentJSONtoDocReformStruct!()(_make_and_meta_struct, _doc_json, "header");
return _header_and_make_and_meta_struct;
}
}
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index cdb1e6b..c3c6147 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -4017,8 +4017,10 @@ template DocReformDocAbstraction() {
table_object.has.inline_notes_star = false;
table_object.has.inline_links = false;
if (auto m = table_head.matchFirst(rgx.table_head_instructions)) {
- table_object.table.heading = ((m["c_heading"].length > 0) && (m["c_heading"] == "h")) ? true : false;
- table_object.table.number_of_columns = ((m["c_num"].length > 0) && (m["c_num"].to!int > 0)) ? m["c_num"].to!int : 0; // double check, may be obsolete
+ table_object.table.heading
+ = ((m["c_heading"].length > 0) && (m["c_heading"] == "h")) ? true : false;
+ table_object.table.number_of_columns
+ = ((m["c_num"].length > 0) && (m["c_num"].to!int > 0)) ? m["c_num"].to!int : 0;
foreach (cw; m["c_widths"].matchAll(rgx.table_col_widths)) {
auto x = cw.hit.matchFirst(rgx.table_col_widths_and_alignment);
table_object.table.column_widths ~= x["width"].to!int;
@@ -4108,7 +4110,7 @@ template DocReformDocAbstraction() {
}
if (table_object.table.number_of_columns == 0
&& table_object.table.column_widths.length > 0) {
- writeln(__LINE__, " ERROR");
+ writeln(__LINE__, " ERROR");
}
if (table_object.table.number_of_columns > 0
&& table_object.table.column_widths.length == 0) {
diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d
index 5e036dd..e8d0dc4 100644
--- a/src/doc_reform/output/hub.d
+++ b/src/doc_reform/output/hub.d
@@ -26,11 +26,6 @@ template outputHub() {
DocReformPod!()(doc_matters);
msg.vv("sisu source done");
}
- if (sched == outTask.sqlite) {
- msg.v("sqlite processing... ");
- SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters, doc_abstraction);
- msg.vv("sqlite done");
- }
if (sched == outTask.epub) {
msg.v("epub3 processing... ");
outputEPub3!()(doc_abstraction, doc_matters);
@@ -51,6 +46,11 @@ template outputHub() {
outputHTML!().images_cp(doc_matters);
msg.vv("html css & images done");
}
+ if (sched == outTask.sqlite) {
+ msg.v("sqlite processing... ");
+ SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters, doc_abstraction);
+ msg.vv("sqlite done");
+ }
}
if (!(doc_matters.opt.action.parallelise_subprocesses)) {
foreach(schedule; doc_matters.opt.action.output_task_scheduler) {
diff --git a/src/doc_reform/source/paths_source.d b/src/doc_reform/source/paths_source.d
index 70e2fc4..a6f3fc1 100644
--- a/src/doc_reform/source/paths_source.d
+++ b/src/doc_reform/source/paths_source.d
@@ -252,7 +252,7 @@ template PathMatters() {
assert(_dir == absolute_path_to_src
.match(rgx.src_base_parent_dir_name).captures["dir"]);
}
- if ((_opt_actions.debug_do)) {
+ if (_opt_actions.debug_do) {
writeln("--> (base_dir) ", _dir);
}
return _dir;
@@ -284,7 +284,7 @@ template PathMatters() {
} else {
_dir = asNormalizedPath(path_and_fn.chainPath("../../")).array;
}
- if ((_opt_actions.debug_do)) {
+ if (_opt_actions.debug_do) {
writeln("--> (base_dir_path) ", _dir);
}
return _dir;
@@ -330,7 +330,7 @@ template PathMatters() {
} else {
_dir = (absolute_path_to_src).match(rgx.src_base_parent_dir_name).captures["dir"];
}
- if ((_opt_actions.debug_do)) {
+ if (_opt_actions.debug_do) {
writeln("--> (base_parent_dir) ", _dir);
}
return _dir;
@@ -546,7 +546,7 @@ template DocReformPathsPods() {
mixin DocReformRgxInit;
static auto rgx = Rgx();
string _suffix = ".zip";
- auto DocReformPathsPods(Dm)(Dm doc_matters) {
+ auto DocReformPathsPods(M)(M doc_matters) {
string _base_dir_pod = (doc_matters.output_path.length > 0)
? doc_matters.output_path ~ "/pod"
: "/pod";
diff --git a/views/version.txt b/views/version.txt
index 913d935..700193b 100644
--- a/views/version.txt
+++ b/views/version.txt
@@ -4,7 +4,7 @@ struct Version {
int minor;
int patch;
}
-enum ver = Version(0, 3, 2);
+enum ver = Version(0, 3, 3);
version (Posix) {
version (DigitalMars) {
} else version (LDC) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 12:03:28 +0000