lilypond-0.1.48

diff --git a/lily/beam-grav.cc b/lily/beam-grav.cc
index ecb00ee0834b09984235b4f151f958f05c6b7349..8cd5958f1763ee3344dd2eac94072487dfede035 100644 (file)
--- 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 4102ba5e88207d2e41fafe341c556ac94a971812..5d9546409bc25cc508572bb0471c3c2b3e0086ab 100644 (file)
--- 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;