src: mass rename project->package
[nit.git] / src / doc / html_templates / html_model.nit
index bcfdcf5..b8727de 100644 (file)
@@ -20,35 +20,15 @@ import doc_down
 import html_components
 import html::bootstrap
 import ordered_tree
-
-redef class Location
-       # Github url based on this location
-       fun github(gitdir: String): String do
-               var base_dir = getcwd.join_path(gitdir).simplify_path
-               var file_loc = getcwd.join_path(file.filename).simplify_path
-               var gith_loc = file_loc.substring(base_dir.length + 1, file_loc.length)
-               return "{gith_loc}:{line_start},{column_start}--{line_end},{column_end}"
-       end
-end
+import model::model_collect
 
 redef class MEntity
-       # ID used as a HTML unique ID and in file names.
-       #
-       # **Must** match the following (POSIX ERE) regular expression:
-       #
-       # ~~~POSIX ERE
-       # ^[A-Za-z_][A-Za-z0-9._-]*$
-       # ~~~
-       #
-       # That way, the ID is always a valid URI component and a valid XML name.
-       fun nitdoc_id: String is abstract
-
        # URL of this entity’s Nitdoc page.
        fun nitdoc_url: String is abstract
 
        # Returns the mentity name without short signature.
        #
-       # * MProject: `foo`
+       # * MPackage: `foo`
        # * MGroup: `foo`
        # * MModule: `foo`
        # * MClass: `Foo[E]`
@@ -64,7 +44,7 @@ redef class MEntity
                var tpl = new Link(nitdoc_url, html_name)
                var mdoc = mdoc_or_fallback
                if mdoc != null then
-                       tpl.title = mdoc.short_comment
+                       tpl.title = mdoc.synopsis
                end
                return tpl
        end
@@ -76,7 +56,7 @@ redef class MEntity
                var tpl = new Link("#{nitdoc_id}", html_name)
                var mdoc = mdoc_or_fallback
                if mdoc != null then
-                       tpl.title = mdoc.short_comment
+                       tpl.title = mdoc.synopsis
                end
                return tpl
        end
@@ -86,7 +66,7 @@ redef class MEntity
 
        # Returns the complete MEntity declaration decorated with HTML.
        #
-       # * MProject: `project foo`
+       # * MPackage: `package foo`
        # * MGroup: `group foo`
        # * MModule: `module foo`
        # * MClass: `private abstract class Foo[E: Object]`
@@ -105,99 +85,68 @@ redef class MEntity
 
        # Returns `self` namespace decorated with HTML links.
        #
-       # * MProject: `mproject`
-       # * MGroup: `mproject(::group)`
+       # * MPackage: `mpackage`
+       # * MGroup: `mpackage(::group)`
        # * MModule: `mgroup::mmodule`
-       # * MClass: `mproject::mclass`
+       # * MClass: `mpackage::mclass`
        # * MClassDef: `mmodule::mclassdef`
        # * MProperty: `mclass::mprop`
        # * MPropdef: `mclassdef:mpropdef`
        fun html_namespace: Template is abstract
 
-       # A template article that briefly describe the entity
-       fun tpl_short_article: TplArticle do
-               var tpl = tpl_article
+       # Returns the synopsis and the comment of this MEntity formatted as HTML.
+       var html_documentation: nullable Writable is lazy do
                var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.content = mdoc.tpl_short_comment
-               end
-               return tpl
-       end
-
-       # A template article that describe the entity
-       fun tpl_article: TplArticle do
-               var tpl = new TplArticle.with_title(nitdoc_id, tpl_title)
-               tpl.title_classes.add "signature"
-               tpl.subtitle = html_namespace
-               tpl.summary_title = html_name
-               return tpl
+               if mdoc == null then return null
+               return mdoc.html_documentation
        end
 
-       # A template definition of the mentity
-       # include name, sysnopsys, comment and namespace
-       fun tpl_definition: TplDefinition is abstract
-
-       # A li element that can go in a list
-       fun tpl_list_item: TplListItem do
-               var lnk = new Template
-               lnk.add new TplLabel.with_classes(tpl_css_classes)
-               lnk.add html_link
+       # Returns the synopsis of this MEntity formatted as HTML.
+       var html_synopsis: nullable Writable is lazy do
                var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       lnk.add ": "
-                       lnk.add mdoc.tpl_short_comment
-               end
-               return new TplListItem.with_content(lnk)
+               if mdoc == null then return null
+               return mdoc.html_synopsis
        end
 
-       var tpl_css_classes = new Array[String]
-
-       # Box title for this mentity
-       fun tpl_title: Template do
-               var title = new Template
-               title.add tpl_icon
-               title.add html_namespace
-               return title
+       # Returns the the comment without the synopsis formatted as HTML.
+       var html_comment: nullable Writable is lazy do
+               var mdoc = mdoc_or_fallback
+               if mdoc == null then return null
+               return mdoc.html_comment
        end
 
        # Icon that will be displayed before the title
-       fun tpl_icon: TplIcon do
-               var icon = new TplIcon.with_icon("tag")
-               icon.css_classes.add_all(tpl_css_classes)
+       fun html_icon: BSIcon do
+               var icon = new BSIcon("tag")
+               icon.css_classes.add_all(css_classes)
                return icon
        end
-end
 
-redef class MConcern
-       # Return a li element for `self` that can be displayed in a concern list
-       private fun tpl_concern_item: TplListItem do
-               var lnk = new Template
-               lnk.add html_link_to_anchor
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       lnk.add ": "
-                       lnk.add mdoc.tpl_short_comment
+       # CSS classes used to decorate `self`.
+       #
+       # Mainly used for icons.
+       var css_classes = new Array[String]
+
+       # A li element that can go in a `HTMLList`.
+       fun html_list_item: ListItem do
+               var tpl = new Template
+               tpl.add new DocHTMLLabel.with_classes(css_classes)
+               tpl.add html_link
+               var comment = html_synopsis
+               if comment != null then
+                       tpl.add ": "
+                       tpl.add comment
                end
-               return new TplListItem.with_content(lnk)
+               return new ListItem(tpl)
        end
 end
 
-redef class MProject
+redef class MPackage
        redef var nitdoc_id = name.to_cmangle is lazy
        redef fun nitdoc_url do return root.nitdoc_url
-       redef var html_modifiers = ["project"]
+       redef var html_modifiers = ["package"]
        redef fun html_namespace do return html_link
-
-       redef fun tpl_definition do
-               var tpl = new TplDefinition
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.comment = mdoc.tpl_comment
-               end
-               return tpl
-       end
-
-       redef fun tpl_css_classes do return ["public"]
+       redef var css_classes = ["public"]
 end
 
 redef class MGroup
@@ -213,26 +162,19 @@ redef class MGroup
 
        # Depends if `self` is root or not.
        #
-       # * If root `mproject`.
-       # * Else `mproject::self`.
+       # * If root `mpackage`.
+       # * Else `mpackage::self`.
        redef fun html_namespace do
                var tpl = new Template
-               tpl.add mproject.html_namespace
-               if mproject.root != self then
+               tpl.add mpackage.html_namespace
+               if mpackage.root != self then
                        tpl.add "::"
                        tpl.add html_link
                end
                return tpl
        end
 
-       redef fun tpl_definition do
-               var tpl = new TplDefinition
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.comment = mdoc.tpl_comment
-               end
-               return tpl
-       end
+       redef var css_classes = ["public"]
 end
 
 redef class MModule
@@ -264,16 +206,7 @@ redef class MModule
                return tpl
        end
 
