Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 8f42c7ff77184c4720e50f492b5a65c1363c7983..70017df10c41ca2a20d7eeed092d5715e2a843bc 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -30,7 +30,7 @@ Font_metric::design_size () const
 }
 
 Stencil
-Font_metric::find_by_name (std::string s) const
+Font_metric::find_by_name (string s) const
 {
   replace_all (s, '-', 'M');
   int idx = name_to_index (s);
@@ -64,32 +64,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 (std::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,45 +129,46 @@ Font_metric::font_file_name () const
   return scm_car (description_);
 }
 
-std::string
+string
 Font_metric::font_name () const
 {
-  std::string s ("unknown");
+  string s ("unknown");
   return s;
 }
 
-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 (std::string) const
+Font_metric::attachment_point (string) const
 {
   return Offset (0, 0);
 }
@@ -179,7 +180,7 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (std::string str) const
+Font_metric::text_stencil (string str) const
 {
   SCM lst = scm_list_3 (ly_symbol2scm ("text"),
                        this->self_scm (),
@@ -190,7 +191,7 @@ Font_metric::text_stencil (std::string str) const
 }
 
 Box
-Font_metric::text_dimension (std::string) const
+Font_metric::text_dimension (string) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }