From f418c40c03fcee08a35e5b1dae8d0d3b9e996b64 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 10 Mar 2005 14:56:48 +0000
Subject: [PATCH] *** empty log message ***

---
 .../{new-slur.ly => slur-scoring.ly}          |  0
 lily/accidental.cc                            | 38 ++++++++++---------
 lily/spaceable-grob.cc                        |  5 ++-
 3 files changed, 24 insertions(+), 19 deletions(-)
 rename input/regression/{new-slur.ly => slur-scoring.ly} (100%)

diff --git a/input/regression/new-slur.ly b/input/regression/slur-scoring.ly
similarity index 100%
rename from input/regression/new-slur.ly
rename to input/regression/slur-scoring.ly
diff --git a/lily/accidental.cc b/lily/accidental.cc
index 9aab78202a..6522a843cd 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -68,7 +68,7 @@ Accidental_interface::accurate_boxes (Grob *a, Grob **common)
       && !parens
       && scm_ilength (accs) == 1)
     {
-      switch (scm_to_int (scm_car (accs))
+      switch (scm_to_int (scm_car (accs)))
 	{
 	case FLAT:
 	  {
@@ -114,21 +114,23 @@ Accidental_interface::accurate_boxes (Grob *a, Grob **common)
 	    TODO: add support for, double flat.
 	  */
 	}
+    }
+      
+  if (!boxes.size ())
+    boxes.push (b);
 
-	      if (!boxes.size ())
-		boxes.push (b);
+  Offset o (a->relative_coordinate (common[X_AXIS], X_AXIS),
+	    a->relative_coordinate (common[Y_AXIS], Y_AXIS));
+  for (int i = boxes.size (); i--;)
+    {
+      boxes[i].translate (o);
+    }
 
-	      Offset o (a->relative_coordinate (common[X_AXIS], X_AXIS),
-			a->relative_coordinate (common[Y_AXIS], Y_AXIS));
-	      for (int i = boxes.size (); i--;)
-		{
-		  boxes[i].translate (o);
-		}
+  return boxes;
+}
 
-	      return boxes;
-	      }
 
-      /*
+/*
        * Some styles do not provide all flavours of accidentals, e.g. there
        * is currently no sharp accidental in vaticana style.  In these cases
        * this function falls back to one of the other styles.
@@ -252,10 +254,10 @@ Accidental_interface::accurate_boxes (Grob *a, Grob **common)
 	return mol.smobbed_copy ();
       }
 
-      /*
-	TODO: should move inside-slur into item?
+/*
+  TODO: should move inside-slur into item?
 
-      */
-      ADD_INTERFACE (Accidental_interface, "accidental-interface",
-		     "a single accidental",
-		     "inside-slur cautionary cautionary-style style tie accidentals");
+*/
+ADD_INTERFACE (Accidental_interface, "accidental-interface",
+	       "a single accidental",
+	       "inside-slur cautionary cautionary-style style tie accidentals");
diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 17d15ba94b..c8f8950b91 100644
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -27,7 +27,10 @@ void
 Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
 {
   //  printf ("rod %lf\n", d);
-
+  if (isinf(d) || d < 0)
+    {
+      programming_error ("Weird rod");
+    }
 
   SCM mins = get_minimum_distances (me);
   SCM newdist = scm_make_real (d);
-- 
2.39.5