From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 7 Jan 2007 17:19:46 +0000 (+0100)
Subject: Fix #226.
X-Git-Tag: release/2.11.10-1~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=72e6cf1054e2550ac8c9701da6cf78f5941981a0;p=lilypond.git

Fix #226.

And move the dot in case of a flag.
---

diff --git a/input/regression/markup-note-dot.ly b/input/regression/markup-note-dot.ly
new file mode 100644
index 0000000000..517f541653
--- /dev/null
+++ b/input/regression/markup-note-dot.ly
@@ -0,0 +1,20 @@
+
+\header {
+
+  texidoc = " A dotted whole note displayed via the @code{\\note}
+  command must separate the note head and the dot. The dot avoids the upflag."
+
+	}
+\paper {
+  packed = ##T
+}
+
+\version "2.10.10"
+
+
+\relative {
+  c^\markup { \note #"1." #1 }
+  c^\markup { \note #"2." #1 }
+  c^\markup { \note #"8." #1 }
+}
+
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 436d2c2378..8f5728c31b 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1263,8 +1263,8 @@ figured bass notation"
                     (apply ly:stencil-add
                            (map (lambda (x)
                                   (ly:stencil-translate-axis
-                                   dot  (* (+ 1 (* 2 x)) dotwid) X))
-                                (iota dot-count 1)))))
+                                   dot (* 2 x dotwid) X))
+                                (iota dot-count)))))
          (flaggl (and (> log 2)
                       (ly:stencil-translate
                        (ly:font-get-glyph font
@@ -1272,6 +1272,9 @@ figured bass notation"
 							 (if (> dir 0) "u" "d")
 							 (number->string log)))
                        (cons (+ (car attach-off) (/ stem-thickness 2)) stemy)))))
+
+    (if (and flaggl (> dir 0))
+	(set! dots (ly:stencil-translate-axis dots 0.35 X)))
     (if flaggl
         (set! stem-glyph (ly:stencil-add flaggl stem-glyph)))
     (if (ly:stencil? stem-glyph)
@@ -1282,12 +1285,7 @@ figured bass notation"
               (ly:stencil-add
                (ly:stencil-translate-axis
 		dots
-		(+ (if (and (> dir 0) (> log 2))
-		       (* 1.5 dotwid)
-		       0)
-		   ;; huh ? why not necessary?
-		   ;;(cdr (ly:stencil-extent head-glyph X))
-		   dotwid)
+		(+ (cdr (ly:stencil-extent head-glyph X)) dotwid)
 		X)
                stem-glyph)))
     stem-glyph))