X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fly-syntax-constructors.scm;h=6d0290d5f5a228783359740cd8d258c3a4aeb69d;hb=b551257a9d5d4bd1b57d32ac0cea4684260dfd83;hp=9e6325a1563b9897828eb8e8ebfa3e2cfac3fdb2;hpb=a3765e1d290e5e49093e7ca7791bf3fe20be1726;p=lilypond.git diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm index 9e6325a156..6d0290d5f5 100644 --- a/scm/ly-syntax-constructors.scm +++ b/scm/ly-syntax-constructors.scm @@ -1,12 +1,24 @@ -;;;; 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--2011 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? -(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 @@ -14,31 +26,37 @@ ;; 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) - (let ((m (apply fun (cons* parser loc args)))) +(define-ly-syntax (music-function parser loc pred fun args) + (let ((m (apply fun parser loc args))) (if (ly:music? m) + (set! (ly:music-property m 'origin) loc)) + (if (pred m) m - (begin - (ly:parser-error parser (_ "Music head function must return Music object") loc) - (make-music 'Music))))) + (cond ((eq? pred ly:music?) + (ly:parser-error parser (_ "Music syntax function must return Music object") loc) + (make-music 'Music 'origin loc)) + (else + (ly:parser-error parser + (format #f (_ "Scheme function must return ~a object") (type-name pred)) + loc) + #f))))) (define-ly-syntax-simple (void-music) (make-music 'Music)) @@ -74,39 +92,50 @@ 'numerator (car fraction) 'denominator (cdr fraction))) -(define-ly-syntax-simple (transpose-music pitch music) - (make-music 'TransposedMusic - 'element (ly:music-transpose music pitch))) - -(define-ly-syntax-simple (tempo duration tempo) - (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))) - 'Score)) - -(define-ly-syntax-simple (skip-music dur) - (make-music 'SkipMusic - 'duration dur)) +(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 (repeat type num body alts) (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) @@ -118,6 +147,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))) @@ -130,7 +165,9 @@ ((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) (if (list? (car args)) @@ -164,6 +201,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 @@ -194,3 +236,17 @@ '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 + 'origin location))) + + (if set + (make-sequential-music (list set ev)) + (begin + (set! (ly:music-property ev 'label) label) + ev))))