Run update-with-convert-ly, and run convert-ly manually on scm/*.scm

diff --git a/Documentation/cs/usage/running.itely b/Documentation/cs/usage/running.itely
index 9c70ff117e59214403dd6dde33f4fd06cae145d7..2b9a699605378eae9916ffbde5ec494de41daacb 100644 (file)
--- a/Documentation/cs/usage/running.itely
+++ b/Documentation/cs/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Pavel Fric
 
@@ -236,7 +236,7 @@ Scheme-Code das System gefährden kann, wie etwa in folgendem Beispiel:
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/de/extending/scheme-tutorial.itely b/Documentation/de/extending/scheme-tutorial.itely
index af64437be2c8e2d5fc063015b79b36b0650a3ae5..0c0d5ca033b76b075b2a3f53c54da34244820216 100644 (file)
--- a/Documentation/de/extending/scheme-tutorial.itely
+++ b/Documentation/de/extending/scheme-tutorial.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @node Scheme-Übung
 @chapter Scheme-Übung
@@ -785,7 +785,7 @@ Anstatt @code{\twice} zu definieren, könne man also auch schreiben:
 
 @example
 ...
-@{ #(ly:export (make-sequential-music (list newLa))) @}
+@{ $(make-sequential-music (list newLa)) @}
 @end example
 
 Scheme-Code wird sofort interpretiert, wenn der Parser darauf stößt.  Um
@@ -1415,7 +1415,7 @@ TODO Find a simple example
 @lilypond[quote,verbatim,ragged-right]
 padText = #(define-music-function (parser location padding) (number?)
 #{
-  \once \override TextScript #'padding = #$padding
+  \once \override TextScript #'padding = #padding
 #})
 
 \relative c''' {

diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely
index 1f9d87dc6958b7343d177380696acd055c52069d..3b4281201945db8d9faf67b507317695fd87015c 100644 (file)
--- a/Documentation/de/notation/pitches.itely
+++ b/Documentation/de/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Till Paala
 
@@ -1501,7 +1501,7 @@ soll.  Diese Funktion kann man wie folgt benutzen:
 
 @example
 \new Staff <<
-  #(set-accidental-style 'voice)
+  $(set-accidental-style 'voice)
   @{ @dots{} @}
 >>
 @end example
@@ -1516,7 +1516,7 @@ Um etwa den neuen Stil in allen Systemen einer
 Stimmgruppe (@code{StaffGroup}) zu benutzen, müsste der Befehl so aussehen:
 
 @example
-#(set-accidental-style 'voice 'StaffGroup)
+$(set-accidental-style 'voice 'StaffGroup)
 @end example
 
 Folgende Versetzungszeichenstile sind unterstützt.
@@ -1559,11 +1559,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1579,7 +1579,7 @@ in beiden Systemen benutzt werden soll:
   <<
     \context Staff = "up" @{
       %%% change the next line as desired:
-      #(set-accidental-style 'default 'Score)
+      $(set-accidental-style 'default 'Score)
       \musicA
     @}
     \context Staff = "down" @{
@@ -1641,11 +1641,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1718,11 +1718,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicB
     }
   >>
@@ -1786,11 +1786,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicB
     }
   >>
@@ -1848,11 +1848,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicB
     }
   >>
@@ -1915,11 +1915,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicB
     }
   >>
@@ -1976,11 +1976,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2040,7 +2040,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano)
+      $(set-accidental-style 'piano)
       \musicA
     }
     \context Staff = "down" {
@@ -2098,7 +2098,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano-cautionary)
+      $(set-accidental-style 'piano-cautionary)
       \musicA
     }
     \context Staff = "down" {
@@ -2157,11 +2157,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicB
     }
   >>
@@ -2215,11 +2215,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicB
     }
   >>
@@ -2277,11 +2277,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicB
     }
   >>
@@ -2335,11 +2335,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2395,11 +2395,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicB
     }
   >>
@@ -2457,12 +2457,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicB
     }
   >>
@@ -2517,11 +2517,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicB
     }
   >>
@@ -2577,11 +2577,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicB
     }
   >>
@@ -2627,7 +2627,7 @@ Klammer kein Auflösungszeichen:
 
 @lilypond[quote]
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2644,12 +2644,12 @@ die den Versetzungszeichenstil kurzzeitig auf @code{forget} umschaltet:
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   $music
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
 #})
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2

diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely
index 41551e7194e55aa21314a916ffddd726a3a8e3d6..f45c15388046e1aa7d1cbae98b08f603493ab1fa 100644 (file)
--- a/Documentation/de/notation/rhythms.itely
+++ b/Documentation/de/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Till Paala
 
@@ -3418,9 +3418,9 @@ MyCadenza = \relative c' {
     \MyCadenza c'1
   }
   \new Staff {
-    #(ly:export (mmrest-of-length MyCadenza))
+    $(mmrest-of-length MyCadenza)
     c'1
-    #(ly:export (skip-of-length MyCadenza))
+    $(skip-of-length MyCadenza)
     c'1
   }
 >>

diff --git a/Documentation/de/usage/running.itely b/Documentation/de/usage/running.itely
index 9df05196d858c3211e0f53f94dc6c3d61ac646b7..0c02b68cc4f94791d266e88f1349d760f4d5099f 100644 (file)
--- a/Documentation/de/usage/running.itely
+++ b/Documentation/de/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Reinhold Kainhofer, Till Paala
 @c Translation checkers: Till Paala
@@ -237,7 +237,7 @@ Scheme-Code das System gefährden kann, wie etwa in folgendem Beispiel:
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/es/extending/programming-interface.itely b/Documentation/es/extending/programming-interface.itely
index 0a5336b488d158525f552e99135f027622c6bf23..2538cb61f6759ccbe33925941ee383fb23514c86 100644 (file)
--- a/Documentation/es/extending/programming-interface.itely
+++ b/Documentation/es/extending/programming-interface.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.15.17"
+@c \version "2.15.18"
 
 @node Interfaces para programadores
 @chapter Interfaces para programadores
@@ -846,8 +846,8 @@ Ahora el código nuevo es como se ve a continuación:
                 (box-padding 0.6))
   "Trazar un rectángulo doble rodeando el texto."
   (interpret-markup layout props
-    #@{\markup \override #`(box-padding . ,$inter-box-padding) \box
-               \override #`(box-padding . ,$box-padding) \box
+    #@{\markup \override #`(box-padding . ,inter-box-padding) \box
+               \override #`(box-padding . ,box-padding) \box
                @{ $text @} #@}))
 @end lisp
 
@@ -883,8 +883,8 @@ y el relleno de los rectángulos se puede personalizar:
                 (box-padding 0.6))
   "Draw a double box around text."
   (interpret-markup layout props
-    #{\markup \override #`(box-padding . ,$inter-box-padding) \box
-              \override #`(box-padding . ,$box-padding) \box
+    #{\markup \override #`(box-padding . ,inter-box-padding) \box
+              \override #`(box-padding . ,box-padding) \box
               { $text } #}))
 
 \markup \double-box A
@@ -1001,7 +1001,7 @@ del argumento @code{props}.
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
    #:properties ((par-indent 2))
    (interpret-markup-list layout props
-     #@{\markuplist \justified-lines @{ \hspace #$par-indent $args @} #@}))
+     #@{\markuplist \justified-lines @{ \hspace #par-indent $args @} #@}))
 @end example
 
 

diff --git a/Documentation/es/extending/scheme-tutorial.itely b/Documentation/es/extending/scheme-tutorial.itely
index 956b81fd8b561bdc842f8246e1c83050ab92b6b6..f506feac175df97d7e07ce9f161914969cd67002 100644 (file)
--- a/Documentation/es/extending/scheme-tutorial.itely
+++ b/Documentation/es/extending/scheme-tutorial.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @node Tutorial de Scheme
 @appendix Tutorial de Scheme
@@ -798,7 +798,7 @@ sido introducido en la sintaxis de LilyPond.  En lugar de definir
 
 @example
 ...
-@{ #(ly:export (make-sequential-music (list newLa))) @}
+@{ $(make-sequential-music (list newLa)) @}
 @end example
 
 El código de Scheme se evalúa tan pronto como el analizador sintáctico
@@ -1417,7 +1417,7 @@ TODO Find a simple example
 @lilypond[quote,verbatim,ragged-right]
 padText = #(define-music-function (parser location padding) (number?)
 #{
-  \once \override TextScript #'padding = #$padding
+  \once \override TextScript #'padding = #padding
 #})
 
 \relative c''' {

diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely
index b6c3f5040523a2087c205bd4d9bfb0d429c214db..ac273601c99caf4a21f85bb19416cae01f0134b9 100644 (file)
--- a/Documentation/es/notation/pitches.itely
+++ b/Documentation/es/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 
 @node Alturas
@@ -1481,7 +1481,7 @@ qué estilo de alteraciones usar.  Esta función se invoca como sigue:
 
 @example
 \new Staff <<
-  #(set-accidental-style 'voice)
+  $(set-accidental-style 'voice)
   @{ @dots{} @}
 >>
 @end example
@@ -1495,7 +1495,7 @@ usar el mismo estilo en todos los pentagramas del @code{StaffGroup} en
 curso, use
 
 @example
-#(set-accidental-style 'voice 'StaffGroup)
+$(set-accidental-style 'voice 'StaffGroup)
 @end example
 
 Están contemplados los siguientes estilos de alteración.  Para dar una
@@ -1537,11 +1537,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1556,7 +1556,7 @@ dos pentagramas.
   <<
     \context Staff = "up" @{
       %%% cambie la línea siguiente como desee:
-      #(set-accidental-style 'default 'Score)
+      $(set-accidental-style 'default 'Score)
       \musicA
     @}
     \context Staff = "down" @{
@@ -1618,11 +1618,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1692,11 +1692,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicB
     }
   >>
@@ -1757,11 +1757,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicB
     }
   >>
@@ -1819,11 +1819,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicB
     }
   >>
@@ -1884,11 +1884,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicB
     }
   >>
@@ -1945,11 +1945,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2009,7 +2009,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano)
+      $(set-accidental-style 'piano)
       \musicA
     }
     \context Staff = "down" {
@@ -2030,7 +2030,7 @@ musicB = {
 
 @funindex piano-cautionary
 
-Igual que @code{#(set-accidental-style 'piano)} pero con las
+Igual que @code{$(set-accidental-style 'piano)} pero con las
 alteraciones añadidas compuestas como de precaución.
 
 @lilypond[quote]
@@ -2069,7 +2069,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano-cautionary)
+      $(set-accidental-style 'piano-cautionary)
       \musicA
     }
     \context Staff = "down" {
@@ -2128,11 +2128,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicB
     }
   >>
@@ -2185,11 +2185,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicB
     }
   >>
@@ -2246,11 +2246,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicB
     }
   >>
@@ -2303,11 +2303,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2362,11 +2362,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicB
     }
   >>
@@ -2424,12 +2424,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicB
     }
   >>
@@ -2483,11 +2483,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicB
     }
   >>
@@ -2542,11 +2542,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicB
     }
   >>
@@ -2595,7 +2595,7 @@ natural de la casilla de segunda vez no necesita becuadro:
 
 @lilypond[quote]
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2612,12 +2612,12 @@ cambie localmente el estilo de alteraciones a @code{forget}:
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   $music
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
 #})
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2

diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely
index 6a3b8bb072bbb4a69b2fd1233b4018e21509e11d..95114ff993dd947603d6d88ef566ce93831553a4 100644 (file)
--- a/Documentation/es/notation/rhythms.itely
+++ b/Documentation/es/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @node Duraciones
 @section Duraciones
@@ -3422,9 +3422,9 @@ MyCadenza = \relative c' {
     \MyCadenza c'1
   }
   \new Staff {
-    #(ly:export (mmrest-of-length MyCadenza))
+    $(mmrest-of-length MyCadenza)
     c'1
-    #(ly:export (skip-of-length MyCadenza))
+    $(skip-of-length MyCadenza)
     c'1
   }
 >>

diff --git a/Documentation/es/usage/running.itely b/Documentation/es/usage/running.itely
index 50dc21ba2d718e78ab34c4a2244394816b2338e5..4c6de3af5802ece0955124f9133c4e4be1a53bf5 100644 (file)
--- a/Documentation/es/usage/running.itely
+++ b/Documentation/es/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 
 @node Ejecutar LilyPond
@@ -224,7 +224,7 @@ por ejemplo
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/extending/programming-interface.itely b/Documentation/extending/programming-interface.itely
index 87c6505c0f2124838571f47fc9cf938449e8d07e..e4948f1b6253e3311858e6abc21bbaace4706d6f 100644 (file)
--- a/Documentation/extending/programming-interface.itely
+++ b/Documentation/extending/programming-interface.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.17"
+@c \version "2.15.18"
 
 @node Interfaces for programmers
 @chapter Interfaces for programmers
@@ -814,8 +814,8 @@ now as follows:
                 (box-padding 0.6))
   "Draw a double box around text."
   (interpret-markup layout props
-    #@{\markup \override #`(box-padding . ,$inter-box-padding) \box
-               \override #`(box-padding . ,$box-padding) \box
+    #@{\markup \override #`(box-padding . ,inter-box-padding) \box
+               \override #`(box-padding . ,box-padding) \box
                @{ $text @} #@}))
 @end lisp
 
@@ -850,8 +850,8 @@ customized:
                 (box-padding 0.6))
   "Draw a double box around text."
   (interpret-markup layout props
-    #{\markup \override #`(box-padding . ,$inter-box-padding) \box
-              \override #`(box-padding . ,$box-padding) \box
+    #{\markup \override #`(box-padding . ,inter-box-padding) \box
+              \override #`(box-padding . ,box-padding) \box
               { $text } #}))
 
 \markup \double-box A
@@ -958,7 +958,7 @@ indented.  The indent width is taken from the @code{props} argument.
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
    #:properties ((par-indent 2))
    (interpret-markup-list layout props
-     #@{\markuplist \justified-lines @{ \hspace #$par-indent $args @} #@}))
+     #@{\markuplist \justified-lines @{ \hspace #par-indent $args @} #@}))
 @end example
 
 

diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely
index 4c180538f5e9ed8246bfbb821063fdb0341f825d..b5db818d653f8a15d2680e0cb108e4d5ba543a24 100644 (file)
--- a/Documentation/extending/scheme-tutorial.itely
+++ b/Documentation/extending/scheme-tutorial.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @node Scheme tutorial
 @chapter Scheme tutorial
@@ -761,7 +761,7 @@ been written as
 
 @example
 ...
-@{ #(ly:export (make-sequential-music (list newLa))) @}
+@{ $(make-sequential-music (list newLa)) @}
 @end example
 
 Scheme code is evaluated as soon as the parser encounters it.  To
@@ -1357,7 +1357,7 @@ TODO Find a simple example
 @lilypond[quote,verbatim,ragged-right]
 padText = #(define-music-function (parser location padding) (number?)
 #{
-  \once \override TextScript #'padding = #$padding
+  \once \override TextScript #'padding = #padding
 #})
 
 \relative c''' {

diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely
index 55f7598182c76fdf6989db016abbac17f4a97a75..f0377bb61d89d2238d1e3f340c64b706faae2603 100644 (file)
--- a/Documentation/fr/notation/pitches.itely
+++ b/Documentation/fr/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Frédéric Chiasson
 @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude
@@ -1213,7 +1213,7 @@ suivante@tie{}:
 
 @example
 \new Staff <<
-  #(set-accidental-style 'voice)
+  $(set-accidental-style 'voice)
   @{ @dots{} @}
 >>
 @end example
@@ -1227,7 +1227,7 @@ utiliser, pour que toutes les portées d'un même système -- contexte
 @code{StaffGroup} -- soient soumises à la même règle@tie{}:
 
 @example
-#(set-accidental-style 'voice 'StaffGroup)
+$(set-accidental-style 'voice 'StaffGroup)
 @end example
 
 Nous vous présentons ci-après les différentes régles d'altération prises
@@ -1270,11 +1270,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1289,7 +1289,7 @@ dernières lignes de cet exemple nous intéressent.
   <<
     \context Staff = "haut" @{
       %%% voici la ligne à modifier en conséquence :
-      #(set-accidental-style 'default 'Score)
+      $(set-accidental-style 'default 'Score)
       \musicA
     @}
     \context Staff = "bas" @{
@@ -1351,11 +1351,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1423,11 +1423,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicB
     }
   >>
@@ -1484,11 +1484,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicB
     }
   >>
@@ -1546,11 +1546,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicB
     }
   >>
@@ -1613,11 +1613,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicB
     }
   >>
@@ -1673,11 +1673,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicB
     }
   >>
@@ -1736,7 +1736,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano)
+      $(set-accidental-style 'piano)
       \musicA
     }
     \context Staff = "down" {
@@ -1793,7 +1793,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano-cautionary)
+      $(set-accidental-style 'piano-cautionary)
       \musicA
     }
     \context Staff = "down" {
@@ -1851,11 +1851,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicB
     }
   >>
@@ -1908,11 +1908,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicB
     }
   >>
@@ -1972,11 +1972,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicB
     }
   >>
@@ -2027,11 +2027,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2086,11 +2086,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicB
     }
   >>
@@ -2148,12 +2148,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicB
     }
   >>
@@ -2206,11 +2206,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicB
     }
   >>
@@ -2266,11 +2266,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicB
     }
   >>
@@ -2319,7 +2319,7 @@ la seconde alternative ne nécessite pas son bécarre.
 
 @lilypond[quote]
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2336,12 +2336,12 @@ L'astuce suivante, qui définit temporairement le recours au style
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   $music
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
 #})
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2

diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely
index 11a3341be4765b8388f4e3327dc235f398c988e5..c91e1591d8a0159151158124b94e54f7b7d89d55 100644 (file)
--- a/Documentation/fr/notation/rhythms.itely
+++ b/Documentation/fr/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Frédéric Chiasson, Jean-Charles Malahieude
 @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude,
@@ -3418,9 +3418,9 @@ MyCadenza = \relative c' {
     \MyCadenza c'1
   }
   \new Staff {
-    #(ly:export (mmrest-of-length MyCadenza))
+    $(mmrest-of-length MyCadenza)
     c'1
-    #(ly:export (skip-of-length MyCadenza))
+    $(skip-of-length MyCadenza)
     c'1
   }
 >>

diff --git a/Documentation/fr/usage/running.itely b/Documentation/fr/usage/running.itely
index c78ed83aa0af89f73d8d1530c9b645fffcd4aa8c..9206d191be64862e0fb72009afdb9f9e45c47772 100644 (file)
--- a/Documentation/fr/usage/running.itely
+++ b/Documentation/fr/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Jean-Charles Malahieude
 @c Translation checkers:
@@ -239,7 +239,7 @@ quelque chose du style
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely
index 5c4718283ec5fe1e43a61c5e21a0fad959a40607..9f64392269f699f929642643893166eb5460df42 100644 (file)
--- a/Documentation/hu/learning/fundamental.itely
+++ b/Documentation/hu/learning/fundamental.itely
@@ -10,7 +10,7 @@
 
 
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c \version "2.14.0"
+@c \version "2.15.18"
 @node Alapfogalmak
 @chapter Alapfogalmak
 @translationof Fundamental concepts
@@ -3122,7 +3122,7 @@ can think of these as functions).
 padText =
 #(define-music-function (parser location padding) (number?)
   #{
-    \once \override TextScript #'padding = #$padding
+    \once \override TextScript #'padding = #padding
   #})
 
 \relative c''' {

diff --git a/Documentation/hu/usage/running.itely b/Documentation/hu/usage/running.itely
index 1808f69c467fafe3d9353a09aa2302bd6b99055b..e817d0bae122ab9fee03eb3dcecb6711e7c259c3 100644 (file)
--- a/Documentation/hu/usage/running.itely
+++ b/Documentation/hu/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 
 @node A lilypond használata
@@ -183,7 +183,7 @@ kárt okozzon. Például:
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/it/usage/running.itely b/Documentation/it/usage/running.itely
index 5d492b40a5551de0212c00ca05b8608d17172611..d75f8ab99f33c7f086d4adcc0991c2285be03d64 100644 (file)
--- a/Documentation/it/usage/running.itely
+++ b/Documentation/it/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 
 @node Eseguire lilypond
@@ -221,7 +221,7 @@ scempio, ad esempio
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/ja/notation/pitches.itely b/Documentation/ja/notation/pitches.itely
index 44969233aa0918a9d6395c38d8e10f3828e48e3b..c37ea0d36a55e16dd0d4115a666056346f1853a6 100644 (file)
--- a/Documentation/ja/notation/pitches.itely
+++ b/Documentation/ja/notation/pitches.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -1513,7 +1513,7 @@ LilyPond はどの臨時記号スタイルを使用するのかを指定する
 
 @example
 \new Staff <<
-  #(set-accidental-style 'voice)
+  $(set-accidental-style 'voice)
   @{ @dots{} @}
 >>
 @end example
@@ -1528,7 +1528,7 @@ LilyPond はどの臨時記号スタイルを使用するのかを指定する
 以下のようにします:
 
 @example
-#(set-accidental-style 'voice 'StaffGroup)
+$(set-accidental-style 'voice 'StaffGroup)
 @end example
 
 サポートされる臨時記号スタイルを以下で示します。@c
@@ -1570,11 +1570,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1589,7 +1589,7 @@ musicB = {
   <<
     \context Staff = "up" @{
       %%% 次の行を変更したいスタイルに合わせて変更してください:
-      #(set-accidental-style 'default 'Score)
+      $(set-accidental-style 'default 'Score)
       \musicA
     @}
     \context Staff = "down" @{
@@ -1652,11 +1652,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1724,11 +1724,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicB
     }
   >>
@@ -1789,11 +1789,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicB
     }
   >>
@@ -1853,11 +1853,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicB
     }
   >>
@@ -1921,11 +1921,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicB
     }
   >>
@@ -1983,11 +1983,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2049,7 +2049,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano)
+      $(set-accidental-style 'piano)
       \musicA
     }
     \context Staff = "down" {
@@ -2108,7 +2108,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano-cautionary)
+      $(set-accidental-style 'piano-cautionary)
       \musicA
     }
     \context Staff = "down" {
@@ -2172,11 +2172,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicB
     }
   >>
@@ -2229,11 +2229,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicB
     }
   >>
@@ -2289,11 +2289,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicB
     }
   >>
@@ -2346,11 +2346,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2408,11 +2408,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicB
     }
   >>
@@ -2472,12 +2472,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicB
     }
   >>
@@ -2532,11 +2532,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicB
     }
   >>
@@ -2593,11 +2593,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicB
     }
   >>
@@ -2651,7 +2651,7 @@ musicB = {
 
 @lilypond[quote]
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2668,12 +2668,12 @@ musicB = {
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   $music
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
 #})
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2

diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely
index af15ccadca6bd8c729faa37a4592fecfabb43a33..3573a199f997999efa4a4f54adea37a0f8fda360 100644 (file)
--- a/Documentation/ja/notation/rhythms.itely
+++ b/Documentation/ja/notation/rhythms.itely
@@ -6,7 +6,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -3266,9 +3266,9 @@ MyCadenza = \relative c' {
     \MyCadenza c'1
   }
   \new Staff {
-    #(ly:export (mmrest-of-length MyCadenza))
+    $(mmrest-of-length MyCadenza)
     c'1
-    #(ly:export (skip-of-length MyCadenza))
+    $(skip-of-length MyCadenza)
     c'1
   }
 >>

diff --git a/Documentation/ja/usage/running.itely b/Documentation/ja/usage/running.itely
index 01c60ad00b7cd5e0c3b70997e323643d8c8e665c..4fbf4e9fc650965f4064e5146a7b40ca0828a2c1 100644 (file)
--- a/Documentation/ja/usage/running.itely
+++ b/Documentation/ja/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -224,7 +224,7 @@ Web サーバを通じて LilyPond フォーマットが利用可能な場合、
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/Documentation/ly-examples/aucun-snippet.ly b/Documentation/ly-examples/aucun-snippet.ly
index 3dd1a642edbf2487afd5a8cf6973d9e5afa860b2..9fb71c8c085b7326f221a36583d0d4e04effcdde 100644 (file)
--- a/Documentation/ly-examples/aucun-snippet.ly
+++ b/Documentation/ly-examples/aucun-snippet.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 \include "example-header.ily"
 
 \paper {
@@ -136,21 +136,21 @@ thick y-factor offset)
 pair?)
 #{
 \once \override Voice.Stem #'text = \markup {
-    \postscript #(let ((x-off (car $offset))
-                       (y-off (cdr $offset)))
+    \postscript #(let ((x-off (car offset))
+                       (y-off (cdr offset)))
     (string-append
-    (ly:number->string (car $offset)) " " (ly:number->string (cdr $offset)) "
+    (ly:number->string (car offset)) " " (ly:number->string (cdr offset)) "
 translate "
-    (ly:number->string $angle) " rotate "
+    (ly:number->string angle) " rotate "
     (ly:number->string (- x-off)) " "
     (ly:number->string (- y-off)) " translate 0 setlinewidth "
-    (ly:number->string (- x-off $len-left))  " " (ly:number->string (+ y-off
-$thick)) " moveto "
-    (ly:number->string (- x-off $len-left))  " " (ly:number->string y-off)
-                                             " " (ly:number->string $thick) "
+    (ly:number->string (- x-off len-left))  " " (ly:number->string (+ y-off
+thick)) " moveto "
+    (ly:number->string (- x-off len-left))  " " (ly:number->string y-off)
+                                             " " (ly:number->string thick) "
 90 270 arc "
-    (ly:number->string (+ x-off $len-right)) " " (ly:number->string y-off)
-                                             " " (ly:number->string $thick) "
+    (ly:number->string (+ x-off len-right)) " " (ly:number->string y-off)
+                                             " " (ly:number->string thick) "
 270 90 arc "
                                              " gsave fill grestore stroke")) }
 
@@ -162,8 +162,8 @@ $thick)) " moveto "
     (ly:stencil-add
         sten1
         (ly:stencil-translate sten2
-                              (cons 0 (+ (* $y-factor (cdr extent1))
-                                         (* (- 1 $y-factor) (car extent1))))))))
+                              (cons 0 (+ (* y-factor (cdr extent1))
+                                         (* (- 1 y-factor) (car extent1))))))))
 #})
 
 

diff --git a/Documentation/ly-examples/bach-bwv610.ly b/Documentation/ly-examples/bach-bwv610.ly
index 27659dfd6b97be3792cbc2ff4a0726a16427a214..15f072811e0fb1809086d3a937bddfd85d82020c 100644 (file)
--- a/Documentation/ly-examples/bach-bwv610.ly
+++ b/Documentation/ly-examples/bach-bwv610.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 %\include "example-header.ily"
 
 
@@ -30,7 +30,7 @@
 global = {
    \key c \minor
    \time 4/4
-   #(set-accidental-style 'default)
+   $(set-accidental-style 'default)
 }
 
 halsup = {

diff --git a/Documentation/ly-examples/cary-layout.ily b/Documentation/ly-examples/cary-layout.ily
index 67bc65936d9af8926fd6e9f459ce8f860217b123..97030d53df056ecc13a4ecd851f16702f09e683d 100644 (file)
--- a/Documentation/ly-examples/cary-layout.ily
+++ b/Documentation/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.14.0"
+\version "2.15.18"
 
 \layout {
   indent = #0
@@ -57,18 +57,18 @@ sffpp = #(make-dynamic-script "sffpp")
 beam = #(define-music-function (parser location left right) (number? number?)
        (cond ((and (= left 0) (> right 0))
                        #{
-                               \set stemRightBeamCount = #$right
+                               \set stemRightBeamCount = #right
                        #})
 
                        ((and (> left 0) (= right 0))
                        #{
-                               \set stemLeftBeamCount = #$left
+                               \set stemLeftBeamCount = #left
                        #})
 
                        (else
                        #{
-                               \set stemLeftBeamCount = #$left
-                               \set stemRightBeamCount = #$right
+                               \set stemLeftBeamCount = #left
+                               \set stemRightBeamCount = #right
                        #})
        )
 )

diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 901546a36401997cfa159d8832a9c10df1974152..a4c1b667c6f53b49b9d7644a40af9a3c96fe7cf9 100644 (file)
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 
 @node Pitches
@@ -1453,7 +1453,7 @@ accidental style to use.  This function is called as follows:
 
 @example
 \new Staff <<
-  #(set-accidental-style 'voice)
+  $(set-accidental-style 'voice)
   @{ @dots{} @}
 >>
 @end example
@@ -1466,7 +1466,7 @@ scope the style should be changed.  For example, to use the same
 style in all staves of the current @code{StaffGroup}, use:
 
 @example
-#(set-accidental-style 'voice 'StaffGroup)
+$(set-accidental-style 'voice 'StaffGroup)
 @end example
 
 The following accidental styles are supported.  To demonstrate
@@ -1509,11 +1509,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1529,7 +1529,7 @@ both staves.
   <<
     \context Staff = "up" @{
       %%% change the next line as desired:
-      #(set-accidental-style 'default 'Score)
+      $(set-accidental-style 'default 'Score)
       \musicA
     @}
     \context Staff = "down" @{
@@ -1592,11 +1592,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'default)
+      $(set-accidental-style 'default)
       \musicB
     }
   >>
@@ -1665,11 +1665,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'voice)
+      $(set-accidental-style 'voice)
       \musicB
     }
   >>
@@ -1731,11 +1731,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern)
+      $(set-accidental-style 'modern)
       \musicB
     }
   >>
@@ -1795,11 +1795,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-cautionary)
+      $(set-accidental-style 'modern-cautionary)
       \musicB
     }
   >>
@@ -1862,11 +1862,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice)
+      $(set-accidental-style 'modern-voice)
       \musicB
     }
   >>
@@ -1923,11 +1923,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'modern-voice-cautionary)
+      $(set-accidental-style 'modern-voice-cautionary)
       \musicB
     }
   >>
@@ -1988,7 +1988,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano)
+      $(set-accidental-style 'piano)
       \musicA
     }
     \context Staff = "down" {
@@ -2048,7 +2048,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'piano-cautionary)
+      $(set-accidental-style 'piano-cautionary)
       \musicA
     }
     \context Staff = "down" {
@@ -2107,11 +2107,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern)
+      $(set-accidental-style 'neo-modern)
       \musicB
     }
   >>
@@ -2164,11 +2164,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-cautionary)
+      $(set-accidental-style 'neo-modern-cautionary)
       \musicB
     }
   >>
@@ -2224,11 +2224,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice)
+      $(set-accidental-style 'neo-modern-voice)
       \musicB
     }
   >>
@@ -2281,11 +2281,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'neo-modern-voice-cautionary)
+      $(set-accidental-style 'neo-modern-voice-cautionary)
       \musicB
     }
   >>
@@ -2341,11 +2341,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'dodecaphonic)
+      $(set-accidental-style 'dodecaphonic)
       \musicB
     }
   >>
@@ -2403,12 +2403,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      #(set-accidental-style 'teaching)
+      $(set-accidental-style 'teaching)
       \musicB
     }
   >>
@@ -2463,11 +2463,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'no-reset)
+      $(set-accidental-style 'no-reset)
       \musicB
     }
   >>
@@ -2522,11 +2522,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicA
     }
     \context Staff = "down" {
-      #(set-accidental-style 'forget)
+      $(set-accidental-style 'forget)
       \musicB
     }
   >>
@@ -2571,7 +2571,7 @@ not need a natural sign:
 
 @lilypond[quote]
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2
@@ -2588,12 +2588,12 @@ the accidental style to @code{forget}:
 
 @lilypond[verbatim,quote]
 forget = #(define-music-function (parser location music) (ly:music?) #{
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   $music
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
 #})
 {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \time 2/4
   \repeat volta 2 {
     c'2

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 89232888ae7c622a17a4f62611e40e0bc37e1a96..5e51e76c92c0061d9062cf3ea9f0278624ed32de 100644 (file)
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 @node Rhythms
 @section Rhythms
@@ -3317,9 +3317,9 @@ MyCadenza = \relative c' {
     \MyCadenza c'1
   }
   \new Staff {
-    #(ly:export (mmrest-of-length MyCadenza))
+    $(mmrest-of-length MyCadenza)
     c'1
-    #(ly:export (skip-of-length MyCadenza))
+    $(skip-of-length MyCadenza)
     c'1
   }
 >>

diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
index 6c45f34517fbe3da98e5936b5c0e73bfc9c0781e..85bd8f74300374e39b66ace4dcdcd5c4884e4250 100644 (file)
--- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
+++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "staff-notation, vocal-music"
@@ -93,7 +93,7 @@ cueWhile =
    (parser location instrument name dir music)
    (string? string? ly:dir? ly:music?)
    #{
-     \cueDuring $instrument #$dir {
+     \cueDuring $instrument #dir {
        \once \override TextScript #'self-alignment-X = #RIGHT
        \once \override TextScript #'direction = $dir
        s1*0-\markup { \tiny $name }

diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index 1b4670ff3beaab7665ffda1189d13fd679fa1c57..76e2517ce6e14190ecf63a99bee074ddab9bcc36 100644 (file)
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "world-music"
@@ -50,7 +50,7 @@ of what could be the start of a hijaz improvisation:
 
 \relative sol' {
   \key re \kurd
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   \cadenzaOn
   sol4 sol sol sol fad mib sol1 fad8 mib re4. r8 mib1 fad sol
 }

diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index ec2898abb4f34a5d0cd4ac73b49462e79570e38c..0cc650f2e331665e918dbd02d9d0b8551e11a8ca 100644 (file)
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "expressive-marks, text"
@@ -37,7 +37,7 @@ hairpinWithCenteredText =
      (ly:stencil-combine-at-edge
       (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER)
       Y DOWN
-      (ly:stencil-aligned-to (grob-interpret-markup grob $text) X CENTER))
+      (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER))
      X LEFT))
 #})
 

diff --git a/Documentation/snippets/chords-headword.ly b/Documentation/snippets/chords-headword.ly
index fea2567b950f0518802356702ef79a16a94c3e22..e433dc1bab7d49b118fee42d79a22fef5c6e3584 100644 (file)
--- a/Documentation/snippets/chords-headword.ly
+++ b/Documentation/snippets/chords-headword.ly
@@ -5,7 +5,7 @@
 %
 % This file is in the public domain.
 %% Note: this file works from version 2.14.0
-\version "2.14.0"
+\version "2.15.18"
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f
@@ -85,7 +85,7 @@ Bass = {
     \context Staff = lower {
       \new Voice {
         \clef bass
-        #(set-accidental-style 'modern-cautionary)
+        $(set-accidental-style 'modern-cautionary)
         <<
           \Tenor
           \Bass

diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index 69d604559ca3b1827e43a9e2a1cac853f306fe3b..b1bcc610b2e715533c585113293d441fea34d88f 100644 (file)
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -5,7 +5,7 @@
 %
 % This file is in the public domain.
 %% Note: this file works from version 2.14.0
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
 %% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb
@@ -116,7 +116,7 @@ is grouped according to the default setting in
     g8 g d d g g a( bes g) |
     \set Timing.beatStructure = #'(2 2 2 3)
     g8 g d d g g a( bes g) |
-    #(set-time-signature 9 8 '(4 5))
+    $(set-time-signature 9 8 '(4 5))
     g8 g d d g g a( bes g) |
     \time 5/8
     a4. g4 |

diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly
index 186483797e6b28a3148ed85080b3e30aba4e72a9..a130cce278d890de7499affd4c06269a5547e68e 100644 (file)
--- a/Documentation/snippets/fretted-headword.ly
+++ b/Documentation/snippets/fretted-headword.ly
@@ -10,7 +10,7 @@
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.14.0"
+\version "2.15.18"
 
 #(set-global-staff-size 15)
 \paper {
@@ -49,7 +49,7 @@ ssnor = \set stringNumberOrientations = #'(right)
 % define fingering offset
 FO = #(define-music-function (parser location offsetX offsetY) (number? number?)
 #{
-  \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY)
+  \once \override Voice.Fingering #'extra-offset = #(cons offsetX offsetY)
 #})
 
 % markups

diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index 001940a0fed5d7852673a53fe0f62c906d434d4e..2b3706cb1688af565e839d78c38543be1eca6a33 100644 (file)
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "pitches"
@@ -33,9 +33,8 @@ get different random note patterns, just change this number.
 
 \score {
   {
-    #(let ((random-state (seed->random-state (current-time))))
-       (ly:export
-        (make-sequential-music
+    $(let ((random-state (seed->random-state (current-time))))
+       (make-sequential-music
          (map (lambda (x)
                 (let ((idx (random 12 random-state)))
                   (make-event-chord
@@ -46,6 +45,6 @@ get different random note patterns, just change this number.
                                         (quotient idx 7)
                                         (remainder idx 7)
                                         0))))))
-              (make-list 24)))))
+              (make-list 24))))
   }
 }

diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index 2e19d84b6783fce32426702c3e3be36e95bb7d6c..d686d5d651cdcc3af340c0bdd66c0541961cd180 100644 (file)
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "rhythms, percussion"
@@ -37,7 +37,7 @@ is the template of a real Balkan song!).
 melody = \relative c'' {
   \set Staff.instrumentName = #"Bb Sop."
   \key g \major
-  #(set-time-signature 25 8 '(3 2 2 3 2 2 2 2 3 2 2))
+  $(set-time-signature 25 8 '(3 2 2 3 2 2 2 2 3 2 2))
   \override Staff.TimeSignature #'stencil =
     #(custom-time-signature "3" "2" "2" "3" "2" "2"
       "2" "2" "3" "2" "2" "8")

diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly
index a7d6c4051653d1f1ab1a7334efe128b8508c9ab1..f8dbbe032b8f4d4969a0b6b75177e52cb2bcaccf 100644 (file)
--- a/Documentation/snippets/incipit.ly
+++ b/Documentation/snippets/incipit.ly
@@ -5,7 +5,7 @@
 %
 % This file is in the public domain.
 %% Note: this file works from version 2.14.0
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
 %% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb
@@ -47,7 +47,7 @@ incipit =
                                        'VerticalAxisGroup
                                        'Y-extent '(-4 . 4))))
                                'MensuralStaff)
-                              $incipit-music)))
+                              incipit-music)))
                 (score (ly:make-score music))
                 (mm (ly:output-def-lookup layout 'mm))
                 (indent (ly:output-def-lookup layout 'indent))

diff --git a/Documentation/snippets/new/chords-headword.ly b/Documentation/snippets/new/chords-headword.ly
index 9a8949b3e3e4ea9f07ff565b0591ef66c46e5662..37ae8e2c3237547e2bd017dbd1987e98dd0e4cca 100644 (file)
--- a/Documentation/snippets/new/chords-headword.ly
+++ b/Documentation/snippets/new/chords-headword.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f
@@ -77,7 +77,7 @@ Bass = {
     \context Staff = lower {
       \new Voice {
         \clef bass
-        #(set-accidental-style 'modern-cautionary)
+        $(set-accidental-style 'modern-cautionary)
         <<
           \Tenor
           \Bass

diff --git a/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly
index 72ce8c800ceede0110e76e3879f6f52156eee424..7bb8713b52fe4a30365d2f87d7b91a058b28a059 100644 (file)
--- a/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "rhythms"
@@ -36,7 +36,7 @@ is grouped according to the default setting in
     g8 g d d g g a( bes g) |
     \set Timing.beatStructure = #'(2 2 2 3)
     g8 g d d g g a( bes g) |
-    #(set-time-signature 9 8 '(4 5))
+    $(set-time-signature 9 8 '(4 5))
     g8 g d d g g a( bes g) |
     \time 5/8
     a4. g4 |

diff --git a/Documentation/snippets/new/fretted-headword.ly b/Documentation/snippets/new/fretted-headword.ly
index bf55f024894f0e69dae411a8dff46502d61ebeaa..1e6e556b4fb8b95a2527a165f6f0b1532ad32240 100644 (file)
--- a/Documentation/snippets/new/fretted-headword.ly
+++ b/Documentation/snippets/new/fretted-headword.ly
@@ -3,7 +3,7 @@
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.14.0"
+\version "2.15.18"
 
 #(set-global-staff-size 15)
 \paper {
@@ -41,7 +41,7 @@ ssnor = \set stringNumberOrientations = #'(right)
 % define fingering offset
 FO = #(define-music-function (parser location offsetX offsetY) (number? number?)
 #{
-  \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY)
+  \once \override Voice.Fingering #'extra-offset = #(cons offsetX offsetY)
 #})
 
 % markups

diff --git a/Documentation/snippets/new/incipit.ly b/Documentation/snippets/new/incipit.ly
index cc217ccba97b2b7d95b537c46b70513f0c67f950..22ddf165669039bc0834a9186849207bfd8d5a42 100644 (file)
--- a/Documentation/snippets/new/incipit.ly
+++ b/Documentation/snippets/new/incipit.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "staff-notation, ancient-notation"
@@ -31,7 +31,7 @@ incipit =
                                        'VerticalAxisGroup
                                        'Y-extent '(-4 . 4))))
                                'MensuralStaff)
-                              $incipit-music)))
+                              incipit-music)))
                 (score (ly:make-score music))
                 (mm (ly:output-def-lookup layout 'mm))
                 (indent (ly:output-def-lookup layout 'indent))

diff --git a/Documentation/snippets/new/score-for-diatonic-accordion.ly b/Documentation/snippets/new/score-for-diatonic-accordion.ly
index 8e1ede90bf3ad0290f231e6793365de8820096a1..9aab782de3b32d2575a439ad77a8e9e6dec5d780 100644 (file)
--- a/Documentation/snippets/new/score-for-diatonic-accordion.ly
+++ b/Documentation/snippets/new/score-for-diatonic-accordion.ly
@@ -1,4 +1,4 @@
-\version "2.15.15"
+\version "2.15.18"
 
 \header {
   lsrtags = "template"
@@ -176,7 +176,7 @@ staffVoice = \new Staff = astaffvoice  {
 
 staffAccordionMel =
 \new Staff  \with { \remove "Clef_engraver" } {
-  #(set-accidental-style 'forget) %Set the accidentals (Vorzeichen) for each note,
+  $(set-accidental-style 'forget) %Set the accidentals (Vorzeichen) for each note,
   %do not remember them for the rest of the measure.
   \time 4/4
   \set Staff.instrumentName="Accordion"
@@ -188,9 +188,9 @@ staffAccordionMel =
 
 AltOn =
 #(define-music-function (parser location mag) (number?)
-  #{ \override Stem #'length = #$(* 7.0 mag)
+  #{ \override Stem #'length = #(* 7.0 mag)
       \override NoteHead #'font-size =
-#$(inexact->exact (* (/ 6.0 (log 2.0)) (log mag))) #})
+#(inexact->exact (* (/ 6.0 (log 2.0)) (log mag))) #})
 
 AltOff = {
   \revert Stem #'length

diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly
index b00d9a502df283c6d6c3e3668aafd5c7444939c8..965727972b36cde2e10d58b49fc057befdd0e532 100644 (file)
--- a/Documentation/snippets/score-for-diatonic-accordion.ly
+++ b/Documentation/snippets/score-for-diatonic-accordion.ly
@@ -5,7 +5,7 @@
 %
 % This file is in the public domain.
 %% Note: this file works from version 2.15.15
-\version "2.15.15"
+\version "2.15.18"
 
 \header {
   lsrtags = "template"
@@ -184,7 +184,7 @@ staffVoice = \new Staff = astaffvoice  {
 
 staffAccordionMel =
 \new Staff  \with { \remove "Clef_engraver" } {
-  #(set-accidental-style 'forget) %Set the accidentals (Vorzeichen) for each note,
+  $(set-accidental-style 'forget) %Set the accidentals (Vorzeichen) for each note,
   %do not remember them for the rest of the measure.
   \time 4/4
   \set Staff.instrumentName="Accordion"
@@ -196,9 +196,9 @@ staffAccordionMel =
 
 AltOn =
 #(define-music-function (parser location mag) (number?)
-  #{ \override Stem #'length = #$(* 7.0 mag)
+  #{ \override Stem #'length = #(* 7.0 mag)
       \override NoteHead #'font-size =
-#$(inexact->exact (* (/ 6.0 (log 2.0)) (log mag))) #})
+#(inexact->exact (* (/ 6.0 (log 2.0)) (log mag))) #})
 
 AltOff = {
   \revert Stem #'length

diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index e2bf45d17c735346ff679946f5c74feddcabdb92..a42ad620f2bd63006c42d71341c8cdd5f520c4e9 100644 (file)
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -64,8 +64,8 @@ up, and changes the default note heads to crosses.
 
 \relative c'' {
   \new Staff {
-    #(remove-grace-property 'Voice 'Stem 'direction)
-    #(add-grace-property 'Voice 'NoteHead 'style 'cross)
+    $(remove-grace-property 'Voice 'Stem 'direction)
+    $(add-grace-property 'Voice 'NoteHead 'style 'cross)
     \new Voice {
        \acciaccatura { f16 } g4
        \grace { d16[ e] } f4

diff --git a/Documentation/usage/running.itely b/Documentation/usage/running.itely
index c14d8c51b65e39966d003dcfe37b54f35cab011c..4abfcf09b13b677717081af5facce9cb36bb5fad 100644 (file)
--- a/Documentation/usage/running.itely
+++ b/Documentation/usage/running.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.18"
 
 
 @node Running lilypond
@@ -215,7 +215,7 @@ havoc, for example
 @verbatim
 #(system "rm -rf /")
 {
-  c4^#(ly:export (ly:gulp-file "/etc/passwd"))
+  c4^$(ly:gulp-file "/etc/passwd")
 }
 @end verbatim
 @end quotation

diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly
index 4aadbb95a5355090b51bd5859586b85501465af0..cd09539bc441965c159e70bf8b302aac1c0561e0 100644 (file)
--- a/input/regression/accidental-contemporary.ly
+++ b/input/regression/accidental-contemporary.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 \header {
 
 texidoc = "Several automatic accidental rules
@@ -30,13 +30,13 @@ Both scores should show the same accidentals.
 
 \score {
   \relative c'' {
-    #(set-accidental-style 'dodecaphonic)
+    $(set-accidental-style 'dodecaphonic)
     gis4 a g gisis
-    #(set-accidental-style 'neo-modern)
+    $(set-accidental-style 'neo-modern)
     gis8 a gis gis g' gis gis,, a'
-    #(set-accidental-style 'neo-modern-cautionary)
+    $(set-accidental-style 'neo-modern-cautionary)
     eis fis eis eis g2
-    #(set-accidental-style 'teaching)
+    $(set-accidental-style 'teaching)
     \key e \major
     e8 eis fis fis gis2
   }

diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly
index 6c47b306b723b87defc63f8bb12c6924118ecb07..9630cdaeaa80504d2f60ce2c49559c72bc1ed84c 100644 (file)
--- a/input/regression/accidental-piano.ly
+++ b/input/regression/accidental-piano.ly
@@ -6,7 +6,7 @@ accidental."
 
 }
 
-\version "2.14.0"
+\version "2.15.18"
 
 \layout
 {
@@ -14,7 +14,7 @@ accidental."
 }
     
 \new PianoStaff \relative <<
-    #(set-accidental-style 'piano)
+    $(set-accidental-style 'piano)
     \new Staff { ges'4 ges4 }
     \new Staff { r8 gis r8 gis }
     >>

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 819e3b78f8d32dd86d227d4701fd16a29d6de902..fa0a38a264462e31db57f39a8aa419059a28bdff 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 \layout { ragged-right = ##t }
 
 \header{
@@ -28,7 +28,7 @@ voiceb =  \transpose c c' {
     \voicea
   }
   \context Staff << 
-    #(set-accidental-style 'modern-voice-cautionary)
+    $(set-accidental-style 'modern-voice-cautionary)
     \new Voice \voicea
     \new Voice \voiceb
   >>

diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index abf0cc0637a04bb70891887deb1688d9f3c8de24..564852b86439963f0091caa22789f9710db42b60 100644 (file)
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 forcedLastBreak =  { \break }
 
@@ -16,9 +16,9 @@ forcedLastBreak =  { \break }
 
 
 #(define (assert-system-count-override count)
-  (ly:export #{ \override NoteHead #'after-line-breaking
-       = #(lambda (smob) (assert-system-count smob $count))
-  #}))
+  #{ \override NoteHead #'after-line-breaking
+       = #(lambda (smob) (assert-system-count smob count))
+  #})
 
 
 \header {
@@ -126,7 +126,7 @@ sarabandeA =  \context Voice  \relative c {
   d'[ cis] |
   %%  d4 d,,2 |
   d4
-%  #(assert-system-count-override 6)
+%  $(assert-system-count-override 6)
   d,,2 |
 }
 

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 848ff190d86b147cdbbc12fc207d40e6522dc59d..5c6e166fac01081355ce5bce6f3266b7623f7931 100644 (file)
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -1,4 +1,4 @@
-\version "2.15.5"
+\version "2.15.18"
 #(use-modules (srfi srfi-13)
               (ice-9 format))
 
@@ -175,7 +175,7 @@ stderr of this run."
 \test "" ##[ \clef "french^2" #]
 \test "" ##[ \clef "alto_3" #]
 \test "" ##[ \time 2/4 #]
-\test "" ##[ #(set-time-signature 5 8 '(3 2)) #]
+\test "" ##[ $(set-time-signature 5 8 '(3 2)) #]
 \test "" ##[ \bar "|." #]
 
 %% staff switches

diff --git a/input/regression/flags-straight-stockhausen-boulez.ly b/input/regression/flags-straight-stockhausen-boulez.ly
index 3190abd2fd69e14f2002d56c6ed99d9d72d4f9bb..c88d39e26ec12b0a57a45ea7f04742149f6a1f28 100644 (file)
--- a/input/regression/flags-straight-stockhausen-boulez.ly
+++ b/input/regression/flags-straight-stockhausen-boulez.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
 texidoc = "Flags can be drawn straight in the style used by
@@ -10,7 +10,7 @@ Stockhausen and Boulez.
 stemLength = #(define-music-function (parser location length) (number?)
   "Set the length of the next stem explicitly."
   #{
-    \once \override Stem #'length-fraction = #$length
+    \once \override Stem #'length-fraction = #length
   #}
 )
 

diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly
index 15da5e6453ee68e9d301388a62e11961675f62c1..a053e8a81295ca5ab5522a36baad87b149d06330 100644 (file)
--- a/input/regression/lily-in-scheme.ly
+++ b/input/regression/lily-in-scheme.ly
@@ -12,21 +12,21 @@ the @code{TextScript} grob.
           
       }
 
-\version "2.14.0"
+\version "2.15.18"
 \layout { ragged-right = ##t }
 
 withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?)
-                #{ \override TextScript #'padding = #$padding
+                #{ \override TextScript #'padding = #padding
                 $music 
                 \revert TextScript #'padding #})
 
 withPaddingB = #(define-music-function (parser location padding music) (number? ly:music?)
-                #{ \override TextScript #'padding = #$(* padding 2)
+                #{ \override TextScript #'padding = #(* padding 2)
                 $music 
                 \revert TextScript #'padding #})
 
 withPaddingC = #(define-music-function (parser location padding music) (number? ly:music?)
-                #{ \override TextScript #'padding = #(+ 1 $(* padding 2))
+                #{ \override TextScript #'padding = #(+ 1 (* padding 2))
                    $music 
                    \revert TextScript #'padding #})
 

diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly
index 7f5fd19e057ec66a71a933d538b9f251bacb3f27..fa7168624436bf731d5d7edca49c7a55f647eb4e 100644 (file)
--- a/input/regression/markup-scheme.ly
+++ b/input/regression/markup-scheme.ly
@@ -25,7 +25,7 @@ For maintenance reasons, we don't excercise the entire markup command set.
 
 
 
-\version "2.14.0"
+\version "2.15.18"
 
 {
   \textLengthOn
@@ -54,7 +54,7 @@ For maintenance reasons, we don't excercise the entire markup command set.
     \larger \sub "alike"
   }    
   \break
-  f'1-#(markup* 
+  f'1-$(markup 
        "foo"
        #:raise 0.2 #:hbracket #:bold "bar"
        #:override '(baseline-skip . 4) 

diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 0e35f38b339d7f95c3bccdb8f51b3bb93abfb03f..bd565e7ad5969af99dc8335e68ad808a732b0948 100644 (file)
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped.  "
 
 }
 
-\version "2.14.0"
+\version "2.15.18"
 
 \layout  {
   ragged-right = ##t
@@ -20,13 +20,13 @@ brackets above beats when the beats of a time signature are grouped.  "
   }
 
 \relative c' {
-  #(set-time-signature 2 4) 
+  $(set-time-signature 2 4) 
   c8 a'4 a8~
-  #(set-time-signature 5 8 '(3 2)) 
+  $(set-time-signature 5 8 '(3 2)) 
   a8 bes4 r8 bes8->
   \time 2/4
   c,8 g'4 g8~
-  #(set-time-signature 5 8 '(3 2)) 
+  $(set-time-signature 5 8 '(3 2)) 
   g8 a4 g a4.->
 }
 

diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index 779bd0935032b453ef35b0441c905178efa28a9d..fe75321fbbcf283e20487f6f6e077603d3074370 100644 (file)
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.15.12"
+\version "2.15.18"
 
 \header {
   texidoc = "Mensural ligatures show different shapes, depending on the
@@ -25,7 +25,7 @@
   \clef "petrucci-c4"
   \set Staff.printKeyCancellation = ##f
   \cadenzaOn % turn off bar lines
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   \textLengthOn
 
 % ligaturae binaria
@@ -309,7 +309,7 @@
   \clef "petrucci-c5"
   \set Staff.printKeyCancellation = ##f
   \cadenzaOn % turn off bar lines
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
   \textLengthOn
 
   \[

diff --git a/input/regression/metronome-range.ly b/input/regression/metronome-range.ly
index 29a4a15ddc36be946016970c0c8687425f3d6071..a7628f304ca87f1073052db0b35b0a4b32d88c51 100644 (file)
--- a/input/regression/metronome-range.ly
+++ b/input/regression/metronome-range.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   texidoc = "
@@ -10,9 +10,8 @@ printed with an en-dash character, separated by thin-spaces.
 \relative c'' {
   \tempo 4 = 66 ~ 72
   c1 | c
-  #(ly:export
-    (make-event-chord (list (make-music 'TempoChangeEvent
+  $(make-event-chord (list (make-music 'TempoChangeEvent
                                         'tempo-unit (ly:make-duration 2 0 1 1)
-                                        'metronome-count (cons 124 132)))))
+                                        'metronome-count (cons 124 132))))
   c1 | c
 }

diff --git a/input/regression/metronome-text.ly b/input/regression/metronome-text.ly
index 37c321213b4c7900f80b9e674313ccc47d536899..04aaea60b3a5155e3a4abaac42297dfbd5597182 100644 (file)
--- a/input/regression/metronome-text.ly
+++ b/input/regression/metronome-text.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 \header{
   texidoc="
@@ -10,9 +10,8 @@ The tempo command supports text markup and/@/or `duration=count'.  Using
 \relative c'' {
   \tempo "Allegro" c1
   \tempo "Allegro" c1
-  #(ly:export
-    (make-event-chord (list (make-music 'TempoChangeEvent
-                                        'text "blah"))))
+  $(make-event-chord (list (make-music 'TempoChangeEvent
+                                        'text "blah")))
   d1
   \tempo \markup { \italic \medium "Allegro" } c1 \break
   \tempo 4 = 120 c1

diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 9d67c32ca224051e7597484ce3b10c3039b856db..07649223a72b88cb56ec8d31ef279087ecfd508e 100644 (file)
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.14.0"
+\version "2.15.18"
 manuscriptBreak = { \break }
 
 
@@ -106,7 +106,7 @@ secondVerse = \lyricmode {
     }
 
 pianoRH =  \relative c''' \repeat volta 2 {
-    #(set-accidental-style 'modern)
+    $(set-accidental-style 'modern)
     g16(_\p fis a g fis g f e d c b a ) | 
     <g e>8( <es fis a> <d f b> <c e c'>) r8 r | 
     r8 c'( e,) f r a |
@@ -127,7 +127,7 @@ pianoRH =  \relative c''' \repeat volta 2 {
 }
 
 pianoLH =  \relative c'' \repeat volta 2 {
-    #(set-accidental-style 'modern)
+    $(set-accidental-style 'modern)
     g16( fis a g fis g f e d c b a) | 
     \clef bass g4.( c,8) r r
     \clef treble r4 <bes' c>8([ <a c>)] r <f c'> |
@@ -154,7 +154,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
     \score {
        << \time 6/8
           \new Staff <<
-              \context Staff #(set-accidental-style 'modern)
+              \context Staff $(set-accidental-style 'modern)
               \melody >>
           \lyricsto "singer" \new Lyrics \firstVerse
           \lyricsto "singer" \new Lyrics \secondVerse

diff --git a/input/regression/mozart-hrn-3.ly b/input/regression/mozart-hrn-3.ly
index 911595e8c162270309ec402ba18ce41b76686258..4324882e35cd3002fd3614ce669f88c7366b2f9a 100644 (file)
--- a/input/regression/mozart-hrn-3.ly
+++ b/input/regression/mozart-hrn-3.ly
@@ -28,8 +28,8 @@
         }
       }
       \fill-line {
-        #(ly:export (string-append  "It has been typeset and placed in the public "
-                                    "domain by " maintainer "."))
+        $(string-append  "It has been typeset and placed in the public "
+                                    "domain by " maintainer ".")
       }
       \fill-line {
         \line {
@@ -48,7 +48,7 @@ virtuoso that taught in Geneva.
 "
 }
 
-\version "2.14.0"
+\version "2.15.18"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"

diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly
index 7e43b91be974e26c0c6853fd0a0ab6ef97393150..233e1287f1e06713839e6665c984afcb21b2a564 100644 (file)
--- a/input/regression/page-breaks.ly
+++ b/input/regression/page-breaks.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
 
@@ -59,7 +59,7 @@
     \column {
       \fill-line {
        " "
-       \line { "Music engraving by LilyPond" #(ly:export (lilypond-version)) }4
+       \line { "Music engraving by LilyPond" $(lilypond-version) }4
        " "
       }
       \with-url

diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly
index 7ce98247f2d717d262e472e3d4bb7c9711469bac..0e8f725500b89f4d86c939a2b9a66dde2051d7ec 100644 (file)
--- a/input/regression/rest-ledger.ly
+++ b/input/regression/rest-ledger.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 \header {
 texidoc = "Breve, whole and half rests moving outside the staff should get
 ledger lines."
@@ -9,7 +9,7 @@ ledger lines."
 
 rPos =
 #(define-music-function (parser location y) (number?)
-  #{ \override Rest #'staff-position = #$y #})
+  #{ \override Rest #'staff-position = #y #})
 
 {
   \set Score.timing = ##f

diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index c343f37102ef2b7ab31511a743280b8cd731950c..a2bdde9500dbf95650115e204cf3687bc779abfe 100644 (file)
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
-\version "2.14.0"
+\version "2.15.18"
 
 \header {
   texidoc = "Accidentals do not influence the amount of stretchable space.
@@ -12,7 +12,7 @@ The accidental does add a little non-stretchable space.
   line-width = 18.\cm
 }
 \relative c'' {
-  #(set-accidental-style 'piano-cautionary)
+  $(set-accidental-style 'piano-cautionary)
   \time 2/4 
   d16 d d d d d cis d dis dis dis dis 
   

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index e97ec8b8f785089d2dd8d67d11e9da28b7d53591..345c60b396a20f7b20c58372a56f9ac221fe067d 100644 (file)
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.14.0"
+\version "2.15.18"
 
 ignoreMelisma =        \set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -74,7 +74,7 @@ secondVerse = \lyricmode {
 }
 
 pianoRH =  \relative c''' \repeat volta 2\new Voice {
-  #(set-accidental-style 'modern)
+  $(set-accidental-style 'modern)
   \voiceOne
   g16( fis a g fis g f e d c b
   \oneVoice
@@ -97,7 +97,7 @@ pianoRH =  \relative c''' \repeat volta 2\new Voice {
              }
 
 pianoLH =  \relative c'' \repeat volta 2\new Voice {
-    #(set-accidental-style 'modern)
+    $(set-accidental-style 'modern)
     \voiceTwo
     g16( fis a g fis g
 
@@ -123,7 +123,7 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
           fontSize = #-3
           \override StaffSymbol #'staff-space = #(magstep -3)
         } <<
-          \context Staff #(set-accidental-style 'modern)
+          \context Staff $(set-accidental-style 'modern)
           \melody >>
         \lyricsto "singer" \new Lyrics \firstVerse
         \lyricsto "singer" \new Lyrics \secondVerse

diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index 70bab63a2372af3d77e6e386de90ae5323d96816..b3cc07213b3f8d395d0ad9e88fb44e44ae3371fd 100644 (file)
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -9,7 +9,7 @@
   $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $
 %}
 
-\version "2.14.0"
+\version "2.15.18"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -41,14 +41,14 @@ hideKeySignature = {
   \override Staff.KeySignature  #'stencil = ##f
   \set Staff.extraNatural = ##f
   \key d \major
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
 }
 showKeySignature = {
   % Show the key signature e.g. for BMW compatibility.
   \override Staff.KeySignature  #'stencil = #ly:key-signature-interface::print
   \set Staff.extraNatural = ##f
   \key d \major
-  #(set-accidental-style 'forget)
+  $(set-accidental-style 'forget)
 }
 
 % Layout tweaks.
@@ -89,7 +89,7 @@ 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

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index dc5e58d02717639bf4773ed4fba7ba08a3be49ac..21d6b560f2b3ee4f4c029d21f8174b6c0f160bc5 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 chordmodifiers = #default-chord-modifier-list
 
@@ -6,20 +6,20 @@ chordmodifiers = #default-chord-modifier-list
 whiteTriangleMarkup = \markup {
   \triangle ##f
   %%  394 capital delta
-  %#(ly:export (ly:wide-char->utf-8 #x0394))
+  %$(ly:wide-char->utf-8 #x0394)
 
   %% 2206 : delta from the symbol font.
-  %   #(ly:export (ly:wide-char->utf-8 #x2206))
+  %   $(ly:wide-char->utf-8 #x2206)
   
   %% up pointing triangle
-  % #(ly:export (ly:wide-char->utf-8 #x25B3))
+  % $(ly:wide-char->utf-8 #x25B3)
 } 
 
 blackTriangleMarkup = \markup {
   \triangle ##t
 
   %% black up pointing triangle
-%  #(ly:export (ly:wide-char->utf-8 #x25B2))
+%  $(ly:wide-char->utf-8 #x25B2)
 }
 
 ignatzekExceptionMusic = {
@@ -27,7 +27,7 @@ ignatzekExceptionMusic = {
   <c es ges>-\markup { \super "o" } % should be $\circ$ ?
   <c es ges bes>-\markup {
     %%  f8 is o with slash.
-    \super #(ly:export (ly:wide-char->utf-8 #x00f8))
+    \super $(ly:wide-char->utf-8 #x00f8)
   }
   <c es ges beses>-\markup { \super  "o7" }
 }

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 9b42d17c4c2d92afd0b820f5d7fdfcf5a6548abf..e5f9a480fd876003b01353179f32fe83f98e53c4 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.15.10"
+\version "2.15.18"
 
 \context {
   \name "Global"
@@ -1036,7 +1036,7 @@ accommodated for typesetting a piece in mensural style."
   \override Custos #'neutral-direction = #DOWN
 
   %% Accidentals are valid only once (same as
-  %% #(set-accidental-style 'forget))
+  %% $(set-accidental-style 'forget))
   extraNatural = ##f
   autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
   autoCautionaries = #'()

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index a3bfebec820dee26207e64a204a7dd79217397bf..c135d80d8f6356512d0793f4e6bac91e9bdf8c68 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -18,7 +18,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.14.0"
+\version "2.15.18"
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -227,7 +227,7 @@ as @code{\\compoundMeter #'((3 2 8))} or shorter
                         (ly:moment-main-denominator mlen))))
   #{
     \once \override Staff.TimeSignature #'stencil = #(lambda (grob)
-               (grob-interpret-markup grob (format-compound-time $args)))
+               (grob-interpret-markup grob (format-compound-time args)))
     \set Timing.timeSignatureFraction = $timesig
     \set Timing.baseMoment = $beat
     \set Timing.beatStructure = $beatGrouping
@@ -410,7 +410,7 @@ harmonics played on a fretted instrument by touching the strings above @var{fret
         (make-sequential-music
          (list
           #{
-            \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label $fret)
+            \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret)
           #}
           (make-harmonic
             (calc-harmonic-pitch pitch music))
@@ -427,7 +427,7 @@ given through @var{ratio}.")
        (make-sequential-music
         (list
          #{
-           \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label $fret)
+           \override TabNoteHead #'stencil = #(tab-note-head::print-custom-fret-label fret)
          #}
          (make-harmonic
            (calc-harmonic-pitch pitch music))
@@ -1002,7 +1002,7 @@ the `parameters' assoc list.")
    #{
      \overrideProperty #"Score.NonMusicalPaperColumn"
      #'line-break-system-details
-     #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters)))
+     #(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters)))
             (cons 'system-Y-extent (cdr (assoc 'system-Y-extent parameters))))
    #})
 

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index e8ff918b497e7d750f24366aac7ff4c8220f76cb..531369085548a5d43b19329fd7893e7b16a3d501 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
@@ -32,26 +32,26 @@ enddecresc =  #(make-span-event 'DecrescendoEvent STOP)
 % Deprecated functions:
 % TODO: DEPRECATED_2_13_19
 deprecatedcresc =  {
-  #(ly:export (make-event-chord (list cr)))
+  $(make-event-chord (list cr))
   \once \set crescendoText = \markup { \italic "cresc." }
   \once \set crescendoSpanner = #'text
 }
 
 
 deprecateddim =  {
-  #(ly:export (make-event-chord (list decr)))
+  $(make-event-chord (list decr))
   \once \set decrescendoText = \markup { \italic "dim." }
   \once \set decrescendoSpanner = #'text
 }
 
 deprecatedenddim =  {
-  #(ly:export (make-event-chord (list enddecr)))
+  $(make-event-chord (list enddecr))
 %  \unset decrescendoText 
 %  \unset decrescendoSpanner 
 }
 
 deprecatedendcresc =  {
-  #(ly:export (make-event-chord (list endcr)))
+  $(make-event-chord (list endcr))
 %  \unset crescendoText 
 %  \unset crescendoSpanner 
 }

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 679742f29190cf87a086b6cadd404e902e393551..5c234f34f2df40a1b9e17f55d5d033eeb5862198 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.18"
 
 slashSeparator = \markup {
   \center-align
@@ -15,11 +15,10 @@ tagline = \markup {
 
     %% 2014 = em dash.
 
-    #(ly:export
-      (format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
+    $(format #f "Music engraving by LilyPond ~a~awww.lilypond.org"
        (lilypond-version)
        (ly:wide-char->utf-8 #x2014)
-       ))
+       )
   }
 }
 

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index f58d60fa35330990983baf421b6183c9efb64de5..a55e1ab7751cfccacbbbcaa37145715a7e40bfa6 100644 (file)
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -900,7 +900,7 @@ Otherwise, return #f."
                 num den
                 (new-line->lily-string))
         (format #f
-                "#(set-time-signature ~a ~a '~a)~a"
+                "$(set-time-signature ~a ~a '~a)~a"
                 num den structure
                 (new-line->lily-string)))))
 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index a25deb60e4c958501795e922dbe18c7f3d8b5c69..5f73038d9118f5554cc1b08156bbf973c5612bea 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -526,11 +526,10 @@ in @var{grob}."
 (define-public (set-time-signature num den . rest)
   "Set properties for time signature @var{num}/@var{den}.
 If @var{rest} is present, it is used to set @code{beatStructure}."
-  (ly:export
-   (make-music 'TimeSignatureMusic
+  (make-music 'TimeSignatureMusic
               'numerator num
               'denominator den
-              'beat-structure (if (null? rest) rest (car rest)))))
+              'beat-structure (if (null? rest) rest (car rest))))
 
 (define-safe-public (make-articulation name)
   (make-music 'ArticulationEvent
@@ -634,7 +633,7 @@ NUMBER is 0-base, i.e., Voice=1 (upstems) has number 0.
     m))
 
 (define-public (empty-music)
-  (ly:export (make-music 'Music)))
+  (make-music 'Music))
 
 ;; Make a function that checks score element for being of a specific type.
 (define-public (make-type-checker symbol)
@@ -727,7 +726,7 @@ NUMBER is 0-base, i.e., Voice=1 (upstems) has number 0.
           (new-settings (append current
                                 (list (list context-name grob sym val)))))
       (ly:context-set-property! where 'graceSettings new-settings)))
-  (ly:export (context-spec-music (make-apply-context set-prop) 'Voice)))
+  (context-spec-music (make-apply-context set-prop) 'Voice))
 
 (define-public (remove-grace-property context-name grob sym)
   "Remove all @var{sym} for @var{grob} in @var{context-name}."
@@ -746,7 +745,7 @@ NUMBER is 0-base, i.e., Voice=1 (upstems) has number 0.
                  (set! new-settings (delete x new-settings)))
                prop-settings)
       (ly:context-set-property! where 'graceSettings new-settings)))
-  (ly:export (context-spec-music (make-apply-context delete-prop) 'Voice)))
+  (context-spec-music (make-apply-context delete-prop) 'Voice))
 
 
 
@@ -1316,8 +1315,7 @@ as a context."
                     (car rest) 'Staff))
        (pcontext (if (pair? rest)
                      (car rest) 'GrandStaff)))
-    (ly:export
-     (cond
+    (cond
       ;; accidentals as they were common in the 18th century.
       ((equal? style 'default)
        (set-accidentals-properties #t
@@ -1470,7 +1468,7 @@ as a context."
                                   context))
       (else
        (ly:warning (_ "unknown accidental style: ~S") style)
-       (make-sequential-music '()))))))
+       (make-sequential-music '())))))
 
 (define-public (invalidate-alterations context)
   "Invalidate alterations in @var{context}.