Remove Font_metric::index_to_ascii.

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index a27dda61d1b0a050d80d78fa0b7325472ac2d2dd..691ed2b5e50cb4e089006b3ed0d02423affaf9ec 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -138,16 +138,10 @@ Font_metric::font_name () const
   return s;
 }
 
-size_t
-Font_metric::index_to_ascii (size_t i) const
-{
-  return i;
-}
-
 size_t
 Font_metric::index_to_charcode (size_t i) const
 {
-  return index_to_ascii (i);
+  return i;
 }
 
 Offset

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 364965844f0d347e2ffc3459ab83a4a4e7d8ff7b..7f2aad917c184aa763e59e65650764c9f3c5fe91 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -49,12 +49,6 @@ public:
   virtual Offset attachment_point (string) const;
   virtual Offset get_indexed_wxwy (size_t) const;
   virtual Box get_indexed_char_dimensions (size_t index) const;
-
-  /*
-    WTF are these vsize ?
-
-    Font_metric is not related to vector<> 
-   */
   virtual size_t name_to_index (string) const;
   virtual size_t index_to_charcode (size_t) const;
   virtual size_t index_to_ascii (size_t) const;

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index bd51ea459fa4473c3e46d4be89c816c1704c4c42..93c763484804d1b104e4112e38f47ed84a85111d 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -46,7 +46,6 @@ protected:
   Real design_size () const;
   void derived_mark () const;
   Box get_indexed_char_dimensions (size_t) const;
-  size_t index_to_ascii (size_t) const;
 };
 
 #endif /* MODIFIED_FONT_METRIC_HH */

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 6b3d767669ab4870f450f1c553dd06f8756a767d..2ba488d396a763b08eb693f430384b530d122526 100644 (file)
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -93,12 +93,6 @@ 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
 {