X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=655d992123f4859cbc4d73cbdf430d22fbaafc4e;hb=34c1ae201891dc856a7625064a9b29c10f79e861;hp=4118cac23b19fca4da5b773078e7d1bf9b9f217d;hpb=cfbe7661413b152a10293f3da7fb412e325254f9;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 4118cac23b..655d992123 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
 */
@@ -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"
@@ -30,9 +29,9 @@ Font_metric::design_size () const
 }
 
 Stencil
-Font_metric::find_by_name (String s) const
+Font_metric::find_by_name (string s) const
 {
-  s.substitute ('-', 'M');
+  replace_all (s, '-', 'M');
   int idx = name_to_index (s);
   Box b;
 
@@ -41,7 +40,7 @@ Font_metric::find_by_name (String s) const
     {
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
 			 self_scm (),
-			 scm_makfrom0str (s.to_str0 ()));
+			 ly_string2scm (s));
       b = get_indexed_char (idx);
     }
 
@@ -64,32 +63,32 @@ Font_metric::~Font_metric ()
 {
 }
 
-int
+size_t
 Font_metric::count () const
 {
   return 0;
 }
 
 Box
-Font_metric::get_ascii_char (int) const
+Font_metric::get_ascii_char (size_t) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
 
 Box
-Font_metric::get_indexed_char (int k) const
+Font_metric::get_indexed_char (size_t k) const
 {
   return get_ascii_char (k);
 }
 
-int
-Font_metric::name_to_index (String) const
+size_t
+Font_metric::name_to_index (string) const
 {
-  return -1;
+  return (size_t)-1;
 }
 
 Offset
-Font_metric::get_indexed_wxwy (int) const
+Font_metric::get_indexed_wxwy (size_t) const
 {
   return Offset (0, 0);
 }
@@ -129,47 +128,46 @@ Font_metric::font_file_name () const
   return scm_car (description_);
 }
 
-String
+string
 Font_metric::font_name () const
 {
-  String s ("unknown");
+  string s ("unknown");
   return s;
 }
 
-#include "afm.hh"
-
-int
-Font_metric::index_to_ascii (int i) const
+size_t
+Font_metric::index_to_ascii (size_t i) const
 {
   return i;
 }
 
-unsigned
-Font_metric::index_to_charcode (int i) const
+size_t
+Font_metric::index_to_charcode (size_t i) const
 {
-  return (unsigned) index_to_ascii (i);
+  return index_to_ascii (i);
 }
 
 Stencil
-Font_metric::get_ascii_char_stencil (int code) const
+Font_metric::get_ascii_char_stencil (size_t code) const
 {
   SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
-		       scm_from_int (code));
+		       scm_from_unsigned (code));
   Box b = get_ascii_char (code);
   return Stencil (b, at);
 }
 
 Stencil
-Font_metric::get_indexed_char_stencil (int code) const
+Font_metric::get_indexed_char_stencil (size_t code) const
 {
-  int idx = index_to_ascii (code);
-  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), scm_from_int (idx));
+  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);
   return Stencil (b, at);
 }
 
 Offset
-Font_metric::attachment_point (String) const
+Font_metric::attachment_point (string) const
 {
   return Offset (0, 0);
 }
@@ -181,18 +179,21 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (String str) const
+Font_metric::word_stencil (string str) const
 {
-  SCM lst = scm_list_3 (ly_symbol2scm ("text"),
-			this->self_scm (),
-			scm_makfrom0str (str.to_str0 ()));
+  return text_stencil (str);
+}
 
-  Box b = text_dimension (str);
-  return Stencil (b, lst);
+Stencil
+Font_metric::text_stencil (string str) const
+{
+  (void) str;
+  programming_error("Cannot get a text stencil from this font");
+  return Stencil (Box (), SCM_EOL);
 }
 
 Box
-Font_metric::text_dimension (String) const
+Font_metric::text_dimension (string) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }