Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ notifications:
otp_release:
- 17.0
before_install:
- sudo apt-get install -y pandoc
- wget -c https://github.com/jgm/pandoc/releases/download/1.13.2/pandoc-1.13.2-1-amd64.deb
- sudo dpkg -i pandoc-1.13.2-1-amd64.deb
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

- git clone https://github.com/elixir-lang/elixir
- cd elixir && make && cd ..
before_script: "export PATH=`pwd`/elixir/bin:$PATH"
Expand Down
2 changes: 2 additions & 0 deletions lib/ex_doc/markdown/hoedown.ex
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ defmodule ExDoc.Markdown.Hoedown do
Hoedown specific options:

* `:autolink` - defaults to true
* `:fenced_code` - defaults to true
* `:tables` - Enables Markdown Extra style tables, defaults to true

"""
def to_html(text, opts \\ []) do
Markdown.to_html(text,
autolink: Keyword.get(opts, :autolink, true),
fenced_code: Keyword.get(opts, :fenced_code, true),
tables: Keyword.get(opts, :tables, true))
end
end
2 changes: 1 addition & 1 deletion lib/ex_doc/markdown/pandoc.ex
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defmodule ExDoc.Markdown.Pandoc do

defp open_port(path, opts) do
exe = :os.find_executable('pandoc')
args = ["--from", "markdown",
args = ["--from", "markdown+fenced_code_blocks",
"--to", get_string(opts, :format, :html),
"--base-header-level", get_string(opts, :header_level, 1),
path]
Expand Down
2 changes: 1 addition & 1 deletion lib/ex_doc/retriever.ex
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ defmodule ExDoc.Retriever do
moduledoc: moduledoc,
docs: docs,
typespecs: get_types(module),
source: source_link(source_path, source_url, line),
source: source_link(source_path, source_url, line)
}
end

Expand Down