16 files changed, 121 insertions, 84 deletions
diff --git a/bin/sisu b/bin/sisu
index 0a904c4d..11e9592c 100755
--- a/bin/sisu
+++ b/bin/sisu
@@ -1,6 +1,56 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
-#SiSU: copyright (C) 1997 - 2015 Ralph Amissah; License GPL 3, see appended program information
+#encoding: utf-8
+#- Name: SiSU
+#
+#  - Description: documents, structuring, processing, publishing, search
+#    sisu
+#
+#  - Author: Ralph Amissah
+#    <ralph.amissah@gmail.com>
+#
+#  - Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+#    2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2019,
+#    2020, 2021, 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.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+#
+#  - SiSU uses:
+#    - Standard SiSU markup syntax,
+#    - Standard SiSU meta-markup syntax, and the
+#    - Standard SiSU object citation numbering and system
+#
+#  - Homepages:
+#    <http://www.sisudoc.org>
+#
+#  - Git
+#    <https://git.sisudoc.org/projects/>
+#    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
+#    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
 class Orient
   require 'singleton'
   include Singleton
@@ -246,6 +296,8 @@ class Orient
         get_processing_info.processing_files.each_pair do |markup_dir,markup_file|
           begin
             $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'')
+            $sisu_base_data=sisu_path_base_system_data # hard fix, revisit
+            $sisu_called_from=File.expand_path(processing.called_as)
             argv_sub=get_processing_info.command_line_modifiers + markup_file
             if FileTest.directory?(markup_dir)
               system("cd #{markup_dir}")
@@ -314,57 +366,3 @@ rescue #% -
   "})
 end
 __END__
-
-* Name: SiSU
-
-** Description: documents, structuring, processing, publishing, search
-
-** Author: Ralph Amissah
-  <ralph@amissah.com>
-  <ralph.amissah@gmail.com>
-
-** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
-
-** 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.sisudoc.org/sisu/en/SiSU/download.html>
-
-** Git
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
diff --git a/bin/sisu-concordance b/bin/sisu-concordance
index 0eabb80c..3a8a49c4 100755
--- a/bin/sisu-concordance
+++ b/bin/sisu-concordance
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --concordance ${@}
diff --git a/bin/sisu-epub b/bin/sisu-epub
index 2c7efc38..ce0d2b65 100755
--- a/bin/sisu-epub
+++ b/bin/sisu-epub
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --epub ${@}
diff --git a/bin/sisu-harvest b/bin/sisu-harvest
index 9430f8b3..444d13eb 100755
--- a/bin/sisu-harvest
+++ b/bin/sisu-harvest
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --harvest ${@}
diff --git a/bin/sisu-html b/bin/sisu-html
index 8f1e4dbc..646bf8fd 100755
--- a/bin/sisu-html
+++ b/bin/sisu-html
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --html ${@}
diff --git a/bin/sisu-html-scroll b/bin/sisu-html-scroll
index f5098f32..796530b7 100755
--- a/bin/sisu-html-scroll
+++ b/bin/sisu-html-scroll
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --html-scroll ${@}
diff --git a/bin/sisu-html-seg b/bin/sisu-html-seg
index c5851331..24c7f0de 100755
--- a/bin/sisu-html-seg
+++ b/bin/sisu-html-seg
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --html-seg ${@}
diff --git a/bin/sisu-misc-utils b/bin/sisu-misc-utils
index 47d8f32b..506d5b52 100755
--- a/bin/sisu-misc-utils
+++ b/bin/sisu-misc-utils
@@ -1,4 +1,56 @@
 #!/usr/bin/env ruby
+#encoding: utf-8
+#- Name: SiSU
+#
+#  - Description: documents, structuring, processing, publishing, search
+#    sisu
+#
+#  - Author: Ralph Amissah
+#    <ralph.amissah@gmail.com>
+#
+#  - Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+#    2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2019,
+#    2020, 2021, 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.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+#
+#  - SiSU uses:
+#    - Standard SiSU markup syntax,
+#    - Standard SiSU meta-markup syntax, and the
+#    - Standard SiSU object citation numbering and system
+#
+#  - Homepages:
+#    <http://www.sisudoc.org>
+#
+#  - Git
+#    <https://git.sisudoc.org/projects/>
+#    <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
+#    <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
 begin
   require 'thor'
 rescue LoadError
@@ -211,18 +263,5 @@ begin
 rescue
 end
 __END__
-
-**  Description: 
-
-**  Homepage: <http://www.jus.uio.no/sisu/SiSU>
-             <http://search.sisudoc.org>
-**  Download: <http://www.jus.uio.no/sisu/download>
-
-**  Copyright: (C) 2007 - 2015 Ralph Amissah
-
-**  License: GPL3+
-
-**  Ralph Amissah <ralph@amissah.com>
-  Ralph Amissah <ralph.amissah@gmail.com>
-
 #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
+__END__
diff --git a/bin/sisu-odf b/bin/sisu-odf
index c6eee725..5b22e450 100755
--- a/bin/sisu-odf
+++ b/bin/sisu-odf
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --odt ${@}
diff --git a/bin/sisu-pdf b/bin/sisu-pdf
index 45a6ba7b..eaef0406 100755
--- a/bin/sisu-pdf
+++ b/bin/sisu-pdf
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --pdf ${@}
diff --git a/bin/sisu-pdf-landscape b/bin/sisu-pdf-landscape
index 1fe79491..0f8400c9 100755
--- a/bin/sisu-pdf-landscape
+++ b/bin/sisu-pdf-landscape
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --pdf-landscape ${@}
diff --git a/bin/sisu-pdf-portrait b/bin/sisu-pdf-portrait
index 4f40aa03..22eb1107 100755
--- a/bin/sisu-pdf-portrait
+++ b/bin/sisu-pdf-portrait
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --pdf-portrait ${@}
diff --git a/bin/sisu-pg b/bin/sisu-pg
index 83585b75..c1c0ab88 100755
--- a/bin/sisu-pg
+++ b/bin/sisu-pg
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --pg ${@}
diff --git a/bin/sisu-sqlite b/bin/sisu-sqlite
index 9863e983..53e4f267 100755
--- a/bin/sisu-sqlite
+++ b/bin/sisu-sqlite
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --sqlite ${@}
diff --git a/bin/sisu-txt b/bin/sisu-txt
index 14dcb085..82a41d52 100755
--- a/bin/sisu-txt
+++ b/bin/sisu-txt
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu --txt ${@}
diff --git a/bin/sisu-webrick b/bin/sisu-webrick
index 75d97238..6b5820dd 100755
--- a/bin/sisu-webrick
+++ b/bin/sisu-webrick
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 sisu -W ${@}