--- JSON-XS/XS.xs	2007/04/06 21:17:09	1.26
+++ 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
 
@@ -33,7 +34,6 @@
 #define INIT_SIZE   32 // initial scalar size to be allocated
 #define INDENT_STEP 3  // spaces per indentation level
 
-#define UTF8_MAX_LEN      11 // for perls UTF-X: max. number of octets per character
 #define SHORT_STRING_LEN 512 // special-case strings of up to this size
 
 #define SB do {
@@ -111,7 +111,7 @@
       STRLEN cur = enc->cur - SvPVX (enc->sv);
       SvGROW (enc->sv, cur + len + 1);
       enc->cur = SvPVX (enc->sv) + cur;
-      enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);
+      enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
     }
 }
 
@@ -183,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)
                         {
@@ -207,6 +207,11 @@
 
                       str += clen;
                     }
+                  else if (enc->flags & F_LATIN1)
+                    {
+                      *enc->cur++ = uch;
+                      str += clen;
+                    }
                   else if (is_utf8)
                     {
                       need (enc, len += clen);
@@ -218,7 +223,7 @@
                     }
                   else
                     {
-                      need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
+                      need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
                       enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
                       ++str;
                     }
@@ -517,10 +522,11 @@
   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);
@@ -602,7 +608,7 @@
 
   do
     {
-      char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
+      char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
       char *cur = buf;
 
       do
@@ -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