From: fred <fred>
Date: Sun, 24 Mar 2002 20:06:49 +0000 (+0000)
Subject: lilypond-0.1.48
X-Git-Tag: release/1.5.59~3376
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3b55f5dd08526d94c8735586d2d88cd792e38171;p=lilypond.git

lilypond-0.1.48
---

diff --git a/lily/beam-grav.cc b/lily/beam-grav.cc
index ecb00ee083..8cd5958f17 100644
--- a/lily/beam-grav.cc
+++ b/lily/beam-grav.cc
@@ -115,7 +115,8 @@ Beam_engraver::acknowledge_element (Score_elem_info i)
   if (!current_grouping_p_->child_fit_b (start))
     {
       String s (_("please fix me: Stem at ") 
-		+ String(now_moment ()) + _(" does not fit in beam"));
+		+ now_moment ().str ()
+		+ _(" does not fit in beam"));
       if (i.req_l_)
 	i.req_l_->warning(s);
       else 
diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 4102ba5e88..5d9546409b 100644
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -16,7 +16,6 @@
  */
 class Text_item : public Item ,public Staff_side
 {
-public:
 public:
 
     /// do I have width?
@@ -24,7 +23,7 @@ public:
     
     /* ***************/
 
-    Text_item (General_script_def* ,Direction dir=0);
+    Text_item (General_script_def* ,Direction dir=CENTER);
     virtual ~Text_item ();
     DECLARE_MY_RUNTIME_TYPEINFO;