aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-05-07 16:07:11 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commite31e98f5cc3c2289ad47198a506d8d03a063512c (patch)
treec954269daebba8549190d1e4a91f4a64ae62664c /org
parentcleaning (diff)
0.15.0 named modules
Diffstat (limited to 'org')
-rw-r--r--org/ao_conf_make_meta.org27
-rw-r--r--org/ao_debugs.org9
-rw-r--r--org/ao_doc_abstraction.org26
-rw-r--r--org/ao_read_source_files.org14
-rw-r--r--org/compile_time_info.org5
-rw-r--r--org/default_misc.org10
-rw-r--r--org/default_paths.org13
-rw-r--r--org/default_regex.org14
-rw-r--r--org/output_hub.org20
-rw-r--r--org/output_sisupod.org15
-rw-r--r--org/output_xmls.org65
-rw-r--r--org/output_xmls_css.org5
-rw-r--r--org/output_zip.org5
-rw-r--r--org/sdp.org46
14 files changed, 151 insertions, 123 deletions
diff --git a/org/ao_conf_make_meta.org b/org/ao_conf_make_meta.org
index ad656aa..471d233 100644
--- a/org/ao_conf_make_meta.org
+++ b/org/ao_conf_make_meta.org
@@ -13,7 +13,8 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 0. Header Hub :ao_markup_header_extract:
+* 0. Header Hub :module:sdp:ao_conf_make_meta:
+** module template
#+BEGIN_SRC d :tangle ../src/sdp/ao_conf_make_meta.d
/++
@@ -26,6 +27,7 @@
converting the metadata and make instructions to a common json format used by
program internally. Moved to associative array.
+/
+module sdp.ao_conf_make_meta;
template SiSUheaderExtractHub() {
private import
std.exception,
@@ -37,9 +39,9 @@ template SiSUheaderExtractHub() {
std.conv : to;
private import sdlang;
private import
- ao_rgx,
- ao_conf_make_meta_native,
- ao_conf_make_meta_sdlang;
+ sdp.ao_rgx,
+ sdp.ao_conf_make_meta_native,
+ sdp.ao_conf_make_meta_sdlang;
mixin SiSUrgxInit;
mixin SiSUheaderExtractNative;
mixin SiSUheaderExtractSDLang;
@@ -64,7 +66,8 @@ template SiSUheaderExtractHub() {
}
#+END_SRC
-* A. header sdlang
+* A. header sdlang (extract) :module:sdp:ao_conf_make_meta_sdlang:
+** module template
** extract sdlang header
#+BEGIN_SRC d :tangle ../src/sdp/ao_conf_make_meta_sdlang.d
@@ -72,6 +75,7 @@ template SiSUheaderExtractHub() {
sdlang headers<BR>
extract sdlang header return sdlang
+/
+module sdp.ao_conf_make_meta_sdlang;
template SiSUheaderExtractSDLang() {
private import
std.exception,
@@ -83,8 +87,8 @@ template SiSUheaderExtractSDLang() {
std.utf,
std.conv : to;
private import
- ao_rgx,
- ao_defaults;
+ sdp.ao_rgx,
+ sdp.ao_defaults;
struct HeaderExtractSDL {
mixin SiSUregisters;
mixin SiSUrgxInit;
@@ -263,14 +267,15 @@ private auto headerSDLangToAA(Hs,Ma)(Hs header_sdlang_src, Ma conf_doc_make_aa)
}
#+END_SRC
-* B. header native :header:native:
-** Header Native :ao_markup_header_extract_native:
+* B. header native :module:sdp:ao_conf_make_meta_native:
+** Header Native :header:native:markup_header_extract_native:
#+BEGIN_SRC d :tangle ../src/sdp/ao_conf_make_meta_native.d
/++
native headers using<br>@title:<BR>:subtitle:<BR>type tags<BR>
extract native/orig header return associative array
+/
+module sdp.ao_conf_make_meta_native;
template SiSUheaderExtractNative() {
private import
std.exception,
@@ -282,8 +287,8 @@ template SiSUheaderExtractNative() {
std.utf,
std.conv : to;
private import
- ao_rgx,
- ao_defaults;
+ sdp.ao_rgx,
+ sdp.ao_defaults;
struct HeaderDocMetadataAndMakeNativeToAA {
mixin SiSUregisters;
mixin SiSUrgxInitFlags;
diff --git a/org/ao_debugs.org b/org/ao_debugs.org
index e0f96da..838d7cf 100644
--- a/org/ao_debugs.org
+++ b/org/ao_debugs.org
@@ -13,13 +13,14 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 1. abstraction debugs :debug:doc:abstraction:
-** 0. code structure: :ao_doc_debugs:
+* 1. abstraction debugs :module:sdp:ao_doc_debugs:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/ao_doc_debugs.d
/++
output debugs
+/
+module sdp.ao_doc_debugs;
template SiSUdebugs() {
<<debug_imports>>
auto SiSUdebugs(S,T)(
@@ -45,8 +46,8 @@ template SiSUdebugs() {
#+name: debug_imports
#+BEGIN_SRC d
import
- ao_defaults,
- ao_rgx;
+ sdp.ao_defaults,
+ sdp.ao_rgx;
private import
std.algorithm,
std.array,
diff --git a/org/ao_doc_abstraction.org b/org/ao_doc_abstraction.org
index f6d65e1..75ed2a6 100644
--- a/org/ao_doc_abstraction.org
+++ b/org/ao_doc_abstraction.org
@@ -102,10 +102,10 @@
| | | | | - heading row | | | |
|-------+--------------+----------------------------+--------------------------+----------------+-----------------+----------------+------------|
-* 1. Document Abstraction :abstract:process:
+* 1. Document Abstraction :module:sdp:ao_abstract_doc_source:
Process markup document, create document abstraction.
-** 0. ao abstract doc source: :ao_abstract_doc_source:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/ao_abstract_doc_source.d
/++
@@ -113,6 +113,7 @@ Process markup document, create document abstraction.
abstraction of sisu markup for downstream processing
ao_abstract_doc_source.d
+/
+module sdp.ao_abstract_doc_source;
template SiSUdocAbstraction() {
/+ ↓ abstraction imports +/
<<abs_top_imports>>
@@ -233,10 +234,10 @@ template SiSUdocAbstraction() {
#+name: abs_top_imports
#+BEGIN_SRC d
import
- ao_defaults,
- ao_object_setter,
- ao_rgx,
- output_hub;
+ sdp.ao_defaults,
+ sdp.ao_object_setter,
+ sdp.ao_rgx,
+ sdp.output_hub;
private import
std.algorithm,
std.array,
@@ -1731,7 +1732,7 @@ the_document_head_section ~= the_document_body_section[0];
the_document_body_section=the_document_body_section[1..$];
#+END_SRC
-*** _minor loops_ :post:
+*** _minor loops_ :post:
**** 1. loop: backmatter loop up to lev4: html_segnames, set backmatter pointers
could optimise by
@@ -6630,7 +6631,7 @@ struct NodeStructureMetadata {
#+END_SRC
*** function assertions :assertions:
-**** mixin template: assertions on markup document structure :doc_structure:
+**** assertions on markup document structure :doc_structure:
#+name: abs_functions_assertions
#+BEGIN_SRC d
@@ -6815,7 +6816,7 @@ auto assertions_doc_structure(O,Lv)(
}
#+END_SRC
-**** mixin template: assertions on blocks :blocks:
+**** assertions on blocks :blocks:
#+name: abs_functions_assertions
#+BEGIN_SRC d
@@ -6865,11 +6866,11 @@ template docSectKeysSeq() {
}
#+END_SRC
-* 2. Object Setter (Set Abstract Object) :abstract:object:
+* 2. Object Setter (Set Abstract Object) :module:sdp:ao_object_setter:
set abstracted objects for downstream processing
-** 0. ao object setter: :ao_object_setter:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/ao_object_setter.d
/++
@@ -6877,6 +6878,7 @@ set abstracted objects for downstream processing
setting of sisu objects for downstream processing
ao_object_setter.d
+/
+module sdp.ao_object_setter;
template ObjectSetter() {
/+ structs +/
<<ao_structs_init>>
@@ -6899,7 +6901,7 @@ struct HeadingAttrib {
}
#+END_SRC
-*** [#A] composite object
+*** [#A] _composite object_
#+name: ao_structs_init
#+BEGIN_SRC d
diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org
index 134b64b..9b9e863 100644
--- a/org/ao_read_source_files.org
+++ b/org/ao_read_source_files.org
@@ -13,8 +13,8 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 1. get config file :config:
-** 0. config files, read in
+* 1. get config file (read in) :module:sdp:ao_read_config_files:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/ao_read_config_files.d
/++
@@ -22,6 +22,7 @@
- read config files<BR>
ao_config_files.d
+/
+module sdp.ao_read_config_files;
template ConfigIn() {
<<imports_std>>
import std.file;
@@ -157,9 +158,9 @@ final auto ConfigHub(C,E)(C conf_sdl, E env) {
}
#+END_SRC
-* 2. get markup source, read file
+* 2. get markup source, read file :module:sdp:ao_read_source_files:
-** 0. ao_markup_source_raw.d: :ao_markup_source_raw:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/ao_read_source_files.d
/++
@@ -167,9 +168,10 @@ final auto ConfigHub(C,E)(C conf_sdl, E env) {
- open markup files<BR>
- if master file scan for addional files to import/insert
+/
+module sdp.ao_read_source_files;
template SiSUrawMarkupContent() {
private import
- ao_rgx;
+ sdp.ao_rgx;
<<imports_std>>
mixin SiSUrgxInit;
auto rgx = Rgx();
@@ -220,7 +222,7 @@ template SiSUrawMarkupContent() {
<<ao_markup_source_raw_get_insert_source_line_array>>
}
struct Inserts {
- private import ao_defaults;
+ private import sdp.ao_defaults;
auto scan_subdoc_source(
char[][] markup_sourcefile_insert_content,
string fn_src
diff --git a/org/compile_time_info.org b/org/compile_time_info.org
index 66e56fc..5da7e04 100644
--- a/org/compile_time_info.org
+++ b/org/compile_time_info.org
@@ -13,19 +13,20 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* compilation info :compile:
+* compilation info :module:sdp:compile_time_info:
[[../maker.org][maker.org makefile]]
[[./sdp.org][sdp hub]] [[./][org/]]
e.g. do on linux bsd osx not windows:
version(Windows) {} else { ... }
-** 0. compile_time_info :compile_time_info:
+** 0. module template
#+begin_src d :tangle ../src/sdp/compile_time_info.d
/++
compile_time_info
+/
+module sdp.compile_time_info;
template CompileTimeInfo() {
<<sdp_compile_time_info>>
}
diff --git a/org/default_misc.org b/org/default_misc.org
index bf18361..84b9076 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -13,14 +13,15 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 0. ao defaults :defaults:
-** 0. tangle template
+* 0. ao defaults :module:sdp:ao_defaults:
+** 0. module template
#+name: tangle_defaults
#+BEGIN_SRC d :tangle ../src/sdp/ao_defaults.d
/++
default settings
+/
+module sdp.ao_defaults;
template SiSUregisters() {
<<ao_defaults_imports>>
<<ao_defaults_template_registers>>
@@ -531,14 +532,15 @@ template SiSUbiblio() {
}
#+END_SRC
-* 1. output defaults
-** 0. tangle: :defaults:
+* 1. output defaults :module:sdp:defaults:
+** 0. module template
#+name: tangle_defaults
#+BEGIN_SRC d :tangle ../src/sdp/defaults.d
/++
default settings
+/
+module sdp.defaults;
<<defaults_template_init_flags>>
<<defaults_template_markup>>
<<defaults_template_language_codes>>
diff --git a/org/default_paths.org b/org/default_paths.org
index 65a0c0f..597f162 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -13,7 +13,8 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 0. source paths :paths:dir:source:
+* 0. source paths :module:sdp:paths_source:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/paths_source.d
/++
@@ -21,11 +22,12 @@
- read config files<BR>
ao_config_files.d
+/
+module sdp.paths_source;
import std.array,
std.path,
std.regex,
std.stdio;
-import ao_rgx;
+import sdp.ao_rgx;
template SiSUpathsSRC() {
mixin SiSUrgxInit;
auto rgx = Rgx();
@@ -77,18 +79,19 @@ template SiSUpathsSRC() {
}
#+END_SRC
-* 1. output paths :paths:dir:output:
-** 0. tangle, template output paths
+* 1. output paths :module:sdp:paths_output:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/paths_output.d
/++
default settings
+/
+module sdp.paths_output;
import std.array,
std.path,
std.regex,
std.stdio;
-import ao_rgx;
+import sdp.ao_rgx;
<<template_paths_sisupod>>
<<template_paths_sisupod_zipped_archive>>
<<template_paths_sisupod_unzipped_filesystem>>
diff --git a/org/default_regex.org b/org/default_regex.org
index 01aa763..4c126a2 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -13,22 +13,23 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 0. ao ctRegex :regex:
+* 0. ao ctRegex :module:sdp:ao_rgx:
[[./sdp.org][sdp]] [[./][org/]]
http://dlang.org/phobos/std_regex.html
- Plain string, in which case it's compiled to bytecode before matching.
- Regex!char (wchar/dchar) that contains a pattern in the form of compiled bytecode.
- StaticRegex!char (wchar/dchar) that contains a pattern in the form of compiled native machine code.
-** 0. rgx code template: :ao_rgx:
+** 0. module template
#+name: tangle_ao_rgx
#+BEGIN_SRC d :tangle ../src/sdp/ao_rgx.d
/++
regex: regular expressions used in sisu document parser
+/
+module sdp.ao_rgx;
template SiSUrgxInit() {
- private import ao_defaults;
+ private import sdp.ao_defaults;
struct Rgx {
<<ao_rgx>>
<<prgmkup_rgx>>
@@ -342,22 +343,23 @@ auto language_code_and_filename =
ctRegex!("(?:^|[/])(am|bg|bn|br|ca|cs|cy|da|de|el|en|eo|es|et|eu|fi|fr|ga|gl|he|hi|hr|hy|ia|is|it|ja|ko|la|lo|lt|lv|ml|mr|nl|no|nn|oc|pl|pt|pt_BR|ro|ru|sa|se|sk|sl|sq|sr|sv|ta|te|th|tk|tr|uk|ur|vi|zh)/[A-Za-z0-9._-].+?[.](?:sst|ssm)$");
#+END_SRC
-* 1. output ctRegex :regex:
+* 1. output ctRegex :module:sdp:output_rgx:
[[./sdp.org][sdp]] [[./][org/]]
http://dlang.org/phobos/std_regex.html
- Plain string, in which case it's compiled to bytecode before matching.
- Regex!char (wchar/dchar) that contains a pattern in the form of compiled bytecode.
- StaticRegex!char (wchar/dchar) that contains a pattern in the form of compiled native machine code.
-** 0. code template: :rgx:
+** 0. module template
#+name: tangle_ao_rgx
#+BEGIN_SRC d :tangle ../src/sdp/output_rgx.d
/++
regex: regular expressions used in sisu document parser
+/
+module sdp.output_rgx;
template SiSUoutputRgxInit() {
- private import defaults;
+ private import sdp.defaults;
struct Rgx {
<<prgmkup_rgx>>
<<sp_ch_xhtml_rgx>>
diff --git a/org/output_hub.org b/org/output_hub.org
index a190c7b..e83b36d 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -13,13 +13,15 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 0. output hub [#A]
+* 0. output hub [#A] :module:sdp:output_hub:
+** module template
#+BEGIN_SRC d :tangle ../src/sdp/output_hub.d
/++
output hub<BR>
check & generate output types requested
+/
+module sdp.output_hub;
template outputHub() {
<<output_imports>>
void outputHub(D,I)(D doc_abstraction, I doc_matters) {
@@ -53,14 +55,14 @@ private import
std.uni,
std.utf;
import
- create_zip_file,
- defaults,
- output_epub3,
- output_html,
- output_rgx,
- output_xmls,
- paths_output,
- source_sisupod;
+ sdp.defaults,
+ sdp.output_epub3,
+ sdp.output_html,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.source_sisupod,
+ sdp.create_zip_file,
+ sdp.paths_output;
#+END_SRC
** output options
diff --git a/org/output_sisupod.org b/org/output_sisupod.org
index e161f54..f768176 100644
--- a/org/output_sisupod.org
+++ b/org/output_sisupod.org
@@ -14,9 +14,11 @@
[[./sdp.org][sdp]] [[./][org/]]
[[./output_hub.org][output_hub]]
-* sisupod template :template:
+* sisupod :module:sdp:source_sisupod:
+** module template
#+BEGIN_SRC d :tangle ../src/sdp/source_sisupod.d
+module sdp.source_sisupod;
template SiSUpod() {
<<output_imports>>
void SiSUpod(T)(T doc_matters) {
@@ -33,7 +35,6 @@ template SiSUpod() {
}
#+END_SRC
-* _sisupod_ :sisupod:
** output imports
#+name: output_imports
@@ -61,11 +62,11 @@ private import
std.zip,
std.conv : to;
import
- create_zip_file,
- defaults,
- output_rgx,
- output_xmls,
- paths_output;
+ sdp.create_zip_file,
+ sdp.defaults,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.paths_output;
#+END_SRC
** mkdir
diff --git a/org/output_xmls.org b/org/output_xmls.org
index 4c6013c..4ee8074 100644
--- a/org/output_xmls.org
+++ b/org/output_xmls.org
@@ -14,11 +14,12 @@
[[./sdp.org][sdp]] [[./][org/]]
[[./output_hub.org][output_hub]]
-* xml offspring (xhtml html epub) :xml:
+* xml offspring (xhtml html epub) :module:sdp:output_xmls:
** format xhtml objects :format:
-*** 0. xhtml common template :template:
+*** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/output_xmls.d
+module sdp.output_xmls;
template outputXHTMLs() {
<<output_imports>>
mixin SiSUoutputRgxInit;
@@ -57,12 +58,12 @@ private import
std.zip,
std.conv : to;
import
- create_zip_file,
- defaults,
- output_rgx,
- output_xmls,
- output_xmls_css,
- paths_output;
+ sdp.create_zip_file,
+ sdp.defaults,
+ sdp.output_rgx,
+ sdp.output_xmls,
+ sdp.output_xmls_css,
+ sdp.paths_output;
#+END_SRC
*** misc
@@ -1075,10 +1076,11 @@ auto endnote(O)(
}
#+END_SRC
-** _html_ [#A] :html:
-*** template :template:
+* _html_ [#A] :module:sdp:output_html:
+** module template
#+BEGIN_SRC d :tangle ../src/sdp/output_html.d
+module sdp.output_html;
template outputHTML() {
<<output_imports>>
mixin outputXHTMLs;
@@ -1089,8 +1091,8 @@ template outputHTML() {
}
#+END_SRC
-*** scroll :scroll:
-**** switch (sections & objects) format html output
+** scroll :scroll:
+*** switch (sections & objects) format html output
#+name: output_html_scroll
#+BEGIN_SRC d
@@ -1238,7 +1240,7 @@ void scroll(D,I)(
}
#+END_SRC
-**** write output file
+*** write output file
#+name: output_html_scroll
#+BEGIN_SRC d
@@ -1269,8 +1271,8 @@ void scroll_write_output(M,C)(
}
#+END_SRC
-*** seg :seg:
-**** switch (sections & objects) format html output
+** seg :seg:
+*** switch (sections & objects) format html output
#+name: output_html_seg
#+BEGIN_SRC d
@@ -1489,7 +1491,7 @@ void seg(D,I)(
}
#+END_SRC
-**** write output files
+*** write output files
#+name: output_html_seg
#+BEGIN_SRC d
@@ -1530,7 +1532,7 @@ void seg_write_output(M,D,E)(
}
#+END_SRC
-*** css :css:
+** css :css:
#+name: output_html_css
#+BEGIN_SRC d
@@ -1552,7 +1554,7 @@ void css(M)(
}
#+END_SRC
-** _epub_ [#B] :epub:
+* _epub_ [#B] :module:sdp:output_epub3:
|-----------------------+--------------------------+---------------------------+----------------------------------|
| function | filename | module | variable |
@@ -1570,9 +1572,10 @@ void css(M)(
| | | | doc_epub3_endnotes[seg_filename] |
|-----------------------+--------------------------+---------------------------+----------------------------------|
-*** template :template:
+** module template
#+BEGIN_SRC d :tangle ../src/sdp/output_epub3.d
+module sdp.output_epub3;
template outputEPub3() {
<<output_imports>>
mixin InternalMarkup;
@@ -1585,9 +1588,9 @@ template outputEPub3() {
}
#+END_SRC
-*** special (epub) files :format:
-**** DONE static
-***** _identify doc filetype_ (mimetype) [static]
+** special (epub) files :format:
+*** DONE static
+**** _identify doc filetype_ (mimetype) [static]
- mimetype file indicating that zip file contains an EPUB
@@ -1600,7 +1603,7 @@ string epub3_mimetypes() {
}
#+END_SRC
-***** _identify doc root_ (META-INF/container.xml) [static] rootfile: contains document root path
+**** _identify doc root_ (META-INF/container.xml) [static] rootfile: contains document root path
- identifies the root package document (so systems can find it), [unchanged from epub2]
@@ -1619,8 +1622,8 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
}
#+END_SRC
-**** constructs (in dir: OEBPS)
-***** TODO _doc manifest_ (OEBPS/content.opf) manifest, register content: files, images etc.
+*** constructs (in dir: OEBPS)
+**** TODO _doc manifest_ (OEBPS/content.opf) manifest, register content: files, images etc.
- manifest, listing all resources
- provides the default reading order
@@ -1703,7 +1706,7 @@ string epub3_oebps_content(D,I,P)(D doc_abstraction, I doc_matters, P parts) {
}
#+END_SRC
-***** _doc navigation epub3_ (OEBPS/toc_nav.xhtml) epub3 navigable toc using Dom structure
+**** _doc navigation epub3_ (OEBPS/toc_nav.xhtml) epub3 navigable toc using Dom structure
- toc_nav.xhtml declared as nav file in content.opf (epub3 navigation document)
@@ -1790,7 +1793,7 @@ string epub3_oebps_toc_nav_xhtml(D,I)(D doc_abstraction, I doc_matters) {
}
#+END_SRC
-***** TODO _doc navigation epub2_ (OEBPS/toc.ncx) navigable toc using Dom structure
+**** TODO _doc navigation epub2_ (OEBPS/toc.ncx) navigable toc using Dom structure
- toc.ncx (epub2 navigation document)
- (replaced in epub3 by a declared xhtml nav file, in our case toc_nav.xhtml)
@@ -1884,8 +1887,8 @@ string epub2_oebps_toc_ncx(D,I)(D doc_abstraction, I doc_matters) {
}
#+END_SRC
-*** the document contents :seg:
-**** switch (sections & objects) format epub3 xhtml output
+** the document contents :seg:
+*** switch (sections & objects) format epub3 xhtml output
#+name: output_epub3_xhtml_seg
#+BEGIN_SRC d
@@ -2167,7 +2170,7 @@ void outputEPub3(D,I)(
}
#+END_SRC
-*** write output files
+** write output files
#+name: output_epub3_xhtml_seg
#+BEGIN_SRC d
@@ -2367,7 +2370,7 @@ void epub3_write_output_files(M,D,E,Mt,Mic,Otnx,Otn,Oc)(
}
#+END_SRC
-*** zip debug, read zip archive
+** zip debug, read zip archive
#+name: output_epub3_xhtml_seg
#+BEGIN_SRC d
diff --git a/org/output_xmls_css.org b/org/output_xmls_css.org
index 5b34915..8fd2c6b 100644
--- a/org/output_xmls_css.org
+++ b/org/output_xmls_css.org
@@ -13,13 +13,14 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* 0. ao css defaults :defaults:
-** 0. tangle template
+* 0. ao css defaults :module:sdp:output_xmls_css:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/output_xmls_css.d
/++
default css settings
+/
+module sdp.output_xmls_css;
template SiSUcss() {
auto SiSUcss() {
string css_shared="
diff --git a/org/output_zip.org b/org/output_zip.org
index 8dd6f23..98aede6 100644
--- a/org/output_zip.org
+++ b/org/output_zip.org
@@ -13,10 +13,11 @@
#+TAGS: assert(a) class(c) debug(d) mixin(m) sdp(s) tangle(T) template(t) WEB(W) noexport(n)
[[./sdp.org][sdp]] [[./][org/]]
-* _zip_
-** template :template:
+* _zip_ :module:sdp:create_zip_file:
+** module template
#+BEGIN_SRC d :tangle ../src/sdp/create_zip_file.d
+module sdp.create_zip_file;
template createZipFile() {
import std.file;
import std.outbuffer;
diff --git a/org/sdp.org b/org/sdp.org
index edf258e..827a00f 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -23,7 +23,7 @@ struct Version {
int minor;
int patch;
}
-enum ver = Version(0, 14, 0);
+enum ver = Version(0, 15, 0);
#+END_SRC
* 1. sdp (sisu document parser) :sdp:
@@ -39,13 +39,13 @@ enum ver = Version(0, 14, 0);
** 0. sdp src/sdp.d :template:
-#+BEGIN_SRC d :tangle ../src/sdp.d :shebang #!/usr/bin/env rdmd
+#+BEGIN_SRC d :tangle ../src/sisu_d_parser.d :shebang #!/usr/bin/env rdmd
/+
sdp
+/
import
- compile_time_info,
- abstraction;
+ sdp.compile_time_info,
+ sdp.abstraction;
<<imports_sdp>>
<<imports_sdlang>>
<<imports_std>>
@@ -88,18 +88,18 @@ unittest {
#+BEGIN_SRC d
/+ sdp: sisu document parser, see http://sisudoc.org +/
import
- abstraction_summary,
- ao_abstract_doc_source,
- ao_conf_make_meta,
- ao_conf_make_meta_native,
- ao_conf_make_meta_sdlang,
- ao_defaults,
- ao_doc_debugs,
- ao_read_config_files,
- ao_read_source_files,
- ao_rgx,
- output_hub,
- paths_source;
+ sdp.abstraction_summary,
+ sdp.ao_abstract_doc_source,
+ sdp.ao_conf_make_meta,
+ sdp.ao_conf_make_meta_native,
+ sdp.ao_conf_make_meta_sdlang,
+ sdp.ao_defaults,
+ sdp.ao_doc_debugs,
+ sdp.ao_read_config_files,
+ sdp.ao_read_source_files,
+ sdp.ao_rgx,
+ sdp.output_hub,
+ sdp.paths_source;
#+END_SRC
****** notes
@@ -440,10 +440,11 @@ writeln("no recognized filename");
break; // terminate, stop
#+END_SRC
-* 2. _document abstraction functions_
-** 0. abstraction template [#A] :template:
+* 2. _document abstraction functions_ :module:sdp:abstraction:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/abstraction.d
+module sdp.abstraction;
template SiSUabstraction() {
<<imports_sdp>>
<<imports_sdlang>>
@@ -615,10 +616,11 @@ struct DocumentMatters {
auto doc_matters = DocumentMatters();
#+END_SRC
-* 3. document abstraction _summary_ :summary:doc:
-** 0. template: :template:
+* 3. document abstraction _summary_ :module:sdp:abstraction_summary:
+** 0. module template
#+BEGIN_SRC d :tangle ../src/sdp/abstraction_summary.d
+module sdp.abstraction_summary;
template SiSUabstractionSummary() {
auto SiSUabstractionSummary(S,T)(
auto return ref const S doc_abstraction,
@@ -640,8 +642,8 @@ template SiSUabstractionSummary() {
#+name: abstraction_summary_imports
#+BEGIN_SRC d
import
- ao_defaults,
- ao_rgx;
+ sdp.ao_defaults,
+ sdp.ao_rgx;
import
std.array,
std.exception,