* lily/line-interface.cc (line): remove thickness from calling interface.

* lily/hairpin.cc: use Line_interface

* lily/line-interface.cc: new file. Line_interface for everything
with dotted/dashed lines.

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 41e9eef5ef90e84d517ad81d7ebc4fd01b5cfe89..869365001841233a21ef895d3c70a8b7b01d13bc 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -119,9 +119,7 @@ Hairpin::brew_molecule (SCM smob)
    */
 
   Molecule mol;
-  mol  = Line_interface::line (me,
-                                     Offset (0, starth),
-                                     Offset (width, endh));
+  mol  = Line_interface::line (me, Offset (0, starth), Offset (width, endh));
   mol.add_molecule (Line_interface::line (me,
                                                 Offset (0, -starth),
                                                 Offset (width, -endh)));

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index e3660924f8d60ab246a18198c43f9eec628f67ab..41f272c90aa9bf89ac233670c3e977d4c02c44e5 100644 (file)
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -73,14 +73,14 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 {
   Real thick = me->get_paper()->get_realvar (ly_symbol2scm ("linethickness"));  
   thick *= robust_scm2double (me->get_grob_property ("thickness"), 1.0); // todo: staff sym referencer? 
-  
+
   SCM type = me->get_grob_property ("style");
-  if (type == ly_symbol2scm ("dotted-line")
-      || type == ly_symbol2scm ("dashed-line"))
+
+  SCM dash_fraction = me->get_grob_property ("dash-fraction");
+  if (gh_number_p (dash_fraction) || type == ly_symbol2scm ("dotted-line"))
     {
       Real fraction =
-       robust_scm2double (me->get_grob_property ("dash-fraction"),
-                          (type == ly_symbol2scm ("dotted-line")) ? 0.0 : 0.4);
+       robust_scm2double (dash_fraction, (type == ly_symbol2scm ("dotted-line")) ? 0.0 : 0.4);
 
       fraction = (fraction >? 0) <? 1.0;
       Real period = Staff_symbol_referencer::staff_space (me)
@@ -88,7 +88,7 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 
       if (period < 0)
        return Molecule ();
-       
+  
       return make_dashed_line (thick, from, to, period, fraction);
     }
   else