* lily/book.cc (to_stencil): New method.

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index f1cab5ba1cc015f9aeb506678946dd9b6d81bd5c..5f0e04f3a8b7b20842b4c78d26ceb00562305599 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -55,6 +55,25 @@ 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;
+}
+
+SCM
+Stencil::expr () const
+{
+  return expr_;
+}
+
+Box
+Stencil::extent_box () const
+{
+  return dim_;
+}
 Offset
 Stencil::origin () const
 {
@@ -125,14 +144,14 @@ Stencil::align_to (Axis a, Real x)
 }
 
 /* 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 +162,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);
 
-  if (minimum > 0
-      && d *(- origin ()[a] + toadd.origin ()[a]) < minimum)
+  if (minimum > 0 && d * (-origin ()[a] + toadd.origin ()[a]) < minimum)
     toadd.translate_axis ( -toadd.origin ()[a]
-                          + origin ()[a] + d* minimum, a);
-    
+                          + origin ()[a] + d * minimum, a);
+
   return toadd;
 }
 
@@ -164,23 +182,3 @@ 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_;
-}