Run scripts/auxiliar/update-with-convert-ly.sh

20 files changed, 230 insertions, 230 deletions

diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely
index 3b42812019..a37defd9d5 100644
--- 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.15.18"
+@c \version "2.15.20"
 
 @c Translators: Till Paala
 
@@ -1501,7 +1501,7 @@ soll.  Diese Funktion kann man wie folgt benutzen:
 
 @example
 \new Staff <<
-  $(set-accidental-style 'voice)
+  \accidentalStyle "voice"
   @{ @dots{} @}
 >>
 @end example
@@ -1559,11 +1559,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1641,11 +1641,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1718,11 +1718,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicB
     }
   >>
@@ -1786,11 +1786,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicB
     }
   >>
@@ -1848,11 +1848,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicB
     }
   >>
@@ -1915,11 +1915,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicB
     }
   >>
@@ -1976,11 +1976,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2040,7 +2040,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano)
+      \accidentalStyle "piano"
       \musicA
     }
     \context Staff = "down" {
@@ -2098,7 +2098,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano-cautionary)
+      \accidentalStyle "piano-cautionary"
       \musicA
     }
     \context Staff = "down" {
@@ -2157,11 +2157,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicB
     }
   >>
@@ -2215,11 +2215,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicB
     }
   >>
@@ -2277,11 +2277,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicB
     }
   >>
@@ -2335,11 +2335,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2395,11 +2395,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicB
     }
   >>
@@ -2457,12 +2457,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicB
     }
   >>
@@ -2517,11 +2517,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicB
     }
   >>
@@ -2577,11 +2577,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicB
     }
   >>
@@ -2627,7 +2627,7 @@ Klammer kein Auflösungszeichen:
 
 @lilypond[quote]
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "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)
+  \accidentalStyle "forget"
   $music
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
 #})
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely
index ac273601c9..4c89f7824d 100644
--- 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.15.18"
+@c \version "2.15.20"
 
 
 @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)
+  \accidentalStyle "voice"
   @{ @dots{} @}
 >>
 @end example
@@ -1537,11 +1537,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1618,11 +1618,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1692,11 +1692,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicB
     }
   >>
@@ -1757,11 +1757,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicB
     }
   >>
@@ -1819,11 +1819,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicB
     }
   >>
@@ -1884,11 +1884,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicB
     }
   >>
@@ -1945,11 +1945,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2009,7 +2009,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano)
+      \accidentalStyle "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{\accidentalStyle "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)
+      \accidentalStyle "piano-cautionary"
       \musicA
     }
     \context Staff = "down" {
@@ -2128,11 +2128,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicB
     }
   >>
@@ -2185,11 +2185,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicB
     }
   >>
@@ -2246,11 +2246,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicB
     }
   >>
@@ -2303,11 +2303,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2362,11 +2362,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicB
     }
   >>
@@ -2424,12 +2424,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicB
     }
   >>
@@ -2483,11 +2483,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicB
     }
   >>
@@ -2542,11 +2542,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicB
     }
   >>
@@ -2595,7 +2595,7 @@ natural de la casilla de segunda vez no necesita becuadro:
 
 @lilypond[quote]
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "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)
+  \accidentalStyle "forget"
   $music
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
 #})
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely
index f0377bb61d..68e193c294 100644
--- 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.15.18"
+@c \version "2.15.20"
 
 @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)
+  \accidentalStyle "voice"
   @{ @dots{} @}
 >>
 @end example
@@ -1270,11 +1270,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1351,11 +1351,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1423,11 +1423,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicB
     }
   >>
@@ -1484,11 +1484,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicB
     }
   >>
@@ -1546,11 +1546,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicB
     }
   >>
@@ -1613,11 +1613,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicB
     }
   >>
@@ -1673,11 +1673,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicB
     }
   >>
