Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index eccc9d2441c02076e375a679e2983788f801a43f..03625cc946b6bd9c405bb157611c82d2a0fbbf41 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -18,7 +18,6 @@ using namespace std;
 #include "modified-font-metric.hh"
 #include "open-type-font.hh"
 #include "stencil.hh"
-#include "virtual-methods.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"
@@ -64,32 +63,32 @@ Font_metric::~Font_metric ()
 {
 }
 
-vsize
+size_t
 Font_metric::count () const
 {
   return 0;
 }
 
 Box
-Font_metric::get_ascii_char (vsize) const
+Font_metric::get_ascii_char (size_t) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
 
 Box
-Font_metric::get_indexed_char (vsize k) const
+Font_metric::get_indexed_char (size_t k) const
 {
   return get_ascii_char (k);
 }
 
-vsize
+size_t
 Font_metric::name_to_index (string) const
 {
-  return VPOS;
+  return (size_t)-1;
 }
 
 Offset
-Font_metric::get_indexed_wxwy (vsize) const
+Font_metric::get_indexed_wxwy (size_t) const
 {
   return Offset (0, 0);
 }
@@ -136,20 +135,20 @@ Font_metric::font_name () const
   return s;
 }
 
-vsize
-Font_metric::index_to_ascii (vsize i) const
+size_t
+Font_metric::index_to_ascii (size_t i) const
 {
   return i;
 }
 
-vsize
-Font_metric::index_to_charcode (vsize i) const
+size_t
+Font_metric::index_to_charcode (size_t i) const
 {
   return index_to_ascii (i);
 }
 
 Stencil
-Font_metric::get_ascii_char_stencil (vsize code) const
+Font_metric::get_ascii_char_stencil (size_t code) const
 {
   SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
                       scm_from_unsigned (code));
@@ -158,9 +157,9 @@ Font_metric::get_ascii_char_stencil (vsize code) const
 }
 
 Stencil
-Font_metric::get_indexed_char_stencil (vsize code) const
+Font_metric::get_indexed_char_stencil (size_t code) const
 {
-  vsize idx = index_to_ascii (code);
+  size_t idx = index_to_ascii (code);
   SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
                       scm_from_unsigned (idx));
   Box b = get_indexed_char (code);
@@ -179,6 +178,12 @@ Font_metric::sub_fonts () const
   return SCM_EOL;
 }
 
+Stencil
+Font_metric::word_stencil (string str) const
+{
+  return text_stencil (str);
+}
+
 Stencil
 Font_metric::text_stencil (string str) const
 {