X-Git-Url: http://nitlanguage.org

diff --git a/src/doc/doc_pages.nit b/src/doc/doc_pages.nit
index ef43946..fc556d6 100644
--- a/src/doc/doc_pages.nit
+++ b/src/doc/doc_pages.nit
@@ -17,12 +17,15 @@ module doc_pages
 
 import toolcontext
 import doc_model
+private import json::static
 
 redef class ToolContext
 	private var opt_dir = new OptionString("output directory", "-d", "--dir")
 	private var opt_source = new OptionString("link for source (%f for filename, %l for first line, %L for last line)", "--source")
 	private var opt_sharedir = new OptionString("directory containing nitdoc assets", "--sharedir")
 	private var opt_shareurl = new OptionString("use shareurl instead of copy shared files", "--shareurl")
+	private var opt_no_attributes = new OptionBool("ignore the attributes",
+			"--no-attributes")
 	private var opt_nodot = new OptionBool("do not generate graphes with graphviz", "--no-dot")
 	private var opt_private = new OptionBool("also generate private API", "--private")
 
@@ -45,7 +48,8 @@ redef class ToolContext
 		super
 
 		var opts = option_context
-		opts.add_option(opt_dir, opt_source, opt_sharedir, opt_shareurl, opt_nodot, opt_private)
+		opts.add_option(opt_dir, opt_source, opt_sharedir, opt_shareurl,
+				opt_no_attributes, opt_nodot, opt_private)
 		opts.add_option(opt_custom_title, opt_custom_footer, opt_custom_intro, opt_custom_brand)
 		opts.add_option(opt_github_upstream, opt_github_base_sha1, opt_github_gitdir)
 		opts.add_option(opt_piwik_tracker, opt_piwik_site_id)
@@ -82,19 +86,30 @@ redef class ToolContext
 			end
 		end
 	end
+
+	# Filter the entity based on the options specified by the user.
+	#
+	# Return `true` if the specified entity has to be included in the generated
+	# documentation
+	private fun filter_mclass(mclass: MClass): Bool do
+		return mclass.visibility >= min_visibility
+	end
+
+	# Filter the entity based on the options specified by the user.
+	#
+	# Return `true` if the specified entity has to be included in the generated
+	# documentation
+	private fun filter_mproperty(mproperty: MProperty): Bool do
+		return mproperty.visibility >= min_visibility and
+			not (opt_no_attributes.value and mproperty isa MAttribute)
+	end
 end
 
 # The Nitdoc class explores the model and generate pages for each mentities found
 class Nitdoc
+	var ctx: ToolContext
 	var model: Model
 	var mainmodule: MModule
-	var ctx: ToolContext
-
-	init(ctx: ToolContext, model: Model, mainmodule: MModule) do
-		self.ctx = ctx
-		self.model = model
-		self.mainmodule = mainmodule
-	end
 
 	fun generate do
 		init_output_dir
@@ -115,11 +130,7 @@ class Nitdoc
 		var sharedir = ctx.opt_sharedir.value
 		if sharedir == null then
 			var dir = ctx.nit_dir
-			if dir == null then
-				print "Error: Cannot locate nitdoc share files. Uses --sharedir or envvar NIT_DIR"
-				abort
-			end
-			sharedir = "{dir}/share/nitdoc"
+			sharedir = dir/"share/nitdoc"
 			if not sharedir.file_exists then
 				print "Error: Cannot locate nitdoc share files. Uses --sharedir or envvar NIT_DIR"
 				abort
@@ -127,9 +138,9 @@ class Nitdoc
 		end
 		# copy shared files
 		if ctx.opt_shareurl.value == null then
-			sys.system("cp -r {sharedir.to_s}/* {output_dir.to_s}/")
+			sys.system("cp -r -- {sharedir.to_s.escape_to_sh}/* {output_dir.to_s.escape_to_sh}/")
 		else
-			sys.system("cp -r {sharedir.to_s}/resources/ {output_dir.to_s}/resources/")
+			sys.system("cp -r -- {sharedir.to_s.escape_to_sh}/resources/ {output_dir.to_s.escape_to_sh}/resources/")
 		end
 
 	end
@@ -163,6 +174,7 @@ class Nitdoc
 
 	private fun classes do
 		for mclass in model.mclasses do
+			if not ctx.filter_mclass(mclass) then continue
 			var page = new NitdocClass(ctx, model, mainmodule, mclass)
 			page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}")
 		end
@@ -170,6 +182,8 @@ class Nitdoc
 
 	private fun properties do
 		for mproperty in model.mproperties do
+			if not ctx.filter_mproperty(mproperty) then continue
+			if mproperty isa MInnerClass then continue
 			var page = new NitdocProperty(ctx, model, mainmodule, mproperty)
 			page.render.write_to_file("{ctx.output_dir.to_s}/{page.page_url}")
 		end
@@ -190,56 +204,79 @@ end
 # All entities are grouped by name to make the research easier.
 class QuickSearch
 
-	private var mmodules = new HashSet[MModule]
-	private var mclasses = new HashSet[MClass]
-	private var mpropdefs = new HashMap[String, Set[MPropDef]]
+	private var table = new QuickSearchTable
 
-	init(ctx: ToolContext, model: Model) do
+	var ctx: ToolContext
+	var model: Model
+
+	init do
 		for mmodule in model.mmodules do
 			if mmodule.is_fictive then continue
-			mmodules.add mmodule
+			add_result_for(mmodule.name, mmodule.full_name, mmodule.nitdoc_url)
 		end
 		for mclass in model.mclasses do