@@ -1736,7 +1736,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano)
+      \accidentalStyle "piano"
       \musicA
     }
     \context Staff = "down" {
@@ -1793,7 +1793,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano-cautionary)
+      \accidentalStyle "piano-cautionary"
       \musicA
     }
     \context Staff = "down" {
@@ -1851,11 +1851,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicB
     }
   >>
@@ -1908,11 +1908,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicB
     }
   >>
@@ -1972,11 +1972,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicB
     }
   >>
@@ -2027,11 +2027,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2086,11 +2086,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicB
     }
   >>
@@ -2148,12 +2148,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicB
     }
   >>
@@ -2206,11 +2206,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicB
     }
   >>
@@ -2266,11 +2266,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicB
     }
   >>
@@ -2319,7 +2319,7 @@ la seconde alternative ne nécessite pas son bécarre.
 
 @lilypond[quote]
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "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)
+  \accidentalStyle "forget"
   $music
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
 #})
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
diff --git a/Documentation/ja/notation/pitches.itely b/Documentation/ja/notation/pitches.itely
index c37ea0d36a..1aefb58e3d 100644
--- 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.15.18"
+@c \version "2.15.20"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -1513,7 +1513,7 @@ LilyPond はどの臨時記号スタイルを使用するのかを指定する�
 
 @example
 \new Staff <<
-  $(set-accidental-style 'voice)
+  \accidentalStyle "voice"
   @{ @dots{} @}
 >>
 @end example
@@ -1570,11 +1570,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1652,11 +1652,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1724,11 +1724,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicB
     }
   >>
@@ -1789,11 +1789,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicB
     }
   >>
@@ -1853,11 +1853,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicB
     }
   >>
@@ -1921,11 +1921,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicB
     }
   >>
@@ -1983,11 +1983,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2049,7 +2049,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano)
+      \accidentalStyle "piano"
       \musicA
     }
     \context Staff = "down" {
@@ -2108,7 +2108,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano-cautionary)
+      \accidentalStyle "piano-cautionary"
       \musicA
     }
     \context Staff = "down" {
@@ -2172,11 +2172,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicB
     }
   >>
@@ -2229,11 +2229,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicB
     }
   >>
@@ -2289,11 +2289,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicB
     }
   >>
@@ -2346,11 +2346,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2408,11 +2408,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicB
     }
   >>
@@ -2472,12 +2472,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicB
     }
   >>
@@ -2532,11 +2532,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicB
     }
   >>
@@ -2593,11 +2593,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicB
     }
   >>
@@ -2651,7 +2651,7 @@ musicB = {
 
 @lilypond[quote]
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "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)
+  \accidentalStyle "forget"
   $music
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
 #})
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
diff --git a/Documentation/ly-examples/bach-bwv610.ly b/Documentation/ly-examples/bach-bwv610.ly
index 15f072811e..5d5fa3fbd7 100644
--- a/Documentation/ly-examples/bach-bwv610.ly
+++ b/Documentation/ly-examples/bach-bwv610.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 %\include "example-header.ily"
 
 
@@ -30,7 +30,7 @@
 global = {
    \key c \minor
    \time 4/4
-   $(set-accidental-style 'default)
+   \accidentalStyle "default"
 }
 
 halsup = {
diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index a4c1b667c6..cb350f7033 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.18"
+@c \version "2.15.20"
 
 
 @node Pitches
@@ -1453,7 +1453,7 @@ accidental style to use.  This function is called as follows:
 
 @example
 \new Staff <<
-  $(set-accidental-style 'voice)
+  \accidentalStyle "voice"
   @{ @dots{} @}
 >>
 @end example
@@ -1509,11 +1509,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1592,11 +1592,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'default)
+      \accidentalStyle "default"
       \musicB
     }
   >>
@@ -1665,11 +1665,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'voice)
+      \accidentalStyle "voice"
       \musicB
     }
   >>
@@ -1731,11 +1731,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern)
+      \accidentalStyle "modern"
       \musicB
     }
   >>
