From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 2 Aug 2002 21:49:36 +0000 (+0000)
Subject: * lily/beam.cc (connect_beams): fix quarter note beams.
X-Git-Tag: release/1.5.72~46
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c7be809157c769a2f12ea2716b38ca50280a6dd3;p=lilypond.git

* lily/beam.cc (connect_beams): fix quarter note beams.

* input/regression/beam-quarter.ly: new file.
---

diff --git a/ChangeLog b/ChangeLog
index c91a073340..7cd2ccfb0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-02  Han-Wen  <hanwen@cs.uu.nl>
+
+	* lily/beam.cc (connect_beams): fix quarter note beams.
+
+	* input/regression/beam-quarter.ly: new file.
+
 2002-08-02  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
 
 	* buildscripts/mf-to-table.py (postfixes): Reduce the line spacing
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index d28775ac5b..a8dc14a6a1 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1563,8 +1563,13 @@ the bottom of the last page.  This signature is produced from the
 the layout of different versions can be compared using archived
 print-outs (that include a version number).
 
-Many people find the default tagline too droll.  If that is the case,
-assign something else to @code{tagline}, as shown above.
+@cindex Lily was here
+@cindex signature line
+@cindex tag line
+
+Many people find the default tagline (``Lily was here'') too droll.
+If that is the case, assign something else to @code{tagline}, as shown
+above.
 
 @separate
 @example
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
new file mode 100644
index 0000000000..1608e62cfb
--- /dev/null
+++ b/input/regression/beam-quarter.ly
@@ -0,0 +1,10 @@
+\header
+{
+    texidoc= "Quarter notes may be beamed: the beam is halted momentarily."
+}
+
+\score {\notes \relative c'' {
+	[c8 c4 c8] % should warn here!
+}
+\paper { linewidth = -1.0 } 
+}
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index e96715d8f2..0fd15d381c 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -19,7 +19,8 @@ hidden just as with breakable bar lines.
 	[c32 c32]
 	[c64 c64]	
 	c32
-	[c8 c,4 c'8] % should warn here!
+	c2
+
 	[c8 c c] c8 % over barline
 	[c16 c8 c16]
 	[c32 c16 c16 c16 c32]
diff --git a/lily/beam.cc b/lily/beam.cc
index 9bd6288cb5..695a704750 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -274,15 +274,18 @@ Beam::connect_beams (Grob *me)
 	      gh_set_car_x (s, gh_int2scm (np));
 	      last_int.add_point (np);
 	    }
-	  
 	}
 
       if (i == stems.size () -1)
 	{
-	  gh_set_cdr_x ( this_beaming, SCM_EOL);
+	  gh_set_cdr_x (this_beaming, SCM_EOL);
+	}
+
+      if (scm_ilength (gh_cdr (this_beaming)) > 0)
+	{
+	  last_beaming = this_beaming;
+	  last_dir = this_dir;
 	}
-      last_beaming = this_beaming;
-      last_dir = this_dir;
     }
  }