new file.

(try_load_text_metrics): new function

diff --git a/ChangeLog b/ChangeLog
index 75225d78be5dd7e77e3e4e1b9148db1d0b6c9ef8..49a40f4bd3dec98f74a222c05c97b99d1a18dd23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-12-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/framework-texstr.scm (header): change extension to .textmetrics
+
+       * lily/lily-parser.cc (parse_file): do try_load_text_metrics for
+       -f tex.
+
+       * lily/text-metrics.cc: new file.
+       (try_load_text_metrics): new function
+
+       * lily/include/text-metrics.hh: new file.
+
 2004-12-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/include/lily-guile.hh (ly_lily_module_constant): rename

diff --git a/lily/text-metrics.cc b/lily/text-metrics.cc
index 919401f61f2280f86db535aba4b783a2b6e6da48..c987579e400009818b0a99360ad33b7fab4300b6 100644 (file)
--- a/lily/text-metrics.cc
+++ b/lily/text-metrics.cc
@@ -9,6 +9,7 @@
 #include "dimensions.hh"
 #include "font-metric.hh"
 #include "main.hh"
+#include "file-path.hh"
 
 static SCM text_dimension_hash_tab;
 
@@ -77,10 +78,10 @@ LY_DEFINE(ly_load_text_dimensions, "ly:load-text-dimensions",
 void
 try_load_text_metrics (String basename)
 {
-  String path =  global_path.find_file (basename +  ".textmetrics");
+  String path =  global_path.find (basename +  ".textmetrics");
   if (path != "")
     {
-      String contents (gulp_file_to_string (path));
+      String contents (gulp_file_to_string (path, true));
       contents = "(quote (" +  contents + "))";
 
       SCM lst = scm_c_eval_string (contents.to_str0 ());

diff --git a/lily/tweak-registration.cc b/lily/tweak-registration.cc
index 701eb08dcc266ff0225744d27a1e32c498201757..d0739a220281c03e35fb7c45f41c476e55f6cbc8 100644 (file)
--- a/lily/tweak-registration.cc
+++ b/lily/tweak-registration.cc
@@ -116,6 +116,7 @@ Tweak_registry::mark_smob (SCM smob)
 int
 Tweak_registry::print_smob (SCM smob, SCM port, scm_print_state*)
 {
+  (void) smob;                 // smother warning.
   scm_puts ("#<Tweak_registry>", port); 
   return 1;
 }