Docs: Update for staff.itely

* small corrections to the main docs and nitpick
  fixes for snippets

Signed-off-by: Patrick McCarty <pnorcks@gmail.com>

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index 9c6e40a36380f16da6615447a252300e7f5558fe..db101e604bc8c132f62ed136e098c34c6a620e4a 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -281,11 +281,11 @@ Internals Reference:
 Two additional staff-group contexts are available that can be
 nested within a @code{StaffGroup} or @code{ChoirStaff} context:
 @code{InnerStaffGroup} and @code{InnerChoirStaff}.  These contexts
-create a bracket next to the original bracket of their parent
-staff group.
+create a new bracket adjacent to the bracket of their parent staff
+group.
 
 An @code{InnerStaffGroup} is treated similarly to a
-@code{StaffGroup}; bar lines are connected between each stave
+@code{StaffGroup}; bar lines are connected between each staff
 within the context:
 
 @lilypond[verbatim,quote,relative=2]
@@ -877,7 +877,10 @@ d4 g e c
 
 @c perhaps also an example of how to move it horizontally?
 
-@c TODO add snippet to LSR -pm
+@c TODO add snippet when ready
+@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@c {changing-the-tempo-without-a-visible-metronome-mark.ly}
+
 To change the tempo in the MIDI output without printing anything,
 make the metronome marking invisible
 
@@ -885,7 +888,10 @@ make the metronome marking invisible
 \once \override Score.MetronomeMark #'transparent = ##t
 @end example
 
-@c TODO add snippet to LSR -pm
+@c TODO add snippet when ready
+@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@c {creating-metronome-marks-in-markup-mode.ly}
+
 To print other metronome markings, use these markup commands
 
 @lilypond[verbatim,quote,relative=1]
@@ -977,7 +983,7 @@ default.  To center multi-line instrument names,
 However, if the instrument names are longer, the instrument names
 in a staff group may not be centered unless the @code{indent} and
 @code{short-indent} settings are increased.  For details about
-these settings, see @ref{Page formatting}.
+these settings, see @ref{Horizontal dimensions}.
 
 @lilypond[verbatim,quote,ragged-right]
 \layout {
@@ -1062,7 +1068,7 @@ to declare the instrument switch:
 @seealso
 
 Notation Reference:
-@ref{Page formatting},
+@ref{Horizontal dimensions},
 @ref{Modifying context plug-ins}.
 
 Snippets:
@@ -1148,29 +1154,18 @@ It is possible to tag quotations with unique names in order to
 process them in different ways.  For details about this procedure,
 see @ref{Using tags}.
 
-@c add to snippets, possibly.  It might already be there.  -pm
-@c
-@c The type of events that are present in the quoted music can be
-@c trimmed with the @code{quotedEventTypes} property.  The default
-@c value is @code{(note-event rest-event)}, which means that only
-@c notes and rests of the quoted voice end up in the
-@c @code{\quoteDuring}.  Setting
-@c
-@c @example
-@c \set Staff.quotedEventTypes =
-@c        #'(note-event articulation-event dynamic-event)
-@c @end example
-@c
-@c @noindent
-@c will quote notes (but no rests), together with scripts and
-@c dynamics.
-
 
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {quoting-another-voice-with-transposition.ly}
 
+@cindex note-event
+@cindex articulation-event
+@cindex dynamic-event
+@cindex rest-event
+@funindex quotedEventTypes
+
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {quoting-another-voice.ly}
 

diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly
index 115680d06a211496e81193b014858c1c1b493bad..5e7ed7a07fa06b6b65074bce5b6bc761a0ee279c 100644 (file)
--- a/input/new/quoting-another-voice-with-transposition.ly
+++ b/input/new/quoting-another-voice-with-transposition.ly
@@ -30,7 +30,8 @@ quoteTest = {
 }
 
 {
-  \set Staff.instrumentName = \markup \center-column { Horn \line { in F } }
+  \set Staff.instrumentName =
+    \markup \center-column { Horn \line { in F } }
   \quoteTest
   \transpose c' d' << \quoteTest s4_"up a tone" >>
 }

diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly
index e6fff64c1363537c33baf5f5ff4f1ea85e3354d2..f16395dd2e2080851913513a8c458183232d2aac 100644 (file)
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,16 +1,20 @@
 \version "2.11.10"
 \header {
   lsrtags = "staff-notation"
-  texidoc = "With @code{\\quote}, fragments of previously entered
-music may be quoted.  @code{quotedEventTypes} will determines which
-items are quoted.  In this example, a 16th rest is not quoted, since
-@code{rest-event} is not in @code{quotedEventTypes}."
+  texidoc = "The @code{quotedEventTypes} property determines the
+music event types that are quoted.  The default value is
+@code{(note-event rest-event)}, which means that only notes and
+rests of the quoted voice appear in the @code{\\quoteDuring}
+expression.  In the following example, a 16th rest is not quoted
+since @code{rest-event} is not in @code{quotedEventTypes}."
   doctitle = "Quoting another voice"
 }
 
-quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
-
+quoteMe = \relative c' {
+  fis4 r16 a8.-> b4\ff c
+}
 \addQuote quoteMe \quoteMe
+
 original = \relative c'' {
   c8 d s2
   \once \override NoteColumn #'ignore-collision = ##t
@@ -28,13 +32,14 @@ original = \relative c'' {
   }
   \new Staff \relative c'' <<
     \set Staff.instrumentName = #"orig+quote"
-    \set Staff.quotedEventTypes = #'(note-event articulation-event)
+    \set Staff.quotedEventTypes =
+      #'(note-event articulation-event)
     \original
     \new Voice {
       s4
-           \set fontSize = #-4
-           \override Stem #'length-fraction = #(magstep -4)
-           \quoteDuring #"quoteMe" { \skip 2. }
+      \set fontSize = #-4
+      \override Stem #'length-fraction = #(magstep -4)
+      \quoteDuring #"quoteMe" { \skip 2. }
     }
   >>
 >>