From c5bfb2bdd18e31a170d487dc742b59425ba4377b Mon Sep 17 00:00:00 2001
From: gpercival <gpercival>
Date: Tue, 14 Mar 2006 00:37:31 +0000
Subject: [PATCH] Minor fixes from mailist.
---
ChangeLog | 5 +++++
Documentation/user/changing-defaults.itely | 2 +-
Documentation/user/instrument-notation.itely | 9 +++++----
Documentation/user/tutorial.itely | 4 ++--
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 222f6c46c8..d99e9b662a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13 Graham Percival <gpermus@gmail.com>
+
+ * Documentation/user/ changing-defaults, instrument-notation,
+ tutorial: small fixes from mailist, mostly from Mats. Thanks!
+
2006-03-13 Heikki Junes <hjunes@cc.hut.fi>
* po/fi.po: update.
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 311bb2e1b6..0bd72c6883 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -965,7 +965,7 @@ Distances in LilyPond are measured in staff-spaces, while most
thickness properties are measured in line-thickness. Some
properties are different; for example, the thickness of beams
is measured in staff-spaces. For more information, see the
-relevant portion of the internals documentation.
+relevant portion of the program reference.
More specific overrides are also possible. The next section
discusses in depth how to figure out these statements for yourself.
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index d1f9ba33ea..e3e3a17b19 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -826,10 +826,11 @@ like notes, but with pitches replaced by text. For example,
\lyricmode @{ Twin-4 kle4 twin- kle litt- le star2 @}
@end example
-There is a difference between @code{\addlyrics} and
-@code{\lyricmode}. @code{\addlyrics} and @code{\lyricsto}
-ignore all durations and aligns syllables to notes; @code{\lyricmode}
-uses the durations specified.
+There are two main methods to specify the horizontal placement
+of the syllables, either by specifying the duration of each syllable
+explicitly, like in the example above, or by automatically aligning
+the lyrics to a melody or other voice of music, using @code{\addlyrics}
+or @code{\lyricsto}. For more details see @ref{The Lyrics context}.
A word lyrics mode begins with an alphabetic character, and ends with
any space or digit. The following characters can be any character
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 5f293c90ae..61a14f3818 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1143,8 +1143,8 @@ Again, these expressions can be nested arbitrarily
>>
\new Staff <<
\clef bass
- { <c, g>1 ~ <c g>4 } \\
- { e,4 d e2 ~ e4}
+ { <c g>1 ~ <c g>4 } \\
+ { e,,4 d e2 ~ e4}
>>
>>
@end lilypond
--
2.39.5