release: 1.3.6

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 44fc05e12a2b96545161e5c439a7aadd48c368c6..b3147fb9e6da7d9d4e8c1f6bf456983f9728ef82 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,18 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef PAPER_DEF_HH
 #define PAPER_DEF_HH
 #include "lily-proto.hh"
-
+#include "lily-guile.hh"
 #include "real.hh"
-#include "string.hh"
-#include "moment.hh"
 
+#include "moment.hh"
+#include "array.hh"
+#include "interval.hh"
+#include "music-output-def.hh"
 
 /** 
 
@@ -27,58 +29,72 @@
   TODO: 
   
   add support for multiple fontsizes 
-  split into "Input_paper_def" and Paper_def
+
+  remove all utility funcs 
+  
 
   add support for other len->wid conversions.
 
-  Input_engraver should be in here.
- */
-class Paper_def {
-    Lookup *lookup_p_;
-    Assoc<String, Real> *real_vars_p_;
 
-    Input_translator * itrans_p_;
+  Interesting variables:
+  
+  /// The distance between lines
+  interline
+  
+*/
+class Paper_def : public Music_output_def 
+{
+  Hash_table<int, Lookup *> *lookup_p_tab_p_;
+  static int default_count_i_;
+
+protected:
+  VIRTUAL_COPY_CONS(Music_output_def);
+
 public:    
-    String outfile_str_;
-    
-    
-    /* *************** */
-    void set_var(String, Real);
-    Real get_var (String)const;
-    void reinit();
-    Paper_def();
-    void set(Lookup*);
-    void set (Input_translator * );
-    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
-     */
-    Real interline_f()const;
-    /// half the distance between lines
-    Real internote_f()const;
-
-    /// 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 crotchet 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  parameters.
-      */
-    Real duration_to_dist(Moment);
+  virtual ~Paper_def ();
+
+  Array<Interval> shape_int_a_;
+  /*
+    JUNKME
+   */
+  Real get_realvar (SCM symbol) const;
+  Real get_var (String id) const;
+
+  
+  void reinit ();
+  Paper_def ();
+  void set_lookup (int, Lookup*);
+
+  Paper_def (Paper_def const&);
+  /** The distance between beams of multiplicity_i
+      JUNKME
+  */
+  Real interbeam_f (int multiplicity_i) const;
+
+  Interval line_dimensions_int (int) const;
+
+  void print () const;
+
+  Lookup const * lookup_l (int sz) const;      // TODO naming
+
+  /** convert a duration to an idealspacing
+    influence using the geometric_ and  paratime_signatures.
+    */
+  Real length_mom_to_dist (Moment, Real) const;
+  
+  Real arithmetic_constant (Moment minimal_mom) const;
+  Real arithmetic_spacing (Moment mom,Real constant) const;
+
+  virtual int get_next_default_count () const;
+  static void reset_default_count();
+
+  void output_settings (Paper_outputter*) const;
+
+  Paper_stream* paper_stream_p () const;
+  String base_output_str () const;
+
+  // urg
+  friend int yyparse (void*);
 };
 
 #endif // Paper_def_HH
-