(Entering lyrics):

add note about lyric ties and required font.

diff --git a/ChangeLog b/ChangeLog
index 8b642f30bf491a5c91e2dff31776c18e958f86ea..fdf144c6e851b6b5f80a6f19a282f1f22cff50f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * Documentation/user/instrument-notation.itely (Entering lyrics):
+       add note about lyric ties and required font.
+
        * lily/open-type-font.cc (glyph_list): format errors.
 
        * Documentation/user/programming-interface.itely (Scheme

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 2023155f36ba2375803a43fb245388d209f0b3f0..cb70ab415948a572fb795e35913560d91411befd 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -88,7 +88,7 @@ now also be added,
 This feature was sponsored by William Wilson.
 
 @ignore
-hint for GP:
+hint for Graham:
 
 - grob StringFinger
 
@@ -98,6 +98,9 @@ hint for GP:
 
 - recommend use of identifiers in practice, eg. rhf = rightHandFinger
 
+Added section on Instrument specific notation.
+
+
 @end ignore 
 
 @item By defining a clip region, a cutout EPS file of a number of measures
@@ -118,7 +121,7 @@ symbol,
     o la~oo ah
   } 
 @end lilypond
-8
+
 @item Calculation of note head durations is now softcoded. 
 
 @lilypond[relative=1,fragment,ragged-right]

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 6cbb216eda28f43e87965a18eb5af078aa303621..0c34beb174840e0f2398ac8f1eba6ea03ccae6fe 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2942,12 +2942,6 @@ printed, left to right with brackets.  This is the standard notation
 for repeats with alternatives.  These are not played in MIDI output by
 default.
 
-@ignore
-@item fold
-Alternative endings are written stacked.  This has limited use but may be
-used to typeset two lines of lyrics in songs with repeats, see
-@inputfileref{input,star-spangled-banner@/.ly}.
-@end ignore
 
 @item tremolo
 Make tremolo beams.  These are not played in MIDI output by default.

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 488485ccd59e53e9467795930a156d3c90eef023..98cfedf2c74e80638fdbdddfdaf76a6b582d0126 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -673,7 +673,7 @@ way is to use the @code{\addlyrics} function.
 @menu
 * Setting simple songs::        
 * Entering lyrics::             
-* Hyphens and extenders::       
+* Hyphens and extenders::
 * The Lyrics context::          
 * Melismata::                   
 * Another way of entering lyrics::  
@@ -790,17 +790,25 @@ property commands
 @funindex _
 @cindex spaces, in lyrics
 @cindex quotes, in lyrics
+@cindex ties, in lyrics
 
-In order to assign more than one syllable to a single note, you must
-surround them with quotes or use a @code{_} character between the syllables.
+In order to assign more than one syllable to a single note, you can
+surround them with quotes or use a @code{_} character, to get spaces
+between syllables, or use tilde  symbol (@code{~}) to get a lyric tie.
 
 @lilypond[quote,relative=2,ragged-right,fragment,verbatim]
 \time 3/4
 \relative { c2 e4 g2 e4 }
 \addlyrics { gran- de_a- mi- go }
 \addlyrics { pu- "ro y ho-" nes- to }
+\addlyrics { pu- ro~y~ho- nes- to }
 @end lilypond
 
+The lyric ties is implemented with the Unicode character U+203F, so be
+sure to have a font (Like DejaVuLGC) installed that includes this
+glyph.
+
+
 To enter lyrics with characters from non-English languages, or with
 non-ascii characters (such as the heart symbol or slanted quotes),
 simply insert the characters directly into the input file and save
@@ -1905,6 +1913,7 @@ around each @code{\parenthesize} statement.
 * Non-guitar tablatures::       
 * Banjo tablatures::            
 * Fret diagrams::               
+* Right hand fingerings::       
 * Other guitar issues::         
 @end menu
 
@@ -2135,6 +2144,62 @@ Details about the property interface to fret diagrams are found at
 Examples: @inputfileref{input/@/test,fret@/-diagram@/.ly}
 
 
+@node Right hand fingerings
+@subsection Right hand fingerings
+
+Right hand fingerings in chords can be entered using
+@code{@var{note}-\rightHandFinger @var{finger}}
+
+@lilypond[verbatim,fragment]
+  <c-\rightHandFinger #1 e-\rightHandFinger #2 >
+@end lilypond
+
+for brevity, you can abbreviate @code{\rightHandFinger} to something
+short, for example @code{RH},
+
+@example
+#(define RH rightHandFinger)
+@end example
+
+@cindex fingerings, right hand, for guitar 
+@cindex right hand fingerings for guitar
+ 
+@commonprop
+
+You may exercise greater control over right handing fingerings by
+setting @code{strokeFingerOrientations},
+
+@lilypond[quote,verbatim,ragged-right,fragment,relative=1]
+#(define RH rightHandFinger)
+{
+  \set strokeFingerOrientations = #'(left down)
+  <c-\RH #1 es-\RH #2 g-\RH #4 bes-\RH #5 > 4
+  \set strokeFingerOrientations = #'(up right down)
+  <c-\RH #1 es-\RH #2 g-\RH #4 bes-\RH #5 > 4
+}
+@end lilypond
+
+The letters used for the fingerings are contained in the property
+@code{digit-names}, but they can also be set individually by supplying
+@code{\rightHandFinger} with a string argument, as in the following example
+
+
+@lilypond[quote,verbatim,ragged-right,fragment,relative=1]
+#(define RH rightHandFinger)
+{
+  \set strokeFingerOrientations = #'(right)
+  \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@") 
+  <c-\RH #5 >4
+  <c-\RH "@">4  
+}
+@end lilypond
+
+@seealso
+
+Internalls: @internalsref{StrokeFinger}
+
+
+
 @node Other guitar issues
 @subsection Other guitar issues