From 18b44eb25e8a8521eadd5e73a4e82bbee954e744 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 8 Nov 2018 22:39:07 -0500 Subject: --workon flag, for some under construction code --- org/doc_reform.org | 5 +++++ org/output_xmls.org | 59 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 20 deletions(-) (limited to 'org') diff --git a/org/doc_reform.org b/org/doc_reform.org index bbe6a65..ab437f9 100644 --- a/org/doc_reform.org +++ b/org/doc_reform.org @@ -278,6 +278,7 @@ bool[string] opts = [ "section_blurb" : true, "backmatter" : true, "skip-output" : false, + "workon" : false, ]; string[string] settings = [ "output-dir" : "", @@ -325,6 +326,7 @@ auto helpInfo = getopt(args, "section-blurb", "--section-blurb process document blurb (default)", &opts["section_blurb"], "backmatter", "--section-backmatter process document backmatter (default)", &opts["backmatter"], "skip-output", "--skip-output", &opts["skip-output"], + "workon", "--workon (reserved for some matters under development & testing)", &opts["workon"], "output-dir", "--output-dir=[dir path]", &settings["output-dir"], "site-config-dir", "--site-config-dir=[dir path]", &settings["site-config-dir"], "sqlite-filename", "--sqlite-filename=[filename].sqlite", &settings["sqlite-filename"], @@ -499,6 +501,9 @@ struct OptActions { auto skip_output() { return opts["skip-output"]; } + auto workon() { + return opts["workon"]; + } auto languages_set() { return settings["lang"].split(","); } diff --git a/org/output_xmls.org b/org/output_xmls.org index 672a589..ab0536d 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -235,7 +235,7 @@ auto site_info_button(M)( .replaceAll( rgx.br_nl, ""); } else { - _locations = "

DocReform

\n

www.sisudoc.org

\n

sources / git

"; + _locations = "

doc-reform

\n

sources / git

\n

www.sisudoc.org

"; } string o; o = format(q"¶
@@ -257,21 +257,32 @@ auto inline_search_form(M)( string _action="http://www.sisudoc.org/cgi-bin/search.cgi"; string _db="DocReform.7a.manual"; string o; - o = format(q"¶
- -
- - - - - -
- - -
+ string _form; + if (doc_matters.opt.action.workon) { + _form = format(q"¶ + +
+ + + + + +
+ + +
+ ¶", + _action, + _db, + ); + } else { + _form = format(q"¶%s¶", + "", + ); + } + o = format(q"¶
%s
¶", - _action, - _db, + _form, ); return o; } @@ -285,6 +296,17 @@ auto html_head(M)( M doc_matters, string type, ) { +string _manifest = ""; +if (doc_matters.opt.action.workon) { + _manifest = format(q"¶ + + + [ document manifest ] + + + ¶", + ); +} string o; o = format(q"¶ @@ -306,11 +328,7 @@ auto html_head(M)(
%s %s%s¶", doc_matters.conf_make_meta.meta.title_full, @@ -323,6 +341,7 @@ auto html_head(M)( : "../../css/html_scroll.css"), doc_matters.src.language, site_info_button(doc_matters), + _manifest, inline_search_form(doc_matters), ((type == "seg") ? "" : "\n
"), ); -- cgit v1.2.3