source file of the GNU LilyPond music typesetter
- (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
italic_correction_fix_ = 0;
}
-#define APPEND_CHAR_METRIC_ELT(k) outstr += to_str (#k) + " " + to_str (k ## _) + "; "
+#define APPEND_CHAR_METRIC_ELT(k) outstr += ::to_string (#k) + " " + ::to_string (k ## _) + "; "
String
-Tex_font_char_metric::str () const
+Tex_font_char_metric::to_string () const
{
String outstr ;
Tex_font_char_metric const *
Tex_font_metric::find_ascii (int ascii, bool warn) const
{
- if (ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
+ if (ascii >= 0 && ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
return & char_metrics_[ascii_to_metric_idx_ [ascii]];
else if (warn)
{
}
Box
-Tex_font_metric::get_char (int a) const
+Tex_font_metric::get_ascii_char (int a) const
{
Box b = find_ascii (a)->dimensions () ;
return b;
}
-
String
-Tex_font_metric::str () const
+Tex_font_metric::to_string () const
{
String outstr;
for (int i=0; i < char_metrics_.size (); i++)
- outstr += char_metrics_[i].str ();
+ outstr += char_metrics_[i].to_string ();
return outstr;
}
SCM
Tex_font_metric::make_tfm (String fn)
{
- Tex_font_metric * tfm_p = new Tex_font_metric;
+ Tex_font_metric * tfm = new Tex_font_metric;
Tex_font_metric_reader reader (fn);
- tfm_p->info_ = reader.info_;
- tfm_p->header_ = reader.header_;
- tfm_p->char_metrics_ = reader.char_metrics_;
- tfm_p->ascii_to_metric_idx_ = reader.ascii_to_metric_idx_;
+ tfm->info_ = reader.info_;
+ tfm->header_ = reader.header_;
+ tfm->char_metrics_ = reader.char_metrics_;
+ tfm->ascii_to_metric_idx_ = reader.ascii_to_metric_idx_;
- return tfm_p->self_scm ();
+ return tfm->self_scm ();
}