X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fencoding.scm;h=c108066f789ad92eead52e4f72afa835beaf0e62;hb=abfdd3c36946e4c341b0abb0f1c6bbdbc12883c1;hp=c4d54b3660796bfb81f81b5c997c12f3cc338ebc;hpb=a1ac6142347beea8db846898b777b0e67cf9f83f;p=lilypond.git

diff --git a/scm/encoding.scm b/scm/encoding.scm
index c4d54b3660..c108066f78 100644
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -10,12 +10,14 @@
 ;;
 
 
-(define-public (read-encoding-file filename)
+(define-public (read-encoding-file file-name)
   "Read .enc file, return (COMMAND-NAME . VECTOR-OF-SYMBOLS)."
-  (let* ((raw (ly:kpathsea-gulp-file filename))
+  (let* ((path (ly:kpathsea-find-file file-name))
+	 (unused (if (string? path) #t (ly:warn "can't find ~s" file-name)))
+	 (raw (ly:gulp-file path))
 	 (string (regexp-substitute/global #f "%[^\n]*" raw 'pre "" 'post))
 	 (command (match:substring
-		(string-match "/([^ \t\n\r]*)[ \t\n\r]+[[]" string) 1))
+		   (string-match "/([^ \t\n\r]*)[ \t\n\r]*[[]" string) 1))
 	 (encoding (match:substring (string-match "[[](.*)[]]" string) 1))
 	 (ps-lst (string-tokenize encoding))
 	 (lst (map (lambda (x) (string->symbol (substring x 1))) ps-lst))
@@ -36,14 +38,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)
@@ -58,51 +60,68 @@ vector of symbols."
     (iota 256))))
 
 
-(define (get-coding-from-file filename)
-  "Read FILENAME, return a list containing encoding vector and table"
-   (let* ((coding (read-encoding-file filename))
-	  (com (car coding))
-	  (vec (cdr coding))
-	  (tab (make-encoding-table vec)))
-    (list com vec tab)))
+(define (get-coding-from-file file-name)
+  "Read FILE-NAME, return a list containing encoding vector and table"
+   (let* ((coding (read-encoding-file file-name))
+	  (command (car coding))
+	  (vector (cdr coding))
+	  (table (make-encoding-table vector)))
+    (list command vector table)))
 
-;; coding-alist maps NAME -> (list FILENAME COMMAND VECTOR TAB)
+;; coding-alist maps NAME -> (list FILE-NAME COMMAND VECTOR TAB)
 (define coding-alist
   
   (map (lambda (x)
 	 (cons (car x)
 	       (cons (cdr x) (delay (get-coding-from-file (cdr x))))))
-       
        '(
-	 ;; teTeX
-	 ("TeX typewriter text" . "09fbbfac.enc") ;; cmtt10
-	 ("TeX math symbols" . "10037936.enc") ;; cmbsy
-	 ("ASCII caps and digits" . "1b6d048e.enc") ;; cminch
-	 ("TeX math italic" . "aae443f0.enc")  ;; cmmi10
-	 ("TeX extended ASCII" . "d9b29452.enc")
-	 ("TeX text" . "f7b6d320.enc")
-	 ("TeX text without f-ligatures" . "0ef0afca.enc")
-	 ("Extended TeX Font Encoding - Latin" . "tex256.enc")
-	 
+	 ;; teTeX font (output) encodings
+	 ("TeX-typewriter-text" . "09fbbfac.enc") ;; cmtt10
+	 ("TeX-math-symbols" . "10037936.enc") ;; cmbsy
+	 ("ASCII-caps-and-digits" . "1b6d048e.enc") ;; cminch
+	 ("TeX-math-italic" . "aae443f0.enc")  ;; cmmi10
+	 ("TeX-extended-ASCII" . "d9b29452.enc")
+	 ("TeX-text" . "cmr.enc")
+	 ("TeX-text-without-f-ligatures" . "0ef0afca.enc")
+	 ("Extended-TeX-Font-Encoding---Latin" . "tex256.enc")
+	 ("AdobeStandardEncoding" . "8a.enc")
 	 ("T1" . "tex256.enc")
-
-	 ;; FIXME: find full Adobe; for testing -- almost Adobe:
-	 ("adobe" . "ad.enc")
-
-	 ("latin1" . "cork.enc")
+	 ("adobe" . "8a.enc")
+	 ;; EC-fonts-mftraced
+	 ("Extended-TeX-Font-Encoding---Latin" . "EC.enc")
+	 ;; lmodern, encoding flavour latin1
+	 ("cork-lm" . "cork-lm.enc")
 	 
-	 ;; LilyPond.
+	 ;; input encodings
+	 ("latin1" . "latin1.enc")
+	 ("cork" . "cork.enc")
+
+	 ;; LilyPond FETA music font
 	 ("fetaBraces" . "feta-braces-a.enc")
-	 ("fetaNumber" . "feta-nummer10.enc")
+	 ;;("fetaDynamic" . "feta-din10.enc")
+	 ;;("fetaNumber" . "feta-nummer10.enc")
+	 ("fetaDynamic" . "feta-alphabet20.enc")
+	 ("fetaNumber" . "feta-alphabet20.enc")
 	 ("fetaMusic" . "feta20.enc")
 	 ("parmesanMusic" . "parmesan20.enc"))
        ))
 
+;; FIXME: this is broken, cannot get font encoding from font/AFM file,
+;; should use encoding from font-tree in fonts.scm
 (define (get-coding coding-name)
   (let ((entry (assoc-get coding-name coding-alist)))
-    (cons (car entry) (force (cdr entry)))))
-
-(define-public (get-coding-filename coding-name)
+    (if entry
+	(cons (car entry) (force (cdr entry)))
+	(if (equal? coding-name "feta-music")
+	    (begin
+	      (ly:warn "installation problem: deprecated encoding requested: ~S" coding-name)
+	      (exit 1))
+	    (let ((fallback "latin1"))
+	      (ly:programming-error "no such encoding: ~S" coding-name)
+	      (ly:programming-error "programming error: cross thumbs, using: ~S:" fallback)
+	      (get-coding fallback))))))
+
+(define-public (get-coding-file-name coding-name)
   (car (get-coding coding-name)))
 
 (define-public (get-coding-command coding-name)
@@ -113,3 +132,19 @@ vector of symbols."
 
 (define-public (get-coding-table coding-name)
   (cadddr (get-coding coding-name)))
+
+
+(define-public (decode-byte-string encoding-name str)
+  "Return vector of glyphname symbols that correspond to string,
+assuming that STR is byte-coded using ENCODING-NAME."
+
+  (let* ((coding-vector (get-coding-vector encoding-name))
+	 (len (string-length str))
+	 (output-vector (make-vector len '.notdef)))
+
+    (do
+	((idx 0 (1+ idx)))
+	((>= idx len) output-vector)
+      (vector-set! output-vector idx
+		     (vector-ref coding-vector
+				 (char->integer (string-ref str idx)))))))