Merge master into nested-bookparts

[lilypond.git] / input / sakura-sakura.ly

diff --git a/input/sakura-sakura.ly b/input/sakura-sakura.ly
index 21fb572cba2830a2fc0e4ada5f1059c658c841c6..8bdcb2ebb578798b162aa1c94c35617c8dad3b64 100644 (file)
--- a/input/sakura-sakura.ly
+++ b/input/sakura-sakura.ly
@@ -1,6 +1,7 @@
 %% sakura-sakura.ly
 
-\version "2.6.0"
+\version "2.11.61"
+
 
 \header {
   title = "さくら さくら"
@@ -24,6 +25,21 @@
       | d,4 e b'8[ a] f4 | e1 \bar "|."
     }
     \addlyrics {
+
+
+      %{
+
+      Try the following if the default font doesn't work for you,
+      run
+
+      lilypond -dshow-available-fonts blabla
+
+      this will show all fonts available to LilyPond, substitute
+      FAMILY-NAME below and uncomment
+      
+      %}
+      %% \override Lyrics . LyricText #'font-name = #"FAMILY-NAME"
+      
       さ く ら さ く ら
       の や ま も さ と も
       み わ た す か ぎ り
@@ -34,7 +50,15 @@
     }
   >>
   \layout { }
-  \midi { \tempo 4=120 }
+  
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 120 4)
+      }
+    }
+
+
   }
 
 %%% Local Variables: