brey fixes

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 9e1c2a724b74a8eaefc4aee1b88c9dc4514c188b..b8bdf8e26ffe334c72e5d22a0394181d8256058a 100644 (file)
--- 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 bd04befbbc17a7b655a515ccaa2eb310644d7a65..ae63850005829361624a3a71085d0dcb5ed4122c 100644 (file)
--- 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 4bb036166b0c8c1b79dea32aa5a9cbd67215c2bb..650ebecc8e74813c4a1960901b2d314ed3e034d6 100644 (file)
--- 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 ad2db208f7b5d67cf39e9c122ceadfc5255eef36..c3260848dab4f78d9e64363fe54ecdebded9ed6e 100644 (file)
--- 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 acf55f371e015ffed3d94584e8c241e902a1824f..cd5dfeafe9723f80d992dbbfe8cef95619f34762 100644 (file)
--- 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 ;
     }