lilypond-0.0.73pre

diff --git a/lily/bar.cc b/lily/bar.cc
index cf8d15bef287151dea74c8974f0f3e698b3243e3..6d50fa0fc91d14771654b77947a3d28bbc3f072b 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -16,6 +16,7 @@
 Bar::Bar()
 {
     type_str_ = "|";
+    spanned_i_ = 0;
 }
 
 
@@ -31,7 +32,9 @@ Bar::do_print()const
 Molecule*
 Bar::brew_molecule_p()const
 {    
-    Symbol s = paper()->lookup_l()->bar(type_str_);
+    Paper_def *p = paper();
+    Symbol s = p->lookup_l()->bar( type_str_, 
+                                  p->get_var("bar_size") );
     Molecule*output = new Molecule(Atom(s));
     return output;
 }

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 9513fc153310682aa5c75cd51100f5e3115a84cd..ccef49e2bf47bda6321b913924c394cca355d4c1 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -13,6 +13,7 @@
 class Bar:public Item {
 public:
     String type_str_;
+    int spanned_i_;
     
     NAME_MEMBERS();
     SCORE_ELEM_CLONE(Bar);

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index aff20862d72c14d90637a24f0bb69497ef4c2d73..d5e0d07fd4eeb65e770b451c2376274ea7e8ab85 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -45,7 +45,8 @@ struct Lookup {
     Symbol flag(int)const;
     Symbol rest(int, bool outside)const;
     Symbol clef(String)const;
-    Symbol bar(String)const;
+    Symbol bar(String, Real height)const;
+    
     Symbol dots(int)const;
     Symbol slur(int dy, Real &dx, int dir)const;
     Symbol half_slur(int dy, Real &dx, int dir, int xpart)const;

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 0dc7047f181799d8f1cf80926f05f04bb9c34cdb..65219628f030476b1af73056874ba6c7dff782b4 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -1,5 +1,5 @@
 /*
-  acceptor.hh -- declare Translator
+  translator.hh -- declare Translator
 
   source file of the GNU LilyPond music typesetter
 
@@ -7,12 +7,11 @@
 */
 
 
-#ifndef ACCEPTOR_HH
-#define ACCEPTOR_HH
+#ifndef TRANSLATOR_HH
+#define TRANSLATOR_HH
 
 #include "string.hh"
 #include "lily-proto.hh"
-#include "interpreter.hh"
 #include "virtual-methods.hh"
 
 class Translator {
@@ -21,10 +20,12 @@ public:
     
     int iterator_count_;
     
-    virtual Interpreter * interpreter_l() { return 0; }
+    virtual Global_translator *global_l() { return 0; }
 
     /// Score_register = 0, Staff_registers = 1, etc)
     virtual int depth_i()const=0;
+    virtual bool is_bottom_engraver_b() const { return false; }
+    virtual bool try_request(Request*);
     virtual Translator *find_get_translator_l(String name, String id)=0;
     virtual Translator *ancestor_l(int l=1)=0;
     virtual ~Translator(){}
@@ -33,8 +34,4 @@ public:
     virtual Translator *get_default_interpreter()=0;
 };
 
-class Interpreter : public virtual Translator {
-public:
-    virtual bool interpret_request_b(Request*) { return false;}
-};
-#endif // ACCEPTOR_HH
+#endif // TRANSLATOR_HH