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

23 files changed, 58 insertions, 163 deletions

diff --git a/Documentation/de/essay/engraving.itely b/Documentation/de/essay/engraving.itely
index 2e3c1a4c3c..c9b7f960fb 100644
--- a/Documentation/de/essay/engraving.itely
+++ b/Documentation/de/essay/engraving.itely
@@ -9,7 +9,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.32"
 
 @c Translators: Till Paala
 
@@ -1642,10 +1642,7 @@ nächste Beispiel zeigt einige etwas exotischere Konstruktionen:
     >> }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     \context {
diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely
index 29ffd19e46..ba01fc60a3 100644
--- a/Documentation/de/notation/input.itely
+++ b/Documentation/de/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.15.25"
+@c \version "2.15.32"
 
 @c Translators: Till Paala
 
@@ -2521,10 +2521,7 @@ gesetzt wird:
 \score @{
   @var{...Noten...}
   \midi @{
-    \context @{
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    @}
+    \tempo 4 = 72
   @}
 @}
 @end example
@@ -2849,10 +2846,7 @@ diese Einstellung korrekt funktioniert.
   >>
   \layout {}
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
@@ -2923,10 +2917,7 @@ Lautstärkewerte, die denen des vorigen Beispiels entsprechen.
   >>
   \layout { }
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
diff --git a/Documentation/es/essay/engraving.itely b/Documentation/es/essay/engraving.itely
index 571f664f1c..b97f2ea81e 100644
--- a/Documentation/es/essay/engraving.itely
+++ b/Documentation/es/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.32"
 
 @node Grabado musical
 @chapter Grabado musical
@@ -1652,10 +1652,7 @@ ejemplo siguiente combina unas pocas construcciones algo más exóticas.
     >> }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     \context {
diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely
index 99087ae563..40d6fffef8 100644
--- a/Documentation/es/notation/input.itely
+++ b/Documentation/es/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.25"
+@c \version "2.15.32"
 
 @node Entrada y salida generales
 @chapter Entrada y salida generales
@@ -2489,10 +2489,7 @@ indicación de tempo:
 \score @{
   @var{...música...}
   \midi @{
-    \context @{
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    @}
+    \tempo 4 = 72
   @}
 @}
 @end example
@@ -2811,10 +2808,7 @@ cada instrumento para que esto funcione correctamente.
   >>
   \layout {}
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
@@ -2882,10 +2876,7 @@ del clarinete a los mismos valores que el ejemplo anterior.
   >>
   \layout { }
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely
index 7001fa4f68..7b58fb050c 100644
--- a/Documentation/essay/engraving.itely
+++ b/Documentation/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.32"
 
 @node Music engraving
 @chapter Music engraving
@@ -1552,10 +1552,7 @@ following example combines some more exotic constructs.
     >> }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     \context {
diff --git a/Documentation/fr/essay/engraving.itely b/Documentation/fr/essay/engraving.itely
index 2d4664b179..531f925bfa 100644
--- a/Documentation/fr/essay/engraving.itely
+++ b/Documentation/fr/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.15.32"
 
 @c Translators: Jean-Charles Malahieude, John Mandereau, Gauvain Pocentek
 
@@ -1653,10 +1653,7 @@ constructions@dots{}
     >> }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     \context {
diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely
index ec7bb4db95..f84485fbfa 100644
--- a/Documentation/fr/notation/input.itely
+++ b/Documentation/fr/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.25"
+@c \version "2.15.32"
 
 @c Translators: Jean-Charles Malahieude, Valentin Villenave
 
@@ -2559,10 +2559,7 @@ imprimée.
 \score @{
   @var{...musique...}
   \midi @{
-    \context @{
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    @}
+    \tempo 4 = 72
   @}
 @}
 @end example
@@ -2929,10 +2926,7 @@ indication de nuance.
   >>
   \layout {}
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
@@ -3001,10 +2995,7 @@ flûte et de la clarinette -- au même niveau que dans le précédent.
   >>
   \layout { }
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely
index 48ed1cd650..7110de4c84 100644
--- a/Documentation/ja/notation/input.itely
+++ b/Documentation/ja/notation/input.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.25"
+@c \version "2.15.32"
 
 
 @c Translators: Yoshiki Sawada
@@ -2571,10 +2571,7 @@ MIDI ファイルの初期テンポを設定します:
 \score @{
   @var{...music...}
   \midi @{
-    \context @{
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    @}
+    \tempo 4 = 72
   @}
 @}
 @end example
@@ -2907,10 +2904,7 @@ MIDI 出力の品質を著しく高めることができます。
   >>
   \layout {}
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
@@ -2977,10 +2971,7 @@ MIDI 最小/最大ボリューム プロパティが設定されていない場�
   >>
   \layout { }
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
diff --git a/Documentation/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly
index 4521e658d0..a5c308cc8a 100644
--- a/Documentation/ly-examples/granados.ly
+++ b/Documentation/ly-examples/granados.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.32"
 \include "example-header.ily"
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -140,9 +140,6 @@ lowerVoiceTwo = \relative c, {
     }
   }
   %{\midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 120 4)
