From b243ba3e00bf6cd5e9298903bc69d8efc7a03414 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 1 Mar 2018 12:51:58 -0500 Subject: conf, make, meta, init and tidy substitution --- org/meta_conf_make_meta.org | 281 +++++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 157 deletions(-) (limited to 'org/meta_conf_make_meta.org') diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index c6c4b2c..fff5275 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -64,36 +64,28 @@ import #+name: meta_defaults_template_structs #+BEGIN_SRC d struct ConfCompositeMakeStr { - string bold = ""; - string breaks = ""; - string cover_image = ""; - string css = ""; - string emphasis = ""; - string footer = ""; + string bold; + string breaks; + string cover_image; + string css; + string emphasis; + string footer; string[] headings; - string home_button_image = ""; - string home_button_text = ""; - string italics = ""; - string num_top = ""; - string num_depth = ""; + string home_button_image; + string home_button_text; + string italics; + string num_top; + string num_depth; string[][] substitute; - string texpdf_font = ""; + string texpdf_font; } struct confCompositeMakeBuild { - auto bold_rgxmatch(string _mk) { - auto _rgxtxt = (_mk.empty) - ? `=NULL` - : `(` ~ _mk.dup ~ `)`; - return (cast(char[]) (_rgxtxt)); - } - auto bold_substitute_abstract() { - return "*{$1}*"; - } - auto bold_substitute_sisu_markup() { - return "*{$1}*"; - } - auto bold_substitute_html() { - return "$1"; + auto bold(string _mk) { + string[] _out; + if (_mk) { + _out = [ (cast(string) (`(` ~ _mk.dup ~ `)`)), "*{$1}*", "$1"]; + } + return _out; } auto breaks(string _mk) { return _mk; @@ -104,20 +96,12 @@ struct confCompositeMakeBuild { auto css(string _mk) { return _mk; } - auto emphasis_rgxmatch(string _mk) { - auto _rgxtxt = (_mk.empty) - ? `=NULL` - : `(` ~ _mk.dup ~ `)`; - return (cast(char[]) (_rgxtxt)); - } - auto emphasis_substitute_abstract() { - return "!{$1}!"; - } - auto emphasis_substitute_sisu_markup() { - return "!{$1}!"; - } - auto emphasis_substitute_html() { - return "$1"; + auto emphasis(string _mk) { + string[] _out; + if (_mk) { + _out = [ (cast(string) (`(` ~ _mk.dup ~ `)`)), "!{$1}!", "$1" ]; + } + return _out; } auto footer(string _mk) { return _mk; @@ -131,20 +115,12 @@ struct confCompositeMakeBuild { auto home_button_text(string _mk) { return _mk; } - auto italics_rgxmatch(string _mk) { - auto _rgxtxt = (_mk.empty) - ? `=NULL` - : `(` ~ _mk.dup ~ `)`; - return (cast(char[]) (_rgxtxt)); - } - auto italics_substitute_abstract() { - return "/{$1}/"; - } - auto italics_substitute_sisu_markup() { - return "/{$1}/"; - } - auto italics_substitute_html() { - return "$1"; + auto italics(string _mk) { + string[] _out; + if (_mk) { + _out = [ (cast(string) (`(` ~ _mk.dup ~ `)`)), "/{$1}/", "$1" ]; + } + return _out; } auto num_top(string _mk) { return _mk; @@ -167,29 +143,20 @@ struct confCompositeMakeBuild { #+name: meta_defaults_template_structs #+BEGIN_SRC d struct ConfCompositeMakeInit { - char[] bold_rgxmatch = `=NULL`.dup; - auto bold_substitute_abstract = "*{$1}*"; - auto bold_substitute_sisu_markup = "*{$1}*"; - auto bold_substitute_html = "$1"; - string breaks = ""; - string cover_image = ""; - string css = ""; - char[] emphasis_rgxmatch = `=NULL`.dup; - auto emphasis_substitute_abstract = "!{$1}!"; - auto emphasis_substitute_sisu_markup = "!{$1}!"; - auto emphasis_substitute_html = "$1"; - string footer = ""; + string[] bold; + string breaks; + string cover_image; + string css; + string[] emphasis; + string footer; string[] headings; - string home_button_image = ""; - string home_button_text = ""; - char[] italics_rgxmatch = `=NULL`.dup; - auto italics_substitute_abstract = "/{$1}/"; - auto italics_substitute_sisu_markup = "/{$1}/"; - auto italics_substitute_html = "$1"; - string num_top = ""; - string num_depth = ""; + string home_button_image; + string home_button_text; + string[] italics; + string num_top; + string num_depth; string[][] substitute; - string texpdf_font = ""; + string texpdf_font; } #+END_SRC @@ -198,38 +165,38 @@ struct ConfCompositeMakeInit { #+name: meta_defaults_template_structs #+BEGIN_SRC d struct ConfCompositeSiteLocal { - string webserv_url_root = ""; - string webserv_path = ""; - string webserv_images = ""; - string webserv_cgi = ""; - string webserv_cgi_host = ""; - string webserv_cgi_host_path = ""; - string webserv_cgi_port = ""; - string webserv_cgi_user = ""; - string webserv_cgi_file_links = ""; - string processing_path = ""; - string processing_dir = ""; - string processing_concord_max = ""; - string flag_act0 = ""; - string flag_act1 = ""; - string flag_act2 = ""; - string flag_act3 = ""; - string flag_act4 = ""; - string flag_act5 = ""; - string flag_act6 = ""; - string flag_act7 = ""; - string flag_act8 = ""; - string flag_act9 = ""; - string default_papersize = ""; - string default_text_wrap = ""; - string default_emphasis = ""; - string default_language = ""; - string default_digest = ""; - string permission_share_source = ""; - string search_flag = ""; - string search_action = ""; - string search_db = ""; - string search_title = ""; + string webserv_url_root; + string webserv_path; + string webserv_images; + string webserv_cgi; + string webserv_cgi_host; + string webserv_cgi_host_path; + string webserv_cgi_port; + string webserv_cgi_user; + string webserv_cgi_file_links; + string processing_path; + string processing_dir; + string processing_concord_max; + string flag_act0; + string flag_act1; + string flag_act2; + string flag_act3; + string flag_act4; + string flag_act5; + string flag_act6; + string flag_act7; + string flag_act8; + string flag_act9; + string default_papersize; + string default_text_wrap; + string default_emphasis; + string default_language; + string default_digest; + string permission_share_source; + string search_flag; + string search_action; + string search_db; + string search_title; } #+END_SRC @@ -238,53 +205,53 @@ struct ConfCompositeSiteLocal { #+name: meta_defaults_template_structs #+BEGIN_SRC d struct MetaComposite { - string classify_dewey = ""; - string classify_keywords = ""; - string classify_loc = ""; - string classify_subject = ""; - string classify_topic_register = ""; - string creator_author = ""; - string creator_author_email = ""; - string creator_illustrator = ""; - string creator_translator = ""; - string date_added_to_site = ""; - string date_available = ""; - string date_created = ""; - string date_issued = ""; - string date_modified = ""; - string date_published = ""; - string date_valid = ""; - string identifier_isbn = ""; - string identifier_oclc = ""; - string identifier_pg = ""; - string language_document = ""; - string language_document_char = ""; - string links = ""; - string notes_abstract = ""; - string notes_description = ""; - string original_language = ""; - string original_language_char = ""; - string original_publisher = ""; - string original_source = ""; - string original_title = ""; - string publisher = ""; - string rights_copyright = ""; - string rights_copyright_audio = ""; - string rights_copyright_cover = ""; - string rights_copyright_illustrations = ""; - string rights_copyright_photographs = ""; - string rights_copyright_text = ""; - string rights_copyright_translation = ""; - string rights_copyright_video = ""; - string rights_license = ""; - string title_edition = ""; - string title_full = ""; - string title_language = ""; - string title_main = ""; - string title_note = ""; - string title_short = ""; - string title_sub = ""; - string title_subtitle = ""; + string classify_dewey; + string classify_keywords; + string classify_loc; + string classify_subject; + string classify_topic_register; + string creator_author; + string creator_author_email; + string creator_illustrator; + string creator_translator; + string date_added_to_site; + string date_available; + string date_created; + string date_issued; + string date_modified; + string date_published; + string date_valid; + string identifier_isbn; + string identifier_oclc; + string identifier_pg; + string language_document; + string language_document_char; + string links; + string notes_abstract; + string notes_description; + string original_language; + string original_language_char; + string original_publisher; + string original_source; + string original_title; + string publisher; + string rights_copyright; + string rights_copyright_audio; + string rights_copyright_cover; + string rights_copyright_illustrations; + string rights_copyright_photographs; + string rights_copyright_text; + string rights_copyright_translation; + string rights_copyright_video; + string rights_license; + string title_edition; + string title_full; + string title_language; + string title_main; + string title_note; + string title_short; + string title_sub; + string title_subtitle; } #+END_SRC @@ -557,16 +524,16 @@ if ("make" in _json.object) { ) { _struct_composite.make_str.texpdf_font = _json.object["make"]["texpdf_font"].str; } - _struct_composite.make.bold_rgxmatch = _mk.bold_rgxmatch(_struct_composite.make_str.bold); + _struct_composite.make.bold = _mk.bold(_struct_composite.make_str.bold); _struct_composite.make.breaks = _mk.breaks(_struct_composite.make_str.breaks); _struct_composite.make.cover_image = _mk.cover_image(_struct_composite.make_str.cover_image); _struct_composite.make.css = _mk.css(_struct_composite.make_str.css); - _struct_composite.make.emphasis_rgxmatch = _mk.emphasis_rgxmatch(_struct_composite.make_str.emphasis); + _struct_composite.make.emphasis = _mk.emphasis(_struct_composite.make_str.emphasis); _struct_composite.make.footer = _mk.footer(_struct_composite.make_str.footer); _struct_composite.make.headings = _mk.headings(_struct_composite.make_str.headings); _struct_composite.make.home_button_image = _mk.home_button_image(_struct_composite.make_str.home_button_image); _struct_composite.make.home_button_text = _mk.home_button_text(_struct_composite.make_str.home_button_text); - _struct_composite.make.italics_rgxmatch = _mk.italics_rgxmatch(_struct_composite.make_str.italics); + _struct_composite.make.italics = _mk.italics(_struct_composite.make_str.italics); _struct_composite.make.num_top = _mk.num_top(_struct_composite.make_str.num_top); _struct_composite.make.num_depth = _mk.num_depth(_struct_composite.make_str.num_depth); _struct_composite.make.substitute = _mk.substitute(_struct_composite.make_str.substitute); -- cgit v1.2.3