summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-08-08 04:10:22 +0000
committerRalph Amissah <ralph@amissah.com>2014-08-08 04:10:22 +0000
commit39e11a4420226c3238e787de5be1c9279f46cf1f (patch)
treebd6a5b4d5f90538ab390709cd003f207c7c1b451
parentv5 v6: version & changelog (& rakefile) (diff)
downloadsisu-39e11a4420226c3238e787de5be1c9279f46cf1f.zip
sisu-39e11a4420226c3238e787de5be1c9279f46cf1f.tar.xz
v5 v6: code file renames, fairly extensive
* v5 file renames sync with v6 for easier comparison * v5 here (5.5.6) remains as in previous version (5.5.5)
-rw-r--r--data/doc/sisu/CHANGELOG_v52
-rw-r--r--data/doc/sisu/CHANGELOG_v62
-rw-r--r--lib/sisu/v5/air.rb2
-rw-r--r--lib/sisu/v5/ao.rb4
-rw-r--r--lib/sisu/v5/ao_composite.rb2
-rw-r--r--lib/sisu/v5/cgi.rb2
-rw-r--r--lib/sisu/v5/cgi_pgsql.rb2
-rw-r--r--lib/sisu/v5/cgi_sqlite.rb2
-rw-r--r--lib/sisu/v5/conf.rb4
-rw-r--r--lib/sisu/v5/css.rb2
-rw-r--r--lib/sisu/v5/db_columns.rb2
-rw-r--r--lib/sisu/v5/db_create.rb2
-rw-r--r--lib/sisu/v5/db_drop.rb2
-rw-r--r--lib/sisu/v5/db_load_tuple.rb2
-rw-r--r--lib/sisu/v5/dbi.rb4
-rw-r--r--lib/sisu/v5/dbi_discrete.rb4
-rw-r--r--lib/sisu/v5/defaults.rb2
-rw-r--r--lib/sisu/v5/digests.rb2
-rw-r--r--lib/sisu/v5/dp.rb (renamed from lib/sisu/v5/param.rb)12
-rw-r--r--lib/sisu/v5/dp_identify_markup.rb (renamed from lib/sisu/v5/param_identify_markup.rb)0
-rw-r--r--lib/sisu/v5/dp_make.rb (renamed from lib/sisu/v5/param_make.rb)2
-rw-r--r--lib/sisu/v5/embedded.rb4
-rw-r--r--lib/sisu/v5/errors.rb2
-rw-r--r--lib/sisu/v5/git.rb4
-rw-r--r--lib/sisu/v5/harvest.rb4
-rw-r--r--lib/sisu/v5/harvest_author_format.rb (renamed from lib/sisu/v5/author_format.rb)2
-rw-r--r--lib/sisu/v5/harvest_authors.rb2
-rw-r--r--lib/sisu/v5/harvest_topics.rb2
-rw-r--r--lib/sisu/v5/html.rb2
-rw-r--r--lib/sisu/v5/html_concordance.rb6
-rw-r--r--lib/sisu/v5/html_lite_shared.rb2
-rw-r--r--lib/sisu/v5/html_promo.rb2
-rw-r--r--lib/sisu/v5/html_tune.rb4
-rw-r--r--lib/sisu/v5/hub.rb14
-rw-r--r--lib/sisu/v5/hub_options.rb (renamed from lib/sisu/v6/options.rb)8
-rw-r--r--lib/sisu/v5/manifest.rb6
-rw-r--r--lib/sisu/v5/manpage.rb2
-rw-r--r--lib/sisu/v5/manpage_format.rb2
-rw-r--r--lib/sisu/v5/po4a.rb2
-rw-r--r--lib/sisu/v5/prog_text_translation.rb2
-rw-r--r--lib/sisu/v5/qrcode.rb6
-rw-r--r--lib/sisu/v5/relaxng.rb2
-rw-r--r--lib/sisu/v5/remote.rb2
-rw-r--r--lib/sisu/v5/rexml.rb4
-rw-r--r--lib/sisu/v5/se.rb (renamed from lib/sisu/v5/sysenv.rb)4
-rw-r--r--lib/sisu/v5/se_createsite.rb2
-rw-r--r--lib/sisu/v5/se_filemap.rb2
-rw-r--r--lib/sisu/v5/se_hub_particulars.rb (renamed from lib/sisu/v5/particulars.rb)6
-rw-r--r--lib/sisu/v5/shared_images.rb2
-rw-r--r--lib/sisu/v5/shared_sem.rb2
-rw-r--r--lib/sisu/v5/sitemaps.rb6
-rw-r--r--lib/sisu/v5/src_kdissert_share.rb2
-rw-r--r--lib/sisu/v5/src_share.rb2
-rw-r--r--lib/sisu/v5/src_shared.rb4
-rw-r--r--lib/sisu/v5/src_sisupod_make.rb4
-rw-r--r--lib/sisu/v5/sst_convert_markup.rb4
-rw-r--r--lib/sisu/v5/sst_do_inline_footnotes.rb6
-rw-r--r--lib/sisu/v5/sst_from_xml.rb2
-rw-r--r--lib/sisu/v5/sst_to_s_xml_sax.rb6
-rw-r--r--lib/sisu/v5/termsheet.rb6
-rw-r--r--lib/sisu/v5/texinfo.rb2
-rw-r--r--lib/sisu/v5/texinfo_format.rb2
-rw-r--r--lib/sisu/v5/texpdf.rb4
-rw-r--r--lib/sisu/v5/txt_asciidoc.rb2
-rw-r--r--lib/sisu/v5/txt_markdown.rb2
-rw-r--r--lib/sisu/v5/txt_plain.rb2
-rw-r--r--lib/sisu/v5/txt_rst.rb2
-rw-r--r--lib/sisu/v5/txt_textile.rb2
-rw-r--r--lib/sisu/v5/update.rb2
-rw-r--r--lib/sisu/v5/urls.rb4
-rw-r--r--lib/sisu/v5/utils_response.rb (renamed from lib/sisu/v6/response.rb)2
-rw-r--r--lib/sisu/v5/utils_screen_text_color.rb (renamed from lib/sisu/v5/screen_text_color.rb)0
-rw-r--r--lib/sisu/v5/utils_spell.rb (renamed from lib/sisu/v5/spell.rb)2
-rw-r--r--lib/sisu/v5/webrick.rb4
-rw-r--r--lib/sisu/v5/wikispeak.rb2
-rw-r--r--lib/sisu/v5/xhtml.rb4
-rw-r--r--lib/sisu/v5/xhtml_epub2.rb2
-rw-r--r--lib/sisu/v5/xhtml_epub2_concordance.rb6
-rw-r--r--lib/sisu/v5/xhtml_epub2_tune.rb4
-rw-r--r--lib/sisu/v5/xml_docbook5.rb4
-rw-r--r--lib/sisu/v5/xml_dom.rb4
-rw-r--r--lib/sisu/v5/xml_fictionbook2.rb4
-rw-r--r--lib/sisu/v5/xml_format.rb2
-rw-r--r--lib/sisu/v5/xml_md_oai_pmh_dc.rb4
-rw-r--r--lib/sisu/v5/xml_odf_odt.rb4
-rw-r--r--lib/sisu/v5/xml_odf_odt_format.rb2
-rw-r--r--lib/sisu/v5/xml_sax.rb4
-rw-r--r--lib/sisu/v5/xml_scaffold_structure_collapsed.rb4
-rw-r--r--lib/sisu/v5/xml_scaffold_structure_sisu.rb4
-rw-r--r--lib/sisu/v5/xml_shared.rb2
-rw-r--r--lib/sisu/v5/zap.rb2
-rw-r--r--lib/sisu/v6/air.rb2
-rw-r--r--lib/sisu/v6/ao.rb4
-rw-r--r--lib/sisu/v6/ao_composite.rb2
-rw-r--r--lib/sisu/v6/cgi.rb4
-rw-r--r--lib/sisu/v6/cgi_pgsql.rb4
-rw-r--r--lib/sisu/v6/cgi_sqlite.rb4
-rw-r--r--lib/sisu/v6/conf.rb4
-rw-r--r--lib/sisu/v6/css.rb2
-rw-r--r--lib/sisu/v6/db_columns.rb2
-rw-r--r--lib/sisu/v6/db_create.rb2
-rw-r--r--lib/sisu/v6/db_drop.rb2
-rw-r--r--lib/sisu/v6/db_load_tuple.rb2
-rw-r--r--lib/sisu/v6/dbi.rb4
-rw-r--r--lib/sisu/v6/dbi_discrete.rb4
-rw-r--r--lib/sisu/v6/defaults.rb2
-rw-r--r--lib/sisu/v6/digests.rb2
-rw-r--r--lib/sisu/v6/dp.rb (renamed from lib/sisu/v6/param.rb)12
-rw-r--r--lib/sisu/v6/dp_identify_markup.rb (renamed from lib/sisu/v6/param_identify_markup.rb)2
-rw-r--r--lib/sisu/v6/dp_make.rb (renamed from lib/sisu/v6/param_make.rb)4
-rw-r--r--lib/sisu/v6/embedded.rb4
-rw-r--r--lib/sisu/v6/errors.rb2
-rw-r--r--lib/sisu/v6/git.rb4
-rw-r--r--lib/sisu/v6/harvest.rb4
-rw-r--r--lib/sisu/v6/harvest_author_format.rb (renamed from lib/sisu/v6/author_format.rb)2
-rw-r--r--lib/sisu/v6/harvest_authors.rb2
-rw-r--r--lib/sisu/v6/harvest_topics.rb2
-rw-r--r--lib/sisu/v6/html.rb2
-rw-r--r--lib/sisu/v6/html_concordance.rb6
-rw-r--r--lib/sisu/v6/html_lite_shared.rb2
-rw-r--r--lib/sisu/v6/html_promo.rb2
-rw-r--r--lib/sisu/v6/html_tune.rb4
-rw-r--r--lib/sisu/v6/hub.rb14
-rw-r--r--lib/sisu/v6/hub_options.rb (renamed from lib/sisu/v5/options.rb)8
-rw-r--r--lib/sisu/v6/manifest.rb6
-rw-r--r--lib/sisu/v6/manpage.rb2
-rw-r--r--lib/sisu/v6/manpage_format.rb2
-rw-r--r--lib/sisu/v6/po4a.rb2
-rw-r--r--lib/sisu/v6/prog_text_translation.rb2
-rw-r--r--lib/sisu/v6/qrcode.rb6
-rw-r--r--lib/sisu/v6/relaxng.rb2
-rw-r--r--lib/sisu/v6/remote.rb2
-rw-r--r--lib/sisu/v6/rexml.rb4
-rw-r--r--lib/sisu/v6/se.rb (renamed from lib/sisu/v6/sysenv.rb)4
-rw-r--r--lib/sisu/v6/se_createsite.rb2
-rw-r--r--lib/sisu/v6/se_filemap.rb2
-rw-r--r--lib/sisu/v6/se_hub_particulars.rb (renamed from lib/sisu/v6/particulars.rb)28
-rw-r--r--lib/sisu/v6/shared_images.rb2
-rw-r--r--lib/sisu/v6/shared_sem.rb2
-rw-r--r--lib/sisu/v6/sitemaps.rb6
-rw-r--r--lib/sisu/v6/src_kdissert_share.rb2
-rw-r--r--lib/sisu/v6/src_share.rb2
-rw-r--r--lib/sisu/v6/src_shared.rb4
-rw-r--r--lib/sisu/v6/src_sisupod_make.rb4
-rw-r--r--lib/sisu/v6/sst_convert_markup.rb4
-rw-r--r--lib/sisu/v6/sst_do_inline_footnotes.rb6
-rw-r--r--lib/sisu/v6/sst_from_xml.rb2
-rw-r--r--lib/sisu/v6/sst_to_s_xml_sax.rb6
-rw-r--r--lib/sisu/v6/termsheet.rb6
-rw-r--r--lib/sisu/v6/texinfo.rb2
-rw-r--r--lib/sisu/v6/texinfo_format.rb2
-rw-r--r--lib/sisu/v6/texpdf.rb4
-rw-r--r--lib/sisu/v6/txt_asciidoc.rb2
-rw-r--r--lib/sisu/v6/txt_markdown.rb2
-rw-r--r--lib/sisu/v6/txt_plain.rb2
-rw-r--r--lib/sisu/v6/txt_rst.rb2
-rw-r--r--lib/sisu/v6/txt_textile.rb2
-rw-r--r--lib/sisu/v6/update.rb2
-rw-r--r--lib/sisu/v6/urls.rb4
-rw-r--r--lib/sisu/v6/utils_response.rb (renamed from lib/sisu/v5/response.rb)2
-rw-r--r--lib/sisu/v6/utils_screen_text_color.rb (renamed from lib/sisu/v6/screen_text_color.rb)2
-rw-r--r--lib/sisu/v6/utils_spell.rb (renamed from lib/sisu/v6/spell.rb)2
-rw-r--r--lib/sisu/v6/webrick.rb4
-rw-r--r--lib/sisu/v6/wikispeak.rb2
-rw-r--r--lib/sisu/v6/xhtml.rb4
-rw-r--r--lib/sisu/v6/xhtml_epub2.rb2
-rw-r--r--lib/sisu/v6/xhtml_epub2_concordance.rb6
-rw-r--r--lib/sisu/v6/xhtml_epub2_tune.rb4
-rw-r--r--lib/sisu/v6/xml_docbook5.rb4
-rw-r--r--lib/sisu/v6/xml_dom.rb4
-rw-r--r--lib/sisu/v6/xml_fictionbook2.rb4
-rw-r--r--lib/sisu/v6/xml_format.rb2
-rw-r--r--lib/sisu/v6/xml_md_oai_pmh_dc.rb4
-rw-r--r--lib/sisu/v6/xml_odf_odt.rb4
-rw-r--r--lib/sisu/v6/xml_odf_odt_format.rb2
-rw-r--r--lib/sisu/v6/xml_sax.rb4
-rw-r--r--lib/sisu/v6/xml_scaffold_structure_collapsed.rb4
-rw-r--r--lib/sisu/v6/xml_scaffold_structure_sisu.rb4
-rw-r--r--lib/sisu/v6/xml_shared.rb2
-rw-r--r--lib/sisu/v6/zap.rb2
180 files changed, 311 insertions, 307 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index fffb16d..e58d6cc 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.6.orig.tar.xz
sisu_5.5.6.orig.tar.xz
sisu_5.5.6-1.dsc
+* file renames, for easier comparison with v6
+
%% 5.5.5.orig.tar.xz (2014-07-29:30/2)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.5
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.5-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index f4fee23..0aaa9cf 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.0.orig.tar.xz
sisu_6.2.0.orig.tar.xz
sisu_6.2.0-1.dsc
+* some file renames, fairly extensive
+
%% 6.1.5.orig.tar.xz (2014-07-29:30/2)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.5
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.5-1
diff --git a/lib/sisu/v5/air.rb b/lib/sisu/v5/air.rb
index 12ec9ed..aaa4340 100644
--- a/lib/sisu/v5/air.rb
+++ b/lib/sisu/v5/air.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Air
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
class Source
@@ao_array=[]
@@fns=nil
diff --git a/lib/sisu/v5/ao.rb b/lib/sisu/v5/ao.rb
index ee99805..d7b418f 100644
--- a/lib/sisu/v5/ao.rb
+++ b/lib/sisu/v5/ao.rb
@@ -64,9 +64,9 @@
module SiSU_AO
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'ao_doc_objects' # ao.rb
require_relative 'ao_syntax' # ao_syntax.rb
diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/v5/ao_composite.rb
index 0d5905b..af194db 100644
--- a/lib/sisu/v5/ao_composite.rb
+++ b/lib/sisu/v5/ao_composite.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Assemble
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
class RemoteImage
def initialize
@env=SiSU_Env::InfoEnv.new
diff --git a/lib/sisu/v5/cgi.rb b/lib/sisu/v5/cgi.rb
index cd0175b..efea863 100644
--- a/lib/sisu/v5/cgi.rb
+++ b/lib/sisu/v5/cgi.rb
@@ -62,7 +62,7 @@
=end
module SiSU_CGI #% database building documents
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'cgi_pgsql' # cgi_pgsql.rb
require_relative 'cgi_sqlite' # cgi_sqlite.rb
class SearchSQL
diff --git a/lib/sisu/v5/cgi_pgsql.rb b/lib/sisu/v5/cgi_pgsql.rb
index a65b8a9..633e20f 100644
--- a/lib/sisu/v5/cgi_pgsql.rb
+++ b/lib/sisu/v5/cgi_pgsql.rb
@@ -61,7 +61,7 @@
=end
module SiSU_CGI_PgSQL #% database building documents
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'cgi_sql_common' # cgi_sql_common.rb
include SiSU_CGI_SQL
class SearchPgSQL < CGI_Common
diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb
index fc66507..531071c 100644
--- a/lib/sisu/v5/cgi_sqlite.rb
+++ b/lib/sisu/v5/cgi_sqlite.rb
@@ -61,7 +61,7 @@
=end
module SiSU_CGI_SQLite #% database building documents
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'cgi_sql_common' # cgi_sql_common.rb
include SiSU_CGI_SQL
class SearchSQLite < CGI_Common
diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/v5/conf.rb
index 04ac5cf..820d094 100644
--- a/lib/sisu/v5/conf.rb
+++ b/lib/sisu/v5/conf.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Initialize
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Screen
require_relative 'relaxng' # relaxng.rb
@@ -82,7 +82,7 @@ module SiSU_Initialize
end
end
class ConfigSite #config files such as css are not updated if they already exist unless forced using the --init=site modifier
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
def initialize(opt)
@opt=opt
@env=SiSU_Env::InfoEnv.new(@opt.fns)
diff --git a/lib/sisu/v5/css.rb b/lib/sisu/v5/css.rb
index d9b2aa8..b99359a 100644
--- a/lib/sisu/v5/css.rb
+++ b/lib/sisu/v5/css.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Style
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'defaults' # defaults.rb
class CSS_HeadInfo
def initialize(md,ft='html')
diff --git a/lib/sisu/v5/db_columns.rb b/lib/sisu/v5/db_columns.rb
index 04be289..189e8ac 100644
--- a/lib/sisu/v5/db_columns.rb
+++ b/lib/sisu/v5/db_columns.rb
@@ -62,7 +62,7 @@
=end
module SiSU_DbColumns
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'db_sqltxt' # db_sqltxt.rb
class Columns < SiSU_DbText::Prepare
def initialize(md=nil)
diff --git a/lib/sisu/v5/db_create.rb b/lib/sisu/v5/db_create.rb
index 142318f..35b15ad 100644
--- a/lib/sisu/v5/db_create.rb
+++ b/lib/sisu/v5/db_create.rb
@@ -64,7 +64,7 @@
module SiSU_DbCreate
require_relative 'db_columns' # db_columns.rb
class Create < SiSU_DbColumns::Columns
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
@@dl=nil
def initialize(opt,conn,file,sql_type=:pg)
@opt,@conn,@file,@sql_type=opt,conn,file,sql_type
diff --git a/lib/sisu/v5/db_drop.rb b/lib/sisu/v5/db_drop.rb
index ba7b57c..2106fe8 100644
--- a/lib/sisu/v5/db_drop.rb
+++ b/lib/sisu/v5/db_drop.rb
@@ -63,7 +63,7 @@
=end
module SiSU_DbDrop
class Drop
- require_relative 'response' # response.rb
+ require_relative 'utils_response' # utils_response.rb
def initialize(opt,conn,db_info,sql_type)
@opt,@conn,@db_info,@sql_type=opt,conn,db_info,sql_type
@ans=SiSU_Response::Response.new
diff --git a/lib/sisu/v5/db_load_tuple.rb b/lib/sisu/v5/db_load_tuple.rb
index 750a47f..98310bf 100644
--- a/lib/sisu/v5/db_load_tuple.rb
+++ b/lib/sisu/v5/db_load_tuple.rb
@@ -64,7 +64,7 @@
module SiSU_DbTuple
require_relative 'db_columns' # db_columns.rb
class LoadDocuments
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
def initialize(conn,col,opt,file_maint)
@conn,@col,@opt,@file_maint=conn,col,opt,file_maint
diff --git a/lib/sisu/v5/dbi.rb b/lib/sisu/v5/dbi.rb
index 83021b2..75b0737 100644
--- a/lib/sisu/v5/dbi.rb
+++ b/lib/sisu/v5/dbi.rb
@@ -61,9 +61,9 @@
=end
module SiSU_DBI #% database building
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'db_dbi' # db_dbi.rb
include SiSU_DbDBI
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index 9c4726c..7397675 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -61,9 +61,9 @@
=end
module SiSU_DBI_Discrete #% database building
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'db_dbi' # db_dbi.rb
include SiSU_DbDBI
diff --git a/lib/sisu/v5/defaults.rb b/lib/sisu/v5/defaults.rb
index 25dd270..c2f0f19 100644
--- a/lib/sisu/v5/defaults.rb
+++ b/lib/sisu/v5/defaults.rb
@@ -67,7 +67,7 @@ module SiSU_Viz
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('uri NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'css' # css.rb
include SiSU_Style
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/v5/digests.rb
index 662fa23..83f2671 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -61,7 +61,7 @@
=end
module SiSU_DigestView
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
require_relative 'prog_text_translation' # prog_text_translation.rb
require_relative 'shared_markup_alt.rb' # shared_markup_alt.rb
class Source
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/dp.rb
index 4621f46..eb9de5e 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/dp.rb
@@ -51,13 +51,13 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/param.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
<ralph.amissah@gmail.com>
- ** Description: parameters extracted from input file(s) for program use
+ ** Description: document parameters extracted from input files for program use
=end
module SiSU_Param
@@ -68,10 +68,10 @@ module SiSU_Param
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('uri or pstore NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param_make' # param_make.rb
- require_relative 'param_identify_markup' # param_identify_markup.rb
+ require_relative 'dp_make' # dp_make.rb
+ require_relative 'dp_identify_markup' # dp_identify_markup.rb
@@date=SiSU_Env::InfoDate.new
@@proc=
@@filename_txt=
@@ -1162,7 +1162,7 @@ module SiSU_Param
gsub(/~\{.+?\}~/,'')
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
- 'Parameters',
+ 'Document Parameters',
%{#{title}#{creator}}
).txt_grey if @opt.act[:verbose][:set]==:on
end
diff --git a/lib/sisu/v5/param_identify_markup.rb b/lib/sisu/v5/dp_identify_markup.rb
index f6884c7..f6884c7 100644
--- a/lib/sisu/v5/param_identify_markup.rb
+++ b/lib/sisu/v5/dp_identify_markup.rb
diff --git a/lib/sisu/v5/param_make.rb b/lib/sisu/v5/dp_make.rb
index 578e4fb..05b5cbd 100644
--- a/lib/sisu/v5/param_make.rb
+++ b/lib/sisu/v5/dp_make.rb
@@ -57,7 +57,7 @@
<ralph@amissah.com>
<ralph.amissah@gmail.com>
- ** Description: make parameters extracted for program use
+ ** Description: document parameters make extracted for program use
=end
diff --git a/lib/sisu/v5/embedded.rb b/lib/sisu/v5/embedded.rb
index c013806..b46975f 100644
--- a/lib/sisu/v5/embedded.rb
+++ b/lib/sisu/v5/embedded.rb
@@ -61,9 +61,9 @@
=end
module SiSU_Embedded
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v5/errors.rb b/lib/sisu/v5/errors.rb
index f4e0509..c346804 100644
--- a/lib/sisu/v5/errors.rb
+++ b/lib/sisu/v5/errors.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Errors
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
class Rescued <CreateFile
def initialize(error,errorlist,cmd,fns='')
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/v5/git.rb
index e7d2fcc..5d3ffb8 100644
--- a/lib/sisu/v5/git.rb
+++ b/lib/sisu/v5/git.rb
@@ -61,8 +61,8 @@
=end
module SiSU_Git
- require_relative 'param' # param.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'dp' # dp.rb
+ require_relative 'se' # se.rb
require_relative 'ao' # ao.rb
class Source
def initialize(opt)
diff --git a/lib/sisu/v5/harvest.rb b/lib/sisu/v5/harvest.rb
index 053df90..cc12b08 100644
--- a/lib/sisu/v5/harvest.rb
+++ b/lib/sisu/v5/harvest.rb
@@ -65,10 +65,10 @@
module SiSU_Harvest
@@the_idx_topics,@@the_idx_authors={},{}
class Source
- require_relative 'options' # options.rb
+ require_relative 'hub_options' # hub_options.rb
require_relative 'harvest_topics' # harvest_topics.rb
require_relative 'harvest_authors' # harvest_authors.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
def initialize(opt)
@opt=opt
diff --git a/lib/sisu/v5/author_format.rb b/lib/sisu/v5/harvest_author_format.rb
index 3bda790..4223892 100644
--- a/lib/sisu/v5/author_format.rb
+++ b/lib/sisu/v5/harvest_author_format.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/author_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_author_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v5/harvest_authors.rb b/lib/sisu/v5/harvest_authors.rb
index 361b9a8..7904ab1 100644
--- a/lib/sisu/v5/harvest_authors.rb
+++ b/lib/sisu/v5/harvest_authors.rb
@@ -62,7 +62,7 @@
=end
module SiSU_HarvestAuthors
- require_relative 'author_format' # author_format.rb
+ require_relative 'harvest_author_format' # harvest_author_format.rb
class Songsheet
@@the_idx_authors={}
def initialize(opt,env)
diff --git a/lib/sisu/v5/harvest_topics.rb b/lib/sisu/v5/harvest_topics.rb
index c68293b..cd507f6 100644
--- a/lib/sisu/v5/harvest_topics.rb
+++ b/lib/sisu/v5/harvest_topics.rb
@@ -63,7 +63,7 @@
=end
module SiSU_HarvestTopics
- require_relative 'author_format' # author_format.rb
+ require_relative 'harvest_author_format' # harvest_author_format.rb
include SiSU_Viz
class Songsheet
@@the_idx_topics={}
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index 526b41c..a613f56 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -66,7 +66,7 @@ module SiSU_HTML
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
end
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'defaults' # defaults.rb
include SiSU_Viz
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb
index 7bbb1a4..dbaf83c 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
@@ -62,9 +62,9 @@
=end
module SiSU_Concordance
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'defaults' # defaults.rb
include SiSU_Viz
@@ -212,7 +212,7 @@ WOK
include SiSU_Viz
require_relative 'html_format' # html_format.rb
include SiSU_HTML_Format
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Screen
@@dp=nil
def initialize(particulars)
diff --git a/lib/sisu/v5/html_lite_shared.rb b/lib/sisu/v5/html_lite_shared.rb
index 3ce5904..e949769 100644
--- a/lib/sisu/v5/html_lite_shared.rb
+++ b/lib/sisu/v5/html_lite_shared.rb
@@ -66,7 +66,7 @@ module SiSU_FormatShared
include SiSU_Viz
class CSS_Format
require_relative 'defaults' # defaults.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@fns=nil
def initialize(md,t_o)
@md,@t_o=md,t_o
diff --git a/lib/sisu/v5/html_promo.rb b/lib/sisu/v5/html_promo.rb
index f10bdb5..87f9bb3 100644
--- a/lib/sisu/v5/html_promo.rb
+++ b/lib/sisu/v5/html_promo.rb
@@ -61,7 +61,7 @@
=end
module SiSU_HTML_Promo
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Ad
def initialize(md)
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/v5/html_tune.rb
index 39cbb70..1a2c9de 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -60,9 +60,9 @@
** Description: html generation, html pre-processing
=end
-require_relative 'param'
+require_relative 'dp' # dp.rb
module SiSU_HTML_Tune
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
require_relative 'html_format' # html_format.rb #watch
@@line_mode=''
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index 510e209..785da84 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -63,11 +63,11 @@
=end
module SiSU
require_relative 'constants' # constants.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Screen
- require_relative 'options' # options.rb
- require_relative 'param' # param.rb
+ require_relative 'hub_options' # hub_options.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'defaults' # defaults.rb
include SiSU_Viz
@@ -599,10 +599,10 @@ module SiSU
else
end
if @opt.act[:urls_selected][:set]==:on #% --sitemap, -Y
- require_relative 'urls'
- OptionLoopFiles.new(@opt).loop_files_on_given_option do
- SiSU_Urls::Source.new(@opt).read #% -u -v -V -M
- end
+ require_relative 'urls'
+ OptionLoopFiles.new(@opt).loop_files_on_given_option do
+ SiSU_Urls::Source.new(@opt).read #% -u -v -V -M
+ end
end
end
def do_initialization
diff --git a/lib/sisu/v6/options.rb b/lib/sisu/v5/hub_options.rb
index b73dd87..f851b98 100644
--- a/lib/sisu/v6/options.rb
+++ b/lib/sisu/v5/hub_options.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/options.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_options.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,8 +67,8 @@ module SiSU_Commandline
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pathname NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
- require_relative 'param_make' # param_make.rb
+ require_relative 'se' # se.rb
+ require_relative 'dp_make' # dp_make.rb
class HeaderCommon
def sisu_document_make_instructions(make_instruct_array=:nil)
@pagenew=
@@ -1394,6 +1394,6 @@ module SiSU_Commandline
end
end
__END__
-note usually named @opt is carried in Param (usually as @md.opt), @opt is a
+note usually named @opt is carried in dp document parameters (usually as @md.opt), @opt is a
subset of @md where @md is passed, contents of @opt are available as @md.opt
passing @opt as well is duplication check for fns & fnb
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index 1afe1de..f2a9e74 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -61,15 +61,15 @@
=end
module SiSU_Manifest
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'prog_text_translation' # prog_text_translation.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'html_minitoc' # html_minitoc.rb
require_relative 'html' # html.rb
include SiSU_HTML_Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'i18n' # i18n.rb
include SiSU_Viz
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index a59ba83..0bcf179 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -63,7 +63,7 @@
=end
module SiSU_Manpage
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Param
include SiSU_Viz
diff --git a/lib/sisu/v5/manpage_format.rb b/lib/sisu/v5/manpage_format.rb
index 7a9ea98..c46a3c7 100644
--- a/lib/sisu/v5/manpage_format.rb
+++ b/lib/sisu/v5/manpage_format.rb
@@ -61,7 +61,7 @@
=end
module SiSU_ManpageFormat
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class ParagraphNumber
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/v5/po4a.rb
index 3b800e8..b5086eb 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -63,7 +63,7 @@
=end
module SiSU_Po4a
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'ao_composite' # ao_composite.rb
require_relative 'shared_metadata' # shared_metadata.rb
diff --git a/lib/sisu/v5/prog_text_translation.rb b/lib/sisu/v5/prog_text_translation.rb
index 9831996..9a7db08 100644
--- a/lib/sisu/v5/prog_text_translation.rb
+++ b/lib/sisu/v5/prog_text_translation.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Translate
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Param
class Source
def initialize(md,doc_lang,trans_str='')
diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb
index f6fd78b..19d310c 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -61,13 +61,13 @@
=end
module SiSU_QRcode
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'prog_text_translation' # prog_text_translation.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'html' # html.rb
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'i18n' # i18n.rb
include SiSU_Viz
diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/v5/relaxng.rb
index f6e8647..ebef4a3 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/v5/relaxng.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Relaxng
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
class RelaxNG
def gpl3_or_later
@gpl3_or_later =<<RELAXNG
diff --git a/lib/sisu/v5/remote.rb b/lib/sisu/v5/remote.rb
index 672eff9..1a1a9f0 100644
--- a/lib/sisu/v5/remote.rb
+++ b/lib/sisu/v5/remote.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Remote
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Put
def initialize(opt)
diff --git a/lib/sisu/v5/rexml.rb b/lib/sisu/v5/rexml.rb
index f7a2c96..c451287 100644
--- a/lib/sisu/v5/rexml.rb
+++ b/lib/sisu/v5/rexml.rb
@@ -67,9 +67,9 @@ module SiSU_Rexml
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('rexml/document NOT FOUND (LoadError)')
end
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Viz
class Rexml
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/se.rb
index 0d67733..cefd45d 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/se.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sysenv.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -156,7 +156,7 @@ module SiSU_Env
end
end
module SiSU_Screen
- require_relative 'screen_text_color' # screen_text_color.rb
+ require_relative 'utils_screen_text_color' # utils_screen_text_color.rb
end
module SiSU_Errors
require_relative 'errors' # errors.rb
diff --git a/lib/sisu/v5/se_createsite.rb b/lib/sisu/v5/se_createsite.rb
index 42d86aa..33e334c 100644
--- a/lib/sisu/v5/se_createsite.rb
+++ b/lib/sisu/v5/se_createsite.rb
@@ -63,7 +63,7 @@
module SiSU_Create_Site
require_relative 'constants' # constants.rb
require_relative 'utils' # utils.rb
- require_relative 'screen_text_color' # screen_text_color.rb
+ require_relative 'utils_screen_text_color' # utils_screen_text_color.rb
require_relative 'se_info_env' # se_info_env.rb
begin
require 'fileutils'
diff --git a/lib/sisu/v5/se_filemap.rb b/lib/sisu/v5/se_filemap.rb
index 99de4a0..0c4c84c 100644
--- a/lib/sisu/v5/se_filemap.rb
+++ b/lib/sisu/v5/se_filemap.rb
@@ -145,7 +145,7 @@ module SiSU_File_Map
ft << @md.fn[:xml_scaffold_structure_collapse]
end
@fnb=@md.fnb
- else # still needed where/when param is not parsed
+ else # still needed where/when dp document param is not parsed
if @opt.act[:html][:set]==:on #% --html, -h -H
ft << '.html' << '.html.??'
end
diff --git a/lib/sisu/v5/particulars.rb b/lib/sisu/v5/se_hub_particulars.rb
index 6efbc94..4372ac7 100644
--- a/lib/sisu/v5/particulars.rb
+++ b/lib/sisu/v5/se_hub_particulars.rb
@@ -52,7 +52,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/particulars.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_hub_particulars.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,9 +67,9 @@ module SiSU_Particulars
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('singleton NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'ao' # ao.rb
class CombinedSingleton
diff --git a/lib/sisu/v5/shared_images.rb b/lib/sisu/v5/shared_images.rb
index e307eba..c1e9abd 100644
--- a/lib/sisu/v5/shared_images.rb
+++ b/lib/sisu/v5/shared_images.rb
@@ -60,7 +60,7 @@
** Description: common file for xml generation
=end
module SiSU_Images
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
class Source
def initialize(opt)
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
diff --git a/lib/sisu/v5/shared_sem.rb b/lib/sisu/v5/shared_sem.rb
index 860457b..6ddc3f4 100644
--- a/lib/sisu/v5/shared_sem.rb
+++ b/lib/sisu/v5/shared_sem.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Sem
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
class Tags
def initialize(para,md)
@para,@md=para,md
diff --git a/lib/sisu/v5/sitemaps.rb b/lib/sisu/v5/sitemaps.rb
index b76d2d6..2d15709 100644
--- a/lib/sisu/v5/sitemaps.rb
+++ b/lib/sisu/v5/sitemaps.rb
@@ -57,13 +57,13 @@
<ralph@amissah.com>
<ralph.amissah@gmail.com>
- ** Description: sitemap created from parameters extracted from input file(s)
+ ** Description: sitemap created from document parameters
=end
module SiSU_Sitemaps
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
diff --git a/lib/sisu/v5/src_kdissert_share.rb b/lib/sisu/v5/src_kdissert_share.rb
index abf2f2d..e67d424 100644
--- a/lib/sisu/v5/src_kdissert_share.rb
+++ b/lib/sisu/v5/src_kdissert_share.rb
@@ -61,7 +61,7 @@
=end
module SiSU_KdiSource
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
begin
diff --git a/lib/sisu/v5/src_share.rb b/lib/sisu/v5/src_share.rb
index f78b922..be789e0 100644
--- a/lib/sisu/v5/src_share.rb
+++ b/lib/sisu/v5/src_share.rb
@@ -63,7 +63,7 @@
module SiSU_Markup
require_relative 'src_shared' # src_shared.rb
include SiSU_Source
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source < SiSU_Source::SiSUpodSource
def initialize(opt,build=nil,place=nil)
diff --git a/lib/sisu/v5/src_shared.rb b/lib/sisu/v5/src_shared.rb
index 068120f..2f6f830 100644
--- a/lib/sisu/v5/src_shared.rb
+++ b/lib/sisu/v5/src_shared.rb
@@ -63,8 +63,8 @@
module SiSU_Source
include SiSU_Env
class SiSUpodSource
- require_relative 'sysenv' # sysenv.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se' # se.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
def initialize(opt,build=nil,place=nil)
@opt=opt
@date=SiSU_Env::InfoDate.new.dt
diff --git a/lib/sisu/v5/src_sisupod_make.rb b/lib/sisu/v5/src_sisupod_make.rb
index 5dd8f03..fa5b656 100644
--- a/lib/sisu/v5/src_sisupod_make.rb
+++ b/lib/sisu/v5/src_sisupod_make.rb
@@ -63,10 +63,10 @@
module SiSU_Doc
require_relative 'src_shared' # scr_shared.rb
include SiSU_Source
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source < SiSU_Source::SiSUpodSource
- require_relative 'response' # response.rb
+ require_relative 'utils_response' # utils_response.rb
def initialize(opt,build=nil,place=nil)
super(opt,build,place)
@zipfile=@opt.fno.gsub(/(?:\~\S{2,3})?(\.ss[tm])$/,'\1')
diff --git a/lib/sisu/v5/sst_convert_markup.rb b/lib/sisu/v5/sst_convert_markup.rb
index cdceba7..6002e2f 100644
--- a/lib/sisu/v5/sst_convert_markup.rb
+++ b/lib/sisu/v5/sst_convert_markup.rb
@@ -65,7 +65,7 @@
module SiSU_Modify
require_relative 'sst_identify_markup' # sst_identify_markup.rb
require_relative 'sst_from_xml' # sst_from_xml.rb
- require_relative 'response' # response.rb
+ require_relative 'utils_response' # utils_response.rb
class ConvertMarkup
def initialize(opt)
@opt=opt
@@ -311,7 +311,7 @@ WOK
end
end
#%% files to match for this conversion set ------------------------->
-require_relative 'options' # options.rb
+require_relative 'hub_options' # hub_options.rb
argv=$*
base_path=Dir.pwd
@opt=SiSU_Commandline::Options.new(argv,base_path)
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/v5/sst_do_inline_footnotes.rb
index ac4c63d..c3340fb 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v5/sst_do_inline_footnotes.rb
@@ -64,9 +64,9 @@
module SiSU_ConvertFootnotes
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'ao_syntax' # ao_syntax.rb
include SiSU_AO_Syntax
@@ -277,7 +277,7 @@ module SiSU_ConvertFootnotes
data=@data
tuned_file=[]
data.each do |para|
- if @md.markup =~/0\.16|0\.37/ #parameters not extracted/available
+ if @md.markup =~/0\.16|0\.37/ #parameters not extracted/available
para.gsub!(/^0~\S+\s+/,'@\1: ')
para.gsub!(/^1~/,':A~')
para.gsub!(/^2~/,':B~')
diff --git a/lib/sisu/v5/sst_from_xml.rb b/lib/sisu/v5/sst_from_xml.rb
index 7ae4b44..b6fccd9 100644
--- a/lib/sisu/v5/sst_from_xml.rb
+++ b/lib/sisu/v5/sst_from_xml.rb
@@ -62,7 +62,7 @@
=end
module SiSU_sstFromXML
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
class Convert
begin
require 'rexml/document'
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/v5/sst_to_s_xml_sax.rb
index acb3ac4..fe68598 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v5/sst_to_s_xml_sax.rb
@@ -61,13 +61,13 @@
=end
module SiSU_SimpleXML_ModelSax
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'ao_doc_str' # ao_doc_str.rb
require_relative 'xml_shared' # xml_shared.rb
diff --git a/lib/sisu/v5/termsheet.rb b/lib/sisu/v5/termsheet.rb
index 7e8a2a3..a3fe308 100644
--- a/lib/sisu/v5/termsheet.rb
+++ b/lib/sisu/v5/termsheet.rb
@@ -62,8 +62,8 @@
sample files must be provided - (saved till later as may confuse)
=end
-require_relative 'sysenv' # sysenv.rb
-require_relative 'param' # param.rb
+require_relative 'se' # se.rb
+require_relative 'dp' # dp.rb
include SiSU_Param
@do,@done,@used,@html_output,@txt_input,@txt_output,@@report=Array.new(7){[]}
@@info=nil
@@ -123,7 +123,7 @@ WOK
@@report << @done << @used << "\n"
@done,@used=[],[]
end
-require_relative 'param' # param.rb
+require_relative 'dp' # dp.rb
@argv=$*
@proc="#{@argv[0].to_s}"
if @proc =~ /^-?[wft]/
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb
index 4c25c1e..e792a98 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -62,7 +62,7 @@
=end
module SiSU_TexInfo
require_relative 'html' # html.rb
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
#include Stamp ... needed removed arbitrarily 2005w05/1 (warnings about undefined flags)
diff --git a/lib/sisu/v5/texinfo_format.rb b/lib/sisu/v5/texinfo_format.rb
index 4286f50..5bc4144 100644
--- a/lib/sisu/v5/texinfo_format.rb
+++ b/lib/sisu/v5/texinfo_format.rb
@@ -62,7 +62,7 @@
=end
module SiSU_TexInfoFormat
@@table_pg_break_counter=1
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class Texinfo
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 8d6a01c..b5d3660 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -68,7 +68,7 @@ module SiSU_TeX
end
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'texpdf_format' # texpdf_format.rb
include SiSU_TeX_Pdf
@@ -87,7 +87,7 @@ module SiSU_TeX
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Viz
require_relative 'ao' # ao.rb
diff --git a/lib/sisu/v5/txt_asciidoc.rb b/lib/sisu/v5/txt_asciidoc.rb
index 7ca3cc8..43e49f7 100644
--- a/lib/sisu/v5/txt_asciidoc.rb
+++ b/lib/sisu/v5/txt_asciidoc.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_AsciiDoc
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v5/txt_markdown.rb b/lib/sisu/v5/txt_markdown.rb
index 69bedbc..1e4326a 100644
--- a/lib/sisu/v5/txt_markdown.rb
+++ b/lib/sisu/v5/txt_markdown.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_Markdown
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v5/txt_plain.rb b/lib/sisu/v5/txt_plain.rb
index 824d29c..2f3cc13 100644
--- a/lib/sisu/v5/txt_plain.rb
+++ b/lib/sisu/v5/txt_plain.rb
@@ -63,7 +63,7 @@
=end
module SiSU_Txt_Plain
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v5/txt_rst.rb b/lib/sisu/v5/txt_rst.rb
index c3978b0..f00c9e9 100644
--- a/lib/sisu/v5/txt_rst.rb
+++ b/lib/sisu/v5/txt_rst.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_rST
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v5/txt_textile.rb b/lib/sisu/v5/txt_textile.rb
index f5962b8..65c102f 100644
--- a/lib/sisu/v5/txt_textile.rb
+++ b/lib/sisu/v5/txt_textile.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_Textile
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v5/update.rb b/lib/sisu/v5/update.rb
index a4b6b2b..2301990 100644
--- a/lib/sisu/v5/update.rb
+++ b/lib/sisu/v5/update.rb
@@ -61,7 +61,7 @@
=end
module SiSU_UpdateControlFlag
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Param
class Check
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/v5/urls.rb
index cef51ab..815fe65 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/v5/urls.rb
@@ -61,9 +61,9 @@
=end
module SiSU_Urls
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
class Source
attr_reader :opt
diff --git a/lib/sisu/v6/response.rb b/lib/sisu/v5/utils_response.rb
index a67602f..88209b2 100644
--- a/lib/sisu/v6/response.rb
+++ b/lib/sisu/v5/utils_response.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/response.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_response.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v5/screen_text_color.rb b/lib/sisu/v5/utils_screen_text_color.rb
index 42b0c69..42b0c69 100644
--- a/lib/sisu/v5/screen_text_color.rb
+++ b/lib/sisu/v5/utils_screen_text_color.rb
diff --git a/lib/sisu/v5/spell.rb b/lib/sisu/v5/utils_spell.rb
index 69b6da7..886f6f7 100644
--- a/lib/sisu/v5/spell.rb
+++ b/lib/sisu/v5/utils_spell.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/spell.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_spell.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v5/webrick.rb b/lib/sisu/v5/webrick.rb
index e43d8cd..f6ff970 100644
--- a/lib/sisu/v5/webrick.rb
+++ b/lib/sisu/v5/webrick.rb
@@ -70,7 +70,7 @@ module SiSU_Webserv
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('time or webrick NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Screen
def initialize
@@ -159,7 +159,7 @@ WOK
get=Dir.pwd
brick(@port,get)
rescue
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
__LINE__.to_s + ':' + __FILE__
end
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/v5/wikispeak.rb
index e54b8ed..a0fba84 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/v5/wikispeak.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Wikispeak
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Param
include SiSU_Viz
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb
index e1efeea..4253e8e 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -63,9 +63,9 @@
module SiSU_XHTML
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/v5/xhtml_epub2.rb
index d0b4a7d..9b11049 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/v5/xhtml_epub2.rb
@@ -66,7 +66,7 @@ module SiSU_XHTML_EPUB2
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
end
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'defaults' # defaults.rb
include SiSU_Viz
diff --git a/lib/sisu/v5/xhtml_epub2_concordance.rb b/lib/sisu/v5/xhtml_epub2_concordance.rb
index cb498d0..447dd72 100644
--- a/lib/sisu/v5/xhtml_epub2_concordance.rb
+++ b/lib/sisu/v5/xhtml_epub2_concordance.rb
@@ -62,9 +62,9 @@
=end
module SiSU_XHTML_EPUB2_Concordance
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'defaults' # defaults.rb
include SiSU_Viz
@@ -157,7 +157,7 @@ WOK
include SiSU_Viz
require_relative 'xhtml_epub2_format' # xhtml_epub2_format.rb
include SiSU_XHTML_EPUB2_Format
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Screen
def initialize(particulars)
@particulars=particulars
diff --git a/lib/sisu/v5/xhtml_epub2_tune.rb b/lib/sisu/v5/xhtml_epub2_tune.rb
index db234a1..aa748cf 100644
--- a/lib/sisu/v5/xhtml_epub2_tune.rb
+++ b/lib/sisu/v5/xhtml_epub2_tune.rb
@@ -60,9 +60,9 @@
** Description: epub generation, epub pre-processing
=end
-require_relative 'param'
+require_relative 'dp' # dp.rb
module SiSU_XHTML_EPUB2_Tune
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
require_relative 'xhtml_epub2_format' # xhtml_epub2_format.rb #watch
@@line_mode=''
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb
index 0870c06..8132a35 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/v5/xml_docbook5.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Docbook_Book
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'txt_shared' # txt_shared.rb
include SiSU_TextUtils
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index b51a317..a602eee 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -63,9 +63,9 @@
module SiSU_XML_DOM
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'ao' # ao.rb
require_relative 'xml_shared' # xml_shared.rb
diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/v5/xml_fictionbook2.rb
index 997f0b0..74afc6a 100644
--- a/lib/sisu/v5/xml_fictionbook2.rb
+++ b/lib/sisu/v5/xml_fictionbook2.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Fictionbook
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'txt_shared' # txt_shared.rb
include SiSU_TextUtils
diff --git a/lib/sisu/v5/xml_format.rb b/lib/sisu/v5/xml_format.rb
index 7694f56..871ec48 100644
--- a/lib/sisu/v5/xml_format.rb
+++ b/lib/sisu/v5/xml_format.rb
@@ -62,7 +62,7 @@
=end
module SiSU_XML_Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class ParagraphNumber
diff --git a/lib/sisu/v5/xml_md_oai_pmh_dc.rb b/lib/sisu/v5/xml_md_oai_pmh_dc.rb
index 7ec83ff..9279ba1 100644
--- a/lib/sisu/v5/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v5/xml_md_oai_pmh_dc.rb
@@ -61,9 +61,9 @@
=end
module SiSU_XML_Metadata
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
class OAI_PMH
def initialize(opt)
diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index df71ce8..55c8d7e 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_ODF_ODT
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Viz
require_relative 'xml_odf_odt_format' # xml_odf_odt_format.rb
diff --git a/lib/sisu/v5/xml_odf_odt_format.rb b/lib/sisu/v5/xml_odf_odt_format.rb
index b56e428..bfbd075 100644
--- a/lib/sisu/v5/xml_odf_odt_format.rb
+++ b/lib/sisu/v5/xml_odf_odt_format.rb
@@ -61,7 +61,7 @@
=end
module SiSU_XML_ODF_ODT_Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class ParagraphNumber
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index ac2b6d4..5871979 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/v5/xml_sax.rb
@@ -63,9 +63,9 @@
module SiSU_XML_SAX
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
diff --git a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
index 0395d09..f36c937 100644
--- a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Scaffold_Structure_Collapse
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v5/xml_scaffold_structure_sisu.rb b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
index 39ca1e6..4434432 100644
--- a/lib/sisu/v5/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Scaffold_Structure_Sisu
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v5/xml_shared.rb b/lib/sisu/v5/xml_shared.rb
index 77df1a3..bd0e383 100644
--- a/lib/sisu/v5/xml_shared.rb
+++ b/lib/sisu/v5/xml_shared.rb
@@ -567,7 +567,7 @@ module SiSU_XML_Munge
end
end
module SiSU_XML_Tags #Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class RDF
diff --git a/lib/sisu/v5/zap.rb b/lib/sisu/v5/zap.rb
index 94a9e19..7570724 100644
--- a/lib/sisu/v5/zap.rb
+++ b/lib/sisu/v5/zap.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Zap
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v6/air.rb b/lib/sisu/v6/air.rb
index 2af4038..11c9445 100644
--- a/lib/sisu/v6/air.rb
+++ b/lib/sisu/v6/air.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Air
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
class Source
@@ao_array=[]
@@fns=nil
diff --git a/lib/sisu/v6/ao.rb b/lib/sisu/v6/ao.rb
index 370bb7e..9b305b3 100644
--- a/lib/sisu/v6/ao.rb
+++ b/lib/sisu/v6/ao.rb
@@ -64,9 +64,9 @@
module SiSU_AO
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'ao_doc_objects' # ao.rb
require_relative 'ao_syntax' # ao_syntax.rb
diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/v6/ao_composite.rb
index eaa4e08..bb188f4 100644
--- a/lib/sisu/v6/ao_composite.rb
+++ b/lib/sisu/v6/ao_composite.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Assemble
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
class RemoteImage
def initialize
@env=SiSU_Env::InfoEnv.new
diff --git a/lib/sisu/v6/cgi.rb b/lib/sisu/v6/cgi.rb
index a406534..d791180 100644
--- a/lib/sisu/v6/cgi.rb
+++ b/lib/sisu/v6/cgi.rb
@@ -61,8 +61,8 @@
(pgsql sqlite)
=end
-module SiSU_CGI #% database building documents
- require_relative 'sysenv' # sysenv.rb
+module SiSU_CGI #% database building documents
+ require_relative 'se' # se.rb
require_relative 'cgi_pgsql' # cgi_pgsql.rb
require_relative 'cgi_sqlite' # cgi_sqlite.rb
class SearchSQL
diff --git a/lib/sisu/v6/cgi_pgsql.rb b/lib/sisu/v6/cgi_pgsql.rb
index 38b5c09..09ded27 100644
--- a/lib/sisu/v6/cgi_pgsql.rb
+++ b/lib/sisu/v6/cgi_pgsql.rb
@@ -60,8 +60,8 @@
** Description: generates naive cgi search form for search of sisu database (pgsql)
=end
-module SiSU_CGI_PgSQL #% database building documents
- require_relative 'sysenv' # sysenv.rb
+module SiSU_CGI_PgSQL #% database building documents
+ require_relative 'se' # se.rb
require_relative 'cgi_sql_common' # cgi_sql_common.rb
include SiSU_CGI_SQL
class SearchPgSQL < CGI_Common
diff --git a/lib/sisu/v6/cgi_sqlite.rb b/lib/sisu/v6/cgi_sqlite.rb
index 8cf01d3..722d903 100644
--- a/lib/sisu/v6/cgi_sqlite.rb
+++ b/lib/sisu/v6/cgi_sqlite.rb
@@ -60,8 +60,8 @@
** Description: generates naive cgi search form for search of sisu database (sqlite)
=end
-module SiSU_CGI_SQLite #% database building documents
- require_relative 'sysenv' # sysenv.rb
+module SiSU_CGI_SQLite #% database building documents
+ require_relative 'se' # se.rb
require_relative 'cgi_sql_common' # cgi_sql_common.rb
include SiSU_CGI_SQL
class SearchSQLite < CGI_Common
diff --git a/lib/sisu/v6/conf.rb b/lib/sisu/v6/conf.rb
index b3a5375..2f29902 100644
--- a/lib/sisu/v6/conf.rb
+++ b/lib/sisu/v6/conf.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Initialize
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Screen
require_relative 'relaxng' # relaxng.rb
@@ -82,7 +82,7 @@ module SiSU_Initialize
end
end
class ConfigSite #config files such as css are not updated if they already exist unless forced using the --init=site modifier
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
def initialize(opt)
@opt=opt
@env=SiSU_Env::InfoEnv.new(@opt.fns)
diff --git a/lib/sisu/v6/css.rb b/lib/sisu/v6/css.rb
index b59458e..a2c75d3 100644
--- a/lib/sisu/v6/css.rb
+++ b/lib/sisu/v6/css.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Style
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'defaults' # defaults.rb
class CSS_HeadInfo
def initialize(md,ft='html')
diff --git a/lib/sisu/v6/db_columns.rb b/lib/sisu/v6/db_columns.rb
index f7db347..d9eda1d 100644
--- a/lib/sisu/v6/db_columns.rb
+++ b/lib/sisu/v6/db_columns.rb
@@ -62,7 +62,7 @@
=end
module SiSU_DbColumns
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
require_relative 'db_sqltxt' # db_sqltxt.rb
class Columns < SiSU_DbText::Prepare
def initialize(md=nil)
diff --git a/lib/sisu/v6/db_create.rb b/lib/sisu/v6/db_create.rb
index e9e6aa4..4d551ee 100644
--- a/lib/sisu/v6/db_create.rb
+++ b/lib/sisu/v6/db_create.rb
@@ -64,7 +64,7 @@
module SiSU_DbCreate
require_relative 'db_columns' # db_columns.rb
class Create < SiSU_DbColumns::Columns
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
@@dl=nil
def initialize(opt,conn,file,sql_type=:pg)
@opt,@conn,@file,@sql_type=opt,conn,file,sql_type
diff --git a/lib/sisu/v6/db_drop.rb b/lib/sisu/v6/db_drop.rb
index e93d288..3363746 100644
--- a/lib/sisu/v6/db_drop.rb
+++ b/lib/sisu/v6/db_drop.rb
@@ -63,7 +63,7 @@
=end
module SiSU_DbDrop
class Drop
- require_relative 'response' # response.rb
+ require_relative 'utils_response' # utils_response.rb
def initialize(opt,conn,db_info,sql_type)
@opt,@conn,@db_info,@sql_type=opt,conn,db_info,sql_type
@ans=SiSU_Response::Response.new
diff --git a/lib/sisu/v6/db_load_tuple.rb b/lib/sisu/v6/db_load_tuple.rb
index c474025..46d2989 100644
--- a/lib/sisu/v6/db_load_tuple.rb
+++ b/lib/sisu/v6/db_load_tuple.rb
@@ -64,7 +64,7 @@
module SiSU_DbTuple
require_relative 'db_columns' # db_columns.rb
class LoadDocuments
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
def initialize(conn,col,opt,file_maint)
@conn,@col,@opt,@file_maint=conn,col,opt,file_maint
diff --git a/lib/sisu/v6/dbi.rb b/lib/sisu/v6/dbi.rb
index 5880aa1..be684ab 100644
--- a/lib/sisu/v6/dbi.rb
+++ b/lib/sisu/v6/dbi.rb
@@ -61,9 +61,9 @@
=end
module SiSU_DBI #% database building
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'db_dbi' # db_dbi.rb
include SiSU_DbDBI
diff --git a/lib/sisu/v6/dbi_discrete.rb b/lib/sisu/v6/dbi_discrete.rb
index fc5c310..ee0737f 100644
--- a/lib/sisu/v6/dbi_discrete.rb
+++ b/lib/sisu/v6/dbi_discrete.rb
@@ -61,9 +61,9 @@
=end
module SiSU_DBI_Discrete #% database building
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'db_dbi' # db_dbi.rb
include SiSU_DbDBI
diff --git a/lib/sisu/v6/defaults.rb b/lib/sisu/v6/defaults.rb
index a26edae..c725b11 100644
--- a/lib/sisu/v6/defaults.rb
+++ b/lib/sisu/v6/defaults.rb
@@ -67,7 +67,7 @@ module SiSU_Viz
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('uri NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'css' # css.rb
include SiSU_Style
diff --git a/lib/sisu/v6/digests.rb b/lib/sisu/v6/digests.rb
index c7a6d3c..5450f7b 100644
--- a/lib/sisu/v6/digests.rb
+++ b/lib/sisu/v6/digests.rb
@@ -61,7 +61,7 @@
=end
module SiSU_DigestView
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
require_relative 'prog_text_translation' # prog_text_translation.rb
require_relative 'shared_markup_alt.rb' # shared_markup_alt.rb
class Source
diff --git a/lib/sisu/v6/param.rb b/lib/sisu/v6/dp.rb
index 25b50ba..499e582 100644
--- a/lib/sisu/v6/param.rb
+++ b/lib/sisu/v6/dp.rb
@@ -51,13 +51,13 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/param.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
<ralph.amissah@gmail.com>
- ** Description: parameters extracted from input file(s) for program use
+ ** Description: document parameters extracted from input files for program use
=end
module SiSU_Param
@@ -68,10 +68,10 @@ module SiSU_Param
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('uri or pstore NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param_make' # param_make.rb
- require_relative 'param_identify_markup' # param_identify_markup.rb
+ require_relative 'dp_make' # dp_make.rb
+ require_relative 'dp_identify_markup' # dp_identify_markup.rb
@@date=SiSU_Env::InfoDate.new
@@proc=
@@filename_txt=
@@ -1162,7 +1162,7 @@ module SiSU_Param
gsub(/~\{.+?\}~/,'')
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
- 'Parameters',
+ 'Document Parameters',
%{#{title}#{creator}}
).txt_grey if @opt.act[:verbose][:set]==:on
end
diff --git a/lib/sisu/v6/param_identify_markup.rb b/lib/sisu/v6/dp_identify_markup.rb
index 87879e7..0281832 100644
--- a/lib/sisu/v6/param_identify_markup.rb
+++ b/lib/sisu/v6/dp_identify_markup.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/param_identify_markup.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp_identify_markup.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/param_make.rb b/lib/sisu/v6/dp_make.rb
index 50c9551..0dacd51 100644
--- a/lib/sisu/v6/param_make.rb
+++ b/lib/sisu/v6/dp_make.rb
@@ -51,13 +51,13 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/param_make.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp_make.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
<ralph.amissah@gmail.com>
- ** Description: make parameters extracted for program use
+ ** Description: document parameters make extracted for program use
=end
diff --git a/lib/sisu/v6/embedded.rb b/lib/sisu/v6/embedded.rb
index cf29489..2405f9e 100644
--- a/lib/sisu/v6/embedded.rb
+++ b/lib/sisu/v6/embedded.rb
@@ -61,9 +61,9 @@
=end
module SiSU_Embedded
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v6/errors.rb b/lib/sisu/v6/errors.rb
index fb5117e..4fb18f4 100644
--- a/lib/sisu/v6/errors.rb
+++ b/lib/sisu/v6/errors.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Errors
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
class Rescued <CreateFile
def initialize(error,errorlist,cmd,fns='')
diff --git a/lib/sisu/v6/git.rb b/lib/sisu/v6/git.rb
index d58ae56..80601b5 100644
--- a/lib/sisu/v6/git.rb
+++ b/lib/sisu/v6/git.rb
@@ -61,8 +61,8 @@
=end
module SiSU_Git
- require_relative 'param' # param.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'dp' # dp.rb
+ require_relative 'se' # se.rb
require_relative 'ao' # ao.rb
class Source
def initialize(opt)
diff --git a/lib/sisu/v6/harvest.rb b/lib/sisu/v6/harvest.rb
index be0efe1..2bd2fc6 100644
--- a/lib/sisu/v6/harvest.rb
+++ b/lib/sisu/v6/harvest.rb
@@ -65,10 +65,10 @@
module SiSU_Harvest
@@the_idx_topics,@@the_idx_authors={},{}
class Source
- require_relative 'options' # options.rb
+ require_relative 'hub_options' # hub_options.rb
require_relative 'harvest_topics' # harvest_topics.rb
require_relative 'harvest_authors' # harvest_authors.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
def initialize(opt)
@opt=opt
diff --git a/lib/sisu/v6/author_format.rb b/lib/sisu/v6/harvest_author_format.rb
index 7b791bd..7b88997 100644
--- a/lib/sisu/v6/author_format.rb
+++ b/lib/sisu/v6/harvest_author_format.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/author_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_author_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/harvest_authors.rb b/lib/sisu/v6/harvest_authors.rb
index c84634b..15c6581 100644
--- a/lib/sisu/v6/harvest_authors.rb
+++ b/lib/sisu/v6/harvest_authors.rb
@@ -62,7 +62,7 @@
=end
module SiSU_HarvestAuthors
- require_relative 'author_format' # author_format.rb
+ require_relative 'harvest_author_format' # harvest_author_format.rb
class Songsheet
@@the_idx_authors={}
def initialize(opt,env)
diff --git a/lib/sisu/v6/harvest_topics.rb b/lib/sisu/v6/harvest_topics.rb
index e17b842..c827bbb 100644
--- a/lib/sisu/v6/harvest_topics.rb
+++ b/lib/sisu/v6/harvest_topics.rb
@@ -63,7 +63,7 @@
=end
module SiSU_HarvestTopics
- require_relative 'author_format' # author_format.rb
+ require_relative 'harvest_author_format' # harvest_author_format.rb
include SiSU_Viz
class Songsheet
@@the_idx_topics={}
diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index 1f6b787..581c3e5 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -66,7 +66,7 @@ module SiSU_HTML
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
end
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'defaults' # defaults.rb
include SiSU_Viz
diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/v6/html_concordance.rb
index 0f87ee0..55bdfb6 100644
--- a/lib/sisu/v6/html_concordance.rb
+++ b/lib/sisu/v6/html_concordance.rb
@@ -62,9 +62,9 @@
=end
module SiSU_Concordance
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'defaults' # defaults.rb
include SiSU_Viz
@@ -212,7 +212,7 @@ WOK
include SiSU_Viz
require_relative 'html_format' # html_format.rb
include SiSU_HTML_Format
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Screen
@@dp=nil
def initialize(particulars)
diff --git a/lib/sisu/v6/html_lite_shared.rb b/lib/sisu/v6/html_lite_shared.rb
index 7ae1735..8eace55 100644
--- a/lib/sisu/v6/html_lite_shared.rb
+++ b/lib/sisu/v6/html_lite_shared.rb
@@ -66,7 +66,7 @@ module SiSU_FormatShared
include SiSU_Viz
class CSS_Format
require_relative 'defaults' # defaults.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@fns=nil
def initialize(md,t_o)
@md,@t_o=md,t_o
diff --git a/lib/sisu/v6/html_promo.rb b/lib/sisu/v6/html_promo.rb
index e2832d3..c216af9 100644
--- a/lib/sisu/v6/html_promo.rb
+++ b/lib/sisu/v6/html_promo.rb
@@ -61,7 +61,7 @@
=end
module SiSU_HTML_Promo
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Ad
def initialize(md)
diff --git a/lib/sisu/v6/html_tune.rb b/lib/sisu/v6/html_tune.rb
index 42568a3..afd6f60 100644
--- a/lib/sisu/v6/html_tune.rb
+++ b/lib/sisu/v6/html_tune.rb
@@ -60,9 +60,9 @@
** Description: html generation, html pre-processing
=end
-require_relative 'param'
+require_relative 'dp' # dp.rb
module SiSU_HTML_Tune
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
require_relative 'html_format' # html_format.rb #watch
@@line_mode=''
diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/v6/hub.rb
index e061ee4..9ebb42d 100644
--- a/lib/sisu/v6/hub.rb
+++ b/lib/sisu/v6/hub.rb
@@ -63,11 +63,11 @@
=end
module SiSU
require_relative 'constants' # constants.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Screen
- require_relative 'options' # options.rb
- require_relative 'param' # param.rb
+ require_relative 'hub_options' # hub_options.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'defaults' # defaults.rb
include SiSU_Viz
@@ -599,10 +599,10 @@ module SiSU
else
end
if @opt.act[:urls_selected][:set]==:on #% --sitemap, -Y
- require_relative 'urls'
- OptionLoopFiles.new(@opt).loop_files_on_given_option do
- SiSU_Urls::Source.new(@opt).read #% -u -v -V -M
- end
+ require_relative 'urls'
+ OptionLoopFiles.new(@opt).loop_files_on_given_option do
+ SiSU_Urls::Source.new(@opt).read #% -u -v -V -M
+ end
end
end
def do_initialization
diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v6/hub_options.rb
index eede713..f851b98 100644
--- a/lib/sisu/v5/options.rb
+++ b/lib/sisu/v6/hub_options.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/options.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_options.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,8 +67,8 @@ module SiSU_Commandline
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pathname NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
- require_relative 'param_make' # param_make.rb
+ require_relative 'se' # se.rb
+ require_relative 'dp_make' # dp_make.rb
class HeaderCommon
def sisu_document_make_instructions(make_instruct_array=:nil)
@pagenew=
@@ -1394,6 +1394,6 @@ module SiSU_Commandline
end
end
__END__
-note usually named @opt is carried in Param (usually as @md.opt), @opt is a
+note usually named @opt is carried in dp document parameters (usually as @md.opt), @opt is a
subset of @md where @md is passed, contents of @opt are available as @md.opt
passing @opt as well is duplication check for fns & fnb
diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb
index 2135093..e38d842 100644
--- a/lib/sisu/v6/manifest.rb
+++ b/lib/sisu/v6/manifest.rb
@@ -61,15 +61,15 @@
=end
module SiSU_Manifest
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'prog_text_translation' # prog_text_translation.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'html_minitoc' # html_minitoc.rb
require_relative 'html' # html.rb
include SiSU_HTML_Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'i18n' # i18n.rb
include SiSU_Viz
diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/v6/manpage.rb
index 4f2bb80..d3192eb 100644
--- a/lib/sisu/v6/manpage.rb
+++ b/lib/sisu/v6/manpage.rb
@@ -63,7 +63,7 @@
=end
module SiSU_Manpage
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Param
include SiSU_Viz
diff --git a/lib/sisu/v6/manpage_format.rb b/lib/sisu/v6/manpage_format.rb
index 1bb0e42..b64911e 100644
--- a/lib/sisu/v6/manpage_format.rb
+++ b/lib/sisu/v6/manpage_format.rb
@@ -61,7 +61,7 @@
=end
module SiSU_ManpageFormat
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class ParagraphNumber
diff --git a/lib/sisu/v6/po4a.rb b/lib/sisu/v6/po4a.rb
index c4e074e..0e7f91b 100644
--- a/lib/sisu/v6/po4a.rb
+++ b/lib/sisu/v6/po4a.rb
@@ -63,7 +63,7 @@
=end
module SiSU_Po4a
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'ao_composite' # ao_composite.rb
require_relative 'shared_metadata' # shared_metadata.rb
diff --git a/lib/sisu/v6/prog_text_translation.rb b/lib/sisu/v6/prog_text_translation.rb
index 177f17b..6a82f3d 100644
--- a/lib/sisu/v6/prog_text_translation.rb
+++ b/lib/sisu/v6/prog_text_translation.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Translate
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Param
class Source
def initialize(md,doc_lang,trans_str='')
diff --git a/lib/sisu/v6/qrcode.rb b/lib/sisu/v6/qrcode.rb
index b9aee5a..b69769e 100644
--- a/lib/sisu/v6/qrcode.rb
+++ b/lib/sisu/v6/qrcode.rb
@@ -61,13 +61,13 @@
=end
module SiSU_QRcode
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'prog_text_translation' # prog_text_translation.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'html' # html.rb
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'i18n' # i18n.rb
include SiSU_Viz
diff --git a/lib/sisu/v6/relaxng.rb b/lib/sisu/v6/relaxng.rb
index 1270ada..c8d85d4 100644
--- a/lib/sisu/v6/relaxng.rb
+++ b/lib/sisu/v6/relaxng.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Relaxng
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
class RelaxNG
def gpl3_or_later
@gpl3_or_later =<<RELAXNG
diff --git a/lib/sisu/v6/remote.rb b/lib/sisu/v6/remote.rb
index 54fd144..3a8b58d 100644
--- a/lib/sisu/v6/remote.rb
+++ b/lib/sisu/v6/remote.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Remote
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Put
def initialize(opt)
diff --git a/lib/sisu/v6/rexml.rb b/lib/sisu/v6/rexml.rb
index 7321ebf..ce6b2ce 100644
--- a/lib/sisu/v6/rexml.rb
+++ b/lib/sisu/v6/rexml.rb
@@ -67,9 +67,9 @@ module SiSU_Rexml
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('rexml/document NOT FOUND (LoadError)')
end
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Viz
class Rexml
diff --git a/lib/sisu/v6/sysenv.rb b/lib/sisu/v6/se.rb
index 26ce7cd..c79f38b 100644
--- a/lib/sisu/v6/sysenv.rb
+++ b/lib/sisu/v6/se.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sysenv.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -156,7 +156,7 @@ module SiSU_Env
end
end
module SiSU_Screen
- require_relative 'screen_text_color' # screen_text_color.rb
+ require_relative 'utils_screen_text_color' # utils_screen_text_color.rb
end
module SiSU_Errors
require_relative 'errors' # errors.rb
diff --git a/lib/sisu/v6/se_createsite.rb b/lib/sisu/v6/se_createsite.rb
index c35d24d..7b1046f 100644
--- a/lib/sisu/v6/se_createsite.rb
+++ b/lib/sisu/v6/se_createsite.rb
@@ -63,7 +63,7 @@
module SiSU_Create_Site
require_relative 'constants' # constants.rb
require_relative 'utils' # utils.rb
- require_relative 'screen_text_color' # screen_text_color.rb
+ require_relative 'utils_screen_text_color' # utils_screen_text_color.rb
require_relative 'se_info_env' # se_info_env.rb
begin
require 'fileutils'
diff --git a/lib/sisu/v6/se_filemap.rb b/lib/sisu/v6/se_filemap.rb
index 987f8f4..88a8095 100644
--- a/lib/sisu/v6/se_filemap.rb
+++ b/lib/sisu/v6/se_filemap.rb
@@ -145,7 +145,7 @@ module SiSU_File_Map
ft << @md.fn[:xml_scaffold_structure_collapse]
end
@fnb=@md.fnb
- else # still needed where/when param is not parsed
+ else # still needed where/when dp document param is not parsed
if @opt.act[:html][:set]==:on #% --html, -h -H
ft << '.html' << '.html.??'
end
diff --git a/lib/sisu/v6/particulars.rb b/lib/sisu/v6/se_hub_particulars.rb
index 7e850f4..99bdf9f 100644
--- a/lib/sisu/v6/particulars.rb
+++ b/lib/sisu/v6/se_hub_particulars.rb
@@ -52,7 +52,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/particulars.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_hub_particulars.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,9 +67,9 @@ module SiSU_Particulars
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('singleton NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'ao' # ao.rb
class CombinedSingleton
@@ -127,7 +127,7 @@ module SiSU_Particulars
@md=SiSU_Param::Parameters.new(opt).get
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -138,7 +138,7 @@ module SiSU_Particulars
@env=SiSU_Env::InfoEnv.new(opt.fns)
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -149,7 +149,7 @@ module SiSU_Particulars
@file=SiSU_Env::FileOp.new(@md)
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -160,7 +160,7 @@ module SiSU_Particulars
@ao_array=SiSU_AO::Source.new(opt).get
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -170,7 +170,7 @@ module SiSU_Particulars
@sst_idx=SiSU_AO::Source.new(opt).get_idx_sst
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -180,7 +180,7 @@ module SiSU_Particulars
@raw_idx=SiSU_AO::Source.new(opt).get_idx_raw
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -190,7 +190,7 @@ module SiSU_Particulars
@html_idx=SiSU_AO::Source.new(opt).get_idx_html
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -200,7 +200,7 @@ module SiSU_Particulars
@xhtml_idx=SiSU_AO::Source.new(opt).get_idx_xhtml
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -213,11 +213,11 @@ module SiSU_Particulars
self
rescue
if @md
- SiSU_Errors::Rescued.new($!,$@,@md.opt.cmd,@md.opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
else
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
@@ -229,7 +229,7 @@ module SiSU_Particulars
@ocn_htmlseg_map=SiSU_AO::Source.new(@md).get_map_ocn_htmlseg
self
rescue
- SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fnl).location do
__LINE__.to_s + ':' + __FILE__
end
end
diff --git a/lib/sisu/v6/shared_images.rb b/lib/sisu/v6/shared_images.rb
index 536a2f2..073ed6d 100644
--- a/lib/sisu/v6/shared_images.rb
+++ b/lib/sisu/v6/shared_images.rb
@@ -60,7 +60,7 @@
** Description: common file for xml generation
=end
module SiSU_Images
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
class Source
def initialize(opt)
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
diff --git a/lib/sisu/v6/shared_sem.rb b/lib/sisu/v6/shared_sem.rb
index 02c04a8..26fe588 100644
--- a/lib/sisu/v6/shared_sem.rb
+++ b/lib/sisu/v6/shared_sem.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Sem
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
class Tags
def initialize(para,md)
@para,@md=para,md
diff --git a/lib/sisu/v6/sitemaps.rb b/lib/sisu/v6/sitemaps.rb
index 0b19314..e656693 100644
--- a/lib/sisu/v6/sitemaps.rb
+++ b/lib/sisu/v6/sitemaps.rb
@@ -57,13 +57,13 @@
<ralph@amissah.com>
<ralph.amissah@gmail.com>
- ** Description: sitemap created from parameters extracted from input file(s)
+ ** Description: sitemap created from document parameters
=end
module SiSU_Sitemaps
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
diff --git a/lib/sisu/v6/src_kdissert_share.rb b/lib/sisu/v6/src_kdissert_share.rb
index 8d6e95f..ebe761f 100644
--- a/lib/sisu/v6/src_kdissert_share.rb
+++ b/lib/sisu/v6/src_kdissert_share.rb
@@ -61,7 +61,7 @@
=end
module SiSU_KdiSource
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
begin
diff --git a/lib/sisu/v6/src_share.rb b/lib/sisu/v6/src_share.rb
index b132038..c043f42 100644
--- a/lib/sisu/v6/src_share.rb
+++ b/lib/sisu/v6/src_share.rb
@@ -63,7 +63,7 @@
module SiSU_Markup
require_relative 'src_shared' # src_shared.rb
include SiSU_Source
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source < SiSU_Source::SiSUpodSource
def initialize(opt,build=nil,place=nil)
diff --git a/lib/sisu/v6/src_shared.rb b/lib/sisu/v6/src_shared.rb
index 514e045..f36bf30 100644
--- a/lib/sisu/v6/src_shared.rb
+++ b/lib/sisu/v6/src_shared.rb
@@ -63,8 +63,8 @@
module SiSU_Source
include SiSU_Env
class SiSUpodSource
- require_relative 'sysenv' # sysenv.rb
- require_relative 'particulars' # particulars.rb
+ require_relative 'se' # se.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
def initialize(opt,build=nil,place=nil)
@opt=opt
@date=SiSU_Env::InfoDate.new.dt
diff --git a/lib/sisu/v6/src_sisupod_make.rb b/lib/sisu/v6/src_sisupod_make.rb
index a1319e3..57f13e6 100644
--- a/lib/sisu/v6/src_sisupod_make.rb
+++ b/lib/sisu/v6/src_sisupod_make.rb
@@ -63,10 +63,10 @@
module SiSU_Doc
require_relative 'src_shared' # scr_shared.rb
include SiSU_Source
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source < SiSU_Source::SiSUpodSource
- require_relative 'response' # response.rb
+ require_relative 'utils_response' # utils_response.rb
def initialize(opt,build=nil,place=nil)
super(opt,build,place)
@zipfile=@opt.fno.gsub(/(?:\~\S{2,3})?(\.ss[tm])$/,'\1')
diff --git a/lib/sisu/v6/sst_convert_markup.rb b/lib/sisu/v6/sst_convert_markup.rb
index 8d523d0..6e73d25 100644
--- a/lib/sisu/v6/sst_convert_markup.rb
+++ b/lib/sisu/v6/sst_convert_markup.rb
@@ -65,7 +65,7 @@
module SiSU_Modify
require_relative 'sst_identify_markup' # sst_identify_markup.rb
require_relative 'sst_from_xml' # sst_from_xml.rb
- require_relative 'response' # response.rb
+ require_relative 'utils_response' # utils_response.rb
class ConvertMarkup
def initialize(opt)
@opt=opt
@@ -311,7 +311,7 @@ WOK
end
end
#%% files to match for this conversion set ------------------------->
-require_relative 'options' # options.rb
+require_relative 'hub_options' # hub_options.rb
argv=$*
base_path=Dir.pwd
@opt=SiSU_Commandline::Options.new(argv,base_path)
diff --git a/lib/sisu/v6/sst_do_inline_footnotes.rb b/lib/sisu/v6/sst_do_inline_footnotes.rb
index 7affab1..afa4ca3 100644
--- a/lib/sisu/v6/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v6/sst_do_inline_footnotes.rb
@@ -64,9 +64,9 @@
module SiSU_ConvertFootnotes
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
require_relative 'ao_syntax' # ao_syntax.rb
include SiSU_AO_Syntax
@@ -277,7 +277,7 @@ module SiSU_ConvertFootnotes
data=@data
tuned_file=[]
data.each do |para|
- if @md.markup =~/0\.16|0\.37/ #parameters not extracted/available
+ if @md.markup =~/0\.16|0\.37/ #parameters not extracted/available
para.gsub!(/^0~\S+\s+/,'@\1: ')
para.gsub!(/^1~/,':A~')
para.gsub!(/^2~/,':B~')
diff --git a/lib/sisu/v6/sst_from_xml.rb b/lib/sisu/v6/sst_from_xml.rb
index 12919a1..56083ff 100644
--- a/lib/sisu/v6/sst_from_xml.rb
+++ b/lib/sisu/v6/sst_from_xml.rb
@@ -62,7 +62,7 @@
=end
module SiSU_sstFromXML
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
class Convert
begin
require 'rexml/document'
diff --git a/lib/sisu/v6/sst_to_s_xml_sax.rb b/lib/sisu/v6/sst_to_s_xml_sax.rb
index ecdfb94..0be6ffa 100644
--- a/lib/sisu/v6/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v6/sst_to_s_xml_sax.rb
@@ -61,13 +61,13 @@
=end
module SiSU_SimpleXML_ModelSax
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'ao_doc_str' # ao_doc_str.rb
require_relative 'xml_shared' # xml_shared.rb
diff --git a/lib/sisu/v6/termsheet.rb b/lib/sisu/v6/termsheet.rb
index 834ca81..6020272 100644
--- a/lib/sisu/v6/termsheet.rb
+++ b/lib/sisu/v6/termsheet.rb
@@ -62,8 +62,8 @@
sample files must be provided - (saved till later as may confuse)
=end
-require_relative 'sysenv' # sysenv.rb
-require_relative 'param' # param.rb
+require_relative 'se' # se.rb
+require_relative 'dp' # dp.rb
include SiSU_Param
@do,@done,@used,@html_output,@txt_input,@txt_output,@@report=Array.new(7){[]}
@@info=nil
@@ -123,7 +123,7 @@ WOK
@@report << @done << @used << "\n"
@done,@used=[],[]
end
-require_relative 'param' # param.rb
+require_relative 'dp' # dp.rb
@argv=$*
@proc="#{@argv[0].to_s}"
if @proc =~ /^-?[wft]/
diff --git a/lib/sisu/v6/texinfo.rb b/lib/sisu/v6/texinfo.rb
index 459d3ac..718d55e 100644
--- a/lib/sisu/v6/texinfo.rb
+++ b/lib/sisu/v6/texinfo.rb
@@ -62,7 +62,7 @@
=end
module SiSU_TexInfo
require_relative 'html' # html.rb
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
#include Stamp ... needed removed arbitrarily 2005w05/1 (warnings about undefined flags)
diff --git a/lib/sisu/v6/texinfo_format.rb b/lib/sisu/v6/texinfo_format.rb
index 884abfc..66ebbc7 100644
--- a/lib/sisu/v6/texinfo_format.rb
+++ b/lib/sisu/v6/texinfo_format.rb
@@ -62,7 +62,7 @@
=end
module SiSU_TexInfoFormat
@@table_pg_break_counter=1
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class Texinfo
diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/v6/texpdf.rb
index 2869c59..4802614 100644
--- a/lib/sisu/v6/texpdf.rb
+++ b/lib/sisu/v6/texpdf.rb
@@ -68,7 +68,7 @@ module SiSU_TeX
end
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'texpdf_format' # texpdf_format.rb
include SiSU_TeX_Pdf
@@ -87,7 +87,7 @@ module SiSU_TeX
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Viz
require_relative 'ao' # ao.rb
diff --git a/lib/sisu/v6/txt_asciidoc.rb b/lib/sisu/v6/txt_asciidoc.rb
index fd10b25..2b4b892 100644
--- a/lib/sisu/v6/txt_asciidoc.rb
+++ b/lib/sisu/v6/txt_asciidoc.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_AsciiDoc
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v6/txt_markdown.rb b/lib/sisu/v6/txt_markdown.rb
index 1fc488b..f7faf07 100644
--- a/lib/sisu/v6/txt_markdown.rb
+++ b/lib/sisu/v6/txt_markdown.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_Markdown
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v6/txt_plain.rb b/lib/sisu/v6/txt_plain.rb
index 3f54e74..7572b89 100644
--- a/lib/sisu/v6/txt_plain.rb
+++ b/lib/sisu/v6/txt_plain.rb
@@ -63,7 +63,7 @@
=end
module SiSU_Txt_Plain
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v6/txt_rst.rb b/lib/sisu/v6/txt_rst.rb
index e60d576..cda1b63 100644
--- a/lib/sisu/v6/txt_rst.rb
+++ b/lib/sisu/v6/txt_rst.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_rST
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v6/txt_textile.rb b/lib/sisu/v6/txt_textile.rb
index 00baaa1..d59a64b 100644
--- a/lib/sisu/v6/txt_textile.rb
+++ b/lib/sisu/v6/txt_textile.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Txt_Textile
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'txt_shared' # txt_shared.rb
diff --git a/lib/sisu/v6/update.rb b/lib/sisu/v6/update.rb
index 4081713..b9dc46c 100644
--- a/lib/sisu/v6/update.rb
+++ b/lib/sisu/v6/update.rb
@@ -61,7 +61,7 @@
=end
module SiSU_UpdateControlFlag
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Param
class Check
diff --git a/lib/sisu/v6/urls.rb b/lib/sisu/v6/urls.rb
index 9cc47af..1a1088f 100644
--- a/lib/sisu/v6/urls.rb
+++ b/lib/sisu/v6/urls.rb
@@ -61,9 +61,9 @@
=end
module SiSU_Urls
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
class Source
attr_reader :opt
diff --git a/lib/sisu/v5/response.rb b/lib/sisu/v6/utils_response.rb
index 969da00..59037c2 100644
--- a/lib/sisu/v5/response.rb
+++ b/lib/sisu/v6/utils_response.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/response.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_response.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/screen_text_color.rb b/lib/sisu/v6/utils_screen_text_color.rb
index 5c4a2f7..c9842c3 100644
--- a/lib/sisu/v6/screen_text_color.rb
+++ b/lib/sisu/v6/utils_screen_text_color.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/screen_text_color.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_screen_text_color.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/spell.rb b/lib/sisu/v6/utils_spell.rb
index a0f6e90..512280c 100644
--- a/lib/sisu/v6/spell.rb
+++ b/lib/sisu/v6/utils_spell.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/spell.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_spell.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v6/webrick.rb b/lib/sisu/v6/webrick.rb
index 97e6548..8ebbf2d 100644
--- a/lib/sisu/v6/webrick.rb
+++ b/lib/sisu/v6/webrick.rb
@@ -70,7 +70,7 @@ module SiSU_Webserv
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('time or webrick NOT FOUND (LoadError)')
end
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Screen
def initialize
@@ -159,7 +159,7 @@ WOK
get=Dir.pwd
brick(@port,get)
rescue
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
SiSU_Errors::Rescued.new($!,$@,'-W',nil).location do #fix
__LINE__.to_s + ':' + __FILE__
end
diff --git a/lib/sisu/v6/wikispeak.rb b/lib/sisu/v6/wikispeak.rb
index a7f00de..ac8e11a 100644
--- a/lib/sisu/v6/wikispeak.rb
+++ b/lib/sisu/v6/wikispeak.rb
@@ -62,7 +62,7 @@
=end
module SiSU_Wikispeak
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Param
include SiSU_Viz
diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/v6/xhtml.rb
index dc04e8b..0f03dc5 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/v6/xhtml.rb
@@ -63,9 +63,9 @@
module SiSU_XHTML
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/v6/xhtml_epub2.rb
index e978c15..e086d12 100644
--- a/lib/sisu/v6/xhtml_epub2.rb
+++ b/lib/sisu/v6/xhtml_epub2.rb
@@ -66,7 +66,7 @@ module SiSU_XHTML_EPUB2
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('pstore NOT FOUND (LoadError)')
end
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'defaults' # defaults.rb
include SiSU_Viz
diff --git a/lib/sisu/v6/xhtml_epub2_concordance.rb b/lib/sisu/v6/xhtml_epub2_concordance.rb
index 2fb8fb9..8defb75 100644
--- a/lib/sisu/v6/xhtml_epub2_concordance.rb
+++ b/lib/sisu/v6/xhtml_epub2_concordance.rb
@@ -62,9 +62,9 @@
=end
module SiSU_XHTML_EPUB2_Concordance
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'defaults' # defaults.rb
include SiSU_Viz
@@ -157,7 +157,7 @@ WOK
include SiSU_Viz
require_relative 'xhtml_epub2_format' # xhtml_epub2_format.rb
include SiSU_XHTML_EPUB2_Format
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Screen
def initialize(particulars)
@particulars=particulars
diff --git a/lib/sisu/v6/xhtml_epub2_tune.rb b/lib/sisu/v6/xhtml_epub2_tune.rb
index 9222f58..00d885e 100644
--- a/lib/sisu/v6/xhtml_epub2_tune.rb
+++ b/lib/sisu/v6/xhtml_epub2_tune.rb
@@ -60,9 +60,9 @@
** Description: epub generation, epub pre-processing
=end
-require_relative 'param'
+require_relative 'dp' # dp.rb
module SiSU_XHTML_EPUB2_Tune
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env; include SiSU_Screen
require_relative 'xhtml_epub2_format' # xhtml_epub2_format.rb #watch
@@line_mode=''
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb
index c5be78f..f087ce0 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/v6/xml_docbook5.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Docbook_Book
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'txt_shared' # txt_shared.rb
include SiSU_TextUtils
diff --git a/lib/sisu/v6/xml_dom.rb b/lib/sisu/v6/xml_dom.rb
index b92c2d5..7bf34dd 100644
--- a/lib/sisu/v6/xml_dom.rb
+++ b/lib/sisu/v6/xml_dom.rb
@@ -63,9 +63,9 @@
module SiSU_XML_DOM
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'ao' # ao.rb
require_relative 'xml_shared' # xml_shared.rb
diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/v6/xml_fictionbook2.rb
index 0430314..6898ab1 100644
--- a/lib/sisu/v6/xml_fictionbook2.rb
+++ b/lib/sisu/v6/xml_fictionbook2.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Fictionbook
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'txt_shared' # txt_shared.rb
include SiSU_TextUtils
diff --git a/lib/sisu/v6/xml_format.rb b/lib/sisu/v6/xml_format.rb
index d310d0c..70c1a27 100644
--- a/lib/sisu/v6/xml_format.rb
+++ b/lib/sisu/v6/xml_format.rb
@@ -62,7 +62,7 @@
=end
module SiSU_XML_Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class ParagraphNumber
diff --git a/lib/sisu/v6/xml_md_oai_pmh_dc.rb b/lib/sisu/v6/xml_md_oai_pmh_dc.rb
index f3a6fae..96dd674 100644
--- a/lib/sisu/v6/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v6/xml_md_oai_pmh_dc.rb
@@ -61,9 +61,9 @@
=end
module SiSU_XML_Metadata
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
class OAI_PMH
def initialize(opt)
diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/v6/xml_odf_odt.rb
index 224de6d..ff6de3a 100644
--- a/lib/sisu/v6/xml_odf_odt.rb
+++ b/lib/sisu/v6/xml_odf_odt.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_ODF_ODT
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
include SiSU_Viz
require_relative 'xml_odf_odt_format' # xml_odf_odt_format.rb
diff --git a/lib/sisu/v6/xml_odf_odt_format.rb b/lib/sisu/v6/xml_odf_odt_format.rb
index b2539df..68457d0 100644
--- a/lib/sisu/v6/xml_odf_odt_format.rb
+++ b/lib/sisu/v6/xml_odf_odt_format.rb
@@ -61,7 +61,7 @@
=end
module SiSU_XML_ODF_ODT_Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class ParagraphNumber
diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/v6/xml_sax.rb
index 6893246..a99714f 100644
--- a/lib/sisu/v6/xml_sax.rb
+++ b/lib/sisu/v6/xml_sax.rb
@@ -63,9 +63,9 @@
module SiSU_XML_SAX
require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
diff --git a/lib/sisu/v6/xml_scaffold_structure_collapsed.rb b/lib/sisu/v6/xml_scaffold_structure_collapsed.rb
index 9fece3b..de2487a 100644
--- a/lib/sisu/v6/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/v6/xml_scaffold_structure_collapsed.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Scaffold_Structure_Collapse
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v6/xml_scaffold_structure_sisu.rb b/lib/sisu/v6/xml_scaffold_structure_sisu.rb
index a21f834..37add44 100644
--- a/lib/sisu/v6/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/v6/xml_scaffold_structure_sisu.rb
@@ -61,10 +61,10 @@
=end
module SiSU_XML_Scaffold_Structure_Sisu
- require_relative 'particulars' # particulars.rb
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
include SiSU_Particulars
require_relative 'ao' # ao.rb
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)
diff --git a/lib/sisu/v6/xml_shared.rb b/lib/sisu/v6/xml_shared.rb
index 38c2180..35d1132 100644
--- a/lib/sisu/v6/xml_shared.rb
+++ b/lib/sisu/v6/xml_shared.rb
@@ -567,7 +567,7 @@ module SiSU_XML_Munge
end
end
module SiSU_XML_Tags #Format
- require_relative 'param' # param.rb
+ require_relative 'dp' # dp.rb
include SiSU_Param
include SiSU_Viz
class RDF
diff --git a/lib/sisu/v6/zap.rb b/lib/sisu/v6/zap.rb
index 5e30842..829056b 100644
--- a/lib/sisu/v6/zap.rb
+++ b/lib/sisu/v6/zap.rb
@@ -61,7 +61,7 @@
=end
module SiSU_Zap
- require_relative 'sysenv' # sysenv.rb
+ require_relative 'se' # se.rb
include SiSU_Env
class Source
def initialize(opt)