From 5744266c21d8772c0e4b2d4bf90910e891468cd1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 10 Oct 2008 23:43:02 -0400 Subject: sha256 for 0.69.3 --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index efaa7f99..75e7dcbe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,9 +11,9 @@ Reverse Chronological: %% sisu_0.69.3.orig.tar.gz (2008-10-10:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz - sisu_0.69.3.orig.tar.gz - sisu_0.69.3-1.dsc - sisu_0.69.3-1.diff.gz + 33783d161293756f33e22867de5c00d02ce8743a19c65846622a272e3c0b8cd3 1527253 sisu_0.69.3.orig.tar.gz + 8c77872852c6efedf17146394032c3281c79e15e86283abd6f906909268ea69b 1159 sisu_0.69.3-1.dsc + 3b8cd23a772e4a8d77f5f7d044e6f084c7769788a9f8974dd5b9227f23a2bd18 146916 sisu_0.69.3-1.diff.gz * minor adjustment to book index code -- cgit v1.2.3 From 33016270298bc963ab391e09f2586bb362967748 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 14 Oct 2008 12:20:01 -0400 Subject: vim syntax, header, version number updated --- CHANGELOG | 8 ++++++++ data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 75e7dcbe..ecfd6c68 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,14 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.69.4.orig.tar.gz (2008-10-14:41/2) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.4.orig.tar.gz + sisu_0.69.4.orig.tar.gz + sisu_0.69.4-1.dsc + sisu_0.69.4-1.diff.gz + + * vim syntax file, header, version number updated + %% sisu_0.69.3.orig.tar.gz (2008-10-10:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz 33783d161293756f33e22867de5c00d02ce8743a19c65846622a272e3c0b8cd3 1527253 sisu_0.69.3.orig.tar.gz diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim index 11e8a629..c7cdf2df 100644 --- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,6 @@ "SiSU Vim syntax file "SiSU Maintainer: Ralph Amissah -"SiSU Markup: SiSU (sisu-0.66.0, 2008-02-24) +"SiSU Markup: SiSU (sisu-0.69.0, 2008-09-16) "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 -- cgit v1.2.3 From c523a5134c8369cec568e69f3ed3f1dd19ed07aa Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:36:18 -0500 Subject: sisu-mode.el, emacs syntax highlighting contributed by Ambrose Kofi Laing based on work by Tong Sun (doc-mode.el) and included with his kind permission --- data/sisu/conf/editor-syntax-etc/emacs/README | 5 + .../sisu/conf/editor-syntax-etc/emacs/sisu-mode.el | 388 +++++++++++++++++++++ 2 files changed, 393 insertions(+) create mode 100644 data/sisu/conf/editor-syntax-etc/emacs/README create mode 100644 data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el diff --git a/data/sisu/conf/editor-syntax-etc/emacs/README b/data/sisu/conf/editor-syntax-etc/emacs/README new file mode 100644 index 00000000..24816c1e --- /dev/null +++ b/data/sisu/conf/editor-syntax-etc/emacs/README @@ -0,0 +1,5 @@ +put this into your .emacs file, then use the mode file: + +(load-file "~/emacs/el/sisu-mode.el") +(add-to-list 'auto-mode-alist '("\\.sst$" . 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 new file mode 100644 index 00000000..1d05a573 --- /dev/null +++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el @@ -0,0 +1,388 @@ +;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text. +;; @Author: Ambrose Kofi Laing (& Ralph Amissah) +;; @Keywords: text, processes, tools +;; @Version: 0.96.4 2008-11-02 +;; @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/ +;; +;; Distribute freely, but please include the author's info & copyright, +;; the file's version & url with the distribution. +;; +; 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: +;; # -*- 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: + +(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)) + (:foreground "brown3" :bold t :height 1.2 :inherit variable-pitch)) + (((class color) + (background light)) + (:foreground "brown3" :bold t :height 1.2 :inherit variable-pitch)) + (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)) + (:foreground "yellow4" :bold t :height 1.1 :inherit variable-pitch)) + (((class color) + (background light)) + (:foreground "yellow4" :bold t :height 1.1 :inherit variable-pitch)) + (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)) + (:foreground "sienna3" :bold t)) + (((class color) + (background light)) + (:foreground "sienna3" :bold t)) + (t (:weight bold))) + "Face for AsciiSisu titles at level 3." + :group 'sisu-faces) + +(defface sisu-title-4-face + `((((class color) + (background dark)) + (:foreground "burlywood3")) + (((class color) + (background light)) + (:foreground "burlywood3")) + (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 "^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) + + ;; footnote/endnote + ;(cons "\~\{.+?\}\~" 'general-font-lock-green1) + (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~" 'general-font-lock-red2) + (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~" 'general-font-lock-red2) + + (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2) + + (list (concat + "\\(\*\~\\)" + "\\([^ \r\t\n]+\\)") + '(1 general-font-lock-red1 t) + '(2 general-font-lock-blue2 t)) + + ;; bold + (list (concat + "\\([*]\{\\)" + "\\([^\}]+\\)" + "\\(\}[*]\\)") + '(1 general-font-lock-red1 t) + '(2 general-font-lock-red1 t) + '(3 general-font-lock-red1 t)) + + (list (concat + "\\([!]\{\\)" + "\\([^\}]+\\)" + "\\(\}[!]\\)") + '(1 general-font-lock-red1 t) + '(2 general-font-lock-red1 t) + '(3 general-font-lock-red1 t)) + (cons "\\*[^ ]+\\*" 'general-font-lock-red1) + (cons "^!_ .+" '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)) + + + ;; underscore + (list (concat + "\\([_]\{\\)" + "\\([^\}]+\\)" + "\\(\}[_]\\)") + '(1 general-font-lock-red1 t) + '(2 general-font-lock-red1 t) + '(3 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)) + + ;; inserted text + (list (concat + "\\([\+]\{\\)" + "\\([^\}]+\\)" + "\\(\}[\+]\\)") + '(1 general-font-lock-red1 t) + '(2 general-font-lock-red1 t) + '(3 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)) + + ;; superscript + (list (concat + "\\(\\^\{\\)" + "\\([^\}]+\\)" + "\\(\}\\^\\)") + '(1 general-font-lock-red1 t) + '(2 general-font-lock-red1 t) + '(3 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)) + + ;;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) + + ;;url + (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2) + +;; \\|\$ + + ;; Comment Lines + (cons "^% .*" 'general-font-lock-blue1) + ;; line break + (cons "
" 'general-font-lock-red1) + + ;; Section titles + (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)" + '(1 sisu-title-1 t) + '(3 sisu-title-2 t)) + + ;; hyper-links + (list (concat + "\\(\{~^\\|\{\\)" + "\\([^\}\{]+\\)" + "\\(\}http:[/][/][^ \r\n\t<]+\\)") + '(1 general-font-lock-blue2 t) + '(2 general-font-lock-red1 t) + '(3 general-font-lock-blue2 t)) + + ;; book index + (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 + "\\(\{\\)" + "\\([^\}\{]+\\)" + "\\(\}image\\)") + '(1 general-font-lock-blue2 t) + '(2 general-font-lock-red1 t) + '(3 general-font-lock-blue2 t)) + + ;; insert file links + (list (concat + "\\(<< \\)" + "\\([^ \r\t\n]+\\.ss\\)" + "\\(i\\|t\\)") + '(1 general-font-lock-blue2 t) + '(2 general-font-lock-blue2 t) + '(3 general-font-lock-blue2 t)) + + ;; raw keywords + (list (concat + "^\\(\\@\\(" + "title\\|" + "subtitle\\|" + "creator\\|author\\|" + "translator\\|translated_by\\|" + "illustrator\\|illustrated_by\\|" + "prepared_by\\|" + "digitized_by\\|" + "contributor\\|" + "publisher\\|" + "subject\\|" + "description\\|" + "type\\|" + "format\\|" + "source\\|" + "language\.original\\|" + "language\.document\\|" + "language\\|" + "rights\\|" + "relation\\|" + "coverage\\|" + "keywords\\|" + "comments\\|" + "papersize\\|" + "tags\\|" + "catalogue\\|" + "classify_loc\\|" + "classify_dewey\\|" + "classify_isbn\\|" + "date.created\\|" + "date.issued\\|" + "date.available\\|" + "date.modified\\|" + "date\\|" + "prefix\\|" + "suffix\\|" + "contact\\|" + "links\\|" + "structure\\|" + "toc\\|" + "level\\|" + "page\\|" + "markup\\|" + "css\\|stylesheet\\|" + "skin\\|" + "abstract\\|" + "bold\\|" + "italics\\|" + "doc_cont_idx\\|" + "doc_content_index\\|" + "\\):\\)\\(.*\\)") + '(1 sisu-title-2 keep) + '(3 sisu-title-3 keep)) + + )) + "Default expressions to highlight in AsciiSisu mode.") + +;;}}} + +;;{{{ Sisu & Autoload: + +;;###autoload +(define-derived-mode sisu-mode text-mode "SiSU" + "Major mode for editing SiSU files." + (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 + nil ; KEYWORDS-ONLY: no + nil ; CASE-FOLD: no + ((?_ . "w")) ; SYNTAX-ALIST + )) + (run-hooks 'sisu-mode-hook)) + +(provide 'sisu-mode) + +;;}}} + +;;; sisu-mode.el ends here -- cgit v1.2.3 From 27d38e541fc25a99d76fa48ab6646a5b3a8a145a Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:38:08 -0500 Subject: diakonos editor syntax highilighting, updated conf file from v0.8.6 --- .../conf/editor-syntax-etc/diakonos/diakonos.conf | 282 +++++++++++++++++---- 1 file changed, 229 insertions(+), 53 deletions(-) diff --git a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf index 025fec07..5b7a049a 100644 --- a/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf +++ b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf @@ -10,10 +10,11 @@ view.margin.x 10 view.margin.y 5 view.jump.x 10 view.jump.y 5 -view.scroll_amount 3 +view.scroll_amount 1 view.lookback 200 view.nonfilelines.visible false view.nonfilelines.character ~ +view.wrap.visual true # bol_behaviour: This specifies where the cursor should go when the # beginning-of-line key (the default is the Home key) is pressed. @@ -26,9 +27,22 @@ view.nonfilelines.character ~ # bol_behavior is a synonym for bol_behaviour. bol_behaviour alternating-first-char +# eol_behaviour: This specifies where the cursor should go when the +# end-of-line key (the default is the End key) is pressed. +# end: Always move to the right-most column of the line +# last-char: Always move to the right-most non-whitespace character +# alternating-end: As with 'end', unless the cursor is +# already there, in which case, as with 'last-char'. +# alternating-last-char: As with 'last-char', unless the cursor is +# already there, in which case, as with 'end'. +# eol_behavior is a synonym for eol_behaviour. +eol_behaviour alternating-end + # Ensures saved files end with a newline character by adding it if necessary. eof_newline false +delete_newline_on_delete_to_eol false + # Specifies whether the cursor should be at the end (false) of found text, or the # beginning (true). found_cursor_start false @@ -37,7 +51,7 @@ max_clips 30 # The maximum number of undo lines held in memory per file # Smaller files will be able to have more undo levels. -max_undo_lines 100000 +max_undo_lines 16384 convert_tabs false @@ -52,7 +66,7 @@ use_magic_file false # Use "% syntax" as placeholders # e.g. %d for decimal integers, %s for strings -status.left -- %s %s%s%s -- (%s) - +status.left -- %s %s%s%s -- (%s) --%s status.right - Buf %d of %d --- L%3d/%3d C%2d -- # The string to use to fill in the space between the left and right sides # of the status line. @@ -63,7 +77,7 @@ status.unnamed_str (unnamed file) status.read_only_str (read-only) # status.vars: any subset of: # line row num_lines col filename modified type buffer_number num_buffers selecting read_only -status.vars filename modified read_only selecting type buffer_number num_buffers row num_lines col +status.vars filename modified read_only selecting type @git_branch buffer_number num_buffers row num_lines col status.format inverse # --------------------------------------------------------------------- @@ -108,6 +122,7 @@ interaction.choice_delay 3 # $F all current buffer filepaths, space-separated # $i get a string from user input # $c temp file containing current clipboard text +# $k temp file containing current klipper (KDE clipboard) text # $s temp file containing currently selected text key left;cursorLeft @@ -122,16 +137,20 @@ key home;cursorBOL key esc O H;cursorBOL key esc [ H;cursorBOL key esc [ 1 ~ cursorBOL +key esc [ 7 ~ cursorBOL key end;cursorEOL key esc O F;cursorEOL key esc [ F;cursorEOL key esc [ 4 ~;cursorEOL +key esc [ 8 ~;cursorEOL key pageup;pageUp key pagedown;pageDown -key ctrl+a;cursorBOL +#key ctrl+a;cursorBOL key ctrl+e;cursorEOL key alt+<;cursorBOF +key esc [ 1 ; 5 H cursorBOF key alt+>;cursorEOF +key esc [ 1 ; 5 F cursorEOF key alt+,;cursorTOV key alt+.;cursorBOV key ctrl+j;cursorReturn @@ -142,18 +161,22 @@ key esc up;scrollUp key esc [ 1 ; 3 A scrollUp key esc [ 1 ; 5 A scrollUp key keycode520 scrollUp +key keycode521 scrollUp key esc down;scrollDown key esc [ 1 ; 3 B scrollDown key esc [ 1 ; 5 B scrollDown key keycode513 scrollDown +key keycode514 scrollDown key esc right;seek /(?:^|\W)(\w)|\w(\W|$)/ key esc [ 1 ; 3 C seek /\w(\W|$)|(?:^|\W)(\w)/ key esc [ 1 ; 5 C seek /\w(\W|$)|(?:^|\W)(\w)/ key keycode517 seek /\w(\W|$)|(?:^|\W)(\w)/ +key keycode518 seek /\w(\W|$)|(?:^|\W)(\w)/ key esc left;seek /\w(\W|$)|(?:^|\W)(\w)/, "up" key esc [ 1 ; 3 D seek /\w(\W|$)|(?:^|\W)(\w)/, "up" key esc [ 1 ; 5 D seek /\w(\W|$)|(?:^|\W)(\w)/, "up" key keycode515 seek /\w(\W|$)|(?:^|\W)(\w)/, "up" +key keycode516 seek /\w(\W|$)|(?:^|\W)(\w)/, "up" key ctrl+g;goToLineAsk key alt+b alt+b;toggleBookmark @@ -184,6 +207,8 @@ key ctrl+k;deleteAndStoreLine key ctrl+alt+k;deleteToEOL key esc del;collapseWhitespace key esc [ 3 ; 3 ~ collapseWhitespace +key alt+w wrap_paragraph +key alt+a columnize key enter;carriageReturn key tab;parsedIndent #key tab;indent @@ -191,10 +216,12 @@ key tab;parsedIndent key alt+i;indent key esc i;indent key esc I;unindent +key esc [ Z unindent key keycode353 unindent #key tab;insertSpaces 4 #key tab;insertTab key ctrl+t;insertTab +key alt+j joinLines key f1 help key esc O P help @@ -208,6 +235,7 @@ key esc [ 2 4 ~;openFile "~/.diakonos/diakonos.conf" key ctrl+alt+r;redraw key esc C;toggleSessionSetting 'context.visible', DO_REDRAW key ctrl+alt+d;toggleSessionSetting 'display' +key esc W;toggleSessionSetting 'view.wrap.visual', DO_REDRAW key ctrl+n;newFile key ctrl+o;openFileAsk @@ -231,12 +259,31 @@ key alt+9;switchToBufferNumber 9 key alt+0;switchToBufferNumber 10 key alt+-;switchToPreviousBuffer key alt+=;switchToNextBuffer +key ctrl+alt+b list_buffers key ctrl+space;anchorSelection #key ctrl+space;toggleSelection key ctrl+c;copySelection key ctrl+x;cutSelection key alt+u;removeSelection +key ctrl+a select_all + +# If you are using KDE, you can uncomment these lines to synchronize +# the Diakonos clipboard with the KDE clipboard +#key ctrl+c copy_selection_to_klipper +#key ctrl+x cut_selection_to_klipper +#key ctrl+v paste_from_klipper +#key ctrl+k delete_and_store_line_to_klipper +#key ctrl+alt+k delete_to_eol_to_klipper + +key ctrl+b select_block +# Select file diff in a patch +key ctrl+alt+d f select_block /^Index: /, /^(Index: |$)/, false +# Select a diff hunk in a patch +key ctrl+alt+d h select_block /^@@ /, /^(@@ |$)/, false +key esc # comment_out +key esc @ uncomment + key ctrl+alt+v;showClips key ctrl+v;paste key ctrl+y;unundo @@ -258,8 +305,10 @@ key esc [ 1 3 ~;findAgain "down" key f15;findAgain "up" key esc [ 2 8 ~ findAgain "up" key esc O 2 R;findAgain "up" -key ctrl+r;searchAndReplace +key ctrl+r searchAndReplace +key alt+r searchAndReplace CASE_SENSITIVE key ctrl+alt+u;clearMatches +key alt+c;close_code key f2 shell key esc O Q shell @@ -267,14 +316,14 @@ key esc [ 1 2 ~ shell key esc [ [ B shell key f8;execute key esc F;execute "glark '$i' $F | less" -key esc d shell "diff -U 5 -w -b $c $s" +key esc d shell "diff -U 5 -w -b $c $s", "clipboard.diff" #key esc F;shell "grep -n '$i' $F" #key esc F;execute "grep -n '$i' $F | less" -key f14 evaluate -key esc O 2 Q evaluate -esc [ 2 6 ~ evaluate -key ctrl+alt+c;shell "ruby -c $f" -key ctrl+alt+d;shell "php -l $f" +#key esc l execute "aspell check $f" +key f14 evaluate +key esc O 2 Q evaluate +key esc [ 2 6 ~ evaluate +key ctrl+alt+c shell "ruby -c $f" # To use the following: # 1) Copy to the clipboard some Ruby code which operates on stdin text and outputs to stdout. @@ -288,6 +337,7 @@ key ctrl+alt+p;pasteShellResult "cat $s | ruby $c" #key ctrl+alt+p;pasteShellResult "cat $s | awk -f $c" key alt+k printKeychain +key esc K print_mapped_function key alt+m;toggleMacroRecording key f4 playMacro key esc O S playMacro @@ -300,7 +350,10 @@ key f6;repeatLast key esc [ 1 7 ~;repeatLast key f7;operateOnEachLine key f19;operateOnString -key esc f7;operateOnLines +key esc [ 1 8 ; 2 ~ operateOnString +key esc f7 operateOnLines +key esc [ 1 8 ; 3 ~ operateOnLines +key keycode319 operateOnLines # Emacs-like keychains @@ -316,8 +369,9 @@ key esc f7;operateOnLines # # For a list of colour names, see the list of format codes in the # Language Definitions section, below. -# This colour command is only used when you want to set a different background -# colour than the terminal default. +# +# With this colour command you can set a different background colour than the +# terminal default. # # color is a synonym for colour. colour 8 white blue @@ -361,13 +415,37 @@ lang.text.indent.auto true lang.text.indent.roundup false #lang.text.indent.using_tabs true lang.text.tabsize 8 - -lang.xml.filemask \.(xml|rdl|aiml|xhtml)$ +lang.text.wrap_margin 80 + +# Diakonos help files + +lang.dhf.filemask \.dhf +lang.dhf.format.default white +lang.dhf.format.selection inverse +lang.dhf.format.found yellow inverse +lang.dhf.tokens.tags (^Tags: .+) +lang.dhf.tokens.tags.format blue +lang.dhf.tokens.title (^# .*) +lang.dhf.tokens.title.format 8 bold +lang.dhf.tokens.subtitle (^## .*) +lang.dhf.tokens.subtitle.format cyan bold +lang.dhf.tokens.subsubtitle (^### .*) +lang.dhf.tokens.subsubtitle.format cyan +lang.dhf.tokens.keys <(.+?)> +lang.dhf.tokens.keys.format white bold +lang.dhf.indent.size 2 +lang.dhf.indent.auto true +lang.dhf.indent.roundup true +lang.dhf.wrap_margin 80 + +# XML + +lang.xml.filemask \.(xml|xsl|rdl|aiml|xhtml)$ lang.xml.format.default white lang.xml.format.selection inverse lang.xml.format.found yellow inverse lang.xml.tabsize 8 -lang.xml.indent.size 4 +lang.xml.indent.size 2 lang.xml.indent.auto true lang.xml.indent.roundup true #lang.xml.indent.using_tabs true @@ -381,15 +459,19 @@ lang.xml.tokens.comments.open () lang.xml.tokens.comments.format 8 lang.xml.tokens.comments.change_to xml_comment +lang.xml.comment_string " lang.xml.tokens.template.open \[@-- lang.xml.tokens.template.close --@\] lang.xml.tokens.template.format brown lang.xml.tokens.template.change_to perl +lang.xml.closers.tag.regexp <([^/> ]*) +lang.xml.closers.tag.closer { |m| "" } lang.xml_tag.format.default white bold lang.xml_tag.format.selection inverse lang.xml_tag.format.found yellow inverse lang.xml_tag.tabsize 8 -lang.xml_tag.indent.size 4 +lang.xml_tag.indent.size 2 lang.xml_tag.indent.auto true lang.xml_tag.indent.roundup true #lang.xml_tag.indent.using_tabs true @@ -397,23 +479,25 @@ lang.xml_tag.tokens.doublequoted_strings (\".*?[^\\]\") lang.xml_tag.tokens.doublequoted_strings.format green bold lang.xml_tag.tokens.singlequoted_strings ('.*?[^\\]') lang.xml_tag.tokens.singlequoted_strings.format green bold -lang.xml_tag.tokens.symbols ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.xml_tag.tokens.symbols.format white +lang.xml_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.xml_tag.tokens.non_alphanum.format white +lang.xml_tag.tokens.namespaces ([a-zA-Z_-]+): +lang.xml_tag.tokens.namespaces.format yellow bold lang.xml_comment.format.default 8 lang.xml_comment.format.selection inverse lang.xml_comment.format.found yellow inverse lang.xml_comment.tabsize 8 -lang.xml_comment.indent.size 4 +lang.xml_comment.indent.size 2 lang.xml_comment.indent.auto true lang.xml_comment.indent.roundup true #lang.xml_comment.indent.using_tabs true -lang.html.filemask \.(r?html?|php|asp)$ +lang.html.filemask \.([rx]?html?|php|asp)$ lang.html.format.default white lang.html.format.selection inverse lang.html.format.found yellow inverse lang.html.tabsize 8 -lang.html.indent.size 4 +lang.html.indent.size 2 lang.html.indent.auto true lang.html.indent.roundup true #lang.html.indent.using_tabs true @@ -427,6 +511,14 @@ lang.html.tokens.eruby.open <% lang.html.tokens.eruby.close %> lang.html.tokens.eruby.format 9 bold lang.html.tokens.eruby.change_to ruby +lang.html.tokens.ezamar.open <\?r +lang.html.tokens.ezamar.close \?> +lang.html.tokens.ezamar.format 9 bold +lang.html.tokens.ezamar.change_to ruby +lang.html.tokens.ezamar-value.open \#\{ +lang.html.tokens.ezamar-value.close \} +lang.html.tokens.ezamar-value.format 9 bold +lang.html.tokens.ezamar-value.change_to ruby lang.html.tokens.php.open <\?(?:php)? lang.html.tokens.php.close \?> lang.html.tokens.php.format 10 bold @@ -435,6 +527,10 @@ lang.html.tokens.comments.open () lang.html.tokens.comments.format 8 lang.html.tokens.comments.change_to html_comment +lang.html.comment_string " +lang.html.closers.tag.regexp <([^/> ]*) +lang.html.closers.tag.closer { |m| "" } lang.html_tag.format.default white bold lang.html_tag.format.selection inverse lang.html_tag.format.found yellow inverse @@ -453,8 +549,8 @@ lang.html_tag.tokens.doublequoted_strings (\".*?[^\\]\") lang.html_tag.tokens.doublequoted_strings.format green bold lang.html_tag.tokens.singlequoted_strings ('.*?[^\\]') lang.html_tag.tokens.singlequoted_strings.format green bold -lang.html_tag.tokens.symbols ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.html_tag.tokens.symbols.format white +lang.html_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.html_tag.tokens.non_alphanum.format white lang.html_comment.format.default 8 lang.html_comment.format.selection inverse lang.html_comment.format.found yellow inverse @@ -478,13 +574,15 @@ lang.css.indent.roundup true lang.css.indent.indenters (\{) lang.css.indent.unindenters (\}) lang.css.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*) -lang.css.tokens.properties \b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-collapse|border-color|border-spacing|border-style|border-top|border-bottom|border-right|border-left|border-top-color|border-top-style|border-top-width|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-right|margin-top|margin-left|margin-bottom|margin|max-height|max-width|min-height|min-width|orphans|outline-color|outline-style|outline-width|outline|overflow|padding-top|padding-left|padding-right|padding-bottom|padding|page-break-after|page-break-before|page-break-inside|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|table-layout|text-align|text-decoration|text-indent|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index): +lang.css.tokens.properties \b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-collapse|border-color|border-spacing|border-style|border-top|border-bottom|border-right|border-left|border-top-color|border-top-style|border-top-width|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-right|margin-top|margin-left|margin-bottom|margin|max-height|max-width|min-height|min-width|orphans|outline-color|outline-style|outline-width|outline|overflow|padding-top|padding-left|padding-right|padding-bottom|padding|page-break-after|page-break-before|page-break-inside|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|table-layout|text-align|text-decoration|text-indent|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index)\s*: lang.css.tokens.properties.format white bold lang.css.tokens.colours #[A-Fa-f0-9]{6}|\b(?:aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b lang.css.tokens.colours.format yellow bold lang.css.tokens.long_comments.open \/\* lang.css.tokens.long_comments.close \*\/ lang.css.tokens.long_comments.format 8 bold +lang.css.comment_string /* +lang.css.comment_close_string " */" lang.css.tokens.numbers \b([0-9]+\.[0-9]+|[0-9]+) lang.css.tokens.numbers.format blue bold lang.css.tokens.units [^A-Za-z](em|pt|px)\b @@ -493,6 +591,7 @@ lang.css.tokens.html_elements.case_insensitive \b(A|ABBR|ACRONYM|ADDRES|APPLET|A lang.css.tokens.html_elements.format green lang.css.tokens.values \b(auto|block|inherit|inline|larger|none|smaller|solid)\b lang.css.tokens.values.format blue bold +lang.css.column_delimiters :|, # Ruby @@ -505,20 +604,43 @@ lang.ruby.tokens.reserved_words \b(__FILE__|and|def|end|in|or|self|unless|__LINE lang.ruby.tokens.reserved_words.format white lang.ruby.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b lang.ruby.tokens.constants.format yellow bold -lang.ruby.tokens.symbols [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~] -lang.ruby.tokens.symbols.format white -lang.ruby.tokens.class_variables (@[A-Za-z_][A-Za-z_0-9]*) -lang.ruby.tokens.class_variables.format white bold +lang.ruby.tokens.symbols [^:](:[a-zA-Z_][a-zA-Z_0-9]*) +lang.ruby.tokens.symbols.format white bold +lang.ruby.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;~] +lang.ruby.tokens.non_alphanum.format white +lang.ruby.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*) +lang.ruby.tokens.instance_variables.format white bold lang.ruby.tokens.comments (#.*) lang.ruby.tokens.comments.format 8 bold +lang.ruby.comment_string # lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/) lang.ruby.tokens.regular_expressions.format red bold +lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\}) +lang.ruby.tokens.regular_expressions2.format red bold lang.ruby.tokens.doublequoted_strings (\".*?[^\\]\"|\"\") lang.ruby.tokens.doublequoted_strings.format green bold +lang.ruby.tokens.interpolated_string.open (%Q?\{) +lang.ruby.tokens.interpolated_string.close (\}) +lang.ruby.tokens.interpolated_string.format green bold +lang.ruby.tokens.interpolated_string.change_to interpolated_ruby +lang.interpolated_ruby.format.default green bold +lang.interpolated_ruby.tokens.interpolation.open (#\{) +lang.interpolated_ruby.tokens.interpolation.close (\}) +lang.interpolated_ruby.tokens.interpolation.format 12 bold +lang.interpolated_ruby.tokens.interpolation.change_to ruby lang.ruby.tokens.singlequoted_strings ('.*?[^\\]'|'') lang.ruby.tokens.singlequoted_strings.format green bold lang.ruby.tokens.backquoted_strings (`.*?[^\\]`|``) lang.ruby.tokens.backquoted_strings.format red bold +lang.ruby.tokens.interpolated_exec_string.open (%x\{) +lang.ruby.tokens.interpolated_exec_string.close (\}) +lang.ruby.tokens.interpolated_exec_string.format red bold +lang.ruby.tokens.interpolated_exec_string.change_to interpolated_exec_ruby +lang.interpolated_exec_ruby.format.default red bold +lang.interpolated_exec_ruby.tokens.interpolation.open (#\{) +lang.interpolated_exec_ruby.tokens.interpolation.close (\}) +lang.interpolated_exec_ruby.tokens.interpolation.format 9 bold +lang.interpolated_exec_ruby.tokens.interpolation.change_to ruby lang.ruby.tokens.character_codes \W(\?\S) lang.ruby.tokens.character_codes.format magenta bold lang.ruby.tokens.long_comments.open ^=begin @@ -528,15 +650,17 @@ lang.ruby.tokens.sql_string.open (<<-EOSQL) lang.ruby.tokens.sql_string.close (EOSQL) lang.ruby.tokens.sql_string.format 1 lang.ruby.tokens.sql_string.change_to sql -lang.ruby.indent.size 4 +lang.ruby.indent.size 2 lang.ruby.indent.auto true lang.ruby.indent.roundup true #lang.ruby.indent.using_tabs true -lang.ruby.indent.indenters \b(do|def|begin|ensure|when|case|else|for|while|elsif|if|class|module|rescue)\b|([{\[(]$|\{\s*\|[\w\s,]*\|\s*$) -lang.ruby.indent.unindenters \b(end|else|when|rescue)\b|(^\s+[\]})]) +lang.ruby.tabsize 2 +lang.ruby.indent.indenters ^\s*(case|def|begin|ensure|when|else|ensure|for|while|until|elsif|if|class|module|rescue)\b|([{\[(]$|\{\s*\|[\w\s,]*\|\s*$)|\b(do)\b +lang.ruby.indent.unindenters ^\s*(end|else|elsif|ensure|when|rescue)\b|(^\s+[\]})]) lang.ruby.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(\/.+?[^\\]\/)|(^\s*#.*)|\S\s+if lang.ruby.indent.ignore ^\s*$ lang.ruby.context.ignore ^=(begin|end)$ +lang.ruby.column_delimiters =>?|:|, # PHP @@ -549,16 +673,17 @@ lang.php.tokens.doublequoted_strings (\".*?[^\\]\") lang.php.tokens.doublequoted_strings.format green bold lang.php.tokens.singlequoted_strings ('.*?[^\\]') lang.php.tokens.singlequoted_strings.format green bold -lang.php.tokens.reserved_words \b(NULL|E_ALL|__wakeup|not|endwhile|__sleep|new|endswitch|__LINE__|list|endif|__FILE__|global|endforeach|while|include_once|endfor|virtual|include|enddeclare|xor|if|empty|var|elseif|TRUE|else|this|echo|stdClass|die|switch|do|static|default|return|function|declare|require_once|foreach|continue|require|for|class|print|FALSE|cfunction|PHP_VERSION|extends|case|exit|break|PHP_OS|eval|argc|parent|E_WARNING|as|or|E_ERROR|argv|old_function|E_PARSE|and)\b +lang.php.tokens.reserved_words \b(NULL|E_ALL|__wakeup|not|endwhile|__sleep|new|endswitch|__LINE__|list|endif|__FILE__|global|endforeach|while|include_once|endfor|virtual|include|enddeclare|xor|if|empty|var|elseif|TRUE|true|else|this|echo|stdClass|die|switch|do|static|default|return|function|declare|require_once|foreach|continue|require|for|class|print|FALSE|false|cfunction|PHP_VERSION|extends|case|exit|break|PHP_OS|eval|argc|parent|E_WARNING|as|or|E_ERROR|argv|old_function|E_PARSE|and)\b lang.php.tokens.reserved_words.format white lang.php.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b lang.php.tokens.constants.format yellow bold lang.php.tokens.comments (\/\/.*) lang.php.tokens.comments.format 8 bold +lang.php.comment_string // lang.php.tokens.preprocessor (^\s*#.*) lang.php.tokens.preprocessor.format yellow bold -lang.php.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.php.tokens.symbols.format white +lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.php.tokens.non_alphanum.format white lang.php.tokens.long_comments.open \/\* lang.php.tokens.long_comments.close \*\/ lang.php.tokens.long_comments.format 8 bold @@ -589,10 +714,11 @@ lang.perl.format.selection inverse lang.perl.format.found yellow inverse lang.perl.tokens.comments (#.*) lang.perl.tokens.comments.format 8 bold +lang.perl.comment_string # lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b lang.perl.tokens.constants.format yellow bold -lang.perl.tokens.symbols [!#^&*()\[\]{}/?=+\-\\|,<.>;:~] -lang.perl.tokens.symbols.format white +lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~] +lang.perl.tokens.non_alphanum.format white lang.perl.tokens.regular_expressions (\/.+?[^\\]\/) lang.perl.tokens.regular_expressions.format red bold lang.perl.tokens.doublequoted_strings (\".*?[^\\]\") @@ -620,6 +746,7 @@ lang.perl.indent.unindenters (case|^\s+[\]})]) lang.perl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(\/.+?[^\\]\/)|(^\s*#.*) lang.perl.indent.ignore ^\s*$ lang.perl.context.ignore ^(.+:|\s*\{?)$ +lang.perl.column_delimiters =>?|:|, # Python @@ -630,10 +757,11 @@ lang.python.format.selection inverse lang.python.format.found yellow inverse lang.python.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b lang.python.tokens.constants.format yellow bold -lang.python.tokens.symbols [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~] -lang.python.tokens.symbols.format white +lang.python.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~] +lang.python.tokens.non_alphanum.format white lang.python.tokens.comments (#.*) lang.python.tokens.comments.format 8 bold +lang.python.comment_string # lang.python.tokens.doublequoted_strings (\".*?[^\\]\") lang.python.tokens.doublequoted_strings.format green bold lang.python.tokens.singlequoted_strings ('.*?[^\\]') @@ -654,7 +782,7 @@ lang.python.indent.ignore ^\s*$ # Java -lang.java.filemask \.java$ +lang.java.filemask \.(?:java|js)$ lang.java.format.default white bold lang.java.format.selection inverse lang.java.format.found yellow inverse @@ -668,11 +796,14 @@ lang.java.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b lang.java.tokens.constants.format yellow bold lang.java.tokens.comments (\/\/.*) lang.java.tokens.comments.format 8 bold -lang.java.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.java.tokens.symbols.format white +lang.java.comment_string // +lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.java.tokens.non_alphanum.format white lang.java.tokens.long_comments.open \/\* lang.java.tokens.long_comments.close \*\/ lang.java.tokens.long_comments.format 8 bold +lang.java.tokens.regular_expressions (\/.+?[^\\]\/) +lang.java.tokens.regular_expressions.format red bold lang.java.indent.size 4 lang.java.indent.auto true lang.java.indent.roundup false @@ -682,6 +813,9 @@ lang.java.indent.unindenters (\}) lang.java.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*) lang.java.indent.ignore ^(.+:|\s*?)$ lang.java.context.ignore ^(.+:|\s*\{?)$ +lang.java.closers.for.regexp for$ +lang.java.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" } +lang.java.column_delimiters =|:|, # C @@ -699,10 +833,11 @@ lang.c.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b lang.c.tokens.constants.format yellow bold lang.c.tokens.comments (\/\/.*) lang.c.tokens.comments.format 8 bold +lang.c.comment_string // lang.c.tokens.preprocessor (^\s*#.*) lang.c.tokens.preprocessor.format yellow bold -lang.c.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.c.tokens.symbols.format white +lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.c.tokens.non_alphanum.format white lang.c.tokens.long_comments.open \/\* lang.c.tokens.long_comments.close \*\/ lang.c.tokens.long_comments.format 8 bold @@ -726,6 +861,7 @@ lang.conf.tokens.commands ^\s*([^\s=]+) lang.conf.tokens.commands.format cyan bold lang.conf.tokens.comments (^\s*#.*) lang.conf.tokens.comments.format yellow bold +lang.conf.comment_string # lang.conf.tokens.doublequoted_strings (\".*?[^\\]\") lang.conf.tokens.doublequoted_strings.format green bold lang.conf.tokens.singlequoted_strings ('.*?[^\\]') @@ -743,6 +879,7 @@ lang.crontab.format.selection inverse lang.crontab.format.found yellow inverse lang.crontab.tokens.comments (^\s*#.*) lang.crontab.tokens.comments.format yellow bold +lang.crontab.comment_string # lang.crontab.tokens.schedule ^((?:[0-9\/*,-]+\s+){5}) lang.crontab.tokens.schedule.format cyan bold lang.crontab.tokens.commands ^(\S+=.+) @@ -758,6 +895,7 @@ lang.fstab.format.selection inverse lang.fstab.format.found yellow inverse lang.fstab.tokens.comments (^\s*#.*) lang.fstab.tokens.comments.format yellow bold +lang.fstab.comment_string # lang.fstab.indent.size 4 lang.fstab.indent.auto true lang.fstab.indent.roundup true @@ -773,7 +911,8 @@ lang.sql.indent.size 4 lang.sql.indent.auto true lang.sql.indent.roundup true #lang.sql.indent.using_tabs true -lang.sql.tokens.reserved_words.case_insensitive \b(ABSOLUTE|ACCESS|ACTION|ADD|ADMIN|AFTER|ALIAS|ALL|ALLOCATE|AND|ANY|ARE|AS|ASC|ASSERTION|AT|AUDIT|AUTHORIZATION|AVG|BEFORE|BEGIN|BETWEEN|BIT_LENGTH|BOTH|BREADTH|BY|CASCADE|CASCADED|CASE|CAST|CATALOG|CHAR_LENGTH|CHARACTER_LENGTH|CHECK|CLASS|CLOSE|CLUSTER|COALESCE|COBOL|COLLATE|COLLATION|COLUMN|COMPLETION|COMPRESS|COMPUTED|CONCAT|CONNECT|CONNECTION|CONSTRAINT|CONSTRAINTS|CONSTRUCTOR|CONTINUE|CONVERT|CORRESPONDING|COUNT|CROSS|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT|CURSOR|CYCLE|DATA|DAY|DBHIGH|DBKEY|DBLOW|DBMAC|DEALLOCATE|DECLARE|DECODE|DEFAULT|DEFERRABLE|DEFERRED|DEPTH|DEREF|DESC|DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DIAGNOSTICS|DICTIONARY|DISCONNECT|DISTINCT|DO|DOMAIN|EACH|ELEMENT|ELSE|ELSEIF|END-EXEC|END|EQUALS|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXISTS|EXTERNAL|EXTERNALLY|EXTRACT|FALSE|FILE|FIRST|FOR|FOREIGN|FORTRAN|FOUND|FROM|FULL|FUNCTION|GENERAL|GET|GLOBAL|GO|GOTO|GROUP|HAVING|HOUR|IDENTIFIED|IDENTITY|IF|IGNORE|IMMEDIATE|IN|INCREMENT|INDEX|INDICATOR|INITIAL|INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSTEAD|INTERSECT|INTERVAL|INTO|IS|ISOLATION|JOIN|KEY|LABEL|LANGUAGE|LAST|LEADING|LEAVE|LEFT|LESS|LEVEL|LIKE|LIMIT|LOCAL|LOCK|LOOP|LOWER|MATCH|MAX|MAXEXTENTS|MIN|MINUS|MINUTE|MLSLABEL|MLS_LABEL_FORMAT|MODE|MODIFY|MODULE|MONTH|MOVE|MULTISET|NAMES|NATIONAL|NATURAL|NEW_TABLE|NEXT|NO|NOAUDIT|NOCOMPRESS|NONE|NOT|NOWAIT|NULL|NULLIF|NUMBER|NVL|OCTET_LENGTH|OF|OFF|OFFLINE|OID|OLD|OLD_TABLE|ON|ONLINE|ONLY|OPEN|OPERATION|OPERATORS|OPTION|OR|ORDER|OTHERS|OUT|OUTER|OUTPUT|OVERLAPS|PAD|PARAMETER|PARTIAL|PASCAL|PCTFREE|PENDANT|PLI|POSITION|PRECISION|PREORDER|PRESERVE|PRIMARY|PRIOR|PRIVATE|PRIVILEGES|PROCEDURE|PROTECTED|PUBLIC|RAW|READ|READUP|REAL|RECORD|RECURSIVE|REF|REFERENCES|REFERENCING|RELATIVE|RENAME|REPLACE|REPRESENTATION|RESIGNAL|RESOURCE|RESTRICT|RETURN|RETURNS|RIGHT|ROLE|ROUTINE|ROW|ROWID|ROWNUM|ROWS|SAVEPOINT|SCHEMA|SCROLL|SEARCH|SECOND|SECTION|SENSITIVE|SEQUENCE|SESSION|SESSION_USER|SET|SHARE|SIGNAL|SIMILAR|SIZE|SOME|SPACE|SPECIFIC|SQL|SQLCODE|SQLERROR|SQLEXCEPTION|SQLSTATE|SQLWARNING|START|STRUCTURE|SUBSTRING|SUCCESSFUL|SUM|SYNONYM|SYSDATE|SYSTEM_USER|TABLE|TEMPLATE|TEMPORARY|TEST|THAN|THEN|THERE|SQ92|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TRAILING|TRANSACTION|TRANSLATE|TRANSLATION|TRIGGER|TRIM|TRUE|TUPLE|TYPE|UID|UNDER|UNION|UNIQUE|UNKNOWN|UPPER|USAGE|USER|USING|VALIDATE|VALUE|VALUES|VARIABLE|VARIANT|VIRTUAL|VARYING|VIEW|VISIBLE|VOID|WAIT|WHEN|WHENEVER|WHERE|WHILE|WITH|WITHOUT|WORK|WRITE|WRITEDOWN|WRITEUP|YEAR|ZONE)\b +#lang.sql.tokens.reserved_words.case_insensitive \b(ABSOLUTE|ACCESS|ACTION|ADD|ADMIN|AFTER|ALIAS|ALL|ALLOCATE|AND|ANY|ARE|AS|ASC|ASSERTION|AT|AUDIT|AUTHORIZATION|AVG|BEFORE|BEGIN|BETWEEN|BIT_LENGTH|BOTH|BREADTH|BY|CASCADE|CASCADED|CASE|CAST|CATALOG|CHAR_LENGTH|CHARACTER_LENGTH|CHECK|CLASS|CLOSE|CLUSTER|COALESCE|COBOL|COLLATE|COLLATION|COLUMN|COMPLETION|COMPRESS|COMPUTED|CONCAT|CONNECT|CONNECTION|CONSTRAINT|CONSTRAINTS|CONSTRUCTOR|CONTINUE|CONVERT|CORRESPONDING|COUNT|CROSS|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT|CURSOR|CYCLE|DATA|DAY|DBHIGH|DBKEY|DBLOW|DBMAC|DEALLOCATE|DECLARE|DECODE|DEFAULT|DEFERRABLE|DEFERRED|DEPTH|DEREF|DESC|DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DIAGNOSTICS|DICTIONARY|DISCONNECT|DISTINCT|DO|DOMAIN|EACH|ELEMENT|ELSE|ELSEIF|END-EXEC|END|EQUALS|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXISTS|EXTERNAL|EXTERNALLY|EXTRACT|FALSE|FILE|FIRST|FOR|FOREIGN|FORTRAN|FOUND|FROM|FULL|FUNCTION|GENERAL|GET|GLOBAL|GO|GOTO|GROUP|HAVING|HOUR|IDENTIFIED|IDENTITY|IF|IGNORE|IMMEDIATE|IN|INCREMENT|INDEX|INDICATOR|INITIAL|INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSTEAD|INTERSECT|INTERVAL|INTO|IS|ISOLATION|JOIN|KEY|LABEL|LANGUAGE|LAST|LEADING|LEAVE|LEFT|LESS|LEVEL|LIKE|LIMIT|LOCAL|LOCK|LOOP|LOWER|MATCH|MAX|MAXEXTENTS|MIN|MINUS|MINUTE|MLSLABEL|MLS_LABEL_FORMAT|MODE|MODIFY|MODULE|MONTH|MOVE|MULTISET|NAMES|NATIONAL|NATURAL|NEW_TABLE|NEXT|NO|NOAUDIT|NOCOMPRESS|NONE|NOT|NOWAIT|NULL|NULLIF|NUMBER|NVL|OCTET_LENGTH|OF|OFF|OFFLINE|OID|OLD|OLD_TABLE|ON|ONLINE|ONLY|OPEN|OPERATION|OPERATORS|OPTION|OR|ORDER|OTHERS|OUT|OUTER|OUTPUT|OVERLAPS|PAD|PARAMETER|PARTIAL|PASCAL|PCTFREE|PENDANT|PLI|POSITION|PRECISION|PREORDER|PRESERVE|PRIMARY|PRIOR|PRIVATE|PRIVILEGES|PROCEDURE|PROTECTED|PUBLIC|RAW|READ|READUP|REAL|RECORD|RECURSIVE|REF|REFERENCES|REFERENCING|RELATIVE|RENAME|REPLACE|REPRESENTATION|RESIGNAL|RESOURCE|RESTRICT|RETURN|RETURNS|RIGHT|ROLE|ROUTINE|ROW|ROWID|ROWNUM|ROWS|SAVEPOINT|SCHEMA|SCROLL|SEARCH|SECOND|SECTION|SENSITIVE|SEQUENCE|SESSION|SESSION_USER|SET|SHARE|SIGNAL|SIMILAR|SIZE|SOME|SPACE|SPECIFIC|SQL|SQLCODE|SQLERROR|SQLEXCEPTION|SQLSTATE|SQLWARNING|START|STRUCTURE|SUBSTRING|SUCCESSFUL|SUM|SYNONYM|SYSDATE|SYSTEM_USER|TABLE|TEMPLATE|TEMPORARY|TEST|THAN|THEN|THERE|SQ92|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TRAILING|TRANSACTION|TRANSLATE|TRANSLATION|TRIGGER|TRIM|TRUE|TUPLE|TYPE|UID|UNDER|UNION|UNIQUE|UNKNOWN|UPPER|USAGE|USER|USING|VALIDATE|VALUE|VALUES|VARIABLE|VARIANT|VIRTUAL|VARYING|VIEW|VISIBLE|VOID|WAIT|WHEN|WHENEVER|WHERE|WHILE|WITH|WITHOUT|WORK|WRITE|WRITEDOWN|WRITEUP|YEAR|ZONE)\b +lang.sql.tokens.reserved_words.case_insensitive \b(ALL|AND|ANY|AS|ASC|BEGIN|BY|CASCADE|CASE|CAST|CHECK|COALESCE|COLUMN|CONSTRAINT|COUNT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURSOR|DECLARE|DEFAULT|DESC|DISTINCT|DO|ELSE|ELSEIF|END|EXCEPT|EXISTS|FALSE|FIRST|FOR|FOREIGN|FOUND|FROM|FULL|FUNCTION|GROUP|HAVING|HOUR|IF|IN|INCREMENT|INDEX|INNER|INPUT|INSTEAD|INTERSECT|INTERVAL|INTO|IS|JOIN|KEY|LANGUAGE|LAST|LEFT|LIKE|LIMIT|LOOP|MAX|MIN|NATURAL|NEXT|NO|NONE|NOT|NULL|NUMBER|OF|OFF|OLD|ON|ONLY|OR|ORDER|OUT|OUTER|PARTIAL|PRECISION|PRIMARY|REAL|RECORD|REF|REFERENCES|REPLACE|RESTRICT|RETURN|RETURNS|RIGHT|SCHEMA|SEQUENCE|SET|SUM|TABLE|TEMPORARY|THAN|THEN|TO|TRANSACTION|TRIGGER|TRUE|TYPE|UNION|UNIQUE|UPPER|USING|VALUE|VALUES|VARYING|VIEW|WHEN|WHERE|WHILE|WITH|WITHOUT|WORK)\b lang.sql.tokens.reserved_words.format white lang.sql.tokens.commands.case_insensitive \b(ALTER|COMMENT|COMMIT|CREATE|DELETE|DROP|EXEC|EXECUTE|FETCH|GRANT|INSERT|PERFORM|PREPARE|REVOKE|ROLLBACK|SELECT|UPDATE)\b lang.sql.tokens.commands.format cyan @@ -781,10 +920,11 @@ lang.sql.tokens.data_types.case_insensitive \b(BIT|BOOLEAN|CHAR|CHARACTER|DATE|D lang.sql.tokens.data_types.format brown lang.sql.tokens.comments (--.*) lang.sql.tokens.comments.format 8 bold +lang.sql.comment_string -- lang.sql.tokens.singlequoted_strings ('.*?[^\\]') lang.sql.tokens.singlequoted_strings.format green bold -lang.sql.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.sql.tokens.symbols.format white +lang.sql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.sql.tokens.non_alphanum.format white lang.sql.tokens.typos (==) lang.sql.tokens.typos.format 15 bold lang.sql.indent.indenters ((?:\(|BEGIN|DECLARE|FROM|LOOP|ORDER BY|SELECT|SET|WHERE)$) @@ -806,6 +946,7 @@ lang.bash.indent.roundup true lang.bash.tabsize 4 lang.bash.tokens.comments (^\s*#.*) lang.bash.tokens.comments.format 8 bold +lang.bash.comment_string # lang.bash.tokens.singlequoted_strings ('.*?[^\\]') lang.bash.tokens.singlequoted_strings.format green bold lang.bash.tokens.doublequoted_strings (\".*?[^\\]\") @@ -831,10 +972,11 @@ lang.tcl.indent.roundup true lang.tcl.tabsize 4 lang.tcl.tokens.comments (^\s*#.*) lang.tcl.tokens.comments.format 8 bold +lang.tcl.comment_string # lang.tcl.tokens.reserved_words \b(encoding|incr|pid|tcl_endOfWord|Tcl|eof|info|tcl_findLibrary|after|error|interp|pkg_mkIndex|tcl_startOfNextWord|append|eval|join|proc|tcl_startOfPreviousWord|array|exec|lappend|puts|tcl_wordBreakAfter|auto_execok|exit|lassign|pwd|tcl_wordBreakBefore|auto_import|expr|lindex|re_syntax|tcltest|auto_load|fblocked|linsert|read|tclvars|auto_mkindex|fconfigure|list|regexp|tell|auto_mkindex_old|fcopy|llength|registry|time|auto_qualify|file|load|regsub|trace|auto_reset|fileevent|lrange|rename|unknown|bgerror|filename|lrepeat|resource|unload|binary|flush|lreplace|return|unset|break|for|lsearch|scan|update|catch|foreach|lset|seek|uplevel|cd|format|lsort|set|upvar|clock|gets|memory|socket|variable|close|glob|msgcat|source|vwait|concat|global|namespace|split|while|continue|history|open|string|dde|http|package|subst|dict|if|parray|switch)\b lang.tcl.tokens.reserved_words.format white -lang.tcl.tokens.symbols ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) -lang.tcl.tokens.symbols.format white +lang.tcl.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:]) +lang.tcl.tokens.non_alphanum.format white lang.tcl.tokens.variables (\$[A-Za-z_][A-Za-z_0-9]*)\b lang.tcl.tokens.variables.format yellow bold lang.tcl.tokens.doublequoted_strings (\".*?[^\\]\") @@ -843,7 +985,7 @@ lang.tcl.indent.indenters (\{) lang.tcl.indent.unindenters (\}) lang.tcl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*) -lang.diff.filemask (?:\.(?:diff|patch))$ +lang.diff.filemask (?:\.(?:diff|patch)|COMMIT_EDITMSG)$ lang.diff.format.default white lang.diff.format.selection inverse lang.diff.format.found yellow inverse @@ -903,6 +1045,7 @@ lang.yaml.tokens.directive_indicator ^(%.*) lang.yaml.tokens.directive_indicator.format 10 lang.yaml.tokens.comment_indicator (#.+) lang.yaml.tokens.comment_indicator.format 8 bold +lang.yaml.comment_string # lang.yaml.tokens.anchor_indicator (&\w+) lang.yaml.tokens.anchor_indicator.format red bold lang.yaml.tokens.alias_indicator (\*\w+) @@ -918,6 +1061,36 @@ lang.yaml.indent.indenters :$ lang.yaml.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(^\s*#.*) lang.yaml.indent.ignore ^\s*$ +lang.haml.filemask \.haml$ +lang.haml.format.default white bold +lang.haml.format.selection inverse +lang.haml.format.found yellow inverse +lang.haml.tabsize 8 +lang.haml.indent.size 2 +lang.haml.indent.auto true +lang.haml.indent.roundup true +lang.haml.indent.using_tabs false +lang.haml.tokens.code.open [=~-] +lang.haml.tokens.code.close $ +lang.haml.tokens.code.format 9 bold +lang.haml.tokens.code.change_to ruby +lang.haml.tokens.tags (%\w+\b) +lang.haml.tokens.tags.format white +lang.haml.tokens.hash.open [{\[] +lang.haml.tokens.hash.close [}\]] +lang.haml.tokens.hash.format blue bold +lang.haml.tokens.hash.change_to ruby +lang.haml.tokens.class \.\w+ +lang.haml.tokens.class.format cyan bold +lang.haml.tokens.id #\w+ +lang.haml.tokens.id.format cyan +lang.haml.tokens.xml !!! +lang.haml.tokens.xml.format magenta bold +lang.haml.tokens.html_comment ^ *(\/.*) +lang.haml.tokens.html_comment.format 8 bold +lang.haml.tokens.line_joiner \|$ +lang.haml.tokens.line_joiner.format 12 bold + #% SiSU lang.sisu.filemask \.(?:sst|ssm|ssi|[_-]sst)$ lang.sisu.format.default white @@ -980,4 +1153,7 @@ lang.sisu.tokens.error.format magenta reverse # If a setting is specified again, it overrides the previous setting given # higher up in the configuration file(s). -include ~/.diakonos/cucumber.conf +include ~/.diakonos/pistos.conf + +# Uncomment this line if your terminal supports 256 colours. +#include ~/.diakonos/diakonos-256-colour.conf -- cgit v1.2.3 From 454d3b84c24518f7eb11ea799590df901be5fd58 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:42:16 -0500 Subject: =?UTF-8?q?software=20libr=C3=A9,=20accent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/sisu/v0/cgi_sql_common.rb | 2 +- lib/sisu/v0/defaults.rb | 2 +- lib/sisu/v0/texpdf_format.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb index fb011cc0..d0b18317 100644 --- a/lib/sisu/v0/cgi_sql_common.rb +++ b/lib/sisu/v0/cgi_sql_common.rb @@ -598,7 +598,7 @@ module SiSU_CGI_sql with the usual GPL (or OSS) suspects.
Better - "performance, reliability, scalability, security & total cost of ownership" - [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libre. + [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libré.
Get With the Future diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb index a3e1b16d..1d1baef6 100644 --- a/lib/sisu/v0/defaults.rb +++ b/lib/sisu/v0/defaults.rb @@ -1592,7 +1592,7 @@ WOK with the usual GPL (or OSS) suspects.
Better - "performance, reliability, scalability, security & total cost of ownership" - [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libre. + [not to mention flexibility & choice] use of and adherence to open standards (where practical and fair) and it is software libré.
Get With the Future diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb index 5c2b7ec5..6e2d0e22 100644 --- a/lib/sisu/v0/texpdf_format.rb +++ b/lib/sisu/v0/texpdf_format.rb @@ -1506,7 +1506,7 @@ WOK \\subsection*{Information on this document copy and an unofficial List of Some web related information and sources} \\addcontentsline{toc}{section}{Information on this document copy and an unofficial List of Some web related information and sources} \\\\ -\"Support Open Standards and Software Libre for the Information Technology Infrastructure\" RA\\subsubsection*{Information on this document copy #{site}} +\"Support Open Standards and Software Libré for the Information Technology Infrastructure\" RA\\subsubsection*{Information on this document copy #{site}} \\addcontentsline{toc}{subsection}{Information on this document copy} {\\begin{footnotesize} \\\\ Generated by \\href{http://www.jus.uio.no/sisu/}{SiSU} found at \\href{http://www.jus.uio.no/sisu/}{www.jus.uio.no/sisu} \\begin{tiny}[ #{v[:project]} #{v[:version]} #{v[:date_stamp]} ]\\end{tiny} \\href{http://www.sisudoc.org}{www.sisudoc.org}. SiSU is software for document structuring, publishing and search (using SiSU: object citation numbering, markup, meta-markup, and system) Copyright #@copymark 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved. -- cgit v1.2.3 From 9458eedd5d4c5b5ece6c258e96d4c37f3cf0cb7b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:44:24 -0500 Subject: dal and param various changes (some affecting other files) dal, minor changes including related to bold line instruction and, variable name change affecting other files param, header tag for document index, create site index of documents use, add info on document content, harvest info provided from document set for metadata to create site index of documents (similar sub-sytax to book index) also variable name others variable name change, made earlier in dal and param --- lib/sisu/v0/dal.rb | 4 ++-- lib/sisu/v0/dal_idx.rb | 10 +++++----- lib/sisu/v0/dal_syntax.rb | 15 ++++++++++++++- lib/sisu/v0/html_segments.rb | 2 +- lib/sisu/v0/param.rb | 11 ++++++----- lib/sisu/v0/sysenv.rb | 2 +- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index 094cf53c..1a8f6733 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -203,7 +203,7 @@ module SiSU_DAL File.open(marshal_meta,'w'){|f| Marshal.dump(@data.to_a,f)} end def idx_html_hard_output - if @md.book_index and @md.cmd =~/M/ + if @md.book_idx and @md.cmd =~/M/ filename_meta=@my_make.file_meta_idx_html @data.each {|s| filename_meta.puts s.strip + "\n" unless s.strip.empty?} else @@ -248,7 +248,7 @@ module SiSU_DAL data=SiSU_images::Images.new(@md,data).images data=SiSU_document_structure::Tables.new(@md,data).tables data=SiSU_numbering::Numbering.new(@md,data).numbering_song - data,book_index,html_idx=SiSU_book_index::Book_index.new(@md,data,@env).indexing_song if @md.book_index + data,book_index,html_idx=SiSU_book_index::Book_index.new(@md,data,@env).indexing_song if @md.book_idx data=SiSU_endnotes::Endnotes.new(@md,data,endnote_array).endnotes data=SiSU_hash::Object_digest.new(@md,data,@env).object_digest meta=SiSU_metadata::Metadata.new(@md,data).metadata diff --git a/lib/sisu/v0/dal_idx.rb b/lib/sisu/v0/dal_idx.rb index 36489e74..0b5c74c7 100644 --- a/lib/sisu/v0/dal_idx.rb +++ b/lib/sisu/v0/dal_idx.rb @@ -95,7 +95,7 @@ module SiSU_book_index the_idx=construct_book_index(idx_array) #screen_print(the_idx) if @md.cmd.inspect =~/V/ sisu_markup_idx,html_idx=nil,nil - if @md.book_index + if @md.book_idx idx=index(the_idx) output_html_idx(idx[:html]) html_idx=idx[:html] @@ -188,7 +188,7 @@ module SiSU_book_index while letter < f if alph.length > 0 letter=alph.shift - @idx[:html] << %{\n
\n

#{letter}

} + @idx[:html] << %{\n
\n

#{letter}

} else break end end @@ -292,11 +292,11 @@ module SiSU_book_index end end def output_html_idx(html_idx) - if @md.book_index + if @md.book_idx path="#{@env.path.output}/#{@md.fnb}" Dir.mkdir(path) unless FileTest.directory?(path) - html_index_file=File.new("#{path}/#{@md.fn[:book_index]}",'w') - #puts "#{path}/#{@md.fn[:book_index]}" + html_index_file=File.new("#{path}/#{@md.fn[:book_idx]}",'w') + #puts "#{path}/#{@md.fn[:book_idx]}" html_idx.each {|x| html_index_file << x } html_index_file.close end diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb index cbcd42f9..84ddef92 100644 --- a/lib/sisu/v0/dal_syntax.rb +++ b/lib/sisu/v0/dal_syntax.rb @@ -76,6 +76,7 @@ module SiSU_Syntax tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)} tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?} bold_line=%{^!_\s.+?(?:#{Mx[:br_line]}|\n|$)} + ital_line=%{^/_\s.+?(?:#{Mx[:br_line]}|\n|$)} @line_scan_ital=if defined? @md.make_italic[:str] \ and defined? @vz.markup_make_italic[:str] /#@http_m|#{bold_line}|#@manmkp_ital#{tail_m_ital}|(?:#{@md.make_italic[:str]}|#{@vz.markup_make_italic[:str]})#{tail_m_ital}|\S+|\n/ @@ -150,11 +151,19 @@ module SiSU_Syntax line end def embolden(given) + given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})http:\/\/\S+.*?)(
)/,"#{Mx[:fa_bold_o]} \\1 #{Mx[:fa_bold_c]}\\2") + given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})http:\/\/\S+.*)/,"#{Mx[:fa_bold_o]} \\1 #{Mx[:fa_bold_c]}") given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)(
)/,"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)\s+((?:[*]~\S+\s*)+)/,"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)\s*([~-]#)$/,"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") given.gsub!(/(?:^!_\s+|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]}\s*)(.*)?\s*$/,"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}") end + def italicise(given) + given.gsub!(/^\/_\s*(.+?)(
)/,"#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") + given.gsub!(/^\/_\s*(.+?)\s+((?:[*]~\S+\s*)+)/,"#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") + given.gsub!(/^\/_\s*(.+?)\s*([~-]#)$/,"#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") + given.gsub!(/^\/_\s+(.*)?\s*$/,"#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}") + end def wordlist_bold(line) line=line.dup if (defined? @md.make_bold[:str] \ @@ -177,6 +186,7 @@ module SiSU_Syntax end else if w =~ /(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s+/; embolden(w) #bold paragraph/emphasize #may wish to remove think about 7{ 8{ conversion not satisfactory, as information is lost! + elsif w =~/^\/_\s+/; italicise(w) end end line_array << w @@ -189,6 +199,9 @@ module SiSU_Syntax and line =~ /(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s+/ embolden(line) end + if line =~ /\/_\s+/ + italicise(line) + end end line end @@ -227,7 +240,7 @@ module SiSU_Syntax word=line.scan(/\S+|\n/) unless line =~/^(?:#{Mx[:meta_o]}|%+\s)/ #visit if word word.each do |w| # _ - / # | : ! ^ ~ - unless w =~/^#{Mx[:lv_o]}[0-9]:\S*?#{Mx[:lv_c]}|~\{|\}~|~\[|\]~|^\^~|~\^|\*~\S+|~#|\{t?~|\{table/ + unless w =~/^#{Mx[:lv_o]}[0-9]:\S*?#{Mx[:lv_c]}|~\{|\}~|~\[|\]~|^\^~|~\^|\*~\S+|~#|\{t?~|\{table|http:\/\/\S+/ w.gsub!(/\\?~/,"#{Mx[:gl_o]}#126#{Mx[:gl_c]}") #escaped special character #w.gsub!(/~/,"#{Mx[:gl_o]}#126#{Mx[:gl_c]}") end diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb index a280a8c8..a67b11b3 100644 --- a/lib/sisu/v0/html_segments.rb +++ b/lib/sisu/v0/html_segments.rb @@ -143,7 +143,7 @@ module SiSU_HTML_seg @h_sfx=@md.sfx if @md.file_type =~/html/ @h_sfx='.html' if @md.file_type =~/html/ #used in creating file, not to be omitted. idx_html=nil - if @md.book_index + if @md.book_idx my_make_source_file=SiSU_Env::Create_file.new(@md.cmd,@md.fns) idx_html=SiSU_Particulars::Combined_singleton.instance.get_html_idx(@md.opt).html_idx idx_html.each {|x| @@seg[:idx] << x } diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb index 02d20ed7..6ab30e86 100644 --- a/lib/sisu/v0/param.rb +++ b/lib/sisu/v0/param.rb @@ -119,13 +119,13 @@ module SiSU_Param @doc={ :lv=>[] } @doc[:fns],@doc[:fnb],@doc[:scr_suffix]='','','' @@publisher='SiSU scribe' - attr_accessor :cmd,:mod,:env,:fn,:fns,:fnb,:fnn,:fnt,:fnl,:flv,:fnz,:fnstex,:ocn,:sfx_src,:sfx,:pdf,:file_type,:dir_out,:dir_tex,:dir_lout,:txt_path,:site_skin,:sisu,:sisu_version,:ruby_version,:title,:dc_title,:html_title,:subtitle,:subtitle_tex,:creator_home,:dc_creator,:translator,:illustrator,:prepared_by,:digitized_by,:dc_subject,:dc_description,:dc_publisher,:dc_contributor,:dc_date,:dc_date_created,:dc_date_issued,:dc_date_available,:dc_date_valid,:dc_date_modified,:date_scheme,:date_created_scheme,:date_issued_scheme,:date_available_scheme,:date_valid_scheme,:date_modified_scheme,:dc_type,:dc_format,:dc_identifier,:dc_source,:dc_language,:language_original,:dc_relation,:dc_coverage,:dc_rights,:keywords,:comments,:abstract,:cls_loc,:cls_dewey,:cls_pg,:cls_isbn,:papersize,:papersize_array,:toc,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:pagenew,:pagebreak,:num_top,:toc_lev_limit,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:flag_auto_heading_num,:markup,:markup_instruction,:markup_version,:markup_declared,:make_bold,:make_italic,:flag_tables,:vocabulary,:doc_skin,:doc_css,:yaml,:lnk,:prefix_a,:prefix_b,:suffix,:information,:contact,:icon,:image,:ad_url,:ad_png,:ad_alt,:ad_began,:flag_promo,:promo,:ad_home,:stmp,:stmpd,:sc_filename,:sc_number,:sc_date,:sc_time,:sc_info,:yamladdr,:locale,:wc_lines,:wc_words,:wc_bytes,:file_encoding,:file_size,:user,:home,:hostname,:pwd,:firstseg,:programs,:creator_copymark,:lang,:en,:dgst,:dgst_skin,:generated,:tags,:tag_array,:concord_make,:seg_names,:seg_autoname_safe,:set_header_title,:set_heading_top,:set_heading_seg,:heading_seg_first,:heading_seg_first_flag,:base_program,:man_section,:man_name,:man_synopsis,:ec,:opt,:sem_tag,:book_index + attr_accessor :cmd,:mod,:env,:fn,:fns,:fnb,:fnn,:fnt,:fnl,:flv,:fnz,:fnstex,:ocn,:sfx_src,:sfx,:pdf,:file_type,:dir_out,:dir_tex,:dir_lout,:txt_path,:site_skin,:sisu,:sisu_version,:ruby_version,:title,:dc_title,:html_title,:subtitle,:subtitle_tex,:creator_home,:dc_creator,:translator,:illustrator,:prepared_by,:digitized_by,:dc_subject,:dc_description,:dc_publisher,:dc_contributor,:dc_date,:dc_date_created,:dc_date_issued,:dc_date_available,:dc_date_valid,:dc_date_modified,:date_scheme,:date_created_scheme,:date_issued_scheme,:date_available_scheme,:date_valid_scheme,:date_modified_scheme,:dc_type,:dc_format,:dc_identifier,:dc_source,:dc_language,:language_original,:dc_relation,:dc_coverage,:dc_rights,:keywords,:comments,:abstract,:cls_loc,:cls_dewey,:cls_pg,:cls_isbn,:papersize,:papersize_array,:toc,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:pagenew,:pagebreak,:num_top,:toc_lev_limit,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:flag_auto_heading_num,:markup,:markup_instruction,:markup_version,:markup_declared,:make_bold,:make_italic,:flag_tables,:vocabulary,:doc_skin,:doc_css,:yaml,:lnk,:prefix_a,:prefix_b,:suffix,:information,:contact,:icon,:image,:ad_url,:ad_png,:ad_alt,:ad_began,:flag_promo,:promo,:ad_home,:stmp,:stmpd,:sc_filename,:sc_number,:sc_date,:sc_time,:sc_info,:yamladdr,:locale,:wc_lines,:wc_words,:wc_bytes,:file_encoding,:file_size,:user,:home,:hostname,:pwd,:firstseg,:programs,:creator_copymark,:lang,:en,:dgst,:dgst_skin,:generated,:tags,:tag_array,:concord_make,:seg_names,:seg_autoname_safe,:set_header_title,:set_heading_top,:set_heading_seg,:heading_seg_first,:heading_seg_first_flag,:base_program,:man_section,:man_name,:man_synopsis,:ec,:opt,:sem_tag,:book_idx,:doc_cont_idx def initialize(fns_array,opt) - @env=@fn=@fns=@fnb=@fnn=@fnt=@fnl=@flv=@fnz=@fnstex=@ocn=@sfx_src=@sfx=@pdf=@file_type=@dir_out=@dir_tex=@dir_lout=@txt_path=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@site_skin=@sisu=@sisu_version=@ruby_version=@title=@dc_title=@html_title=@subtitle=@subtitle_tex=@creator_home=@dc_creator=@translator=@illustrator=@prepared_by=@digitized_by=@dc_subject=@dc_description=@dc_publisher=@dc_contributor=@dc_date=@dc_date_created=@dc_date_issued=@dc_date_available=@dc_date_valid=@dc_date_modified=@date_scheme=@date_created_scheme=@date_issued_scheme=@date_available_scheme=@date_valid_scheme=@date_modified_scheme=@dc_type=@dc_format=@dc_identifier=@dc_source=@dc_language=@language_original=@dc_relation=@dc_coverage=@dc_rights=@keywords=@comments=@abstract=@cls_loc=@cls_dewey=@cls_pg=@cls_isbn=@papersize=@toc=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@pagenew=@pagebreak=@num_top=@toc_lev_limit=@flag_auto_heading_num=@make_bold=@make_italic=@flag_tables=@vocabulary=@doc_skin=@doc_css=@yaml=@lnk=@prefix_a=@prefix_b=@suffix=@information=@contact=@icon=@ad_url=@ad_png=@ad_alt=@ad_began=@promo=@ad_home=@stmp=@stmpd=@sc_filename=@sc_number=@sc_date=@sc_time=@sc_info=@yamladdr=@locale=@wc_lines=@wc_words=@wc_bytes=@file_encoding=@file_size=@firstseg=@programs=@creator_copymark=@lang=@en=@dgst=@dgst_skin=@generated=@heading_seg_first=@base_program=@man_synopsis=nil + @env=@fn=@fns=@fnb=@fnn=@fnt=@fnl=@flv=@fnz=@fnstex=@ocn=@sfx_src=@sfx=@pdf=@file_type=@dir_out=@dir_tex=@dir_lout=@txt_path=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@site_skin=@sisu=@sisu_version=@ruby_version=@title=@dc_title=@html_title=@subtitle=@subtitle_tex=@creator_home=@dc_creator=@translator=@illustrator=@prepared_by=@digitized_by=@dc_subject=@dc_description=@dc_publisher=@dc_contributor=@dc_date=@dc_date_created=@dc_date_issued=@dc_date_available=@dc_date_valid=@dc_date_modified=@date_scheme=@date_created_scheme=@date_issued_scheme=@date_available_scheme=@date_valid_scheme=@date_modified_scheme=@dc_type=@dc_format=@dc_identifier=@dc_source=@dc_language=@language_original=@dc_relation=@dc_coverage=@dc_rights=@keywords=@comments=@abstract=@cls_loc=@cls_dewey=@cls_pg=@cls_isbn=@papersize=@toc=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@pagenew=@pagebreak=@num_top=@toc_lev_limit=@flag_auto_heading_num=@make_bold=@make_italic=@flag_tables=@vocabulary=@doc_skin=@doc_css=@yaml=@lnk=@prefix_a=@prefix_b=@suffix=@information=@contact=@icon=@ad_url=@ad_png=@ad_alt=@ad_began=@promo=@ad_home=@stmp=@stmpd=@sc_filename=@sc_number=@sc_date=@sc_time=@sc_info=@yamladdr=@locale=@wc_lines=@wc_words=@wc_bytes=@file_encoding=@file_size=@firstseg=@programs=@creator_copymark=@lang=@en=@dgst=@dgst_skin=@generated=@heading_seg_first=@base_program=@man_synopsis=@doc_cont_idx=nil @man_section=1 @man_name='man page "name/whatis" information not provided, set in header @man: name=[whatis information]' @data,@fns,@cmd,@mod,@opt=fns_array,opt.fns,opt.cmd,opt.mod,opt #@data used as data - @flag_tables,@set_header_title,@set_heading_top,@set_heading_seg,@heading_seg_first_flag,@flag_promo,@book_index=false,false,false,false,false,false,false + @flag_tables,@set_header_title,@set_heading_top,@set_heading_seg,@heading_seg_first_flag,@flag_promo,@book_idx=false,false,false,false,false,false,false @seg_autoname_safe=true @sem_tag=false @markup_instruction,@markup_declared,@image='','','' #check which other values should be set to empty rather than nil @@ -517,6 +517,7 @@ module SiSU_Param end when /^(?:0~suffix|@suffix:)\s+(.+?)$/m; @suffix=$1 #% metainfo when /^(?:0~information|@information:)\s+(.+?)$/m; @information=$1 #% metainfo + when /^(?:0~doc_cont(?:ent)?_in?de?x|@doc_cont(?:ent)?_in?de?x:)\s+(.+?)$/m; @doc_cont_idx=$1 #% metainfo, similar syntax to book index, leave out the ={} i.e. use equivalent of ={(.+?)} when /^(?:0~contact|@contact:)\s+(.+?)$/m; @contact=$1 #% metainfo when /^(?:0~icon|@icon:)\s+(.+?)$/m; @icon=$1 #% processing when /^(?:0~promo|@promo:)\s+(.+?)$/m @@ -575,8 +576,8 @@ module SiSU_Param end end end - if not @book_index and para =~/^=\{(.+?)\}\s*$/ - @book_index=true + if not @book_idx and para =~/^=\{(.+?)\}\s*$/ + @book_idx=true end unless @code_flag case para diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 677c6d09..2481cbdc 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -519,7 +519,7 @@ module SiSU_Env :sxd => filename(code,@fnb,'.sxd.xml'), :sxn => filename(code,@fnb,'.sxn.xml'), :sisupod => filename(nil,@fnz,''), - :book_index => filename(code,'book_index','.html'), + :book_idx => filename(code,'book_index','.html'), } @fn end -- cgit v1.2.3 From c662fb09304eb29c9f765af759c69de909c5b112 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:50:29 -0500 Subject: regex match refinement --- lib/sisu/v0/html_tune.rb | 2 +- lib/sisu/v0/shared_html_lite.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v0/html_tune.rb index 99f2d7f4..f910da66 100644 --- a/lib/sisu/v0/html_tune.rb +++ b/lib/sisu/v0/html_tune.rb @@ -101,7 +101,7 @@ module SiSU_Tune @html=html end def clean - @html.gsub!(/#{Mx[:gl_o]}(#[0-9]+)#{Mx[:gl_c]}/u,'&\1;') + @html.gsub!(/#{Mx[:gl_o]}(#[0-9]{3})#{Mx[:gl_c]}/u,'&\1;') @html.gsub!(/#{Mx[:gl_o]}#([a-z]{2,4})#{Mx[:gl_c]}/u,'&\1;') @html.gsub!(/¢/u,'¢') # ¢ @html.gsub!(/£/u,'£') # £ diff --git a/lib/sisu/v0/shared_html_lite.rb b/lib/sisu/v0/shared_html_lite.rb index 7a23be0b..08d6997d 100644 --- a/lib/sisu/v0/shared_html_lite.rb +++ b/lib/sisu/v0/shared_html_lite.rb @@ -150,6 +150,8 @@ module SiSU_Format_Shared words=urls(wm) para.gsub!(/.+/m,words) end + para.gsub!(/#{Mx[:gl_o]}(#[0-9]{3})#{Mx[:gl_c]}/u,'&\1;') + para.gsub!(/#{Mx[:gl_o]}#([a-z]{2,4})#{Mx[:gl_c]}/u,'&\1;') para.gsub!(/#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}/m,'') para.gsub!(/\b[_\\]((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\1\2') #http ftp matches escaped, no decoration para.gsub!(/((?:^|\s)#{Mx[:lnk_c]})((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,'\1\2\3') #special case \{ e.g. \}http://url -- cgit v1.2.3 From 868478a6dc0a0ecaeddb333c3b318298cd1b67e8 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:51:13 -0500 Subject: ruby1.9 some testing minor changes opened to run with ruby1.9, (however not all used libraries ported on system) continue to use ruby1.8 series >= ruby1.8.4 --- bin/sisu | 4 ++-- lib/sisu/v0/concordance.rb | 4 ++-- lib/sisu/v0/constants.rb | 8 ++++---- lib/sisu/v0/html.rb | 2 +- lib/sisu/v0/manifest.rb | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/sisu b/bin/sisu index 164655b4..671a06cd 100644 --- a/bin/sisu +++ b/bin/sisu @@ -1,8 +1,8 @@ #!/usr/bin/env ruby # coding: utf-8 #SiSU: copyright (C) 1997..2008 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' +#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' branch='v0' diff --git a/lib/sisu/v0/concordance.rb b/lib/sisu/v0/concordance.rb index babc6655..676aa3a7 100644 --- a/lib/sisu/v0/concordance.rb +++ b/lib/sisu/v0/concordance.rb @@ -121,8 +121,8 @@ WOK end def create head_banner=SiSU_HTML_Format::Head_toc.new(@md) - minitoc=SiSU_HTML_minitoc::Toc_mini.new(@md,@data).songsheet - toc='
' + minitoc.to_s + '
' + minitoc=SiSU_HTML_minitoc::Toc_mini.new(@md,@data).songsheet.join("\n") + toc='
' + minitoc + '
' < diff --git a/lib/sisu/v0/constants.rb b/lib/sisu/v0/constants.rb index 414732e1..9339f143 100644 --- a/lib/sisu/v0/constants.rb +++ b/lib/sisu/v0/constants.rb @@ -1,4 +1,4 @@ -# coding:utf-7 +# coding:utf-8 =begin * Name: SiSU @@ -142,9 +142,9 @@ unless RUBY_VERSION < '1.9' Mx[:sm_set_o].force_encoding('utf-8'); Mx[:sm_set_c].force_encoding('utf-8') Mx[:sm_subset_o].force_encoding('utf-8'); Mx[:sm_subset_c].force_encoding('utf-8') # - Rx[:mx_fa_clean].force_encoding('utf-8') - Rx[:lv].force_encoding('utf-8');Rx[:lv_1].force_encoding('utf-8');Rx[:lv_2].force_encoding('utf-8');Rx[:lv_3].force_encoding('utf-8');Rx[:lv_4].force_encoding('utf-8');Rx[:lv_5].force_encoding('utf-8');Rx[:lv_6].force_encoding('utf-8');Rx[:lv_7].force_encoding('utf-8');Rx[:lv_8].force_encoding('utf-8');Rx[:lv_9].force_encoding('utf-8') - Rx[:meta].force_encoding('utf-8') + #Rx[:mx_fa_clean].force_encoding('utf-8') + #Rx[:lv].force_encoding('utf-8');Rx[:lv_1].force_encoding('utf-8');Rx[:lv_2].force_encoding('utf-8');Rx[:lv_3].force_encoding('utf-8');Rx[:lv_4].force_encoding('utf-8');Rx[:lv_5].force_encoding('utf-8');Rx[:lv_6].force_encoding('utf-8');Rx[:lv_7].force_encoding('utf-8');Rx[:lv_8].force_encoding('utf-8');Rx[:lv_9].force_encoding('utf-8') + #Rx[:meta].force_encoding('utf-8') end __END__ consider: diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v0/html.rb index df53d1b7..a368ff3d 100644 --- a/lib/sisu/v0/html.rb +++ b/lib/sisu/v0/html.rb @@ -293,7 +293,7 @@ module SiSU_HTML @@toc end def minitoc - minitoc=@@toc[:seg_mini].to_s + minitoc=@@toc[:seg_mini].join("\n") '
' + minitoc + '
' end protected diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb index 22330734..307d9ced 100644 --- a/lib/sisu/v0/manifest.rb +++ b/lib/sisu/v0/manifest.rb @@ -522,7 +522,7 @@ module SiSU_Manifest end def check_output begin - minitoc=SiSU_HTML_minitoc::Toc_mini.new(@md,@data).songsheet + minitoc=SiSU_HTML_minitoc::Toc_mini.new(@md,@data).songsheet.join("\n") id,file='','' vz=SiSU_Env::Get_init.instance.skin banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ \ -- cgit v1.2.3 From 6e5c6c2267083a1d7bc54626cc822a7ca5d41718 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 13:51:45 -0500 Subject: changelog updated --- CHANGELOG | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ecfd6c68..351701d0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,14 +9,26 @@ Reverse Chronological: %% STABLE MANIFEST -%% sisu_0.69.4.orig.tar.gz (2008-10-14:41/2) +%% sisu_0.69.4.orig.tar.gz (2008-11-02:43/7) http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.4.orig.tar.gz sisu_0.69.4.orig.tar.gz sisu_0.69.4-1.dsc sisu_0.69.4-1.diff.gz + * sisu-mode.el emacs syntax highlighting file contributed by Ambrose Kofi Laing + data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el + based on doc-mode.el (v1.14 2006-01-19) by Tong SUN, who granted permission + for this adaptation and inclusion + * vim syntax file, header, version number updated + * ruby1.9 some testing minor changes (not all ruby libraries updated yet in + Debian Sid) (sisu currently to be used with ruby 1.8 branch 1.8.4 or later) + + * dal, related to bold line instruction + + * minor touches + %% sisu_0.69.3.orig.tar.gz (2008-10-10:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz 33783d161293756f33e22867de5c00d02ce8743a19c65846622a272e3c0b8cd3 1527253 sisu_0.69.3.orig.tar.gz -- cgit v1.2.3 From 917b58bba636eca63337be1ea6d44d90c8dbf793 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 18:31:34 -0500 Subject: sisu-mode.el make version number match this sisu version where introduced --- data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1d05a573..d8febd78 100644 --- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el +++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el @@ -1,7 +1,7 @@ ;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text. ;; @Author: Ambrose Kofi Laing (& Ralph Amissah) ;; @Keywords: text, processes, tools -;; @Version: 0.96.4 2008-11-02 +;; @Version: 0.69.4 2008-11-02 ;; @License: GPLv3 ;; @Home URL: SiSU: http://www.jus.uio.no/sisu ;; originally looked at (based on) doc-mode, with kind permission of the author -- cgit v1.2.3 From edc7d97f5a8933ce44ef2165a65104774006edb9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 Nov 2008 18:42:19 -0500 Subject: changelog and version updated --- conf/sisu/version.yml | 6 +++--- data/doc/sisu/CHANGELOG | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml index b76a0716..fca39870 100644 --- a/conf/sisu/version.yml +++ b/conf/sisu/version.yml @@ -1,5 +1,5 @@ --- -:version: 0.69.3 -:date_stamp: 2008w40/5 -:date: "2008-10-10" +:version: 0.69.4 +:date_stamp: 2008w44/1 +:date: "2008-11-03" :project: SiSU diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG index efaa7f99..351701d0 100644 --- a/data/doc/sisu/CHANGELOG +++ b/data/doc/sisu/CHANGELOG @@ -9,11 +9,31 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.69.4.orig.tar.gz (2008-11-02:43/7) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.4.orig.tar.gz + sisu_0.69.4.orig.tar.gz + sisu_0.69.4-1.dsc + sisu_0.69.4-1.diff.gz + + * sisu-mode.el emacs syntax highlighting file contributed by Ambrose Kofi Laing + data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el + based on doc-mode.el (v1.14 2006-01-19) by Tong SUN, who granted permission + for this adaptation and inclusion + + * vim syntax file, header, version number updated + + * ruby1.9 some testing minor changes (not all ruby libraries updated yet in + Debian Sid) (sisu currently to be used with ruby 1.8 branch 1.8.4 or later) + + * dal, related to bold line instruction + + * minor touches + %% sisu_0.69.3.orig.tar.gz (2008-10-10:40/5) http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz - sisu_0.69.3.orig.tar.gz - sisu_0.69.3-1.dsc - sisu_0.69.3-1.diff.gz + 33783d161293756f33e22867de5c00d02ce8743a19c65846622a272e3c0b8cd3 1527253 sisu_0.69.3.orig.tar.gz + 8c77872852c6efedf17146394032c3281c79e15e86283abd6f906909268ea69b 1159 sisu_0.69.3-1.dsc + 3b8cd23a772e4a8d77f5f7d044e6f084c7769788a9f8974dd5b9227f23a2bd18 146916 sisu_0.69.3-1.diff.gz * minor adjustment to book index code -- cgit v1.2.3