-			if mclass.visibility < ctx.min_visibility then continue
-			mclasses.add mclass
+			if not ctx.filter_mclass(mclass) then continue
+			add_result_for(mclass.name, mclass.full_name, mclass.nitdoc_url)
 		end
 		for mproperty in model.mproperties do
-			if mproperty.visibility < ctx.min_visibility then continue
-			if mproperty isa MAttribute then continue
-			if not mpropdefs.has_key(mproperty.name) then
-				mpropdefs[mproperty.name] = new HashSet[MPropDef]
+			if not ctx.filter_mproperty(mproperty) then continue
+			for mpropdef in mproperty.mpropdefs do
+				var full_name = mpropdef.mclassdef.mclass.full_name
+				var cls_url = mpropdef.mclassdef.mclass.nitdoc_url
+				var def_url = "{cls_url}#{mpropdef.mproperty.nitdoc_id}"
+				add_result_for(mproperty.name, full_name, def_url)
 			end
-			mpropdefs[mproperty.name].add_all(mproperty.mpropdefs)
 		end
 	end
 
+	private fun add_result_for(query: String, txt: String, url: String) do
+		table[query].add new QuickSearchResult(txt, url)
+	end
+
 	fun render: Template do
 		var tpl = new Template
-		tpl.add "var nitdocQuickSearchRawList=\{ "
-		for mmodule in mmodules do
-			tpl.add "\"{mmodule.name}\":["
-			tpl.add "\{txt:\"{mmodule.full_name}\",url:\"{mmodule.nitdoc_url}\"\},"
-			tpl.add "],"
-		end
-		for mclass in mclasses do
-			var full_name = mclass.intro.mmodule.full_name
-			tpl.add "\"{mclass.name}\":["
-			tpl.add "\{txt:\"{full_name}\",url:\"{mclass.nitdoc_url}\"\},"
-			tpl.add "],"
-		end
-		for mproperty, mprops in mpropdefs do
-			tpl.add "\"{mproperty}\":["
-			for mpropdef in mprops do
-				var full_name = mpropdef.mclassdef.mclass.full_name
-				tpl.add "\{txt:\"{full_name}\",url:\"{mpropdef.nitdoc_url}\"\},"
-			end
-			tpl.add "],"
-		end
-		tpl.add " \};"
+		var buffer = new RopeBuffer
+		tpl.add buffer
+		buffer.append "var nitdocQuickSearchRawList="
+		table.append_json buffer
+		buffer.append ";"
 		return tpl
 	end
 end
 
+# The result map for QuickSearch.
+private class QuickSearchTable
+	super JsonMapRead[String, QuickSearchResultList]
+	super HashMap[String, QuickSearchResultList]
+
+	redef fun provide_default_value(key) do
+		var v = new QuickSearchResultList
+		self[key] = v
+		return v
+	end
+end
+
+# A QuickSearch result list.
+private class QuickSearchResultList
+	super JsonSequenceRead[QuickSearchResult]
+	super Array[QuickSearchResult]
+end
+
+# A QuickSearch result.
+private class QuickSearchResult
+	super Jsonable
+
+	# The text of the link.
+	var txt: String
+
+	# The destination of the link.
+	var url: String
+
+	redef fun to_json do
+		return "\{\"txt\":{txt.to_json},\"url\":{url.to_json}\}"
+	end
+end
+
 # Nitdoc base page
 # Define page structure and properties
 abstract class NitdocPage
@@ -249,12 +286,6 @@ abstract class NitdocPage
 	private var mainmodule: MModule
 	private var name_sorter = new MEntityNameSorter
 
-	init(ctx: ToolContext, model: Model, mainmodule: MModule) do
-		self.ctx = ctx
-		self.model = model
-		self.mainmodule = mainmodule
-	end
-
 	# Render the page as a html template
 	fun render: Template do
 		var shareurl = "."
@@ -320,14 +351,16 @@ abstract class NitdocPage
 
 	# Clickable graphviz image using dot format
 	# return null if no graph for this page
-	fun tpl_graph(dot: FlatBuffer, name: String, title: nullable String): nullable TplArticle do
+	fun tpl_graph(dot: Buffer, name: String, title: nullable String): nullable TplArticle do
 		if ctx.opt_nodot.value then return null
 		var output_dir = ctx.output_dir
-		var file = new OFStream.open("{output_dir}/{name}.dot")
+		var path = output_dir / name
+		var path_sh = path.escape_to_sh
+		var file = new OFStream.open("{path}.dot")
 		file.write(dot)
 		file.close
-		sys.system("\{ test -f {output_dir}/{name}.png && test -f {output_dir}/{name}.s.dot && diff {output_dir}/{name}.dot {output_dir}/{name}.s.dot >/dev/null 2>&1 ; \} || \{ cp {output_dir}/{name}.dot {output_dir}/{name}.s.dot && dot -Tpng -o{output_dir}/{name}.png -Tcmapx -o{output_dir}/{name}.map {output_dir}/{name}.s.dot ; \}")
-		var fmap = new IFStream.open("{output_dir}/{name}.map")
+		sys.system("\{ test -f {path_sh}.png && test -f {path_sh}.s.dot && diff -- {path_sh}.dot {path_sh}.s.dot >/dev/null 2>&1 ; \} || \{ cp -- {path_sh}.dot {path_sh}.s.dot && dot -Tpng -o{path_sh}.png -Tcmapx -o{path_sh}.map {path_sh}.s.dot ; \}")
+		var fmap = new IFStream.open("{path}.map")
 		var map = fmap.read_all
 		fmap.close
 
@@ -335,11 +368,12 @@ abstract class NitdocPage
 		var alt = ""
 		if title != null then
 			article.title = title