@@ -1795,11 +1795,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-cautionary)
+      \accidentalStyle "modern-cautionary"
       \musicB
     }
   >>
@@ -1862,11 +1862,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice)
+      \accidentalStyle "modern-voice"
       \musicB
     }
   >>
@@ -1923,11 +1923,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'modern-voice-cautionary)
+      \accidentalStyle "modern-voice-cautionary"
       \musicB
     }
   >>
@@ -1988,7 +1988,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano)
+      \accidentalStyle "piano"
       \musicA
     }
     \context Staff = "down" {
@@ -2048,7 +2048,7 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'piano-cautionary)
+      \accidentalStyle "piano-cautionary"
       \musicA
     }
     \context Staff = "down" {
@@ -2107,11 +2107,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern)
+      \accidentalStyle "neo-modern"
       \musicB
     }
   >>
@@ -2164,11 +2164,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-cautionary)
+      \accidentalStyle "neo-modern-cautionary"
       \musicB
     }
   >>
@@ -2224,11 +2224,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice)
+      \accidentalStyle "neo-modern-voice"
       \musicB
     }
   >>
@@ -2281,11 +2281,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'neo-modern-voice-cautionary)
+      \accidentalStyle "neo-modern-voice-cautionary"
       \musicB
     }
   >>
@@ -2341,11 +2341,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'dodecaphonic)
+      \accidentalStyle "dodecaphonic"
       \musicB
     }
   >>
@@ -2403,12 +2403,12 @@ musicB = {
   <<
     \context Staff = "up" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicA
     }
     \context Staff = "down" {
       \key fis \minor
-      $(set-accidental-style 'teaching)
+      \accidentalStyle "teaching"
       \musicB
     }
   >>
@@ -2463,11 +2463,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'no-reset)
+      \accidentalStyle "no-reset"
       \musicB
     }
   >>
