patch::: 1.1.27.jcn4: jcn4

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

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 87bfe545731de4472bebe79619131a29990badc7..4364350592653d8f0ade328d4617bf1f343d3403 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -10,7 +10,7 @@
 #ifndef PAPER_DEF_HH
 #define PAPER_DEF_HH
 #include "lily-proto.hh"
-
+#include "lily-guile.hh"
 #include "real.hh"
 
 #include "moment.hh"
@@ -36,20 +36,19 @@
  */
 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_;
-  bool ps_b_;
 
 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_;
-
-  Real get_var (String) const;
+  Real get_realvar (SCM symbol) const;
+  Real get_var (String id) const;
   void reinit ();
   Paper_def ();
   void set_lookup (int, Lookup*);
@@ -87,17 +86,20 @@ public:
   /** convert a duration to an idealspacing
     influence using the geometric_ and  paratime_signatures.
     */
-  Real duration_to_dist (Moment, Real) const;
+  Real length_mom_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;
-  //urg
-  String tex_output_settings_str () const;
-  String ps_output_settings_str () 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;
+
   // urg
   friend int yyparse (void*);
 };
 
 #endif // Paper_def_HH
-