X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fly-syntax-constructors.scm;h=82aee84d0a7190b1a9c0cdcec230f933d00d483b;hb=c22f75eaf6692b4498251f4d57fc5e7af9f79891;hp=8eefe63b714fd0cb3944a5dd38e5b083d500a38f;hpb=1c859650b6ff11a7dbe829328fd5cae3816b9231;p=lilypond.git

diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 8eefe63b71..82aee84d0a 100644
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -1,8 +1,19 @@
-;;;; ly-syntax-constructors.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 <mandolaerik@gmail.com>
+;;;; Copyright (C) 2006--2010 Erik Sandberg <mandolaerik@gmail.com>
+;;;;
+;;;; 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 <http://www.gnu.org/licenses/>.
 
 ;; TODO: use separate module for syntax
 ;; constructors. Also create wrapper around the constructor?
@@ -110,16 +121,17 @@
   (make-repeat type num body alts))
 
 (define (script-to-mmrest-text music)
-  "Extract 'direction and 'text from SCRIPT-MUSIC, and transform MultiMeasureTextEvent"
+  "Extract @code{'direction} and @code{'text} from @var{music}, and transform
+into a @code{MultiMeasureTextEvent}."
 
   (if (memq 'script-event (ly:music-property music 'types))
-      
-      (let*
-	  ((dir (ly:music-property music 'direction))
-	   (tags (ly:music-property music 'tags))
-	   (p   (make-music 'MultiMeasureTextEvent
-			     'tags tags
-			     'text (ly:music-property music 'text))))
+      (let* ((location (ly:music-property music 'origin))
+	     (dir (ly:music-property music 'direction))
+	     (tags (ly:music-property music 'tags))
+	     (p (make-music 'MultiMeasureTextEvent
+			    'origin location
+			    'tags tags
+			    'text (ly:music-property music 'text))))
 	(if (ly:dir? dir)
 	    (set! (ly:music-property p 'direction) dir))
 	p)
@@ -131,6 +143,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 +197,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
@@ -209,3 +232,30 @@
 					 'origin loc)))
 			 addlyrics-list)))
     (make-simultaneous-music (cons voice lyricstos))))
+
+(define-ly-syntax (make-mark-set parser location label)
+  "Make the music for the \\mark command."
+  (let* ((set (and (integer? label)
+		   (context-spec-music (make-property-set 'rehearsalMark label)
+				      'Score)))
+	 (ev (make-music 'MarkEvent))
+	 (ch (make-event-chord (list ev))))
+
+    (set! (ly:music-property ev 'origin) location)
+    (if set
+	(make-sequential-music (list set ch))
+	(begin
+	  (set! (ly:music-property ev 'label) label)
+	  ch))))
+
+(define-ly-syntax (partial parser location dur)
+  "Make a partial measure."
+
+  ;; We use `descend-to-context' here instead of `context-spec-music' to
+  ;; ensure \partial still works if the Timing_translator is moved
+    (descend-to-context
+     (context-spec-music (make-music 'PartialSet
+				     'origin location
+				     'partial-duration dur)
+			 'Timing)
+     'Score))