X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=12d8807831d5d57023ef905de5bdb501a8d46972;hb=905473989ebcecca6922afcf6161c5c24a8e0282;hp=360f4d6ed330b7d370e28b62c52d228853d06241;hpb=7367bac15e22b0b2ae9a1a0a7f849860f9d66f45;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 360f4d6ed3..12d8807831 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,115 +1,199 @@
-/*   
-  font-metric.cc --  implement Font_metric
-  
+/*
+  font-metric.cc -- implement Font_metric
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-    Mats Bengtsson <matsb@s3.kth.se>  (the ugly TeX parsing in text_dimension)
- */
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include <math.h>
-#include <ctype.h>
+  Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
+*/
 
-#include "molecule.hh"
-#include "ly-smobs.icc"
 #include "font-metric.hh"
-#include "string.hh"
 
-Box
-Font_metric::text_dimension (String text) const
+#include <cmath>
+#include <cctype>
+using namespace std;
+
+#include "dimensions.hh"
+#include "modified-font-metric.hh"
+#include "open-type-font.hh"
+#include "stencil.hh"
+#include "warn.hh"
+
+#include "ly-smobs.icc"
+
+Real
+Font_metric::design_size () const
+{
+  return 1.0 * point_constant;
+}
+
+Stencil
+Font_metric::find_by_name (string s) const
 {
-  Interval ydims;
-  Real w=0.0;
-  
-  for (int i = 0; i < text.length_i (); i++) 
+  replace_all (&s, '-', 'M');
+  int idx = name_to_index (s);
+  Box b;
+
+  SCM expr = SCM_EOL;
+  if (idx >= 0)
     {
-      
-      switch (text[i]) 
-	{
-	case '\\':
-	  for (i++; (i < text.length_i ()) && !isspace(text[i]) 
-		 && text[i]!='{' && text[i]!='}'; i++)
-	    ;
-	  // ugh.
-	  i--; // Compensate for the increment in the outer loop!
-	  break;
-	case '{':  // Skip '{' and '}'
-	case '}':
-	  break;
-	
-	default: 
-	  Box b = get_char ((unsigned char)text[i]);
-	  
-	  // Ugh, use the width of 'x' for unknown characters
-	  if (b[X_AXIS].length () == 0) 
-	    b = get_char ((unsigned char)'x');
-	  
-	  w += b[X_AXIS].length ();
-	  ydims.unite (b[Y_AXIS]);
-	  break;
-	}
+      expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
+			 self_scm (),
+			 ly_string2scm (s));
+      b = get_indexed_char (idx);
     }
-  if (ydims.empty_b ())
-    ydims = Interval (0,0);
 
-  return Box(Interval (0, w), ydims);
+  Stencil q (b, expr);
+  return q;
 }
 
+Font_metric::Font_metric ()
+{
+  description_ = SCM_EOL;
+  self_scm_ = SCM_EOL;
+  smobify_self ();
+}
 
+Font_metric::Font_metric (Font_metric const &)
+{
+}
 
 Font_metric::~Font_metric ()
 {
 }
 
-Font_metric::Font_metric ()
+size_t
+Font_metric::count () const
 {
-  description_ = SCM_EOL;
+  return 0;
+}
 
-  smobify_self ();
+Box
+Font_metric::get_ascii_char (size_t) const
+{
+  return Box (Interval (0, 0), Interval (0, 0));
 }
 
-Font_metric::Font_metric (Font_metric const &s)
+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;
+}
 
-Box 
-Font_metric::get_char (int )const
+Offset
+Font_metric::get_indexed_wxwy (size_t) const
 {
-  return Box (Interval(0,0),Interval (0,0));
+  return Offset (0, 0);
 }
 
+void
+Font_metric::derived_mark () const
+{
+}
 
 SCM
 Font_metric::mark_smob (SCM s)
 {
-  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1(s);
+  Font_metric *m = (Font_metric *) SCM_CELL_WORD_1 (s);
+  m->derived_mark ();
   return m->description_;
 }
 
 int
-Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
+Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
   Font_metric *m = unsmob_metrics (s);
-  scm_puts ("#<Font_metric ", port);
+  scm_puts ("#<", port);
+  scm_puts (m->class_name (), port);
+  scm_puts (" ", port);
   scm_write (m->description_, port);
   scm_puts (">", port);
   return 1;
 }
 
-
-IMPLEMENT_UNSMOB (Font_metric, metrics);
 IMPLEMENT_SMOBS (Font_metric);
-IMPLEMENT_DEFAULT_EQUAL_P(Font_metric);
-IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
+IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
+IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
 
-Molecule
-Font_metric::find_by_name (String) const
+SCM
+Font_metric::font_file_name () const
 {
-  Molecule m ;
-  return m;
+  return scm_car (description_);
 }
 
+string
+Font_metric::font_name () const
+{
+  string s ("unknown");
+  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);
+}
+
+Offset
+Font_metric::attachment_point (string) const
+{
+  return Offset (0, 0);
+}
+
+SCM
+Font_metric::sub_fonts () const
+{
+  return SCM_EOL;
+}
 
+Stencil
+Font_metric::word_stencil (string str) const
+{
+  return text_stencil (str);
+}
+
+Stencil
+Font_metric::text_stencil (string /* str */) const
+{
+  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));
+}