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

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 539a27173d..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--2010 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,8 +26,13 @@ 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)
+                                            Real magnification)
 {
   magnification_ = magnification;
 
@@ -54,19 +59,17 @@ Modified_font_metric::design_size () const
 }
 
 Box
-Modified_font_metric::get_indexed_char (vsize i) const
+Modified_font_metric::get_indexed_char_dimensions (vsize i) const
 {
-  Box b = orig_->get_indexed_char (i);
+  Box b = orig_->get_indexed_char_dimensions (i);
   b.scale (magnification_);
   return b;
 }
 
-Box
-Modified_font_metric::get_ascii_char (vsize i) const
+Real
+Modified_font_metric::get_magnification () const
 {
-  Box b = orig_->get_ascii_char (i);
-  b.scale (magnification_);
-  return b;
+  return magnification_;
 }
 
 vsize
@@ -76,7 +79,7 @@ Modified_font_metric::count () const
 }
 
 Offset
-Modified_font_metric::attachment_point (string s) const
+Modified_font_metric::attachment_point (const string &s) const
 {
   Offset o = orig_->attachment_point (s);
   return o * magnification_;
@@ -89,7 +92,7 @@ Modified_font_metric::get_indexed_wxwy (vsize k) const
   return o * magnification_;
 }
 
-vsize
+size_t
 Modified_font_metric::name_to_index (string s) const
 {
   return orig_->name_to_index (s);
@@ -101,25 +104,23 @@ Modified_font_metric::index_to_charcode (vsize i) const
   return orig_->index_to_charcode (i);
 }
 
-vsize
-Modified_font_metric::index_to_ascii (vsize k) const
-{
-  return orig_->index_to_ascii (k);
-}
-
 void
 Modified_font_metric::derived_mark () const
 {
+  if (orig_)
+    scm_gc_mark (orig_->self_scm ());
 }
 
 Stencil
-Modified_font_metric::text_stencil (Output_def* state,
-                                    string text, bool feta) const
+Modified_font_metric::text_stencil (Output_def *state,
+                                    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 ();
 
@@ -128,28 +129,7 @@ Modified_font_metric::text_stencil (Output_def* state,
       return scaled;
     }
 
-  return Font_metric::text_stencil (state, text, feta);
-}
-
-Box
-Modified_font_metric::text_dimension (string text) const
-{
-  Box b;
-  Interval ydims;
-  Real w = 0.0;
-
-  for (ssize i = 0; i < text.length (); i++)
-    {
-      Box b = get_ascii_char ((unsigned char)text[i]);
-
-      w += b[X_AXIS].length ();
-      ydims.unite (b[Y_AXIS]);
-    }
-  if (ydims.is_empty ())
-    ydims = Interval (0, 0);
-
-  b = Box (Interval (0, w), ydims);
-  return b;
+  return Font_metric::text_stencil (state, text, feta, features_str);
 }
 
 Font_metric *