X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fly-syntax-constructors.scm;h=171cee12407e8bbb2ebf1f0c87b25d3ed3e0ce3f;hb=993cc2b89ca2b240e6cdcded9fe744be38a6faac;hp=98365930fefa16e2a1e8c4751b8196774206b290;hpb=3c8c7f97c35c3d424bb004d7c0fbd16af94d44cc;p=lilypond.git

diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 98365930fe..171cee1240 100644
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2006--2010 Erik Sandberg <mandolaerik@gmail.com>
+;;;; Copyright (C) 2006--2011 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
@@ -17,7 +17,8 @@
 
 ;; TODO: use separate module for syntax
 ;; constructors. Also create wrapper around the constructor?
-(define define-ly-syntax define-public)
+(defmacro define-ly-syntax (args . body)
+  `(define-public ,args ,(cons 'begin body)))
 
 ;; A ly-syntax constructor takes two extra parameters, parser and
 ;; location. These are mainly used for reporting errors and
@@ -25,22 +26,21 @@
 ;; location arg to set the origin of the returned music object; this
 ;; behaviour is usually desired
 (defmacro define-ly-syntax-loc (args . body)
-  (primitive-eval `(define-ly-syntax ,args
-		     (let ((m ,(cons 'begin body)))
-		       (set! (ly:music-property m 'origin) ,(third args))
-		       m))))
-
+  `(define-public ,args
+     (let ((m ,(cons 'begin body)))
+       (set! (ly:music-property m 'origin) ,(third args))
+       m)))
 ;; Like define-ly-syntax-loc, but adds parser and location
 ;; parameters. Useful for simple constructors that don't need to
 ;; report errors.
 (defmacro define-ly-syntax-simple (args . body)
-  (primitive-eval `(define-ly-syntax ,(cons* (car args) 
-					     'parser
-					     'location 
-					     (cdr args))
-		     (let ((m ,(cons 'begin body)))
-		       (set! (ly:music-property m 'origin) location)
-		       m))))
+  `(define-public ,(cons* (car args)
+			  'parser
+			  'location
+			  (cdr args))
+     (let ((m ,(cons 'begin body)))
+       (set! (ly:music-property m 'origin) location)
+       m)))
 
 ;; Music function: Apply function and check return value.
 (define-ly-syntax-loc (music-function parser loc fun args)
@@ -89,29 +89,34 @@
   (make-music 'TransposedMusic
   	      'element (ly:music-transpose music pitch)))
 
-(define-ly-syntax-simple (tempo text duration tempo)
-  (let ((props (list
-		  (make-property-set 'tempoWholesPerMinute
-			(ly:moment-mul (ly:make-moment tempo 1)
-				       (ly:duration-length duration)))
-		  (make-property-set 'tempoUnitDuration duration)
-		  (make-property-set 'tempoUnitCount tempo))))
-    (set! props (cons 
-            (if text (make-property-set 'tempoText text)
-                     (make-property-unset 'tempoText)) 
-            props))
-    (context-spec-music
-      (make-sequential-music props)
-      'Score)))
-
-(define-ly-syntax-simple (tempoText text)
-  (context-spec-music
-   (make-sequential-music
-    (list
-     (make-property-unset 'tempoUnitDuration)
-     (make-property-unset 'tempoUnitCount)
-     (make-property-set 'tempoText text)))
-   'Score))
+(define-ly-syntax (tempo parser location text . rest)
+  (let* ((unit (and (pair? rest)
+		    (car rest)))
+	 (count (and unit
+		     (cadr rest)))
+	 (range-tempo? (pair? count))
+	 (tempo-change (make-music 'TempoChangeEvent
+				   'origin location
+				   'text text
+				   'tempo-unit unit
+				   'metronome-count count))
+	 (tempo-set
+	  (and unit
+	       (context-spec-music
+		(make-property-set 'tempoWholesPerMinute
+				   (ly:moment-mul
+				    (ly:make-moment
+				     (if range-tempo?
+					 (round (/ (+ (car count) (cdr count))
+						   2))
+					 count)
+				     1)
+				    (ly:duration-length unit)))
+		'Score))))
+
+    (if tempo-set
+	(make-sequential-music (list tempo-change tempo-set))
+	tempo-change)))
 
 (define-ly-syntax-simple (skip-music dur)
   (make-music 'SkipMusic
@@ -247,3 +252,15 @@ into a @code{MultiMeasureTextEvent}."
 	(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))