mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 08:21:25 +00:00
Merged in 1.6.0 branch
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16228 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
c4b26f8afa
commit
5c49ef401a
38 changed files with 812 additions and 295 deletions
|
@ -775,6 +775,7 @@ static NSMutableSet *textNodes = nil;
|
|||
if (val == nil)
|
||||
{
|
||||
val = text;
|
||||
if (val == nil) val = @"";
|
||||
}
|
||||
[buf appendString: [self makeAnchor: val ofType: @"label" name: @""]];
|
||||
}
|
||||
|
@ -844,6 +845,7 @@ static NSMutableSet *textNodes = nil;
|
|||
{
|
||||
NSString *content = [t content];
|
||||
|
||||
if (content == nil) content = @"";
|
||||
str = [str stringByAppendingString: content];
|
||||
}
|
||||
t = [t next];
|
||||
|
@ -1180,6 +1182,7 @@ static NSMutableSet *textNodes = nil;
|
|||
if (val == nil)
|
||||
{
|
||||
val = text;
|
||||
if (val == nil) val = @"";
|
||||
}
|
||||
[buf appendString:
|
||||
[self makeAnchor: val ofType: @"label" name: text]];
|
||||
|
@ -1219,6 +1222,7 @@ static NSMutableSet *textNodes = nil;
|
|||
{
|
||||
NSString *content = [t content];
|
||||
|
||||
if (content == nil) content = @"";
|
||||
str = [str stringByAppendingString: content];
|
||||
}
|
||||
t = [t next];
|
||||
|
@ -1333,6 +1337,7 @@ static NSMutableSet *textNodes = nil;
|
|||
{
|
||||
NSString *content = [t content];
|
||||
|
||||
if (content == nil) content = @"";
|
||||
sel = [sel stringByAppendingString: content];
|
||||
if (hadArg == YES)
|
||||
{
|
||||
|
@ -1356,7 +1361,10 @@ static NSMutableSet *textNodes = nil;
|
|||
{
|
||||
if ([t type] == XML_TEXT_NODE)
|
||||
{
|
||||
str = [str stringByAppendingString: [t content]];
|
||||
NSString *content = [t content];
|
||||
|
||||
if (content == nil) content = @"";
|
||||
str = [str stringByAppendingString: content];
|
||||
}
|
||||
t = [t next];
|
||||
}
|
||||
|
@ -1991,6 +1999,7 @@ NSLog(@"Element '%@' not implemented", name); // FIXME
|
|||
{
|
||||
NSString *str = [node content];
|
||||
|
||||
if (str == nil) str = @"";
|
||||
[buf appendString: str];
|
||||
}
|
||||
else if ([node type] == XML_ENTITY_REF_NODE)
|
||||
|
@ -2043,6 +2052,7 @@ NSLog(@"Element '%@' not implemented", name); // FIXME
|
|||
{
|
||||
NSString *text = [[node firstChild] content];
|
||||
|
||||
if (text == nil) text = @"";
|
||||
[buf appendString: indent];
|
||||
[buf appendString: @"<dd>"];
|
||||
[buf appendString: [self protocolRef: text]];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue