Run `make grand-replace'.

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

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index ee5d459d720e8d649aa962f0f7e1961825dc639b..c7c4248ea4bb3a1a9ac4969ef46a8cead4495687 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_OUTPUT_DEF_HH
 #define MUSIC_OUTPUT_DEF_HH
 
-#include "string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "smobs.hh"
@@ -38,22 +37,25 @@
  */
 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_;
 
   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;
@@ -62,9 +64,6 @@ SCM get_font_table (Output_def *def);
 void assign_context_def (Output_def *m, SCM transdef);
 SCM find_context_def (Output_def const *m, SCM name);
 
-int get_tempo (Output_def*def, Moment moment);
-void set_tempo (Output_def*def, Moment moment, int count_per_minute_i);
-
 Interval line_dimensions_int (Output_def*def, int);
  
 
@@ -74,9 +73,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 */