Fretboards: markup strings in dot positions

[lilypond.git] / lily / break-substitution.cc

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index c2a363cb7366a1da5b9c2b4f1fe71a72795a5503..f26e9510bc9dd565c7288ea83c182bee8a49a895 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -51,7 +51,7 @@ substitute_grob (Grob *sc)
   else
     {
       System *line
-        = dynamic_cast<System *> (Grob::unsmob (break_criterion));
+        = derived_unsmob<System> (break_criterion);
       if (sc->get_system () != line)
         sc = sc->find_broken_piece (line);
 
@@ -125,8 +125,8 @@ again:
       SCM newcar = do_break_substitution (scm_car (src));
       SCM oldcdr = scm_cdr (src);
 
-      if (newcar == SCM_UNDEFINED
-          && (scm_is_pair (oldcdr) || oldcdr == SCM_EOL))
+      if (SCM_UNBNDP (newcar)
+          && (scm_is_pair (oldcdr) || scm_is_null (oldcdr)))
         {
           /*
             This is tail-recursion, ie.
@@ -477,7 +477,7 @@ substitute_object_alist (SCM alist, SCM dest)
       else
         val = do_break_substitution (val);
 
-      if (val != SCM_UNDEFINED)
+      if (!SCM_UNBNDP (val))
         {
           /*
             for ly:grob? properties, SCM_UNDEFINED could leak out