X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=aec43fe8fb9eb41c7a763a7a6ab1b0674e928c5a;hb=e94c4a66c9d565749d8a121fc0267ddeb423ca13;hp=dfda5f73e4eab63d06a4bd454a953549a3690662;hpb=2a5bf602e34fadfeb14b0d7be3b83fa587be3fbb;p=lilypond.git

diff --git a/lily/lookup.cc b/lily/lookup.cc
index dfda5f73e4..aec43fe8fb 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -1,11 +1,22 @@
 /*
-  lookup.cc -- implement simple Lookup methods.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "lookup.hh"
@@ -18,11 +29,9 @@ using namespace std;
 #include "warn.hh"
 #include "dimensions.hh"
 #include "bezier.hh"
-#include "string-convert.hh"
 #include "file-path.hh"
 #include "main.hh"
 #include "lily-guile.hh"
-#include "font-metric.hh"
 
 Stencil
 Lookup::dot (Offset p, Real radius)
@@ -88,28 +97,6 @@ Lookup::beam (Real slope, Real width, Real thick, Real blot)
   return Stencil (b, expr);
 }
 
-Stencil
-Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction)
-{
-  SCM l = SCM_EOL;
-
-  Real on = dash_fraction * dash_period;
-  Real off = dash_period - on;
-
-  for (int i = 4; i--;)
-    l = scm_cons (ly_offset2scm (b.control_[i]), l);
-
-  SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
-			scm_from_double (thick),
-			scm_from_double (on),
-			scm_from_double (off),
-			ly_quote_scm (l),
-			SCM_UNDEFINED));
-
-  Box box (b.extent (X_AXIS), b.extent (Y_AXIS));
-  return Stencil (box, at);
-}
-
 Stencil
 Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
 {
@@ -367,47 +354,75 @@ Lookup::frame (Box b, Real thick, Real blot)
   Make a smooth curve along the points
 */
 Stencil
-Lookup::slur (Bezier curve, Real curvethick, Real linethick)
+Lookup::slur (Bezier curve, Real curvethick, Real linethick,
+              SCM dash_details)
 {
+  Stencil return_value;
+
+  /* 
+      calculate the offset for the two beziers that make the sandwich
+      for the slur
+  */
   Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
   Bezier back = curve;
   Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI / 2)) * 0.5;
-  back.reverse ();
   back.control_[1] += perp;
   back.control_[2] += perp;
 
   curve.control_[1] -= perp;
   curve.control_[2] -= perp;
