*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 6aec04e5b3b12493cd9ed29d5c69a919fae4b38c..ea6e06663cdb7d94e0bb1818d250353dc540cb19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/*.cc: remove <cmath> everywhere. <cmath> is included from real.hh
+
 2005-09-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * stepmake/stepmake/c++-vars.make (#EXTRA_CXXFLAGS): don't add

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index d4e6a340f84069610d8fa1ec1a0b395fb6385d08..3f63cb1c5baaf628b61b5ed35bb7fcb8f6b0cb5d 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -6,8 +6,7 @@
   (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <cmath>
-using namespace std;
+
 
 #include "accidental-placement.hh"
 #include "skyline.hh"

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index ecc8ac70d6935b14aa8afc6b226ae0c090223490..555a5c2566cb01e06ea8913dfdcc7037e39a02c8 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -8,9 +8,6 @@
 
 #include "bar-line.hh"
 
-#include <cmath>
-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 1866e52f278dc00e23469523d661739eee62b952..f0e0cbde50a384afdd67cbfff4f2f01fdc8a2946 100644 (file)
--- a/lily/beam-concave.cc
+++ b/lily/beam-concave.cc
@@ -2,9 +2,6 @@
   Determine whether a beam is concave.
 */
 
-#include <cmath>
-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 d8544b9b18de2c402e0a875874b73104ffe8d28c..d0a09e9530cf8027f109c919372a2b8bdb325d51 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -10,7 +10,6 @@
 #include "beam.hh"
 
 #include <algorithm>
-#include <cmath>
 using namespace std;
 
 #include "warn.hh"

diff --git a/lily/beam.cc b/lily/beam.cc
index 0b3ca786c42763734f9dee6e86317a6ba8fba1d2..95e5c4fefc1804ef631a738ccccab93da8a5591d 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -24,9 +24,6 @@
   - beam_translation is the offset between Y centers of the beam.
 */
 
