Issue 4961/5: Change rotations to degrees rather than radians

[lilypond.git] / lily / grob.cc

diff --git a/lily/grob.cc b/lily/grob.cc
index 2f1bd8aa9f52c463c274fa28ab6fe2fc60227d03..eafa66288efdab93c9ab72bf49a3831c749c24b2 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -146,25 +146,15 @@ Grob::get_print_stencil () const
       /* whiteout background and larger file sizes with \pointAndClickOn. */
       /* A grob has to be visible, otherwise the whiteout property has no effect. */
       /* Calls the scheme procedure stencil-whiteout in scm/stencils.scm */
-      if (!transparent && (scm_is_number (get_property("whiteout"))
+      if (!transparent && (scm_is_number (get_property ("whiteout"))
                            || to_boolean (get_property ("whiteout"))))
         {
-          Real thickness = robust_scm2double (get_property("whiteout"), 3.0)
-               * layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+          Real line_thickness = layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
           retval = *unsmob<Stencil>
             (Lily::stencil_whiteout (retval.smobbed_copy (),
-                                     scm_from_double (thickness)));
-        }
-
-      /* Calls the scheme procedure stencil-whiteout-box in scm/stencils.scm */
-      if (!transparent && (scm_is_number (get_property("whiteout-box"))
-                           || to_boolean (get_property ("whiteout-box"))))
-        {
-          Real thickness = robust_scm2double (get_property("whiteout-box"), 0.0)
-               * layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
-          retval = *unsmob<Stencil>
-            (Lily::stencil_whiteout_box (retval.smobbed_copy (),
-                                     scm_from_double (thickness)));
+                                     get_property ("whiteout-style"),
+                                     get_property ("whiteout"),
+                                     scm_from_double (line_thickness)));
         }
 
       if (transparent)
@@ -343,7 +333,7 @@ Real
 Grob::relative_coordinate (Grob const *refp, Axis a) const
 {
   /* eaa - hmmm, should we do a programming_error() here? */
-  if ((this == NULL) || (refp == this))
+  if (refp == this)
     return 0.0;
 
   /* We catch PARENT_L_ == nil case with this, but we crash if we did
@@ -352,7 +342,8 @@ Grob::relative_coordinate (Grob const *refp, Axis a) const
   if (refp == dim_cache_[a].parent_)
     return off;
 
-  off += dim_cache_[a].parent_->relative_coordinate (refp, a);
+  if (dim_cache_[a].parent_ != NULL)
+    off += dim_cache_[a].parent_->relative_coordinate (refp, a);
 
   return off;
 }
@@ -843,7 +834,7 @@ ADD_INTERFACE (Grob,
                "transparent "
                "vertical-skylines "
                "whiteout "
-               "whiteout-box "
+               "whiteout-style "
               );
 
 /****************************************************************