lilypond-manuals.css: edit color scheme and some spacing

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 138ede129ebbec443bd9942b300d259c8ab2fd28..d930cdaa372868622e4624883c4ace2f5539e2a9 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -33,6 +33,7 @@
 #include "program-option.hh"
 #include "international.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 static void
 replace_special_characters (string &str, SCM props)
@@ -89,7 +90,7 @@ Text_interface::interpret_string (SCM layout_smob,
   SCM encoding = ly_chain_assoc_get (ly_symbol2scm ("font-encoding"),
                                      props,
                                      SCM_BOOL_F);
-  SCM music_encodings = ly_lily_module_constant ("all-music-font-encodings");
+  SCM music_encodings = Lily::all_music_font_encodings;
 
   bool is_music = scm_is_true (scm_memq (encoding, music_encodings));
   return fm->text_stencil (layout, str, is_music).smobbed_copy ();
@@ -133,6 +134,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
       scm_dynwind_unwind_handler (markup_down_depth, 0, SCM_F_WIND_EXPLICITLY);
       if (markup_depth > max_depth)
         {
+          scm_dynwind_end ();
           string name = ly_symbol2string (scm_procedure_name (func));
           // TODO: Also print the arguments of the markup!
           non_fatal_error (_f ("Markup depth exceeds maximal value of %d; "
@@ -183,8 +185,7 @@ Text_interface::is_markup (SCM x)
 bool
 Text_interface::is_markup_list (SCM x)
 {
-  SCM music_list_p = ly_lily_module_constant ("markup-list?");
-  return scm_is_true (scm_call_1 (music_list_p, x));
+  return scm_is_true (Lily::markup_list_p (x));
 }
 
 ADD_INTERFACE (Text_interface,