lilypond-0.1.14

diff --git a/lily/beam-grav.cc b/lily/beam-grav.cc
index bfaf3e12ace8a6a1be9eb8368b8f446d88be99ea..68d798ae25e5d146e7a73cbe8cb2de67aac8c71a 100644 (file)
--- a/lily/beam-grav.cc
+++ b/lily/beam-grav.cc
@@ -116,11 +116,7 @@ Beam_engraver::acknowledge_element (Score_elem_info i)
    */
   current_grouping_p_->add_child (get_staff_info().time_C_->whole_in_measure_,
                                  rhythmic_req->duration ());
-  /* 
-   TODO
-   should change repr. of flags too.
-   */
-  s->flag_i_ = Duration_convert::type2_i (rhythmic_req->duration_.durlog_i_);
+  s->flag_i_ = rhythmic_req->duration_.durlog_i_;
   beam_p_->add (s);
 } 
     

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index c9af80091c01cae44ee4bedfcbead1a4cc29d224..638e8c3bdffce990e67562dee83c55844869a4f3 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -43,7 +43,7 @@ struct Lookup {
     Symbol rule_symbol (Real height, Real width) const;
     Symbol accidental (int) const;
     Symbol ball (int) const;
-    Symbol flag (int) const;
+    Symbol flag (int, Direction) const;
     Symbol rest (int, bool outside) const;
     Symbol clef (String) const;
     Symbol bar (String, Real height) const;

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index a492a3d4d862c4762c1c7791b20d047aec4329c4..f7240397b302fdfaf1b868bc0cf29b465e393b77 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -33,7 +33,6 @@ class Stem : public Item {
     
   Real stem_bottom_f_, stem_top_f_;
     
-    
   /// needed for determining direction/length
   int staff_size_i_;
 
@@ -55,7 +54,10 @@ public:
   /// abbrev flag? + count
   int abbrev_flag_i_;
 
-  /// flagtype? 4 none, 8 8th flag, 0 = beam.
+  /// how many abbrev beam don't reach stem?
+  int beam_gap_i_;
+
+  /// log of the duration. Eg. 4 -> 16th note -> 2 flags
   int flag_i_;
 
   /** 
@@ -79,7 +81,9 @@ public:
   DECLARE_MY_RUNTIME_TYPEINFO;
 
   Real hpos_f() const;
-    
+  
+  int type_i () const;
+
   void do_print() const;
   void set_stemend (Real);
   Direction get_default_dir();

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 480abb5f9a06212c7f62abbccfaf2f2360ce2794..119c52e449e0a805f6c0b86e0800cb2c45b36af5 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -143,9 +143,10 @@ Lookup::dots (int j) const
 }
 
 Symbol
-Lookup::flag (int j) const
+Lookup::flag (int j, Direction d) const
 {
-  return (*symtables_)("flags")->lookup (j);
+  char c = (d == UP) ? 'u' : 'd';
+  return (*symtables_)("flags")->lookup (c + String (j));
 }
 
 Symbol