primarily gpl3 changes, license changed, license included, images added

skins cleaned a bit and output info on sisu modified, esp. in html

html no link to concordance if generated on document above word count 260k

odf url match bug fix

dal text block fix for dealing with url to be followed by <br>

minor cosmetic stuff

1 files changed, 109 insertions, 157 deletions

diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb
index 3713acae..66333528 100644
--- a/lib/sisu/v0/defaults.rb
+++ b/lib/sisu/v0/defaults.rb
@@ -1,50 +1,58 @@
 =begin
- * Name: SiSU information Structuring Universe - Structured information, Serialized Units
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
  * Author: Ralph Amissah
-   * http://www.jus.uio.no/sisu
-   * http://www.jus.uio.no/sisu/SiSU/download.html
 
- * Description: Default values (reset by skins)
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Ralph Amissah All Rights Reserved.
 
- * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Ralph Amissah
+ * License: GPL 3 or later:
 
- * License: GPL 2 or later
+   SiSU, a framework for document structuring, publishing and search
 
-  Summary of GPL 2
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 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
-  Software Foundation; either version 2 of the License, or (at your option)
-  any later version.
+   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
+   Software Foundation, either version 3 of the License, or (at your option)
+   any later version.
 
-  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
-  more details.
+   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
+   more details.
 
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+   You should have received a copy of the GNU General Public License along with
+   this program. If not, see <http://www.gnu.org/licenses/>.
 
-  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.gnu.org/copyleft/gpl.html
-    http://www.jus.uio.no/sisu/gpl2.fsf
+   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.gnu.org/copyleft/gpl.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf>
 
-  SiSU was first released to the public on January 4th 2005
+ * SiSU uses:
+   * Standard SiSU markup syntax,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
 
-  SiSU uses:
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
 
-  *  Standard SiSU markup syntax,
-  *  Standard SiSU meta-markup syntax, and the
-  *  Standard SiSU object citation numbering and system
+ * Download:
+   <http://www.jus.uio.no/sisu/SiSU/download.html>
 
-  © Ralph Amissah 1997, current 2007.
-  All Rights Reserved.
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
+
+ ** Description: Default values (reset by skins)
 
- * Ralph Amissah: ralph@amissah.com
-                  ralph.amissah@gmail.com
 =end
 $latex_run=nil
 module SiSU_Viz
@@ -172,6 +180,9 @@ module SiSU_Viz
     def url_sisu
       'http://www.jus.uio.no/sisu'
     end
+    def url_sisudoc
+      'http://www.sisudoc.org'
+    end
     def url_root
       '/sisu' #watch
     end
@@ -1224,10 +1235,15 @@ module SiSU_Viz
 </td></tr>
 WOK
     end
+    def widgets_open
+<<WOK
+<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
+WOK
+    end
     def widget_pdfviewers
 <<WOK
 <tr align="center"><td align="center">
-<table summary="pdf viewer suggestions" bgcolor="#ffffff" cellpadding="4" border="0">
+<!-- pdf viewer suggestions -->
 <tr><td>
   <p class="center">
   <font color="#666666" size="1">
@@ -1240,8 +1256,7 @@ WOK
     (rather than web browser plugins):
   </font>
   </p>
-#{table_close}
-<table summary="" bgcolor="#ffffff" cellpadding="4" border="0" align="center">
+</td></tr>
 <tr align="center"><td align="center">
   <p class="center">
   <font color="#666666" size="1">
@@ -1287,163 +1302,100 @@ WOK
     <sup>&reg;</sup>
   </font>
   </p>
-#{table_close}
-WOK
-    end
-    def widget_googlegroups
-<<WOK
-<table style="border:1px solid #aa0033; font-size:small" align=center>
-<tr><td rowspan=3>
-  <img src="http://groups-beta.google.com/groups/img/groups_medium.gif" height=58 width=150 alt="Google Groups" />
-</td>
-<td colspan=2 align=center>
-  <b>Subscribe to SiSU e-docs</b>
-</td>
-</tr>
-<form action="http://groups-beta.google.com/group/SiSU_e-docs/boxsubscribe">
-  <tr><td>
-    Email:
-    <input type=text name=email>
-  </td>
-  <td>
-  <table style="background-color:#ffcc33;padding:2px;border:2px outset #ffcc33;">
-  <tr><td>
-    <input type=submit name="sub" value="Subscribe">
-  </td></tr>
-  </table>
-  </td></tr>
-</form>
-<tr><td colspan=2 align=center>
-  <a href="http://groups-beta.google.com/group/SiSU_e-docs">
-    Browse Archives
-  </a> at
-  <a href="http://groups-beta.google.com/">
-    groups-beta.google.com</a>
-  </td></tr>
-</table>
+</td></tr>
 WOK
     end
     def widget_sisu
+      #{@date.year}
       v=SiSU_Env::Info_version.new.get_version
 <<WOK
-<table summary="" bgcolor="#ffffff" cellpadding="4" border="0" align="center">
-<tr align="center"><td align="center">
-  <p class="center">
-  <font color="#666666" size="2">
-    presentations' look and feel
-  <br />
-    generated by
-  <br />
+<!-- widget sisu -->
+<tr><td valign="top" width="10%">
+  <p class="tiny_left"><font color="#666666" size="2">
     <a href="#{url_sisu}" #{js_sisu}>
       <img border="0" src="../_sisu/image/sisu.png" alt="SiSU" width="120" height="39" />
     </a>
