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

Fixups for libxml bug/feature

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16702 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-05-12 19:23:02 +00:00
parent 3cff27ca8e
commit 1d6f162285
6 changed files with 135 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tools/AGSHtml.m
View file

@ -774,7 +774,7 @@ static NSMutableSet *textNodes = nil;
NSString *text;
NSString *val;
text = [children content];
text = [children escapedContent];
val = [prop objectForKey: @"id"];
if (val == nil)
{
@ -847,7 +847,7 @@ static NSMutableSet *textNodes = nil;
{
if ([t type] == XML_TEXT_NODE)
{
NSString *content = [t content];
NSString *content = [t escapedContent];
if (content == nil) content = @"";
str = [str stringByAppendingString: content];
@ -1182,7 +1182,7 @@ static NSMutableSet *textNodes = nil;
NSString *text;
NSString *val;
text = [children content];
text = [children escapedContent];
val = [prop objectForKey: @"id"];
if (val == nil)
{
@ -1225,7 +1225,7 @@ static NSMutableSet *textNodes = nil;
{
if ([t type] == XML_TEXT_NODE)
{
NSString *content = [t content];
NSString *content = [t escapedContent];
if (content == nil) content = @"";
str = [str stringByAppendingString: content];
@ -1340,7 +1340,7 @@ static NSMutableSet *textNodes = nil;
{
if ([t type] == XML_TEXT_NODE)
{
NSString *content = [t content];
NSString *content = [t escapedContent];
if (content == nil) content = @"";
sel = [sel stringByAppendingString: content];
@ -1366,7 +1366,7 @@ static NSMutableSet *textNodes = nil;
{
if ([t type] == XML_TEXT_NODE)
{
NSString *content = [t content];
NSString *content = [t escapedContent];
if (content == nil) content = @"";
str = [str stringByAppendingString: content];
@ -2002,7 +2002,7 @@ NSLog(@"Element '%@' not implemented", name); // FIXME
{
if ([node type] == XML_TEXT_NODE)
{
NSString *str = [node content];
NSString *str = [node escapedContent];
if (str == nil) str = @"";
[buf appendString: str];
@ -2055,7 +2055,7 @@ NSLog(@"Element '%@' not implemented", name); // FIXME
[buf appendString: @"<dt><b>Conforms to:</b></dt>\n"];
while (node != nil && [[node name] isEqual: @"conform"] == YES)
{
NSString *text = [[node firstChild] content];
NSString *text = [[node firstChild] escapedContent];
if (text == nil) text = @"";
[buf appendString: indent];

4
Tools/autogsdoc.m
View file

@ -1196,9 +1196,9 @@ main(int argc, char **argv, char **env)
AGSIndex *localRefs;
parser = [GSXMLParser parserWithContentsOfFile: gsdocfile];
[parser substituteEntities: NO];
[parser doValidityChecking: YES];
[parser keepBlanks: NO];
[parser substituteEntities: NO];
if ([parser parse] == NO)
{
NSLog(@"WARNING %@ is not a valid document", gsdocfile);
@ -1485,9 +1485,9 @@ main(int argc, char **argv, char **env)
file, gDate, hDate);
}
parser = [GSXMLParser parserWithContentsOfFile: gsdocfile];
[parser substituteEntities: NO];
[parser doValidityChecking: YES];
[parser keepBlanks: NO];
[parser substituteEntities: NO];
if ([parser parse] == NO)
{
NSLog(@"WARNING %@ is not a valid document", gsdocfile);