programming_error messages should NOT be translated

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 619d8eaab2893afa7063fcac2909063f8d04ed7a..8396d9512c6f259d1b79c7cf537735d39deba249 100644 (file)
--- 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 83b8ae17dd21d6f1e2575f6303a039b921b1b9c1..0c2cfe947f8e55c63e358e85e2168b2f3bb59d1c 100644 (file)
--- 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 af2bcd73b4337e06689c74615a2310b0cf60996f..299190b42841734b34ef8e86635bfccc4cb710b6 100644 (file)
--- 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 de1e01b396b4e63dd2f9099c35b52ea318ae7576..153627274d03e274abe1cdf0dc8ce00808e51a84 100644 (file)
--- 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 d8aeedd5ad2d3f53fff33bfd5761e5ff7e91953a..36aadb4e938b549df05260d98cf7dc13030e6455 100644 (file)
--- 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 f7de22edcf6f5411ce16e248df9980c8906fe1e1..4148c4719995db367c9ed3076443fd4e9bf23c15 100644 (file)
--- 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 52f280c58ecadb697487380a4d462df971c812df..f72b8937d4fea21b02d2e75b6cfdf4fc00f4e726 100644 (file)
--- 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 2bf5ff9fe61ab392da3de51ac30cb399e6bbad1d..686b6640060147298e7858b04c59f8666cd5f79e 100644 (file)
--- 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 7bb4ceadc07c53ded50199d088572280975b1308..8071df3cb856428af7aacac5aaa87028f9fecbb8 100644 (file)
--- 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 42511f7243f141c7071630eeb5b94fad823d8ee5..805430bd9b774029c844f64298655989afa84092 100644 (file)
--- 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);