Small updates from Cameron and Juergen, thanks!

diff --git a/ChangeLog b/ChangeLog
index 5708ddb81a73b1da80a4ccb757aa8c84d97325e4..b6c118f3c6847f7d53b148dc4ce6311025e2239c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/ various: small updates from Cameron
+       and Juergen, thanks!
+
 2006-04-11  Graham Percival  <gpermus@gmail.com>
 
        * scm/define-context-properties.scm: typo.

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index c01d7473d493758cd3ba6700f9bbf28865d97abb..93ccabb0e371d60af973b877b1c406f0f6282abe 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -3134,9 +3134,10 @@ Measure repeats of more than 2 measures get a counter, if you switch
 on the @code{countPercentRepeats} property,
 
 @lilypond[relative=2,fragment,quote,verbatim,ragged-right]
+\new Voice {
 \set countPercentRepeats = ##t
-\new Voice
   \repeat "percent" 4 { c1 }
+}
 @end lilypond
 
 

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index b1b561a8ca77853940aa17dd0856e4f32f5d2381..1a416ed3fc4fec21e094baa7fff499718d11dae8 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -959,10 +959,9 @@ bassusLyrics = \lyricmode {
 
 @subsection Gregorian transcription template
 
-This example demonstrates how to do modern transcriptions of Gregorian
+This example demonstrates how to do modern transcription of Gregorian
 music.  Gregorian music has no measure, no stems; it uses only half and
-quarter notes, and two types of barlines, a short one indicating a rest,
-and a second one indicating a breath mark.
+quarter noteheads, and special marks, indicating rests of different length.
 
 @lilypond[quote,verbatim,ragged-right]
 \include "gregorian-init.ly"
@@ -1033,8 +1032,12 @@ is within a @code{\transpose} section.
   composer = "Me"
   meter = "moderato"
   piece = "Swing"
-  tagline = "LilyPond example file by Amelie Zapf,
-             Berlin 07/07/2003"
+  tagline = \markup {
+    \column {
+      "LilyPond example file by Amelie Zapf,"
+      "Berlin 07/07/2003"
+    }
+  }
   texidoc = "Jazz tune for combo
              (horns, guitar, piano, bass, drums)."
 }
@@ -1082,7 +1085,7 @@ trumpet = {
   \global
   \set Staff.instrument = #"Trumpet"
   \clef treble
-  \new Staff <<
+  <<
     \trpt
   >>
 }
@@ -1099,7 +1102,7 @@ altosax = {
   \global
   \set Staff.instrument = #"Alto Sax"
   \clef treble
-  \new Staff <<
+  <<
     \alto
   >>
 }
@@ -1116,7 +1119,7 @@ barisax = {
   \global
   \set Staff.instrument = #"Bari Sax"
   \clef treble
-  \new Staff <<
+  <<
     \bari
   >>
 }
@@ -1133,7 +1136,7 @@ trombone = {
   \global
   \set Staff.instrument = #"Trombone"
   \clef bass
-  \new Staff <<
+  <<
     \tbone
   >>
 }
@@ -1153,7 +1156,7 @@ guitar = {
   \global
   \set Staff.instrument = #"Guitar"
   \clef treble
-  \new Staff <<
+  <<
     \gtr
   >>
 }
@@ -1185,7 +1188,7 @@ PianoRH = {
   \clef treble
   \global
   \set Staff.midiInstrument = "acoustic grand"
-  \new Staff <<
+  <<
     \new Voice = "one" \rhUpper
     \new Voice = "two" \rhLower
   >>
@@ -1194,14 +1197,14 @@ PianoLH = {
   \clef bass
   \global
   \set Staff.midiInstrument = "acoustic grand"
-  \new Staff <<
+  <<
     \new Voice = "one" \lhUpper
     \new Voice = "two" \lhLower
   >>
 }
 
 piano = {
-  \new PianoStaff <<
+  <<
     \set PianoStaff.instrument = #"Piano"
     \new Staff = "upper" \PianoRH
     \new Staff = "lower" \PianoLH
@@ -1217,7 +1220,7 @@ bass = {
   \global
   \set Staff.instrument = #"Bass"
   \clef bass
-  \new Staff <<
+  <<
     \Bass
   >>
 }

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index c20497ab74d6a0ee9a79fe338e3608f2f695383c..ced13593ca641d50f1aebee4c37bd2fb443f061c 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -3881,6 +3881,20 @@ Trigonus
 @code{\[ \stropha b \stropha b \stropha a \]}
 @end multitable
 
+The ligatures listed above mainly serve as a limited, but still
+representative pool of Gregorian ligature examples.  Virtually, within
+the ligature delimiters @code{\[} and @code{\]}, any number of heads
+may be accumulated to form a single ligature, and head prefixes like
+@code{\pes}, @code{\flexa}, @code{\virga}, @code{\inclinatum},
+etc. may be mixed in as desired.  The use of the set of rules that
+underlies the construction of the ligatures in the above table is
+accordingly extrapolated.  This way, infinitely many different
+ligatures can be created.
+
+@c TODO: create a regression or tips & tricks example document with
+@c even more Gregorian ligatures, and add a link to this document
+@c here.
+
 @refcommands
 
 The following head prefixes are supported
@@ -3902,7 +3916,11 @@ The following head prefixes are supported
 @cindex @code{\quilisma}
 @code{\quilisma},
 @cindex @code{\deminutum}
-@code{\deminutum}.
+@code{\deminutum},
+@cindex @code{\cavum}
+@code{\cavum},
+@cindex @code{\linea}
+@code{\linea}.
 
 Head prefixes can be accumulated, though restrictions apply.  For
 example, either @code{\descendens} or @code{\ascendens} can be applied