From 923d361cea4639f7728ace99240f488d8ec8525e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 14 Dec 2015 11:47:51 -0500 Subject: emacs sisu-mode.el & sisu-mode-autoloads.el * sisu-mode.el, minor update and modify format to reduce diff with FSF version * sisu-mode-autoloads.el, added (see elpa 3.0.3 & Kevin Ryde recent post) --- data/doc/sisu/CHANGELOG_v7 | 5 + .../editor-syntax-etc/emacs/sisu-mode-autoloads.el | 10 ++ .../sisu/conf/editor-syntax-etc/emacs/sisu-mode.el | 168 +++++++++++++++++---- 3 files changed, 151 insertions(+), 32 deletions(-) create mode 100644 data/sisu/conf/editor-syntax-etc/emacs/sisu-mode-autoloads.el (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index cd4464e8..00a458e0 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -23,6 +23,11 @@ Reverse Chronological: * sisu_7.1.6.orig.tar.xz (Open commit window: 2015-12-14; Pre-Release)) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.6 + * emacs sisu-mode.el & sisu-mode-autoloads.el: + * sisu-mode.el, minor update and modify format to reduce diff with FSF + version + * sisu-mode-autoloads.el, added (see elpa 3.0.3 & Kevin Ryde recent post) + * sisu_7.1.5.orig.tar.xz (2015-06-02:22/2) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.5 diff --git a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode-autoloads.el b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode-autoloads.el new file mode 100644 index 00000000..81c69e54 --- /dev/null +++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode-autoloads.el @@ -0,0 +1,10 @@ +(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) +(autoload 'sisu-mode "sisu-mode" "\ +Major mode for editing SiSU markup files. +SiSU (http://www.sisudoc.org/) document structuring, publishing +and search. + +\(fn)" t nil) +(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)) 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 772a87d8..4d2641e6 100644 --- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el +++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el @@ -1,44 +1,63 @@ ;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text. -;; @Author: Ambrose Kofi Laing & Ralph Amissah -;; @Keywords: text, syntax, processes, tools -;; @Version: 4.0.8 2013-02-17 (3.0.7 2011-04-20) (2008-12-14) -;; [3.0.7 2011-04-20 Ambrose Kofi Laing & Ralph Amissah] -;; [5.7.2 2014-10-28 Ralph Amissah] -;; @URL: -;; @Copyright: Assigned to FSF 2011-04-08 (GNU EMACS) -;; @License: GPLv3 -;; @Home URL: SiSU: http://www.jus.uio.no/sisu + +;; 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] + +;; Author: Ralph Amissah & Ambrose Kofi Laing +;; Keywords: text, syntax, processes, tools +;; Version: 7.1.6 2015-12-14 Ralph Amissah, +;; 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 ;; originally looked at (based on) doc-mode, with kind permission of the author ;; Author: SUN, Tong , (c)2001-6, all right reserved ;; Version: $Date: 2006/01/19 03:13:41 $ $Revision: 1.14 $ ;; Home URL: http://xpt.sourceforge.net/ + +;; 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, or (at your option) +;; any later version. ;; -;; Distribute freely, but please include the author's info & copyright, -;; the file's version & url with the distribution. +;; 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. ;; -; Viva Software Libre! +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;; Viva Software Libre! ;; Support the free software movement! -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Commentary: -;; -;; To enter sisu-mode automatically, add (autoload 'sisu-mode "sisu-mode") -;; to your .emacs file and change the first line of your sisu file to: +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;; Commentary: + +;; SiSU (http://www.sisudoc.org/) is a document structuring and +;; publishing framework. This package provides an Emacs major mode +;; for SiSU markup. + +;; When this package is installed, files ending in ".sisu" are +;; automatically associated with sisu-mode. If a file doesn't have a +;; .sisu extension, add a first line: ;; # -*- Sisu -*- -;; if it doesn't have a .sisu extension. -;; -;; To handle .sisu files, e.g., 'filename.sisu', add something like -;; (add-to-list 'auto-mode-alist '("\\.sisu$" . sisu-mode)) -;; to your .emacs file -;; -;; The documentation for the "Structure Of The Hierarchy Text" can be found in -;; the sisustring for the sisu-mode function. -;; -;; Variables: + +;; The documentation for the "Structure Of The Hierarchy Text" can be +;; found in the sisustring for the sisu-mode function. + (defgroup sisu-faces nil "AsciiSisu highlighting" :group 'sisus) + ;; == Colors ; color n is more prominent than color n+1 + (defface sisu-title-1-face `((((class color) (background dark)) @@ -49,6 +68,7 @@ (t (:weight bold :inherit variable-pitch))) "Face for AsciiSisu titles at level 1." :group 'sisu-faces) + (defface sisu-title-2-face `((((class color) (background dark)) @@ -59,6 +79,7 @@ (t (:weight bold :inherit variable-pitch))) "Face for AsciiSisu titles at level 2." :group 'sisu-faces) + (defface sisu-title-3-face `((((class color) (background dark)) @@ -69,6 +90,7 @@ (t (:weight bold))) "Face for AsciiSisu titles at level 3." :group 'sisu-faces) + (defface sisu-title-4-face `((((class color) (background dark)) @@ -79,35 +101,46 @@ (t ())) "Face for AsciiSisu titles at level 4." :group 'sisu-faces) + (defface info-node '((((class color) (background light)) (:foreground "brown" :bold t :italic t)) (((class color) (background dark)) (:foreground "white" :bold t :italic t)) (t (:bold t :italic t))) "Face for Info node names." :group 'sisu-faces) + (defvar sisu-title-1 'sisu-title-1-face) (defvar sisu-title-2 'sisu-title-2-face) (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 general-font-lock-green1 font-lock-type-face) (defvar 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 general-font-lock-yellow1 font-lock-variable-name-face) (defvar general-font-lock-yellow2 font-lock-comment-face) + ;; == sisu-mode settings + (defvar sisu-mode-hook nil "Normal hook run when entering Sisu Text mode.") + (defvar sisu-mode-abbrev-table nil "Abbrev table in use in Sisu-mode buffers.") (define-abbrev-table 'sisu-mode-abbrev-table ()) + (defconst sisu-font-lock-keywords (eval-when-compile (list + ;;grouped text --------- (cons "^group\{\\|^\}group" 'general-font-lock-red2) (cons "^block\{\\|^\}block" 'general-font-lock-red2) @@ -116,6 +149,7 @@ (cons "^alt\{\\|^\}alt" 'general-font-lock-red2) (cons "^table\{.+\\|^\}table" 'general-font-lock-red2) (cons "^\{table[^}]+\}" 'general-font-lock-red2) + ;; footnote/endnote ---- ;(cons "\~\{.+?\}\~" 'general-font-lock-green1) (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~" 'general-font-lock-red2) @@ -129,6 +163,7 @@ '(1 general-font-lock-red1 t) '(2 general-font-lock-blue2 t) ) + ;; emphasis (can be program configured to be bold italics or underscore) (list (concat @@ -140,6 +175,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; bold ---------------- (list (concat @@ -153,6 +189,7 @@ ) (cons "\\*[^ ]+\\*" 'general-font-lock-red1) (cons "^!_ .+" 'general-font-lock-red1) + ;; italics ------------- (list (concat @@ -164,6 +201,7 @@ '(2 general-font-lock-blue1 t) '(3 general-font-lock-red1 t) ) + ;; underscore ---------- (list (concat @@ -175,6 +213,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; monospace ----------- (list (concat @@ -186,6 +225,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; citation ------------ (list (concat @@ -197,6 +237,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; inserted text ------- (list (concat @@ -208,6 +249,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; strike through ------ (list (concat @@ -219,6 +261,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; superscript --------- (list (concat @@ -230,6 +273,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; subscript ----------- (list (concat @@ -241,33 +285,44 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-red1 t) ) + ;; numbered list (cons "^# \\|^_# " 'general-font-lock-red1) + ;; bullet text (cons "^_\\*[1-9] \\|^_\\* " 'general-font-lock-red1) + ;; indented text (cons "^_[1-9] " 'general-font-lock-red1) (cons "^_[1-9]! " '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) + ;; url (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2) + ;; Comment Lines (cons "^% .*" 'general-font-lock-blue1) + ;; page break (cons "^\\(-\\\\\\\\-\\|=\\\\\\\\=\\|-\\.\\.-\\)" 'general-font-lock-red2) + ;; line break (cons " \\\\\\\\ " 'general-font-lock-red1) + ;; line break (depreciated) (cons "
" 'general-font-lock-red1) + ;; Section titles (list "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\)\\(.*\\)" '(1 sisu-title-1 t) '(3 sisu-title-2 t) ) + ;; hyper-links (list (concat @@ -279,12 +334,27 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-blue2 t) ) + ;; book index - (cons "^\=\{.+\}" 'general-font-lock-green1) + (list + (concat + "^\\(\=\{\\)" + "\\([^\}\{]+\\)" + "\\(}\\)$" + ) + '(1 general-font-lock-green1 t) + '(2 nil t) + '(3 general-font-lock-green1 t) + ) + + ;(cons "^\=\{.+\}" 'general-font-lock-green1) + ;; numbers (cons "\\<[.0-9]+\\>" 'general-font-lock-green2) + ;; bullets sisu_normal (nearly copied regexp) (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2) + ;; image links (list (concat @@ -296,6 +366,7 @@ '(2 general-font-lock-red1 t) '(3 general-font-lock-blue2 t) ) + ;; insert file links (list (concat @@ -307,6 +378,7 @@ '(2 general-font-lock-blue2 t) '(3 general-font-lock-blue2 t) ) + ;; raw keywords (list (concat @@ -331,16 +403,25 @@ ) "Default expressions to highlight in AsciiSisu mode." ) + ;; enables outlining for sisu (add-hook 'sisu-mode-hook '(lambda () (outline-minor-mode) (setq outline-regexp "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\|\\@[a-z]+:\\( \\|$\\)\\)"))) -;; outline mode "folding" if available + +;;; 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 @@ -353,14 +434,17 @@ (interactive) (modify-syntax-entry ?\' ".") ;(flyspell-mode nil) + (make-local-variable 'paragraph-start) (setq paragraph-start (concat "$\\|>" page-delimiter)) (make-local-variable 'paragraph-separate) (setq paragraph-separate paragraph-start) (make-local-variable 'paragraph-ignore-fill-prefix) (setq paragraph-ignore-fill-prefix t) + (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 @@ -368,10 +452,30 @@ nil ; CASE-FOLD: no ((?_ . "w")) ; SYNTAX-ALIST )) - (run-hooks 'sisu-mode-hook) -) + (run-hooks 'sisu-mode-hook)) + (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)) + +;;;; ChangeLog: + +;; 2011-07-12 Chong Yidong +;; +;; Fix version numbers of sisu-mode, register-list, and windresize. +;; +;; 2011-07-08 Chong Yidong +;; +;; sisu-mode.el: Add .sisu to auto-mode-alist using autoload cookie. +;; Minor doc fixes. +;; +;; 2011-07-06 Stefan Monnier +;; +;; * sisu-mode.el (sisu-mode): Autoload. +;; +;; 2011-07-04 Stefan Monnier +;; +;; Add sisu-mode.el. Update all.el licence. +;; + (provide 'sisu-mode) -;; sisu-mode.el ends here -- cgit v1.2.3