Adjusted handling of the standard options part of the Ttk manual pages so

that they are documented in the correct location. [Bug 1876493]

17 files changed, 80 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 9dc0f03..6bdafaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-29  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* doc/ttk_*.n: Adjusted handling of the standard options part of the
+	Ttk manual pages so that they are documented in the correct location.
+	[Bug 1876493]
+
 2008-01-28  Joe English  <jenglish@users.sourceforge.net>
 
 	* unix/tkUnixRFont.c: Re-fix strict-aliasing warnings
diff --git a/doc/ttk_button.n b/doc/ttk_button.n
index 97fd305..66acf14 100644
--- a/doc/ttk_button.n
+++ b/doc/ttk_button.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_button.n,v 1.10 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_button.n,v 1.11 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::button n 8.5 Tk "Tk Themed Widget"
@@ -17,10 +17,11 @@ ttk::button \- Widget that issues a command when pressed
 .SH DESCRIPTION
 A \fBttk::button\fR widget displays a textual label and/or image,
 and evaluates a command when pressed.
-.SO
-\-class	\-compound	\-cursor	\-image
-\-state	\-style	\-takefocus	\-text	
-\-textvariable	\-underline	\-width
+.SO ttk_widget
+\-class	\-compound	\-cursor
+\-image	\-state	\-style
+\-takefocus	\-text	\-textvariable
+\-underline	\-width
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
diff --git a/doc/ttk_checkbutton.n b/doc/ttk_checkbutton.n
index dab787d..5d717e0 100644
--- a/doc/ttk_checkbutton.n
+++ b/doc/ttk_checkbutton.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_checkbutton.n,v 1.11 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_checkbutton.n,v 1.12 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::checkbutton n 8.5 Tk "Tk Themed Widget"
@@ -18,10 +18,11 @@ ttk::checkbutton \- On/off widget
 A \fBttk::checkbutton\fR widget is used to show or change a setting.
 It has two states, selected and deselected.  
 The state of the checkbutton may be linked to a Tcl variable.
-.SO
-\-class	\-compound	\-cursor	\-image
-\-state	\-style	\-takefocus	\-text
-\-textvariable	\-underline	\-width
+.SO ttk_widget
+\-class	\-compound	\-cursor
+\-image	\-state	\-style
+\-takefocus	\-text	\-textvariable
+\-underline	\-width
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index 681f6bc..e9e1dc7 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_combobox.n,v 1.13 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_combobox.n,v 1.14 2008/01/29 15:38:00 dkf Exp $
 '\"
 .so man.macros
 .TH ttk::combobox n 8.5 Tk "Tk Themed Widget"
@@ -18,8 +18,9 @@ ttk::combobox \- text field with popdown selection list
 A \fBttk::combobox\fR combines a text field with a pop-down list of values;
 the user may select the value of the text field from among the 
 values in the list.
-.SO
-\-class	\-cursor	\-takefocus	\-style
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style
 .SE
 .\" ALSO: Other entry widget options
 .SH "WIDGET-SPECIFIC OPTIONS"
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index cf1e410..2be5714 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -7,7 +7,7 @@
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
 '\" SOURCE: entry.n, r1.12
-'\" RCS: @(#) $Id: ttk_entry.n,v 1.10 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_entry.n,v 1.11 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::entry n 8.5 Tk "Tk Themed Widget"
@@ -25,9 +25,9 @@ The value of the string may be linked to a Tcl variable
 with the \fB\-textvariable\fR option.
 Entry widgets support horizontal scrolling with the 
 standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
-.SO
-\-class	\-cursor	\-style	\-takefocus
-\-xscrollcommand
+.SO ttk_widget
+\-class	\-cursor	\-style
+\-takefocus	\-xscrollcommand
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
diff --git a/doc/ttk_frame.n b/doc/ttk_frame.n
index 25b0a2c..d51e1c3 100644
--- a/doc/ttk_frame.n
+++ b/doc/ttk_frame.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_frame.n,v 1.8 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_frame.n,v 1.9 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::frame n 8.5 Tk "Tk Themed Widget"
@@ -17,8 +17,9 @@ ttk::frame \- Simple container widget
 .SH DESCRIPTION
 A \fBttk::frame\fR widget is a container, used to group other widgets
 together.
