Imported Upstream version 2.16.0

[lilypond.git] / input / regression / mozart-hrn-3.ly

diff --git a/input/regression/mozart-hrn-3.ly b/input/regression/mozart-hrn-3.ly
index 985b415a9e781c938e393728f6331a6d7b3c11b2..3908f6bc6020884d1c768585931ca765c7f9bd18 100644 (file)
--- a/input/regression/mozart-hrn-3.ly
+++ b/input/regression/mozart-hrn-3.ly
@@ -19,19 +19,27 @@
   source = "Edition Breitkopf 2563"
   footer = "Mutopia-2002/05/21-25"
 
-  tagline = \markup { \smaller
-      \column {
-          \fill-line { \footer "" }
-          \fill-line { { "This music is part of the Mutopia project,"
-                         \typewriter { "http://mutopiaproject.org/" }
-                        } }
-          \fill-line { #(ly:export (string-append "It has been typeset and placed in the public "
-                         "domain by "  maintainer  "."))  }
-          \fill-line { #(ly:export (string-append "Unrestricted modification and redistribution"
-                         " is permitted and encouraged---copy this music"
-                         " and share it!")) }
-          }
-       }
+  tagline = \markup {
+    \smaller \column {
+      \fill-line { \footer "" }
+      \fill-line {
+        \line { "This music is part of the Mutopia project,"
+          \typewriter { "http://mutopiaproject.org/" }
+        }
+      }
+      \fill-line {
+        #(string-append  "It has been typeset and placed in the public "
+                                    "domain by " maintainer ".")
+      }
+      \fill-line {
+        \line {
+          "Unrestricted modification and redistribution"
+          "is permitted and encouraged - copy this music"
+          "and share it!"
+        }
+      }
+    }
+  }
 
   texidoc="
 This is the Mozart 3 for horn.  It's from an Edition Breitkopf EB
@@ -40,7 +48,7 @@ virtuoso that taught in Geneva.
 "
 }
 
-\version "2.14.0"
+\version "2.16.0"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
@@ -48,58 +56,52 @@ virtuoso that taught in Geneva.
 \include "mozart-hrn3-rondo.ily"
 
 \paper {
-    obsolete-between-system-space = 20 \mm
-    system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
-    score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+  system-system-spacing #'basic-distance = 10
+  score-system-spacing #'basic-distance = 20
 }
 
-
 \book {
-    \score {
-       { \transpose c' bes \allegro }
-       \layout { }
-       \header { piece = "Allegro" opus = "" }
-
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 90 4)
-      }
+  \score {
+    { \transpose c' bes \allegro }
+    \layout { }
+    \header {
+      piece = "Allegro"
+      opus = ""
     }
 
-
+    \midi {
+      \tempo 4 = 90
     }
+  }
 
-    \score {
-       { \transpose c' bes \romanze }
-       \header { piece = "Romanze" opus = "" }
-
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 70 4)
-      }
+  \score {
+    { \transpose c' bes \romanze }
+    \header {
+      piece = "Romanze"
+      opus = ""
     }
 
-
-       \layout {}
+    \midi {
+      \tempo 4 = 70
     }
 
-    \score
-    {
-       { \transpose c' bes \rondo }
-       \header { piece = "Rondo" opus = "" }
+    \layout { }
+  }
 
-  \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 100 4)
-      }
+  \score
+  {
+    { \transpose c' bes \rondo }
+    \header {
+      piece = "Rondo"
+      opus = ""
     }
 
-
-       \layout { }
+    \midi {
+      \tempo 4 = 100
     }
+
+    \layout { }
+  }
 }
 
 %% Local Variables: