Use '\\' for keywords and identifiers in lilypond.words.

diff --git a/ChangeLog b/ChangeLog
index c4fc9f3d9e40a6e15c7aa3e7e4f7a1400650dbdd..60163968e427ae962aecb389d1f8f6deee0049b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * lilypond-mode.el (LilyPond-autocompletion): deletes end-of-word,
        inserts try-completion and shows all-completions.
+
+       * lilypond.words: '\' -> '\\'
        
 2002-11-22  Heikki Junes <hjunes@cc.hut.fi>
 

diff --git a/lilypond-mode.el b/lilypond-mode.el
index 1cf8b3742c087da1fb85e59567b6a5dc68640819..cdc36101bbded170816ab0e645bd65ef863918a2 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -661,7 +661,8 @@ command."
   (setq i 0)
   (setq ch (char-before (- (point) i)))
   (while (or (and (>= ch 65) (<= ch 90)) 
-            (and (>= ch 97) (<= ch 122))) ; add [A-Z,a-z] until non-alpha
+            (and (>= ch 97) (<= ch 122)) 
+            (= ch 92)) ; add [A-Za-z\\] until non-alpha
     (setq beg (concat (char-to-string ch) beg))
     (setq i (+ i 1))
     (setq ch (char-before (- (point) i)))

diff --git a/lilypond.words b/lilypond.words
index 643d21e68a1b80d41561886fa2e5634222ec36e3..6f1adf05246aabae87f078e5f51ceb328446a0eb 100644 (file)
--- a/lilypond.words
+++ b/lilypond.words
@@ -1,436 +1,436 @@
-\accent
-\accepts
+\\accent
+\\accepts
 Accidental 
-\accompany
-\addlyrics
-\aeolian
-\alias
-\alternative
+\\accompany
+\\addlyrics
+\\aeolian
+\\alias
+\\alternative
 alto
-\apply
-\archiGroup
-\arpeggio
-\autoBeamOff
-\autoBeamOn
+\\apply
+\\archiGroup
+\\arpeggio
+\\autoBeamOff
+\\autoBeamOn
 autoBeamSettings 
-\autochange
-\bar
+\\autochange
+\\bar
 baritone
 BarLine 
-\BarNumberingContext
+\\BarNumberingContext
 bass
-\bassiGroup
-\bcincipit
+\\bassiGroup
+\\bcincipit
 Beam
-\beamintervals
-\blend
-\break
-\breathe
-\broken
-\cadenzaOff
-\cadenzaOn
-\cg
-\ch
-\char
+\\beamintervals
+\\blend
+\\break
+\\breathe
+\\broken
+\\cadenzaOff
+\\cadenzaOn
+\\cg
+\\ch
+\\char
 ChoirStaff
-\ChoirStaffContext
-\chord
-\chordchordmodifiers
-\chordmodifiers
+\\ChoirStaffContext
+\\chord
+\\chordchordmodifiers
+\\chordmodifiers
 ChordName
 ChordName
-\ChordNamesContext
-\chords
-\chordstest
-\clarinetti
-\clarinettiStaff
-\clef
-\clipping
-\cm
-\coda
-\commandspanrequest
-\complex
-\consists
-\consistsend
-\context
-\contrabasso
-\cr
-\cresc
-\CueVoiceContext
-\decr
-\default
-\denies
-\different
-\dirs
-\dorian
+\\ChordNamesContext
+\\chords
+\\chordstest
+\\clarinetti
+\\clarinettiStaff
+\\clef
+\\clipping
+\\cm
+\\coda
+\\commandspanrequest
+\\complex
+\\consists
+\\consistsend
+\\context
+\\contrabasso
+\\cr
+\\cresc
+\\CueVoiceContext
+\\decr
+\\default
+\\denies
+\\different
+\\dirs
+\\dorian
 Dots
-\dotsBoth
-\dotsDown
-\dotsUp
-\down
-\downbow
-\downmordent
-\downprall
-\duration
-\dynamicBoth
-\dynamicDown
+\\dotsBoth
+\\dotsDown
+\\dotsUp
+\\down
+\\downbow
+\\downmordent
+\\downprall
+\\duration
+\\dynamicBoth
+\\dynamicDown
 DynamicText
-\dynamicUp
-\EasyNotation
-\eccentric
-\eg
-\elementdescriptions
-\embeddedps
-\emptyText
-\endcresc
-\endHorizScript
-\endincipit
-\ex
-\extreme
-\f
+\\dynamicUp
+\\EasyNotation
+\\eccentric
+\\eg
+\\elementdescriptions
+\\embeddedps
+\\emptyText
+\\endcresc
+\\endHorizScript
+\\endincipit
+\\ex
+\\extreme
+\\f
 F
-\fagotti
-\fagottiStaff
-\fatText
-\fermata
-\ff
-\fff
-\ffff
+\\fagotti
+\\fagottiStaff
+\\fatText
+\\fermata
+\\ff
+\\fff
+\\ffff
 FiguredBass
-\FiguredBassContext
-\figures
-\flageolet
-\flauti
-\flautiStaff
+\\FiguredBassContext
+\\figures
+\\flageolet
+\\flauti
+\\flautiStaff
 fold
-\font
-\FontBody
-\forgetAccidental
-\fp
-\fragment
-\fz
+\\font
+\\FontBody
+\\forgetAccidental
+\\fp
+\\fragment
+\\fz
 G
-\gg
-\gliss
-\glissando
-\gmsus
-\grace
+\\gg
+\\gliss
+\\glissando
+\\gmsus
+\\grace
 Grace
-\GraceContext
-\grandstaff
+\\GraceContext
+\\grandstaff
 GrandStaff
-\GrandStaffContext
-\grstaff
+\\GrandStaffContext
+\\grstaff
 Hairpin
-\hairyChord
-\HaraKiriStaffContext
-\header
-\hideStaffSwitch
-\hsize
-\improOff
-\improOn
-\include
+\\hairyChord
+\\HaraKiriStaffContext
+\\header
+\\hideStaffSwitch
+\\hsize
+\\improOff
+\\improOn
+\\include
 InnerChoirStaff
-\InnerChoirStaffContext
-\InnerStaffContainerContext
-\InnerStaffContext
-\InnerStaffGroupContext
-\inversions
-\invisible
-\ionian
-\key
-\keys
-\keysignature
-\lag
-\legniGroup
-\lheel
-\linebreak
-\lineprall
-\locrian
-\longa
-\lower
-\lowerOctave
-\lowerOne
-\lowerVoice
-\ltoe
-\lydian
-\lyrics
+\\InnerChoirStaffContext
+\\InnerStaffContainerContext
+\\InnerStaffContext
+\\InnerStaffGroupContext
+\\inversions
+\\invisible
+\\ionian
+\\key
+\\keys
+\\keysignature
+\\lag
+\\legniGroup
+\\lheel
+\\linebreak
+\\lineprall
+\\locrian
+\\longa
+\\lower
+\\lowerOctave
+\\lowerOne
+\\lowerVoice
+\\ltoe
+\\lydian
+\\lyrics
 Lyrics
-\LyricsContext
-\LyricsVoiceContext
-\major
-\marcato
-\mark
-\maxima
-\melisma
-\melisma
-\melismaEnd
-\melodic
-\melodicStaff
-\melody
+\\LyricsContext
+\\LyricsVoiceContext
+\\major
+\\marcato
+\\mark
+\\maxima
+\\melisma
+\\melisma
+\\melismaEnd
+\\melodic
+\\melodicStaff
+\\melody
 mezzosoprano
-\mf
-\midi
-\minor
-\mixolydian
-\mm
-\mm
-\modernAccidental
-\modernCautionaries
-\modernVoiceCautionaries
-\monstrous
-\mp
-\multipart
-\music
-\musicalpitch
-\n
-\name
-\names
-\newpage
-\noBreak
-\noise
-\noisebeat
-\noResetKey
-\normalkey
-\normalsize
+\\mf
+\\midi
+\\minor
+\\mixolydian
+\\mm
+\\mm
+\\modernAccidental
+\\modernCautionaries
+\\modernVoiceCautionaries
+\\monstrous
+\\mp
+\\multipart
+\\music
+\\musicalpitch
+\\n
+\\name
+\\names
+\\newpage
+\\noBreak
+\\noise
+\\noisebeat
+\\noResetKey
+\\normalkey
+\\normalsize
 NoteHead
-\notenames
+\\notenames
 NoteNames
