Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v diff -u -N -r1.30.2.6 -r1.30.2.7 --- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 7 Dec 2015 18:40:45 -0000 1.30.2.6 +++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 7 Dec 2015 19:06:32 -0000 1.30.2.7 @@ -387,26 +387,30 @@ append out $first_line_tag$pretty_name$end_tag if {[regexp {^(.*) (inst)?proc (.*)$} $proc_name match cl prefix method]} { - set xotcl 1 + set xotclArgs 1 set scope "" if {[regexp {^(.+) (.+)$} $cl match scope cl]} { set cl "$scope do $cl" } if {$prefix eq ""} { set pretty_proc_name "[::xotcl::api object_link $scope $cl] $method" } else { - set pretty_proc_name \ - "<instance of\ + set pretty_proc_name "<instance of\ [::xotcl::api object_link $scope $cl]> $method" } } else { - set xotcl 0 - set pretty_proc_name $proc_name + set xotclArgs 0 + if {[info commands ::xotcl::api] ne "" && [::xotcl::api isclass "" [lindex $proc_name 1]]} { + set name [lindex $proc_name 1] + set pretty_proc_name "[$name info class] [::xotcl::api object_link {} $name]" + } else { + set pretty_proc_name $proc_name + } } lappend command_line $pretty_proc_name foreach switch $doc_elements(switches) { - if {$xotcl} { + if {$xotclArgs} { if {"boolean" in $flags($switch)} { set value "on|off " } elseif {"switch" in $flags($switch)} { @@ -647,10 +651,11 @@ if {![info exists label]} { set label $proc } + ns_log notice "api_proc_pretty_name link $link_p, label $label, proc $proc" if { $link_p } { append out "$label" } else { - append out "$label" + append out $label } array set doc_elements [nsv_get api_proc_doc $proc] if {$doc_elements(deprecated_p)} { @@ -664,6 +669,7 @@ if { $doc_elements(private_p) } { append out " (private$deprecated)" } + ns_log notice "... return $out" return $out }