Remove cheatsheets from epub, perform sectionize later

Author: josevalim

lib/ex_doc/formatter/epub.ex

@@ -63,7 +63,7 @@ defmodule ExDoc.Formatter.EPUB do
   defp generate_extras(config) do
     for {_title, extras} <- config.extras,
         node <- extras,
-        not is_map_key(node, :url) do
+        not is_map_key(node, :url) and node.extension != ".cheatmd" do
       output = "#{config.output}/OEBPS/#{node.id}.xhtml"
       html = Templates.extra_template(config, node)
 

lib/ex_doc/formatter/html.ex

@@ -410,12 +410,12 @@ defmodule ExDoc.Formatter.HTML do
     source_file = input_options[:source] || input
     opts = [file: source_file, line: 1]
 
-    {source, ast} =
+    {extension, source, ast} =
       case extension_name(input) do
         extension when extension in ["", ".txt"] ->
           source = File.read!(input)
           ast = [{:pre, [], ["\n" <> source], %{}}]
-          {source, ast}
+          {extension, source, ast}
 
         extension when extension in [".md", ".livemd", ".cheatmd"] ->
           source = File.read!(input)
@@ -424,10 +424,9 @@ defmodule ExDoc.Formatter.HTML do
             source
             |> Markdown.to_ast(opts)
             |> ExDoc.DocAST.add_ids_to_headers([:h2, :h3])
-            |> sectionize(extension)
             |> autolink_and_highlight(language, [file: input] ++ autolink_opts, opts)
 
-          {source, ast}
+          {extension, source, ast}
 
         _ ->
           raise ArgumentError,
@@ -451,6 +450,7 @@ defmodule ExDoc.Formatter.HTML do
     search_data = normalize_search_data!(input_options[:search_data])
 
     %{
+      extension: extension,
       source: source,
       group: group,
       id: id,
@@ -491,12 +491,6 @@ defmodule ExDoc.Formatter.HTML do
     |> String.downcase()
   end
 
-  defp sectionize(ast, ".cheatmd") do
-    ExDoc.DocAST.sectionize(ast, [:h2, :h3])
-  end
-
-  defp sectionize(ast, _), do: ast
-
   defp filename_to_title(input) do
     input |> Path.basename() |> Path.rootname()
   end

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

@@ -26,7 +26,11 @@
     </div>
   <% end %>
 
-  <%= node[:content] || render_doc(node.doc) %>
+  <%= if type == :cheatmd do %>
+    <%= node.doc |> ExDoc.DocAST.sectionize([:h2, :h3]) |> render_doc() %>
+  <% else %>
+    <%= node[:content] || render_doc(node.doc) %>
+  <% end %>
 </div>
 
 <div class="bottom-actions" id="bottom-actions">