Misc minor editing and moving sections around.

diff --git a/ChangeLog b/ChangeLog
index 17f01a3b4cecda7234fd87f9c5773dc16bbc6fc6..fff84253ca304587fb3dd4a941e9b0d6842bd3cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/ *-notation.itely: misc minor editing,
+       shifting doc sections around.
+
 2006-02-20  Heikki Junes  <hjunes@cc.hut.fi>
 
        * po/fi.po: update.

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 69692f8a20d4a9845e1580ab8a43d4de190c687e..2d1e2bfdaa64ba4e42c8393743bc44b2d1052640 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1522,7 +1522,6 @@ LilyPond is limited.
 * Clusters::                    
 * Special fermatas::            
 * Special noteheads::           
-* Pitched trills::              
 * Feathered beams::             
 * Improvisation::               
 @end menu
@@ -1829,19 +1828,6 @@ To see all notehead styles, please see
 
 Program reference: @internalsref{NoteHead}.
 
-@node Pitched trills
-@subsection Pitched trills
-
-Trills that should be executed on an explicitly specified pitch can be
-typeset with the command @code{pitchedTrill}, 
-
-@lilypond[ragged-right,verbatim,fragment]
-  \pitchedTrill c'4\startTrillSpan fis
-  f'\stopTrillSpan
-@end lilypond
-
-The first argument is the main note. The absolute pitch of the second
-is printed as a stemless note head in parentheses.
 
 @node Feathered beams
 @subsection Feathered beams

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 5c3d193464ceba54c69e40c344434c44c1794d75..5b60197da90922867e516c34759c287b971c833e 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -42,7 +42,7 @@ related constructs, such as stems, tuplets and ties.
 * Augmentation dots::           
 * Tuplets::                     
 * Scaling durations::           
-* Stems::
+* Stems::                       
 @end menu
 
 
@@ -822,7 +822,7 @@ is processed.
 @cindex @code{skipTypesetting}
 @cindex @code{showLastLength}
 
-When entering or copying music, only the music near the end (where you
+When entering or copying music, usually only the music near the end (where you
 are adding notes) is interesting to view and correct.  To speed up
 this correction process, it is possible to skip typesetting of all but
 the last few measures. This is achieved by putting
@@ -1455,6 +1455,7 @@ This section deals with notation that affects groups of notes.
 * Ties::                        
 * Slurs::                       
 * Phrasing slurs::              
+* Laissez vibrer ties::         
 * Automatic beams::             
 * Manual beams::                
 * Grace notes::                 
@@ -1652,6 +1653,29 @@ You cannot have simultaneous phrasing slurs.
 Program reference: @internalsref{PhrasingSlur}.
 
 
+@node Laissez vibrer ties
+@subsection Laissez vibrer ties
+@cindex Laissez vibrer
+@cindex Ties, laissez vibrer
+
+L.v. ties (laissez vibrer) indicate that notes must not be damped at the
+end. It is used in notation for piano, harp and other string and
+percussion instruments. They can be entered using @code{\laissezVibrer},
+
+@lilypond[fragment,ragged-right,verbatim,relative=1]
+<c f g>\laissezVibrer 
+@end lilypond
+
+@seealso
+
+Program reference: 
+@internalsref{LaissezVibrerTie}
+@internalsref{LaissezVibrerTieColumn}
+
+Example files:
+@inputfileref{input/regression,laissez-vibrer-tie.ly}
+
+
 @node Automatic beams
 @subsection Automatic beams
 
@@ -1946,7 +1970,7 @@ notes and rhythms.
 * Fingering instructions::      
 * Dynamics::                    
 * Breath marks::                
-* Running trills::              
+* Trills::                      
 * Glissando::                   
 * Arpeggio::                    
 @end menu
@@ -2266,8 +2290,10 @@ Program reference: @internalsref{BreathingSign}.
 Examples: @inputfileref{input/@/regression,breathing@/-sign@/.ly}.
 
 
-@node Running trills
-@subsection Running trills
+@node Trills
+@subsection Trills
+
+Short trills are printed like normal articulation; see @ref{Articulations}.
 
 Long running trills are made with @code{\startTrillSpan} and
 @code{\stopTrillSpan},
@@ -2279,6 +2305,20 @@ Long running trills are made with @code{\startTrillSpan} and
   c4 }
 @end lilypond
 
+@cindex Pitched trills
+
+Trills that should be executed on an explicitly specified pitch can be
+typeset with the command @code{pitchedTrill}, 
+
+@c  if bug fixed, remove ! in f1   --gp
+@lilypond[ragged-right,verbatim,fragment,relative=1]
+\pitchedTrill c4\startTrillSpan fis
+f!\stopTrillSpan
+@end lilypond
+
+The first argument is the main note.  The pitch of the second
+is printed as a stemless note head in parentheses.
+
 
 @refcommands
 
@@ -2527,7 +2567,7 @@ melody is now in a single voice context.
   \voiceOne
   <<   
     { g4 f e | d2 e2 }
-    \context Voice="1" { \voiceTwo
+    \new Voice="1" { \voiceTwo
       r8 e4 d c8 ~ | c8 b16 a b8 g ~ g2 
       \oneVoice
     }

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 17e65053ef2306ce2cbd7d6b4bffc72214b443ce..8c5f2950a46345194afeb019e455f1c5d39b6df4 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -36,7 +36,6 @@ handle this cross-staffing behavior.  In this section we discuss the
 @menu
 * Automatic staff changes::     
 * Manual staff switches::       
-* Laissez vibrer ties::         
 * Pedals::                      
 * Staff switch lines::          
 * Cross staff stems::           
@@ -154,28 +153,6 @@ and the @context{Voice} is inserted afterwards
 @end example
 
 
-@node Laissez vibrer ties
-@subsection Laissez vibrer ties
-@cindex Laissez vibrer
-@cindex Ties,  laissez vibrer
-
-L.v. ties (laissez vibrer) indicate that notes must not be damped at the
-end. It is used in notation for piano, harp and other string and
-percussion instruments. They can be entered using @code{\laissezVibrer},
-
-@lilypond[fragment,ragged-right,verbatim,relative=1]
-<c f g>\laissezVibrer 
-@end lilypond
-
-@seealso
-
-Program reference: 
-@internalsref{LaissezVibrerTie}
-@internalsref{LaissezVibrerTieColumn}
-
-Example files:
-@inputfileref{input/regression,laissez-vibrer-tie.ly}
-
 @node Pedals
 @subsection Pedals
 @cindex Pedals