release: 1.5.36

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 671faf456e836ba79ea48224a3a247a2130618a7..6bc9df23d3a37fec080fa951a667bc2f05d2f436 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,20 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef PAPER_DEF_HH
 #define PAPER_DEF_HH
-#include "lily-proto.hh"
 
+
+#include "lily-proto.hh"
+#include "lily-guile.hh"
 #include "real.hh"
 
 #include "moment.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "interval.hh"
 #include "music-output-def.hh"
+#include "protected-scm.hh"
 
 /** 
 
@@ -30,67 +33,51 @@
   
   add support for multiple fontsizes 
 
+  remove all utility funcs 
+  
+
   add support for other len->wid conversions.
 
-  Input_engraver should be in here.
- */
-class Paper_def : public Music_output_def {
-  Lookup *lookup_p_;
-  Dictionary<Real> *real_vars_p_;
-  static int default_count_i_;
+
+  Interesting variables:
+  
+  /// The distance between lines
+  interline
+  
+*/
+class Paper_def : public Music_output_def 
+{
 protected:
-  VIRTUAL_COPY_CONS(Paper_def,Music_output_def);
-public:    
-  virtual ~Paper_def ();
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS (Music_output_def);
 
-  Array<Interval> shape_int_a_;
 
-  /**
-    Set or overwrite a variable
-   */
-  void set_var (String, Real);
-  /**
-    Read a variable.  Crash if it doesn't exist.
+public:    
+  SCM font_descriptions ()const;
+  virtual ~Paper_def ();
+  static int score_count_i_;
+  
+  /*
+    JUNKME
    */
-  Real get_var (String) const;
+  Real get_realvar (SCM symbol) const;
+  Real get_var (String id) const;
+  SCM get_scmvar (String id)const;
+  SCM get_scmvar_scm  (SCM sym) const;
   void reinit ();
   Paper_def ();
-  void set (Lookup*);
-
   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;
+
   Interval line_dimensions_int (int) 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, 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;
+
+  virtual int get_next_score_count () const;
+  static void reset_score_count ();
+  void output_settings (Paper_outputter*) const;
+  Paper_outputter* paper_outputter_p () ;
+
+  Font_metric * find_font (SCM name, Real mag);
+  
+  // urg
+  friend int yyparse (void*);
 };
 
 #endif // Paper_def_HH
-