X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=5e804f7a8f8f743430dd0c757d3220bd9df5619b;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=2a3367705b8ee2c4f51008d16b7752e99ac61d56;hpb=3cdc909d8cea64c8faef90d3a6a391f32a424ba2;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 2a3367705b..5e804f7a8f 100644
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -29,19 +29,22 @@
 
 #include "font-metric.hh"
 
-class Pango_font : public Preinit<Pango_font>, public Font_metric
+struct Preinit_Pango_font {
+  SCM physical_font_tab_;
+  Preinit_Pango_font ();
+};
+
+class Pango_font : Preinit_Pango_font, public Font_metric
 {
   PangoContext *context_;
   PangoFontDescription *pango_description_;
   PangoAttrList *attribute_list_;
   Real scale_;
   Real output_scale_;
-  SCM physical_font_tab_;
   Direction text_direction_;
 
 public:
   SCM physical_font_tab () const;
-  void pre_init ();
   Pango_font (PangoFT2FontMap *,
               PangoFontDescription const *,
               Real);
@@ -60,7 +63,9 @@ public:
   Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
 
   virtual Stencil text_stencil (Output_def *output_state,
-                                const string &text, bool music) const;
+                                const string &text,
+                                bool music,
+                                const string &features_str) const;
   virtual void derived_mark () const;
 };