release: 1.3.120

[lilypond.git] / lily / property-engraver.cc

diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index e327679c016ead5534f4add87c14c617fbc8be15..4ece8f391927ecc1ceb4b71c40fad3eedd5d9584 100644 (file)
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -116,21 +116,14 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
        {
          e->set_grob_property (elt_prop_sym, val);
 
-         SCM errport = scm_current_error_port ();
-         scm_display (prop_sym, errport);
-         scm_puts (_(" is deprecated. Use\n \\property ").ch_C(), errport);
-
-         scm_puts (origin->type_str_.ch_C(), errport);
-         scm_puts (".", errport);
-         
-         SCM name = e->get_grob_property ("meta");
-         name = scm_assoc (ly_symbol2scm ("name"), name);
-         scm_display (gh_cdr(name), errport);
-         scm_puts(" \\push #'",errport);
-         scm_write (elt_prop_sym,errport);
-         scm_puts ( " = #",errport);
-         scm_write (val, scm_current_error_port ());
-         scm_puts ("\n", errport);
+         SCM meta = e->get_grob_property ("meta");
+         SCM name = scm_assoc (ly_symbol2scm ("name"), meta);
+         warning (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
+                      ly_symbol2string (prop_sym).ch_C (),
+                      origin->type_str_.ch_C (),
+                      ly_scm2string (gh_cdr (name)).ch_C (),
+                      ly_symbol2string (elt_prop_sym).ch_C (),
+                      ly_scm2string (ly_write2scm (val)).ch_C ()));
        }
       else
 
@@ -147,17 +140,13 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
        if (val != SCM_EOL)
          {                     // not the right type: error message.
            SCM errport = scm_current_error_port ();
-           warning (_("Wrong type for property"));
-           scm_display (prop_sym, errport);
-           scm_puts (", type: ", errport);
-
            SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL);
-           
-           scm_display (gh_call1 (typefunc, type_p), errport);
-           scm_puts (", value found: ", errport);
-           scm_write (val, errport);
-           scm_puts (" type: ", errport);
-           scm_display (ly_type (val), errport);
+           SCM type_name = gh_call1 (typefunc, type_p);
+           warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s",
+                        ly_symbol2string (prop_sym).ch_C (),
+                        ly_scm2string (type_name).ch_C (),
+                        ly_scm2string (ly_write2scm (val)).ch_C (),
+                        ly_scm2string (ly_type (val)).ch_C ()));
            scm_puts ("\n", errport);
          }
     }