diff options
author | dgp <dgp@users.sourceforge.net> | 2007-11-02 14:49:12 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2007-11-02 14:49:12 (GMT) |
commit | 93121ecc2bde5853aa0d7fac349fd1c942eccda0 (patch) | |
tree | 7efc157b6ca61caffdc21a5ffef137425bb5c02b | |
parent | 0537174e35c6270b8692f4912ba7aeb657cc57e4 (diff) | |
download | tcl-93121ecc2bde5853aa0d7fac349fd1c942eccda0.zip tcl-93121ecc2bde5853aa0d7fac349fd1c942eccda0.tar.gz tcl-93121ecc2bde5853aa0d7fac349fd1c942eccda0.tar.bz2 |
merge updates from HEAD
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | doc/apply.n | 4 | ||||
-rw-r--r-- | doc/interp.n | 70 | ||||
-rw-r--r-- | doc/join.n | 6 | ||||
-rw-r--r-- | doc/lindex.n | 32 | ||||
-rw-r--r-- | doc/lrepeat.n | 14 | ||||
-rw-r--r-- | doc/lreverse.n | 8 | ||||
-rw-r--r-- | doc/lsearch.n | 31 | ||||
-rwxr-xr-x | doc/lset.n | 39 | ||||
-rw-r--r-- | doc/mathfunc.n | 18 | ||||
-rw-r--r-- | doc/mathop.n | 4 | ||||
-rw-r--r-- | doc/regexp.n | 10 | ||||
-rw-r--r-- | doc/split.n | 10 | ||||
-rwxr-xr-x | tools/tcltk-man2html.tcl | 7 |
14 files changed, 143 insertions, 113 deletions
@@ -1,5 +1,8 @@ 2007-11-01 Donal K. Fellows <donal.k.fellows@man.ac.uk> + * tools/tcltk-man2html.tcl (output-directive): Convert .DS/.DE pairs + into tables since that is now all that they are used for. + * doc/RegExp.3: Clarified documentation of RE flags. [Bug 1167840] * doc/refchan.n: Adjust internal name to be consistent with the file diff --git a/doc/apply.n b/doc/apply.n index bcdf6bd..8a38aac 100644 --- a/doc/apply.n +++ b/doc/apply.n @@ -74,9 +74,9 @@ proc map {lambda list} { return $result } map {x {return [string length $x]:$x}} {a bb ccc dddd} - \fI=> 1:a 2:bb 3:ccc 4:dddd\fR + \fI\(-> 1:a 2:bb 3:ccc 4:dddd\fR map {x {expr {$x**2 + 3*$x - 2}}} {-4 -3 -2 -1 0 1 2 3 4} - \fI=> 2 -2 -4 -4 -2 2 8 16 26\fR + \fI\(-> 2 -2 -4 -4 -2 2 8 16 26\fR .CE .PP The \fBapply\fR command is also useful for defining callbacks for use in the diff --git a/doc/interp.n b/doc/interp.n index e9c5801..dfa9961 100644 --- a/doc/interp.n +++ b/doc/interp.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: interp.n,v 1.27.2.3 2007/11/01 16:25:49 dgp Exp $ +'\" RCS: @(#) $Id: interp.n,v 1.27.2.4 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH interp n 7.6 Tcl "Tcl Built-In Commands" @@ -488,32 +488,33 @@ A safe interpreter is created with exactly the following set of built-in commands: .DS .ta 1.2i 2.4i 3.6i -\fBafter append apply array -binary break case catch -clock close concat continue -dict eof error eval -expr fblocked fcopy fileevent -flush for foreach format -gets global if incr -info interp join lappend -lassign lindex linsert list -llength lrange lrepeat lreplace -lsearch lset lsort namespace -package pid proc puts -read regexp regsub rename -return scan seek set -split string subst switch -tell time trace unset -update uplevel upvar variable -vwait while\fR +\fBafter\fR \fBappend\fR \fBapply\fR \fBarray\fR +\fBbinary\fR \fBbreak\fR \fBcase\fR \fBcatch\fR +\fBclock\fR \fBclose\fR \fBconcat\fR \fBcontinue\fR +\fBdict\fR \fBeof\fR \fBerror\fR \fBeval\fR +\fBexpr\fR \fBfblocked\fR \fBfcopy\fR \fBfileevent\fR +\fBflush\fR \fBfor\fR \fBforeach\fR \fBformat\fR +\fBgets\fR \fBglobal\fR \fBif\fR \fBincr\fR +\fBinfo\fR \fBinterp\fR \fBjoin\fR \fBlappend\fR +\fBlassign\fR \fBlindex\fR \fBlinsert\fR \fBlist\fR +\fBllength\fR \fBlrange\fR \fBlrepeat\fR \fBlreplace\fR +\fBlsearch\fR \fBlset\fR \fBlsort\fR \fBnamespace\fR +\fBpackage\fR \fBpid\fR \fBproc\fR \fBputs\fR +\fBread\fR \fBregexp\fR \fBregsub\fR \fBrename\fR +\fBreturn\fR \fBscan\fR \fBseek\fR \fBset\fR +\fBsplit\fR \fBstring\fR \fBsubst\fR \fBswitch\fR +\fBtell\fR \fBtime\fR \fBtrace\fR \fBunset\fR +\fBupdate\fR \fBuplevel\fR \fBupvar\fR \fBvariable\fR +\fBvwait\fR \fBwhile\fR .DE The following commands are hidden by \fBinterp create\fR when it creates a safe interpreter: .DS .ta 1.2i 2.4i 3.6i -\fBcd encoding exec exit -fconfigure file glob load -open pwd socket source unload\fR +\fBcd\fR \fBencoding\fR \fBexec\fR \fBexit\fR +\fBfconfigure\fR \fBfile\fR \fBglob\fR \fBload\fR +\fBopen\fR \fBpwd\fR \fBsocket\fR \fBsource\fR +\fBunload\fR .DE These commands can be recreated later as Tcl procedures or aliases, or re-exposed by \fBinterp expose\fR. @@ -522,25 +523,24 @@ The following commands from Tcl's library of support procedures are not present in a safe interpreter: .DS .ta 1.6i 3.2i -\fBauto_exec_ok auto_import auto_load -auto_load_index auto_qualify unknown\fR +\fBauto_exec_ok\fR \fBauto_import\fR \fBauto_load\fR +\fBauto_load_index\fR \fBauto_qualify\fR \fBunknown\fR .DE Note in particular that safe interpreters have no default \fBunknown\fR command, so Tcl's default autoloading facilities are not available. Autoload access to Tcl's commands that are normally autoloaded: .DS .ta 2.1i -\fB -auto_mkindex auto_mkindex_old -auto_reset history -parray pkg_mkIndex -::pkg::create ::safe::interpAddToAccessPath -::safe::interpCreate ::safe::interpConfigure -::safe::interpDelete ::safe::interpFindInAccessPath -::safe::interpInit ::safe::setLogCmd -tcl_endOfWord tcl_findLibrary -tcl_startOfNextWord tcl_startOfPreviousWord -tcl_wordBreakAfter tcl_wordBreakBefore\fR +\fBauto_mkindex\fR \fBauto_mkindex_old\fR +\fBauto_reset\fR \fBhistory\fR +\fBparray\fR \fBpkg_mkIndex\fR +\fB::pkg::create\fR \fB::safe::interpAddToAccessPath\fR +\fB::safe::interpCreate\fR \fB::safe::interpConfigure\fR +\fB::safe::interpDelete\fR \fB::safe::interpFindInAccessPath\fR +\fB::safe::interpInit\fR \fB::safe::setLogCmd\fR +\fBtcl_endOfWord\fR \fBtcl_findLibrary\fR +\fBtcl_startOfNextWord\fR \fBtcl_startOfPreviousWord\fR +\fBtcl_wordBreakAfter\fR \fBtcl_wordBreakBefore\fR .DE can only be provided by explicit definition of an \fBunknown\fR command in the safe interpreter. This will involve exposing the \fBsource\fR @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: join.n,v 1.5 2004/10/27 12:53:22 dkf Exp $ +'\" RCS: @(#) $Id: join.n,v 1.5.12.1 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH join n "" Tcl "Tcl Built-In Commands" @@ -29,14 +29,14 @@ Making a comma-separated list: .CS set data {1 2 3 4 5} \fBjoin\fR $data ", " - \fB=> 1, 2, 3, 4, 5\fR + \fB\(-> 1, 2, 3, 4, 5\fR .CE .PP Using \fBjoin\fR to flatten a list by a single level: .CS set data {1 {2 3} 4 {5 {6 7} 8}} \fBjoin\fR $data - \fB=> 1 2 3 4 5 {6 7} 8\fR + \fB\(-> 1 2 3 4 5 {6 7} 8\fR .CE .SH "SEE ALSO" diff --git a/doc/lindex.n b/doc/lindex.n index b99427e..c88cf91 100644 --- a/doc/lindex.n +++ b/doc/lindex.n @@ -6,7 +6,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: lindex.n,v 1.12 2006/11/15 09:23:01 dkf Exp $ +'\" RCS: @(#) $Id: lindex.n,v 1.12.2.1 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH lindex n 8.4 Tcl "Tcl Built-In Commands" @@ -68,16 +68,26 @@ lindex [lindex [lindex $a 1] 2] 3 .CE .SH EXAMPLES .CS -\fBlindex\fR {a b c} \fI=> a b c\fR -\fBlindex\fR {a b c} {} \fI=> a b c\fR -\fBlindex\fR {a b c} 0 \fI=> a\fR -\fBlindex\fR {a b c} 2 \fI=> c\fR -\fBlindex\fR {a b c} end \fI=> c\fR -\fBlindex\fR {a b c} end-1 \fI=> b\fR -\fBlindex\fR {{a b c} {d e f} {g h i}} 2 1 \fI=> h\fR -\fBlindex\fR {{a b c} {d e f} {g h i}} {2 1} \fI=> h\fR -\fBlindex\fR {{{a b} {c d}} {{e f} {g h}}} 1 1 0 \fI=> g\fR -\fBlindex\fR {{{a b} {c d}} {{e f} {g h}}} {1 1 0} \fI=> g\fR +\fBlindex\fR {a b c} + \fI\(-> a b c\fR +\fBlindex\fR {a b c} {} + \fI\(-> a b c\fR +\fBlindex\fR {a b c} 0 + \fI\(-> a\fR +\fBlindex\fR {a b c} 2 + \fI\(-> c\fR +\fBlindex\fR {a b c} end + \fI\(-> c\fR +\fBlindex\fR {a b c} end-1 + \fI\(-> b\fR +\fBlindex\fR {{a b c} {d e f} {g h i}} 2 1 + \fI\(-> h\fR +\fBlindex\fR {{a b c} {d e f} {g h i}} {2 1} + \fI\(-> h\fR +\fBlindex\fR {{{a b} {c d}} {{e f} {g h}}} 1 1 0 + \fI\(-> g\fR +\fBlindex\fR {{{a b} {c d}} {{e f} {g h}}} {1 1 0} + \fI\(-> g\fR .CE .SH "SEE ALSO" list(n), lappend(n), linsert(n), llength(n), lsearch(n), diff --git a/doc/lrepeat.n b/doc/lrepeat.n index 4bda99c..1913ab0 100644 --- a/doc/lrepeat.n +++ b/doc/lrepeat.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: lrepeat.n,v 1.2 2006/11/15 09:23:01 dkf Exp $ +'\" RCS: @(#) $Id: lrepeat.n,v 1.2.2.1 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH lrepeat n 8.5 Tcl "Tcl Built-In Commands" @@ -25,10 +25,14 @@ is identical to \fBlist arg ...\fR, though the \fIarg\fR is required with \fBlrepeat\fR. .SH EXAMPLES .CS -lrepeat 3 a => a a a -lrepeat 3 [lrepeat 3 0] => {0 0 0} {0 0 0} {0 0 0} -lrepeat 3 a b c => a b c a b c a b c -lrepeat 3 [lrepeat 2 a] b c => {a a} b c {a a} b c {a a} b c +\fBlrepeat\fR 3 a + \fI\(-> a a a\fR +\fBlrepeat\fR 3 [\fBlrepeat\fR 3 0] + \fI\(-> {0 0 0} {0 0 0} {0 0 0}\fR +\fBlrepeat\fR 3 a b c + \fI\(-> a b c a b c a b c\fR +\fBlrepeat\fR 3 [\fBlrepeat\fR 2 a] b c + \fI\(-> {a a} b c {a a} b c {a a} b c\fR .CE .SH "SEE ALSO" list(n), lappend(n), linsert(n), llength(n), lset(n) diff --git a/doc/lreverse.n b/doc/lreverse.n index 932b2d9..3aa8ac5 100644 --- a/doc/lreverse.n +++ b/doc/lreverse.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: lreverse.n,v 1.2 2006/11/15 09:23:02 dkf Exp $ +'\" RCS: @(#) $Id: lreverse.n,v 1.2.4.1 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH lreverse n 8.5 Tcl "Tcl Built-In Commands" @@ -21,8 +21,10 @@ The \fBlreverse\fR command returns a list that has the same elements as its input list, \fIlist\fR, except with the elements in the reverse order. .SH EXAMPLES .CS -\fBlreverse\fR {a a b c} => c b a a -\fBlreverse\fR {a b {c d} e f} => f e {c d} b a +\fBlreverse\fR {a a b c} + \fI\(-> c b a a\fR +\fBlreverse\fR {a b {c d} e f} + \fI\(-> f e {c d} b a\fR .CE .SH "SEE ALSO" list(n), lsearch(n), lsort(n) diff --git a/doc/lsearch.n b/doc/lsearch.n index e64ecd4..6cf9131 100644 --- a/doc/lsearch.n +++ b/doc/lsearch.n @@ -7,7 +7,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: lsearch.n,v 1.26.8.2 2007/11/01 16:25:49 dgp Exp $ +'\" RCS: @(#) $Id: lsearch.n,v 1.26.8.3 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH lsearch n 8.5 Tcl "Tcl Built-In Commands" @@ -143,53 +143,50 @@ overall list to the term found. This option has no effect unless the Basic searching: .CS \fBlsearch\fR {a b c d e} c - => 2 + \fI\(-> 2\fR \fBlsearch\fR -all {a b c a b c} c - => 2 5 + \fI\(-> 2 5\fR .CE - +.PP Using \fBlsearch\fR to filter lists: .CS \fBlsearch\fR -inline {a20 b35 c47} b* - => b35 + \fI\(-> b35\fR \fBlsearch\fR -inline -not {a20 b35 c47} b* - => a20 + \fI\(-> a20\fR \fBlsearch\fR -all -inline -not {a20 b35 c47} b* - => a20 c47 + \fI\(-> a20 c47\fR \fBlsearch\fR -all -not {a20 b35 c47} b* - => 0 2 + \fI\(-> 0 2\fR .CE +.PP This can even do a .QW set-like removal operation: .CS \fBlsearch\fR -all -inline -not -exact {a b c a d e a f g a} a - => b c d e f g + \fI\(-> b c d e f g\fR .CE - +.PP Searching may start part-way through the list: .CS \fBlsearch\fR -start 3 {a b c a b c} c - => 5 + \fI\(-> 5\fR .CE - +.PP It is also possible to search inside elements: .CS \fBlsearch\fR -index 1 -all -inline {{a abc} {b bcd} {c cde}} *bc* - => {a abc} {b bcd} + \fI\(-> {a abc} {b bcd}\fR .CE - .SH "SEE ALSO" foreach(n), list(n), lappend(n), lindex(n), linsert(n), llength(n), lset(n), lsort(n), lrange(n), lreplace(n), .VS 8.5 string(n) .VE - - .SH KEYWORDS list, match, pattern, regular expression, search, string - '\" Local Variables: '\" mode: nroff '\" End: @@ -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: lset.n,v 1.9 2005/05/10 18:34:02 kennykb Exp $ +'\" RCS: @(#) $Id: lset.n,v 1.9.8.1 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH lset n 8.4 Tcl "Tcl Built-In Commands" @@ -80,32 +80,43 @@ of a list. If an index is outside the permitted range, an error is reported. In each of these examples, the initial value of \fIx\fR is: .CS set x [list [list a b c] [list d e f] [list g h i]] - => {a b c} {d e f} {g h i} + \fI\(-> {a b c} {d e f} {g h i}\fR .CE The indicated return value also becomes the new value of \fIx\fR (except in the last case, which is an error which leaves the value of \fIx\fR unchanged.) .CS -lset x {j k l} => j k l -lset x {} {j k l} => j k l -lset x 0 j => j {d e f} {g h i} -lset x 2 j => {a b c} {d e f} j -lset x end j => {a b c} {d e f} j -lset x end-1 j => {a b c} j {g h i} -lset x 2 1 j => {a b c} {d e f} {g j i} -lset x {2 1} j => {a b c} {d e f} {g j i} -lset x {2 3} j => \fIlist index out of range\fR +\fBlset\fR x {j k l} + \fI\(-> j k l\fR +\fBlset\fR x {} {j k l} + \fI\(-> j k l\fR +\fBlset\fR x 0 j + \fI\(-> j {d e f} {g h i}\fR +\fBlset\fR x 2 j + \fI\(-> {a b c} {d e f} j\fR +\fBlset\fR x end j + \fI\(-> {a b c} {d e f} j\fR +\fBlset\fR x end-1 j + \fI\(-> {a b c} j {g h i}\fR +\fBlset\fR x 2 1 j + \fI\(-> {a b c} {d e f} {g j i}\fR +\fBlset\fR x {2 1} j + \fI\(-> {a b c} {d e f} {g j i}\fR +\fBlset\fR x {2 3} j + \fI\(-> list index out of range\fR .CE In the following examples, the initial value of \fIx\fR is: .CS set x [list [list [list a b] [list c d]] \e [list [list e f] [list g h]]] - => {{a b} {c d}} {{e f} {g h}} + \fI\(-> {{a b} {c d}} {{e f} {g h}}\fR .CE The indicated return value also becomes the new value of \fIx\fR. .CS -lset x 1 1 0 j => {{a b} {c d}} {{e f} {j h}} -lset x {1 1 0} j => {{a b} {c d}} {{e f} {j h}} +\fBlset\fR x 1 1 0 j + \fI\(-> {{a b} {c d}} {{e f} {j h}}\fR +\fBlset\fR x {1 1 0} j + \fI\(-> {{a b} {c d}} {{e f} {j h}}\fR .CE .SH "SEE ALSO" list(n), lappend(n), lindex(n), linsert(n), llength(n), lsearch(n), diff --git a/doc/mathfunc.n b/doc/mathfunc.n index bf89d1c..faa9773 100644 --- a/doc/mathfunc.n +++ b/doc/mathfunc.n @@ -6,7 +6,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: mathfunc.n,v 1.13.2.1 2007/11/01 16:25:49 dgp Exp $ +'\" RCS: @(#) $Id: mathfunc.n,v 1.13.2.2 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH mathfunc n 8.5 Tcl "Tcl Mathematical Functions" @@ -107,6 +107,14 @@ of which work solely with floating-point numbers unless otherwise noted: \fBtan\fR \fBtanh\fR \fBwide\fR .DE .PP +In addition to these predefined functions, applications may +define additional functions by using \fBproc\fR (or any other method, +such as \fBinterp alias\fR or \fBTcl_CreateObjCommand\fR) to define +new commands in the \fBtcl::mathfunc\fR namespace. In addition, an +obsolete interface named \fBTcl_CreateMathFunc\fR() is available to +extensions that are written in C. The latter interface is not recommended +for new implementations. +.SS "DETAILED DEFINITIONS" .TP \fBabs \fIarg\fR Returns the absolute value of \fIarg\fR. \fIArg\fR may be either @@ -255,14 +263,6 @@ Returns the hyperbolic tangent of \fIarg\fR. The argument may be any numeric value. The integer part of \fIarg\fR is determined, and then the low order 64 bits of that integer value are returned as an integer value. -.PP -In addition to these predefined functions, applications may -define additional functions by using \fBproc\fR (or any other method, -such as \fBinterp alias\fR or \fBTcl_CreateObjCommand\fR) to define -new commands in the \fBtcl::mathfunc\fR namespace. In addition, an -obsolete interface named \fBTcl_CreateMathFunc\fR() is available to -extensions that are written in C. The latter interface is not recommended -for new implementations. .SH "SEE ALSO" expr(n), mathop(n), namespace(n) .SH "COPYRIGHT" diff --git a/doc/mathop.n b/doc/mathop.n index 108cbd5..d1fd7df 100644 --- a/doc/mathop.n +++ b/doc/mathop.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: mathop.n,v 1.4 2006/12/19 14:22:06 dkf Exp $ +.\" RCS: @(#) $Id: mathop.n,v 1.4.4.1 2007/11/02 14:49:14 dgp Exp $ .\" .so man.macros .TH mathop n 8.5 Tcl "Tcl Mathematical Operator Commands" @@ -49,7 +49,7 @@ package require \fBTcl 8.5\fR .br \fB::tcl::mathop::<=\fR ?\fIarg\fR ...? .br -\fB::tcl::mathop::=>\fR ?\fIarg\fR ...? +\fB::tcl::mathop::>=\fR ?\fIarg\fR ...? .br \fB::tcl::mathop::>\fR ?\fIarg\fR ...? .br diff --git a/doc/regexp.n b/doc/regexp.n index 4e155ab..e0b51e2 100644 --- a/doc/regexp.n +++ b/doc/regexp.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: regexp.n,v 1.19.8.1 2007/11/01 16:25:54 dgp Exp $ +'\" RCS: @(#) $Id: regexp.n,v 1.19.8.2 2007/11/02 14:49:14 dgp Exp $ '\" .so man.macros .TH regexp n 8.3 Tcl "Tcl Built-In Commands" @@ -116,10 +116,10 @@ always returned. For each match iteration, the command will append the overall match data, plus one element for each subexpression in the regular expression. Examples are: .CS - regexp -inline -- {\ew(\ew)} " inlined " - => {in n} - regexp -all -inline -- {\ew(\ew)} " inlined " - => {in n li i ne e} +\fBregexp\fR -inline -- {\ew(\ew)} " inlined " + \fI\(-> in n\fR +\fBregexp\fR -all -inline -- {\ew(\ew)} " inlined " + \fI\(-> in n li i ne e\fR .CE .TP 15 \fB\-start\fR \fIindex\fR diff --git a/doc/split.n b/doc/split.n index 83c7ca6..ecb8b79 100644 --- a/doc/split.n +++ b/doc/split.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: split.n,v 1.5.12.1 2007/11/01 16:25:55 dgp Exp $ +'\" RCS: @(#) $Id: split.n,v 1.5.12.2 2007/11/02 14:49:15 dgp Exp $ '\" .so man.macros .TH split n "" Tcl "Tcl Built-In Commands" @@ -34,7 +34,7 @@ If \fIsplitChars\fR is an empty string then each character of Divide up a USENET group name into its hierarchical components: .CS \fBsplit\fR "comp.lang.tcl.announce" . - \fI=> comp lang tcl announce\fR + \fI\(-> comp lang tcl announce\fR .CE .PP See how the \fBsplit\fR command splits on \fIevery\fR character in @@ -42,19 +42,19 @@ See how the \fBsplit\fR command splits on \fIevery\fR character in careful: .CS \fBsplit\fR "alpha beta gamma" "temp" - \fI=> al {ha b} {} {a ga} {} a\fR + \fI\(-> al {ha b} {} {a ga} {} a\fR .CE .PP Extract the list words from a string that is not a well-formed list: .CS \fBsplit\fR "Example with {unbalanced brace character" - \fI=> Example with \e{unbalanced brace character\fR + \fI\(-> Example with \e{unbalanced brace character\fR .CE .PP Split a string into its constituent characters .CS \fBsplit\fR "Hello world" {} - \fI=> H e l l o { } w o r l d\fR + \fI\(-> H e l l o { } w o r l d\fR .CE .SS "PARSING RECORD-ORIENTED FILES" Parse a Unix /etc/passwd file, which consists of one entry per line, diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl index fa22b2e..c12b643 100755 --- a/tools/tcltk-man2html.tcl +++ b/tools/tcltk-man2html.tcl @@ -1296,10 +1296,13 @@ proc output-directive {line} { } .DS { if {[next-op-is .ta rest]} { - # ??? + # skip the leading .ta directive if it is there } if {[match-text @stuff .DE]} { - man-puts <PRE>$stuff</PRE> + set td "<td><p style=\"font-size:12px;padding-left:.5em;padding-right:.5em;\">" + set bodyText [string map [list \n <tr>$td \t $td] \n$stuff] + man-puts "<dl><dd><table border=\"0\">$bodyText</table></dl>" + #man-puts <PRE>$stuff</PRE> } elseif {[match-text .fi @ul1 @ul2 .nf @stuff .DE]} { man-puts "<PRE>[lindex $ul1 1][lindex $ul2 1]\n$stuff</PRE>" } else { |