From c7c6c121884feb55ae3964e6055ac8ca983458cd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 20 Aug 2016 08:57:12 -0400 Subject: step 0.6.3 includes fixes --- org/sdp.org | 144 ++++++++++++++++++++++++------------------------------------ 1 file changed, 58 insertions(+), 86 deletions(-) (limited to 'org/sdp.org') diff --git a/org/sdp.org b/org/sdp.org index 4eec38d..b06c7ef 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -24,7 +24,7 @@ struct Version { int minor; int patch; } -enum ver = Version(0, 6, 2); +enum ver = Version(0, 6, 3); #+END_SRC * sdp.d sisu document parser :sdp.d: @@ -84,7 +84,11 @@ import [[./ao_rgx.org][ao_rgx]] [[./output_hub.org][output hub]] -**** sdlang :import:sdlang: +**** TODO sdlang :import:sdlang: +keep up to date, configuration in ../maker.org +check: +- http://github.com/Abscissa/SDLang-D +- https://github.com/abscissa/libInputVisitor #+NAME: imports_sdlang #+BEGIN_SRC d @@ -151,64 +155,6 @@ mixin SiSUoutputHub; mixin ScreenTxtColors; #+END_SRC -*** sdp output check selection :output: - -#+NAME: sdp_output_selection -#+BEGIN_SRC d -struct SDPoutput { - auto hub(S)( - auto ref const S contents, - string[][string][string] bookindex_unordered_hashes, - JSONValue[] biblio, - string[string][string] dochead_make_json, - string[string][string] dochead_meta_json, - string fn_src, - bool[string] opt_action_bool - ) { - mixin ScreenTxtColors; - mixin RgxInit; - mixin SiSUoutputHub; - auto rgx = Rgx(); - uint return_ = 0; - if (opt_action_bool["source"]) { - writeln("sisupod source"); - } - if (opt_action_bool["sisupod"]) { - writeln("sisupod source"); - } - if (opt_action_bool["text"]) { - writeln("text processing"); - // auto text=SDPoutput_text(); - // text.scroll(contents, bookindex_unordered_hashes, biblio, fn_src, opt_action_bool); - // // text.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool); - } - if (opt_action_bool["html"]) { - auto html=SDPoutputHTML(); - html.css_write; - html.scroll(contents, bookindex_unordered_hashes, biblio, fn_src, opt_action_bool); - // html.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make_aa, dochead_meta_aa, fn_src, opt_action_bool); - } - if (opt_action_bool["epub"]) { - writeln("epub processing"); - } - if (opt_action_bool["pdf"]) { - writeln("pdf processing"); - } - if (opt_action_bool["odt"]) { - writeln("odt processing"); - } - if (opt_action_bool["sqlite"]) { - writeln("sqlite processing"); - } - if (opt_action_bool["postgresql"]) { - writeln("pgsql processing"); - } - return return_; - } -} -#+END_SRC - - *** init :init: #+NAME: sdp_args @@ -233,7 +179,7 @@ string arg_unrecognized; auto rgx = Rgx(); #+END_SRC -*** scope :scope: +*** scope (run complete) :scope: #+NAME: sdp_args #+BEGIN_SRC d @@ -251,8 +197,7 @@ scope(success) { scope(failure) { debug(checkdoc) { stderr.writefln( - "%s~ run failure ~%s", - scr_txt_color["fuchsia"], scr_txt_color["off"], + "run failure", ); } } @@ -342,7 +287,7 @@ auto conf_doc_make_aa = confsdl.documentMakeSDLangToAAmake(sdl_root_doc_make); ** each file (loop) [+2] :loop:files: *** filename provided [+1] :file:process: -**** loop scope :scope: +**** scope (loop) :scope: #+NAME: sdp_each_file_do #+BEGIN_SRC d @@ -445,7 +390,7 @@ output.hub( ); #+END_SRC -**** on exit :scope:exit: +**** scope (on loop exit) :scope:exit: #+NAME: sdp_each_file_do #+BEGIN_SRC d @@ -529,7 +474,7 @@ void main(string[] args) { ** program dir structure figure out best program dir structure for dub and compilers, issue with rdmd -** sisu file structure +** sisu document structure |---------------------+------------------------------------------+------------------------+--------| | header | sisu /header markup/ | markup | | @@ -561,6 +506,7 @@ figure out best program dir structure for dub and compilers, issue with rdmd ** config :config: using sdlang in sdp + *** sdp config and header? file format? sdl ? yml ? json ? :sdl:sdlang: [[https://sdlang.org/][SDL: Simple Declarative Language]] [[http://sdl4r.rubyforge.org/syntaxhighlighter_brush.html][highlighter]] @@ -610,27 +556,31 @@ http://forum.dlang.org/thread/gnfctbuhiemidetngrzi@forum.dlang.org?page=23#post- *** other links http://semitwist.com/sdlang-d-docs/v0.9.3/sdlang.html http://semitwist.com/sdlang-d-docs/ -** read markup files -**** regular .sst -relatively straight forward -**** master .ssm -master files have been able to read in inser files .ssi and regular files .sst -***** reading in .ssi files is straightforward -***** reading in .sst files is more problematic -.sst files have their own root (structure) -either -- the root needs to be disabled - not used -or -- the root tree needs to be demoted, which is only possible if markup from - heading D is not reached then A - C could be demoted to B - D -- the other issue there is that it is common not to write out heading level A - text but to rely on the metadata for title and author, the issue there is that - at present the header for .sst files that are imported is just lopped off and - thrown away. At least the title and author information for each imported .sst - file would have to read and available for use in its header A that is demoted - to B +** markup +*** code + +#+BEGIN_SRC txt :tangle no +code.ruby{ + +}code + +code.python{ + +}code + +code.sh{ + +}code + +code.txt{ + +}code + +code.d{ + +}code +#+END_SRC -** processing files, currently using utf8 ** src dir structure & files #+BEGIN_SRC txt :tangle no tree /home/ralph/sisu_www/current/src/democratizing_innovation.eric_von_hippel.sst @@ -653,7 +603,29 @@ democratizing_innovation.eric_von_hippel.sst #+END_SRC +** read markup files +**** regular .sst +relatively straight forward +**** master .ssm +master files have been able to read in inser files .ssi and regular files .sst +***** reading in .ssi files is straightforward +***** reading in .sst files is more problematic +.sst files have their own root (structure) +either +- the root needs to be disabled - not used +or +- the root tree needs to be demoted, which is only possible if markup from + heading D is not reached then A - C could be demoted to B - D +- the other issue there is that it is common not to write out heading level A + text but to rely on the metadata for title and author, the issue there is that + at present the header for .sst files that are imported is just lopped off and + thrown away. At least the title and author information for each imported .sst + file would have to read and available for use in its header A that is demoted + to B + +** processing files, currently using utf8 ** check + #+BEGIN_SRC text ./.sisu ./_sisu ~/.sisu /etc/.sisu #+END_SRC -- cgit v1.2.3