-/*
+/*
international.cc -- implement stuff for internationalisation
-
+
source file of the GNU LilyPond music typesetter
-
- (c) 1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
-
- */
-#include <stdarg.h>
-#include "config.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);
- String str = String_convert::vform_str (gettext (format), args);
+ String str = String_convert::vform_string (gettext (format), args);
va_end (args);
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_str (gettext (format), s.ch_C (), s2.ch_C (),
- s3.ch_C ());
+ return String_convert::form_string (gettext (format), s.to_str0 (), s2.to_str0 (),
+ s3.to_str0 ());
}