Merge branch 'upstream' into debian/sid

8 files changed, 268 insertions, 3 deletions

diff --git a/bin/sisu b/bin/sisu
index d977642f..54075d98 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -6,7 +6,18 @@ raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VER
 $VERBOSE=nil
 $KCODE='u' if RUBY_VERSION < '1.9'
 argv=$*
-SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
+SiSU_version_dir=case argv.inspect
+when /--v1/
+  'v1'
+when /--v2/
+  'v2'
+when /--v3/
+  'v3'
+when /--dev/
+  'v3'
+else
+  'v2'
+end
 SiSU_lib="sisu/#{SiSU_version_dir}"
 require "#{SiSU_lib}/hub"
 __END__
diff --git a/bin/sisu-git b/bin/sisu-git
new file mode 100644
index 00000000..d38b10c5
--- /dev/null
+++ b/bin/sisu-git
@@ -0,0 +1,2 @@
+#!/bin/sh
+sisu -g ${@}
diff --git a/bin/sisu-po b/bin/sisu-po
new file mode 100644
index 00000000..9d0d1b95
--- /dev/null
+++ b/bin/sisu-po
@@ -0,0 +1,2 @@
+#!/bin/sh
+sisu --v3 --po4a ${@}
diff --git a/bin/sisu1 b/bin/sisu1
new file mode 100644
index 00000000..87d9d19a
--- /dev/null
+++ b/bin/sisu1
@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+#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'
+argv=$*
+SiSU_version_dir=case argv.inspect
+when /--v1/
+  'v1'
+when /--v2/
+  'v2'
+when /--v3/
+  'v3'
+when /--dev/
+  'v3'
+else
+  'v1'
+end
+SiSU_lib="sisu/#{SiSU_version_dir}"
+require "#{SiSU_lib}/hub"
+__END__
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010 Ralph Amissah All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+   SiSU, a framework for document structuring, publishing and search
+
+   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
+   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.
+
+   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/licensing/licenses/gpl.html>
+   <http://www.gnu.org/licenses/gpl.html>
+
+   <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,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
+
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
+
+ * Download:
+   <http://www.jus.uio.no/sisu/SiSU/download.html>
+
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
diff --git a/bin/sisu2 b/bin/sisu2
new file mode 100644
index 00000000..54075d98
--- /dev/null
+++ b/bin/sisu2
@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+#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'
+argv=$*
+SiSU_version_dir=case argv.inspect
+when /--v1/
+  'v1'
+when /--v2/
+  'v2'
+when /--v3/
+  'v3'
+when /--dev/
+  'v3'
+else
+  'v2'
+end
+SiSU_lib="sisu/#{SiSU_version_dir}"
+require "#{SiSU_lib}/hub"
+__END__
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010 Ralph Amissah All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+   SiSU, a framework for document structuring, publishing and search
+
+   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
+   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.
+
+   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/licensing/licenses/gpl.html>
+   <http://www.gnu.org/licenses/gpl.html>
+
+   <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,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
+
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
+
+ * Download:
+   <http://www.jus.uio.no/sisu/SiSU/download.html>
+
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
diff --git a/bin/sisu3 b/bin/sisu3
new file mode 100644
index 00000000..e2f21554
--- /dev/null
+++ b/bin/sisu3
@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+#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'
+argv=$*
+SiSU_version_dir=case argv.inspect
+when /--v1/
+  'v1'
+when /--v2/
+  'v2'
+when /--v3/
+  'v3'
+when /--dev/
+  'v3'
+else
+  'v3'
+end
+SiSU_lib="sisu/#{SiSU_version_dir}"
+require "#{SiSU_lib}/hub"
+__END__
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010 Ralph Amissah All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+   SiSU, a framework for document structuring, publishing and search
+
+   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
+   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.
+
+   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/licensing/licenses/gpl.html>
+   <http://www.gnu.org/licenses/gpl.html>
+
+   <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,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
+
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
+
+ * Download:
+   <http://www.jus.uio.no/sisu/SiSU/download.html>
+
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet
index 15771bae..66370567 100644
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -5,7 +5,18 @@ raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RU
 #raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
 $VERBOSE=nil
 argv=$*
-SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
+SiSU_version_dir=case argv.inspect
+when /--v1/
+  'v1'
+when /--v2/
+  'v2'
+when /--v3/
+  'v3'
+when /--dev/
+  'v3'
+else
+  'v2'
+end
 SiSU_lib="sisu/#{SiSU_version_dir}"
 require "#{SiSU_lib}/termsheet"
 __END__
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index e0d6e5ca..cde38193 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -5,7 +5,18 @@ raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RU
 #raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
 $VERBOSE=nil
 argv=$*
-SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
+SiSU_version_dir=case argv.inspect
+when /--v1/
+  'v1'
+when /--v2/
+  'v2'
+when /--v3/
+  'v3'
+when /--dev/
+  'v3'
+else
+  'v2'
+end
 SiSU_lib="sisu/#{SiSU_version_dir}"
 require "#{SiSU_lib}/webrick"
 __END__