Skip to content

Commit 18d9b9c

Browse files
committed
Merge pull request #211 from milmazz/hoedown_option
Added the :fenced_code Hoedown option.
2 parents bbf4114 + f4266f9 commit 18d9b9c

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ notifications:
55
otp_release:
66
- 17.0
77
before_install:
8-
- sudo apt-get install -y pandoc
8+
- wget -c https://github.com/jgm/pandoc/releases/download/1.13.2/pandoc-1.13.2-1-amd64.deb
9+
- sudo dpkg -i pandoc-1.13.2-1-amd64.deb
910
- git clone https://github.com/elixir-lang/elixir
1011
- cd elixir && make && cd ..
1112
before_script: "export PATH=`pwd`/elixir/bin:$PATH"

lib/ex_doc/markdown/hoedown.ex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ defmodule ExDoc.Markdown.Hoedown do
77
Hoedown specific options:
88
99
* `:autolink` - defaults to true
10+
* `:fenced_code` - defaults to true
1011
* `:tables` - Enables Markdown Extra style tables, defaults to true
1112
1213
"""
1314
def to_html(text, opts \\ []) do
1415
Markdown.to_html(text,
1516
autolink: Keyword.get(opts, :autolink, true),
17+
fenced_code: Keyword.get(opts, :fenced_code, true),
1618
tables: Keyword.get(opts, :tables, true))
1719
end
1820
end

lib/ex_doc/markdown/pandoc.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ defmodule ExDoc.Markdown.Pandoc do
2727

2828
defp open_port(path, opts) do
2929
exe = :os.find_executable('pandoc')
30-
args = ["--from", "markdown",
30+
args = ["--from", "markdown+fenced_code_blocks",
3131
"--to", get_string(opts, :format, :html),
3232
"--base-header-level", get_string(opts, :header_level, 1),
3333
path]

lib/ex_doc/retriever.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ defmodule ExDoc.Retriever do
109109
moduledoc: moduledoc,
110110
docs: docs,
111111
typespecs: get_types(module),
112-
source: source_link(source_path, source_url, line),
112+
source: source_link(source_path, source_url, line)
113113
}
114114
end
115115

0 commit comments

Comments
 (0)