release: 1.1.0

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 671faf456e836ba79ea48224a3a247a2130618a7..0ae3a6981e6ca00c3403cb2936897163a46bd7f2 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,7 +14,7 @@
 #include "real.hh"
 
 #include "moment.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "interval.hh"
 #include "music-output-def.hh"
 
@@ -34,62 +34,71 @@
 
   Input_engraver should be in here.
  */
-class Paper_def : public Music_output_def {
-  Lookup *lookup_p_;
-  Dictionary<Real> *real_vars_p_;
+class Paper_def : public Music_output_def 
+{
+  Assoc<int, Lookup *> *lookup_p_assoc_p_;
   static int default_count_i_;
+
 protected:
   VIRTUAL_COPY_CONS(Paper_def,Music_output_def);
+
 public:    
   virtual ~Paper_def ();
   DECLARE_MY_RUNTIME_TYPEINFO;
 
   Array<Interval> shape_int_a_;
 
-  /**
-    Set or overwrite a variable
-   */
-  void set_var (String, Real);
-  /**
-    Read a variable.  Crash if it doesn't exist.
-   */
   Real get_var (String) const;
   void reinit ();
   Paper_def ();
-  void set (Lookup*);
+  void set_lookup (int, Lookup*);
 
   Paper_def (Paper_def const&);
-  /// The distance between beams
-  Real interbeam_f () const;
-  /**
-    The distance between lines
-    */
+  /// The distance between beams of multiplicity_i
+  Real interbeam_f (int multiplicity_i) const;
+
+  /// The thickness of a beam
+  Real beam_thickness_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;
+
+  /// thickness of the staff line
+  Real staffline_f () const;
+
   Interval line_dimensions_int (int) const;
   Real linewidth_f () const;
+
   /// height of the staff
-  Real standard_height () const;
+  Real staffheight_f () const;
 
   /// width of a crotchet ball
   Real note_width () const;
   void print () const;
 
-  Lookup const * lookup_l ();  // TODO naming
+  Lookup const * lookup_l (int sz) const;      // TODO naming
 
   /** convert a duration to an idealspacing
-    influence using the geometric_ and  parameters.
+    influence using the geometric_ and  paratime_signatures.
     */
   Real duration_to_dist (Moment, Real) const;
   Real geometric_spacing (Moment) const;
   Real arithmetic_constant (Moment minimal_mom) const;
   Real arithmetic_spacing (Moment mom,Real constant) const;
   virtual int get_next_default_count () const;
-  String TeX_output_settings_str () const;
+
+  void output_settings (Paper_outputter*) const;
+  Paper_outputter* paper_outputter_p (Paper_stream*, Scope*, String) const;
+  Paper_stream* paper_stream_p () const;
+  String base_output_str () const;
+
+  // urg
+  friend int yyparse (void*);
 };
 
 #endif // Paper_def_HH