X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fly-syntax-constructors.scm;h=2a2629fab3247a5a495164d43a082b275fb918f0;hb=cd848b99438940ebb8a74dcaaa51840267a5ef9f;hp=ee798233611a6a65361f1fae414962848a9f3cfa;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm index ee79823361..2a2629fab3 100644 --- a/scm/ly-syntax-constructors.scm +++ b/scm/ly-syntax-constructors.scm @@ -1,8 +1,19 @@ -;;;; define-syntax.scm -- Defines functions for syntax expressions +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2006 Erik Sandberg +;;;; Copyright (C) 2006--2010 Erik Sandberg +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . ;; TODO: use separate module for syntax ;; constructors. Also create wrapper around the constructor? @@ -131,6 +142,12 @@ 'duration duration 'origin location)) +(define-ly-syntax (repetition-chord parser location previous-chord repetition-function duration articulations) + (make-music 'RepeatedChord + 'original-chord previous-chord + 'element (repetition-function previous-chord location duration articulations) + 'origin location)) + (define-ly-syntax-simple (context-specification type id mus ops create-new) (let* ((type-sym (if (symbol? type) type (string->symbol type))) (csm (context-spec-music mus type-sym id))) @@ -179,6 +196,11 @@ (call-with-output-string (lambda (p) (format p "uniqueContext~s" unique-counter)))) (define (lyric-combine-music sync music loc) + ;; CompletizeExtenderEvent is added following the last lyric in MUSIC + ;; to signal to the Extender_engraver that any pending extender should + ;; be completed if the lyrics end before the associated voice. + (append! (ly:music-property music 'elements) + (list (make-music 'CompletizeExtenderEvent))) (make-music 'LyricCombineMusic 'element music 'associated-context sync