From dc503a5bd6a105e72d1004221d8dd04937db874b Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:57:30 +0000
Subject: [PATCH] lilypond-0.1.14

---
 input/wtk1-fugue1.ly               | 13 ++++++-------
 lily/abbreviation-beam-engraver.cc |  5 ++++-
 lily/include/beam.hh               |  2 +-
 lily/rest-collision-grav.cc        |  1 -
 lily/rest-collision.cc             |  3 +--
 lily/stem-info.cc                  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/input/wtk1-fugue1.ly b/input/wtk1-fugue1.ly
index d1c21d8aeb..62a25c5338 100644
--- a/input/wtk1-fugue1.ly
+++ b/input/wtk1-fugue1.ly
@@ -11,7 +11,7 @@ copyright		Public Domain
 %{
 	
 %}
-\version "0.1.5";
+\version "0.1.6";
 
 
 global = 
@@ -47,12 +47,12 @@ tenor =
 	\stemboth
 	[c'. d'32 c'] [b8 e'] [a d'] ~ [d'16 e' d' c'] |
 	[b8 g' cis' d'] [e' cis' d' e' ] |
-	\stemdown a8 r8 r e [fis g] \stemboth[a. b32 a] |
+	\stemdown a8 r8 r e [fis g] \stemboth [a. b32 a] |
 %% 20
-	[g8 c' fis b] ~ [b16 c' b a] \stemdown [g fis e d] \stemboth|
+	[g8 c' fis b] ~ [b16 c' b a] \stemdown [g fis e d] \stemboth |
 	e4 \stemdown d ~ [d16 a g f!] [e g f! a] |
 	g4 ~ [g16 a bes8] c'4 [d'8 g] |
-	\stembothg4. f8 ~ [f e] d4 |
+	\stemboth g4. f8 ~ [f e] d4 |
 	\stemdown e8 a4 g8 ~ [g8 f g a] |
 %% 25
 	[bes8. c'32 b] [a8 d'] [g c'] ~ [c'16 d' c' bes] |
@@ -183,13 +183,12 @@ bass =
         
 \score {
     \melodic \type Grandstaff < 
-	       \multi 1;
-                 < \multi 2;
+  	         \multi 2 <
                        \global 
                        \soprane
                        \tenor
                  >
-                 < \multi 2;
+                 \multi 2 <
                        \global
                        \alt
 		       \bass
diff --git a/lily/abbreviation-beam-engraver.cc b/lily/abbreviation-beam-engraver.cc
index 89952d24fa..59c70b28b7 100644
--- a/lily/abbreviation-beam-engraver.cc
+++ b/lily/abbreviation-beam-engraver.cc
@@ -79,7 +79,6 @@ Abbreviation_beam_engraver::do_removal_processing ()
     }
 }
 
-
 void
 Abbreviation_beam_engraver::acknowledge_element (Score_elem_info i)
 {
@@ -94,5 +93,9 @@ Abbreviation_beam_engraver::acknowledge_element (Score_elem_info i)
     s->beams_left_i_ = s->flag_i_;
   else
     s->beams_right_i_ = s->flag_i_;
+
+  if (s->type_i () != 1) // no abbrev gaps on half note
+    s->beam_gap_i_ = s->flag_i_ - ((s->type_i () >? 2) - 2);
+  
   abeam_p_->add (s);
 } 
diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index c1b1b971b9..5d605937c1 100644
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -33,7 +33,7 @@ public:
   SCORE_ELEM_CLONE(Beam);
 
 protected:
-  Interval do_width() const;    
+  virtual Interval do_width() const;    
   Offset center() const;
   void set_default_dir();
   virtual void do_pre_processing();
diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 7a41c7ab45..4aa0607aca 100644
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -10,7 +10,6 @@
 #include "rest-collision.hh"
 #include "rest-collision-grav.hh"
 #include "collision.hh"
-#include "rest-column.hh"
 #include "note-column.hh"
 
 
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 54392d5585..6c50682722 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -8,7 +8,6 @@
 
 #include "debug.hh"
 #include "rest-collision.hh"
-#include "rest-column.hh"
 #include "note-column.hh"
 #include "stem.hh"
 #include "note-head.hh"
@@ -152,5 +151,5 @@ Rest_collision::do_substitute_dependency (Score_elem*o,Score_elem*n)
 Rest_collision::Rest_collision()
 {
   transparent_b_ = true;
-  empty_b_ = true;
+  set_empty (true);
 }
diff --git a/lily/stem-info.cc b/lily/stem-info.cc
index 5e446b665e..a3287ce55c 100644
--- a/lily/stem-info.cc
+++ b/lily/stem-info.cc
@@ -25,7 +25,7 @@ Stem_info::Stem_info (Stem const *s)
 {
   x = s->hpos_f();
   dir_ = s->dir_;
-  beams_i_ = intlog2(s->flag_i_) - 2;
+  beams_i_ =  0 >? (abs (s->flag_i_) - 2);
 
   /*
     [todo] 
-- 
2.39.5