* lily/parser.yy (assignment_id): allow LYRICS_STRING as

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

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index 05e7259e94c1d6a9375e83e0887addbea056f450..b5c60c0c59e854ee4d8f4f51376ffba29500ebad 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef MUSIC_OUTPUT_DEF_HH
@@ -11,7 +11,6 @@
 
 #include "string.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "virtual-methods.hh"
 #include "smobs.hh"
 #include "input.hh"
@@ -59,7 +58,7 @@ public:
   void set_variable (SCM sym, SCM val);
   Real get_dimension (SCM symbol) const;
 };
-
+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);
 
@@ -69,15 +68,16 @@ void set_tempo (Output_def*def, Moment moment, int count_per_minute_i);
 Interval line_dimensions_int (Output_def*def, int);
  
 
-Font_metric *select_encoded_font (Output_def *layout, SCM input_encoding, SCM chain);
+Font_metric *select_encoded_font (Output_def *layout, SCM chain);
 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 m, SCM input_enc_name);
+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 */