Index: library/lib/doc-assets/class.html.tmpl =================================================================== diff -u -rc4cc0944433a7cc9ae99612039aa0237ae70ec08 -rdbddbce63d4a499de52ff07fdc63c02017960c79 --- library/lib/doc-assets/class.html.tmpl (.../class.html.tmpl) (revision c4cc0944433a7cc9ae99612039aa0237ae70ec08) +++ library/lib/doc-assets/class.html.tmpl (.../class.html.tmpl) (revision dbddbce63d4a499de52ff07fdc63c02017960c79) @@ -5,7 +5,7 @@

- [:? {[${:name} info is class]} { Class } - { Object }] + Class ${:name} [:?var :@superclass { @@ -26,11 +26,12 @@
-[:?var :@param {
-

Slots

+

Class parameters

- [:for attr ${:@param} { +[:?var :@class-param { + + [:for attr ${:@class-param} {

[$attr name]

@@ -57,17 +58,18 @@
}] -
+}] +
-} ] - [:let iattrs [:inherited @param]] + + [:let iattrs [:inherited @class-param]] [:? {$iattrs ne ""} {
[:for superclass [dict keys $iattrs] { [:let attrs [dict get $iattrs $superclass]]
-

Slots inherited +

Object parameters inherited from [$superclass name]:

@@ -89,12 +91,50 @@ }]
+
+
+

Object parameters

+
+[:?var :@object-param { + + [:for attr ${:@object-param} { +
+

[$attr name] +

+
+
+ [$attr text] +
+
+ + + [:? {[$attr eval {info exists :default}]} { +
+ Default Value: [$attr default] +
+ }] + + [:? {[$attr eval {info exists :deprecated}]} { +
+ Deprecated: [$attr] +
+ }] + +
+
+ + }] +}] +
+
+
+
-[:?var :@method {
-

Methods

+

Class methods

- [:for method ${:@method} { +[:?var :@class-method { + [:for method ${:@class-method} {

[$method name]

@@ -163,10 +203,11 @@
}] + }]
- }] - [:let imethods [:inherited @method]] + + [:let imethods [:inherited @class-method]] [:? {$imethods ne ""} {
[:for superclass [dict keys $imethods] { @@ -203,7 +244,7 @@ [:?var :@object-method {
-

Per-object methods

+

Object methods

[:for omethod ${:@object-method} {
Index: library/lib/doc-assets/entity.html.tmpl =================================================================== diff -u -r6458c13882afd52e8719ee0e0e054b42e9aee696 -rdbddbce63d4a499de52ff07fdc63c02017960c79 --- library/lib/doc-assets/entity.html.tmpl (.../entity.html.tmpl) (revision 6458c13882afd52e8719ee0e0e054b42e9aee696) +++ library/lib/doc-assets/entity.html.tmpl (.../entity.html.tmpl) (revision dbddbce63d4a499de52ff07fdc63c02017960c79) @@ -1,6 +1,3 @@ -[:let packages [sorted [@package info instances] name]] -[:let objects [sorted [@object info instances] name]] -[:let commands [sorted [@command info instances] name]] @@ -29,7 +26,7 @@ [$project name] [:? {[:info is type ::nx::doc::@package]} { > ${:name} - } ? {[:info is type ::nx::doc::@object]} { + } ? {[:info is type ::nx::doc::@class]} { > [:?var :partof {[${:partof} name] >}] ${:name} }]
@@ -47,8 +44,8 @@
[:? {[:info is type ::nx::doc::@package]} { [:include package.html.tmpl] - } ? {[:info is type ::nx::doc::@object]} { - [:include object.html.tmpl] + } ? {[:info is type ::nx::doc::@class]} { + [:include class.html.tmpl] } ? {[:info is type ::nx::doc::@command]} { [:include command.html.tmpl] } ? {[:info is type ::nx::doc::@project]} { @@ -62,11 +59,11 @@