Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/Documentation/user/policy.txt b/Documentation/user/policy.txt
index 4dac1c28f5fdd89f1752dbda586cb458f205792d..aa496271841baf71837efca0c89f7ee71b07be88 100644 (file)
--- a/Documentation/user/policy.txt
+++ b/Documentation/user/policy.txt
@@ -131,6 +131,8 @@ main docs
 * To create links, use @ref{} if the link is within the same
   manual.
 
+* @predefined  is for commands in ly/property-init.ly
+
 * Do not include any real info in second-level sections (ie 1.1
   Pitches).  A first-level section may have introductory material,
   but other than that all material goes into third-level sections

diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely
index 911ceb53931cc9d8ecdb7bf1337f4c2fd23a6a61..86e7bd9acecae300af9181b47fea40580bc2d5a5 100644 (file)
--- a/Documentation/user/repeats.itely
+++ b/Documentation/user/repeats.itely
@@ -20,11 +20,11 @@ exist for repetitions. LilyPond supports the following kinds of repeats:
 
 @table @code
 @item volta
-The repeated music is not written out but enclosed in repeat bar
+The repeated music is not written out but enclosed between repeat bar
 lines.  If the repeat is at the beginning of a piece, a repeat bar
 line is only printed at the end. Alternative endings (volte) are
-printed, left to right with brackets.  This is the standard
-notation for repeats with alternatives.
+printed, left to right with brackets.  This is the standard notation
+for repeats with alternatives.
 
 @item unfold
 The repeated music is fully written out, as many times as
@@ -32,11 +32,11 @@ specified by @var{repeatcount}.  This is useful when
 entering repetitious music. 
 
 @item percent
-Write beat or measure repeats.  These look like percent signs.
+These are beat or measure repeats.  They look like percent signs.
 Percent repeats must be declared within a @code{Voice} context.
 
 @item tremolo
-Write tremolo beams.
+This is used to write tremolo beams.
 
 @end table
 
@@ -45,10 +45,10 @@ LilyPond has one syntactic construct for specifying different
 types of repeats.  The syntax is
 
 @example
-\repeat @var{variant} @var{repeatcount} @var{repeatbody}
+\repeat @var{variant} @var{repeatcount} @var{musicexpr}
 @end example
 
-where @var{repeatbody} is a music expression.
+where @var{musicexpr} is a music expression.
 
 
 Alternative endings are entered with 
@@ -97,10 +97,10 @@ to be played more than once.
 The syntax for a normal repeat is
 
 @example
-\repeat volta @var{repeatcount} @var{repeatbody}
+\repeat volta @var{repeatcount} @var{musicexpr}
 @end example
 
-where @var{repeatbody} is a music expression.  Alternate endings can
+where @var{musicexpr} is a music expression.  Alternate endings can
 be produced using @code{\alternative}.
 
 Normal repeats without alternate endings:
@@ -250,9 +250,9 @@ Stop a running volta bracket.
 @lilypond[quote,ragged-right,verbatim,fragment,relative=2]
 c4
 \set Score.repeatCommands = #'((volta "93") end-repeat)
-c4 c4
+c4 b4
 \set Score.repeatCommands = #'((volta #f))
-c4 c4
+d4 e4
 @end lilypond
 
 @c FIXME: improve visibility of bar lines link?
@@ -279,10 +279,10 @@ By using the @code{unfold} command, repeats can be used to simplify
 the writing out of repetitious music.  The syntax is
 
 @example
-\repeat unfold @var{repeatcount} @var{repeatbody}
+\repeat unfold @var{repeatcount} @var{musicexpr}
 @end example
 
-where @var{repeatbody} is a music expression.  Unfold repeats can be
+where @var{musicexpr} is a music expression.  Unfold repeats can be
 made with or without alternate endings.  Unfold repeats without
 alternate endings:
 
