From 497bc9460c22455176d9935f1af6b643260c2dbd Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Sat, 9 Jan 2010 18:42:43 +0000
Subject: Added the contributed packages to the code to build HTML docs.
---
ChangeLog | 15 +++++++++++----
tools/tcltk-man2html.tcl | 26 +++++++++++++++++++++-----
2 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9927869..54a592d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2010-01-09 Donal K. Fellows <dkf@users.sf.net>
+
+ * tools/tcltk-man2html.tcl: Added basic support for building the docs
+ for contributed packages into the HTML versions. Prompted by question
+ on Tcler's Chat by Tom Krehbiel. Note that there remain problems in
+ the documentation generated due to errors in the contributed docs.
+
2010-01-05 Don Porter <dgp@users.sourceforge.net>
- * generic/tclPathObj.c (TclPathPart): Correct inconsistency between
- * tests/fileName.test (filename-14.31): the string rep and the intrep
- of a path value created by [file rootname]. Thanks to Vitaly Magerya
- for reporting. [Bug 2918610]
+ * generic/tclPathObj.c (TclPathPart): [Bug 2918610]: Correct
+ * tests/fileName.test (filename-14.31): inconsistency between the
+ string rep and the intrep of a path value created by [file rootname].
+ Thanks to Vitaly Magerya for reporting.
2010-01-03 Donal K. Fellows <dkf@users.sf.net>
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 3855d50..747c020 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -1956,15 +1956,31 @@ set tclcmddesc {The commands which the <B>tclsh</B> interpreter implements.}
set tkcmddesc {The additional commands which the <B>wish</B> interpreter implements.}
set tcllibdesc {The C functions which a Tcl extended C program may use.}
set tklibdesc {The additional C functions which a Tk extended C program may use.}
+set tclpkgcmdsdesc {The additional commands in packages contributed to the Tcl distribution.}
+set tclpkglibdesc {The additional C functions in packages contributed to the Tcl distribution.}
if {1} {
if {[catch {
make-man-pages $webdir \
- "$tcltkdir/{$appdir}/doc/*.1 \"$tcltkdesc Applications\" UserCmd {$usercmddesc}" \
- [expr {$build_tcl ? "$tcltkdir/$tcldir/doc/*.n {Tcl Commands} TclCmd {$tclcmddesc}" : ""}] \
- [expr {$build_tk ? "$tcltkdir/$tkdir/doc/*.n {Tk Commands} TkCmd {$tkcmddesc}" : ""}] \
- [expr {$build_tcl ? "$tcltkdir/$tcldir/doc/*.3 {Tcl Library} TclLib {$tcllibdesc}" : ""}] \
- [expr {$build_tk ? "$tcltkdir/$tkdir/doc/*.3 {Tk Library} TkLib {$tklibdesc}" : ""}]
+ [list $tcltkdir/{$appdir}/doc/*.1 "$tcltkdesc Applications" UserCmd $usercmddesc] \
+ [expr {$build_tcl ?
+ [list $tcltkdir/$tcldir/doc/*.n {Tcl Commands} TclCmd $tclcmddesc]
+ : ""}] \
+ [expr {$build_tk ?
+ [list $tcltkdir/$tkdir/doc/*.n {Tk Commands} TkCmd $tkcmddesc]
+ : ""}] \
+ [expr {$build_tcl ?
+ [list $tcltkdir/$tcldir/pkgs/*/doc/*.n {Contrib. Package Commands} PkgCmd $tclpkgcmdsdesc]
+ : ""}] \
+ [expr {$build_tcl ?
+ [list $tcltkdir/$tcldir/doc/*.3 {Tcl Library} TclLib $tcllibdesc]
+ : ""}] \
+ [expr {$build_tk ?
+ [list $tcltkdir/$tkdir/doc/*.3 {Tk Library} TkLib $tklibdesc]
+ : ""}] \
+ [expr {$build_tcl ?
+ [list $tcltkdir/$tcldir/pkgs/*/doc/*.3 {Contrib. Package Library} PkgLib $tclpkglibdesc]
+ : ""}]
} error]} {
puts $error\n$errorInfo
}
--
cgit v0.12