diff --git a/lib/modules/Locale.pmod/Charset.pmod/module.pmod b/lib/modules/Locale.pmod/Charset.pmod/module.pmod index d07a8d78d71c0ab01f8063013592b800cfc7075b..48f2d87275113ea708b5690bb0fbf4c18e96c0c0 100644 --- a/lib/modules/Locale.pmod/Charset.pmod/module.pmod +++ b/lib/modules/Locale.pmod/Charset.pmod/module.pmod @@ -91,7 +91,9 @@ static private inherit _Charset; //! @item 1257 //! @item 1258 //! These may be prefixed with @expr{"cp"@}, @expr{"ibm"@}, -//! @expr{"ms"@} or @expr{"windows"@}. +//! @expr{"ms"@} or @expr{"windows"@} +//! @item mysql-latin1 +//! The default charset in MySQL, similar to @expr{cp1252@}. //! @endul //! //! +359 more. diff --git a/src/modules/_Charset/misc.c b/src/modules/_Charset/misc.c index a66acd97dff8eebdf98608b0b56d97ae06fdc312..af9c578e76e3b9e060e65c16992117e4a8503faa 100644 --- a/src/modules/_Charset/misc.c +++ b/src/modules/_Charset/misc.c @@ -2,7 +2,7 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: misc.c,v 1.18 2005/12/07 23:13:43 marcus Exp $ +|| $Id: misc.c,v 1.19 2006/08/12 01:57:30 mast Exp $ */ #include "global.h" @@ -1892,6 +1892,23 @@ static const p_wchar1 map_windows_1258[] = { 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x0301, 0x00ed, 0x00ee, 0x00ef, 0x0111, 0x00f1, 0x0323, 0x00f3, 0x00f4, 0x01a1, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x01b0, 0x20ab, 0x00ff, }; +static const p_wchar1 map_mysql_latin1[] = { + 0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, + 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f, + 0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, + 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178, + 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, + 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, + 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, + 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, + 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, + 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, + 0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, + 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, + 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, + 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, + 0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, + 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, }; static const struct { @@ -2038,6 +2055,7 @@ static const struct { { "macintoshcyr", map_macintosh_cyr, 128, 255 }, /* :: macintosh-cyr */ { "macroman", map_macintosh, 128, 255 }, /* :: macroman */ { "msansi", map_windows_1252, 128, 255 }, /* :: ms-ansi */ + { "mysqllatin1", map_mysql_latin1, 128, 255 }, /* :: mysql-latin1 */ { "naplps", map_ANSI_X3_110_1983, 33, 255 }, /* :: naplps */ { "ncnc001081", map_NC_NC00_10_81, 36, 127 }, /* :: nc_nc00-10:81 */ { "pc850multilingual", map_IBM850, 128, 255 },