From 4c624f467a6aecf1f5a46bf272b48ec1cee15d3f Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 14 Jul 2002 13:36:41 +0000
Subject: [PATCH] brey fixes

---
 Documentation/user/refman.itely  | 2 ++
 lily/bar-number-engraver.cc      | 2 +-
 lily/instrument-name-engraver.cc | 2 +-
 lily/paper-column.cc             | 3 ++-
 lily/volta-engraver.cc           | 4 +++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 9e1c2a724b..b8bdf8e26f 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4008,6 +4008,8 @@ syntax and semantics are slated for a rewrite.
 @node Spacing
 @subsection Spacing
 
+S
+
 TODO: Move this section.
 
 @refbugs
diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index bd04befbbc..ae63850005 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -18,7 +18,7 @@
 
 /*
   
-TODO: detect the top staff (staffsFound), and acknowledge staff-group
+TODO: detect the top staff (stavesFound), and acknowledge staff-group
 system-start-delims. If we find these, and the top staff is in the
 staff-group, add padding to the bar number.
 
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 4bb036166b..650ebecc8e 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -102,7 +102,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
     therefore the location of its refpoint won't be very useful.
     
 
-    We could also just use staffsFound, but lets keep this working
+    We could also just use stavesFound, but lets keep this working
     without staffs as well.
 
   */
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index ad2db208f7..c3260848da 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -162,7 +162,8 @@ Paper_column::before_line_breaking (SCM grob)
 	  ptrptr = SCM_CDRLOC (c);
 	}
       
-      c = gh_cdr (c);
+      if (gh_pair_p(c))
+	c = gh_cdr (c);
     }
 
   me->set_grob_property ("bounded-by-me", c);
diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index acf55f371e..cd5dfeafe9 100644
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -67,7 +67,9 @@ Volta_engraver::process_music ()
 	volta engraver in score context or somesuch.
 	
       */
-      if (ly_car (scm_last_pair (staffs)) != staff_)
+      if (!gh_pair_p (staffs))
+	programming_error ("Huh? Volta engraver can't find staffs?");
+      else if (ly_car (scm_last_pair (staffs)) != staff_)
 	return ;
     }
 	
-- 
2.39.2