(interpret_markup): use abort().

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index b1cd6a66da10693597f7be203ceaa3a1caad2644..985b05989b18709bf775c308527f606dd5a78f99 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -1,5 +1,5 @@
 /*
-  text-item.cc -- implement Text_interface
+  text-interface.cc -- implement Text_interface
 
   source file of the GNU LilyPond music typesetter
 
@@ -7,7 +7,7 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "text-item.hh"
+#include "text-interface.hh"
 
 #include <math.h>
 
@@ -49,7 +49,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
     {
       SCM func = scm_car (markup);
       SCM args = scm_cdr (markup);
-      if (!markup_p (markup))
+      if (!is_markup (markup))
        programming_error ("markup head has no markup signature");
 
       return scm_apply_2 (func, layout_smob, props, args);
@@ -58,7 +58,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
     {
       programming_error ("not a markup: ");
       scm_display (markup, scm_current_error_port ());
-      assert (false);
+      abort();
       Box b;
       b[X_AXIS].set_empty ();
       b[Y_AXIS].set_empty ();
@@ -81,7 +81,7 @@ Text_interface::print (SCM grob)
 
 /* Ugh. Duplicated from Scheme.  */
 bool
-Text_interface::markup_p (SCM x)
+Text_interface::is_markup (SCM x)
 {
   return (scm_is_string (x)
          || (scm_is_pair (x)
@@ -92,5 +92,9 @@ Text_interface::markup_p (SCM x)
 
 ADD_INTERFACE (Text_interface, "text-interface",
               "A scheme markup text, see @usermanref{Text markup}.",
-              "text baseline-skip word-space");
+              "baseline-skip "
+              "text "
+              "word-space "
+              "text-direction "
+              );