* input/test/time-signature-double.ly: use markups for double time

[lilypond.git] / lily / warn.cc

diff --git a/lily/warn.cc b/lily/warn.cc
index 08c8b526960dbc03f1be58e4a0ad1b39ee4afa06..04f52b17584d15484f015eb551708e5447b3b505 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -1,58 +1,20 @@
 /*
   warn.cc -- implement warning and error messages. Needs cleanup.
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
-#include "plist.hh"
-#include "debug.hh"
-#include "my-lily-lexer.hh"
-#include "moment.hh"
-#include "time-description.hh"
-#include "source-file.hh"
-#include "source.hh"
-#include "main.hh"
-#include "input.hh"
-
-ostream &warnout (cerr);
-ostream *mlog(&cerr);
-
-
-void
-error(String s)
-{
-    cerr <<  "error: " << s << "\n";
-       
-    exit(1);
-}
+#include <stdio.h>
 
-void
-error_t(String const & s, Moment const & r)
-{
-    String t_mom = String(trunc(r)) + String(r - Moment(trunc(r)));
-    String e=s+ " (t = " +  t_mom + ")";
-    error(e);
-}
+#include "string.hh"
+#include "main.hh"
 
 void
-error_t(String const & s, Time_description const &t_tdes)
+progress_indication (String s)
 {
-    String e=s+ " (at t=" + String(t_tdes.bars_i_) + ": " + String(t_tdes.whole_in_measure_) + ")\n";
-    error(e);
+ fputs (s.to_str0 (), stderr);
+ fflush (stderr);
 }
 
-void
-warning(String m)
-{
-    cerr << "warning" <<m <<endl;
-
-}
-
-void
-message(String m)
-{
-    cerr << m<<endl;
-}