From: Phil Holmes <mail@philholmes.net>
Date: Fri, 21 Jun 2013 13:56:27 +0000 (+0100)
Subject: Updates to NR chapter 1
X-Git-Tag: release/2.17.21-1~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b00f11e450fd9c3c7b56ece5afa72606cac064cb;p=lilypond.git

Updates to NR chapter 1
---

diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 7a9867dc6f..d1a4ad7fe0 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -1265,8 +1265,8 @@ It is not possible to mix connected arpeggios and unconnected
 arpeggios in one @code{PianoStaff} at the same point in
 time.
 
-The parenthesis-style arpeggio brackets do not work for
-cross-staff arpeggios.
+The simple way of setting parenthesis-style arpeggio brackets does not work for
+cross-staff arpeggios; see @ref{Cross-staff stems}.
 
 
 @node Trills
diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index a090078a22..d2c9171fd8 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -404,7 +404,7 @@ cis cis cis! cis? c c c! c?
 Accidentals on tied notes are only printed at the beginning of a
 new system:
 
-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote,relative=2,ragged-right]
 cis1~ cis~
 \break
 cis
@@ -1313,8 +1313,8 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL)
     (3 . ,NATURAL) (4 . ,NATURAL) (5 . ,FLAT) (6 . ,FLAT))
 
 \relative c' {
-  \key c\freygish c4 des e f
-  \bar "||" \key d\freygish d es fis g
+  \key c \freygish c4 des e f
+  \bar "||" \key d \freygish d es fis g
 }
 @end lilypond
 
diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index d737ab53b2..e7168b8977 100644
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -1345,13 +1345,16 @@ to prevent tempo indications from overlapping, and @code{\markLengthOff}
 restores the default behavior of ignoring tempo marks
 for horizontal spacing.
 
-@lilypond[quote,relative=0]
+@lilypond[verbatim,quote,relative=0]
 \compressFullBarRests
 \markLengthOn
 \tempo "Molto vivace"
 R1*12
 \tempo "Meno mosso"
 R1*16
+\markLengthOff
+\tempo "Tranquillo"
+R1*20
 @end lilypond
 
 @snippets
@@ -2731,7 +2734,7 @@ a1
 
 Additionally, a bar line can be printed as a simple tick:
 @lilypond[quote,relative=1,verbatim]
-f1 \bar "'"
+f1 \bar "'" g1
 @end lilypond
 However, as such ticks are typically used in Gregorian chant, it is
 preferable to use @code{\divisioMinima} there instead, described in
diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index 62ce5461ce..a08fa9fff0 100644
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -681,9 +681,8 @@ in bar 2, where the automatic merging fails.
 >>
 @end lilypond
 
-Notes with different note heads may be merged, with the
-exception of half-note heads and quarter-note heads, as shown
-below.  Here the note heads on beat 1 of bar 1 are now merged:
+Notes with different note heads may be merged as shown
+below.  In this example the note heads on beat 1 of bar 1 are now merged:
 
 @lilypond[quote,verbatim,relative=2]
 <<
@@ -702,6 +701,9 @@ below.  Here the note heads on beat 1 of bar 1 are now merged:
 >>
 @end lilypond
 
+Quarter and half notes are not merged in this way, since it would be difficult
+to tell them apart.
+
 Note heads with different dots as shown in beat 3 of bar 1 may be
 also be merged:
 
diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 82c7a209a3..89c82c7d21 100644
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -261,7 +261,7 @@ bar, they can be placed above the bar line or between notes.  When
 specified at a line break, the mark will be printed at the beginning of
 the next line.
 
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2,ragged-right]
 \mark "Allegro"
 c1 c
 \mark "assai" \break