From f1e6a812cca9ab3b58ce8f36acacde0c7f035448 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 15 Mar 2010 01:01:25 -0300 Subject: [PATCH] Cleanup: remove Simple_font_metric, Font_metric::text_dimension --- lily/font-metric.cc | 8 -------- lily/include/font-metric.hh | 9 --------- lily/include/modified-font-metric.hh | 2 -- lily/modified-font-metric.cc | 21 --------------------- 4 files changed, 40 deletions(-) diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 1ff7e47fc0..ed53d26618 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -2,7 +2,6 @@ This file is part of LilyPond, the GNU music typesetter. Copyright (C) 1999--2010 Han-Wen Nienhuys - Mats Bengtsson (the ugly TeX parsing in text_dimension) LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -197,10 +196,3 @@ Font_metric::text_stencil (Output_def* state, programming_error ("Cannot get a text stencil from this font"); return Stencil (Box (), SCM_EOL); } - -Box -Font_metric::text_dimension (string) const -{ - return Box (Interval (0, 0), Interval (0, 0)); -} - diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index 04e78f8e37..b9dc5c7891 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -44,9 +44,6 @@ public: virtual Stencil text_stencil (Output_def* output_state, string text, bool music) const; - // ugh. - virtual Box text_dimension (string) const; - virtual string font_name () const; virtual size_t count () const; virtual Offset attachment_point (string) const; @@ -82,12 +79,6 @@ protected: int get_encoded_index (Font_metric *m, string input_coding, int code); -class Simple_font_metric : public Font_metric -{ - DECLARE_CLASSNAME(Simple_font_metric); -public: -}; - DECLARE_UNSMOB (Font_metric, metrics); char *pfb2pfa (Byte const *pfb, int length); diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh index 35b7d5b4cc..b72fcd4d9f 100644 --- a/lily/include/modified-font-metric.hh +++ b/lily/include/modified-font-metric.hh @@ -26,8 +26,6 @@ struct 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; static SCM make_scaled_font_metric (Font_metric *fm, Real magnification); diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 539a27173d..5ad26a3548 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -131,27 +131,6 @@ Modified_font_metric::text_stencil (Output_def* state, return Font_metric::text_stencil (state, text, feta); } -Box -Modified_font_metric::text_dimension (string text) const -{ - Box b; - Interval ydims; - Real w = 0.0; - - for (ssize i = 0; i < text.length (); i++) - { - Box b = get_ascii_char ((unsigned char)text[i]); - - w += b[X_AXIS].length (); - ydims.unite (b[Y_AXIS]); - } - if (ydims.is_empty ()) - ydims = Interval (0, 0); - - b = Box (Interval (0, w), ydims); - return b; -} - Font_metric * Modified_font_metric::original_font () const { -- 2.39.2