X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=70017df10c41ca2a20d7eeed092d5715e2a843bc;hb=3d8dbaf926ecdf3b417fc45d1050f4de1cc07d40;hp=dd1d6245ca2209ced80154bd0492d3972081a524;hpb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index dd1d6245ca..70017df10c 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,17 +1,18 @@
-/*   
+/*
   font-metric.cc -- implement Font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-    Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
 */
 
 #include "font-metric.hh"
 
-#include <math.h>
+#include <cmath>
 #include <cctype>
+using namespace std;
 
 #include "dimensions.hh"
 #include "modified-font-metric.hh"
@@ -28,24 +29,22 @@ Font_metric::design_size () const
   return 1.0 * point_constant;
 }
 
-
 Stencil
-Font_metric::find_by_name (String s) const
+Font_metric::find_by_name (string s) const
 {
-  s.substitute_char ('-', "M");
+  replace_all (s, '-', 'M');
   int idx = name_to_index (s);
   Box b;
-  
+
   SCM expr = SCM_EOL;
   if (idx >= 0)
     {
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
 			 self_scm (),
-			 scm_makfrom0str (s.to_str0 ())
-			 );
+			 scm_makfrom0str (s.c_str ()));
       b = get_indexed_char (idx);
     }
-  
+
   Stencil q (b, expr);
   return q;
 }
@@ -61,37 +60,36 @@ Font_metric::Font_metric (Font_metric const &)
 {
 }
 
-
 Font_metric::~Font_metric ()
 {
 }
 
-int
+size_t
 Font_metric::count () const
 {
   return 0;
 }
 
-Box 
-Font_metric::get_ascii_char (int) const
+Box
+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
+Box
+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);
 }
@@ -104,7 +102,7 @@ Font_metric::derived_mark () const
 SCM
 Font_metric::mark_smob (SCM s)
 {
-  Font_metric *m = (Font_metric*) SCM_CELL_WORD_1 (s);
+  Font_metric *m = (Font_metric *) SCM_CELL_WORD_1 (s);
   m->derived_mark ();
   return m->description_;
 }
@@ -114,69 +112,63 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
   Font_metric *m = unsmob_metrics (s);
   scm_puts ("#<", port);
-  scm_puts (classname (m), port);
+  scm_puts (m->class_name (), port);
   scm_puts (" ", port);
   scm_write (m->description_, port);
   scm_puts (">", port);
   return 1;
 }
 
-
-
 IMPLEMENT_SMOBS (Font_metric);
 IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
 
-
-SCM 
+SCM
 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_int2num (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_int2num (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);
 }
@@ -188,19 +180,19 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (String str) const
+Font_metric::text_stencil (string str) const
 {
   SCM lst = scm_list_3 (ly_symbol2scm ("text"),
 			this->self_scm (),
-			scm_makfrom0str (str.to_str0 ()));
-  
+			scm_makfrom0str (str.c_str ()));
+
   Box b = text_dimension (str);
   return Stencil (b, lst);
 }
 
 Box
-Font_metric::text_dimension (String) const
+Font_metric::text_dimension (string) const
 {
-  return Box (Interval (0,0), Interval (0,0));
+  return Box (Interval (0, 0), Interval (0, 0));
 }