From: Reinhold Kainhofer Date: Thu, 15 Sep 2011 12:19:08 +0000 (+0200) Subject: programming_error messages should NOT be translated X-Git-Tag: release/2.15.12-1~43 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0e13fe23a0698ae81b9e618b15841b8a88919ed7;p=lilypond.git programming_error messages should NOT be translated --- diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc index 619d8eaab2..8396d9512c 100644 --- a/lily/break-alignment-interface.cc +++ b/lily/break-alignment-interface.cc @@ -193,9 +193,9 @@ Break_alignment_interface::calc_positioning_done (SCM smob) if (unsmob_grob (l->get_property ("cause"))) orig_string = unsmob_grob (l->get_property ("cause"))->name (); - programming_error (_f ("No spacing entry from %s to `%s'", - orig_string.c_str (), - sym_string.c_str ())); + programming_error (to_string ("No spacing entry from %s to `%s'", + orig_string.c_str (), + sym_string.c_str ())); } Real distance = 1.0; diff --git a/lily/context.cc b/lily/context.cc index 83b8ae17dd..0c2cfe947f 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -265,7 +265,7 @@ Context::create_context_from_event (SCM sev) if (path.size () != 1) { - programming_error (_f ("Invalid CreateContext event: Cannot create %s context", type.c_str ())); + programming_error (to_string ("Invalid CreateContext event: Cannot create %s context", type.c_str ())); return; } Context_def *cdef = path[0]; diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index af2bcd73b4..299190b428 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -229,8 +229,8 @@ LY_DEFINE (ly_number_2_string, "ly:number->string", Real r (scm_to_double (s)); if (isinf (r) || isnan (r)) { - programming_error (_ ("infinity or NaN encountered while converting Real number")); - programming_error (_ ("setting to zero")); + programming_error ("infinity or NaN encountered while converting Real number, " + "setting to zero"); r = 0.0; } diff --git a/lily/grob-property.cc b/lily/grob-property.cc index de1e01b396..153627274d 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -168,9 +168,9 @@ Grob::internal_get_property (SCM sym) const #ifndef NDEBUG if (val == ly_symbol2scm ("calculation-in-progress")) { - programming_error (_f ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)", - ly_symbol2string (sym).c_str (), - name ().c_str ())); + programming_error (to_string ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)", + ly_symbol2string (sym).c_str (), + name ().c_str ())); if (debug_property_callbacks) { message ("backtrace: "); diff --git a/lily/grob.cc b/lily/grob.cc index d8aeedd5ad..36aadb4e93 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -286,7 +286,7 @@ Grob::translate_axis (Real y, Axis a) { if (isinf (y) || isnan (y)) { - programming_error (_ ("Infinity or NaN encountered")); + programming_error ("Infinity or NaN encountered"); return; } diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index f7de22edcf..4148c47199 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -168,8 +168,8 @@ internal_brew_primitive (Grob *me) note_shape == MLP_FLEXA_BEGIN); break; default: - programming_error (_ ("Mensural_ligature:" - " unexpected case fall-through")); + programming_error ("Mensural_ligature:" + " unexpected case fall-through"); return Lookup::blank (Box (Interval (0, 0), Interval (0, 0))); } @@ -230,7 +230,7 @@ internal_brew_primitive (Grob *me) out.add_stencil (join); } else - programming_error (_ ("Mensural_ligature: (join_right == 0)")); + programming_error ("Mensural_ligature: (join_right == 0)"); } #if 0 /* what happend with the ledger lines? */ diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 52f280c58e..f72b8937d4 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -178,7 +178,7 @@ Music_iterator::report_event (Music *m) FIXME: then don't do it. */ if (!m->is_mus_type ("event")) - m->origin ()->programming_error (_ ("Sending non-event to context")); + m->origin ()->programming_error ("Sending non-event to context"); m->send_to_context (get_outlet ()); } diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 2bf5ff9fe6..686b664006 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -91,8 +91,8 @@ Spaceable_grob::get_spring (Grob *this_col, Grob *next_col) } if (!spring) - programming_error (_f ("No spring between column %d and next one", - Paper_column::get_rank (this_col))); + programming_error (to_string ("No spring between column %d and next one", + Paper_column::get_rank (this_col))); return spring ? *spring : Spring (); } diff --git a/lily/text-interface.cc b/lily/text-interface.cc index 7bb4ceadc0..8071df3cb8 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -28,6 +28,7 @@ #include "modified-font-metric.hh" #include "output-def.hh" #include "pango-font.hh" +#include "international.hh" #include "warn.hh" static void @@ -109,12 +110,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) scm_display (markup, scm_current_error_port ()); scm_puts ("\n", scm_current_error_port ()); - Box b; - b[X_AXIS].set_empty (); - b[Y_AXIS].set_empty (); - - Stencil s (b, SCM_EOL); - return s.smobbed_copy (); + return Stencil ().smobbed_copy (); } } diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index 42511f7243..805430bd9b 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -185,8 +185,8 @@ vaticana_brew_join (Grob *me, int delta_pitch, Real staff_space = Staff_symbol_referencer::staff_space (me); if (!delta_pitch) { - me->programming_error (_ ("Vaticana_ligature: " - "zero join (delta_pitch == 0)")); + me->programming_error ("Vaticana_ligature: " + "zero join (delta_pitch == 0)"); return Lookup::blank (Box (Interval (0, 0), Interval (0, 0))); } Interval x_extent = Interval (0, join_thickness);