Change merged from Pace repository:

> Summary:
>   Merged changes from branch tree
>   Reversed previous change
> Detail:
>
> * Merged a few changes/fixes from the Unicode library in
>  branch's tree.
>
> * Reversed Steve's change from version 0.50. The change wasn't
>  necessary, and with the changed definition of NOT_USED in this
>  version, it compiles fine with cc 5.45.
>
> * Small comment change in unix.c. It now states that the file
>  isn't equivalent to any in the branch tree.
>
> Admin:
>   Built and briefly tested using TextConv utility on Risc PC.

Version 0.52. Tagged as 'Unicode-0_52'

VersionNum

-/* (0.51)
+/* (0.52)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        0.51
+#define Module_MajorVersion_CMHG        0.52
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                02 Jul 2003
+#define Module_Date_CMHG                05 Mar 2004
 
-#define Module_MajorVersion             "0.51"
-#define Module_Version                  51
+#define Module_MajorVersion             "0.52"
+#define Module_Version                  52
 #define Module_MinorVersion             ""
-#define Module_Date                     "02 Jul 2003"
+#define Module_Date                     "05 Mar 2004"
 
-#define Module_ApplicationDate          "02-Jul-03"
+#define Module_ApplicationDate          "05-Mar-04"
 
 #define Module_ComponentName            "Unicode"
 #define Module_ComponentPath            "RiscOS/Sources/Lib/Unicode"
 
-#define Module_FullVersion              "0.51"
-#define Module_HelpVersion              "0.51 (02 Jul 2003)"
-#define Module_LibraryVersionInfo       "0:51"
+#define Module_FullVersion              "0.52"
+#define Module_HelpVersion              "0.52 (05 Mar 2004)"
+#define Module_LibraryVersionInfo       "0:52"

c/encoding

@@ -48,7 +48,9 @@
 #include "iso3166.h"
 #include "languages.h"
 
-#include "VersionNum"
+#ifndef Module_Version
+#  include "VersionNum"
+#endif
 
 /* ----------------------------------------------------------------------------- */
 
@@ -90,13 +92,20 @@ static EncList enclist[] =
                           "\x1B\x24\x2B\x44"
                               "\x1B\x22\x43"
                               "\x1B\x20\x5C", NULL },
-
+ {   csKSC56011987, /* 36 - note this is really the same as EUC */
+     2,
+     "/KS_C_5601-1987/ISO-IR-149/KOREAN/KS_C_5601/KS_C_5601_1987/KS_C_5601-1989/KSC_5601/KSC5601/",
+     lang_KOREAN,
+     &enc_iso2022_euc,
+     "\x1B\x24\x29\x43",                       /* Select G1 = KS X 1001 */
+     NULL
+ },
  {   csISO2022KR /* 37 */, 3, "/ISO-2022-KR/", lang_KOREAN, &enc_iso2022_shifts, NULL,
 	        "\x1B\x28\x42"     /* ISO 646-IRV */
 		"\x1B\x24\x29\x43" /* KS X 1001 */
 		/* "\x1B\x20\x41" G0 & G1 are used. SI invokes G0, SO invokes G1 */
  },
- {   csEUCKR  /* 38 */, 0, "/EUC-KR/", lang_KOREAN, &enc_iso2022_euc,
+ {   csEUCKR  /* 38 */, 2, "/EUC-KR/", lang_KOREAN, &enc_iso2022_euc,
 		"\x1B\x24\x29\x43", NULL },			/* Select G1 = KS X 1001 */
  {   csISO2022JP /* 39 */, 0, "/ISO-2022-JP/JIS_Encoding/", lang_JAPANESE, &enc_iso2022_shifts, NULL,
                 "\x1B\x28\x42"  /* ASCII      */
@@ -370,7 +379,7 @@ static void encoding_table_free(encoding_table t)
 void encoding_initialise(void)
 {
     enc_table_list = NULL;
-    (void) version;
+    NOT_USED( version );
 }
 
 void encoding_tidyup(void)

c/iso2022

@@ -398,6 +398,11 @@ static int iso2022_reset(Encoding *e, int for_encoding)
 	unsigned int n = strlen(e->list_entry->preload);
 	if (n != e->read(e, NULL, (unsigned char *)e->list_entry->preload, n, NULL))
 	    return 0;
+
+        /* if we've preloaded then we need to disable further escape
+         * sequences otherwise stray control sequences (eg 8E, 8F)
+         * will try and switch tables */
+        i->esc_disabled = 1;
     }
 
     if (for_encoding != encoding_READ)

c/unix

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* > unix.c (layers/unix/unicode/encodingmap.c in branched tree) */
+/* > unix.c (Not in branched tree) */
 
 /**************************************************************************/
 /*                                                                        */