-       redef fun tpl_definition do
-               var tpl = new TplClassDefinition
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.comment = mdoc.tpl_comment
-               end
-               return tpl
-       end
-
-       redef fun tpl_css_classes do return ["public"]
+       redef var css_classes = ["public"]
 end
 
 redef class MClass
@@ -300,42 +233,24 @@ redef class MClass
        redef fun html_modifiers do return intro.html_modifiers
        redef fun html_declaration do return intro.html_declaration
 
-       # Returns `mproject::self`.
+       # Returns `mpackage::self`.
        redef fun html_namespace do
                var tpl = new Template
-               tpl.add intro_mmodule.mgroup.mproject.html_namespace
+               tpl.add intro_mmodule.mgroup.mpackage.html_namespace
                tpl.add "::<span>"
                tpl.add html_link
                tpl.add "</span>"
                return tpl
        end
 
-       redef fun tpl_definition do return intro.tpl_definition
-
-       redef fun tpl_title do
-               var title = new Template
-               title.add tpl_icon
-               title.add html_link
-               return title
-       end
+       # Returns `intro.html_short_signature`.
+       fun html_short_signature: Template do return intro.html_short_signature
 
-       redef fun tpl_icon do return intro.tpl_icon
+       # Returns `intro.html_signature`.
+       fun html_signature: Template do return intro.html_signature
 
-       fun tpl_signature: Template do
-               var tpl = new Template
-               if arity > 0 then
-                       tpl.add "["
-                       var parameter_names = new Array[String]
-                       for p in mparameters do
-                               parameter_names.add(p.html_name)
-                       end
-                       tpl.add parameter_names.join(", ")
-                       tpl.add "]"
-               end
-               return tpl
-       end
-
-       redef fun tpl_css_classes do return intro.tpl_css_classes
+       redef fun html_icon do return intro.html_icon
+       redef fun css_classes do return intro.css_classes
 end
 
 redef class MClassDef
@@ -364,14 +279,17 @@ redef class MClassDef
        #
        # For intro: `private abstract class Foo[E: Object]`
        # For redef: `redef class Foo[E]`
-       # TODO change the implementation to correspond to the comment.
        redef fun html_declaration do
                var tpl = new Template
                tpl.add "<span>"
                tpl.add html_modifiers.join(" ")
                tpl.add " "
                tpl.add html_link
-               tpl.add tpl_signature
+               if is_intro then
+                       tpl.add html_signature
+               else
+                       tpl.add html_short_signature
+               end
                tpl.add "</span>"
                return tpl
        end
@@ -386,37 +304,30 @@ redef class MClassDef
                return tpl
        end
 
