Issue 5057/1: Add Protected_scm::is_bound () function

[lilypond.git] / lily / line-interface.cc

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index 0aeec915409660ae7a4b4cc2c7248f529f5dea0b..bc0895339fea3c996e08a71891c0090cbea2e96c 100644 (file)
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -25,8 +25,6 @@
 #include "output-def.hh"
 #include "staff-symbol-referencer.hh"
 
-using std::vector;
-
 Stencil
 Line_interface::make_arrow (Offset begin, Offset end,
                             Real thick,
@@ -72,7 +70,7 @@ Line_interface::make_trill_line (Grob *me,
     }
   while (len + elt_len < dz.length ());
 
-  line.rotate (dz.arg (), Offset (LEFT, CENTER));
+  line.rotate (dz.angle_degrees (), Offset (LEFT, CENTER));
   line.translate (from);
 
   return line;
@@ -125,8 +123,8 @@ Line_interface::make_dashed_line (Real thick, Offset from, Offset to,
                                   Real dash_period, Real dash_fraction)
 {
   dash_fraction = min (max (dash_fraction, 0.0), 1.0);
-  Real on = dash_fraction * dash_period + thick;
-  Real off = max (0.0, dash_period - on);
+  Real on = dash_fraction * dash_period; 
+  Real off = max (0.0, dash_period - on - thick);
 
   SCM at = scm_list_n (ly_symbol2scm ("dashed-line"),
                        scm_from_double (thick),