X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=2a8af551e98aaacd049907d738126b74c238958e;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=a1fafa63e35c5a142d3dbb764dd36eb614b27811;hpb=803e5864749fea2cd888525ebcf47fb94baeafd1;p=lilypond.git

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index a1fafa63e3..2a8af551e9 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,6 +1,6 @@
 % -*-Scheme-*-
 
-\version "2.9.12"
+\version "2.10.0"
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -9,24 +9,17 @@
 
 %% need SRFI-1 filter 
 
-#(use-modules (srfi srfi-1))  
-%% FIXME: guile-1.7 required?
-%#(use-modules (scm display-lily))invalid module name for use-syntax ((srfi srfi-39))
-
-#(use-modules (scm display-lily))
-#(display-lily-init parser)
-
+#(use-modules (srfi srfi-1))
 
 acciaccatura =
 #(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
 
-addquote =
+addQuote =
 #(define-music-function (parser location name music) (string? ly:music?)
-   "Add a piece of music to be quoted "
+   (_i "Add a piece of music to be quoted ")
    (add-quotable parser name music)
    (make-music 'SequentialMusic 'void #t))
 
-
 afterGraceFraction =
 #(cons 6 8)
 
@@ -104,6 +97,24 @@ applyContext =
                    'origin location
                    'procedure proc))
 
+
+balloonText =
+#(define-music-function (parser location offset text) (number-pair? markup?)
+   
+    (make-music 'AnnotateOutputEvent
+		'X-offset (car offset)
+		'Y-offset (cdr offset)
+		'text text))
+
+balloonGrobText =
+#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?)
+   
+    (make-music 'AnnotateOutputEvent
+		'symbol grob-name
+		'X-offset (car offset)
+		'Y-offset (cdr offset)
+		'text text))
+
 bar =
 #(define-music-function (parser location type)
    (string?)
@@ -141,8 +152,7 @@ bendAfter =
 clef =
 #(define-music-function (parser location type)
    (string?)
-   
-   "Set the current clef."
+   (_i "Set the current clef.")
 
    (make-clef-set type))
 
@@ -165,22 +175,22 @@ cueDuring =
 	      'quoted-voice-direction dir
 	      'origin location))
 
-
 displayLilyMusic =
 #(define-music-function (parser location music) (ly:music?)
-   (display-lily-music music)
+   (newline)
+   (display-lily-music music parser)
    music)
 
 displayMusic =
 #(define-music-function (parser location music) (ly:music?)
-		 (display-scheme-music music)
-		 music)
+   (newline)
+   (display-scheme-music music)
+   music)
 
 featherDurations=
 #(define-music-function (parser location factor argument) (ly:moment? ly:music?)
