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

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 0da8031c4b..b550eb4f7f 100644
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
@@ -72,30 +72,34 @@ 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 [x, y]
+  Rotate this stencil around the point ABSOLUTE_OFF.
+
  */
 void
-Stencil::rotate (Real a, Offset off)
+Stencil::rotate_degrees_absolute (Real a, Offset absolute_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;
+  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))),
@@ -104,16 +108,36 @@ Stencil::rotate (Real a, Offset off)
   /*
    * Calculate the new bounding box
    */
+  Box shifted_box = extent_box ();
+  shifted_box.translate (-absolute_off);
+
   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));
+  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 + Offset (x_cen, y_cen));
+    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)
+{
+  /*
+   * 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
@@ -143,7 +167,6 @@ Stencil::translate (Offset o)
 		      expr_, SCM_UNDEFINED);
   if (!is_empty ())
     dim_.translate (o);
-  origin_ += o;
 }
 
 void
@@ -186,20 +209,16 @@ 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;
     }
   else
@@ -210,20 +229,7 @@ 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;
-}
-
-/*  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));
+  add_stencil (toadd);
 }
 
 Stencil