X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=73743ab5b23172a8a97197ada23fb9857a45498c;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=8c8a8e31a7f28e6062ff505971fc5ab0da123f12;hpb=82731e802565546441c401a84a13b486e54eb760;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 8c8a8e31a7..73743ab5b2 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,100 +1,206 @@
 /*   
-  font-metric.cc --  implement Font_metric
+  font-metric.cc -- implement Font_metric
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+  (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 "font-metric.hh"
+#include "ly-smobs.icc"
 
-Box
-Font_metric::text_dimension (String text) const
+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;
+  s.substitute_char ('-', "M");
+  int idx = name_to_index (s);
+  Box b;
   
-  for (int i = 0; i < text.length_i (); i++) 
+  SCM expr = SCM_EOL;
+  if (idx >= 0)
     {
-      
-      if (text[i]=='\\') 
-	{
-	  for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
-	    ;
-	  // ugh.
-	  i--; // Compensate for the increment in the outer loop!
-	}
-      else
-	{
-	  Character_metric const *c = get_char ((unsigned char)text[i],false);
-
-	  // Ugh, use the width of 'x' for unknown characters
-	  if (c->dimensions()[X_AXIS].length () == 0) 
-	    c = get_char ((unsigned char)'x',false);
-	  
-	  w += c->dimensions()[X_AXIS].length ();
-	  ydims.unite (c->dimensions()[Y_AXIS]);
-	}
+      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 ();
+}
 
-Box
-Scaled_font_metric::text_dimension (String t) const
+Font_metric::Font_metric (Font_metric const &)
 {
-  Real realmag = pow (1.2, magstep_i_);
-  Box b (orig_l_->text_dimension (t));
+}
 
-  return Box(b[X_AXIS]* realmag, b[Y_AXIS]*realmag);
+
+Font_metric::~Font_metric ()
+{
 }
 
+int
+Font_metric::count () const
+{
+  return 0;
+}
 
-Box
-Character_metric::dimensions () const
+Box 
+Font_metric::get_ascii_char (int) const
 {
-  return Box(Interval(0,0), Interval(0,0));
+  return Box (Interval (0, 0), Interval (0, 0));
 }
 
-Font_metric::~Font_metric ()
+Box 
+Font_metric::get_indexed_char (int k) const
 {
+  return get_ascii_char (k);
 }
 
-Character_metric::~Character_metric()
+int
+Font_metric::name_to_index (String) const
 {
+  return -1;
 }
 
-Character_metric const *
-Font_metric::get_char (int, bool)const
+Offset
+Font_metric::get_indexed_wxwy (int) const
 {
-  return 0;
+  return Offset (0, 0);
 }
 
-Scaled_font_metric::Scaled_font_metric (Font_metric* m, int s)
+void
+Font_metric::derived_mark () const
 {
-  magstep_i_ = s;
-  orig_l_ = m;
 }
 
 SCM
-Font_metric::description () const
+Font_metric::mark_smob (SCM 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 *m = unsmob_metrics (s);
+  scm_puts ("#<", port);
+  scm_puts (classname (m), port);
+  scm_puts (" ", port);
+  scm_write (m->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?");
+
+
+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);
+}
+
+Stencil
+Font_metric::get_ascii_char_stencil (int code) const
+{
+  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
 {
-  return gh_cons (ly_symbol2scm (name_str_.ch_C()), gh_int2scm (0));
+  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
-Scaled_font_metric::description () const
+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
 {
-  SCM od = orig_l_->description ();
-  gh_set_cdr_x (od, gh_int2scm (magstep_i_));
-  return od;
+  return Box (Interval (0, 0), Interval (0, 0));
 }
+