From 5bd7d58675cc7c92e840282b9b13c0b17bba33bf Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 00:34:29 +0000
Subject: [PATCH] lilypond-1.3.116

---
 input/test/auto-beam-bar.ly     | 20 ++++++++++++++++++++
 input/test/beam-rest.ly         | 17 +++++++++++++++++
 input/test/follow-thread.ly     |  6 ++++++
 input/test/glissando.ly         | 19 +++++++++++--------
 lily/auto-beam-engraver.cc      |  5 ++---
 lily/note-head-line-engraver.cc |  5 ++++-
 6 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 input/test/auto-beam-bar.ly
 create mode 100644 input/test/beam-rest.ly

diff --git a/input/test/auto-beam-bar.ly b/input/test/auto-beam-bar.ly
new file mode 100644
index 0000000000..645c62de7c
--- /dev/null
+++ b/input/test/auto-beam-bar.ly
@@ -0,0 +1,20 @@
+\header{
+texidoc="
+The first two a8 notes should not be beamed.
+Also, no automatic beaming accross bar lines.
+";
+}
+
+\score{
+\notes \notes\relative c'' {
+\time 2/8;
+a8 a
+\time 6/8;
+a16 cis d a bes g fis4 g8
+%a4. fis4 g8
+a16 g a bes c d % ees8 d c
+}
+\paper{
+   linewidth=-1.;
+}
+}
\ No newline at end of file
diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly
new file mode 100644
index 0000000000..bf8d2788f6
--- /dev/null
+++ b/input/test/beam-rest.ly
@@ -0,0 +1,17 @@
+\header{
+texidoc="
+Beams over rests.
+";
+}
+
+\score{
+        \context Staff=one \notes\relative c''{
+	  r4 [r8 g a]
+	  [bes8 r16 f g a]
+	  [bes8 r16 \property Voice.stemLeftBeamCount = #1 f g a]
+
+    }
+    \paper{
+        linewidth =-1;
+    }
+}
diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly
index d22f1fcf9b..e58e1c91f8 100644
--- a/input/test/follow-thread.ly
+++ b/input/test/follow-thread.ly
@@ -1,3 +1,9 @@
+\header{
+texidoc="
+Theads can be traced automagically when they switch staffs by setting
+property @code{followThread}.
+";
+}
 % followThread: connect note heads with line when thread switches staff 
 
 \score{
diff --git a/input/test/glissando.ly b/input/test/glissando.ly
index 951557e530..74d43fba58 100644
--- a/input/test/glissando.ly
+++ b/input/test/glissando.ly
@@ -1,19 +1,22 @@
 \header{
 texidoc="
-Simple glissando lines between notes are supported.
+Simple glissando lines between notes are supported.  The first two glissandi are not consecutive.
 ";
 }
 
 \score{
-    <
         \context Staff=one \notes\relative c''{
-            a \glissando e' \glissando a, \glissando
-	    \translator Staff=two
-	    a,,
-	}
-	\context Staff=two { \clef bass; \skip 1; }
-    >
+	     % gliss non gliss and 
+	     c \glissando d e \glissando f\break
+	     % consecutive 
+	     c \glissando d \glissando e f
+    }
     \paper{
         linewidth = 70.\mm;
+	\translator{
+	       \StaffContext
+	       % makes for handier debugging
+	       % \remove Clef_engraver;
+	}
     }
 }
\ No newline at end of file
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index d5af0fcf66..07ff86dceb 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -56,7 +56,7 @@ private:
   Link_array<Item>* stem_l_arr_p_;
 
 
-  bool count_i_;
+  int count_i_;
   Moment last_add_mom_;
 
   /*
@@ -193,7 +193,7 @@ Auto_beam_engraver::consider_begin (Moment test_mom)
 void
 Auto_beam_engraver::consider_end (Moment test_mom)
 {
-  if (stem_l_arr_p_ && stem_l_arr_p_->size () > 1)
+  if (stem_l_arr_p_)
     {
       /* Allow already started autobeam to end:
 	 don't check for noAutoBeaming */
@@ -396,7 +396,6 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
 
 	but the code didn't match: */
 #if 1
-      
       consider_end (dur);
       consider_begin (dur);
 
diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index 9ca614859b..b2717201cf 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -128,10 +128,13 @@ Note_head_line_engraver::create_grobs ()
 	  
 	  announce_grob (line_, last_req_);
 	}
+
+      last_head_ = 0;
+      if (!follow_ && !req_)
+	head_ = 0;
       
       last_req_ = 0;
       follow_ = false;
-      last_head_ = 0;
     }
 }
 
-- 
2.39.5