vocabulary to be used in autocompletion

diff --git a/ChangeLog b/ChangeLog
index 8aa4b64b3edd0c1209456d8f888b75abcd8d11b5..1cee193bd000a650c61909c491e32effc09add71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-13  Heikki Junes <hjunes@cc.hut.fi>
+
+       * lilypond.words: add vocabulary to be used in auto-completion
+
+       * vimrc: autocompletion in Insert/Replace-mode with <Ctrn-N>
+
+       * lilypond.vim: allow note name at EOF
+
 2002-11-13  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * buildscripts/new-chords.py (edit): -e option: inline editing.

diff --git a/lilypond.vim b/lilypond.vim
index dc9eadd57cbf47ac6abcfb2901a30cb9f5a4f89f..1492f0aed120eb4a715b90cfdffc4729c14f4433 100644 (file)
--- a/lilypond.vim
+++ b/lilypond.vim
@@ -2,7 +2,7 @@
 " Language:    LilyPond
 " Maintainer:  Heikki Junes <hjunes@cc.hut.fi>
 " Created:      Oct 17, 2002
-" Last Change: Oct 17, 2002
+" Last Change: Nov 13, 2002
 " Version:     6.1-1
 " Latest:
 " http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lilypond.vim
@@ -30,6 +30,7 @@ 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 lilyNumber   "[-_^.]\?\d\+[.]\?"
 syn match lilyEquation "\(#['`]\)\?\(\a*[-]\)*\a*\s*=\s*\(#[#'`]\?\)\?\a*"
 syn match lilySlur     "[(~)]"

diff --git a/lilypond.words b/lilypond.words
new file mode 100644 (file)
index 0000000..e0f023a
--- /dev/null
+++ b/lilypond.words
@@ -0,0 +1,249 @@
+\accent
+\accepts
+\accompany
+\addlyrics
+\aeolian
+\alias
+\alternative
+\alto
+\apply
+\arpeggio
+\autochange
+\bar
+\baritone
+\bass
+\bcincipit
+\beamintervals
+\blend
+\break
+\breathe
+\broken
+\cg
+\ch
+\char
+\chord
+\chordchordmodifiers
+\chordmodifiers
+\chords
+\chordstest
+\clef
+\clipping
+\cm
+\coda
+\commandspanrequest
+\complex
+\consists
+\consistsend
+\context
+\contrabasso
+\cr
+\cresc
+\decr
+\default
+\denies
+\different
+\dirs
+\dorian
+\down
+\downbow
+\downmordent
+\downprall
+\duration
+\eccentric
+\eg
+\elementdescriptions
+\embeddedps
+\endcresc
+\endincipit
+\ex
+\extreme
+\f
+\F
+\fermata
+\ff
+\fff
+\ffff
+\figures
+\flageolet
+\fold
+\font
+\fp
+\fragment
+\fz
+\G
+\gg
+\gliss
+\glissando
+\gmsus
+\grace
+\grandstaff
+\grstaff
+\header
+\hsize
+\include
+\inversions
+\invisible
+\ionian
+\key
+\keys
+\keysignature
+\lag
+\lheel
+\linebreak
+\lineprall
+\locrian
+\longa
+\lower
+\ltoe
+\lydian
+\lyrics
+\major
+\marcato
+\mark
+\maxima
+\melisma
+\melody
+\mezzosoprano
+\mf
+\midi
+\minor
+\mixolydian
+\mm
+\mm
+\monstrous
+\mp
+\multipart
+\music
+\musicalpitch
+\n
+\name
+\names
+\newpage
+\noise
+\noisebeat
+\normalkey
+\normalsize
+\notenames
+\notes
+\nt
+\one
+\onestaff
+\open
+\outputproperty
+\over
+\override
+\p
+\paper
+\part
+\partcombine
+\partial
+\pbow
+\penalty
+\percent
+\phrygian
+\pitch
+\pitchnames
+\pp
+\pper
+\ppp
+\pprall
+\prall
+\pralldown
+\prallmordent
+\prallprall
+\prallup
+\property
+\pt
+\quickmeasure
+\rc
+\rced
+\relative
+\remove
+\repeat
+\rest
+\reverseturn
+\revert
+\rf
+\rfz
+\rheel
+\rhythm
+\right
+\rtoe
+\scale
+\scales
+\scheme
+\score
+\scpaper
+\script
+\scscore
+\sd
+\segno
+\sequential
+\set
+\settings
+\sf
+\sff
+\sfff
+\sffff
+\sfz
+\shortlong
+\simultaneous
+\singlepart
+\skip
+\small
+\smarttranspose
+\soprano
+\sp
+\spanrequest
+\spp
+\sppp
+\spppp
+\staccatissimo
+\staccato
+\staffheight
+\staffspace
+\start
+\steminvert
+\stop
+\stopped
+\stpaper
+\stscore
+\stuff
+\su
+\tab
+\tempo
+\tenor
+\tenuto
+\textscript
+\thenotes
+\thrd
+\threevoice
+\thumb
+\tiltdown
+\tiltup
+\timb
+\time
+\times
+\tiny
+\toeters
+\touch
+\translator
+\transpose
+\treble
+\tremolo
+\trill
+\turn
+\twovoicesteminvert
+\type
+\under
+\unfold
+\unset
+\upmordent
+\version
+\violin
+\visible
+\voicedefault
+\voicesteminvert
+\volta
+\vsize
+\x

diff --git a/vimrc b/vimrc
index e8457217ecb0d1c47b7e5d7570e07356b1cbc06d..b6093bb8ef5750064baa897462e1011b5f94e841 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -37,6 +37,9 @@ map <F12> :g!/%.*/normal 0i%<Return>
 " <S-F12> remove comments in region
 map <S-F12> :g/%.*/normal 0x<Return>
 "
+" Completions in Insert/Replace-mode with <Ctrl-N>
+set dictionary-=~/.vim/lilypond.words dictionary+=~/.vim/lilypond.words
+set complete-=k complete+=k
 " errorformat for lily (with columns) and gcc
 " (how to see multiple-line error messages?)
 "