Merge branch 'upstream' into debian/sid

10 files changed, 66 insertions, 40 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 5d5c0556..48c6c0fc 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,17 +12,29 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.0.4.orig.tar.gz (2010-03-23:12/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
+  sisu_2.0.4.orig.tar.gz
+  sisu_2.0.4-1.dsc
+  sisu_2.0.4-1.diff.gz
+
+  * bug fixes
+    * correct method call for md.title.full a number of places [in db_import,
+      results in failure of  doc import when called]
+
+  * free_as_in_freedom, additional links to available material
+
 %% 2.0.3.orig.tar.gz (2010-03-22:12/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
-  sisu_2.0.3.orig.tar.gz
-  sisu_2.0.3-1.dsc
-  sisu_2.0.3-1.diff.gz
+  5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz
+  4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc
+  c30e3dc32f824360e411a37a969f1d997cc20671ca119c302192735a8f650037 275394 sisu_2.0.3-1.diff.gz
 
   * bug fixes
-    odf, xml, texpdf, bulleted group, clean
-    odf, metadata line break - prevent from breaking document [potential odf
-    breakage]
-    xml_dom, behaviours fixes
+    * odf, xml, texpdf, bulleted group, clean
+    * odf, metadata line break - prevent from breaking document [potential odf
+      breakage]
+    * xml_dom, behaviours fixes
 
 %% 2.0.2.orig.tar.gz (2010-03-21:11/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 8afd183e..c908e9cc 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.0.3
-:date_stamp: 2010w12/1
-:date: "2010-03-22"
+:version: 2.0.4
+:date_stamp: 2010w12/2
+:date: "2010-03-23"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index fdc6ce80..c6a4af68 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,17 +12,29 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.0.4.orig.tar.gz (2010-03-23:12/2)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
+  sisu_2.0.4.orig.tar.gz
+  sisu_2.0.4-1.dsc
+  sisu_2.0.4-1.diff.gz
+
+  * bug fixes
+    * correct method call for md.title.full a number of places [in db_import,
+      results in failure of  doc import when called]
+
+  * free_as_in_freedom, additional links to available material
+
 %% 2.0.3.orig.tar.gz (2010-03-22:12/1)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
-  sisu_2.0.3.orig.tar.gz
-  sisu_2.0.3-1.dsc
-  sisu_2.0.3-1.diff.gz
+  5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz
+  4e09d9f39e4365493c8633d4c577201694fa6d1d36fdc3fba998bb65f8e01bb5 1145 sisu_2.0.3-1.dsc
+  c30e3dc32f824360e411a37a969f1d997cc20671ca119c302192735a8f650037 275394 sisu_2.0.3-1.diff.gz
 
   * bug fixes
-    odf, xml, texpdf, bulleted group, clean
-    odf, metadata line break - prevent from breaking document [potential odf
-    breakage]
-    xml_dom, behaviours fixes
+    * odf, xml, texpdf, bulleted group, clean
+    * odf, metadata line break - prevent from breaking document [potential odf
+      breakage]
+    * xml_dom, behaviours fixes
 
 %% 2.0.2.orig.tar.gz (2010-03-21:11/7)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
diff --git a/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 9b8c2b93..78a383eb 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/doc/sisu/v2/sisu_markup_samples/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -6,11 +6,11 @@
 @creator: Williams, Sam
 
 @rights:
-  :copyright: Copyright (C) Sam Williams 2002.
-  :license: Published under the GNU Free Documentation License. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Document License, Version 1.1 or any later version published by the Free Software Foundation; with the Invariant Sections being no invariant sections, with the Front-Cover Texts being no invariant sections, and with the Back-Cover Texts being no invariant sections. A copy of the license is included in Appendix C, GNU Free Documentation License. All images are to be included verbatim when the document is copied, distributed, or modified under the terms of the GFDL.
+ :copyright: Copyright (C) Sam Williams 2002.
+ :license: Published under the GNU Free Documentation License. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Document License, Version 1.1 or any later version published by the Free Software Foundation; with the Invariant Sections being no invariant sections, with the Front-Cover Texts being no invariant sections, and with the Back-Cover Texts being no invariant sections. A copy of the license is included in Appendix C, GNU Free Documentation License. All images are to be included verbatim when the document is copied, distributed, or modified under the terms of the GFDL.
 
 @classify:
- :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography
+ :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography;programming
 
 @date:
  :published: 2002
@@ -30,8 +30,10 @@
  {The Wealth of Networks, Yochai Benkler @ SiSU}http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler
  {Two Bits, Christopher Kelty @ SiSU}http://www.jus.uio.no/sisu/two_bits.christopher_kelty
  {Free For All, Peter Wayner @ SiSU}http://www.jus.uio.no/sisu/free_for_all.peter_wayner
- {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
  {The Cathedral and the Bazaar, Eric S. Raymond @ SiSU }http://www.jus.uio.no/sisu/the_cathedral_and_the_bazaar.eric_s_raymond
+ {Free Culture, Lawrence Lessig @ SiSU}http://www.jus.uio.no/sisu/free_culture.lawrence_lessig
+ {CONTENT, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/content.cory_doctorow
+ {Little Brother, Cory Doctorow @ SiSU}http://www.jus.uio.no/sisu/little_brother.cory_doctorow
 
 @make:
  :skin: skin_rms
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 369ade1a..61d3af36 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -16,7 +16,7 @@
  :issued: 2002-11-12
  :available: 2002-11-12
  :published: 2009-01-18
- :modified: 2010-03-06
+ :modified: 2010-03-23
 
 @make:
  :num_top: 1
@@ -57,7 +57,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_2.0.3.orig.tar.gz (of 2010-03-22:12/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
+_* {~^ sisu_2.0.4.orig.tar.gz (2010-03-22:12/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
 
 _* {~^ sisu-markup-samples_1.0.10.orig.tar.gz (of 2008-10-09:40/4 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.10.orig.tar.gz ~{ <br>1e769b5c2c2d6135c3f5a14ede1d019f77588c7024168c756c7093510145c7dc 3442966 }~ *~sisu-markup-samples
 
@@ -104,11 +104,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.0.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
+{~^ sisu_2.0.4.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
 
-{~^ sisu_2.0.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3-1.diff.gz
+{~^ sisu_2.0.4-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4-1.diff.gz
 
-{~^ sisu_2.0.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3-1.dsc
+{~^ sisu_2.0.4-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4-1.dsc
 
 }group
 
@@ -116,15 +116,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+{~^ sisu_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.4-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-{~^ sisu-complete_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+{~^ sisu-complete_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.4-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-{~^ sisu-pdf_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+{~^ sisu-pdf_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.4-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-{~^ sisu-postgresql_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+{~^ sisu-postgresql_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.4-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-{~^ sisu-sqlite_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+{~^ sisu-sqlite_2.0.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.4-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 }group
 
@@ -154,7 +154,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.0.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.3-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.0.4-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.4-2.noarch.rpm ~{ <br>created using alien }~
 
 _* {~^ sisu-markup-samples_1.0.10.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
 
diff --git a/lib/sisu/v2/concordance.rb b/lib/sisu/v2/concordance.rb
index 06cc3056..74338e98 100644
--- a/lib/sisu/v2/concordance.rb
+++ b/lib/sisu/v2/concordance.rb
@@ -111,7 +111,7 @@ module SiSU_Concordance
         @fnb=@md.fnb
         @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home --&gt;"></a>}
         @doc_details =<<WOK
-<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.fn[:toc]}" #{@vz.js_toc}><b>#{@md.full_title}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
+<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.fn[:toc]}" #{@vz.js_toc}><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
 WOK
       end
       def create
@@ -123,11 +123,11 @@ WOK
 <html>
 <head>
   <title>
-    SiSU created WordIndex for: #{@md.full_title}
+    SiSU created WordIndex for: #{@md.title.full}
   </title>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
   <meta name="Description" content="&nbsp;SiSU created">
-  <meta name="keywords" content="word index for #{@md.full_title}">
+  <meta name="keywords" content="word index for #{@md.title.full}">
   <meta name="generator" content="SiSU (Linux &amp; Ruby!)">
   <link rel="generator" href="http://www.jus.uio.no/sisu" />
   <link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
diff --git a/lib/sisu/v2/db_import.rb b/lib/sisu/v2/db_import.rb
index e5c05040..1f795e68 100644
--- a/lib/sisu/v2/db_import.rb
+++ b/lib/sisu/v2/db_import.rb
@@ -224,7 +224,7 @@ module SiSU_DB_import
       @md=SiSU_Param::Parameters.new(@opt).get
       if defined? @md.title.full \
       and @md.title.full=~/\S+/                                              # DublinCore 1 - title
-        @tp[:title]=@md.title.all
+        @tp[:title]=@md.title.full
         special_character_escape(@tp[:title])
         @tp[:title_f],@tp[:title_i]='title, ',"'#{@tp[:title]}', "
         sql='SELECT MAX(tid) FROM metadata'
diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb
index 680a7abf..c1da4ccb 100644
--- a/lib/sisu/v2/manifest.rb
+++ b/lib/sisu/v2/manifest.rb
@@ -598,7 +598,7 @@ WOK
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>
-SiSU manifest: #{@md.full_title}
+SiSU manifest: #{@md.title.full}
 </title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="sourcefile" content="#{@md.fns}" />
@@ -613,7 +613,7 @@ SiSU manifest: #{@md.full_title}
 </div>
 <div class="content">
 <h1 class="small">#{@translate.manifest_description}</h1>
-<h2 class="small">#{@md.full_title}</h2>
+<h2 class="small">#{@md.title.full}</h2>
 <p class="bold">#{@md.author}</p>
 <p class="small">
 &nbsp;&nbsp;<a href="#output">Document, Available Filetypes</a>
diff --git a/lib/sisu/v2/shared_txt.rb b/lib/sisu/v2/shared_txt.rb
index 90de5ef5..9d35743b 100644
--- a/lib/sisu/v2/shared_txt.rb
+++ b/lib/sisu/v2/shared_txt.rb
@@ -162,7 +162,7 @@ module SiSU_text_utils
     end
     def start_is_match
       meta=case @p
-      when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/;               header($1,@md.full_title,'meta','dc') #dc 1
+      when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/;               header($1,@md.title.full,'meta','dc') #dc 1
       when /^#{Mx[:meta_o]}(creator|author)#{Mx[:meta_c]}\s*(.+?)$/;      header('creator',$2,'meta','dc')    #dc 2
       when /^#{Mx[:meta_o]}(subject)#{Mx[:meta_c]}\s*(.+?)$/;             header($1,$2,'meta','dc')           #dc 3
       when /^#{Mx[:meta_o]}(description)#{Mx[:meta_c]}\s*(.+?)$/;         header($1,$2,'meta','dc')           #dc 4
diff --git a/lib/sisu/v2/xml_fictionbook.rb b/lib/sisu/v2/xml_fictionbook.rb
index 129dabd3..045fdb93 100644
--- a/lib/sisu/v2/xml_fictionbook.rb
+++ b/lib/sisu/v2/xml_fictionbook.rb
@@ -123,7 +123,7 @@ module SiSU_XML_Fictionbook
       <middle-name>***</middle-name>
       <last-name>***</last-name>
     </author>
-    <book-title>#{@md.full_title}</book-title>
+    <book-title>#{@md.title.full}</book-title>
     <annotation>
     </annotation>
     <date value="#{@md.date}">yyyy</date>