Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index a3110eda5195e840c1c748be4e4d52d80b4138ad..7d5563d4743487118d0f45792b9c9507c8031af3 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_OUTPUT_DEF_HH
 #define MUSIC_OUTPUT_DEF_HH
 
-#include "string.hh"
+#include "std-string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "smobs.hh"
@@ -38,22 +38,27 @@
  */
 class Output_def   
 {
+
 public:
   VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def);
-  DECLARE_SMOBS (Output_def,);
+  DECLARE_SMOBS (Output_def, );
 public:
   SCM scope_;
-  Output_def * parent_;
+  Output_def *parent_;
+  
   Input input_origin_;
-  String user_key_;
+  string user_key_;
 
+  Lily_parser *parser_;
+  Lily_parser *get_parser () const;
+  
   Output_def (Output_def const&);
   Output_def ();
-  
+
   /*
     variables.
    */
-  SCM c_variable (String id) const;
+  SCM c_variable (string id) const;
   SCM lookup_variable (SCM sym) const;
   void set_variable (SCM sym, SCM val);
   Real get_dimension (SCM symbol) const;
@@ -74,9 +79,10 @@ Font_metric *select_font (Output_def *layout, SCM chain);
 DECLARE_UNSMOB (Output_def, output_def);
 
 
-Font_metric *find_scaled_font (Output_def *od,
-                              Font_metric *f, Real magnification);
+Font_metric* find_pango_font (Output_def *layout,  SCM descr, Real factor);
+Font_metric *find_scaled_font (Output_def *od, Font_metric *f, Real magnification);
 Output_def *scale_output_def (Output_def *def, Real scale);
+
 Real output_scale (Output_def*);
 
 #endif /* MUSIC_OUTPUT_DEF_HH */