]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/modified-font-metric.cc
Don't let lyrics interfere with StaffGrouper.
[lilypond.git] / lily / modified-font-metric.cc
index 5ad26a3548ddeecddaa645377a745ac15fa5e7fc..7fb724425fcae0193a44452ed2deadc94b2a7e12 100644 (file)
@@ -54,17 +54,9 @@ 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);
-  b.scale (magnification_);
-  return b;
-}
-
-Box
-Modified_font_metric::get_ascii_char (vsize i) const
-{
-  Box b = orig_->get_ascii_char (i);
+  Box b = orig_->get_indexed_char_dimensions (i);
   b.scale (magnification_);
   return b;
 }
@@ -101,19 +93,13 @@ 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
 {
 }
 
 Stencil
-Modified_font_metric::text_stencil (Output_defstate,
+Modified_font_metric::text_stencil (Output_def *state,
                                     string text, bool feta) const
 {
   Box b;