2003 -> 2004

[lilypond.git] / lily / afm.cc

diff --git a/lily/afm.cc b/lily/afm.cc
index 8c7e7b2e3f489613e5953750b869e4be6f6dfd2e..26d9b252d9728ebd2eb8496c6a2c728521ff5813 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -3,11 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+
+#include <string.h>
+
+#include "warn.hh"             // error()
+#include "libc-extension.hh"
 #include "afm.hh"
-#include "warn.hh"
 #include "molecule.hh"
 #include "dimensions.hh"
 
@@ -45,7 +49,7 @@ Adobe_font_metric::make_afm (AFM_Font_info *fi, unsigned int checksum)
 
 
 AFM_CharMetricInfo const *
-Adobe_font_metric::find_ascii_metric (int a , bool warn) const
+Adobe_font_metric::find_ascii_metric (int a) const
 {
   if (ascii_to_metric_idx_[a] >=0)
     {
@@ -55,29 +59,31 @@ Adobe_font_metric::find_ascii_metric (int a , bool warn) const
          return font_inf_->cmi + code;
        }
     }
-  else if (warn)
-    {
-      warning (_f ("can't find character number: %d", a));
-    }
 
   return 0;
 }
 
+
+
 AFM_CharMetricInfo const *
-Adobe_font_metric::find_char_metric (String nm, bool warn) const
+Adobe_font_metric::find_char_metric (String nm) const
+{
+  int idx = name_to_index (nm);
+  if (idx >= 0)
+    return font_inf_->cmi+ idx;
+  else
+    return 0;
+}
+
+int
+Adobe_font_metric::name_to_index (String nm)const 
 {
   std::map<String,int>::const_iterator ai = name_to_metric_dict_.find (nm);
   
   if (ai == name_to_metric_dict_.end ())
-    {
-      if (warn)
-       {
-         warning (_f ("can't find character called: `%s'", nm.to_str0 ()));
-       }
-      return 0;
-    }
+    return -1;
   else
-    return font_inf_->cmi + (*ai).second;
+    return (*ai).second; 
 }
 
 int
@@ -87,10 +93,10 @@ Adobe_font_metric::count () const
 }
 
 Box
-Adobe_font_metric::get_char (int code) const
+Adobe_font_metric::get_ascii_char (int code) const
 {
   AFM_CharMetricInfo const
-    * c =  find_ascii_metric (code,false);
+    * c =  find_ascii_metric (code);
   Box b (Interval (0,0),Interval (0,0));
   if (c)
     b = afm_bbox_to_box (c->charBBox);                 
@@ -98,24 +104,38 @@ Adobe_font_metric::get_char (int code) const
   return b;
 }
 
+
+Box
+Adobe_font_metric::get_indexed_char (int code) const
+{
+  if (code>= 0)
+    return afm_bbox_to_box (font_inf_->cmi[code].charBBox);
+  else
+    return   Box (Interval (0,0),Interval (0,0));
+}
+
 SCM
 read_afm_file (String nm)
 {
   FILE *f = fopen (nm.to_str0 () , "r");
   char s[2048];
-  char *check_key = "TfmCheckSum"; 
-  fgets (s, sizeof (s), f);
+  char *check_key = "Comment TfmCheckSum";
 
-  unsigned int cs = 0;  
-  if (strncmp (s, check_key, strlen (check_key)) == 0)
-    {
-      sscanf (s + strlen (check_key), "%ud", &cs);
-    }
-  else
+  unsigned int cs = 0;
+
+  s[0] = 0;
+  /* Assume check_key in first 10 lines */
+  for (int i = 0; i < 10; i++)
     {
-      rewind (f);
+      fgets (s, sizeof (s), f);
+      if (strncmp (s, check_key, strlen (check_key)) == 0)
+       {
+         sscanf (s + strlen (check_key), "%ud", &cs);
+         break;
+       }
     }
-
+  
+  rewind (f);
     
   AFM_Font_info * fi;
   int ok = AFM_parseFile (f, &fi, ~1);
@@ -142,7 +162,15 @@ afm_bbox_to_box (AFM_BBox bb)
              Interval (bb.lly, bb.ury)* (1/1000.0) PT);
 
 }
-  
+
+Offset
+Adobe_font_metric::get_indexed_wxwy (int k)const
+{
+  AFM_CharMetricInfo const *mi = font_inf_->cmi+ k;
+  return 1/1000.0 PT * Offset (mi->wx, mi->wy); 
+}
+
+
 
 Adobe_font_metric::~Adobe_font_metric ()
 {
@@ -155,7 +183,7 @@ Adobe_font_metric::~Adobe_font_metric ()
 Molecule
 Adobe_font_metric::find_by_name (String s) const
 {
-  AFM_CharMetricInfo const *cm = find_char_metric (s, false);
+  AFM_CharMetricInfo const *cm = find_char_metric (s);
 
   if (!cm)
     {