-/*
+/*
tfm.cc -- implement Tex_font_metric
-
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
- */
+*/
-#include "file-name.hh"
#include "tfm.hh"
-#include "tfm-reader.hh"
+
+#include "dimensions.hh"
+#include "file-name.hh"
+#include "international.hh"
#include "string-convert.hh"
+#include "tfm-reader.hh"
#include "warn.hh"
-#include "dimensions.hh"
static Tex_font_char_metric dummy_static_char_metric;
b.set_empty ();
return b;
}
-
+
Real d = -depth_;
Real point_constant = 1 PT;
-
- return Box (Interval (0, width_* point_constant ),
- Interval ((d <? height_) * point_constant,
- (d >? height_) * point_constant));
+
+ return Box (Interval (0, width_ * point_constant),
+ Interval (min (d, height_) * point_constant,
+ max (d, height_) * point_constant));
}
Tex_font_metric::Tex_font_metric ()
}
Tex_font_char_metric const *
-Tex_font_metric::find_ascii (int ascii, bool warn) const
+Tex_font_metric::find_ascii (vsize ascii, bool warn) const
{
- if (ascii >= 0 && ascii < ascii_to_metric_idx_.size ()
- && ascii_to_metric_idx_[ascii] >= 0)
- return & char_metrics_[ascii_to_metric_idx_ [ascii]];
+ if (ascii != VPOS && ascii < ascii_to_metric_idx_.size ()
+ && ascii_to_metric_idx_[ascii] != VPOS)
+ return &char_metrics_[ascii_to_metric_idx_ [ascii]];
else if (warn)
warning (_f ("can't find ascii character: %d", ascii));
- return &dummy_static_char_metric;
+ return &dummy_static_char_metric;
}
/* UGH: glyphs need not be consecutive in TFM. */
-int
+vsize
Tex_font_metric::count () const
{
- for (int i = ascii_to_metric_idx_.size (); i--;)
- if (ascii_to_metric_idx_[i] != -1)
+ for (vsize i = ascii_to_metric_idx_.size (); i--;)
+ if (ascii_to_metric_idx_[i] != VPOS)
return i + 1;
return 0;
}
Box
-Tex_font_metric::get_ascii_char (int a) const
+Tex_font_metric::get_ascii_char (vsize a) const
{
Box b = find_ascii (a)->dimensions ();
return b;
}
SCM
-Tex_font_metric::make_tfm (String file_name)
+Tex_font_metric::make_tfm (string file_name)
{
Tex_font_metric *tfm = new Tex_font_metric;
Tex_font_metric_reader reader (file_name);
return info_.design_size * point_constant;
}
-String
+string
Tex_font_metric::font_name () const
{
return font_name_;
}
-int
-Tex_font_metric::name_to_index (String) const
+vsize
+Tex_font_metric::name_to_index (string) const
{
assert (false);
+ return 0;
}