Index: lilypond/ly/articulate.ly =================================================================== --- lilypond.orig/ly/articulate.ly 2011-04-20 10:56:54.797655857 +1000 +++ lilypond/ly/articulate.ly 2011-04-20 11:49:15.760881681 +1000 @@ -368,36 +368,22 @@ ((and (eq? factor ac:normalFactor) (or ac:inSlur ac:inPhrasingSlur)) (append actions (list 'articulation '(1 . 1)) )) (else (append actions (list 'articulation factor))))) ; else part (let ((e (car es)) (tail (cdr es))) (case (ly:music-property e 'name) ((BeamEvent) ; throw away beam events, or they'll be duplicated by turn or trill (loop factor newelements tail actions)) - ((LineBreakEvent) ; pass through linebreak events. - (loop (cons 1 1) (cons e newelements) tail actions)) - ((FingeringEvent) ; and fingering events too. - (loop factor newelements tail actions)) - - ((BreathingEvent) ; throw away BreathingEvent --- - ; should really shorten previous note a little. - (loop (cons 1 1) (cons e newelements) tail actions)) - - ((TieEvent) - (loop (cons 1 1) (cons e newelements) tail actions)) - - ((SkipEvent) - (loop (cons 1 1) (cons e newelements) tail actions)) - ((RestEvent) + ((LineBreakEvent FingeringEvent MarkEvent BreathingEvent TieEvent SkipEvent RestEvent) ; pass through some events. (loop (cons 1 1) (cons e newelements) tail actions)) ((ArticulationEvent) (let ((articname (ly:music-property e 'articulation-type))) ; TODO: add more here (cond ((string= articname "staccato") (loop ac:staccatoFactor newelements tail actions)) ((string= articname "staccatissimo") (loop ac:staccatissimoFactor newelements tail actions))