release: 1.5.13

[lilypond.git] / lily / grob.cc

diff --git a/lily/grob.cc b/lily/grob.cc
index 314db7ae4e69798277b6d089036d03ddee2b9bd4..f1f80e720a6d57a19037713f6e8e3c2b23c28f63 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -278,7 +278,7 @@ Grob::get_uncached_molecule ()const
 
   SCM  mol = SCM_EOL;
   if (gh_procedure_p (proc)) 
-    mol = gh_apply (proc, scm_listify (this->self_scm (), SCM_UNDEFINED));
+    mol = gh_apply (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED));
 
   
   Molecule *m = unsmob_molecule (mol);
@@ -296,7 +296,7 @@ Grob::get_uncached_molecule ()const
       // ugr.
       
       mol = Molecule (m->extent_box (),
-                     scm_listify (origin, m->get_expr (), SCM_UNDEFINED)
+                     scm_list_n (origin, m->get_expr (), SCM_UNDEFINED)
                      ). smobbed_copy ();
 
       m = unsmob_molecule (mol);
@@ -387,6 +387,12 @@ Grob::handle_broken_grobs (SCM src, SCM criterion)
 
          /* now: sc && sc->line_l () == line */
          if (!line
+             /*
+               This was introduced in 1.3.49 as a measure to prevent
+               programming errors. It looks expensive (?). TODO:
+               benchmark , document when (what kind of programming
+               errors) this happens.
+              */
              || (sc->common_refpoint (line, X_AXIS)
                  && sc->common_refpoint (line, Y_AXIS)))
            {
@@ -672,7 +678,7 @@ Grob::name () const
   SCM meta = get_grob_property ("meta");
   SCM nm = scm_assoc (ly_symbol2scm ("name"), meta);
   nm = (gh_pair_p (nm)) ? ly_cdr (nm) : SCM_EOL;
-  return  gh_string_p (nm) ?ly_scm2string (nm) :  classname (this);  
+  return  gh_symbol_p (nm) ? ly_symbol2string (nm) :  classname (this);  
 }
 
 void