Merge tag 'sisu_7.1.8' into debian/sid

SiSU 7.1.8

4 files changed, 274 insertions, 237 deletions

diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
index c9caa971..3f4450af 100644
--- a/data/doc/sisu/CHANGELOG_v7
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -20,7 +20,23 @@ Reverse Chronological:
 
 --- HEAD ---
 
-* sisu_7.1.7.orig.tar.xz (Open commit window: 2015-12-29; Pre-Release)
+* sisu_7.1.8.orig.tar.xz (2016-02-26:08/5)
+  http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.8
+
+  * headers
+    * rollover year, 2016
+    * hyperlink delimiters changed to square brackets
+
+  * sisu-mode.el as committed to Gnu elpa
+    * re-submitted after feedback (on 7.1.7) from Stefan Monnier
+
+  * sisu.org add to header and minor update
+
+  * txt_orgmode, update (dp add email header field)
+
+  * json, an output representation, first pass
+
+* sisu_7.1.7.orig.tar.xz (2016-01-05:01/1)
   http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.7
 
   * emacs sisu-mode.el
diff --git a/data/doc/sisu/org/sisu.org b/data/doc/sisu/org/sisu.org
index 38dd3b31..e2933b1b 100644
--- a/data/doc/sisu/org/sisu.org
+++ b/data/doc/sisu/org/sisu.org
@@ -1,5 +1,15 @@
-#+OPTIONS: ^:nil _:nil
+#+TITLE: SiSU
+#+AUTHOR: Ralph Amissah
+#+EMAIL: ralph.amissah@gmail.com
+#+STARTUP: indent content
+#+LANGUAGE: en
+#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
+#+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
+#+OPTIONS: author:nil email:nil creator:nil timestamp:nil
 #+PRIORITIES: A F E
+#+EXPORT_SELECT_TAGS: export
+#+EXPORT_EXCLUDE_TAGS: noexport
+#+FILETAGS: :sisu:notes:
 (emacs:evil mode gifts a "vim" of enticing "alternative" powers! ;)
 (vim, my _editor_ of choice also in the emacs environment :)
 
@@ -749,26 +759,65 @@ The package is divided into the following components:
 
 ** Arch Linux
 
-* sisu markup                                                  :sisu:markup:
-
-** sisu markup
-
-#% structure - headings, levels
-  * headings (A-D, 1-3)
-    * inline
-      'A~ ' NOTE title level
-      'B~ ' NOTE optional
-      'C~ ' NOTE optional
-      'D~ ' NOTE optional
-      '1~ ' NOTE chapter level
-      '2~ ' NOTE optional
-      '3~ ' NOTE optional
-      '4~ ' NOTE optional :consider:
+* sisu markup                                                          :sisu:
+
+** markup                                                            :markup:
+
+*** sisu document parts
+- header
+  - metadata
+  - make instructionS
+- substantive (& other) content
+  (sisu markup)
+- endnotes
+  (markup within substantive content)
+- glossary
+  (section, special markup)
+- bibliography
+  (section, special markup)
+- book index
+  (markup attached to substantive content objects)
+
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| header              | sisu /header markup/                                                    | markup                 |        |
+| - metadata          |                                                                       |                        |        |
+| - make instructions |                                                                       |                        |        |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| substantive content | sisu /content markup/                                                   | markup                 | output |
+|                     | headings (providing document structure), paragraphs,                  | (regular content)      |        |
+|                     | blocks (code, poem, group, table)                                     |                        |        |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| endnotes            | markup within substantive content                                     | markup                 | output |
+|                     | (extracted from sisu /content markup/)                                  | (from regular content) |        |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| glossary            | identify special section, regular /content markup/                      | markup                 | output |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| bibliography        | identify section, special /bibliography markup/                         | markup                 | output |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| book index          | extracted from markup attached to related substantive content objects | markup                 | output |
+|                     | (special tags in sisu /content markup/)                                 | (from regular content) |        |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+| metadata            |                                                                       | (from regular header)  | output |
+|---------------------+-----------------------------------------------------------------------+------------------------+--------|
+
+*** structure - headings, levels
+- headings (A-D, 1-3)
+
+'A~ ' NOTE title level
+
+'B~ ' NOTE optional
+'C~ ' NOTE optional
+'D~ ' NOTE optional
+
+'1~ ' NOTE chapter level
+'2~ ' NOTE optional
+'3~ ' NOTE optional
+
   * node
     * parent
     * children
 