-.SO
-\-class	\-cursor	\-takefocus	\-style
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-borderwidth borderWidth BorderWidth
diff --git a/doc/ttk_label.n b/doc/ttk_label.n
index a8e35f7..f9bf6c6 100644
--- a/doc/ttk_label.n
+++ b/doc/ttk_label.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_label.n,v 1.8 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_label.n,v 1.9 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::label n 8.5 Tk "Tk Themed Widget"
@@ -18,10 +18,11 @@ ttk::label \- Display a text string and/or image
 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
-\-class	\-compound	\-cursor	\-image
-\-style	\-takefocus	\-text	\-textvariable
-\-underline	\-width
+.SO ttk_widget
+\-class	\-compound	\-cursor
+\-image	\-style	\-takefocus
+\-text	\-textvariable	\-underline
+\-width
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-anchor anchor Anchor
diff --git a/doc/ttk_labelframe.n b/doc/ttk_labelframe.n
index c2444a9..5a302f9 100644
--- a/doc/ttk_labelframe.n
+++ b/doc/ttk_labelframe.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_labelframe.n,v 1.8 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_labelframe.n,v 1.9 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::labelframe n 8.5 Tk "Tk Themed Widget"
@@ -18,8 +18,9 @@ ttk::labelframe \- Container widget with optional label
 A \fBttk::labelframe\fR widget is a container used to group other widgets
 together.  It has an optional label, which may be a plain text string or
 another widget.
-.SO
-\-class	\-cursor	\-takefocus	\-style
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .\" XXX: Currently included, but may go away: 
diff --git a/doc/ttk_menubutton.n b/doc/ttk_menubutton.n
index 0d192c2..7999019 100644
--- a/doc/ttk_menubutton.n
+++ b/doc/ttk_menubutton.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_menubutton.n,v 1.8 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_menubutton.n,v 1.9 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::menubutton n 8.5 Tk "Tk Themed Widget"
@@ -17,10 +17,11 @@ ttk::menubutton \- Widget that pops down a menu when pressed
 .SH DESCRIPTION
 A \fBttk::menubutton\fR widget displays a textual label and/or image,
 and displays a menu when pressed.
-.SO
-\-class	\-compound	\-cursor	\-image
-\-state	\-style	\-takefocus	\-text
-\-textvariable	\-underline	\-width
+.SO ttk_widget
+\-class	\-compound	\-cursor
+\-image	\-state	\-style
+\-takefocus	\-text	\-textvariable
+\-underline	\-width
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-direction direction Direction
diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n
index 909be01..bfdfd72 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_notebook.n,v 1.10 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_notebook.n,v 1.11 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::notebook n 8.5 Tk "Tk Themed Widget"
@@ -24,8 +24,9 @@ A \fBttk::notebook\fR widget manages a collection of windows
 and displays a single one at a time.
 Each slave window is associated with a \fItab\fR,
 which the user may select to change the currently-displayed window.
-.SO
-\-class	\-cursor	\-takefocus	\-style
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-height height Height
diff --git a/doc/ttk_panedwindow.n b/doc/ttk_panedwindow.n
index 20b7756..a3cb277 100644
--- a/doc/ttk_panedwindow.n
+++ b/doc/ttk_panedwindow.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_panedwindow.n,v 1.14 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_panedwindow.n,v 1.15 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::panedwindow n 8.5 Tk "Tk Themed Widget"
@@ -23,8 +23,9 @@ ttk::panedwindow \- Multi-pane container window
 A \fBttk::panedwindow\fR widget displays a number of subwindows, stacked
 either vertically or horizontally.  The user may adjust the relative sizes
 of the subwindows by dragging the sash between panes.
-.SO
-\-class	\-cursor	\-takefocus	\-style
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-orient orient Orient
diff --git a/doc/ttk_progressbar.n b/doc/ttk_progressbar.n
index 2523c69..44be482 100644
--- a/doc/ttk_progressbar.n
+++ b/doc/ttk_progressbar.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_progressbar.n,v 1.9 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_progressbar.n,v 1.10 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::progressbar n 8.5 Tk "Tk Themed Widget"
@@ -20,8 +20,9 @@ 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.
-.SO
-\-class	\-cursor	\-takefocus	\-style
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-orient orient Orient
diff --git a/doc/ttk_radiobutton.n b/doc/ttk_radiobutton.n
index ee50c01..251577b 100644
--- a/doc/ttk_radiobutton.n
+++ b/doc/ttk_radiobutton.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_radiobutton.n,v 1.10 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_radiobutton.n,v 1.11 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::radiobutton n 8.5 Tk "Tk Themed Widget"
@@ -20,10 +20,11 @@ a set of mutually-exclusive options.
 Radiobuttons are linked to a Tcl variable,
 and have an associated value; when a radiobutton is clicked,
 it sets the variable to its associated value.
