From: hanwen <hanwen>
Date: Fri, 5 May 2006 12:19:12 +0000 (+0000)
Subject: * scm/define-markup-commands.scm (note-by-number): remove debug display.
X-Git-Tag: release/2.8.2~9^2~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b6237fca422320833d89d3e990e1edf16c0e803b;p=lilypond.git

* scm/define-markup-commands.scm (note-by-number): remove debug display.
(note-by-number): further attachment fixes.

* scm/define-markup-commands.scm (note-by-number): read 'style
property.

* mf/feta-bolletjes.mf (overdone_heads): fix attachment points for
triangle head.
---

diff --git a/ChangeLog b/ChangeLog
index 0312d9dfb9..9965de0e1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-05-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* scm/define-markup-commands.scm (note-by-number): remove debug display.
+	(note-by-number): further attachment fixes.
 
 	* scm/lily-library.scm (ordered-cons): new function.
 	(interval-index): new function
@@ -11,7 +12,6 @@
 
 	* scm/define-markup-commands.scm (note-by-number): read 'style
 	property. 
-	
 
 	* input/regression/markup-note.ly: show note-head style option.
 
diff --git a/VERSION b/VERSION
index c6046fa0f2..ff852b3e82 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=9
-PATCH_LEVEL=3
+PATCH_LEVEL=4
 MY_PATCH_LEVEL=
 
diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index e500999ec4..50648f13c0 100644
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -14,7 +14,8 @@
 
 message "******************************************************";
 message "Using feta Autometric macros.";
-message "Do not worry about the @ signs in the output, they are not errors.";
+message "order of messages: ";
+message " NAME/CODE/BP/WD/DP/HT/WX/WY";
 message "******************************************************";
 message "";
 
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 7eda902975..c09c3d2df9 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -443,6 +443,7 @@ def define_triangle_shape (expr stemdir) =
 		       & {direction infinity of triangle_out_c}z1'l
 		       .. cycle;
 
+
 	labels (0, 10, 20, 30);
 	penlabels (1, 1', 2, 2', 3, 3', 12, 23, 31);
 
@@ -452,7 +453,7 @@ def define_triangle_shape (expr stemdir) =
 		charwx := xpart exact_right_point + .5 pen_thick# * xs;
 	else:
 		charwy := -ypart exact_down_point;
-		charwx := (width# - xpart exact_down_point + xs * pen_thick#);
+		charwx := (width# - (xpart exact_down_point - 0.5 * xs * pen_thick#));
 	fi
 enddef;
 
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index c5ee47382f..7f7b964d94 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1169,21 +1169,20 @@ figured bass notation"
          (stem-length (*  size-factor (max 3 (- log 1))))
          (head-glyph-name (get-glyph-name font (get-glyph-name-candidates dir log style)))
          (head-glyph (ly:font-get-glyph font head-glyph-name))
-	 (attach-indices (offset-scale
-			  (ly:note-head::stem-attachment font head-glyph-name) dir))
-	 
+	 (attach-indices (ly:note-head::stem-attachment font head-glyph-name))
          (stem-thickness (* size-factor 0.13))
          (stemy (* dir stem-length))
          (attach-off (cons (interval-index
 			    (ly:stencil-extent head-glyph X)
-			    (car attach-indices))
-			   (interval-index
-			    (ly:stencil-extent head-glyph Y)
-			    (cdr attach-indices))))
-
+			    (* dir (car attach-indices)))
+			   (* dir	; fixme, this is inconsistent between X & Y.
+			      (interval-index
+			       (ly:stencil-extent head-glyph Y)
+			       (cdr attach-indices)))))
          (stem-glyph (and (> log 0)
 			  (ly:round-filled-box
-			   (ordered-cons (car attach-off) (+ (car attach-off)  (* (- dir) stem-thickness)))
+			   (ordered-cons (car attach-off)
+					 (+ (car attach-off)  (* (- dir) stem-thickness)))
 			   (cons (min stemy (cdr attach-off))
 				 (max stemy (cdr attach-off)))
 			   (/ stem-thickness 3))))