Add words. Put \longa as duration.

diff --git a/ChangeLog b/ChangeLog
index 04abe45c2f213288d35a572f330a539ca1d9f920..d9832fb94c33d8a4a3a0ecadb4b584a60c3da2a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-06  Heikki Junes <hjunes@cc.hut.fi>
+
+       * lilypond.vim:
+       * lilypond-font-lock.el: Put \longa as duration.
+
+       * lilypond.words: Add words from Info.
+
 2002-12-06  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
 
        * stepmake/stepmake/c++-rules.make: Compile fix (bison 1.28)

diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index c3bcfaf22ab86cc5738b3b66bd3ccae36cf01f2a..f9bb4f2ef62224a7540d550e1cc144ea63c277a4 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -62,7 +62,7 @@
       (cons (concat "\\(\\([_^-]?\\(" kwregex "\\)\\)+\\)\\($\\|[] \t(~{}>\\\\_()^*-]\\)") '(1 font-lock-keyword-face))
 
 ;; ... keyword-type constructs, e.g., ^\abracadabra; not \breve (= a duration)
-      '("\\([_^-]?\\\\\\([^b]\\|b[^r]\\|br[^e]\\|bre[^v]\\|brev[^e]\\|breve[a-zA-Z]\\)[a-zA-Z]*\\)" 1 font-lock-constant-face)
+      '("\\([_^-]?\\\\\\(longa[a-zA-Z]\\|long[^a]\\|lon[^g]\\|lo[^n]\\|l[^o]\\|[^lb]\\|b[^r]\\|br[^e]\\|bre[^v]\\|brev[^e]\\|breve[a-zA-Z]\\)[a-zA-Z]*\\)" 1 font-lock-constant-face)
 
 ;; ... the left side of '=' -mark
       '("\\([_a-zA-Z.0-9-]+\\)[ \t]*=[ \t]*" 1 font-lock-variable-name-face)
@@ -74,7 +74,7 @@
       (cons (concat "\\(" rwregex "\\)") 'font-lock-variable-name-face)
 
 ;; ... notes and rests, accidentals and duration (multiplied), e.g., b,?16.*3/4
-      '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(bb\\|as[ae]s\\|eses\\|\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(\\(flat\\)+\\|\\(sharp\\)+\\|is\\(siss\\|i?s\\)?\\|es\\(sess\\|e?s\\)?\\|ff?\\|ss?\\)?\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9][0-9]*\\)?\\)?\\)?\\)" 2 font-lock-type-face)
+      '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(bb\\|as[ae]s\\|eses\\|\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(\\(flat\\)+\\|\\(sharp\\)+\\|is\\(siss\\|i?s\\)?\\|es\\(sess\\|e?s\\)?\\|ff?\\|ss?\\)?\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\|\\\\longa\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9][0-9]*\\)?\\)?\\)?\\)" 2 font-lock-type-face)
 
 ;; "on top", ... '{[]}'-brackets
       '("\\([][}{]\\)" 0 font-lock-warning-face t)

diff --git a/lilypond.vim b/lilypond.vim
index 1492f0aed120eb4a715b90cfdffc4729c14f4433..006e67cc110aa9731d84a42df6d48e1e2ad241b7 100644 (file)
--- a/lilypond.vim
+++ b/lilypond.vim
@@ -29,8 +29,8 @@ syn region lilyComment        start="%{" skip="%$" end="%}"
 syn region lilyComment start="%\([^{]\|$\)" end="$"
 
 syn match lilyStatement        "[-_^]\?\\\a\+"
-syn match lilyNote     "\<\(\(\(bb\|as[ae]s\|[ae]s\|eses\|[a-h]\(\|is\|isis\|es\|eses\)\)\([,']\)\{,4}\([?!]\)\?\|[srR]\)\(\(128\|6\?4\|3\?2\|16\?\|8\|\\breve\)[.]*\)\?\)\(\A\|\n\)"me=e-1
-syn match lilyNote     "\<\(\(\(bb\|as[ae]s\|[ae]s\|eses\|[a-h]\(\|is\|isis\|es\|eses\)\)\([,']\)\{,4}\([?!]\)\?\|[srR]\)\(\(128\|6\?4\|3\?2\|16\?\|8\|\\breve\)[.]*\)\?\)$"
+syn match lilyNote     "\<\(\(\(bb\|as[ae]s\|[ae]s\|eses\|[a-h]\(\|is\|isis\|es\|eses\)\)\([,']\)\{,4}\([?!]\)\?\|[srR]\)\(\(128\|6\?4\|3\?2\|16\?\|8\|\\breve\|\\longa\)[.]*\)\?\)\(\A\|\n\)"me=e-1
+syn match lilyNote     "\<\(\(\(bb\|as[ae]s\|[ae]s\|eses\|[a-h]\(\|is\|isis\|es\|eses\)\)\([,']\)\{,4}\([?!]\)\?\|[srR]\)\(\(128\|6\?4\|3\?2\|16\?\|8\|\\breve\|\\longa\)[.]*\)\?\)$"
 syn match lilyNumber   "[-_^.]\?\d\+[.]\?"
 syn match lilyEquation "\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*"
 syn match lilySlur     "[(~)]"

diff --git a/lilypond.words b/lilypond.words
index 436ef30da5671188570b3f643da9bf37441e0010..131bdb927e0a6e2f0b28b08d48df8f5590b887ff 100644 (file)
--- a/lilypond.words
+++ b/lilypond.words
@@ -121,6 +121,8 @@ Grace
 \\grandstaff
 GrandStaff
 \\GrandStaffContext
+\\groupClose
+\\groupOpen
 \\grstaff
 Hairpin
 \\hairyChord
@@ -147,10 +149,10 @@ InnerChoirStaff
 \\legato
 \\legniGroup
 \\lheel
+Ligature_bracket_engraver
 \\linebreak
 \\lineprall
 \\locrian
-\\longa
 \\lower
 \\lowerOctave
 \\lowerOne
@@ -171,6 +173,7 @@ Lyrics
 \\melodic
 \\melodicStaff
 \\melody
+Mensural_ligature_engraver
 mezzosoprano
 \\mf
 \\midi
@@ -291,6 +294,7 @@ Score
 \\segno
 \\sequential
 \\set
+\\setMmRestFermata
 \\settings
 \\sf
 \\sff
@@ -344,12 +348,14 @@ Staff
 StaffSymbol
 \\staffTwo
 \\start
+\\startTextSpan
 Stem
 \\stemBoth
 \\stemDown
 \\steminvert
 \\stemUp
 \\stop
+\\stopTextSpan
 \\stopped
 \\stpaper
 \\stscore