From: hanwen Date: Mon, 12 Sep 2005 23:33:24 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.7.16^2~157 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7ef938b1a85a43ada7c609f5aa4b678689e85b49;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 6aec04e5b3..ea6e06663c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-09-13 Han-Wen Nienhuys + + * lily/*.cc: remove everywhere. is included from real.hh + 2005-09-12 Han-Wen Nienhuys * stepmake/stepmake/c++-vars.make (#EXTRA_CXXFLAGS): don't add diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index d4e6a340f8..3f63cb1c5b 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -6,8 +6,7 @@ (c) 2002--2005 Han-Wen Nienhuys */ -#include -using namespace std; + #include "accidental-placement.hh" #include "skyline.hh" diff --git a/lily/bar-line.cc b/lily/bar-line.cc index ecc8ac70d6..555a5c2566 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -8,9 +8,6 @@ #include "bar-line.hh" -#include -using namespace std; - #include "all-font-metrics.hh" #include "font-interface.hh" #include "lookup.hh" diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc index 1866e52f27..f0e0cbde50 100644 --- a/lily/beam-concave.cc +++ b/lily/beam-concave.cc @@ -2,9 +2,6 @@ Determine whether a beam is concave. */ -#include -using namespace std; - #include "pointer-group-interface.hh" #include "array.hh" #include "stem.hh" diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index d8544b9b18..d0a09e9530 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -10,7 +10,6 @@ #include "beam.hh" #include -#include using namespace std; #include "warn.hh" diff --git a/lily/beam.cc b/lily/beam.cc index 0b3ca786c4..95e5c4fefc 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -24,9 +24,6 @@ - beam_translation is the offset between Y centers of the beam. */ -#include // tanh. -using namespace std; - #include "beam.hh" #include "interval-set.hh" #include "directional-element-interface.hh" diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index fcc6df45f4..e744219bd0 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -6,9 +6,6 @@ (c) 1998--2005 Jan Nieuwenhuizen */ -#include -using namespace std; - #include "misc.hh" #include "bezier.hh" diff --git a/lily/bezier.cc b/lily/bezier.cc index 09bcd54a1a..1b73404b77 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -6,9 +6,6 @@ (c) 1998--2005 Jan Nieuwenhuizen */ -#include -using namespace std; - #include "bezier.hh" #include "warn.hh" #include "libc-extension.hh" diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index c06c267001..970be7cbe8 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -6,8 +6,6 @@ (c) 1997--2005 Han-Wen Nienhuys */ -#include -using namespace std; #include "break-align-interface.hh" diff --git a/lily/clef.cc b/lily/clef.cc index dafb09d4e5..4007d93e9f 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -42,7 +42,7 @@ Clef::before_line_breaking (SCM smob) } MAKE_SCHEME_CALLBACK (Clef, print, 1) - SCM +SCM Clef::print (SCM smob) { Grob *me = unsmob_grob (smob); diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index 3254e5e819..ff47aab7e8 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -6,8 +6,6 @@ (c) 1998--2005 Han-Wen Nienhuys */ -#include -using namespace std; #include "dimension-cache.hh" #include "warn.hh" diff --git a/lily/font-select.cc b/lily/font-select.cc index c91f713b17..571433052d 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -6,8 +6,6 @@ (c) 2003--2005 Han-Wen Nienhuys */ -#include -using namespace std; #include "dimensions.hh" #include "all-font-metrics.hh" diff --git a/lily/grob-property.cc b/lily/grob-property.cc index 04acbf4fc1..e6b6ec961e 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -3,8 +3,6 @@ */ #include -#include -using namespace std; #include "main.hh" #include "input-smob.hh" diff --git a/lily/grob.cc b/lily/grob.cc index cfb8c319f9..3a019cea6e 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -9,8 +9,6 @@ #include "grob.hh" #include -#include -using namespace std; #include "main.hh" #include "input-smob.hh" diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh index b5eac587db..eaba85657d 100644 --- a/lily/include/accidental-interface.hh +++ b/lily/include/accidental-interface.hh @@ -18,8 +18,8 @@ class Accidental_interface public: DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); + static bool has_interface (Grob *); - static String get_fontcharname (String style, int alteration); static Array Accidental_interface::accurate_boxes (Grob *me, Grob **common); diff --git a/lily/include/clef.hh b/lily/include/clef.hh index ec80108af6..1f3146aea9 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -8,6 +8,7 @@ #ifndef CLEF_HH #define CLEF_HH + #include "lily-guile.hh" #include "lily-proto.hh" diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh index 24989a8acf..3f1cabbe99 100644 --- a/lily/include/lily-guile-macros.hh +++ b/lily/include/lily-guile-macros.hh @@ -94,7 +94,7 @@ inline SCM ly_symbol2scm (char const *x) { return scm_str2symbol ((x)); } { \ TYPE ::FUNC ## _proc = scm_c_define_gsubr (#TYPE "::" #FUNC, \ (ARGCOUNT), 0, 0, \ - (Scheme_function_unknown)TYPE ::FUNC); \ + (Scheme_function_unknown) TYPE::FUNC); \ scm_c_export (#TYPE "::" #FUNC, NULL); \ } \ \ diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 664dcf2905..17409239b1 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -13,6 +13,7 @@ #include #include /* strdup, strchr */ #include + using namespace std; #include "config.hh" diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index cbfe9dd306..358f7311f6 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -8,8 +8,6 @@ #include "line-spanner.hh" -#include -using namespace std; #include "spanner.hh" #include "output-def.hh" diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index ebf3c41ce5..f9c1f0b47d 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -8,8 +8,6 @@ #include "lyric-extender.hh" -#include -using namespace std; #include "warn.hh" #include "lookup.hh" diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index f68719595b..4bafc7e508 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -8,8 +8,6 @@ #include "lyric-hyphen.hh" -#include -using namespace std; #include "lookup.hh" #include "output-def.hh" diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index 250a0f9411..87ca3f5bd1 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -7,8 +7,6 @@ Pal Benko */ -#include -using namespace std; #include "mensural-ligature.hh" #include "item.hh" diff --git a/lily/midi-def.cc b/lily/midi-def.cc index a806675016..1b89f6533c 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -6,8 +6,6 @@ (c) 1997--2005 Jan Nieuwenhuizen */ -#include -using namespace std; #include "misc.hh" #include "output-def.hh" diff --git a/lily/misc.cc b/lily/misc.cc index 809c1b7169..08f3827abb 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -7,8 +7,6 @@ Jan Nieuwenhuizen */ -#include -using namespace std; #include "misc.hh" #include "string.hh" diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 353c40037b..8a96ab5efe 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -8,8 +8,6 @@ #include "note-collision.hh" -#include -using namespace std; #include "warn.hh" #include "note-column.hh" diff --git a/lily/pango-select.cc b/lily/pango-select.cc index 3f654ff324..2fa33d506c 100644 --- a/lily/pango-select.cc +++ b/lily/pango-select.cc @@ -5,8 +5,6 @@ (c) 2004--2005 Han-Wen Nienhuys */ -#include -using namespace std; #include "dimensions.hh" #include "all-font-metrics.hh" diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index f3d81ba543..25d71ef3fa 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -8,8 +8,6 @@ #include "percent-repeat-item.hh" -#include -using namespace std; #include "lookup.hh" #include "font-interface.hh" diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc index 6c95f42124..2e0cc3afa0 100644 --- a/lily/simple-spacer-scheme.cc +++ b/lily/simple-spacer-scheme.cc @@ -7,8 +7,6 @@ */ #include -#include -using namespace std; #include "paper-column.hh" #include "spring.hh" diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 2cccb6d83c..6495e3516b 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -10,8 +10,6 @@ */ #include -#include -using namespace std; #include "libc-extension.hh" // isinf #include "simple-spacer.hh" diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 6f86fd432a..f5698104ad 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -8,8 +8,6 @@ #include "slur-configuration.hh" -#include -using namespace std; #include "stem.hh" #include "warn.hh" diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index bcb65320ed..dc6ae85294 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -7,8 +7,6 @@ Jan Nieuwenhuizen */ -#include -using namespace std; #include "slur-scoring.hh" #include "libc-extension.hh" diff --git a/lily/slur.cc b/lily/slur.cc index 8159e0dd3d..6db1fabfb0 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -9,8 +9,6 @@ #include "slur.hh" -#include -using namespace std; #include "beam.hh" #include "bezier.hh" diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 12012be46d..0bbdc908a0 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -9,8 +9,6 @@ #include "spaceable-grob.hh" #include -#include -using namespace std; #include "warn.hh" #include "spring.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index 33e1a7cb24..182a2a818c 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -8,8 +8,6 @@ #include "spanner.hh" -#include -using namespace std; #include "pointer-group-interface.hh" #include "libc-extension.hh" diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 7ad89794f9..ea7d70f799 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -8,8 +8,6 @@ #include "staff-symbol-referencer.hh" -#include -using namespace std; #include "staff-symbol.hh" #include "output-def.hh" diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index 1bf2eab213..bab7895d42 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -6,8 +6,6 @@ (c) 1997--2005 Han-Wen Nienhuys */ -#include -using namespace std; #include "font-metric.hh" #include "libc-extension.hh" diff --git a/lily/stencil.cc b/lily/stencil.cc index fd8a19d3e2..64bab4f12f 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -8,8 +8,6 @@ #include "stencil.hh" -#include -using namespace std; #include "dimensions.hh" #include "font-metric.hh" diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 33ba97f165..c4aee8a7e1 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -8,8 +8,6 @@ #include "system-start-delimiter.hh" -#include -using namespace std; #include "spanner.hh" #include "axis-group-interface.hh" diff --git a/lily/system.cc b/lily/system.cc index 4ce6a9c00e..6e597b1bf3 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -8,8 +8,6 @@ #include "system.hh" -#include -using namespace std; #include "align-interface.hh" #include "axis-group-interface.hh" diff --git a/lily/text-interface.cc b/lily/text-interface.cc index 4c28ee8671..7a4dcc1899 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -9,8 +9,6 @@ #include "text-interface.hh" -#include -using namespace std; #include "main.hh" #include "config.hh" diff --git a/lily/tie-column-format.cc b/lily/tie-column-format.cc index 812782ef4e..3fb78cd166 100644 --- a/lily/tie-column-format.cc +++ b/lily/tie-column-format.cc @@ -260,7 +260,8 @@ set_tie_config_directions (Array *tie_configs_ptr) */ for (int i = 1; i < tie_configs.size(); i++) { - if (fabs (tie_configs[i-1].position_ - tie_configs[i].position_) <= 1) + Real diff = tie_configs[i-1].position_ - tie_configs[i].position_; + if (fabs (diff) <= 1) { if (!tie_configs[i-1].dir_) tie_configs[i-1].dir_ = DOWN; diff --git a/lily/tie-helper.cc b/lily/tie-helper.cc index 8d5a427615..eba02de16c 100644 --- a/lily/tie-helper.cc +++ b/lily/tie-helper.cc @@ -7,8 +7,6 @@ */ -#include -using namespace std; #include "tie.hh" #include "bezier.hh" diff --git a/lily/tie.cc b/lily/tie.cc index 40664a67e7..236845405a 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -8,8 +8,6 @@ #include "tie.hh" -#include -using namespace std; #include "spanner.hh" #include "lookup.hh" diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index a95e666110..8a18e4c7b9 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -29,8 +29,6 @@ todo: handle breaking elegantly. */ -#include -using namespace std; #include "tuplet-bracket.hh" #include "line-interface.hh" diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index eefe2fe760..d07a1ba370 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -8,8 +8,6 @@ #include "vaticana-ligature.hh" -#include -using namespace std; #include "item.hh" #include "font-interface.hh"