* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 0f7d9b8d767c47ac2d6c51b262afa085a0c417c6..9781002205780066c6ba28ff4522252f95791172 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -81,19 +81,19 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash)
 }
 
 Molecule
-Lookup::line (Real th, Offset f, Offset t)
+Lookup::line (Real th, Offset from, Offset to)
 {
   SCM at = scm_list_n (ly_symbol2scm ("draw-line"),
                        gh_double2scm (th), 
-                       gh_double2scm (f[X_AXIS]),
-                       gh_double2scm (f[Y_AXIS]),
-                       gh_double2scm (t[X_AXIS]),
-                       gh_double2scm (t[Y_AXIS]),
+                       gh_double2scm (from[X_AXIS]),
+                       gh_double2scm (from[Y_AXIS]),
+                       gh_double2scm (to[X_AXIS]),
+                       gh_double2scm (to[Y_AXIS]),
                        SCM_UNDEFINED);
 
   Box box;
-  box.add_point (f);
-  box.add_point (t);
+  box.add_point (from);
+  box.add_point (to);
 
   box[X_AXIS].widen (th/2);
   box[Y_AXIS].widen (th/2);  
@@ -101,6 +101,34 @@ Lookup::line (Real th, Offset f, Offset t)
   return Molecule (box, at);
 }
 
+Molecule
+Lookup::dashed_line (Real thick, Offset from, Offset to,
+                    Real dash_period, Real dash_fraction)
+{
+  dash_fraction = (dash_fraction >? 0) <? 1.0;
+  Real on = dash_fraction * dash_period + thick; 
+  Real off = dash_period - on;
+  
+  SCM at = scm_list_n (ly_symbol2scm ("dashed-line"),
+                       gh_double2scm (thick), 
+                       gh_double2scm (on),
+                       gh_double2scm (off),
+                       gh_double2scm (to[X_AXIS] - from[X_AXIS]),
+                       gh_double2scm (to[Y_AXIS] - from[Y_AXIS]),
+                       SCM_UNDEFINED);
+  
+  Box box;
+  box.add_point (Offset (0,0));
+  box.add_point (to - from);
+
+  box[X_AXIS].widen (thick/2);
+  box[Y_AXIS].widen (thick/2);  
+
+  Molecule m = Molecule (box, at);
+  m.translate (from);
+  return m;
+}
+
 Molecule
 Lookup::horizontal_line (Interval w, Real th)
 {
@@ -166,7 +194,7 @@ Lookup::filledbox (Box b)
  *       Box extent(X_AXIS)
  */
 Molecule
-Lookup::roundfilledbox (Box b, Real blotdiameter)
+Lookup::round_filled_box (Box b, Real blotdiameter)
 {
   if (b.x ().length () < blotdiameter)
     {
@@ -179,7 +207,7 @@ Lookup::roundfilledbox (Box b, Real blotdiameter)
       blotdiameter = b.y ().length ();
     }
 
-  SCM at = (scm_list_n (ly_symbol2scm ("roundfilledbox"),
+  SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"),
                        gh_double2scm (-b[X_AXIS][LEFT]),
                        gh_double2scm (b[X_AXIS][RIGHT]),
                        gh_double2scm (-b[Y_AXIS][DOWN]),
@@ -190,24 +218,6 @@ Lookup::roundfilledbox (Box b, Real blotdiameter)
   return Molecule (b,at);
 }
 
-LY_DEFINE(ly_round_filled_box, "ly:round-filled-box",
-         2, 0,0,
-         (SCM b, SCM blot),
-         "Make a box with rounded corners. B is a pair of number-pairs, and BLOT a number")
-{
-  SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG2, __FUNCTION__, "number") ;
-  SCM_ASSERT_TYPE(gh_pair_p (b), b, SCM_ARG4, __FUNCTION__, "pair") ;
-
-  SCM_ASSERT_TYPE(ly_number_pair_p (gh_car (b)), gh_car (b), SCM_ARG1, __FUNCTION__, "number-pair") ;
-  SCM_ASSERT_TYPE(ly_number_pair_p (gh_cdr (b)), gh_cdr (b), SCM_ARG1, __FUNCTION__, "number-pair") ;
-
-  Interval x (ly_scm2interval (gh_car (b)));
-  Interval y (ly_scm2interval (gh_cdr (b)));
-  
-  return Lookup::roundfilledbox (Box (x,y),
-                                gh_scm2double (blot)).smobbed_copy();
-  
-}
          
 
 /*
@@ -400,7 +410,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick)
     }
   
   
-  SCM at = (scm_list_n (ly_symbol2scm ("bezier-bow"),
+  SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
                     ly_quote_scm (list),
                     gh_double2scm (linethick),
                     SCM_UNDEFINED));
@@ -760,8 +770,8 @@ LY_DEFINE(ly_bracket ,"ly:bracket",
          "given by @var{iv}. The wings protude by an amount of @var{p}, which "
          "may be negative. The thickness is given by @var{t}.")
 {
-  SCM_ASSERT_TYPE(ly_axis_p (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
-  SCM_ASSERT_TYPE(ly_number_pair_p (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE(is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
+  SCM_ASSERT_TYPE(is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
   SCM_ASSERT_TYPE(gh_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ;
   SCM_ASSERT_TYPE(gh_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ;
 
@@ -770,4 +780,19 @@ LY_DEFINE(ly_bracket ,"ly:bracket",
                          gh_scm2double (t),
                          gh_scm2double (p)).smobbed_copy ();
 }
-  
+
+
+
+LY_DEFINE(ly_filled_box ,"ly:round-filled-box",
+         3, 0, 0,
+         (SCM xext, SCM yext, SCM blot),
+         "Make a filled-box of dimensions @var{xext}, @var{yext} and roundness @var{blot}.")
+{
+  SCM_ASSERT_TYPE(is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE(is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
+
+  return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),
+                                  gh_scm2double (blot)).smobbed_copy ();
+}
+