lilypond-1.5.14

diff --git a/lily/grob.cc b/lily/grob.cc
index f1f80e720a6d57a19037713f6e8e3c2b23c28f63..82b177151687b8801711902640c013e311168895 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -92,12 +92,14 @@ Grob::Grob (SCM basicprops)
     }
 
   SCM meta = get_grob_property ("meta");
-  SCM ifs = scm_assoc (ly_symbol2scm ("interfaces"), meta);
+  if (gh_pair_p (meta))
+    {
+      SCM ifs = scm_assoc (ly_symbol2scm ("interfaces"), meta);
   
-  set_grob_property ("interfaces",ly_cdr (ifs));
+      set_grob_property ("interfaces",ly_cdr (ifs));
+    }
 }
 
-
 Grob::Grob (Grob const&s)
    : dim_cache_ (s.dim_cache_)
 {

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 83ea32eb9ab09981ec9efcfeb8a5272774088221..1d26dc2a03b0107a4d5cbd102b6613c9e9a974f3 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -164,4 +164,4 @@ hideStaffSwitch = \property PianoStaff.followVoice = ##f
 % To remove a Volta bracet or some other graphical object,
 % set it to turnOff. Example: \property Staff.VoltaBracket = \turnOff
 
-turnOff = #'((meta .  ((interfaces . ()))))
+turnOff = #'()