From: fred <fred>
Date: Wed, 27 Mar 2002 01:00:14 +0000 (+0000)
Subject: lilypond-1.3.146
X-Git-Tag: release/1.5.59~794
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6cd05f0293baca36e248a328bf5e2c1b20f94e02;p=lilypond.git

lilypond-1.3.146
---

diff --git a/lily/stem.cc b/lily/stem.cc
index 2b965b1c25..165848acd7 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -477,31 +477,6 @@ Stem::brew_molecule (SCM smob)
 
   Real dy = Staff_symbol_referencer::staff_space (me)/2.0;
   Real head_wid = 0;
-
-  /*
-TODO:
-
-    I don't really get the idea of the attachment-angle.
-    It seems like that you attach the Stem to the NoteHead at point
-    (1,tan(aa)/2), making it still nessesary to have special CENTER-STEMS
-    option - and if I would like to attach stem i.e. here:
-
-      |
-      |
-      |
-    XXX
-   XXXXX
-   XXXXX
-    XXX
-
-   That would be impossible.
-   Why haven't you just made ATTACHMENT-COORDINATES as a pair of reals,
-   with (0 . 0) meaning CENTER, (1 . 1) upper right, etc...?
-   
--Rune
-
- 
-  */
     
   if (Grob *hed = support_head (me))
     {
@@ -511,7 +486,7 @@ TODO:
       Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
 
       y_attach = head_height.linear_combination (y_attach);
-      stem_y[Direction (-d)] += d * y_attach;
+      stem_y[Direction (-d)] += d * 2*y_attach;
     }
 
   
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 5973b51718..7632fcff47 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -546,13 +546,18 @@ fet_beginchar("Crossed notehead", "2cross", "crossedhead")
 fet_endchar;
 
 fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
-	set_char_box(0, noteheight#+stafflinethickness#,
-	  noteheight#/2+stafflinethickness#/2,noteheight#/2+stafflinethickness#/2);
-	pickup pencircle scaled 1.2stafflinethickness;
-	draw fullcircle scaled 2h shifted (h,0);
-	pos := h/sqrt2;
-	draw (-pos+h,-pos) -- (pos+h,pos);
-	draw (-pos+h,pos) -- (pos+h,-pos);
+	wid# := black_notehead_width#;
+	hei# := noteheight#+stafflinethickness#;
+	set_char_box(0, wid#,hei#/2,hei#/2);
+	cthick := 1.2stafflinethickness;
+	cxr := w/2-cthick/2;
+	cyr := h-cthick/2;
+	pickup pencircle scaled cthick;
+	draw fullcircle xscaled 2cxr yscaled 2cyr shifted (w/2,0);
+	xpos := cxr/sqrt2;
+	ypos := cyr/sqrt2;
+	draw (-xpos+w/2,-ypos) -- (xpos+w/2,ypos);
+	draw (-xpos+w/2,ypos) -- (xpos+w/2,-ypos);
 fet_endchar;
 
 fet_endgroup("noteheads");
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index d6d57b3765..e3a9ad11ac 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -70,7 +70,7 @@
 		   (if (< duration 0) "mensural" "")))
    ((default) (number->string duration))
    (else
-    (string-append (number->string duration) (symbol->string style)))))
+    (string-append (number->string (max 0 duration)) (symbol->string style)))))
 
 
 (define (note-head-style->attachment-coordinates style)
@@ -79,9 +79,9 @@ bounding box, where to attach the stem. e.g.: X==0 means horizontally
 centered, X==1 is at the right, X == -1 is at the left."
 
   (case style
-    ((default) '(1.0 . 0.8))
-    ((cross) '(1.0 . -1.0))
-    ((mensural) '(0.0 . 1.0))
+    ((default) '(1.0 . 0.5))
+    ((cross) '(1.0 . 0.75))
+    ((mensural) '(0.0 . 0.6))
     ((diamond) '(1.0 . 0.8))
     ((transparent) '(1.0 . 1.0))
     ((slash) '(1.0 . 1.0))