* 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.

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c1934df8de16791ec3a54e96176996f662282540..d957e4b3defdf291f19b763fcd1c4c3dcfa22e94 100644 (file)
--- 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 eee3027ec467f417f877641e32c1ce4f17985dd0..3ee8ef8c6706767ba790a1cdd79751faf419d4c6 100644 (file)
--- 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);