* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 7ce615a85926fd9f6fdbf290cb2c74b8fe0f0855..a25bde424f72a4ef9ca570f4211fc207d454540b 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
     Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
  */
@@ -23,13 +23,29 @@ Font_metric::text_dimension (String text) const
   Interval ydims;
   Real w=0.0;
   
-  for (int i = 0; i < text.length_i (); i++) 
+  for (int i = 0; i < text.length (); i++) 
     {
       
       switch (text[i]) 
        {
        case '\\':
-         for (i++; (i < text.length_i ()) && !isspace (text[i]) 
+  // accent marks use width of base letter
+         if (i +1 < text.length ())
+          {
+            if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"' ||
+                text[i+1]=='^')
+              {
+                i++;
+                break;
+              }
+            // for string width \\ is a \ and \_ is a _.
+            if (text[i+1]=='\\' || text[i+1]=='_')        
+              {
+                break;
+              }
+          }
+         
+         for (i++; (i < text.length ()) && !isspace (text[i]) 
                 && text[i]!='{' && text[i]!='}'; i++)
            ;
          // ugh.
@@ -66,14 +82,19 @@ Font_metric::~Font_metric ()
 Font_metric::Font_metric ()
 {
   description_ = SCM_EOL;
-
+  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
-Font_metric::Font_metric (Font_metric const &s)
+Font_metric::Font_metric (Font_metric const &)
 {
 }
 
+int
+Font_metric::count () const
+{
+  return 0;
+}
 
 Box 
 Font_metric::get_char (int)const
@@ -82,10 +103,20 @@ Font_metric::get_char (int)const
 }
 
 
+void
+Font_metric::derived_mark ()const
+{
+  
+}
+
+  
+
 SCM
 Font_metric::mark_smob (SCM s)
 {
   Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s);
+
+  m->derived_mark();
   return m->description_;
 }
 
@@ -100,7 +131,7 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 }
 
 
-IMPLEMENT_UNSMOB (Font_metric, metrics);
+
 IMPLEMENT_SMOBS (Font_metric);
 IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
 IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
@@ -113,24 +144,46 @@ Font_metric::find_by_name (String) const
 }
 
 
-SCM
-ly_find_glyph_by_name (SCM font, SCM name)
+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.")
 {
-  if (!unsmob_metrics (font) || !gh_string_p (name))
-    {
-      warning ("ly-find-glyph-by-name: invalid argument.");
-      Molecule m;
-      return m.smobbed_copy ();
-    }
+  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 unsmob_metrics (font)->find_by_name (ly_scm2string (name)).smobbed_copy ();
+  return fm->find_by_name (ly_scm2string (name)).smobbed_copy ();
 }
 
 
-static void
-font_metric_init ()
+LY_DEFINE(ly_text_dimension,"ly-text-dimension", 2 , 0, 0,
+         (SCM font, SCM text),
+         "Given the font metric in @var{font} and the string @var{text}, compute
+the extents of that text in that font. The return value is a pair of
+number-pairs.")
 {
-   scm_make_gsubr ("ly-find-glyph-by-name", 2 , 0, 0, (Scheme_function_unknown) ly_find_glyph_by_name);
+  Box b;
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE(fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE(gh_string_p (text), text, SCM_ARG2, __FUNCTION__, "string");
+
+  b = fm->text_dimension (ly_scm2string (text));
+  
+  return gh_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm(b[Y_AXIS]));
 }
 
-ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);
+
+
+
+  
+Molecule
+Font_metric::get_char_molecule (int code)  const
+{
+  Molecule  m ;
+  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);
+}