-			alt = "alt='{title}'"
+			alt = "alt='{title.html_escape}'"
 		end
 		article.css_classes.add "text-center"
 		var content = new Template
-		content.add "<img src='{name}.png' usemap='#{name}' style='margin:auto' {alt}/>"
+		var name_html = name.html_escape
+		content.add "<img src='{name_html}.png' usemap='#{name_html}' style='margin:auto' {alt}/>"
 		content.add map
 		article.content = content
 		return article
@@ -350,7 +384,10 @@ abstract class NitdocPage
 	do
 		if location == null then return null
 		var source = ctx.opt_source.value
-		if source == null then return "{location.file.filename.simplify_path}"
+		if source == null then
+			var url = location.file.filename.simplify_path
+			return "<a target='_blank' title='Show source' href=\"{url.html_escape}\">View Source</a>"
+		end
 		# THIS IS JUST UGLY ! (but there is no replace yet)
 		var x = source.split_with("%f")
 		source = x.join(location.file.filename.simplify_path)
@@ -359,7 +396,7 @@ abstract class NitdocPage
 		x = source.split_with("%L")
 		source = x.join(location.line_end.to_s)
 		source = source.simplify_path
-		return "<a target='_blank' title='Show source' href=\"{source.to_s}\">View Source</a>"
+		return "<a target='_blank' title='Show source' href=\"{source.to_s.html_escape}\">View Source</a>"
 	end
 
 	# MProject description template
@@ -367,8 +404,9 @@ abstract class NitdocPage
 		var article = mproject.tpl_article
 		article.subtitle = mproject.tpl_declaration
 		article.content = mproject.tpl_definition
-		if mproject.mdoc != null then
-			article.content = mproject.mdoc.tpl_short_comment
+		var mdoc = mproject.mdoc_or_fallback
+		if mdoc != null then
+			article.content = mdoc.tpl_short_comment
 		end
 		return article
 	end
@@ -390,10 +428,10 @@ abstract class NitdocPage
 		var intros = mmodule.intro_mclassdefs(ctx.min_visibility).to_a
 		if not intros.is_empty then
 			mainmodule.linearize_mclassdefs(intros)
-			var intros_art = new TplArticle.with_title("{mmodule.nitdoc_id}_intros", "Introduces")
+			var intros_art = new TplArticle.with_title("{mmodule.nitdoc_id}.intros", "Introduces")
 			var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
 			for mclassdef in intros do
-				intros_lst.add_li new TplListItem.with_content(mclassdef.tpl_list_item)
+				intros_lst.add_li mclassdef.tpl_list_item
 			end
 			if not intros_lst.is_empty then
 				intros_art.content = intros_lst
@@ -403,10 +441,10 @@ abstract class NitdocPage
 		var redefs = mmodule.redef_mclassdefs(ctx.min_visibility).to_a
 		if not redefs.is_empty then
 			mainmodule.linearize_mclassdefs(redefs)
-			var redefs_art = new TplArticle.with_title("{mmodule.nitdoc_id}_redefs", "Redefines")
+			var redefs_art = new TplArticle.with_title("{mmodule.nitdoc_id}.redefs", "Redefines")
 			var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
 			for mclassdef in redefs do
-				redefs_lst.add_li new TplListItem.with_content(mclassdef.tpl_list_item)
+				redefs_lst.add_li mclassdef.tpl_list_item
 			end
 			if not redefs_lst.is_empty then
 				redefs_art.content = redefs_lst
@@ -432,19 +470,19 @@ abstract class NitdocPage
 			redef_article.source_link = tpl_showsource(mclassdef.location)
 			article.add_child redef_article
 			# mpropdefs list
-			var intros = new TplArticle.with_title("{mclassdef.nitdoc_id}_intros", "Introduces")
+			var intros = new TplArticle.with_title("{mclassdef.nitdoc_id}.intros", "Introduces")
 			var intros_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
 			for mpropdef in mclassdef.collect_intro_mpropdefs(ctx.min_visibility) do
-				intros_lst.add_li new TplListItem.with_content(mpropdef.tpl_list_item)
+				intros_lst.add_li mpropdef.tpl_list_item
 			end
 			if not intros_lst.is_empty then
 				intros.content = intros_lst
 				redef_article.add_child intros
 			end
-			var redefs = new TplArticle.with_title("{mclassdef.nitdoc_id}_redefs", "Redefines")
+			var redefs = new TplArticle.with_title("{mclassdef.nitdoc_id}.redefs", "Redefines")
 			var redefs_lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
 			for mpropdef in mclassdef.collect_redef_mpropdefs(ctx.min_visibility) do
-				redefs_lst.add_li new TplListItem.with_content(mpropdef.tpl_list_item)
+				redefs_lst.add_li mpropdef.tpl_list_item
 			end
 			if not redefs_lst.is_empty then
 				redefs.content = redefs_lst
@@ -463,28 +501,73 @@ abstract class NitdocPage
 	end
 
 	# MProp description template
