From: janneke <janneke>
Date: Sun, 10 Oct 2004 15:24:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.24^2~62
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ffb504b4f2c0d07aea4aee9a5ffe0af5d4fab7bb;p=lilypond.git

*** empty log message ***
---

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 90af827458..d97dc7d518 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1918,24 +1918,31 @@ No work-around exists for decreasing the amount of space.
 @cindex @code{indent}
 @cindex @code{linewidth}
 
+@c Although linewidth can be set in \layout, it should be set in paper
+@c block, to get page layout right.
+@c Setting indent in \paper block makes not much sense, but it works.
+
+@c Bit verbose and vague, use examples?
 The most basic settings influencing the spacing are @code{indent} and
-@code{linewidth}. They are set in the @code{\layout} block. They
+@code{linewidth}.  They are set in the @code{\layout} block.  They
 control the indentation of the first line of music, and the lengths of
 the lines.
 
-If  @code{raggedright} is set to true in the @code{\layout}
-block, then the lines are justified at their natural length. This
-useful for short fragments, and for checking how tight the natural
-spacing is.
+If @code{raggedright} is set to true in the @code{\layout} block, then
+the lines are justified at their natural length.  This useful for
+short fragments, and for checking how tight the natural spacing is.
 
 @cindex page layout
 @cindex vertical spacing
 
 The option @code{raggedlast} is similar to @code{raggedright}, but
-only affects the last line of the piece. No restrictions are put on
-that line. The result is similar to formatting text paragraphs. In a
+only affects the last line of the piece.  No restrictions are put on
+that line.  The result is similar to formatting text paragraphs.  In a
 paragraph, the last line simply takes its natural length.
-
+@c Note that for text there are several options for the last line.
+@c While Knuth TeX uses natural length, lead typesetters use the same
+@c stretch as the previous line.  eTeX uses \lastlinefit to
+@c interpolate between both these solutions.
 
 @node Line breaking
 @subsection Line breaking
@@ -2229,9 +2236,9 @@ The default layout responds to the following settings in the
 @item bottommargin
  Margin between footer and bottom of the page
 @item leftmargin
- Margin between the left side of the page and the beginning  of the music.
+ Margin between the left side of the page and the beginning  of the music
 @item linewidth
- The length of the systems.
+ The length of the systems
 @item headsep
  Distance between top-most music system and the page header
 @item footsep
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 7536fffb92..2468ccbd59 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -7689,7 +7689,7 @@ teaching tools in addition to great musical scores.
 
 @menu
 * Balloon help::                
-* Blank music layout::           
+* blank music sheet::           
 * Hidden notes::     
 * Easy Notation note heads::    
 @end menu
@@ -7729,10 +7729,10 @@ Examples: @inputfileref{input/regression,balloon.ly}.
 
 
 
-@node Blank music layout
-@subsection Blank music layout
+@node blank music sheet
+@subsection blank music sheet
 
-A blank music layout can be produced also by using invisible notes, and
+A blank music sheet can be produced also by using invisible notes, and
 removing @code{Bar_number_engraver}.
 
 
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c6f4481dda..3cb6f8e3d7 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1212,14 +1212,14 @@ input.  For example,
 @example
   width = 4.5\cm
   name = "Wendy"
-  aFivePaper = \layout @{ paperheight = 21.0 \cm @}
+  aFivePaper = \paper @{ paperheight = 21.0 \cm @}
 @end example
 
 Depending on its contents, the identifier can be used in different
 places.  The following example uses the above variables
 
 @example
-  \layout @{
+  \paper @{
     \aFivePaper
     linewidth = \width
   @}