Merge trunk

5 files changed, 65 insertions, 4 deletions

diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index d56abee..6a70d9f 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -52,7 +52,7 @@ pointed to by this argument must exist for the lifetime of the Tk_OptionTable.
 .AP Tk_OptionTable optionTable in
 Token for an option table.  Must have been returned by a previous call
 to \fBTk_CreateOptionTable\fR.
-.AP char *recordPtr in/out
+.AP void *recordPtr in/out
 Points to structure in which values of configuration options are stored;
 fields of this record are modified by procedures such as \fBTk_SetOptions\fR
 and read by procedures such as \fBTk_GetOptionValue\fR.
diff --git a/doc/canvas.n b/doc/canvas.n
index e9a2f97..fa7843d 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -313,6 +313,7 @@ The second possible syntax is a character list containing only
 The space can be used
 to enlarge the space between other line elements, and cannot
 occur as the first position in the string. Some examples:
+.PP
 .CS
 \-dash .     \(-> \-dash {2 4}
 \-dash -     \(-> \-dash {6 4}
@@ -1337,8 +1338,8 @@ arc's region.
 .PP
 Items of type \fBarc\fR appear on the display as arc-shaped regions.
 An arc is a section of an oval delimited by two angles (specified
-by the \fB\-start\fR and \fB\-extent\fR options) and displayed in
-one of several ways (specified by the \fB\-style\fR option).
+by either the \fB\-start\fR and \fB\-extent\fR options or the \fB\-height\fR option)
+and displayed in one of several ways (specified by the \fB\-style\fR option).
 Arcs are created with widget commands of the following form:
 .CS
 \fIpathName \fBcreate arc \fIx1 y1 x2 y2 \fR?\fIoption value ...\fR?
@@ -1346,7 +1347,9 @@ Arcs are created with widget commands of the following form:
 .CE
 The arguments \fIx1\fR, \fIy1\fR, \fIx2\fR, and \fIy2\fR or \fIcoordList\fR give
 the coordinates of two diagonally opposite corners of a
-rectangular region enclosing the oval that defines the arc.
+rectangular region enclosing the oval that defines the arc (except when
+\fB\-height\fR is specified - see below).
+.
 After the coordinates there may be any number of \fIoption\fR\-\fIvalue\fR
 pairs, each of which sets one of the configuration options
 for the item. These same \fIoption\fR\-\fIvalue\fR pairs may be
@@ -1387,6 +1390,34 @@ arc.
 \fIDegrees\fR is given in units of degrees measured counter-clockwise
 from the 3-o'clock position; it may be either positive or negative.
 .TP
+\fB\-height \fIdistance\fR
+Provides a shortcut for creating a circular arc segment by defining the
+distance of the mid-point of the arc from its chord. When this option
+is used the coordinates are interpreted as the start and end coordinates
+of the chord, and the options \fB\-start\fR and \fB-extent\fR are ignored.
+The value of \fIdistance\fR has the following meaning:
+.RS
+.PP
+.RS
+\fIdistance\fR > 0 creates a clockwise arc
+.br
+\fIdistance\fR < 0 creates an counter-clockwise arc
+.br
+\fIdistance\fR = 0 creates an arc as if this option had not been specified
+.RE
+.PP
+If you want the arc to have a specific radius, \fIr\fR, use the formula:
+.PP
+.RS
+\fIdistance\fR = \fIr\fR \(+- sqrt(\fIr\fR**2 - (chordLength / 2)**2)
+.RE
+.PP
+choosing the minus sign for the minor arc and the plus sign for the major arc.
+.PP
+Note that \fBitemcget \-height\fR always returns 0 so that introspection code
+can be kept simple.
+.RE
+.TP
 \fB\-style \fItype\fR
 Specifies how to draw the arc. If \fItype\fR is \fBpieslice\fR
 (the default) then the arc's region is defined by a section
diff --git a/doc/grid.n b/doc/grid.n
index ca8b7cd..ea72db1 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -202,6 +202,14 @@ The slaves will no longer be managed by the grid geometry manager.
 The configuration options for that window are forgotten, so that if the
 slave is managed once more by the grid geometry manager, the initial
 default settings are used.
+.RS
+.PP
+.VS TIP518
+If the last slave of the master becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+may choose to resize itself (or otherwise respond) to such a change.
+.VE TIP518
+.RE
 .TP
 \fBgrid info \fIslave\fR
 .
@@ -278,6 +286,14 @@ However, the configuration options for that window are remembered,
 so that if the
 slave is managed once more by the grid geometry manager, the previous
 values are retained.
+.RS
+.PP
+.VS TIP518
+If the last slave of the master becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+may choose to resize itself (or otherwise respond) to such a change.
+.VE TIP518
+.RE
 .TP
 \fBgrid size \fImaster\fR
 .
diff --git a/doc/pack.n b/doc/pack.n
index 6b39e1d..980dd6e 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -129,6 +129,14 @@ than receiving default values.
 Removes each of the \fIslave\fRs from the packing order for its
 master and unmaps their windows.
 The slaves will no longer be managed by the packer.
+.RS
+.PP
+.VS TIP518
+If the last slave of the master becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+may choose to resize itself (or otherwise respond) to such a change.
+.VE TIP518
+.RE
 .TP
 \fBpack info \fIslave\fR
 Returns a list whose elements are the current configuration state of
diff --git a/doc/ttk_label.n b/doc/ttk_label.n
index 8511c12..8553a08 100644
--- a/doc/ttk_label.n
+++ b/doc/ttk_label.n
@@ -34,6 +34,12 @@ Specifies the 3-D effect desired for the widget border.
 Valid values are
 \fBflat\fR, \fBgroove\fR, \fBraised\fR, \fBridge\fR, \fBsolid\fR,
 and \fBsunken\fR.
+.OP \-wraplength wrapLength WrapLength
+Specifies the maximum line length (in pixels).
+If this option is less than or equal to zero,
+then automatic wrapping is not performed; otherwise
+the text is split into lines such that no line is longer
+than the specified value.
 .SH "WIDGET COMMAND"
 .PP
 Supports the standard widget commands