($(outdir)/%.pdf): add DVIPS_FLAGS. This will

[lilypond.git] / lily / font-metric.cc

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index a1c0f72bff479983fe3967615dbd22e9f2d61163..1d0428b278e80a628d1eda33c969068e29d80c38 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
     Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
  */
@@ -11,8 +11,9 @@
 #include <math.h>
 #include <ctype.h>
 
+#include "virtual-methods.hh"
 #include "warn.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "ly-smobs.icc"
 #include "font-metric.hh"
 #include "string.hh"
@@ -56,18 +57,18 @@ Font_metric::text_dimension (String text) const
          break;
        
        default: 
-         Box b = get_char ((unsigned char)text[i]);
+         Box b = get_ascii_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');
+           b = get_ascii_char ((unsigned char)'x');
          
          w += b[X_AXIS].length ();
          ydims.unite (b[Y_AXIS]);
          break;
        }
     }
-  if (ydims.empty_b ())
+  if (ydims.is_empty ())
     ydims = Interval (0,0);
 
   return Box (Interval (0, w), ydims);
@@ -97,11 +98,29 @@ Font_metric::count () const
 }
 
 Box 
-Font_metric::get_char (int)const
+Font_metric::get_ascii_char (int) const
 {
   return Box (Interval (0,0),Interval (0,0));
 }
 
+Box 
+Font_metric::get_indexed_char (int k) const
+{
+  return get_ascii_char(k);
+}
+
+
+int
+Font_metric::name_to_index (String) const
+{
+  return -1;
+}
+
+Offset
+Font_metric::get_indexed_wxwy (int )const
+{
+  return Offset (0,0);
+}
 
 void
 Font_metric::derived_mark ()const
@@ -109,8 +128,6 @@ Font_metric::derived_mark ()const
   
 }
 
-  
-
 SCM
 Font_metric::mark_smob (SCM s)
 {
@@ -124,7 +141,9 @@ int
 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;
@@ -136,35 +155,42 @@ IMPLEMENT_SMOBS (Font_metric);
 IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
 
-Molecule
+Stencil
 Font_metric::find_by_name (String) const
 {
-  Molecule m ;
+  Stencil m ;
   return m;
 }
 
 LY_DEFINE(ly_find_glyph_by_name, "ly:find-glyph-by-name", 2 , 0, 0,
          (SCM font, SCM name),
-         "This function retrieves a Molecule for the glyph named @var{name} in "
-"@var{font}.  The font must be available as an AFM file.")
+         "This function retrieves a Stencil for the glyph named @var{name} in "
+"@var{font}.  The font must be available as an AFM file. If the glyph "
+"is not found, #f is returned. ")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE(fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   SCM_ASSERT_TYPE(gh_string_p (name), name, SCM_ARG2, __FUNCTION__, "string");
 
-  return fm->find_by_name (ly_scm2string (name)).smobbed_copy ();
+  Stencil m =  fm->find_by_name (ly_scm2string (name));
+
+  /*
+    TODO: make optional argument for default if not found.
+    
+   */
+  return m.smobbed_copy ();
 }
 
 LY_DEFINE(ly_get_glyph, "ly:get-glyph", 2 , 0, 0,
          (SCM font, SCM index),
-         "This function retrieves a Molecule for the glyph numbered @var{index} in "
+         "This function retrieves a Stencil for the glyph numbered @var{index} in "
 "@var{font}. ")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE(fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   SCM_ASSERT_TYPE(gh_number_p (index), index, SCM_ARG2, __FUNCTION__, "number");
 
-  return fm->get_char_molecule (gh_scm2int (index)).smobbed_copy ();
+  return fm->get_ascii_char_stencil (gh_scm2int (index)).smobbed_copy ();
 }
 
 LY_DEFINE(ly_text_dimension,"ly:text-dimension", 2 , 0, 0,
@@ -182,13 +208,23 @@ LY_DEFINE(ly_text_dimension,"ly:text-dimension", 2 , 0, 0,
   
   return gh_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm(b[Y_AXIS]));
 }
-  
-Molecule
-Font_metric::get_char_molecule (int code)  const
+
+Stencil
+Font_metric::get_ascii_char_stencil (int code)  const
+{
+  SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (code),
+                      SCM_UNDEFINED);
+  at = fontify_atom (this, at);
+  Box b = get_ascii_char (code);
+  return Stencil (b, at);
+}
+
+Stencil
+Font_metric::get_indexed_char_stencil (int code)  const
 {
   SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (code),
                       SCM_UNDEFINED);
   at = fontify_atom (this, at);
-  Box b = get_char (code);
-  return Molecule (b, at);
+  Box b = get_indexed_char (code);
+  return Stencil (b, at);
 }