Imported Upstream version 2.16.0

[lilypond.git] / lily / grob-closure.cc

diff --git a/lily/grob-closure.cc b/lily/grob-closure.cc
index 124d1437932c034f7fa5e2ba1dd5195585dac6ad..4f6c0adc81f5219836e20c2bb92754f347a20eab 100644 (file)
--- a/lily/grob-closure.cc
+++ b/lily/grob-closure.cc
@@ -5,20 +5,18 @@ SCM
 axis_offset_symbol (Axis a)
 {
   return a == X_AXIS
-    ? ly_symbol2scm ("X-offset")
-    : ly_symbol2scm ("Y-offset");
+         ? ly_symbol2scm ("X-offset")
+         : ly_symbol2scm ("Y-offset");
 }
 
 SCM
 axis_parent_positioning (Axis a)
 {
   return (a == X_AXIS)
-    ? Grob::x_parent_positioning_proc
-    : Grob::y_parent_positioning_proc;
+         ? Grob::x_parent_positioning_proc
+         : Grob::y_parent_positioning_proc;
 }
 
-
-
 /*
   Replace
 
@@ -27,7 +25,6 @@ axis_parent_positioning (Axis a)
   by
 
   (+ (PROC GROB) (orig-proc GROB))
-  
 */
 void
 add_offset_callback (Grob *g, SCM proc, Axis a)
@@ -38,11 +35,11 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
       && !is_simple_closure (data))
     {
       g->set_property (axis_offset_symbol (a), proc);
-      return ;
+      return;
     }
 
   if (ly_is_procedure (data))
-    data = ly_make_simple_closure (scm_list_1  (data));
+    data = ly_make_simple_closure (scm_list_1 (data));
   else if (is_simple_closure (data))
     data = simple_closure_expression (data);
 
@@ -50,12 +47,11 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
 
   if (ly_is_procedure (proc))
     proc = ly_make_simple_closure (scm_list_1 (proc));
-  
+
   SCM expr = scm_list_3 (plus, proc, data);
   g->set_property (axis_offset_symbol (a), ly_make_simple_closure (expr));
 }
 
-
 /*
   replace
 
@@ -63,8 +59,7 @@ add_offset_callback (Grob *g, SCM proc, Axis a)
 
   by
 
-  (PROC GROB (orig-proc GROB)) 
-
+  (PROC GROB (orig-proc GROB))
 */
 void
 chain_callback (Grob *g, SCM proc, SCM sym)
@@ -72,7 +67,7 @@ chain_callback (Grob *g, SCM proc, SCM sym)
   SCM data = g->get_property_data (sym);
 
   if (ly_is_procedure (data))
-    data = ly_make_simple_closure (scm_list_1  (data));
+    data = ly_make_simple_closure (scm_list_1 (data));
   else if (is_simple_closure (data))
     data = simple_closure_expression (data);
   else
@@ -85,10 +80,10 @@ chain_callback (Grob *g, SCM proc, SCM sym)
 
   SCM expr = scm_list_2 (proc, data);
   g->set_property (sym,
-                  
-                  // twice: one as a wrapper for grob property routines,
-                  // once for the actual delayed binding. 
-                  ly_make_simple_closure (ly_make_simple_closure (expr)));
+
+                   // twice: one as a wrapper for grob property routines,
+                   // once for the actual delayed binding.
+                   ly_make_simple_closure (ly_make_simple_closure (expr)));
 }
 
 void