X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-metrics.cc;h=c83f561dc74876d4094d7f5026efaf114f586782;hb=cb735173098378b0fd952a2d33fc8b03dedcd5cb;hp=927a9d39e950fb9a331421bfc32a2ff36450ef64;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/text-metrics.cc b/lily/text-metrics.cc
index 927a9d39e9..c83f561dc7 100644
--- a/lily/text-metrics.cc
+++ b/lily/text-metrics.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "dimensions.hh"
@@ -18,8 +18,12 @@ 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 ());
+  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;
 
@@ -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.to_str0 ()),
+		    ly_string2scm (key_str),
 		    SCM_BOOL_F);
     }
   if (scm_is_pair (val))
@@ -46,7 +50,8 @@ lookup_tex_text_dimension (Font_metric *font, SCM text)
 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")
+	   "Load dimensions from @TeX{} in a @code{(KEY . (W H D))} format"
+	   " alist.")
 {
   if (!text_dimension_hash_tab)
     {
@@ -63,24 +68,22 @@ LY_DEFINE (ly_load_text_dimensions, "ly:load-text-dimensions",
 
       if (scm_hash_ref (text_dimension_hash_tab, key, SCM_BOOL_F)
 	  == SCM_BOOL_F)
-	{
-	  scm_hash_set_x (text_dimension_hash_tab, key, val);
-	}
+	scm_hash_set_x (text_dimension_hash_tab, key, val);
     }
 
   return SCM_UNSPECIFIED;
 }
 
 void
-try_load_text_metrics (String basename)
+try_load_text_metrics (string basename)
 {
-  String path = global_path.find (basename + ".textmetrics");
+  string path = global_path.find (basename + ".textmetrics");
   if (path != "")
     {
-      String contents (gulp_file_to_string (path, true));
+      string contents (gulp_file_to_string (path, true, -1));
       contents = "(quote (" + contents + "))";
 
-      SCM lst = scm_c_eval_string (contents.to_str0 ());
+      SCM lst = scm_c_eval_string (contents.c_str ());
       ly_load_text_dimensions (lst);
     }
 }