From c3447d531c6e7d637076e8e6d46bf16c30df7def Mon Sep 17 00:00:00 2001 From: Heikki Junes Date: Tue, 19 Nov 2002 15:11:15 +0000 Subject: [PATCH] add identifiers to modes --- ChangeLog | 7 ++ lilypond-mode.el | 11 +-- lilypond.words | 185 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 179 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index c560072359..8c1f5acd4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-11-19 Heikki Junes + + * lilypond-mode.el: LilyPond-imenu-generic-re: only alphabetic chars, + remove instructions (found in lilypond-init.el or Documentation). + + * lilypond.words: add identifiers. + 2002-11-19 Han-Wen Nienhuys * VERSION: 1.7.8 released diff --git a/lilypond-mode.el b/lilypond-mode.el index a9bd79f864..9cd62cb905 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -15,20 +15,13 @@ ;;; Inspired on auctex -;;; -;;; Add this to your ~/.emacs or ~/.emacs.el -;;; (load-library "lilypond-mode.el") -;;; (setq auto-mode-alist -;;; (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist)) -;;; - (load-library "lilypond-font-lock") (load-library "lilypond-indent") (require 'easymenu) (require 'compile) -(defconst LilyPond-version "1.7.6" +(defconst LilyPond-version "1.7.8" "`LilyPond-mode' version number.") (defconst LilyPond-help-address "bug-lilypond@gnu.org" @@ -717,7 +710,7 @@ command." )) )) -(defconst LilyPond-imenu-generic-re "^\\([a-zA-Z_][a-zA-Z0-9_]*\\) *=" +(defconst LilyPond-imenu-generic-re "^\\([a-zA-Z]+\\) *=" "Regexp matching Identifier definitions.") (defvar LilyPond-imenu-generic-expression diff --git a/lilypond.words b/lilypond.words index e0f023a68b..d3db65f251 100644 --- a/lilypond.words +++ b/lilypond.words @@ -5,27 +5,38 @@ \aeolian \alias \alternative -\alto +alto \apply +\archiGroup \arpeggio +\autoBeamOff +\autoBeamOn \autochange \bar -\baritone -\bass +baritone +\BarNumberingContext +bass +\bassiGroup \bcincipit \beamintervals \blend \break \breathe \broken +\cadenzaOff +\cadenzaOn \cg \ch \char +\ChoirStaffContext \chord \chordchordmodifiers \chordmodifiers +\ChordNamesContext \chords \chordstest +\clarinetti +\clarinettiStaff \clef \clipping \cm @@ -38,49 +49,78 @@ \contrabasso \cr \cresc +\CueVoiceContext \decr \default \denies \different \dirs \dorian +\dotsBoth +\dotsDown +\dotsUp \down \downbow \downmordent \downprall \duration +\dynamicBoth +\dynamicDown +\dynamicUp +\EasyNotation \eccentric \eg \elementdescriptions \embeddedps +\emptyText \endcresc +\endHorizScript \endincipit \ex \extreme \f -\F +F +\fagotti +\fagottiStaff +\fatText \fermata \ff \fff \ffff +\FiguredBassContext \figures \flageolet -\fold +\flauti +\flautiStaff +fold \font +\FontBody +\forgetAccidental \fp \fragment \fz -\G +G \gg \gliss \glissando \gmsus \grace +\GraceContext \grandstaff +\GrandStaffContext \grstaff +\hairyChord +\HaraKiriStaffContext \header +\hideStaffSwitch \hsize +\improOff +\improOn \include +\InnerChoirStaffContext +\InnerStaffContainerContext +\InnerStaffContext +\InnerStaffGroupContext \inversions \invisible \ionian @@ -88,28 +128,41 @@ \keys \keysignature \lag +\legniGroup \lheel \linebreak \lineprall \locrian \longa \lower +\lowerOctave +\lowerOne +\lowerVoice \ltoe \lydian \lyrics +\LyricsContext +\LyricsVoiceContext \major \marcato \mark \maxima \melisma +\melisma +\melismaEnd +\melodic +\melodicStaff \melody -\mezzosoprano +mezzosoprano \mf \midi \minor \mixolydian \mm \mm +\modernAccidental +\modernCautionaries +\modernVoiceCautionaries \monstrous \mp \multipart @@ -119,28 +172,44 @@ \name \names \newpage +\noBreak \noise \noisebeat +\noResetKey \normalkey \normalsize \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 -\percent +percent \phrygian +\Piano +\PianoStaff +\PianoStaffContext \pitch \pitchnames \pp @@ -155,26 +224,39 @@ \property \pt \quickmeasure +\quiteLongLyrics +\quiteLongLyricsStaff +\ratherLongLyrics +\ratherLongLyricsStaff \rc \rced \relative \remove \repeat \rest +\rests +\restsII \reverseturn \revert \rf \rfz \rheel \rhythm +\RhythmicStaffContext +\Rhytmic +\RhytmicStaff \right \rtoe \scale \scales \scheme \score +\ScoreContext \scpaper \script +\scriptBoth +\scriptDown +\scriptUp \scscore \sd \segno @@ -186,64 +268,137 @@ \sfff \sffff \sfz +\shiftI +\shiftII +\shiftIII +\shiftIV +\shiftOff +\shiftOn +\shiftOnn +\shiftOnnn +\shiftV \shortlong +\showStaffSwitch \simultaneous \singlepart \skip +\slurBoth +\slurDotted +\slurDown +\slurSolid +\slurUp \small \smarttranspose -\soprano +\somewhatLongLyrics +\somewhatLongLyricsStaff +soprano +\sostenutoBoth +\sostenutoDown +\sostenutoUp \sp \spanrequest +\specialKey \spp \sppp \spppp \staccatissimo \staccato +\StaffContainerContext +\StaffContext +\StaffGroupContext \staffheight +\staffOne \staffspace +\staffTwo \start +\stemBoth +\stemDown \steminvert +\stemUp \stop \stopped \stpaper \stscore \stuff \su +\sustainBoth +\sustainDown +\sustainUp \tab \tempo -\tenor +tenor \tenuto +\textI +\textII +\textIII \textscript \thenotes \thrd +\ThreadContext \threevoice \thumb +\tieBoth +\tieDotted +\tieDown +\tieSolid +\tieUp \tiltdown \tiltup \timb \time \times +\timpaniGroup \tiny \toeters \touch \translator \transpose -\treble -\tremolo +treble +\treCorde +\treCordeBoth +\treCordeDown +\treCordeUp +tremolo \trill +\tupletBoth +\tupletDown +\tupletUp \turn +\turnOff +\turnOn \twovoicesteminvert \type +\unaCorda +\unaCordaBoth +\unaCordaDown +\unaCordaUp \under -\unfold +unfold \unset \upmordent +\upperOctave +\upperOne +\upperVoice \version -\violin +\viloinII +\viloinIIStaff +\violeGroup +violin +\violinI +\violiniGroup +\violinIStaff \visible +\voiceB +\voiceC +\VoiceContext +\voiceD \voicedefault +\voiceE +\voiceFour +\voiceOne \voicesteminvert -\volta +\voiceThree +\voiceTwo +volta \vsize \x -- 2.39.5