-
-  SCM scontrols[8];
-
-  for (int i = 0; i < 4; i++)
-    scontrols[i] = ly_offset2scm (back.control_[i]);
-  for (int i = 0; i < 4; i++)
-    scontrols[i + 4] = ly_offset2scm (curve.control_[i]);
-
-  /*
-    Need the weird order b.o. the way PS want its arguments
-  */
-  int indices[] = {5, 6, 7, 4, 1, 2, 3, 0};
-  SCM list = SCM_EOL;
-  for (int i = 8; i--;)
-    list = scm_cons (scontrols[indices[i]], list);
-
-  SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
-			ly_quote_scm (list),
-			scm_from_double (linethick),
-			SCM_UNDEFINED));
-  Box b (curve.extent (X_AXIS),
-	 curve.extent (Y_AXIS));
-
-  b[X_AXIS].unite (back.extent (X_AXIS));
-  b[Y_AXIS].unite (back.extent (Y_AXIS));
-
-  b.widen (0.5 * linethick, 0.5 * linethick);
-  return Stencil (b, at);
+ 
+  if (!scm_is_pair (dash_details))
+    { 
+      /* solid slur  */
+      return_value = bezier_sandwich (back, curve, linethick);
+    }
+  else
+    { 
+      /* dashed or combination slur */
+      int num_segments = scm_to_int (scm_length (dash_details));
+      for (int i=0; i<num_segments; i++)
+        {
+          SCM dash_pattern = scm_list_ref (dash_details, scm_from_int (i));
+          Real t_min = robust_scm2double (scm_car (dash_pattern), 0);
+          Real t_max = robust_scm2double (scm_cadr (dash_pattern), 1.0);
+          Real dash_fraction = 
+            robust_scm2double (scm_caddr (dash_pattern), 1.0);
+          Real dash_period = 
+            robust_scm2double (scm_cadddr (dash_pattern), 0.75);
+          Bezier back_segment = back.extract (t_min, t_max);
+          Bezier curve_segment = curve.extract (t_min, t_max);
+          if (dash_fraction == 1.0) 
+              return_value.add_stencil (bezier_sandwich (back_segment,
+                                                         curve_segment,
+                                                         linethick));
+          else
+            {
+              Bezier back_dash, curve_dash;
+              Real seg_length = (back_segment.control_[3] - 
+                                 back_segment.control_[0]).length ();
+              int pattern_count = (int) (seg_length / dash_period);
+              Real pattern_length = 1.0 / (pattern_count + dash_fraction);
+              Real start_t, end_t;
+              for (int p = 0; p <= pattern_count; p++)
+                {
+                  start_t = p * pattern_length;
+                  end_t = (p + dash_fraction) * pattern_length;
+                  back_dash = 
+                    back_segment.extract (start_t, end_t);
+                  curve_dash =
+                    curve_segment.extract (start_t, end_t);
+                  return_value.add_stencil (bezier_sandwich (back_dash,
+                                                             curve_dash,
+                                                             linethick));
+                }
+            }
+        }
+    }
+  return return_value;
 }
 
+
 /*
  * Bezier Sandwich:
  *
@@ -432,7 +447,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick)
  *
  */
 Stencil
-Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
+Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
 {
   /*
     Need the weird order b.o. the way PS want its arguments
@@ -449,7 +464,7 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
 
   SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"),
 				    ly_quote_scm (list),
-				    scm_from_double (0.0),
+				    scm_from_double (thickness),
 				    SCM_UNDEFINED);
 
   Interval x_extent = top_curve.extent (X_AXIS);
@@ -458,210 +473,10 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
   y_extent.unite (bottom_curve.extent (Y_AXIS));
   Box b (x_extent, y_extent);
 
+  b.widen (0.5 * thickness, 0.5 * thickness);
   return Stencil (b, horizontal_bend);
 }
 
-/*
-  TODO: junk me.
-*/
-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)));
-
-  if (sym == "Discant")
-    {
-      Stencil r = fm->find_by_name ("accordion.accDiscant");
-      m.add_stencil (r);
-      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.substr (1);
-	}
-      int eflag = 0x00;
-      if (reg.substr (0, 3) == "EEE")
-	{
-	  eflag = 0x07;
-	  reg = reg.substr (3);
-	}
-      else if (reg.substr (0, 2) == "EE")
-	{
-	  eflag = 0x05;
-	  reg = reg.substr (2);
-	}
-      else if (reg.substr (0, 2) == "Eh")
-	{
-	  eflag = 0x04;
-	  reg = reg.substr (2);
-	}
-      else if (reg.substr (0, 1) == "E")
-	{
-	  eflag = 0x02;
-	  reg = reg.substr (1);
-	}
-      if (eflag & 0x02)
-	{
-	  Stencil d = fm->find_by_name ("accordion.accDot");
-	  d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-	  m.add_stencil (d);
-	}
-      if (eflag & 0x04)
-	{
-	  Stencil d = fm->find_by_name ("accordion.accDot");
-	  d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-	  d.translate_axis (0.8 * staff_space PT, X_AXIS);
-	  m.add_stencil (d);
-	}
-      if (eflag & 0x01)
-	{
-	  Stencil d = fm->find_by_name ("accordion.accDot");
-	  d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-	  d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-	  m.add_stencil (d);
-	}
-      if (reg.substr (0, 2) == "SS")
-	{
-	  Stencil d = fm->find_by_name ("accordion.accDot");
-	  d.translate_axis (0.5 * staff_space PT, Y_AXIS);
-	  d.translate_axis (0.4 * staff_space PT, X_AXIS);
-	  m.add_stencil (d);
-	  d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-	  m.add_stencil (d);
-	  reg = reg.substr (2);
-	}
-      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.substr (1);
-	}
-    }
-  else if (sym == "Freebase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accFreebase");
-      m.add_stencil (r);
-      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.substr (1);
-	}
-      if (reg == "E")
-	{
-	  Stencil d = fm->find_by_name ("accordion.accDot");
-	  d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-	  m.add_stencil (d);
-	}
-    }
-  else if (sym == "Bayanbase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accBayanbase");
-      m.add_stencil (r);
-      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.substr (1);
-	}
-      /* include 4' reed just for completeness. You don't want to use this. */
-      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.substr (1);
-	}
-      if (reg.substr (0, 2) == "EE")
-	{
-	  Stencil d = fm->find_by_name ("accordion.accDot");
-	  d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-	  d.translate_axis (0.4 * staff_space PT, X_AXIS);
-	  m.add_stencil (d);
-	  d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-	  m.add_stencil (d);
-	  reg = reg.substr (2);
-	}
-      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.substr (1);
-	}
-    }
-  else if (sym == "Stdbase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accStdbase");
-      m.add_stencil (r);
-      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.substr (1);
-	}
-      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.substr (1);
-	}
-      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.substr (1);
-	}
-      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.substr (1);
-	}
-      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.substr (1);
-	}
-    }
-  /* ugh maybe try to use regular font for S.B. and B.B and only use one font
-     for the rectangle */
-  else if (sym == "SB")
-    {
-      Stencil r = fm->find_by_name ("accordion.accSB");
-      m.add_stencil (r);
-    }
-  else if (sym == "BB")
-    {
-      Stencil r = fm->find_by_name ("accordion.accBB");
-      m.add_stencil (r);
-    }
-  else if (sym == "OldEE")
-    {
-      Stencil r = fm->find_by_name ("accordion.accOldEE");
-      m.add_stencil (r);
-    }
-  else if (sym == "OldEES")
-    {
-      Stencil r = fm->find_by_name ("accordion.accOldEES");
-      m.add_stencil (r);
-    }
-  return m;
-}
-
 Stencil
 Lookup::repeat_slash (Real w, Real s, Real t)
 {
@@ -688,7 +503,7 @@ Lookup::repeat_slash (Real w, Real s, Real t)
 }
 
 Stencil
-Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
 {
   Box b;
   Axis other = Axis ((a + 1)%2);
@@ -698,8 +513,8 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
   Stencil m = round_filled_box (b, blot);
 
   b[a] = Interval (iv[UP] - thick, iv[UP]);
-  Interval oi = Interval (-thick / 2, thick / 2 + fabs (protude));
-  oi *= sign (protude);
+  Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude));
+  oi *= sign (protrude);
   b[other] = oi;
   m.add_stencil (round_filled_box (b, blot));
   b[a] = Interval (iv[DOWN], iv[DOWN] + thick);
@@ -709,16 +524,17 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
 }
 
 Stencil
-Lookup::triangle (Interval iv, Real thick, Real protude)
+Lookup::triangle (Interval iv, Real thick, Real protrude)
 {
   Box b;
   b[X_AXIS] = Interval (0, iv.length ());
-  b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude));
+  b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
 
   vector<Offset> points;
   points.push_back (Offset (iv[LEFT], 0));
   points.push_back (Offset (iv[RIGHT], 0));
-  points.push_back (Offset (iv.center (), protude));
+  points.push_back (Offset (iv.center (), protrude));
+  points.push_back (Offset (iv[LEFT], 0));  // close triangle
 
   return points_to_line_stencil (thick, points);