Issue 5167/1: Reorganize markup commands to use object properties

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index bad6d50281f626ccce966a8e15200b9a4f80ea8d..fc797073734cbc405183f42cd112fc0f607619e2 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -210,14 +210,9 @@ Text_interface::is_markup (SCM x)
 {
   return scm_is_string (x)
     || (scm_is_pair (x)
-        && scm_is_true
-        (scm_object_property (scm_car (x),
-                              ly_symbol2scm ("markup-signature")))
-        && scm_is_false
-        (scm_object_property (scm_car (x),
-                              ly_symbol2scm ("markup-list-command"))));
+        && scm_is_true (Lily::markup_command_signature (scm_car (x)))
+        && scm_is_false (Lily::markup_list_function_p (scm_car (x))));
 }
-
 bool
 Text_interface::is_markup_list (SCM x)
 {