-    }
+    \tempo 4 = 120
   }%}
 }
diff --git a/Documentation/ly-examples/theory.ly b/Documentation/ly-examples/theory.ly
index 9f8adab952..629cf409eb 100644
--- a/Documentation/ly-examples/theory.ly
+++ b/Documentation/ly-examples/theory.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.32"
 \include "example-header.ily"
 
 #(ly:set-option 'point-and-click #f)
@@ -54,9 +54,6 @@ bassFigures = \figuremode {
   >>
   \layout {}
   %{\midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 120 4)
-    }
+    \tempo 4 = 120
   }%}
 }
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 19c87ce971..410ac25a9e 100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.15.25"
+@c \version "2.15.32"
 
 @node General input and output
 @chapter General input and output
@@ -2365,10 +2365,7 @@ indication to be printed:
 \score @{
   @var{...music...}
   \midi @{
-    \context @{
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    @}
+    \tempo 4 = 72
   @}
 @}
 @end example
@@ -2681,10 +2678,7 @@ correctly.
   >>
   \layout {}
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
@@ -2750,10 +2744,7 @@ to the same values as the previous example.
   >>
   \layout { }
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 @end lilypond
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 81cb63c310..1330b5c197 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
   lsrtags = "rhythms, percussion"
@@ -71,10 +71,7 @@ timb = \drummode { timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb }
   >>
   \layout { }
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 120 4)
-    }
+    \tempo 4 = 120
   }
 }
 
diff --git a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
index 22d4914a4c..74147ae8c6 100644
--- a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
+++ b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.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.32"
 
 \header {
   lsrtags = "contexts-and-engravers, midi"
@@ -92,10 +92,7 @@ two MIDI channels are created, each with a different
       \Voice
       \consists "Staff_performer"
     }
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 2)
-    }
+    \tempo 2 = 72
   }
 }
 
diff --git a/Documentation/snippets/new/screech-boink.ly b/Documentation/snippets/new/screech-boink.ly
index 35efa386b2..699d7f740e 100644
--- a/Documentation/snippets/new/screech-boink.ly
+++ b/Documentation/snippets/new/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.32"
 \header {
   lsrtags = "headwords"
   texidoc = "Random complex notation"
@@ -58,10 +58,7 @@
     }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     ragged-right = ##t
diff --git a/Documentation/snippets/new/staff-headword.ly b/Documentation/snippets/new/staff-headword.ly
index 7547f03eb0..3dbed3282b 100644
--- a/Documentation/snippets/new/staff-headword.ly
+++ b/Documentation/snippets/new/staff-headword.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.32"
 \include "catalan.ly"
 #(set-global-staff-size 15)
 \paper{
@@ -117,10 +117,7 @@ lower = \relative do {
     >>
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    }
+    \tempo 4 = 72
   }
 }
 
