From 9bc6d3a39db60af7ee2496433bfa93ff9eb3ef3a Mon Sep 17 00:00:00 2001 From: max Date: Tue, 8 Nov 2011 17:44:42 +0000 Subject: * 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. --- ChangeLog | 10 ++++++++++ doc/label.n | 2 +- doc/pack.n | 2 +- doc/text.n | 8 ++++---- doc/ttk_notebook.n | 6 +++--- unix/Makefile.in | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fc0f18..4a09749 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-11-08 Reinhard Max + + * 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-04 Don Porter *** 8.5.11 TAGGED FOR RELEASE *** diff --git a/doc/label.n b/doc/label.n index 5e1139a..ef121cb 100644 --- a/doc/label.n +++ b/doc/label.n @@ -112,7 +112,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 diff --git a/doc/pack.n b/doc/pack.n index 0809337..73e4872 100644 --- a/doc/pack.n +++ b/doc/pack.n @@ -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 diff --git a/doc/text.n b/doc/text.n index 69f7ac2..860bb89 100644 --- a/doc/text.n +++ b/doc/text.n @@ -2292,8 +2292,8 @@ match, the text widget will return the wrong result. In practice this is a rare problem, but it can occur, for example: .CS pack [text .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 @@ -2310,8 +2310,8 @@ possible match which might cover large portions of the widget. For example: .CS pack [text .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 d6c33d3..c0de39e 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 fa23848..170f157 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -552,7 +552,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@}"; \ -- cgit v0.12