Issue 4997/6: Use Preinit for font metrics

[lilypond.git] / lily / include / modified-font-metric.hh

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index c1c893a61320a6eb4b3fd6ee8479132bb56e2064..66996eaf06c226ded5522198767987813055efe0 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--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
@@ -23,7 +23,8 @@
 #include "font-metric.hh"
 
 /* Perhaps junk this, and move this to layout_def as interface? */
-struct Modified_font_metric : public Font_metric
+struct Modified_font_metric : public Preinit<Modified_font_metric>,
+                              public Font_metric
 {
 public:
   Stencil text_stencil (Output_def *output_state, const string&, bool) const;
@@ -36,6 +37,7 @@ public:
   size_t name_to_index (string) const;
   size_t index_to_charcode (size_t) const;
   Font_metric *original_font () const;
+  void pre_init ();
 
 protected:
   Font_metric *orig_;