From 693c0ccdd2fd4d660691258b63eea05fa3dc00c5 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 Mar 2005 20:43:28 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 1 - lily/beam.cc | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index db229c8f0e..41d04bf40d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,6 @@ * scm/paper.scm (layout-set-staff-size): increase blotdiameter to 0.4pt. ->>>>>>> 1.3297 2005-03-13 Jan Nieuwenhuizen * ly/titling-init.ly (bookTitleMarkup): Refinements. diff --git a/lily/beam.cc b/lily/beam.cc index 9eac207bb4..fc02627a2e 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -172,18 +172,18 @@ Beam::before_line_breaking (SCM smob) return SCM_EOL; } -/* - We want a maximal number of shared beams, but if there is choice, we - take the one that is closest to the end of the stem. This is for situations like - - x - | - | - |===| - |= - | - x -*/ +/* We want a maximal number of shared beams, but if there is choice, we + * take the one that is closest to the end of the stem. This is for + * situations like + * + * x + * | + * | + * |===| + * |= + * | + * x + */ int position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, Direction left_dir, -- 2.39.5