From 675533acf58b9b863adc830f175696735ca6dc95 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 11 Jul 2002 10:55:26 +0000 Subject: [PATCH] * lily/include/debug.hh: deprecate. --- ChangeLog | 2 ++ lily/all-font-metrics.cc | 2 +- lily/audio-column.cc | 2 +- lily/audio-element.cc | 2 +- lily/audio-item.cc | 2 +- lily/auto-beam-engraver.cc | 2 +- lily/bar-line.cc | 2 +- lily/breathing-sign.cc | 2 +- lily/change-iterator.cc | 3 ++- lily/chord.cc | 2 +- lily/clef-engraver.cc | 2 +- lily/column-x-positions.cc | 2 +- lily/command-request.cc | 2 +- lily/custos.cc | 2 +- lily/dimensions.cc | 2 +- lily/dynamic-engraver.cc | 2 +- lily/engraver-group-engraver.cc | 2 +- lily/global-translator.cc | 2 +- lily/gourlay-breaking.cc | 3 ++- lily/hairpin.cc | 2 +- lily/hara-kiri-group-spanner.cc | 2 +- lily/includable-lexer.cc | 2 +- lily/include/debug.hh | 16 ---------------- lily/include/hairpin.hh | 1 + lily/include/main.hh | 1 + lily/item.cc | 2 +- lily/lexer.ll | 2 +- lily/lily-guile.cc | 2 +- lily/lyric-extender.cc | 2 +- lily/main.cc | 2 +- lily/midi-def.cc | 2 +- lily/midi-item.cc | 2 +- lily/midi-stream.cc | 2 +- lily/midi-walker.cc | 2 +- lily/molecule.cc | 2 +- lily/multi-measure-rest.cc | 2 +- lily/music-iterator.cc | 2 +- lily/music-output-def.cc | 2 +- lily/music-sequence.cc | 2 +- lily/music.cc | 2 +- lily/musical-request.cc | 2 +- lily/my-lily-lexer.cc | 2 +- lily/my-lily-parser.cc | 2 +- lily/note-collision.cc | 2 +- lily/note-column.cc | 2 +- lily/note-head.cc | 2 +- lily/note-performer.cc | 2 +- lily/paper-column.cc | 3 ++- lily/paper-outputter.cc | 2 +- lily/paper-score.cc | 2 +- lily/parser.yy | 2 +- lily/performance.cc | 2 +- lily/performer-group-performer.cc | 2 +- lily/performer.cc | 2 +- lily/phrasing-slur-engraver.cc | 2 +- lily/pitch.cc | 2 +- lily/porrectus.cc | 2 +- lily/relative-octave-music.cc | 2 +- lily/repeated-music.cc | 2 +- lily/request-chord-iterator.cc | 2 +- lily/request.cc | 2 +- lily/rest-collision-engraver.cc | 2 +- lily/rest-collision.cc | 2 +- lily/rhythmic-head.cc | 2 +- lily/rod.cc | 2 +- lily/score-engraver.cc | 4 ++-- lily/score-performer.cc | 2 +- lily/score.cc | 2 +- lily/scores.cc | 2 +- lily/script.cc | 2 +- lily/separation-item.cc | 2 +- lily/sequential-music-iterator.cc | 2 +- lily/side-position-interface.cc | 2 +- lily/simultaneous-music-iterator.cc | 2 +- lily/slur-bezier-bow.cc | 2 +- lily/slur-engraver.cc | 2 +- lily/slur.cc | 2 +- lily/spacing-spanner.cc | 11 +++++++++-- lily/spanner.cc | 2 +- lily/spring-smob.cc | 2 +- lily/staff-performer.cc | 2 +- lily/staff-symbol.cc | 2 +- lily/stem-tremolo.cc | 2 +- lily/stem.cc | 2 +- lily/system.cc | 2 +- lily/text-item.cc | 2 +- lily/text-spanner.cc | 2 +- lily/tfm-reader.cc | 2 +- lily/tfm.cc | 2 +- lily/tie.cc | 2 +- lily/timing-translator.cc | 2 +- lily/translator-ctors.cc | 2 +- lily/translator-group.cc | 2 +- lily/translator.cc | 2 +- lily/transposed-music.cc | 2 +- lily/tuplet-bracket.cc | 2 +- lily/unfolded-repeat-iterator.cc | 2 +- lily/volta-bracket.cc | 2 +- 98 files changed, 110 insertions(+), 112 deletions(-) delete mode 100644 lily/include/debug.hh diff --git a/ChangeLog b/ChangeLog index 8e86b94f0d..1cab6d4e8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-07-11 Han-Wen Nienhuys + * 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 91fcbcf3de..6e00f0dce7 100644 --- 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 2e176ac50b..15050f57ee 100644 --- 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 3c9712680e..1b910a6816 100644 --- 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 6b5f43dce7..68ed3bc4cb 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -5,7 +5,7 @@ (c) 1997--2002 Jan Nieuwenhuizen */ -#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 6216b9f475..15e931c7cb 100644 --- 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 f48667ede9..1499a34bde 100644 --- 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 85a17b450f..730a3f4964 100644 --- 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 cdae5724b4..6d0ba3d1c2 100644 --- 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 bb41246ffa..f0ef3685bc 100644 --- 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 1c9151a690..75de5c144c 100644 --- 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 b84a7f1ae5..0958c2e431 100644 --- 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 061063eacc..55cc30cd1f 100644 --- 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 d4025b188e..0a196792de 100644 --- 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 1023450ee4..ba33ccdff3 100644 --- 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 f51dfb20fc..0def592438 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -5,7 +5,7 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#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 f08a71909c..71dab3bd09 100644 --- 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 9ee578925a..0f6d75c117 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -7,7 +7,7 @@ */ #include -#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 a70f658ea2..ac250e9684 100644 --- 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 a7046766aa..458a7b5361 100644 --- 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 dba478e0a3..8a3f6d0558 100644 --- 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 e38dbd363e..914934bf95 100644 --- 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 index 956b06b54f..0000000000 --- a/lily/include/debug.hh +++ /dev/null @@ -1,16 +0,0 @@ -/* - Argh! this sux! implementation not liblily - */ - -#ifndef DEBUG_HH -#define DEBUG_HH - -#include - -#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 7ad6dd95cf..f27e8851e1 100644 --- 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 e7caae383c..80c18a3e83 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -20,6 +20,7 @@ String find_file (String); void call_constructors (); extern Array get_inclusion_names (); extern void set_inclusion_names (Array); +void progress_indication (String); /* options */ extern bool dependency_global_b; diff --git a/lily/item.cc b/lily/item.cc index a16253825a..9c8a004fde 100644 --- 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 c90632a355..76d17e4c13 100644 --- 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 89bf7e82b8..8630c6d68e 100644 --- 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 0c7bb4ec44..9cb03b14ec 100644 --- 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 f467bdda24..6e2435142b 100644 --- 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 2f2479815d..fa8f01643c 100644 --- 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 0203c2a9ce..22176a87aa 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -6,7 +6,7 @@ (c) 1997--2002 Jan Nieuwenhuizen */ -#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 afce7e3b54..315da95860 100644 --- 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 58dbb45c8f..b544dc3fb0 100644 --- 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 f044a4cb88..e748b5d77b 100644 --- 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 cba08eca96..1d60568d45 100644 --- 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 b75f1e3281..21d3edfd0a 100644 --- 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 f2f3195b6e..399feeccd7 100644 --- 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 69755be050..44ec103c40 100644 --- 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 4c0fd48116..db7b1f4d65 100644 --- 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 4beca66cf7..ac24a4c917 100644 --- 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 de7e68637d..bcfc85c40b 100644 --- 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 ff1baa3642..fcba6c4691 100644 --- 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 5468ff529f..bb50797597 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -7,7 +7,7 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#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 9e6c4cdc1c..8b479cd38b 100644 --- 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 2b2983be92..379ee656eb 100644 --- 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 3b39293e27..b6076e94f5 100644 --- 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 2abeff483e..ad2db208f7 100644 --- 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 5e8c509807..65c4e384d7 100644 --- 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 9193e92c0a..cfa9781bd7 100644 --- 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 d29412b1af..e7d9d6498a 100644 --- 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 9e1b7058c3..1a941c6697 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -7,7 +7,7 @@ */ #include -#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 8d5b6b7f60..e97182933d 100644 --- 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 9f0e889ce7..5fe1d64916 100644 --- 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 329228cddc..b1e621a910 100644 --- 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 fa06546afe..06c19f5473 100644 --- 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 c9865f68b2..b4947c43b5 100644 --- 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 b9aeb445a3..14890694c3 100644 --- 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 3ae277f8f5..7b3ffe6e4d 100644 --- 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 6bd81ae335..2a23dba32c 100644 --- 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 aefeb1f7a0..5b0911a2da 100644 --- 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 a1d4d7f0bb..fc1e71e383 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -6,7 +6,7 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#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 49e85e2d95..0292881cb4 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -8,7 +8,7 @@ #include // 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 9f6b18ca1c..18f341cebc 100644 --- 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 1577baa310..14f710ff4b 100644 --- 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 efa97d2c9a..d4d5e0aab7 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -6,8 +6,8 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#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 a8d2dd7218..d79efd76fc 100644 --- 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 b66a3ca34c..94a3a25298 100644 --- 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 a76b86ba41..5073a1daa2 100644 --- 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 7483b07a79..8ff25c0988 100644 --- 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 1e439066b5..49467607be 100644 --- 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 b3d0e5bc09..63f7e072f0 100644 --- 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 b1d5c190e1..1c9b34e4a3 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -9,7 +9,7 @@ #include // 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 d2c99bb280..cc246f8a48 100644 --- 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 de18ddd5f6..54620e6606 100644 --- a/lily/slur-bezier-bow.cc +++ b/lily/slur-bezier-bow.cc @@ -6,7 +6,7 @@ (c) 2000--2002 Jan Nieuwenhuizen */ -#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 2599059008..42ede51908 100644 --- 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 8a05cc744e..0e86220d10 100644 --- 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 483f9715d2..4c3f635950 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -10,7 +10,9 @@ #include #include +#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 0c65019c4f..0c11f2833a 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -9,7 +9,7 @@ #include -#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 b00bd9df12..3ab9618ef0 100644 --- 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 57ffc8efd3..2479dc3ae4 100644 --- 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 c2e2bb0c7f..841f060ef1 100644 --- 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 5af470bae5..612a5ad1ec 100644 --- 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 b80418aa89..7b61a8cfa5 100644 --- 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 af5fecc44e..3cb30a2e95 100644 --- 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 19fbf548d2..7ed5d1ed8d 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -8,7 +8,7 @@ */ #include -#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 acbabdc56e..ebcac1ee55 100644 --- 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 c6a7952f9a..062b7c688d 100644 --- 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 89a09a5011..23bd86aef7 100644 --- 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 0f7f0830ce..5bac5978e7 100644 --- 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 f92b598a41..43ce9c83d0 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -7,7 +7,7 @@ (c) 1997--2002 Han-Wen Nienhuys */ -#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 849a732485..65f6528b83 100644 --- 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 bac3a47db0..f37563c6c2 100644 --- 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 1e89cb3d27..897b30a0cf 100644 --- 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 86c9b84849..42f797cc75 100644 --- 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 b58cd43d01..881bff5550 100644 --- 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 9bd90c397f..16c21f425b 100644 --- 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 1c3d2fd1a4..ad1a7306e9 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -9,7 +9,7 @@ #include #include "box.hh" -#include "debug.hh" +#include "warn.hh" #include "font-interface.hh" #include "molecule.hh" #include "paper-column.hh" -- 2.39.2