From: Nicolas Sceaux Date: Sun, 28 Nov 2004 17:01:19 +0000 (+0000) Subject: * scm/define-grob-properties.scm (all-user-grob-properties): fixed X-Git-Tag: release/2.5.14~482 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=82c6005ed2b61d3636e339b1fa742da343795d95;p=lilypond.git * scm/define-grob-properties.scm (all-user-grob-properties): fixed typo s/ly:dimension ?/ly:dimension?/ * input/regression/lily-in-scheme.ly: * input/regression/music-function.ly: * ly/spanners-init.ly (assertBeamSlope): * scm/music-functions.scm (def-grace-function): add the paper argument to music function definitions. --- diff --git a/ChangeLog b/ChangeLog index 24489e3e89..a396d438b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-11-28 Nicolas Sceaux + + * scm/define-grob-properties.scm (all-user-grob-properties): fixed + typo s/ly:dimension ?/ly:dimension?/ + + * input/regression/lily-in-scheme.ly: + * input/regression/music-function.ly: + * ly/spanners-init.ly (assertBeamSlope): + * scm/music-functions.scm (def-grace-function): add the paper + argument to music function definitions. + 2004-11-28 Han-Wen Nienhuys * input/regression/spacing-stick-out.ly: new file. diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index bea26a171f..88d3d4adb3 100644 --- a/input/regression/lily-in-scheme.ly +++ b/input/regression/lily-in-scheme.ly @@ -15,17 +15,17 @@ the @code{TextScript} grob. \version "2.4.0" \layout { raggedright = ##t } -withPaddingA = #(def-music-function (location padding music) (number? ly:music?) +withPaddingA = #(def-music-function (parser location padding music) (number? ly:music?) #{ \override TextScript #'padding = #$padding $music \revert TextScript #'padding #}) -withPaddingB = #(def-music-function (location padding music) (number? ly:music?) +withPaddingB = #(def-music-function (parser location padding music) (number? ly:music?) #{ \override TextScript #'padding = #$(* padding 2) $music \revert TextScript #'padding #}) -withPaddingC = #(def-music-function (location padding music) (number? ly:music?) +withPaddingC = #(def-music-function (parser location padding music) (number? ly:music?) #{ \override TextScript #'padding = #(+ 1 $(* padding 2)) $music \revert TextScript #'padding #}) diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index 259742869b..c904f6166c 100644 --- a/input/regression/music-function.ly +++ b/input/regression/music-function.ly @@ -9,14 +9,10 @@ demonstrate a @code{\myBar} function, which works similar to } \version "2.4.0" -#(define myBar - (ly:make-music-function - (list string?) - (lambda (where type) - (context-spec-music - (context-spec-music (make-property-set 'whichBar type) 'Timing) - 'Score)) - )) +myBar = #(def-music-function (parser location bar-type) (string?) + (context-spec-music + (context-spec-music (make-property-set 'whichBar bar-type) 'Timing) + 'Score)) \layout { raggedright = ##t } diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index e43cad0cca..4208aaddc3 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -93,7 +93,7 @@ sostenutoUp = #(make-span-event 'SostenutoEvent STOP) % for regression testing purposes. assertBeamQuant = -#(def-music-function (location l r) (pair? pair?) +#(def-music-function (parser location l r) (pair? pair?) (let* ((f (check-quant-callbacks l r))) #{ @@ -104,7 +104,7 @@ assertBeamQuant = % for regression testing purposes. assertBeamSlope = -#(def-music-function (location comp) (procedure?) +#(def-music-function (parser location comp) (procedure?) (let* ((f (check-slope-callbacks comp))) #{ diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index d416a9a21a..fca647c368 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -47,7 +47,7 @@ called first. The functions take a grob and axis argument. ") (align-dir ,ly:dir? "Which side to align? @code{-1}: left side, @code{0}: around center of width, @code{1}: right side.") (arch-angle ,number? "Turning angle of the hook of a system brace" ) - (arch-height ,ly:dimension ? "Height of the hook of a system brace.") + (arch-height ,ly:dimension? "Height of the hook of a system brace.") (arch-thick ,number? "Thickness of the hook of system brace.") (arch-width ,ly:dimension? "Width of the hook of a system brace.") (arpeggio-direction ,ly:dir? "If set, put an diff --git a/scm/music-functions.scm b/scm/music-functions.scm index d47de57077..1d8fa5bc00 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -555,7 +555,7 @@ without context specification. Called from parser." (defmacro-public def-grace-function (start stop) - `(def-music-function (location music) (ly:music?) + `(def-music-function (parser location music) (ly:music?) (make-music 'GraceMusic 'origin location 'element (make-music 'SequentialMusic @@ -566,7 +566,7 @@ without context specification. Called from parser." (defmacro-public def-music-function (args signature . body) "Helper macro for `ly:make-music-function'. Syntax: - (def-music-function (location arg1 arg2 ...) (arg1-type? arg2-type? ...) + (def-music-function (parser location arg1 arg2 ...) (arg1-type? arg2-type? ...) ...function body...) " `(ly:make-music-function (list ,@signature)