Index: library/lib/nxdoc-xowiki.tcl =================================================================== diff -u -re0f9892926cd7c2c3bf54a1e7d1d945a5c77e7ca -r263cd750f41d98badaae2b2d06bb2ea58feb99e4 --- library/lib/nxdoc-xowiki.tcl (.../nxdoc-xowiki.tcl) (revision e0f9892926cd7c2c3bf54a1e7d1d945a5c77e7ca) +++ library/lib/nxdoc-xowiki.tcl (.../nxdoc-xowiki.tcl) (revision 263cd750f41d98badaae2b2d06bb2ea58feb99e4) @@ -14,18 +14,18 @@ nx::Class create Page { :property {lang en} :property {description ""} - :property {text ""} + :property -accessor public {text ""} :property {nls_language en_US} :property {mime_type text/html} - :property {title ""} + :property -accessor public {title ""} :property name :property text :property page_order # # For representing a folder structure # :property parent_id - :property item_id + :property -accessor public item_id } nx::Class create File -superclass Page @@ -173,7 +173,7 @@ next } - :public class method mkFolder {entity} -returns object,type=[current] { + :public object method mkFolder {entity} -returns object,type=[current] { return [:new -name en:[$entity filename] -title [$entity print_name]] } @@ -196,7 +196,12 @@ :public method serialize {} { set map [list [current class] [[: -system info class] info superclass]] - set ignore [join [[current class] info slot names] |] + set slots [[current class] info slots] + set names [list] + foreach s $slots { + lappend names [$s name] + } + set ignore [join $names |] append script [::Serializer deepSerialize -map $map -ignoreVarsRE $ignore [current]] if {[info exists :indexPage]} { append script \n [${:indexPage} serialize] @@ -336,7 +341,7 @@ } - :class method render { + :object method render { project entity:object,type=::nx::doc::StructuredEntity theme @@ -362,9 +367,9 @@ set fwdTarget [list ::base64::encode] } - :class forward asBase64 {*}$fwdTarget + :object forward asBase64 {*}$fwdTarget - :class method installAssets {project theme targetDir} { + :object method installAssets {project theme targetDir} { # # render and append single glossary page to the output #