* The grand 2005-2006 replace.

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 4c28ee8671373ecd3304da89fad76a938b3d8052..c21975bb8f8e0beac67c105b596675728a84dfb5 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -3,14 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "text-interface.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "main.hh"
 #include "config.hh"
@@ -57,8 +55,10 @@ 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 ());
+      scm_puts ("\n", scm_current_error_port ());
 
       Box b;
       b[X_AXIS].set_empty ();
@@ -77,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.  */