X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmensural-ligature-engraver.cc;h=b422398b7380d469e8d5ea4da00427a99279fc9b;hb=303c4023fce97de0cfb2d27a7e689d1ad7c4752b;hp=993e4ff5c97b7b5823941748944a3bd933f2404a;hpb=9eccfecefa05801661bf3a9590dda7cd630d3e07;p=lilypond.git

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 993e4ff5c9..b422398b73 100644
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -1,10 +1,21 @@
 /*
-  mensural-ligature-engraver.cc -- implement Mensural_ligature_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>,
+  Copyright (C) 2002--2010 Juergen Reuter <reuter@ipd.uka.de>,
   Pal Benko <benkop@freestart.hu>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "coherent-ligature-engraver.hh"
@@ -82,7 +93,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +120,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +134,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +146,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +158,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +206,7 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +217,8 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +244,10 @@ Mensural_ligature_engraver::transform_heads (vector<Grob_info> 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 +364,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;
 	}
     }