X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=329c5cae61d2d85b87a41273ae9564bc6b486749;hb=3465d3e1c1d2b87f7a1adc5c7c1dfe868c754e57;hp=f1cab5ba1cc015f9aeb506678946dd9b6d81bd5c;hpb=e87d9c881c1ac0dc5d243c7a0f62cb41a02bb3b8;p=lilypond.git

diff --git a/lily/stencil.cc b/lily/stencil.cc
index f1cab5ba1c..329c5cae61 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--2006 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,23 +53,87 @@ Stencil::extent (Axis a) const
   return dim_[a];
 }
 
+bool
+Stencil::is_empty () const
+{
+  return (expr_ == SCM_EOL
+	  || dim_[X_AXIS].is_empty ()
+	  || dim_[Y_AXIS].is_empty ());
+}
+
+SCM
+Stencil::expr () const
+{
+  return expr_;
+}
+
+Box
+Stencil::extent_box () const
+{
+  return dim_;
+}
 Offset
 Stencil::origin () const
 {
   return origin_;
 }
 
+/*
+ * Rotate this stencil around the point [x, y]
+ */
+void
+Stencil::rotate (Real a, Offset 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 + off[X_AXIS] * x_cen;
+  const Real y = y_cen + 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
 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);
     }
@@ -83,11 +145,11 @@ Stencil::translate (Offset o)
     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);
 }
@@ -109,8 +171,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);
     }
 }
 
@@ -118,21 +180,21 @@ 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 ().  */
+   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
+Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
+			Real padding, Real minimum) const
 {
-  Interval my_extent=  dim_[a];
-
-
+  Interval my_extent = dim_[a];
   Interval i (s.extent (a));
   Real his_extent;
   if (i.is_empty ())
@@ -143,17 +205,16 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, Real padding,
   else
     his_extent = i[-d];
 
-  Real offset = (my_extent.  is_empty () ? 0.0 : my_extent[d] - his_extent)
+  Real offset = (my_extent.is_empty () ? 0.0 : my_extent[d] - his_extent)
     + d * padding;
 
   Stencil toadd (s);
-  toadd.translate_axis (offset,a);
+  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);
 
-  if (minimum > 0
-      && d *(- origin ()[a] + toadd.origin ()[a]) < minimum)
-    toadd.translate_axis ( -toadd.origin ()[a]
-			   + origin ()[a] + d* minimum, a);
-    
   return toadd;
 }
 
@@ -165,22 +226,14 @@ Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding,
   add_stencil (moved_to_edge (a, d, s, padding, minimum));
 }
 
-/* Hmm... maybe this is not such a good idea ; stuff can be empty,
-   while expr_ == '()  */
-bool
-Stencil::is_empty () const
-{
-  return expr_ == SCM_EOL;
-}
-
-SCM
-Stencil::get_expr () const
-{
-  return expr_;
-}
-
-Box
-Stencil::extent_box () const
-{
-  return dim_;
+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;
 }