X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstencil.cc;h=59e88398f29b11f7449353aa5f1d317203b95610;hb=9f114c6402fb7cf9c9bf0ea97ee7c16291c48193;hp=5f0e04f3a8b7b20842b4c78d26ceb00562305599;hpb=da66c77772050eccbb972538c2cf9f6ec76018b4;p=lilypond.git

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 5f0e04f3a8..59e88398f2 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,17 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <math.h>
-#include <libc-extension.hh>	// isinf
-
-#include "font-metric.hh" 
-#include "dimensions.hh"
-#include "interval.hh"
-#include "string.hh"
 #include "stencil.hh"
+
+#include "main.hh"
+#include "font-metric.hh"
+#include "input.hh"
+#include "string-convert.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"
@@ -41,7 +39,7 @@ Stencil::print_smob (SCM, SCM port, scm_print_state *)
 SCM
 Stencil::mark_smob (SCM smob)
 {
-  Stencil *s = (Stencil*) ly_cdr (smob);
+  Stencil *s = (Stencil *) SCM_CELL_WORD_1 (smob);
   return s->expr_;
 }
 
@@ -55,12 +53,12 @@ Stencil::extent (Axis a) const
   return dim_[a];
 }
 
-/* Hmm... maybe this is not such a good idea ; stuff can be empty,
-   while expr_ == '()  */
 bool
 Stencil::is_empty () const
 {
-  return expr_ == SCM_EOL;
+  return (expr_ == SCM_EOL
+	  || dim_[X_AXIS].is_empty ()
+	  || dim_[Y_AXIS].is_empty ());
 }
 
 SCM
@@ -74,10 +72,52 @@ Stencil::extent_box () const
 {
   return dim_;
 }
-Offset
-Stencil::origin () const
+
+void
+Stencil::rotate (Real a, Offset off)
 {
-  return origin_;
+  rotate_degrees (a * 180/M_PI, off); 
+}
+
+/*
+  Rotate this stencil around the point RELATIVE_OFF.
+
+  RELATIVE_OFF is measured in terms of the extent of the stencil, so
+  -1 = LEFT/DOWN edge, 1 = RIGHT/UP edge.
+ */
+void
+Stencil::rotate_degrees (Real a, Offset relative_off)
+{
+  const Real x_cen = extent (X_AXIS).center ();
+  const Real y_cen = extent (Y_AXIS).center ();
+
+  /*
+   * Calculate the center of rotation
+   */
+  const Real x = x_cen + relative_off[X_AXIS] * x_cen;
+  const Real y = y_cen + relative_off[Y_AXIS] * y_cen;
+
+  /*
+   * Build scheme expression (processed in stencil-interpret.cc)
+   */
+  expr_ = scm_list_n (ly_symbol2scm ("rotate-stencil"),
+		      scm_list_2 (scm_from_double (a),
+		      scm_cons (scm_from_double (x), scm_from_double (y))),
+		      expr_, SCM_UNDEFINED);
+
+  /*
+   * Calculate the new bounding box
+   */
+  vector<Offset> pts;
+  pts.push_back (Offset (-x_cen, -y_cen));
+  pts.push_back (Offset (x_cen, -y_cen));
+  pts.push_back (Offset (x_cen, y_cen));
+  pts.push_back (Offset (-x_cen, y_cen));
+
+  const Offset rot = complex_exp (Offset (0, a * M_PI / 180.0));
+  dim_.set_empty ();
+  for (vsize i = 0; i < pts.size (); i++)
+    dim_.add_point (pts[i] * rot + Offset (x_cen, y_cen));
 }
 
 void
@@ -86,11 +126,18 @@ Stencil::translate (Offset o)
   Axis a = X_AXIS;
   while (a < NO_AXES)
     {
-      if (abs (o[a]) > 100 CM
-	  || isinf (o[a]) || isnan (o[a]))
+      if (isinf (o[a])
+	  || isnan (o[a])
+
+	  // ugh, hardcoded. 
+	  || fabs (o[a]) > 1e6)
 	{
-	  programming_error ("Improbable offset for translation: setting to zero");
-	  o[a] =  0.0;
+	  programming_error (String_convert::form_string ("Improbable offset for stencil: %f staff space", o[a])
+			     + "\n"
+			     + "Setting to zero.");
+	  o[a] = 0.0;
+	  if (strict_infinity_checking)
+	    scm_misc_error (__FUNCTION__, "Improbable offset.", SCM_EOL);
 	}
       incr (a);
     }
@@ -100,13 +147,12 @@ Stencil::translate (Offset o)
 		      expr_, SCM_UNDEFINED);
   if (!is_empty ())
     dim_.translate (o);
-  origin_ += o;
 }
-  
+
 void
 Stencil::translate_axis (Real x, Axis a)
 {
-  Offset o (0,0);
+  Offset o (0, 0);
   o[a] = x;
   translate (o);
 }
@@ -128,8 +174,8 @@ Stencil::set_empty (bool e)
     }
   else
     {
-      dim_[X_AXIS] = Interval (0,0);
-      dim_[Y_AXIS] = Interval (0,0);
+      dim_[X_AXIS] = Interval (0, 0);
+      dim_[Y_AXIS] = Interval (0, 0);
     }
 }
 
@@ -137,19 +183,15 @@ void
 Stencil::align_to (Axis a, Real x)
 {
   if (is_empty ())
-    return ;
+    return;
 
   Interval i (extent (a));
   translate_axis (-i.linear_combination (x), a);
 }
 
-/* FIXME: unintuitive naming, you would expect *this to be moved.
-   Kept (keeping?) API for compat with add_at_edge ().
-
-   What is PADDING, what is MINIMUM, exactly?  */
-Stencil
-Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
-			Real padding, Real minimum) const
+/*  See scheme Function.  */
+void
+Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding)
 {
   Interval my_extent = dim_[a];
   Interval i (s.extent (a));
@@ -166,19 +208,27 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
     + d * padding;
 
   Stencil toadd (s);
-  toadd.translate_axis (offset,a);
-
-  if (minimum > 0 && d * (-origin ()[a] + toadd.origin ()[a]) < minimum)
-    toadd.translate_axis ( -toadd.origin ()[a]
-			   + origin ()[a] + d * minimum, a);
+  toadd.translate_axis (offset, a);
+  add_stencil (toadd);
+}
 
-  return toadd;
+Stencil
+Stencil::in_color (Real r, Real g, Real b) const
+{
+  Stencil new_stencil (extent_box (),
+		       scm_list_3 (ly_symbol2scm ("color"),
+				   scm_list_3 (scm_from_double (r),
+					       scm_from_double (g),
+					       scm_from_double (b)),
+				   expr ()));
+  return new_stencil;
 }
 
-/*  See scheme Function.  */
-void
-Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding,
-		      Real minimum)
+/* convenience */
+Stencil
+Stencil::translated (Offset z) const
 {
-  add_stencil (moved_to_edge (a, d, s, padding, minimum));
+  Stencil s (*this);
+  s.translate (z);
+  return s;
 }