Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index a1ef5ef4325cd572b0a47df621975b13a642e52d..d8c20c044fcd871b36f831b83adf022ed28c0c54 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -110,6 +110,22 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction)
   return Stencil (box, at);
 }
 
+Stencil
+Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
+{
+  vector<Offset> pts;
+  Offset rot (1, slope);
+
+  thick -= 2*blot;
+  width -= 2*blot;
+  rot /= sqrt (1 + slope*slope);
+  pts.push_back (Offset (0, -thick / 2) * rot);
+  pts.push_back (Offset (width, -thick / 2) * rot);
+  pts.push_back (Offset (width, thick / 2) * rot);
+  pts.push_back (Offset (0, thick / 2) * rot);
+  return Lookup::round_filled_polygon (pts, blot);
+}
+
 Stencil
 Lookup::horizontal_line (Interval w, Real th)
 {
@@ -227,7 +243,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter)
  * shrinked polygon). --jr
  */
 Stencil
-Lookup::round_filled_polygon (Array<Offset> const &points,
+Lookup::round_filled_polygon (vector<Offset> const &points,
                              Real blotdiameter)
 {
   /* TODO: Maybe print a warning if one of the above limitations
@@ -238,7 +254,7 @@ Lookup::round_filled_polygon (Array<Offset> const &points,
 
 #ifndef NDEBUG
   /* remove consecutive duplicate points */
-  for (int i = 0; i < points.size (); i++)
+  for (vsize i = 0; i < points.size (); i++)
     {
       int next_i = (i + 1) % points.size ();
       Real d = (points[i] - points[next_i]).length ();
@@ -256,10 +272,10 @@ Lookup::round_filled_polygon (Array<Offset> const &points,
     return Line_interface::make_line (blotdiameter, points[0], points[1]);
 
   /* shrink polygon in size by 0.5 * blotdiameter */
-  Array<Offset> shrunk_points;
-  shrunk_points.set_size (points.size ());
+  vector<Offset> shrunk_points;
+  shrunk_points.resize (points.size ());
   bool ccw = 1; // true, if three adjacent points are counterclockwise ordered
-  for (int i = 0; i < points.size (); i++)
+  for (vsize i = 0; i < points.size (); i++)
     {
       int i0 = i;
       int i1 = (i + 1) % points.size ();
@@ -304,7 +320,7 @@ Lookup::round_filled_polygon (Array<Offset> const &points,
   /* build scm expression and bounding box */
   SCM shrunk_points_scm = SCM_EOL;
   Box box;
-  for (int i = 0; i < shrunk_points.size (); i++)
+  for (vsize i = 0; i < shrunk_points.size (); i++)
     {
       SCM x = scm_from_double (shrunk_points[i][X_AXIS]);
       SCM y = scm_from_double (shrunk_points[i][Y_AXIS]);
@@ -451,40 +467,40 @@ Stencil
 Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
 {
   Stencil m;
-  String sym = ly_scm2string (scm_car (s));
-  String reg = ly_scm2string (scm_car (scm_cdr (s)));
+  string sym = ly_scm2string (scm_car (s));
+  string reg = ly_scm2string (scm_car (scm_cdr (s)));
 
   if (sym == "Discant")
     {
       Stencil r = fm->find_by_name ("accordion.accDiscant");
       m.add_stencil (r);
-      if (reg.left_string (1) == "F")
+      if (reg.substr (0, 1) == "F")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
       int eflag = 0x00;
-      if (reg.left_string (3) == "EEE")
+      if (reg.substr (0, 3) == "EEE")
        {
          eflag = 0x07;
-         reg = reg.right_string (reg.length () - 3);
+         reg = reg.substr (3);
        }
-      else if (reg.left_string (2) == "EE")
+      else if (reg.substr (0, 2) == "EE")
        {
          eflag = 0x05;
-         reg = reg.right_string (reg.length () - 2);
+         reg = reg.substr (2);
        }
-      else if (reg.left_string (2) == "Eh")
+      else if (reg.substr (0, 2) == "Eh")
        {
          eflag = 0x04;
-         reg = reg.right_string (reg.length () - 2);
+         reg = reg.substr (2);
        }
-      else if (reg.left_string (1) == "E")
+      else if (reg.substr (0, 1) == "E")
        {
          eflag = 0x02;
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
       if (eflag & 0x02)
        {
@@ -506,7 +522,7 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
          d.translate_axis (-0.8 * staff_space PT, X_AXIS);
          m.add_stencil (d);
        }
-      if (reg.left_string (2) == "SS")
+      if (reg.substr (0, 2) == "SS")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (0.5 * staff_space PT, Y_AXIS);
@@ -514,26 +530,26 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
          m.add_stencil (d);
          d.translate_axis (-0.8 * staff_space PT, X_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 2);
+         reg = reg.substr (2);
        }
-      if (reg.left_string (1) == "S")
+      if (reg.substr (0, 1) == "S")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (0.5 * staff_space PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
     }
   else if (sym == "Freebase")
     {
       Stencil r = fm->find_by_name ("accordion.accFreebase");
       m.add_stencil (r);
-      if (reg.left_string (1) == "F")
+      if (reg.substr (0, 1) == "F")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
       if (reg == "E")
        {
@@ -546,22 +562,22 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
     {
       Stencil r = fm->find_by_name ("accordion.accBayanbase");
       m.add_stencil (r);
-      if (reg.left_string (1) == "T")
+      if (reg.substr (0, 1) == "T")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
       /* include 4' reed just for completeness. You don't want to use this. */
-      if (reg.left_string (1) == "F")
+      if (reg.substr (0, 1) == "F")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
-      if (reg.left_string (2) == "EE")
+      if (reg.substr (0, 2) == "EE")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
@@ -569,55 +585,55 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
          m.add_stencil (d);
          d.translate_axis (-0.8 * staff_space PT, X_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 2);
+         reg = reg.substr (2);
        }
-      if (reg.left_string (1) == "E")
+      if (reg.substr (0, 1) == "E")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
     }
   else if (sym == "Stdbase")
     {
       Stencil r = fm->find_by_name ("accordion.accStdbase");
       m.add_stencil (r);
-      if (reg.left_string (1) == "T")
+      if (reg.substr (0, 1) == "T")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
-      if (reg.left_string (1) == "F")
+      if (reg.substr (0, 1) == "F")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
-      if (reg.left_string (1) == "M")
+      if (reg.substr (0, 1) == "M")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 2 PT, Y_AXIS);
          d.translate_axis (staff_space PT, X_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
-      if (reg.left_string (1) == "E")
+      if (reg.substr (0, 1) == "E")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
-      if (reg.left_string (1) == "S")
+      if (reg.substr (0, 1) == "S")
        {
          Stencil d = fm->find_by_name ("accordion.accDot");
          d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
          m.add_stencil (d);
-         reg = reg.right_string (reg.length () - 1);
+         reg = reg.substr (1);
        }
     }
   /* ugh maybe try to use regular font for S.B. and B.B and only use one font
@@ -649,7 +665,7 @@ Stencil
 Lookup::repeat_slash (Real w, Real s, Real t)
 {
 #if 0 /*  TODO */
-  Array<Offset> points;
+  vector<Offset> points;
   Real blotdiameter = 0.0;
 
   Offset p1 (0, 0);