Minor editing.

diff --git a/ChangeLog b/ChangeLog
index c9ee4e792b0fb93f7999e5c09e587d7bb60bf88d..cf0cb48d3d0943002a4bbbe2cbf08505aaca6d94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-15  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/notation.itely: minor editing.
+
+       * Documentation/user/converters.itely: updated convert-ly bugs.
+
 2005-02-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/convert-ly.py: new slur dash patch by Bertalan Fodor.

diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 78bb8570de7c221201804d440e907bf8f3801eca..392ff01c60c5f63fc18a8ecae063754884805634 100644 (file)
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -97,7 +97,7 @@ specified.
 
 @ignore
 Copy and paste from CVS, last updated
-Dec 22, 2004
+Feb 14, 2005
 
 http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/lilypond/lily-bugs/bugs/convert-ly.txt?rev=HEAD&content-type=text/plain
 @end ignore
@@ -122,6 +122,10 @@ here for reference.
  Doesn't do \addlyrics => \lyricsto, this breaks some scores with multiple stanzas.
 2.2->2.4:
  \turnOff (used in \set Staff.VoltaBracket = \turnOff) is not properly converted.
+2.4.2->2.5.9
+ \markup{ \center-align <{ ... }> } should be converted to:
+ \markup{ \center-align {\line { ... }} }
+ but now, \line is missing.
 @end verbatim
 
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index e16894bb1fbc9035ebea3bd13e66b94f05e86d2b..cbd6b2c3bb35e13eb2e4ac4c40ba09b528fe8f42 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1030,9 +1030,6 @@ This command is equivalent to setting @code{clefGlyph},
 when any of these properties are changed.  The following example shows
 possibilities when setting properties manually.
 
-@ignore
-should to be fixed very quickly  -gp
-
 @lilypond[quote,raggedright,verbatim]
 {
   \set Staff.clefGlyph = #"clefs.F"
@@ -1054,8 +1051,6 @@ should to be fixed very quickly  -gp
 }
 @end lilypond
 
-@end ignore
-
 @seealso
 
 Program reference: @internalsref{Clef}.
@@ -2194,6 +2189,18 @@ layout output, a metronome marking is printed
 
 Program reference: @internalsref{MetronomeChangeEvent}.
 
+@refbugs
+
+Collisions are not checked.  If you have notes above the top line of
+the staff (or notes with articulations, slurs, text, etc), then the
+metronome marking may be printed on top of musical symbols.  If this
+occurs, increase the padding of the metronome mark to place it 
+further away from the staff.
+
+@example
+\Score \override MetronomeMark #'padding = #2.5
+@end example
+
 
 @node Text scripts
 @subsection Text scripts
@@ -4148,10 +4155,6 @@ Program reference: @internalsref{LyricCombineMusic},
 @inputfileref{input/@/regression,lyric@/-combine@/-new@/.ly}.
 @c TODO: make separate section for melismata
 
-@c  I can't find these examples in 2.0 or 2.2; remove. -gp
-@c @inputfileref{input/@/test,lyrics@/-melisma@/-variants@/.ly}.
-@c @inputfileref{input/@/test,lyrics@/-melisma@/-faster@/.ly}.
-
 @refbugs
 
 Melismata are not detected automatically, and extender lines must be