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, 15 insertions, 118 deletions

diff --git a/Rantfile b/Rantfile
index bb733a6e..04063df5 100644
--- a/Rantfile
+++ b/Rantfile
@@ -1,75 +1,29 @@
 #!/usr/bin/env ruby
 raise 'Please, use ruby1.8.4 or later.' if RUBY_VERSION < '1.8.4'
 =begin
- Rantfile mapping setup.rb directory structure
+ Rantfile installer for SiSU
+ * Homepage: <http://www.jus.uio.no/sisu/SiSU> <http://www.sisudoc.org>
+ * Download:  <http://www.jus.uio.no/sisu/download>
 
- SiSU Simple information Structuring Universe, Serialised information, Structured Units
- * SiSU at present is for the Linux/Unix platform
- * See homepage at: <<  http://www.jus.uio.no/sisu/SiSU  >>
- * &  <<  http://www.jus.uio.no/sisu/download  >>
 
- Rant is a Ruby 'ant' by Stefan Lang
-
- For Setup/Installation SiSU uses either:
- * Minero Aoki's setup.rb, provided along with SiSU, or
- * Rant which may be downloaded and installed from:
-     http://make.rubyforge.org/
-
- * Name: Rant install/setup file for SiSU - Simple information Structuring Universe, Serialised information Structured Units
- *
- * Author: Ralph@Amissah.com
- * Description: Rant install/setup file which maps directory structure used by setup.rb
-   * arch-tag: Rant install/setup file which maps directory structure used by setup.rb
-   * $Id$
-
- Copyright (C) 2005 Ralph Amissah (first release edition)
- Copyright (C) 1997 Ralph Amissah (first edition)
-
- * License: GPL 2 or later
-
-  Summary of GPL 2
-
-  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 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.
+ Copyright (C) 2007 Ralph Amissah
 
-  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
+ * License: LGPL - GNU Lesser General Public License
+     [same license as Rant provided within the Rant package]
 
-  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
+ * Ralph Amissah <ralph@amissah.com>
+   Ralph Amissah <ralph.amissah@gmail.com>
 
-  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
+ Rant is a Ruby 'ant' by Stefan Lang
+ * Rant may be downloaded and installed from:
+     http://make.rubyforge.org/
 
-  © Ralph Amissah 1997, current 2005.
-  All Rights Reserved.
+ Notes on use:
 
- * Ralph Amissah mailto:ralph@amissah.com
-   Ralph Amissah mailto:amissah@gmail.com
+     rant -T
 
- * NOTE reminder to create independent setup file called install:
-     rant-import --auto install
-   then you can, as root (for default action):
-     ruby install
-   or for help on alternative actions:
-     ruby install help
-     ruby install -T
+ SiSU can also be Setup/Installation using:
+ * Minero Aoki's setup.rb, provided along with SiSU, or
 
 =end
 #%% produce a makefile suitable for the target platform
@@ -170,52 +124,6 @@ def setup_find_cp_r(dir_get,dir_put)                       #secondary, using rec
     end
   end
 end
-                                                           #%% using a single filelist
-#filelist broken in switch to rant from rake
-#filelist=Rant::FileList.new('bin/*','lib/**/*','conf/**/*','data/**/*','man/**/*')
-#filelist=Rant::FileList.new('bin/*','lib/**/*','conf/**/*','data/**/*','data/man/**/*')
-def dest(f)                                                #filelist mapping - note currently does not get 'data/man'
-  stub=f.scan(/^\S+?\/(\S+)/).join
-  place=case f
-  when /^bin/;        "#{@dir[:bin]}/#{stub}"
-  when /^lib/;        "#{@dir[:lib]}/#{stub}"
-  when /^conf/;       "#{@dir[:conf]}/#{stub}"
-  when /^data/;       "#{@dir[:data]}/#{stub}" unless f =~/^data\/sisu/
-  when /^share/;      "#{@dir[:share]}"
-  when /^man/;        "#{@dir[:man]}/#{stub}"
-  when /^vim/;        "#{@dir[:conf]}/#{stub}/vim"
-  else 'ERROR' #change
-  end
-end
-def setup_filelist_cp_r(filelist)                          #secondary, using recursive copy
-  filelist.sort.each do |f|
-    place=dest(f)
-    case
-    when File.file?(f)
-      cp_r(f,place)
-      chmod_util(place)
-    when File.directory?(f)
-      mkdir(place) unless FileTest.directory?(place)
-    end
-  end
-end
-def setup_filelist_create(filelist)                        #secondary
-  filelist.sort.each do |f|
-    place=dest(f)
-    action=case
-    when File.file?(f)
-      cp(f,place)
-      chmod_file(place)
-      "->  #{place}"
-    when File.directory?(f)
-      p place
-      File.mkpath(place) unless FileTest.directory?(place)
-      ".#{place}/"
-    else '?'
-    end
-    puts action
-  end
-end
 def rant_system_info
   puts <<WOK
   #{@proj[:platform_notice]}
@@ -392,15 +300,10 @@ desc "Help"
 task :help => [:project_help,:system_info,:rant_tasks,:pi?]
 #desc "Setup/Install #{@proj[:name]} (uses filelist)"
 task :install => [:default_notice,:project]
-#:install uses filelist which was broken in switch to rant from rake, look at later
-#task :install => [:install]
-task :install_a => [:rant_default1]
-task :install_b => [:rant_default2]
 task :install_bin => [:setup_bin]
 desc "[make rant install file]"
 task :create_rant_independent_task_file => [:rant_independence]
                                                            #%% setup/install tasks
-
 task :rant_independence do                                 #notice
   resp=''
   while resp.length < 4
@@ -429,9 +332,6 @@ end
 task :default_notice do                                    #notice
   default_notice
 end
-task :rant_default1 do                                     #secondary
-  setup_filelist_cp_r(filelist)
-end
 task :rant_default2 do                                     #secondary
   setup_find_cp_r('bin',@dir[:bin]) if File.directory?('bin')
   setup_find_cp_r('lib',@dir[:lib]) if File.directory?('lib')
@@ -441,9 +341,6 @@ task :rant_default2 do                                     #secondary
   setup_find_cp_r('data/vim',"#{@dir[:data]}/vim") if File.directory?('data/vim')
   setup_find_cp_r('man',@dir[:man]) if File.directory?('man')
 end
-task :install do                                           #secondary
-  setup_filelist_create(filelist)
-end
 task :setup_bin do                                         #bin
   setup_find_create('bin',@dir[:bin]) if File.directory?('bin')
 end