-#include <cmath> // 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 fcc6df45f4ce1e898ec3167f244861a6a050dd8a..e744219bd0c00408f96fca4a97e727c4ef6f0a04 100644 (file)
--- a/lily/bezier-bow.cc
+++ b/lily/bezier-bow.cc
@@ -6,9 +6,6 @@
   (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <cmath>
-using namespace std;
-
 #include "misc.hh"
 #include "bezier.hh"
 

diff --git a/lily/bezier.cc b/lily/bezier.cc
index 09bcd54a1a80b755a18231623f0ec81c170a0fab..1b73404b776dde613408eb5668e6ec6e913b075b 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -6,9 +6,6 @@
   (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <cmath>
-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 c06c267001b4f67d2980c08d7aeb6d06d559a25c..970be7cbe8f3a33820135e2ea909d1f2ad14ee63 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -6,8 +6,6 @@
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "break-align-interface.hh"
 

diff --git a/lily/clef.cc b/lily/clef.cc
index dafb09d4e54debc8b3cd1aa986baaf59d973f61a..4007d93e9feb6be47b506bbb86db446ca2b72c78 100644 (file)
--- 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 3254e5e81971b4b7c4fdbcdd27e0917658a13ea6..ff47aab7e8494b155bd1647fb18ddba1c0f02804 100644 (file)
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -6,8 +6,6 @@
   (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "dimension-cache.hh"
 #include "warn.hh"

diff --git a/lily/font-select.cc b/lily/font-select.cc
index c91f713b176b6c52719c03f1edc7e8cb3af819c6..571433052d4317e3a169ab10fba1bd06a4446256 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -6,8 +6,6 @@
   (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "dimensions.hh"
 #include "all-font-metrics.hh"

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 04acbf4fc17e303f62d2fb2f1f9e2ec161b5ab1c..e6b6ec961eb5acba38257226e4ee51524e6f5917 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -3,8 +3,6 @@
 */
 
 #include <cstring>
-#include <cmath>
-using namespace std;
 
 #include "main.hh"
 #include "input-smob.hh"

diff --git a/lily/grob.cc b/lily/grob.cc
index cfb8c319f9f31b23489386f99878ef14f5f8036c..3a019cea6ec54f251e7063db9602bfe8328d175f 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -9,8 +9,6 @@
 #include "grob.hh"
 
 #include <cstring>
-#include <cmath>
-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 b5eac587dbd84b7632a694e918b519ae51f75f30..eaba85657df2ba575b918d9424ba73fdd2f882ad 100644 (file)
--- 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<Box> Accidental_interface::accurate_boxes (Grob *me,
                                                          Grob **common);

diff --git a/lily/include/clef.hh b/lily/include/clef.hh
index ec80108af6b0d6ac461427a9fd3a6762bc5e0eea..1f3146aea9e147068566b4c63197384fa9dedc59 100644 (file)
--- 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 24989a8acfc487ef898bad208d9b06a4e7ecae1a..3f1cabbe995e8f5847615c77e9dadf496511198d 100644 (file)
--- 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 664dcf2905b9ddc7d3dfccc82b523a44a83ee9b0..17409239b14a6e2956cfebc70cd79ef759629e17 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -13,6 +13,7 @@
 #include <cstdlib>
 #include <cstring> /* strdup, strchr */
 #include <cctype>
+
 using namespace std;
 
 #include "config.hh"

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index cbfe9dd306f6895cec23f74f3ad6a08fc0905473..358f7311f6650bf91f26717bc54fa1e9f88a95fc 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -8,8 +8,6 @@
 
 #include "line-spanner.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "spanner.hh"
 #include "output-def.hh"

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index ebf3c41ce5c906a459834af8cae066defc92fa9a..f9c1f0b47d2f1b14660bc9ec500c4255700176e7 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -8,8 +8,6 @@
 
 #include "lyric-extender.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "warn.hh"
 #include "lookup.hh"

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index f68719595bd1e3c54484ca773e9c89705ceac554..4bafc7e508c82353fabc5bd2663f220c4cb9698b 100644 (file)
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -8,8 +8,6 @@
 
 #include "lyric-hyphen.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "lookup.hh"
 #include "output-def.hh"

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 250a0f9411ec1d88671320633b1d5441032af647..87ca3f5bd1bd8a57cdd38080a546fb5d73a5ff32 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -7,8 +7,6 @@
   Pal Benko <benkop@freestart.hu>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "mensural-ligature.hh"
 #include "item.hh"

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index a80667501654871f127dc418a7ea556abe3f3578..1b89f6533c6a8776469400a18d64b10bb7d993d7 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -6,8 +6,6 @@
   (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "misc.hh"
 #include "output-def.hh"

diff --git a/lily/misc.cc b/lily/misc.cc
index 809c1b7169f8ed0cd326ec8ced4f17caf2370b5e..08f3827abbf48122cc27ceb281e455ebe5aebe23 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -7,8 +7,6 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "misc.hh"
 #include "string.hh"

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 353c40037b381e5ae1e70a8a7828e03496384003..8a96ab5efe4f2bde8e142e9a82809c2365939ac3 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -8,8 +8,6 @@
 
 #include "note-collision.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "warn.hh"
 #include "note-column.hh"

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index 3f654ff3243eda6ed909d77d9299b0026ceaa628..2fa33d506c4a002af3afa82ee0e9a245f705adfc 100644 (file)
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -5,8 +5,6 @@
 
   (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include <cmath>
-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 f3d81ba5434ce9cde5939a32bbe2b29b0bf9beef..25d71ef3fad568036c3fdc8743dfb7f4193f3516 100644 (file)
--- a/lily/percent-repeat-item.cc
+++ b/lily/percent-repeat-item.cc
@@ -8,8 +8,6 @@
 
 #include "percent-repeat-item.hh"
 
-#include <cmath>
-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 6c95f421244b93abe912cd9e524ef7568e4b515f..2e0cc3afa03dbe674e323e6b3627f315c8590c6c 100644 (file)
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -7,8 +7,6 @@
 */
 
 #include <cstdio>
-#include <cmath>
-using namespace std;
 
 #include "paper-column.hh"
 #include "spring.hh"

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 2cccb6d83c435b75d510f8b45ce8cb3cd9167b22..6495e3516b0c417e21971a3b4f8983ac054d2ac2 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -10,8 +10,6 @@
 */
 
 #include <cstdio>
-#include <cmath>
-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 6f86fd432a3d29ea86b89ccd73fd91f284af2eed..f5698104ade42dc01bf2a506485daa4d5583628c 100644 (file)
--- a/lily/slur-configuration.cc
+++ b/lily/slur-configuration.cc
@@ -8,8 +8,6 @@
 
 #include "slur-configuration.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "stem.hh"
 #include "warn.hh"

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index bcb65320ed5d6029e400321a0cb0d34d750f220c..dc6ae852940944f378a241e3fe35d2d71d989d31 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -7,8 +7,6 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "slur-scoring.hh"
 #include "libc-extension.hh"

diff --git a/lily/slur.cc b/lily/slur.cc
index 8159e0dd3dc81fffff267a2d381a496f3baec188..6db1fabfb0fd3dbcb9f0639afd51d07e64db65ad 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -9,8 +9,6 @@
 
 #include "slur.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "beam.hh"
 #include "bezier.hh"

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 12012be46d9df5500148977af8b5675f18691082..0bbdc908a0d574dba88dc2cec4c9839346f687e0 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -9,8 +9,6 @@
 #include "spaceable-grob.hh"
 
 #include <cstdio>
-#include <cmath>
-using namespace std;
 
 #include "warn.hh"
 #include "spring.hh"

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 33e1a7cb2493af773da4b44bd654993becb97e91..182a2a818c27b15d11c537313e3dc0832fa3abd6 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -8,8 +8,6 @@
 
 #include "spanner.hh"
 
-#include <cmath>
-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 7ad89794f9cbf1580bc9156fc54c8b12c12e5af0..ea7d70f799ffa500948b58a0e86a5e72e9395717 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -8,8 +8,6 @@
 
 #include "staff-symbol-referencer.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "staff-symbol.hh"
 #include "output-def.hh"

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index 1bf2eab21387312447a1411fa8a8ff86049b9102..bab7895d42605d4cd6eb7de4f6902996157f65bd 100644 (file)
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -6,8 +6,6 @@
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "font-metric.hh"
 #include "libc-extension.hh"

diff --git a/lily/stencil.cc b/lily/stencil.cc
index fd8a19d3e2987b68061939ba968a2e7994c7f439..64bab4f12fb05212f0dd3cb660ba621deea7cd35 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -8,8 +8,6 @@
 
 #include "stencil.hh"
 
-#include <cmath>
-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 33ba97f16524635cef4cb70545b3fed1194f64d5..c4aee8a7e158c87c6e9a633acf645eb6cce0ebb9 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -8,8 +8,6 @@
 
 #include "system-start-delimiter.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "spanner.hh"
 #include "axis-group-interface.hh"

diff --git a/lily/system.cc b/lily/system.cc
index 4ce6a9c00ec876c7aed5c4ae545a2b94f7182323..6e597b1bf363fb49b4713caa8f101f8582c1842f 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -8,8 +8,6 @@
 
 #include "system.hh"
 
-#include <cmath>
-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 4c28ee8671373ecd3304da89fad76a938b3d8052..7a4dcc18998e4993e38b2ceaf962865e7ee719de 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -9,8 +9,6 @@
 
 #include "text-interface.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "main.hh"
 #include "config.hh"

diff --git a/lily/tie-column-format.cc b/lily/tie-column-format.cc
index 812782ef4e97368885006e2d2f80ef583f22b2d9..3fb78cd16683ceb1f2261ceb4daa4240a6a0bff3 100644 (file)
--- a/lily/tie-column-format.cc
+++ b/lily/tie-column-format.cc
@@ -260,7 +260,8 @@ set_tie_config_directions (Array<Tie_configuration> *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 8d5a427615f9f217016fb343ecc938d38d7adc31..eba02de16cec4a0104706d9cc6f92eb173c77934 100644 (file)
--- a/lily/tie-helper.cc
+++ b/lily/tie-helper.cc
@@ -7,8 +7,6 @@
 
 */
 
-#include <cmath>
-using namespace std;
 
 #include "tie.hh"
 #include "bezier.hh"

diff --git a/lily/tie.cc b/lily/tie.cc
index 40664a67e7006f83def3cba8fc00551390f0ac16..236845405a5bfa508980857877c19d920abef327 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -8,8 +8,6 @@
 
 #include "tie.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "spanner.hh"
 #include "lookup.hh"

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index a95e66611072fc377c2e2e10aefa11bacabd4563..8a18e4c7b9f361d767cc4316f392ffb3237b4071 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -29,8 +29,6 @@
   todo: handle breaking elegantly.
 */
 
-#include <cmath>
-using namespace std;
 
 #include "tuplet-bracket.hh"
 #include "line-interface.hh"

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index eefe2fe760dc85ae4fa292957d64a0f2db51cbb6..d07a1ba370e36dc575bd7d9f95341b0449c4beb1 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -8,8 +8,6 @@
 
 #include "vaticana-ligature.hh"
 
-#include <cmath>
-using namespace std;
 
 #include "item.hh"
 #include "font-interface.hh"