X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=f18b2d7256ae2717928937c3bbe76cc41799d121;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=70017df10c41ca2a20d7eeed092d5715e2a843bc;hpb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 70017df10c..f18b2d7256 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,11 +1,20 @@
 /*
-  font-metric.cc -- implement Font_metric
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "font-metric.hh"
@@ -18,10 +27,8 @@ using namespace std;
 #include "modified-font-metric.hh"
 #include "open-type-font.hh"
 #include "stencil.hh"
-#include "virtual-methods.hh"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
 
 Real
 Font_metric::design_size () const
@@ -32,7 +39,7 @@ Font_metric::design_size () const
 Stencil
 Font_metric::find_by_name (string s) const
 {
-  replace_all (s, '-', 'M');
+  replace_all (&s, '-', 'M');
   int idx = name_to_index (s);
   Box b;
 
@@ -40,9 +47,9 @@ Font_metric::find_by_name (string s) const
   if (idx >= 0)
     {
       expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
-			 self_scm (),
-			 scm_makfrom0str (s.c_str ()));
-      b = get_indexed_char (idx);
+                         self_scm (),
+                         ly_string2scm (s));
+      b = get_indexed_char_dimensions (idx);
     }
 
   Stencil q (b, expr);
@@ -52,11 +59,11 @@ Font_metric::find_by_name (string s) const
 Font_metric::Font_metric ()
 {
   description_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
 Font_metric::Font_metric (Font_metric const &)
+  : Smob<Font_metric> ()
 {
 }
 
@@ -71,23 +78,11 @@ Font_metric::count () const
 }
 
 Box
-Font_metric::get_ascii_char (size_t) const
+Font_metric::get_indexed_char_dimensions (size_t) const
 {
   return Box (Interval (0, 0), Interval (0, 0));
 }
 
-Box
-Font_metric::get_indexed_char (size_t k) const
-{
-  return get_ascii_char (k);
-}
-
-size_t
-Font_metric::name_to_index (string) const
-{
-  return (size_t)-1;
-}
-
 Offset
 Font_metric::get_indexed_wxwy (size_t) const
 {
@@ -100,28 +95,24 @@ Font_metric::derived_mark () const
 }
 
 SCM
-Font_metric::mark_smob (SCM s)
+Font_metric::mark_smob ()
 {
-  Font_metric *m = (Font_metric *) SCM_CELL_WORD_1 (s);
-  m->derived_mark ();
-  return m->description_;
+  derived_mark ();
+  return description_;
 }
 
 int
-Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
+Font_metric::print_smob (SCM port, scm_print_state *)
 {
-  Font_metric *m = unsmob_metrics (s);
   scm_puts ("#<", port);
-  scm_puts (m->class_name (), port);
+  scm_puts (class_name (), port);
   scm_puts (" ", port);
-  scm_write (m->description_, port);
+  scm_write (description_, port);
   scm_puts (">", port);
   return 1;
 }
 
-IMPLEMENT_SMOBS (Font_metric);
-IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
-IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
+const char Font_metric::type_p_name_[] = "ly:font-metric?";
 
 SCM
 Font_metric::font_file_name () const
@@ -136,39 +127,14 @@ Font_metric::font_name () const
   return s;
 }
 
-size_t
-Font_metric::index_to_ascii (size_t i) const
-{
-  return i;
-}
-
 size_t
 Font_metric::index_to_charcode (size_t i) const
 {
-  return index_to_ascii (i);
-}
-
-Stencil
-Font_metric::get_ascii_char_stencil (size_t code) const
-{
-  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
-		       scm_from_unsigned (code));
-  Box b = get_ascii_char (code);
-  return Stencil (b, at);
-}
-
-Stencil
-Font_metric::get_indexed_char_stencil (size_t code) const
-{
-  size_t idx = index_to_ascii (code);
-  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
-		       scm_from_unsigned (idx));
-  Box b = get_indexed_char (code);
-  return Stencil (b, at);
+  return i;
 }
 
 Offset
-Font_metric::attachment_point (string) const
+Font_metric::attachment_point (const string&) const
 {
   return Offset (0, 0);
 }
@@ -180,19 +146,11 @@ Font_metric::sub_fonts () const
 }
 
 Stencil
-Font_metric::text_stencil (string str) const
+Font_metric::text_stencil (Output_def *state,
+                           const string&, bool) const
 {
-  SCM lst = scm_list_3 (ly_symbol2scm ("text"),
-			this->self_scm (),
-			scm_makfrom0str (str.c_str ()));
+  (void) state;
 
-  Box b = text_dimension (str);
-  return Stencil (b, lst);
+  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));
-}
-