Skip to content

Commit aa55819

Browse files
oehharoehhar
committed
merge trunk
2 parents 994514d + 0ca1277 commit aa55819

File tree

329 files changed

+39259
-9584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

329 files changed

+39259
-9584
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ Image processing
320320
.nf
321321
Copyright (c)
322322

323-
.fi
323+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,4 +356,4 @@ Documentation tools
356356
.nf
357357
Copyright (c) 2010 Andreas Kupries <andreas_kupries@users\&.sourceforge\&.net>
358358

359-
.fi
359+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,4 +340,4 @@ Please report such in the category \fIautoscroll\fR of the
340340
Please also report any ideas for enhancements you may have for either
341341
package and/or documentation\&.
342342
.SH KEYWORDS
343-
scroll, scrollbar
343+
scroll, scrollbar

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -414,4 +414,4 @@ Please report such in the category \fIcanvas\fR of the
414414
Please also report any ideas for enhancements you may have for either
415415
package and/or documentation\&.
416416
.SH KEYWORDS
417-
canvas, dragging
417+
canvas, dragging

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,4 +538,4 @@ Please report such in the category \fIcanvas\fR of the
538538
Please also report any ideas for enhancements you may have for either
539539
package and/or documentation\&.
540540
.SH KEYWORDS
541-
canvas, editing, point cloud, points
541+
canvas, editing, point cloud, points

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,4 +490,4 @@ Please report such in the category \fIcanvas\fR of the
490490
Please also report any ideas for enhancements you may have for either
491491
package and/or documentation\&.
492492
.SH KEYWORDS
493-
canvas, editing, polyline
493+
canvas, editing, polyline

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,4 +378,4 @@ Copyright (c) Origin http://wiki\&.tcl\&.tk/6100
378378
Copyright (c) Origin http://wiki\&.tcl\&.tk/37242
379379
Copyright (c) Origin http://wiki\&.tcl\&.tk/9079
380380