-    <br />
-    <a href="#{url_sisu}" #{js_sisu}>
-      #{v[:project]}
-    </a>
-  <br />
-    version #{v[:version]}
-  <br />
-    #{v[:date_stamp]} (#{v[:date]})
-  <br />
-  </font>
-  </p>
-<table summary="SiSU rights" bgcolor="#ffffff" cellpadding="4" border="0" align="center" width="40%">
-<tr align="center"><td align="left">
-  <p class="left">
-  <font color="#666666" size="2">
+  </font></p>
+</td><td valign="top" width="45%">
+<!-- SiSU Rights -->
+  <p class="tiny_left"><font color="#666666" size="2">
     Generated by
     <a href="#{url_sisu}" #{js_sisu}>
       SiSU
     </a>
-  <br />
-    #{v[:project]} #{v[:version]} #{v[:date_stamp]}
-  <br />
+    #{v[:project]} #{v[:version]} #{v[:date]} (#{v[:date_stamp]})
+    <br />
     <a href="#{url_sisu}" #{js_sisu}>
       www.jus.uio.no/sisu
     </a>
-  <br />
-    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)
-  <br />
-    <sup>&copy;</sup> Ralph Amissah 1997, current #{@date.year}.
-  <br />
-    All Rights Reserved.
-  <br />
-    SiSU is the result of several years of research and development in electronic
-    publishing, commenced in 1993 and under active development since 1997.
-  <br />
-    <b>SiSU is released under
-    <a href="http://www.gnu.org/copyleft/gpl.html">
-      GPL 2
-    </a>
-    or later</b>
-    <a href="http://www.gnu.org/copyleft/gpl.html">
-      http://www.gnu.org/copyleft/gpl.html
+    and
+    <a href="#{url_sisudoc}" #{js_sisu}>
+      www.sisudoc.org
     </a>
   <br />
-    (SiSU's first public release on January 4<sup>th</sup> 2005)
-  <br />
-  </font>
-  </p>
-  <p class="center">
-  <font color="#666666" size="3">
-    <sup>&copy;</sup> Ralph Amissah
-  <br />
-    1993, current #{@date.year}
-  <br />
-    All Rights Reserved
   <br />
     <i>w3 since October 3 1993</i>
-  <br />
     <a href="mailto://ralph@amissah.com" #{js_mail}>
       ralph@amissah.com
     </a>
+  </font></p>
+</td><td valign="top" width="45%">
+  <p class="tiny_left"><font color="#666666" size="2">
+    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)
   <br />
-  </font>
-  </p>
+    <sup>&copy;</sup> Ralph Amissah 1997, current 2007.
+    All Rights Reserved.
+  </font></p>
+</td></tr>
 WOK
     end
     def widget_way_better
       <<WOK
-  <p class="center">
-  <font color="#666666" size="2">
-    Developed
+<!-- widget way better -->
+<tr><td valign="top" width="10%">
+  <p class="tiny_left"><font color="#666666" size="2">
+    <a href="http://www.gnu.org/licenses/gpl.html">
+      <img border="0" src="../_sisu/image/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
+    </a>
+  </font></p>
+</td><td valign="top" width="45%">
+  <p class="tiny_left"><font color="#666666" size="2">
+    <b>SiSU</b> <sup>&copy;</sup> Ralph Amissah
+    1993, current 2007
+    All Rights Reserved.
   <br />
-    using
+    <b>SiSU is released under
+    <a href="http://www.gnu.org/licenses/gpl.html">GPL v3</a>
+    or later</b>
+    <a href="http://www.gnu.org/licenses/gpl.html">
+      http://www.gnu.org/licenses/gpl.html
+    </a>
+  </font></p>
+</td><td valign="top" width="45%">
+  <p class="tiny_left"><font color="#666666" size="2">
+    Developed using
     <a href="http://www.ruby-lang.org/en/">
       Ruby
     </a>
-  <br />
     on
     <a href="http://www.debian.org/">
       Debian/Gnu/Linux
     </a>
     software infrastructure,
-  <br />
     &amp; with the usual GPL (or OSS) suspects.
   <br />
-    Better - "performance, reliability, scalability, security
-  <br />
-    &amp; total cost of ownership"
-  <br />
+    Better - "performance, reliability, scalability, security &amp; total cost of ownership"
     [not to mention flexibility &amp; choice]
   <br />
-  <br />
     Get With the Future
-  <br />
     <a href="http://www.jus.uio.no/sisu/">
       Way Better!
     </a>
-  </font>
-  </p>
-#{table_close}
-#{table_close}
+  </font></p>
+</td></tr>
 WOK
     end
     def widget_wayBetter
@@ -1470,14 +1422,14 @@ WOK
   </font>
 #{table_close*4}}
     end
-    def credits_splash
-      %{  <center>
-<table align="center"bgcolor="#ffffff">
+    def credits_sisu
+      %{#{widgets_open}
 <tr><td>
-  #{widget_sisu}#{widget_way_better}#{widget_browsers}#{widget_pdfviewers}
-</td></tr>
-</table>
-</center>}
+  #{widget_way_better}
+  #{widget_sisu}
+</table>}
+    end
+    def credits_splash
     end
     #% bottom
     def bottom_surround
@@ -1570,7 +1522,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
 </h2>
 </div>
 <div id="top_band_search">
-<!-- Search SiSU -->
+<!-- SiSU Search -->
 <a name="search"></a><form method="get" action="http://search.sisudoc.org" target="_top">
 <input type="text" name="s1" size="24" maxlength="255" />
 <br />
@@ -1580,7 +1532,7 @@ outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQ
 <input type="radio" name="view" value="index" checked="checked" /> idx
 <input type="radio" name="view" value="text" /> txt
 </form>
-<!-- Search SiSU -->
+<!-- SiSU Search -->
 </div>
 <div id="column_left">
 <p class="bold">