* lily/include/debug.hh: deprecate.

diff --git a/ChangeLog b/ChangeLog
index 8e86b94f0d9814f2ae1cc445ea706b18f8dc23e1..1cab6d4e8a092492a37cc135595f515091cdbd7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-07-11  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/include/debug.hh: deprecate.
+
        * lily/spacing-spanner.cc (set_springs): add support for
        common-shortest-duration field.
 

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 91fcbcf3de130fe09375761552de306215ad0fb9..6e00f0dce770bfcebd8d3c1a3647ac1d98127f0e 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -10,7 +10,7 @@
 #include "config.h"
 #include "main.hh"
 #include "all-font-metrics.hh"
-#include "debug.hh"
+
 #include "warn.hh"
 #include "afm.hh"
 #include "tfm.hh"

diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index 2e176ac50bb70dd8870065aa4481410c2fdc6f7f..15050f57ee6a799e99b8d0c3d03763f514969d9a 100644 (file)
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -10,7 +10,7 @@
 #include "audio-item.hh"
 #include "performance.hh"
 
-#include "debug.hh"
+
 
 Audio_column::Audio_column (Moment at_mom)
 {

diff --git a/lily/audio-element.cc b/lily/audio-element.cc
index 3c9712680e757bccc6758d26429acb5e0a8e500d..1b910a6816af928fda25546eebff780f761058c6 100644 (file)
--- a/lily/audio-element.cc
+++ b/lily/audio-element.cc
@@ -7,7 +7,7 @@
 */
 
 #include "audio-element.hh"
-#include "debug.hh"
+
 
 Audio_element::Audio_element ()
 {

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 6b5f43dce72be194962b9ff814d0d266cf813781..68ed3bc4cb37139b721d7de0735ccdf791fee6a3 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -5,7 +5,7 @@
 
   (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include "debug.hh"
+
 #include "audio-item.hh"
 #include "midi-item.hh"
 #include "audio-column.hh"

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 6216b9f47533d77fcb876305e366d9c60618390e..15e931c7cb6a69550bde20959dff22d3f22d2889 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -11,7 +11,7 @@
 #include "musical-request.hh"
 #include "beam.hh"
 #include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "engraver-group-engraver.hh"
 #include "bar-line.hh"
 #include "rest.hh"

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index f48667ede9fd6bff5056ab720c71e2d9f4d5827e..1499a34bde9c8463232070e2f884d089d4db1d01 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -17,7 +17,7 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
-#include "debug.hh"
+
 #include "all-font-metrics.hh"
 #include "item.hh"
 #include "staff-symbol-referencer.hh"

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 85a17b450ff4f3d0dee6b9cc0430587bda699ed2..730a3f496485574b2a8a33e826708be9de3a506d 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -16,7 +16,7 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "debug.hh"
+
 #include "dimensions.hh"
 #include "direction.hh"
 

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index cdae5724b40448846892c04bd1e8e98f05ee8150..6d0ba3d1c254c932c314a37d86b80c2092cd807c 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -9,7 +9,8 @@
 #include "change-iterator.hh"
 #include "translator-group.hh"
 #include "music.hh"
-#include "debug.hh"
+#include "warn.hh"
+
 
 
 void

diff --git a/lily/chord.cc b/lily/chord.cc
index bb41246ffac176ea9a1491429c560dab4d2d21cc..f0ef3685bcdc4b1f70ee52ccd9bb6c6c9159073e 100644 (file)
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -9,7 +9,7 @@
 #include "chord.hh"
 #include "musical-request.hh"
 #include "warn.hh"
-#include "debug.hh"
+
 #include "music-list.hh"
 #include "musical-request.hh"
 

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 1c9151a69033a1cc34bbc4387041dd526a223a1f..75de5c144c9044535bf86a6f348335c93f12d9a1 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -14,7 +14,7 @@
 
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
-#include "debug.hh"
+
 #include "engraver.hh"
 #include "direction.hh"
 #include "side-position-interface.hh"

diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index b84a7f1ae5632997c54b0d5ee6b6049df1823686..0958c2e431d20e708b74cc5c502274f652e9d7be 100644 (file)
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -8,7 +8,7 @@
 
 #include "column-x-positions.hh"
 #include "real.hh"
-#include "debug.hh"
+
 
 Column_x_positions::Column_x_positions ()
 {

diff --git a/lily/command-request.cc b/lily/command-request.cc
index 061063eaccea5068eab568a6982bd18289212a9a..55cc30cd1f140e164b03ca995194387e02005a15 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -7,7 +7,7 @@
 */
 
 #include "command-request.hh"
-#include "debug.hh"
+
 #include "musical-request.hh"
 
 Tempo_req::Tempo_req ()

diff --git a/lily/custos.cc b/lily/custos.cc
index d4025b188e814f91ca3c63051dd31cebdcdafe5c..0a196792de1a387ba55ae160c24aad5f4e491ec3 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -24,7 +24,7 @@
 #include "staff-symbol-referencer.hh"
 #include "custos.hh"
 #include "molecule.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "note-head.hh"
 #include "item.hh"
 #include "font-interface.hh"

diff --git a/lily/dimensions.cc b/lily/dimensions.cc
index 1023450ee4b6ab0b8d7eccadf1eeba3626034486..ba33ccdff304cd6417d32e5f0743a25749f34a8d 100644 (file)
--- a/lily/dimensions.cc
+++ b/lily/dimensions.cc
@@ -1,7 +1,7 @@
 // dimensions.cc
 
 #include "dimensions.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "string.hh"
 
 String

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index f51dfb20fc32a6ed7deac3b356f7e0b29cca179c..0def5924387545095930e882480fe61d0004c382 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -5,7 +5,7 @@
 
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
 #include "hairpin.hh"
 #include "musical-request.hh"

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index f08a71909c65a861b2061592550ffce994857f9b..71dab3bd0967d045b809062b4f24898fcde11cc8 100644 (file)
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -9,7 +9,7 @@
 #include "flower-proto.hh"
 #include "engraver-group-engraver.hh"
 #include "engraver.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-score.hh"
 #include "grob.hh"
 

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 9ee578925abe5c49f1e2f874fef42d57c26c7369..0f6d75c11735df500e97c3a670e30afa272ee2bd 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -7,7 +7,7 @@
 */
 #include <stdio.h>
 
-#include "debug.hh"
+#include "warn.hh"
 #include "music.hh"
 #include "request.hh"
 #include "music-list.hh"

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index a70f658ea2e924c22e825febe1b9d9fec27a1f41..ac250e9684a96c6dd382d373fa0a0c75c1715ed2 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -9,7 +9,8 @@
 
 #include "gourlay-breaking.hh"
 #include "column-x-positions.hh"
-#include "debug.hh"
+#include "warn.hh"
+#include "main.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
 #include "paper-def.hh"

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index a7046766aa536f8644f07812673f41017661e9db..458a7b5361e9f127722875cd4d4352455e799c9a 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -12,7 +12,7 @@
 #include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-column.hh"
 #include "lookup.hh"
 

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index dba478e0a30e93f2a2b54f276b1c9f49ad65a277..8a3f6d05582cdfed8828410a322f058f4743636b 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -10,7 +10,7 @@
 #include "axis-group-interface.hh"
 #include "spanner.hh"
 #include "hara-kiri-group-spanner.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "item.hh"
 
 

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index e38dbd363ece5611f35a7376c49de590a85477ae..914934bf95581ddfc2c64f0945d6dd80ae32019b 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -13,7 +13,7 @@
 #include "includable-lexer.hh"
 #include "source-file.hh"
 #include "source.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "main.hh"
 
 #ifndef YY_BUF_SIZE

diff --git a/lily/include/debug.hh b/lily/include/debug.hh
deleted file mode 100644 (file)
index 956b06b..0000000
--- a/lily/include/debug.hh
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Argh! this sux! implementation not liblily
- */
-
-#ifndef DEBUG_HH
-#define DEBUG_HH
-
-#include <assert.h>
-
-#include "real.hh"
-#include "lily-proto.hh"
-#include "warn.hh"
-
-void progress_indication (String);
-
-#endif

diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh
index 7ad6dd95cff972900600742fac0f54c92a2e52c9..f27e8851e12f125bf10977cc057c121c55615719 100644 (file)
--- a/lily/include/hairpin.hh
+++ b/lily/include/hairpin.hh
@@ -11,6 +11,7 @@
 #define HAIRPIN_HH
 
 #include "lily-guile.hh"
+#include "lily-proto.hh"
 /**
   The hairpin symbol. 
  */

diff --git a/lily/include/main.hh b/lily/include/main.hh
index e7caae383ccf957def54200cbf3498e8bc485f90..80c18a3e8382f257aa5056cba18a5f6371cde6af 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -20,6 +20,7 @@ String find_file (String);
 void call_constructors ();
 extern Array<String> get_inclusion_names ();
 extern void set_inclusion_names (Array<String>);
+void progress_indication (String);
 
 /* options */
 extern bool dependency_global_b;

diff --git a/lily/item.cc b/lily/item.cc
index a16253825a282747a611b598e606ad3e92c871f0..9c8a004fde23c0d5ec384004427437c8c9104663 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -8,7 +8,7 @@
 
 
 #include "paper-score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "item.hh"
 #include "paper-column.hh"
 #include "spanner.hh"

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c90632a355e28a8844590da513e9ae3e6b98cf40..76d17e4c131e4b090e9e55f7051a288e0c15c409 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -37,7 +37,7 @@
 #include "interval.hh"
 #include "lily-guile.hh"
 #include "parser.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "main.hh"
 #include "musical-request.hh"
 #include "version.hh"

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 89bf7e82b8623c4fe60995c48342c4f2719a7578..8630c6d68e4c85bdef37cc0799ea8593532c7e96 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -18,7 +18,7 @@
 #include "main.hh"
 #include "simple-file-storage.hh"
 #include "file-path.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "direction.hh"
 #include "offset.hh"
 #include "interval.hh"

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 0c7bb4ec448b3ec143f642b437a5c871ad522023..9cb03b14ec5fe9867e71d0365c714ed5bdaeb056 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -8,7 +8,7 @@
 
 
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "lookup.hh"
 #include "molecule.hh"
 #include "paper-column.hh"

diff --git a/lily/main.cc b/lily/main.cc
index f467bdda24f347aa8f7e496bbce2bef5156ce8a7..6e2435142b58c1c14f7a4dd1842829cce2d1e2a2 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -29,7 +29,7 @@
 #include "main.hh"
 #include "file-path.hh"
 #include "file-results.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "lily-guile.hh"
 #include "paper-def.hh"
 #include "midi-def.hh"

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 2f2479815d7f3ee82a82d0f7b8a2d11a81a2472f..fa8f01643c6d09677a529876e6f8b717ad65d04f 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -10,7 +10,7 @@
 #include "misc.hh"
 #include "midi-def.hh"
 #include "performance.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "scm-hash.hh"
 
 Midi_def::Midi_def ()

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 0203c2a9ce31657ff9ad6dae70f707c51b578617..22176a87aabe21785066420f73b38ae979983ce0 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -6,7 +6,7 @@
   (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "string.hh"

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index afce7e3b5402ff426b22efa3c4ce3eddacebe5ab..315da958607864d794bd8b2f62c405aaf8f44065 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -14,7 +14,7 @@
 #include "misc.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "scm-option.hh"
 
 Midi_stream::Midi_stream (String filename)

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 58dbb45c8f3c0837e48ddb288b4464aaee3b8528..b544dc3fb0abd84d3a285509e5c68ebcf567ce05 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -13,7 +13,7 @@
 #include "audio-staff.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 Midi_note_event::Midi_note_event () 
 { 

diff --git a/lily/molecule.cc b/lily/molecule.cc
index f044a4cb88408427e60e0575c8ea1815820af00c..e748b5d77b4b655cb5335bd2f50ca7fc63dea044 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -14,7 +14,7 @@
 #include "interval.hh"
 #include "string.hh"
 #include "molecule.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 
 #include "ly-smobs.icc"

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index cba08eca96dc9ca848a7c40fed08fe920557e0ef..1d60568d45052d2ea2a4ef6070e86dbb9a4edadd 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -8,7 +8,7 @@
  */
 
 #include "multi-measure-rest.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "paper-column.hh" // urg
 #include "font-interface.hh"

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index b75f1e3281930b391a321e421a248a58169059da..21d3edfd0ae2394c7e05aa1950158cbe2f6328ae 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -9,7 +9,7 @@
 /*
   UGH. too many includes.
  */
-#include "debug.hh"
+#include "warn.hh"
 #include "music-iterator.hh"
 #include "translator-group.hh"
 #include "music-wrapper.hh"

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index f2f3195b6e4a66c5f7264548607c9cbfd6a95159..399feeccd7418a45372cefd61706c4252fdead77 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -9,7 +9,7 @@
 #include "scm-hash.hh"
 
 #include "dictionary.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-output-def.hh"
 #include "global-translator.hh"
 #include "translator-def.hh"

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 69755be0500e03a36e54a7fb7ad2f5fe7b85f66c..44ec103c4092f7f8ab39769b6f6d80fec7125302 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -7,7 +7,7 @@
   
  */
 #include "music-list.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "pitch.hh"
 
 

diff --git a/lily/music.cc b/lily/music.cc
index 4c0fd48116c8382da99a5886690d88e5d16ee658..db7b1f4d65cdfad1091a9c69d1ae2186ea756549 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -10,7 +10,7 @@
 #include "input-smob.hh"
 #include "music.hh"
 #include "music-list.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "pitch.hh"
 #include "ly-smobs.icc"
 

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 4beca66cf72369515a58567f2bdcddd5eeda7b61..ac24a4c9172f6e55a23e63854770088fe406bcfc 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -8,7 +8,7 @@
 
 #include "musical-request.hh"
 #include "misc.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-list.hh"
 
 

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index de7e68637d334825969ca1024f2679e0f620938c..bcfc85c40b369c0c6e35521cf9e3e93d70d94d64 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -18,7 +18,7 @@
 #include "parser.hh"
 #include "keyword.hh"
 #include "my-lily-lexer.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "source-file.hh"
 #include "main.hh"
 #include "input.hh"

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index ff1baa364288c6c592f02d1191ce5f59856bb325..fcba6c4691aa986e2347b1f875099510a9b63735 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -9,7 +9,7 @@
 
 #include "my-lily-parser.hh"
 #include "my-lily-lexer.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "main.hh"
 #include "parser.hh"
 #include "file-results.hh"

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 5468ff529f71e2c095259e70625f90de6ee50cb7..bb50797597e25b1639dc11d5d1bf0f4008b6f9ab 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -7,7 +7,7 @@
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "note-collision.hh"
 #include "note-column.hh"
 #include "note-head.hh"

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 9e6c4cdc1c1ab2a7cf4ff878c2e740bc67116c67..8b479cd38b48ab374e2b3bb85ccafb29d74fe5b7 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -10,7 +10,7 @@
 #include "axis-group-interface.hh"
 #include "note-column.hh"
 #include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "group-interface.hh"
 #include "staff-symbol-referencer.hh"

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 2b2983be9223d6261a7ebfa14a5959faad0afa09..379ee656eb84a021a96cc7f745bc736df5b872fe 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -11,7 +11,7 @@
 #include "misc.hh"
 #include "dots.hh"
 #include "note-head.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
 #include "musical-request.hh"

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 3b39293e27da50f968738e430ae033c35fc468cd..b6076e94f562520e7853dffe45475b9d932ecb7c 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -11,7 +11,7 @@
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-translator.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 /**
 Convert reqs to audio notes.

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 2abeff483e683329ddb28305cf91a94375c30869..ad2db208f7b5d67cf39e9c122ceadfc5255eef36 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -9,7 +9,7 @@
 #include "moment.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "axis-group-interface.hh"
 #include "spaceable-grob.hh"
 #include "molecule.hh"
@@ -166,4 +166,5 @@ Paper_column::before_line_breaking (SCM grob)
     }
 
   me->set_grob_property ("bounded-by-me", c);
+  return SCM_UNSPECIFIED;
 }

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5e8c509807f53d6881d1ab2d411858cca763fd65..65c4e384d73c6842c401def99bf9aac270262325 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -16,7 +16,7 @@
 #include "molecule.hh"
 #include "array.hh"
 #include "string-convert.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-metric.hh"
 #include "main.hh"
 #include "scm-hash.hh"

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 9193e92c0abc692ecca8227c7186f3f8a32d2a6d..cfa9781bd7f1c1e51669616d31b13433e701c4eb 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -7,7 +7,7 @@
 */
 
 #include "main.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-metric.hh"
 #include "spanner.hh"
 #include "paper-def.hh"

diff --git a/lily/parser.yy b/lily/parser.yy
index d29412b1afbd19f95fff001339c567e819f74956..e7d9d6498a3f1f9c31e2fdbcebc4b5fec26195a4 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -36,7 +36,7 @@ this.
 #include "midi-def.hh"
 #include "main.hh"
 #include "file-path.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
 #include "command-request.hh"
 #include "musical-request.hh"

diff --git a/lily/performance.cc b/lily/performance.cc
index 9e1b7058c307679407cfec0948e791234f36a1c5..1a941c6697387aecb3a668596af812324d043f44 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -7,7 +7,7 @@
 */
 
 #include <time.h>
-#include "debug.hh"
+#include "warn.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 8d5b6b7f60b841c5d41fe16beb111fdb80931d9e..e97182933ddedd05cece6c78dfa1b52a117d3a71 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -10,7 +10,7 @@
 #include "performer-group-performer.hh"
 
 #include "audio-element.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 
 ENTER_DESCRIPTION(Performer_group_performer,

diff --git a/lily/performer.cc b/lily/performer.cc
index 9f0e889ce7062655c2ad41e609307ec5df5320cf..5fe1d649165b0b8484b8d2a12c06f4663b1633a9 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -9,7 +9,7 @@
 
 
 #include "performer-group-performer.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 void 
 Performer::play_element (Audio_element* p) 

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 329228cddc8d9ef472c108e16b8f10925626fd49..b1e621a910d7c3d1b93036899e605669eaa05d28 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -6,7 +6,7 @@
 
 #include "musical-request.hh"
 #include "slur.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "note-column.hh"
 #include "translator-group.hh"
 #include "engraver.hh"

diff --git a/lily/pitch.cc b/lily/pitch.cc
index fa06546afee4eeca96dc7c51a81bf628a66de17c..06c19f5473d3953570ea13d177cd61e8ab7b0ec1 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -7,7 +7,7 @@
   
  */
 #include "pitch.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "main.hh"
 #include "ly-smobs.icc"
 

diff --git a/lily/porrectus.cc b/lily/porrectus.cc
index c9865f68b23bba773b74b40e41cf86f7e9433da4..b4947c43b59b6d38583e56ff28ee3b67a2a2070b 100644 (file)
--- a/lily/porrectus.cc
+++ b/lily/porrectus.cc
@@ -14,7 +14,7 @@
 #include "molecule.hh"
 #include "pitch.hh"
 #include "lookup.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
 #include "direction.hh"
 #include "bezier.hh"

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index b9aeb445a33a9ba388a52c831812a94d40834865..14890694c3efad70de98e64c9038af43714ad49d 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -8,7 +8,7 @@
  */
 
 #include "relative-music.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 Pitch
 Relative_octave_music::to_relative_octave (Pitch)

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 3ae277f8f5d051b392b350f0bef583e1b7642b52..7b3ffe6e4d8f1e686922ca634b29fc2ed376ae00 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -10,7 +10,7 @@
 #include "repeated-music.hh"
 #include "music-list.hh"
 #include "pitch.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-sequence.hh"
 
 Music *

diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc
index 6bd81ae335be2b155253ce6092070d20fd75c53f..2a23dba32c46b1113c89a0c2b32567e59a9ee9bd 100644 (file)
--- a/lily/request-chord-iterator.cc
+++ b/lily/request-chord-iterator.cc
@@ -7,7 +7,7 @@
 */
 
 #include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "request-chord-iterator.hh"
 #include "music-list.hh"
 #include "request.hh"

diff --git a/lily/request.cc b/lily/request.cc
index aefeb1f7a0e51ddcfac1b8ba08d62152016a3524..5b0911a2dab71ece99fc16f4df5c02d3cc7c993c 100644 (file)
--- a/lily/request.cc
+++ b/lily/request.cc
@@ -7,7 +7,7 @@
 */
 
 #include "request.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 bool
 Request::equal_b (Request const* r) const

diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index a1d4d7f0bba5d4858dcd37dfb747ba0bae0ad2ed..fc1e71e3838e90df3a13585d283efe37ef95e26a 100644 (file)
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -6,7 +6,7 @@
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "rest-collision.hh"
 #include "engraver.hh"
 #include "note-collision.hh"

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 49e85e2d955e2c50a776e154706510381e8996dc..0292881cb4e64b09aa4bdde35c761867bf33984f 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -8,7 +8,7 @@
 
 #include <math.h>              // ceil.
 
-#include "debug.hh"
+#include "warn.hh"
 #include "rest-collision.hh"
 #include "note-column.hh"
 #include "stem.hh"

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 9f6b18ca1ccfb82e8bd1a8884551f7b50ec9af22..18f341cebc73e317234625f6a4f31881ce4eb6d7 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -7,7 +7,7 @@
 */
 
 #include "rhythmic-head.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "rest.hh"
 #include "stem.hh"
 #include "staff-symbol-referencer.hh"

diff --git a/lily/rod.cc b/lily/rod.cc
index 1577baa310eec1b9711a0fd47c0aaece4c84e07e..14f710ff4bd1bab6ab8df93b02459bd2201ea955 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -8,7 +8,7 @@
  */
 #include "rod.hh"
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
 #include "spaceable-grob.hh"
 

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index efa97d2c9afe2804bb35fc6e1e2958b7c3481bab..d4d5e0aab7b1dc55b4f9dd5516b111942cf3eca3 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -6,8 +6,8 @@
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
-
+#include "warn.hh"
+#include "main.hh"
 #include "system.hh"
 #include "item.hh"
 #include "score-engraver.hh"

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index a8d2dd7218673563501ffee13308564c2987be0c..d79efd76fc931487d9d193e569e252e5944def3a 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -13,7 +13,7 @@
 #include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "translator-def.hh"
 
 

diff --git a/lily/score.cc b/lily/score.cc
index b66a3ca34c509aada6f8c20f4a40ce8f2cea1aec..94a3a252989e452ce540ebc01a967a6e0415ac12 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -11,7 +11,7 @@
 #include "ly-smobs.icc"
 
 #include "score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-output-def.hh"
 #include "music-output.hh"
 #include "music-iterator.hh"

diff --git a/lily/scores.cc b/lily/scores.cc
index a76b86ba41d959e5f4d9e86aa665eddc3cb97021..5073a1daa29db80bb84aa0b884126c0f4c7518dd 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -22,7 +22,7 @@
 #include "score.hh"
 #include "string.hh"
 #include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "parray.hh"
 #include "file-path.hh"
 #include "file-results.hh"

diff --git a/lily/script.cc b/lily/script.cc
index 7483b07a79318cdf30cac54eb54d4cdc9a52c0ff..8ff25c098841ea1ac9bbb368bcfed23cf5a3acf9 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -7,7 +7,7 @@
   
  */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "script.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 1e439066b530e75d82401b4ce94c03657ff247f5..49467607bed9cb8d4ea2ef47e8a136a2682d1405 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -9,7 +9,7 @@
 
 #include "separation-item.hh"
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "group-interface.hh"
 
 

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index b3d0e5bc09f30de01ec65b61010cbd822cd9a2ad..63f7e072f0cc901b25cfeb8b549364a67a598fb1 100644 (file)
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -7,7 +7,7 @@
 */
 
 #include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "sequential-music-iterator.hh"
 #include "music-list.hh"
 

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index b1d5c190e1c0524dd58f35af4f21e143ae464041..1c9b34e4a33f54f754bde5d7669e31da21f80e28 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -9,7 +9,7 @@
 #include <math.h>              // ceil.
 
 #include "side-position-interface.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "warn.hh"
 #include "dimensions.hh"
 #include "staff-symbol-referencer.hh"

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index d2c99bb2802c2fd2929387dc4add256e4661115b..cc246f8a48a70f3c6e3125e828f60e9d113f9f55 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -7,7 +7,7 @@
 */
 
 #include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
 #include "killing-cons.tcc"

diff --git a/lily/slur-bezier-bow.cc b/lily/slur-bezier-bow.cc
index de18ddd5f63c64ca73c0306c874b48254c52a177..54620e6606db37b58d6513c67f52bc79f2df813f 100644 (file)
--- a/lily/slur-bezier-bow.cc
+++ b/lily/slur-bezier-bow.cc
@@ -6,7 +6,7 @@
   (c) 2000--2002  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "slur-bezier-bow.hh"
 #include "main.hh"

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 259905900881327acdc05c4c86b4877ae307e66f..42ede51908d287bffc467059fae934713f630ae2 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -6,7 +6,7 @@
 
 #include "musical-request.hh"
 #include "slur.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "note-column.hh"
 #include "translator-group.hh"
 #include "engraver.hh"

diff --git a/lily/slur.cc b/lily/slur.cc
index 8a05cc744e40e3ef2b0207c07209003da2311c22..0e86220d107a69e75486de405df75a751bac4b20 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -30,7 +30,7 @@
 #include "stem.hh"
 #include "paper-column.hh"
 #include "molecule.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "slur-bezier-bow.hh"
 #include "main.hh"
 #include "group-interface.hh"

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 483f9715d23d8ae2615b70b94aba880f88366756..4c3f635950c4a63e25853712f382363ad6424b3b 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -10,7 +10,9 @@
 #include <math.h>
 #include <stdio.h>
 
+#include "main.hh"
 #include "system.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
@@ -373,8 +375,13 @@ Spacing_spanner::set_springs (SCM smob)
       global_shortest = unsmob_moment (preset_shortest)->main_part_;
     }
   else
-    global_shortest = find_shortest (me, all);
-  
+    {
+      global_shortest = find_shortest (me, all);
+      if (verbose_global_b)
+       {
+         progress_indication (_f("Global shortest duration is %s\n", global_shortest.str())); 
+       }
+    }
   prune_loose_colunms (me, &all, global_shortest);
   set_implicit_neighbor_columns (all);
 

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 0c65019c4f2fef34e2532933b9ba6889be7cf1b3..0c11f2833ab4be321755bd9115772e84c3600e13 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -9,7 +9,7 @@
 #include <libc-extension.hh>
 
 
-#include "debug.hh"
+#include "warn.hh"
 #include "spanner.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index b00bd9df12ca4c12c0cd62ce2ddd4982a5814969..3ab9618ef068ef478ea6a89fd2a05f77afdfc46a 100644 (file)
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -8,7 +8,7 @@
  */
 
 #include "spring.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "ly-smobs.icc"
 
 Spring_smob::Spring_smob()

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 57ffc8efd33151bb546da0b319d1bc5ac4090663..2479dc3ae4a864b3d7fe4b4f6affb097a9d60ad9 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -7,7 +7,7 @@
  */
 
 #include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index c2e2bb0c7f8c6f88163f6a983431934bc19471e7..841f060ef10ffcf91bc6f782c5df7d7c46b6647e 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -10,7 +10,7 @@
 #include "dimensions.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "item.hh"
 #include "staff-symbol.hh"
 #include "staff-symbol-referencer.hh"

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 5af470bae5402bf3a8201ba3447c81d6556ed513..612a5ad1ec6b6866810c96f194885dca9f0f96db 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -8,7 +8,7 @@
  */
 
 #include "stem-tremolo.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "beam.hh"
 #include "paper-def.hh"
 #include "lookup.hh"

diff --git a/lily/stem.cc b/lily/stem.cc
index b80418aa89c73abb65593a337205510f513b0aff..7b61a8cfa5b0df3575400dbb0ac4b00f043bd005 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -19,7 +19,7 @@
 #include "directional-element-interface.hh"
 #include "note-head.hh"
 #include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "rhythmic-head.hh"
 #include "font-interface.hh"

diff --git a/lily/system.cc b/lily/system.cc
index af5fecc44e3c091070dc6d81b0a1766f4766ff00..3cb30a2e95c42fe82ccecaaf14e88e0e355aa1e6 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -8,7 +8,7 @@
 
 #include "input-smob.hh"
 #include "axis-group-interface.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "system.hh"
 #include "main.hh"
 #include "paper-column.hh"

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 19fbf548d2701887a9c01644e76997326a3cc78e..7ed5d1ed8d665534ebfe338110cf189779100f4c 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -8,7 +8,7 @@
  */
 #include <math.h>
 
-#include "debug.hh"
+#include "warn.hh"
 #include "text-item.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index acbabdc56e7629a432d936575c8ac6ba89f1c202..ebcac1ee5522c17d7f7f3bf68e164f02f0fbe7a3 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -15,7 +15,7 @@ source file of the GNU LilyPond music typesetter
 #include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
 

diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc
index c6a7952f9ad21537080d54148b6c643b4139650c..062b7c688d39d70eb9f3df9e9671d946c283a3a3 100644 (file)
--- a/lily/tfm-reader.cc
+++ b/lily/tfm-reader.cc
@@ -11,7 +11,7 @@
 
 #include "tfm-reader.hh"
 #include "string-convert.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "warn.hh"
 
 #define format_str String_convert::form_str

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 89a09a5011807a79027e05e1eef94f222e3c9d78..23bd86aef72b95e65df0287cf4466506a4253a92 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -12,7 +12,7 @@
 #include "tfm.hh"
 #include "tfm-reader.hh"
 #include "string-convert.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "warn.hh"
 #include "dimensions.hh"
 

diff --git a/lily/tie.cc b/lily/tie.cc
index 0f7f0830cefac107bdf7951194c0ccda7457e815..5bac5978e73bb808687ab1c5ca570017e1b000d2 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -15,7 +15,7 @@
 #include "rhythmic-head.hh"
 #include "bezier.hh"
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 #include "molecule.hh"

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index f92b598a41e116ef834ed607bfedc96b8b39f088..43ce9c83d095d9de7d7f2fed68178a24d2a060d2 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -7,7 +7,7 @@
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "timing-translator.hh"
 #include "command-request.hh"
 #include "translator-group.hh"

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 849a73248582c301f1ac8b332d3943d869002694..65f6528b833a2dd02c2d303af5ad8831fff986a6 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -8,7 +8,7 @@
 
 #include "translator.hh"
 #include "dictionary.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 /*
   should delete these after exit.

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index bac3a47db03264fcdec033423634f330d1038464..f37563c6c28df98722a6207d626474d65d0237bf 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -9,7 +9,7 @@
 #include "music-output-def.hh"
 #include "translator-group.hh"
 #include "translator.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "moment.hh"
 #include "scm-hash.hh"
 #include "translator-def.hh"

diff --git a/lily/translator.cc b/lily/translator.cc
index 1e89cb3d27ff807ed3cf35e83bd48353cf5fecef..897b30a0cf3124e94d2380b52265a024e15ef867 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -8,7 +8,7 @@
 
 
 #include "translator.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "translator-group.hh"
 #include "translator-def.hh"
 

diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc
index 86c9b84849016f070c276e12edacec7426f1a9da..42f797cc75eefade748b599d45093b8424c49f6e 100644 (file)
--- a/lily/transposed-music.cc
+++ b/lily/transposed-music.cc
@@ -8,7 +8,7 @@
  */
 
 #include "transposed-music.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 Transposed_music::Transposed_music (SCM l)
   : Music_wrapper (l)

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index b58cd43d01dbf97d572bd9a460633990d3efe1a7..881bff555093442137b73b1ce669d8b6bef4daa2 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -26,7 +26,7 @@
 
 #include "beam.hh"
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
 #include "paper-def.hh"

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 9bd90c397f2c9e9bd3057075880376d14e2c7742..16c21f425b5551af555c024a377496c2eac0c208 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -15,7 +15,7 @@
 #include "music-iterator.hh"
 #include "repeated-music.hh"
 #include "music-list.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "translator-group.hh"
 
 /**

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 1c3d2fd1a45c378ecd14593a58330dcbc4159a70..ad1a7306e9676813dcefd95ddd4bd2706e54e046 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include "box.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "font-interface.hh"
 #include "molecule.hh"
 #include "paper-column.hh"