aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2009-07-04 13:17:07 -0400
committerRalph Amissah <ralph@amissah.com>2009-07-04 13:17:07 -0400
commitebb0b3a2a83bc3ec196f9d9d126fcd679b1aacbd (patch)
tree6130d4625a3999f772ee6956a1c766e73556e9d0
parentMerge branch 'upstream' into debian/sid (diff)
parentmove lib to version 1 directory, (lib/sisu/v1) and make related changes (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG26
-rw-r--r--bin/sisu4
-rw-r--r--[-rwxr-xr-x]bin/sisu_termsheet4
-rw-r--r--[-rwxr-xr-x]bin/sisu_webrick4
-rw-r--r--conf/sisu/version.yml5
-rw-r--r--conf/sisu/version1.yml5
-rw-r--r--lib/sisu/v1/author_format.rb (renamed from lib/sisu/v0/author_format.rb)2
-rw-r--r--lib/sisu/v1/cgi.rb (renamed from lib/sisu/v0/cgi.rb)2
-rw-r--r--lib/sisu/v1/cgi_pgsql.rb (renamed from lib/sisu/v0/cgi_pgsql.rb)0
-rw-r--r--lib/sisu/v1/cgi_sql_common.rb (renamed from lib/sisu/v0/cgi_sql_common.rb)23
-rw-r--r--lib/sisu/v1/cgi_sqlite.rb (renamed from lib/sisu/v0/cgi_sqlite.rb)0
-rw-r--r--lib/sisu/v1/character_encoding.rb (renamed from lib/sisu/v0/character_encoding.rb)2
-rw-r--r--lib/sisu/v1/composite.rb (renamed from lib/sisu/v0/composite.rb)2
-rw-r--r--lib/sisu/v1/concordance.rb (renamed from lib/sisu/v0/concordance.rb)0
-rw-r--r--lib/sisu/v1/conf.rb (renamed from lib/sisu/v0/conf.rb)2
-rw-r--r--lib/sisu/v1/constants.rb (renamed from lib/sisu/v0/constants.rb)0
-rw-r--r--lib/sisu/v1/css.rb (renamed from lib/sisu/v0/css.rb)2
-rw-r--r--lib/sisu/v1/dal.rb (renamed from lib/sisu/v0/dal.rb)0
-rw-r--r--lib/sisu/v1/dal_character_check.rb (renamed from lib/sisu/v0/dal_character_check.rb)0
-rw-r--r--lib/sisu/v1/dal_doc_str.rb (renamed from lib/sisu/v0/dal_doc_str.rb)0
-rw-r--r--lib/sisu/v1/dal_doc_str_code.rb (renamed from lib/sisu/v0/dal_doc_str_code.rb)0
-rw-r--r--lib/sisu/v1/dal_doc_str_tables.rb (renamed from lib/sisu/v0/dal_doc_str_tables.rb)0
-rw-r--r--lib/sisu/v1/dal_endnotes.rb (renamed from lib/sisu/v0/dal_endnotes.rb)0
-rw-r--r--lib/sisu/v1/dal_expand_insertions.rb (renamed from lib/sisu/v0/dal_expand_insertions.rb)3
-rw-r--r--lib/sisu/v1/dal_hash_digest.rb (renamed from lib/sisu/v0/dal_hash_digest.rb)0
-rw-r--r--lib/sisu/v1/dal_idx.rb (renamed from lib/sisu/v0/dal_idx.rb)3
-rw-r--r--lib/sisu/v1/dal_images.rb (renamed from lib/sisu/v0/dal_images.rb)0
-rw-r--r--lib/sisu/v1/dal_metadata.rb (renamed from lib/sisu/v0/dal_metadata.rb)0
-rw-r--r--lib/sisu/v1/dal_numbering.rb (renamed from lib/sisu/v0/dal_numbering.rb)5
-rw-r--r--lib/sisu/v1/dal_substitutions_and_insertions.rb (renamed from lib/sisu/v0/dal_substitutions_and_insertions.rb)0
-rw-r--r--lib/sisu/v1/dal_syntax.rb (renamed from lib/sisu/v0/dal_syntax.rb)0
-rw-r--r--lib/sisu/v1/db_columns.rb (renamed from lib/sisu/v0/db_columns.rb)2
-rw-r--r--lib/sisu/v1/db_create.rb (renamed from lib/sisu/v0/db_create.rb)0
-rw-r--r--lib/sisu/v1/db_dbi.rb (renamed from lib/sisu/v0/db_dbi.rb)2
-rw-r--r--lib/sisu/v1/db_drop.rb (renamed from lib/sisu/v0/db_drop.rb)2
-rw-r--r--lib/sisu/v1/db_import.rb (renamed from lib/sisu/v0/db_import.rb)0
-rw-r--r--lib/sisu/v1/db_indexes.rb (renamed from lib/sisu/v0/db_indexes.rb)0
-rw-r--r--lib/sisu/v1/db_load_tuple.rb (renamed from lib/sisu/v0/db_load_tuple.rb)0
-rw-r--r--lib/sisu/v1/db_remove.rb (renamed from lib/sisu/v0/db_remove.rb)0
-rw-r--r--lib/sisu/v1/db_select.rb (renamed from lib/sisu/v0/db_select.rb)2
-rw-r--r--lib/sisu/v1/db_tests.rb (renamed from lib/sisu/v0/db_tests.rb)2
-rw-r--r--lib/sisu/v1/dbi.rb (renamed from lib/sisu/v0/dbi.rb)2
-rw-r--r--lib/sisu/v1/defaults.rb (renamed from lib/sisu/v0/defaults.rb)25
-rw-r--r--lib/sisu/v1/digests.rb (renamed from lib/sisu/v0/digests.rb)2
-rw-r--r--lib/sisu/v1/embedded.rb (renamed from lib/sisu/v0/embedded.rb)2
-rw-r--r--lib/sisu/v1/errors.rb (renamed from lib/sisu/v0/errors.rb)2
-rw-r--r--lib/sisu/v1/harvest.rb (renamed from lib/sisu/v0/harvest.rb)0
-rw-r--r--lib/sisu/v1/harvest_authors.rb (renamed from lib/sisu/v0/harvest_authors.rb)6
-rw-r--r--lib/sisu/v1/harvest_topics.rb (renamed from lib/sisu/v0/harvest_topics.rb)6
-rw-r--r--lib/sisu/v1/help.rb (renamed from lib/sisu/v0/help.rb)8
-rw-r--r--lib/sisu/v1/html.rb (renamed from lib/sisu/v0/html.rb)33
-rw-r--r--lib/sisu/v1/html_format.rb (renamed from lib/sisu/v0/html_format.rb)33
-rw-r--r--lib/sisu/v1/html_minitoc.rb (renamed from lib/sisu/v0/html_minitoc.rb)12
-rw-r--r--lib/sisu/v1/html_promo.rb (renamed from lib/sisu/v0/html_promo.rb)23
-rw-r--r--lib/sisu/v1/html_scroll.rb (renamed from lib/sisu/v0/html_scroll.rb)0
-rw-r--r--lib/sisu/v1/html_segments.rb (renamed from lib/sisu/v0/html_segments.rb)20
-rw-r--r--lib/sisu/v1/html_table.rb (renamed from lib/sisu/v0/html_table.rb)2
-rw-r--r--lib/sisu/v1/html_tune.rb (renamed from lib/sisu/v0/html_tune.rb)4
-rw-r--r--lib/sisu/v1/hub.rb (renamed from lib/sisu/v0/hub.rb)12
-rw-r--r--lib/sisu/v1/i18n.rb (renamed from lib/sisu/v0/i18n.rb)2
-rw-r--r--lib/sisu/v1/manifest.rb (renamed from lib/sisu/v0/manifest.rb)2
-rw-r--r--lib/sisu/v1/manpage.rb (renamed from lib/sisu/v0/manpage.rb)4
-rw-r--r--lib/sisu/v1/manpage_format.rb (renamed from lib/sisu/v0/manpage_format.rb)2
-rw-r--r--lib/sisu/v1/odf.rb (renamed from lib/sisu/v0/odf.rb)0
-rw-r--r--lib/sisu/v1/odf_format.rb (renamed from lib/sisu/v0/odf_format.rb)2
-rw-r--r--lib/sisu/v1/options.rb (renamed from lib/sisu/v0/options.rb)2
-rw-r--r--lib/sisu/v1/param.rb (renamed from lib/sisu/v0/param.rb)2
-rw-r--r--lib/sisu/v1/param_identify_markup.rb (renamed from lib/sisu/v0/param_identify_markup.rb)2
-rw-r--r--lib/sisu/v1/particulars.rb (renamed from lib/sisu/v0/particulars.rb)2
-rw-r--r--lib/sisu/v1/plaintext.rb (renamed from lib/sisu/v0/plaintext.rb)0
-rw-r--r--lib/sisu/v1/plaintext_format.rb (renamed from lib/sisu/v0/plaintext_format.rb)2
-rw-r--r--lib/sisu/v1/relaxng.rb (renamed from lib/sisu/v0/relaxng.rb)17
-rw-r--r--lib/sisu/v1/remote.rb (renamed from lib/sisu/v0/remote.rb)2
-rw-r--r--lib/sisu/v1/response.rb (renamed from lib/sisu/v0/response.rb)2
-rw-r--r--lib/sisu/v1/rexml.rb (renamed from lib/sisu/v0/rexml.rb)2
-rw-r--r--lib/sisu/v1/screen_text_color.rb (renamed from lib/sisu/v0/screen_text_color.rb)2
-rw-r--r--lib/sisu/v1/share_src.rb (renamed from lib/sisu/v0/share_src.rb)2
-rw-r--r--lib/sisu/v1/share_src_kdissert.rb (renamed from lib/sisu/v0/share_src_kdissert.rb)2
-rw-r--r--lib/sisu/v1/shared_html.rb (renamed from lib/sisu/v0/shared_html.rb)2
-rw-r--r--lib/sisu/v1/shared_html_lite.rb (renamed from lib/sisu/v0/shared_html_lite.rb)0
-rw-r--r--lib/sisu/v1/shared_sem.rb (renamed from lib/sisu/v0/shared_sem.rb)2
-rw-r--r--lib/sisu/v1/shared_structure.rb (renamed from lib/sisu/v0/shared_structure.rb)2
-rw-r--r--lib/sisu/v1/shared_txt.rb (renamed from lib/sisu/v0/shared_txt.rb)0
-rw-r--r--lib/sisu/v1/shared_xml.rb (renamed from lib/sisu/v0/shared_xml.rb)8
-rw-r--r--lib/sisu/v1/sisupod_make.rb (renamed from lib/sisu/v0/sisupod_make.rb)4
-rw-r--r--lib/sisu/v1/sitemaps.rb (renamed from lib/sisu/v0/sitemaps.rb)2
-rw-r--r--lib/sisu/v1/spell.rb (renamed from lib/sisu/v0/spell.rb)2
-rw-r--r--lib/sisu/v1/sst_convert_markup.rb (renamed from lib/sisu/v0/sst_convert_markup.rb)2
-rw-r--r--lib/sisu/v1/sst_do_inline_footnotes.rb (renamed from lib/sisu/v0/sst_do_inline_footnotes.rb)2
-rw-r--r--lib/sisu/v1/sst_from_kdissert.rb (renamed from lib/sisu/v0/sst_from_kdissert.rb)4
-rw-r--r--lib/sisu/v1/sst_from_xml.rb (renamed from lib/sisu/v0/sst_from_xml.rb)4
-rw-r--r--lib/sisu/v1/sst_identify_markup.rb (renamed from lib/sisu/v0/sst_identify_markup.rb)2
-rw-r--r--lib/sisu/v1/sst_to_s_xml_dom.rb (renamed from lib/sisu/v0/sst_to_s_xml_dom.rb)0
-rw-r--r--lib/sisu/v1/sst_to_s_xml_node.rb (renamed from lib/sisu/v0/sst_to_s_xml_node.rb)18
-rw-r--r--lib/sisu/v1/sst_to_s_xml_sax.rb (renamed from lib/sisu/v0/sst_to_s_xml_sax.rb)0
-rw-r--r--lib/sisu/v1/sysenv.rb (renamed from lib/sisu/v0/sysenv.rb)15
-rw-r--r--lib/sisu/v1/termsheet.rb (renamed from lib/sisu/v0/termsheet.rb)2
-rw-r--r--lib/sisu/v1/texinfo.rb (renamed from lib/sisu/v0/texinfo.rb)2
-rw-r--r--lib/sisu/v1/texinfo_format.rb (renamed from lib/sisu/v0/texinfo_format.rb)4
-rw-r--r--lib/sisu/v1/texpdf.rb (renamed from lib/sisu/v0/texpdf.rb)45
-rw-r--r--lib/sisu/v1/texpdf_format.rb (renamed from lib/sisu/v0/texpdf_format.rb)20
-rw-r--r--lib/sisu/v1/update.rb (renamed from lib/sisu/v0/update.rb)2
-rw-r--r--lib/sisu/v1/urls.rb (renamed from lib/sisu/v0/urls.rb)2
-rw-r--r--lib/sisu/v1/webrick.rb (renamed from lib/sisu/v0/webrick.rb)2
-rw-r--r--lib/sisu/v1/wikispeak.rb (renamed from lib/sisu/v0/wikispeak.rb)2
-rw-r--r--lib/sisu/v1/xhtml.rb (renamed from lib/sisu/v0/xhtml.rb)0
-rw-r--r--lib/sisu/v1/xml.rb (renamed from lib/sisu/v0/xml.rb)0
-rw-r--r--lib/sisu/v1/xml_dom.rb (renamed from lib/sisu/v0/xml_dom.rb)0
-rw-r--r--lib/sisu/v1/xml_fictionbook.rb (renamed from lib/sisu/v0/xml_fictionbook.rb)6
-rw-r--r--lib/sisu/v1/xml_format.rb (renamed from lib/sisu/v0/xml_format.rb)2
-rw-r--r--lib/sisu/v1/xml_md_oai_pmh_dc.rb (renamed from lib/sisu/v0/xml_md_oai_pmh_dc.rb)2
-rw-r--r--lib/sisu/v1/xml_scaffold.rb (renamed from lib/sisu/v0/xml_scaffold.rb)0
-rw-r--r--lib/sisu/v1/xml_tables.rb (renamed from lib/sisu/v0/xml_tables.rb)2
-rw-r--r--lib/sisu/v1/zap.rb (renamed from lib/sisu/v0/zap.rb)2
114 files changed, 268 insertions, 243 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 965661ac..3c7eb9c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,32 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.71.0.orig.tar.gz (2009-07-04:26/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz
+ sisu_0.71.0.orig.tar.gz
+ sisu_0.71.0-1.dsc
+ sisu_0.71.0-1.diff.gz
+
+ * prepare for version 1, (and make way for version 2)
+ * move lib to v1 from v0 lib/sisu/v1
+ * change to version1.yml from version.yml (conf/sisu/version1.yml)
+ * make necessary program changes
+ [note on version 2 to come, input unchanged, output much the same, middle-
+ layer (document abstraction) changed, uses ruby objects instead of strings
+ to represent data]
+
+ * sysenv, make sisu and ruby version info ruby instance methods
+
+ * minor housekeeping:
+ * texpdf mostly minor cleaning
+ * html various minor:
+ * use suffix provided in constants;
+ * module SiSU_HTML_Tune;
+ * possibility of use of adsense
+ * dal_numbering, minor regex reduction
+ * dal_idx, book_idx_html, match sysenv
+ * xml related minor touches
+
%% sisu_0.70.6.orig.tar.gz (2009-07-01:26/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.6.orig.tar.gz
218ece8c5b813ebf40eb43af2e9272a166675da4b7235f85c96c414a654054de 1546958 sisu_0.70.6.orig.tar.gz
diff --git a/bin/sisu b/bin/sisu
index 5ef458e4..23577573 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -1,11 +1,11 @@
#!/usr/bin/env ruby
# coding: utf-8
-#SiSU: copyright (C) 1997..2008 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997 - 2009 Ralph Amissah; License GPL, see appended program information
#raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
$VERBOSE=nil
$KCODE='u' if RUBY_VERSION < '1.9'
-branch='v0'
+branch='v1'
SiSU_lib="sisu/#{branch}"
require "#{SiSU_lib}/hub"
__END__
diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet
index 4ff87246..c2c040d3 100755..100644
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -1,10 +1,10 @@
#!/usr/bin/env ruby
# coding: utf-8
-#SiSU: copyright (C) 1997..2008 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997 - 2009 Ralph Amissah; License GPL, see appended program information
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
$VERBOSE=nil
-branch='v0'
+branch='v1'
SiSU_lib="sisu/#{branch}"
require "#{SiSU_lib}/termsheet"
__END__
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index 6c028b83..f954a8a8 100755..100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -1,10 +1,10 @@
#!/usr/bin/env ruby
# coding: utf-8
-#SiSU: copyright (C) 1997..2008 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997 - 2009 Ralph Amissah; License GPL, see appended program information
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
$VERBOSE=nil
-branch='v0'
+branch='v1'
SiSU_lib="sisu/#{branch}"
require "#{SiSU_lib}/webrick"
__END__
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
deleted file mode 100644
index 64ebaa03..00000000
--- a/conf/sisu/version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:version: 0.70.6
-:date_stamp: 2009w26/3
-:date: "2009-07-01"
-:project: SiSU
diff --git a/conf/sisu/version1.yml b/conf/sisu/version1.yml
new file mode 100644
index 00000000..09101fab
--- /dev/null
+++ b/conf/sisu/version1.yml
@@ -0,0 +1,5 @@
+---
+:version: 0.71.0
+:date_stamp: 2009w26/6
+:date: "2009-07-04"
+:project: SiSU
diff --git a/lib/sisu/v0/author_format.rb b/lib/sisu/v1/author_format.rb
index 9240f915..a947df2b 100644
--- a/lib/sisu/v0/author_format.rb
+++ b/lib/sisu/v1/author_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/cgi.rb b/lib/sisu/v1/cgi.rb
index 4b105150..504cd7f1 100644
--- a/lib/sisu/v0/cgi.rb
+++ b/lib/sisu/v1/cgi.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/cgi_pgsql.rb b/lib/sisu/v1/cgi_pgsql.rb
index 4f201dfa..4f201dfa 100644
--- a/lib/sisu/v0/cgi_pgsql.rb
+++ b/lib/sisu/v1/cgi_pgsql.rb
diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v1/cgi_sql_common.rb
index ee006516..fea17a7a 100644
--- a/lib/sisu/v0/cgi_sql_common.rb
+++ b/lib/sisu/v1/cgi_sql_common.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -78,15 +78,13 @@ module SiSU_CGI_sql
* Author: Ralph Amissah
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Ralph Amissah All Rights Reserved.
+ * Copyright: (C) 1997 - 2009 Ralph Amissah All Rights Reserved.
* License: GPL 3 or later:
SiSU, a framework for document structuring, publishing and search
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Ralph Amissah
+ Copyright (C) Ralph Amissah
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@ -103,9 +101,12 @@ module SiSU_CGI_sql
If you have Internet connection, the latest version of the GPL should be
available at these locations:
- <http://www.fsf.org/licenses/gpl.html>
+ <http://www.fsf.org/licensing/licenses/gpl.html>
<http://www.gnu.org/licenses/gpl.html>
- <http://www.jus.uio.no/sisu/gpl.fsf>
+
+ <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
+ <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
+ <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
* SiSU uses:
* Standard SiSU markup syntax,
@@ -122,6 +123,8 @@ module SiSU_CGI_sql
* Ralph Amissah
<ralph@amissah.com>
<ralph.amissah@gmail.com>
+
+ ** Description: html generation, processing
WOK_SQL
end
def header1
@@ -513,7 +516,7 @@ module SiSU_CGI_sql
WOK_SQL
end
def tail
- v=SiSU_Env::Info_version.new.get_version
+ v=SiSU_Env::Info_version.instance.get_version
<<-WOK_SQL
def tail
<<-'WOK'
@@ -535,7 +538,7 @@ module SiSU_CGI_sql
<br />
<a href="http://www.jus.uio.no/sisu" >
<b>#{v[:project]}</b></a> <sup>&copy;</sup> Ralph Amissah
- 1993, current 2008.
+ 1993, current 2009.
All Rights Reserved.
<br />
<a href="http://www.jus.uio.no/sisu" >
@@ -562,7 +565,7 @@ module SiSU_CGI_sql
<br />Standard SiSU meta-markup syntax, and the
<br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
<br />
- <sup>&copy;</sup> Ralph Amissah 1997, current 2008.
+ <sup>&copy;</sup> Ralph Amissah 1997, current 2009.
All Rights Reserved.
</font></p>
</td></tr>
diff --git a/lib/sisu/v0/cgi_sqlite.rb b/lib/sisu/v1/cgi_sqlite.rb
index 34cb67dc..34cb67dc 100644
--- a/lib/sisu/v0/cgi_sqlite.rb
+++ b/lib/sisu/v1/cgi_sqlite.rb
diff --git a/lib/sisu/v0/character_encoding.rb b/lib/sisu/v1/character_encoding.rb
index 23bad376..2bac8edc 100644
--- a/lib/sisu/v0/character_encoding.rb
+++ b/lib/sisu/v1/character_encoding.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v1/composite.rb
index 4994f568..9dc35eec 100644
--- a/lib/sisu/v0/composite.rb
+++ b/lib/sisu/v1/composite.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/concordance.rb b/lib/sisu/v1/concordance.rb
index 3c2b8326..3c2b8326 100644
--- a/lib/sisu/v0/concordance.rb
+++ b/lib/sisu/v1/concordance.rb
diff --git a/lib/sisu/v0/conf.rb b/lib/sisu/v1/conf.rb
index 03af859b..9e2b7efd 100644
--- a/lib/sisu/v0/conf.rb
+++ b/lib/sisu/v1/conf.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/constants.rb b/lib/sisu/v1/constants.rb
index 5c93d543..5c93d543 100644
--- a/lib/sisu/v0/constants.rb
+++ b/lib/sisu/v1/constants.rb
diff --git a/lib/sisu/v0/css.rb b/lib/sisu/v1/css.rb
index 8023c737..3f2733b1 100644
--- a/lib/sisu/v0/css.rb
+++ b/lib/sisu/v1/css.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v1/dal.rb
index 627244c6..627244c6 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v1/dal.rb
diff --git a/lib/sisu/v0/dal_character_check.rb b/lib/sisu/v1/dal_character_check.rb
index 99ee25cd..99ee25cd 100644
--- a/lib/sisu/v0/dal_character_check.rb
+++ b/lib/sisu/v1/dal_character_check.rb
diff --git a/lib/sisu/v0/dal_doc_str.rb b/lib/sisu/v1/dal_doc_str.rb
index 2e135243..2e135243 100644
--- a/lib/sisu/v0/dal_doc_str.rb
+++ b/lib/sisu/v1/dal_doc_str.rb
diff --git a/lib/sisu/v0/dal_doc_str_code.rb b/lib/sisu/v1/dal_doc_str_code.rb
index 02643fa3..02643fa3 100644
--- a/lib/sisu/v0/dal_doc_str_code.rb
+++ b/lib/sisu/v1/dal_doc_str_code.rb
diff --git a/lib/sisu/v0/dal_doc_str_tables.rb b/lib/sisu/v1/dal_doc_str_tables.rb
index ff29706b..ff29706b 100644
--- a/lib/sisu/v0/dal_doc_str_tables.rb
+++ b/lib/sisu/v1/dal_doc_str_tables.rb
diff --git a/lib/sisu/v0/dal_endnotes.rb b/lib/sisu/v1/dal_endnotes.rb
index 77909443..77909443 100644
--- a/lib/sisu/v0/dal_endnotes.rb
+++ b/lib/sisu/v1/dal_endnotes.rb
diff --git a/lib/sisu/v0/dal_expand_insertions.rb b/lib/sisu/v1/dal_expand_insertions.rb
index 2f04803f..90102c7d 100644
--- a/lib/sisu/v0/dal_expand_insertions.rb
+++ b/lib/sisu/v1/dal_expand_insertions.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -194,4 +194,3 @@ module SiSU_insertions
end
end
__END__
-
diff --git a/lib/sisu/v0/dal_hash_digest.rb b/lib/sisu/v1/dal_hash_digest.rb
index 2b7370ca..2b7370ca 100644
--- a/lib/sisu/v0/dal_hash_digest.rb
+++ b/lib/sisu/v1/dal_hash_digest.rb
diff --git a/lib/sisu/v0/dal_idx.rb b/lib/sisu/v1/dal_idx.rb
index 7201e2ac..fec0e1ed 100644
--- a/lib/sisu/v0/dal_idx.rb
+++ b/lib/sisu/v1/dal_idx.rb
@@ -292,8 +292,7 @@ module SiSU_book_index
if @md.book_idx
path="#{@env.path.output}/#{@md.fnb}"
Dir.mkdir(path) unless FileTest.directory?(path)
- html_index_file=File.new("#{path}/#{@md.fn[:book_idx]}",'w')
- #puts "#{path}/#{@md.fn[:book_idx]}"
+ html_index_file=File.new("#{path}/#{@md.fn[:book_idx_html]}",'w')
html_idx.each {|x| html_index_file << x }
html_index_file.close
end
diff --git a/lib/sisu/v0/dal_images.rb b/lib/sisu/v1/dal_images.rb
index 621ac986..621ac986 100644
--- a/lib/sisu/v0/dal_images.rb
+++ b/lib/sisu/v1/dal_images.rb
diff --git a/lib/sisu/v0/dal_metadata.rb b/lib/sisu/v1/dal_metadata.rb
index bdf0dace..bdf0dace 100644
--- a/lib/sisu/v0/dal_metadata.rb
+++ b/lib/sisu/v1/dal_metadata.rb
diff --git a/lib/sisu/v0/dal_numbering.rb b/lib/sisu/v1/dal_numbering.rb
index bbbd3f46..05123bbc 100644
--- a/lib/sisu/v0/dal_numbering.rb
+++ b/lib/sisu/v1/dal_numbering.rb
@@ -133,10 +133,7 @@ module SiSU_numbering
if (para =~/^(?:#{no1}|^#{no2}|^#{no3}#{no4})~#/ \
and para !~/^#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}/)
t_not+=1 #; t_no2=0; t_no3=0
- para.gsub!(/^(#{Mx[:lv_o]}#{no1}):#(#{Mx[:lv_c]})/,"\\1:ps#{t_not}\\2")
- para.gsub!(/^(#{Mx[:lv_o]}#{no2}):#(#{Mx[:lv_c]})/,"\\1:ps#{t_not}\\2")
- para.gsub!(/^(#{Mx[:lv_o]}#{no3}):#(#{Mx[:lv_c]})/,"\\1:ps#{t_not}\\2")
- para.gsub!(/^(#{Mx[:lv_o]}#{no4}):#(#{Mx[:lv_c]})/,"\\1:ps#{t_not}\\2")
+ para.gsub!(/^(#{Mx[:lv_o]}(?:#{no1}|#{no2}|#{no3}|#{no4})):#(#{Mx[:lv_c]})/,"\\1:ps#{t_not}\\2")
end
if para =~/#{Mx[:lv_o]}#{no1}:/
@subnumber=1
diff --git a/lib/sisu/v0/dal_substitutions_and_insertions.rb b/lib/sisu/v1/dal_substitutions_and_insertions.rb
index cadae8a7..cadae8a7 100644
--- a/lib/sisu/v0/dal_substitutions_and_insertions.rb
+++ b/lib/sisu/v1/dal_substitutions_and_insertions.rb
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v1/dal_syntax.rb
index e917621a..e917621a 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v1/dal_syntax.rb
diff --git a/lib/sisu/v0/db_columns.rb b/lib/sisu/v1/db_columns.rb
index 7ed5cdf9..2dc88a9d 100644
--- a/lib/sisu/v0/db_columns.rb
+++ b/lib/sisu/v1/db_columns.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/db_create.rb b/lib/sisu/v1/db_create.rb
index 2cdb2c06..2cdb2c06 100644
--- a/lib/sisu/v0/db_create.rb
+++ b/lib/sisu/v1/db_create.rb
diff --git a/lib/sisu/v0/db_dbi.rb b/lib/sisu/v1/db_dbi.rb
index d95b7be5..1c09f334 100644
--- a/lib/sisu/v0/db_dbi.rb
+++ b/lib/sisu/v1/db_dbi.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/db_drop.rb b/lib/sisu/v1/db_drop.rb
index 02a38880..bed179b7 100644
--- a/lib/sisu/v0/db_drop.rb
+++ b/lib/sisu/v1/db_drop.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/db_import.rb b/lib/sisu/v1/db_import.rb
index da564639..da564639 100644
--- a/lib/sisu/v0/db_import.rb
+++ b/lib/sisu/v1/db_import.rb
diff --git a/lib/sisu/v0/db_indexes.rb b/lib/sisu/v1/db_indexes.rb
index 315ae199..315ae199 100644
--- a/lib/sisu/v0/db_indexes.rb
+++ b/lib/sisu/v1/db_indexes.rb
diff --git a/lib/sisu/v0/db_load_tuple.rb b/lib/sisu/v1/db_load_tuple.rb
index 447e9354..447e9354 100644
--- a/lib/sisu/v0/db_load_tuple.rb
+++ b/lib/sisu/v1/db_load_tuple.rb
diff --git a/lib/sisu/v0/db_remove.rb b/lib/sisu/v1/db_remove.rb
index bde5c891..bde5c891 100644
--- a/lib/sisu/v0/db_remove.rb
+++ b/lib/sisu/v1/db_remove.rb
diff --git a/lib/sisu/v0/db_select.rb b/lib/sisu/v1/db_select.rb
index 4ba722d4..1d5e1f20 100644
--- a/lib/sisu/v0/db_select.rb
+++ b/lib/sisu/v1/db_select.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/db_tests.rb b/lib/sisu/v1/db_tests.rb
index c002bdda..c5370b52 100644
--- a/lib/sisu/v0/db_tests.rb
+++ b/lib/sisu/v1/db_tests.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v1/dbi.rb
index a30820f7..644b150d 100644
--- a/lib/sisu/v0/dbi.rb
+++ b/lib/sisu/v1/dbi.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v1/defaults.rb
index 61eb74b1..fe2a61e8 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v1/defaults.rb
@@ -70,6 +70,7 @@ module SiSU_Viz
@fonts='verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman' # 'verdana, arial, georgia, tahoma, sans-serif, helvetica, "times new roman", times, roman'
@dir=SiSU_Env::Info_env.new
@date=SiSU_Env::Info_date.new #{@date.year}
+ @v=SiSU_Env::Info_version.instance.get_version
end
#% glyph
def glyph_bullet # &bullet;
@@ -342,13 +343,11 @@ module SiSU_Viz
end
#% text #changed from txt to avoid naming conflicts #FOLLOW
def txt_generator
- v=SiSU_Env::Info_version.new.get_version
- %{ <meta name="generator" content="#{v[:project]} #{v[:version]} of #{v[:date_stamp]} (#{v[:date]}) (n*x and Ruby!)" />
+ %{ <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
<link rel="generator" href="http://www.jus.uio.no/sisu" />}
end
def txt_generator_comment
- v=SiSU_Env::Info_version.new.get_version
- %{ <!- #{v[:project]} #{v[:version]} of #{v[:date_stamp]} (#{v[:date]}) (n*x and Ruby!)" http://www.jus.uio.no/sisu ->}
+ %{ <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.jus.uio.no/sisu ->}
end
def txt_hp
'&nbsp;SiSU'
@@ -1500,7 +1499,6 @@ WOK
WOK
end
def widget_sisu
- v=SiSU_Env::Info_version.new.get_version
<<WOK
<!-- widget sisu -->
<tr><td valign="top" width="10%">
@@ -1514,19 +1512,19 @@ WOK
<p class="tiny_left"><font color="#666666" size="2">
Output generated by
<a href="#{url_sisu}" #{js_sisu}>
- #{v[:project]}
+ #{@v[:project]}
</a>
- #{v[:version]} #{v[:date]} (#{v[:date_stamp]})
+ #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
<br />
<a href="#{url_sisu}" #{js_sisu}>
- <b>#{v[:project]}</b>
+ <b>#{@v[:project]}</b>
</a>
Copyright <sup>&copy;</sup> Ralph Amissah
1997, current #{@date.year_static}.
All Rights Reserved.
<br />
<a href="#{url_sisu}" #{js_sisu}>
- #{v[:project]}
+ #{@v[:project]}
</a>
is software for document structuring, publishing and search,
<br />
@@ -1545,7 +1543,7 @@ WOK
</font></p>
</td><td valign="top" width="45%">
<p class="tiny_left"><font color="#666666" size="2">
- #{v[:project]} using:
+ #{@v[:project]} using:
<br />Standard SiSU markup syntax,
<br />Standard SiSU meta-markup syntax, and the
<br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
@@ -1557,7 +1555,6 @@ WOK
WOK
end
def widget_way_better
- v=SiSU_Env::Info_version.new.get_version
<<WOK
<!-- widget way better -->
<tr><td valign="top" width="10%">
@@ -1569,7 +1566,7 @@ WOK
</td><td valign="top" width="45%">
<p class="tiny_left"><font color="#666666" size="2">
<a href="#{url_sisu}" #{js_sisu}>
- #{v[:project]}
+ #{@v[:project]}
</a>
is released under
<a href="http://www.gnu.org/licenses/gpl.html">GPLv3</a>
@@ -1578,7 +1575,7 @@ WOK
</font></p>
</td><td valign="top" width="45%">
<p class="tiny_left"><font color="#666666" size="2">
- #{v[:project]}, developed using
+ #{@v[:project]}, developed using
<a href="http://www.ruby-lang.org/en/">
Ruby
</a>
@@ -1660,7 +1657,7 @@ WOK
end
class Home < Skin
def initialize
- @v=SiSU_Env::Info_version.new.get_version
+ @v=SiSU_Env::Info_version.instance.get_version
@dir=SiSU_Env::Info_env.new
@date=SiSU_Env::Info_date.new #{@date.year}
end
diff --git a/lib/sisu/v0/digests.rb b/lib/sisu/v1/digests.rb
index b39fb2aa..d4e5befc 100644
--- a/lib/sisu/v0/digests.rb
+++ b/lib/sisu/v1/digests.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/embedded.rb b/lib/sisu/v1/embedded.rb
index 20700674..7f351a18 100644
--- a/lib/sisu/v0/embedded.rb
+++ b/lib/sisu/v1/embedded.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/errors.rb b/lib/sisu/v1/errors.rb
index 65d23685..93aab7cb 100644
--- a/lib/sisu/v0/errors.rb
+++ b/lib/sisu/v1/errors.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/harvest.rb b/lib/sisu/v1/harvest.rb
index 1e390c50..1e390c50 100644
--- a/lib/sisu/v0/harvest.rb
+++ b/lib/sisu/v1/harvest.rb
diff --git a/lib/sisu/v0/harvest_authors.rb b/lib/sisu/v1/harvest_authors.rb
index 4d9b9dce..c7ca80fb 100644
--- a/lib/sisu/v0/harvest_authors.rb
+++ b/lib/sisu/v1/harvest_authors.rb
@@ -23,7 +23,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -208,7 +208,7 @@ module HARVEST_authors
'../_sisu/css/harvest.css'
else 'harvest.css'
end
- sv=SiSU_Env::Info_version.new.get_version
+ sv=SiSU_Env::Info_version.instance.get_version
<<WOK
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -216,7 +216,7 @@ module HARVEST_authors
<head>
<title>SiSU Metadata Harvest - Authors</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units, 2008" />
+<meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units" />
<meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
<meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
diff --git a/lib/sisu/v0/harvest_topics.rb b/lib/sisu/v1/harvest_topics.rb
index 85067e55..1ab62a95 100644
--- a/lib/sisu/v0/harvest_topics.rb
+++ b/lib/sisu/v1/harvest_topics.rb
@@ -24,7 +24,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -285,7 +285,7 @@ module HARVEST_topics
'../_sisu/css/harvest.css'
else 'harvest.css'
end
- sv=SiSU_Env::Info_version.new.get_version
+ sv=SiSU_Env::Info_version.instance.get_version
<<WOK
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -293,7 +293,7 @@ module HARVEST_topics
<head>
<title>SiSU Metadata Harvest - Topics</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units, 2008" />
+<meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units" />
<meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
<meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v1/help.rb
index e9d1c365..cd5eaf25 100644
--- a/lib/sisu/v0/help.rb
+++ b/lib/sisu/v1/help.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -158,7 +158,7 @@ module SiSU_Help
end
def summary
print <<WOK
- SiSU, Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Ralph Amissah
+ SiSU, Copyright (C) 1997 - 2009 Ralph Amissah
License GPL version 3 or Later. This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it under the conditions of the GPL3 or later.
For more license detail type/enter: "sisu --help license"
@@ -1014,8 +1014,8 @@ WOK
end
end
def sisu_version
- version=SiSU_Env::Info_version.new.get_version
- rb_ver=SiSU_Env::Info_version.new.rbversion
+ version=SiSU_Env::Info_version.instance.get_version
+ rb_ver=SiSU_Env::Info_version.instance.rbversion
if version[:version]
tell=SiSU_Screen::Ansi.new('-v',version[:project],version[:version],version[:date_stamp],version[:date],rb_ver)
tell.version
diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v1/html.rb
index 5cf8e8d4..39775832 100644
--- a/lib/sisu/v0/html.rb
+++ b/lib/sisu/v1/html.rb
@@ -71,7 +71,7 @@ module SiSU_HTML
require "#{SiSU_lib}/html_promo"
include SiSU_HTML_promo
require "#{SiSU_lib}/html_tune"
- include SiSU_Tune
+ include SiSU_HTML_Tune
require "#{SiSU_lib}/shared_xml"
require "#{SiSU_lib}/shared_structure"
class Source
@@ -152,27 +152,12 @@ module SiSU_HTML
end
def tuned_file_instructions
@tell=SiSU_Screen::Ansi.new(@md.cmd)
- if @md
- #@md.sfx=''
- @md.sfx='' if @md.cmd =~/z/
- if @md.cmd =~/h/ \
- or @md.fns =~/\~[a-z]{2,3}\.s?/ #multilingual document protection is a bit arbitrary, (needed by existing server configuration), add configuration overide...
- if @md.cmd =~/H/ \
- and @md.fns =~/\~[a-z]{2,3}\.s?/
- SiSU_Screen::Ansi.new(@md.cmd,
- 'multilingual document, creating internal url links with filetype suffix',
- "\n\t\t(overriding -H request, using -h mode instead)"
- ).warn unless @md.cmd =~/q/
- end
- @md.sfx='.html'
- end
- end
@md.cmd=@md.cmd.gsub(/H/,'h')
@md.file_type='html' if @md.cmd =~/[hon]/
directories
newfilename=%{#{@env.path.output}/#{@md.fnb}/#{@md.fn[:index]}} if @md.file_type =~/html/
dal_array=@particulars.dal_array # dal file drawn here
- @tuned_file_array=SiSU_Tune::Tune.new(dal_array,@md).songsheet
+ @tuned_file_array=SiSU_HTML_Tune::Tune.new(dal_array,@md).songsheet
@tuned_file_array
end
end
@@ -353,7 +338,7 @@ WOK
title=unless para =~/Document Information/; linkname
else
link='metadata'
- %{<b><a href="#{@md.fnl[:pre]}#{link}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}">#{linkname}</a></b>}
+ %{<b><a href="#{@md.fnl[:pre]}#{link}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}">#{linkname}</a></b>}
end
toc={}
txt_obj={:txt =>title}
@@ -456,7 +441,7 @@ WOK
para.gsub!(/#{Mx[:id_o]}~0;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/,'')
if para =~/^#{Mx[:lv_o]}4:/
seg_link=para.gsub(/^\s*#{Mx[:lv_o]}4:(\S+?)#{Mx[:lv_c]}\s*(.+?)$/,
- %{ <a href="#{@md.fnl[:pre]}\\1#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}" target="_top">
+ %{ <a href="#{@md.fnl[:pre]}\\1#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top">
\\2
</a> })
if seg_link =~/(#{Mx[:id_o]}\~\d+;(?:\w|[0-6]:\d+);\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]})$/m
@@ -466,7 +451,7 @@ WOK
@@seg_url=para[/^#{Mx[:lv_o]}4:(\S+?)#{Mx[:lv_c]}.+?$/,1]
elsif para =~/\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+/
seg_link=para.gsub(/^\s*(#{@md.lv4}\s+)\s*(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/,
- %{<a href="#{@md.fnl[:pre]}\\2#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}" } +
+ %{<a href="#{@md.fnl[:pre]}\\2#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" } +
%{target="_top">\\1 \\2 \\3</a> })
end
p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn) if ocn
@@ -504,7 +489,7 @@ WOK
para.gsub!(m,'')
title=linkname
else
- lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}##{ocn}">
+ lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}##{ocn}">
#{linkname}
</a>}
txt_obj={:txt =>lnk_n_txt}
@@ -535,7 +520,7 @@ WOK
para.gsub!(m,'')
title=linkname
else
- lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}##{ocn}">
+ lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}##{ocn}">
#{linkname}
</a>}
txt_obj={:txt =>lnk_n_txt}
@@ -593,11 +578,11 @@ WOK
toc_shared << format_head_toc.scroll_head_navigation_band
if @md.rights
rights=format_head_toc.rights
- rights=SiSU_Tune::Clean_html.new(rights).clean
+ rights=SiSU_HTML_Tune::Clean_html.new(rights).clean
end
if @md.prefix_b
prefix_b=format_head_toc.prefix_b
- prefix_b=SiSU_Tune::Clean_html.new(prefix_b).clean
+ prefix_b=SiSU_HTML_Tune::Clean_html.new(prefix_b).clean
end
@seg_toc_band=format_head_toc.seg_head_navigation_band('pdf') #bug, vary depending on type of doc !! examine
@seg_toc_band_bottom=format_head_toc.seg_head_navigation_band_bottom('pdf') #bug, vary depending on type of doc !! examine
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v1/html_format.rb
index 995fa330..eb29f9f9 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v1/html_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -97,10 +97,9 @@ module SiSU_HTML_Format
end
class Head_information
include SiSU_Viz
- attr_reader :md,:sfx,:pdf,:rdf,:vz
+ attr_reader :md,:pdf,:rdf,:vz
def initialize(md)
@md=md
- @sfx,@pdf=@md.sfx,@md.pdf
@rdf=SiSU_XML_tags::RDF.new(md)
# DublinCore 1 - title
@vz=SiSU_Env::Get_init.instance.skin
@@ -276,7 +275,7 @@ WOK
if type=~/pdf/
@tocband_segtoc=make_scroll_seg_pdf
end
- firstseg=%{<a href="#{@md.fnl[:pre]}#{@md.firstseg}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" alt="-&gt;">
+ firstseg=%{<a href="#{@md.fnl[:pre]}#{@md.firstseg}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" alt="-&gt;">
#{@vz.png_nav_nxt}
</a>} if @md.firstseg =~/\S+/
%{<table summary="table of contents segment navigation band" id="toc" width="100%" bgcolor=#{@vz.color_band1}>
@@ -295,7 +294,7 @@ WOK
if type=~/pdf/
@tocband_segtoc=make_scroll_seg_pdf
end
- firstseg=%{<a href="#{@md.fnl[:pre]}#{@md.firstseg}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" alt="-&gt;">
+ firstseg=%{<a href="#{@md.fnl[:pre]}#{@md.firstseg}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" alt="-&gt;">
#{@vz.png_nav_nxt}
</a>} if @md.firstseg =~/\S+/
%{<table summary="table of contents segment navigation band" id="toc" width="100%" bgcolor=#{@vz.color_band1}>
@@ -638,17 +637,17 @@ WOK
def dot_control_pre_next
%{<table summary="segment hidden control pre and next" width="100%" border="0" cellpadding="0" bgcolor=#{@vz.color_grey_pale} align="center">
<tr><td align="left">
- <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
+ <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
#{@vz.png_nav_dot_pre}
</a>
</td>
<td align="center">
- <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
+ <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
#{@vz.png_nav_dot_toc}
</a>
</td>
<td align="right">
- <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_next}>
+ <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_next}>
#{@vz.png_nav_dot_nxt}
</a>
#{@vz.table_close}}
@@ -656,12 +655,12 @@ WOK
def dot_control_pre
%{<table summary="segment hidden control pre" width="100%" border="0" cellpadding="0" bgcolor=#{@vz.color_grey_pale} align="center">
<tr><td align="left">
- <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-2]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
+ <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-2]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
#{@vz.png_nav_dot_pre}
</a>
</td>
<td align="center">
- <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
+ <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
#{@vz.png_nav_dot_toc}
</a>
</td>
@@ -674,17 +673,17 @@ WOK
def toc_nav(f_pre=false,f_nxt=false,use=1)
pre=nxt=''
toc=%{<td align="center" bgcolor=#{@vz.color_band1}>
- <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
+ <a href="#{@md.fnl[:pre]}#@index#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_toc}>
#{@vz.png_nav_toc}
</a>
</td>}
pre=%{<td align="center" bgcolor=#{@vz.color_band1}>
- <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
+ <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_prev}>
#{@vz.png_nav_pre}
</a>
</td>} if f_pre==true
nxt=%{<td align="center" bgcolor=#{@vz.color_band1}>
- <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#@sfx#{@md.fnl[:post]}" target="_top" #{@vz.js_next}>
+ <a href="#{@md.fnl[:pre]}#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top" #{@vz.js_next}>
#{@vz.png_nav_nxt}
</a>
</td>} if f_nxt==true
@@ -793,7 +792,7 @@ WOK
%{ <center>
<table summary="image" border="0" cellpadding="3" cellspacing="0" align="center">
<tr><td align="center" bgcolor="white">
- <a href="http://#{@md.ad_url}#@sfx" target="_top">
+ <a href="http://#{@md.ad_url}#{Sfx[:html]}" target="_top">
<img border="0" src="#{dir.url.images_local}/#{@md.ad_png}" alt="#{@md.ad_alt}">
</a>
<p />
@@ -805,7 +804,7 @@ WOK
%{ <center>
<table summary="image" border="0" cellpadding="3" cellspacing="0" align="center">
<tr><td align="center" bgcolor="white">
- <a href="#{@md.ad_url}#@sfx" target="_top">
+ <a href="#{@md.ad_url}#{Sfx[:html]}" target="_top">
<img border="0" src="#{dir.url.images_local}/#{@md.ad_png}" alt="#{@md.ad_alt}">
</a>
<p />
@@ -817,7 +816,7 @@ WOK
%{ <center>
<table summary="image" border="0" cellpadding="3" cellspacing="0" align="center">
<tr><td align="center" bgcolor="white">
- <a href="#{@md.ad_url}#@sfx" target="external">
+ <a href="#{@md.ad_url}#{Sfx[:html]}" target="external">
<img border="0" src="#{dir.url.images_local}/#{@md.ad_png}" alt="#{@md.ad_alt}">
</a>
<p />
@@ -1260,7 +1259,7 @@ WOK
fn='doc' if fn.empty? #you may wish to reconsider, sends to 'doc' where no segment info
%{
<p class="endnote">
- #{@endnote_part_a}#{@md.fnl[:pre]}#{fn}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}#{@endnote_part_b}
+ #{@endnote_part_a}#{@md.fnl[:pre]}#{fn}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}#{@endnote_part_b}
</p>
}
end
diff --git a/lib/sisu/v0/html_minitoc.rb b/lib/sisu/v1/html_minitoc.rb
index 2f95326a..62054db0 100644
--- a/lib/sisu/v0/html_minitoc.rb
+++ b/lib/sisu/v1/html_minitoc.rb
@@ -59,7 +59,7 @@
=end
module SiSU_HTML_minitoc
require "#{SiSU_lib}/html_tune"
- include SiSU_Tune
+ include SiSU_HTML_Tune
class Toc_mini
@@seg_mini=nil
@@seg_url=''
@@ -119,7 +119,7 @@
title=unless txt =~/Document Information/; linkname
else
link='metadata'
- %{<b><a href="#{@md.fnl[:pre]}#{link}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}">#{linkname}</a></b>}
+ %{<b><a href="#{@md.fnl[:pre]}#{link}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}">#{linkname}</a></b>}
end
toc={}
txt_obj={:txt =>title}
@@ -162,7 +162,7 @@
txt.gsub!(/#{Mx[:id_o]}~0;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/,'')
if txt =~/^#{Mx[:lv_o]}4:/
seg_link=txt.gsub(/^\s*#{Mx[:lv_o]}4:(\S+?)#{Mx[:lv_c]}\s*(.+?)$/,
- %{ <a href="#{@md.fnl[:pre]}\\1#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}" target="_top">
+ %{ <a href="#{@md.fnl[:pre]}\\1#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top">
\\2
</a> })
if seg_link =~/(#{Mx[:id_o]}\~\d+;(?:\w|[0-6]:\d+);\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]})$/m
@@ -172,7 +172,7 @@
@@seg_url=txt[/^#{Mx[:lv_o]}4:(\S+?)#{Mx[:lv_c]}.+?$/,1]
elsif txt =~/\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+/
seg_link=txt.gsub(/^\s*(#{@md.lv4}\s+)\s*(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/,
- %{<a href="#{@md.fnl[:pre]}\\2#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}" } +
+ %{<a href="#{@md.fnl[:pre]}\\2#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" } +
%{target="_top">\\1 \\2 \\3</a> })
end
txt_obj={:txt =>seg_link}
@@ -198,7 +198,7 @@
txt.gsub!(m,'')
title=linkname
else
- lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}##{ocn}">
+ lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}##{ocn}">
#{linkname}
</a>}
txt_obj={:txt =>lnk_n_txt}
@@ -224,7 +224,7 @@
txt.gsub!(m,'')
title=linkname
else
- lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{@md.sfx}#{@md.fnl[:post]}##{ocn}">
+ lnk_n_txt=%{ <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}##{ocn}">
#{linkname}
</a>}
txt_obj={:txt =>lnk_n_txt}
diff --git a/lib/sisu/v0/html_promo.rb b/lib/sisu/v1/html_promo.rb
index bc46d487..d4c1f4c0 100644
--- a/lib/sisu/v0/html_promo.rb
+++ b/lib/sisu/v1/html_promo.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -244,6 +244,21 @@ module SiSU_HTML_promo
end
%{<p class="pane">Price:#{gbp}#{euro}#{usd}</p>}
end
+ def adsense #draw content from a configuration file
+ def column_right
+ if defined? @ad[:promo]['ad']['adsense']['column_right']
+ @ad[:promo]['ad']['adsense']['column_right'].join("\n")
+ else ''
+ end
+ end
+ def line_single
+ if defined? @ad[:promo]['ad']['adsense']['line_single']
+ @ad[:promo]['ad']['adsense']['line_single'].join("\n")
+ else ''
+ end
+ end
+ self
+ end
def site_link #Work area
if url_link.url
<<WOK
@@ -386,6 +401,12 @@ WOK
if defined? @ad[:promo][type][id] \
and not @ad[:promo][type][id].nil?
adverts << output_form_select(type,id)
+ else
+ if defined? @ad[:promo][category][type][id] \
+ and @ad[:promo][category][type][id].class==Array \
+ and @ad[:promo][category][type][id].length > 0
+ adverts << @ad[:promo][category][type][id].join("\n")
+ end
end
end
end
diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v1/html_scroll.rb
index 0cd34694..0cd34694 100644
--- a/lib/sisu/v0/html_scroll.rb
+++ b/lib/sisu/v1/html_scroll.rb
diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v1/html_segments.rb
index a2d4f849..d874063a 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v1/html_segments.rb
@@ -102,7 +102,7 @@ module SiSU_HTML_seg
class Seg
@@seg,@@seg_subtoc,@@seg_endnotes,@@seg_ad={},{},{},{}
@@seg_name,@@seg_name_html=[],[]
- @@seg_url=@@fn=@@to_lev4=@@get_hash_to=@@get_hash_fn=''
+ @@seg_url=@@fn=@@get_hash_to=@@get_hash_fn=''
@@loop_count=@@seg_total=@@tracker=0
@@is4=@@is3=@@is2=@@is1=0
@@header1=@@header2=@@header3=@@header4=0
@@ -137,9 +137,6 @@ module SiSU_HTML_seg
track,tracking,newfile=0,0,0
@@is4=@@is3=@@is2=@@is1=0
printed_endnote_seg='n'
- @h_sfx='.php' if @md.file_type =~/php/
- @h_sfx=@md.sfx if @md.file_type =~/html/
- @h_sfx='.html' if @md.file_type =~/html/ #used in creating file, not to be omitted.
idx_html=nil
if @md.book_idx
my_make_source_file=SiSU_Env::Create_file.new(@md.cmd,@md.fns)
@@ -196,7 +193,7 @@ module SiSU_HTML_seg
if tracking != 0
mkdir_p(@md.dir_out) unless FileTest.directory?(@md.dir_out) #bug - added specifically for nav! not needed by regular seg, check !!!
Seg.new('',@md).tail
- segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking-1]}#{@md.fnl[:mid]}#@h_sfx#{@md.fnl[:post]}"
+ segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking-1]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}"
@output_seg_file=File.new(segfilename,'w') if @@seg_name_html[tracking-1]
if @@seg_name_html[tracking-1] !~/endnotes|idx/
Seg_output.new(@md,@output_seg_file,@@seg,@minitoc).output
@@ -210,10 +207,10 @@ module SiSU_HTML_seg
header_art(para)
head(para)
if @@seg_name_html[tracking] =~/metadata/ # this is for metadata
- segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking]}#{@md.fnl[:mid]}#@h_sfx#{@md.fnl[:post]}"
+ segfilename="#{@md.dir_out}/#{@md.fnl[:pre]}#{@@seg_name_html[tracking]}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}"
@output_seg_file=File.new(segfilename,'w')
Seg.new.reinitialise #BUG with items following endnote, and occurring before metadata, this becomes a bug ... work area for book index, FIX
- flagend="x"
+ flagend='x'
@output_seg_file.close #%(((( EOF )))) -->
end
end
@@ -269,7 +266,7 @@ module SiSU_HTML_seg
@author=%{<b>#{@md.author}</b>\n} if @md.author.to_s =~/\S/
@@seg[:tocband_banner] << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav])
conditional_div_close=if @@get_hash_fn =~/metadata/ #watch
- '</div>'
+ ''
else ''
end
@@seg[:tocband_bannerless] << conditional_div_close << format_head_seg.navigation_band_bottom(@@segtocband,@@seg[:dot_nav])
@@ -398,7 +395,7 @@ module SiSU_HTML_seg
else @sto=nil
end
if @md.flag_separate_endnotes
- para.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{@md.sfx}#_\\1">}) #endnote- twice #removed file type
+ para.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type
end
if para !~/#{@vz.margin_txt_w1}|#{@vz.margin_txt_w2}/
if para[/(.*)#{Mx[:id_o]}~0;(?:u|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}(.*)/] #% watch u & m?
@@ -467,11 +464,11 @@ module SiSU_HTML_seg
if para !~/^#{Mx[:lv_o]}4:metadata#{Mx[:lv_c]}/
m=para[/^#{Mx[:lv_o]}4:(\S+?)#{Mx[:lv_c]}.+?#{Mx[:id_o]}~(\d+);(?:[oh]|4:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/]
end
- if m; @@fn,@@to_lev4=$1,$2 if m # changed 2004w07 #endnotes and sub-tocs
+ if m; @@fn=$1 if m # changed 2004w07 #endnotes and sub-tocs
else
if para !~/^#{Mx[:lv_o]}4:metadata#{Mx[:lv_c]}/
m=para[/^#{Mx[:lv_o]}4:(\S+?)#{Mx[:lv_c]}/]
- @@fn,@@to_lev4=$1,'nonum' if m # changed 2005w13
+ @@fn=$1 if m # changed 2005w13
else @@fn=''
end
end
@@ -525,7 +522,6 @@ module SiSU_HTML_seg
endnote_part_a=note_match_seg[m,1]
endnote_part_b=note_match_seg[m,2]
txt_obj={:endnote_part_a =>endnote_part_a,:endnote_part_b =>endnote_part_b}
-
format_seg=SiSU_HTML_Format::Format_seg.new(@md,txt_obj)
note_match_all_seg=format_seg.endnote_seg_body(@@fn) #BUG WATCH 200408
@@seg[:endnote_all] << note_match_all_seg
diff --git a/lib/sisu/v0/html_table.rb b/lib/sisu/v1/html_table.rb
index d92c5856..81ff0814 100644
--- a/lib/sisu/v0/html_table.rb
+++ b/lib/sisu/v1/html_table.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v1/html_tune.rb
index 333824ce..682a734a 100644
--- a/lib/sisu/v0/html_tune.rb
+++ b/lib/sisu/v1/html_tune.rb
@@ -57,7 +57,7 @@
=end
require "#{SiSU_lib}/param"
-module SiSU_Tune
+module SiSU_HTML_Tune
require "#{SiSU_lib}/sysenv"
require "#{SiSU_lib}/html_format" #watch
include SiSU_Env
@@ -245,7 +245,7 @@ module SiSU_Tune
para.gsub!(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'<a name="\1"></a>')
para.gsub!(/#{Mx[:nbsp]}/,'&nbsp;')
para.gsub!(/<(p|br)>/,'<\1 />')
- para=SiSU_Tune::Clean_html.new(para).clean
+ para=SiSU_HTML_Tune::Clean_html.new(para).clean
@tuned_file << para
end
end
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v1/hub.rb
index 3c2e6d89..4906c3f4 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v1/hub.rb
@@ -129,18 +129,18 @@ module SiSU
when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read ## -S
when /^digests$/; SiSU_Digest_view::Source.new(@opt).read # -N
when /^xml_scaffold$/; SiSU_XML_scaffold::Source.new(@opt).read # -T
- #when /^air$/; SiSU_Air::Source.new(@opt).read # -A
+ #when /^air$/; SiSU_Air::Source.new(@opt).read # -A
when /^plaintext$/; SiSU_Plaintext::Source.new(@opt).read # -a
- #when /^git$/; SiSU_Git::Source.new(@opt).read # -g
- #when /^wikispeak$/; SiSU_Wikispeak::Source.new(@opt).read # -g
+ #when /^git$/; SiSU_Git::Source.new(@opt).read # -g
+ #when /^wikispeak$/; SiSU_Wikispeak::Source.new(@opt).read # -g
when /^odf$/; SiSU_ODF::Source.new(@opt).read # -o
when /^xml_md_oai_pmh_dc$/; SiSU_XML_metadata::OAI_PMH.new(@opt).read # -O
when /^texpdf$/; SiSU_TeX::Source.new(@opt).read # -p
when /^manpage$/; SiSU_manpage::Source.new(@opt).read # -i
when /^texinfo$/; SiSU_TexInfo::Source.new(@opt).read # -I
- #when /^plaintext_exp$/; SiSU_Plaintext_exp::Source.new(@opt).read # -j
- #when /^manpage_exp$/; SiSU_manpage_exp::Source.new(@opt).read # -J
- #when /^docbook$/; SiSU_Docbook::Source.new(@opt).read # -B
+ #when /^plaintext_exp$/; SiSU_Plaintext_exp::Source.new(@opt).read # -j
+ #when /^manpage_exp$/; SiSU_manpage_exp::Source.new(@opt).read # -J
+ #when /^docbook$/; SiSU_Docbook::Source.new(@opt).read # -B
when /^html$/; SiSU_HTML::Source.new(@opt).read # -h -H
when /^xml$/; SiSU_XML_SAX::Source.new(@opt).read # -x
when /^xml_dom$/; SiSU_XML_DOM::Source.new(@opt).read # -X
diff --git a/lib/sisu/v0/i18n.rb b/lib/sisu/v1/i18n.rb
index 5c284006..4abad8b5 100644
--- a/lib/sisu/v0/i18n.rb
+++ b/lib/sisu/v1/i18n.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v1/manifest.rb
index fbb55cba..73f3bd18 100644
--- a/lib/sisu/v0/manifest.rb
+++ b/lib/sisu/v1/manifest.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/manpage.rb b/lib/sisu/v1/manpage.rb
index 72157aaa..7129e45a 100644
--- a/lib/sisu/v0/manpage.rb
+++ b/lib/sisu/v1/manpage.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -420,7 +420,7 @@ WOK
date=if @md.date; @md.date
else '2007' #date missing decide on action
end
- proj=SiSU_Env::Info_version.new.get_version
+ proj=SiSU_Env::Info_version.instance.get_version
manpage[:open] = %{.TH "#{@md.fnb}" "1" "#{date}" "#{proj[:version]}" "#{@md.title}"#{@md.man_name}#{@md.man_synopsis}}
content << manpage[:open]
content << manpage[:head]
diff --git a/lib/sisu/v0/manpage_format.rb b/lib/sisu/v1/manpage_format.rb
index ab8a67a4..36009f8d 100644
--- a/lib/sisu/v0/manpage_format.rb
+++ b/lib/sisu/v1/manpage_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v1/odf.rb
index e4873a10..e4873a10 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v1/odf.rb
diff --git a/lib/sisu/v0/odf_format.rb b/lib/sisu/v1/odf_format.rb
index 3dd4b496..d779d82d 100644
--- a/lib/sisu/v0/odf_format.rb
+++ b/lib/sisu/v1/odf_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/options.rb b/lib/sisu/v1/options.rb
index 25e84415..f43034dc 100644
--- a/lib/sisu/v0/options.rb
+++ b/lib/sisu/v1/options.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v1/param.rb
index 7153c40d..4efdebb5 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v1/param.rb
@@ -244,7 +244,7 @@ module SiSU_Param
@flag_separate_endnotes=false
@flag_separate_endnotes_make=true
regx_date=/^\d{4}(?:-(?:[0][0-9]|1[0-2])(-(?:[0-2][0-9]|3[01]))?)?$/
- ver=SiSU_Env::Info_version.new
+ ver=SiSU_Env::Info_version.instance
@sisu_version=ver.get_version
@ruby_version=ver.rbversion
@generated=Time.now
diff --git a/lib/sisu/v0/param_identify_markup.rb b/lib/sisu/v1/param_identify_markup.rb
index 2bcc9a99..37eb8be1 100644
--- a/lib/sisu/v0/param_identify_markup.rb
+++ b/lib/sisu/v1/param_identify_markup.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/particulars.rb b/lib/sisu/v1/particulars.rb
index b6c4c35e..ac6b10bc 100644
--- a/lib/sisu/v0/particulars.rb
+++ b/lib/sisu/v1/particulars.rb
@@ -23,7 +23,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/plaintext.rb b/lib/sisu/v1/plaintext.rb
index dd2964d9..dd2964d9 100644
--- a/lib/sisu/v0/plaintext.rb
+++ b/lib/sisu/v1/plaintext.rb
diff --git a/lib/sisu/v0/plaintext_format.rb b/lib/sisu/v1/plaintext_format.rb
index b48bfe95..42c206e8 100644
--- a/lib/sisu/v0/plaintext_format.rb
+++ b/lib/sisu/v1/plaintext_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/relaxng.rb b/lib/sisu/v1/relaxng.rb
index 93b5dda1..a53b6dee 100644
--- a/lib/sisu/v0/relaxng.rb
+++ b/lib/sisu/v1/relaxng.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -70,15 +70,13 @@ module SiSU_relaxng
* Author: Ralph Amissah
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Ralph Amissah All Rights Reserved.
+ * Copyright: (C) 1997 - 2009 Ralph Amissah All Rights Reserved.
* License: GPL 3 or later:
SiSU, a framework for document structuring, publishing and search
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008 Ralph Amissah
+ Copyright (C) Ralph Amissah
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@ -95,9 +93,12 @@ module SiSU_relaxng
If you have Internet connection, the latest version of the GPL should be
available at these locations:
- <http://www.fsf.org/licenses/gpl.html>
+ <http://www.fsf.org/licensing/licenses/gpl.html>
<http://www.gnu.org/licenses/gpl.html>
- <http://www.jus.uio.no/sisu/gpl.fsf>
+
+ <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
+ <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
+ <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
* SiSU uses:
* Standard SiSU markup syntax,
@@ -115,6 +116,8 @@ module SiSU_relaxng
<ralph@amissah.com>
<ralph.amissah@gmail.com>
+ ** Description: html generation, processing
+
=end
RELAXNG
end
diff --git a/lib/sisu/v0/remote.rb b/lib/sisu/v1/remote.rb
index af3a389a..cc217018 100644
--- a/lib/sisu/v0/remote.rb
+++ b/lib/sisu/v1/remote.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/response.rb b/lib/sisu/v1/response.rb
index c01f4d47..b69f2677 100644
--- a/lib/sisu/v0/response.rb
+++ b/lib/sisu/v1/response.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/rexml.rb b/lib/sisu/v1/rexml.rb
index be81b6d6..6b6ff906 100644
--- a/lib/sisu/v0/rexml.rb
+++ b/lib/sisu/v1/rexml.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/screen_text_color.rb b/lib/sisu/v1/screen_text_color.rb
index 6bb0c8e2..915cf58b 100644
--- a/lib/sisu/v0/screen_text_color.rb
+++ b/lib/sisu/v1/screen_text_color.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/share_src.rb b/lib/sisu/v1/share_src.rb
index 993027a9..d151daff 100644
--- a/lib/sisu/v0/share_src.rb
+++ b/lib/sisu/v1/share_src.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/share_src_kdissert.rb b/lib/sisu/v1/share_src_kdissert.rb
index 85fcfe8e..8dbe83f2 100644
--- a/lib/sisu/v0/share_src_kdissert.rb
+++ b/lib/sisu/v1/share_src_kdissert.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/shared_html.rb b/lib/sisu/v1/shared_html.rb
index 0f84ae0c..baefa2fd 100644
--- a/lib/sisu/v0/shared_html.rb
+++ b/lib/sisu/v1/shared_html.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/shared_html_lite.rb b/lib/sisu/v1/shared_html_lite.rb
index 7fe77e0b..7fe77e0b 100644
--- a/lib/sisu/v0/shared_html_lite.rb
+++ b/lib/sisu/v1/shared_html_lite.rb
diff --git a/lib/sisu/v0/shared_sem.rb b/lib/sisu/v1/shared_sem.rb
index f63fbf4a..e7a0724b 100644
--- a/lib/sisu/v0/shared_sem.rb
+++ b/lib/sisu/v1/shared_sem.rb
@@ -23,7 +23,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/shared_structure.rb b/lib/sisu/v1/shared_structure.rb
index 573f9c8e..60e6a451 100644
--- a/lib/sisu/v0/shared_structure.rb
+++ b/lib/sisu/v1/shared_structure.rb
@@ -80,7 +80,7 @@ module SiSU_Structure
end
else
if @para[/^(#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}#{Mx[:gl_bullet]})\s*(.+?)#{Mx[:id_o]}~(\d+);(?:[ohu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/m]
- @format,@text,@ocn=$1,$2,$3,$4 #watch and work on
+ @format,@text,@ocn=$1,$2,$3 #,$4 #watch and work on
elsif @para[/^(#{Mx[:gl_bullet]})\s*(.+?)#{Mx[:id_o]}~(\d+);(?:[ohu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/m]
@format,@text,@ocn=$1,$2,$3
elsif @para[/#{Mx[:pa_o]}:(i[1-9])#{Mx[:pa_c]}\s*(.+?)#{Mx[:id_o]}~(\d+);(?:[ohu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/m]
diff --git a/lib/sisu/v0/shared_txt.rb b/lib/sisu/v1/shared_txt.rb
index f5762c8e..f5762c8e 100644
--- a/lib/sisu/v0/shared_txt.rb
+++ b/lib/sisu/v1/shared_txt.rb
diff --git a/lib/sisu/v0/shared_xml.rb b/lib/sisu/v1/shared_xml.rb
index 25a0a7a9..05161c41 100644
--- a/lib/sisu/v0/shared_xml.rb
+++ b/lib/sisu/v1/shared_xml.rb
@@ -95,9 +95,12 @@ module SiSU_text_parts
@format="#@format:#{segname}" #
#follow this search beneath for heading_body1-6
@lev_para_ocn=if @para =~/.+#{Mx[:id_o]}~\d+;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}$/
- SiSU_XML_format::Format_scroll.new(@md,@format,@text,@ocn)
+ t_o={:format=>@format,:txt=>@text,:ocn=>@ocn} #(@format,@text,@ocn)
+ SiSU_XML_format::Format_scroll.new(@md,t_o)
else
- SiSU_XML_format::Format_scroll.new(@md,@format,@text,"#{Mx[:id_o]}~0;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}")
+ t_o={:format=>@format,:txt=>@text,:ocn=>0} #(@format,@text,@ocn)
+ SiSU_XML_format::Format_scroll.new(@md,t_o)
+ #SiSU_XML_format::Format_scroll.new(@md,@format,@text,"#{Mx[:id_o]}~0;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp#{Mx[:id_c]}")
end
self
end
@@ -543,7 +546,6 @@ module SiSU_XML_tags #Format
@full_title=@subtitle=@author=@subject=@description=@publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@copyright=@owner=@keywords=''
#seg_name=%{#{@@seg_name[@@tracker]} - } if @@seg_name[@@tracker]
@md=md
- @sfx,@pdf=@md.sfx,@md.pdf
@rdfurl=%{ rdf:about="http://www.jus.uio.no/lm/toc"\n}
if @md.full_title # DublinCore 1 - title
@rdf_title=%{ dc.title="#{seg_name}#{@md.full_title}"\n}
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v1/sisupod_make.rb
index c55bb1c7..470cbb01 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v1/sisupod_make.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -68,7 +68,7 @@ module SiSU_Doc
m=/.+\/(?:src\/)?(\S+)/im # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
@date=SiSU_Env::Info_date.new.dt
@env=SiSU_Env::Info_env.new(@opt.fns)
- @ver=SiSU_Env::Info_version.new.get_version
+ @ver=SiSU_Env::Info_version.instance.get_version
@ans=SiSU_Response::Response.new
pod_path="#{@env.path.processing}/sisupod"
@v=if @opt.cmd =~/[VM]/; 'v'
diff --git a/lib/sisu/v0/sitemaps.rb b/lib/sisu/v1/sitemaps.rb
index 85589c5b..f838373b 100644
--- a/lib/sisu/v0/sitemaps.rb
+++ b/lib/sisu/v1/sitemaps.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/spell.rb b/lib/sisu/v1/spell.rb
index 8d61387a..6ceb44cf 100644
--- a/lib/sisu/v0/spell.rb
+++ b/lib/sisu/v1/spell.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/sst_convert_markup.rb b/lib/sisu/v1/sst_convert_markup.rb
index d5b0aeef..1d678b11 100644
--- a/lib/sisu/v0/sst_convert_markup.rb
+++ b/lib/sisu/v1/sst_convert_markup.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/sst_do_inline_footnotes.rb b/lib/sisu/v1/sst_do_inline_footnotes.rb
index a40ad27e..ebe038fb 100644
--- a/lib/sisu/v0/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v1/sst_do_inline_footnotes.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/sst_from_kdissert.rb b/lib/sisu/v1/sst_from_kdissert.rb
index bd86e088..53840fcd 100644
--- a/lib/sisu/v0/sst_from_kdissert.rb
+++ b/lib/sisu/v1/sst_from_kdissert.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -65,7 +65,7 @@ module SiSU_Kdissert
def initialize(opt)
@opt=opt
@sisu,@sisu_base=[],[]
- @ver=SiSU_Env::Info_version.new.get_version
+ @ver=SiSU_Env::Info_version.instance.get_version
end
def read
kdissert_to_sisu
diff --git a/lib/sisu/v0/sst_from_xml.rb b/lib/sisu/v1/sst_from_xml.rb
index de40c16d..cab88cbb 100644
--- a/lib/sisu/v0/sst_from_xml.rb
+++ b/lib/sisu/v1/sst_from_xml.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -65,7 +65,7 @@ module SiSU_sst_from_xml
def initialize(opt)
@opt=opt
@sisu,@sisu_base=[],[]
- @ver=SiSU_Env::Info_version.new.get_version
+ @ver=SiSU_Env::Info_version.instance.get_version
end
def tell(filename,type)
SiSU_Screen::Ansi.new(@opt.cmd,"XML #{type} to SiSU sst","#{filename} --> #{filename}.sst").green_hi_blue
diff --git a/lib/sisu/v0/sst_identify_markup.rb b/lib/sisu/v1/sst_identify_markup.rb
index e652fe62..7d8e0eda 100644
--- a/lib/sisu/v0/sst_identify_markup.rb
+++ b/lib/sisu/v1/sst_identify_markup.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/sst_to_s_xml_dom.rb b/lib/sisu/v1/sst_to_s_xml_dom.rb
index 3db194b2..3db194b2 100644
--- a/lib/sisu/v0/sst_to_s_xml_dom.rb
+++ b/lib/sisu/v1/sst_to_s_xml_dom.rb
diff --git a/lib/sisu/v0/sst_to_s_xml_node.rb b/lib/sisu/v1/sst_to_s_xml_node.rb
index 5c341956..09e9f740 100644
--- a/lib/sisu/v0/sst_to_s_xml_node.rb
+++ b/lib/sisu/v1/sst_to_s_xml_node.rb
@@ -458,27 +458,33 @@ WOK
case @sto.format
when /^(1):(\S*)/
xml_clean(para)
- xml_structure(o,para,$1,$2)
+ t_o={:txt =>para,:ocn =>o.ocn,:format =>$1,:segname =>$2} # o,para,$1,$2
+ xml_structure(@md,t_o)
para=@sto.lev_para_ocn.heading_body1
when /^(2):(\S*)/
xml_clean(para)
- xml_structure(o,para,$1,$2)
+ t_o={:txt =>para,:ocn =>o.ocn,:format =>$1,:segname =>$2}
+ xml_structure(@md,t_o)
para=@sto.lev_para_ocn.heading_body2
when /^(3):(\S*)/
xml_clean(para)
- xml_structure(o,para,$1,$2)
+ t_o={:txt =>para,:ocn =>o.ocn,:format =>$1,:segname =>$2}
+ xml_structure(@md,t_o)
para=@sto.lev_para_ocn.heading_body3
when /^(4):(\S*)/ # work on see Split_text_object
xml_clean(para)
- xml_structure(o,para,$1,$2)
+ t_o={:txt =>para,:ocn =>o.ocn,:format =>$1,:segname =>$2}
+ xml_structure(@md,t_o)
para=@sto.lev_para_ocn.heading_body4
when /^(5):(\S*)/
xml_clean(para)
- xml_structure(o,para,$1,$2)
+ t_o={:txt =>para,:ocn =>o.ocn,:format =>$1,:segname =>$2}
+ xml_structure(@md,t_o)
para=@sto.lev_para_ocn.heading_body5
when /^(6):(\S*)/
xml_clean(para)
- xml_structure(o,para,$1,$2)
+ t_o={:txt =>para,:ocn =>o.ocn,:format =>$1,:segname =>$2}
+ xml_structure(@md,t_o)
para=@sto.lev_para_ocn.heading_body6
else
if para =~ /<:verse>/
diff --git a/lib/sisu/v0/sst_to_s_xml_sax.rb b/lib/sisu/v1/sst_to_s_xml_sax.rb
index 26bd96f5..26bd96f5 100644
--- a/lib/sisu/v0/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v1/sst_to_s_xml_sax.rb
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v1/sysenv.rb
index ee5e3f38..17f0b6be 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v1/sysenv.rb
@@ -87,7 +87,7 @@ module SiSU_Env
@t.month
end
def year_static
- '2008'
+ '2009'
end
end
class Info_system
@@ -517,7 +517,7 @@ module SiSU_Env
:sxd => filename(code,@fnb,'.sxd.xml'),
:sxn => filename(code,@fnb,'.sxn.xml'),
:sisupod => filename(nil,@fnz,''),
- :book_idx => filename(code,'book_index','.html'),
+ :book_idx_html => filename(code,'book_index','.html'),
}
@fn
end
@@ -546,7 +546,7 @@ module SiSU_Env
program='file'
fnsp=Info_env.new(filename).source_file_with_path
if program_found?(program)
- encoding=%x{file #{fnsp}}.strip
+ encoding=%x{file -L #{fnsp}}.strip
encoding.gsub!(/#{fnsp}:(\s+|$)/,'')
encoding=if encoding \
and not encoding.empty?
@@ -1481,7 +1481,9 @@ WOK
pth
end
def odf
- "#{processing}/odf"
+ pth="#{processing}/odf"
+ mkdir_p(pth) unless FileTest.directory?(pth)
+ pth
end
def tex
pth=if defined? @rc['processing']['latex'] \
@@ -2635,11 +2637,12 @@ WOK
end
end
class Info_version <Info_env
+ include Singleton
require 'rbconfig'
def get_version
@version={}
@pwd=ENV['PWD']
- yst_etc="#{defaults[:sisu_etc]}/version.yml"
+ yst_etc="#{defaults[:sisu_etc]}/version1.yml"
lib_path=`echo $RUBYLIB`.split(':')
if File.exist?(yst_etc); @version=YAML::load(File::open(yst_etc)) #unless @@noyaml
end
@@ -3035,7 +3038,7 @@ WOK
begin
super(fns)
@env=SiSU_Env::Info_env.new(fns)
- ver=Info_version.new
+ ver=Info_version.instance
case operation #watch
when /pdf/; @env_out=''
when /sql/
diff --git a/lib/sisu/v0/termsheet.rb b/lib/sisu/v1/termsheet.rb
index 056a5d34..ce4d63f3 100644
--- a/lib/sisu/v0/termsheet.rb
+++ b/lib/sisu/v1/termsheet.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/texinfo.rb b/lib/sisu/v1/texinfo.rb
index 03fd3adc..08b0cbe9 100644
--- a/lib/sisu/v0/texinfo.rb
+++ b/lib/sisu/v1/texinfo.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/texinfo_format.rb b/lib/sisu/v1/texinfo_format.rb
index 076d3ccd..eede7b71 100644
--- a/lib/sisu/v0/texinfo_format.rb
+++ b/lib/sisu/v1/texinfo_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -102,7 +102,7 @@ module SiSU_Texinfo_format
author=@md.author if @md.author
author ||=''
author.gsub!(/[\*]/,'') #if author
- v=SiSU_Env::Info_version.new.get_version
+ v=SiSU_Env::Info_version.instance.get_version
#(version @value{VERSION} #{v[:version]}, @value{UPDATED} #{v[:date]})
head =<<WOK
\\input texinfo @c -*-texinfo-*-
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v1/texpdf.rb
index 9450aed5..1e5375af 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v1/texpdf.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -58,12 +58,12 @@
=end
module SiSU_TeX
require 'pstore'
- require "#{SiSU_lib}/defaults"
- include SiSU_Viz
- require "#{SiSU_lib}/particulars"
- include SiSU_Particulars
- require "#{SiSU_lib}/texpdf_format"
- include SiSU_TeX_Pdf
+ require "#{SiSU_lib}/defaults" # defaults.rb
+ include SiSU_Viz
+ require "#{SiSU_lib}/particulars" # particulars.rb
+ include SiSU_Particulars
+ require "#{SiSU_lib}/texpdf_format" # texpdf_format.rb
+ include SiSU_TeX_Pdf
@tex_file=@@tex_footnote_array=@@tex_col_w=[]
@@tex_backslash ||="\\\\"
@@tilde='\\\\\\~' #?? debug crazy
@@ -71,16 +71,15 @@ module SiSU_TeX
@@column_instruct=@@squigle_close=@@tex_line_mode=@@tex_word_mode=@@line_mode=''
@@tex_debug_counter=@@table_pagebreak_counter=@@tex_footnote_call_counter=@@tex_table_flag=@@tex_counter=@@tex_column=@@tex_columns=@@tex_columns=@@counting=0
@@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}\\\\hspace\\\{0mm\\\}\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/
- #@@tex_pattern_margin_number="\\\\marginpar.+?\s+"
@@n=@@tableheader=@@rights=nil
@@date ||=SiSU_Env::Info_date.new
class Source #Songsheet #<SiSU_Param::MyFiles
require 'pstore'
- require "#{SiSU_lib}/sysenv"
- include SiSU_Env
+ require "#{SiSU_lib}/sysenv" # sysenv.rb
+ include SiSU_Env
include SiSU_Viz
- require "#{SiSU_lib}/dal"
- include SiSU_DAL
+ require "#{SiSU_lib}/dal" # dal.rb
+ include SiSU_DAL
include SiSU_TeX
def initialize(opt)
@opt=opt
@@ -109,10 +108,12 @@ module SiSU_TeX
tell=SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF')
tell.green_title_hi unless @opt.cmd =~/q/
path=@env.url.output_tell
- tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_l]}")
- tell.flow if @opt.cmd =~/[MVv]/
- tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_p]}")
- tell.flow if @opt.cmd =~/[MVv]/
+ if @opt.cmd =~/[MVv]/
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_l]}")
+ tell.flow
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_p]}")
+ tell.flow
+ end
@md=@particulars.md
SiSU_Env::Create_file.new(@opt.cmd,@opt.fns)
$flag=@md.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format
@@ -198,7 +199,7 @@ module SiSU_TeX
if FileTest.file?(landscape_pdf)
cp(landscape_pdf,"#@dir_sisu/#{@md.fnb}/#{pdf_l}")
rm(landscape_pdf)
- else p "here #{__FILE__} #{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.cmd.inspect =~/M/
+ else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.cmd.inspect =~/M/
end
tell=SiSU_Screen::Ansi.new(@md.cmd,@@n_lpdf,'processed (SiSU LaTeX to pdf - using pdfetex aka. pdftex or pdflatex)')
tell.generic_number unless @md.cmd =~/q/
@@ -365,7 +366,6 @@ module SiSU_TeX
@tex_file=[]
data.each do |para|
# EMBEDDED FOOTNOTES / ENDNOTES should be straightforward but not quite a synch.
- footnote=[]
if para =~/#{Mx[:en_a_o]}[\d*+]+\s|#{Mx[:en_b_o]}([*+]\d+)\s/ # note escape not necessary in front of ~ has implications for many other matches #debug note
para.gsub!(/#{Mx[:en_a_o]}(\d+)\s+(.+?)#{Mx[:id_o]}#@dp#{Mx[:id_c]}#{Mx[:en_a_c]}/m,"\\footnote[\\1]{%\n \\2} ") #removed space before \\footnote 2004w21, watch
para.gsub!(/#{Mx[:en_b_o]}([*+]\d+)\s+(.+?)#{Mx[:id_o]}#@dp#{Mx[:id_c]}#{Mx[:en_b_c]}/m,"\\FootnoteA{\\1}{%\n \\2} ") #work on asterisk footnotes
@@ -450,7 +450,6 @@ module SiSU_TeX
else ''
end
para.gsub!(regx,'')
- #@group_collect.each{ |x| x.gsub!(/(<:\S+>|<!.*?!>|<!>)/,' ') }
group_collect=[]
group_collect << '\begin{footnotesize} ' unless @@flag_code
@group_collect.each do |x|
@@ -461,7 +460,6 @@ module SiSU_TeX
group_collect << ' \end{footnotesize} ' unless @@flag_code
@group_collect=group_collect.flatten
@lineone.gsub!(/(<:\S+>|#{Mx[:fa_o]}.*?#{Mx[:fa_c]}|#{Mx[:gr_o]}.*?#{Mx[:gr_c]}|<!.*?!>|<!>)/,' ')
- #@group_collect.each{ |x| x.gsub!(/(.#{@@tilde}\S*\s*|<:\S+>|<!.*?!>|<!>)/,' ') }
insert=[]
insert=if para =~/#{Mx[:gr_o]}code-end#{Mx[:gr_c]}/m
insert << y + @lineone << @group_collect << ' \end{scriptsize}' << " #{@tex.paraskip_normal}"
@@ -470,14 +468,10 @@ module SiSU_TeX
para.gsub!(/(<:\S+>|#{Mx[:fa_o]}.*?#{Mx[:fa_c]}|#{Mx[:gr_o]}.*?#{Mx[:gr_c]}|<!.*?!>|<!>)/,' ')
@@flag_alt,@@flag_group,@@flag_code=false,false,false
@group_collect=[]
- #@tex_file << insert.flatten
tex_f=insert.flatten
end
para=tex_f
else
- #if para =~ /\}(?:https?|file|ftp)/
- # para=mono.http #(@orientation)
- #end
case para
when /^#{Mx[:lv_o_1]}/; mono.level1
when /^#{Mx[:lv_o_2]}/; mono.level2
@@ -551,9 +545,6 @@ WOK
sisu_rc_footnote=if @md.sc_info; @tex.doc_sc_info_footnote_full
else @tex.doc_sc_info_footnote_brief
end
- #@copymark=if @md.author_copymark; '^\copyright'
- #else ''
- #end
@copymark='' #check and remove as now is superflous
x={}
txt_obj={:title =>@md.title,:subtitle =>@md.subtitle}
diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v1/texpdf_format.rb
index 690321b7..b13220e4 100644
--- a/lib/sisu/v0/texpdf_format.rb
+++ b/lib/sisu/v1/texpdf_format.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -93,7 +93,6 @@ module SiSU_TeX_Pdf
p t_o.class
p caller
end
-
if defined? @md.image \
and @md.image =~/center/
@center_begin,@center_end='\begin{center}','\end{center}'
@@ -580,12 +579,12 @@ para
class Format_head
def initialize(md,t_o)
@md,@t_o=md,t_o
- if t_o.class == Hash
+ if t_o.class==Hash
@txt =t_o[:txt] || nil
#@title =t_o[:title] || nil
- @subtitle =t_o[:subtitle] || nil
- @ps =t_o[:paper_size] || nil
- @ocn =t_o[:ocn] || nil
+ @subtitle=t_o[:subtitle] || nil
+ @ps=t_o[:paper_size] || nil
+ @ocn=t_o[:ocn] || nil
@layout=t_o[:orientation] || nil
#elsif t_o.class == Array
# @txt =txt[0]
@@ -595,7 +594,6 @@ para
p t_o.class
p caller
end
-
@tx=SiSU_Env::Get_init.instance.tex
@url_brace=SiSU_Viz::Skin.new.url_decoration
@tex2pdf=@@tex3pdf ||=SiSU_Env::System_call.new.tex2pdf_engine
@@ -1429,7 +1427,7 @@ WOK
end
end
def sisu_rights
- v=SiSU_Env::Info_version.new.get_version
+ v=SiSU_Env::Info_version.instance.get_version
base_prog_txt=if @md.base_program
case @md.base_program
when /kdissert/i; "\n\\\\ This document prepared using \\href{http://freehackers.org/~tnagy/kdissert/}{Kdissert \\ http://freehackers.org/~tnagy/kdissert/ } \\\\ Kdissert is Document Mapping software by Thomas Nagy"
@@ -1457,7 +1455,7 @@ WOK
" \\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\ \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu} \\newline \\href{http://www.sisudoc.org}{www.sisudoc.org} \\\n}"
end
def doc_sc_info
- v=SiSU_Env::Info_version.new.get_version
+ v=SiSU_Env::Info_version.instance.get_version
<<WOK
\\\\
{\\begin{footnotesize}
@@ -1469,7 +1467,7 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- ve
WOK
end
def doc_no_sc_info
- v=SiSU_Env::Info_version.new.get_version
+ v=SiSU_Env::Info_version.instance.get_version
<<WOK
\\\\
{\\begin{small}
@@ -1502,7 +1500,7 @@ WOK
def doc_tail
dir=SiSU_Env::Info_env.new(@md.fns)
base_html="#{dir.url.root}/#{@md.fnb}"
- v=SiSU_Env::Info_version.new.get_version
+ v=SiSU_Env::Info_version.instance.get_version
sisu_ico=if FileTest.file?("#{dir.path.image_source_tex}/sisu.png")
"\\includegraphics*[width=60pt]{#{dir.path.image_source_tex}/sisu.png}"
else
diff --git a/lib/sisu/v0/update.rb b/lib/sisu/v1/update.rb
index 781b6a5d..a54a6e1b 100644
--- a/lib/sisu/v0/update.rb
+++ b/lib/sisu/v1/update.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v1/urls.rb
index 1c358910..ea090253 100644
--- a/lib/sisu/v0/urls.rb
+++ b/lib/sisu/v1/urls.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/webrick.rb b/lib/sisu/v1/webrick.rb
index e579da4e..0e8ed910 100644
--- a/lib/sisu/v0/webrick.rb
+++ b/lib/sisu/v1/webrick.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/wikispeak.rb b/lib/sisu/v1/wikispeak.rb
index d29487e0..170ff39e 100644
--- a/lib/sisu/v0/wikispeak.rb
+++ b/lib/sisu/v1/wikispeak.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/xhtml.rb b/lib/sisu/v1/xhtml.rb
index e83943af..e83943af 100644
--- a/lib/sisu/v0/xhtml.rb
+++ b/lib/sisu/v1/xhtml.rb
diff --git a/lib/sisu/v0/xml.rb b/lib/sisu/v1/xml.rb
index a270494c..a270494c 100644
--- a/lib/sisu/v0/xml.rb
+++ b/lib/sisu/v1/xml.rb
diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v1/xml_dom.rb
index 5145be98..5145be98 100644
--- a/lib/sisu/v0/xml_dom.rb
+++ b/lib/sisu/v1/xml_dom.rb
diff --git a/lib/sisu/v0/xml_fictionbook.rb b/lib/sisu/v1/xml_fictionbook.rb
index 98609c45..a0a82cba 100644
--- a/lib/sisu/v0/xml_fictionbook.rb
+++ b/lib/sisu/v1/xml_fictionbook.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -106,8 +106,8 @@ module SiSU_XML_Fictionbook
tail
end
def head
- version=SiSU_Env::Info_version.new.get_version
- rb_ver=SiSU_Env::Info_version.new.rbversion
+ version=SiSU_Env::Info_version.instance.get_version
+ rb_ver=SiSU_Env::Info_version.instance.rbversion
date_available=if defined? @md.date_available; "\n <p>#{@md.date_available} Initial version</p>"
else ''
end
diff --git a/lib/sisu/v0/xml_format.rb b/lib/sisu/v1/xml_format.rb
index bf75ae15..c636ba2d 100644
--- a/lib/sisu/v0/xml_format.rb
+++ b/lib/sisu/v1/xml_format.rb
@@ -84,7 +84,7 @@ module SiSU_XML_format
class Head_information
def initialize #dc rdf
@full_title=@subtitle=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@copyright=@owner=@keywords=''
- @sfx,@pdf,@md=@@md.sfx,@@md.pdf,@@md
+ @md=@@md
# DublinCore 1 - title
@rdfurl=%{ rdf:about="http://www.jus.uio.no/lm/toc"\n}
if @md.full_title
diff --git a/lib/sisu/v0/xml_md_oai_pmh_dc.rb b/lib/sisu/v1/xml_md_oai_pmh_dc.rb
index 341596bb..afe46d88 100644
--- a/lib/sisu/v0/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v1/xml_md_oai_pmh_dc.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/xml_scaffold.rb b/lib/sisu/v1/xml_scaffold.rb
index 4e8745fb..4e8745fb 100644
--- a/lib/sisu/v0/xml_scaffold.rb
+++ b/lib/sisu/v1/xml_scaffold.rb
diff --git a/lib/sisu/v0/xml_tables.rb b/lib/sisu/v1/xml_tables.rb
index 11748331..72a4d9d1 100644
--- a/lib/sisu/v0/xml_tables.rb
+++ b/lib/sisu/v1/xml_tables.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
diff --git a/lib/sisu/v0/zap.rb b/lib/sisu/v1/zap.rb
index 7dcc09e4..54b60bed 100644
--- a/lib/sisu/v0/zap.rb
+++ b/lib/sisu/v1/zap.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with