Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / user / staff.itely

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index a736f96794ed0b922c3973d86dfb1d539a90bd96..c013f4b2f34d141c5b1b91fb149086cf5da80218 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -98,7 +98,7 @@ is preserved.  See @ref{Showing melody rhythms}.
 
 @item
 @code{TabStaff} creates by default a tablature with six strings in 
-standard guitar tuning.  See @ref{Tablatures basic}.
+standard guitar tuning.  See @ref{Guitar tablatures}.
 
 @lilypond[verbatim,ragged-right,quote,fragment,relative=2]
 \new TabStaff { c d e f }
@@ -121,15 +121,16 @@ in the score.  This is done with the commands @code{\startStaff} and
 Music Glossary: @rglos{staff}, @rglos{staves}.
 
 Notation Reference: @ref{Percussion staves}, 
-@ref{Tablatures basic}, @ref{Gregorian Chant contexts},
+@ref{Guitar tablatures}, @ref{Gregorian chant contexts},
 @ref{Mensural contexts}.
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Staff}, @internalsref{DrumStaff},
-@internalsref{GregorianTranscriptionStaff}, @internalsref{RhythmicStaff},
-@internalsref{TabStaff}, @internalsref{MensuralStaff},
-@internalsref{VaticanaStaff}, @internalsref{StaffSymbol}.
+Internals Reference: @rinternals{Staff}, @rinternals{DrumStaff},
+@rinternals{GregorianTranscriptionStaff}, @rinternals{RhythmicStaff},
+@rinternals{TabStaff}, @rinternals{MensuralStaff},
+@rinternals{VaticanaStaff}, @rinternals{StaffSymbol}.
 
 
 
@@ -173,12 +174,10 @@ In a @code{StaffGroup}, the bar lines will be drawn through
 all the staves, and the group is started with a bracket.
 
 @lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new StaffGroup {
-  <<
-    \new Staff { c1 c }
-    \new Staff { c c }
-  >>
-}
+\new StaffGroup <<
+  \new Staff { c1 c }
+  \new Staff { c c }
+>>
 @end lilypond
 
 @item
@@ -186,12 +185,10 @@ In a @code{ChoirStaff}, the group is
 started with a bracket, but bar lines are not connected. 
 
 @lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new ChoirStaff {
-  <<
-    \new Staff { c1 c }
-    \new Staff { c c }
-  >>
-}
+\new ChoirStaff <<
+  \new Staff { c1 c }
+  \new Staff { c c }
+>>
 @end lilypond
 
 @item
@@ -199,12 +196,10 @@ In a @code{GrandStaff}, the group is started with a brace
 at the left, and bar lines are connected between the staves. 
 
 @lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new GrandStaff {
-  <<
-    \new Staff { c1 c }
-    \new Staff { c c }
-  >>
-}
+\new GrandStaff <<
+  \new Staff { c1 c }
+  \new Staff { c c }
+>>
 @end lilypond
 
 @item
@@ -213,12 +208,10 @@ optimized for setting piano music. In particular it supports the printing
 of an instrument name directly, see @ref{Instrument names}.
 
 @lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new PianoStaff {
-  <<
-    \new Staff { c1 c }
-    \new Staff { c c }
-  >>
-}
+\new PianoStaff <<
+  \new Staff { c1 c }
+  \new Staff { c c }
+>>
 @end lilypond
 
 @end itemize
@@ -246,10 +239,10 @@ piano music and @code{ChoirStaff} for all kind of vocal ensemble music.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {use-square-bracket-at-the-start-of-a-staff-group.ly}
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {display-bracket-with-only-one-staff-in-a-system.ly}
 
 @cindex mensurstriche layout
@@ -257,7 +250,7 @@ piano music and @code{ChoirStaff} for all kind of vocal ensemble music.
 @cindex transcription of mensural music
 @cindex mensural music, transcription of
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {mensurstriche-layout-bar-lines-between-the-staves.ly}
 @c FIXME: move to NR 2.8.x when sectioning is ready
 
@@ -266,13 +259,14 @@ piano music and @code{ChoirStaff} for all kind of vocal ensemble music.
 Music Glossary: @rglos{brace}, 
 @rglos{bracket}, @rglos{grand staff}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Staff}, @internalsref{ChoirStaff},
-@internalsref{GrandStaff}, @internalsref{PianoStaff}, 
-@internalsref{StaffGroup}, @internalsref{systemStartDelimiter},
-@internalsref{SystemStartBar}, @internalsref{SystemStartBrace},
-@internalsref{SystemStartBracket}, @internalsref{systemStartSquare}.
+Internals Reference: @rinternals{Staff}, @rinternals{ChoirStaff},
+@rinternals{GrandStaff}, @rinternals{PianoStaff}, 
+@rinternals{StaffGroup}, @rinternals{systemStartDelimiter},
+@rinternals{SystemStartBar}, @rinternals{SystemStartBrace},
+@rinternals{SystemStartBracket}, @rinternals{systemStartSquare}.
 
 
 @node Deeper nested staff groups
