Editing.

diff --git a/ChangeLog b/ChangeLog
index 387ec86374da109e511069f0308465cf3553472b..12cbe88a79ea0185d2d7ad08ed131d9663fe2a65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-23  Graham Percival  <gperlist@shaw.ca>
+
+       * ly/property.ly: Update tieDotted to have the same form as slurDotted.
+
+       * Documentation/user/lilypond.tely: change Unified index to
+       LilyPond index.
+
+       * Documentation/user/advanced-notation.itely,
+       instrument-notation.itely: editing.
+
 2005-05-23  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/main.cc (setup_paths)[__MINGW32__]: Normalize LILYPONDPREFIX.

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index c936755fa51c43fe17fc2813a73b09e59cc25c87..2e08383c6b4e8ba69d45e469a753508cc21781ff 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1315,10 +1315,12 @@ LilyPond is limited.
 * Polymetric notation::         
 * Clusters::                    
 * Special fermatas::            
+* Special noteheads::           
 * Feathered beams::             
 * Improvisation::               
 @end menu
 
+
 @node Polymetric notation
 @subsection Polymetric notation
 
@@ -1527,6 +1529,34 @@ of differing lengths.  The following fermatas are supported
 See @ref{Articulations} for general instructions how to apply scripts
 such as fermatas to notes.
 
+
+@node Special noteheads
+@subsection Special noteheads
+
+Different noteheads are used by various instruments for various
+meanings -- crosses are used for ``parlato'' with vocalists, stopped
+notes on guitar; diamonds are used for harmonics on string instruments,
+etc.  There is a shorthand (@code{\harmonic}) for diamond shapes; the
+other notehead styles are produced by tweaking the property
+
+@lilypond[raggedright,relative=1,fragment,verbatim,quote]
+c4 d
+\override NoteHead #'style = #'cross
+e f
+\revert NoteHead #'style
+e d <c f\harmonic> <d a'\harmonic>
+@end lilypond
+
+@noindent
+To see all notehead styles, please see
+@inputfileref{input/@/regression,note@/-head@/-style@/.ly}.
+
+
+@seealso
+
+Program reference: @internalsref{NoteHead}.
+
+
 @node Feathered beams
 @subsection Feathered beams
 
@@ -1534,7 +1564,7 @@ Feathered beams are not supported natively, but they can be faked by
 forcing two beams to overlap.  Here is an example,
 
 @c don't change relative setting witout changing positions!
-@lilypond[raggedright,relative=1,fragment,verbatim]
+@lilypond[raggedright,relative=1,fragment,verbatim,quote]
 \new Staff <<
   \new Voice
   {

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 69707d77184a079631b837cea2bc1e457efba5ab..7324a87ceabc30e7b09b39672c40a33e9f5fce50 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -1218,6 +1218,48 @@ the line, just like instrument names.  They are created by setting
 }
 @end lilypond
 
+You can display alternate (or divisi) lyrics by naming voice
+contexts and attaching lyrics to those specific contexts.
+
+@lilypond[verbatim,raggedright,quote]
+\score{ <<
+  \context Voice = "melody" {
+    \relative c' {
+      c4
+      <<
+        { \voiceOne c8 e }
+        \context Voice = splitpart { \voiceTwo c4 }
+      >>
+      \oneVoice c4 c | c
+    }
+  }
+  \new Lyrics \lyricsto "melody" { we shall not o- ver- come }
+  \new Lyrics \lyricsto "splitpart" { will }
+>> }
+@end lilypond
+
+
+You can use this trick to display different lyrics for a repeated
+section.
+
+@lilypond[verbatim,raggedright,quote]
+\score{ <<
+  \context Voice = melody \relative c' {
+    c2 e | g e | c1 |
+    \context Voice = verse \repeat volta 2 {c4 d e f | g1 | }
+    a2 b | c1}
+  \lyricsto melody  \context Lyrics = mainlyrics \lyricmode {
+    do mi sol mi do
+    la si do }
+  \lyricsto verse \context Lyrics = mainlyrics \lyricmode {
+   do re mi fa sol }
+  \lyricsto verse \context Lyrics = repeatlyrics \lyricmode {
+   dodo rere mimi fafa solsol }
+>>
+}
+@end lilypond
+
+
 @seealso
 
 Program reference: @internalsref{LyricText}, @internalsref{VocalName}.
