From: gpercival <gpercival>
Date: Wed, 3 May 2006 09:43:33 +0000 (+0000)
Subject: Some more fixes from Eduardo.
X-Git-Tag: release/2.8.2~9^2~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4dfbb45778627de3df1db18a77b7aced43938161;p=lilypond.git

Some more fixes from Eduardo.
---

diff --git a/ChangeLog b/ChangeLog
index 0c508f8101..20ec1f094b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 
 	* Documentation/user/ various: final round of reorg.
 
+	* Documentation/user/instrument-notation.itely: some more
+	fixes from Eduardo, thanks!
+
 2006-05-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* flower/file-path.cc (is_dir): canonicalize file name before stat'ing.
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index bfcea5f45a..1f6d223745 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -677,7 +677,9 @@ way is to use the @code{\addlyrics} function.
 * The Lyrics context::          
 * Melismata::                   
 * Another way of entering lyrics::  
-* Flexibility in alignment::    
+* Flexibility in placement::    
+* Switching the melody associated with a lyrics line::  
+* Specifying melismata within the lyrics::  
 * More about stanzas::          
 * Ambitus::                     
 * Other vocal issues::          
@@ -1067,13 +1069,18 @@ Here is an example demonstrating manual lyric durations,
 
 @c TODO: document \new Staff << Voice \lyricsto >> bug
 
-@node Flexibility in alignment
-@subsection Flexibility in alignment
+@node Flexibility in placement
+@subsection Flexibility in placement
 
 Often, different stanzas of one song are put to one melody in slightly
 differing ways.  Such variations can still be captured with
 @code{\lyricsto}.
 
+@menu
+* Lyrics to multiple notes of a melisma::  
+@end menu
+
+@node Lyrics to multiple notes of a melisma
 @subsubsection Lyrics to multiple notes of a melisma 
 
 
@@ -1082,7 +1089,7 @@ multiple syllables in another one.  One solution is to make the faster
 voice ignore the melisma.  This is done by setting
 @code{ignoreMelismata} in the Lyrics context.
 
-There has one tricky aspect.  The setting for @code{ignoreMelismata}
+There is one tricky aspect: the setting for @code{ignoreMelismata}
 must be set one syllable @emph{before} the non-melismatic syllable
 in the text, as shown here,
 
@@ -1125,9 +1132,9 @@ For example,
 @end lilypond
 
 
+@node Switching the melody associated with a lyrics line
 @subsection Switching the melody associated with a lyrics line
 
-
 More complex variations in text underlay are possible.  It is possible
 to switch the melody for a line of lyrics during the text.  This is
 done by setting the @code{associatedVoice} property.  In the example
@@ -1208,7 +1215,7 @@ The underlay is switched back to the starting situation by assigning
 @code{lahlah} to @code{associatedVoice}.
 
 
-
+@node Specifying melismata within the lyrics
 @subsection Specifying melismata within the lyrics
 
 It is also possible to define melismata entirely in the lyrics. This
@@ -1234,6 +1241,11 @@ set @code{melismaBusyProperties}, as is done in the example above.
  { Ky -- _ _ ri __ _ _ _  e }
 @end lilypond
 
+@menu
+* Spacing lyrics::              
+@end menu
+
+@node Spacing lyrics
 @subsubsection Spacing lyrics
 
 @cindex Spacing lyrics
diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index 1084de1841..5f0ab3def5 100644
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -258,15 +258,15 @@ to understand these files.
 
 @itemize bullet
 
-@item Linux: @file{/usr/ ... }
+@item Linux: @file{@{INSTALLDIR@}/lilypond/usr/share/lilypond/current/}
 
 @item OSX:
-@file{@{LILYPOND_INSTALLED_DIR@}/LilyPond.app/Contents/Resources/share/lilypond/current/}.
+@file{@{INSTALLDIR@}/LilyPond.app/Contents/Resources/share/lilypond/current/}.
 To access this, either @code{cd} into this directory from
 the Terminal, or control-click on the LilyPond application
 and select "Show Package Contents".
 
-@item Windows:
+@item Windows: @file{C:/Program Files/LilyPond/usr/share/lilypond/current/}
 
 @end itemize