(class Grob): move pscore, dim_cache_,

[lilypond.git] / lily / text-interface.cc

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 985b05989b18709bf775c308527f606dd5a78f99..5797f12e08167a15c9f6e6f0436a32cec8eb0564 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -9,7 +9,6 @@
 
 #include "text-interface.hh"
 
-#include <math.h>
 
 #include "main.hh"
 #include "config.hh"
@@ -56,9 +55,11 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
     }
   else
     {
-      programming_error ("not a markup: ");
+      programming_error ("Object is not a markup. ");
+      scm_puts ("This object should be a markup: ", scm_current_error_port ());
       scm_display (markup, scm_current_error_port ());
-      abort();
+      scm_puts ("\n", scm_current_error_port ());
+
       Box b;
       b[X_AXIS].set_empty ();
       b[Y_AXIS].set_empty ();
@@ -76,7 +77,7 @@ Text_interface::print (SCM grob)
 
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);
-  return interpret_markup (me->get_layout ()->self_scm (), chain, t);
+  return interpret_markup (me->layout ()->self_scm (), chain, t);
 }
 
 /* Ugh. Duplicated from Scheme.  */