Doc: elaborate explanation of accidentals within cadenzas (3078)

[lilypond.git] / lily / modified-font-metric.cc

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index d9104917627f3c7d4d43a309d1cc1d7e964b1439..7a54948fed13a96882fc40d0567cd34de9708d09 100644 (file)
--- 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--2012 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
@@ -27,7 +27,7 @@ using namespace std;
 #include "program-option.hh"
 
 Modified_font_metric::Modified_font_metric (Font_metric *fm,
-                                           Real magnification)
+                                            Real magnification)
 {
   magnification_ = magnification;
 
@@ -54,13 +54,19 @@ 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;
 }
 
+Real
+Modified_font_metric::get_magnification () const
+{
+  return magnification_;
+}
+
 vsize
 Modified_font_metric::count () const
 {
@@ -93,19 +99,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_def* state,
+Modified_font_metric::text_stencil (Output_def *state,
                                     string text, bool feta) const
 {
   Box b;