Index: lily/grob.cc |
diff --git a/lily/grob.cc b/lily/grob.cc |
index 268ac1146917be2092fb36473dbefb00ebf2bfcf..f7353e9d37b6e449f5db49860f305f9e0ba766f4 100644 |
--- a/lily/grob.cc |
+++ b/lily/grob.cc |
@@ -104,7 +104,7 @@ Grob::Grob (Grob const &s) |
mutable_property_alist_ = SCM_EOL; |
for (Axis a = X_AXIS; a < NO_AXES; incr (a)) |
- dim_cache_ [a] = s.dim_cache_ [a]; |
+ dim_cache_ [a] = s.dim_cache_ [a]; |
interfaces_ = s.interfaces_; |
object_alist_ = SCM_EOL; |
@@ -154,10 +154,10 @@ Grob::get_print_stencil () const |
{ |
Real line_thickness = layout ()->get_dimension (ly_symbol2scm ("line-thickness")); |
retval = *unsmob<Stencil> |
- (Lily::stencil_whiteout (retval.smobbed_copy (), |
- get_property ("whiteout-style"), |
- get_property ("whiteout"), |
- scm_from_double (line_thickness))); |
+ (Lily::stencil_whiteout (retval.smobbed_copy (), |
+ get_property ("whiteout-style"), |
+ get_property ("whiteout"), |
+ scm_from_double (line_thickness))); |
} |
if (transparent) |
@@ -467,14 +467,14 @@ Grob::extent (Grob const *refp, Axis a) const |
Order is significant: ?-extent may trigger suicide. |
*/ |
SCM ext = (a == X_AXIS) |
- ? get_property ("X-extent") |
- : get_property ("Y-extent"); |
+ ? get_property ("X-extent") |
+ : get_property ("Y-extent"); |
if (is_number_pair (ext)) |
real_ext.unite (ly_scm2interval (ext)); |
SCM min_ext = (a == X_AXIS) |
- ? get_property ("minimum-X-extent") |
- : get_property ("minimum-Y-extent"); |
+ ? get_property ("minimum-X-extent") |
+ : get_property ("minimum-Y-extent"); |
if (is_number_pair (min_ext)) |
real_ext.unite (ly_scm2interval (min_ext)); |
@@ -482,11 +482,11 @@ Grob::extent (Grob const *refp, Axis a) const |
} |
// We never want nan, so we avoid shifting infinite values. |
- if(!std::isinf (offset)) |
- real_ext.translate(offset); |
- else |
- warning(_f ("ignored infinite %s-offset", |
- a == X_AXIS ? "X" : "Y")); |
+ if (!std::isinf (offset)) |
+ real_ext.translate (offset); |
+ else |
+ warning (_f ("ignored infinite %s-offset", |
+ a == X_AXIS ? "X" : "Y")); |
return real_ext; |
} |
@@ -996,7 +996,7 @@ direct_less (Grob **a, Grob **b) |
// memory allocation of Grobs. |
void |
-uniquify (vector <Grob *> & grobs) |
+uniquify (vector <Grob *> &grobs) |
{ |
vector <Grob **> vec (grobs.size ()); |
for (vsize i = 0; i < grobs.size (); i++) |