@@ -384,18 +378,19 @@ source code, for instructions how to set them see @ref{Instrument names}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {nesting-staves.ly}
 
 
 @seealso
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{InnerChoirStaffGroup}, 
-@internalsref{InnerStaffGroup}, @internalsref{SystemStartBar}, 
-@internalsref{SystemStartBrace}, @internalsref{SystemStartBracket},
-@internalsref{systemStartDelimiterHierarchy}.
+Internals Reference: @rinternals{InnerChoirStaffGroup}, 
+@rinternals{InnerStaffGroup}, @rinternals{SystemStartBar}, 
+@rinternals{SystemStartBrace}, @rinternals{SystemStartBracket},
+@rinternals{systemStartDelimiterHierarchy}.
 
 
 
@@ -552,14 +547,14 @@ b b
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {making-some-staff-lines-thicker-than-the-others.ly}
 
 @seealso
 
 Glossary: @rglos{line}, @rglos{ledger line}, @rglos{staff}.
 
-Internals Reference: @internalsref{StaffSymbol}.
+Internals Reference: @rinternals{StaffSymbol}.
 
 @knownissues
 
@@ -602,7 +597,7 @@ to the main staff with @code{<<} and @code{>>} brackets.  The @emph{ossia}
 staff is stopped and started explicitely and white space is inserted 
 with the @code{\skip} command.
 
-@lilypond[verbatim,relative=2,quote]
+@lilypond[verbatim,quote]
 <<
   \new Staff \with
   {
@@ -644,9 +639,10 @@ with the @code{\skip} command.
 
 Music Glossary: @rglos{ossia}, @rglos{staff}, @rglos{Frenched staff}.
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{StaffSymbol}.
+Internals Reference: @rinternals{StaffSymbol}.
 
 
 @node Hiding staves
@@ -700,7 +696,7 @@ You can make the staff lines invisible by removing the
 
 @lilypond[quote,ragged-right,verbatim]
 \score {
-  \context Staff \relative c'' { c8 c c16 c c c }
+  \new Staff \relative c'' { c8 c c16 c c c }
   \layout{
     \context {
       \Staff
@@ -723,7 +719,7 @@ The lower staff of the second staff group is not removed,
 because the setting applies only to the specific staff inside 
 of which it is written.
 
-@lilypond[quote,ragged-right,verbatim,relative=2]
+@lilypond[quote,ragged-right,verbatim]
 \layout {
   \context { 
     \RemoveEmptyStaffContext 
@@ -748,7 +744,7 @@ of which it is written.
 @end lilypond
 
 @c FIXME not yet in master
-@c lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@c lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 @c {remove-the-first-empy-line.ly}
 
 @predefined
@@ -761,11 +757,12 @@ of which it is written.
 
 Notation Reference: @ref{Staff symbol}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{ChordNames},
-@internalsref{FiguredBass}, @internalsref{Lyrics},
-@internalsref{Staff}, @internalsref{VerticalAxisGroup}.
+Internals Reference: @rinternals{ChordNames},
+@rinternals{FiguredBass}, @rinternals{Lyrics},
+@rinternals{Staff}, @rinternals{VerticalAxisGroup}.
 
 @node Writing parts
 @subsection Writing parts
@@ -827,9 +824,10 @@ Music Glossary: @rglos{metronome}, @rglos{metronomic indication},
 
 Notation Reference: @ref{Formatting text}.
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{MetronomeMark}, @ref{MIDI
+Internals Reference: @rinternals{MetronomeMark}, @ref{MIDI
 output}.
 
 
@@ -946,10 +944,11 @@ c1 c c c \break
 
 Notation Reference: @ref{Modifying context plug-ins}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{InstrumentName},
-@internalsref{PianoStaff}, @internalsref{Staff}.
+Internals Reference: @rinternals{InstrumentName},
+@rinternals{PianoStaff}, @rinternals{Staff}.
 
 
 @node Quoting other voices
@@ -1068,9 +1067,10 @@ written entirely in lower-case letters: @code{\addquote}.
 
 Notation Reference: @ref{Instrument transpositions}.
 
-Snippets: @lsrdir{Staff,Staff-notation}
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{QuoteMusic}, @internalsref{Voice}.
+Internals Reference: @rinternals{QuoteMusic}, @rinternals{Voice}.
 
 
 @node Formatting cue notes
@@ -1174,15 +1174,16 @@ cbsn = \relative c, {
 }
 
 <<
-  \context Staff = "picc" \picc
-  \context Staff = "cbsn" \cbsn
+  \new Staff = "picc" \picc
+  \new Staff = "cbsn" \cbsn
 >>
 @end lilypond
 
 @seealso
 
-Snippets: @lsrdir{Staff,Staff-notation}.
+Snippets:
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Voice}.
+Internals Reference: @rinternals{Voice}.