@@ -2522,11 +2522,11 @@ musicB = {
 \new PianoStaff {
   <<
     \context Staff = "up" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicA
     }
     \context Staff = "down" {
-      $(set-accidental-style 'forget)
+      \accidentalStyle "forget"
       \musicB
     }
   >>
@@ -2571,7 +2571,7 @@ not need a natural sign:
 
 @lilypond[quote]
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "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)
+  \accidentalStyle "forget"
   $music
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
 #})
 {
-  $(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \time 2/4
   \repeat volta 2 {
     c'2
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index 76e2517ce6..6395ad3d74 100644
--- 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.15.18"
+\version "2.15.20"
 
 \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)
+  \accidentalStyle "forget"
   \cadenzaOn
   sol4 sol sol sol fad mib sol1 fad8 mib re4. r8 mib1 fad sol
 }
diff --git a/Documentation/snippets/chords-headword.ly b/Documentation/snippets/chords-headword.ly
index e433dc1bab..8c813a1106 100644
--- 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.15.18"
+\version "2.15.20"
 #(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)
+        \accidentalStyle "modern-cautionary"
         <<
           \Tenor
           \Bass
diff --git a/Documentation/snippets/new/chords-headword.ly b/Documentation/snippets/new/chords-headword.ly
index 37ae8e2c32..ce0724c93c 100644
--- a/Documentation/snippets/new/chords-headword.ly
+++ b/Documentation/snippets/new/chords-headword.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 #(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)
+        \accidentalStyle "modern-cautionary"
         <<
           \Tenor
           \Bass
diff --git a/Documentation/snippets/new/score-for-diatonic-accordion.ly b/Documentation/snippets/new/score-for-diatonic-accordion.ly
index 9aab782de3..2bae67087e 100644
--- 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.18"
+\version "2.15.20"
 
 \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,
+  \accidentalStyle "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"
diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly
index 965727972b..16328830c8 100644
--- 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.18"
+\version "2.15.20"
 
 \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,
+  \accidentalStyle "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"
diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly
index cd09539bc4..ceacccd889 100644
--- a/input/regression/accidental-contemporary.ly
+++ b/input/regression/accidental-contemporary.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 \header {
 
 texidoc = "Several automatic accidental rules
@@ -30,13 +30,13 @@ Both scores should show the same accidentals.
 
 \score {
   \relative c'' {
-    $(set-accidental-style 'dodecaphonic)
+    \accidentalStyle "dodecaphonic"
     gis4 a g gisis
-    $(set-accidental-style 'neo-modern)
+    \accidentalStyle "neo-modern"
     gis8 a gis gis g' gis gis,, a'
-    $(set-accidental-style 'neo-modern-cautionary)
+    \accidentalStyle "neo-modern-cautionary"
     eis fis eis eis g2
-    $(set-accidental-style 'teaching)
+    \accidentalStyle "teaching"
     \key e \major
     e8 eis fis fis gis2
   }
diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly
index 9630cdaeaa..f1a851cb1c 100644
--- a/input/regression/accidental-piano.ly
+++ b/input/regression/accidental-piano.ly
@@ -6,7 +6,7 @@ accidental."
 
 }
 
-\version "2.15.18"
+\version "2.15.20"
 
 \layout
 {
@@ -14,7 +14,7 @@ accidental."
 }
     
 \new PianoStaff \relative <<
-    $(set-accidental-style 'piano)
+    \accidentalStyle "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 fa0a38a264..c8500e9926 100644
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 \layout { ragged-right = ##t }
 
 \header{
@@ -28,7 +28,7 @@ voiceb =  \transpose c c' {
     \voicea
   }
   \context Staff << 
-    $(set-accidental-style 'modern-voice-cautionary)
+    \accidentalStyle "modern-voice-cautionary"
     \new Voice \voicea
     \new Voice \voiceb
   >>
diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index fe75321fbb..1971f26917 100644
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.20"
 
 \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)
+  \accidentalStyle "forget"
   \textLengthOn
 
 % ligaturae binaria
@@ -309,7 +309,7 @@
   \clef "petrucci-c5"
   \set Staff.printKeyCancellation = ##f
   \cadenzaOn % turn off bar lines
-  $(set-accidental-style 'forget)
+  \accidentalStyle "forget"
   \textLengthOn
 
   \[
diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 07649223a7..27dd7f2dac 100644
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.15.18"
+\version "2.15.20"
 manuscriptBreak = { \break }
 
 
@@ -106,7 +106,7 @@ secondVerse = \lyricmode {
     }
 
 pianoRH =  \relative c''' \repeat volta 2 {
-    $(set-accidental-style 'modern)
+    \accidentalStyle "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)
+    \accidentalStyle "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 \accidentalStyle "modern"
 	       \melody >>
 	   \lyricsto "singer" \new Lyrics \firstVerse
 	   \lyricsto "singer" \new Lyrics \secondVerse
diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index a2bdde9500..8d9eb39ffc 100644
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
-\version "2.15.18"
+\version "2.15.20"
 
 \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)
+  \accidentalStyle "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 345c60b396..34d5ad607c 100644
--- 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.15.18"
+\version "2.15.20"
 
 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)
+  \accidentalStyle "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)
+    \accidentalStyle "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 \accidentalStyle "modern"
 	   \melody >>
 	 \lyricsto "singer" \new Lyrics \firstVerse
 	 \lyricsto "singer" \new Lyrics \secondVerse
diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index b3cc07213b..f1566c7d4a 100644
--- 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.15.18"
+\version "2.15.20"
 
 % 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)
+  \accidentalStyle "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)
+  \accidentalStyle "forget"
 }
 
 % Layout tweaks.
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index e5f9a480fd..21c0447868 100644
--- 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.18"
+\version "2.15.20"
 
 \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))
+  %% \accidentalStyle "forget")
   extraNatural = ##f
   autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
   autoCautionaries = #'()