X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=b550eb4f7fdcd01774557286fc2e7933b2302e9a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=714d403638ae5d4bb8a8cfaaf32481bb9506f16b;hpb=9362fc6e2a7604cbe2dd977009e687137b5ef05a;p=lilypond.git

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 714d403638..b550eb4f7f 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,17 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
 
-#include <math.h>
-
-#include "dimensions.hh"
+#include "main.hh"
 #include "font-metric.hh"
-#include "input-smob.hh"
-#include "libc-extension.hh"	// isinf
+#include "input.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 
@@ -56,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
@@ -75,10 +72,72 @@ Stencil::extent_box () const
 {
   return dim_;
 }
-Offset
-Stencil::origin () const
+
+void
+Stencil::rotate (Real a, Offset off)
+{
+  rotate_degrees (a * 180/M_PI, off); 
+}
+
+/*
+  Rotate this stencil around the point ABSOLUTE_OFF.
+
+ */
+void
+Stencil::rotate_degrees_absolute (Real a, Offset absolute_off)
+{
+  const Real x = absolute_off[X_AXIS];
+  const Real y = absolute_off[Y_AXIS];
+
+  /*
+   * Build scheme expression (processed in stencil-interpret.cc)
+   */
+  /* TODO: by hanwenn 2008/09/10 14:38:56:
+   * in effect, this copies the underlying expression.  It might be a
+   * little bit nicer to mirror this in the api, ie. make a
+   *         Stencil::rotated()
+   * and have Stencil::rotate be an abbrev of
+   *         *this = rotated()
+   */
+
+  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
+   */
+  Box shifted_box = extent_box ();
+  shifted_box.translate (-absolute_off);
+
+  vector<Offset> pts;
+  pts.push_back (Offset (shifted_box.x ().at(LEFT), shifted_box.y ().at(DOWN)));
+  pts.push_back (Offset (shifted_box.x ().at(RIGHT), shifted_box.y ().at(DOWN)));
+  pts.push_back (Offset (shifted_box.x ().at(RIGHT), shifted_box.y ().at(UP)));
+  pts.push_back (Offset (shifted_box.x ().at(LEFT), shifted_box.y ().at(UP)));
+
+  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 + absolute_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)
 {
-  return origin_;
+  /*
+   * Calculate the center of rotation
+   */
+  const Real x = extent (X_AXIS).linear_combination (relative_off[X_AXIS]);
+  const Real y = extent (Y_AXIS).linear_combination (relative_off[Y_AXIS]);
+  rotate_degrees_absolute (a, Offset (x, y));
 }
 
 void
@@ -91,12 +150,14 @@ Stencil::translate (Offset o)
 	  || isnan (o[a])
 
 	  // ugh, hardcoded. 
-	  || fabs (o[a]) > 1e6)	
+	  || fabs (o[a]) > 1e6)
 	{
 	  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);
     }
@@ -106,7 +167,6 @@ Stencil::translate (Offset o)
 		      expr_, SCM_UNDEFINED);
   if (!is_empty ())
     dim_.translate (o);
-  origin_ += o;
 }
 
 void
@@ -149,22 +209,17 @@ Stencil::align_to (Axis a, Real x)
   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));
   Real his_extent;
   if (i.is_empty ())
     {
-      programming_error ("Stencil::moved_to_edge: adding empty stencil.");
+      programming_error ("Stencil::add_at_edge: adding empty stencil.");
       his_extent = 0.0;
-      //      SCM_ASSERT_TYPE (0, s.expr (), SCM_ARG1, __FUNCTION__, "non-empty stencil");
     }
   else
     his_extent = i[-d];
@@ -174,24 +229,9 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s,
 
   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);
-
-  return toadd;
+  add_stencil (toadd);
 }
 
-/*  See scheme Function.  */
-void
-Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding,
-		      Real minimum)
-{
-  add_stencil (moved_to_edge (a, d, s, padding, minimum));
-}
-
-
-
 Stencil
 Stencil::in_color (Real r, Real g, Real b) const
 {
@@ -203,3 +243,12 @@ Stencil::in_color (Real r, Real g, Real b) const
 				   expr ()));
   return new_stencil;
 }
+
+/* convenience */
+Stencil
+Stencil::translated (Offset z) const
+{
+  Stencil s (*this);
+  s.translate (z);
+  return s;
+}