Document the new options for ttk::progressbar

3 files changed, 62 insertions, 57 deletions

diff --git a/doc/ttk_label.n b/doc/ttk_label.n
index e891954..a9e7f11 100644
--- a/doc/ttk_label.n
+++ b/doc/ttk_label.n
@@ -18,26 +18,18 @@ A \fBttk::label\fR widget displays a textual label and/or image.
 The label may be linked to a Tcl variable
 to automatically change the displayed text.
 .SO ttk_widget
-\-class	\-compound	\-cursor
+\-anchor	\-class	\-compound	\-cursor
+\-foreground
 \-image	\-justify	\-style	\-takefocus
 \-text	\-textvariable	\-underline
-\-width
+\-width	\-wraplength
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
-.OP \-anchor anchor Anchor
-Specifies how the information in the widget is positioned
-relative to the inner margins.  Legal values are
-\fBn\fR, \fBne\fR, \fBe\fR, \fBse\fR,
-\fBs\fR, \fBsw\fR, \fBw\fR, \fBnw\fR, and \fBcenter\fR.
-See also \fB\-justify\fR.
 .OP \-background frameColor FrameColor
 The widget's background color.
 If unspecified, the theme default is used.
 .OP \-font font Font
 Font to use for label text.
-.OP \-foreground textColor TextColor
-The widget's foreground color.
-If unspecified, the theme default is used.
 .OP \-padding padding Padding
 Specifies the amount of extra space to allocate for the widget.
 The padding is a list of up to four length specifications
