Re: beams

[Rune Zedeler]

Rune Zedeler wrote:

> is there a reason why stemLeftBeamCount and stemRightBeamCount cannot be 0...?

Well, easy to fix, at least...


-Rune

Generated by (address unknown),
>From = lilypond-1.5.38.chj1, To = lilypond-1.5.38.rz1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.38.rz1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.38.chj1/ChangeLog ./ChangeLog
--- ../lilypond-1.5.38.chj1/ChangeLog   Tue Mar 12 01:43:11 2002
+++ ./ChangeLog Tue Mar 12 01:40:48 2002
@@ -1,3 +1,8 @@
+2002-03-12 Rune Zedeler <address@hidden>
+       * lily/beam.cc lily/stem.cc lily/beam-engraver.cc allow for
+       stemLeftBeamCount and stemRightBeamCount to equal 0.
+       Fixes [c8 c4 c8]
+
 2002-03-07 Chris Jackson <address@hidden>
 
        * lily/piano-pedal-engraver.cc Rewritten to support bracketed as
diff -purN ../lilypond-1.5.38.chj1/VERSION ./VERSION
--- ../lilypond-1.5.38.chj1/VERSION     Tue Mar 12 01:43:11 2002
+++ ./VERSION   Tue Mar 12 01:37:08 2002
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=38
-MY_PATCH_LEVEL=chj1
+MY_PATCH_LEVEL=rz1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -purN ../lilypond-1.5.38.chj1/lily/beam-engraver.cc ./lily/beam-engraver.cc
--- ../lilypond-1.5.38.chj1/lily/beam-engraver.cc       Mon Feb  4 00:12:07 2002
+++ ./lily/beam-engraver.cc     Tue Mar 12 01:34:33 2002
@@ -258,7 +258,7 @@ Beam_engraver::acknowledge_grob (Grob_in
                                    gh_int2scm (durlog));
          Moment stem_location = now - beam_start_mom_ + beam_start_location_;
          beam_info_p_->add_stem (stem_location,
- (durlog- 2) >? 1);
+ (durlog- 2) >? 0);
          Beam::add_stem (beam_p_, stem_l);
        }
     }
diff -purN ../lilypond-1.5.38.chj1/lily/beam.cc ./lily/beam.cc
--- ../lilypond-1.5.38.chj1/lily/beam.cc        Mon Mar 11 01:49:51 2002
+++ ./lily/beam.cc      Tue Mar 12 01:29:21 2002
@@ -762,7 +762,7 @@ Beam::set_beaming (Grob*me,Beaming_info_
       do
        {
          /* Don't overwrite user override (?) */
-         if (Stem::beam_count (stems[i], d) == 0
+         if (Stem::beam_count (stems[i], d) == -1
              /* Don't set beaming for outside of outer stems */
              && ! (d == LEFT && i == 0)
              && ! (d == RIGHT && i == stems.size () -1))
diff -purN ../lilypond-1.5.38.chj1/lily/stem.cc ./lily/stem.cc
--- ../lilypond-1.5.38.chj1/lily/stem.cc        Mon Mar 11 01:49:52 2002
+++ ./lily/stem.cc      Tue Mar 12 01:30:42 2002
@@ -36,7 +36,7 @@ Stem::set_beaming (Grob*me ,int i,  Dire
   
   if (!gh_pair_p (pair))
     {
-      pair = gh_cons (gh_int2scm (0),gh_int2scm (0));
+      pair = gh_cons (gh_int2scm (-1),gh_int2scm (-1));
       me->      set_grob_property ("beaming", pair);
     }
   index_set_cell (pair, d, gh_int2scm (i));
@@ -49,7 +49,7 @@ Stem::beam_count (Grob*me,Direction d)
   if (gh_pair_p (p))
     return gh_scm2int (index_cell (p,d));
   else
-    return 0;
+    return -1;
 }
 
 Interval