#include "warn.hh"
#include "lily-imports.hh"
-using std::string;
-
static void
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))));
}
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; "