X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=a3acc19d88c68fc0be9f9ef527c6d6df67148c43;hb=72e907de352fb29336e9d70b9c2a999f881e79be;hp=8ff6a36bac4127269a6525f81d4437ee31b0f380;hpb=7776d4901caa57e1d0f3ab7cf01348b930a6dbee;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 8ff6a36bac..a3acc19d88 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,115 +1,198 @@
-/*   
-  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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+  Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
+*/
+
+#include "font-metric.hh"
 
 #include <math.h>
-#include <ctype.h>
+#include <cctype>
+
+#include "dimensions.hh"
+#include "modified-font-metric.hh"
+#include "open-type-font.hh"
+#include "stencil.hh"
+#include "virtual-methods.hh"
+#include "warn.hh"
 
-#include "molecule.hh"
 #include "ly-smobs.icc"
-#include "font-metric.hh"
-#include "string.hh"
 
-Box
-Font_metric::text_dimension (String text) const
+Real
+Font_metric::design_size () const
 {
-  Interval ydims;
-  Real w=0.0;
-  
-  for (int i = 0; i < text.length_i (); i++) 
+  return 1.0 * point_constant;
+}
+
+Stencil
+Font_metric::find_by_name (String s) const
+{
+  s.substitute ('-', '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 (),
+			 scm_makfrom0str (s.to_str0 ()));
+      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 ()
+int
+Font_metric::count () const
 {
-  description_ = SCM_EOL;
+  return 0;
+}
 
-  smobify_self ();
+Box
+Font_metric::get_ascii_char (int) const
+{
+  return Box (Interval (0, 0), Interval (0, 0));
 }
 
-Font_metric::Font_metric (Font_metric const &)
+Box
+Font_metric::get_indexed_char (int k) const
 {
+  return get_ascii_char (k);
 }
 
+int
+Font_metric::name_to_index (String) const
+{
+  return -1;
+}
 
-Box 
-Font_metric::get_char (int )const
+Offset
+Font_metric::get_indexed_wxwy (int) 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 (classname (m), 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?");
+
+SCM
+Font_metric::font_file_name () const
+{
+  return scm_car (description_);
+}
+
+String
+Font_metric::font_name () const
+{
+  String s ("unknown");
+  return s;
+}
+
+#include "afm.hh"
+
+int
+Font_metric::index_to_ascii (int i) const
+{
+  return i;
+}
+
+unsigned
+Font_metric::index_to_charcode (int i) const
+{
+  return (unsigned) index_to_ascii (i);
+}
 
-Molecule
-Font_metric::find_by_name (String) const
+Stencil
+Font_metric::get_ascii_char_stencil (int code) const
 {
-  Molecule m ;
-  return m;
+  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
+		       scm_int2num (code));
+  Box b = get_ascii_char (code);
+  return Stencil (b, at);
 }
 
+Stencil
+Font_metric::get_indexed_char_stencil (int code) const
+{
+  int idx = index_to_ascii (code);
+  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), scm_int2num (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::text_stencil (String str) const
+{
+  SCM lst = scm_list_3 (ly_symbol2scm ("text"),
+			this->self_scm (),
+			scm_makfrom0str (str.to_str0 ()));
+
+  Box b = text_dimension (str);
+  return Stencil (b, lst);
+}
 
+Box
+Font_metric::text_dimension (String) const
+{
+  return Box (Interval (0, 0), Interval (0, 0));
+}