X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fwarn.cc;h=0bf8983c7a83f4dbd27a369404faf686c0c33cfe;hb=392386cc9874bf94a4656a2074e76e462958e78d;hp=4ad8e947d85a23f415a5b9ddf94c90ee3b5a1af9;hpb=aa384518d059d26ffd6c0da3068fbdc2a345ecc1;p=lilypond.git

diff --git a/flower/warn.cc b/flower/warn.cc
index 4ad8e947d8..0bf8983c7a 100644
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -1,37 +1,82 @@
-#include <stdlib.h>
-#include <stdio.h>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  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 "warn.hh"
 
+#include <cstdlib>
+#include <cstdio>
+
+#include "international.hh"
+
+using namespace std;
+
+/* Is progress indication at NEWLINE?  */
+static bool progress_newline = true;
 
+/* Display user information that is not a full message.  */
 void
-error (String s)
+progress_indication (string s)
 {
-  fputs ( _f("error: %s\n", s.ch_C()).ch_C(), stderr);  
-  exit (1);
+  /* Test if all silly progress_indication ("\n") can be dropped now.  */
+  if (s == "\n")
+    return;
+
+  fputs (s.c_str (), stderr);
+  fflush (stderr);
+  if (s.length ())
+    progress_newline = s[s.length () - 1] == '\n';
 }
 
+/* Display a single user message.  Always starts on a new line.  */
 void
-non_fatal_error (String s)
+message (string s)
 {
-  fputs ( _f("error: %s\n", s.ch_C()).ch_C(), stderr);  
+  if (!progress_newline)
+    fputc ('\n', stderr);
+  progress_indication (s);
 }
 
+/* Display a warning message.  Always starts on a new line.  */
 void
-warning (String m)
+warning (string s)
 {
-  fputs ( _f("warning: %s\n", m.ch_C()).ch_C(), stderr);
+  message (_f ("warning: %s", s.c_str ()) + "\n");
 }
 
 void
-message (String m)
+non_fatal_error (string s)
 {
-  fprintf (stderr, "%s\n",m.ch_C());
+  message (_f ("error: %s", s.c_str ()) + "\n");
+}
+
+/* Display an error message.  Always starts on a new line.  */
+void
+error (string s)
+{
+  non_fatal_error (s);
+  exit (1);
 }
 
 void
-programming_error (String s)
+programming_error (string s)
 {
-  fputs ( _f("programming error: %s (Continuing; cross thumbs)\n", s.ch_C()).ch_C(), stderr);  
+  message (_f ("programming error: %s", s) + "\n");
+  message (_ ("continuing, cross fingers") + "\n");
 }