wip rebasing

Author: lud

lib/ex_doc/formatter/epub/templates/module_template.eex

@@ -22,12 +22,12 @@
       </section>
     <% end %>
 
-    <%= for group <- summary, key = text_to_id(group.title) do %>
+    <%= for group <- dbg(summary), key = text_to_id(group.title) do %>
       <section id="<%= key %>" class="details-list">
         <h1 class="section-heading"><%=h to_string(group.title) %></h1>
-        <%= if doc = group.rendered_doc do %>
+        <%= if doc = group.doc  do %>
           <div class="group-description" id="group-description-<%= key %>">
-            <%= H.link_group_headings(doc, key) %>
+            <%= render_doc(doc) %>
           </div>
         <% end %>
         <div class="<%= key %>-list">

lib/ex_doc/formatter/html/templates.ex

@@ -217,10 +217,6 @@ defmodule ExDoc.Formatter.HTML.Templates do
     end)
   end
 
-  def link_group_headings(content, key) do
-    link_headings(content, "group-#{key}-")
-  end
-
   templates = [
     detail_template: [:node, :module],
     footer_template: [:config, :source_path],

lib/ex_doc/formatter/html/templates/module_template.eex

@@ -53,7 +53,7 @@
     </h1>
     <%= if doc = group.rendered_doc do %>
       <div class="group-description" id="group-description-<%= key %>">
-        <%= link_group_headings(doc, key) %>
+       <%= render_doc(doc) %>
       </div>
     <% end %>
     <div class="<%= key %>-list">

lib/ex_doc/nodes.ex

@@ -93,13 +93,12 @@ defmodule ExDoc.DocNode do
 end
 
 defmodule ExDoc.DocGroupNode do
-  defstruct title: nil, description: nil, doc: nil, rendered_doc: nil, docs: []
+  defstruct title: nil, description: nil, doc: nil, docs: []
 
   @type t :: %__MODULE__{
           title: String.t() | atom(),
           description: String.t() | nil,
           doc: ExDoc.DocAST.t() | nil,
-          rendered_doc: String.t() | nil,
           docs: [ExDoc.DocNode.t()]
         }
 end

lib/ex_doc/retriever.ex

@@ -168,8 +168,7 @@ defmodule ExDoc.Retriever do
       deprecated: metadata[:deprecated],
       docs_groups: docs_groups,
       docs: docs,
-      doc_format: format,
-      doc: doc,
+      doc: normalize_doc_ast(doc_ast, "module-"),
       source_doc: source_doc,
       source_format: format,
       moduledoc_line: doc_line,

test/ex_doc/formatter/epub/templates_test.exs

@@ -169,6 +169,9 @@ defmodule ExDoc.Formatter.EPUB.TemplatesTest do
 
       doc = LazyHTML.from_document(content)
 
+      IO.warn("remove file.write")
+      File.write("/tmp/doc.html", LazyHTML.to_html(doc))
+
       assert Enum.count(doc["div.group-description"]) == 1
       assert Enum.count(doc["#group-description-example-functions"]) == 1
       assert Enum.count(doc["#group-description-example-functions h3"]) == 1