summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-07-19 15:29:51 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-07-19 15:29:51 (GMT)
commite27a7fdeba5a29068de83dc546c9ff9d01eb6aa1 (patch)
treee24bbb2c0403c4812424bb2e799dfac49b4cc55f /tools
parent44695da5cf0b2b661205e9509841420f6485e3c9 (diff)
parent72d34422eacbba7943133639ab202f4cb9869a06 (diff)
downloadtcl-e27a7fdeba5a29068de83dc546c9ff9d01eb6aa1.zip
tcl-e27a7fdeba5a29068de83dc546c9ff9d01eb6aa1.tar.gz
tcl-e27a7fdeba5a29068de83dc546c9ff9d01eb6aa1.tar.bz2
merge to rc
Diffstat (limited to 'tools')
-rw-r--r--tools/tcltk-man2html-utils.tcl8
-rwxr-xr-xtools/tcltk-man2html.tcl27
2 files changed, 32 insertions, 3 deletions
diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index a7270a1..af2faa3 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -4,7 +4,7 @@
## by Tcl and Tk; they do not cope with arbitrary nroff markup.
##
## Copyright (c) 1995-1997 Roger E. Critchlow Jr
-## Copyright (c) 2004-2010 Donal K. Fellows
+## Copyright (c) 2004-2011 Donal K. Fellows
set ::manual(report-level) 1
@@ -491,7 +491,7 @@ proc output-IP-list {context code rest} {
set dl "<DL class=\"[string tolower $manual(section)]\">"
set enddl "</DL>"
if {$code eq ".IP"} {
- if {[regexp {^\[[\da-f]+\]$} $rest]} {
+ if {[regexp {^\[[\da-f]+\]|\(?[\da-f]+\)$} $rest]} {
set dl "<OL class=\"[string tolower $manual(section)]\">"
set enddl "</OL>"
} elseif {"&#8226;" eq $rest} {
@@ -518,6 +518,8 @@ proc output-IP-list {context code rest} {
man-puts "$para<DT>$rest<DD>"
} elseif {[regexp {^\[([\da-f]+)\]$} $rest -> value]} {
man-puts "$para<LI value=\"$value\">"
+ } elseif {[regexp {^\(?([\da-f]+)\)$} $rest -> value]} {
+ man-puts "$para<LI value=\"$value\">"
} elseif {"&#8226;" eq $rest} {
man-puts "$para<LI>"
} else {
@@ -624,7 +626,7 @@ proc cross-reference {ref} {
set manname $manual(name)
set mantail $manual(tail)
if {[string match "Tcl_*" $ref] || [string match "Tk_*" $ref] || [string match "Ttk_*" $ref]} {
- set lref $ref
+ regexp {^\w+} $ref lref
##
## apply a link remapping if available
##
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index cd8b0e5..f928d4a 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -828,6 +828,33 @@ array set remap_link_target {
pkg_mkIndex pkg_mkIndex
Tcl_Obj Tcl_NewObj
Tcl_ObjType Tcl_RegisterObjType
+ Tcl_OpenFileChannelProc Tcl_FSOpenFileChannel
+ errorinfo env
+ errorcode env
+ tcl_pkgpath env
+ Tcl_Command Tcl_CreateObjCommand
+ Tcl_CmdProc Tcl_CreateObjCommand
+ Tcl_Channel Tcl_OpenFileChannel
+ Tcl_WideInt Tcl_NewIntObj
+ Tcl_ChannelType Tcl_CreateChannel
+ Tcl_DString Tcl_DStringInit
+ Tcl_Namespace Tcl_AppendExportList
+ Tcl_Object Tcl_NewObjectInstance
+ Tcl_Class Tcl_GetObjectAsClass
+ Tcl_Event Tcl_QueueEvent
+ Tcl_Time Tcl_GetTime
+ Tcl_ThreadId Tcl_CreateThread
+ Tk_Window Tk_WindowId
+ Tk_3DBorder Tk_Get3DBorder
+ Tk_Anchor Tk_GetAnchor
+ Tk_Cursor Tk_GetCursor
+ Tk_Dash Tk_GetDash
+ Tk_Font Tk_GetFont
+ Tk_Image Tk_GetImage
+ Tk_ImageMaster Tk_GetImage
+ Tk_ItemType Tk_CreateItemType
+ Tk_Justify Tk_GetJustify
+ Ttk_Theme Ttk_GetTheme
}
array set exclude_refs_map {
bind.n {button destroy option}