-	fun tpl_mprop_article(mproperty: MProperty, mpropdefs: Array[MPropDef]): TplArticle do
-		var article = mproperty.tpl_article
-		if not mpropdefs.has(mproperty.intro) then
-			# add intro synopsys
-			var intro_article = mproperty.intro.tpl_short_article
-			intro_article.source_link = tpl_showsource(mproperty.intro.location)
-			article.add_child intro_article
+	#
+	# `main_mpropdef`: The most important mpropdef to display
+	# `local_mpropdefs`: List of other locally defined mpropdefs to display
+	# `lin`: full linearization from local_mpropdefs to intro (displayed in redef tree)
+	fun tpl_mprop_article(main_mpropdef: MPropDef, local_mpropdefs: Array[MPropDef],
+	   lin: Array[MPropDef]): TplArticle do
+		var mprop = main_mpropdef.mproperty
+		var article = new TplArticle(mprop.nitdoc_id)
+		var title = new Template
+		title.add mprop.tpl_icon
+		title.add "<span id='{main_mpropdef.nitdoc_id}'></span>"
+		if main_mpropdef.is_intro then
+			title.add mprop.tpl_link
+			title.add mprop.intro.tpl_signature
+		else
+			var cls_url = mprop.intro.mclassdef.mclass.nitdoc_url
+			var def_url = "{cls_url}#{mprop.nitdoc_id}"
+			var lnk = new TplLink.with_title(def_url, mprop.nitdoc_name,
+					"Go to introduction")
+			title.add "redef "
+			title.add lnk
+		end
+		article.title = title
+		article.title_classes.add "signature"
+		article.summary_title = "{mprop.nitdoc_name}"
+		article.subtitle = main_mpropdef.tpl_namespace
+		if main_mpropdef.mdoc_or_fallback != null then
+			article.content = main_mpropdef.mdoc_or_fallback.tpl_comment
+		end
+		var subarticle = new TplArticle("{main_mpropdef.nitdoc_id}.redefs")
+		# Add redef in same `MClass`
+		if local_mpropdefs.length > 1 then
+			for mpropdef in local_mpropdefs do
+				if mpropdef == main_mpropdef then continue
+				var redef_article = new TplArticle("{mpropdef.nitdoc_id}")
+				var redef_title = new Template
+				redef_title.add "also redef in "
+				redef_title.add mpropdef.tpl_namespace
+				redef_article.title = redef_title
+				redef_article.title_classes.add "signature info"
+				redef_article.css_classes.add "nospace"
+				var redef_content = new Template
+				if mpropdef.mdoc_or_fallback != null then
+					redef_content.add mpropdef.mdoc_or_fallback.tpl_comment
+				end
+				redef_article.content = redef_content
+				subarticle.add_child redef_article
+			end
 		end
-		mainmodule.linearize_mpropdefs(mpropdefs)
-		for mpropdef in mpropdefs do
-			# add mpropdef description
-			var redef_article = mpropdef.tpl_article
-			redef_article.source_link = tpl_showsource(mpropdef.location)
-			article.add_child redef_article
+		# Add linearization
+		if lin.length > 1 then
+			var lin_article = new TplArticle("{main_mpropdef.nitdoc_id}.lin")
+			lin_article.title = "Inheritance"
+			var lst = new TplList.with_classes(["list-unstyled", "list-labeled"])
+			for mpropdef in lin do
+				lst.add_li mpropdef.tpl_inheritance_item
+			end
+			lin_article.content = lst
+			subarticle.add_child lin_article
 		end
+		article.add_child subarticle
 		return article
 	end
 
 	# MProperty description template
 	fun tpl_mpropdef_article(mpropdef: MPropDef): TplArticle do
 		var article = mpropdef.tpl_article
-		if mpropdef.is_intro then article.content = null
 		article.source_link = tpl_showsource(mpropdef.location)
 		return article
 	end
@@ -595,7 +678,7 @@ class NitdocSearch
 	private fun classes_list: Array[MClass] do
 		var sorted = new Array[MClass]
 		for mclass in model.mclasses do
-			if mclass.visibility < ctx.min_visibility then continue
+			if not ctx.filter_mclass(mclass) then continue
 			sorted.add mclass
 		end
 		name_sorter.sort(sorted)
@@ -606,9 +689,7 @@ class NitdocSearch
 	private fun mprops_list: Array[MProperty] do
 		var sorted = new Array[MProperty]
 		for mproperty in model.mproperties do
-			if mproperty.visibility < ctx.min_visibility then continue
-			if mproperty isa MAttribute then continue
-			sorted.add mproperty
+			if ctx.filter_mproperty(mproperty) then sorted.add mproperty
 		end
 		name_sorter.sort(sorted)
 		return sorted
@@ -622,13 +703,11 @@ class NitdocGroup
 
 	private var mgroup: MGroup
 
-	private var concerns: ConcernsTree
-	private var intros: Set[MClass]
-	private var redefs: Set[MClass]
+	private var concerns: ConcernsTree is noinit
+	private var intros: Set[MClass] is noinit
+	private var redefs: Set[MClass] is noinit
 
-	init(ctx: ToolContext, model: Model, mainmodule: MModule, mgroup: MGroup) do
-		super
-		self.mgroup = mgroup
+	init do
 		self.concerns = model.concerns_tree(mgroup.collect_mmodules)
 		self.concerns.sort_with(new MConcernRankSorter)
 		self.intros = mgroup.in_nesting_intro_mclasses(ctx.min_visibility)
@@ -646,7 +725,7 @@ class NitdocGroup
 	private var sidebar = new TplSidebar
 	redef fun tpl_sidebar do return sidebar
 
-	redef fun tpl_title do return "{mgroup.nitdoc_name}"
+	redef fun tpl_title do return mgroup.nitdoc_name
 
 	redef fun page_url do return mgroup.nitdoc_url
 
@@ -654,9 +733,9 @@ class NitdocGroup
 		var topmenu = super
 		var mproject = mgroup.mproject
 		if not mgroup.is_root then
-			topmenu.add_link new TplLink(mproject.nitdoc_url, "{mproject.nitdoc_name}")
+			topmenu.add_link new TplLink(mproject.nitdoc_url, mproject.nitdoc_name)
 		end
-		topmenu.add_link new TplLink(page_url, "{mproject.nitdoc_name}")
+		topmenu.add_link new TplLink(page_url, mproject.nitdoc_name)
 		return topmenu
 	end
 
@@ -676,7 +755,7 @@ class NitdocGroup
 		tpl_sidebar.boxes.add new TplSideBox.with_content("All classes", list)
 	end
 
-	private fun tpl_sidebar_item(def: MClass): Template do
+	private fun tpl_sidebar_item(def: MClass): TplListItem do
 		var classes = def.intro.tpl_css_classes.to_a
 		if intros.has(def) then
 			classes.add "intro"
@@ -686,7 +765,7 @@ class NitdocGroup
 		var lnk = new Template
 		lnk.add new TplLabel.with_classes(classes)
 		lnk.add def.tpl_link
-		return lnk
+		return new TplListItem.with_content(lnk)
 	end
 
 	# intro text
@@ -749,14 +828,12 @@ class NitdocModule
 	super NitdocPage
 
 	private var mmodule: MModule
-	private var concerns: ConcernsTree
-	private var mclasses2mdefs: Map[MClass, Set[MClassDef]]
-	private var mmodules2mclasses: Map[MModule, Set[MClass]]
+	private var concerns: ConcernsTree is noinit
+	private var mclasses2mdefs: Map[MClass, Set[MClassDef]] is noinit
+	private var mmodules2mclasses: Map[MModule, Set[MClass]] is noinit
 
 
-	init(ctx: ToolContext, model: Model, mainmodule: MModule, mmodule: MModule) do
-		super
-		self.mmodule = mmodule
+	init do
 		var mclassdefs = new HashSet[MClassDef]
 		mclassdefs.add_all mmodule.intro_mclassdefs(ctx.min_visibility)
 		mclassdefs.add_all mmodule.redef_mclassdefs(ctx.min_visibility)
@@ -779,7 +856,7 @@ class NitdocModule
 	private var sidebar = new TplSidebar
 	redef fun tpl_sidebar do return sidebar
 
-	redef fun tpl_title do return "{mmodule.nitdoc_name}"
+	redef fun tpl_title do return mmodule.nitdoc_name
 	redef fun page_url do return mmodule.nitdoc_url
 
 	redef fun tpl_topmenu do
@@ -806,7 +883,7 @@ class NitdocModule
 		tpl_sidebar.boxes.add new TplSideBox.with_content("All classes", list)
 	end
 
-	private fun tpl_sidebar_item(def: MClass): Template do
+	private fun tpl_sidebar_item(def: MClass): TplListItem do
 		var classes = def.intro.tpl_css_classes.to_a
 		if def.intro_mmodule == mmodule then
 			classes.add "intro"
@@ -816,7 +893,7 @@ class NitdocModule
 		var lnk = new Template
 		lnk.add new TplLabel.with_classes(classes)
 		lnk.add def.tpl_link
-		return lnk
+		return new TplListItem.with_content(lnk)
 	end
 
 	# intro text
@@ -846,7 +923,7 @@ class NitdocModule
 
 		# Graph
 		var mmodules = new HashSet[MModule]
-		mmodules.add_all mmodule.in_nesting.direct_greaters
+		mmodules.add_all mmodule.nested_mmodules
 		mmodules.add_all imports
 		if clients.length < 10 then mmodules.add_all clients
 		mmodules.add mmodule
@@ -958,17 +1035,17 @@ class NitdocModule
 			end
 		end
 		# build graph
-		var op = new FlatBuffer
-		var name = "dep_{mmodule.name}"
-		op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
+		var op = new RopeBuffer
+		var name = "dep_module_{mmodule.nitdoc_id}"
+		op.append("digraph \"{name.escape_to_dot}\" \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
 		for mmodule in poset do
 			if mmodule == self.mmodule then
-				op.append("\"{mmodule.name}\"[shape=box,margin=0.03];\n")
+				op.append("\"{mmodule.name.escape_to_dot}\"[shape=box,margin=0.03];\n")
 			else
-				op.append("\"{mmodule.name}\"[URL=\"{mmodule.nitdoc_url}\"];\n")
+				op.append("\"{mmodule.name.escape_to_dot}\"[URL=\"{mmodule.nitdoc_url.escape_to_dot}\"];\n")
 			end
 			for omodule in poset[mmodule].direct_greaters do
-				op.append("\"{mmodule.name}\"->\"{omodule.name}\";\n")
+				op.append("\"{mmodule.name.escape_to_dot}\"->\"{omodule.name.escape_to_dot}\";\n")
 			end
 		end
 		op.append("\}\n")
@@ -992,13 +1069,11 @@ class NitdocClass
 	super NitdocPage
 
 	private var mclass: MClass
-	private var concerns: ConcernsTree
-	private var mprops2mdefs: Map[MProperty, Set[MPropDef]]
-	private var mmodules2mprops: Map[MModule, Set[MProperty]]
+	private var concerns: ConcernsTree is noinit
+	private var mprops2mdefs: Map[MProperty, Set[MPropDef]] is noinit
+	private var mmodules2mprops: Map[MModule, Set[MProperty]] is noinit
 
-	init(ctx: ToolContext, model: Model, mainmodule: MModule, mclass: MClass) do
-		super
-		self.mclass = mclass
+	init do
 		var mpropdefs = new HashSet[MPropDef]
 		mpropdefs.add_all mclass.intro_mpropdefs(ctx.min_visibility)
 		mpropdefs.add_all mclass.redef_mpropdefs(ctx.min_visibility)
@@ -1021,25 +1096,23 @@ class NitdocClass
 		var topmenu = super
 		var mproject = mclass.intro_mmodule.mgroup.mproject
 		topmenu.add_link new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}")
-		topmenu.add_link new TplLink(page_url, "{mclass.nitdoc_name}")
+		topmenu.add_link new TplLink(page_url, mclass.nitdoc_name)
 		return topmenu
 	end
 
 	# Property list to display in sidebar
 	fun tpl_sidebar_properties do
-		var kind_map = sort_by_kind(mclass_inherited_mprops)
+		var by_kind = new PropertiesByKind.with_elements(mclass_inherited_mprops)
 		var summary = new TplList.with_classes(["list-unstyled"])
 
-		tpl_sidebar_list("Virtual types", kind_map["type"].to_a, summary)
-		tpl_sidebar_list("Constructors", kind_map["init"].to_a, summary)
-		tpl_sidebar_list("Methods", kind_map["fun"].to_a, summary)
+		by_kind.sort_groups(name_sorter)
+		for g in by_kind.groups do tpl_sidebar_list(g, summary)
 		tpl_sidebar.boxes.add new TplSideBox.with_content("All properties", summary)
 	end
 
-	private fun tpl_sidebar_list(name: String, mprops: Array[MProperty], summary: TplList) do
+	private fun tpl_sidebar_list(mprops: PropertyGroup[MProperty], summary: TplList) do
 		if mprops.is_empty then return
-		name_sorter.sort(mprops)
-		var entry = new TplListItem.with_content(name)
+		var entry = new TplListItem.with_content(mprops.title)
 		var list = new TplList.with_classes(["list-unstyled", "list-labeled"])
 		for mprop in mprops do
 			list.add_li tpl_sidebar_item(mprop)
@@ -1048,14 +1121,19 @@ class NitdocClass
 		summary.elts.add entry
 	end
 
-	private fun tpl_sidebar_item(mprop: MProperty): Template do
+	private fun tpl_sidebar_item(mprop: MProperty): TplListItem do
 		var classes = mprop.intro.tpl_css_classes.to_a
 		if not mprops2mdefs.has_key(mprop) then
 			classes.add "inherit"
-			var lnk = new Template
-			lnk.add new TplLabel.with_classes(classes)
-			lnk.add mprop.intro.tpl_link
-			return lnk
+			var cls_url = mprop.intro.mclassdef.mclass.nitdoc_url
+			var def_url = "{cls_url}#{mprop.nitdoc_id}"
+			var lnk = new TplLink(def_url, mprop.nitdoc_name)
+			var mdoc = mprop.intro.mdoc_or_fallback
+			if mdoc != null then lnk.title = mdoc.short_comment
+			var item = new Template
+			item.add new TplLabel.with_classes(classes)
+			item.add lnk
+			return new TplListItem.with_content(item)
 		end
 		var defs = mprops2mdefs[mprop]
 		if defs.has(mprop.intro) then
@@ -1065,16 +1143,17 @@ class NitdocClass
 		end
 		var lnk = new Template
 		lnk.add new TplLabel.with_classes(classes)
-		lnk.add mprop.intro.tpl_anchor
-		return lnk
+		lnk.add mprop.tpl_anchor
+		return new TplListItem.with_content(lnk)
 	end
 
 	private fun tpl_intro: TplSection do
 		var section = new TplSection.with_title("top", tpl_title)
 		section.subtitle = mclass.intro.tpl_declaration
 		var article = new TplArticle("comment")
-		if mclass.mdoc != null then
-			article.content = mclass.mdoc.tpl_comment
+		var mdoc = mclass.mdoc_or_fallback
+		if mdoc != null then
+			article.content = mdoc.tpl_comment
 		end
 		section.add_child article
 		return section
@@ -1095,15 +1174,14 @@ class NitdocClass
 		# parents
 		var hparents = new HashSet[MClass]
 		for c in mclass.in_hierarchy(mainmodule).direct_greaters do
-			if c.visibility < ctx.min_visibility then continue
-			hparents.add c
+			if ctx.filter_mclass(c) then hparents.add c
 		end
 
 		# ancestors
 		var hancestors = new HashSet[MClass]
 		for c in mclass.in_hierarchy(mainmodule).greaters do
 			if c == mclass then continue
-			if c.visibility < ctx.min_visibility then continue
+			if not ctx.filter_mclass(c) then continue
 			if hparents.has(c) then continue
 			hancestors.add c
 		end
@@ -1111,15 +1189,14 @@ class NitdocClass
 		# children
 		var hchildren = new HashSet[MClass]
 		for c in mclass.in_hierarchy(mainmodule).direct_smallers do
-			if c.visibility < ctx.min_visibility then continue
-			hchildren.add c
+			if ctx.filter_mclass(c) then hchildren.add c
 		end
 
 		# descendants
 		var hdescendants = new HashSet[MClass]
 		for c in mclass.in_hierarchy(mainmodule).smallers do
 			if c == mclass then continue
-			if c.visibility < ctx.min_visibility then continue
+			if not ctx.filter_mclass(c) then continue
 			if hchildren.has(c) then continue
 			hdescendants.add c
 		end
@@ -1131,8 +1208,8 @@ class NitdocClass
 		var mclasses = new HashSet[MClass]
 		mclasses.add_all hancestors
 		mclasses.add_all hparents
-		if hchildren.length < 10 then mclasses.add_all hchildren
-		if hdescendants.length < 10 then mclasses.add_all hdescendants
+		mclasses.add_all hchildren
+		mclasses.add_all hdescendants
 		mclasses.add mclass
 		var graph = tpl_dot(mclasses)
 		if graph != null then section.add_child graph
@@ -1152,14 +1229,14 @@ class NitdocClass
 		end
 
 		# children
-		if not hchildren.is_empty and hchildren.length < 15 then
+		if not hchildren.is_empty then
 			var lst = hchildren.to_a
 			name_sorter.sort lst
 			section.add_child tpl_list("children", "Children", lst)
 		end
 
 		# descendants
-		if not hdescendants.is_empty and hchildren.length < 15 then
+		if not hdescendants.is_empty then
 			var lst = hdescendants.to_a
 			name_sorter.sort lst
 			section.add_child tpl_list("descendants", "Descendants", lst)
@@ -1170,9 +1247,18 @@ class NitdocClass
 
 	private fun tpl_list(id: String, title: String, elts: Array[MClass]): TplArticle do
 		var article = new TplArticle.with_title(id, title)
-		var list = new TplList.with_classes(["list-unstyled", "list-definition"])
-		for elt in elts do list.elts.add elt.tpl_list_item
-		article.content = list
+		if elts.length > 20 then
+			var tpl = new Template
+			for e in elts do
+				tpl.add e.tpl_link
+				if e != elts.last then tpl.add ", "
+			end
+			article.content = tpl
+		else
+			var list = new TplList.with_classes(["list-unstyled", "list-definition"])
+			for elt in elts do list.elts.add elt.tpl_list_item
+			article.content = list
+		end
 		return article
 	end
 
@@ -1193,34 +1279,40 @@ class NitdocClass
 
 				# properties
 				var mprops = mmodules2mprops[mentity]
-				var kind_map = sort_by_kind(mprops)
-
-				# virtual types
-				var elts = kind_map["type"].to_a
-				name_sorter.sort(elts)
-				for elt in elts do
-					var defs = mprops2mdefs[elt].to_a
-					section.add_child tpl_mprop_article(elt, defs)
-				end
+				var by_kind = new PropertiesByKind.with_elements(mprops)
 
-				# constructors
-				elts = kind_map["init"].to_a
-				name_sorter.sort(elts)
-				for elt in elts do
-					var defs = mprops2mdefs[elt].to_a
-					section.add_child tpl_mprop_article(elt, defs)
+				for g in by_kind.groups do
+					for article in tpl_mproperty_articles(g) do
+						section.add_child article
+					end
 				end
+				parent.add_child section
+			end
+		end
+	end
 
-				# methods
-				elts = kind_map["fun"].to_a
-				name_sorter.sort(elts)
-				for elt in elts do
-					var defs = mprops2mdefs[elt].to_a
-					section.add_child tpl_mprop_article(elt, defs)
+	private fun tpl_mproperty_articles(elts: Collection[MProperty]):
+			Sequence[TplArticle] do
+		var articles = new List[TplArticle]
+		for elt in elts do
+			var local_defs = mprops2mdefs[elt]
+			# var all_defs = elt.mpropdefs
+			var all_defs = new HashSet[MPropDef]
+			for local_def in local_defs do
+				all_defs.add local_def
+				var mpropdef = local_def
+				while not mpropdef.is_intro do
+					mpropdef = mpropdef.lookup_next_definition(mainmodule, mpropdef.mclassdef.bound_mtype)
+					all_defs.add mpropdef
 				end
-				parent.add_child section
 			end
+			var loc_lin = local_defs.to_a
+			mainmodule.linearize_mpropdefs(loc_lin)
+			var all_lin = all_defs.to_a
+			mainmodule.linearize_mpropdefs(all_lin)
+			articles.add tpl_mprop_article(loc_lin.first, loc_lin, all_lin)
 		end
+		return articles
 	end
 
 	redef fun tpl_content do
@@ -1254,25 +1346,6 @@ class NitdocClass
 		return map
 	end
 
-	private fun sort_by_kind(mprops: Collection[MProperty]): Map[String, Set[MProperty]] do
-		var map = new HashMap[String, Set[MProperty]]
-		map["type"] = new HashSet[MProperty]
-		map["init"] = new HashSet[MProperty]
-		map["fun"] = new HashSet[MProperty]
-		for mprop in mprops do
-			if mprop isa MVirtualTypeProp then
-				map["type"].add mprop
-			else if mprop isa MMethod then
-				if mprop.is_init then
-					map["init"].add mprop
-				else
-					map["fun"].add mprop
-				end
-			end
-		end
-		return map
-	end
-
 	private fun mclass_inherited_mprops: Set[MProperty] do
 		var res = new HashSet[MProperty]
 		var local = mclass.local_mproperties(ctx.min_visibility)
@@ -1305,6 +1378,7 @@ class NitdocClass
 		for mclass in mclasses do
 			poset.add_node mclass
 			for oclass in mclasses do
+				if mclass == oclass then continue
 				poset.add_node oclass
 				if mclass.in_hierarchy(mainmodule) < oclass then
 					poset.add_edge(mclass, oclass)
@@ -1312,17 +1386,31 @@ class NitdocClass
 			end
 		end
 
-		var op = new FlatBuffer
-		var name = "dep_{mclass.name}"
-		op.append("digraph {name} \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
-		for c in poset do
+		var op = new RopeBuffer
+		var name = "dep_class_{mclass.nitdoc_id}"
+		op.append("digraph \"{name.escape_to_dot}\" \{ rankdir=BT; node[shape=none,margin=0,width=0,height=0,fontsize=10]; edge[dir=none,color=gray]; ranksep=0.2; nodesep=0.1;\n")
+		var classes = poset.to_a
+		var todo = new Array[MClass]
+		var done = new HashSet[MClass]
+		mainmodule.linearize_mclasses(classes)
+		if not classes.is_empty then todo.add classes.first
+		while not todo.is_empty do
+			var c = todo.shift
+			if done.has(c) then continue
+			done.add c
 			if c == mclass then
-				op.append("\"{c.name}\"[shape=box,margin=0.03];\n")
+				op.append("\"{c.name.escape_to_dot}\"[shape=box,margin=0.03];\n")
 			else
-				op.append("\"{c.name}\"[URL=\"{c.nitdoc_url}\"];\n")
+				op.append("\"{c.name.escape_to_dot}\"[URL=\"{c.nitdoc_url.escape_to_dot}\"];\n")
 			end
-			for c2 in poset[c].direct_greaters do
-				op.append("\"{c.name}\"->\"{c2.name}\";\n")
+			var smallers = poset[c].direct_smallers
+			if smallers.length < 10 then
+				for c2 in smallers do
+					op.append("\"{c2.name.escape_to_dot}\"->\"{c.name.escape_to_dot}\";\n")
+				end
+				todo.add_all smallers
+			else
+				op.append("\"...\"->\"{c.name.escape_to_dot}\";\n")
 			end
 		end
 		op.append("\}\n")
@@ -1330,16 +1418,83 @@ class NitdocClass
 	end
 end
 
+# Groups properties by kind.
+private class PropertiesByKind
+	# The virtual types.
+	var virtual_types = new PropertyGroup[MVirtualTypeProp]("Virtual types")
+
+	# The constructors.
+	var constructors = new PropertyGroup[MMethod]("Contructors")
+
+	# The attributes.
+	var attributes = new PropertyGroup[MAttribute]("Attributes")
+
+	# The methods.
+	var methods = new PropertyGroup[MMethod]("Methods")
+
+	# The inner classes.
+	var inner_classes = new PropertyGroup[MInnerClass]("Inner classes")
+
+	# All the groups.
+	#
+	# Sorted in the order they are displayed to the user.
+	var groups: SequenceRead[PropertyGroup[MProperty]] = [
+			virtual_types,
+			constructors,
+			attributes,
+			methods,
+			inner_classes: PropertyGroup[MProperty]]
+
+	# Add each the specified property to the appropriate list.
+	init with_elements(properties: Collection[MProperty]) do add_all(properties)
+
+	# Add the specified property to the appropriate list.
+	fun add(property: MProperty) do
+		if property isa MMethod then
+			if property.is_init then
+				constructors.add property
+			else
+				methods.add property
+			end
+		else if property isa MVirtualTypeProp then
+			virtual_types.add property
+		else if property isa MAttribute then
+			attributes.add property
+		else if property isa MInnerClass then
+			inner_classes.add property
+		else
+			abort
+		end
+	end
+
+	# Add each the specified property to the appropriate list.
+	fun add_all(properties: Collection[MProperty]) do
+		for p in properties do add(p)
+	end
+
+	# Sort each group with the specified comparator.
+	fun sort_groups(comparator: Comparator) do
+		for g in groups do comparator.sort(g)
+	end
+end
+
+# A Group of properties of the same kind.
+private class PropertyGroup[E: MProperty]
+	super Array[E]
+
+	# The title of the group, as displayed to the user.
+	var title: String
+end
+
 # A MProperty page
 class NitdocProperty
 	super NitdocPage
 
 	private var mproperty: MProperty
-	private var concerns: ConcernsTree
-	private var mmodules2mdefs: Map[MModule, Set[MPropDef]]
+	private var concerns: ConcernsTree is noinit
+	private var mmodules2mdefs: Map[MModule, Set[MPropDef]] is noinit
 
-	init(ctx: ToolContext, model: Model, mainmodule: MModule, mproperty: MProperty) do
-		super
+	init do
 		self.mproperty = mproperty
 		self.mmodules2mdefs = sort_by_mmodule(collect_mpropdefs)
 		self.concerns = model.concerns_tree(mmodules2mdefs.keys)
@@ -1373,24 +1528,28 @@ class NitdocProperty
 		var mclass = mproperty.intro_mclassdef.mclass
 		topmenu.add_link new TplLink("{mproject.nitdoc_url}", "{mproject.nitdoc_name}")
 		topmenu.add_link new TplLink("{mclass.nitdoc_url}", "{mclass.nitdoc_name}")
-		topmenu.add_link new TplLink(page_url, "{mproperty.nitdoc_name}")
+		topmenu.add_link new TplLink(page_url, mproperty.nitdoc_name)
 		return topmenu
 	end
 
 	private fun tpl_intro: TplSection do
-		var section = new TplSection.with_title("top", tpl_title)
-		section.subtitle = mproperty.tpl_declaration
-		var article = new TplArticle("comment")
-		if mproperty.intro.mdoc != null then
-			article.content = mproperty.intro.mdoc.tpl_comment
-		end
-		section.add_child article
+		var title = new Template
+		title.add mproperty.nitdoc_name
+		title.add mproperty.intro.tpl_signature
+		var section = new TplSection.with_title("top", title)
+		section.subtitle = mproperty.tpl_namespace
+		section.summary_title = mproperty.nitdoc_name
 		return section
 	end
 
 	private fun tpl_properties(parent: TplSection) do
 		# intro title
-		var section = new TplSection.with_title("intro", "Introduction")
+		var ns = mproperty.intro.mclassdef.mmodule.tpl_namespace
+		var section = new TplSection("intro")
+		var title = new Template
+		title.add "Introduction in "
+		title.add ns
+		section.title = title
 		section.summary_title = "Introduction"
 		section.add_child tpl_mpropdef_article(mproperty.intro)
 		parent.add_child section
@@ -1408,7 +1567,7 @@ class NitdocProperty
 				parent.add_child new TplSection(mentity.nitdoc_id)
 			else if mentity isa MModule then
 				var ssection = new TplSection(mentity.nitdoc_id)
-				var title = new Template
+				title = new Template
 				title.add "in "
 				title.add mentity.tpl_namespace
 				ssection.title = title