* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 723244c025d14682bff1e75a3845cb68974afe50..c757f4ce1e645facc3dc3761c6a85a6ca23f53c7 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -27,7 +27,7 @@ Hairpin::brew_molecule (SCM smob)
   Real line = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
   
   SCM s = me->get_grob_property ("grow-direction");
-  if (!ly_dir_p (s))
+  if (!is_direction (s))
     {
       me->suicide ();
       return SCM_EOL;
@@ -116,17 +116,48 @@ Hairpin::brew_molecule (SCM smob)
       endh = height;
     }
 
-  Molecule mol  = Lookup::line (thick,
-                               Offset (0, starth),
-                               Offset (width, endh));
-  mol.add_molecule (Lookup::line (thick,
-                                 Offset (0, -starth),
-                                 Offset (width, -endh)));
-                   
+  /*
+    should do relative to staff-symbol staff-space?
+   */
+
+  Real period = 1.0;
+  s = me->get_grob_property ("dash-period");
+  if (gh_number_p (s))
+    period = gh_scm2double (s);
+  
+  Real fraction = 1.0;
+  s = me->get_grob_property ("dash-fraction");
+  if (gh_number_p (s))
+    fraction = gh_scm2double (s);
+  
+  /*
+    TODO: set line style.
+   */
+  Molecule mol;
+  if (fraction < 1.0)
+    {
+      mol  = Lookup::dashed_line (thick,
+                                 Offset (0, starth),
+                                 Offset (width, endh),
+                                 period, fraction);
+      mol.add_molecule (Lookup::dashed_line (thick,
+                                            Offset (0, -starth),
+                                            Offset (width, -endh),
+                                            period, fraction));
+    }
+  else
+    {
+      mol  = Lookup::line (thick,
+                          Offset (0, starth),
+                          Offset (width, endh));
+      mol.add_molecule (Lookup::line (thick,
+                                     Offset (0, -starth),
+                                     Offset (width, -endh)
+                                     ));
+    }
   mol.translate_axis (x_points[LEFT]
                      - bounds[LEFT]->relative_coordinate (common, X_AXIS),
                      X_AXIS);
-
   return mol.smobbed_copy ();
 }
 
@@ -134,5 +165,5 @@ Hairpin::brew_molecule (SCM smob)
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
   "hairpin crescendo.",
-  "grow-direction thickness height if-text-padding");
+  "dash-period dash-fraction grow-direction thickness height if-text-padding");