From 1e3a06a03c2541d5937fabf506de698f4ce1a857 Mon Sep 17 00:00:00 2001 From: CaS Date: Sat, 2 Feb 2002 17:04:50 +0000 Subject: [PATCH] minor fixes git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12385 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 2 ++ Tools/AGSHtml.m | 37 +++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41e6203cb..8e727834c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ reference counts. * Source/NSMapTable.m: Improve warning logging for dodgy practices. * Source/NSHashTable.m: ditto + * Tools/AGSHtml.m: A couple of minor fixes for systems where the xml + parser does not discard whitespace as it should. 2002-02-01 Richard Frith-Macdonald diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m index 2ac38ca63..ca17ceac7 100644 --- a/Tools/AGSHtml.m +++ b/Tools/AGSHtml.m @@ -1234,16 +1234,19 @@ static NSMutableSet *textNodes = nil; [buf appendString: @"Standards:"]; while (tmp != nil) { - if (first == YES) + if ([tmp type] == XML_ELEMENT_NODE) { - first = NO; - [buf appendString: @" "]; + if (first == YES) + { + first = NO; + [buf appendString: @" "]; + } + else + { + [buf appendString: @", "]; + } + [buf appendString: [tmp name]]; } - else - { - [buf appendString: @", "]; - } - [buf appendString: [tmp name]]; tmp = [tmp next]; } [buf appendString: @"
\n"]; @@ -1657,10 +1660,13 @@ NSLog(@"Element '%@' not implemented", name); // FIXME [self incIndent]; while (t != nil) { - [buf appendString: indent]; - [buf appendString: @"
  • "]; - [buf appendString: [t name]]; - [buf appendString: @"
  • \n"]; + if ([t type] == XML_ELEMENT_NODE) + { + [buf appendString: indent]; + [buf appendString: @"
  • "]; + [buf appendString: [t name]]; + [buf appendString: @"
  • \n"]; + } t = [t next]; } [self decIndent]; @@ -1699,9 +1705,12 @@ NSLog(@"Element '%@' not implemented", name); // FIXME to: buf]; [buf appendString: indent]; [buf appendString: @"
    \n"]; - while (node != nil && [[node name] isEqual: @"method"] == YES) + while (node != nil) { - [self outputNode: node to: buf]; + if([[node name] isEqual: @"method"] == YES) + { + [self outputNode: node to: buf]; + } node = [node next]; } }