Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / ly / music-functions-init.ly

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 35cf74296e27b2449533d4d4c1803630b7d786ca..05ed471320d93d629567448e51ef7afe8a035df8 100644 (file)
--- 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"
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -98,6 +98,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?)
@@ -387,6 +405,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 |
@@ -395,6 +415,7 @@ 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)
@@ -530,7 +551,7 @@ includePageLayoutFile =
         (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))))))
@@ -589,9 +610,8 @@ 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?)