source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (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"
#include "open-type-font.hh"
#include "stencil.hh"
-#include "virtual-methods.hh"
#include "warn.hh"
#include "ly-smobs.icc"
}
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;
{
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);
}
{
}
-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);
}
{
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 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);
}
}
Stencil
-Font_metric::text_stencil (String str) const
+Font_metric::word_stencil (string str) const
+{
+ return text_stencil (str);
+}
+
+Stencil
+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));
}