* 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.
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.
SCM coding_vector_;
SCM coding_table_;
- SCM coding_permutation_;
+ SCM coding_mapping_;
SCM coding_description_;
friend SCM ly_font_encoding(SCM);
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;
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_);
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_);
}
}
(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));
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
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)
(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))
(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)
(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)