X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmodified-font-metric.cc;h=a3beb4daefa0665be7fd0bacef73fe19571e49ef;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=53ccefa2997e0c9e93a05d9b9688678b1b726db3;hpb=40aac0ae57ee113faa860ba221d83d9e6312173e;p=lilypond.git

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 53ccefa299..a3beb4daef 100644
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -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
@@ -26,6 +26,11 @@ using namespace std;
 #include "main.hh"
 #include "program-option.hh"
 
+Preinit_Modified_font_metric::Preinit_Modified_font_metric ()
+{
+  orig_ = 0;
+}
+
 Modified_font_metric::Modified_font_metric (Font_metric *fm,
                                             Real magnification)
 {
@@ -102,16 +107,20 @@ Modified_font_metric::index_to_charcode (vsize i) const
 void
 Modified_font_metric::derived_mark () const
 {
+  if (orig_)
+    scm_gc_mark (orig_->self_scm ());
 }
 
 Stencil
 Modified_font_metric::text_stencil (Output_def *state,
-                                    const string &text, bool feta) const
+                                    const string &text,
+                                    bool feta,
+                                    const string &features_str) const
 {
   Box b;
   if (Pango_font *pf = dynamic_cast<Pango_font *> (orig_))
     {
-      Stencil stc = pf->text_stencil (state, text, feta);
+      Stencil stc = pf->text_stencil (state, text, feta, features_str);
 
       Box b = stc.extent_box ();
 
@@ -120,7 +129,7 @@ Modified_font_metric::text_stencil (Output_def *state,
       return scaled;
     }
 
-  return Font_metric::text_stencil (state, text, feta);
+  return Font_metric::text_stencil (state, text, feta, features_str);
 }
 
 Font_metric *