From f54d0fca09ebce10a7a37fa5473deff946dc9c94 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 5 Dec 2005 13:07:32 +0000 Subject: [PATCH] (NonDentedHeadingFormatter.format_headi): option formatting, lilypond style. --- lily/beam.cc | 6 +++--- scm/define-grobs.scm | 2 +- scripts/musicxml2ly.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lily/beam.cc b/lily/beam.cc index 806130862c..8a98a3e965 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1287,9 +1287,9 @@ Beam::rest_collision_callback (SCM smob, SCM prev_offset) Drul_array 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 4ebab5b02f..f4ac31d258 100644 --- 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 2be5653651..31bab22dee 100644 --- 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): -- 2.39.5