Merge 8.7

1 files changed, 67 insertions, 3 deletions

diff --git a/doc/wm.n b/doc/wm.n
index eda2fa7..e53529c 100644
--- a/doc/wm.n
+++ b/doc/wm.n
@@ -94,7 +94,32 @@ value accepted by \fBTk_GetColor\fR.  If the empty string is specified
 2000/XP+.  Where not supported, the \fB\-transparentcolor\fR value remains
 at \fB{}\fR.
 .PP
-On Mac OS X, the following attributes may be set.
+On MacOS, the following attributes may be set.
+.TP
+\fB\-appearance\fR
+.
+Specifies whether the window is rendered in "dark mode".  Allowed
+values are \fBauto\fR, \fBaqua\fR and \fBdarkaqua\fR.  If the setting
+is auto then the appearance of the window is controlled by the
+System Settings.
+.TP
+\fB\-class\fR
+.
+Specifies whether the underlying Aqua window for a toplevel is an
+object of the NSWindow class or the NSPanel class.  The two allowed
+values for this option are \fBnswindow\fR and \fBnspanel\fR.  It is
+not possible to change the class of the underlying Aqua window once
+that window has been instantiated, and attempting to do that is an
+error.  However it is allowed to set this option for a pathname that
+does not correspond to an existing window.  Doing that causes the
+class name to be cached for later use.  When a toplevel with that
+pathname is eventually created, the cached class name will determine which
+class is used for the underlying Aqua window.
+.TP
+\fB\-isdark\fR
+.
+Returns a boolean value which is true if the window is currently in
+dark mode.
 .TP
 \fB\-modified\fR
 .
@@ -106,10 +131,49 @@ proxy icon is draggable).
 .
 Specifies process notification state (bouncing of the application dock icon).
 .TP
+\fB\-stylemask\fR
+.
+Specifies an integer to be assigned as the styleMask of the underlying
+Aqua window.  (See the Apple documentation for styleMask property of
+the NSWindow class.) The value of this option should be a list of
+bitnames.  Each bit named in the list will be set to 1, and all other
+bits will be set to 0.  The allowed bitnames are: \fBtitled\fR,
+\fBclosable\fR, \fBminiaturizable\fR, \fBresizable\fR,
+\fBfullsizecontentview\fR, \fBdocmodal\fR, \fButility\fR,
+\fBnonactivatingpanel\fR, and \fBHUDwindow\fR.  Note that a side
+effect of setting the fullsizecontentview bit is that the window title
+bar becomes transparent.
+.TP
+\fB\-tabbingid\fR
+.
+Controls how tabbed toplevel windows are grouped together.  Two tabs
+in the same group must correspond to toplevels with the same
+tabbingid, which can be an arbitrary UTF8 string.  In the Tk
+implementation, changing the tabbingid of a toplevel in a tab group
+will cause it to be moved into a different group, in which all tabs
+have the new tabbingid or, if the new tabbingid is unique, to become
+a normal non-tabbed toplevel.   It is allowed to set the tabbingid before the
+toplevel is created.  If the pathname provided in the command does not
+correspond to a toplevel, the value will be cached and used later when
+the toplevel is actually created.
+.TP
+\fB\-tabbingmode\fR
+.
+Controls whether a toplevel can be opened as a tab within a tab group.
+The allowed values are \fBauto\fR, \fBpreferred\fR or
+\fBdisallowed\fR.  A toplevel can be opened as a tab in exactly two
+situations: if its tabbingmode is \fBpreferred\fR; or if its
+tabbingmode is \fBauto\fR and the user has selected "prefer tabs when
+opening documents" in the Desktop and Dock panel of the System
+Settings application.  It is allowed to set the tabbingmode before the
+toplevel is created.  If the pathname provided in the command does not
+correspond to a toplevel, the value will be cached and used later when
+the toplevel is actually created.
+.TP
 \fB\-titlepath\fR
 .
-Specifies the path of the file referenced as the window proxy icon (which
-can be dragged and dropped in lieu of the file's finder icon).
+Specifies the path of the file referenced as the window proxy icon
+(which can be dragged and dropped in lieu of the file's finder icon).
 .TP
 \fB\-transparent\fR
 .