From 5ef76ceea2facb0c8dfe889ed319ff3e2955bb97 Mon Sep 17 00:00:00 2001
From: Sven Axelsson <sven@fronter.com>
Date: Sun, 16 Sep 2012 21:04:09 +0200
Subject: [PATCH] Updated support files to 2.16

---
 bagpipe_new.ly | 12 ++++++------
 cheatsheet.ly  |  2 +-
 format.ly      |  8 ++++----
 formatbook.ly  |  3 +--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bagpipe_new.ly b/bagpipe_new.ly
index a14bb1a..372a84f 100644
--- a/bagpipe_new.ly
+++ b/bagpipe_new.ly
@@ -7,7 +7,7 @@
   (http://www.murrays.nu)
 %}
 
-\version "2.12.0"
+\version "2.16.0"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -36,7 +36,7 @@ pitchnames = \pitchnamesBagpipe
 % flattened notes, the flat should be shown on all instances.
 bagpipeKey = {
     \key d \major
-    #(set-accidental-style 'forget)
+    \accidentalStyle "forget"
 }
 
 % Show the key signature e.g. for BMW compatibility.
@@ -133,13 +133,13 @@ marchTime = {
 
 % Add appropriate tweaks needed for piping grace notes to look great.
 stemspace = #(define-music-function (parser location extent) (pair?) #{
-    \once \override Staff.Stem #'X-extent = #$extent
+  \once \override Staff.Stem #'X-extent = #extent
 #})
 pgrace = #(define-music-function (parser location notes) (ly:music?) #{
   \override Score.GraceSpacing #'spacing-increment = #0
-   \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5)
-   \small \grace $notes \normalsize
-   \revert Score.Stem #'beamlet-default-length
+  \override Score.Stem #'beamlet-max-length-proportion = #'(0.5 . 0.5)
+  \small \grace $notes \normalsize
+  \revert Score.Stem #'beamlet-default-length
 #})
 
 % Single pgrace notes
diff --git a/cheatsheet.ly b/cheatsheet.ly
index 75b8982..d4dd6bb 100644
--- a/cheatsheet.ly
+++ b/cheatsheet.ly
@@ -2,7 +2,7 @@
     All of the bagpipe specific markup.
 %}
 
-\version "2.12.0"
+\version "2.16.0"
 
 #(ly:set-option 'point-and-click #f)
 
diff --git a/format.ly b/format.ly
index 6342cfd..f6d75a6 100644
--- a/format.ly
+++ b/format.ly
@@ -2,7 +2,7 @@
     Header formatting for bagpipe tunes. Customize to get your name in the tag line.
 %}
 
-\version "2.12.0"
+\version "2.16.0"
 
 % Bring in the time/date package. Set format to month day, year
 
@@ -30,9 +30,9 @@ today = #(date->string (current-date) "~B ~e, ~Y")
                 \fromproperty #'header:meter
                 \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
             }
-            #(ly:export (if (not (ly:get-option 'without-comment))
-                         (markup #:justify-field 'header:comment)
-                         (markup)))
+            $(if (not (ly:get-option 'without-comment))
+                 (markup #:justify-field 'header:comment)
+                 (markup))
         }
     }
 }
diff --git a/formatbook.ly b/formatbook.ly
index 69fa0d8..7908a78 100644
--- a/formatbook.ly
+++ b/formatbook.ly
@@ -2,7 +2,7 @@
     Header formatting for bagpipe tunes. Customize to get your name in the tag line.
 %}
 
-\version "2.12.0"
+\version "2.16.0"
 
 % Bring in the time/date package. Set format to month day, year
 
@@ -44,5 +44,4 @@ today = #(date->string (current-date) "~B ~e, ~Y")
         }
       }
     }
-
 }