381-
.fi
381+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,4 +356,4 @@ Please report such in the category \fIcanvas\fR of the
356356
Please also report any ideas for enhancements you may have for either
357357
package and/or documentation\&.
358358
.SH KEYWORDS
359-
canvas, enter callback, highlighting, leave callback
359+
canvas, enter callback, highlighting, leave callback

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,4 @@ canvas, graphics, imagemagick, magick vector graphics, mvg, print screen, serial
307307
Copyright (c) 2010 Wolf-Dieter Busch (http://wiki\&.tcl\&.tk/15505)
308308
Copyright (c) 2010 Documentation, Andreas Kupries
309309

310-
.fi
310+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,4 +314,4 @@ canvas, image, photo, print screen, snapshot
314314
Copyright (c) 2004 George Petasis (http://wiki\&.tcl\&.tk/1404)
315315
Copyright (c) 2010 Documentation, Andreas Kupries
316316

317-
.fi
317+
.fi

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

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,4 +347,4 @@ Please report such in the category \fIcanvas\fR of the
347347
Please also report any ideas for enhancements you may have for either
348348
package and/or documentation\&.
349349
.SH KEYWORDS
350-
canvas, crosshair, rubberband, tracking
350+
canvas, crosshair, rubberband, tracking

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,4 +332,4 @@ Please report such in the category \fIcanvas\fR of the
332332
Please also report any ideas for enhancements you may have for either
333333
package and/or documentation\&.
334334
.SH KEYWORDS
335-
zoom
335+
zoom

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,4 +399,4 @@ package and/or documentation\&.
399399
.SH "SEE ALSO"
400400
text(n)
401401
.SH KEYWORDS
402-
chat, chatwidget, composite widget, irc, mega-widget, widget
402+
chat, chatwidget, composite widget, irc, mega-widget, widget

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

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

815-
.fi
821+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,4 +410,4 @@ Copyright (c) 2003 Kevin Kenny
410410
Copyright (c) 2008 (docs) Andreas Kupries <andreas_kupries@users\&.sourceforge\&.net>
411411
Copyright (c) 2013 Frank Gover, Andreas Kupries
412412

413-
.fi
413+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -583,4 +583,4 @@ syntax highlighting, text, widget
583583
.nf
584584
Copyright (c) George Peter Staplin <GeorgePS@XMission\&.com>
585585

586-
.fi
586+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ cursor
320320
.nf
321321
Copyright (c) Jeffrey Hobbs <jeff@hobbs\&.org>
322322

323-
.fi
323+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,4 +336,4 @@ Widget
336336
.nf
337337
Copyright (c) Keith Vetter <keith@ebook\&.gemstar\&.com>
338338

339-
.fi
339+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3246,4 +3246,4 @@ package and/or documentation\&.
32463246
.SH KEYWORDS
32473247
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
32483248
.SH CATEGORY
3249-
Documentation tools
3249+
Documentation tools

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ Please report such in the category \fIgetstring\fR of the
320320
Please also report any ideas for enhancements you may have for either
321321
package and/or documentation\&.
322322
.SH KEYWORDS
323-
dialog, entry, string
323+
dialog, entry, string

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,4 +354,4 @@ Please report such in the category \fIentry::history\fR of the
354354
Please also report any ideas for enhancements you may have for either
355355
package and/or documentation\&.
356356
.SH KEYWORDS
357-
entry, history
357+
entry, history

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,4 +495,4 @@ Please report such in the category \fIico\fR of the
495495
Please also report any ideas for enhancements you may have for either
496496
package and/or documentation\&.
497497
.SH KEYWORDS
498-
dll, entry, exe, ico, icon
498+
dll, entry, exe, ico, icon

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,4 +503,4 @@ package and/or documentation\&.
503503
.SH KEYWORDS
504504
entry, ip address, network
505505
.SH CATEGORY
506-
Widget
506+
Widget

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -444,4 +444,4 @@ Please report such in the category \fIkhim\fR of the
444444
Please also report any ideas for enhancements you may have for either
445445
package and/or documentation\&.
446446
.SH KEYWORDS
447-
character, i18n, input, international, method
447+
character, i18n, input, international, method

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -942,4 +942,4 @@ package and/or documentation\&.
942942
.nf
943943
Copyright (c) 2009 Tom Krehbiel <krehbiel\&.tom@gmail\&.com> All rights reserved\&.
944944

945-
.fi
945+
.fi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,4 @@ alert, notification, tk
307307
.nf
308308
Copyright (c) 2015 Kevin Walzer/WordTech Communications LLC <kw@codebykevin\&.com>
309309

310-
.fi
310+
.fi

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

+35-6
Original file line numberDiff line numberDiff line change
@@ -285,21 +285,23 @@ package require \fBntext ?1\&.0?\fR
285285
.sp
286286
\fB::ntext::new_textPaste\fR \fIpathName\fR
287287
.sp
288+
\fB::ntext::syncIndentColor\fR \fIpathName\fR
289+
.sp
288290
.BE
289291
.SH DESCRIPTION
290292
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\&.
291293
.PP
292294
The package provides a binding tag named \fINtext\fR for use by text widgets in place of the default \fIText\fR binding tag\&.
293295
.PP
294-
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\&.
296+
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\&.
295297
.PP
296298
The differences between the \fINtext\fR binding tag and the default \fIText\fR binding tag are in three categories:
297299
.IP \(bu
298300
Some \fIText\fR bindings behave differently from most text-editing applications\&. \fINtext\fR gives these bindings more familiar behaviour\&. For details see \fIntextBindings\fR\&.
299301
.IP \(bu
300302
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\&.
301303
.IP \(bu
302-
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\&.
304+
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\&.
303305
.PP
304306
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\&.
305307
.PP
@@ -314,6 +316,9 @@ Replacement for ::tk_textCut that also maintains \fINtext\fR indentation (see \f
314316
.TP
315317
\fB::ntext::new_textPaste\fR \fIpathName\fR
316318
Replacement for ::tk_textPaste that also maintains \fINtext\fR indentation (see \fIntextIndent\fR)\&.
319+
.TP
320+
\fB::ntext::syncIndentColor\fR \fIpathName\fR
321+
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)\&.
317322
.PP
318323
.SH "CONFIGURATION OPTIONS"
319324
\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
347352
For more information see \fIntextBindings\fR
348353
.PP
349354
.PP
355+
\fB::ntext::classicParagraphs\fR
356+
.IP \(bu
357+
\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)>\&.
358+
.IP \(bu
359+
\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)>\&.
360+
.IP \(bu
361+
For more information see \fIntextBindings\fR
362+
.PP
363+
.PP
350364
\fB::ntext::classicSelection\fR
351365
.IP \(bu
352366
\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
374388
For more information see \fIntextIndent\fR
375389
.PP
376390
.PP
391+
\fB::ntext::indentColor\fR
392+
.IP \(bu
393+
\fB{}\fR - if the value is the empty string, then the indent of wrapped display lines has the same color as the widget background\&.
394+
.IP \(bu
395+
\fIcolor\fR - a valid \fBTk\fR color to use for the indent of wrapped display lines (default value \fI#d9d9d9\fR)\&.
396+
.sp
397+
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\&.
398+
.sp
399+
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\&.
400+
.IP \(bu
401+
For more information see \fIntextIndent\fR
402+
.PP
403+
.PP
377404
\fB::ntext::overwrite\fR
378405
.IP \(bu
379406
\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
385412
For more information see \fIntextBindings\fR
386413
.PP
387414
.PP
388-
\fB::ntext::classicParagraphs\fR
415+
\fB::ntext::useBlockCursor\fR
389416
.IP \(bu
390-
\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)>\&.
417+
\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\&.
391418
.IP \(bu
392-
\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)>\&.
419+
\fB1\fR - the block cursor will be used when the widget is in \fIoverwrite\fR mode (see \fB::ntext::overwrite\fR)\&.
420+
.IP \(bu
421+
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\&.
393422
.IP \(bu
394423
For more information see \fIntextBindings\fR
395424
.PP
@@ -409,4 +438,4 @@ See bindtags for more information\&.
409438
.SH "SEE ALSO"
410439
bindtags, ntextBindings, ntextIndent, ntextWordBreak, re_syntax, regexp, text
411440
.SH KEYWORDS
412-
bindtags, re_syntax, regexp, text
441+
bindtags, re_syntax, regexp, text

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,13 @@ The behaviour of \fINtext\fR may be configured application-wide by setting the v
343343
\fB1\fR - selects classic \fIText\fR behaviour
344344
.PP
345345
.PP
346+
\fB::ntext::classicParagraphs\fR
347+
.IP \(bu
348+
\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)>\&.
349+
.IP \(bu
350+
\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)>\&.
351+
.PP
352+
.PP
346353
\fB::ntext::classicSelection\fR
347354
.IP \(bu
348355
\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
359366
The value is toggled by the \fIInsert\fR key\&.
360367
.PP
361368
.PP
362-
\fB::ntext::classicParagraphs\fR
369+
\fB::ntext::useBlockCursor\fR
363370
.IP \(bu
364-
\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)>\&.
371+
\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\&.
365372
.IP \(bu
366-
\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)>\&.
373+
\fB1\fR - the block cursor will be used when the widget is in \fIoverwrite\fR mode (see \fB::ntext::overwrite\fR)\&.
374+
.IP \(bu
375+
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\&.
367376
.PP
368377
.SH INTERNALS
369378
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}
387396
.SH "SEE ALSO"
388397
bindtags, ntext, ntextIndent, text
389398
.SH KEYWORDS
390-
bindtags, text
399+
bindtags, text

0 commit comments

Comments
 (0)