Merge branch 'lilypond/translation' of git+ssh://git.savannah.gnu.org/srv/git/lilypon...

diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi
index 9a370e24ac2a32fc2edb15ce47b3880b7608f59f..4d014836a425f0f504302c92b28119a906f086aa 100644 (file)
--- a/Documentation/contributor/quick-start.itexi
+++ b/Documentation/contributor/quick-start.itexi
@@ -410,7 +410,7 @@ cd build/
 
 @subsubheading Building @code{lilypond}
 
-Compiling lilypond will likely take between 5 and 30 minutes,
+Compiling lilypond will likely take between 5 and 60 minutes,
 depending on your computer's speed and available RAM.  We
 recommend that you minimize the terminal window while it is
 building; this can have a non-negligible effect on compilation
@@ -452,6 +452,13 @@ To select different build options, or isolate certain parts of the
 build, or to use multiple CPUs while building, read the rest of
 this chapter.
 
+@subsubheading Installing LilyPond with lilydev
+
+Don't.  There is no reason to install lilypond within lilydev.
+All development work can (and should) stay within the
+@file{$HOME/lilypond-git/} directory, and any personal composition
+or typesetting work should be done with an official GUB release.
+
 
 @node Now start work!
 @section Now start work!
@@ -461,7 +468,7 @@ their intended contributions:
 
 @itemize
 @item @rcontrib{Documentation work}
-@item @rcontrib{Translate the documentation}
+@item @rcontrib{Translating the documentation}
 @item @rcontrib{Website work}
 @item @rcontrib{Regression tests}
 @item @rcontrib{Programming work}

diff --git a/Documentation/included/compile.itexi b/Documentation/included/compile.itexi
index b2a4ec89a76d1363879a67000502e30e4664135e..683326dd903ea46da3a7ed9b8d9268603e01567f 100644 (file)
--- a/Documentation/included/compile.itexi
+++ b/Documentation/included/compile.itexi
@@ -43,7 +43,7 @@ without compiling}.
 
 Attempts to compile LilyPond natively on Windows have been
 unsuccessful, though a workaround is available (see
-@rcontrib{Lilybuntu}).
+@rcontrib{Lilydev}).
 
 
 @node Requirements

diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely
index b80e6372b3b9eeb9cedbd59f9c19fce99241923d..3468ddec36009cd7b11ad006446971f73f9fedd0 100644 (file)
--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -2105,11 +2105,16 @@ for all contexts of a particular type by including the
 @code{\set} command in a @code{\context} block in the
 same way.
 
-
 @seealso
 Notation Reference: @ruser{Modifying context plug-ins},
 @ruser{Changing context default settings}.
 
+@knownissues
+The @code{Stem_engraver} and @code{Beam_engraver} attach their
+objects to note heads.  If the @code{Note_heads_engraver} is removed
+no note heads are produced and therefore no stems or beams are created
+either.
+
 
 @node Extending the templates
 @section Extending the templates

diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely
index efae065ebf50dc6891eddb28f1492258357978c8..1e8de840be18135c816e3920ddc1fe0cb472518b 100644 (file)
--- a/Documentation/notation/repeats.itely
+++ b/Documentation/notation/repeats.itely
@@ -113,10 +113,10 @@ repeats are given the first alternative.
 A single repeat with one alternate ending:
 
 @lilypond[verbatim,quote,relative=2]
-\repeat volta 2 { c4 d e f }
+\repeat volta 2 { c4 d e f | }
 \alternative {
-  { c2 e }
-  { f2 g }
+  { c2 e | }
+  { f2 g | }
 }
 c1
 @end lilypond
@@ -124,10 +124,10 @@ c1
 A single repeat with more than one alternate ending:
 
 @lilypond[verbatim,quote,relative=2]
-\repeat volta 4 { c4 d e f }
+\repeat volta 4 { c4 d e f | }
 \alternative {
-  { c2 e }
-  { f2 g }
+  { c2 e | }
+  { f2 g | }
 }
 c1
 @end lilypond
@@ -135,15 +135,20 @@ c1
 Multiple repeats with more than one alternate ending:
 
 @lilypond[verbatim,quote,relative=2]
-\repeat volta 3 { c4 d e f }
+\repeat volta 3 { c4 d e f | }
 \alternative {
-  { c2 e }
-  { f2 g }
-  { a2 g }
+  { c2 e | }
+  { f2 g | }
+  { a2 g | }
 }
 c1
 @end lilypond
 
+@warning{If there are two or more alternatives, nothing should appear
+between the closing brace of one and the opening brace of the next
+in an @code{@bs{}alternative} block, otherwise you will not get the
+expected number of endings.}
+
 @warning{If you include @code{@bs{}relative} inside a
 @code{@bs{}repeat} without explicitly instantiating the
 @code{Voice} context, extra (unwanted) staves will appear.  See
@@ -157,7 +162,6 @@ c1
 @cindex pickup in a repeat
 @funindex \partial
 
-
 If a repeat starts in the middle of a measure and has no alternate
 endings, normally the end of the repeat will also fall in the
 middle of a measure, so that the two ends add up to one complete

diff --git a/scripts/build/output-distance.py b/scripts/build/output-distance.py
index 6b63e79f90cccf3c12aa7d769c12a26d73903015..19b14435f630e7218f191d59aec56d2a4f9be241 100644 (file)
--- a/scripts/build/output-distance.py
+++ b/scripts/build/output-distance.py
@@ -87,7 +87,7 @@ def compare_png_images (old, new, dest_dir):
     system ('convert -depth 8 -crop %dx%d+0+0 %s %s/crop1.png' % (dims + (old, dir)))
     system ('convert -depth 8 -crop %dx%d+0+0 %s %s/crop2.png' % (dims + (new, dir)))
 
-    system ('compare -depth 8 %(dir)s/crop1.png %(dir)s/crop2.png %(dir)s/diff.png' % locals ())
+    system ('compare -depth 8 -dissimilarity-threshold 1 %(dir)s/crop1.png %(dir)s/crop2.png %(dir)s/diff.png' % locals ())
 
     system ("convert  -depth 8 %(dir)s/diff.png -blur 0x3 -negate -channel alpha,blue -type TrueColorMatte -fx 'intensity'    %(dir)s/matte.png" % locals ())