X-Git-Url: http://nitlanguage.org diff --git a/src/ni_nitdoc.nit b/src/ni_nitdoc.nit index bdb915e..535614b 100644 --- a/src/ni_nitdoc.nit +++ b/src/ni_nitdoc.nit @@ -203,7 +203,10 @@ abstract class NitdocPage protected fun head do append("") append("") + append("") append("") + append("") + append("") append("") append("") var title = "" @@ -226,43 +229,6 @@ abstract class NitdocPage append("") append("") @@ -305,7 +271,7 @@ abstract class NitdocPage source = x.join(l.line_start.to_s) x = source.split_with("%L") source = x.join(l.line_end.to_s) - return " (source)" + return " (source)" end end @@ -372,7 +338,9 @@ class NitdocOverview end redef fun content do - append("
") + var footed = "" + if ctx.opt_custom_footer_text.value != null then footed = "footed" + append("
") var title = "Overview" if ctx.opt_custom_title.value != null then title = ctx.opt_custom_title.value.to_s @@ -447,7 +415,9 @@ class NitdocFullindex end redef fun content do - append("
") + var footed = "" + if ctx.opt_custom_footer_text.value != null then footed = "footed" + append("
") append("

Full Index

") module_column classes_column @@ -545,7 +515,9 @@ class NitdocModule redef fun content do sidebar - append("
") + var footed = "" + if ctx.opt_custom_footer_text.value != null then footed = "footed" + append("
") append("

{mmodule.name}

") append("
") mmodule.html_signature(self) @@ -783,7 +755,9 @@ class NitdocClass properties_column inheritance_column append("
") - append("
") + var footed = "" + if ctx.opt_custom_footer_text.value != null then footed = "footed" + append("
") class_doc append("
") end @@ -891,9 +865,7 @@ class NitdocClass append("
") # comment var nclass = ctx.mbuilder.mclassdef2nclassdef[mclass.intro] - append("
") append("
") - if nclass isa AStdClassdef and not nclass.full_comment.is_empty then append("
{nclass.full_comment}
CancelCommit
")
 		process_generate_dot
 		append("
") # concerns @@ -958,9 +930,9 @@ class NitdocClass if mclass.arity > 0 and nclass isa AStdClassdef then for ft, bound in mclass.parameter_types do append("
") - append("

{ft}: ") + append("

{ft}: ") bound.html_link(self) - append("

") + append("") append("
formal generic type
") append("
") end @@ -1183,10 +1155,6 @@ redef class MModule if page.ctx.mbuilder.mmodule2nmodule.has_key(self) then page.append("
") page.append("
{page.ctx.mbuilder.mmodule2nmodule[self].full_comment}
") - page.append("") - page.append("Cancel") - page.append("Commit") - page.append("
")
 			page.append("
") end end @@ -1439,26 +1407,25 @@ redef class MPropDef if not page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then return var nprop = page.ctx.mbuilder.mpropdef2npropdef[self] page.append("
") - if not is_intro then + if not is_intro and page.ctx.mbuilder.mpropdef2npropdef.has_key(mproperty.intro) then var intro_nprop = page.ctx.mbuilder.mpropdef2npropdef[mproperty.intro] - page.append("

from ") + page.append("

from ") mproperty.html_namespace(page) page.append("

") if intro_nprop.full_comment == "" then - page.append("New Comment") + page.append("No comment") else - page.append("
{intro_nprop.full_comment}
") + page.append("
{intro_nprop.full_comment}
") end - page.append("

from ") + page.append("

from ") mclassdef.html_namespace(page) page.append("

") end if nprop.full_comment == "" then - page.append("New Comment") + page.append("No comment") else - page.append("
{nprop.full_comment}
") + page.append("
{nprop.full_comment}
") end - page.append("CancelCommit
")
 		html_inheritance(page)
 		page.append("
") end @@ -1477,13 +1444,15 @@ redef class MMethodDef classes.add(mproperty.visibility.to_s) page.append("
") if page.ctx.mbuilder.mpropdef2npropdef.has_key(self) then - page.append("

{mproperty.name}") + page.append("

") + page.append("{mproperty.name}") msignature.html_signature(page) - page.append("

") + page.append("") else - page.append("

init") + page.append("

") + page.append("init") msignature.html_signature(page) - page.append("

") + page.append("") end html_info(page) html_comment(page) @@ -1501,7 +1470,6 @@ redef class MMethodDef end mproperty.html_namespace(page) page.append("
") - page.append("
") end end @@ -1513,9 +1481,9 @@ redef class MVirtualTypeDef if is_redef then classes.add("redef") classes.add(mproperty.visibility.to_s) page.append("
") - page.append("

{mproperty.name}: ") + page.append("

{mproperty.name}: ") bound.html_link(page) - page.append("

") + page.append("") html_info(page) html_comment(page) page.append("
") @@ -1527,7 +1495,6 @@ redef class MVirtualTypeDef page.append("type ") mproperty.html_namespace(page) page.append("
") - page.append("
") end end @@ -1546,6 +1513,19 @@ redef class MSignature return_mtype.html_link(page) end end + + private fun untyped_signature(page: NitdocPage): String do + var res = new Buffer + if not mparameters.is_empty then + res.append("(") + for i in [0..mparameters.length[ do + res.append(mparameters[i].name) + if i < mparameters.length - 1 then res.append(", ") + end + res.append(")") + end + return res.to_s + end end redef class MParameter