Technically <br /> is correct xml even though <br/> is generally accepted.

This commit is contained in:
rfm 2024-11-17 10:14:08 +00:00
parent 37eba33f8c
commit d31ed9a68e

View file

@ -262,7 +262,7 @@ static NSMutableSet *textNodes = nil;
* Calls -makeLink:ofType:isRef: or -makeLink:ofType:inUnit:isRef: to * Calls -makeLink:ofType:isRef: or -makeLink:ofType:inUnit:isRef: to
* create the first part of an anchor, and fills in the text content * create the first part of an anchor, and fills in the text content
* of the anchor with n (the specified name). Returns an entire anchor * of the anchor with n (the specified name). Returns an entire anchor
* string as a result.<br/> * string as a result.<br />
* This method is used to create all the anchors in the html output. * This method is used to create all the anchors in the html output.
*/ */
- (NSString*) makeAnchor: (NSString*)r - (NSString*) makeAnchor: (NSString*)r
@ -337,9 +337,9 @@ static NSMutableSet *textNodes = nil;
/** /**
* Make a link for the element r, with the specified type t, * Make a link for the element r, with the specified type t,
* in a particular unit u. Only the start of * in a particular unit u. Only the start of
* the html element is returned (&lt;a ...&gt;).<br/> * the html element is returned (&lt;a ...&gt;).<br />
* If the boolean f is YES, then the link is a reference to somewhere, * If the boolean f is YES, then the link is a reference to somewhere,
* otherwise the link is an anchor for some element being output.<br/> * otherwise the link is an anchor for some element being output.<br />
* If there is an error, the method returns nil. * If there is an error, the method returns nil.
*/ */
- (NSString*) makeLink: (NSString*)r - (NSString*) makeLink: (NSString*)r
@ -584,7 +584,7 @@ static NSMutableSet *textNodes = nil;
} }
else else
{ {
[buf appendString: @"<br/>"]; [buf appendString: @"<br />"];
} }
[buf appendString: @"\n"]; [buf appendString: @"\n"];
} }
@ -748,7 +748,7 @@ static NSMutableSet *textNodes = nil;
} }
else else
{ {
[buf appendString: @"<br/>"]; [buf appendString: @"<br />"];
} }
[buf appendString: @"\n"]; [buf appendString: @"\n"];
@ -797,7 +797,7 @@ static NSMutableSet *textNodes = nil;
[self outputNodeList: children to: buf]; [self outputNodeList: children to: buf];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: @"<br/>\n"]; [buf appendString: @"<br />\n"];
if (prevFile != nil) if (prevFile != nil)
{ {
[buf appendString: indent]; [buf appendString: indent];
@ -836,7 +836,7 @@ static NSMutableSet *textNodes = nil;
} }
else if ([name isEqual: @"br"] == YES) else if ([name isEqual: @"br"] == YES)
{ {
[buf appendString: @"<br/>"]; [buf appendString: @"<br />"];
} }
else if ([name isEqual: @"category"] == YES) else if ([name isEqual: @"category"] == YES)
{ {
@ -933,7 +933,7 @@ static NSMutableSet *textNodes = nil;
[buf appendString: @"</h3>\n"]; [buf appendString: @"</h3>\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: str]; [buf appendString: str];
[buf appendString: @";<br/>\n"]; [buf appendString: @";<br />\n"];
node = firstElement(children); node = firstElement(children);
@ -1246,7 +1246,7 @@ static NSMutableSet *textNodes = nil;
[buf appendString: @"</h3>\n"]; [buf appendString: @"</h3>\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: str]; [buf appendString: str];
[buf appendString: @");<br/>\n"]; [buf appendString: @");<br />\n"];
node = firstElement(children); node = firstElement(children);
@ -1359,25 +1359,25 @@ static NSMutableSet *textNodes = nil;
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-classes\">Classes</a><br/>\n"]; @"<a href=\"#nav-bar-classes\">Classes</a><br />\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-protocols\">Protocols</a><br/>\n"]; @"<a href=\"#nav-bar-protocols\">Protocols</a><br />\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-constants\">Constants</a><br/>\n"]; @"<a href=\"#nav-bar-constants\">Constants</a><br />\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-functions\">Functions</a><br/>\n"]; @"<a href=\"#nav-bar-functions\">Functions</a><br />\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-macros\">Macros</a><br/>\n"]; @"<a href=\"#nav-bar-macros\">Macros</a><br />\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-types\">Types</a><br/>\n"]; @"<a href=\"#nav-bar-types\">Types</a><br />\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: [buf appendString:
@"<a href=\"#nav-bar-variables\">Variables</a><br/>\n"]; @"<a href=\"#nav-bar-variables\">Variables</a><br />\n"];
[self decIndent]; [self decIndent];
[buf appendString: indent]; [buf appendString: indent];
@ -1512,7 +1512,7 @@ static NSMutableSet *textNodes = nil;
if (prevFile != nil || upFile != nil || nextFile != nil) if (prevFile != nil || upFile != nil || nextFile != nil)
{ {
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: @"<br/>\n"]; [buf appendString: @"<br />\n"];
} }
[buf appendString: indent]; [buf appendString: indent];
@ -1733,7 +1733,7 @@ static NSMutableSet *textNodes = nil;
{ {
v = @"public"; v = @"public";
} }
[buf appendFormat: @"%@@%@ %@ <b>%@</b>;<br/>\n", indent, v, t, n]; [buf appendFormat: @"%@@%@ %@ <b>%@</b>;<br />\n", indent, v, t, n];
/* /*
* List standards with which ivar complies * List standards with which ivar complies
@ -1851,7 +1851,7 @@ static NSMutableSet *textNodes = nil;
{ {
[buf appendString: @")"]; [buf appendString: @")"];
} }
[buf appendString: @"<br/>\n"]; [buf appendString: @"<br />\n"];
node = firstElement(children); node = firstElement(children);
@ -1998,7 +1998,7 @@ static NSMutableSet *textNodes = nil;
[buf appendString: @"</h3>\n"]; [buf appendString: @"</h3>\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: str]; [buf appendString: str];
[buf appendString: @";<br/>\n"]; [buf appendString: @";<br />\n"];
node = firstElement(children); node = firstElement(children);
@ -2016,23 +2016,23 @@ static NSMutableSet *textNodes = nil;
&& [str boolValue] == YES) && [str boolValue] == YES)
{ {
[buf appendString: @"This is a designated initialiser " [buf appendString: @"This is a designated initialiser "
@"for the class.<br/>\n"]; @"for the class.<br />\n"];
} }
str = [prop objectForKey: @"override"]; str = [prop objectForKey: @"override"];
if ([str isEqual: @"subclass"] == YES) if ([str isEqual: @"subclass"] == YES)
{ {
[buf appendString: @"Subclasses <strong>must</strong> " [buf appendString: @"Subclasses <strong>must</strong> "
@"override this method.<br/>\n"]; @"override this method.<br />\n"];
} }
else if ([str isEqual: @"dummy"] == YES) else if ([str isEqual: @"dummy"] == YES)
{ {
[buf appendString: @"An empty method provided for subclasses " [buf appendString: @"An empty method provided for subclasses "
@"to override.<br/>\n"]; @"to override.<br />\n"];
} }
else if ([str isEqual: @"never"] == YES) else if ([str isEqual: @"never"] == YES)
{ {
[buf appendString: @"Subclasses must <strong>NOT</strong> " [buf appendString: @"Subclasses must <strong>NOT</strong> "
@"override this method.<br/>\n"]; @"override this method.<br />\n"];
} }
if ([[node name] isEqual: @"desc"]) if ([[node name] isEqual: @"desc"])
@ -2214,7 +2214,7 @@ static NSMutableSet *textNodes = nil;
[buf appendString: @"</h3>\n"]; [buf appendString: @"</h3>\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: str]; [buf appendString: str];
[buf appendString: @";<br/>\n"]; [buf appendString: @";<br />\n"];
node = firstElement(children); node = firstElement(children);
@ -2292,7 +2292,7 @@ static NSMutableSet *textNodes = nil;
[buf appendString: @"</h3>\n"]; [buf appendString: @"</h3>\n"];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: str]; [buf appendString: str];
[buf appendString: @";<br/>\n"]; [buf appendString: @";<br />\n"];
node = firstElement(children); node = firstElement(children);
@ -2866,11 +2866,11 @@ static NSMutableSet *textNodes = nil;
[buf appendFormat: @"<a href=\"#_%@_ivars\">Instance Variables</a>\n", [buf appendFormat: @"<a href=\"#_%@_ivars\">Instance Variables</a>\n",
classname]; classname];
[buf appendString: indent]; [buf appendString: indent];
[buf appendString: @"<br/><br/>\n"]; [buf appendString: @"<br /><br />\n"];
[ibuf appendFormat: @"<a name=\"_%@_ivars\"/>", classname]; [ibuf appendFormat: @"<a name=\"_%@_ivars\"/>", classname];
} }
[ibuf appendString: indent]; [ibuf appendString: indent];
[ibuf appendString: @"<br/><hr class=\"section-separator\">\n"]; [ibuf appendString: @"<br /><hr class=\"section-separator\">\n"];
[ibuf appendString: indent]; [ibuf appendString: indent];
[ibuf appendFormat: @"<h2>Instance Variables for %@ Class</h2>\n", [ibuf appendFormat: @"<h2>Instance Variables for %@ Class</h2>\n",
classname]; classname];
@ -2880,7 +2880,7 @@ static NSMutableSet *textNodes = nil;
node = [node nextElement]; node = [node nextElement];
} }
[ibuf appendString: indent]; [ibuf appendString: indent];
[ibuf appendString: @"<br/><hr class=\"section-separator\"><br/>\n"]; [ibuf appendString: @"<br /><hr class=\"section-separator\"><br />\n"];
} }
a = [localRefs methodsInUnit: unit]; a = [localRefs methodsInUnit: unit];
@ -3018,7 +3018,7 @@ static NSMutableSet *textNodes = nil;
} }
} }
[buf appendString:@"</div>\n"]; [buf appendString:@"</div>\n"];
[buf appendString: @"<br/>\n"]; [buf appendString: @"<br />\n"];
} }
else if ([gvadd length] > 0) else if ([gvadd length] > 0)
{ {
@ -3036,14 +3036,14 @@ static NSMutableSet *textNodes = nil;
[buf appendString: @" deprecated at "]; [buf appendString: @" deprecated at "];
[buf appendString: gvdep]; [buf appendString: gvdep];
} }
[buf appendString: @"<br/>\n"]; [buf appendString: @"<br />\n"];
if ([gvrem length] > 0) if ([gvrem length] > 0)
{ {
[buf appendString: @" Likely to be changed/moved/removed at "]; [buf appendString: @" Likely to be changed/moved/removed at "];
[buf appendString: gvrem]; [buf appendString: gvrem];
} }
[buf appendString:@"</div>\n"]; [buf appendString:@"</div>\n"];
[buf appendString: @"<br/>\n"]; [buf appendString: @"<br />\n"];
} }
} }