@@ -1316,6 +1358,7 @@ Examples: @inputfileref{input/@/regression,ambitus@/.ly}.
 There is no collision handling in the case of multiple per-voice
 ambitus.
 
+
 @node Other vocal issues
 @subsection Other vocal issues
 
@@ -1329,59 +1372,9 @@ can ask them for specific instructions about where to move these
 examples, and that might get them more involved in the docs.  -gp
 @end ignore
 
-You can display alternate (or divisi) lyrics by naming voice
-contexts and attaching lyrics to those specific contexts.
-
-@lilypond[verbatim,raggedright,quote]
-\score{ <<
-  \context Voice = "melody" {
-    \relative c' {
-      c4
-      <<
-        { \voiceOne c8 e }
-        \context Voice = splitpart { \voiceTwo c4 }
-      >>
-      \oneVoice c4 c | c
-    }
-  }
-  \new Lyrics \lyricsto "melody" { we shall not o- ver- come }
-  \new Lyrics \lyricsto "splitpart" { shall }
->> }
-@end lilypond
-
-
-You can use this trick to display different lyrics for a repeated
-section.
-
-@lilypond[verbatim,raggedright,quote]
-\score{ <<
-  \context Voice = melody \relative c' {
-    c2 e | g e | c1 |
-    \context Voice = verse \repeat volta 2 {c4 d e f | g1 | }
-    a2 b | c1}
-  \lyricsto melody  \context Lyrics = mainlyrics \lyricmode {
-    do mi sol mi do
-    la si do }
-  \lyricsto verse \context Lyrics = mainlyrics \lyricmode {
-   do re mi fa sol }
-  \lyricsto verse \context Lyrics = repeatlyrics \lyricmode {
-   dodo rere mimi fafa solsol }
->>
-}
-@end lilypond
-
-
-To notate ``parlato'' (spoken without pitch but still with
-rhythm) sections, 
-
-@lilypond[raggedright,verbatim,quote,fragment,relative=2]
-c4 d
-\override NoteHead #'style = #'cross
-e f
-\revert NoteHead #'style
-e d
-@end lilypond
-
+``Parlato'' is spoken without pitch but still with rhythm; it is
+notated by cross noteheads.  This is demonstrated in
+@ref{Special noteheads}.
 
 
 @node Rhythmic music
@@ -1854,6 +1847,13 @@ e16 b16 g16 d16
 @end lilypond
 
 
+Stopped (X) note heads are used in guitar music to signal a place where the 
+guitarist must play a certain note or chord, with its fingers just 
+touching the strings instead of fully pressing them.  This gives the sound a 
+percussive noise-like sound that still maintains part of the original
+pitch.  It is notated with cross noteheads; this is
+demonstrated in @ref{Special noteheads}.
+
 
 @node Ancient notation
 @section Ancient notation
@@ -3897,25 +3897,4 @@ are entered by marking the harmonic pitch with @code{\harmonic}.
 @node Stopped notes (guitar)
 @subsection Stopped notes (guitar)
 
-Stopped (X) note heads are used in guitar music to signal a place where the 
-guitarist must play a certain note or chord, with its fingers just 
-touching the strings instead of fully pressing them.  This gives the sound a 
-percussive noise-like sound that still maintains part of the original pitch.
-
-Finger stopped technique is extremely important for rhythm and rock-heavy 
-metal guitarists; the former often uses barré based stopped chords to 
-intermix harmony with rythm, the latters use finger stopping to mute power 
-chords, or charge them with more expression in close-tied power chord stums.
-
-It is also used (even if rarely) in classic guitar music, generally in the 
-melodic line, to provide some rithmic pattern right in the melody.
-
-@lilypond[raggedright,verbatim,quote,fragment,relative=2]
-c4 d
-\override NoteHead #'style = #'cross
-e f
-\revert NoteHead #'style
-e d
-@end lilypond
-