Minor fix.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15743 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-01-28 07:38:35 +00:00
parent 460cd690de
commit 17ac680236
5 changed files with 29 additions and 3 deletions

View file

@ -1,3 +1,10 @@
2003-01-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/Unicode.m: Fixed bug in utf-8 output for three
byte sequences.
* Tools/AGSOutput.m: Fix loss of trailing info after a closing
square bracket round a class name.
2003-01-26 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: Added new MacOS-X method ...

View file

@ -1978,7 +1978,10 @@ static NSString *endMarker = @"At end of incremental parse";
int newVal = (yesno == YES) ? 1 : 0;
xmlGetFeature((xmlParserCtxtPtr)lib, "substitute entities", (void*)&oldVal);
xmlSetFeature((xmlParserCtxtPtr)lib, "substitute entities", (void*)&newVal);
if (xmlSetFeature((xmlParserCtxtPtr)lib, "substitute entities",
(void*)&newVal) < 0)
[NSException raise: NSInternalInconsistencyException
format: @"Unable to set substituteEntities"];
return (oldVal == 1) ? YES : NO;
}

View file

@ -1571,7 +1571,7 @@ GSFromUnicode(unsigned char **dst, unsigned int *size, const unichar *src,
else
{
ptr[dpos++] = (u >> 12) | 0xe0;
ptr[dpos++] = (u >> 6) | 0x80;
ptr[dpos++] = ((u >> 6) & 0x3f) | 0x80;
ptr[dpos++] = (u & 0x3f) | 0x80;
}
}

View file

@ -1989,7 +1989,9 @@ NSLog(@"Element '%@' not implemented", name); // FIXME
{
if ([node type] == XML_TEXT_NODE)
{
[buf appendString: [node content]];
NSString *str = [node content];
[buf appendString: str];
}
else if ([node type] == XML_ENTITY_REF_NODE)
{

View file

@ -2080,6 +2080,20 @@ static BOOL snuggleStart(NSString *t)
cName, cName];
}
[a replaceObjectAtIndex: l withObject: ref];
if (ePos < [tmp length])
{
NSString *end = [tmp substringFromIndex: ePos];
if ([end isEqualToString: @"]"] == NO
&& [end hasPrefix: @"]"] == YES)
{
end = [end substringFromIndex: 1];
}
if ([end length] > 0)
{
[a insertObject: end atIndex: ++l];
}
}
}
}
continue;