Initial support for external-formats for encoding foreign strings

[uffi.git] / src / i18n.lisp

diff --git a/src/i18n.lisp b/src/i18n.lisp
index a42944451c627f8c14e2a49636de5cfa933ff9db..1d5ec0ab082b6c1490d1b54a5bfcab15a48b3e7b 100644 (file)
--- a/src/i18n.lisp
+++ b/src/i18n.lisp
@@ -18,13 +18,13 @@
       (and openmcl openmcl-unicode-strings))
 (pushnew 'no-i18n cl:*features*)
 
-(defvar *default-external-character-encoding*
+(defvar *default-external-format*
   nil
-  "Normalized name of default external character encoding to use
+  "Normalized name of default external character format to use
 for foreign string conversions. nil means use implementation default
 encoding.")
 
-(defvar *external-encoding-mapping*
+(defvar *external-format-mapping*
     #+(and lispworks unicode)
     '((:ascii . :ascii) (:latin-1 . :latin-1) (:ucs-2 . :unicode)
       (:utf-8 . :utf-8) (:jis . :jis) (:sjis . :sjis) (:gbk . :gbk))
@@ -42,16 +42,18 @@ encoding.")
       (:gbk . charset:gbk) (:euc-jp . charset:euc-jp))
     #+(and openmcl openmcl-unicode-strings)
     '((:ascii . :ascii) (:latin-1 . :iso-8859-1) (:utf-8 . :utf-8)
-      (:ucs-2 . :ucs-2) (:euc-jp . :euc-jp))
+      (:ucs-2 . :ucs-2)
+      #+nil (:euc-jp . :euc-jp)
+      )
     #-(or (and lispworks unicode) (and sbcl sb-unicode)
           (and allegro ics) (and clisp unicode)
           (and openmcl openmcl-unicode-strings))
     nil
-  "Mapping between normalized external encoding name and implementation name.")
+  "Mapping between normalized external format name and implementation name.")
 
-(defvar *external-character-encodings*
-  (mapcar 'car *external-encoding-mapping*)
-  "List of normalized names of external encodings support by underlying implementation.")
+(defvar *external-formats*
+  (mapcar 'car *external-format-mapping*)
+  "List of normalized names of external formats support by underlying implementation.")
 
-(defun map-normalized-external-encoding (normalized)
-  (cdr (assoc normalized *external-encoding-mapping* :test 'eql)))
+(defun map-normalized-external-format (normalized)
+  (cdr (assoc normalized *external-format-mapping* :test 'eql)))