lilypond-0.1.1

diff --git a/flower/configure.in b/flower/configure.in
index 619a5fe71ef8f7ec9966cf236746f7e05740d888..dd20827eae99b0a86fdf817e69910bee83126c2a 100644 (file)
--- a/flower/configure.in
+++ b/flower/configure.in
@@ -7,16 +7,18 @@ optimise_b=yes
 shared_b=no
 LIB_SUFFIX=.a
 
-# if given here, these vars are initted at the checking point.
 if test x$host = xNONE; then
-    flowerbuildprefix=.
+    OUTDIR_NAME=${OUTDIR_NAME-"out"}
 else
-    flowerbuildprefix="../$host-build-dir/Flower"
-    mkdir $flowerbuildprefix;
-    for a in `find -type d -and -not -name '*-build-dir'`; do
-       mkdir $flowerbuildprefix/$a;
-    done
+    OUTDIR_NAME=${OUTDIR_NAME-"out-$host"}
 fi
+
+for a in `find -type d -and -not -name 'out'`; do
+       if test ! -d  $a/$OUTDIR_NAME; then
+               mkdir $a/$OUTDIR_NAME;
+       fi
+done
+
     
 AC_ARG_ENABLE(shared,
     [  enable-shared       shared flower library],
@@ -26,6 +28,11 @@ AC_ARG_ENABLE(optimise,
     [  disable-optimise    optimisations off],
     [optimise_b=$enableval])
 
+AC_ARG_ENABLE(out-dir,
+    [  out-dir                 set the directory for machine generated files. Default out or out-HOST],
+    [OUTDIR_NAME=$enableval]
+    [])
+
 if test $shared_b = yes; then
        MODULE_CXXFLAGS="$MODULE_CXXFLAGS -fPIC"
        MODULE_LDFLAGS="-shared -Wl,-soname,libflower.so "
@@ -44,9 +51,11 @@ AC_PROG_CXX
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memmem snprintf )
-AC_CONFIG_HEADER($flowerbuildprefix/out/config.hh:config.hh.in)
 
-CXX="$ac_cv_prog_CXX" ../bin/make-version > $flowerbuildprefix/out/version.hh
+if test ! -d $OUTDIR_NAME ; then
+    mkdir $OUTDIR_NAME
+fi
 
-AC_OUTPUT($flowerbuildprefix/out/Flower-flags.make:Flower-flags.make.in)
+AC_CONFIG_HEADER($OUTDIR_NAME/config.hh:config.hh.in)
+AC_OUTPUT($OUTDIR_NAME/Flower-flags.make:Flower-flags.make.in)
 

diff --git a/lily/include/elem-group.hh b/lily/include/elem-group.hh
index 650dc613ceff1fd236085b078a5a219b47e70dc3..9569dcd90cee3e08161bdb0499c385d524acb2fd 100644 (file)
--- a/lily/include/elem-group.hh
+++ b/lily/include/elem-group.hh
@@ -9,6 +9,7 @@
 
 #ifndef ELEM_GROUP_HH
 #define ELEM_GROUP_HH
+
 #include "score-elem.hh"
 
 class Elbement_group: public virtual Score_elem {
@@ -17,23 +18,26 @@ protected:
     
     virtual void do_print() const ;
 public:
+    Elbement_group(Elbement_group const&);
     Elbement_group();
     bool contains_b(Score_elem const *)const;
     void add_element(Score_elem*);
     DECLARE_MY_RUNTIME_TYPEINFO;
-       
 };
 
 class Horizontal_group : public Elbement_group {
 public:
     DECLARE_MY_RUNTIME_TYPEINFO;
-    Horizontal_group(Horizontal_group const&);
     Horizontal_group(){}
     void add_element(Score_elem*);
+    Horizontal_group(Horizontal_group const&);
+    void remove_element(Score_elem*);
+
 protected:
+    virtual Horizontal_group * horizontal_group() { return this; }
     virtual void do_substitute_dependency(Score_elem*,Score_elem*);
     virtual void do_print() const ;
-  virtual void translate_x(Real);
+    virtual void translate_x(Real);
     virtual Interval do_width()const;
 };
 
@@ -41,10 +45,13 @@ class Vertical_group : public Elbement_group {
 protected:
     virtual void translate_y(Real);
     virtual void do_print() const ;
-  virtual Interval do_height()const;
+    virtual Interval do_height()const;
     virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    void add_element(Score_elem*);
+    virtual Vertical_group * vertical_group() { return this; }
 public:
+    void add_element(Score_elem*);
+    void remove_element(Score_elem*);
+    
     Vertical_group(Vertical_group const &);
     Vertical_group(){}
     DECLARE_MY_RUNTIME_TYPEINFO;