Whole bunch of minor fixes from mailist.

diff --git a/ChangeLog b/ChangeLog
index f36a1024c1a9a4354fab422a84e7cb049a8a6c22..b164dbbe32149649edcdda755bcedfba4d33c508 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-10  Graham Percival  <gpermus@gmail.com>
+
+       * THANKS, Documentation/user/ basic-notation, advanced-notation,
+       music-glossary, programming-interface: more minor fixes
+       from mailist.
+
 2006-04-10  Erlend Aasland  <erlenda@gmail.com>
 
        * mf/GNUmakefile: fix for mftrace version >= 1.2.0

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 4009241d27ef50d24e5f28dd631e3e44a92d2745..87db4e69697b4f2faca27139bfaa900af27e0415 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -622,7 +622,7 @@ multi-measure rest.  This expansion is controlled by the property
 be expanded, and the appropriate number is added automatically
 
 @lilypond[quote,ragged-right,fragment,verbatim]
-\time 4/4 r1 | R1 | R1*2
+\time 4/4 r1 | R1 | R1*2 \time 3/4 R2. \time 2/4 R2 \time 4/4
 \set Score.skipBars = ##t R1*17 R1*4
 @end lilypond
 
@@ -2408,7 +2408,7 @@ the change should be made.  The default is @code{'Voice}.
 @end itemize
 
 For example, if automatic beams should always end on the first quarter
-node, use
+note, use
 
 @example
 #(override-auto-beam-setting '(end * * * *) 1 4)

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index cb84f4fe12c0537643f027be5e9eb66dbf052e68..3fe839677b818abe12bf0350c2bb1d2f7714a4a2 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2888,6 +2888,13 @@ c1
 \alternative { {d2 d} {f f,} }
 @end lilypond
 
+In this example, the first ending is not a complete bar (it
+only had 3 beats).  The beginning of the second ending
+contains the 4th beat from the first ending.  This ``extra''
+beat in the second ending is due to the first time ending,
+and has nothing to do with the @code{\partial} at the
+beginning of the example.
+
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Staff {
   \partial 4

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 08f03e9c142feec82d23c150bbb21cb6044ce668..b781d89c1ef856911b17b90a321158181807cad6 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -5029,7 +5029,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item
   @tab @strong{UK}
   @tab @strong{I}
-  @tab @strong{F}
+  @tab @strong{F (note name / rest name)}
 @item
   @tab @strong{D}
   @tab @strong{NL}
@@ -5059,7 +5059,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{breve}
   @tab breve
   @tab breve
-  @tab brève
+  @tab brève / double-pause
 @item
   @tab Brevis
   @tab brevis
@@ -5074,7 +5074,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{whole}
   @tab semi@-breve
   @tab semi@-breve
-  @tab ronde
+  @tab ronde / pause
 @item
   @tab Ganze
   @tab hele
@@ -5089,7 +5089,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{half}
   @tab minim
   @tab minima
-  @tab blanche
+  @tab blanche / demi-pause
 @item
   @tab Halbe
   @tab halve
@@ -5104,7 +5104,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{quarter}
   @tab crotchet
   @tab semiminima
-  @tab noire
+  @tab noire / soupir
 @item
   @tab Viertel
   @tab kwart
@@ -5119,7 +5119,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{eighth}
   @tab quaver
   @tab croma
-  @tab croche
+  @tab croche / semi-pause
 @item
   @tab Achtel
   @tab achtste
@@ -5134,7 +5134,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{sixteenth}
   @tab semiquaver
   @tab semicroma
-  @tab double croche
+  @tab double croche / quart de soupir
 @item
   @tab Sechzehntel
   @tab zestiende
@@ -5149,7 +5149,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{thirty-second}
   @tab demisemiquaver
   @tab biscroma
-  @tab triple croche
+  @tab triple croche / huitième de soupir
 @item
   @tab Zweiunddreissigstel
   @tab tweeendertigste
@@ -5164,7 +5164,7 @@ symphony orchestra are flute, oboe, clarinet, saxophone, and bassoon.
 @item @strong{sixty-fourth}
   @tab hemidemisemiquaver
   @tab semibiscroma
-  @tab quadruple croche
+  @tab quadruple croche / seizième de soupir
 @item
   @tab Vierundsechzigstel
   @tab vierenzestigste

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 8c45e57d26c38827d5e2e9d487252b0eabb3558f..14aa7dffe94e3db76b86dbf7ac5828c399211fe2 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -589,7 +589,7 @@ a list of alists, containing all active properties.
 @end table
 
 As a simple example, we show how to add a @code{\smallcaps} command,
-which selects @TeX{}'s small caps font.  Normally, we could select the
+which selects a small caps font.  Normally, we could select the
 small caps font as follows:
 
 @example
@@ -719,6 +719,10 @@ the markups built for each token are put in a line by
 to the @code{interpret-markup} function, with the @code{layout} and
 @code{props} arguments.
 
+Note: there is now an internal command @code{\smallCaps} which can
+be used to set text in small caps.  See
+@ref{Overview of text markup commands} for details.
+
 
 
 @node Contexts for programmers

diff --git a/THANKS b/THANKS
index 29c98f7bcfe6f36fd2eb75a603b10c0be8439446..53916ebece7b18ec397ce17470836f8cb68e69ba 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -34,7 +34,9 @@ Juergen Reuter
 BUG HUNTERS/SUGGESTIONS
 
 Aurèle Duda
+Claude Routhier
 Christopher Ellis
+Colin Wilding
 David Rogers
 J. Leung
 Harald Wellmann