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 ea7b9d39e329421ae2e86b328c14e75386cc7d14..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"
 
@@ -36,8 +36,7 @@
  */
 class Paper_def : public Music_output_def 
 {
-  Lookup *lookup_p_;
-  Scope* scope_p_;
+  Assoc<int, Lookup *> *lookup_p_assoc_p_;
   static int default_count_i_;
 
 protected:
@@ -52,7 +51,7 @@ public:
   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 of multiplicity_i
@@ -82,17 +81,22 @@ public:
   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*);
 };