/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "main.hh"
#include "program-option.hh"
+void Modified_font_metric::pre_init ()
+{
+ orig_ = 0;
+}
+
Modified_font_metric::Modified_font_metric (Font_metric *fm,
- Real magnification)
+ Real magnification)
{
magnification_ = magnification;
}
Box
-Modified_font_metric::get_indexed_char (vsize i) const
+Modified_font_metric::get_indexed_char_dimensions (vsize i) const
{
- Box b = orig_->get_indexed_char (i);
+ Box b = orig_->get_indexed_char_dimensions (i);
b.scale (magnification_);
return b;
}
+Real
+Modified_font_metric::get_magnification () const
+{
+ return magnification_;
+}
+
vsize
Modified_font_metric::count () const
{
}
Offset
-Modified_font_metric::attachment_point (string s) const
+Modified_font_metric::attachment_point (const string &s) const
{
Offset o = orig_->attachment_point (s);
return o * magnification_;
return o * magnification_;
}
-vsize
+size_t
Modified_font_metric::name_to_index (string s) const
{
return orig_->name_to_index (s);
return orig_->index_to_charcode (i);
}
-vsize
-Modified_font_metric::index_to_ascii (vsize k) const
-{
- return orig_->index_to_ascii (k);
-}
-
void
Modified_font_metric::derived_mark () const
{
+ if (orig_)
+ scm_gc_mark (orig_->self_scm ());
}
Stencil
-Modified_font_metric::text_stencil (Output_def* state,
- string text, bool feta) const
+Modified_font_metric::text_stencil (Output_def *state,
+ const string &text, bool feta) const
{
Box b;
if (Pango_font *pf = dynamic_cast<Pango_font *> (orig_))