--- JSON-XS/XS.xs	2007/04/11 12:23:02	1.28
+++ JSON-XS/XS.xs	2007/05/09 16:10:37	1.30
@@ -12,13 +12,14 @@
 #endif
 
 #define F_ASCII        0x00000001UL
-#define F_UTF8         0x00000002UL
-#define F_INDENT       0x00000004UL
-#define F_CANONICAL    0x00000008UL
-#define F_SPACE_BEFORE 0x00000010UL
-#define F_SPACE_AFTER  0x00000020UL
-#define F_ALLOW_NONREF 0x00000080UL
-#define F_SHRINK       0x00000100UL
+#define F_LATIN1       0x00000002UL
+#define F_UTF8         0x00000004UL
+#define F_INDENT       0x00000008UL
+#define F_CANONICAL    0x00000010UL
+#define F_SPACE_BEFORE 0x00000020UL
+#define F_SPACE_AFTER  0x00000040UL
+#define F_ALLOW_NONREF 0x00000100UL
+#define F_SHRINK       0x00000200UL
 #define F_MAXDEPTH     0xf8000000UL
 #define S_MAXDEPTH     27
 
@@ -182,7 +183,7 @@
                   if (uch > 0x10FFFFUL)
                     croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
 
-                  if (uch < 0x80 || enc->flags & F_ASCII)
+                  if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
                     {
                       if (uch > 0xFFFFUL)
                         {
@@ -206,6 +207,11 @@
 
                       str += clen;
                     }
+                  else if (enc->flags & F_LATIN1)
+                    {
+                      *enc->cur++ = uch;
+                      str += clen;
+                    }
                   else if (is_utf8)
                     {
                       need (enc, len += clen);
@@ -516,12 +522,12 @@
   SvPOK_only (enc.sv);
   encode_sv (&enc, scalar);
 
-  if (!(flags & (F_ASCII | F_UTF8)))
-    SvUTF8_on (enc.sv);
-
   SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
   *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
 
+  if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
+    SvUTF8_on (enc.sv);
+
   if (enc.flags & F_SHRINK)
     shrink (enc.sv);
 
@@ -984,6 +990,7 @@
   dec_t dec;
   SV *sv;
 
+  SvGETMAGIC (string);
   SvUPGRADE (string, SVt_PV);
 
   if (flags & F_UTF8)
@@ -1065,6 +1072,7 @@
 SV *ascii (SV *self, int enable = 1)
 	ALIAS:
         ascii        = F_ASCII
+        latin1       = F_LATIN1
         utf8         = F_UTF8
         indent       = F_INDENT
         canonical    = F_CANONICAL