source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <cctype>
using namespace std;
#include "text-metrics.hh"
#include "warn.hh"
#include "stencil.hh"
-#include "lookup.hh"
#include "main.hh"
Modified_font_metric::Modified_font_metric (Font_metric *fm,
}
Box
-Modified_font_metric::get_indexed_char (int i) const
+Modified_font_metric::get_indexed_char (vsize i) const
{
Box b = orig_->get_indexed_char (i);
b.scale (magnification_);
}
Box
-Modified_font_metric::get_ascii_char (int i) const
+Modified_font_metric::get_ascii_char (vsize i) const
{
Box b = orig_->get_ascii_char (i);
b.scale (magnification_);
return b;
}
-int
+vsize
Modified_font_metric::count () const
{
return orig_->count ();
}
Offset
-Modified_font_metric::attachment_point (String s) const
+Modified_font_metric::attachment_point (string s) const
{
Offset o = orig_->attachment_point (s);
return o * magnification_;
}
Offset
-Modified_font_metric::get_indexed_wxwy (int k) const
+Modified_font_metric::get_indexed_wxwy (vsize k) const
{
Offset o = orig_->get_indexed_wxwy (k);
return o * magnification_;
}
-int
-Modified_font_metric::name_to_index (String s) const
+vsize
+Modified_font_metric::name_to_index (string s) const
{
return orig_->name_to_index (s);
}
-unsigned
-Modified_font_metric::index_to_charcode (int i) const
+vsize
+Modified_font_metric::index_to_charcode (vsize i) const
{
return orig_->index_to_charcode (i);
}
-int
-Modified_font_metric::index_to_ascii (int k) const
+vsize
+Modified_font_metric::index_to_ascii (vsize k) const
{
return orig_->index_to_ascii (k);
}
/* TODO: put this klutchness behind ly:option switch. */
Box
-Modified_font_metric::tex_kludge (String text) const
+Modified_font_metric::tex_kludge (string text) const
{
Interval ydims;
Real w = 0;
- for (int i = 0; i < text.length (); i++)
+ for (ssize i = 0; i < text.length (); i++)
{
switch (text[i])
{
case '\\':
/* Accent marks use width of base letter */
- if (i +1 < text.length ())
+ if (i < text.length () - 1)
{
if (text[i + 1]=='\'' || text[i + 1]=='`' || text[i + 1]=='"'
|| text[i + 1]=='^')
}
Stencil
-Modified_font_metric::text_stencil (String text) const
+Modified_font_metric::text_stencil (string text) const
{
Box b;
if (Pango_font *pf = dynamic_cast<Pango_font *> (orig_))
}
Box
-Modified_font_metric::text_dimension (String text) const
+Modified_font_metric::text_dimension (string text) const
{
- SCM stext = scm_makfrom0str (text.to_str0 ());
- Box b = lookup_tex_text_dimension (orig_, stext);
- if (!b[Y_AXIS].is_empty ())
- {
- b.scale (magnification_);
- return b;
- }
-
+ SCM stext = scm_makfrom0str (text.c_str ());
+
+ Box b;
if (output_backend_global == "tex")
{
+ b = lookup_tex_text_dimension (orig_, stext);
+
+ if (!b[Y_AXIS].is_empty ())
+ {
+ b.scale (magnification_);
+ return b;
+ }
+
b = tex_kludge (text);
return b;
}
Real w = 0.0;
- for (int i = 0; i < text.length (); i++)
+ for (ssize i = 0; i < text.length (); i++)
{
Box b = get_ascii_char ((unsigned char)text[i]);
return orig_->sub_fonts ();
}
-String
+string
Modified_font_metric::font_name () const
{
return original_font ()->font_name ();