From d6da43d125a88ffe95c1d4c1d340b466af6ffad8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 7 Apr 2004 12:31:12 +0000 Subject: [PATCH] * lily/scaled-font-metric.cc (derived_mark): is a const method. * lily/scaled-font-metric.cc (ly_font_encoding): return vector --- lily/font-metric.cc | 2 +- lily/include/scaled-font-metric.hh | 2 +- lily/scaled-font-metric.cc | 6 ++++-- scm/output-ps.scm | 7 ++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 1042844c06..578824b084 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -97,7 +97,7 @@ Font_metric::get_indexed_wxwy (int )const } void -Font_metric::derived_mark ()const +Font_metric::derived_mark () const { } diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh index 5abddcacd4..c5d9a3bf05 100644 --- a/lily/include/scaled-font-metric.hh +++ b/lily/include/scaled-font-metric.hh @@ -35,7 +35,7 @@ protected: friend SCM ly_font_encoding(SCM); virtual Real design_size () const; - virtual void derived_mark (); + virtual void derived_mark () const; virtual Box get_indexed_char (int) const; virtual int index_to_ascii (int) const; virtual Box get_ascii_char (int) const; diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc index 6cab0e8ce5..e62421300b 100644 --- a/lily/scaled-font-metric.cc +++ b/lily/scaled-font-metric.cc @@ -19,9 +19,11 @@ Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real coding_vector_ = SCM_EOL; coding_permutation_ = SCM_EOL; coding_table_ = SCM_EOL; - coding_permutation_ = SCM_EOL; + coding_description_ = SCM_EOL; + coding_scheme_ = coding; magnification_ = magn; + SCM desc = m->description_; Real total_mag = magn * gh_scm2double (ly_cdr (desc)); @@ -130,7 +132,7 @@ Modified_font_metric::coding_scheme () const } void -Modified_font_metric::derived_mark () +Modified_font_metric::derived_mark () const { scm_gc_mark (coding_vector_); scm_gc_mark (coding_description_); diff --git a/scm/output-ps.scm b/scm/output-ps.scm index dfbcf74f17..f96051b08a 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -204,8 +204,8 @@ (let* ((command (font-command font)) (fontname (ly:font-name font)) (mangled (possibly-mangle-fontname fontname)) - ;;(encoding (assoc-get fontname font-encoding-alist)) - (encoding (ly:font-coding-name font)) + (coding (ly:font-encoding font)) + (encoding (vector-ref coding 2)) (designsize (ly:font-design-size font)) (magnification (* (ly:font-magnification font))) (ops (ly:paper-lookup paper 'outputscale)) @@ -217,7 +217,8 @@ (newline) (format (current-error-port) "fontname ~S\n" fontname) (format (current-error-port) "command ~S\n" command) - (format (current-error-port) "encoding ~S\n" encoding) + (format (current-error-port) "encoding ~S\n" coding) + (format (current-error-port) "encoding name ~S\n" encoding) (format (current-error-port) "mangled ~S\n" mangled) (format (current-error-port) "designsize ~S\n" designsize) (format (current-error-port) "magnification ~S\n" magnification) -- 2.39.5