-#% font face NOTE open & close marks, inline within paragraph
+***  font face NOTE open & close marks, inline within paragraph
   * emphasize '*{ ... }*' NOTE configure whether bold italics or underscore, default bold
   * bold '!{ ... }!'
   * italics '/{ ... }/'
@@ -778,7 +827,9 @@ The package is divided into the following components:
   * strike '-{ ... }-'
   * add '+{ ... }+'
   * monospace '#{ ... }#'
-#% para NOTE paragraph controls are at the start of a paragraph
+
+*** para
+NOTE paragraph controls are at the start of a paragraph
   * a para is a block of text separated from others by an empty line
   * indent
     * default, all '_1 ' up to '_9 '
@@ -793,45 +844,46 @@ The package is divided into the following components:
     [levels 1-3]
       '# '
 
-#% blocks NOTE text blocks that are not to be treated in the way that ordinary paragraphs would be
+*** blocks
+NOTE text blocks that are not to be treated in the way that ordinary paragraphs would be
   * code
     * [type of markup if any]
   * poem
   * group
   * alt
   * tables
-#% boxes
-  NOTE grouped text with code block type color & possibly default image, warning, tip, red, blue etc. decide [NB N/A not implemented]
 
-#% notes NOTE inline within paragraph at the location where the note reference is to occur
+*** notes (footnotes/ endnotes)
+ NOTE inline within paragraph at the location where the note reference is to occur
   * footnotes '~{ ... }~'
   * [bibliography] [NB N/A not implemented]
 
-#% links, linking
+*** links, linking
   * links - external, web, url
   * links - internal
 
-#% images [multimedia?]
+*** images [multimedia?]
   * images
   * [base64 inline] [N/A not implemented]
 
-#% object numbers
+*** object numbers
   * ocn (object numbers)
     automatically attributed to substantive objects, paragraphs, tables, blocks, verse (unless exclude marker provided)
 
-#% contents
+*** contents
   * toc (table of contents)
     autogenerated from structure/headings information
   * index (book index)
     built from hints in newline text following a paragraph and starting with ={} has identifying rules for main and subsidiary text
 
-#% breaks
+*** breaks
   * line break ' \\ ' inline
   * page break, column break ' -\\- ' start of line, breaks a column, starts a new column, if using columns, else breaks the page, starts a new page.
   * page break, page new ' =\\= ' start of line, breaks the page, starts a new page.
   * horizontal '-..-' start of line, rule page (break) line across page (dividing paragraphs)
 
-#% book type index
+*** book type index
+built from hints in newline text following a paragraph and starting with ={} has identifying rules for main and subsidiary text
 
 #% comment
   * comment
@@ -839,7 +891,7 @@ The package is divided into the following components:
 #% misc
   * term & definition
 
-** syntax hilighting
+** syntax highlighting                                  :syntax:highlighting:
 
 *** vim
 data/sisu/conf/editor-syntax-etc/vim/
diff --git a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
index 998a4231..6bfbb4ba 100644
--- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -1,25 +1,17 @@
-;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
+;;; sisu-mode.el --- Major mode for SiSU markup text
 
-;; Copyright (C): Free Software Foundation, Inc. (FSF) (GNU EMACS)
-;;                Assigned to FSF 2011-04-08
-;;
-;; [this file has been edited and updated by Ralph Amissah]
+;; Copyright (C) 2011, 2016  Free Software Foundation, Inc.
 
 ;; Author: Ralph Amissah & Ambrose Kofi Laing
+;; Maintainer: Ralph Amissah <ralph.amissah@gmail.com>
 ;; Keywords: text, syntax, processes, tools
