* lily/music.cc (derived_mark): derive Music from Prob.

[lilypond.git] / lily / tfm.cc

diff --git a/lily/tfm.cc b/lily/tfm.cc
index ed97e417b17d75819a5cc47d9554840a8af83fbc..9a8d7ee08a2c6289ee4cf4d7444de46e29b63ed6 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -1,54 +1,22 @@
-/*   
+/*
   tfm.cc -- implement Tex_font_metric
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
   some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
- */
+*/
 
+#include "file-name.hh"
 #include "tfm.hh"
-
 #include "tfm-reader.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 #include "dimensions.hh"
 
-static SCM tex_dimension_hash_tab;
 static Tex_font_char_metric dummy_static_char_metric;
 
-
-         
-Box
-lookup_tex_text_dimension (Font_metric *font,
-                          SCM text)
-{
-  Box b;
-
-  SCM limit = ly_lily_module_constant ("TEX_STRING_HASHLIMIT");
-  String key_str = ly_scm2string (font->font_file_name());
-  int hash_code = scm_to_int (scm_hash (text, limit));
-  key_str = to_string (hash_code)  + key_str;
-  
-  SCM val = scm_hash_ref (tex_dimension_hash_tab,
-                         scm_makfrom0str (key_str.to_str0 ()),
-                         SCM_BOOL_F);
-
-  if (scm_is_pair (val))
-    {
-      b[X_AXIS][LEFT] = 0.0 PT;
-      b[X_AXIS][RIGHT] = scm_to_double (scm_car (val)) PT;
-      val = scm_cdr (val);
-      b[Y_AXIS][UP] = scm_to_double (scm_car (val)) PT;
-      val = scm_cdr (val);
-      b[Y_AXIS][DOWN] = scm_to_double (scm_car (val)) PT; 
-    }
-  
-  return b; 
-}
-
-
 Tex_font_char_metric::Tex_font_char_metric ()
 {
   exists_ = false;
@@ -72,14 +40,13 @@ Tex_font_char_metric::dimensions () const
       b.set_empty ();
       return b;
     }
-  
-  Real d = -depth_;
 
+  Real d = -depth_;
   Real point_constant = 1 PT;
-  
-  return Box (Interval (0, width_*point_constant ),
-             Interval ((d <? height_)*point_constant,
-                       (d >? height_)*point_constant));
+
+  return Box (Interval (0, width_ * point_constant),
+             Interval (min (d, height_) * point_constant,
+                       max (d, height_) * point_constant));
 }
 
 Tex_font_metric::Tex_font_metric ()
@@ -98,10 +65,10 @@ Tex_font_metric::find_ascii (int ascii, bool warn) const
 {
   if (ascii >= 0 && ascii < ascii_to_metric_idx_.size ()
       && ascii_to_metric_idx_[ascii] >= 0)
-    return & char_metrics_[ascii_to_metric_idx_ [ascii]];
+    return &char_metrics_[ascii_to_metric_idx_ [ascii]];
   else if (warn)
     warning (_f ("can't find ascii character: %d", ascii));
-  return &dummy_static_char_metric;  
+  return &dummy_static_char_metric;
 }
 
 /* UGH: glyphs need not be consecutive in TFM. */
@@ -131,70 +98,33 @@ Tex_font_metric::make_tfm (String file_name)
   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_lily_module_constant ("get-coding-table"),
-                 scm_makfrom0str (tfm->coding_scheme ().to_str0 ()));
 
+  File_name fn (file_name);
+  tfm->font_name_ = fn.base_;
   return tfm->self_scm ();
 }
 
+Tfm_info const &
+Tex_font_metric::info () const
+{
+  return info_;
+}
+
 Real
 Tex_font_metric::design_size () const
 {
-  return info_.design_size;
+  return info_.design_size * point_constant;
 }
 
 String
-Tex_font_metric::coding_scheme () const
+Tex_font_metric::font_name () const
 {
-  String scm = info_.coding_scheme;
-
-  for(int i = 0; i < scm.length (); i++)
-    if (scm[i] == ' ')
-      scm[i] = '-';
-
-  return scm;
+  return font_name_;
 }
 
 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;  
-}
-
-
-LY_DEFINE(ly_load_text_dimensions, "ly:load-text-dimensions",
-         1, 0, 0,
-         (SCM dimension_alist),
-         "Load dimensions from TeX in a (KEY . (W H D)) format alist")
+Tex_font_metric::name_to_index (String) const
 {
-  if (!tex_dimension_hash_tab)
-    {
-      tex_dimension_hash_tab =
-       scm_gc_protect_object (scm_make_hash_table (scm_from_int (113)));
-    }
-
-  for (SCM s = dimension_alist;
-       scm_is_pair (s);
-       s = scm_cdr (s))
-    {
-      SCM key = scm_caar (s);
-      SCM val = scm_cdar (s);
-      
-      if (scm_hash_ref (tex_dimension_hash_tab, key, SCM_BOOL_F)
-         == SCM_BOOL_F)
-       {
-         scm_hash_set_x (tex_dimension_hash_tab, key, val);
-       }
-    }
-
-  return SCM_UNSPECIFIED;
+  assert (false);
+  return 0;
 }