Small fixes.

diff --git a/ChangeLog b/ChangeLog
index afa5494fd263ab6145706685ba19a320c6bceb6a..3760e91ed7d0832f5fbf6aabfc3b1af4986a17c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-27  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/notation.itely: added info about what
+       \voiceFoo does.  Also rewrote warning about marks at
+       a line break.
+
+       * Docuementation/user/changing-defaults.itely: added info
+       about putting dynamics in parenthesis and brackets.
+
 2005-01-27  Werner Lemberg  <wl@gnu.org>
 
        * mf/feta-schrift.mf ("Trill (`tr')"): Fix typo.

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index c178378d78dbdbe96320c341e6bddcc8ff1ebfce..c12920cebd45b28dbd19525517766f9edb1d251e 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1651,6 +1651,21 @@ sfzp = #(make-dynamic-script "sfzp")
 }
 @end lilypond
 
+@cindex Dynamics, editorial
+@cindex Dynamics, parenthesis
+
+It is also possible to print dynamics in round parenthesis or square
+brackets.  These are often used for adding editorial dynamics.
+
+@ignore
+@li lypond[quote,verbatim,raggedright]
+\version "2.4.2"
+rndf = \markup{ \center-align <{ \bold{\italic (} \dynamic f \bold{\italic )} }> }
+boxf = \markup{ \bracket { \dynamic f } }
+{ c'1_\rndf c'1_\boxf }
+@end lilypond
+@end ignore
+
 
 @node Global layout
 @section Global layout

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 356d33282cc654ca01766ff782fb7bdbdcb97d6d..8af2acf8afc0a9fe22b5cfba8e64b798c45c1b76 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1493,6 +1493,11 @@ a stem directions and horizontal shift for each part
 The command @code{\oneVoice} will revert back to the normal setting.
 @cindex @code{\oneVoice}
 
+Defining voices (either with the separator @code{\\} or with
+@code{\voiceXXX}) will set the direction of stems, slurs, ties,
+articulations, text annotations, augmentation dots of dotted
+notes, and fingerings.  @code{\voiceOne} makes these objects
+point upwards, while @code{\voiceTwo} makes them point down.
 
 Normally, note heads with a different number of dots are not merged, but
 when the object property @code{merge-differently-dotted} is set in
@@ -5231,9 +5236,13 @@ c1 \mark \markup { \musicglyph #"scripts-ufermata" }
 c1
 @end lilypond
 
-In the case of a line break, marks must also be printed at the end of
-the line, and not at the beginning.  Use the following to force that
-behavior
+If the mark occurs at a line break, the mark will be printed at the
+beginning of the next line.
+@c  IMO this is a bug; hopefully it'll be fixed soon, so I can
+@c  delete this sentence.   -gp
+If there is no next line, then the mark will not be printed at all.
+To print the mark at the end of the current line, use
+
 @example
 \override Score.RehearsalMark
   #'break-visibility = #begin-of-line-invisible