diff options
Diffstat (limited to 'src/sdp/meta')
| -rw-r--r-- | src/sdp/meta/conf_make_meta_sdlang.d | 14 | ||||
| -rw-r--r-- | src/sdp/meta/defaults.d | 204 | ||||
| -rw-r--r-- | src/sdp/meta/metadoc_from_src.d | 27 | 
3 files changed, 135 insertions, 110 deletions
| diff --git a/src/sdp/meta/conf_make_meta_sdlang.d b/src/sdp/meta/conf_make_meta_sdlang.d index 2bded69..478cea4 100644 --- a/src/sdp/meta/conf_make_meta_sdlang.d +++ b/src/sdp/meta/conf_make_meta_sdlang.d @@ -161,6 +161,7 @@ static template SiSUextractSDLang() {        }        if ("original" in header_sdlang.maybe.tags) {          _conf_composite.meta.original_language       = extractSDLangTabOrAttrib(header_sdlang, "original", "language"); +        _conf_composite.meta.original_language_char  = extractSDLangTabOrAttrib(header_sdlang, "original", "language_char");          _conf_composite.meta.original_source         = extractSDLangTabOrAttrib(header_sdlang, "original", "source");          _conf_composite.meta.original_title          = extractSDLangTabOrAttrib(header_sdlang, "original", "title");        } @@ -168,10 +169,15 @@ static template SiSUextractSDLang() {          // _conf_composite.meta.publisher               = extractSDLangTabOrAttrib(header_sdlang, "publisher", "");        }        if ("rights" in header_sdlang.maybe.tags) { -        _conf_composite.meta.rights_copyright        = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright"); -        _conf_composite.meta.rights_cover            = extractSDLangTabOrAttrib(header_sdlang, "rights", "cover"); -        _conf_composite.meta.rights_illustrations    = extractSDLangTabOrAttrib(header_sdlang, "rights", "illustrations"); -        _conf_composite.meta.rights_license          = extractSDLangTabOrAttrib(header_sdlang, "rights", "license"); +        _conf_composite.meta.rights_copyright               = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright"); +        _conf_composite.meta.rights_copyright_text          = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_text"); +        _conf_composite.meta.rights_copyright_audio         = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_audio"); +        _conf_composite.meta.rights_copyright_cover         = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_cover"); +        _conf_composite.meta.rights_copyright_illustrations = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_illustrations"); +        _conf_composite.meta.rights_copyright_photographs   = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_photographs"); +        _conf_composite.meta.rights_copyright_translation   = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_translation"); +        _conf_composite.meta.rights_copyright_video         = extractSDLangTabOrAttrib(header_sdlang, "rights", "copyright_video"); +        _conf_composite.meta.rights_license                 = extractSDLangTabOrAttrib(header_sdlang, "rights", "license");        }        if (_conf_composite.meta.creator_author.empty) {          if ("creator" in header_sdlang.maybe.tags) { diff --git a/src/sdp/meta/defaults.d b/src/sdp/meta/defaults.d index ede1523..e598aa8 100644 --- a/src/sdp/meta/defaults.d +++ b/src/sdp/meta/defaults.d @@ -23,109 +23,119 @@ template SiSUregisters() {      std.utf,      std.conv : to;    struct ConfCompositeMake { -    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 substitute              = ""; -    string texpdf_font             = ""; +    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 substitute                     = ""; +    string texpdf_font                    = "";    }    struct ConfCompositeMakeStr { -    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 substitute              = ""; -    string texpdf_font             = ""; +    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 substitute                     = ""; +    string texpdf_font                    = "";    }    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                   = "";    }    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 links                   = ""; -    string notes_abstract          = ""; -    string notes_description       = ""; -    string original_language       = ""; -    string original_source         = ""; -    string original_title          = ""; -    string publisher               = ""; -    string rights_copyright        = ""; -    string rights_cover            = ""; -    string rights_illustrations    = ""; -    string rights_license          = ""; -    string title_edition           = ""; -    string title_full              = ""; -    string title_language          = ""; -    string title_main              = ""; -    string title_note              = ""; -    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                 = "";    }    struct ConfComposite {      MetaComposite          meta; diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d index b4bee7a..80de1f2 100644 --- a/src/sdp/meta/metadoc_from_src.d +++ b/src/sdp/meta/metadoc_from_src.d @@ -1375,7 +1375,8 @@ template SiSUdocAbstraction() {          || (opt_action["html-scroll"])          || (opt_action["html-seg"])          || (opt_action["epub"]) -        || (opt_action["sqlite"]) +        || (opt_action["sqlite-discrete"]) +        || (opt_action["sqlite-update"])          || (opt_action["postgresql"])) {            obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);            obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1401,7 +1402,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1458,7 +1460,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1499,7 +1502,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1533,7 +1537,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1571,7 +1576,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1614,7 +1620,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1652,7 +1659,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); @@ -1691,7 +1699,8 @@ template SiSUdocAbstraction() {            || (opt_action["html-scroll"])            || (opt_action["html-seg"])            || (opt_action["epub"]) -          || (opt_action["sqlite"]) +          || (opt_action["sqlite-discrete"]) +          || (opt_action["sqlite-update"])            || (opt_action["postgresql"])) {              obj = obj_dom_structure_set_markup_tags(obj, dom_markedup, obj.heading_lev_markup);              obj = obj_dom_set_collapsed_tags(obj, dom_collapsed, obj.heading_lev_collapsed); | 