-       redef fun tpl_article do
-               var tpl = new TplArticle(nitdoc_id)
-               tpl.summary_title = "in {mmodule.html_name}"
-               tpl.title = html_declaration
-               tpl.title_classes.add "signature"
-               var title = new Template
-               title.add "in "
-               title.add mmodule.html_namespace
-               tpl.subtitle = title
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.content = mdoc.tpl_comment
+       # Returns the MClassDef generic signature without static bounds.
+       fun html_short_signature: Template do
+               var tpl = new Template
+               var mparameters = mclass.mparameters
+               if not mparameters.is_empty then
+                       tpl.add "["
+                       for i in [0..mparameters.length[ do
+                               tpl.add mparameters[i].html_name
+                               if i < mparameters.length - 1 then tpl.add ", "
+                       end
+                       tpl.add "]"
                end
                return tpl
        end
 
-       redef fun tpl_title do
-               var title = new Template
-               title.add tpl_icon
-               title.add html_link
-               return title
-       end
-
-       fun tpl_signature: Template do
+       # Returns the MClassDef generic signature with static bounds.
+       fun html_signature: Template do
                var tpl = new Template
                var mparameters = mclass.mparameters
                if not mparameters.is_empty then
                        tpl.add "["
                        for i in [0..mparameters.length[ do
                                tpl.add "{mparameters[i].html_name}: "
-                               tpl.add bound_mtype.arguments[i].tpl_signature
+                               tpl.add bound_mtype.arguments[i].html_signature
                                if i < mparameters.length - 1 then tpl.add ", "
                        end
                        tpl.add "]"
@@ -424,31 +335,13 @@ redef class MClassDef
                return tpl
        end
 
-       redef fun tpl_definition do
-               var tpl = new TplClassDefinition
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.comment = mdoc.tpl_comment
-               end
-               return tpl
-       end
-
-       redef fun tpl_css_classes do
+       redef fun css_classes do
                var set = new HashSet[String]
                if is_intro then set.add "intro"
-               for m in mclass.intro.modifiers do set.add m.to_cmangle
-               for m in modifiers do set.add m.to_cmangle
+               for m in mclass.intro.collect_modifiers do set.add m.to_cmangle
+               for m in collect_modifiers do set.add m.to_cmangle
                return set.to_a
        end
-
-       fun tpl_modifiers: Template do
-               var tpl = new Template
-               for modifier in modifiers do
-                       if modifier == "public" then continue
-                       tpl.add "{modifier.html_escape} "
-               end
-               return tpl
-       end
 end
 
 redef class MProperty
@@ -468,13 +361,13 @@ redef class MProperty
                return tpl
        end
 
-       fun tpl_signature: Template do return new Template
-
-       redef fun tpl_title do return intro.tpl_title
+       # Returns `intro.html_short_signature`.
+       fun html_short_signature: Template do return intro.html_short_signature
 
-       redef fun tpl_icon do return intro.tpl_icon
+       # Returns `intro.html_signature`.
+       fun html_signature: Template do return intro.html_signature
 
-       redef fun tpl_css_classes do return intro.tpl_css_classes
+       redef fun css_classes do return intro.css_classes
 end
 
 redef class MPropDef
@@ -502,14 +395,18 @@ redef class MPropDef
        #
        # For intro: `private fun foo(e: Object): Bar is abstract`
        # For redef: `redef fun foo(e) is cached`
-       # TODO change the implementation to correspond to the comment.
        redef fun html_declaration do
                var tpl = new Template
                tpl.add "<span>"
                tpl.add html_modifiers.join(" ")
                tpl.add " "
-               tpl.add html_link
-               tpl.add tpl_signature
+               if is_intro then
+                       tpl.add html_link
+                       tpl.add html_signature
+               else
+                       tpl.add mproperty.intro.html_link
+                       tpl.add html_short_signature
+               end
                tpl.add "</span>"
                return tpl
        end
@@ -523,84 +420,19 @@ redef class MPropDef
                return tpl
        end
 
-       redef fun tpl_article do
-               var tpl = new TplArticle(nitdoc_id)
-               tpl.summary_title = "in {mclassdef.html_name}"
-               var title = new Template
-               title.add "in "
-               title.add mclassdef.html_link
-               tpl.title = title
-               tpl.subtitle = html_declaration
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.content = mdoc.tpl_comment
-               end
-               return tpl
-       end
+       # Returns the MPropdDef signature without static types.
+       fun html_short_signature: Template is abstract
 
-       redef fun tpl_definition do
-               var tpl = new TplDefinition
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.comment = mdoc.tpl_comment
-               end
-               return tpl
-       end
+       # Returns the MPropDef signature with static types.
+       fun html_signature: Template is abstract
 
-       redef fun tpl_css_classes do
+       redef fun css_classes do
                var set = new HashSet[String]
                if is_intro then set.add "intro"
-               for m in mproperty.intro.modifiers do set.add m.to_cmangle
-               for m in modifiers do set.add m.to_cmangle
+               for m in mproperty.intro.collect_modifiers do set.add m.to_cmangle
+               for m in collect_modifiers do set.add m.to_cmangle
                return set.to_a
        end
-
-       fun tpl_modifiers: Template do
-               var tpl = new Template
-               for modifier in modifiers do
-                       if modifier == "public" then continue
-                       tpl.add "{modifier.html_escape} "
-               end
-               return tpl
-       end
-
-       fun tpl_signature: Template do return new Template
-
-       redef fun tpl_list_item do
-               var lnk = new Template
-               lnk.add new TplLabel.with_classes(tpl_css_classes.to_a)
-               var atext = html_link.text
-               var ahref = "{mclassdef.mclass.nitdoc_url}#{mproperty.nitdoc_id}"
-               var atitle = html_link.title
-               var anchor = new Link.with_title(ahref, atext, atitle)
-               lnk.add anchor
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       lnk.add ": "
-                       lnk.add mdoc.tpl_short_comment
-               end
-               return new TplListItem.with_content(lnk)
-       end
-
-       fun tpl_inheritance_item: TplListItem do
-               var lnk = new Template
-               lnk.add new TplLabel.with_classes(tpl_css_classes.to_a)
-               lnk.add mclassdef.mmodule.html_namespace
-               lnk.add "::"
-               var atext = mclassdef.html_link.text
-               var ahref = "{mclassdef.mclass.nitdoc_url}#{mproperty.nitdoc_id}"
-               var atitle = mclassdef.html_link.title
-               var anchor = new Link.with_title(ahref, atext, atitle)
-               lnk.add anchor
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       lnk.add ": "
-                       lnk.add mdoc.tpl_short_comment
-               end
-               var li = new TplListItem.with_content(lnk)
-               li.css_classes.add "signature"
-               return li
-       end
 end
 
 redef class MAttributeDef
@@ -611,27 +443,13 @@ redef class MAttributeDef
                return res
        end
 
-       redef fun tpl_signature do
+       redef fun html_short_signature do return new Template
+
+       redef fun html_signature do
                var tpl = new Template
                if static_mtype != null then
                        tpl.add ": "
-                       tpl.add static_mtype.tpl_signature
-               end
-               return tpl
-       end
-end
-
-redef class MMethod
-       redef fun tpl_signature do
-               var tpl = new Template
-               var params = new Array[String]
-               for param in intro.msignature.mparameters do
-                       params.add param.name.html_escape
-               end
-               if not params.is_empty then
-                       tpl.add "("
-                       tpl.add params.join(", ")
-                       tpl.add ")"
+                       tpl.add static_mtype.html_signature
                end
                return tpl
        end
@@ -641,26 +459,54 @@ redef class MMethodDef
 
        # FIXME annotation should be handled in their own way
        redef fun html_modifiers do
+               if mproperty.is_init then
+                       var res = new Array[String]
+                       if mproperty.visibility != public_visibility then
+                               res.add mproperty.visibility.to_s
+                       end
+                       return res
+               end
                var res = super
                if is_abstract then
                        res.add "abstract"
                else if is_intern then
                        res.add "intern"
                end
+               res.add "fun"
+               return res
+       end
+
+       redef fun html_declaration do
                if mproperty.is_init then
-                       res.add "init"
-               else
-                       res.add "fun"
+                       var tpl = new Template
+                       tpl.add "<span>"
+                       tpl.add html_modifiers.join(" ")
+                       tpl.add " "
+                       tpl.add html_link
+                       tpl.add html_signature
+                       tpl.add "</span>"
+                       return tpl
                end
-               return res
+               return super
        end
 
-       redef fun tpl_signature do return msignature.tpl_signature
+       redef fun html_short_signature do
+               if mproperty.is_root_init and new_msignature != null then
+                       return new_msignature.html_short_signature
+               end
+               return msignature.html_short_signature
+       end
+
+       redef fun html_signature do
+               if mproperty.is_root_init and new_msignature != null then
+                       return new_msignature.html_signature
+               end
+               return msignature.html_signature
+       end
 end
 
 redef class MVirtualTypeProp
        redef fun html_link do return mvirtualtype.html_link
-       redef fun tpl_signature do return html_link
 end
 
 redef class MVirtualTypeDef
@@ -671,41 +517,69 @@ redef class MVirtualTypeDef
                return res
        end
 
-       redef fun tpl_signature do
+       redef fun html_short_signature do return new Template
+
+       redef fun html_signature do
                var tpl = new Template
                if bound == null then return tpl
                tpl.add ": "
-               tpl.add bound.tpl_signature
+               tpl.add bound.html_signature
                return tpl
        end
 end
 
 redef class MType
-       fun tpl_signature: Template is abstract
+       # Returns the signature of this type whithout bounds.
+       fun html_short_signature: Template is abstract
+
+       # Returns the signature of this type.
+       fun html_signature: Template is abstract
 end
 
 redef class MClassType
        redef fun html_link do return mclass.html_link
-       redef fun tpl_signature do return html_link
+       redef fun html_short_signature do return html_link
+       redef fun html_signature do return html_link
 end
 
 redef class MNullableType
-       redef fun tpl_signature do
+
+       redef fun html_short_signature do
                var tpl = new Template
                tpl.add "nullable "
-               tpl.add mtype.tpl_signature
+               tpl.add mtype.html_short_signature
+               return tpl
+       end
+
+       redef fun html_signature do
+               var tpl = new Template
+               tpl.add "nullable "
+               tpl.add mtype.html_signature
                return tpl
        end
 end
 
 redef class MGenericType
-       redef fun tpl_signature do
+       redef fun html_short_signature do
                var lnk = html_link
                var tpl = new Template
                tpl.add new Link.with_title(lnk.href, mclass.name.html_escape, lnk.title)
                tpl.add "["
                for i in [0..arguments.length[ do
-                       tpl.add arguments[i].tpl_signature
+                       tpl.add arguments[i].html_short_signature
+                       if i < arguments.length - 1 then tpl.add ", "
+               end
+               tpl.add "]"
+               return tpl
+       end
+
+       redef fun html_signature do
+               var lnk = html_link
+               var tpl = new Template
+               tpl.add new Link.with_title(lnk.href, mclass.name.html_escape, lnk.title)
+               tpl.add "["
+               for i in [0..arguments.length[ do
+                       tpl.add arguments[i].html_signature
                        if i < arguments.length - 1 then tpl.add ", "
                end
                tpl.add "]"
@@ -717,86 +591,124 @@ redef class MParameterType
        redef fun html_link do
                return new Link.with_title("{mclass.nitdoc_url}#FT_{name.to_cmangle}", name, "formal type")
        end
-       redef fun tpl_signature do return html_link
+
+       redef fun html_short_signature do return html_link
+       redef fun html_signature do return html_link
 end
 
 redef class MVirtualType
        redef fun html_link do return mproperty.intro.html_link
-       redef fun tpl_signature do return html_link
+       redef fun html_signature do return html_link
 end
 
 redef class MSignature
-       redef fun tpl_signature do
+
+       redef fun html_short_signature do
+               var tpl = new Template
+               if not mparameters.is_empty then
+                       tpl.add "("
+                       for i in [0..mparameters.length[ do
+                               tpl.add mparameters[i].html_short_signature
+                               if i < mparameters.length - 1 then tpl.add ", "
+                       end
+                       tpl.add ")"
+               end
+               return tpl
+       end
+
+       redef fun html_signature do
                var tpl = new Template
                if not mparameters.is_empty then
                        tpl.add "("
                        for i in [0..mparameters.length[ do
-                               tpl.add mparameters[i].tpl_signature
+                               tpl.add mparameters[i].html_signature
                                if i < mparameters.length - 1 then tpl.add ", "
                        end
                        tpl.add ")"
                end
                if return_mtype != null then
                        tpl.add ": "
-                       tpl.add return_mtype.tpl_signature
+                       tpl.add return_mtype.html_signature
                end
                return tpl
        end
 end
 
 redef class MParameter
-       fun tpl_signature: Template do
+
+       # Returns `self` name and ellipsys if any.
+       fun html_short_signature: Template do
+               var tpl = new Template
+               tpl.add name
+               if is_vararg then tpl.add "..."
+               return tpl
+       end
+
+       # Returns `self` name with it's static type and ellipsys if any.
+       fun html_signature: Template do
                var tpl = new Template
                tpl.add "{name}: "
-               tpl.add mtype.tpl_signature
+               tpl.add mtype.html_signature
                if is_vararg then tpl.add "..."
                return tpl
        end
 end
 
 redef class ConcernsTree
-
-       private var seen = new HashSet[MConcern]
-
-       redef fun add(p, e) do
-               if seen.has(e) then return
-               seen.add e
-               super(p, e)
-       end
-
-       fun to_tpl: TplList do
-               var lst = new TplList.with_classes(["list-unstyled", "list-definition"])
+       # Render `self` as a hierarchical UnorderedList.
+       fun html_list: UnorderedList do
+               var lst = new UnorderedList
+               lst.css_classes.add "list-unstyled list-definition"
                for r in roots do
-                       var li = r.tpl_concern_item
+                       var li = r.html_concern_item
                        lst.add_li li
-                       build_list(r, li)
+                       build_html_list(r, li)
                end
                return lst
        end
 
-       private fun build_list(e: MConcern, li: TplListItem) do
+       # Build the html list recursively.
+       private fun build_html_list(e: MConcern, li: ListItem) do
                if not sub.has_key(e) then return
                var subs = sub[e]
-               var lst = new TplList.with_classes(["list-unstyled", "list-definition"])
+               var lst = new UnorderedList
+               lst.css_classes.add "list-unstyled list-definition"
                for e2 in subs do
                        if e2 isa MGroup and e2.is_root then
-                               build_list(e2, li)
+                               build_html_list(e2, li)
                        else
-                               var sli = e2.tpl_concern_item
+                               var sli = e2.html_concern_item
                                lst.add_li sli
-                               build_list(e2, sli)
+                               build_html_list(e2, sli)
                        end
                end
-               li.append lst
+               var text = new Template
+               text.add li.text
+               if not lst.is_empty then text.add lst
+               li.text = text
        end
 end
 
+redef class MConcern
+       # Return a li element for `self` that can be displayed in a concern list
+       private fun html_concern_item: ListItem do
+               var lnk = html_link
+               var tpl = new Template
+               tpl.add new Link.with_title("#{nitdoc_id}.concern", lnk.text, lnk.title)
+               var comment = html_synopsis
+               if comment != null then
+                       tpl.add ": "
+                       tpl.add comment
+               end
+               return new ListItem(tpl)
+       end
+end
 
 ################################################################################
 # Additions to `model_ext`.
 
 redef class MRawType
-       redef fun tpl_signature do
+       redef fun html_signature do
                var tpl = new Template
 
                for part in parts do
@@ -812,7 +724,7 @@ end
 
 redef class MInnerClass
        redef fun nitdoc_url do return inner.nitdoc_url
-       redef fun tpl_signature do return inner.tpl_signature
+       redef fun html_signature do return inner.html_signature
 end
 
 redef class MInnerClassDef
@@ -820,14 +732,5 @@ redef class MInnerClassDef
 
        redef fun html_link_to_anchor do return inner.html_link_to_anchor
        redef fun html_link do return inner.html_link
-       redef fun tpl_signature do return inner.tpl_signature
-
-       redef fun tpl_definition do
-               var tpl = new TplClassDefinition
-               var mdoc = mdoc_or_fallback
-               if mdoc != null then
-                       tpl.comment = mdoc.tpl_comment
-               end
-               return tpl
-       end
+       redef fun html_signature do return inner.html_signature
 end