-\NoteNamesContext
-\notes
-\nt
-\oboi
-\oboiStaff
-\one
-\onestaff
-\open
-\OrchestralPartStaffContext
-\OrchestralScoreContext
-\ottoniGroup
-\outputproperty
-\over
-\override
-\p
-\paper
-\paperEleven
-\paperSixteen
-\paperThirteen
-\paperTwentysix
-\paperTwentySix
-\part
-\partcombine
-\partial
-\pbow
-\penalty
+\\NoteNamesContext
+\\notes
+\\nt
+\\oboi
+\\oboiStaff
+\\one
+\\onestaff
+\\open
+\\OrchestralPartStaffContext
+\\OrchestralScoreContext
+\\ottoniGroup
+\\outputproperty
+\\over
+\\override
+\\p
+\\paper
+\\paperEleven
+\\paperSixteen
+\\paperThirteen
+\\paperTwentysix
+\\paperTwentySix
+\\part
+\\partcombine
+\\partial
+\\pbow
+\\penalty
 percent
-\phrygian
-\Piano
+\\phrygian
+\\Piano
 PianoStaff
-\PianoStaff
-\PianoStaffContext
-\pitch
-\pitchnames
-\pp
-\pper
-\ppp
-\pprall
-\prall
-\pralldown
-\prallmordent
-\prallprall
-\prallup
-\property
-\pt
-\quickmeasure
-\quiteLongLyrics
-\quiteLongLyricsStaff
-\ratherLongLyrics
-\ratherLongLyricsStaff
-\rc
-\rced
-\relative
-\remove
-\repeat
-\rest
-\rests
-\restsII
-\reverseturn
-\revert
-\rf
-\rfz
-\rheel
-\rhythm
+\\PianoStaff
+\\PianoStaffContext
+\\pitch
+\\pitchnames
+\\pp
+\\pper
+\\ppp
+\\pprall
+\\prall
+\\pralldown
+\\prallmordent
+\\prallprall
+\\prallup
+\\property
+\\pt
+\\quickmeasure
+\\quiteLongLyrics
+\\quiteLongLyricsStaff
+\\ratherLongLyrics
+\\ratherLongLyricsStaff
+\\rc
+\\rced
+\\relative
+\\remove
+\\repeat
+\\rest
+\\rests
+\\restsII
+\\reverseturn
+\\revert
+\\rf
+\\rfz
+\\rheel
+\\rhythm
 RhythmicStaff
-\RhythmicStaffContext
-\Rhytmic
-\RhytmicStaff
-\right
-\rtoe
-\scale
-\scales
-\scheme
-\score
+\\RhythmicStaffContext
+\\Rhytmic
+\\RhytmicStaff
+\\right
+\\rtoe
+\\scale
+\\scales
+\\scheme
+\\score
 Score
-\ScoreContext
-\scpaper
-\script
-\scriptBoth
-\scriptDown
-\scriptUp
-\scscore
-\sd
-\segno
-\sequential
-\set
-\settings
-\sf
-\sff
-\sfff
-\sffff
-\sfz
-\shiftI
-\shiftII
-\shiftIII
-\shiftIV
-\shiftOff
-\shiftOn
-\shiftOnn
-\shiftOnnn
-\shiftV
-\shortlong
-\showStaffSwitch
-\simultaneous
-\singlepart
-\skip
+\\ScoreContext
+\\scpaper
+\\script
+\\scriptBoth
+\\scriptDown
+\\scriptUp
+\\scscore
+\\sd
+\\segno
+\\sequential
+\\set
+\\settings
+\\sf
+\\sff
+\\sfff
+\\sffff
+\\sfz
+\\shiftI
+\\shiftII
+\\shiftIII
+\\shiftIV
+\\shiftOff
+\\shiftOn
+\\shiftOnn
+\\shiftOnnn
+\\shiftV
+\\shortlong
+\\showStaffSwitch
+\\simultaneous
+\\singlepart
+\\skip
 Slur
-\slurBoth
-\slurDotted
-\slurDown
-\slurSolid
-\slurUp
-\small
-\smarttranspose
-\somewhatLongLyrics
-\somewhatLongLyricsStaff
+\\slurBoth
+\\slurDotted
+\\slurDown
+\\slurSolid
+\\slurUp
+\\small
+\\smarttranspose
+\\somewhatLongLyrics
+\\somewhatLongLyricsStaff
 soprano
