/*
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 "font-metric.hh"
+struct Preinit_Modified_font_metric
+{
+ Font_metric *orig_;
+ Preinit_Modified_font_metric ();
+};
+
/* Perhaps junk this, and move this to layout_def as interface? */
-struct Modified_font_metric : public Font_metric
+class Modified_font_metric : Preinit_Modified_font_metric,
+ public Font_metric
{
public:
- Box text_dimension (string) const;
- Box word_dimension (string) const;
- Stencil text_stencil (Output_def* output_state, string, bool) const;
+ Stencil text_stencil (Output_def *output_state, const string&, bool) const;
+ Real get_magnification () const;
static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
size_t count () const;
Offset get_indexed_wxwy (size_t) const;
- Offset attachment_point (string) const;
+ Offset attachment_point (const string&) const;
size_t name_to_index (string) const;
size_t index_to_charcode (size_t) const;
Font_metric *original_font () const;
protected:
- Font_metric *orig_;
Real magnification_;
Modified_font_metric (Font_metric *fm, Real magnification);
string font_name () const;
Real design_size () const;
void derived_mark () const;
- Box get_indexed_char (size_t) const;
- size_t index_to_ascii (size_t) const;
- Box get_ascii_char (size_t) const;
+ Box get_indexed_char_dimensions (size_t) const;
};
#endif /* MODIFIED_FONT_METRIC_HH */