gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add osx compatibility option

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29067 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-11-26 22:15:39 +00:00
parent 3992cde903
commit 48499df0dd
1 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
Source/NSPropertyList.m
View file

@ -1574,6 +1574,9 @@ XString(NSString* obj, NSMutableData *output)
unsigned len;
unsigned rpos;
unsigned wpos;
BOOL osx;
osx = GSPrivateDefaultsFlag(GSMacOSXCompatible);
base = NSAllocateCollectable(sizeof(unichar) * end, 0);
[obj getCharacters: base];
@ -1598,7 +1601,14 @@ XString(NSString* obj, NSMutableData *output)
if ((c < 0x20 && (c != 0x09 && c != 0x0A && c != 0x0D))
|| (c > 0xD7FF && c < 0xE000) || c > 0xFFFD)
{
len += 6;
if (osx)
{
len += 8; // Illegal in XML
}
else
{
len += 6; // Non-standard escape
}
}
else
{
@ -1653,18 +1663,40 @@ XString(NSString* obj, NSMutableData *output)
if ((c < 0x20 && (c != 0x09 && c != 0x0A && c != 0x0D))
|| (c > 0xD7FF && c < 0xE000) || c > 0xFFFD)
{
/* We need to be able to encode characters in a
* property list which are illegal in XML (even
* when encoded as numeric entities with the
* &#...; format. So we use the same \Uxxxx
* format is in old style property lists.
*/
map[wpos++] = '\\';
map[wpos++] = 'U';
map[wpos++] = hexdigits[(c>>12) & 0xf];
map[wpos++] = hexdigits[(c>>8) & 0xf];
map[wpos++] = hexdigits[(c>>4) & 0xf];
map[wpos++] = hexdigits[c & 0xf];
if (osx)
{
/* Use XML style character entity references for
* OSX compatibility, even though this is an
* illegal character code and a standards complient
* XML parser will barf when it tries to read it.
* The OSX property list parser does not implement
* the XML standard and accepts at least some
* illegal characters.
*/
map[wpos++] = '&';
map[wpos++] = '#';
map[wpos++] = 'x';
map[wpos++] = hexdigits[(c>>12) & 0xf];
map[wpos++] = hexdigits[(c>>8) & 0xf];
map[wpos++] = hexdigits[(c>>4) & 0xf];
map[wpos++] = hexdigits[c & 0xf];
map[wpos++] = ';';
}
else
{
/* We need to be able to encode characters in a
* property list which are illegal in XML (even
* when encoded as numeric entities with the
* &#...; format. So we use the same \Uxxxx
* format is in old style property lists.
*/
map[wpos++] = '\\';
map[wpos++] = 'U';
map[wpos++] = hexdigits[(c>>12) & 0xf];
map[wpos++] = hexdigits[(c>>8) & 0xf];
map[wpos++] = hexdigits[(c>>4) & 0xf];
map[wpos++] = hexdigits[c & 0xf];
}
}
else
{