From c388633a6547e4b1750439db77702742b2d30b8d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 29 Nov 2008 18:04:46 +0100 Subject: [PATCH] Use `_f' consequently only for strings with arguments. --- lily/dispatcher.cc | 2 +- lily/mensural-ligature-engraver.cc | 26 +++++++++++++------------- lily/mensural-ligature.cc | 6 +++--- lily/midi-stream.cc | 2 +- lily/paper-column-engraver.cc | 3 ++- lily/stem-engraver.cc | 2 +- lily/tuplet-engraver.cc | 2 +- lily/vaticana-ligature.cc | 4 ++-- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc index 64062139b0..29ad2ba376 100644 --- a/lily/dispatcher.cc +++ b/lily/dispatcher.cc @@ -68,7 +68,7 @@ Dispatcher::dispatch (SCM sev) SCM class_symbol = ev->get_property ("class"); if (!scm_symbol_p (class_symbol)) { - warning (_f ("Event class should be a symbol")); + warning (_ ("Event class should be a symbol")); return; } diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 993e4ff5c9..e50764091c 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -82,7 +82,7 @@ Mensural_ligature_engraver::transform_heads (vector primitives) { if (primitives.size () < 2) { - warning (_f ("ligature with less than 2 heads -> skipping")); + warning (_ ("ligature with less than 2 heads -> skipping")); return; } int prev_pitch = 0; @@ -109,7 +109,7 @@ Mensural_ligature_engraver::transform_heads (vector primitives) if (!nr->in_event_class ("note-event")) { nr->origin ()->warning - (_f ("cannot determine pitch of ligature primitive -> skipping")); + (_ ("cannot determine pitch of ligature primitive -> skipping")); at_beginning = true; continue; } @@ -123,7 +123,7 @@ Mensural_ligature_engraver::transform_heads (vector primitives) { // we can get here after invalid input nr->origin ()->warning - (_f ("single note ligature - skipping")); + (_ ("single note ligature - skipping")); break; } prev_semibrevis = prev_brevis_shape = false; @@ -135,7 +135,7 @@ Mensural_ligature_engraver::transform_heads (vector primitives) if (delta_pitch == 0) { nr->origin ()->warning - (_f ("prime interval within ligature -> skipping")); + (_ ("prime interval within ligature -> skipping")); at_beginning = true; primitive->set_property ("primitive", scm_from_int (MLP_NONE)); @@ -147,7 +147,7 @@ Mensural_ligature_engraver::transform_heads (vector primitives) || duration_log > 0) { nr->origin ()->warning - (_f ("mensural ligature: duration none of Mx, L, B, S -> skipping")); + (_ ("mensural ligature: duration none of Mx, L, B, S -> skipping")); primitive->set_property ("primitive", scm_from_int (MLP_NONE)); at_beginning = true; @@ -195,7 +195,7 @@ Mensural_ligature_engraver::transform_heads (vector primitives) else { nr->origin ()->warning - (_f ("semibrevis must be followed by another one -> skipping")); + (_ ("semibrevis must be followed by another one -> skipping")); primitive->set_property ("primitive", scm_from_int (MLP_NONE)); at_beginning = true; @@ -206,8 +206,8 @@ Mensural_ligature_engraver::transform_heads (vector primitives) else if (duration_log == 0) { nr->origin ()->warning - (_f ("semibreves can only appear at the beginning of a ligature,\n" - "and there may be only zero or two of them")); + (_ ("semibreves can only appear at the beginning of a ligature,\n" + "and there may be only zero or two of them")); primitive->set_property ("primitive", scm_from_int (MLP_NONE)); at_beginning = true; @@ -233,10 +233,10 @@ Mensural_ligature_engraver::transform_heads (vector primitives) else { nr->origin ()->warning - (_f ("invalid ligatura ending:\n" - "when the last note is a descending brevis,\n" - "the penultimate note must be another one,\n" - "or the ligatura must be LB or SSB")); + (_ ("invalid ligatura ending:\n" + "when the last note is a descending brevis,\n" + "the penultimate note must be another one,\n" + "or the ligatura must be LB or SSB")); primitive->set_property ("primitive", scm_from_int (MLP_NONE)); break; } @@ -353,7 +353,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature, scm_from_double (flexa_width)); break; default: - programming_error (_f ("unexpected case fall-through")); + programming_error (_ ("unexpected case fall-through")); break; } } diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index e4901a4eca..9dbcf9818b 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -138,8 +138,8 @@ internal_brew_primitive (Grob *me) out = brew_flexa (me, delta_pitch, false, width, thickness); break; default: - programming_error (_f ("Mensural_ligature: " - "unexpected case fall-through")); + programming_error (_ ("Mensural_ligature: " + "unexpected case fall-through")); return Lookup::blank (Box (Interval (0, 0), Interval (0, 0))); } @@ -189,7 +189,7 @@ internal_brew_primitive (Grob *me) out.add_stencil (join); } else - programming_error (_f ("Mensural_ligature: (join_right == 0)")); + programming_error (_ ("Mensural_ligature: (join_right == 0)")); } #if 0 /* what happend with the ledger lines? */ diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index bcaefe7c18..df363385cf 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -41,7 +41,7 @@ Midi_stream::write (string str) size_t written = fwrite (str.data (), sz, n, out_file_); if (written != sz * n) - warning (_ ("cannot write to file: `%s'")); + warning (_f ("cannot write to file: `%s'", str.data ())); } void diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index c662a9baf7..6d24686b45 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -218,7 +218,8 @@ Paper_column_engraver::stop_translation_timestep () { SCM perm = break_events_[i]->get_property ("break-permission"); if (perm == ly_symbol2scm ("force") || perm == ly_symbol2scm ("allow")) - warning (_f ("forced break was overridden by some other event, should you be using bar checks?")); + warning (_ ("forced break was overridden by some other event, " + "should you be using bar checks?")); } } else if (Paper_column::is_breakable (command_column_)) diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index d07716e813..519329ef57 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -128,7 +128,7 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi) // FIXME: gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_))); - gi.event_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices")); + gi.event_cause ()->origin ()->warning (_ ("maybe input should specify polyphonic voices")); } Stem::add_head (stem_, gi.grob ()); diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 5cd637e3f9..4401bdb75d 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -93,7 +93,7 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev) tuplets_.pop_back (); } else if (!to_boolean (get_property ("skipTypesetting"))) - ev->origin ()->warning (_f ("No tuplet to end")); + ev->origin ()->warning (_ ("No tuplet to end")); } else ev->origin ()->programming_error ("direction tuplet-span-event_ invalid."); diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index 0cf90c5af9..3b1c12efe5 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -174,8 +174,8 @@ vaticana_brew_join (Grob *me, int delta_pitch, Real staff_space = Staff_symbol_referencer::staff_space (me); if (!delta_pitch) { - me->programming_error (_f ("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); -- 2.39.5