More small documentation improvements.

2 files changed, 29 insertions, 4 deletions

diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index 16e9a93..a7270a1 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -623,7 +623,7 @@ proc cross-reference {ref} {
     global ensemble_commands exclude_refs_map exclude_when_followed_by_map
     set manname $manual(name)
     set mantail $manual(tail)
-    if {[string match "Tcl_*" $ref] || [string match "Tk_*" $ref]} {
+    if {[string match "Tcl_*" $ref] || [string match "Tk_*" $ref] || [string match "Ttk_*" $ref]} {
 	set lref $ref
 	##
 	## apply a link remapping if available
@@ -758,6 +758,7 @@ proc insert-cross-references {text} {
 	    bold       {<B>}	end-bold   {</B>}
 	    tcl        {Tcl_}
 	    tk         {Tk_}
+	    ttk	       {Ttk_}
 	    Tcl1       {Tcl manual entry}
 	    Tcl2       {Tcl overview manual entry}
 	    url	       {http://}
@@ -795,7 +796,7 @@ proc insert-cross-references {text} {
 		if {$offset(end-quote) < 0} {
 		    return [reference-error "Missing end quote" $text]
 		}
-		if {$invert([lindex $offsets 1]) in {tcl tk}} {
+		if {$invert([lindex $offsets 1]) in {tcl tk ttk}} {
 		    set offsets [lreplace $offsets 1 1]
 		}
 		switch -exact -- $invert([lindex $offsets 1]) {
@@ -824,7 +825,7 @@ proc insert-cross-references {text} {
 		if {$offset(end-bold) < 0} {
 		    return [append result $text]
 		}
-		if {$invert([lindex $offsets 1]) in {tcl tk}} {
+		if {$invert([lindex $offsets 1]) in {tcl tk ttk}} {
 		    set offsets [lreplace $offsets 1 1]
 		}
 		switch -exact -- $invert([lindex $offsets 1]) {
@@ -864,6 +865,18 @@ proc insert-cross-references {text} {
 		append result [cross-reference $body]
 		continue
 	    }
+	    ttk {
+		append result [string range $text 0 [expr {$offset(ttk)-1}]]
+		if {![regexp -indices -start $offset(ttk) {Ttk_\w+} $text range]} {
+		    return [reference-error "Ttk regexp failed" $text]
+		}
+		set body [string range $text {*}$range]
+		set text [string range $text[set text ""] \
+			      [expr {[lindex $range 1]+1}] end]
+		set tail $text
+		append result [cross-reference $body]
+		continue
+	    }
 	    tcl {
 		append result [string range $text 0 [expr {$offset(tcl)-1}]]
 		if {![regexp -indices -start $offset(tcl) {Tcl_\w+} $text range]} {
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 33d9ff9..cd8b0e5 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -836,22 +836,31 @@ array set exclude_refs_map {
     next.n		{unknown}
     zlib.n		{binary close filename text}
     canvas.n		{bitmap text}
+    console.n		{eval}
     checkbutton.n	{image}
     clipboard.n		{string}
+    entry.n		{string}
+    event.n		{return}
+    font.n		{menu}
+    getOpenFile.n	{file open text}
+    grab.n		{global}
     interp.n		{time}
     menu.n		{checkbutton radiobutton}
+    messageBox.n	{error info}
     options.n		{bitmap image set}
     radiobutton.n	{image}
     safe.n		{join split}
+    scale.n		{label variable}
     scrollbar.n		{set}
     selection.n		{string}
     tcltest.n		{error}
     tkvars.n		{tk}
+    tkwait.n		{variable}
     tm.n		{exec}
     ttk_checkbutton.n	{variable}
     ttk_combobox.n	{selection}
     ttk_entry.n		{focus variable}
-    ttk_intro.n		{focus}
+    ttk_intro.n		{focus text}
     ttk_label.n		{font text}
     ttk_labelframe.n	{text}
     ttk_menubutton.n	{flush}
@@ -880,6 +889,9 @@ array set exclude_when_followed_by_map {
     ttk_image.n {
 	image imageSpec
     }
+    fontchooser.n {
+	tk fontchooser
+    }
 }
 
 try {