Minor editing.

diff --git a/ChangeLog b/ChangeLog
index e40587ffd9dc9ca6aee5c24f61bfb2f1967bda69..a373de07de49e8dfb8feef5b0c044b14b181e28e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-30  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/notation.itely: add warning about bar numbers
+       in multistaff music, add warning about quoting grace notes.
+
+       * Documentation/user/changing-defaults.itely: clarify paper size commands,
+       add missing subsubtitle entry to Creating titles.
+
 2004-10-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/convert-ly.py (conv): fixed \context Foo = mixedCaps
@@ -52,6 +60,7 @@
        * scm/lily.scm (ly:system): new function. Catches uninstalled
        ps2png.
 
+>>>>>>> 1.2778
 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * Documentation/user/notation.itely: remove

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 38abc749632704f9dfb045a6b160dea6bd8fcb6d..80474eed899f67dd76a7e5445b64a7f1cbdbc1e4 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1629,7 +1629,7 @@ titles.
 * Multiple movements::          
 * Creating titles::             
 * Page breaking::               
-* paper size::                  
+* Paper size::                  
 * Page layout::                 
 @end menu
 
@@ -2065,6 +2065,8 @@ The header block for a book supports the following
     The title of the music. Centered on top of the first page.
 @item subtitle
     Subtitle, centered below the title.
+@item subsubtitle
+    Subsubtitle, centered below the subtitle.
 @item poet
     Name of the poet, left flushed below the subtitle.
 @item composer
@@ -2088,9 +2090,9 @@ This is a demonstration of the fields available,
 @lilypond[verbatim]
 \book {
   \header {
-    title = "Title"
-    subtitle = "and the subtitle"
-    subsubtitle = "Sub sub title"
+    title = "Title,"
+    subtitle = "the subtitle,"
+    subsubtitle = "and the sub sub title"
     poet = "Poet"
     composer = "Composer"
     texttranslator = "Text Translator"
@@ -2167,21 +2169,22 @@ Page breaks are computed by the @code{page-breaking} function in the
 @cindex  @code{\noPageBreak} 
 @code{\noPageBreak} 
 
-@node paper size
-@subsection paper size
+@node Paper size
+@subsection Paper size
 
 @cindex paper size
 @cindex page size
 @cindex @code{papersize}
 
-To change the paper size, there are two commands,
+To change the paper size, there are two equal commands,
 @example
-        #(set-default-paper-size "a4")
-        \layout@{
-           #(set-paper-size "a4")
-        @}
+  #(set-default-paper-size "a4")
+  \layout@{
+    #(set-paper-size "a4")
+  @}
 @end example
-The second one sets the size of the @code{\layout} block that it is in.
+
+The first command sets the size of all pages.  The second command sets the size of the pages that the @code{\layout} block applies to -- if the @code{\layout} block is at the top of the file, then it will apply to all pages.  If the @code{\layout} block is inside a @code{\score}, then the paper size will only apply to that score.
 
 The following paper sizes are supported.
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 8936c70536bd0c4b0a6410c4aca6e038c60257fe..c91e4f17da2b6e27b18848069d6ff8002ad562fd 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -5065,6 +5065,18 @@ whose source is available as
 
 @lilypondfile[raggedright,quote]{bar-number-regular-interval.ly}
 
+Bar numbers can be manually changed by setting the
+@code{Staff.currentBarNumber} property
+
+@c fragproblem?  -gp
+@lilypond[raggedright,quote]
+\relative c' {
+  \repeat unfold 4 {c4 c c c} \break
+  \set Score.currentBarNumber = #50
+  \repeat unfold 4 {c4 c c c}
+}
+@end lilypond
+
 @seealso
 
 Program reference: @internalsref{BarNumber}.
@@ -5621,6 +5633,7 @@ Only the contents of the first @internalsref{Voice} occurring in an
 @var{music} can not contain @code{\new} and @code{\context Voice}
 statements that would switch to a different Voice.
 
+Quoting grace notes is broken and can even cause LilyPond to crash.
 
 @seealso