From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 25 Aug 2006 12:00:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: cvs/HEAD~123
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f6007bf240fb6073db67ce271aa7a1d4effd9640;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index cb07814787..6222a53120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-25  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* Documentation/user/advanced-notation.itely (Metronome marks):
+	update use of \tempo in \midi.
+
 2006-08-24  Erik Sandberg  <mandolaerik@gmail.com>
 
 	* input/mutopia/*: upgrade to new midi tempo syntax (repairs make
@@ -44,7 +49,7 @@
 
 2006-08-23  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
-	* buildscripts/mutopia-index.py (allfiles):  filter  lily-XXX and
+	* buildscripts/mutopia-index.py (allfiles): filter lily-XXX and
 	snippet-map
 
 	* scm/define-context-properties.scm
@@ -57,7 +62,8 @@
 	* lily/smobs.cc (protect_smob): switch off fancy smob protection
 	for now. 
 
-	* lily/include/performer.hh (class Performer): strip get_tempo() method.
+	* lily/include/performer.hh (class Performer): strip get_tempo()
+	method.
 
 	* lily/midi-def.cc: strip file.
 
diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index f20895cad6..9d17777509 100644
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -39,7 +39,7 @@ melody = \relative c' {
 \score {
    \new Staff \melody
    \layout { }
-   \midi { \tempo 4=60 }
+   \midi o}
 }
 @end lilypond
 
@@ -74,7 +74,7 @@ text = \lyricmode {
       \new Lyrics \lyricsto "one" \text
    >>
    \layout { }
-   \midi { \tempo 4=60 }
+   \midi { }
 }
 @end lilypond
 
@@ -107,7 +107,7 @@ harmonies = \chordmode {
    >>
 
    \layout{ }
-   \midi { \tempo 4=60}
+   \midi { }
 }
 @end lilypond
 
@@ -146,7 +146,7 @@ harmonies = \chordmode {
    \new Lyrics \lyricsto "one" \text
    >>
    \layout { }
-   \midi { \tempo 4=60 }
+   \midi { }
 }
 @end lilypond
 
@@ -181,7 +181,7 @@ lower = \relative c {
       \new Staff = "lower" \lower
    >>
    \layout { }
-   \midi { \tempo 4=60 }
+   \midi { }
 }
 @end lilypond
 
@@ -236,7 +236,7 @@ lower = \relative c {
    \layout {
       \context { \RemoveEmptyStaffContext }
    }
-   \midi { \tempo 4=60 }
+   \midi { }
 }
 @end lilypond
 
@@ -281,7 +281,7 @@ text = \lyricmode {
     \context { \GrandStaff \accepts "Lyrics" }
     \context { \Lyrics \consists "Bar_engraver" }
   }
-  \midi { \tempo 4=60 }
+  \midi { }
 }
 @end lilypond
 
@@ -433,7 +433,7 @@ cello = \new Voice { \relative c' {
       \new Staff << \global \cello >>
    >>
    \layout { }
-   \midi { \tempo 4=60}
+   \midi { }
 }
 @end lilypond
 
@@ -503,7 +503,7 @@ music = {
 \score {
   \new StaffGroup \keepWithTag #'score \music
   \layout { }
-  \midi { \tempo 4 = 60 }
+  \midi { }
 }
 
 
@@ -1277,7 +1277,7 @@ drumContents = {
     }
   }
 
-  \midi { \tempo 4 = 75 }
+  \midi { }
 }
 @end lilypond
 
diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 2ecd6dd1cb..4449a54187 100644
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -729,10 +729,12 @@ to a score, for example,
 @example
 \score @{
   @var{...music...}
-  \midi @{ \tempo 4=72 @}
+  \midi @{  @}
 @}
 @end example
 
+FIXME
+
 The tempo is specified using the @code{\tempo} command.  In this
 example the tempo of quarter notes is set to 72 beats per minute.
 
@@ -744,7 +746,7 @@ be added
 @example
 \score @{
   @var{...music...}
-  \midi @{ \tempo 4=72 @}
+  \midi @{ @}
   \layout @{ @}
 @}
 @end example
@@ -810,21 +812,8 @@ will.
 
 
 The MIDI block is analogous to the layout block, but it is somewhat
-simpler.  The @code{\midi} block can contain
-@cindex MIDI block
-
-@itemize @bullet
-  @item a @code{\tempo} definition, and
-  @item context definitions.
-@end itemize
-
-A number followed by a period is interpreted as a real number, so
-for setting the tempo for dotted notes, an extra space should be
-inserted, for example
-
-@example
-\midi @{ \tempo 4 . = 120 @}
-@end example
+simpler.  The @code{\midi} block is similar to @code{\layout}. It can contain
+context definitions.
 
 
 @cindex context definition
diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely
index 88aac44959..0cc5ecd908 100644
--- a/Documentation/user/putting.itely
+++ b/Documentation/user/putting.itely
@@ -48,7 +48,7 @@ text = \lyricmode @{
     \new Lyrics \lyricsto "one" \text
   >>
   \layout @{ @}
-  \midi @{ \tempo 4=60 @}
+  \midi @{ @}
 @}
 @end example
 
@@ -67,7 +67,7 @@ melody = \relative c' @{
 \score @{
 \new Staff \melody
 \layout @{ @}
-\midi @{ \tempo 4=60 @}
+\midi @{ @}
 @}
 @end example
 
@@ -121,7 +121,7 @@ celloMusic = \relative c @{
     \new Lyrics \lyricsto "one" \sopranoLyrics
   >>
   \layout @{ @}
-  \midi @{ \tempo 4=60 @}
+  \midi @{ @}
 @}
 @end example
 
@@ -152,7 +152,7 @@ more than one thing (in this case, @code{Staff}) happening at once.  The
     \new Staff \celloMusic
   >>
   \layout @{ @}
-  \midi @{ \tempo 4=60 @}
+  \midi @{ @}
 @}
 @end example
 
@@ -194,7 +194,7 @@ celloMusic = \relative c {
     \new Staff \celloMusic
   >>
   \layout { }
-  \midi { \tempo 4=60 }
+  \midi { }
 }
 @end lilypond