Index: /trunk/ccl/level-1/l1-streams.lisp
===================================================================
--- /trunk/ccl/level-1/l1-streams.lisp	(revision 6537)
+++ /trunk/ccl/level-1/l1-streams.lisp	(revision 6538)
@@ -395,5 +395,5 @@
   (encoding nil)
   (pending-byte-order-mark nil)
-  (literal-char-code-limit 256)
+  (decode-literal-code-unit-limit 256)
   (encode-output-function nil)
   (decode-input-function nil)
@@ -412,5 +412,5 @@
   (line-termination nil)
   (unread-char-function 'ioblock-no-char-input)
-  (reserved2 nil)
+  (encode-literal-char-code-limit 256)
   (reserved3 nil))
 
@@ -1152,5 +1152,5 @@
               (declare (type (unsigned-byte 8) 1st-unit))
             (if (< 1st-unit
-                   (the (mod #x110000) (ioblock-literal-char-code-limit ioblock)))
+                   (the (mod #x110000) (ioblock-decode-literal-code-unit-limit ioblock)))
               (%code-char 1st-unit)
               (funcall (ioblock-decode-input-function ioblock)
@@ -1182,5 +1182,5 @@
               (declare (type (unsigned-byte 16) 1st-unit))
             (if (< 1st-unit
-                   (the (mod #x110000) (ioblock-literal-char-code-limit ioblock)))
+                   (the (mod #x110000) (ioblock-decode-literal-code-unit-limit ioblock)))
               (code-char 1st-unit)
               (funcall (ioblock-decode-input-function ioblock)
@@ -1212,5 +1212,5 @@
               (declare (type (unsigned-byte 16) 1st-unit))
             (if (< 1st-unit
-                   (the (mod #x110000) (ioblock-literal-char-code-limit ioblock)))
+                   (the (mod #x110000) (ioblock-decode-literal-code-unit-limit ioblock)))
               (code-char 1st-unit)
               (funcall (ioblock-decode-input-function ioblock)
@@ -1242,5 +1242,5 @@
               (declare (type (unsigned-byte 16) 1st-unit))
             (if (< 1st-unit
-                   (the (mod #x110000) (ioblock-literal-char-code-limit ioblock)))
+                   (the (mod #x110000) (ioblock-decode-literal-code-unit-limit ioblock)))
               (code-char 1st-unit)
               (funcall (ioblock-decode-input-function ioblock)
@@ -1272,5 +1272,5 @@
               (declare (type (unsigned-byte 16) 1st-unit))
             (if (< 1st-unit
-                   (the (mod #x110000) (ioblock-literal-char-code-limit ioblock)))
+                   (the (mod #x110000) (ioblock-decode-literal-code-unit-limit ioblock)))
               (code-char 1st-unit)
               (funcall (ioblock-decode-input-function ioblock)
@@ -1861,5 +1861,5 @@
   (let* ((code (char-code char)))
     (declare (type (mod #x110000) code))
-    (if (< code (the fixnum (ioblock-literal-char-code-limit ioblock)))
+    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
       (%ioblock-write-u8-element ioblock code)
       (funcall (ioblock-encode-output-function ioblock)
@@ -1885,5 +1885,5 @@
   (do* ((i 0 (1+ i))
         (col (ioblock-charpos ioblock))
-        (limit (ioblock-literal-char-code-limit ioblock))
+        (limit (ioblock-encode-literal-char-code-limit ioblock))
         (encode-function (ioblock-encode-output-function ioblock))
         (start-char start-char (1+ start-char)))
@@ -1912,5 +1912,5 @@
   (let* ((code (char-code char)))
     (declare (type (mod #x110000) code))
-    (if (< code (the fixnum (ioblock-literal-char-code-limit ioblock)))
+    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
       (%ioblock-write-u16-code-unit ioblock code)
       (funcall (ioblock-encode-output-function ioblock)
@@ -1939,5 +1939,5 @@
   (do* ((i 0 (1+ i))
         (col (ioblock-charpos ioblock))
-        (limit (ioblock-literal-char-code-limit ioblock))
+        (limit (ioblock-encode-literal-char-code-limit ioblock))
         (encode-function (ioblock-encode-output-function ioblock))
         (start-char start-char (1+ start-char)))
@@ -1962,5 +1962,5 @@
   (let* ((code (char-code char)))
     (declare (type (mod #x110000) code))
-    (if (< code (the fixnum (ioblock-literal-char-code-limit ioblock)))
+    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
       (%ioblock-write-swapped-u16-code-unit ioblock code)
       (funcall (ioblock-encode-output-function ioblock)
@@ -1985,5 +1985,5 @@
   (do* ((i 0 (1+ i))
         (col (ioblock-charpos ioblock))
-        (limit (ioblock-literal-char-code-limit ioblock))
+        (limit (ioblock-encode-literal-char-code-limit ioblock))
         (encode-function (ioblock-encode-output-function ioblock))
         (wcf (ioblock-write-char-when-locked-function ioblock))
@@ -2015,5 +2015,5 @@
   (let* ((code (char-code char)))
     (declare (type (mod #x110000 code)))
-    (if (< code (the fixnum (ioblock-literal-char-code-limit ioblock)))
+    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
       (%ioblock-write-u32-code-unit ioblock code)
       (funcall (ioblock-encode-output-function ioblock)
@@ -2041,5 +2041,5 @@
   (do* ((i 0 (1+ i))
         (col (ioblock-charpos ioblock))
-        (limit (ioblock-literal-char-code-limit ioblock))
+        (limit (ioblock-encode-iteral-char-code-limit ioblock))
         (encode-function (ioblock-encode-output-function ioblock))
         (start-char start-char (1+ start-char)))
@@ -2065,5 +2065,5 @@
   (let* ((code (char-code char)))
     (declare (type (mod #x110000 code)))
-    (if (< code (the fixnum (ioblock-literal-char-code-limit ioblock)))
+    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
       (%ioblock-write-swapped-u32-code-unit ioblock code)
       (funcall (ioblock-encode-output-function ioblock)
@@ -2088,5 +2088,5 @@
   (do* ((i 0 (1+ i))
         (col (ioblock-charpos ioblock))
-        (limit (ioblock-literal-char-code-limit ioblock))
+        (limit (ioblock-encode-literal-char-code-limit ioblock))
         (encode-function (ioblock-encode-output-function ioblock))
         (start-char start-char (1+ start-char)))
@@ -3033,7 +3033,11 @@
       (setf (ioblock-owner ioblock) *current-process*))
     (setf (ioblock-encoding ioblock) encoding)
-    (setf (ioblock-literal-char-code-limit ioblock)
+    (setf (ioblock-decode-literal-code-unit-limit ioblock)
           (if encoding
-            (character-encoding-literal-char-code-limit encoding)
+            (character-encoding-decode-literal-code-unit-limit encoding)
+            256))
+    (setf (ioblock-encode-literal-char-code-limit ioblock)
+          (if encoding
+            (character-encoding-encode-literal-char-code-limit encoding)
             256))
     (when insize
Index: /trunk/ccl/level-1/l1-unicode.lisp
===================================================================
--- /trunk/ccl/level-1/l1-unicode.lisp	(revision 6537)
+++ /trunk/ccl/level-1/l1-unicode.lisp	(revision 6538)
@@ -87,5 +87,5 @@
 
   ;; Code units less than this value map to themselves on input.
-  (literal-char-code-limit 0)
+  (decode-literal-code-unit-limit 0)
 
   ;; Does a byte-order-mark determine the endianness of input ?
@@ -263,5 +263,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit 256
+  :decode-literal-code-unit-limit 256
   :encode-literal-char-code-limit 256
   )
@@ -349,5 +349,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit 128
+  :decode-literal-code-unit-limit 128
   :encode-literal-char-code-limit 128
   )
@@ -523,5 +523,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0
   )
@@ -702,5 +702,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -874,5 +874,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -1026,5 +1026,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0
   )
@@ -1175,5 +1175,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -1355,5 +1355,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -1521,5 +1521,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -1664,5 +1664,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xd0
+  :decode-literal-code-unit-limit #xd0
   :encode-literal-char-code-limit #xa0
   )
@@ -1814,5 +1814,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -1924,5 +1924,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -2094,5 +2094,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -2303,5 +2303,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -2463,5 +2463,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -2644,5 +2644,5 @@
   :length-of-memory-encoding-function 
   #'8-bit-fixed-width-length-of-memory-encoding
-  :literal-char-code-limit #xa0
+  :decode-literal-code-unit-limit #xa0
   :encode-literal-char-code-limit #xa0  
   )
@@ -3015,5 +3015,5 @@
              (return (values nchars i))
              (setq nchars (1+ nchars) i nexti))))))
-    :literal-char-code-limit #x80
+    :decode-literal-code-unit-limit #x80
   :encode-literal-char-code-limit #x80    
     :bom-encoding #(#xef #xbb #xbf)
@@ -3295,5 +3295,5 @@
              (return (values nchars i))
              (setq i nexti nchars (1+ nchars)))))))
-    :literal-char-code-limit #xd800  
+    :decode-literal-code-unit-limit #xd800  
     :encode-literal-char-code-limit #x10000
     :nul-encoding #(0 0)
@@ -3459,5 +3459,5 @@
            (return (values nchars i))
            (setq i nexti nchars (1+ nchars)))))))
-  :literal-char-code-limit #xd800
+  :decode-literal-code-unit-limit #xd800
   :encode-literal-char-code-limit #x10000
   :nul-encoding #(0 0)
@@ -3671,5 +3671,5 @@
                    2
                    4)))))))
-  :literal-char-code-limit #xd800
+  :decode-literal-code-unit-limit #xd800
   :encode-literal-char-code-limit #x10000  
   :use-byte-order-mark
@@ -3797,5 +3797,5 @@
      (declare (ignore pointer))
      (values (floor noctets 2) (+ start noctets))))
-  :literal-char-code-limit #x10000
+  :decode-literal-code-unit-limit #x10000
   :encode-literal-char-code-limit #x10000  
   :nul-encoding #(0 0)
@@ -3896,5 +3896,5 @@
      (declare (ignore pointer))
      (values (floor noctets 2) (+ start noctets))))
-  :literal-char-code-limit #x10000
+  :decode-literal-code-unit-limit #x10000
   :encode-literal-char-code-limit #x10000
   :nul-encoding #(0 0)
@@ -4017,5 +4017,5 @@
           (decf noctets 2))))
      (values (floor noctets 2) (+ start noctets))))
-  :literal-char-code-limit #x10000
+  :decode-literal-code-unit-limit #x10000
   :encode-literal-char-code-limit #x10000  
   :use-byte-order-mark
@@ -4203,5 +4203,5 @@
      (declare (ignore pointer))
      (values (floor noctets 4) (+ start noctets))))
-  :literal-char-code-limit #x110000
+  :decode-literal-code-unit-limit #x110000
   :encode-literal-char-code-limit #x110000
   :nul-encoding #(0 0 0 0)
@@ -4301,5 +4301,5 @@
      (declare (ignore pointer))
      (values (floor noctets 4) (+ start noctets))))
-  :literal-char-code-limit #x110000
+  :decode-literal-code-unit-limit #x110000
   :encode-literal-char-code-limit #x110000
   :nul-encoding #(0 0 0 0)  
@@ -4422,5 +4422,5 @@
           (decf noctets 4))))
      (values (floor noctets 4) (+ start noctets))))
-  :literal-char-code-limit #x110000
+  :decode-literal-code-unit-limit #x110000
   :encode-literal-char-code-limit #x110000  
   :use-byte-order-mark