Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / text-metrics.hh

diff --git a/lily/include/text-metrics.hh b/lily/include/text-metrics.hh
index 8cf63713e40276e8524de0cae13e8ac738fe58d1..fa4dac15135b308edf4105e545468ae9ab5359c7 100644 (file)
--- a/lily/include/text-metrics.hh
+++ b/lily/include/text-metrics.hh
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TEXT_METRICS_HH
@@ -13,10 +12,10 @@
 #include "lily-guile.hh"
 #include "box.hh"
 
-void try_load_text_metrics (String);
+void try_load_text_metrics (string);
 SCM ly_load_text_dimensions (SCM);
 Box lookup_tex_text_dimension (Font_metric *font,
-                          SCM text);
+                              SCM text);
 
 #endif /* TEXT_METRICS_HH */