restored TIP#145 and Aqua improvements that got lost in the 8.5b2 release revert

1 files changed, 72 insertions, 6 deletions

diff --git a/doc/font.n b/doc/font.n
index 633b710..673699c 100644
--- a/doc/font.n
+++ b/doc/font.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: font.n,v 1.18 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: font.n,v 1.19 2007/10/30 01:26:11 das Exp $
 '\" 
 .so man.macros
 .TH font n 8.0 Tk "Tk Built-In Commands"
@@ -287,26 +287,92 @@ font should be underlined.  The default value for underline is \fBfalse\fR.
 The value is a boolean flag that specifies whether a horizontal line should
 be drawn through the middle of characters in this font.  The default value
 for overstrike is \fBfalse\fR.
-.SH "PLATFORM-SPECIFIC ISSUES"
+.SH "STANDARD FONTS"
 .LP
-The following named system fonts are supported:
+The following named fonts are supported on all systems, and default to values
+that match appropriate system defaults.
+.TP
+\fBTkDefaultFont\fR
+.
+This font is the default for all GUI items not otherwise specified.
+.TP
+\fBTkTextFont\fR
+.
+This font should be used for user text in entry widgets, listboxes etc.
+.TP
+\fBTkFixedFont\fR
+.
+This font is the standard fixed-width font.
+.TP
+\fBTkMenuFont\fR
+.
+This font is used for menu items.
+.TP
+\fBTkHeadingFont\fR
+.
+This font should be used for column headings in lists and tables.
+.TP
+\fBTkCaptionFont\fR
+.
+This font should be used for window and dialog caption bars.
+.TP
+\fBTkSmallCaptionFont\fR
+.
+This font should be used for captions on contained windows or tool dialogs.
+.TP
+\fBTkIconFont\fR
+.
+This font should be used for icon captions.
+.TP
+\fBTkTooltipFont\fR
+.
+This font should be used for tooltip windows (transient information windows).
+.LP
+It is \fInot\fR advised to change these fonts, as they may be modified by Tk
+itself in response to system changes. Instead, make a copy of the font and
+modify that.
+.SH "PLATFORM-SPECIFIC FONTS"
+.LP
+The following system fonts are supported:
 .RS
 .TP
-X Windows:
+\fBX Windows\fR
 All valid X font names, including those listed by xlsfonts(1), are available.
 .TP
-MS Windows:
+\fBMS Windows\fR
 .DS
 .ta 3c 6c
 \fBsystem	ansi	device
 systemfixed	ansifixed	oemfixed\fR
 .DE
 .TP
-Mac OS X:
+\fBMac OS X\fR
 .DS
 .ta 3c 6c
 \fBsystem	application	menu\fR
 .DE
+Additionally, the following named fonts provide access to the Aqua theme fonts:
+.DS
+\fBsystemSystemFont
+systemEmphasizedSystemFont
+systemSmallSystemFont
+systemSmallEmphasizedSystemFont
+systemApplicationFont
+systemLabelFont
+systemViewsFont
+systemMenuTitleFont
+systemMenuItemFont
+systemMenuItemMarkFont
+systemMenuItemCmdKeyFont
+systemWindowTitleFont
+systemPushButtonFont
+systemUtilityWindowTitleFont
+systemAlertHeaderFont
+systemToolbarFont
+systemMiniSystemFont
+systemDetailSystemFont
+systemDetailEmphasizedSystemFont\fR
+.DE
 .RE
 .SH EXAMPLE
 Fill a text widget with lots of font demonstrators, one for every font