-.SO
-\-class	\-compound	\-cursor	\-image
-\-state	\-style	\-takefocus	\-text
-\-textvariable	\-underline	\-width
+.SO ttk_widget
+\-class	\-compound	\-cursor
+\-image	\-state	\-style
+\-takefocus	\-text	\-textvariable
+\-underline	\-width
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
diff --git a/doc/ttk_scrollbar.n b/doc/ttk_scrollbar.n
index 0086899..d4128f8 100644
--- a/doc/ttk_scrollbar.n
+++ b/doc/ttk_scrollbar.n
@@ -6,7 +6,7 @@
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
 '\" SOURCE: tk/doc/scrollbar.n, r1.4
-'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.11 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.12 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::scrollbar n 8.5 Tk "Tk Themed Widget"
@@ -26,8 +26,9 @@ document visible in the associated window.
 The thumb may be dragged by the user to control the visible region.
 Depending on the theme, two or more arrow buttons may also be present;
 these are used to scroll the visible region in discrete units.
-.SO
-\-class	\-cursor	\-style	\-takefocus
+.SO ttk_widget
+\-class	\-cursor	\-style
+\-takefocus
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
diff --git a/doc/ttk_separator.n b/doc/ttk_separator.n
index ca2ac95..87dfecb 100644
--- a/doc/ttk_separator.n
+++ b/doc/ttk_separator.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_separator.n,v 1.7 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_separator.n,v 1.8 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::separator n 8.5 Tk "Tk Themed Widget"
@@ -17,9 +17,9 @@ ttk::separator \- Separator bar
 .SH DESCRIPTION
 A \fBttk::separator\fR widget displays a horizontal or vertical separator
 bar.
-.SO
-\-class	\-cursor	\-state	\-style	
-\-takefocus
+.SO ttk_widget
+\-class	\-cursor	\-state
+\-style	\-takefocus
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-orient orient Orient
diff --git a/doc/ttk_sizegrip.n b/doc/ttk_sizegrip.n
index ea019cb..d3ea7d9 100644
--- a/doc/ttk_sizegrip.n
+++ b/doc/ttk_sizegrip.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_sizegrip.n,v 1.14 2007/12/13 15:23:44 dgp Exp $
+'\" RCS: @(#) $Id: ttk_sizegrip.n,v 1.15 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::sizegrip n 8.5 Tk "Tk Themed Widget"
@@ -18,9 +18,9 @@ ttk::sizegrip \- Bottom-right corner resize widget
 A \fBttk::sizegrip\fR widget (also known as a \fIgrow box\fR)
 allows the user to resize the containing toplevel window
 by pressing and dragging the grip.
-.SO
-\-class	\-cursor	\-state	\-style
-\-takefocus
+.SO ttk_widget
+\-class	\-cursor	\-state
+\-style	\-takefocus
 .SE
 .SH "WIDGET COMMAND"
 Sizegrip widgets support the standard
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index 2e0ce9f..fbe84b1 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_treeview.n,v 1.16 2007/12/14 16:29:24 jenglish Exp $
+'\" RCS: @(#) $Id: ttk_treeview.n,v 1.17 2008/01/29 15:38:00 dkf Exp $
 '\" 
 .so man.macros
 .TH ttk::treeview n 8.5 Tk "Tk Themed Widget"
@@ -43,9 +43,9 @@ and control the appearance of the item.
 Treeview widgets support horizontal and vertical scrolling with the
 standard \fB\-\fR[\fBxy\fR]\fBscrollcommand\fR options 
 and [\fBxy\fR]\fBview\fR widget commands.
-.SO
-\-class	\-cursor	\-takefocus	\-style
-\-xscrollcommand	\-yscrollcommand
+.SO ttk_widget
+\-class	\-cursor	\-takefocus
+\-style	\-xscrollcommand	\-yscrollcommand
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-columns columns Columns