-;; Version:   7.1.7 2015-12-26 Ralph Amissah,
-;;   including patch from Kevin Ryde;
-;;   5.7.2 2014-10-28 Ralph Amissah;
-;;   4.0.8 2013-02-17 Ralph Amissah;
-;;   3.0.7 2011-04-20 Ambrose Kofi Laing & Ralph Amissah;
-;;   2008-12-14
-;; URL: [http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD]
-;; License: GPLv3
-;; Home URL: SiSU:   http://www.jus.uio.no/sisu
+;; Version:   7.1.8
+;; URL: http://www.sisudoc.org/
 ;; originally looked at (based on) doc-mode, with kind permission of the author
 ;;   Author: SUN, Tong <suntong001@users.sf.net>, (c)2001-6, all right reserved
 ;;   Version: $Date: 2006/01/19 03:13:41 $ $Revision: 1.14 $
 ;;   Home URL: http://xpt.sourceforge.net/
+;; with contributions from Kevin Ryde and Stefan Monnier
 
 ;; 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
@@ -32,7 +24,7 @@
 ;; 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/].
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; Viva Software Libre!
 ;; Support the free software movement!
@@ -52,6 +44,10 @@
 ;; The documentation for the "Structure Of The Hierarchy Text" can be
 ;; found in the sisustring for the sisu-mode function.
 
