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 b8ec1d6c88f31b7077ff5caed0f83724b611728d..d930cdaa372868622e4624883c4ace2f5539e2a9 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -35,8 +35,6 @@
 #include "warn.hh"
 #include "lily-imports.hh"
 
-using std::string;
-
 static void
 replace_special_characters (string &str, SCM props)
 {
@@ -47,7 +45,7 @@ replace_special_characters (string &str, SCM props)
   int max_length = 0;
   for (SCM s = replacement_alist; scm_is_pair (s); s = scm_cdr (s))
     {
-      max_length = std::max (max_length, scm_to_int
+      max_length = max (max_length, scm_to_int
                         (scm_string_length (scm_caar (s))));
     }
 
@@ -136,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; "