-
-   "Rearrange durations in ARGUMENT so there is an
-acceleration/deceleration. "
+   (_i "Rearrange durations in ARGUMENT so there is an
+acceleration/deceleration. ")
    
    (let*
        ((orig-duration (ly:music-length argument))
@@ -288,9 +298,9 @@ overrideProperty =
    (string? symbol? scheme?)
 
 
-   "Set @var{property} to @var{value} in all grobs named @var{name}.
+   (_i "Set @var{property} to @var{value} in all grobs named @var{name}.
 The @var{name} argument is a string of the form @code{\"Context.GrobName\"}
-or @code{\"GrobName\"}"
+or @code{\"GrobName\"}")
 
    (let*
        ((name-components (string-split name #\.))
@@ -330,7 +340,7 @@ removeWithTag =
 
 octave =
 #(define-music-function (parser location pitch-note) (ly:music?)
-   "octave check"
+   (_i "octave check")
 
    (make-music 'RelativeOctaveCheck
 	       'origin location
@@ -371,7 +381,7 @@ pitchedTrill =
    
 parenthesize =
 #(define-music-function (parser loc arg) (ly:music?)
-   "Tag @var{arg} to be parenthesized."
+   (_i "Tag @var{arg} to be parenthesized.")
 
    (set! (ly:music-property arg 'parenthesize) #t)
    arg)
@@ -381,7 +391,7 @@ parenthesize =
 
 parallelMusic =
 #(define-music-function (parser location voice-ids music) (list? ly:music?)
-  "Define parallel music sequences, separated by '|' (bar check signs),
+  (_i "Define parallel music sequences, separated by '|' (bar check signs),
 and assign them to the identifiers provided in @var{voice-ids}.
 
 @var{voice-ids}: a list of music identifiers (symbols containing only letters)
@@ -389,6 +399,8 @@ and assign them to the identifiers provided in @var{voice-ids}.
 @var{music}: a music sequence, containing BarChecks as limiting expressions.
 
 Example:
+
+@verbatim
   \\parallelMusic #'(A B C) {
     c c | d d | e e |
     d d | e e | f f |
@@ -397,7 +409,8 @@ Example:
   A = { c c | d d | }
   B = { d d | e e | }
   C = { e e | f f | }
-"
+@end verbatim
+")
   (let* ((voices (apply circular-list (make-list (length voice-ids) (list))))
          (current-voices voices)
          (current-sequence (list)))
@@ -484,7 +497,7 @@ resetRelativeOctave  =
 #(define-music-function
     (parser location reference-note)
     (ly:music?)
-    "Set the octave inside a \\relative section."
+    (_i "Set the octave inside a \\relative section.")
 
    (let*
     ((notes (ly:music-property reference-note 'elements))
@@ -502,8 +515,7 @@ resetRelativeOctave  =
 
 shiftDurations =
 #(define-music-function (parser location dur dots arg) (integer? integer? ly:music?)
-   ""
-
+   (_i "")
    
    (music-map
     (lambda (x)
@@ -511,12 +523,13 @@ shiftDurations =
 
 spacingTweaks =
 #(define-music-function (parser location parameters) (list?)
-   "Set the system stretch, by reading the 'system-stretch property of
-   the `parameters' assoc list."
+   (_i "Set the system stretch, by reading the 'system-stretch property of
+the `parameters' assoc list.")
    #{
       \overrideProperty #"Score.NonMusicalPaperColumn"
         #'line-break-system-details
-        #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters))))
+        #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters)))
+		(cons 'system-Y-extent (cdr (assoc 'system-Y-extent parameters))))
    #})
 
 %% Parser used to read page-layout file, and then retreive score tweaks.
@@ -524,15 +537,15 @@ spacingTweaks =
 
 includePageLayoutFile = 
 #(define-music-function (parser location) ()
-   "If page breaks and tweak dump is not asked, and the file
-   <basename>-page-layout.ly exists, include it."
+   (_i "If page breaks and tweak dump is not asked, and the file
+<basename>-page-layout.ly exists, include it.")
    (if (not (ly:get-option 'dump-tweaks))
        (let ((tweak-filename (format #f "~a-page-layout.ly"
 				     (ly:parser-output-name parser))))
 	 (if (access? tweak-filename R_OK)
 	     (begin
 	       (ly:message "Including tweak file ~a" tweak-filename)
-               (set! page-layout-parser (ly:clone-parser parser))
+               (set! page-layout-parser (ly:parser-clone parser))
 	       (ly:parser-parse-string page-layout-parser
                                        (format #f "\\include \"~a\""
                                                tweak-filename))))))
@@ -541,7 +554,7 @@ includePageLayoutFile =
 
 rightHandFinger =
 #(define-music-function (parser location finger) (number-or-string?)
-   "Define a StrokeFingerEvent"
+   (_i "Define a StrokeFingerEvent")
    
    (apply make-music
 	  (append
@@ -554,7 +567,7 @@ rightHandFinger =
 
 scoreTweak =
 #(define-music-function (parser location name) (string?)
-   "Include the score tweak, if exists."
+   (_i "Include the score tweak, if exists.")
    (if (and page-layout-parser (not (ly:get-option 'dump-tweaks)))
        (let ((tweak-music (ly:parser-lookup page-layout-parser
                                             (string->symbol name))))
@@ -568,11 +581,11 @@ transposedCueDuring =
   (parser location what dir pitch-note main-music)
   (string? ly:dir? ly:music? ly:music?)
 
-  "Insert notes from the part @var{what} into a voice called @code{cue},
+  (_i "Insert notes from the part @var{what} into a voice called @code{cue},
 using the transposition defined by @var{pitch-note}.  This happens
 simultaneously with @var{main-music}, which is usually a rest.  The
 argument @var{dir} determines whether the cue notes should be notated
-as a first or second voice."
+as a first or second voice.")
 
   (make-music 'QuoteMusic
 	      'element main-music
@@ -587,19 +600,17 @@ as a first or second voice."
 
 transposition =
 #(define-music-function (parser location pitch-note) (ly:music?)
-   "Set instrument transposition"
+   (_i "Set instrument transposition")
 
    (context-spec-music
     (make-property-set 'instrumentTransposition
-		       (ly:pitch-diff (ly:make-pitch 0 0 0) (pitch-of-note pitch-note)))
-        'Staff
-))
+		       (ly:pitch-negate (pitch-of-note pitch-note)))
+        'Staff))
 
 tweak = #(define-music-function (parser location sym val arg)
 	   (symbol? scheme? ly:music?)
 
-	   "Add @code{sym . val} to the @code{tweaks} property of @var{arg}."
-
+	   (_i "Add @code{sym . val} to the @code{tweaks} property of @var{arg}.")
 	   
 	   (set!
 	    (ly:music-property arg 'tweaks)
@@ -610,7 +621,7 @@ tweak = #(define-music-function (parser location sym val arg)
 tag = #(define-music-function (parser location tag arg)
    (symbol? ly:music?)
 
-   "Add @var{tag} to the @code{tags} property of @var{arg}."
+   (_i "Add @var{tag} to the @code{tags} property of @var{arg}.")
 
    (set!
     (ly:music-property arg 'tags)
@@ -627,7 +638,7 @@ unfoldRepeats =
 
 withMusicProperty =
 #(define-music-function (parser location sym val music) (symbol? scheme? ly:music?)
-   "Set @var{sym} to @var{val} in @var{music}."
+   (_i "Set @var{sym} to @var{val} in @var{music}.")
 
    (set! (ly:music-property music sym) val)
    music)