Merge pull request #430 from gnustep/agsdoc_new_style

Style HR bars with CSS and not inline.
gnustep · Aug 8, 2024 · ea9c40e · ea9c40e
2 parents 3fb7647 + db2f554
commit ea9c40e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m
@@ -866,7 +866,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	}
       else if ([name isEqual: @"br"] == YES)
 	{
-	  [buf appendString: @"<br />"];
+	  [buf appendString: @"<br/>"];
 	}
       else if ([name isEqual: @"category"] == YES)
 	{
@@ -1023,7 +1023,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	  [buf appendString: @"</h3>\n"];
 	  [buf appendString: indent];
 	  [buf appendString: str];
-	  [buf appendString: @";<br />\n"];
+	  [buf appendString: @";<br/>\n"];
 
 	  node = firstElement(children);
 
@@ -1046,7 +1046,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	    }
 
 	  [buf appendString: indent];
-	  [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	  [buf appendString: @"<hr class=\"method-separator\">\n"];
 	}
       else if ([name isEqual: @"contents"] == YES)
         {
@@ -1359,7 +1359,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	    }
 
 	  [buf appendString: indent];
-	  [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	  [buf appendString: @"<hr class=\"method-separator\">\n"];
 	}
       else if ([name isEqual: @"gsdoc"] == YES)
 	{
@@ -1402,6 +1402,14 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	  [self outputText: [children firstChild] to: buf];
 	  [self decIndent];
 	  [buf appendString: @"</title>\n"];
+
+	  /** handcrafted styles for previous in-line styles */
+	  [buf appendString: indent];
+	  [buf appendString: @"<style type=\"text/css\">\n"];
+	  [buf appendString: indent];
+	  [buf appendString: @"hr.method-separator { width:25%; margin-left:0; }\n"];
+	  [buf appendString: indent];
+	  [buf appendString: @"</style>\n"];
 #if 0
           /** Css : TODO print.css **/
           [buf appendString:@"<meta http-equiv=\"Content-Style-Type\" content=\"text/css\"/>\n"];
@@ -1674,7 +1682,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	    }
 
 	  [buf appendString: indent];
-	  [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	  [buf appendString: @"<hr class=\"method-separator\"/>\n"];
 	}
       else if ([name isEqual: @"label"] == YES)	// %anchor
 	{
@@ -1803,7 +1811,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	    }
 
 	  [buf appendString: indent];
-	  [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	  [buf appendString: @"<hr class=\"method-separator\"/>\n"];
 	}
       else if ([name isEqual: @"method"] == YES)
 	{
@@ -1969,7 +1977,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 		  [self outputNode: node to: buf];
 		}
 	      [buf appendString: indent];
-	      [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	      [buf appendString: @"<hr class=\"method-separator\"/>\n"];
 	    }
           [buf appendString:@"</div>\n"];
 	}
@@ -2166,7 +2174,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	    }
 
 	  [buf appendString: indent];
-	  [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	  [buf appendString: @"<hr class=\"method-separator\"/>\n"];
 	}
       else if ([name isEqual: @"uref"] == YES)
 	{
@@ -2221,7 +2229,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	  [buf appendString: @"</h3>\n"];
 	  [buf appendString: indent];
 	  [buf appendString: str];
-	  [buf appendString: @";<br />\n"];
+	  [buf appendString: @";<br/>\n"];
 
 	  node = firstElement(children);
 
@@ -2244,7 +2252,7 @@ - (void) outputNode: (GSXMLNode*)node to: (NSMutableString*)buf
 	    }
 
 	  [buf appendString: indent];
-	  [buf appendString: @"<hr width=\"25%\" align=\"left\" />\n"];
+	  [buf appendString: @"<hr class=\"method-separator\"/>\n"];
 	}
       else
 	{
@@ -2833,14 +2841,14 @@ - (void) outputVersion: (NSDictionary*)prop to: (NSMutableString*)buf
 	  [buf appendString: @" deprecated at "];
 	  [buf appendString: gvdep];
 	}
-      [buf appendString: @"<br />\n"];
+      [buf appendString: @"<br/>\n"];
       if ([gvrem length] > 0)
 	{
           [buf appendString: @" Likely to be changed/moved/removed at "];
 	  [buf appendString: gvrem];
 	}
       [buf appendString:@"</div>\n"];
-      [buf appendString: @"<br />\n"];
+      [buf appendString: @"<br/>\n"];
     }
 }
 

diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
@@ -1978,8 +1978,7 @@ standard PropertyList format (not the XML format of OS X), using
       // file for top-left frame (header only; rest appended below)
       idxIndexFile = [@"MainIndex" stringByAppendingPathExtension: @"html"];
       [idxIndex setString: @"<HTML>\n  <BODY>\n"
-@"    <FONT FACE=\"sans\" SIZE=\"+1\"><B>Index</B></FONT><BR/><BR/>\n"
-@"    <FONT FACE=\"sans\" SIZE=\"-1\">"];
+@"    <B>Index</B><BR/>\n"];
 
       // this becomes index.html
       framesetFile = [@"index" stringByAppendingPathExtension: @"html"];
@@ -2041,7 +2040,7 @@ standard PropertyList format (not the XML format of OS X), using
       [idxIndex appendFormat:
         @"&nbsp;(<A HREF=\"%@.html\" TARGET=\"_top\">unframe</A>)\n",
         project];
-      [idxIndex appendString: @"    </FONT>\n  </BODY>\n</HTML>\n"];
+      [idxIndex appendString: @"    </BODY>\n</HTML>\n"];
       [idxIndex writeToFile:
         [documentationDirectory stringByAppendingPathComponent: idxIndexFile]
                  atomically: YES];