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

[lilypond.git] / lily / include / pango-font.hh

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 08e21edc553c5d6c1613fa59f1e4562f0580a7f8..31b858f14343c9782360360509722175adcd412c 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -25,9 +25,10 @@ class Pango_font : public Font_metric
   PangoFontDescription *pango_description_; 
   PangoAttrList *attribute_list_;
   Real scale_;
-  SCM subfonts_;
-  
+  SCM physical_font_tab_;
+
 public:
+  SCM physical_font_tab () const; 
   Pango_font (PangoFT2FontMap *,
              Direction leftright,
              PangoFontDescription *,
@@ -39,7 +40,6 @@ public:
   Stencil text_stencil (String) const;
   Stencil pango_item_string_stencil (PangoItem*, String, Real) const;
 
-  virtual SCM sub_fonts () const;
   virtual void derived_mark () const;
 };