Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

3 files changed, 22 insertions, 19 deletions

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index c1eb057773..6f8b2c5557 100644
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -153,11 +153,11 @@ a stem are shifted vertically.
 @lilypond[quote,verbatim,relative=2]
 <<
   {
-    c8 d e d c d e4
-    g2 fis
+    c8 d e d c d c4
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
@@ -175,11 +175,11 @@ Note heads with different note heads may be merged:
 <<
   {
     \override Staff.NoteCollision #'merge-differently-headed = ##t
-    c8 d e d c d e4
-    g2 fis
+    c8 d e d c d c4
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
@@ -196,11 +196,11 @@ Note heads with different dots may be merged:
   {
     \override Staff.NoteCollision #'merge-differently-headed = ##t
     \override Staff.NoteCollision #'merge-differently-dotted = ##t	
-    c8 d e d c d e4
-    g2 fis
+    c8 d e d c d c4
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
@@ -224,17 +224,18 @@ column, and @code{merge-differently-headed} works properly.
   {
     \override Staff.NoteCollision #'merge-differently-headed = ##t
     \override Staff.NoteCollision #'merge-differently-dotted = ##t	
-    c8 d e d c d e4
+    c8 d e d c d c4
     \shiftOn
-    g2 fis
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
     e8 a b c d2
   }
+
 >>
 @end lilypond
 
diff --git a/input/regression/spacing-packed.ly b/input/regression/spacing-packed.ly
index a7bb43c8bb..010370930b 100644
--- a/input/regression/spacing-packed.ly
+++ b/input/regression/spacing-packed.ly
@@ -1,7 +1,7 @@
 \header {
   texidoc = "
 	In packed mode, pack notes as tight as possible.  This makes
-	sense mostly in combination with raggedright mode: the notes
+	sense mostly in combination with ragged-right mode: the notes
 	are then printed at minimum distance.  This is mostly useful
 	for ancient notation, but may also be useful for some flavours
 	of contemporary music.  If not in raggedright mode, lily will
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 2cffb172e6..3c8d151b4f 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1608,8 +1608,10 @@ Construct a note symbol, with stem.  By using fractional values for
 							 (number->string log)))
                        (cons (+ (car attach-off) (if (< dir 0) stem-thickness 0)) stemy)))))
 
-    (if (and dots flaggl (> dir 0))
-	(set! dots (ly:stencil-translate-axis dots 0.35 X)))
+    ; If there is a flag on an upstem and the stem is short, move the dots to avoid the flag.
+    ; 16th notes get a special case because their flags hang lower than any other flags.
+    (if (and dots (> dir 0) (> log 2) (or (< dir 1.15) (and (= log 4) (< dir 1.3))))
+	(set! dots (ly:stencil-translate-axis dots 0.5 X)))
     (if flaggl
         (set! stem-glyph (ly:stencil-add flaggl stem-glyph)))
     (if (ly:stencil? stem-glyph)