From d8082113a0df616e7beabc0417c3590a3fac7320 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 29 Nov 2006 18:19:45 +0100 Subject: [PATCH] trim duplicate headers. --- flower/file-path.cc | 2 -- flower/getopt-long.cc | 1 - flower/include/interval.hh | 2 -- flower/include/string-convert.hh | 1 - lily/accidental-placement.cc | 1 - lily/auto-change-iterator.cc | 1 + lily/axis-group-interface.cc | 3 --- lily/beam-concave.cc | 2 +- lily/book.cc | 2 -- lily/break-substitution.cc | 2 +- lily/breathing-sign.cc | 1 + lily/clef.cc | 1 - lily/context-property.cc | 1 - lily/context-specced-music-iterator.cc | 2 ++ lily/dimension-cache.cc | 1 + lily/directional-element-interface.cc | 1 + lily/dispatcher.cc | 1 - lily/dot-column.cc | 1 + lily/drum-note-performer.cc | 1 - lily/dynamic-engraver.cc | 1 - lily/easy-notation.cc | 1 - lily/engraver-group.cc | 1 - lily/engraver.cc | 1 - lily/event-chord-iterator.cc | 2 -- lily/event-iterator.cc | 1 - lily/figured-bass-continuation.cc | 1 - lily/font-metric-scheme.cc | 3 ++- lily/font-metric.cc | 1 - lily/forbid-break-engraver.cc | 1 - lily/general-scheme.cc | 1 - lily/global-context.cc | 1 - lily/grace-music.cc | 1 - lily/grid-line-interface.cc | 1 - lily/grob-info.cc | 1 - lily/grob-interface.cc | 1 - lily/grob-scheme.cc | 4 +--- lily/hara-kiri-group-spanner.cc | 1 - lily/include/accidental-interface.hh | 1 - lily/include/accidental-placement.hh | 2 +- lily/include/align-interface.hh | 1 - lily/include/ambitus.hh | 1 - lily/include/arpeggio.hh | 1 - lily/include/axis-group-interface.hh | 1 - lily/include/bar-line.hh | 1 - lily/include/bar.hh | 1 - lily/include/beam.hh | 1 - lily/include/book.hh | 2 +- lily/include/breathing-sign.hh | 2 +- lily/include/clef.hh | 1 - lily/include/context-def.hh | 2 ++ lily/include/context.hh | 1 - lily/include/custos.hh | 1 - lily/include/directional-element-interface.hh | 3 ++- lily/include/dot-column.hh | 2 +- lily/include/dots.hh | 1 - lily/include/grid-line-interface.hh | 1 - lily/include/hairpin.hh | 7 ++----- lily/include/hara-kiri-group-spanner.hh | 1 - lily/include/horizontal-bracket.hh | 1 - lily/include/input.hh | 3 --- lily/include/item.hh | 2 -- lily/include/lily-parser.hh | 1 - lily/include/line-spanner.hh | 5 +---- lily/include/melody-spanner.hh | 1 - lily/include/mensural-ligature.hh | 1 - lily/include/multi-measure-rest.hh | 1 - lily/include/music-sequence.hh | 4 +++- lily/include/music-wrapper-iterator.hh | 1 - lily/include/music.hh | 1 - lily/include/note-collision.hh | 3 +-- lily/include/output-def.hh | 1 - lily/include/page-breaking.hh | 1 - lily/include/page-turn-page-breaking.hh | 2 -- lily/include/pango-font.hh | 3 +-- lily/include/paper-column.hh | 1 - lily/include/prob.hh | 2 ++ lily/include/rest-collision.hh | 1 - lily/include/rest.hh | 1 - lily/include/rhythmic-head.hh | 1 - lily/include/score.hh | 1 - lily/include/script-column.hh | 1 - lily/include/script-interface.hh | 1 - lily/include/semi-tie-column.hh | 1 - lily/include/semi-tie.hh | 2 +- lily/include/skyline.hh | 1 + lily/include/slur-configuration.hh | 2 +- lily/include/slur-scoring.hh | 1 - lily/include/slur.hh | 4 +--- lily/include/smobs.hh | 1 - lily/include/source-file.hh | 1 - lily/include/spaceable-grob.hh | 1 - lily/include/spacing-spanner.hh | 1 - lily/include/span-bar.hh | 1 - lily/include/spanner.hh | 2 -- lily/include/staff-symbol.hh | 1 - lily/include/stem-info.hh | 1 + lily/include/stem-tremolo.hh | 1 - lily/include/stem.hh | 1 - lily/include/system-start-delimiter.hh | 1 - lily/include/system.hh | 2 -- lily/include/text-spanner.hh | 1 - lily/include/tie-column.hh | 3 +-- lily/include/tie-configuration.hh | 4 +--- lily/include/tie-formatting-problem.hh | 2 -- lily/include/tie.hh | 1 - lily/include/timing-translator.hh | 2 -- lily/include/translator-dispatch-list.hh | 1 - lily/include/translator-group.hh | 1 - lily/include/translator.hh | 3 +-- lily/include/tuplet-bracket.hh | 1 - lily/include/vaticana-ligature.hh | 1 - lily/include/volta-bracket.hh | 1 - lily/instrument-name-engraver.cc | 1 - lily/ledger-line-spanner.cc | 1 - lily/lily-guile.cc | 2 -- lily/lily-parser-scheme.cc | 1 - lily/lyric-combine-music-iterator.cc | 1 - lily/lyric-combine-music.cc | 2 -- lily/lyric-extender.cc | 1 - lily/main.cc | 1 - lily/modified-font-metric.cc | 1 - lily/module-scheme.cc | 4 ++-- lily/music-iterator.cc | 3 +-- lily/music-output.cc | 1 - lily/music-scheme.cc | 1 - lily/music-sequence.cc | 5 +++-- lily/music-wrapper-iterator.cc | 1 + lily/music.cc | 1 - lily/note-head.cc | 1 + lily/output-def-scheme.cc | 4 ++-- lily/page-turn-engraver.cc | 1 - lily/pango-font.cc | 7 ++++++- lily/paper-column-engraver.cc | 1 - lily/parenthesis-engraver.cc | 1 - lily/part-combine-iterator.cc | 1 - lily/percent-repeat-iterator.cc | 1 - lily/pointer-group-interface.cc | 2 -- lily/quote-iterator.cc | 1 - lily/relative-octave-check.cc | 1 - lily/relative-octave-music.cc | 1 - lily/rest-collision.cc | 1 + lily/rest.cc | 1 + lily/score-engraver.cc | 1 - lily/score-performer.cc | 2 -- lily/script-column.cc | 1 + lily/semi-tie-column.cc | 1 - lily/side-position-interface.cc | 1 + lily/simple-closure.cc | 1 - lily/skyline.cc | 3 +++ lily/slur.cc | 4 ++-- lily/spacing-determine-loose-columns.cc | 1 + lily/spanner.cc | 3 --- lily/tie-configuration.cc | 1 + lily/tie-formatting-problem.cc | 1 - lily/translator-dispatch-list.cc | 2 -- lily/translator-group-ctors.cc | 2 -- lily/translator-group.cc | 1 - lily/ttf.cc | 1 - 158 files changed, 65 insertions(+), 183 deletions(-) diff --git a/flower/file-path.cc b/flower/file-path.cc index 63ecdb833a..31e7e993ef 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -9,8 +9,6 @@ #include "file-path.hh" -#include "std-string.hh" - #include #include diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index 17c1eafb7d..bb51a01863 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -12,7 +12,6 @@ #include "config.hh" #include "international.hh" -#include "std-string.hh" #if !HAVE_GETTEXT inline char * diff --git a/flower/include/interval.hh b/flower/include/interval.hh index 7b7d4f54e5..c485f32016 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -9,8 +9,6 @@ #include -#include "std-string.hh" - #include "flower-proto.hh" #include "drul-array.hh" diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh index 64e23e0f8b..1277890929 100644 --- a/flower/include/string-convert.hh +++ b/flower/include/string-convert.hh @@ -9,7 +9,6 @@ #include using namespace std; -#include "std-string.hh" #include "flower-proto.hh" /** The functor string_convert handles all conversions to/from string diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index a96f0e2542..4161e8df3b 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -15,7 +15,6 @@ #include "music.hh" #include "note-collision.hh" #include "note-column.hh" -#include "pitch.hh" #include "pointer-group-interface.hh" #include "skyline.hh" #include "stream-event.hh" diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index ade8303e0d..a935bfc05a 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -9,6 +9,7 @@ #include "context.hh" #include "direction.hh" #include "international.hh" +#include "music.hh" #include "music-wrapper-iterator.hh" class Auto_change_iterator : public Music_wrapper_iterator diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 1ed274ec76..2ede25493a 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -11,14 +11,11 @@ #include "align-interface.hh" #include "directional-element-interface.hh" #include "pointer-group-interface.hh" -#include "grob.hh" #include "grob-array.hh" #include "hara-kiri-group-spanner.hh" #include "international.hh" -#include "item.hh" #include "paper-column.hh" #include "paper-score.hh" -#include "std-vector.hh" #include "system.hh" #include "warn.hh" diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc index 47ee57bbf5..ee351d0a26 100644 --- a/lily/beam-concave.cc +++ b/lily/beam-concave.cc @@ -3,9 +3,9 @@ */ #include "pointer-group-interface.hh" -#include "std-vector.hh" #include "stem.hh" #include "beam.hh" +#include "grob.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" diff --git a/lily/book.cc b/lily/book.cc index f307bcf3c3..44f7ee4ef9 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -13,12 +13,10 @@ using namespace std; #include "lilypond-key.hh" #include "main.hh" -#include "music-output.hh" #include "music.hh" #include "output-def.hh" #include "paper-book.hh" #include "score.hh" -#include "stencil.hh" #include "text-interface.hh" #include "warn.hh" #include "performance.hh" diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index 20ae27b01f..4885c6ed72 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -10,9 +10,9 @@ #include using namespace std; -#include "grob-array.hh" #include "item.hh" #include "system.hh" +#include "grob-array.hh" static SCM break_criterion; void diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 36b6502fc1..d0acbcea05 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -20,6 +20,7 @@ #include "direction.hh" #include "text-interface.hh" #include "font-interface.hh" +#include "grob.hh" /* TODO: thickness should be a grob property (unit: linethickness) diff --git a/lily/clef.cc b/lily/clef.cc index 769c90195b..36427055f5 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -11,7 +11,6 @@ #include "font-interface.hh" #include "international.hh" #include "item.hh" -#include "std-string.hh" #include "stencil.hh" MAKE_SCHEME_CALLBACK (Clef, calc_glyph_name, 1); diff --git a/lily/context-property.cc b/lily/context-property.cc index 851bbe0a41..9496518a23 100644 --- a/lily/context-property.cc +++ b/lily/context-property.cc @@ -12,7 +12,6 @@ #include "international.hh" #include "item.hh" #include "main.hh" -#include "paper-column.hh" #include "simple-closure.hh" #include "spanner.hh" #include "warn.hh" diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc index 86342a5eb4..59b3ba907c 100644 --- a/lily/context-specced-music-iterator.cc +++ b/lily/context-specced-music-iterator.cc @@ -9,6 +9,8 @@ #include "music-wrapper-iterator.hh" #include "context.hh" +#include "music.hh" + class Context_specced_music_iterator : public Music_wrapper_iterator { diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index ebf4ad93e2..1a98ab2a43 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -8,6 +8,7 @@ #include "dimension-cache.hh" + #include "warn.hh" #include "grob.hh" diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index 4c46118b1f..d828544977 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -8,6 +8,7 @@ #include "directional-element-interface.hh" #include "warn.hh" +#include "grob.hh" Direction get_grob_direction (Grob *me) diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc index fb3df2a40f..6107594900 100644 --- a/lily/dispatcher.cc +++ b/lily/dispatcher.cc @@ -10,7 +10,6 @@ #include "input.hh" #include "international.hh" #include "ly-smobs.icc" -#include "stream-event.hh" #include "warn.hh" IMPLEMENT_SMOBS (Dispatcher); diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 33af9f381b..a07dfcde11 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -21,6 +21,7 @@ using namespace std; #include "side-position-interface.hh" #include "axis-group-interface.hh" #include "stem.hh" +#include "grob.hh" #include "pointer-group-interface.hh" /* diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index 19ba7bbf90..7aa463b576 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -10,7 +10,6 @@ #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" -#include "pitch.hh" #include "stream-event.hh" #include "translator.icc" #include "warn.hh" diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index fc87783bba..5c3d0feecd 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -23,7 +23,6 @@ #include "staff-symbol-referencer.hh" #include "stream-event.hh" #include "warn.hh" -#include "item.hh" #include "spanner.hh" #include "translator.icc" diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc index 2fb0d72234..c6ecb0e20f 100644 --- a/lily/easy-notation.cc +++ b/lily/easy-notation.cc @@ -15,7 +15,6 @@ using namespace std; #include "grob.hh" #include "music.hh" #include "output-def.hh" -#include "pitch.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" #include "stream-event.hh" diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc index 525c1fa857..4c5a5864c3 100644 --- a/lily/engraver-group.cc +++ b/lily/engraver-group.cc @@ -11,7 +11,6 @@ #include "engraver-group.hh" #include "grob.hh" #include "paper-score.hh" -#include "stream-event.hh" #include "translator-dispatch-list.hh" #include "warn.hh" diff --git a/lily/engraver.cc b/lily/engraver.cc index b61850eb2f..c8eb805638 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -10,7 +10,6 @@ #include "context.hh" #include "international.hh" -#include "item.hh" #include "lilypond-key.hh" #include "music.hh" #include "paper-column.hh" diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc index 89a0f383a9..ea1a105ea4 100644 --- a/lily/event-chord-iterator.cc +++ b/lily/event-chord-iterator.cc @@ -14,8 +14,6 @@ #include "input.hh" #include "international.hh" #include "music.hh" -#include "pitch.hh" -#include "stream-event.hh" #include "warn.hh" Event_chord_iterator::Event_chord_iterator () diff --git a/lily/event-iterator.cc b/lily/event-iterator.cc index 8e6d6df26d..9f3b353c50 100644 --- a/lily/event-iterator.cc +++ b/lily/event-iterator.cc @@ -13,7 +13,6 @@ #include "input.hh" #include "international.hh" #include "music.hh" -#include "pitch.hh" #include "warn.hh" Event_iterator::Event_iterator () diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc index 2830b10295..0020b11e7f 100644 --- a/lily/figured-bass-continuation.cc +++ b/lily/figured-bass-continuation.cc @@ -8,7 +8,6 @@ */ #include "line-interface.hh" -#include "lily-guile.hh" #include "spanner.hh" #include "output-def.hh" #include "item.hh" diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc index 64d6f5c400..d04d1eab8a 100644 --- a/lily/font-metric-scheme.cc +++ b/lily/font-metric-scheme.cc @@ -6,9 +6,10 @@ (c) 2005--2006 Han-Wen Nienhuys */ +#include "font-metric.hh" + #include "warn.hh" #include "stencil.hh" -#include "font-metric.hh" #include "modified-font-metric.hh" LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph", diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 7cfb8d749c..03625cc946 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -18,7 +18,6 @@ using namespace std; #include "modified-font-metric.hh" #include "open-type-font.hh" #include "stencil.hh" -#include "virtual-methods.hh" #include "warn.hh" #include "ly-smobs.icc" diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc index 64dedf7358..c44bbb6012 100644 --- a/lily/forbid-break-engraver.cc +++ b/lily/forbid-break-engraver.cc @@ -10,7 +10,6 @@ #include "engraver.hh" #include "grob.hh" #include "input.hh" -#include "moment.hh" #include "pitch.hh" #include "rhythmic-head.hh" diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 0fcb16bb1d..142e7c2bef 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -16,7 +16,6 @@ using namespace std; #include "international.hh" #include "libc-extension.hh" #include "lily-guile.hh" -#include "std-string.hh" #include "misc.hh" #include "warn.hh" #include "version.hh" diff --git a/lily/global-context.cc b/lily/global-context.cc index 858922562f..6e0e1c4379 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -18,7 +18,6 @@ using namespace std; #include "music-iterator.hh" #include "music.hh" #include "output-def.hh" -#include "stream-event.hh" #include "warn.hh" Global_context::Global_context (Output_def *o, Object_key *key) diff --git a/lily/grace-music.cc b/lily/grace-music.cc index bf3e304f16..51ea066f1a 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -8,7 +8,6 @@ #include "music.hh" #include "music-wrapper.hh" -#include "moment.hh" class Grace_music { diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc index f5e98ffabe..f24f96829f 100644 --- a/lily/grid-line-interface.cc +++ b/lily/grid-line-interface.cc @@ -12,7 +12,6 @@ #include "pointer-group-interface.hh" #include "lookup.hh" #include "output-def.hh" -#include "stencil.hh" MAKE_SCHEME_CALLBACK (Grid_line_interface, print, 1); SCM diff --git a/lily/grob-info.cc b/lily/grob-info.cc index 23ff736d95..62af8f3256 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -8,7 +8,6 @@ #include "context.hh" #include "grob-info.hh" -#include "grob.hh" #include "item.hh" #include "music.hh" #include "spanner.hh" diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index afae13dbec..c47937db0f 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -11,7 +11,6 @@ #include "grob.hh" #include "international.hh" #include "protected-scm.hh" -#include "std-string.hh" #include "string-convert.hh" #include "warn.hh" #include "misc.hh" diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index b31447ffac..be431b7e10 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -7,15 +7,13 @@ Han-Wen Nienhuys */ -#include "grob.hh" - #include "warn.hh" // error() #include "item.hh" #include "output-def.hh" #include "system.hh" #include "font-interface.hh" #include "paper-score.hh" - +#include "grob-array.hh" LY_DEFINE (ly_grob_property_data, "ly:grob-property-data", 2, 0, 0, (SCM grob, SCM sym), diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 0dec921395..90a06f145a 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -14,7 +14,6 @@ #include "axis-group-interface.hh" #include "spanner.hh" #include "warn.hh" -#include "item.hh" MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 1); SCM diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh index 62eeb1b5ad..8fd57a5fd9 100644 --- a/lily/include/accidental-interface.hh +++ b/lily/include/accidental-interface.hh @@ -12,7 +12,6 @@ #include "std-vector.hh" #include "box.hh" -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh index ed2703af87..c34fc0b766 100644 --- a/lily/include/accidental-placement.hh +++ b/lily/include/accidental-placement.hh @@ -10,7 +10,7 @@ #define ACCIDENTAL_PLACEMENT_HH #include "grob-interface.hh" -#include "grob.hh" +#include "lily-proto.hh" class Accidental_placement { diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 5363ead48d..54005bd986 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -10,7 +10,6 @@ #define ALIGN_INTERFACE_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "std-vector.hh" #include "grob-interface.hh" diff --git a/lily/include/ambitus.hh b/lily/include/ambitus.hh index 7bd37ecc29..d687e20be4 100644 --- a/lily/include/ambitus.hh +++ b/lily/include/ambitus.hh @@ -9,7 +9,6 @@ #ifndef AMBITUS_HH #define AMBITUS_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh index ce69cddc17..4d740dbc15 100644 --- a/lily/include/arpeggio.hh +++ b/lily/include/arpeggio.hh @@ -9,7 +9,6 @@ #ifndef ARPEGGIO_HH #define ARPEGGIO_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index e03d7326ad..b38537c661 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -11,7 +11,6 @@ #include "std-vector.hh" #include "lily-proto.hh" -#include "lily-guile.hh" #include "grob-interface.hh" struct Axis_group_interface diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh index d06c8314ea..d7b51cbad9 100644 --- a/lily/include/bar-line.hh +++ b/lily/include/bar-line.hh @@ -7,7 +7,6 @@ #ifndef BAR_HH #define BAR_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/bar.hh b/lily/include/bar.hh index eb74b7ac6d..ee737a1beb 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -7,7 +7,6 @@ #ifndef BAR_HH #define BAR_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/beam.hh b/lily/include/beam.hh index ae138911ee..9126bfbfec 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -13,7 +13,6 @@ #include "grob-interface.hh" #include "std-vector.hh" #include "lily-proto.hh" -#include "lily-guile.hh" #include "stem-info.hh" /* diff --git a/lily/include/book.hh b/lily/include/book.hh index 5bdb47359c..03553138d5 100644 --- a/lily/include/book.hh +++ b/lily/include/book.hh @@ -9,11 +9,11 @@ #ifndef BOOK_HH #define BOOK_HH -#include "input.hh" #include "lily-proto.hh" #include "std-vector.hh" #include "object-key.hh" #include "std-string.hh" +#include "virtual-methods.hh" class Book { diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh index 237fd158be..69d46e67a2 100644 --- a/lily/include/breathing-sign.hh +++ b/lily/include/breathing-sign.hh @@ -10,7 +10,7 @@ #define BREATHING_SIGN_HH #include "grob-interface.hh" -#include "lily-guile.hh" +#include "lily-proto.hh" class Grob; diff --git a/lily/include/clef.hh b/lily/include/clef.hh index aaa7435685..6595fc4687 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -9,7 +9,6 @@ #ifndef CLEF_HH #define CLEF_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh index 5884ff128e..ac7b776208 100644 --- a/lily/include/context-def.hh +++ b/lily/include/context-def.hh @@ -13,6 +13,8 @@ #include "lily-proto.hh" #include "smobs.hh" #include "input.hh" +#include "virtual-methods.hh" + /* The definition of a interpretation context as given in the diff --git a/lily/include/context.hh b/lily/include/context.hh index 74058ad798..8eba283027 100644 --- a/lily/include/context.hh +++ b/lily/include/context.hh @@ -10,7 +10,6 @@ #define CONTEXT_HH #include "context-key-manager.hh" -#include "lily-proto.hh" #include "listener.hh" #include "moment.hh" #include "std-vector.hh" diff --git a/lily/include/custos.hh b/lily/include/custos.hh index 45914f77ab..d1a26ab4a4 100644 --- a/lily/include/custos.hh +++ b/lily/include/custos.hh @@ -9,7 +9,6 @@ #ifndef CUSTOS_HH #define CUSTOS_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh index 9fff2486ad..7da0eae623 100644 --- a/lily/include/directional-element-interface.hh +++ b/lily/include/directional-element-interface.hh @@ -9,7 +9,8 @@ #ifndef DIRECTIONAL_ELEMENT_HH #define DIRECTIONAL_ELEMENT_HH -#include "grob.hh" +#include "lily-proto.hh" +#include "direction.hh" // what is the advantage not having these two as STATICs of GROB -- jcn void set_grob_direction (Grob *, Direction); diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 8362e84613..503b1425ae 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -9,7 +9,7 @@ #ifndef DOT_COLUMN_HH #define DOT_COLUMN_HH -#include "lily-guile.hh" +#include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 8f83f3a057..df1d37289b 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -10,7 +10,6 @@ #define DOTS_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "grob-interface.hh" class Dots diff --git a/lily/include/grid-line-interface.hh b/lily/include/grid-line-interface.hh index 1ff2de217f..abb02c9488 100644 --- a/lily/include/grid-line-interface.hh +++ b/lily/include/grid-line-interface.hh @@ -10,7 +10,6 @@ #define GRID_LINE_INTERFACE_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "grob-interface.hh" diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh index b76b4373a3..0d7c92ff23 100644 --- a/lily/include/hairpin.hh +++ b/lily/include/hairpin.hh @@ -8,13 +8,10 @@ #ifndef HAIRPIN_HH #define HAIRPIN_HH -#include "grob-interface.hh" -#include "lily-guile.hh" +#include "grob-interface.hh" #include "lily-proto.hh" -/** - The hairpin symbol. -*/ + struct Hairpin { public: diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 93986178b6..42692c7396 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -9,7 +9,6 @@ #ifndef HARA_KIRI_VERTICAL_GROUP_SPANNER_HH #define HARA_KIRI_VERTICAL_GROUP_SPANNER_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/horizontal-bracket.hh b/lily/include/horizontal-bracket.hh index dea58a3ccc..d8cbef6c06 100644 --- a/lily/include/horizontal-bracket.hh +++ b/lily/include/horizontal-bracket.hh @@ -9,7 +9,6 @@ #ifndef HORIZONTAL_BRACKET_HH #define HORIZONTAL_BRACKET_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "std-vector.hh" #include "grob-interface.hh" diff --git a/lily/include/input.hh b/lily/include/input.hh index 625910ea74..15f54aef22 100644 --- a/lily/include/input.hh +++ b/lily/include/input.hh @@ -10,7 +10,6 @@ #define INPUT_HH #include "flower-proto.hh" -#include "std-string.hh" /** Base class for anything that records its poisition in the parse file. @@ -53,8 +52,6 @@ public: }; - -#include "input.hh" #include "smobs.hh" SCM make_input (Input spot); diff --git a/lily/include/item.hh b/lily/include/item.hh index d1d7a2f7d9..cb8c61523e 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -8,8 +8,6 @@ #ifndef ITEM_HH #define ITEM_HH -#include "grob-interface.hh" -#include "box.hh" #include "grob.hh" /** diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh index d4557e3688..b07734769a 100644 --- a/lily/include/lily-parser.hh +++ b/lily/include/lily-parser.hh @@ -11,7 +11,6 @@ #include "duration.hh" #include "input.hh" -#include "std-vector.hh" #include "pitch.hh" /** diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh index 4c7e4471d6..de1170b6b0 100644 --- a/lily/include/line-spanner.hh +++ b/lily/include/line-spanner.hh @@ -9,12 +9,9 @@ #ifndef LINE_SPANNER_HH #define LINE_SPANNER_HH -#include "lily-guile.hh" +#include "lily-proto.hh" #include "grob-interface.hh" -class Grob; -class Stencil; - class Line_spanner { public: diff --git a/lily/include/melody-spanner.hh b/lily/include/melody-spanner.hh index a02fc1f576..0b67613cfa 100644 --- a/lily/include/melody-spanner.hh +++ b/lily/include/melody-spanner.hh @@ -10,7 +10,6 @@ #ifndef MELODY_SPANNER_HH #define MELODY_SPANNER_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/mensural-ligature.hh b/lily/include/mensural-ligature.hh index e887e07a9a..afb04a2ef2 100644 --- a/lily/include/mensural-ligature.hh +++ b/lily/include/mensural-ligature.hh @@ -11,7 +11,6 @@ #define MENSURAL_LIGATURE_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "grob-interface.hh" diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index 2b29582869..dd0d4054ae 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -10,7 +10,6 @@ #define MULTI_MEASURE_REST_HH #include "grob-interface.hh" -#include "lily-guile.hh" #include "rod.hh" class Multi_measure_rest diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh index 9287bc6e2b..dc1046aaa8 100644 --- a/lily/include/music-sequence.hh +++ b/lily/include/music-sequence.hh @@ -9,7 +9,9 @@ #ifndef MUSIC_SEQUENCE_HH #define MUSIC_SEQUENCE_HH -#include "music.hh" +#include "pitch.hh" +#include "moment.hh" +#include "lily-guile.hh" struct Music_sequence { diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh index d249428654..ca118be037 100644 --- a/lily/include/music-wrapper-iterator.hh +++ b/lily/include/music-wrapper-iterator.hh @@ -9,7 +9,6 @@ #ifndef MUSIC_WRAPPER_ITERATOR_HH #define MUSIC_WRAPPER_ITERATOR_HH -#include "music.hh" #include "music-iterator.hh" /** diff --git a/lily/include/music.hh b/lily/include/music.hh index 223764bb14..f7e4407f3b 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -9,7 +9,6 @@ #ifndef MUSIC_HH #define MUSIC_HH -#include "virtual-methods.hh" #include "smobs.hh" #include "moment.hh" #include "pitch.hh" diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh index 20de1ca362..7500ea45e9 100644 --- a/lily/include/note-collision.hh +++ b/lily/include/note-collision.hh @@ -9,10 +9,9 @@ #ifndef COLLISION_HH #define COLLISION_HH -#include "lily-proto.hh" -#include "lily-guile.hh" #include "std-vector.hh" #include "grob-interface.hh" +#include "lily-proto.hh" /** diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh index 8670be67fb..6a6165037e 100644 --- a/lily/include/output-def.hh +++ b/lily/include/output-def.hh @@ -9,7 +9,6 @@ #ifndef MUSIC_OUTPUT_DEF_HH #define MUSIC_OUTPUT_DEF_HH -#include "std-string.hh" #include "lily-proto.hh" #include "virtual-methods.hh" #include "smobs.hh" diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh index 548100ca8b..7c2a99e381 100644 --- a/lily/include/page-breaking.hh +++ b/lily/include/page-breaking.hh @@ -11,7 +11,6 @@ #define PAGE_BREAKING_HH #include "constrained-breaking.hh" -#include "lily-guile.hh" /* Either a paper-score, markup or header. */ diff --git a/lily/include/page-turn-page-breaking.hh b/lily/include/page-turn-page-breaking.hh index 6fb78bc67d..a109f1ff8f 100644 --- a/lily/include/page-turn-page-breaking.hh +++ b/lily/include/page-turn-page-breaking.hh @@ -11,9 +11,7 @@ #ifndef PAGE_TURN_PAGE_BREAKING_HH #define PAGE_TURN_PAGE_BREAKING_HH -#include "constrained-breaking.hh" #include "page-breaking.hh" -#include "lily-guile.hh" /* A dynamic programming solution to breaking pages diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh index 5449ec0a42..76b4d6c8eb 100644 --- a/lily/include/pango-font.hh +++ b/lily/include/pango-font.hh @@ -15,9 +15,8 @@ #include #include -#include "font-metric.hh" -#include "open-type-font.hh" +#include "font-metric.hh" class Pango_font : public Font_metric { diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index c182d6aa6c..542bd86e2b 100644 --- a/lily/include/paper-column.hh +++ b/lily/include/paper-column.hh @@ -11,7 +11,6 @@ #include "item.hh" #include "rod.hh" -#include "lily-proto.hh" class Paper_column : public Item { diff --git a/lily/include/prob.hh b/lily/include/prob.hh index 40d5f5e250..6c6f59be7c 100644 --- a/lily/include/prob.hh +++ b/lily/include/prob.hh @@ -10,6 +10,8 @@ #define PROPERTY_OBJECT_HH #include "stencil.hh" +#include "virtual-methods.hh" + /* A formatted "system" (A block of titling also is a Property_object) diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index c90883c2e2..5f2e165765 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -11,7 +11,6 @@ #include "grob-interface.hh" #include "lily-proto.hh" -#include "lily-guile.hh" class Rest_collision { diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 4d8be0e01c..20107120b7 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -9,7 +9,6 @@ #ifndef REST_HH #define REST_HH -#include "lily-guile.hh" #include "grob-interface.hh" class Grob; diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index f59e758a4b..2fae285707 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -10,7 +10,6 @@ #define RHYTHMIC_HEAD_HH #include "grob-interface.hh" -#include "lily-guile.hh" #include "lily-proto.hh" class Rhythmic_head diff --git a/lily/include/score.hh b/lily/include/score.hh index 039e1d236a..71b2037efb 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -15,7 +15,6 @@ #include "std-vector.hh" #include "smobs.hh" #include "virtual-methods.hh" -#include "std-string.hh" class Score { diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index d3ac2e49ff..e36eb952bf 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -9,7 +9,6 @@ #ifndef Script_COLUMN_HH #define Script_COLUMN_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" #include "std-vector.hh" diff --git a/lily/include/script-interface.hh b/lily/include/script-interface.hh index 3b8d714eeb..6acbadc35b 100644 --- a/lily/include/script-interface.hh +++ b/lily/include/script-interface.hh @@ -9,7 +9,6 @@ #ifndef SCRIPT_INTERFACE_HH #define SCRIPT_INTERFACE_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/semi-tie-column.hh b/lily/include/semi-tie-column.hh index d27ad3c5a4..1671f7fc5f 100644 --- a/lily/include/semi-tie-column.hh +++ b/lily/include/semi-tie-column.hh @@ -12,7 +12,6 @@ #include "grob-interface.hh" #include "lily-proto.hh" -#include "lily-guile.hh" struct Semi_tie_column { diff --git a/lily/include/semi-tie.hh b/lily/include/semi-tie.hh index 0d5bb85f75..83688ab012 100644 --- a/lily/include/semi-tie.hh +++ b/lily/include/semi-tie.hh @@ -12,7 +12,7 @@ #include "grob-interface.hh" -#include "lily-guile.hh" +#include "lily-proto.hh" struct Semi_tie { diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh index c8440c7f94..1edda9b1bf 100644 --- a/lily/include/skyline.hh +++ b/lily/include/skyline.hh @@ -10,6 +10,7 @@ #define SKYLINE_HH #include + #include "axis.hh" #include "box.hh" #include "interval.hh" diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh index fa61e42b14..1db127238a 100644 --- a/lily/include/slur-configuration.hh +++ b/lily/include/slur-configuration.hh @@ -10,8 +10,8 @@ #define SLUR_CONFIGURATION_HH #include "bezier.hh" +#include "lily-proto.hh" #include "std-vector.hh" -#include "main.hh" enum Configuration_tag diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh index 3e5b9d86b4..c02fac2005 100644 --- a/lily/include/slur-scoring.hh +++ b/lily/include/slur-scoring.hh @@ -10,7 +10,6 @@ #define SLUR_SCORING_HH #include "box.hh" -#include "lily-proto.hh" #include "std-vector.hh" #include "lily-guile.hh" #include "slur-score-parameters.hh" diff --git a/lily/include/slur.hh b/lily/include/slur.hh index f31aba7bb2..0ec721d4d2 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -9,9 +9,7 @@ #ifndef SLUR_HH #define SLUR_HH -#include "grob-info.hh" #include "lily-proto.hh" -#include "lily-guile.hh" #include "std-vector.hh" #include "grob-interface.hh" @@ -21,7 +19,7 @@ public: static void add_column (Grob *me, Grob *col); static void add_extra_encompass (Grob *me, Grob *col); static void replace_breakable_encompass_objects (Grob *me); - static void auxiliary_acknowledge_extra_object (Grob_info, vector&, vector&); + static void auxiliary_acknowledge_extra_object (Grob_info const &, vector&, vector&); DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM)); DECLARE_SCHEME_CALLBACK (calc_direction, (SCM)); diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index a2dcdb613d..da37b4f9e8 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -10,7 +10,6 @@ #define SMOBS_HH #include "lily-guile.hh" -#include "virtual-methods.hh" #include "warn.hh" /* diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index 88120da55c..71ae366a85 100644 --- a/lily/include/source-file.hh +++ b/lily/include/source-file.hh @@ -9,7 +9,6 @@ #ifndef SOURCE_FILE_HH #define SOURCE_FILE_HH -#include "flower-proto.hh" #include "std-vector.hh" #include "lily-proto.hh" #include "smobs.hh" diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh index 573be0337f..cb1217bf6f 100644 --- a/lily/include/spaceable-grob.hh +++ b/lily/include/spaceable-grob.hh @@ -9,7 +9,6 @@ #ifndef SPACEABLE_GROB_HH #define SPACEABLE_GROB_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index 719d8d1fb3..b1d760c441 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -10,7 +10,6 @@ #define SPACING_SPANNER_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "rational.hh" #include "std-vector.hh" #include "grob-interface.hh" diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index a328101ade..449f8bca3d 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -9,7 +9,6 @@ #ifndef SPAN_BAR_HH #define SPAN_BAR_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index abc6d23adc..b90d199516 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -9,8 +9,6 @@ #include "grob.hh" #include "rod.hh" -#include "grob-interface.hh" -#include "lily-proto.hh" /** A symbol which is attached between two columns. A spanner is a symbol which spans across several columns, so its final appearance diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index 599c1cbf60..af532014d9 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -9,7 +9,6 @@ #ifndef STAFF_SYMBOL_HH #define STAFF_SYMBOL_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh index c83c1c68a2..2551c1b094 100644 --- a/lily/include/stem-info.hh +++ b/lily/include/stem-info.hh @@ -10,6 +10,7 @@ #define STEM_INFO_HH #include "real.hh" +#include "direction.hh" /* Parameters for a stem, (multiply with stemdirection, to get real values diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index d05e5fc410..75946a34ee 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -10,7 +10,6 @@ #define ABBREV_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "grob-interface.hh" class Stem_tremolo diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 402ab5a14b..8808d16665 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -9,7 +9,6 @@ #include "std-vector.hh" #include "lily-proto.hh" -#include "lily-guile.hh" #include "stem-info.hh" #include "grob-interface.hh" diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index 4304837649..f04cde76f6 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -9,7 +9,6 @@ #ifndef SYSTEM_START_DELIMITER_HH #define SYSTEM_START_DELIMITER_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "grob-interface.hh" diff --git a/lily/include/system.hh b/lily/include/system.hh index 9866a19667..e1a91bf4fa 100644 --- a/lily/include/system.hh +++ b/lily/include/system.hh @@ -10,9 +10,7 @@ #include "column-x-positions.hh" #include "spanner.hh" -#include "grob-array.hh" #include "skyline.hh" -#include "grob-interface.hh" /* If you keep following offset reference points, you will always end diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh index 28fc7c680a..06034b1870 100644 --- a/lily/include/text-spanner.hh +++ b/lily/include/text-spanner.hh @@ -9,7 +9,6 @@ #ifndef TEXT_SPANNER_HH #define TEXT_SPANNER_HH -#include "lily-guile.hh" #include "grob-interface.hh" #include "lily-proto.hh" diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index 3826b207ce..77d6d68a78 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -9,9 +9,8 @@ #ifndef TIE_COLUMN_HH #define TIE_COLUMN_HH -#include "lily-proto.hh" -#include "lily-guile.hh" #include "grob-interface.hh" +#include "lily-proto.hh" class Tie_column { diff --git a/lily/include/tie-configuration.hh b/lily/include/tie-configuration.hh index cd3bfe3998..95fd15b01c 100644 --- a/lily/include/tie-configuration.hh +++ b/lily/include/tie-configuration.hh @@ -10,12 +10,10 @@ #ifndef TIE_CONFIGURATION_HH #define TIE_CONFIGURATION_HH -#include "main.hh" -#include "lily-proto.hh" #include "direction.hh" #include "interval.hh" -#include "compare.hh" #include "std-vector.hh" +#include "main.hh" // DEBUG_SLUR_SCORING class Tie_configuration { diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh index 7d48995d60..2b1e2b6230 100644 --- a/lily/include/tie-formatting-problem.hh +++ b/lily/include/tie-formatting-problem.hh @@ -11,9 +11,7 @@ #define TIE_FORMATTING_PROBLEM_HH #include "drul-array.hh" -#include "std-vector.hh" #include "skyline.hh" -#include "lily-proto.hh" #include "tie-configuration.hh" #include "tie-details.hh" #include "tuple.hh" diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 9764908fe8..35d3d9596c 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -9,7 +9,6 @@ #ifndef TIE_HH #define TIE_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "skyline.hh" #include "grob-interface.hh" diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh index ef13b682cc..3ed20422b7 100644 --- a/lily/include/timing-translator.hh +++ b/lily/include/timing-translator.hh @@ -12,8 +12,6 @@ #include "moment.hh" #include "translator.hh" -#include "std-vector.hh" - class Timing_translator : public Translator { public: diff --git a/lily/include/translator-dispatch-list.hh b/lily/include/translator-dispatch-list.hh index e385dee0c0..3a54305235 100644 --- a/lily/include/translator-dispatch-list.hh +++ b/lily/include/translator-dispatch-list.hh @@ -10,7 +10,6 @@ #define TRANSLATOR_DISPATCH_LIST_HH #include "lily-proto.hh" -#include "lily-guile.hh" #include "std-vector.hh" #include "smobs.hh" diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 577c1db93f..72481b5da3 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -11,7 +11,6 @@ #include "listener.hh" #include "translator.hh" -#include "std-vector.hh" typedef void (Translator:: *Translator_method) (void); typedef void (Translator_group:: *Translator_group_method) (void); diff --git a/lily/include/translator.hh b/lily/include/translator.hh index cf1439e673..eee42e5b7d 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -10,10 +10,9 @@ #define TRANSLATOR_HH #include "global-ctor.hh" -#include "std-string.hh" #include "lily-proto.hh" #include "virtual-methods.hh" -#include "input.hh" +#include "input.hh" // for error reporting #include "smobs.hh" #include "std-vector.hh" #include "protected-scm.hh" diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh index 221be2b6d3..b60c417c19 100644 --- a/lily/include/tuplet-bracket.hh +++ b/lily/include/tuplet-bracket.hh @@ -7,7 +7,6 @@ #ifndef Tuplet_bracket_HH #define Tuplet_bracket_HH -#include "lily-guile.hh" #include "lily-proto.hh" #include "std-vector.hh" #include "grob-interface.hh" diff --git a/lily/include/vaticana-ligature.hh b/lily/include/vaticana-ligature.hh index c9e53803e4..f20fccf28f 100644 --- a/lily/include/vaticana-ligature.hh +++ b/lily/include/vaticana-ligature.hh @@ -9,7 +9,6 @@ #ifndef VATICANA_LIGATURE_HH #define VATICANA_LIGATURE_HH -#include "stencil.hh" #include "grob-interface.hh" #include "lily-proto.hh" diff --git a/lily/include/volta-bracket.hh b/lily/include/volta-bracket.hh index 955876f6f6..687439cc7f 100644 --- a/lily/include/volta-bracket.hh +++ b/lily/include/volta-bracket.hh @@ -8,7 +8,6 @@ #define VOLTA_SPANNER_HH #include "spanner.hh" -#include "grob-interface.hh" #include "lily-proto.hh" class Volta_bracket_interface diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 9290ef93e5..a256b8beb1 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -7,7 +7,6 @@ */ #include "engraver.hh" -#include "spanner.hh" #include "pointer-group-interface.hh" #include "side-position-interface.hh" #include "axis-group-interface.hh" diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index 4a62aa7e4d..ea0fa43d4e 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -9,7 +9,6 @@ #include using namespace std; -#include "item.hh" #include "note-head.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index e1a0e9bffd..4c23b2ad40 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -16,8 +16,6 @@ using namespace std; -#include "config.hh" - #include "dimensions.hh" #include "direction.hh" #include "file-path.hh" diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index a1cdfa3c03..8bc3d5e994 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -11,7 +11,6 @@ #include "file-name-map.hh" #include "file-name.hh" #include "file-path.hh" -#include "input.hh" #include "international.hh" #include "lily-lexer.hh" #include "lily-parser.hh" diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index dafed1d3c8..6011ede3f2 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -6,7 +6,6 @@ (c) 2004--2006 Han-Wen Nienhuys */ -#include "context.hh" #include "dispatcher.hh" #include "global-context.hh" #include "grob.hh" diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 931ef3b041..d3f2eafe85 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -7,8 +7,6 @@ */ #include "music.hh" -#include "pitch.hh" -#include "moment.hh" struct Lyric_combine_music { diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index b7d9bb6e10..d30a53d668 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -12,7 +12,6 @@ #include "item.hh" #include "warn.hh" #include "lookup.hh" -#include "paper-column.hh" #include "output-def.hh" #include "note-head.hh" #include "pointer-group-interface.hh" diff --git a/lily/main.cc b/lily/main.cc index 0e8a1e580d..9a21728eb3 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -34,7 +34,6 @@ using namespace std; #include "getopt-long.hh" #include "global-ctor.hh" #include "international.hh" -#include "lily-guile.hh" #include "lily-version.hh" #include "misc.hh" #include "output-def.hh" diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 52eee67268..e0fb13044d 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -13,7 +13,6 @@ using namespace std; #include "text-metrics.hh" #include "warn.hh" #include "stencil.hh" -#include "lookup.hh" #include "main.hh" Modified_font_metric::Modified_font_metric (Font_metric *fm, diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc index 0d64fa5290..f930a2856e 100644 --- a/lily/module-scheme.cc +++ b/lily/module-scheme.cc @@ -6,12 +6,12 @@ (c) 2005--2006 Han-Wen Nienhuys */ -#include "lily-guile.hh" +#include "ly-module.hh" + #include "warn.hh" #include "main.hh" #include "std-string.hh" -#include "ly-module.hh" /* If a variable in changed in SRC, we DEST doesn't see the diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 036a0c3249..3a97459f89 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -7,12 +7,11 @@ */ -#include "music-iterator.hh" - #include using namespace std; #include "warn.hh" +#include "music.hh" #include "context.hh" #include "event-iterator.hh" #include "input.hh" diff --git a/lily/music-output.cc b/lily/music-output.cc index 184849b18a..096dd33007 100644 --- a/lily/music-output.cc +++ b/lily/music-output.cc @@ -9,7 +9,6 @@ #include "music-output.hh" #include "ly-smobs.icc" -#include "virtual-methods.hh" Music_output::Music_output () { diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc index b18aae42da..365c3f4344 100644 --- a/lily/music-scheme.cc +++ b/lily/music-scheme.cc @@ -10,7 +10,6 @@ #include "duration.hh" #include "warn.hh" -#include "pitch.hh" LY_DEFINE (ly_music_length, "ly:music-length", 1, 0, 0, (SCM mus), diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 8a2915ad10..30ca686e79 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -6,11 +6,12 @@ (c) 1998--2006 Han-Wen Nienhuys */ +#include "music-sequence.hh" + #include "warn.hh" #include "program-option.hh" -#include "pitch.hh" +#include "music.hh" #include "input.hh" -#include "music-sequence.hh" void transpose_music_list (SCM lst, Pitch rq) diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index c50a64c7c1..e89896ce66 100644 --- a/lily/music-wrapper-iterator.cc +++ b/lily/music-wrapper-iterator.cc @@ -8,6 +8,7 @@ #include "music-wrapper-iterator.hh" #include "music-wrapper.hh" +#include "music.hh" Music_wrapper_iterator::Music_wrapper_iterator () { diff --git a/lily/music.cc b/lily/music.cc index 1253e72860..fb272aae03 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -16,7 +16,6 @@ #include "ly-smobs.icc" #include "main.hh" #include "music-sequence.hh" -#include "pitch.hh" #include "score.hh" #include "warn.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index 7628a8fc57..12064f705b 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -18,6 +18,7 @@ using namespace std; #include "font-interface.hh" #include "international.hh" #include "warn.hh" +#include "grob.hh" static Stencil internal_print (Grob *me, string *font_char) diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc index 6c257fd092..95fd4a5782 100644 --- a/lily/output-def-scheme.cc +++ b/lily/output-def-scheme.cc @@ -6,10 +6,10 @@ (c) 2005--2006 Han-Wen Nienhuys */ -#include "font-metric.hh" +#include "output-def.hh" + #include "pango-font.hh" #include "modified-font-metric.hh" -#include "output-def.hh" #include "ly-module.hh" #include "context-def.hh" #include "lily-parser.hh" diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc index c2817479d3..4064efa37e 100644 --- a/lily/page-turn-engraver.cc +++ b/lily/page-turn-engraver.cc @@ -12,7 +12,6 @@ #include "duration.hh" #include "grob.hh" #include "international.hh" -#include "moment.hh" #include "paper-column.hh" #include "stream-event.hh" #include "warn.hh" diff --git a/lily/pango-font.cc b/lily/pango-font.cc index e075029154..ca08a4b0d2 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -10,13 +10,18 @@ #include #include +#include + /* Ugh. */ + #include "pango-font.hh" +#include "open-type-font.hh" // Index_to_charcode_map + #include "dimensions.hh" #include "file-name.hh" #include "international.hh" -#include "lookup.hh" +#include "lookup.hh" // debugging #include "main.hh" #include "string-convert.hh" #include "warn.hh" diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index fb0ab67c81..bef70f72a7 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -11,7 +11,6 @@ #include "international.hh" #include "axis-group-interface.hh" #include "context.hh" -#include "item.hh" #include "note-spacing.hh" #include "paper-column.hh" #include "pointer-group-interface.hh" diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc index 54e016f4d9..cef5c55493 100644 --- a/lily/parenthesis-engraver.cc +++ b/lily/parenthesis-engraver.cc @@ -9,7 +9,6 @@ #include "engraver.hh" -#include "grob.hh" #include "item.hh" #include "pointer-group-interface.hh" #include "simple-closure.hh" diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc index 03da0d4f57..6dbff41180 100644 --- a/lily/part-combine-iterator.cc +++ b/lily/part-combine-iterator.cc @@ -9,7 +9,6 @@ #include "context.hh" #include "dispatcher.hh" #include "lily-guile.hh" -#include "listener.hh" #include "music.hh" #include "music-iterator.hh" #include "music-sequence.hh" diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index 495f30f33c..077d51907d 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -8,7 +8,6 @@ */ #include "input.hh" -#include "music.hh" #include "repeated-music.hh" #include "sequential-iterator.hh" diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc index 2d58941b72..36eac12bca 100644 --- a/lily/pointer-group-interface.cc +++ b/lily/pointer-group-interface.cc @@ -8,8 +8,6 @@ #include "pointer-group-interface.hh" -#include "lily-proto.hh" -#include "item.hh" #include "grob-array.hh" #include "grob.hh" diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc index dead1d503e..849472c329 100644 --- a/lily/quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -15,7 +15,6 @@ #include "lily-guile.hh" #include "music-sequence.hh" #include "music.hh" -#include "stream-event.hh" #include "warn.hh" class Quote_iterator : public Music_wrapper_iterator diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc index 651702ce99..388e2f2d0f 100644 --- a/lily/relative-octave-check.cc +++ b/lily/relative-octave-check.cc @@ -9,7 +9,6 @@ #include "input.hh" #include "international.hh" #include "music.hh" -#include "pitch.hh" class Relative_octave_check { diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index d8dadb981b..f940a8b68b 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -7,7 +7,6 @@ */ #include "music.hh" -#include "pitch.hh" #include "warn.hh" #include "program-option.hh" diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 899d22a5c7..3e82328837 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -21,6 +21,7 @@ using namespace std; #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" +#include "grob.hh" #include "warn.hh" MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1); diff --git a/lily/rest.cc b/lily/rest.cc index 139386416d..e3543e4cb9 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -16,6 +16,7 @@ #include "paper-score.hh" #include "staff-symbol-referencer.hh" #include "stencil.hh" +#include "grob.hh" // -> offset callback MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1); diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 1f8832831f..91cca081e7 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -20,7 +20,6 @@ #include "paper-column-engraver.hh" #include "paper-column.hh" #include "paper-score.hh" -#include "stream-event.hh" #include "system.hh" #include "warn.hh" diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 34c5a1c78d..73f79add86 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -11,12 +11,10 @@ #include "audio-column.hh" #include "audio-item.hh" #include "context-def.hh" -#include "context.hh" #include "dispatcher.hh" #include "global-context.hh" #include "performance.hh" #include "midi-stream.hh" -#include "moment.hh" #include "output-def.hh" #include "string-convert.hh" #include "warn.hh" diff --git a/lily/script-column.cc b/lily/script-column.cc index 511efa7dce..726b327276 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -13,6 +13,7 @@ #include "directional-element-interface.hh" #include "side-position-interface.hh" #include "warn.hh" +#include "grob.hh" #include "pointer-group-interface.hh" #include diff --git a/lily/semi-tie-column.cc b/lily/semi-tie-column.cc index 57b81e5d44..7a02ac578b 100644 --- a/lily/semi-tie-column.cc +++ b/lily/semi-tie-column.cc @@ -17,7 +17,6 @@ #include "staff-symbol-referencer.hh" #include "item.hh" #include "tie-formatting-problem.hh" -#include "tie-configuration.hh" #include "tie-column-format.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 825d88e908..96751edf2c 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -22,6 +22,7 @@ using namespace std; #include "staff-symbol.hh" #include "string-convert.hh" #include "misc.hh" +#include "grob.hh" void Side_position_interface::add_support (Grob *me, Grob *e) diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc index 139478983a..cea6584972 100644 --- a/lily/simple-closure.cc +++ b/lily/simple-closure.cc @@ -9,7 +9,6 @@ #include "simple-closure.hh" #include "grob.hh" -#include "lily-guile.hh" static scm_t_bits simple_closure_tag; diff --git a/lily/skyline.cc b/lily/skyline.cc index e52a6277d5..cd2cf25337 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -346,6 +346,9 @@ Skyline::set_minimum_height (Real h) merge (s); } +/* + fixme: move this out of skyline. +*/ Stencil Skyline::stencil () { diff --git a/lily/slur.cc b/lily/slur.cc index 093807b78f..88697c2bb1 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -8,7 +8,7 @@ */ #include "slur.hh" - +#include "grob-info.hh" #include "grob-array.hh" #include "beam.hh" #include "bezier.hh" @@ -320,7 +320,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) * Used by Slur_engraver:: and Phrasing_slur_engraver:: */ void -Slur::auxiliary_acknowledge_extra_object (Grob_info info, +Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, vector &slurs, vector &end_slurs) { diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc index 51bbf24787..37fe47f8d5 100644 --- a/lily/spacing-determine-loose-columns.cc +++ b/lily/spacing-determine-loose-columns.cc @@ -16,6 +16,7 @@ #include "spacing-spanner.hh" #include "note-spacing.hh" #include "moment.hh" +#include "grob-array.hh" #include "break-align-interface.hh" #include "warn.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index 1e49d0b0c9..0f02020241 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -6,9 +6,6 @@ (c) 1996--2006 Han-Wen Nienhuys */ -#include "spanner.hh" - - #include "pointer-group-interface.hh" #include "libc-extension.hh" #include "paper-column.hh" diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc index 2e15eb72eb..9192b3795e 100644 --- a/lily/tie-configuration.cc +++ b/lily/tie-configuration.cc @@ -8,6 +8,7 @@ */ #include "tie-configuration.hh" + #include "warn.hh" #include "tie-formatting-problem.hh" #include "bezier.hh" diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index 0e29d3ca50..9f05c5b807 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -12,7 +12,6 @@ #include "paper-column.hh" #include "bezier.hh" #include "directional-element-interface.hh" -#include "item.hh" #include "libc-extension.hh" #include "misc.hh" #include "note-head.hh" diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc index 28ea71afa2..bd27091988 100644 --- a/lily/translator-dispatch-list.cc +++ b/lily/translator-dispatch-list.cc @@ -7,8 +7,6 @@ */ #include "translator-dispatch-list.hh" - -#include "grob-info.hh" #include "engraver.hh" #include "ly-smobs.icc" diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc index 6684842876..83feef1634 100644 --- a/lily/translator-group-ctors.cc +++ b/lily/translator-group-ctors.cc @@ -8,8 +8,6 @@ #include "score-engraver.hh" #include "score-performer.hh" -#include "engraver-group.hh" -#include "performer-group.hh" #include "warn.hh" /* diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 4ef8c49d6b..b25d6154e5 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -19,7 +19,6 @@ #include "output-def.hh" #include "performer-group.hh" #include "scm-hash.hh" -#include "stream-event.hh" #include "warn.hh" Translator_group * diff --git a/lily/ttf.cc b/lily/ttf.cc index 8dfa7308f7..2e5eb8865d 100644 --- a/lily/ttf.cc +++ b/lily/ttf.cc @@ -10,7 +10,6 @@ #include -#include "lily-proto.hh" #include "memory-stream.hh" #include "warn.hh" #include "lily-guile.hh" -- 2.39.2