From: Jürgen Reuter <j@web.de>
Date: Thu, 26 Aug 2004 23:55:02 +0000 (+0000)
Subject: * mf/parmesan-heads.mf: draw_diamond_head: fixed pen width; added
X-Git-Tag: release/2.3.13~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54022bda44c08f2558155ab135f8139723ae7f17;p=lilypond.git

* mf/parmesan-heads.mf: draw_diamond_head: fixed pen width; added
missing lneo_mensural head; editorial cleanups

* lily/mensural-ligature.cc: added more comments
---

diff --git a/ChangeLog b/ChangeLog
index f19e6f03cb..2d8721e72c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* Documentation/user/lilypond-book.itely: fix parse error: @LaTeX
 	-> La@TeX
 
+	* mf/parmesan-heads.mf: draw_diamond_head: fixed pen width; added
+	missing lneo_mensural head; editorial cleanups
+
+	* lily/mensural-ligature.cc: added more comments
+
 2004-08-26  Graham Percival  <gperlist@shaw.ca>
 
 	* Documentation/user/examples.itely: second, third, fourth, and fifth sections added.
diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 3d344a9a0e..f3f8c704ae 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -140,13 +140,13 @@ internal_brew_primitive (Grob *me)
 	out = brew_flexa (me, delta_pitch, false,
 			  flexa_width, thickness, true, DOWN);
 	break;
-      case MLP_sc:
+      case MLP_sc: // mensural brevis head with right cauda
 	out = Font_interface::get_default_font (me)->find_by_name ("noteheads--2mensural");
 	break;
-      case MLP_ss:
+      case MLP_ss: // mensural brevis head
 	out = Font_interface::get_default_font (me)->find_by_name ("noteheads--1mensural");
 	break;
-      case MLP_cs:
+      case MLP_cs: // mensural brevis head with left cauda
 	out = Font_interface::get_default_font (me)->find_by_name ("noteheads-lmensural");
 	break;
       case MLP_SS:
diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index b8e6421667..b9039be772 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -124,6 +124,10 @@ def draw_neo_longa (expr wid) =
 	penlabels(6,7);
 enddef;
 
+fet_beginchar("Left stemmed notehead", "lneo_mensural", "mensuralleftstemmedhead");
+	draw_neo_left_stemmed_head (2 staff_space#);
+fet_endchar;
+
 %
 % En wij presenteren U: de opvolgster van Emily
 %
@@ -215,8 +219,6 @@ enddef;
 
 def draw_left_stemmed_head (expr wid) =
 	draw_brevis(wid);
-	save theta;
-
 	x6 = x7 = stem_width/2;
 	y6 = y5;
 	y7 = y5 - 2.25staff_space;
@@ -224,13 +226,8 @@ def draw_left_stemmed_head (expr wid) =
 	draw z6 .. z7;
 enddef;
 
-fet_beginchar("Left stemmed notehead", "lmensural", "mensuralleftstemmedhead");
-	draw_left_stemmed_head (staff_space#)
-fet_endchar;
-
 def draw_longa (expr wid) =
 	draw_brevis(wid);
-
 	x6 = x7 = head_width - stem_width/2;
 	y6 = y5;
 	y7 = y5 - 2.25staff_space;
@@ -238,6 +235,10 @@ def draw_longa (expr wid) =
 	draw z6 .. z7;
 enddef;
 
+fet_beginchar("Left stemmed notehead", "lmensural", "mensuralleftstemmedhead");
+	draw_left_stemmed_head (staff_space#)
+fet_endchar;
+
 fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
 	draw_longa (2.0 staff_space#)
 fet_endchar;
@@ -254,7 +255,6 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
       save head_width, head_height;
       head_height# = head_h;
       head_width# / head_height# = tand(angle);
-      define_pixels(head_width, head_height);
 
       set_char_box (0, head_width#,
 	head_height#/2, head_height#/2);
@@ -262,9 +262,10 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
       charwx := head_width# / 2;
       charwy := head_height# / 2 - linethickness#;
 
+      define_pixels(head_width, head_height);
       pickup pencircle
-	     xscaled (min(blot_diameter, pen_w * head_width))
-	     yscaled (min(blot_diameter, pen_h * head_width))
+	     xscaled (max(blot_diameter, pen_w * head_width))
+	     yscaled (max(blot_diameter, pen_h * head_width))
 	     rotated -angle;
 
       %% FIXME: replace "xpart (top z2)" (and, analogously,