From ff12cca9061ebf8d92d004169ebb3382fd8cb997 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Tue, 22 Nov 2011 16:07:17 +0100
Subject: [PATCH] convert-ly to latest lilypond version

---
 orchestrallily.ily | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/orchestrallily.ily b/orchestrallily.ily
index 0f9e264..3a781c6 100644
--- a/orchestrallily.ily
+++ b/orchestrallily.ily
@@ -1,4 +1,4 @@
-\version "2.13.17"
+\version "2.15.19"
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % OrchestralLily
@@ -933,7 +933,7 @@ createHeadline = #(define-music-function (parser location headline) (string?)
 
 newInstrument = #(define-music-function (parser location instr) (string?)
 #{
-  \set Voice.instrumentCueName = #$(string-join (list "+" instr))
+  \set Voice.instrumentCueName = #(string-join (list "+" instr))
 #}
 )
 cueText = #(define-music-function (parser location instr) (string?)
@@ -956,7 +956,7 @@ clearCueText = #(define-music-function (parser location) ()
 insertCueText = #(define-music-function (parser location instr) (string?)
   (if (string-null? instr)
     #{ \tag #'cued \clearCueText #}
-    #{ \tag #'cued \cueText #$instr #}
+    #{ \tag #'cued \cueText #instr #}
 ))
 
 % generate a cue music section with instrument names
@@ -969,19 +969,19 @@ insertCueText = #(define-music-function (parser location instr) (string?)
 %      the beginning of the cue notes and "Sop." at the end
 namedCueDuring = #(define-music-function (parser location cuevoice direction instrcue instr cuemusic) (string? number? string? string? ly:music?)
 #{
-  \cueDuring #$cuevoice #$direction {
-    \insertCueText #$instrcue
+  \cueDuring #cuevoice #direction {
+    \insertCueText #instrcue
     $cuemusic
-    \insertCueText #$instr
+    \insertCueText #instr
   }
 #}
 )
 namedTransposedCueDuring = #(define-music-function (parser location cuevoice direction instrcue instr trans cuemusic) (string? number? string? string? ly:music? ly:music?)
    #{
-     \transposedCueDuring #$cuevoice #$direction $trans {
-       \insertCueText #$instrcue
+     \transposedCueDuring #cuevoice #direction $trans {
+       \insertCueText #instrcue
        $cuemusic
-       \insertCueText #$instr
+       \insertCueText #instr
      }
    #}
 )
@@ -1007,10 +1007,10 @@ setClefCue = #(define-music-function (parser location instr clef)
 cleffedCueDuring = #(define-music-function (parser location cuevoice direction instrcue clefcue instr clefinstr cuemusic)
                                                         (string? number? string? ly:music? string? ly:music? ly:music?)
    #{
-     \cueDuring #$cuevoice #$direction {
-       \tag #'cued \setClefCue #$instrcue $clefcue
+     \cueDuring #cuevoice #direction {
+       \tag #'cued \setClefCue #instrcue $clefcue
        $cuemusic
-       \tag #'cued \setClefCue #$instr $clefinstr
+       \tag #'cued \setClefCue #instr $clefinstr
      }
    #}
 )
@@ -1027,10 +1027,10 @@ cleffedCueDuring = #(define-music-function (parser location cuevoice direction i
 namedCueDuringWithClef = #(define-music-function (parser location cuevoice direction instrcue clefcue instr cuemusic)
                                              (string? number? string? string? string? ly:music?)
    #{
-     \cueDuringWithClef #$cuevoice #$direction #$clefcue {
-       \insertCueText #$instrcue
+     \cueDuringWithClef #cuevoice #direction #clefcue {
+       \insertCueText #instrcue
        $cuemusic
-       \insertCueText #$instr
+       \insertCueText #instr
      }
    #}
 )
@@ -1590,11 +1590,11 @@ setCopyrightPages = #(define-music-function (parser location pages) (list?)
 
 
 startSlashedGraceMusic =  {
-  \override Stem  #'stroke-style = #"grace"
+  \override Flag #'stroke-style = #"grace"
 }
 
 stopSlashedGraceMusic =  {
-  \revert Stem #'stroke-style
+  \revert Flag #'stroke-style
 }
 
 slashedGrace =
@@ -1616,7 +1616,6 @@ slashedGrace =
   line-width = 17.5\cm
 %   bottom-margin = 1.5\cm
   top-margin = 0.7\cm
-%   after-title-space = 0.5\cm
   ragged-right = ##f
   ragged-last = ##f
   ragged-bottom = ##f
@@ -1828,34 +1827,34 @@ videEnd = \notemode {
   ragged-last-bottom = ##f
 
   top-markup-spacing #'minimum-distance = #5
-%   top-markup-spacing #'space = #4
+%   top-markup-spacing #'basic-distance = #4
 %   top-markup-spacing #'padding = #2
   top-markup-spacing #'stretchability = #15
 
   top-system-spacing #'minimum-distance = #0
-%   top-system-spacing #'space = #3
+%   top-system-spacing #'basic-distance = #3
   top-system-spacing #'padding = #2
   top-system-spacing #'stretchability = #13
   
   markup-system-spacing #'minimum-distance = #5
-%   markup-system-spacing #'space = #4
+%   markup-system-spacing #'basic-distance = #4
   markup-system-spacing #'padding = #3
   markup-system-spacing #'stretchability = #25
   
   system-system-spacing #'minimum-distance = #0
-%   system-system-spacing #'space = #5
+%   system-system-spacing #'basic-distance = #5
   system-system-spacing #'padding = #2
   system-system-spacing #'stretchability = #15
   
   last-bottom-spacing #'basic-distance = #3
-%   last-bottom-spacing #'space = #7
+%   last-bottom-spacing #'basic-distance = #7
   last-bottom-spacing #'padding = #4
   last-bottom-spacing #'stretchability = #14
 
-%   score-markup-spacing #'space = #5
+%   score-markup-spacing #'basic-distance = #5
 %   score-markup-spacing #'stretchability = #15
 
-%   markup-markup-spacing #'space = #5
+%   markup-markup-spacing #'basic-distance = #5
 %   markup-markup-spacing #'stretchability = #30
 }
 
-- 
2.11.4.GIT