* flower

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index a7d09733cb1835a01ebe884b55a3856ba8b57f5a..1e908cc5fde3f8b51ffd7ed2def564b8dc25ba4c 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -1,36 +1,32 @@
-/*   
+/*
   international.cc -- implement stuff for internationalisation
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
 
-#include <stdarg.h>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "config.hh"
 #include "string-convert.hh"
-#include "international.hh"
 
 #if !HAVE_GETTEXT
-inline char*
-gettext (char const* s)
+inline char *
+gettext (char const *s)
 {
-  return (char*)s;
+  return (char *)s;
 }
 #else
 #include <libintl.h>
 #endif
 
-String 
+String
 _ (char const *ch)
 {
   return String (gettext (ch));
 }
 
-String 
-_f (char const* format, ...)
+String
+_f (char const *format, ...)
 {
   va_list args;
   va_start (args, format);
@@ -39,9 +35,9 @@ _f (char const* format, ...)
   return str;
 }
 
-String 
-_f (char const* format, String s, String s2, String s3)
+String
+_f (char const *format, String s, String s2, String s3)
 {
-  return String_convert::form_string (gettext (format), s.to_str0 (), s2.to_str0 (), 
-    s3.to_str0 ());
+  return String_convert::form_string (gettext (format), s.to_str0 (), s2.to_str0 (),
+                                     s3.to_str0 ());
 }