@@ -296,7 +296,7 @@ Unfold repeats with alternate endings:
 
 @lilypond[quote,ragged-right,verbatim,fragment,relative=2]
 c1
-\repeat unfold 2 { g f e d }
+\repeat unfold 2 { g4 f e d }
   \alternative {
     { cis2 g' }
     { cis,2 b }
@@ -334,14 +334,15 @@ Percent repeats must be declared within a @code{Voice} context.  The
 syntax is
 
 @example
-@code{\repeat percent @var{number} @var{repeatbody}}
+@code{\repeat percent @var{number} @var{musicexpr}}
 @end example
 
-where @var{repeatbody} is a music expression. 
+where @var{musicexpr} is a music expression. 
 
 @lilypond[quote,verbatim,ragged-right]
 \new Voice \relative c' {
   \repeat percent 4 { c4 }
+  \repeat percent 2 { b4 a4 g4 f4 }
   \repeat percent 2 { c2 es2 f4 fis4 g4 c4 }
 }
 @end lilypond

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 27ddc14e982d49e1823e57808392a93ecf44412f..5c0b3f5fd4e5376faa1d07d624c32a6c387f0106 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -34,7 +34,7 @@ than one voice on the same staff.
 @node Chorded notes
 @subsubsection Chorded notes
 
-@cindex Chords
+@cindex chords
 
 A chord is formed by a enclosing a set of pitches between @code{<}
 and @code{>}.  A chord may be followed by a duration, and a set of
@@ -48,9 +48,11 @@ For more information about chords, see @ref{Modern chords}.
 
 @seealso
 
-Music Glossary: @rglos{chord}.
+Music Glossary:
+@rglos{chord}.
 
-Notation Reference: @ref{Modern chords}.
+Notation Reference:
+@ref{Modern chords}.
 
 Snippets:
 @lsrdir{Simultaneous,Simultaneous-notes}
@@ -86,7 +88,8 @@ clusters.
 Snippets:
 @lsrdir{Simultaneous,Simultaneous-notes}
 
-Internals Reference: @internalsref{ClusterSpanner},
+Internals Reference:
+@internalsref{ClusterSpanner},
 @internalsref{ClusterSpannerBeacon},
 @internalsref{Cluster_spanner_engraver}.
 
@@ -255,8 +258,9 @@ override typesetting decisions.
 Snippets:
 @lsrdir{Simultaneous,Simultaneous-notes}
 
-Internals Reference: the objects responsible for resolving
-collisions are @internalsref{NoteCollision} and
+Internals Reference: the objects responsible for resolving collisions
+are
+@internalsref{NoteCollision} and
 @internalsref{RestCollision}.
 
 
@@ -354,12 +358,15 @@ has no effect on the pitches of @var{musicexpr1} and
 
 @seealso
 
-Music Glossary: @rglos{a due}.
+Music Glossary:
+@rglos{a due}.
 
 Snippets:
 @lsrdir{Simultaneous,Simultaneous-notes}
 
-Internals Reference: @internalsref{PartCombineMusic}, @internalsref{Voice}.
+Internals Reference:
+@internalsref{PartCombineMusic},
+@internalsref{Voice}.
 
 @knownissues
 

diff --git a/Documentation/user/writing-texinfo.txt b/Documentation/user/writing-texinfo.txt
index d8d5f6cdacd9893729bf33128f6c37be4993a6d5..4b10aebd0d691adf6344002f7e30ae68c7ac7cae 100644 (file)
--- a/Documentation/user/writing-texinfo.txt
+++ b/Documentation/user/writing-texinfo.txt
@@ -70,6 +70,12 @@ commands.
   in print.  Please create a smaller example.  (the smaller
   example does not need to be minimal, however)
 
+* Specify durations for at least the first note of every bar.
+
+* If you only have one bar per line, omit bar checks.  If you
+  put more than one bar per line (not recommended), then include
+  bar checks.
+
 * If you want to work on an example outside of the manual (for
   easier/faster processing), use this header: