Move fundamental voices stuff into Fundamental.

diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely
index 4aa1eb68c29c57f0033cdb6503714876b09420ca..a84ac0c45dc98e347e7ba8cace244e93e4689744 100644 (file)
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@ -7,6 +7,7 @@
 @menu
 * How LilyPond files work::     
 * Score is a single musical expression::  
+* I'm seeing Voices::           
 @end menu
 
 
@@ -261,4 +262,85 @@ on the same horizontal position in your text editor.
 
 
 
+@node I'm seeing Voices
+@section I'm seeing Voices
+
+@cindex polyphony
+
+The easiest way to enter fragments with more than one voice on a
+staff is to enter each voice as a sequence (with @code{@{...@}}),
+and combine them simultaneously, separating the voices with
+@code{\\}
+
+@funindex \\
+
+@lilypond[quote,verbatim,fragment]
+\new Staff \relative c' {
+  c16 d e f
+  <<
+    { g4 f e | d2 e2 } \\
+    { r8 e4 d c8 ~ | c b16 a b8 g ~ g2 } \\
+    { s2. | s4 b4 c2 }
+  >>
+}
+@end lilypond
+
+@cindex layers
+
+The separator causes @internalsref{Voice}
+contexts@footnote{Polyphonic voices are sometimes
+called @q{layers} in other notation packages} to be instantiated.
+They bear the names @code{"1"}, @code{"2"}, etc.  In each of these
+contexts, vertical direction of slurs, stems, etc., is set
+appropriately.
+
+These voices are all separate from the voice that contains the
+notes just outside the @code{<< \\ >>} construct.  This should be
+noted when making changes at the voice level.  This also means
+that slurs and ties cannot go into or out of a @code{<< \\ >>}
+construct.  Conversely, parallel voices from separate @code{<< \\
+>>} constructs on the same staff are the same voice.  Here is the
+same example, with different noteheads and colors for each voice.
+Note that the change to the note-head style in the main voice does
+not affect the inside of the @code{<< \\ >>} constructs.  Also,
+the change to the second voice in the first @code{<< \\ >>}
+construct is effective in the second @code{<< \\ >>}, and the
+voice is tied across the two constructs.
+
+@cindex note heads, styles
+
+@lilypond[quote,verbatim,fragment]
+\new Staff \relative c' {
+  \override NoteHead #'style = #'cross
+  \override NoteHead #'color = #red
+  c16 d e f
+  <<
+    { g4 f e } \\
+    { \override NoteHead #'style = #'triangle
+      \override NoteHead #'color = #blue
+    r8 e4 d c8 ~ }
+  >> |
+  <<
+    { d2 e2 } \\
+    { c8 b16 a b8 g ~ g2 } \\
+    { \override NoteHead #'style = #'slash 
+      \override NoteHead #'color = #green
+      s4 b4 c2 }
+  >>
+}
+@end lilypond
+
+Polyphony does not change the relationship of notes within a
+@code{\relative @{ @}} block.  Each note is calculated relative to
+the note immediately preceding it.
+
+@example
+\relative @{ noteA << noteB \\ noteC >> noteD @}
+@end example
+
+@code{noteC} is relative to @code{noteB}, not @code{noteA};
+@code{noteD} is relative to @code{noteC}, not @code{noteB} or
+@code{noteA}.
+
+
 

diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely
index f73f46a78bb054c0e02b1a840669992dcc2673e1..364b0374a317cc8aab8caf3199a3feab85c83db9 100644 (file)
--- a/Documentation/user/percussion.itely
+++ b/Documentation/user/percussion.itely
@@ -89,8 +89,9 @@ down = \drummode { bassdrum4 snare8 bd r bd sn4 }
 @end lilypond
 
 The above example shows verbose polyphonic notation.  The short
-polyphonic notation, described in @ref{Basic polyphony}, can also be used if
-the @internalsref{DrumVoice}s are instantiated by hand first.  For example,
+polyphonic notation, described in @rlearning{I'm seeing Voices},
+can also be used if the @internalsref{DrumVoice}s are instantiated
+by hand first.  For example,
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 \new DrumStaff <<

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 9f921c9732081a3078f64ba5ae0dddf425a2a7a2..b552bcb712105995c22689959796973eb86205cf 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -82,94 +82,12 @@ accurately.  Use @code{<g a>8 <e a>8} instead.
 @subsection Multiple voices
 
 @menu
-* Basic polyphony::             
 * Explicitly instantiating voices::  
 * Collision Resolution::        
 * Automatic part combining::    
 * Writing music in parallel::   
 @end menu
 
-@node Basic polyphony
-@unnumberedsubsubsec Basic polyphony
-
-@cindex polyphony
-
-The easiest way to enter fragments with more than one voice on a
-staff is to enter each voice as a sequence (with @code{@{...@}}),
-and combine them simultaneously, separating the voices with
-@code{\\}
-
-@funindex \\
-
-@lilypond[quote,verbatim,fragment]
-\new Staff \relative c' {
-  c16 d e f
-  <<
-    { g4 f e | d2 e2 } \\
-    { r8 e4 d c8 ~ | c b16 a b8 g ~ g2 } \\
-    { s2. | s4 b4 c2 }
-  >>
-}
-@end lilypond
-
-@cindex layers
-
-The separator causes @internalsref{Voice}
-contexts@footnote{Polyphonic voices are sometimes
-called @q{layers} in other notation packages} to be instantiated.
-They bear the names @code{"1"}, @code{"2"}, etc.  In each of these
-contexts, vertical direction of slurs, stems, etc., is set
-appropriately.
-
-These voices are all separate from the voice that contains the
-notes just outside the @code{<< \\ >>} construct.  This should be
-noted when making changes at the voice level.  This also means
-that slurs and ties cannot go into or out of a @code{<< \\ >>}
-construct.  Conversely, parallel voices from separate @code{<< \\
->>} constructs on the same staff are the same voice.  Here is the
-same example, with different noteheads and colors for each voice.
-Note that the change to the note-head style in the main voice does
-not affect the inside of the @code{<< \\ >>} constructs.  Also,
-the change to the second voice in the first @code{<< \\ >>}
-construct is effective in the second @code{<< \\ >>}, and the
-voice is tied across the two constructs.
-
-@cindex note heads, styles
-
-@lilypond[quote,verbatim,fragment]
-\new Staff \relative c' {
-  \override NoteHead #'style = #'cross
-  \override NoteHead #'color = #red
-  c16 d e f
-  <<
-    { g4 f e } \\
-    { \override NoteHead #'style = #'triangle
-      \override NoteHead #'color = #blue
-    r8 e4 d c8 ~ }
-  >> |
-  <<
-    { d2 e2 } \\
-    { c8 b16 a b8 g ~ g2 } \\
-    { \override NoteHead #'style = #'slash 
-      \override NoteHead #'color = #green
-      s4 b4 c2 }
-  >>
-}
-@end lilypond
-
-Polyphony does not change the relationship of notes within a
-@code{\relative @{ @}} block.  Each note is calculated relative to
-the note immediately preceding it.
-
-@example
-\relative @{ noteA << noteB \\ noteC >> noteD @}
-@end example
-
-@code{noteC} is relative to @code{noteB}, not @code{noteA};
-@code{noteD} is relative to @code{noteC}, not @code{noteB} or
-@code{noteA}.
-
-
 @node Explicitly instantiating voices
 @unnumberedsubsubsec Explicitly instantiating voices