diff options
Diffstat (limited to 'org/sdp.org')
| -rw-r--r-- | org/sdp.org | 58 |
1 files changed, 37 insertions, 21 deletions
diff --git a/org/sdp.org b/org/sdp.org index e34c57b..2f93812 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -23,7 +23,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 15, 0); +enum ver = Version(0, 16, 0); #+END_SRC * 1. sdp (sisu document parser) :sdp: @@ -37,15 +37,15 @@ enum ver = Version(0, 15, 0); - process file - output -** 0. sdp src/sdp.d :template: +** 0. sdp src/sdp :template: -#+BEGIN_SRC d :tangle ../src/sisu_d_parser.d :shebang #!/usr/bin/env rdmd +#+BEGIN_SRC d :tangle ../src/sdp/sisu_d_parser.d :shebang #!/usr/bin/env rdmd /+ sdp +/ import - sdp.compile_time_info, - sdp.abstraction; + sdp.conf.compile_time_info, + sdp.ao.abstraction; <<imports_sdp>> <<imports_sdlang>> <<imports_std>> @@ -87,7 +87,23 @@ unittest { #+NAME: imports_sdp #+BEGIN_SRC d /+ sdp: sisu document parser, see http://sisudoc.org +/ -import sdp.imports_for_ao; +import sdp.ao; +import + std.getopt, + std.process; +import + sdp.ao.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.output.paths_source; #+END_SRC ****** notes @@ -402,8 +418,8 @@ break; // terminate, stop * 2. _document abstraction functions_ :module:sdp:abstraction: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/abstraction.d -module sdp.abstraction; +#+BEGIN_SRC d :tangle ../src/sdp/ao/abstraction.d +module sdp.ao.abstraction; template SiSUabstraction() { <<imports_sdp>> <<imports_sdlang>> @@ -578,8 +594,8 @@ auto doc_matters = DocumentMatters(); * 3. document abstraction _summary_ :module:sdp:abstraction_summary: ** 0. module template -#+BEGIN_SRC d :tangle ../src/sdp/abstraction_summary.d -module sdp.abstraction_summary; +#+BEGIN_SRC d :tangle ../src/sdp/ao/abstraction_summary.d +module sdp.ao.abstraction_summary; template SiSUabstractionSummary() { auto SiSUabstractionSummary(S,T)( auto return ref const S doc_abstraction, @@ -601,8 +617,8 @@ template SiSUabstractionSummary() { #+name: abstraction_summary_imports #+BEGIN_SRC d import - sdp.ao_defaults, - sdp.ao_rgx; + sdp.ao.defaults, + sdp.ao.rgx; import std.array, std.exception, @@ -652,35 +668,35 @@ char_repeat_number = (char_repeat_number > min_repeat_number) ? char_repeat_number : min_repeat_number; writefln( - "%s\n\"%s\", %s\n%s\n%s\n%s%10d\n%s%10d\n%s%10d\n%s%10d\n%s%10d\n%s%10d\n%s%10d\n%s%10d\n(%s: %s)\n%s", + "%s\n\"%s\", %s\n%s\n%s\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n%30-s%10-d\n(%s: %s)\n%s", markup.repeat_character_by_number_provided("-", char_repeat_number), doc_matters.dochead_meta["title"]["full"], doc_matters.dochead_meta["creator"]["author"], doc_matters.source_filename, markup.repeat_character_by_number_provided("-", char_repeat_number), - "length toc arr: ", + "length toc arr:", to!int(doc_abstraction["toc_seg"].length), - "length doc_abstraction arr: ", + "length doc_abstraction arr:", to!int(doc_abstraction["body"].length), - "last obj_cite_number: ", + "last obj_cite_number:", to!int(check["last_obj_cite_number"]), - "length endnotes: ", + "length endnotes:", (doc_abstraction["endnotes"].length > 1) ? (to!int(doc_abstraction["endnotes"].length)) : 0, - "length glossary: ", + "length glossary:", (doc_abstraction["glossary"].length > 1) ? (to!int(doc_abstraction["glossary"].length)) : 0, - "length biblio: ", + "length biblio:", (doc_abstraction["bibliography"].length > 1) ? (to!int(doc_abstraction["bibliography"].length)) : 0, - "length bookindex: ", + "length bookindex:", (doc_abstraction["bookindex_seg"].length > 1) ? (to!int(doc_abstraction["bookindex_seg"].length)) : 0, - "length blurb: ", + "length blurb:", (doc_abstraction["blurb"].length > 1) ? (to!int(doc_abstraction["blurb"].length)) : 0, |