release: 0.0.73pre

[lilypond.git] / lily / include / paper-def.hh

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 2ce328406b9f4bda4972b0b203fcd6475c6733b2..d93246dfaffe2d39ba28cd5af413afbc61a6bada 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -10,6 +10,7 @@
 #ifndef PAPER_DEF_HH
 #define PAPER_DEF_HH
 #include "lily-proto.hh"
+
 #include "real.hh"
 #include "string.hh"
 #include "moment.hh"
@@ -27,28 +28,32 @@
   
   add support for multiple fontsizes 
   split into "Input_paper_def" and Paper_def
+
   add support for other len->wid conversions.
- 
+
+  Input_engraver should be in here.
  */
 class Paper_def {
     Lookup *lookup_p_;
-public:    
-    String outfile;
-
-    Real linewidth;
+    Assoc<String, Real> *real_vars_p_;
 
-    /// how much space does a whole note take (ideally?)
-    Real whole_width;
-
-    /// ideal = geometric_ ^ log2(duration)
-    Real geometric_;
+    Input_engraver * igrav_p_;
+public:    
+    String outfile_str_;
+    
     
     /* *************** */
+    void set_var(String, Real);
+    Real get_var (String)const;
     void reinit();
-    Paper_def(Lookup*);
+    Paper_def();
     void set(Lookup*);
+    void set (Input_engraver * );
+    Global_translator * get_global_translator_p()const;
     ~Paper_def();
     Paper_def(Paper_def const&);
+    /// The distance between beams
+    Real interbeam_f()const;
     /**
       The distance between lines
      */
@@ -58,17 +63,19 @@ public:
 
     /// thickness of the standard line 
     Real rule_thickness()const;
-
+    Real whole_width()const;
+    Real linewidth_f()const;
     /// height of the staff
     Real standard_height()const;
 
     /// width of a quaver ball
     Real note_width() const;
     void print() const;
+
     Lookup const * lookup_l(); // TODO naming
 
     /** convert a duration to an idealspacing
-      influence using the geometric_ and whole_width parameters.
+      influence using the geometric_ and  parameters.
       */
     Real duration_to_dist(Moment);
 };