113 files changed, 18 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c1525fa6..3c7eb9c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,19 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.70.7.orig.tar.gz (2009-07-04:26/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.7.orig.tar.gz
-  sisu_0.70.7.orig.tar.gz
-  sisu_0.70.7-1.dsc
-  sisu_0.70.7-1.diff.gz
+%% 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
 
diff --git a/bin/sisu b/bin/sisu
index c336379a..23577573 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -5,7 +5,7 @@
 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 791efb0d..c2c040d3 100644
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -4,7 +4,7 @@
 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 ffe74e80..f954a8a8 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -4,7 +4,7 @@
 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/version1.yml
index 8a161435..09101fab 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version1.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 0.70.7
+: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 a947df2b..a947df2b 100644
--- a/lib/sisu/v0/author_format.rb
+++ b/lib/sisu/v1/author_format.rb
diff --git a/lib/sisu/v0/cgi.rb b/lib/sisu/v1/cgi.rb
index 504cd7f1..504cd7f1 100644
--- a/lib/sisu/v0/cgi.rb
+++ b/lib/sisu/v1/cgi.rb
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 fea17a7a..fea17a7a 100644
--- a/lib/sisu/v0/cgi_sql_common.rb
+++ b/lib/sisu/v1/cgi_sql_common.rb
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 2bac8edc..2bac8edc 100644
--- a/lib/sisu/v0/character_encoding.rb
+++ b/lib/sisu/v1/character_encoding.rb
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v1/composite.rb
index 9dc35eec..9dc35eec 100644
--- a/lib/sisu/v0/composite.rb
+++ b/lib/sisu/v1/composite.rb
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 9e2b7efd..9e2b7efd 100644
--- a/lib/sisu/v0/conf.rb
+++ b/lib/sisu/v1/conf.rb
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 3f2733b1..3f2733b1 100644
--- a/lib/sisu/v0/css.rb
+++ b/lib/sisu/v1/css.rb
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 90102c7d..90102c7d 100644
--- a/lib/sisu/v0/dal_expand_insertions.rb
+++ b/lib/sisu/v1/dal_expand_insertions.rb
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 fec0e1ed..fec0e1ed 100644
--- a/lib/sisu/v0/dal_idx.rb
+++ b/lib/sisu/v1/dal_idx.rb
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 05123bbc..05123bbc 100644
--- a/lib/sisu/v0/dal_numbering.rb
+++ b/lib/sisu/v1/dal_numbering.rb
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 2dc88a9d..2dc88a9d 100644
--- a/lib/sisu/v0/db_columns.rb
+++ b/lib/sisu/v1/db_columns.rb
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 1c09f334..1c09f334 100644
--- a/lib/sisu/v0/db_dbi.rb
+++ b/lib/sisu/v1/db_dbi.rb
diff --git a/lib/sisu/v0/db_drop.rb b/lib/sisu/v1/db_drop.rb
index bed179b7..bed179b7 100644
--- a/lib/sisu/v0/db_drop.rb
+++ b/lib/sisu/v1/db_drop.rb
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 1d5e1f20..1d5e1f20 100644
--- a/lib/sisu/v0/db_select.rb
+++ b/lib/sisu/v1/db_select.rb
diff --git a/lib/sisu/v0/db_tests.rb b/lib/sisu/v1/db_tests.rb
index c5370b52..c5370b52 100644
--- a/lib/sisu/v0/db_tests.rb
+++ b/lib/sisu/v1/db_tests.rb
diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v1/dbi.rb
index 644b150d..644b150d 100644
--- a/lib/sisu/v0/dbi.rb
+++ b/lib/sisu/v1/dbi.rb
diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v1/defaults.rb
index fe2a61e8..fe2a61e8 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v1/defaults.rb
diff --git a/lib/sisu/v0/digests.rb b/lib/sisu/v1/digests.rb
index d4e5befc..d4e5befc 100644
--- a/lib/sisu/v0/digests.rb
+++ b/lib/sisu/v1/digests.rb
diff --git a/lib/sisu/v0/embedded.rb b/lib/sisu/v1/embedded.rb
index 7f351a18..7f351a18 100644
--- a/lib/sisu/v0/embedded.rb
+++ b/lib/sisu/v1/embedded.rb
diff --git a/lib/sisu/v0/errors.rb b/lib/sisu/v1/errors.rb
index 93aab7cb..93aab7cb 100644
--- a/lib/sisu/v0/errors.rb
+++ b/lib/sisu/v1/errors.rb
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 c7ca80fb..c7ca80fb 100644
--- a/lib/sisu/v0/harvest_authors.rb
+++ b/lib/sisu/v1/harvest_authors.rb
diff --git a/lib/sisu/v0/harvest_topics.rb b/lib/sisu/v1/harvest_topics.rb
index 1ab62a95..1ab62a95 100644
--- a/lib/sisu/v0/harvest_topics.rb
+++ b/lib/sisu/v1/harvest_topics.rb
diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v1/help.rb
index cd5eaf25..cd5eaf25 100644
--- a/lib/sisu/v0/help.rb
+++ b/lib/sisu/v1/help.rb
diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v1/html.rb
index 39775832..39775832 100644
--- a/lib/sisu/v0/html.rb
+++ b/lib/sisu/v1/html.rb
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v1/html_format.rb
index eb29f9f9..eb29f9f9 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v1/html_format.rb
diff --git a/lib/sisu/v0/html_minitoc.rb b/lib/sisu/v1/html_minitoc.rb
index 62054db0..62054db0 100644
--- a/lib/sisu/v0/html_minitoc.rb
+++ b/lib/sisu/v1/html_minitoc.rb
diff --git a/lib/sisu/v0/html_promo.rb b/lib/sisu/v1/html_promo.rb
index d4c1f4c0..d4c1f4c0 100644
--- a/lib/sisu/v0/html_promo.rb
+++ b/lib/sisu/v1/html_promo.rb
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 d874063a..d874063a 100644
--- a/lib/sisu/v0/html_segments.rb
+++ b/lib/sisu/v1/html_segments.rb
diff --git a/lib/sisu/v0/html_table.rb b/lib/sisu/v1/html_table.rb
index 81ff0814..81ff0814 100644
--- a/lib/sisu/v0/html_table.rb
+++ b/lib/sisu/v1/html_table.rb
diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v1/html_tune.rb
index 682a734a..682a734a 100644
--- a/lib/sisu/v0/html_tune.rb
+++ b/lib/sisu/v1/html_tune.rb
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v1/hub.rb
index 4906c3f4..4906c3f4 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v1/hub.rb
diff --git a/lib/sisu/v0/i18n.rb b/lib/sisu/v1/i18n.rb
index 4abad8b5..4abad8b5 100644
--- a/lib/sisu/v0/i18n.rb
+++ b/lib/sisu/v1/i18n.rb
diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v1/manifest.rb
index 73f3bd18..73f3bd18 100644
--- a/lib/sisu/v0/manifest.rb
+++ b/lib/sisu/v1/manifest.rb
diff --git a/lib/sisu/v0/manpage.rb b/lib/sisu/v1/manpage.rb
index 7129e45a..7129e45a 100644
--- a/lib/sisu/v0/manpage.rb
+++ b/lib/sisu/v1/manpage.rb
diff --git a/lib/sisu/v0/manpage_format.rb b/lib/sisu/v1/manpage_format.rb
index 36009f8d..36009f8d 100644
--- a/lib/sisu/v0/manpage_format.rb
+++ b/lib/sisu/v1/manpage_format.rb
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 d779d82d..d779d82d 100644
--- a/lib/sisu/v0/odf_format.rb
+++ b/lib/sisu/v1/odf_format.rb
diff --git a/lib/sisu/v0/options.rb b/lib/sisu/v1/options.rb
index f43034dc..f43034dc 100644
--- a/lib/sisu/v0/options.rb
+++ b/lib/sisu/v1/options.rb
diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v1/param.rb
index 4efdebb5..4efdebb5 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v1/param.rb
diff --git a/lib/sisu/v0/param_identify_markup.rb b/lib/sisu/v1/param_identify_markup.rb
index 37eb8be1..37eb8be1 100644
--- a/lib/sisu/v0/param_identify_markup.rb
+++ b/lib/sisu/v1/param_identify_markup.rb
diff --git a/lib/sisu/v0/particulars.rb b/lib/sisu/v1/particulars.rb
index ac6b10bc..ac6b10bc 100644
--- a/lib/sisu/v0/particulars.rb
+++ b/lib/sisu/v1/particulars.rb
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 42c206e8..42c206e8 100644
--- a/lib/sisu/v0/plaintext_format.rb
+++ b/lib/sisu/v1/plaintext_format.rb
diff --git a/lib/sisu/v0/relaxng.rb b/lib/sisu/v1/relaxng.rb
index a53b6dee..a53b6dee 100644
--- a/lib/sisu/v0/relaxng.rb
+++ b/lib/sisu/v1/relaxng.rb
diff --git a/lib/sisu/v0/remote.rb b/lib/sisu/v1/remote.rb
index cc217018..cc217018 100644
--- a/lib/sisu/v0/remote.rb
+++ b/lib/sisu/v1/remote.rb
diff --git a/lib/sisu/v0/response.rb b/lib/sisu/v1/response.rb
index b69f2677..b69f2677 100644
--- a/lib/sisu/v0/response.rb
+++ b/lib/sisu/v1/response.rb
diff --git a/lib/sisu/v0/rexml.rb b/lib/sisu/v1/rexml.rb
index 6b6ff906..6b6ff906 100644
--- a/lib/sisu/v0/rexml.rb
+++ b/lib/sisu/v1/rexml.rb
diff --git a/lib/sisu/v0/screen_text_color.rb b/lib/sisu/v1/screen_text_color.rb
index 915cf58b..915cf58b 100644
--- a/