Backport doc material. (mostly a test)

diff --git a/ChangeLog b/ChangeLog
index 08846facf94a74d5d97a34b8c05668e390b65e0d..3541cfb1e7d1c8b7da5a1ba95a916f2fd3fe1cef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/advanced-notation.itely: backport fixes
+       from 2.9.  (this is mostly a test; more backporting will occur)
+
 2006-03-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * Documentation/topdocs/NEWS.tely (Top): change to 2.8

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index ce25eddca56df74990ef73c3cfd3094248d43019..45d76a739de42df75e9da58ead52a044dee7bfb9 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -216,6 +216,27 @@ bar lines,
 }
 @end lilypond
 
+Although text marks are normally only printed above the topmost
+staff, you may alter this to print them on every staff,
+
+@lilypond[quote,ragged-right,verbatim,relative=2]
+{
+  \new Score \with {
+    \remove "Mark_engraver"
+  }
+  <<
+    \new Staff \with {
+      \consists "Mark_engraver"
+    }
+    { c''1 \mark "foo" c'' }
+    \new Staff \with {
+      \consists "Mark_engraver"
+    }
+    { c'1 \mark "foo" c' }
+  >>
+}
+@end lilypond
+
 
 @seealso
 
@@ -519,7 +540,9 @@ Examples: @file{ly/@/font@/-family@/-override.ly}
 @subsection New dynamic marks
 
 It is possible to print new dynamic marks or text that should be aligned
-with dynamics.  Use @code{make-dynamic-script} to create these marks.
+with dynamics.  Use @code{make-dynamic-script} to create these
+marks.  Note that the dynamic font only contains the characters
+@code{f,m,p,r,s} and @code{z}.
 
 @cindex make-dynamic-script
 
@@ -937,6 +960,25 @@ If you wish to center the instrument names, you must center all of them
 For longer instrument names, it may be useful to increase the
 @code{indent} setting in the @code{\layout} block.
 
+To center instrument names while leaving extra space to the right,
+
+@lilypond[quote,verbatim,ragged-right]
+\new StaffGroup \relative
+<<
+  \new Staff {
+    \set Staff.instrument
+    = \markup { \hcenter-in #10 "blabla" }
+    c1 c1
+  }
+  \new Staff {
+    \set Staff.instrument
+    = \markup { \hcenter-in #10 "blo" }
+    c1 c1
+  }
+>>
+@end lilypond
+
+
 @seealso
 
 Program reference: @internalsref{InstrumentName}.
@@ -1970,22 +2012,6 @@ e4 f4
 g4 a
 @end lilypond
 
-Hidden notes are also great for performing weird tricks.  For example,
-slurs cannot be attached to rests or spacer rests, but you may wish
-to include that in your score -- string instruments use this notation
-when doing pizzicato to indicate that the note should ring for as long
-as possible.
-
-@lilypond[quote,ragged-right,verbatim,relative=0,fragment]
-\clef bass
-<< {
-  c4^"pizz"( \hideNotes c)
-  \unHideNotes c( \hideNotes c)
-} {
-  s4 r s r
-} >>
-@end lilypond
-
 
 @node Shape note heads 
 @subsection Shape note heads