@@ -52,15 +44,6 @@ 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 \-text text Text
-Specifies a text string to be displayed inside the widget
-(unless overridden by \fB\-textvariable\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
diff --git a/doc/ttk_progressbar.n b/doc/ttk_progressbar.n
index 1945f70..33da815 100644
--- a/doc/ttk_progressbar.n
+++ b/doc/ttk_progressbar.n
@@ -19,22 +19,36 @@ operation.  They can operate in two modes: \fIdeterminate\fR mode shows the
 amount completed relative to the total amount of work to be done, and
 \fIindeterminate\fR mode provides an animated display to let the user know
 that something is happening.
+.PP
+If the value of \fB-orient\fR is \fBhorizontal\fR a text string can be
+displayed inside the progressbar. This string can be configured using
+the \fB-anchor\fR, \fB-text\fR, \fB-foreground\fR, \fB-justify\fR and
+\fB-wraplength\fR options. If the value of \fB-orient\fR is \fBvertical\fR
+then these options are ignored.
 .SO ttk_widget
-\-class	\-cursor	\-takefocus
-\-style
+\-anchor	\-class	\-cursor
+\-foreground	\-justify	\-style
+\-takefocus	\-text	\-wraplength
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
-.OP \-orient orient Orient
-One of \fBhorizontal\fR or \fBvertical\fR.
-Specifies the orientation of the progress bar.
 .OP \-length length Length
 Specifies the length of the long axis of the progress bar
 (width if horizontal, height if vertical).
-.OP \-mode mode Mode
-One of \fBdeterminate\fR or \fBindeterminate\fR.
 .OP \-maximum maximum Maximum
 A floating point number specifying the maximum \fB\-value\fR.
 Defaults to 100.
+.OP \-mode mode Mode
+One of \fBdeterminate\fR or \fBindeterminate\fR.
+.OP \-orient orient Orient
+One of \fBhorizontal\fR or \fBvertical\fR.
+Specifies the orientation of the progress bar.
+.OP \-phase phase Phase
+Read-only option.
+The widget periodically increments the value of this option
+whenever the \fB\-value\fR is greater than 0 and,
+in \fIdeterminate\fR mode, less than \fB\-maximum\fR.
+This option may be used by the current theme
+to provide additional animation effects.
 .OP \-value value Value
 The current value of the progress bar.
 In \fIdeterminate\fR mode, this represents the amount of work completed.
@@ -47,13 +61,6 @@ The name of a global Tcl variable which is linked to the \fB\-value\fR.
 If specified, the \fB\-value\fR of the progress bar is
 automatically set to the value of the variable whenever
 the latter is modified.
-.OP \-phase phase Phase
-Read-only option.
-The widget periodically increments the value of this option
-whenever the \fB\-value\fR is greater than 0 and,
-in \fIdeterminate\fR mode, less than \fB\-maximum\fR.
-This option may be used by the current theme
-to provide additional animation effects.
 .SH "WIDGET COMMAND"
 .PP
 .TP
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 1ab3bc8..f8bf98b 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -71,29 +71,12 @@ See the description of \fB\-xscrollcommand\fR above for details.
 .SH "LABEL OPTIONS"
 The following options are supported by labels, buttons,
 and other button-like widgets:
-.OP \-justify justify Justify
-If there are multiple lines of text, specifies how
-the lines are laid out relative to one another.
-One of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
-See also \fB\-anchor\fR (for widgets supporting this option).
-.OP \-text text Text
-Specifies a text string to be displayed inside the widget
-(unless overridden by \fB\-textvariable\fR).
-.OP \-textvariable textVariable Variable
-Specifies the name of a global variable whose value will be used
-in place of the \fB\-text\fR resource.
-.OP \-underline underline Underline
-If set, specifies the integer index (0-based) of a character to underline
-in the text string.
-The underlined character is used for mnemonic activation.
-.OP \-image image Image
-Specifies an image to display.
-This is a list of 1 or more elements.
-The first element is the default image name.
-The rest of the list is a sequence of \fIstatespec / value\fR pairs
-as per \fBstyle map\fR, specifying different images to use when
-the widget is in a particular state or combination of states.
-All images in the list should have the same size.
+.OP \-anchor anchor Anchor
+Specifies how the information in the widget is positioned
+relative to the inner margins.  Legal values are
+\fBn\fR, \fBne\fR, \fBe\fR, \fBse\fR,
+\fBs\fR, \fBsw\fR, \fBw\fR, \fBnw\fR, and \fBcenter\fR.
+See also \fB\-justify\fR (for widgets supporting this option).
 .OP \-compound compound Compound
 Specifies how to display the image relative to the text,
 in the case both \fB\-text\fR and \fB\-image\fR are present.
@@ -113,11 +96,43 @@ Display image above, below, left of, or right of the text, respectively.
 .IP none
 The default; display the image if present, otherwise the text.
 .RE
+.OP \-foreground textColor TextColor
+The widget's foreground color.
+If unspecified, the theme default is used.
+.OP \-image image Image
+Specifies an image to display.
+This is a list of 1 or more elements.
+The first element is the default image name.
+The rest of the list is a sequence of \fIstatespec / value\fR pairs
+as per \fBstyle map\fR, specifying different images to use when
+the widget is in a particular state or combination of states.
+All images in the list should have the same size.
+.OP \-justify justify Justify
+If there are multiple lines of text, specifies how
+the lines are laid out relative to one another.
+One of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
+See also \fB\-anchor\fR (for widgets supporting this option).
+.OP \-text text Text
+Specifies a text string to be displayed inside the widget
+(unless overridden by \fB\-textvariable\fR for the widgets supporting this option).
+.OP \-textvariable textVariable Variable
+Specifies the name of a global variable whose value will be used
+in place of the \fB\-text\fR resource.
+.OP \-underline underline Underline
+If set, specifies the integer index (0-based) of a character to underline
+in the text string.
+The underlined character is used for mnemonic activation.
 .OP \-width width Width
 If greater than zero, specifies how much space, in character widths,
 to allocate for the text label.
 If less than zero, specifies a minimum width.
 If zero or unspecified, the natural width of the text label is used.
+.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 "COMPATIBILITY OPTIONS"
 .OP \-state state State
 May be set to \fBnormal\fR or \fBdisabled\fR