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 4195ca77f9d88ed1b65b18cf686e81af3223e9ea..b3147fb9e6da7d9d4e8c1f6bf456983f9728ef82 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.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 "moment.hh"
@@ -30,55 +30,49 @@
   
   add support for multiple fontsizes 
 
+  remove all utility funcs 
+  
+
   add support for other len->wid conversions.
 
-  Input_engraver should be in here.
- */
+
+  Interesting variables:
+  
+  /// The distance between lines
+  interline
+  
+*/
 class Paper_def : public Music_output_def 
 {
-  Assoc<int, Lookup *> *lookup_p_assoc_p_;
+  Hash_table<int, Lookup *> *lookup_p_tab_p_;
   static int default_count_i_;
 
 protected:
-  VIRTUAL_COPY_CONS(Paper_def,Music_output_def);
+  VIRTUAL_COPY_CONS(Music_output_def);
 
 public:    
   virtual ~Paper_def ();
-  DECLARE_MY_RUNTIME_TYPEINFO;
 
   Array<Interval> shape_int_a_;
+  /*
+    JUNKME
+   */
+  Real get_realvar (SCM symbol) const;
+  Real get_var (String id) const;
 
-  Real get_var (String) const;
+  
   void reinit ();
   Paper_def ();
   void set_lookup (int, Lookup*);
 
   Paper_def (Paper_def const&);
-  /// The distance between beams of multiplicity_i
+  /** The distance between beams of multiplicity_i
+      JUNKME
+  */
   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 staffheight_f () const;
-
-  /// width of a crotchet ball
-  Real note_width () const;
   void print () const;
 
   Lookup const * lookup_l (int sz) const;      // TODO naming
@@ -86,15 +80,16 @@ public:
   /** convert a duration to an idealspacing
     influence using the geometric_ and  paratime_signatures.
     */
-  Real duration_to_dist (Moment, Real) const;
-  Real geometric_spacing (Moment) const;
+  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_outputter* paper_outputter_p (Paper_stream*, Scope*, String) const;
+
   Paper_stream* paper_stream_p () const;
   String base_output_str () const;