nitdoc: move `DocComposite::is_toc_hidden` to `doc_base`

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/doc/doc_base.nit b/src/doc/doc_base.nit
index 95ad145..4338eee 100644 (file)
--- a/src/doc/doc_base.nit
+++ b/src/doc/doc_base.nit
@@ -129,6 +129,11 @@ abstract class DocComposite
        # Title used in table of content if any.
        var toc_title: nullable String is writable, lazy do return title
 
+       # Is `self` hidden in the table of content?
+       var is_toc_hidden: Bool is writable, lazy do
+               return toc_title == null or is_hidden
+       end
+
        # Add a `child` to `self`.
        #
        # Shortcut for `children.add`.

diff --git a/src/doc/doc_phases/doc_graphs.nit b/src/doc/doc_phases/doc_graphs.nit
index a0a8d11..50a2aab 100644 (file)
--- a/src/doc/doc_phases/doc_graphs.nit
+++ b/src/doc/doc_phases/doc_graphs.nit
@@ -125,4 +125,5 @@ class GraphArticle
        var dot: Text
 
        redef var is_hidden = false
+       redef var is_toc_hidden = true
 end

diff --git a/src/doc/doc_phases/doc_intros_redefs.nit b/src/doc/doc_phases/doc_intros_redefs.nit
index 1680883..30f98db 100644 (file)
--- a/src/doc/doc_phases/doc_intros_redefs.nit
+++ b/src/doc/doc_phases/doc_intros_redefs.nit
@@ -88,6 +88,8 @@ end
 class IntrosRedefsSection
        super TabbedGroup
        super MEntitySection
+
+       redef var is_toc_hidden = true
 end
 
 # An article that displays a list of introduced / refined mentities.
@@ -101,4 +103,5 @@ class IntrosRedefsListArticle
        var mentities: Array[MEntity]
 
        redef fun is_hidden do return mentities.is_empty
+       redef var is_toc_hidden = true
 end

diff --git a/src/doc/doc_phases/doc_lin.nit b/src/doc/doc_phases/doc_lin.nit
index c309db8..efd3803 100644 (file)
--- a/src/doc/doc_phases/doc_lin.nit
+++ b/src/doc/doc_phases/doc_lin.nit
@@ -100,4 +100,5 @@ class DefinitionLinArticle
 
        redef var toc_title = "Linearization"
        redef fun is_hidden do return mentities.is_empty
+       redef var is_toc_hidden = true
 end

diff --git a/src/doc/doc_phases/doc_structure.nit b/src/doc/doc_phases/doc_structure.nit
index bab950e..fc68097 100644 (file)
--- a/src/doc/doc_phases/doc_structure.nit
+++ b/src/doc/doc_phases/doc_structure.nit
@@ -318,6 +318,8 @@ end
 class ConcernSection
        super MEntityComposite
        super DocSection
+
+       redef fun is_toc_hidden do return is_hidden
 end
 
 # An article about a Mentity.
@@ -344,6 +346,7 @@ class IntroArticle
        super DocArticle
 
        redef var is_hidden = false
+       redef var is_toc_hidden = true
 end
 
 # An article that display a ConcernsTreee as a list.

diff --git a/src/doc/html_templates/html_templates.nit b/src/doc/html_templates/html_templates.nit
index 21ec7c1..b596df1 100644 (file)
--- a/src/doc/html_templates/html_templates.nit
+++ b/src/doc/html_templates/html_templates.nit
@@ -294,12 +294,9 @@ redef class DocComposite
                return html_title.write_to_string
        end
 
-       # Is `self` hidden in the table of content?
-       var is_toc_hidden = false is writable
-
        # Render this element in a table of contents.
        private fun render_toc_item(lst: UnorderedList) do
-               if is_toc_hidden then return
+               if is_toc_hidden or html_toc_title == null then return
 
                var content = new Template
                content.add new Link("#{html_id}", html_toc_title.to_s)
@@ -442,12 +439,10 @@ end
 redef class ConstructorsSection
        redef var html_title = "Constructors"
        redef var html_subtitle = null
-       redef fun is_toc_hidden do return is_hidden
 end
 
 redef class ConcernSection
        redef var html_title is lazy do return "in {mentity.nitdoc_name}"
-       redef fun is_toc_hidden do return is_hidden
 end
 
 redef class ImportationListSection
@@ -460,7 +455,6 @@ end
 
 redef class IntroArticle
        redef var html_title = null
-       redef var is_toc_hidden = true
 
        # Link to source to display if any.
        var html_source_link: nullable Writable is noinit, writable
@@ -545,8 +539,6 @@ redef class DefinitionArticle
 end
 
 redef class HierarchyListArticle
-       redef var is_toc_hidden = true
-
        redef fun render_body do
                var lst = new UnorderedList
                lst.css_classes.add "list-unstyled list-definition"
@@ -561,12 +553,9 @@ redef class IntrosRedefsSection
        redef var toc_title do return "Intros / Redefs"
        redef var html_title = null
        redef var html_subtitle = null
-       redef var is_toc_hidden = true
 end
 
 redef class IntrosRedefsListArticle
-       redef var is_toc_hidden = true
-
        redef fun render_body do
                var lst = new UnorderedList
                lst.css_classes.add "list-unstyled list-labeled"
@@ -579,7 +568,6 @@ end
 
 redef class DefinitionLinArticle
        redef var html_title is lazy do return "Linearization"
-       redef var is_toc_hidden = true
 
        redef fun render_body do
                var lst = new UnorderedList
@@ -603,7 +591,6 @@ end
 
 redef class GraphArticle
        redef var html_title = null
-       redef var is_toc_hidden = true
 
        # HTML map used to display link.
        #