diff options
author | max <max@noemail.net> | 2011-11-08 17:59:04 (GMT) |
---|---|---|
committer | max <max@noemail.net> | 2011-11-08 17:59:04 (GMT) |
commit | 6536fc07655a950db3de610665c299d6977d4da0 (patch) | |
tree | cc142b6dc30f0ccc6f1671d52e9eabbdf2ee7bb6 | |
parent | 174711102dde9c7ecd96f53c31142fccd960db12 (diff) | |
parent | e40993314a56b68dce84312f2b9d995455fb103e (diff) | |
download | tk-6536fc07655a950db3de610665c299d6977d4da0.zip tk-6536fc07655a950db3de610665c299d6977d4da0.tar.gz tk-6536fc07655a950db3de610665c299d6977d4da0.tar.bz2 |
* Add square to DEMOPROGS in unix/Makefile.in. It contains a shebang
and hence should get installed with executable bits.
* manpages: Fix the escaping of leading dots in lines that start
with a widget name, so that nroff doesn't mistake it as a
non-existing macro and skips the entire line.
FossilOrigin-Name: b3f23db823bacca36192279f2f8936cc06bcf228
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | doc/label.n | 2 | ||||
-rw-r--r-- | doc/pack.n | 2 | ||||
-rw-r--r-- | doc/text.n | 8 | ||||
-rw-r--r-- | doc/ttk_notebook.n | 6 | ||||
-rw-r--r-- | unix/Makefile.in | 2 |
6 files changed, 20 insertions, 10 deletions
@@ -1,3 +1,13 @@ +2011-11-08 Reinhard Max <max@suse.de> + + * unix/Makefile.in: Add square to DEMOPROGS. It contains a shebang + and hence should get installed with executable bits. + + * doc/label.n: Fix the escaping of leading dots in lines that + * doc/text.n: start with a widget name, so that nroff + * doc/ttk_notebook.n: doesn't mistake it as a non-existing macro + * doc/pack.n: and skips the entire line. + 2011-11-01 Donal K. Fellows <dkf@users.sf.net> * generic/tkObj.c (GetPixelsFromObjEx): [Bug 3431491]: Use a bit of diff --git a/doc/label.n b/doc/label.n index 7d768f5..e445ebb 100644 --- a/doc/label.n +++ b/doc/label.n @@ -113,7 +113,7 @@ labels are not intended to be interactive. \fBlabel\fR .l \-text "Left\enHand\enSide" \fBlabel\fR .r \-text "Right\enHand\enSide" text .mid -\.mid insert end "This layout is like Java's BorderLayout" +\&.mid insert end "This layout is like Java's BorderLayout" # Lay them out pack .t \-side top \-fill x pack .b \-side bottom \-fill x @@ -266,7 +266,7 @@ label .b \-text "This widget is at the bottom" \-bg green label .l \-text "Left\enHand\enSide" label .r \-text "Right\enHand\enSide" text .mid -\.mid insert end "This layout is like Java's BorderLayout" +\&.mid insert end "This layout is like Java's BorderLayout" # Lay them out \fBpack\fR .t \-side top \-fill x \fBpack\fR .b \-side bottom \-fill x @@ -2058,8 +2058,8 @@ would actually match, the text widget will return the wrong result. In practice this is a rare problem, but it can occur, for example: .CS pack [\fBtext\fR .t] -\.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en" -\.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0 +\&.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en" +\&.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0 .CE will not find a match when one exists of 19 characters starting from the first .QW b . @@ -2074,8 +2074,8 @@ not look back arbitrarily far for a possible match which might cover large portions of the widget. For example: .CS pack [\fBtext\fR .t] -\.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n" -\.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end +\&.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n" +\&.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end .CE matches at .QW 5.0 diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n index 456b796..6b4b2bc 100644 --- a/doc/ttk_notebook.n +++ b/doc/ttk_notebook.n @@ -199,9 +199,9 @@ virtual event after a new tab is selected. .SH "EXAMPLE" .CS pack [\fBttk::notebook\fR .nb] -\.nb add [frame .nb.f1] \-text "First tab" -\.nb add [frame .nb.f2] \-text "Second tab" -\.nb select .nb.f2 +\&.nb add [frame .nb.f1] \-text "First tab" +\&.nb add [frame .nb.f2] \-text "Second tab" +\&.nb select .nb.f2 ttk::notebook::enableTraversal .nb .CE .SH "SEE ALSO" diff --git a/unix/Makefile.in b/unix/Makefile.in index a38ff74..492c7ca 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -559,7 +559,7 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) -DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget +DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget SHELL_ENV = \ @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ |