* lily/scaled-font-metric.cc (derived_mark): idem.

* scm/encoding.scm (make-encoding-mapping): change permutation to mapping.

* lily/scaled-font-metric.cc (derived_mark): is a const method.
(Modified_font_metric): make alist for coding_description_
(LY_DEFINE): remove coding-name.

* scm/output-tex.scm (text): remove debugging code.

* lily/scaled-font-metric.cc (ly_font_encoding): return vector

* scm/encoding.scm (read-encoding-file): use symbol for glyph
name.

diff --git a/ChangeLog b/ChangeLog
index 292dec9942c5cc4cff73938cca9cdbc386ec4284..71467515f2ae32b874fbb6b54e4e58a5dafe86c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-04-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/scaled-font-metric.cc (derived_mark): idem.
+
+       * scm/encoding.scm (make-encoding-mapping): change permutation to mapping.
+
        * lily/scaled-font-metric.cc (derived_mark): is a const method.
        (Modified_font_metric): make alist for coding_description_
        (LY_DEFINE): remove coding-name.

diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh
index c5d9a3bf056e1c4c5e4600984c211a738ac5804e..4a37f4152ceb90538ebd7bd38aa1db89e0edf521 100644 (file)
--- a/lily/include/scaled-font-metric.hh
+++ b/lily/include/scaled-font-metric.hh
@@ -30,7 +30,7 @@ protected:
   
   SCM coding_vector_;
   SCM coding_table_;
-  SCM coding_permutation_;
+  SCM coding_mapping_;
   SCM coding_description_;
   friend SCM ly_font_encoding(SCM);
     

diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc
index 72e0e752450a3e8aaeef7a0e5db214219182b952..f916996c4b4e183bdcd0015f1bb1254fa8660212 100644 (file)
--- a/lily/scaled-font-metric.cc
+++ b/lily/scaled-font-metric.cc
@@ -17,7 +17,7 @@
 Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real magn)
 {
   coding_vector_ = SCM_EOL;
-  coding_permutation_ = SCM_EOL;
+  coding_mapping_ = SCM_EOL;
   coding_table_ = SCM_EOL;
   coding_description_ = SCM_EOL;
   
@@ -49,7 +49,7 @@ Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real
       coding_table_ = scm_call_1 (ly_scheme_function ("get-coding-table"),
                                  scm_makfrom0str (orig_->coding_scheme ().to_str0 ()));
          
-      coding_permutation_  = scm_call_2 (ly_scheme_function ("make-encoding-permutation"),
+      coding_mapping_  = scm_call_2 (ly_scheme_function ("make-encoding-mapping"),
                                         coding_vector_,
                                         coding_table_);
 
@@ -68,8 +68,8 @@ Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real
                                       coding_table_,
                                       coding_description_);
       
-      coding_description_ = scm_acons (ly_symbol2scm ("coding-permutation"),
-                                      coding_permutation_,
+      coding_description_ = scm_acons (ly_symbol2scm ("char-mapping"),
+                                      coding_mapping_,
                                       coding_description_);
     } 
 }
@@ -81,7 +81,7 @@ LY_DEFINE (ly_font_encoding, "ly:font-encoding-alist",
           (SCM font),
           "Given the Modified_font_metric @var{font}, return an "
           "alist. Keys are input-name, input-vector, "
-          "output-name, output-table, permutation.")
+          "output-name, output-table, mapping.")
 {
   Modified_font_metric *fm
     = dynamic_cast<Modified_font_metric*> (unsmob_metrics (font));
@@ -160,7 +160,7 @@ Modified_font_metric::derived_mark () const
   scm_gc_mark (coding_vector_);
   scm_gc_mark (coding_description_);
   scm_gc_mark (coding_table_);
-  scm_gc_mark (coding_permutation_);
+  scm_gc_mark (coding_mapping_);
 }
 
 Box

diff --git a/scm/encoding.scm b/scm/encoding.scm
index c4d54b3660796bfb81f81b5c997c12f3cc338ebc..254086cf6126f2c76f7400474d6a0041b3c97d45 100644 (file)
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -36,14 +36,14 @@ vector of symbols."
 
     h))
 
-(define-public (reencode-string permutation str)
-  "Apply PERMUTATION, a vector of [0..256) -> char, to STR"
+(define-public (reencode-string mapping str)
+  "Apply MAPPING, a vector of [0..256) -> char, to STR"
   (string-map (lambda (chr)
-               (vector-ref permutation (char->integer chr)))
+               (vector-ref mapping (char->integer chr)))
              str))
 
-(define-public (make-encoding-permutation input-encoding output-encoding)
-  "Contruct a permutation by applying output-encoding after input-encoding "
+(define-public (make-encoding-mapping input-encoding output-encoding)
+  "Contruct a mapping by applying output-encoding after input-encoding "
   (list->vector
    (map
     (lambda (byte)

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 881034ef1ad707e6900d03c9d9ce59d5165f58a5..7358bd8666e1018f5f09e56773348f70ab37bc5d 100644 (file)
--- 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))
-          (coding (ly:font-encoding font))
-          (encoding (vector-ref coding 2))
+          (coding-alist (ly:font-encoding-alist font))
+          (encoding (assoc-get 'input-name coding-alist ))
           (designsize (ly:font-design-size font))
           (magnification (* (ly:font-magnification font)))
           (ops (ly:paper-lookup paper 'outputscale))
@@ -217,7 +217,6 @@
         (newline)
         (format (current-error-port) "fontname ~S\n" fontname)
         (format (current-error-port) "command ~S\n" command)
-        (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)

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index e42dcc636cf70a976cc7e871b65dfe7dcb15ca0b..3e6770201a9b3e05d39c6cf3bae214bb6fb1fa67 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -312,8 +312,9 @@
 
 (define (text font s)
   (let*
-      ((perm (vector-ref (ly:font-encoding font) 4)))
-    
+      ((perm (assoc-get  'mapping (ly:font-encoding-alist font))))
+
+    (display (ly:font-encoding-alist font))
     (string-append "\\hbox{\\" (font-command font) "{}"
                   (output-tex-string
                    (if (vector? perm)