cli precedence over config file settings

- cli precedence over config file settings
- latex papersize settings sorted

1 files changed, 50 insertions, 50 deletions

diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 3bab7d0..34b30a3 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -141,56 +141,56 @@ struct ConfCompositeMakeInit {
   string     texpdf_font;
 }
 struct ConfCompositeSiteLocal {
-  string w_srv_http;
-  string w_srv_domain;
-  string w_srv_data_http;            // if not set same as webserv_http
-  string w_srv_data_domain;          // if not set same as webserv_domain
-  string w_srv_data_root_part;
-  string w_srv_data_root_url;
-  string w_srv_data_root_url_html;
-  string w_srv_data_root_path;
-  string w_srv_images_root_part;
-  // string w_srv_url_doc_path;
-  string w_srv_cgi_title;
-  string w_srv_cgi_http;             // if not set same as webserv_http
-  string w_srv_cgi_domain;           // if not set same as webserv_domain
-  string w_srv_cgi_bin_part;
-  string w_srv_cgi_bin_path;
-  string w_srv_cgi_search_script;
-  string w_srv_cgi_search_script_raw_fn_d;
-  string w_srv_cgi_port;
-  string w_srv_cgi_user;
-  string w_srv_cgi_action;
-  string w_srv_cgi_bin_url;
-  string w_srv_db_sqlite;
-  // string w_srv_db_pg;
-  string w_srv_db_pg_table;
-  string w_srv_db_pg_user;
-  // string webserv_cgi_file_links;
-  string output_path;
-  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   w_srv_http;
+  string   w_srv_domain;
+  string   w_srv_data_http;            // if not set same as webserv_http
+  string   w_srv_data_domain;          // if not set same as webserv_domain
+  string   w_srv_data_root_part;
+  string   w_srv_data_root_url;
+  string   w_srv_data_root_url_html;
+  string   w_srv_data_root_path;
+  string   w_srv_images_root_part;
+  // string   w_srv_url_doc_path;
+  string   w_srv_cgi_title;
+  string   w_srv_cgi_http;             // if not set same as webserv_http
+  string   w_srv_cgi_domain;           // if not set same as webserv_domain
+  string   w_srv_cgi_bin_part;
+  string   w_srv_cgi_bin_path;
+  string   w_srv_cgi_search_script;
+  string   w_srv_cgi_search_script_raw_fn_d;
+  string   w_srv_cgi_port;
+  string   w_srv_cgi_user;
+  string   w_srv_cgi_action;
+  string   w_srv_cgi_bin_url;
+  string   w_srv_db_sqlite;
+  // string   w_srv_db_pg;
+  string   w_srv_db_pg_table;
+  string   w_srv_db_pg_user;
+  // string   webserv_cgi_file_links;
+  string   output_path;
+  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[] set_papersize;
+  string   set_text_wrap;
+  string   set_emphasis;
+  string   set_language;
+  string   set_digest;
+  string   permission_share_source;
+  string   search_flag;
+  string   search_action;
+  string   search_db;
+  string   search_title;
 }
 struct MetaComposite {
   string   classify_dewey;