diff --git a/Documentation/snippets/screech-boink.ly b/Documentation/snippets/screech-boink.ly
index 4cf5f59345..88fefa9414 100644
--- a/Documentation/snippets/screech-boink.ly
+++ b/Documentation/snippets/screech-boink.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.32"
 \header {
   lsrtags = "headwords"
   texidoc = "Random complex notation"
@@ -66,10 +66,7 @@
     }
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 8)
-    }
+    \tempo 8 = 60
   }
   \layout {
     ragged-right = ##t
diff --git a/Documentation/snippets/staff-headword.ly b/Documentation/snippets/staff-headword.ly
index a1b083aeae..461e543c18 100644
--- a/Documentation/snippets/staff-headword.ly
+++ b/Documentation/snippets/staff-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.32"
 \include "catalan.ly"
 #(set-global-staff-size 15)
 \paper{
@@ -125,10 +125,7 @@ lower = \relative do {
     >>
   >>
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 72 4)
-    }
+    \tempo 4 = 72
   }
 }
 
diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index 564852b864..ee58a08dbe 100644
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.15.18"
+\version "2.15.32"
 
 forcedLastBreak =  { \break }
 
@@ -187,10 +187,7 @@ smallerPaper = \layout {
     \layout { }
 
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 40 4)
-      }
+    \tempo 4 = 40
     }
 
 
diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 517930db87..575a4f6471 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -7,7 +7,7 @@
 }
 
 
-\version "2.14.0"
+\version "2.15.32"
 
 drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
 drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
@@ -36,10 +36,7 @@ timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r
   %% broken:
   
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 120 4)
-      }
+    \tempo 4 = 120
     }
 
 
diff --git a/input/regression/midi-volume-equaliser.ly b/input/regression/midi-volume-equaliser.ly
index df240189cd..72ae48a840 100644
--- a/input/regression/midi-volume-equaliser.ly
+++ b/input/regression/midi-volume-equaliser.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.32"
 \header {
   texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a note, where groups stop one after
@@ -124,10 +124,7 @@ violoncello =  \relative c' {
   >>
 
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 60 1)
-    }
+    \tempo 1 = 60
   }
 }
 
diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 27dd7f2dac..387bd49115 100644
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.15.20"
+\version "2.15.32"
 manuscriptBreak = { \break }
 
 
@@ -180,10 +180,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
 	    }
 	}
 	\midi {
-	  \context {
-	    \Score
-	    tempoWholesPerMinute = #(ly:make-moment 70 4)
-	  }
+	  \tempo 4 = 70
 	}
     }
 }
diff --git a/input/regression/mozart-hrn-3.ly b/input/regression/mozart-hrn-3.ly
index 63e91886d0..1cb2602db8 100644
--- a/input/regression/mozart-hrn-3.ly
+++ b/input/regression/mozart-hrn-3.ly
@@ -48,7 +48,7 @@ virtuoso that taught in Geneva.
 "
 }
 
-\version "2.15.20"
+\version "2.15.32"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
@@ -70,10 +70,7 @@ virtuoso that taught in Geneva.
     }
 
     \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 90 4)
-      }
+      \tempo 4 = 90
     }
   }
 
@@ -85,10 +82,7 @@ virtuoso that taught in Geneva.
     }
 
     \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 70 4)
-      }
+      \tempo 4 = 70
     }
 
     \layout { }
@@ -103,10 +97,7 @@ virtuoso that taught in Geneva.
     }
 
     \midi {
-      \context {
-        \Score
-        tempoWholesPerMinute = #(ly:make-moment 100 4)
-      }
+      \tempo 4 = 100
     }
 
     \layout { }
diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index 34d5ad607c..d20c6fe825 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.20"
+\version "2.15.32"
 
 ignoreMelisma =	\set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -158,10 +158,7 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
       }
       
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 70 4)
-      }
+    \tempo 4 = 70
     }