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 fa18af6ce7dd6270f4c909f1519aca3eb926aa0f..05ed471320d93d629567448e51ef7afe8a035df8 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -405,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 |
@@ -413,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)
@@ -548,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))))))
@@ -607,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?)