use springs instead of fixed/distance pairs

[lilypond.git] / lily / text-metrics.cc

diff --git a/lily/text-metrics.cc b/lily/text-metrics.cc
index 2b6d57e538f81ceff99aee5e7b388b7a80597976..05b17fdfccca442235b7c6b335bcead786dac60f 100644 (file)
--- a/lily/text-metrics.cc
+++ b/lily/text-metrics.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dimensions.hh"
@@ -18,6 +18,10 @@ lookup_tex_text_dimension (Font_metric *font, SCM text)
 {
   Box b;
 
+  /*
+    Actually, it's defined in framework-texstr, but let's see how long
+    it takes before we get a bugreport. HWN 13/2/2006.
+   */
   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));
@@ -27,7 +31,7 @@ lookup_tex_text_dimension (Font_metric *font, SCM text)
   if (text_dimension_hash_tab)
     {
       scm_hash_ref (text_dimension_hash_tab,
-                   scm_makfrom0str (key_str.c_str ()),
+                   ly_string2scm (key_str),
                    SCM_BOOL_F);
     }
   if (scm_is_pair (val))