From 813ba6878323b57c6ebfb8d710ca33af031abed5 Mon Sep 17 00:00:00 2001
From: Valentin Villenave <valentin@villenave.net>
Date: Sun, 13 Dec 2015 09:10:17 +0100
Subject: [PATCH] Update syntax for (*location*) callbacks

---
 bin/macros.scm                        | 2 +-
 bin/text.scm                          | 4 ++--
 doc/snippets/meter-equivalences.ly    | 6 +++---
 doc/snippets/postfix-text-spanners.ly | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/macros.scm b/bin/macros.scm
index d162350..d56f9f4 100644
--- a/bin/macros.scm
+++ b/bin/macros.scm
@@ -69,7 +69,7 @@
           (mark-set (context-spec-music
               (make-property-set 'rehearsalMark equiv-mark)
               'Score)))
-         (ly:music-set-property! mark-ev 'origin location)
+         (ly:music-set-property! mark-ev 'origin (*location*))
          (ly:music-set-property! mark-ev 'label equiv-mark)
          mark-ch)))
 
diff --git a/bin/text.scm b/bin/text.scm
index 99726b3..2f32fd3 100644
--- a/bin/text.scm
+++ b/bin/text.scm
@@ -143,7 +143,7 @@
       ; this shouldn't be needed!!!
       (set! current-staff-position -4)
       (make-music 'ApplyOutputEvent
-                  'origin location
+                  'origin (*location*)
                   'context-type 'Voice
                   'procedure
                   (lambda (grob grob-origin context)
@@ -161,7 +161,7 @@
       ; this shouldn't be needed!!!
       (set! current-staff-position -1)
       (make-music 'ApplyOutputEvent
-                  'origin location
+                  'origin (*location*)
                   'context-type 'Voice
                   'procedure
                   (lambda (grob grob-origin context)
diff --git a/doc/snippets/meter-equivalences.ly b/doc/snippets/meter-equivalences.ly
index a146713..23b2557 100644
--- a/doc/snippets/meter-equivalences.ly
+++ b/doc/snippets/meter-equivalences.ly
@@ -1,4 +1,4 @@
-\version "2.14"
+\version "2.19"
 
 \header {
   texidoc = "When switching between time signatures, it is
@@ -15,7 +15,7 @@ between two written durations."
 #(use-modules (ice-9 regex))
 
 equiv =
-#(define-music-function (parser location str) (string?)
+#(define-music-function (str) (string?)
 
    (define (parse-my-duration duration-string)
   "Parse the `duration-string', e.g. ''4..'' or ''breve.'',
@@ -56,7 +56,7 @@ this function is whitespace-insensitive."
           (mark-set (context-spec-music
               (make-property-set 'rehearsalMark equiv-mark)
               'Score)))
-         (ly:music-set-property! mark-ev 'origin location)
+         (ly:music-set-property! mark-ev 'origin (*location*))
          (ly:music-set-property! mark-ev 'label equiv-mark)
          mark-ch))
 
diff --git a/doc/snippets/postfix-text-spanners.ly b/doc/snippets/postfix-text-spanners.ly
index e281caa..a5e879c 100644
--- a/doc/snippets/postfix-text-spanners.ly
+++ b/doc/snippets/postfix-text-spanners.ly
@@ -1,4 +1,4 @@
-\version "2.14"
+\version "2.19"
 
 \header {
   texidoc "The traditional way of printing text spanners in
@@ -29,7 +29,7 @@
 
 %% Wrapper for the make-text-span function
 #(define startText
-  (define-music-function (location parser txt) (markup?)
+  (define-music-function (txt) (markup?)
      (make-text-span txt)))
 
 %% for consistency only.
-- 
2.11.4.GIT