From 5a8bb21e5a2b31b4e8347944394dc6b716c6c6c4 Mon Sep 17 00:00:00 2001
From: wl <wl>
Date: Thu, 5 Aug 2004 04:06:34 +0000
Subject: [PATCH] * lily/slur-quanting.cc: Include libc-extension.hh.
 s/round/my_round/.

* ly/engraver-init.ly (VaticanaVoice, GregorianTranscriptionVoice):
s/autobeaming/autoBeaming/.
---
 ChangeLog             |  7 +++++++
 lily/slur-quanting.cc | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1bcec1982b..87dd8d61b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-04  Werner Lemberg  <wl@gnu.org>
+
+	* lily/slur-quanting.cc: Include libc-extension.hh.
+	s/round/my_round/.
+	* ly/engraver-init.ly (VaticanaVoice, GregorianTranscriptionVoice):
+	s/autobeaming/autoBeaming/.
+
 2004-08-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* scripts/lilypond-book.py (Lilypond_file_snippet.ly): reinstate
diff --git a/lily/slur-quanting.cc b/lily/slur-quanting.cc
index b6ad5ac5a3..9d9a8f858c 100644
--- a/lily/slur-quanting.cc
+++ b/lily/slur-quanting.cc
@@ -13,6 +13,7 @@
 #include "beam.hh"
 #include "directional-element-interface.hh"
 #include "group-interface.hh"
+#include "libc-extension.hh"
 #include "lily-guile.hh"
 #include "new-slur.hh"
 #include "note-column.hh"
@@ -576,7 +577,7 @@ get_base_attachments (Spanner *me,
 	    * 2.0 / Staff_symbol::staff_space (extremes[d].staff_);
 
 	  /* start off staffline. */
-	  if (fabs (pos - round (pos)) < 0.2
+	  if (fabs (pos - my_round (pos)) < 0.2
 	      && Staff_symbol_referencer::on_staffline (head, (int) rint (pos))
 	      && Staff_symbol_referencer::line_count (head) - 1 >= rint (pos)
 	      )
@@ -637,18 +638,18 @@ avoid_staff_line (Grob *me, Grob **common,
       Real p = 2 * (y - staff->relative_coordinate (common[Y_AXIS], Y_AXIS))
 	/ staff_space;
 
-      Real distance = fabs (round (p) - p);	//  in halfspaces
+      Real distance = fabs (my_round (p) - p);	//  in halfspaces
       if (distance < 4 * thick
-	  && (int) fabs (round (p))
+	  && (int) fabs (my_round (p))
 	  <= 2 * Staff_symbol_referencer::staff_radius (staff) + 0.1
-	  && (int (fabs (round (p))) % 2
+	  && (int (fabs (my_round (p))) % 2
 	      != Staff_symbol_referencer::line_count (staff) % 2))
 	{
 	  Direction resolution_dir =
-	    (distance ?  get_grob_direction (me) : Direction (sign (p - round(p))));
+	    (distance ?  get_grob_direction (me) : Direction (sign (p - my_round(p))));
 
 	  // TODO: parameter
-	  Real newp = round (p) + resolution_dir
+	  Real newp = my_round (p) + resolution_dir
 	    * 5 * thick;
 	
 	  Real dy = (newp - p) * staff_space / 2.0;
-- 
2.39.5