From: Jan Nieuwenhuizen Date: Thu, 18 Nov 2004 23:02:23 +0000 (+0000) Subject: * configure.in: Test for and accept lmodern if EC fonts not found. X-Git-Tag: release/2.5.14~529 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git * configure.in: Test for and accept lmodern if EC fonts not found. * Debian lmodern support. * scm/framework-tex.scm (font-load-command): TeX font name mangling for latin1 encoded cork-lm fonts. (convert-to-ps): Load lm.map if available. * ly/paper-defaults.ly: Use cork-lm encoding if ec is not available. * scm/encoding.scm (coding-alist): Add cork-lm encoding. * scm/font.scm: Add header. Autoload cork-lm and ec fonts if available. * lily/kpath.cc (ly_kpathsea_find_file): Rename. Do not use path for absolute file name, that is silly. * lily/score-engraver.cc (initialize): --- diff --git a/ChangeLog b/ChangeLog index ad75fa9ba9..db04109464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,44 @@ -2004-11-18 Heikki Junes +2004-11-18 Jan Nieuwenhuizen - * input/test/script-abbreviations.ly: fix typos. + * Debian lmodern support. Note that LilyPond will issue warnings + + no such encoding: "FontSpecific" -2004-11-18 Jan Nieuwenhuizen + The font selection mechanism wants to get the encoding from the + font itself, but the whole idea of lmodern is that it is usable + with different encodings, ie, Lily should get the encoding from + the font tree, rather than the font itself. This would require + some major brain surgery. + + * configure.in: Test for and accept lmodern if EC fonts not found. + + * Debian lmodern support. + * scm/framework-tex.scm (font-load-command): TeX font name + mangling for latin1 encoded cork-lm fonts. + (convert-to-ps): Load lm.map if available. + + * ly/paper-defaults.ly: Use cork-lm encoding if ec is not + available. + + * scm/encoding.scm (coding-alist): Add cork-lm encoding. + + * scm/font.scm: Add header. Autoload cork-lm and ec fonts if + available. + + * lily/kpath.cc (ly_kpathsea_find_file): Rename. Do not use + path for absolute file name, that is silly. + + * lily/score-engraver.cc (initialize): * Documentation/user/GNUmakefile (local-install-info): Invoke install-info --remove first. + * #include cleanup (Andreas Scherer). + +2004-11-18 Heikki Junes + + * input/test/script-abbreviations.ly: fix typos. + 2004-11-17 Werner Lemberg * python/lilylib.py (options_help_str): Support pretty-printing of diff --git a/THANKS b/THANKS index 1fb1034487..70b16e6a79 100644 --- a/THANKS +++ b/THANKS @@ -11,31 +11,13 @@ Graham Percival - Documentation Editor CONTRIBUTORS -Andreas Scherer Carl Sorensen - -BUG HUNTERS/SUGGESTIONS - - -Release 2.5 -*********** - - -DEVELOPMENT TEAM - -Han-Wen Nienhuys - Core development -Jan Nieuwenhuizen - Core development -Erik Sandberg - Bug Meister -Pedro Kroger - Build Meister -Graham Percival - Documentation Editor - -CONTRIBUTORS - -Werner Lemberg Heikki Junes +Werner Lemberg BUG HUNTERS/SUGGESTIONS +Andreas Scherer Fernando Pablo Lopez-Lezcano Jack O'Quin Karl Hammar diff --git a/configure.in b/configure.in index 43badca3cd..83ea307aa1 100644 --- a/configure.in +++ b/configure.in @@ -69,12 +69,18 @@ if test -n "$ecb10"; then AC_MSG_RESULT([$ecb10]) else AC_MSG_RESULT(no) - STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5') - AC_MSG_CHECKING([for old version of ec-fonts-mftraced]) - ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null` - if test -n "$ecrm10"; then - AC_MSG_RESULT([$ecrm10]) - AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer]) + AC_MSG_CHECKING([for lmodern]) + lmr10=`kpsewhich lmr10.pfb 2>/dev/null` + if test -n "$lmr10"; then + AC_MSG_RESULT([$lmr10]) + else + STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5') + AC_MSG_CHECKING([for old version of ec-fonts-mftraced]) + ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null` + if test -n "$ecrm10"; then + AC_MSG_RESULT([$ecrm10]) + AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer]) + fi fi fi diff --git a/flower/axis.cc b/flower/axis.cc index d28657aabe..340a9f7d7b 100644 --- a/flower/axis.cc +++ b/flower/axis.cc @@ -6,8 +6,8 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include #include "axes.hh" + #include "string.hh" String @@ -15,4 +15,3 @@ axis_name_string (Axis a) { return to_string (char (a + 'x')); } - diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc index 0ed394409d..f66d657be4 100644 --- a/flower/cpu-timer.cc +++ b/flower/cpu-timer.cc @@ -7,6 +7,7 @@ */ #include "cpu-timer.hh" + #include // nextstep #ifndef CLOCKS_PER_SEC @@ -19,7 +20,6 @@ #endif #endif - Cpu_timer::Cpu_timer () { restart (); diff --git a/flower/direction.cc b/flower/direction.cc index e5ab18e848..e5ae0b41af 100644 --- a/flower/direction.cc +++ b/flower/direction.cc @@ -8,6 +8,7 @@ */ #include "direction.hh" + #include "string.hh" String diff --git a/flower/file-name.cc b/flower/file-name.cc index 5c848efd74..cf9dc82fef 100644 --- a/flower/file-name.cc +++ b/flower/file-name.cc @@ -7,9 +7,10 @@ Jan Nieuwenhuizen */ -#include -#include -#include +#include "file-name.hh" + +#include +#include #include "config.hh" @@ -21,8 +22,6 @@ #include #endif -#include "file-name.hh" - /* We don't have multiple roots, set this to '\0'? */ #ifndef ROOTSEP #define ROOTSEP ':' diff --git a/flower/file-path.cc b/flower/file-path.cc index 125cf5844b..eb08b9251a 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -7,9 +7,10 @@ Jan Nieuwenhuizen */ -#include -#include -#include +#include "file-path.hh" + +#include +#include #include "config.hh" #if HAVE_SYS_STAT_H @@ -21,7 +22,6 @@ #endif #include "file-name.hh" -#include "file-path.hh" #ifndef PATHSEP #define PATHSEP ':' diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index feb655ab2e..cc39687121 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -4,19 +4,17 @@ this is Copyleft (c) 1996--2004 Han-Wen Nienhuys, */ -#include -#include -#include -#include +#include "getopt-long.hh" + +#include +#include +#include #include #include "config.hh" -#include "getopt-long.hh" -#include "international.hh" #include "string-convert.hh" - #if !HAVE_GETTEXT inline char* gettext (char const* s) diff --git a/flower/include/array.hh b/flower/include/array.hh index caa76c7abf..c22977f55a 100644 --- a/flower/include/array.hh +++ b/flower/include/array.hh @@ -6,7 +6,7 @@ #ifndef ARRAY_H #define ARRAY_H -#include +#include #ifndef INLINE #define INLINE inline diff --git a/flower/include/axes.hh b/flower/include/axes.hh index d2d57e0fbf..0aa0d5835e 100644 --- a/flower/include/axes.hh +++ b/flower/include/axes.hh @@ -10,7 +10,7 @@ #ifndef AXES_HH #define AXES_HH -#include +#include enum Axis { X_AXIS =0, diff --git a/flower/include/cons.hh b/flower/include/cons.hh index dec3e29d64..6830697fb5 100644 --- a/flower/include/cons.hh +++ b/flower/include/cons.hh @@ -11,7 +11,7 @@ #define CONS_HH -#include +#include template class Cons diff --git a/flower/include/cpu-timer.hh b/flower/include/cpu-timer.hh index e4bbec09b2..ce4a8a8258 100644 --- a/flower/include/cpu-timer.hh +++ b/flower/include/cpu-timer.hh @@ -10,7 +10,8 @@ #ifndef CPU_TIMER_HH #define CPU_TIMER_HH -#include +#include + #include "real.hh" class Cpu_timer { diff --git a/flower/include/drul-array.hh b/flower/include/drul-array.hh index faed9a0591..c565e92c28 100644 --- a/flower/include/drul-array.hh +++ b/flower/include/drul-array.hh @@ -13,8 +13,6 @@ #include "direction.hh" #include "real.hh" -#include - /** Left/right or Up/down arrays. Drul is nicer sounding than udlr */ diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh index e75cdba670..1b8ceabe4b 100644 --- a/flower/include/flower-proto.hh +++ b/flower/include/flower-proto.hh @@ -23,7 +23,6 @@ template struct PQueue; #include "real.hh" typedef Interval_t Interval; -typedef Interval_t Slice; // junkme. struct Offset; struct Long_option_init; diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh index 2b6747e490..8233114ed7 100644 --- a/flower/include/getopt-long.hh +++ b/flower/include/getopt-long.hh @@ -1,6 +1,7 @@ #ifndef GETOPT_LONG_HH #define GETOPT_LONG_HH +#include #include "string.hh" diff --git a/flower/include/international.hh b/flower/include/international.hh index b50bb1f68c..42c83f4ee0 100644 --- a/flower/include/international.hh +++ b/flower/include/international.hh @@ -10,7 +10,6 @@ #ifndef INTERNATIONAL_HH #define INTERNATIONAL_HH -#include "string.hh" /** Internationalisation: _i ("to be translated") gets an entry in the POT file diff --git a/flower/include/interval.hh b/flower/include/interval.hh index c2d012c4f1..1875e7ce66 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -7,9 +7,7 @@ #ifndef INTERVAL_HH #define INTERVAL_HH -#include #include "flower-proto.hh" -#include "real.hh" #include "drul-array.hh" /* A T interval. This represents the closed interval [left,right]. diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc index afa4e9cf9a..d912e526e2 100644 --- a/flower/include/interval.tcc +++ b/flower/include/interval.tcc @@ -10,8 +10,9 @@ #ifndef INTERVAL_TCC #define INTERVAL_TCC -#include -#include +#include +#include + #include "interval.hh" #include "string.hh" diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh index 906e64a4d4..a306f0590f 100644 --- a/flower/include/libc-extension.hh +++ b/flower/include/libc-extension.hh @@ -10,7 +10,7 @@ #define LIBC_EXTENSION_HH #include -#include +#include #include "config.hh" #include "flower-proto.hh" diff --git a/flower/include/offset.hh b/flower/include/offset.hh index ccf64ea784..2e2a7dd8e6 100644 --- a/flower/include/offset.hh +++ b/flower/include/offset.hh @@ -7,10 +7,7 @@ #ifndef OFFSET_HH #define OFFSET_HH -#include "flower-proto.hh" -#include "real.hh" #include "axes.hh" -#include "arithmetic-operator.hh" #include "string.hh" Offset complex_multiply (Offset, Offset); diff --git a/flower/include/parse-afm.hh b/flower/include/parse-afm.hh index 51b43b3e1f..34162dbbe2 100644 --- a/flower/include/parse-afm.hh +++ b/flower/include/parse-afm.hh @@ -79,7 +79,7 @@ * - fixed typos */ -#include +#include /* your basic constants */ diff --git a/flower/include/rational.hh b/flower/include/rational.hh index 4c4b0a3891..361b075f7e 100644 --- a/flower/include/rational.hh +++ b/flower/include/rational.hh @@ -10,12 +10,8 @@ #ifndef RATIONAL_HH #define RATIONAL_HH -#include "compare.hh" -#include "arithmetic-operator.hh" -#include "flower-proto.hh" #include "string.hh" - /** Rational numbers. Included is support for + and - infinity. */ diff --git a/flower/include/real.hh b/flower/include/real.hh index e00c2880e3..ae3e436ff2 100644 --- a/flower/include/real.hh +++ b/flower/include/real.hh @@ -11,7 +11,7 @@ #define REAL_HH -#include +#include typedef double Real; extern const Real infinity_f; diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh index 6e109e604a..65d2c98b87 100644 --- a/flower/include/string-convert.hh +++ b/flower/include/string-convert.hh @@ -7,8 +7,8 @@ #ifndef STRING_CONVERT_HH #define STRING_CONVERT_HH -#include -#include "flower-proto.hh" +#include + #include "string.hh" diff --git a/flower/include/string-data.hh b/flower/include/string-data.hh index 9b23c48716..50abeb985f 100644 --- a/flower/include/string-data.hh +++ b/flower/include/string-data.hh @@ -10,6 +10,7 @@ #ifndef STRINGDATA_HH #define STRINGDATA_HH +#include "flower-proto.hh" /**Internal String struct. the data itself. Handles simple tasks (resizing, resetting) diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc index 00691cc57b..51aa1a8543 100644 --- a/flower/include/string-data.icc +++ b/flower/include/string-data.icc @@ -9,9 +9,10 @@ #ifndef STRINGDATA_INL #define STRINGDATA_INL -#include +#include +#include + #include -#include #include "string-data.hh" const int INITIALMAX=8; diff --git a/flower/include/string-handle.icc b/flower/include/string-handle.icc index f5bd77fcd9..9989da7e9d 100644 --- a/flower/include/string-handle.icc +++ b/flower/include/string-handle.icc @@ -10,7 +10,8 @@ #ifndef STRINGHANDLE_INL #define STRINGHANDLE_INL -#include +#include + #include #include "string-data.hh" diff --git a/flower/include/string.hh b/flower/include/string.hh index 4e06820c04..be50752b00 100644 --- a/flower/include/string.hh +++ b/flower/include/string.hh @@ -14,14 +14,13 @@ // too darn slow with gcc3 #ifdef STREAM_SUPPORT #if ( __GNUC__ > 2 ) -#include +#include #else class ostream; #endif #endif #include "arithmetic-operator.hh" -#include "flower-proto.hh" #include "string-handle.hh" /** diff --git a/flower/international.cc b/flower/international.cc index a7d09733cb..4f3869c2de 100644 --- a/flower/international.cc +++ b/flower/international.cc @@ -7,11 +7,8 @@ */ -#include - #include "config.hh" #include "string-convert.hh" -#include "international.hh" #if !HAVE_GETTEXT inline char* diff --git a/flower/interval.cc b/flower/interval.cc index 965888ade5..e30098e30b 100644 --- a/flower/interval.cc +++ b/flower/interval.cc @@ -6,9 +6,8 @@ (c) 1997--2004 Han-Wen Nienhuys */ - #include "interval.hh" -#include "real.hh" + #include "interval.tcc" Real diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc index e072826d30..e103d0c44b 100644 --- a/flower/libc-extension.cc +++ b/flower/libc-extension.cc @@ -8,13 +8,13 @@ Jan Nieuwenhuizen */ -#include - -#include -#include -#include #include "libc-extension.hh" +#include +#include +#include +#include + char* strnlwr (char* start ,int n) { diff --git a/flower/offset.cc b/flower/offset.cc index 41eb841c24..1fae9a3b3c 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -5,13 +5,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#ifndef STANDALONE -#include "string.hh" -#endif #include "offset.hh" +#include #ifndef STANDALONE String diff --git a/flower/parse-afm.cc b/flower/parse-afm.cc index 97e854ae31..59f9bf012f 100644 --- a/flower/parse-afm.cc +++ b/flower/parse-afm.cc @@ -68,13 +68,15 @@ Morten Welinder September 1999. * - changed (width == 250) to (width = 250) in initializeArray */ -#include -#include -#include -#include -#include -#include #include "parse-afm.hh" + +#include +#include +#include +#include + +#include + #include "warn.hh" #define METATYPE1_BUG /* Parse Metatype1's (version unknown) diff --git a/flower/polynomial.cc b/flower/polynomial.cc index a6ee02d183..e48d8f9e64 100644 --- a/flower/polynomial.cc +++ b/flower/polynomial.cc @@ -4,10 +4,10 @@ (c) 1993--2004 Han-Wen Nienhuys */ -#include - #include "polynomial.hh" +#include + /* Een beter milieu begint bij uzelf. Hergebruik! diff --git a/flower/rational.cc b/flower/rational.cc index 54ac55bdaf..2d3195514a 100644 --- a/flower/rational.cc +++ b/flower/rational.cc @@ -5,10 +5,12 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include + #include "rational.hh" -#include "string.hh" + +#include +#include + #include "string-convert.hh" #include "libc-extension.hh" diff --git a/flower/real.cc b/flower/real.cc index a043b98f4f..7f57b1474b 100644 --- a/flower/real.cc +++ b/flower/real.cc @@ -1,4 +1,5 @@ -#include #include "real.hh" +#include + const Real infinity_f = HUGE_VAL; diff --git a/flower/rtti.cc b/flower/rtti.cc index fc278636a1..3166cb9dd9 100644 --- a/flower/rtti.cc +++ b/flower/rtti.cc @@ -1,7 +1,6 @@ -#include -#include -#include "virtual-methods.hh" +#include +#include "virtual-methods.hh" const char * demangle_classname (std::type_info const &t) diff --git a/flower/string-convert.cc b/flower/string-convert.cc index 74b6c23277..d2fd21ce97 100644 --- a/flower/string-convert.cc +++ b/flower/string-convert.cc @@ -4,13 +4,12 @@ --*/ -#include -#include -#include -#include -#include "libc-extension.hh" -#include "string.hh" #include "string-convert.hh" + +#include +#include + +#include "libc-extension.hh" #include "rational.hh" #include "array.hh" diff --git a/flower/string.cc b/flower/string.cc index b08bf68d3b..e4191300fe 100644 --- a/flower/string.cc +++ b/flower/string.cc @@ -10,15 +10,15 @@ #define _GNU_SOURCE #endif -#include -#include -#include -#include -#include +#include "string.hh" + +#include +#include +#include +#include #include -#include "string.hh" #include "libc-extension.hh" #include "string-convert.hh" diff --git a/flower/stringutil.cc b/flower/stringutil.cc index 037eae03a3..f630838a22 100644 --- a/flower/stringutil.cc +++ b/flower/stringutil.cc @@ -22,9 +22,9 @@ #define INLINE -#include "string-handle.hh" #include "string-data.hh" #include "string.hh" + #include "string-data.icc" #include "string-handle.icc" #include "string.icc" diff --git a/flower/warn.cc b/flower/warn.cc index 98769fc241..548782c9b6 100644 --- a/flower/warn.cc +++ b/flower/warn.cc @@ -6,11 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include - #include "warn.hh" +#include +#include + void message (String s) { diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 4a59aced62..f4bbbd21e9 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -11,16 +11,12 @@ #include "arpeggio.hh" #include "context.hh" #include "engraver.hh" -#include "event.hh" -#include "item.hh" #include "protected-scm.hh" #include "rhythmic-head.hh" #include "side-position-interface.hh" -#include "spanner.hh" #include "tie.hh" #include "warn.hh" - class Accidental_entry { public: diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 2c508ac9f7..b88e6f94ca 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -7,15 +7,15 @@ */ -#include +#include "accidental-placement.hh" + +#include #include "libc-extension.hh" // isinf -#include "item.hh" #include "skyline.hh" #include "music.hh" #include "pitch.hh" #include "warn.hh" -#include "accidental-placement.hh" #include "note-column.hh" #include "group-interface.hh" #include "note-collision.hh" diff --git a/lily/afm.cc b/lily/afm.cc index c92433bd1a..ccb0562c1e 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -7,11 +7,12 @@ */ -#include +#include "afm.hh" + +#include #include "warn.hh" #include "libc-extension.hh" -#include "afm.hh" #include "dimensions.hh" Adobe_font_metric::Adobe_font_metric (AFM_Font_info *fi) diff --git a/lily/align-interface.cc b/lily/align-interface.cc index cd40632eb8..87fb32e6fb 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -8,8 +8,7 @@ */ #include "align-interface.hh" -#include "grob.hh" -#include "group-interface.hh" + #include "axis-group-interface.hh" #include "hara-kiri-group-spanner.hh" #include "output-def.hh" diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 05a952e81b..62133dfde7 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -8,13 +8,13 @@ */ +#include "all-font-metrics.hh" + #include "config.hh" #include "main.hh" -#include "all-font-metrics.hh" #include "warn.hh" #include "afm.hh" #include "tfm.hh" -#include "lily-guile.hh" #include "scm-hash.hh" #include "kpath.hh" diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index bf95336d8a..c83f65cb16 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -10,10 +10,7 @@ */ #include "engraver.hh" -#include "item.hh" #include "note-head.hh" -#include "event.hh" -#include "pitch.hh" #include "pitch-interval.hh" #include "protected-scm.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/ambitus.cc b/lily/ambitus.cc index 3c40cce7a1..bf05f8c4c1 100644 --- a/lily/ambitus.cc +++ b/lily/ambitus.cc @@ -6,10 +6,10 @@ (c) 2002--2004 Juergen Reuter */ +#include "ambitus.hh" + #include "staff-symbol-referencer.hh" #include "pitch.hh" -#include "ambitus.hh" -#include "stencil.hh" #include "note-head.hh" #include "item.hh" #include "font-interface.hh" diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 261ff66f51..e258b5a707 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -8,8 +8,6 @@ #include "engraver.hh" #include "group-interface.hh" -#include "item.hh" -#include "event.hh" #include "arpeggio.hh" #include "stem.hh" #include "rhythmic-head.hh" diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 3b9fcc2ff0..e4b9a03a19 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -6,10 +6,9 @@ (c) 2000--2004 Jan Nieuwenhuizen */ -#include "stencil.hh" -#include "output-def.hh" #include "arpeggio.hh" -#include "grob.hh" + +#include "output-def.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" diff --git a/lily/audio-column.cc b/lily/audio-column.cc index 549f0f153d..8b4e309d4f 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -7,6 +7,7 @@ */ #include "audio-column.hh" + #include "audio-item.hh" #include "performance.hh" diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index 55bd91e29e..da5170ab0c 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -7,6 +7,7 @@ */ #include "audio-element-info.hh" + #include "translator-group.hh" #include "context.hh" diff --git a/lily/audio-item.cc b/lily/audio-item.cc index bdcf76b57f..3cf2300827 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -7,6 +7,7 @@ */ #include "audio-item.hh" + #include "midi-item.hh" #include "audio-column.hh" diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index a233fa3f8b..4e66a22648 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -7,7 +7,7 @@ */ #include "audio-staff.hh" -#include "audio-item.hh" + #include "midi-item.hh" #include "midi-stream.hh" #include "midi-walker.hh" diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 61ef8a47d4..662ebeff5f 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -7,18 +7,15 @@ */ +#include "engraver.hh" #include "beaming.hh" -#include "event.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" -#include "engraver-group-engraver.hh" #include "bar-line.hh" #include "rest.hh" -#include "engraver.hh" #include "item.hh" #include "spanner.hh" -#include "duration.hh" #include "context.hh" class Auto_beam_engraver : public Engraver diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index d162e32dfd..efc0d78d0e 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -7,7 +7,6 @@ */ -#include "music.hh" #include "context.hh" #include "event.hh" #include "music-wrapper-iterator.hh" diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index c28584909f..c4967edfd3 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -9,7 +9,6 @@ #include "spanner.hh" #include "paper-column.hh" #include "axis-group-interface.hh" -#include "engraver.hh" #include "engraver-group-engraver.hh" #include "warn.hh" #include "context.hh" diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index ab1776da86..fbac83ee5b 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -6,9 +6,10 @@ (c) 2000--2004 Han-Wen Nienhuys */ -#include "hara-kiri-group-spanner.hh" + #include "axis-group-interface.hh" -#include "grob.hh" + +#include "hara-kiri-group-spanner.hh" void Axis_group_interface::add_element (Grob*me,Grob *e) diff --git a/lily/balloon.cc b/lily/balloon.cc index 2906383d70..1c8172a949 100644 --- a/lily/balloon.cc +++ b/lily/balloon.cc @@ -11,7 +11,6 @@ #include "line-interface.hh" #include "lookup.hh" #include "font-interface.hh" -#include "stencil.hh" #include "lily-guile.hh" #include "output-def.hh" #include "misc.hh" diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 379b2394e1..0483857e01 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -9,11 +9,8 @@ #include "bar-line.hh" #include "score-engraver.hh" -#include "event.hh" -#include "engraver-group-engraver.hh" #include "warn.hh" #include "item.hh" -#include "engraver.hh" /* generate bars. Either user ("|:"), or default (new measure) diff --git a/lily/bar-line.cc b/lily/bar-line.cc index d2f50ca073..6762b21864 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -6,19 +6,15 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "bar-line.hh" + +#include #include "lookup.hh" #include "paper-column.hh" -#include "grob.hh" -#include "bar-line.hh" -#include "string.hh" -#include "stencil.hh" #include "output-def.hh" #include "font-interface.hh" - #include "all-font-metrics.hh" -#include "item.hh" #include "staff-symbol-referencer.hh" MAKE_SCHEME_CALLBACK (Bar_line,print,1); diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 65e830441b..373cdf4c07 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -6,13 +6,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ - -#include "lily-guile.hh" #include "paper-column.hh" #include "output-def.hh" #include "side-position-interface.hh" -#include "item.hh" -#include "moment.hh" #include "engraver.hh" #include "context.hh" diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc index 07d0e3b335..bb956f5ade 100644 --- a/lily/beam-concave.cc +++ b/lily/beam-concave.cc @@ -1,14 +1,12 @@ /* Determine whether a beam is concave. */ -#include +#include #include "group-interface.hh" #include "array.hh" -#include "grob.hh" #include "stem.hh" -#include "interval.hh" #include "beam.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 727f329dd3..88265759f4 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -8,7 +8,6 @@ */ #include "engraver.hh" -#include "event.hh" #include "beam.hh" #include "stem.hh" #include "warn.hh" diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc index 8748d7320d..107eeb4357 100644 --- a/lily/beam-performer.cc +++ b/lily/beam-performer.cc @@ -7,7 +7,6 @@ */ #include "performer.hh" -#include "event.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 1315c2dba7..2075eb76d3 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -12,10 +12,9 @@ -#include +#include #include "warn.hh" -#include "grob.hh" #include "staff-symbol-referencer.hh" #include "beam.hh" #include "stem.hh" diff --git a/lily/beam.cc b/lily/beam.cc index b8d5018927..d5ee204fd0 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -26,13 +26,13 @@ Notes: */ -#include // tanh. +#include "beam.hh" + +#include // tanh. #include "interval-set.hh" -#include "stencil.hh" #include "directional-element-interface.hh" #include "beaming.hh" -#include "beam.hh" #include "misc.hh" #include "least-squares.hh" #include "stem.hh" diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index 044a898d07..70072356ed 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -6,7 +6,7 @@ (c) 1998--2004 Jan Nieuwenhuizen */ -#include +#include #include "misc.hh" #include "bezier.hh" diff --git a/lily/bezier.cc b/lily/bezier.cc index 8c806a0f63..40fd5f7ac0 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -6,13 +6,12 @@ (c) 1998--2004 Jan Nieuwenhuizen */ -#include +#include "bezier.hh" + +#include -#include "config.hh" #include "warn.hh" #include "libc-extension.hh" -#include "bezier.hh" -#include "polynomial.hh" Real binomial_coefficient (Real over , int under) diff --git a/lily/binary-source-file.cc b/lily/binary-source-file.cc index 5d6568f4f9..2e45fb557c 100644 --- a/lily/binary-source-file.cc +++ b/lily/binary-source-file.cc @@ -7,13 +7,10 @@ */ -#include // INT_MAX -#include - -#include "flower-proto.hh" -#include "string.hh" -#include "source-file.hh" #include "binary-source-file.hh" + +#include // INT_MAX + #include "string-convert.hh" Binary_source_file::Binary_source_file (String& file_name_string) diff --git a/lily/book.cc b/lily/book.cc index 640600f6d3..4b3cce04db 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -6,10 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "book.hh" + +#include #include "lilypond-key.hh" -#include "book.hh" #include "global-context.hh" #include "ly-module.hh" #include "main.hh" diff --git a/lily/box.cc b/lily/box.cc index 97bbbb905b..1dc85ea63f 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -7,8 +7,8 @@ */ #include "box.hh" + #include "array.hh" -#include "axes.hh" void Box::translate (Offset o) diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 212913f4ae..4d44c06841 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -6,14 +6,14 @@ (c) 1996--2004 Han-Wen Nienhuys */ -#include "paper-column.hh" #include "break-algorithm.hh" + +#include "paper-column.hh" #include "output-def.hh" #include "system.hh" #include "paper-score.hh" #include "paper-column.hh" #include "cpu-timer.hh" - #include "simple-spacer.hh" #include "group-interface.hh" diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index b56a5ad2a6..49ea7ca788 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -9,7 +9,6 @@ #include "engraver.hh" #include "protected-scm.hh" #include "break-align-interface.hh" -#include "item.hh" #include "align-interface.hh" #include "axis-group-interface.hh" #include "context.hh" diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index bcd62a73fc..c8ed412989 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -6,20 +6,19 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "break-align-interface.hh" + +#include -#include #include // isinf #include "self-alignment-interface.hh" #include "side-position-interface.hh" #include "axis-group-interface.hh" #include "warn.hh" -#include "lily-guile.hh" -#include "break-align-interface.hh" #include "dimensions.hh" #include "output-def.hh" #include "paper-column.hh" -#include "group-interface.hh" #include "align-interface.hh" MAKE_SCHEME_CALLBACK (Break_align_interface,alignment_callback,2); diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index 7415d4950b..d97bdb5a51 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -1,10 +1,8 @@ -#include -#include +#include +#include -#include "grob.hh" #include "item.hh" -#include "spanner.hh" -#include "system.hh" +#include "system.hh" static SCM break_criterion; void diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 10074de3f6..f6442151a0 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -15,11 +15,8 @@ TODO: #include "staff-symbol-referencer.hh" #include "breathing-sign.hh" -#include "event.hh" - #include "engraver-group-engraver.hh" #include "item.hh" -#include "engraver.hh" class Breathing_sign_engraver : public Engraver { diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 98966e2bf4..59a47a127d 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -10,14 +10,12 @@ Extensions for ancient notation (c) 2003 by Juergen Reuter */ +#include "breathing-sign.hh" + #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" -#include "breathing-sign.hh" -#include "string.hh" -#include "stencil.hh" #include "output-def.hh" #include "lookup.hh" - #include "dimensions.hh" #include "direction.hh" #include "text-item.hh" diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index d36567b594..35c82aaf08 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -7,12 +7,12 @@ */ #include "change-iterator.hh" + #include "context.hh" #include "music.hh" #include "warn.hh" #include "input.hh" - void Change_iterator::error (String reason) { diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 7a78ed2443..7982645663 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -8,13 +8,11 @@ #include "engraver.hh" #include "chord-name.hh" -#include "event.hh" #include "output-def.hh" #include "font-interface.hh" #include "output-def.hh" #include "dimensions.hh" #include "item.hh" -#include "pitch.hh" #include "protected-scm.hh" #include "context.hh" #include "warn.hh" diff --git a/lily/chord-name.cc b/lily/chord-name.cc index b7c019e322..ccd58b295c 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -7,10 +7,9 @@ */ #include "chord-name.hh" -#include "stencil.hh" + #include "output-def.hh" #include "font-interface.hh" -#include "grob.hh" #include "paper-column.hh" #include "system.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 7e38969eb0..b7ecae6d21 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -7,13 +7,11 @@ */ -#include "engraver.hh" #include "beam.hh" #include "repeated-music.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "engraver-group-engraver.hh" -#include "event.hh" #include "warn.hh" #include "misc.hh" #include "note-head.hh" diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index aa19347471..36e8697426 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -13,8 +13,9 @@ subclassing proved to be too difficult. */ -#include "input.hh" #include "chord-tremolo-iterator.hh" + +#include "input.hh" #include "repeated-music.hh" void diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 53074e6e27..c38d0cb69a 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -8,7 +8,7 @@ Mats Bengtsson */ -#include +#include #include "context.hh" #include "bar-line.hh" @@ -16,7 +16,6 @@ #include "engraver.hh" #include "direction.hh" #include "side-position-interface.hh" -#include "item.hh" class Clef_engraver : public Engraver { diff --git a/lily/clef.cc b/lily/clef.cc index c7e4920a99..c07944289e 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -7,6 +7,7 @@ */ #include "clef.hh" + #include "string.hh" #include "stencil.hh" #include "item.hh" diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index 0e99a2a8f2..0730c28b28 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -7,7 +7,6 @@ */ #include "engraver.hh" -#include "item.hh" #include "spanner.hh" #include "note-head.hh" #include "note-column.hh" diff --git a/lily/cluster.cc b/lily/cluster.cc index adf4e0aca6..3d1adbe29b 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -9,16 +9,15 @@ */ -#include - #include "cluster.hh" + +#include + #include "spanner.hh" #include "item.hh" #include "pitch.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" -#include "box.hh" -#include "interval.hh" #include "output-def.hh" #include "warn.hh" diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 2ef5cf41bd..1fad0f9b24 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -7,7 +7,7 @@ */ #include "coherent-ligature-engraver.hh" -#include "item.hh" + #include "warn.hh" #include "staff-symbol-referencer.hh" #include "spanner.hh" diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc index c9a0c06e10..39a352fd85 100644 --- a/lily/column-x-positions.cc +++ b/lily/column-x-positions.cc @@ -7,20 +7,9 @@ */ #include "column-x-positions.hh" -#include "real.hh" - Column_x_positions::Column_x_positions () { satisfies_constraints_ = true; force_ = 0; } - - - - - - - - - diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 07a53b8bc3..08a6737c2b 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -4,7 +4,7 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include #include "rhythmic-head.hh" #include "output-def.hh" diff --git a/lily/context-def.cc b/lily/context-def.cc index 1f75b9e74f..82b32ef4b7 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -10,8 +10,8 @@ a single list of context modifications? */ #include "context-def.hh" + #include "engraver.hh" -#include "lily-proto.hh" #include "output-def.hh" #include "performer.hh" #include "score-context.hh" diff --git a/lily/context.cc b/lily/context.cc index 82eaba0adf..c85d5a6cbd 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -7,9 +7,9 @@ */ -#include "object-key.hh" -#include "context-def.hh" #include "context.hh" + +#include "context-def.hh" #include "ly-smobs.icc" #include "main.hh" #include "output-def.hh" diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 928fde107e..fb6cc09c74 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -13,7 +13,6 @@ #include "note-head.hh" #include "staff-symbol-referencer.hh" #include "warn.hh" -#include "event.hh" /* * This class implements an engraver for custos symbols. diff --git a/lily/custos.cc b/lily/custos.cc index 9a41fb20c6..8ea02b4b1c 100644 --- a/lily/custos.cc +++ b/lily/custos.cc @@ -14,17 +14,17 @@ */ +#include "custos.hh" + +#include +#include // rint -#include #include "direction.hh" #include "staff-symbol-referencer.hh" -#include "custos.hh" -#include "stencil.hh" #include "warn.hh" #include "note-head.hh" #include "item.hh" #include "font-interface.hh" -#include "math.h" // rint MAKE_SCHEME_CALLBACK (Custos,print,1); SCM diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index 08074b2dab..8a1140c290 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -5,12 +5,13 @@ (c) 1998--2004 Han-Wen Nienhuys */ -#include -#include "warn.hh" + #include "dimension-cache.hh" -#include "parray.hh" -#include "grob.hh" +#include + +#include "warn.hh" +#include "grob.hh" Dimension_cache::Dimension_cache (Dimension_cache const &d) { diff --git a/lily/dimensions.cc b/lily/dimensions.cc index 20d9b8e32e..547ec07a2d 100644 --- a/lily/dimensions.cc +++ b/lily/dimensions.cc @@ -1,8 +1,8 @@ // dimensions.cc #include "dimensions.hh" + #include "warn.hh" -#include "string.hh" String print_dimen (Real r) diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index b45012c3be..698f2ff122 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -9,7 +9,6 @@ #include "directional-element-interface.hh" - Direction get_grob_direction (Grob*me) { diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index 2d4b6ea4d0..0a45cea586 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -7,7 +7,6 @@ */ - #include "rhythmic-head.hh" #include "dot-column.hh" #include "side-position-interface.hh" diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 63dc2f76ee..47052f2549 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -6,14 +6,14 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include +#include "dot-column.hh" + +#include +#include #include #include "dots.hh" -#include "dot-column.hh" #include "rhythmic-head.hh" -#include "group-interface.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" #include "side-position-interface.hh" diff --git a/lily/dots.cc b/lily/dots.cc index ba33b5ff53..1cd07bb3ca 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -7,8 +7,8 @@ */ #include "dots.hh" + #include "item.hh" -#include "stencil.hh" #include "output-def.hh" #include "font-interface.hh" #include "lookup.hh" diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index c66846137c..f650589012 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -3,11 +3,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include + +#include #include "rhythmic-head.hh" -#include "event.hh" -#include "item.hh" #include "engraver.hh" #include "warn.hh" #include "side-position-interface.hh" diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index e20d1da05d..f104ae705f 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -7,7 +7,6 @@ */ #include "performer.hh" -#include "event.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" diff --git a/lily/duration.cc b/lily/duration.cc index bf4e97bf73..4a836d5dd8 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -8,15 +8,12 @@ */ -#include +#include "duration.hh" #include "misc.hh" #include "lily-proto.hh" -#include "string.hh" -#include "moment.hh" -#include "duration.hh" -#include "ly-smobs.icc" +#include "ly-smobs.icc" int Duration::compare (Duration const &left, Duration const &right) diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index d9bdf7e94e..4675737005 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -11,11 +11,8 @@ #include "dimensions.hh" #include "directional-element-interface.hh" #include "engraver.hh" -#include "event.hh" -#include "group-interface.hh" #include "hairpin.hh" #include "interval.hh" -#include "item.hh" #include "note-column.hh" #include "paper-column.hh" #include "script-interface.hh" diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index cc6936a475..721ae39492 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -7,8 +7,6 @@ */ #include "performer.hh" - -#include "event.hh" #include "audio-item.hh" /* diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc index 0911781be2..56267f363c 100644 --- a/lily/dynamic-text-spanner.cc +++ b/lily/dynamic-text-spanner.cc @@ -9,7 +9,6 @@ Revised over good by Han-Wen. */ -#include "stencil.hh" #include "text-item.hh" #include "text-spanner.hh" #include "line-spanner.hh" diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 3cb642fc23..dcb46f9792 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -6,16 +6,14 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "flower-proto.hh" #include "engraver-group-engraver.hh" -#include "engraver.hh" + +#include "flower-proto.hh" #include "warn.hh" #include "paper-score.hh" #include "grob.hh" #include "context.hh" - - void Engraver_group_engraver::announce_grob (Grob_info info) { diff --git a/lily/engraver.cc b/lily/engraver.cc index 4430ab4fc6..e1d1ddf50b 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -6,10 +6,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "music.hh" #include "engraver.hh" -#include "engraver-group-engraver.hh" -#include "grob.hh" + +#include "music.hh" #include "score-engraver.hh" #include "warn.hh" #include "spanner.hh" diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc index ef045c427f..56fe24f6cb 100644 --- a/lily/event-chord-iterator.cc +++ b/lily/event-chord-iterator.cc @@ -6,9 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "event-chord-iterator.hh" + #include "context.hh" #include "warn.hh" -#include "event-chord-iterator.hh" #include "music-list.hh" #include "event.hh" diff --git a/lily/event.cc b/lily/event.cc index f497c2c121..3031f0f212 100644 --- a/lily/event.cc +++ b/lily/event.cc @@ -7,9 +7,9 @@ */ #include "event.hh" + #include "warn.hh" -#include "event.hh" - + Moment Event::get_length () const { diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index 2368748c2a..c35e87d9c1 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -9,7 +9,6 @@ source file of the GNU LilyPond music typesetter #include "engraver.hh" #include "text-item.hh" -#include "event.hh" #include "item.hh" #include "context.hh" diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 48776e2f64..95a4b559cd 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -7,11 +7,8 @@ */ - #include "engraver.hh" #include "side-position-interface.hh" -#include "item.hh" -#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "self-alignment-interface.hh" diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index 8ec9103eb9..cf9b5438ed 100644 --- a/lily/folded-repeat-iterator.cc +++ b/lily/folded-repeat-iterator.cc @@ -7,8 +7,9 @@ */ -#include "input.hh" #include "folded-repeat-iterator.hh" + +#include "input.hh" #include "repeated-music.hh" #include "music-list.hh" #include "simultaneous-music-iterator.hh" diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 01b5cf9c11..d96529383a 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -6,13 +6,12 @@ (c) 2000--2004 Han-Wen Nienhuys */ -#include "all-font-metrics.hh" -#include "font-metric.hh" #include "font-interface.hh" -#include "grob.hh" + +#include "all-font-metrics.hh" #include "output-def.hh" #include "warn.hh" - +#include "grob.hh" /* todo: split up this func, reuse in text_item? */ Font_metric * diff --git a/lily/font-metric.cc b/lily/font-metric.cc index b47d50b775..8a11c911a2 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -8,16 +8,17 @@ Mats Bengtsson (the ugly TeX parsing in text_dimension) */ -#include -#include +#include "font-metric.hh" + +#include +#include #include "modified-font-metric.hh" #include "virtual-methods.hh" #include "warn.hh" #include "stencil.hh" + #include "ly-smobs.icc" -#include "font-metric.hh" -#include "string.hh" Real Font_metric::design_size () const diff --git a/lily/font-select.cc b/lily/font-select.cc index 6e3348a335..0613840b00 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -7,8 +7,7 @@ */ -#include - +#include #include "all-font-metrics.hh" #include "output-def.hh" diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc index 207e302849..2407e81613 100644 --- a/lily/forbid-break-engraver.cc +++ b/lily/forbid-break-engraver.cc @@ -1,5 +1,4 @@ #include "rhythmic-head.hh" -#include "engraver.hh" #include "grob.hh" #include "score-engraver.hh" diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc index dc05bb3088..f0ba20d554 100644 --- a/lily/function-documentation.cc +++ b/lily/function-documentation.cc @@ -7,9 +7,8 @@ */ -#include +#include -#include "lily-guile.hh" #include "protected-scm.hh" #include "string.hh" diff --git a/lily/gdb.cc b/lily/gdb.cc index e9bfd001dc..c47934c7ba 100644 --- a/lily/gdb.cc +++ b/lily/gdb.cc @@ -1,4 +1,3 @@ -#include "item.hh" #include "spanner.hh" #include "paper-column.hh" diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 884f5e3665..e1ebe69182 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -7,7 +7,6 @@ */ #include "warn.hh" -#include "event.hh" #include "spanner.hh" #include "rhythmic-head.hh" #include "engraver.hh" diff --git a/lily/global-context.cc b/lily/global-context.cc index 44065e9cb4..7acf004cf1 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -5,14 +5,15 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include + +#include "global-context.hh" + +#include #include "warn.hh" -#include "music.hh" #include "event.hh" #include "music-list.hh" #include "music-iterator.hh" -#include "global-context.hh" #include "score-context.hh" #include "context-def.hh" #include "output-def.hh" diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc index 5f2a767973..70e7dc848a 100644 --- a/lily/global-ctor.cc +++ b/lily/global-ctor.cc @@ -6,7 +6,9 @@ (c) 1999--2004 Han-Wen Nienhuys */ + #include "global-ctor.hh" + #include "array.hh" static Array *ctor_global_statics_; diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 98c3cb761c..62d134c00a 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -5,11 +5,12 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include // rint -#include #include "gourlay-breaking.hh" -#include "column-x-positions.hh" + +#include // rint +#include + #include "warn.hh" #include "main.hh" #include "paper-column.hh" diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index d68bcad7b3..17ba7bd187 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -7,10 +7,9 @@ */ -#include "grace-music.hh" #include "grace-iterator.hh" - +#include "grace-music.hh" #include "global-context.hh" #include "warn.hh" diff --git a/lily/grace-music.cc b/lily/grace-music.cc index 895764682b..60599ebcf7 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -8,6 +8,7 @@ */ #include "grace-music.hh" + #include "grace-iterator.hh" Moment diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc index cf4c0e18f2..7b623cc2ef 100644 --- a/lily/gregorian-ligature-engraver.cc +++ b/lily/gregorian-ligature-engraver.cc @@ -7,8 +7,8 @@ */ #include "gregorian-ligature-engraver.hh" + #include "gregorian-ligature.hh" -#include "item.hh" #include "warn.hh" #include "staff-symbol-referencer.hh" #include "spanner.hh" diff --git a/lily/gregorian-ligature.cc b/lily/gregorian-ligature.cc index e472171337..38b1d7a29a 100644 --- a/lily/gregorian-ligature.cc +++ b/lily/gregorian-ligature.cc @@ -5,8 +5,10 @@ (c) 2003--2004 Han-Wen Nienhuys */ -#include "grob.hh" + #include "gregorian-ligature.hh" + +#include "grob.hh" #include "string.hh" void check_prefix (String name, int mask, int prefix_set, String *str) diff --git a/lily/grob-info.cc b/lily/grob-info.cc index bc6205a8dc..d64f48f5f4 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -6,8 +6,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "grob.hh" #include "grob-info.hh" + +#include "grob.hh" #include "music.hh" #include "translator-group.hh" #include "context.hh" diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index 19b88d8a64..21ce34c48e 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -6,9 +6,9 @@ (c) 2002--2004 Han-Wen Nienhuys */ -#include "protected-scm.hh" #include "grob-interface.hh" -#include "lily-guile.hh" + +#include "protected-scm.hh" #include "grob.hh" #include "warn.hh" diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc index fd3f9953c1..883af20ca6 100644 --- a/lily/grob-pitch-tuple.cc +++ b/lily/grob-pitch-tuple.cc @@ -6,10 +6,10 @@ source file of the GNU LilyPond music typesetter (c) 2001--2004 Han-Wen Nienhuys */ + #include "grob-pitch-tuple.hh" -#include "pitch.hh" -#include "event.hh" +#include "event.hh" int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b) { diff --git a/lily/grob-property.cc b/lily/grob-property.cc index 1c5bbea7b0..f8ebf1fc35 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -2,8 +2,8 @@ Implement storage and manipulation of grob properties. */ -#include -#include +#include +#include #include "main.hh" #include "input-smob.hh" @@ -11,7 +11,6 @@ #include "misc.hh" #include "paper-score.hh" #include "output-def.hh" -#include "grob.hh" #include "spanner.hh" #include "item.hh" #include "misc.hh" diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index 6b7fdc2332..d6d32e9ecd 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -7,14 +7,11 @@ Han-Wen Nienhuys */ -#include "grob.hh" #include "warn.hh" -#include "spanner.hh" #include "item.hh" #include "output-def.hh" #include "system.hh" - LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!", 3, 0, 0, (SCM grob, SCM sym, SCM val), "Set @var{sym} in grob @var{grob} to value @var{val}") diff --git a/lily/grob.cc b/lily/grob.cc index fe43a6218c..c6e442ec53 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -6,9 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "grob.hh" -#include -#include +#include +#include #include "main.hh" #include "input-smob.hh" @@ -17,9 +18,7 @@ #include "misc.hh" #include "paper-score.hh" #include "stencil.hh" -#include "grob.hh" #include "warn.hh" -#include "spanner.hh" #include "system.hh" #include "item.hh" #include "stencil.hh" diff --git a/lily/group-interface.cc b/lily/group-interface.cc index ff1a4a30b6..14cdbc5277 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -6,8 +6,8 @@ (c) 1999--2004 Han-Wen Nienhuys */ + #include "group-interface.hh" -#include "grob.hh" void Group_interface::add_thing (Grob*me, SCM sym, SCM thing) diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 9fcf79df88..de83f6a3b8 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -6,10 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "hairpin.hh" + #include "staff-symbol-referencer.hh" -#include "stencil.hh" #include "line-interface.hh" -#include "hairpin.hh" #include "spanner.hh" #include "font-interface.hh" #include "dimensions.hh" diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index f477cd22e4..1907f56bf3 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -7,13 +7,13 @@ Han-Wen Nienhuys */ +#include "hara-kiri-group-spanner.hh" + #include "axis-group-interface.hh" #include "spanner.hh" -#include "hara-kiri-group-spanner.hh" #include "warn.hh" #include "item.hh" - MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner,y_extent,2); SCM Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis) diff --git a/lily/identifier-smob.cc b/lily/identifier-smob.cc index 7846df2666..d5f23ad49e 100644 --- a/lily/identifier-smob.cc +++ b/lily/identifier-smob.cc @@ -9,7 +9,6 @@ #include "identifier-smob.hh" - scm_t_bits package_tag; static int diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 195702bf24..d58b31ced3 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -6,11 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "includable-lexer.hh" + #include #include "config.hh" - -#include "includable-lexer.hh" #include "file-path.hh" #include "source-file.hh" #include "source.hh" diff --git a/lily/include/afm.hh b/lily/include/afm.hh index ebf8b6afb6..9853cae98d 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -13,8 +13,6 @@ #include -#include "string.hh" -#include "box.hh" #include "array.hh" #include "font-metric.hh" #include "parse-afm.hh" diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index 776a38d16f..b506abaad5 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -11,7 +11,6 @@ #define ALL_FONTS_HH #include "file-path.hh" -#include "lily-proto.hh" #include "font-metric.hh" /** diff --git a/lily/include/ambitus.hh b/lily/include/ambitus.hh index baea7d01ab..6898873048 100644 --- a/lily/include/ambitus.hh +++ b/lily/include/ambitus.hh @@ -11,6 +11,8 @@ #include "lily-guile.hh" +class Grob; + struct Ambitus { DECLARE_SCHEME_CALLBACK (print, (SCM smob)); diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index 9b78075c6e..06ba4b0ec7 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -7,7 +7,6 @@ #ifndef AUDIO_COLUMN_HH #define AUDIO_COLUMN_HH -#include "flower-proto.hh" #include "lily-proto.hh" #include "moment.hh" #include "parray.hh" diff --git a/lily/include/audio-element.hh b/lily/include/audio-element.hh index ca54756ac4..cc70358028 100644 --- a/lily/include/audio-element.hh +++ b/lily/include/audio-element.hh @@ -10,7 +10,6 @@ #ifndef AUDIO_ELEMENT_HH #define AUDIO_ELEMENT_HH -#include #include "virtual-methods.hh" class Audio_element diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index cde3d8ad3d..f2f73efacf 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -7,14 +7,9 @@ #ifndef AUDIO_ITEM_HH #define AUDIO_ITEM_HH -#include -#include "lily-proto.hh" -#include "string.hh" #include "audio-element.hh" - -#include "pitch.hh" #include "moment.hh" -#include "drul-array.hh" +#include "pitch.hh" /** diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh index c5c82d5ea4..d60955df5a 100644 --- a/lily/include/beaming.hh +++ b/lily/include/beaming.hh @@ -11,7 +11,6 @@ #define BEAMING_HH #include "parray.hh" -#include "drul-array.hh" #include "moment.hh" struct Beaming_info diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index c7317be581..90b19a2d1f 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -8,11 +8,8 @@ #define BEZIER_HH -#include "real.hh" -#include "drul-array.hh" #include "interval.hh" #include "offset.hh" -#include "array.hh" #include "polynomial.hh" /** diff --git a/lily/include/book-paper-def.hh b/lily/include/book-paper-def.hh index f807347bb6..09ef4fe15b 100644 --- a/lily/include/book-paper-def.hh +++ b/lily/include/book-paper-def.hh @@ -9,7 +9,6 @@ #ifndef BOOK_PAPER_DEF_HH #define BOOK_PAPER_DEF_HH -#include "lily-proto.hh" #include "output-def.hh" #error diff --git a/lily/include/book.hh b/lily/include/book.hh index 062658420a..2563bc1227 100644 --- a/lily/include/book.hh +++ b/lily/include/book.hh @@ -12,7 +12,6 @@ #include "input.hh" #include "lily-proto.hh" #include "parray.hh" -#include "smobs.hh" #include "object-key.hh" #include "string.hh" diff --git a/lily/include/box.hh b/lily/include/box.hh index a04661fa56..901987f1ad 100644 --- a/lily/include/box.hh +++ b/lily/include/box.hh @@ -5,8 +5,6 @@ #ifndef BOXES_HH #define BOXES_HH -#include "flower-proto.hh" -#include "real.hh" #include "interval.hh" #include "offset.hh" diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh index 9729d9ca99..6d0eb51181 100644 --- a/lily/include/break-algorithm.hh +++ b/lily/include/break-algorithm.hh @@ -10,9 +10,7 @@ #ifndef BREAK_HH #define BREAK_HH -#include "array.hh" #include "interval.hh" -#include "lily-proto.hh" #include "column-x-positions.hh" diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh index 75a035437b..e155445e28 100644 --- a/lily/include/breathing-sign.hh +++ b/lily/include/breathing-sign.hh @@ -12,6 +12,8 @@ #include "lily-guile.hh" +class Grob; + /* breathing sign (apostrophe within staff, not the comma above staff type) diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index 147722ade0..b040bf64cd 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -9,7 +9,6 @@ #ifndef CHORD_NAME_HH #define CHORD_NAME_HH -#include "lily-guile.hh" #include "stencil.hh" diff --git a/lily/include/cluster.hh b/lily/include/cluster.hh index 490863be63..2895a00ae9 100644 --- a/lily/include/cluster.hh +++ b/lily/include/cluster.hh @@ -9,7 +9,6 @@ #ifndef CLUSTER_HH #define CLUSTER_HH -#include "lily-guile.hh" #include "stencil.hh" class Cluster diff --git a/lily/include/custos.hh b/lily/include/custos.hh index 0d6401130b..d5d20d6c66 100644 --- a/lily/include/custos.hh +++ b/lily/include/custos.hh @@ -11,6 +11,9 @@ #include "lily-guile.hh" +class Grob; +class Stencil; + struct Custos { DECLARE_SCHEME_CALLBACK (print, (SCM )); diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh index ec2f601c46..5017554fb1 100644 --- a/lily/include/dimension-cache-callback.hh +++ b/lily/include/dimension-cache-callback.hh @@ -10,6 +10,7 @@ #ifndef DIMENSION_CACHE_CALLBACK_HH #define DIMENSION_CACHE_CALLBACK_HH +#include "axes.hh" typedef Interval (*Dim_cache_callback) (Grob *,Axis); typedef Real (*Offset_callback) (Grob *,Axis); diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh index 4576c99ef2..06c1ebf4d6 100644 --- a/lily/include/dimension-cache.hh +++ b/lily/include/dimension-cache.hh @@ -10,14 +10,11 @@ #ifndef DIMENSION_CACHE_HH #define DIMENSION_CACHE_HH -#include "interval.hh" -#include "real.hh" #include "lily-proto.hh" #include "parray.hh" #include "dimension-cache-callback.hh" #include "lily-guile.hh" - /** Adminstration of offset dimension info. */ diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index dc30f42c91..05c5a7e548 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -12,6 +12,8 @@ #include "lily-guile.hh" +class Grob; + /** Group dots. This is needed because, the dots have to be aligned per voice */ diff --git a/lily/include/duration.hh b/lily/include/duration.hh index 6d8667febb..793042cb23 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -10,9 +10,7 @@ #ifndef DURATION_HH #define DURATION_HH -#include "flower-proto.hh" #include "moment.hh" -#include "smobs.hh" /** A musical duration. @@ -43,7 +41,6 @@ private: Rational factor_; }; -#include "compare.hh" INSTANTIATE_COMPARE (Duration, Duration::compare); DECLARE_UNSMOB (Duration, duration); diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh index 1651f80116..53180f5f8b 100644 --- a/lily/include/engraver-group-engraver.hh +++ b/lily/include/engraver-group-engraver.hh @@ -11,9 +11,6 @@ #ifndef ENGRAVERGROUP_HH #define ENGRAVERGROUP_HH -#include "lily-proto.hh" -#include "parray.hh" -#include "grob-info.hh" #include "engraver.hh" #include "translator-group.hh" diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index dfe333ef78..39a5b1f8ee 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -10,13 +10,10 @@ #ifndef ENGRAVER_HH #define ENGRAVER_HH -#include "lily-proto.hh" -#include "array.hh" #include "event.hh" #include "grob-info.hh" #include "translator.hh" - /** a struct which processes events, and creates the #Grob#s. It may use derived classes. diff --git a/lily/include/event.hh b/lily/include/event.hh index 0cf7b8f3b2..6365b16c86 100644 --- a/lily/include/event.hh +++ b/lily/include/event.hh @@ -10,9 +10,6 @@ #define EVENT_HH -#include "string.hh" -#include "moment.hh" -#include "virtual-methods.hh" #include "input.hh" #include "music.hh" #include "duration.hh" diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh index 5a15a29eae..0a0b662723 100644 --- a/lily/include/font-interface.hh +++ b/lily/include/font-interface.hh @@ -10,7 +10,6 @@ #ifndef FONT_INTERFACE_HH #define FONT_INTERFACE_HH -#include "lily-proto.hh" #include "font-metric.hh" struct Font_interface diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index d6236e042a..7184c752aa 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -11,10 +11,8 @@ #define FONT_METRIC_HH #include "box.hh" -#include "lily-guile.hh" #include "smobs.hh" #include "lily-proto.hh" -#include "string.hh" struct Font_metric { diff --git a/lily/include/gregorian-ligature.hh b/lily/include/gregorian-ligature.hh index 0fd627c400..8b447a95d9 100644 --- a/lily/include/gregorian-ligature.hh +++ b/lily/include/gregorian-ligature.hh @@ -9,6 +9,9 @@ #ifndef GREGORIAN_LIGATURE_HH #define GREGORIAN_LIGATURE_HH +class Grob; +class String; + class Gregorian_ligature { public: static bool has_interface (Grob *); diff --git a/lily/include/grob-interface.hh b/lily/include/grob-interface.hh index 059687ccee..a3194a9a13 100644 --- a/lily/include/grob-interface.hh +++ b/lily/include/grob-interface.hh @@ -10,6 +10,7 @@ #ifndef INTERFACE_HH #define INTERFACE_HH +#include /* SCM */ void add_interface (const char * symbol, const char * descr, diff --git a/lily/include/grob-pitch-tuple.hh b/lily/include/grob-pitch-tuple.hh index b2a734bbd8..ba2904b38b 100644 --- a/lily/include/grob-pitch-tuple.hh +++ b/lily/include/grob-pitch-tuple.hh @@ -10,7 +10,6 @@ source file of the GNU LilyPond music typesetter #ifndef GROB_PITCH_TUPLE_HH #define GROB_PITCH_TUPLE_HH -#include "lily-proto.hh" #include "pitch.hh" #include "moment.hh" diff --git a/lily/include/grob.hh b/lily/include/grob.hh index b09e6e9ac0..503f5c307b 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -9,11 +9,7 @@ #ifndef GROB_HH #define GROB_HH -#include "parray.hh" #include "virtual-methods.hh" -#include "lily-guile.hh" -#include "lily-proto.hh" -#include "smobs.hh" #include "dimension-cache.hh" #include "grob-interface.hh" #include "object-key.hh" diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index fbc776e49b..6d544f27ee 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -10,11 +10,8 @@ #ifndef GROUP_INTERFACE_HH #define GROUP_INTERFACE_HH -#include "lily-proto.hh" -#include "string.hh" -#include "lily-guile.hh" - #include "grob.hh" +#include "string.hh" /** Look at Score element ELT as thing which has a list property called NAME_. Normally the list would contain Grobs, but diff --git a/lily/include/input-smob.hh b/lily/include/input-smob.hh index cc75837d74..b651dd8687 100644 --- a/lily/include/input-smob.hh +++ b/lily/include/input-smob.hh @@ -11,7 +11,6 @@ #define INPUT_SMOB_HH #include "input.hh" -#include "lily-guile.hh" #include "smobs.hh" SCM make_input (Input spot); diff --git a/lily/include/item.hh b/lily/include/item.hh index bb0e02ef82..5e8787a9f3 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -11,7 +11,6 @@ #include "box.hh" #include "grob.hh" -#include "drul-array.hh" /** diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh index f941091b1a..af0825a3d2 100644 --- a/lily/include/kpath.hh +++ b/lily/include/kpath.hh @@ -10,6 +10,8 @@ #ifndef KPATH_HH #define KPATH_HH +class String; + String kpathsea_find_afm (char const * name); String kpathsea_find_tfm (char const * name); void initialize_kpathsea (char *av0); diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index fb3de16595..40b9bcc13d 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -10,10 +10,8 @@ #define LILY_GUILE_HH #include -#include "flower-proto.hh" -#include "drul-array.hh" -#include "direction.hh" +#include "interval.hh" #include "guile-compatibility.hh" #ifndef SMOB_FREE_RETURN_VAL @@ -190,7 +188,7 @@ SCM ly_unique (SCM lst); SCM ly_list_qsort_uniq_x (SCM lst); SCM ly_output_formats(); -SCM ly_kpathsea_expand_path (SCM); +SCM ly_kpathsea_find_file (SCM); /* snarfing. diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh index 26ac92a6c2..cfdb891033 100644 --- a/lily/include/lily-lexer.hh +++ b/lily/include/lily-lexer.hh @@ -12,13 +12,8 @@ #include "includable-lexer.hh" #include "input.hh" -#include "lily-proto.hh" -#include "flower-proto.hh" -#include "array.hh" -#include "string.hh" #include "duration.hh" #include "pitch.hh" -#include "smobs.hh" bool busy_parsing (); void kill_lexer (); diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh index b3f8ddd33e..131c778362 100644 --- a/lily/include/lily-parser.hh +++ b/lily/include/lily-parser.hh @@ -9,13 +9,10 @@ #ifndef MY_LILY_PARSER_HH #define MY_LILY_PARSER_HH -#include "array.hh" #include "duration.hh" #include "input.hh" #include "parray.hh" #include "pitch.hh" -#include "smobs.hh" -#include "string.hh" /** State for the parser. Do not ever add any variables to parse diff --git a/lily/include/lilypond-key.hh b/lily/include/lilypond-key.hh index fe47155bf6..15d4639ec1 100644 --- a/lily/include/lilypond-key.hh +++ b/lily/include/lilypond-key.hh @@ -13,7 +13,6 @@ #include "object-key.hh" #include "lily-proto.hh" #include "moment.hh" -#include "string.hh" class Lilypond_grob_key : public Object_key { diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index c2409b81c1..6e9a944974 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -11,7 +11,6 @@ #define LINE_GROUP_GRAV_HH #include "engraver-group-engraver.hh" -#include "lily-proto.hh" /** Engravers put elements on the same or lowel level in a line. diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh index 79a08e2c81..2879a35cec 100644 --- a/lily/include/line-spanner.hh +++ b/lily/include/line-spanner.hh @@ -12,6 +12,9 @@ #include "lily-guile.hh" +class Grob; +class Stencil; + class Line_spanner { public: diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index b84097ee2e..5a8184c722 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -10,11 +10,7 @@ #ifndef LOOKUP_HH #define LOOKUP_HH -#include "string.hh" #include "stencil.hh" -#include "flower-proto.hh" -#include "direction.hh" -#include "box.hh" struct Lookup { diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index e61b5ed775..5d5ff89389 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -8,9 +8,6 @@ #define MIDI_ITEM_HH #include "cons.hh" -#include "string.hh" -#include "lily-proto.hh" -#include "moment.hh" #include "audio-item.hh" /** diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index 2622027d6d..21fd193c82 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -7,9 +7,12 @@ #ifndef MIDI_STREAM_HH #define MIDI_STREAM_HH -#include +#include + #include "string.hh" +class Midi_item; + /// Midi outputfile struct Midi_stream { Midi_stream (String file_name_string); diff --git a/lily/include/minterval.hh b/lily/include/minterval.hh index b6e9d28e8c..a8d882d283 100644 --- a/lily/include/minterval.hh +++ b/lily/include/minterval.hh @@ -10,7 +10,6 @@ #ifndef MINTERVAL_HH #define MINTERVAL_HH -#include "interval.hh" #include "moment.hh" typedef Interval_t MInterval; diff --git a/lily/include/misc.hh b/lily/include/misc.hh index c76c8a9a86..754379d477 100644 --- a/lily/include/misc.hh +++ b/lily/include/misc.hh @@ -1,9 +1,8 @@ #ifndef MISC_HH #define MISC_HH -#include +#include -#include "real.hh" #include "array.hh" #include "interval.hh" diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index c863940ec1..c23cb9cc42 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -10,7 +10,6 @@ #ifndef MULTI_MEASURE_REST_HH #define MULTI_MEASURE_REST_HH -#include "lily-proto.hh" #include "lily-guile.hh" #include "rod.hh" diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 71de6e4810..c5fdfe912c 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -10,12 +10,10 @@ #ifndef MUSIC_ITERATOR_HH #define MUSIC_ITERATOR_HH -#include "lily-proto.hh" #include "array.hh" #include "moment.hh" #include "virtual-methods.hh" #include "interpretation-context-handle.hh" -#include "smobs.hh" /** --- diff --git a/lily/include/music.hh b/lily/include/music.hh index d669d39e52..b59114eafb 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -11,9 +11,6 @@ #include "virtual-methods.hh" #include "minterval.hh" -#include "lily-proto.hh" -#include "string.hh" -#include "smobs.hh" #include "music-constructor.hh" #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x)) diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh index 0a36863979..a5f803b2a0 100644 --- a/lily/include/note-collision.hh +++ b/lily/include/note-collision.hh @@ -12,8 +12,6 @@ #include "lily-proto.hh" #include "lily-guile.hh" - -#include "drul-array.hh" #include "parray.hh" /** diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 88173d1b0e..6b81322f17 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -7,7 +7,6 @@ #ifndef NOTEHEAD_HH #define NOTEHEAD_HH -#include "lily-guile.hh" #include "stencil.hh" /** ball at the end of the stem. Also takes care of ledger lines. diff --git a/lily/include/object-key-dumper.hh b/lily/include/object-key-dumper.hh index 1dd1e6c113..bbcf8bf014 100644 --- a/lily/include/object-key-dumper.hh +++ b/lily/include/object-key-dumper.hh @@ -12,9 +12,7 @@ #include -#include "lily-guile.hh" #include "object-key.hh" -#include "smobs.hh" typedef std::map Key_to_key_map; typedef std::map Pointer_to_int_map; diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh index 05e7259e94..cf8208714b 100644 --- a/lily/include/output-def.hh +++ b/lily/include/output-def.hh @@ -11,7 +11,6 @@ #include "string.hh" #include "lily-proto.hh" -#include "lily-guile.hh" #include "virtual-methods.hh" #include "smobs.hh" #include "input.hh" diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh index a770536b6f..e5302c298b 100644 --- a/lily/include/paper-book.hh +++ b/lily/include/paper-book.hh @@ -8,11 +8,13 @@ #ifndef PAPER_BOOK_HH #define PAPER_BOOK_HH -#include "lily-guile.hh" #include "parray.hh" #include "protected-scm.hh" #include "smobs.hh" +class Output_def; +class Stencil; + struct Score_systems { SCM systems_; diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index 2c1aeb2ed9..aa9e90d9e2 100644 --- a/lily/include/paper-outputter.hh +++ b/lily/include/paper-outputter.hh @@ -13,8 +13,8 @@ #include "lily-proto.hh" #include "array.hh" #include "string.hh" -#include "lily-guile.hh" #include "protected-scm.hh" +#include "smobs.hh" /* Glue between the backend (grobs, systems, pages) and the output file. diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 8cc83e0644..3e82beb448 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -10,11 +10,7 @@ #define PAPER_SCORE_HH #include "column-x-positions.hh" -#include "parray.hh" -#include "lily-proto.hh" #include "music-output.hh" -#include "lily-guile.hh" -#include "protected-scm.hh" /* LAYOUT output */ class Paper_score : public Music_output diff --git a/lily/include/paper-system.hh b/lily/include/paper-system.hh index b94a3be35e..92a394729f 100644 --- a/lily/include/paper-system.hh +++ b/lily/include/paper-system.hh @@ -8,9 +8,6 @@ #ifndef PAPER_SYSTEM_HH #define PAPER_SYSTEM_HH -#include "lily-proto.hh" -#include "smobs.hh" -#include "offset.hh" #include "stencil.hh" /* diff --git a/lily/include/performance.hh b/lily/include/performance.hh index 4163493711..494934c073 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -8,7 +8,6 @@ #define PERFORMANCE_HH #include "parray.hh" -#include "lily-proto.hh" #include "cons.hh" #include "music-output.hh" diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh index b7d2575f5c..c93f2eb094 100644 --- a/lily/include/performer-group-performer.hh +++ b/lily/include/performer-group-performer.hh @@ -8,8 +8,6 @@ #ifndef PERFORMER_GROUP_PERFORMER_HH #define PERFORMER_GROUP_PERFORMER_HH -#include "lily-proto.hh" -#include "parray.hh" #include "performer.hh" #include "translator-group.hh" diff --git a/lily/include/performer.hh b/lily/include/performer.hh index 40e5695f59..ddc2fe4995 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -9,7 +9,6 @@ #define PERFORMER_HH #include "audio-element-info.hh" -#include "array.hh" #include "event.hh" #include "grob-info.hh" #include "translator.hh" diff --git a/lily/include/pitch-interval.hh b/lily/include/pitch-interval.hh index dde3c1d556..fd16d11c63 100644 --- a/lily/include/pitch-interval.hh +++ b/lily/include/pitch-interval.hh @@ -11,7 +11,6 @@ #define PITCH_INTERVAL_HH #include "pitch.hh" -#include "drul-array.hh" class Pitch_interval : public Drul_array { diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index bd0f209182..b281c0e198 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -81,7 +81,6 @@ SCM ly_pitch_diff (SCM pitch, SCM root); SCM ly_pitch_transpose (SCM p, SCM delta); DECLARE_UNSMOB(Pitch,pitch); -#include "compare.hh" INSTANTIATE_COMPARE (Pitch, Pitch::compare); int compare (Array*, Array*); diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 0c8ae0d36b..e71d12657d 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -12,6 +12,8 @@ #include "lily-guile.hh" +class Grob; + class Rest { public: diff --git a/lily/include/rod.hh b/lily/include/rod.hh index 1ab271bba3..65be3ce012 100644 --- a/lily/include/rod.hh +++ b/lily/include/rod.hh @@ -11,7 +11,6 @@ #define ROD_HH #include "lily-proto.hh" -#include "direction.hh" #include "drul-array.hh" struct Rod diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index a823494505..29accbce44 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -11,7 +11,6 @@ #define SCM_HASH_HH -#include "lily-guile.hh" #include "smobs.hh" diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh index 42680ad0ab..5ea8c6f953 100644 --- a/lily/include/slur-configuration.hh +++ b/lily/include/slur-configuration.hh @@ -10,9 +10,7 @@ #ifndef SLUR_CONFIGURATION_HH #define SLUR_CONFIGURATION_HH -#include "drul-array.hh" #include "bezier.hh" -#include "lily-proto.hh" #include "parray.hh" #include "main.hh" diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index b50ca1ffe1..02ec733ec2 100644 --- a/lily/include/source-file.hh +++ b/lily/include/source-file.hh @@ -11,9 +11,7 @@ #include -#include "flower-proto.hh" #include "string.hh" -#include "interval.hh" #include "protected-scm.hh" #include "parray.hh" diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index dad07123bf..ac5706de82 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -7,9 +7,7 @@ #ifndef SPANNER_HH #define SPANNER_HH -#include "lily-proto.hh" #include "grob.hh" -#include "drul-array.hh" #include "rod.hh" /** A symbol which is attached between two columns. A spanner is a diff --git a/lily/include/spring.hh b/lily/include/spring.hh index 3224d77189..a42ecd5824 100644 --- a/lily/include/spring.hh +++ b/lily/include/spring.hh @@ -11,7 +11,6 @@ #define SPRING_HH #include "lily-proto.hh" -#include "drul-array.hh" #include "smobs.hh" struct Spring_smob diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 22721dad31..b9134d120f 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -10,7 +10,6 @@ #include "lily-proto.hh" #include "lily-guile.hh" #include "stem-info.hh" -#include "drul-array.hh" class Stem { diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh index edfb1c7f8f..dfda4f2547 100644 --- a/lily/include/stencil.hh +++ b/lily/include/stencil.hh @@ -8,11 +8,10 @@ #ifndef STENCIL_HH #define STENCIL_HH -#include // size_t +#include // size_t + #include "lily-proto.hh" #include "box.hh" -#include "direction.hh" -#include "lily-guile.hh" #include "smobs.hh" /** a group of individually translated symbols. You can add stencils diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh index 6f5425de47..97d91cf14e 100644 --- a/lily/include/text-item.hh +++ b/lily/include/text-item.hh @@ -11,8 +11,6 @@ #define TEXT_ITEM -#include "lily-proto.hh" -#include "lily-guile.hh" #include "stencil.hh" class Text_interface diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh index 4ac6431985..eb60883fdd 100644 --- a/lily/include/text-spanner.hh +++ b/lily/include/text-spanner.hh @@ -12,6 +12,8 @@ #include "lily-guile.hh" +class Grob; + class Text_spanner { public: diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh index dd8a679d1e..3fcf49cf13 100644 --- a/lily/include/tfm.hh +++ b/lily/include/tfm.hh @@ -17,9 +17,7 @@ #ifndef TFM_HH #define TFM_HH -#include "string.hh" #include "array.hh" -#include "lily-proto.hh" #include "font-metric.hh" /* The type. */ diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 17a6163659..0f5bc4f13a 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -10,12 +10,8 @@ #ifndef TRANSLATOR_GROUP_HH #define TRANSLATOR_GROUP_HH -#include "string.hh" -#include "lily-proto.hh" -#include "virtual-methods.hh" #include "translator.hh" #include "parray.hh" -#include "smobs.hh" typedef void (Translator::*Translator_method) (void); diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 3babb758c9..cc255a59c8 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -14,7 +14,6 @@ #include "string.hh" #include "lily-proto.hh" #include "virtual-methods.hh" -#include "lily-guile.hh" #include "input.hh" #include "smobs.hh" diff --git a/lily/include/tweak-registration.hh b/lily/include/tweak-registration.hh index 61aab26f70..2ad715f497 100644 --- a/lily/include/tweak-registration.hh +++ b/lily/include/tweak-registration.hh @@ -13,8 +13,7 @@ #include #include "lily-proto.hh" -#include "smobs.hh" -#include "lily-guile.hh" +#include "object-key.hh" typedef std::map Tweak_map ; diff --git a/lily/include/vaticana-ligature.hh b/lily/include/vaticana-ligature.hh index ee68e69649..1e57ba3aab 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 "lily-guile.hh" #include "stencil.hh" struct Vaticana_ligature diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 0c1018fc11..0dd973956f 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -7,9 +7,10 @@ */ -#include "input.hh" #include "input-smob.hh" + #include "string.hh" + #include "ly-smobs.icc" /* Dummy input location for use if real one is missing. */ diff --git a/lily/input.cc b/lily/input.cc index 77c5c14b2c..6408fea4ec 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -6,11 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include - -#include "flower-proto.hh" #include "input.hh" -#include "string.hh" + +#include + #include "source.hh" #include "source-file.hh" diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 334da9dd59..695d96a2f8 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -8,7 +8,6 @@ */ #include "engraver.hh" -#include "item.hh" #include "bar-line.hh" #include "system-start-delimiter.hh" #include "side-position-interface.hh" diff --git a/lily/item.cc b/lily/item.cc index c6d5ba053e..2f4ba5f361 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -6,16 +6,15 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "item.hh" + #include "paper-score.hh" #include "warn.hh" -#include "item.hh" #include "paper-column.hh" -#include "spanner.hh" #include "lily-guile.hh" #include "system.hh" #include "group-interface.hh" - Grob * Item::clone (int count) const { diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index e4c84d9e9f..db5c1e4c06 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -6,15 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ - - -#include "event.hh" #include "item.hh" #include "bar-line.hh" #include "staff-symbol-referencer.hh" #include "context.hh" #include "engraver.hh" -#include "pitch.hh" #include "protected-scm.hh" #include "clef.hh" diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 4f0da8ae5b..09e0ce0aac 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -6,13 +6,10 @@ (c) 1997--2004 Jan Nieuwenhuizen */ -#include "lily-guile.hh" - #include "audio-item.hh" #include "performer.hh" #include "warn.hh" - class Key_performer : public Performer { public: diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index c7672ea875..6dbc94a51d 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -9,14 +9,10 @@ */ #include "item.hh" - -#include "stencil.hh" #include "output-def.hh" #include "font-interface.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" -#include "lily-guile.hh" -#include "lily-proto.hh" #include "accidental-interface.hh" struct Key_signature_interface diff --git a/lily/keyword.cc b/lily/keyword.cc index de6aca9e49..418542cd25 100644 --- a/lily/keyword.cc +++ b/lily/keyword.cc @@ -1,10 +1,11 @@ /* keyword.cc -- keywords and identifiers */ -#include -#include + #include "keyword.hh" +#include +#include /* for qsort */ int tabcmp (Keyword_ent const &p1, Keyword_ent const &p2) diff --git a/lily/kpath.cc b/lily/kpath.cc index b9755f3ede..1f3b005737 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -6,8 +6,10 @@ (c) 2000--2004 Han-Wen Nienhuys */ -#include -#include +#include "kpath.hh" + +#include +#include /* @@ -20,7 +22,9 @@ I found a somewhat more elegant patch for this: Just #include before defining YAKLUDGE. */ + #include + #include "config.hh" #define popen REALLYUGLYKLUDGE @@ -35,9 +39,7 @@ extern "C" { #endif #include "file-path.hh" -#include "string.hh" #include "main.hh" -#include "kpath.hh" #include "source-file.hh" #include "warn.hh" @@ -147,12 +149,10 @@ kpathsea_gulp_file_to_string (String name) return string; } - - -LY_DEFINE (ly_kpathsea_expand_path, "ly:kpathsea-expand-path", +LY_DEFINE (ly_kpathsea_find_file, "ly:kpathsea-find-file", 1, 0, 0, (SCM name), - "Return the expanded path of @var{name}, or" - "@code{#f} if not found.") + "Return the absolute file name of @var{name}," + "or @code{#f} if not found.") { SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); @@ -160,17 +160,14 @@ LY_DEFINE (ly_kpathsea_expand_path, "ly:kpathsea-expand-path", String file_name = global_path.find (nm); if (file_name.is_empty ()) { - char *p = kpse_find_file (nm.to_str0 (), kpathsea_find_format (nm), - true); - if (p) + if (char *p = kpse_find_file (nm.to_str0 (), kpathsea_find_format (nm), + true)) return scm_makfrom0str (p); - else - return SCM_BOOL_F; + return SCM_BOOL_F; } return scm_makfrom0str (file_name.to_str0 ()); } - LY_DEFINE (ly_kpathsea_expand_variable, "ly:kpathsea-expand-variable", 1, 0, 0, (SCM var), "Return the expanded version @var{var}.") @@ -185,7 +182,6 @@ LY_DEFINE (ly_kpathsea_expand_variable, "ly:kpathsea-expand-variable", return ret; } - void initialize_kpathsea (char *av0) { diff --git a/lily/least-squares.cc b/lily/least-squares.cc index bcb2cb1a9b..abac75b1bd 100644 --- a/lily/least-squares.cc +++ b/lily/least-squares.cc @@ -8,8 +8,8 @@ */ #include "least-squares.hh" -#include "warn.hh" +#include "warn.hh" void minimise_least_squares (Real * coef, Real * offset, diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc index 754b6946f2..e0eda1fb70 100644 --- a/lily/ledger-line-engraver.cc +++ b/lily/ledger-line-engraver.cc @@ -7,7 +7,6 @@ */ - #include "group-interface.hh" #include "spanner.hh" #include "engraver.hh" diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index d2eda9a07e..f72caba6ea 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -9,7 +9,6 @@ #include -#include "item.hh" #include "note-head.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index 0a32c30400..5790517afe 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -6,6 +6,7 @@ (c) 2002--2004 Juergen Reuter */ + #include "ligature-engraver.hh" #include "note-column.hh" #include "tuplet-bracket.hh" diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index 447aeb08ba..4ec29c1cf2 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -6,7 +6,9 @@ (c) 2002--2004 Juergen Reuter */ + #include "ligature-engraver.hh" + #include "spanner.hh" #include "score-engraver.hh" #include "note-head.hh" @@ -14,7 +16,6 @@ #include "warn.hh" #include "context.hh" - /* * This abstract class provides the general framework for ligatures of * any kind. It cares for handling start/stop ligatures requests and diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 92c3bca31b..d7c8c39cb3 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -7,15 +7,16 @@ Han-Wen Nienhuys */ +#include "lily-guile.hh" + +#include +#include +#include /* isinf */ +#include /* strdup, strchr */ +#include -#include -#include #include // gettext on macos x -#include /* isinf */ -#include /* strdup, strchr */ -#include -#include "lily-proto.hh" #include "version.hh" /* MacOS S fix: @@ -26,15 +27,12 @@ inline int my_isinf (Real r) { return isinf (r); } inline int my_isnan (Real r) { return isnan (r); } - #include "libc-extension.hh" -#include "lily-guile.hh" #include "main.hh" #include "file-path.hh" #include "warn.hh" #include "direction.hh" #include "offset.hh" -#include "interval.hh" #include "pitch.hh" #include "dimensions.hh" #include "source-file.hh" diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 82fa29b217..191997357f 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -6,24 +6,21 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "lily-lexer.hh" + +#include #include -#include "lily-proto.hh" #include "scm-hash.hh" #include "interval.hh" -#include "lily-guile.hh" #include "parser.hh" #include "keyword.hh" -#include "lily-lexer.hh" #include "warn.hh" #include "source-file.hh" #include "main.hh" -#include "input.hh" #include "moment.hh" #include "ly-module.hh" - static Keyword_ent the_key_tab[] = { {"accepts", ACCEPTS}, {"addquote", ADDQUOTE}, diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 8d1c582c89..e401761ef3 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -7,6 +7,7 @@ Jan Nieuwenhuizen */ +#include "lily-parser.hh" #include "book.hh" #include "lilypond-key.hh" @@ -16,7 +17,6 @@ #include "ly-module.hh" #include "main.hh" #include "lily-lexer.hh" -#include "lily-parser.hh" #include "output-def.hh" #include "paper-book.hh" #include "parser.hh" @@ -24,7 +24,6 @@ #include "source.hh" #include "warn.hh" - Lily_parser::Lily_parser (Sources *sources) { book_count_ = 0; diff --git a/lily/lily-version.cc b/lily/lily-version.cc index 6bee35d852..bba3de2fd0 100644 --- a/lily/lily-version.cc +++ b/lily/lily-version.cc @@ -6,9 +6,10 @@ (c) 1999--2004 Jan Nieuwenhuizen */ +#include "lily-version.hh" + #include "config.hh" #include "version.hh" -#include "lily-version.hh" String version_string () diff --git a/lily/lilypond-key.cc b/lily/lilypond-key.cc index 6dc69be030..bf05aebf3c 100644 --- a/lily/lilypond-key.cc +++ b/lily/lilypond-key.cc @@ -7,8 +7,6 @@ */ - -#include "object-key.hh" #include "lilypond-key.hh" Lilypond_grob_key::Lilypond_grob_key (Object_key const *context, diff --git a/lily/line-interface.cc b/lily/line-interface.cc index d57b5cac0c..6ee2575196 100644 --- a/lily/line-interface.cc +++ b/lily/line-interface.cc @@ -8,13 +8,11 @@ source file of the GNU LilyPond music typesetter */ #include "line-interface.hh" -#include "stencil.hh" -#include "grob.hh" + #include "staff-symbol-referencer.hh" #include "lookup.hh" #include "output-def.hh" - Stencil Line_interface::make_dashed_line (Real thick, Offset from, Offset to, Real dash_period, Real dash_fraction) diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 5a3a851a7c..aa517a77ea 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -6,12 +6,11 @@ (c) 2000--2004 Jan Nieuwenhuizen */ -#include +#include "line-spanner.hh" + +#include -#include "stencil.hh" -#include "item.hh" #include "spanner.hh" -#include "line-spanner.hh" #include "output-def.hh" #include "paper-column.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/lookup.cc b/lily/lookup.cc index ad082dc806..2a46069662 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -7,8 +7,11 @@ Jan Nieuwenhuizen */ -#include -#include + +#include "lookup.hh" + +#include +#include #include "line-interface.hh" #include "warn.hh" @@ -18,10 +21,7 @@ #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "stencil.hh" -#include "lookup.hh" #include "font-metric.hh" -#include "interval.hh" Stencil Lookup::dot (Offset p, Real radius) diff --git a/lily/ly-module.cc b/lily/ly-module.cc index 4ee3c5d273..bf951abfc5 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -6,10 +6,10 @@ (c) 2002--2004 Han-Wen Nienhuys */ +#include "ly-module.hh" + #include "main.hh" #include "string.hh" -#include "lily-guile.hh" -#include "ly-module.hh" #include "protected-scm.hh" #define FUNC_NAME __FUNCTION__ diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 021c915953..82f1e56de7 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -8,6 +8,7 @@ */ #include "lyric-combine-music.hh" + #include "pitch.hh" Lyric_combine_music::Lyric_combine_music () diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 552d46151f..87a6bfb8f4 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -9,7 +9,6 @@ #include "context.hh" #include "engraver.hh" -#include "event.hh" #include "font-metric.hh" #include "item.hh" #include "multi-measure-rest.hh" diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index cc2be05f08..5776e88486 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -6,20 +6,17 @@ Han-Wen Nienhuys */ -#include +#include "lyric-extender.hh" + +#include -#include "box.hh" #include "warn.hh" #include "lookup.hh" -#include "stencil.hh" #include "paper-column.hh" #include "output-def.hh" -#include "lyric-extender.hh" #include "note-head.hh" #include "group-interface.hh" - - MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1) SCM Lyric_extender::print (SCM smob) diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 5af5bf7f7d..62bcce8a54 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -6,16 +6,13 @@ (c) 2003--2004 Han-Wen Nienhuys */ -#include +#include "lyric-hyphen.hh" + +#include -#include "box.hh" #include "lookup.hh" -#include "stencil.hh" #include "output-def.hh" #include "paper-column.hh" -#include "spanner.hh" -#include "item.hh" -#include "lyric-hyphen.hh" #include "moment.hh" MAKE_SCHEME_CALLBACK (Hyphen_spanner,print,1) diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 9542f222ec..8118c60d90 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -6,11 +6,8 @@ (c) 1997--2004 Jan Nieuwenhuizen */ -#include "event.hh" #include "audio-item.hh" -#include "lily-proto.hh" #include "performer.hh" -#include "array.hh" class Lyric_performer : public Performer { public: diff --git a/lily/main.cc b/lily/main.cc index 0c91f2cfd8..2cd0a59d1f 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -6,11 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include -#include -#include -#include +#include "main.hh" + +#include +#include +#include #include "config.hh" @@ -20,16 +20,13 @@ #include "all-font-metrics.hh" #include "file-name.hh" -#include "file-path.hh" #include "getopt-long.hh" #include "global-ctor.hh" #include "kpath.hh" #include "lily-guile.hh" #include "lily-version.hh" -#include "main.hh" #include "misc.hh" #include "output-def.hh" -#include "string.hh" #include "warn.hh" /* diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index bd79403806..37f903b3a7 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -6,12 +6,11 @@ (c) 1998--2004 Jan Nieuwenhuizen */ -#include +#include #include "bar-line.hh" #include "context.hh" #include "engraver-group-engraver.hh" -#include "engraver.hh" #include "item.hh" #include "warn.hh" #include "text-item.hh" diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index 75bb7b2c3b..bda7ed0bda 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -6,7 +6,6 @@ (c) 2002--2004 Han-Wen Nienhuys */ -#include "spanner.hh" #include "warn.hh" #include "side-position-interface.hh" #include "global-context.hh" diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc index b603c76685..f6a751c7b8 100644 --- a/lily/measure-grouping-spanner.cc +++ b/lily/measure-grouping-spanner.cc @@ -7,9 +7,10 @@ */ +#include "measure-grouping-spanner.hh" + #include "output-def.hh" #include "spanner.hh" -#include "measure-grouping-spanner.hh" #include "lookup.hh" #include "item.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc index d71cf13d98..fbffc1e00f 100644 --- a/lily/melisma-translator.cc +++ b/lily/melisma-translator.cc @@ -10,12 +10,11 @@ /* duplicated in melisma-performer */ + #include "engraver.hh" -#include "event.hh" #include "grob.hh" #include "context.hh" - /** Signal existence of melismas. */ diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 04e468c2af..5598ec4207 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -6,13 +6,12 @@ (c) 2002--2004 Juergen Reuter */ -#include "mensural-ligature.hh" #include "coherent-ligature-engraver.hh" + +#include "mensural-ligature.hh" #include "event.hh" #include "warn.hh" -#include "item.hh" #include "spanner.hh" -#include "rod.hh" #include "paper-column.hh" #include "note-column.hh" #include "rhythmic-head.hh" diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index b50bd7c557..bcb05b8977 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -6,11 +6,12 @@ (c) 2002--2004 Juergen Reuter */ -#include -#include "item.hh" #include "mensural-ligature.hh" + +#include + +#include "item.hh" #include "font-interface.hh" -#include "stencil.hh" #include "lookup.hh" #include "staff-symbol-referencer.hh" #include "note-head.hh" diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 449834390f..19049500b8 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -6,14 +6,12 @@ (c) 1998--2004 Jan Nieuwenhuizen */ -#include +#include #include "note-column.hh" #include "bar-line.hh" #include "time-signature.hh" -#include "engraver.hh" #include "engraver-group-engraver.hh" -#include "item.hh" #include "context.hh" /** diff --git a/lily/midi-def.cc b/lily/midi-def.cc index d30e94e599..0d3122b7ba 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -6,7 +6,8 @@ (c) 1997--2004 Jan Nieuwenhuizen */ -#include + +#include #include "misc.hh" #include "output-def.hh" @@ -14,8 +15,6 @@ #include "warn.hh" #include "scm-hash.hh" - - int get_tempo (Output_def * def, Moment one_beat_mom) diff --git a/lily/midi-item.cc b/lily/midi-item.cc index a04209ad53..916d518d95 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -6,17 +6,15 @@ (c) 1997--2004 Jan Nieuwenhuizen */ +#include "midi-item.hh" + #include "warn.hh" #include "main.hh" #include "misc.hh" -#include "string.hh" #include "string-convert.hh" -#include "midi-item.hh" #include "midi-stream.hh" -#include "audio-item.hh" #include "duration.hh" #include "scm-option.hh" - #include "killing-cons.tcc" #define PITCH_WHEEL_TOP 0x3FFF diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index d266391510..cfc5a60eca 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -6,14 +6,13 @@ (c) 1997--2004 Jan Nieuwenhuizen */ +#include "midi-stream.hh" #include "stream.hh" -#include "string.hh" #include "string-convert.hh" #include "main.hh" #include "misc.hh" #include "midi-item.hh" -#include "midi-stream.hh" #include "warn.hh" #include "scm-option.hh" diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 340eee8492..59ed2193d4 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -8,8 +8,8 @@ */ #include "midi-walker.hh" + #include "audio-column.hh" -#include "audio-item.hh" #include "audio-staff.hh" #include "midi-item.hh" #include "midi-stream.hh" diff --git a/lily/misc.cc b/lily/misc.cc index b1f6b5b734..036cbd7e50 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -7,9 +7,10 @@ Jan Nieuwenhuizen */ -#include #include "misc.hh" +#include + /* Return the 2-log, rounded down */ diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 70454a3c33..f7631734c3 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -6,11 +6,11 @@ (c) 1999--2004 Han-Wen Nienhuys */ -#include +#include "modified-font-metric.hh" + +#include #include "warn.hh" -#include "modified-font-metric.hh" -#include "string.hh" #include "stencil.hh" Modified_font_metric::Modified_font_metric (String input_encoding, @@ -45,6 +45,9 @@ Modified_font_metric::Modified_font_metric (String input_encoding, && coding_scheme_ != "ASCII" && coding_scheme_ != orig_->coding_scheme ()) { + /* FIXME: this is broken, cannot get font encoding from font/AFM file, + should use encoding from font-tree in fonts.scm. */ + coding_vector_ = scm_call_1 (ly_scheme_function ("get-coding-vector"), scm_makfrom0str (coding_scheme_.to_str0 ())); diff --git a/lily/moment.cc b/lily/moment.cc index a257daec74..4ac319df5b 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -6,10 +6,9 @@ (c) 1999--2004 Han-Wen Nienhuys */ -#include "lily-guile.hh" #include "moment.hh" -#include "warn.hh" +#include "warn.hh" Moment::Moment () { diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 08b4dda385..1e89a14ecc 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -5,15 +5,12 @@ Han-Wen Nienhuys */ -#include "event.hh" #include "multi-measure-rest.hh" #include "paper-column.hh" #include "engraver-group-engraver.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" -#include "engraver.hh" #include "moment.hh" -#include "spanner.hh" /** The name says it all: make multi measure rests diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 3a7cf73125..30c1d0e06c 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -8,12 +8,12 @@ */ #include "multi-measure-rest.hh" + #include "warn.hh" #include "output-def.hh" #include "paper-column.hh" // urg #include "font-interface.hh" #include "rest.hh" -#include "stencil.hh" #include "misc.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc index e6d5c11de7..bfa4199c91 100644 --- a/lily/music-constructor.cc +++ b/lily/music-constructor.cc @@ -7,11 +7,12 @@ */ +#include "music-constructor.hh" + #include // UGH. -#include +#include #include "warn.hh" -#include "music-constructor.hh" typedef Music *(*Music_ctor) (); diff --git a/lily/music-function.cc b/lily/music-function.cc index 31ff12dcb8..392aeb3a59 100644 --- a/lily/music-function.cc +++ b/lily/music-function.cc @@ -6,8 +6,9 @@ (c) 2004 Han-Wen Nienhuys */ + #include "music-function.hh" -#include "string.hh" + #include "music.hh" static scm_t_bits music_function_tag; diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index fce6412e7e..7cf30a3c2c 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -9,10 +9,12 @@ /* UGH. too many includes. */ -#include -#include "warn.hh" #include "music-iterator.hh" + +#include + +#include "warn.hh" #include "context.hh" #include "music-wrapper.hh" #include "music-wrapper-iterator.hh" diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index 7d6f3888b4..e81aced76f 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" Music_wrapper_iterator::Music_wrapper_iterator () diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index 3eac65aec6..a17a631039 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -7,11 +7,8 @@ */ - - #include "music-wrapper.hh" - Music_wrapper::Music_wrapper () : Music () { diff --git a/lily/music.cc b/lily/music.cc index 2442027987..b5f407d3d3 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -6,12 +6,13 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "music.hh" + #include "duration.hh" #include "input-smob.hh" #include "ly-smobs.icc" #include "main.hh" #include "music-list.hh" -#include "music.hh" #include "pitch.hh" #include "score.hh" #include "warn.hh" diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 681e61ba4e..b8863aed5e 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -10,8 +10,6 @@ #include "warn.hh" #include "engraver.hh" #include "side-position-interface.hh" -#include "item.hh" -#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "self-alignment-interface.hh" diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc index dd2f487bdb..690e828b98 100644 --- a/lily/new-lyric-combine-music-iterator.cc +++ b/lily/new-lyric-combine-music-iterator.cc @@ -12,7 +12,6 @@ #include "grob.hh" #include "music-iterator.hh" - class New_lyric_combine_music_iterator : public Music_iterator { public: diff --git a/lily/note-collision.cc b/lily/note-collision.cc index d8d015c84c..0aef74e9b8 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -6,16 +6,16 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "note-collision.hh" + +#include #include "warn.hh" -#include "note-collision.hh" #include "note-column.hh" #include "note-head.hh" #include "rhythmic-head.hh" #include "output-def.hh" #include "axis-group-interface.hh" -#include "item.hh" #include "stem.hh" #include "side-position-interface.hh" #include "dot-column.hh" diff --git a/lily/note-column.cc b/lily/note-column.cc index a3afffe426..c88f9b3e8a 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -5,14 +5,15 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include // ceil -#include "axis-group-interface.hh" #include "note-column.hh" + +#include // ceil + +#include "axis-group-interface.hh" #include "stem.hh" #include "warn.hh" #include "output-def.hh" -#include "group-interface.hh" #include "staff-symbol-referencer.hh" #include "rest.hh" #include "note-head.hh" diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index b489af8b14..b04da2e094 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -8,16 +8,12 @@ #include "engraver.hh" #include "group-interface.hh" -#include "item.hh" -#include "event.hh" -#include "spanner.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" #include "context.hh" - /** Create line-spanner grobs for lines that connect note heads. diff --git a/lily/note-head.cc b/lily/note-head.cc index 9b25d3ee95..45687ddf8b 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -5,16 +5,17 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include + +#include "note-head.hh" + +#include +#include #include "staff-symbol.hh" #include "misc.hh" #include "dots.hh" -#include "note-head.hh" #include "warn.hh" #include "font-interface.hh" -#include "stencil.hh" #include "event.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 9baa2af3e9..01f3c0ed31 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -3,11 +3,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include + +#include #include "rhythmic-head.hh" #include "output-def.hh" -#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 94841f7481..af468e0753 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -8,7 +8,6 @@ */ #include "engraver.hh" -#include "event.hh" #include "item.hh" class Note_name_engraver : public Engraver diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 0109b7bb33..c0ed895f00 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -7,7 +7,6 @@ */ #include "performer.hh" -#include "event.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc index 70f062ec73..377367a909 100644 --- a/lily/note-spacing.cc +++ b/lily/note-spacing.cc @@ -6,12 +6,10 @@ (c) 2001--2004 Han-Wen Nienhuys */ +#include "note-spacing.hh" #include "paper-column.hh" -#include "item.hh" #include "moment.hh" -#include "note-spacing.hh" -#include "grob.hh" #include "note-column.hh" #include "warn.hh" #include "stem.hh" @@ -20,7 +18,6 @@ #include "accidental-placement.hh" #include "output-def.hh" - /* TODO: detect hshifts due to collisions, and account for them in diff --git a/lily/object-key-dumper.cc b/lily/object-key-dumper.cc index 547707bab4..368e2d0402 100644 --- a/lily/object-key-dumper.cc +++ b/lily/object-key-dumper.cc @@ -7,15 +7,11 @@ */ - -#include - -#include "ly-smobs.icc" +#include "object-key-dumper.hh" #include "moment.hh" -#include "object-key-dumper.hh" -#include "object-key.hh" +#include "ly-smobs.icc" SCM Object_key_dumper::mark_smob (SCM smob ) diff --git a/lily/object-key-undumper.cc b/lily/object-key-undumper.cc index bf0f32f993..ba199d8897 100644 --- a/lily/object-key-undumper.cc +++ b/lily/object-key-undumper.cc @@ -7,11 +7,6 @@ */ -#include - - -#include "smobs.hh" -#include "object-key.hh" #include "object-key-undumper.hh" #include "ly-smobs.icc" diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index 59b640e64b..a491ea42e3 100644 --- a/lily/ottava-bracket.cc +++ b/lily/ottava-bracket.cc @@ -7,7 +7,6 @@ */ -#include "stencil.hh" #include "text-item.hh" #include "line-spanner.hh" #include "spanner.hh" diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index e7778a8d4c..bb771d6761 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -8,7 +8,6 @@ #include "protected-scm.hh" #include "note-column.hh" -#include "item.hh" #include "side-position-interface.hh" #include "engraver.hh" diff --git a/lily/output-def.cc b/lily/output-def.cc index 8a1c87707c..e220ffdfc4 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -6,15 +6,15 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "output-def.hh" + #include "context-def.hh" #include "file-path.hh" #include "global-context.hh" #include "interval.hh" -#include "lily-guile.hh" #include "ly-module.hh" #include "main.hh" #include "output-def.hh" -#include "output-def.hh" #include "scm-hash.hh" #include "warn.hh" diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index 06bfffefca..c2443f5b52 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -11,7 +11,6 @@ #include "grob.hh" #include "context.hh" - class Output_property_engraver : public Engraver { TRANSLATOR_DECLARATIONS (Output_property_engraver); diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 08367608b3..d2227ed86c 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -6,14 +6,14 @@ (c) 2004 Jan Nieuwenhuizen */ +#include "paper-book.hh" + #include "ly-module.hh" #include "main.hh" #include "output-def.hh" -#include "paper-book.hh" #include "paper-outputter.hh" #include "paper-score.hh" #include "paper-system.hh" -#include "stencil.hh" #include "warn.hh" #include "ly-smobs.icc" diff --git a/lily/paper-column.cc b/lily/paper-column.cc index c964d2fa88..bb3d8ad42e 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -6,21 +6,18 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "moment.hh" #include "paper-column.hh" + +#include "moment.hh" #include "paper-score.hh" #include "warn.hh" #include "axis-group-interface.hh" #include "spaceable-grob.hh" -#include "stencil.hh" #include "text-item.hh" #include "lookup.hh" #include "font-interface.hh" #include "output-def.hh" - - - Grob * Paper_column::clone (int count) const { diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 1bc6bab26d..0b16578ce9 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -7,7 +7,6 @@ */ #include "dimensions.hh" -#include "font-metric.hh" #include "ly-module.hh" #include "output-def.hh" #include "modified-font-metric.hh" diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index e871011a6f..23e5f9cfc6 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -7,30 +7,27 @@ Jan Nieuwenhuizen */ -#include -#include +#include "paper-outputter.hh" + +#include +#include -#include "array.hh" #include "dimensions.hh" #include "file-name.hh" #include "font-metric.hh" #include "input-smob.hh" -#include "lily-guile.hh" #include "lily-version.hh" #include "ly-module.hh" #include "main.hh" #include "output-def.hh" #include "paper-book.hh" -#include "paper-outputter.hh" #include "paper-system.hh" #include "scm-hash.hh" -#include "stencil.hh" #include "string-convert.hh" #include "warn.hh" #include "ly-smobs.icc" - Paper_outputter::Paper_outputter (String file_name, String format) { file_ = SCM_EOL; diff --git a/lily/paper-score.cc b/lily/paper-score.cc index c1487c89b2..4fafe399d6 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -6,8 +6,9 @@ (c) 1996--2004 Han-Wen Nienhuys */ +#include "paper-score.hh" + #include "all-font-metrics.hh" -#include "font-metric.hh" #include "gourlay-breaking.hh" #include "ly-module.hh" #include "main.hh" @@ -15,10 +16,8 @@ #include "output-def.hh" #include "paper-book.hh" #include "paper-column.hh" -#include "paper-score.hh" #include "scm-hash.hh" #include "score.hh" -#include "spanner.hh" #include "stencil.hh" #include "system.hh" #include "warn.hh" diff --git a/lily/paper-system.cc b/lily/paper-system.cc index b4dd9784e4..3a5835079c 100644 --- a/lily/paper-system.cc +++ b/lily/paper-system.cc @@ -7,8 +7,7 @@ */ #include "paper-system.hh" -#include "stencil.hh" -#include "string.hh" + #include "virtual-methods.hh" #include "ly-smobs.icc" diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index a18a6b42c3..cb7c7c2618 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -6,15 +6,13 @@ (c) 2004 Han-Wen Nienhuys */ +#include "parse-scm.hh" -#include +#include #include "ly-module.hh" -#include "lily-guile.hh" #include "main.hh" #include "paper-book.hh" -#include "parse-scm.hh" -#include "string.hh" #include "source-file.hh" /* Pass string to scm parser, evaluate one expression. diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index f0a340c363..fd70968f15 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -10,7 +10,6 @@ */ #include "engraver.hh" -#include "item.hh" #include "text-item.hh" #include "note-head.hh" #include "stem.hh" diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc index 95542d3c30..521e2c458d 100644 --- a/lily/part-combine-iterator.cc +++ b/lily/part-combine-iterator.cc @@ -12,7 +12,6 @@ #include "lily-guile.hh" #include "warn.hh" #include "music-iterator.hh" -#include "interpretation-context-handle.hh" class Part_combine_iterator : public Music_iterator { diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 2639dfabdc..8b5c04f530 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -7,9 +7,7 @@ */ -#include "engraver.hh" #include "repeated-music.hh" -#include "engraver-group-engraver.hh" #include "global-context.hh" #include "warn.hh" #include "misc.hh" @@ -17,10 +15,7 @@ #include "item.hh" #include "percent-repeat-iterator.hh" #include "bar-line.hh" - #include "score-engraver.hh" -#include "context.hh" - /** This acknowledges repeated music with "percent" style. It typesets diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index 2c0ae42d20..eddb2656a9 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -6,15 +6,13 @@ (c) 2001--2004 Han-Wen Nienhuys */ -#include -#include "grob.hh" -#include "lookup.hh" -#include "stencil.hh" -#include "font-interface.hh" -#include "font-metric.hh" #include "percent-repeat-item.hh" +#include + +#include "lookup.hh" +#include "font-interface.hh" Stencil Percent_repeat_item_interface::brew_slash ( Grob *me) diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index 86a1d33795..6792231283 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -8,6 +8,7 @@ */ #include "percent-repeat-iterator.hh" + #include "repeated-music.hh" #include "input.hh" diff --git a/lily/performance.cc b/lily/performance.cc index 65e091bf69..acb78d194c 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -6,20 +6,19 @@ (c) 1997--2004 Jan Nieuwenhuizen */ -#include +#include "performance.hh" + +#include #include "audio-column.hh" -#include "audio-item.hh" #include "audio-staff.hh" #include "file-name.hh" #include "lily-version.hh" #include "main.hh" #include "midi-item.hh" #include "midi-stream.hh" -#include "performance.hh" #include "score.hh" #include "string-convert.hh" -#include "string.hh" #include "warn.hh" #include "killing-cons.tcc" diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index f93defe07c..a4bfbfa925 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -8,11 +8,11 @@ */ #include "performer-group-performer.hh" + #include "context.hh" #include "audio-element.hh" #include "warn.hh" - ENTER_DESCRIPTION (Performer_group_performer, /* descr */ "", /* creats*/ "", diff --git a/lily/pfb.cc b/lily/pfb.cc index 9dbdf0f363..30d4e32dcb 100644 --- a/lily/pfb.cc +++ b/lily/pfb.cc @@ -6,12 +6,11 @@ (c) 2004 Han-Wen Nienhuys */ -#include -#include -#include -#include "string.hh" -#include "lily-guile.hh" +#include +#include +#include + #include "source-file.hh" char * diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 5f11aaa486..98712ee314 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -7,7 +7,6 @@ #include "context.hh" #include "directional-element-interface.hh" #include "engraver.hh" -#include "event.hh" #include "slur.hh" #include "note-column.hh" #include "spanner.hh" diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 09c6afce2a..5f6b0503e0 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -10,16 +10,11 @@ */ #include "engraver.hh" -#include "event.hh" -#include "grob.hh" -#include "item.hh" #include "lily-guile.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" -#include "item.hh" #include "axis-group-interface.hh" #include "context.hh" - #include "directional-element-interface.hh" #include "note-column.hh" #include "warn.hh" diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 1dbdf10dcd..25f8c618af 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -7,8 +7,6 @@ */ #include "performer.hh" - -#include "event.hh" #include "audio-item.hh" /** diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc index fa8fb61911..41a61051f6 100644 --- a/lily/pitch-interval.cc +++ b/lily/pitch-interval.cc @@ -8,8 +8,8 @@ */ #include "pitch-interval.hh" -#include "interval.tcc" +#include "interval.tcc" Pitch_interval::Pitch_interval (Pitch p1, Pitch p2) { diff --git a/lily/pitch.cc b/lily/pitch.cc index 6613dbdc49..0815d49b8c 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -7,10 +7,11 @@ */ #include "pitch.hh" + #include "warn.hh" #include "main.hh" -#include "ly-smobs.icc" +#include "ly-smobs.icc" Pitch::Pitch (int o, int n, int a) { diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 78c2b3ec71..c3c0ca7a21 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -7,6 +7,7 @@ */ #include "property-iterator.hh" + #include "music.hh" #include "context-def.hh" #include "global-context.hh" diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 56bd2def2f..18f2205e56 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -6,8 +6,8 @@ (c) 1998--2004 Han-Wen Nienhuys */ + #include "protected-scm.hh" -#include "lily-guile.hh" Protected_scm::Protected_scm () { diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc index 4f2e5ab2fc..de3993b3ef 100644 --- a/lily/quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -12,10 +12,7 @@ #include "music-sequence.hh" #include "lily-guile.hh" #include "music-wrapper-iterator.hh" -#include "music.hh" -#include "input.hh" #include "warn.hh" -#include "interpretation-context-handle.hh" class Quote_iterator : public Music_wrapper_iterator { diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc index fedc58b9be..ee22516c07 100644 --- a/lily/relative-octave-check.cc +++ b/lily/relative-octave-check.cc @@ -1,4 +1,5 @@ #include "relative-octave-check.hh" + #include "input.hh" #include "pitch.hh" diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index fde9c2f835..bc723df723 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -6,11 +6,11 @@ (c) 1998--2004 Han-Wen Nienhuys */ + #include "relative-music.hh" #include "warn.hh" #include "scm-option.hh" - Pitch Relative_octave_music::to_relative_octave (Pitch p) { diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index c1c77892ca..711cedb6ce 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -12,7 +12,6 @@ #include "context.hh" #include "repeated-music.hh" - /* Objective: diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 8d76ae78a8..ea2805b1c4 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -8,10 +8,10 @@ */ #include "repeated-music.hh" + #include "music-list.hh" #include "pitch.hh" #include "warn.hh" -#include "music-sequence.hh" #include "scm-option.hh" Music * diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 74797b2d6c..7661707ade 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -6,10 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include // ceil. +#include "rest-collision.hh" + +#include // ceil. #include "warn.hh" -#include "rest-collision.hh" #include "note-column.hh" #include "stem.hh" #include "rhythmic-head.hh" diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 4d9809b8f8..e3f379c076 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -5,14 +5,13 @@ (c) 1997--2004 Han-Wen Nienhuys */ + #include "item.hh" #include "staff-symbol-referencer.hh" -#include "event.hh" #include "dots.hh" #include "rhythmic-head.hh" #include "engraver.hh" - class Rest_engraver : public Engraver { Music *rest_req_; diff --git a/lily/rest.cc b/lily/rest.cc index b41babd365..3589735705 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -6,10 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "rest.hh" + #include "stencil.hh" #include "output-def.hh" #include "font-interface.hh" -#include "rest.hh" #include "dots.hh" #include "paper-score.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 80698dec74..8ec466dde5 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -6,18 +6,13 @@ (c) 1997--2004 Han-Wen Nienhuys */ - #include "engraver.hh" #include "rhythmic-head.hh" #include "stem.hh" #include "note-column.hh" #include "dot-column.hh" -#include "event.hh" -#include "item.hh" #include "group-interface.hh" - - /* this engraver glues together stems, rests and note heads into a NoteColumn grob. diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index 40983ead13..40eceea1e3 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -7,13 +7,13 @@ */ #include "rhythmic-head.hh" + #include "warn.hh" #include "rest.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" #include "item.hh" - Item* Rhythmic_head::get_dots (Grob*me) { diff --git a/lily/rod.cc b/lily/rod.cc index f86fc4e112..0d179d75c8 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -6,7 +6,9 @@ (c) 1998--2004 Han-Wen Nienhuys */ + #include "rod.hh" + #include "paper-column.hh" #include "warn.hh" #include "dimensions.hh" diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 2cdbb1d50c..b4bd0a936f 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -6,9 +6,10 @@ (c) 1999--2004 Han-Wen Nienhuys */ -#include - #include "scm-hash.hh" + +#include + #include "ly-smobs.icc" /* diff --git a/lily/scm-option.cc b/lily/scm-option.cc index 14c069e4b6..dac63fde44 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -6,12 +6,12 @@ (c) 2001--2004 Han-Wen Nienhuys */ -#include -#include "parse-scm.hh" -#include "string.hh" -#include "lily-guile.hh" #include "scm-option.hh" + +#include + +#include "parse-scm.hh" #include "warn.hh" #include "main.hh" diff --git a/lily/score-context.cc b/lily/score-context.cc index 8730ebcd71..4876f51548 100644 --- a/lily/score-context.cc +++ b/lily/score-context.cc @@ -7,6 +7,7 @@ */ #include "score-context.hh" + #include "score-translator.hh" void diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 316afa65f2..f99ed6151d 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -11,7 +11,6 @@ #include "warn.hh" #include "main.hh" #include "system.hh" -#include "item.hh" #include "score-engraver.hh" #include "paper-score.hh" #include "paper-column.hh" @@ -20,12 +19,8 @@ #include "context-def.hh" #include "staff-spacing.hh" #include "note-spacing.hh" -#include "context.hh" #include "global-context.hh" - - - /* TODO: the column creation logic is rather hairy. Revise it. */ @@ -107,16 +102,22 @@ Score_engraver::initialize () { Font_metric *fm = all_fonts_global->find_afm ("feta20"); if (!fm) - error (_f ("can't find `%s'", "feta20.afm") - + "\n" +_ ("Music font has not been installed properly. Aborting")); - - SCM pfa_path = ly_kpathsea_expand_path (scm_makfrom0str ("ecrm10.pfa")); - if (!scm_is_string (pfa_path)) - error (_f ("can't find `%s'", "ecrm10.pfa") - + "\n" +_f ("Install the ec-mftraced package from %s. Aborting", - "http://lilypond.org/download/fonts/")); - - + error (_f ("cannot find `%s'", "feta20.afm") + + "\n" + + _ ("Music font has not been installed properly.") + + _ ("Aborting")); + + if (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("ecrm10.pfa"))) + && (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("lmr10.pfb"))))) + error (_f ("cannot find `%s'", "ecrm10.pfa") + + "\n" + + _f ("cannot find `%s'", "lmr10.pfb") + + "\n" + + _f ("Install the ec-fonts-mftraced package from: %s.", + "http://lilypond.org/download/fonts/") + + "\n" + + _ ("Aborting.")); + pscore_ = new Paper_score; pscore_->layout_ = dynamic_cast (get_output_def ()); diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 4d231ff63a..ab4843b740 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -7,6 +7,7 @@ */ #include "score-performer.hh" + #include "audio-column.hh" #include "audio-item.hh" #include "performance.hh" @@ -16,8 +17,6 @@ #include "context-def.hh" #include "output-def.hh" - - ENTER_DESCRIPTION (Score_performer, /* descr */ "", /* creats*/ "", diff --git a/lily/score-translator.cc b/lily/score-translator.cc index 74c2411d41..3426311f04 100644 --- a/lily/score-translator.cc +++ b/lily/score-translator.cc @@ -7,6 +7,7 @@ */ #include "score-translator.hh" + #include "moment.hh" void diff --git a/lily/score.cc b/lily/score.cc index c308509e0d..6a962306b0 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -6,7 +6,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "score.hh" + +#include #include "lilypond-key.hh" #include "lily-parser.hh" @@ -18,13 +20,11 @@ #include "main.hh" #include "music-iterator.hh" #include "output-def.hh" -#include "music-output.hh" #include "music.hh" #include "paper-book.hh" #include "output-def.hh" #include "paper-score.hh" #include "scm-hash.hh" -#include "score.hh" #include "warn.hh" Score::Score () diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 0975c0a4dd..fa0fb9ffd9 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -9,7 +9,6 @@ #include "engraver.hh" #include "script-column.hh" -#include "item.hh" #include "side-position-interface.hh" /** diff --git a/lily/script-column.cc b/lily/script-column.cc index 917122c9e6..311f5cbb7c 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -6,7 +6,9 @@ (c) 1999--2004 Han-Wen Nienhuys */ + #include "script-column.hh" + #include "side-position-interface.hh" #include "warn.hh" #include "group-interface.hh" diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index db1df11e9b..b40fb63eb5 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -9,7 +9,6 @@ #include "context.hh" #include "directional-element-interface.hh" #include "engraver.hh" -#include "event.hh" #include "slur.hh" #include "note-column.hh" #include "paper-column.hh" diff --git a/lily/script-interface.cc b/lily/script-interface.cc index 76dfb902ee..c529cd37a2 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -13,8 +13,6 @@ #include "font-interface.hh" #include "side-position-interface.hh" #include "output-def.hh" -#include "item.hh" -#include "stencil.hh" #include "lookup.hh" #include "stem.hh" #include "note-column.hh" diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc index e1db1ded12..e67a8f0d12 100644 --- a/lily/self-aligment-interface.cc +++ b/lily/self-aligment-interface.cc @@ -7,6 +7,7 @@ */ #include "self-alignment-interface.hh" + #include "warn.hh" /* Position centered on parent. */ diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 7f692ef644..7c62e720d9 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -8,6 +8,7 @@ */ #include "separating-group-spanner.hh" + #include "separation-item.hh" #include "paper-column.hh" #include "output-def.hh" diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index acaf1920b4..1a784ad152 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -14,12 +14,9 @@ #include "engraver.hh" #include "axis-group-interface.hh" #include "note-spacing.hh" -#include "group-interface.hh" #include "accidental-placement.hh" #include "context.hh" - - struct Spacings { Item * staff_spacing_; diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 49469946d9..c77a356435 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -8,6 +8,7 @@ */ #include "separation-item.hh" + #include "paper-column.hh" #include "warn.hh" #include "group-interface.hh" diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 6cc4f61a9c..a1133033cd 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -6,9 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "sequential-iterator.hh" + #include "translator-group.hh" #include "context.hh" -#include "sequential-iterator.hh" #include "music-list.hh" #include "grace-fixup.hh" diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc index bc00a33e12..206d36141d 100644 --- a/lily/sequential-music-iterator.cc +++ b/lily/sequential-music-iterator.cc @@ -6,16 +6,12 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "context.hh" - +#include "sequential-music-iterator.hh" +#include "context.hh" #include "warn.hh" -#include "sequential-music-iterator.hh" #include "music-list.hh" - - - IMPLEMENT_CTOR_CALLBACK (Sequential_music_iterator); SCM diff --git a/lily/sequential-music.cc b/lily/sequential-music.cc index 27bdbe3a58..f250e86e37 100644 --- a/lily/sequential-music.cc +++ b/lily/sequential-music.cc @@ -1,4 +1,3 @@ - #include "music-list.hh" #include "sequential-music-iterator.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 7ff38d6e4e..ec15be6641 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -6,10 +6,12 @@ (c) 1998--2004 Han-Wen Nienhuys */ -#include // ceil. -#include "note-head.hh" #include "side-position-interface.hh" + +#include // ceil. + +#include "note-head.hh" #include "warn.hh" #include "warn.hh" #include "dimensions.hh" diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc index 6b1dedb55a..1ab5b399c7 100644 --- a/lily/simple-music-iterator.cc +++ b/lily/simple-music-iterator.cc @@ -8,6 +8,7 @@ */ #include "simple-music-iterator.hh" + #include "music.hh" #include "input.hh" diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index d9413d5b8e..5a03cbb483 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -9,20 +9,21 @@ - add support for different stretch/shrink constants? */ -#include -#include -#include // isinf #include "simple-spacer.hh" + +#include +#include + +#include // isinf + #include "paper-column.hh" #include "spring.hh" -#include "rod.hh" #include "warn.hh" #include "column-x-positions.hh" #include "spaceable-grob.hh" #include "dimensions.hh" - /* A simple spacing constraint solver. The approach: diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index ad093ec93b..1849c85acd 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -6,13 +6,13 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "simultaneous-music-iterator.hh" + #include "context.hh" #include "warn.hh" -#include "simultaneous-music-iterator.hh" #include "music-list.hh" #include "context-def.hh" - Simultaneous_music_iterator::Simultaneous_music_iterator () { create_separate_contexts_ = false; diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc index ba79169dbd..7e2a480e54 100644 --- a/lily/simultaneous-music.cc +++ b/lily/simultaneous-music.cc @@ -8,7 +8,6 @@ */ #include "input.hh" -#include "moment.hh" #include "pitch.hh" #include "music-list.hh" #include "scm-option.hh" diff --git a/lily/skyline.cc b/lily/skyline.cc index 33447faeb8..1d7782008d 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -8,7 +8,6 @@ #include "skyline.hh" - /* A skyline is a shape of the form: diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc index 7b45796ea1..14d4de8899 100644 --- a/lily/slash-repeat-engraver.cc +++ b/lily/slash-repeat-engraver.cc @@ -7,9 +7,7 @@ */ -#include "engraver.hh" #include "repeated-music.hh" -#include "engraver-group-engraver.hh" #include "global-context.hh" #include "warn.hh" #include "misc.hh" @@ -17,10 +15,7 @@ #include "item.hh" #include "percent-repeat-iterator.hh" #include "bar-line.hh" - #include "score-engraver.hh" -#include "context.hh" - /** This acknowledges repeated music with "percent" style. It typesets diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 0cedafeeb6..4889c9c920 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -7,7 +7,9 @@ */ -#include +#include "slur-configuration.hh" + +#include #include "stem.hh" #include "warn.hh" @@ -16,7 +18,6 @@ #include "group-interface.hh" #include "slur.hh" #include "slur-scoring.hh" -#include "slur-configuration.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "libc-extension.hh" diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 80bd9bbf81..ff2388f4cd 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -4,7 +4,6 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "event.hh" #include "slur.hh" #include "note-column.hh" #include "context.hh" @@ -12,7 +11,7 @@ #include "engraver.hh" #include "spanner.hh" #include "tie.hh" -#include "input.hh" + /* It is possible that a slur starts and ends on the same note. At least, it is for phrasing slurs: a note can be both beginning and diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc index 1836016161..ea809ae5f6 100644 --- a/lily/slur-performer.cc +++ b/lily/slur-performer.cc @@ -7,7 +7,6 @@ */ #include "performer.hh" -#include "event.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 6e9f05dff2..3d381d09aa 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -7,20 +7,19 @@ Jan Nieuwenhuizen */ -#include +#include "slur-scoring.hh" + +#include #include "libc-extension.hh" #include "slur-configuration.hh" -#include "slur-scoring.hh" #include "beam.hh" #include "directional-element-interface.hh" #include "group-interface.hh" -#include "lily-guile.hh" #include "slur.hh" #include "note-column.hh" #include "output-def.hh" #include "pitch.hh" -#include "bezier.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" diff --git a/lily/slur.cc b/lily/slur.cc index fcf02f39ce..c1a0c96c2e 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -7,26 +7,23 @@ Jan Nieuwenhuizen */ +#include "slur.hh" -#include +#include #include "beam.hh" #include "bezier.hh" #include "directional-element-interface.hh" #include "font-interface.hh" #include "group-interface.hh" -#include "lily-guile.hh" #include "lookup.hh" #include "main.hh" // DEBUG_SLUR_SCORING #include "note-column.hh" #include "output-def.hh" -#include "rod.hh" -#include "slur.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "stem.hh" -#include "stencil.hh" #include "text-item.hh" #include "warn.hh" #include "slur-scoring.hh" diff --git a/lily/source-file.cc b/lily/source-file.cc index f083fedfd3..bad88ec625 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -7,10 +7,11 @@ Han-Wen Nienhuys */ +#include "source-file.hh" + #include "config.hh" -#include -#include +#include #if HAVE_SSTREAM #include #else @@ -18,11 +19,7 @@ #define istringstream(x) istrstream(x, length ()) #endif -#include "string.hh" -#include "flower-proto.hh" #include "warn.hh" -#include "source-file.hh" -#include "array.hh" void Source_file::load_stdin () diff --git a/lily/source.cc b/lily/source.cc index 927469cc28..5d03537cdf 100644 --- a/lily/source.cc +++ b/lily/source.cc @@ -6,14 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ - -#include +#include "source.hh" #include "killing-cons.tcc" -#include "string.hh" -#include "flower-proto.hh" #include "source-file.hh" -#include "source.hh" #include "file-path.hh" Sources::Sources () diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index d90297d4e7..405aabd6c6 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -6,11 +6,12 @@ (c) 2000--2004 Han-Wen Nienhuys */ -#include -#include #include "spaceable-grob.hh" -#include "grob.hh" + +#include +#include + #include "warn.hh" #include "spring.hh" #include "group-interface.hh" diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 5da8f7d407..4ba9f8fb4f 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -7,7 +7,6 @@ */ -#include "event.hh" #include "paper-column.hh" #include "engraver.hh" #include "pqueue.hh" diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 841bf43676..e01511538f 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -7,8 +7,8 @@ */ -#include -#include +#include +#include #include "main.hh" #include "system.hh" @@ -16,7 +16,6 @@ #include "output-def.hh" #include "paper-score.hh" #include "paper-column.hh" -#include "item.hh" #include "moment.hh" #include "note-spacing.hh" #include "misc.hh" @@ -28,7 +27,6 @@ #include "break-align-interface.hh" #include "spacing-interface.hh" - /* TODO: this file/class is too complex. Should figure out how to chop this up even more. diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 51151a4b22..d75ff0173b 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -9,14 +9,11 @@ */ #include "engraver.hh" -#include "lily-guile.hh" -#include "item.hh" #include "arpeggio.hh" #include "group-interface.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" - /** Make arpeggios that span multiple staves. Catch arpeggios, and span a Span_arpeggio over them if we find more than two arpeggios. diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 3016528658..a36c0ce5f1 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -6,14 +6,11 @@ (c) 1997--2004 Han-Wen Nienhuys */ - -#include "lily-guile.hh" #include "bar-line.hh" #include "item.hh" #include "span-bar.hh" #include "engraver.hh" - /** Make bars that span multiple "staves". Catch bars, and span a diff --git a/lily/span-bar.cc b/lily/span-bar.cc index e806a0dd2d..6dc63610c2 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -7,14 +7,13 @@ */ #include "span-bar.hh" + #include "font-interface.hh" #include "dimensions.hh" #include "output-def.hh" #include "stencil.hh" #include "warn.hh" #include "axis-group-interface.hh" -#include "group-interface.hh" -#include "grob.hh" #include "bar-line.hh" void diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index edd25919ed..e282ba4bba 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -7,8 +7,6 @@ */ #include "performer.hh" - -#include "event.hh" #include "audio-item.hh" /* diff --git a/lily/spanner.cc b/lily/spanner.cc index 9e33b18eed..69251e2a2a 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -5,12 +5,14 @@ (c) 1996--2004 Han-Wen Nienhuys */ -#include -#include +#include "spanner.hh" + +#include + +#include #include "warn.hh" -#include "spanner.hh" #include "paper-column.hh" #include "paper-score.hh" #include "stencil.hh" diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc index de3e1fda41..c9865ef3b6 100644 --- a/lily/staff-collecting-engraver.cc +++ b/lily/staff-collecting-engraver.cc @@ -6,12 +6,12 @@ source file of the GNU LilyPond music typesetter (c) 2001--2004 Han-Wen Nienhuys */ + #include "staff-symbol.hh" #include "engraver.hh" #include "grob.hh" #include "context.hh" - class Staff_collecting_engraver : public Engraver { public: diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 6a028a6f67..3994e3b63d 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -6,7 +6,6 @@ (c) 1997--2004 Jan Nieuwenhuizen */ -#include "translator-group.hh" #include "warn.hh" #include "audio-column.hh" #include "audio-item.hh" diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 6e4ba374c0..88ebb31089 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -6,13 +6,13 @@ (c) 2001--2004 Han-Wen Nienhuys */ -#include + +#include "staff-spacing.hh" + +#include #include "paper-column.hh" #include "separation-item.hh" -#include "item.hh" -#include "staff-spacing.hh" -#include "grob.hh" #include "warn.hh" #include "bar-line.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index c9c21e500c..b02e7620f4 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -6,14 +6,14 @@ (c) 1999--2004 Han-Wen Nienhuys */ -#include - #include "staff-symbol-referencer.hh" + +#include + #include "staff-symbol.hh" #include "output-def.hh" #include "libc-extension.hh" - int Staff_symbol_referencer::line_count (Grob *me) { diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index e6b73143fe..e458ffdc80 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -6,18 +6,16 @@ (c) 1997--2004 Han-Wen Nienhuys */ +#include "staff-symbol.hh" + #include "lookup.hh" #include "dimensions.hh" #include "output-def.hh" -#include "stencil.hh" #include "warn.hh" #include "item.hh" -#include "staff-symbol.hh" #include "staff-symbol-referencer.hh" #include "spanner.hh" - - MAKE_SCHEME_CALLBACK (Staff_symbol,print,1); SCM diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc index 194064f8fd..737a8e5435 100644 --- a/lily/stanza-number-align-engraver.cc +++ b/lily/stanza-number-align-engraver.cc @@ -8,16 +8,13 @@ source file of the GNU LilyPond music typesetter */ - #include "context.hh" #include "engraver.hh" #include "note-head.hh" #include "lyric-extender.hh" -#include "item.hh" #include "group-interface.hh" #include "side-position-interface.hh" - class Stanza_number_align_engraver : public Engraver { public: diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 06751e1a40..e88ac53536 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -8,7 +8,6 @@ */ #include "engraver.hh" -#include "item.hh" #include "side-position-interface.hh" class Stanza_number_engraver : public Engraver diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index c4d3d1f8b3..11a567dbd0 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -9,7 +9,6 @@ #include "context.hh" #include "directional-element-interface.hh" #include "engraver.hh" -#include "event.hh" #include "item.hh" #include "misc.hh" #include "rhythmic-head.hh" @@ -18,7 +17,6 @@ #include "stem-tremolo.hh" #include "stem.hh" - /** Make stems upon receiving noteheads. */ diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 646b18b4e5..3e88861cca 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -6,6 +6,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ + +#include "stem-tremolo.hh" + #include "spanner.hh" #include "beam.hh" #include "directional-element-interface.hh" @@ -13,7 +16,6 @@ #include "lookup.hh" #include "output-def.hh" #include "staff-symbol-referencer.hh" -#include "stem-tremolo.hh" #include "stem.hh" #include "warn.hh" diff --git a/lily/stem.cc b/lily/stem.cc index ad049f1935..940284971a 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -13,24 +13,23 @@ Stem-end, chord-start, etc. is all confusing naming. */ -#include // rint +#include "stem.hh" + +#include // rint #include "lookup.hh" #include "directional-element-interface.hh" #include "note-head.hh" -#include "stem.hh" #include "warn.hh" #include "output-def.hh" #include "rhythmic-head.hh" #include "font-interface.hh" -#include "stencil.hh" #include "paper-column.hh" #include "misc.hh" #include "beam.hh" #include "rest.hh" #include "group-interface.hh" #include "staff-symbol-referencer.hh" -#include "spanner.hh" #include "side-position-interface.hh" #include "dot-column.hh" #include "stem-tremolo.hh" diff --git a/lily/stencil.cc b/lily/stencil.cc index 4b642e596a..b1ac31b705 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -6,15 +6,15 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "stencil.hh" + +#include + #include // isinf #include "input-smob.hh" #include "font-metric.hh" #include "dimensions.hh" -#include "interval.hh" -#include "string.hh" -#include "stencil.hh" #include "warn.hh" #include "ly-smobs.icc" diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index 1b2fe25260..5537069fd4 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -9,7 +9,6 @@ #include "grob.hh" #include "stencil.hh" #include "font-interface.hh" -#include "string.hh" // update comment --hwn /* diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index fde98b9db1..9062e6c37d 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -6,16 +6,16 @@ (c) 2000--2004 Han-Wen Nienhuys */ -#include + +#include "system-start-delimiter.hh" + +#include #include "spanner.hh" #include "axis-group-interface.hh" -#include "system-start-delimiter.hh" #include "output-def.hh" -#include "stencil.hh" #include "font-interface.hh" #include "all-font-metrics.hh" -#include "grob.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" diff --git a/lily/system.cc b/lily/system.cc index d16b5a3b4e..041a133a3f 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -6,20 +6,19 @@ (c) 1996--2004 Han-Wen Nienhuys */ -#include +#include "system.hh" + +#include #include "align-interface.hh" #include "axis-group-interface.hh" #include "warn.hh" -#include "system.hh" #include "main.hh" #include "paper-column.hh" #include "output-def.hh" #include "paper-outputter.hh" #include "paper-score.hh" -#include "string.hh" #include "warn.hh" -#include "stencil.hh" #include "all-font-metrics.hh" #include "spacing-interface.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index f40fddbead..5730980092 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -3,8 +3,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include + +#include +#include #include "rhythmic-head.hh" #include "output-def.hh" diff --git a/lily/template5.cc b/lily/template5.cc index 8a71838252..e2956a2c76 100644 --- a/lily/template5.cc +++ b/lily/template5.cc @@ -6,12 +6,9 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include -#include "string.hh" #include "moment.hh" -#include "real.hh" + #include "interval.tcc" -#include "compare.hh" Rational Interval_t::infinity () diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 0030340172..c84eefab18 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -6,16 +6,14 @@ (c) 1998--2004 Han-Wen Nienhuys */ + #include "directional-element-interface.hh" #include "engraver.hh" #include "side-position-interface.hh" -#include "item.hh" -#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "text-item.hh" - /** typeset directions that are plain text. */ diff --git a/lily/text-item.cc b/lily/text-item.cc index 032bb09ae1..fdceef15f8 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -7,11 +7,12 @@ Jan Nieuwenhuizen */ -#include +#include "text-item.hh" + +#include #include "warn.hh" #include "grob.hh" -#include "text-item.hh" #include "font-interface.hh" #include "virtual-font-metric.hh" #include "output-def.hh" @@ -21,7 +22,7 @@ MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 4) SCM Text_interface::interpret_string (SCM layout_smob, - SCM props, SCM input_encoding, SCM markup) + SCM props, SCM input_encoding, SCM markup) { Output_def *layout = unsmob_output_def (layout_smob); diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index dbf83a5646..c60ca144ce 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -7,7 +7,6 @@ */ #include "note-column.hh" -#include "item.hh" #include "side-position-interface.hh" #include "engraver.hh" diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 41d7bd3cc6..0e8ec2b4d5 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -8,9 +8,9 @@ Revised over good by Han-Wen. */ -#include "stencil.hh" -#include "text-item.hh" #include "text-spanner.hh" + +#include "text-item.hh" #include "line-spanner.hh" #include "spanner.hh" #include "font-interface.hh" diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc index 08b6995f67..bc62f65ba3 100644 --- a/lily/tfm-reader.cc +++ b/lily/tfm-reader.cc @@ -10,9 +10,9 @@ */ #include "tfm-reader.hh" + #include "string-convert.hh" #include "warn.hh" -#include "warn.hh" #define format_string String_convert::form_string #define FIX_UNITY \ diff --git a/lily/tfm.cc b/lily/tfm.cc index 97b2bbfa45..571df4319c 100644 --- a/lily/tfm.cc +++ b/lily/tfm.cc @@ -9,10 +9,10 @@ */ #include "tfm.hh" + #include "tfm-reader.hh" #include "string-convert.hh" #include "warn.hh" -#include "warn.hh" #include "dimensions.hh" static Tex_font_char_metric dummy_static_char_metric; @@ -102,10 +102,9 @@ Tex_font_metric::make_tfm (String file_name) tfm->char_metrics_ = reader.char_metrics_; tfm->ascii_to_metric_idx_ = reader.ascii_to_metric_idx_; - - tfm->encoding_table_ = - scm_call_1 (ly_scheme_function ("get-coding-table"), - scm_makfrom0str (tfm->coding_scheme ().to_str0 ())); + tfm->encoding_table_ + = scm_call_1 (ly_scheme_function ("get-coding-table"), + scm_makfrom0str (tfm->coding_scheme ().to_str0 ())); return tfm->self_scm (); } diff --git a/lily/tie-column.cc b/lily/tie-column.cc index c3ff0c50e6..0cbc5da9a0 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -7,18 +7,14 @@ */ -#include "spanner.hh" #include "tie-column.hh" + +#include "spanner.hh" #include "group-interface.hh" #include "tie.hh" #include "directional-element-interface.hh" #include "rhythmic-head.hh" - - - - - /* tie dir depends on what Tie_column does. */ diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 6cfc5b6457..2176a3af98 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -7,10 +7,8 @@ */ -#include "event.hh" #include "tie.hh" #include "context.hh" - #include "protected-scm.hh" #include "spanner.hh" #include "tie-column.hh" diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 5bcc1987a0..8fe14a3567 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -9,7 +9,6 @@ #include "context.hh" #include "audio-item.hh" -#include "event.hh" #include "pqueue.hh" #include "performer.hh" diff --git a/lily/tie.cc b/lily/tie.cc index 855891f07d..36db5cb037 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -5,20 +5,20 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include "tie.hh" + +#include #include "spanner.hh" #include "lookup.hh" #include "output-def.hh" -#include "tie.hh" #include "rhythmic-head.hh" #include "bezier.hh" #include "paper-column.hh" #include "warn.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" -#include "stencil.hh" #include "bezier.hh" #include "stem.hh" #include "note-head.hh" diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc index 4c7b577aa3..1111b68742 100644 --- a/lily/time-scaled-music-iterator.cc +++ b/lily/time-scaled-music-iterator.cc @@ -8,6 +8,7 @@ */ #include "time-scaled-music-iterator.hh" + #include "time-scaled-music.hh" #include "event.hh" #include "context.hh" diff --git a/lily/time-scaled-music.cc b/lily/time-scaled-music.cc index 2d70b02adc..c41bb123f0 100644 --- a/lily/time-scaled-music.cc +++ b/lily/time-scaled-music.cc @@ -8,6 +8,7 @@ */ #include "time-scaled-music.hh" + #include "time-scaled-music-iterator.hh" Time_scaled_music::Time_scaled_music () diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index a66068e1d6..7581abdd15 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -8,8 +8,6 @@ #include "time-signature.hh" #include "warn.hh" - -#include "engraver.hh" #include "engraver-group-engraver.hh" #include "misc.hh" diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index d6226e725a..3988db8c23 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -7,10 +7,8 @@ */ #include "audio-item.hh" -#include "lily-proto.hh" #include "performer.hh" - class Time_signature_performer : public Performer { public: diff --git a/lily/time-signature.cc b/lily/time-signature.cc index f8e7dcf1ab..42262d8270 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -7,16 +7,14 @@ */ +#include "time-signature.hh" -#include "stencil.hh" #include "text-item.hh" -#include "time-signature.hh" #include "output-def.hh" #include "font-interface.hh" #include "warn.hh" #include "staff-symbol-referencer.hh" - /* TODO: diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc index 468656ffe2..73e4f5561f 100644 --- a/lily/timing-engraver.cc +++ b/lily/timing-engraver.cc @@ -5,8 +5,8 @@ (c) 1997--2004 Han-Wen Nienhuys */ + #include "context.hh" -#include "grob-info.hh" #include "multi-measure-rest.hh" #include "timing-translator.hh" #include "engraver.hh" diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 9fde83d395..304be3699c 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -7,14 +7,13 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "warn.hh" #include "timing-translator.hh" +#include "warn.hh" #include "translator-group.hh" #include "global-context.hh" #include "multi-measure-rest.hh" - void Timing_translator::stop_translation_timestep () { diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 5ed918f3cb..4dcdca35b3 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -6,11 +6,10 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "output-def.hh" #include "translator-group.hh" -#include "translator.hh" + +#include "output-def.hh" #include "warn.hh" -#include "moment.hh" #include "scm-hash.hh" #include "context-def.hh" #include "context.hh" diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc index 35054fd0d2..8d8f262d3a 100644 --- a/lily/translator-scheme.cc +++ b/lily/translator-scheme.cc @@ -7,11 +7,8 @@ */ -#include "translator.hh" #include "context-def.hh" #include "translator-group.hh" -#include "lily-guile.hh" - LY_DEFINE (ly_translator_name, "ly:translator-name", 1, 0, 0, (SCM trans), diff --git a/lily/translator.cc b/lily/translator.cc index a5c612a929..d6a4a79ca2 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -6,16 +6,14 @@ (c) 1997--2004 Han-Wen Nienhuys */ - #include "translator.hh" + #include "warn.hh" #include "translator-group.hh" #include "context-def.hh" #include "global-context.hh" -#include "moment.hh" -#include "context.hh" -#include "ly-smobs.icc" +#include "ly-smobs.icc" Translator::~Translator () { diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc index 47905bca53..d2c1166a21 100644 --- a/lily/transposed-music.cc +++ b/lily/transposed-music.cc @@ -8,6 +8,7 @@ */ #include "transposed-music.hh" + #include "warn.hh" Pitch diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index 6bfd91ba6b..2857a123c5 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -15,7 +15,6 @@ */ #include "note-column.hh" -#include "item.hh" #include "side-position-interface.hh" #include "engraver.hh" diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 1f313e84a9..dd1fda286d 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -23,17 +23,16 @@ */ -#include +#include "tuplet-bracket.hh" + +#include #include "line-interface.hh" #include "beam.hh" -#include "box.hh" #include "warn.hh" #include "font-interface.hh" -#include "stencil.hh" #include "output-def.hh" #include "text-item.hh" -#include "tuplet-bracket.hh" #include "stem.hh" #include "note-column.hh" #include "group-interface.hh" @@ -42,7 +41,6 @@ #include "staff-symbol-referencer.hh" #include "lookup.hh" - static Grob* get_x_bound_grob (Grob *g, Direction my_dir) { diff --git a/lily/tweak-registration.cc b/lily/tweak-registration.cc index 501731400e..701eb08dcc 100644 --- a/lily/tweak-registration.cc +++ b/lily/tweak-registration.cc @@ -7,15 +7,13 @@ */ +#include "tweak-registration.hh" #include "object-key-undumper.hh" -#include "tweak-registration.hh" -#include "object-key.hh" #include "grob.hh" #include "ly-smobs.icc" - void Tweak_registry::clear () { diff --git a/lily/un-relativable-music.cc b/lily/un-relativable-music.cc index 8565c17250..1d0f0271d6 100644 --- a/lily/un-relativable-music.cc +++ b/lily/un-relativable-music.cc @@ -9,7 +9,6 @@ #include "un-relativable-music.hh" - Un_relativable_music::Un_relativable_music ( ) { } diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 5c7be710e3..10283f5a7c 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -7,7 +7,6 @@ source file of the GNU LilyPond music typesetter (c) 2002--2004 Han-Wen Nienhuys */ - #include "music.hh" #include "sequential-iterator.hh" #include "context.hh" diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 41a54ec74b..7a02f96a4f 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -9,7 +9,6 @@ #include "gregorian-ligature-engraver.hh" #include "gregorian-ligature.hh" #include "vaticana-ligature.hh" -#include "item.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "font-interface.hh" diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index 7cc2263c44..90fffe0174 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -6,11 +6,12 @@ (c) 2003--2004 Juergen Reuter */ -#include -#include "item.hh" #include "vaticana-ligature.hh" + +#include + +#include "item.hh" #include "font-interface.hh" -#include "stencil.hh" #include "lookup.hh" #include "staff-symbol-referencer.hh" #include "note-head.hh" diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc index 5b476be788..7b8bd26d14 100644 --- a/lily/virtual-font-metric.cc +++ b/lily/virtual-font-metric.cc @@ -7,12 +7,12 @@ source file of the GNU LilyPond music typesetter */ -#include "warn.hh" #include "virtual-font-metric.hh" + #include "all-font-metrics.hh" #include "stencil.hh" #include "output-def.hh" - +#include "warn.hh" /* passing DEF is ughish. Should move into layoutdef? diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index 9b96d0f950..78d1e39f9a 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -6,13 +6,11 @@ (c) 1997--2004 Jan Nieuwenhuizen */ -#include +#include -#include "box.hh" #include "warn.hh" #include "font-interface.hh" #include "line-interface.hh" -#include "stencil.hh" #include "paper-column.hh" #include "output-def.hh" #include "text-item.hh" diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index a988218ca0..263bca5aed 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -10,7 +10,6 @@ #include "engraver.hh" #include "context.hh" #include "volta-bracket.hh" -#include "item.hh" #include "note-column.hh" #include "bar-line.hh" #include "side-position-interface.hh" diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly index e606809e9e..05726b3921 100644 --- a/ly/paper-defaults.ly +++ b/ly/paper-defaults.ly @@ -65,8 +65,11 @@ #(define font-defaults '((font-encoding . fetaMusic))) + %% use lmodern in latin1 (cork) flavour if EC is not available. #(define text-font-defaults - '((font-encoding . ec) + `((font-encoding + . ,(if (and (not (ly:kpathsea-find-file "ecrm10.pfa")) + (ly:kpathsea-find-file "cork-lm.enc")) 'cork-lm 'ec)) (baseline-skip . 2) (word-space . 0.6))) diff --git a/scm/encoding.scm b/scm/encoding.scm index af4ba61afe..dc10d1f116 100644 --- a/scm/encoding.scm +++ b/scm/encoding.scm @@ -12,7 +12,7 @@ (define-public (read-encoding-file file-name) "Read .enc file, return (COMMAND-NAME . VECTOR-OF-SYMBOLS)." - (let* ((path (ly:kpathsea-expand-path file-name)) + (let* ((path (ly:kpathsea-find-file file-name)) (unused (if (string? path) #t (ly:warn "can't find ~s" file-name))) (raw (ly:gulp-file path)) (string (regexp-substitute/global #f "%[^\n]*" raw 'pre "" 'post)) @@ -88,7 +88,10 @@ vector of symbols." ("AdobeStandardEncoding" . "8a.enc") ("T1" . "tex256.enc") ("adobe" . "8a.enc") + ;; EC-fonts-mftraced ("ec" . "EC.enc") + ;; lmodern, encoding flavour latin1 + ("cork-lm" . "cork-lm.enc") ;; input encodings ("latin1" . "latin1.enc") @@ -101,6 +104,8 @@ vector of symbols." ("parmesanMusic" . "parmesan20.enc")) )) +;; FIXME: this is broken, cannot get font encoding from font/AFM file, +;; should use encoding from font-tree in fonts.scm (define (get-coding coding-name) (let ((entry (assoc-get coding-name coding-alist))) (if entry diff --git a/scm/font.scm b/scm/font.scm index eadad9b3d7..1b108dfccc 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -1,3 +1,9 @@ +;;;; font.scm -- construct font trees +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (c) 2004 Han-Wen Nienhuys + ;; As an excercise, do it with records. ;; Should use GOOPS, really. @@ -14,8 +20,8 @@ ;; (define-class - () - ) + ()) + (define-class () (default-size #:init-keyword #:default-size) @@ -32,37 +38,37 @@ (define (make-font-tree-node qualifier default) (make - #:qualifier qualifier - #:default default - #:children (make-hash-table 11))) + #:qualifier qualifier + #:default default + #:children (make-hash-table 11))) (define-method (display (leaf ) port) (map (lambda (x) (display x port)) - (list - "Font-size-family: \n" - (slot-ref leaf 'default-size) - (slot-ref leaf 'size-vector) ))) - + (list + "Font-size-family: \n" + (slot-ref leaf 'default-size) + (slot-ref leaf 'size-vector) ))) + (define-method (display (node ) port) - - (map - (lambda (x) - (display x port)) - - (list - "Font_node { \nqual: " - (font-qualifier node) - "(def: " - (font-default node) - ") {\n")) - (for-each - (lambda (x) - (display "\n") - (display (car x) port) - (display "=" port) - (display (cdr x) port)) - (hash-table->alist (font-children node))) - (display "} } \n")) + + (map + (lambda (x) + (display x port)) + + (list + "Font_node { \nqual: " + (font-qualifier node) + "(def: " + (font-default node) + ") {\n")) + (for-each + (lambda (x) + (display "\n") + (display (car x) port) + (display "=" port) + (display (cdr x) port)) + (hash-table->alist (font-children node))) + (display "} } \n")) (define default-qualifier-order @@ -77,8 +83,8 @@ (let* ((qual (next-qualifier default-qualifier-order fprops))) (make-font-tree-node qual - (assoc-get qual fprops))) - )) + (assoc-get qual fprops))))) + (define (next-qualifier order props) (cond ((and (null? props) (null? order)) @@ -88,8 +94,8 @@ (else (if (assoc-get (car order) props) (car order) - (next-qualifier (cdr order) props)) - ))) + (next-qualifier (cdr order) props))))) + (let* ((q (font-qualifier node)) @@ -114,15 +120,15 @@ (define-method (g-lookup-font (node ) alist-chain) (let* - ((qual (font-qualifier node)) - (def (font-default node)) - (val (chain-assoc-get qual alist-chain def)) - (desired-child (hashq-ref (font-children node) val))) + ((qual (font-qualifier node)) + (def (font-default node)) + (val (chain-assoc-get qual alist-chain def)) + (desired-child (hashq-ref (font-children node) val))) (if desired-child (g-lookup-font desired-child alist-chain) - (g-lookup-font (hashq-ref (font-children node) def) alist-chain) - ))) + (g-lookup-font (hashq-ref (font-children node) def) alist-chain)))) + (define-method (g-lookup-font (node ) alist-chain) node) @@ -131,10 +137,10 @@ (define (lookup-font node alist-chain) (g-lookup-font node alist-chain)) -; -; Each size family is a vector of fonts, loaded with a delay. -; The vector should be sorted according to ascending design size. -; + ; + ; Each size family is a vector of fonts, loaded with a delay. + ; The vector should be sorted according to ascending design size. + ; (define-public (add-music-fonts node factor) (for-each @@ -144,276 +150,244 @@ (cons (* factor (cadr x)) (caddr x)))) `((fetaNumber 10 - #(,(delay (ly:font-load "feta-nummer4")) - ,(delay (ly:font-load "feta-nummer6")) - ,(delay (ly:font-load "feta-nummer8")) - ,(delay (ly:font-load "feta-nummer10")) - ,(delay (ly:font-load "feta-nummer12")) - ,(delay (ly:font-load "feta-nummer16")))) + #(,(delay (ly:font-load "feta-nummer4")) + ,(delay (ly:font-load "feta-nummer6")) + ,(delay (ly:font-load "feta-nummer8")) + ,(delay (ly:font-load "feta-nummer10")) + ,(delay (ly:font-load "feta-nummer12")) + ,(delay (ly:font-load "feta-nummer16")))) (fetaDynamic 14.0 #(,(delay (ly:font-load "feta-din6")) - ,(delay (ly:font-load "feta-din8")) - ,(delay (ly:font-load "feta-din10")) - ,(delay (ly:font-load "feta-din12")) - ,(delay (ly:font-load "feta-din14")) - ,(delay (ly:font-load "feta-din17")) - )) + ,(delay (ly:font-load "feta-din8")) + ,(delay (ly:font-load "feta-din10")) + ,(delay (ly:font-load "feta-din12")) + ,(delay (ly:font-load "feta-din14")) + ,(delay (ly:font-load "feta-din17")))) + (fetaMusic 20.0 - #(,(delay (ly:make-virtual-font - (ly:font-load "feta11") - (ly:font-load "parmesan11"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta13") - (ly:font-load "parmesan13"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta14") - (ly:font-load "parmesan14"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta16") - (ly:font-load "parmesan16"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta18") - (ly:font-load "parmesan18"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta20") - (ly:font-load "parmesan20"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta23") - (ly:font-load "parmesan23"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta26") - (ly:font-load "parmesan26"))) - )) - + #(,(delay (ly:make-virtual-font + (ly:font-load "feta11") + (ly:font-load "parmesan11"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta13") + (ly:font-load "parmesan13"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta14") + (ly:font-load "parmesan14"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta16") + (ly:font-load "parmesan16"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta18") + (ly:font-load "parmesan18"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta20") + (ly:font-load "parmesan20"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta23") + (ly:font-load "parmesan23"))) + ,(delay (ly:make-virtual-font + (ly:font-load "feta26") + (ly:font-load "parmesan26"))))) + + (fetaBraces 15 #(,(delay - (ly:make-virtual-font - (ly:font-load "feta-braces-a") - (ly:font-load "feta-braces-b") - (ly:font-load "feta-braces-c") - (ly:font-load "feta-braces-d") - (ly:font-load "feta-braces-e") - (ly:font-load "feta-braces-f") - (ly:font-load "feta-braces-g") - (ly:font-load "feta-braces-h") - (ly:font-load "feta-braces-i")) - )))))) - + (ly:make-virtual-font + (ly:font-load "feta-braces-a") + (ly:font-load "feta-braces-b") + (ly:font-load "feta-braces-c") + (ly:font-load "feta-braces-d") + (ly:font-load "feta-braces-e") + (ly:font-load "feta-braces-f") + (ly:font-load "feta-braces-g") + (ly:font-load "feta-braces-h") + (ly:font-load "feta-braces-i")))))))) (define-public (add-cmr-fonts node factor) - (add-font - node - '((font-encoding . TeX-math)) - `(,(* factor 10) . #(,(delay (ly:font-load "msam10"))))) - - (for-each - (lambda (x) - (add-font - node - `((font-encoding . TeX-text) - (font-series . ,(vector-ref (car x) 2)) - (font-shape . ,(vector-ref (car x) 1)) - (font-family . ,(vector-ref (car x) 0))) - (cons (* factor (cadr x)) - (cddr x)) - )) - `((#(roman upright medium) . - (10.0 . #(,(delay (ly:font-load "cmr6")) - ,(delay (ly:font-load "cmr8")) - ,(delay (ly:font-load "cmr10")) - ,(delay (ly:font-load "cmr17")) - ))) - - (#(roman upright bold) . - (10.0 . #(,(delay (ly:font-load "cmbx6")) - ,(delay (ly:font-load "cmbx8")) - ,(delay (ly:font-load "cmbx10")) - ,(delay (ly:font-load "cmbx12")) - ))) - - (#(roman italic medium) . - (10.0 . #(,(delay (ly:font-load "cmti7")) - ,(delay (ly:font-load "cmti10")) - ,(delay (ly:font-load "cmti12")) - ))) - (#(roman italic bold) . - (10.0 . #(,(delay (ly:font-load "cmbxti8")) - ,(delay (ly:font-load "cmbxti10")) - ,(delay (ly:font-load "cmbxti14")) - ))) - - (#(roman caps medium) . - (10.0 . #(,(delay (ly:font-load "cmcsc10"))))) - - (#(roman upright bold-narrow ) . - (10.0 . #(,(delay (ly:font-load "cmb10")) - ))) - - (#(sans upright medium) . - (10.0 . #(,(delay (ly:font-load "cmss8")) - ,(delay (ly:font-load "cmss10")) - ,(delay (ly:font-load "cmss12")) - ,(delay (ly:font-load "cmss17")) - ))) - (#(typewriter upright medium) . - (10.0 . #(,(delay (ly:font-load "cmtt8")) - ,(delay (ly:font-load "cmtt10")) - ,(delay (ly:font-load "cmtt12")) - ))))) - - ;; lmodern: super-cm using metapost - ;; lm.map: Reencoding, at fontlevel for TeX ?: - ;; cork-lmb10 LMRomanDemi10-Regular "enccorklm ReEncodeFont" pfa bpath)) (else - (ly:warn "Can't find PFA font ~S" x) + (ly:warn "cannot find PFA font ~S" x) "")))) (filter string? font-names)))) @@ -125,7 +125,7 @@ (define (font-load-encoding encoding) (let ((file-name (get-coding-file-name encoding))) - (ly:gulp-file (ly:kpathsea-expand-path file-name)))) + (ly:gulp-file (ly:kpathsea-find-file file-name)))) (let* ((encoding-list (map (lambda (x) (assoc-get 'input-name diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index ba9726b6c6..988e49e040 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -12,8 +12,8 @@ (ice-9 string-fun) (ice-9 format) (guile) - (srfi srfi-13) (srfi srfi-1) + (srfi srfi-13) (lily)) (define-public (sanitize-tex-string s) @@ -46,6 +46,10 @@ (font-encoding (assoc-get 'output-name coding-alist))) (string-append "\\font\\lilypond" (tex-font-command font) "=" + (if (or (equal? (ly:font-encoding font) "cork-lm") + ;; FIXME: encoding: FontSpecific for cork-lm + (string-prefix? "lm" (ly:font-file-name font))) + "cork-" "") (ly:font-file-name font) " scaled " (ly:number->string (inexact->exact @@ -283,19 +287,19 @@ (base (basename name ".tex")) (cmd (string-append "dvips " (if preview? - " -E " + "-E " (string-append - " -t " - + "-t" ;; careful: papersizename is user-set. - (sanitize-command-option papersizename))) - - (if landscape? - " -t landscape " - " ") - " -u+ec-mftrace.map -u+lilypond.map -Ppdf " + (sanitize-command-option papersizename) + " ")) + (if landscape? "-t landscape " "") + (if (ly:kpathsea-find-file "lm.map") + "-u+lm.map " "") + (if (ly:kpathsea-find-file "ecrm10.pfa") + "-u+ec-mftrace.map " "") + "-u+lilypond.map -Ppdf " "" base))) - (let ((ps-name (string-append base ".ps"))) (if (access? ps-name W_OK) (delete-file ps-name)))