-\sostenutoBoth
-\sostenutoDown
-\sostenutoUp
-\sp
+\\sostenutoBoth
+\\sostenutoDown
+\\sostenutoUp
+\\sp
 SpacingSpanner
-\spanrequest
-\specialKey
-\spp
-\sppp
-\spppp
-\staccatissimo
-\staccato
+\\spanrequest
+\\specialKey
+\\spp
+\\sppp
+\\spppp
+\\staccatissimo
+\\staccato
 Staff
-\StaffContainerContext
-\StaffContext
-\StaffGroupContext
-\staffheight
-\staffOne
-\staffspace
+\\StaffContainerContext
+\\StaffContext
+\\StaffGroupContext
+\\staffheight
+\\staffOne
+\\staffspace
 StaffSymbol
-\staffTwo
-\start
+\\staffTwo
+\\start
 Stem
-\stemBoth
-\stemDown
-\steminvert
-\stemUp
-\stop
-\stopped
-\stpaper
-\stscore
-\stuff
-\su
-\sustainBoth
-\sustainDown
-\sustainUp
+\\stemBoth
+\\stemDown
+\\steminvert
+\\stemUp
+\\stop
+\\stopped
+\\stpaper
+\\stscore
+\\stuff
+\\su
+\\sustainBoth
+\\sustainDown
+\\sustainUp
 System
 SystemStartDelimiter
-\tab
+\\tab
 TabStaff
-\tempo
+\\tempo
 tenor
-\tenuto
-\textI
-\textII
-\textIII
-\textscript
+\\tenuto
+\\textI
+\\textII
+\\textIII
+\\textscript
 TextScript 
-\thenotes
-\thrd
-\ThreadContext
-\threevoice
-\thumb
-\tieBoth
-\tieDotted
-\tieDown
-\tieSolid
-\tieUp
-\tiltdown
-\tiltup
-\timb
-\time
-\times
+\\thenotes
+\\thrd
+\\ThreadContext
+\\threevoice
+\\thumb
+\\tieBoth
+\\tieDotted
+\\tieDown
+\\tieSolid
+\\tieUp
+\\tiltdown
+\\tiltup
+\\timb
+\\time
+\\times
 TimeSignature 
-\timpaniGroup
-\tiny
-\toeters
-\touch
-\translator
-\transpose
+\\timpaniGroup
+\\tiny
+\\toeters
+\\touch
+\\translator
+\\transpose
 treble
-\treCorde
-\treCordeBoth
-\treCordeDown
-\treCordeUp
+\\treCorde
+\\treCordeBoth
+\\treCordeDown
+\\treCordeUp
 tremolo
-\trill
-\tupletBoth
-\tupletDown
-\tupletUp
-\turn
-\turnOff
-\turnOn
-\twovoicesteminvert
-\type
-\unaCorda
-\unaCordaBoth
-\unaCordaDown
-\unaCordaUp
-\under
+\\trill
+\\tupletBoth
+\\tupletDown
+\\tupletUp
+\\turn
+\\turnOff
+\\turnOn
+\\twovoicesteminvert
+\\type
+\\unaCorda
+\\unaCordaBoth
+\\unaCordaDown
+\\unaCordaUp
+\\under
 unfold
-\unset
-\upmordent
-\upperOctave
-\upperOne
-\upperVoice
-\version
+\\unset
+\\upmordent
+\\upperOctave
+\\upperOne
+\\upperVoice
+\\version
 VerticalAlignment
-\viloinII
-\viloinIIStaff
-\violeGroup
+\\viloinII
+\\viloinIIStaff
+\\violeGroup
 violin
-\violinI
-\violiniGroup
-\violinIStaff
-\visible
+\\violinI
+\\violiniGroup
+\\violinIStaff
+\\visible
 Voice
-\voiceB
-\voiceC
-\VoiceContext
-\voiceD
-\voicedefault
-\voiceE
-\voiceFour
-\voiceOne
-\voicesteminvert
-\voiceThree
-\voiceTwo
+\\voiceB
+\\voiceC
+\\VoiceContext
+\\voiceD
+\\voicedefault
+\\voiceE
+\\voiceFour
+\\voiceOne
+\\voicesteminvert
+\\voiceThree
+\\voiceTwo
 volta
-\vsize
-\x
+\\vsize
+\\x