+;;; Code:
+
+;;{{{ Variables:
+
 (defgroup sisu-faces nil
   "AsciiSisu highlighting"
   :group 'sisus)
@@ -115,19 +111,19 @@
 (defvar sisu-title-3 'sisu-title-3-face)
 (defvar sisu-title-4 'sisu-title-4-face)
 
-(defvar general-font-lock-red1 font-lock-warning-face)
-(defvar general-font-lock-red2 font-lock-comment-face)
-(defvar general-font-lock-red3 font-lock-string-face)
+(defvar sisu-general-font-lock-red1 font-lock-warning-face)
+(defvar sisu-general-font-lock-red2 font-lock-comment-face)
+(defvar sisu-general-font-lock-red3 font-lock-string-face)
 
-(defvar general-font-lock-green1 font-lock-type-face)
-(defvar general-font-lock-green2 font-lock-constant-face)
+(defvar sisu-general-font-lock-green1 font-lock-type-face)
+(defvar sisu-general-font-lock-green2 font-lock-constant-face)
 
-(defvar general-font-lock-blue1 font-lock-keyword-face)
-(defvar general-font-lock-blue2 font-lock-function-name-face)
-(defvar general-font-lock-blue3 font-lock-builtin-face)
+(defvar sisu-general-font-lock-blue1 font-lock-keyword-face)
+(defvar sisu-general-font-lock-blue2 font-lock-function-name-face)
+(defvar sisu-general-font-lock-blue3 font-lock-builtin-face)
 
-(defvar general-font-lock-yellow1 font-lock-variable-name-face)
-(defvar general-font-lock-yellow2 font-lock-comment-face)
+(defvar sisu-general-font-lock-yellow1 font-lock-variable-name-face)
+(defvar sisu-general-font-lock-yellow2 font-lock-comment-face)
 
 ;; == sisu-mode settings
 
@@ -142,21 +138,21 @@
   (eval-when-compile
     (list
       ;;grouped text ---------
-      ;(cons "^```[ ]code\\(.\\|\n\\)+?\n```\n"      'general-font-lock-red2)
-      (cons "^```[ ]+code.*?$\\|^```$"  'general-font-lock-red2)
-      (cons "^```[ ]+table.*?$\\|^```$" 'general-font-lock-red2)
-      (cons "^```[ ]+group$\\|^```$"    'general-font-lock-red2)
-      (cons "^```[ ]+block$\\|^```$"    'general-font-lock-red2)
-      (cons "^```[ ]+poem$\\|^```$"     'general-font-lock-red2)
-      (cons "^```[ ]+alt$\\|^```$"      'general-font-lock-red2)
+      ;(cons "^```[ ]code\\(.\\|\n\\)+?\n```\n"      'sisu-general-font-lock-red2)
+      (cons "^```[ ]+code.*?$\\|^```$"  'sisu-general-font-lock-red2)
+      (cons "^```[ ]+table.*?$\\|^```$" 'sisu-general-font-lock-red2)
+      (cons "^```[ ]+group$\\|^```$"    'sisu-general-font-lock-red2)
+      (cons "^```[ ]+block$\\|^```$"    'sisu-general-font-lock-red2)
+      (cons "^```[ ]+poem$\\|^```$"     'sisu-general-font-lock-red2)
+      (cons "^```[ ]+alt$\\|^```$"      'sisu-general-font-lock-red2)
       ;;grouped text ---------
-      (cons "^group\{\\|^\}group"       'general-font-lock-red2)
-      (cons "^block\{\\|^\}block"       'general-font-lock-red2)
-      (cons "^code\{\\|^\}code"         'general-font-lock-red2)
-      (cons "^poem\{\\|^\}poem"         'general-font-lock-red2)
-      (cons "^alt\{\\|^\}alt"           'general-font-lock-red2)
-      (cons "^table\{.+\\|^\}table"     'general-font-lock-red2)
-      (cons "^\{table[^}]+\}"           'general-font-lock-red2)
+      (cons "^group{\\|^}group"       'sisu-general-font-lock-red2)
+      (cons "^block{\\|^}block"       'sisu-general-font-lock-red2)
+      (cons "^code{\\|^}code"         'sisu-general-font-lock-red2)
+      (cons "^poem{\\|^}poem"         'sisu-general-font-lock-red2)
+      (cons "^alt{\\|^}alt"           'sisu-general-font-lock-red2)
+      (cons "^table{.+\\|^}table"     'sisu-general-font-lock-red2)
+      (cons "^{table[^}]+}"           'sisu-general-font-lock-red2)
 
       (list
         (concat
@@ -164,9 +160,9 @@
           "\\(.\\|\n\\)+?"
           "\`\\{3\\}$"
         )
-        '(1 general-font-lock-red2 t)
+        '(1 sisu-general-font-lock-red2 t)
         '(2 nil t)
-        '(3 general-font-lock-red2 t)
+        '(3 sisu-general-font-lock-red2 t)
       )
       (list
         (concat
@@ -174,9 +170,9 @@
           "\\(.\\|\n\\)+?"
           "\`\\{3\\}$"
         )
-        '(1 general-font-lock-red2 t)
+        '(1 sisu-general-font-lock-red2 t)
         '(2 nil t)
-        '(3 general-font-lock-red2 t)
+        '(3 sisu-general-font-lock-red2 t)
       )
       (list
         (concat
@@ -184,177 +180,177 @@
           "\\(.\\|\n\\)+?"
           "^\`\\{3\\}$"
         )
-        '(1 general-font-lock-red2 t)
+        '(1 sisu-general-font-lock-red2 t)
         '(2 nil t)
-        '(3 general-font-lock-red2 t)
+        '(3 sisu-general-font-lock-red2 t)
       )
 
       ;; footnote/endnote ----
-      ;(cons "\~\{.+?\}\~"  'general-font-lock-green1)
-      (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~"   'general-font-lock-red2)
-      (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~"  'general-font-lock-red2)
-      (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2)
+      ;(cons "\~{.+?}\~"  'sisu-general-font-lock-green1)
+      (cons "\~{\\*\\*\\|\~{\\*\\|\~{\\|}\~"   'sisu-general-font-lock-red2)
+      (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~"  'sisu-general-font-lock-red2)
+      (cons "\~\\^ \\|^\\^\~ " 'sisu-general-font-lock-red2)
       (list
         (concat
           "\\(\*\~\\)"
           "\\([^ \r\t\n]+\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-blue2 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-blue2 t)
       )
 
       ;; emphasis (can be program configured to be bold italics or underscore)
       (list
         (concat
-          "\\([*]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[*]\\)"
+          "\\([*]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[*]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; bold ----------------
       (list
         (concat
-          "\\([!]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[!]\\)"
+          "\\([!]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[!]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
-      (cons "\\*[^ ]+\\*"               'general-font-lock-red1)
-      (cons "^!_ .+"                    'general-font-lock-red1)
+      (cons "\\*[^ ]+\\*"               'sisu-general-font-lock-red1)
+      (cons "^!_ .+"                    'sisu-general-font-lock-red1)
 
       ;; italics -------------
       (list
         (concat
-          "\\([/]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[/]\\)"
+          "\\([/]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[/]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-blue1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-blue1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; underscore ----------
       (list
         (concat
-          "\\([_]\{\\)"
-          "\\([^\}]+\\)"
+          "\\([_]{\\)"
+          "\\([^}]+\\)"
           "\\(\}[_]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; monospace -----------
       (list
         (concat
-          "\\([#]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[#]\\)"
+          "\\([#]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[#]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; citation ------------
       (list
         (concat
-          "\\([\"]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[\"]\\)"
+          "\\([\"]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[\"]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; inserted text -------
       (list
         (concat
-          "\\([\+]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[\+]\\)"
+          "\\([\+]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[\+]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; strike through ------
       (list
         (concat
-          "\\(\\-\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}\\-\\)"
+          "\\(\\-{\\)"
+          "\\([^}]+\\)"
+          "\\(}\\-\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; superscript ---------
       (list
         (concat
-          "\\(\\^\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}\\^\\)"
+          "\\(\\^{\\)"
+          "\\([^}]+\\)"
+          "\\(}\\^\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; subscript -----------
       (list
         (concat
-          "\\([,]\{\\)"
-          "\\([^\}]+\\)"
-          "\\(\}[,]\\)"
+          "\\([,]{\\)"
+          "\\([^}]+\\)"
+          "\\(}[,]\\)"
         )
-        '(1 general-font-lock-red1 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-red1 t)
+        '(1 sisu-general-font-lock-red1 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-red1 t)
       )
 
       ;; numbered list
-      (cons "^# \\|^_# "                'general-font-lock-red1)
+      (cons "^# \\|^_# "                'sisu-general-font-lock-red1)
 
       ;; bullet text
-      (cons "^_\\*[1-9] \\|^_\\* "      'general-font-lock-red1)
+      (cons "^_\\*[1-9] \\|^_\\* "      'sisu-general-font-lock-red1)
 
       ;; indented text
-      (cons "^_[1-9] "                  'general-font-lock-red1)
-      (cons "^_[1-9]! "                 'general-font-lock-red1)
+      (cons "^_[1-9] "                  'sisu-general-font-lock-red1)
+      (cons "^_[1-9]! "                 'sisu-general-font-lock-red1)
 
       ;; hanging indented text [proposed enable when implemented]
-      (cons "^__[1-9] "                'general-font-lock-red1)
-      (cons "^_[0-9]_[0-9] "           'general-font-lock-red1)
-      (cons "^__[1-9]! "               'general-font-lock-red1)
-      (cons "^_[0-9]_[0-9]! "          'general-font-lock-red1)
+      (cons "^__[1-9] "                'sisu-general-font-lock-red1)
+      (cons "^_[0-9]_[0-9] "           'sisu-general-font-lock-red1)
+      (cons "^__[1-9]! "               'sisu-general-font-lock-red1)
+      (cons "^_[0-9]_[0-9]! "          'sisu-general-font-lock-red1)
 
       ;; url
-      (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2)
+      (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'sisu-general-font-lock-blue2)
 
       ;; Comment Lines
-      (cons "^% .*"                     'general-font-lock-blue1)
+      (cons "^% .*"                     'sisu-general-font-lock-blue1)
 
       ;; page break
-      (cons "^\\(-\\\\\\\\-\\|=\\\\\\\\=\\|-\\.\\.-\\)" 'general-font-lock-red2)
+      (cons "^\\(-\\\\\\\\-\\|=\\\\\\\\=\\|-\\.\\.-\\)" 'sisu-general-font-lock-red2)
 
       ;; line break
-      (cons " \\\\\\\\ "                'general-font-lock-red1)
+      (cons " \\\\\\\\ "                'sisu-general-font-lock-red1)
 
       ;; line break (depreciated)
-      (cons "<br>"                      'general-font-lock-red1)
+      (cons "<br>"                      'sisu-general-font-lock-red1)
 
       ;; Section titles
       (list "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\)\\(.*\\)"
@@ -365,45 +361,45 @@
       ;; hyper-links
       (list
         (concat
-          "\\(\{~^\\|\{\\)"
-          "\\([^\}\{]+\\)"
-          "\\(\}http:[/][/][^ \r\n\t<]+\\)"
+          "\\({~^\\|{\\)"
+          "\\([^}{]+\\)"
+          "\\(}http:[/][/][^ \r\n\t<]+\\)"
         )
-        '(1 general-font-lock-blue2 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-blue2 t)
+        '(1 sisu-general-font-lock-blue2 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-blue2 t)
       )
 
       ;; book index
       (list
         (concat
-          "^\\(\=\{\\)"
-          "\\([^\}\{]+\\)"
+          "^\\(\={\\)"
+          "\\([^}{]+\\)"
           "\\(}\\)$"
         )
-        '(1 general-font-lock-green1 t)
+        '(1 sisu-general-font-lock-green1 t)
         '(2 nil t)
-        '(3 general-font-lock-green1 t)
+        '(3 sisu-general-font-lock-green1 t)
       )
 
-      ;(cons "^\=\{.+\}"                 'general-font-lock-green1)
+      ;(cons "^\={.+}"                 'sisu-general-font-lock-green1)
 
       ;; numbers
-      (cons "\\<[.0-9]+\\>"             'general-font-lock-green2)
+      (cons "\\<[.0-9]+\\>"             'sisu-general-font-lock-green2)
 
       ;; bullets sisu_normal (nearly copied regexp)
-      (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2)
+      (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'sisu-general-font-lock-blue2)
 
       ;; image links
       (list
         (concat
-          "\\(\{\\)"
-          "\\([^\}\{]+\\)"
-          "\\(\}image\\)"
+          "\\({\\)"
+          "\\([^}{]+\\)"
+          "\\(}image\\)"
         )
-        '(1 general-font-lock-blue2 t)
-        '(2 general-font-lock-red1 t)
-        '(3 general-font-lock-blue2 t)
+        '(1 sisu-general-font-lock-blue2 t)
+        '(2 sisu-general-font-lock-red1 t)
+        '(3 sisu-general-font-lock-blue2 t)
       )
 
       ;; insert file links
@@ -413,9 +409,9 @@
           "\\([^ \r\t\n]+\\.ss\\)"
           "\\(i\\|t\\)"
         )
-        '(1 general-font-lock-blue2 t)
-        '(2 general-font-lock-blue2 t)
-        '(3 general-font-lock-blue2 t)
+        '(1 sisu-general-font-lock-blue2 t)
+        '(2 sisu-general-font-lock-blue2 t)
+        '(3 sisu-general-font-lock-blue2 t)
       )
 
       ;; raw keywords
@@ -443,34 +439,23 @@
   "Default expressions to highlight in AsciiSisu mode."
 )
 
-;; enables outlining for sisu
-(add-hook 'sisu-mode-hook
-       '(lambda ()
-         (outline-minor-mode)))
-
-;;; outline mode "folding" if available
-;;; TODO make sure linum (line numbering) is off, else performance penalty, sucks bigtime
-;(define-key evil-normal-state-map (kbd ",0") (lambda() (interactive) (show-all)))
-;(define-key evil-normal-state-map (kbd ",-") (lambda() (interactive) (hide-body)))
-;(define-key evil-normal-state-map (kbd ",+") (lambda() (interactive) (show-subtree)))
-;(define-key evil-normal-state-map (kbd ",=") (lambda() (interactive) (show-subtree)))
-;
-;;(define-key evil-normal-state-map ",0"   'show-all)
-;;(define-key evil-normal-state-map ",-"   'hide-body)
-;;(define-key evil-normal-state-map ",+"   'show-subtree)
-;;(define-key evil-normal-state-map ",="   'show-subtree)
-
-;; C-c @ C-a show all
-;; C-c @ C-t show only the headings
-;; C-c @ C-s show subtree at cursor location
-;; C-c @ C-d hide subtree at cursor location
-
-;; Sisu & Autoload:
+;; outline mode evil "folding" if available
+;; (define-key evil-normal-state-map ",0"   'show-all)
+;; (define-key evil-normal-state-map ",-"   'hide-body)
+;; (define-key evil-normal-state-map ",+"   'show-subtree)
+;; (define-key evil-normal-state-map ",="   'show-subtree)
+
+;;}}}
+
+;;{{{ Sisu & Autoload:
+
+;;;###autoload
 (define-derived-mode sisu-mode text-mode "SiSU"
-  "Major mode for editing SiSU files."
-  (interactive)
+  "Major mode for editing SiSU files.
+SiSU document structuring, publishing in multiple formats and search.
+URL `http://www.sisudoc.org/'"
   (modify-syntax-entry ?\'  ".")
-  ;(flyspell-mode nil)
+  ;;(flyspell-mode nil)
 
   (make-local-variable 'paragraph-start)
   (setq paragraph-start (concat "$\\|>" page-delimiter))
@@ -480,43 +465,27 @@
   (setq paragraph-ignore-fill-prefix t)
 
   (set (make-local-variable 'outline-regexp)
-    "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\|\\@[a-z]+:\\( \\|$\\)\\)")
+       "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\|\\@[a-z]+:\\( \\|$\\)\\)")
 
   (make-local-variable 'require-final-newline)
   (setq require-final-newline t)
 
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults
-  '(sisu-font-lock-keywords
-    nil        ; KEYWORDS-ONLY: no
-    nil        ; CASE-FOLD: no
-    ((?_ . "w"))      ; SYNTAX-ALIST
-    ))
-  (run-hooks 'sisu-mode-hook))
+        '(sisu-font-lock-keywords
+          nil                           ; KEYWORDS-ONLY: no
+          nil                           ; CASE-FOLD: no
+          ((?_ . "w"))                  ; SYNTAX-ALIST
+          ))
+  ;; Enable outlining.
+  ;; TODO with outlining make sure linum (line numbering) is off,
+  ;; else performance penalty, sucks bigtime
+  (outline-minor-mode 1))
+
+;;;###autoload (add-to-list 'auto-mode-alist '("\\.ss[imt]\\'" . sisu-mode))
 
-;; ##autoload
-(add-to-list 'auto-mode-alist '("\\.sst\\'" . sisu-mode))
-(add-to-list 'auto-mode-alist '("\\.ssm\\'" . sisu-mode))
-(add-to-list 'auto-mode-alist '("\\.ssi\\'" . sisu-mode))
+(provide 'sisu-mode)
 
-;;;; ChangeLog:
+;;}}}
 
-;; 2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
-;;
-;; Fix version numbers of sisu-mode, register-list, and windresize.
-;;
-;; 2011-07-08  Chong Yidong  <cyd@stupidchicken.com>
-;;
-;; sisu-mode.el: Add .sisu to auto-mode-alist using autoload cookie.
-;; Minor doc fixes.
-;;
-;; 2011-07-06  Stefan Monnier  <monnier@iro.umontreal.ca>
-;;
-;; * sisu-mode.el (sisu-mode): Autoload.
-;;
-;; 2011-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
-;;
-;; Add sisu-mode.el.  Update all.el licence.
-;;
-
-(provide 'sisu-mode)
+;;; sisu-mode.el ends here
diff --git a/data/sisu/version.yml b/data/sisu/version.yml
index 94c536cd..5d04cf82 100644
--- a/data/sisu/version.yml
+++ b/data/sisu/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 7.1.7
-:date_stamp: 2016w01/2
-:date: "2016-01-05"
+:version: 7.1.8
+:date_stamp: 2016w08/5
+:date: "2016-02-26"