Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 43eca3a6ba156dde4d43e988cf732a703f2cc0bf..aaae077b769d01bd257e1e96414581a6ea147dd4 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,14 +29,18 @@
 
 #include "font-metric.hh"
 
-class 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: