merge trunk

embedded/man/files/apps/bitmap-editor.n

@@ -320,4 +320,4 @@ Image processing
 .nf
 Copyright (c)
 
-.fi
+.fi

embedded/man/files/apps/diagram-viewer.n

@@ -356,4 +356,4 @@ Documentation tools
 .nf
 Copyright (c) 2010 Andreas Kupries <andreas_kupries@users\&.sourceforge\&.net>
 
-.fi
+.fi

embedded/man/files/modules/autoscroll/autoscroll.n

@@ -340,4 +340,4 @@ Please report such in the category \fIautoscroll\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-scroll, scrollbar
+scroll, scrollbar

embedded/man/files/modules/canvas/canvas_drag.n

@@ -414,4 +414,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, dragging
+canvas, dragging

embedded/man/files/modules/canvas/canvas_epoints.n

@@ -538,4 +538,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, editing, point cloud, points
+canvas, editing, point cloud, points

embedded/man/files/modules/canvas/canvas_epolyline.n

@@ -490,4 +490,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, editing, polyline
+canvas, editing, polyline

embedded/man/files/modules/canvas/canvas_equad.n

@@ -496,4 +496,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, concave, convex, editing, non-convex, quadrilateral
+canvas, concave, convex, editing, non-convex, quadrilateral

embedded/man/files/modules/canvas/canvas_gradient.n

@@ -378,4 +378,4 @@ Copyright (c) Origin http://wiki\&.tcl\&.tk/6100
 Copyright (c) Origin http://wiki\&.tcl\&.tk/37242
 Copyright (c) Origin http://wiki\&.tcl\&.tk/9079
 
-.fi
+.fi

embedded/man/files/modules/canvas/canvas_highlight.n

@@ -356,4 +356,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, enter callback, highlighting, leave callback
+canvas, enter callback, highlighting, leave callback

embedded/man/files/modules/canvas/canvas_mvg.n

@@ -307,4 +307,4 @@ canvas, graphics, imagemagick, magick vector graphics, mvg, print screen, serial
 Copyright (c) 2010 Wolf-Dieter Busch (http://wiki\&.tcl\&.tk/15505)
 Copyright (c) 2010 Documentation, Andreas Kupries
 
-.fi
+.fi

embedded/man/files/modules/canvas/canvas_snap.n

@@ -314,4 +314,4 @@ canvas, image, photo, print screen, snapshot
 Copyright (c) 2004 George Petasis (http://wiki\&.tcl\&.tk/1404)
 Copyright (c) 2010 Documentation, Andreas Kupries
 
-.fi
+.fi

embedded/man/files/modules/canvas/canvas_sqmap.n

@@ -396,4 +396,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, cell, grid, image, map, square map, tile
+canvas, cell, grid, image, map, square map, tile

embedded/man/files/modules/canvas/canvas_tags.n

@@ -350,4 +350,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-append tag, canvas, insert tag, remove tag, tags
+append tag, canvas, insert tag, remove tag, tags

embedded/man/files/modules/canvas/canvas_trlines.n

@@ -347,4 +347,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-canvas, crosshair, rubberband, tracking
+canvas, crosshair, rubberband, tracking

embedded/man/files/modules/canvas/canvas_zoom.n

@@ -332,4 +332,4 @@ Please report such in the category \fIcanvas\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-zoom
+zoom

embedded/man/files/modules/chatwidget/chatwidget.n

@@ -399,4 +399,4 @@ package and/or documentation\&.
 .SH "SEE ALSO"
 text(n)
 .SH KEYWORDS
-chat, chatwidget, composite widget, irc, mega-widget, widget
+chat, chatwidget, composite widget, irc, mega-widget, widget

embedded/man/files/modules/controlwidget/controlwidget.n

@@ -637,6 +637,9 @@ Color for the needle and the pin
 \fB::controlwidget::rdial\fR \fIw\fR \fIargs\fR
 Create a rotating dial\&. You can drag the dial to change the value\&. With the shift button
 depressed the value changes slowly, with the control button depressed it changes fast\&.
+Similarly, you can control the dial via the mouse wheel, with the shift and control button
+working in the same way as with the mouse pointer\&.
+\fINote:\fR The shift and control buttons currently have no effect on Windows\&.
 .RS
 .TP
 widget \fIw\fR (in)
@@ -658,6 +661,9 @@ Whether a horizontal disk/dial is required ("horizontal") or a vertical one ("ve
 \fBstep\fR value
 Initial step for incrementing or decrementing the value
 .TP
+\fBbindwheel\fR value
+Step size for controlling the dial's value via the mouse wheel
+.TP
 \fBslow\fR value
 Factor on the step size for incrementing or decrementing the value slowly
 .TP
@@ -812,4 +818,4 @@ Copyright (c) 2010 Gerhard Reithofer <\&.\&.\&.@\&.\&.\&.>
 Copyright (c) 2010 Marco Maggi <\&.\&.\&.@\&.\&.\&.>
 Copyright (c) 2010 Arjen Markus <arjenmarkus@users\&.sourceforge\&.net>
 
-.fi
+.fi

embedded/man/files/modules/crosshair/crosshair.n

@@ -410,4 +410,4 @@ Copyright (c) 2003 Kevin Kenny
 Copyright (c) 2008 (docs) Andreas Kupries <andreas_kupries@users\&.sourceforge\&.net>
 Copyright (c) 2013 Frank Gover, Andreas Kupries
 
-.fi
+.fi

embedded/man/files/modules/ctext/ctext.n

@@ -583,4 +583,4 @@ syntax highlighting, text, widget
 .nf
 Copyright (c) George Peter Staplin <GeorgePS@XMission\&.com>
 
-.fi
+.fi

embedded/man/files/modules/cursor/cursor.n

@@ -320,4 +320,4 @@ cursor
 .nf
 Copyright (c) Jeffrey Hobbs <jeff@hobbs\&.org>
 
-.fi
+.fi

embedded/man/files/modules/datefield/datefield.n

@@ -336,4 +336,4 @@ Widget
 .nf
 Copyright (c) Keith Vetter <keith@ebook\&.gemstar\&.com>
 
-.fi
+.fi

embedded/man/files/modules/diagrams/diagram.n

@@ -3246,4 +3246,4 @@ package and/or documentation\&.
 .SH KEYWORDS
 2D geometry, arc, arrow, box, canvas, circle, diagram, diamond, drawing, drum, ellipse, image, interpolation, intersection, line, move, picture, plane geometry, plotting, point, raster image, spline, text, vector
 .SH CATEGORY
-Documentation tools
+Documentation tools

embedded/man/files/modules/getstring/tk_getString.n

@@ -320,4 +320,4 @@ Please report such in the category \fIgetstring\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-dialog, entry, string
+dialog, entry, string

embedded/man/files/modules/history/tklib_history.n

@@ -354,4 +354,4 @@ Please report such in the category \fIentry::history\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-entry, history
+entry, history

embedded/man/files/modules/ico/ico.n

@@ -495,4 +495,4 @@ Please report such in the category \fIico\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-dll, entry, exe, ico, icon
+dll, entry, exe, ico, icon

embedded/man/files/modules/ipentry/ipentry.n

@@ -503,4 +503,4 @@ package and/or documentation\&.
 .SH KEYWORDS
 entry, ip address, network
 .SH CATEGORY
-Widget
+Widget

embedded/man/files/modules/khim/khim.n

@@ -444,4 +444,4 @@ Please report such in the category \fIkhim\fR of the
 Please also report any ideas for enhancements you may have for either
 package and/or documentation\&.
 .SH KEYWORDS
-character, i18n, input, international, method
+character, i18n, input, international, method

embedded/man/files/modules/menubar/menubar.n

@@ -942,4 +942,4 @@ package and/or documentation\&.
 .nf
 Copyright (c) 2009 Tom Krehbiel <krehbiel\&.tom@gmail\&.com> All rights reserved\&.
 
-.fi
+.fi

embedded/man/files/modules/notifywindow/notifywindow.n

@@ -307,4 +307,4 @@ alert, notification, tk
 .nf
 Copyright (c) 2015 Kevin Walzer/WordTech Communications LLC <kw@codebykevin\&.com>
 
-.fi
+.fi

embedded/man/files/modules/ntext/ntext.n

@@ -285,21 +285,23 @@ package require \fBntext  ?1\&.0?\fR
 .sp
 \fB::ntext::new_textPaste\fR \fIpathName\fR
 .sp
+\fB::ntext::syncIndentColor\fR \fIpathName\fR
+.sp
 .BE
 .SH DESCRIPTION
 The purpose of the \fBntext\fR package is to make the text widget behave more like other text-editing applications\&. It makes the text widget more useful for implementing a text editor, and makes it behave in a way that will be more familiar to most users\&.
 .PP
 The package provides a binding tag named \fINtext\fR for use by text widgets in place of the default \fIText\fR binding tag\&.
 .PP
-Package \fBntext\fR 's functions and variables are contained entirely in the \fB::ntext\fR namespace; its other code is contained in the binding tag \fINtext\fR\&.  \fBntext\fR has no exports to the global or other namespaces, and no new widget commands\&.  It uses modified copies of the Tk code, leaving the original code, and the \fIText\fR binding tag, unchanged\&.
+Package \fBntext\fR 's functions and variables are contained entirely in the \fB::ntext\fR namespace; its other code is contained in the binding tag \fINtext\fR\&.  \fBntext\fR has no exports to the global or other namespaces, and no new widget commands\&.  It uses modified copies of the \fBTk\fR code, leaving the original code, and the \fIText\fR binding tag, unchanged\&.
 .PP
 The differences between the \fINtext\fR binding tag and the default \fIText\fR binding tag are in three categories:
 .IP \(bu
 Some \fIText\fR bindings behave differently from most text-editing applications\&.  \fINtext\fR gives these bindings more familiar behaviour\&.  For details see \fIntextBindings\fR\&.
 .IP \(bu
 When a logical line with leading whitespace is word-wrapped onto more than one display line, the wrapped display lines begin further to the left than the first display line, which can make the text layout untidy and difficult to read\&.  \fINtext\fR can indent the wrapped lines to match the leading whitespace of the first display line (this facility is switched off by default)\&.  For details see \fIntextIndent\fR\&.
 .IP \(bu
-When the user navigates or selects text, Tcl/Tk sometimes needs to detect word boundaries\&.  \fINtext\fR provides improved rules for word boundary detection\&.  For details see \fIntextWordBreak\fR\&.
+When the user navigates or selects text, \fBTcl/Tk\fR sometimes needs to detect word boundaries\&.  \fINtext\fR provides improved rules for word boundary detection\&.  For details see \fIntextWordBreak\fR\&.
 .PP
 The remainder of this page describes the basic use and configuration of all three aspects of \fINtext\fR\&.  For more detailed information on the different facilities of \fINtext\fR, see the pages \fIntextBindings\fR, \fIntextIndent\fR, and \fIntextWordBreak\fR\&.
 .PP
@@ -314,6 +316,9 @@ Replacement for ::tk_textCut that also maintains \fINtext\fR indentation (see \f
 .TP
 \fB::ntext::new_textPaste\fR \fIpathName\fR
 Replacement for ::tk_textPaste that also maintains \fINtext\fR indentation (see \fIntextIndent\fR)\&.
+.TP
+\fB::ntext::syncIndentColor\fR \fIpathName\fR
+Command to apply the current value of the variable \fB::ntext::indentColor\fR to existing lines in a text widget\&.  This command is useful if a text widget has been created, text has been inserted in the widget, \fIand then\fR the value of \fB::ntext::indentColor\fR is changed (see \fIntextIndent\fR)\&.
 .PP
 .SH "CONFIGURATION OPTIONS"
 \fINtext\fR provides alternatives to a number of behaviours of the classic \fIText\fR binding tag\&.  Where there is an option, the \fINtext\fR behaviour (except for display-line indentation) is switched on by default\&.
@@ -347,6 +352,15 @@ For more information see \fIntextBindings\fR
 For more information see \fIntextBindings\fR
 .PP
 .PP
+\fB::ntext::classicParagraphs\fR
+.IP \(bu
+\fB0\fR - (default value) on macOS Aqua, certain keyboard bindings are made to behave in the same way as the Mac application TextEdit\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+.IP \(bu
+\fB1\fR - on macOS Aqua, certain keyboard bindings are made to behave in the same way as classic \fIText\fR, ignoring the conventions of Aqua\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+.IP \(bu
+For more information see \fIntextBindings\fR
+.PP
+.PP
 \fB::ntext::classicSelection\fR
 .IP \(bu
 \fB0\fR - (default value on macOS Aqua) selects Mac-like behaviour, i\&.e\&. when a navigation keystroke cancels a selection, the insert mark first moves to the end of the selection determined by the navigation direction of the keystroke, and then the keystroke is applied\&.
@@ -374,6 +388,19 @@ After changing this value, the matching patterns should be recalculated\&.  See
 For more information see \fIntextIndent\fR
 .PP
 .PP
+\fB::ntext::indentColor\fR
+.IP \(bu
+\fB{}\fR - if the value is the empty string, then the indent of wrapped display lines has the same color as the widget background\&.
+.IP \(bu
+\fIcolor\fR - a valid \fBTk\fR color to use for the indent of wrapped display lines (default value \fI#d9d9d9\fR)\&.
+.sp
+Coloring is implemented with the text widget tag option \fI-lmargincolor\fR, which is available from \fBTk\fR 8\&.6\&.6 onwards\&.  \fINtext\fR indent coloring has no effect in earlier versions of \fBTk\fR\&.
+.sp
+The value of \fB::ntext::indentColor\fR will often be set at startup\&.  If the value is changed when text widgets already exist and contain text, those widgets can be updated by calling command \fB::ntext::syncIndentColor\fR\&.
+.IP \(bu
+For more information see \fIntextIndent\fR
+.PP
+.PP
 \fB::ntext::overwrite\fR
 .IP \(bu
 \fB0\fR - (initial value) text typed at the keyboard is inserted into the widget
@@ -385,11 +412,13 @@ The value is toggled by the \fIInsert\fR key (except on macOS Aqua where there i
 For more information see \fIntextBindings\fR
 .PP
 .PP
-\fB::ntext::classicParagraphs\fR
+\fB::ntext::useBlockCursor\fR
 .IP \(bu
-\fB0\fR - (default value) on macOS Aqua, certain keyboard bindings are made to behave in the same way as the Mac application TextEdit\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+\fB0\fR - the block cursor will not be used\&.  When the widget is in \fIoverwrite\fR mode (see \fB::ntext::overwrite\fR), the ordinary cursor will change color instead\&.
 .IP \(bu
-\fB1\fR - on macOS Aqua, certain keyboard bindings are made to behave in the same way as classic \fIText\fR, ignoring the conventions of Aqua\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+\fB1\fR - the block cursor will be used when the widget is in \fIoverwrite\fR mode (see \fB::ntext::overwrite\fR)\&.
+.IP \(bu
+The default value depends on the version of \fBTk\fR\&.  In versions of \fBTk\fR earlier than \fB8\&.5\&.12\fR, the sizing of the block cursor had a bug, and \fB::ntext::useBlockCursor\fR defaults to \fB0\fR\&.  From \fB8\&.5\&.12\fR onwards the bug is fixed, and \fB::ntext::useBlockCursor\fR defaults to \fB1\fR\&.
 .IP \(bu
 For more information see \fIntextBindings\fR
 .PP
@@ -409,4 +438,4 @@ See bindtags for more information\&.
 .SH "SEE ALSO"
 bindtags, ntextBindings, ntextIndent, ntextWordBreak, re_syntax, regexp, text
 .SH KEYWORDS
-bindtags, re_syntax, regexp, text
+bindtags, re_syntax, regexp, text

embedded/man/files/modules/ntext/ntextBindings.n

@@ -343,6 +343,13 @@ The behaviour of \fINtext\fR may be configured application-wide by setting the v
 \fB1\fR - selects classic \fIText\fR behaviour
 .PP
 .PP
+\fB::ntext::classicParagraphs\fR
+.IP \(bu
+\fB0\fR - (default value) on macOS Aqua, certain keyboard bindings are made to behave in the same way as the Mac application TextEdit\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+.IP \(bu
+\fB1\fR - on macOS Aqua, certain keyboard bindings are made to behave in the same way as for the Windows and X11 windowing systems and the classic \fIText\fR, ignoring the conventions of Aqua\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+.PP
+.PP
 \fB::ntext::classicSelection\fR
 .IP \(bu
 \fB0\fR - (default value on macOS Aqua) selects Mac-like behaviour, i\&.e\&. when a navigation keystroke cancels a selection, the insert mark first moves to the end of the selection determined by the navigation direction of the keystroke, and then the keystroke is applied\&.
@@ -359,11 +366,13 @@ The behaviour of \fINtext\fR may be configured application-wide by setting the v
 The value is toggled by the \fIInsert\fR key\&.
 .PP
 .PP
-\fB::ntext::classicParagraphs\fR
+\fB::ntext::useBlockCursor\fR
 .IP \(bu
-\fB0\fR - (default value) on macOS Aqua, certain keyboard bindings are made to behave in the same way as the Mac application TextEdit\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+\fB0\fR - the block cursor will not be used\&.  When the widget is in \fIoverwrite\fR mode (see \fB::ntext::overwrite\fR), the ordinary cursor will change color instead\&.
 .IP \(bu
-\fB1\fR - on macOS Aqua, certain keyboard bindings are made to behave in the same way as for the Windows and X11 windowing systems and the classic \fIText\fR, ignoring the conventions of Aqua\&.  The bindings involve vertical scrolling of the screen and are <?Shift-?Option-(Up|Down)>\&.
+\fB1\fR - the block cursor will be used when the widget is in \fIoverwrite\fR mode (see \fB::ntext::overwrite\fR)\&.
+.IP \(bu
+The default value depends on the version of \fBTk\fR\&.  In versions of \fBTk\fR earlier than \fB8\&.5\&.12\fR, the sizing of the block cursor had a bug, and \fB::ntext::useBlockCursor\fR defaults to \fB0\fR\&.  From \fB8\&.5\&.12\fR onwards the bug is fixed, and \fB::ntext::useBlockCursor\fR defaults to \fB1\fR\&.
 .PP
 .SH INTERNALS
 In order to remain independent of the version of \fBTk\fR (8\&.5 or 8\&.6), \fBntext\fR defines its own virtual events\&.  These new virtual events are used only in the \fINtext\fR binding tag, and therefore do not interfere with the real or virtual events used in other code\&.
@@ -387,4 +396,4 @@ bindtags \&.t {\&.t Ntext \&. all}
 .SH "SEE ALSO"
 bindtags, ntext, ntextIndent, text
 .SH KEYWORDS
-bindtags, text
+bindtags, text