* lily/lookup.cc (triangle): rewrite, obviating symmetric_x_triangle().

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index d68df68febdd2aab9eb10bc78eec60232b34bd8c..942cffb3afe8fe99394177d407adeb3a8964c955 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -3,8 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
-  
+  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
  */
@@ -16,10 +15,26 @@
 #include "warn.hh"
 #include "dimensions.hh"
 
+static Tex_font_char_metric dummy_static_char_metric;
+
+Tex_font_char_metric::Tex_font_char_metric ()
+{
+  exists_ = false;
+  code_ = 0;;
+  width_ = 0;
+  height_ = 0;
+  depth_ = 0;
+  italic_correction_ = 0;
+  width_fix_ = 0;
+  height_fix_ = 0;
+  depth_fix_ = 0;
+  italic_correction_fix_ = 0;
+}
+
 Box
 Tex_font_char_metric::dimensions () const
 {
-  if (!exists_b_)
+  if (!exists_)
     {
       Box b;
       b.set_empty ();
@@ -35,102 +50,94 @@ Tex_font_char_metric::dimensions () const
                        (d >? height_)*point_constant));
 }
 
-Tex_font_char_metric::Tex_font_char_metric ()
+Tex_font_metric::Tex_font_metric ()
 {
-  exists_b_ = false;
-  code_ = 0;;
-  width_ = 0;
-  height_ = 0;
-  depth_ = 0;
-  italic_correction_ = 0;
-  width_fix_ = 0;
-  height_fix_ = 0;
-  depth_fix_ = 0;
-  italic_correction_fix_ = 0;
+  encoding_table_ = SCM_EOL;
 }
 
-#define APPEND_CHAR_METRIC_ELT(k)  outstr += to_string (#k) + " "  + to_string (k ## _)  + "; "
 
-String
-Tex_font_char_metric::string () const
-{
-  String outstr ;
-
-  APPEND_CHAR_METRIC_ELT (exists_b);
-  APPEND_CHAR_METRIC_ELT (code);
-  APPEND_CHAR_METRIC_ELT (width);
-  APPEND_CHAR_METRIC_ELT (height);
-  APPEND_CHAR_METRIC_ELT (depth);
-  APPEND_CHAR_METRIC_ELT (italic_correction);
-  
-  return outstr + "\n";
-}
 
-Tex_font_metric::Tex_font_metric ()
+void
+Tex_font_metric::derived_mark () const
 {
+  scm_gc_mark (encoding_table_);
 }
 
-
-static Tex_font_char_metric dummy_static_char_metric;
-
 Tex_font_char_metric const *
 Tex_font_metric::find_ascii (int ascii, bool warn) const
 {
-  if (ascii < ascii_to_metric_idx_.size () && ascii_to_metric_idx_[ascii] >= 0)
+  if (ascii >= 0 && ascii < ascii_to_metric_idx_.size ()
+      && ascii_to_metric_idx_[ascii] >= 0)
     return & char_metrics_[ascii_to_metric_idx_ [ascii]];
   else if (warn)
-    {
-      warning (_f ("can't find ascii character: %d", ascii));
-    }
+    warning (_f ("can't find ascii character: %d", ascii));
   return &dummy_static_char_metric;  
 }
 
-
-/*
-  UGH: glyphs need not be consecutive in TFM.
- */
+/* UGH: glyphs need not be consecutive in TFM. */
 int
 Tex_font_metric::count () const
 {
   for (int i = ascii_to_metric_idx_.size (); i--;)
-    {
-      if (ascii_to_metric_idx_[i] != -1)
-       return i + 1;
-    }
+    if (ascii_to_metric_idx_[i] != -1)
+      return i + 1;
   return 0;
 }
 
 Box
-Tex_font_metric::get_char (int a) const
+Tex_font_metric::get_ascii_char (int a) const
 {
-  Box b = find_ascii (a)->dimensions () ;
+  Box b = find_ascii (a)->dimensions ();
   return b;
 }
 
-
-String
-Tex_font_metric::string () const
-{
-  String outstr;
-  for (int i=0; i < char_metrics_.size (); i++)
-    outstr += char_metrics_[i].string ();
-  
-  return outstr;
-}
-
-
-
-
 SCM
-Tex_font_metric::make_tfm (String fn)
+Tex_font_metric::make_tfm (String filename)
 {
-  Tex_font_metric * tfm = new Tex_font_metric;
-  Tex_font_metric_reader reader (fn);
+  Tex_font_metric *tfm = new Tex_font_metric;
+  Tex_font_metric_reader reader (filename);
 
   tfm->info_ = reader.info_;
   tfm->header_ = reader.header_;
   tfm->char_metrics_ = reader.char_metrics_;
   tfm->ascii_to_metric_idx_ = reader.ascii_to_metric_idx_;
+
   
+  tfm->encoding_table_ =
+    scm_call_1 (ly_scheme_function ("get-coding-table"),
+               scm_makfrom0str (tfm->coding_scheme ().to_str0 ()));
+
   return tfm->self_scm ();
 }
+
+Real
+Tex_font_metric::design_size () const
+{
+  return info_.design_size;
+}
+
+String
+Tex_font_metric::coding_scheme () const
+{
+  String scm = info_.coding_scheme;
+
+  for(int i = 0; i < scm.length (); i++)
+    if (scm[i] == ' ')
+      scm[i] = '-';
+
+  return scm;
+}
+
+int
+Tex_font_metric::name_to_index (String s) const
+{
+  SCM sym = ly_symbol2scm (s.to_str0 ());
+
+  SCM idx = scm_hash_ref (encoding_table_, sym, SCM_BOOL_F);
+  if (ly_c_char_p (idx))
+    {
+      return (unsigned char) ly_scm2char (idx);
+    }
+  else
+    return -1;  
+}