lilypond-0.0.64

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index e850586626a6aed90f6dd007ceff12baaed4acf6..42a2e03819bd986da0bf5325a9460a34faaf5a8c 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -31,6 +31,7 @@ struct Lookup {
       */
     Symbol streepjes(int pos)const;
 
+    Symbol vbrace(Real &dy) const;
     Symbol meter(Array<Scalar>)const;
     Symbol stem(Real y1_pos, Real y2_pos)const;
     Symbol rule_symbol(Real height, Real width)const;

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index 33e066c3c707536e721e06c135ea3df543631de5..1e283faf9e4a8b6f59c7f0b8bdf470b6da5e6db5 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -12,6 +12,7 @@
 
 #include "colhpos.hh"
 #include "varray.hh"
+#include "lily-proto.hh"
 #include "p-col.hh"
 #include "p-staff.hh"
 
@@ -45,6 +46,7 @@ struct PScore {
     /// broken spanners
     Pointer_list<Spanner*> broken_spans;
 
+    Pointer_list<Vertical_spanner*> vspan_p_list_;
     /* *************** */
     /* CONSTRUCTION */
     

diff --git a/lily/include/vertical-brace.hh b/lily/include/vertical-brace.hh
new file mode 100644 (file)
index 0000000..c0b368e
--- /dev/null
+++ b/lily/include/vertical-brace.hh
@@ -0,0 +1,20 @@
+/*
+  vertical-brace.hh -- declare 
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef VERTICAL_BRACE_HH
+#define VERTICAL_BRACE_HH
+
+#include "vertical-spanner.hh"
+
+class Vertical_brace : public Vertical_spanner {
+public:
+    
+};
+
+#endif // VERTICAL_BRACE_HH

diff --git a/lily/slur.cc b/lily/slur.cc
index 1b7bb0f76a028a13d27da1cb8fbeebd4d8947802..1fa1ad288531e0ac6f9f703910428a5d9d2780ea 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -75,11 +75,11 @@ Slur::do_post_processing()
        set_default_dir();
     Real inter_f = paper()->internote();
     if (encompass_arr_[0]->stem_l_)
-        left_pos_i_ = encompass_arr_[0]->stem_l_->height()[dir_i_]/inter_f;
+        left_pos_i_ = rint(encompass_arr_[0]->stem_l_->height()[dir_i_]/inter_f);
     else
         left_pos_i_ = 0;
     if (encompass_arr_.top()->stem_l_)
-        right_pos_i_ = encompass_arr_.top()->stem_l_->height()[dir_i_]/inter_f;
+        right_pos_i_ = rint(encompass_arr_.top()->stem_l_->height()[dir_i_]/inter_f);
     else
         right_pos_i_ = 0;
 

diff --git a/lily/template1.cc b/lily/template1.cc
index 23c68dd011caaaf3fe1cb6a3466c815c4f475630..0e1b7258b9bb73fc40c6fc97161f775541e4b71a 100644 (file)
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -7,6 +7,7 @@
 #include "spanner.hh"
 #include "scoreline.hh" 
 #include "staffline.hh"
+#include "vertical-spanner.hh"
 
 #include "pcursor.tcc"
 #include "plist.tcc"
@@ -19,6 +20,7 @@ IPLC_instantiate(Line_of_score);
 IPLC_instantiate(Line_of_staff);
 IPLC_instantiate(Item);
 IPLC_instantiate(Spanner);
+IPLC_instantiate(Vertical_spanner);
 IPLC_instantiate(PStaff);
 IPLC_instantiate(Idealspacing);
 IPLC_instantiate(PCol);

diff --git a/lily/vertical-brace.cc b/lily/vertical-brace.cc
new file mode 100644 (file)
index 0000000..0bd59e7
--- /dev/null
+++ b/lily/vertical-brace.cc
@@ -0,0 +1,9 @@
+/*
+  vertical-brace.cc -- implement 
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include "vertical-brace.hh"