-;;;; 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 <mandolaerik@gmail.com>
+;;;; Copyright (C) 2006--2009 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?
(make-music 'TransposedMusic
'element (ly:music-transpose music pitch)))
-(define-ly-syntax-simple (tempo duration tempo)
+(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-set 'tempoWholesPerMinute
- (ly:moment-mul (ly:make-moment tempo 1)
- (ly:duration-length duration)))
- (make-property-set 'tempoUnitDuration duration)
- (make-property-set 'tempoUnitCount tempo)))
+ (make-property-unset 'tempoUnitDuration)
+ (make-property-unset 'tempoUnitCount)
+ (make-property-set 'tempoText text)))
'Score))
(define-ly-syntax-simple (skip-music dur)
(define (script-to-mmrest-text music)
"Extract 'direction and 'text from SCRIPT-MUSIC, and transform MultiMeasureTextEvent"
+
(if (memq 'script-event (ly:music-property music 'types))
- (let ((dir (ly:music-property music 'direction))
- (p (make-music 'MultiMeasureTextEvent
+ (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))))
(if (ly:dir? dir)
(set! (ly:music-property p 'direction) dir))
'duration duration
'origin location))
+(define-ly-syntax (repetition-chord parser location previous-chord repetition-function duration articulations)
+ (let ((new-chord (repetition-function previous-chord duration articulations)))
+ (set! (ly:music-property new-chord 'origin) location)
+ new-chord))
+
(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)))
((PropertySet) (list 'value (car args)))
((PropertyUnset) '())
((OverrideProperty) (list 'grob-value (car args)
- 'grob-property-path (cdr args)
+ 'grob-property-path (if (list? (cadr args))
+ (cadr args)
+ (cdr args))
'pop-first #t))
- ((RevertProperty) (list 'grob-property-path args))
+ ((RevertProperty)
+ (if (list? (car args))
+ (list 'grob-property-path (car args))
+ (list 'grob-property-path args)))
(else (ly:error (_ "Invalid property operation ~a") music-type))))
(oprops (if once (cons* 'once once props) props))
(m (apply make-music music-type