X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmensural-ligature.cc;h=87ca3f5bd1bd8a57cdd38080a546fb5d73a5ff32;hb=eb72c0f066957c3e71d336db0f72814e34d3964d;hp=22138e453cdf844af91397ff28808292fd614005;hpb=0d6207e894224577f9879f4036ef8cab4925c4c7;p=lilypond.git

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 22138e453c..87ca3f5bd1 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -1,15 +1,13 @@
 /*
   mensural-ligature.cc -- implement Mensural_ligature
-  
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>,
-		 Pal Benko <benkop@freestart.hu>
+  Pal Benko <benkop@freestart.hu>
 */
 
 
-#include <math.h>
-
 #include "mensural-ligature.hh"
 #include "item.hh"
 #include "font-interface.hh"
@@ -29,46 +27,60 @@ brew_flexa (Grob *me,
 	    Real interval,
 	    bool solid,
 	    Real width,
-	    Real thickness)
+	    Real vertical_line_thickness)
 {
   Real staff_space = Staff_symbol_referencer::staff_space (me);
-  Real height = 0.6 * staff_space;
-  Stencil stencil;
-
   Real slope = (interval / 2.0 * staff_space) / width;
 
   // Compensate optical illusion regarding vertical position of left
   // and right endings due to slope.
-  Real ypos_correction = -0.1*staff_space * sign (slope);
-  Real slope_correction = 0.2*staff_space * sign (slope);
-  Real corrected_slope = slope + slope_correction/width;
+  Real ypos_correction = -0.1 * staff_space * sign (slope);
+  Real slope_correction = 0.2 * staff_space * sign (slope);
+  Real corrected_slope = slope + slope_correction / width;
 
-  if (solid) // this will come handy for colorated flexae
+  Stencil stencil;
+  if (solid) // colorated flexae
     {
-      Stencil solid_head =
-	Lookup::beam (corrected_slope, width, height, 0.0);
+      Stencil solid_head
+	= Lookup::beam (corrected_slope, width, staff_space, 0.0);
       stencil.add_stencil (solid_head);
     }
   else // outline
     {
-      Stencil left_edge =
-	Lookup::beam (corrected_slope, thickness, height, 0.0);
+      /*
+	The thickness of the horizontal lines of the flexa shape
+	should be equal to that of the horizontal lines of the
+	neomensural brevis note head (see mf/parmesan-heads.mf).
+      */
+      Real const horizontal_line_thickness = staff_space * 0.35;
+
+      // URGH!  vertical_line_thickness is adjustable (via thickness
+      // property), while horizontal_line_thickness is constant.
+      // Maybe both should be adjustable independently?
+
+      Real height = staff_space - horizontal_line_thickness;
+
+      Stencil left_edge
+	= Lookup::beam (corrected_slope, vertical_line_thickness, height, 0.0);
       stencil.add_stencil (left_edge);
 
-      Stencil right_edge =
-	Lookup::beam (corrected_slope, thickness, height, 0.0);
-      right_edge.translate_axis (width-thickness, X_AXIS);
-      right_edge.translate_axis (corrected_slope * (width-thickness), Y_AXIS);
+      Stencil right_edge
+	= Lookup::beam (corrected_slope, vertical_line_thickness, height, 0.0);
+      right_edge.translate_axis (width - vertical_line_thickness, X_AXIS);
+      right_edge.translate_axis ((width - vertical_line_thickness) *
+				 corrected_slope, Y_AXIS);
       stencil.add_stencil (right_edge);
 
-      Stencil bottom_edge =
-	Lookup::beam (corrected_slope, width, thickness, 0.0);
-      bottom_edge.translate_axis (-0.5*height, Y_AXIS);
+      Stencil bottom_edge
+	= Lookup::beam (corrected_slope, width,
+			horizontal_line_thickness, 0.0);
+      bottom_edge.translate_axis (-0.5 * height, Y_AXIS);
       stencil.add_stencil (bottom_edge);
 
-      Stencil top_edge =
-	Lookup::beam (corrected_slope, width, thickness, 0.0);
-      top_edge.translate_axis (+0.5*height, Y_AXIS);
+      Stencil top_edge
+	= Lookup::beam (corrected_slope, width,
+			horizontal_line_thickness, 0.0);
+      top_edge.translate_axis (+0.5 * height, Y_AXIS);
       stencil.add_stencil (top_edge);
     }
   stencil.translate_axis (ypos_correction, Y_AXIS);
@@ -93,21 +105,17 @@ internal_brew_primitive (Grob *me)
   Real width = 0.0;
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   if (primitive & MLP_ANY)
-    {
-      thickness = robust_scm2double (me->get_property ("thickness"), .14);
-    }
+    thickness = robust_scm2double (me->get_property ("thickness"), .14);
 
   if (primitive & MLP_FLEXA)
     {
       delta_pitch = robust_scm2int (me->get_property ("delta-pitch"),
 				    0);
-      width =
-	robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
+      width
+	= robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
     }
   if (primitive & MLP_SINGLE_HEAD)
-    {
-      width = robust_scm2double (me->get_property ("head-width"), staff_space);
-    }
+    width = robust_scm2double (me->get_property ("head-width"), staff_space);
 
   switch (primitive & MLP_ANY)
     {
@@ -134,8 +142,8 @@ internal_brew_primitive (Grob *me)
       return Stencil ();
     }
 
-  Real blotdiameter =
-    (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+  Real blotdiameter
+    = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
 
   if (primitive & MLP_STEM)
     {
@@ -180,17 +188,15 @@ internal_brew_primitive (Grob *me)
 	  out.add_stencil (join);
 	}
       else
-	{
-	  programming_error (_f ("Mensural_ligature: (join_right == 0)"));
-	}
+	programming_error (_f ("Mensural_ligature: (join_right == 0)"));
     }
 
-#if 0 // what happend with the ledger lines?
+#if 0 /* what happend with the ledger lines? */
   int pos = Staff_symbol_referencer::get_rounded_position (me);
   if (primitive & MLP_FLEXA)
     {
       pos += delta_pitch;
-      add_ledger_lines(me, &out, pos, 0.5*delta_pitch, ledger_take_space);
+      add_ledger_lines (me, &out, pos, 0.5 * delta_pitch, ledger_take_space);
     }
 #endif