From 001265dfaaf8c2b7cb0ea55e63abd1d78e481fdb Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 7 Apr 2004 13:45:42 +0000 Subject: [PATCH] * lily/scaled-font-metric.cc (derived_mark): idem. * lily/scaled-font-metric.cc (derived_mark): is a const method. (Modified_font_metric): make alist for coding_description_ (LY_DEFINE): remove coding-name. * lily/scaled-font-metric.cc (ly_font_encoding): return vector * lily/my-lily-lexer.cc (set_identifier): remove gh_scm2newstr use. --- lily/my-lily-lexer.cc | 4 ++-- lily/scaled-font-metric.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index c1934df8de..d957e4b3de 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -173,7 +173,7 @@ My_lily_lexer::start_main_input () void My_lily_lexer::set_identifier (SCM name, SCM s) { - assert (gh_string_p (name)); + assert (ly_string_p (name)); if (lookup_keyword (ly_scm2string (name)) >= 0) { @@ -181,7 +181,7 @@ My_lily_lexer::set_identifier (SCM name, SCM s) } SCM sym = scm_string_to_symbol (name); - SCM mod = gh_car (scopes_); + SCM mod = ly_car (scopes_); scm_module_define (mod, sym, s); } diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc index eee3027ec4..3ee8ef8c67 100644 --- a/lily/scaled-font-metric.cc +++ b/lily/scaled-font-metric.cc @@ -262,7 +262,7 @@ Modified_font_metric::text_dimension (String text) Box char_box; - if (!gh_symbol_p (sym)) + if (!ly_symbol_p (sym)) continue; char const * chars = SCM_SYMBOL_CHARS(sym); -- 2.39.5