(NonDentedHeadingFormatter.format_headi):

option formatting, lilypond style.

diff --git a/lily/beam.cc b/lily/beam.cc
index 806130862c0f411f3ff39044046cdf04ed44beb9..8a98a3e96535d662df112e3e6aca7c0645dd7dc2 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1287,9 +1287,9 @@ Beam::rest_collision_callback (SCM smob, SCM prev_offset)
 
   Drul_array<Grob*> visible_stems (first_visible_stem (beam),
                                   last_visible_stem (beam));
-                                   
-  Grob *common = visible_stems[RIGHT]
-    ->common_refpoint (visible_stems[LEFT], X_AXIS);
+  extract_grob_set (beam, "stems", stems);
+  
+  Grob *common = common_refpoint_of_array (stems, beam, X_AXIS);
   
   Real x0 = visible_stems[LEFT]->relative_coordinate (common, X_AXIS);
   Real dx = visible_stems[RIGHT]->relative_coordinate (common, X_AXIS) - x0;

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4ebab5b02f162f953d35827cf63a7c50e6a19912..f4ac31d2586c7df85b431e7680019cf523b1775c 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -880,7 +880,7 @@
        (length . 0.66)
        (minimum-length . 0.3)
        (padding . 0.07)
-                                       ;       (springs-and-rods . ,Hyphen_spanner::set_spacing_rods)
+       ;;      (springs-and-rods . ,Hyphen_spanner::set_spacing_rods)
 
        (stencil . ,Hyphen_spanner::print)
 

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 2be5653651b9192714cd16e69f312d7658a2c0e2..31bab22dee7b2ca640c293cc9d9e50567a7d1786 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -256,7 +256,7 @@ def musicxml_pitch_to_lily (mxl_pitch):
        p = musicexp.Pitch()
        p.alteration = mxl_pitch.get_alteration ()
        p.step = (ord (mxl_pitch.get_step ()) - ord ('A') + 7 - 2) % 7
-       p.octave = mxl_pitch.get_octave () -4
+       p.octave = mxl_pitch.get_octave () - 4
        return p
 
 def get_all_voices (parts):