Skip to content
Open
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ html = renderer.render(document)

Added and require [tartrazine](https://github.com/ralsina/tartrazine) before markd will use it to render code block.

Use either `r` or `language-r` after the opening fence to highlight a code block as R.

By default, it use formatter like following:

```crystal
Expand Down
9 changes: 7 additions & 2 deletions spec/markd_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ describe Markd do
Markd.to_html(raw).should eq(html)
end

it "should no error when require tartrazine" do
{{ run("./fixtures/tartrazine.cr") }}
it "preserves the original fence label in plain HTML classes" do
Markd.to_html("```language-r\nx\n```").should eq(%(<pre><code class="language-language-r">x\n</code></pre>\n))
Markd.to_html("```language-\nx\n```").should eq(%(<pre><code class="language-language-">x\n</code></pre>\n))
end

it "highlights R fences with Tartrazine using either language label" do
{{ run("./support/tartrazine_languages.cr") }}
end
end
9 changes: 9 additions & 0 deletions spec/support/tartrazine_languages.cr
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
require "../fixtures/tartrazine"

formatter = Tartrazine::Html.new
expected = formatter.format("x <- 1", Tartrazine.lexer("r"))

%w[r language-r].each do |language|
actual = Markd.to_html("```#{language}\nx <- 1\n```", formatter: formatter)
raise "Expected Tartrazine to highlight #{language} as R" unless actual.strip == expected.strip
end
40 changes: 21 additions & 19 deletions src/markd/renderers/html_renderer.cr
Original file line number Diff line number Diff line change
Expand Up @@ -344,31 +344,33 @@ module Markd
end
end

private def render_code_block_use_tartrazine(node : Node, formatter : Tartrazine::Formatter)
languages = node.fence_language ? node.fence_language.split : nil
lang = code_block_language(languages)
{% if @top_level.has_constant?("Tartrazine") %}
private def render_code_block_use_tartrazine(node : Node, formatter : Tartrazine::Formatter)
languages = node.fence_language ? node.fence_language.split : nil
lang = code_block_language(languages).try(&.lchop("language-").presence)

newline
newline

if lang
lexer = Tartrazine.lexer(lang)
if lang
lexer = Tartrazine.lexer(lang)

literal(formatter.format(node.text.chomp, lexer))
else
code_tag_attrs = attrs(node)
pre_tag_attrs = if @options.prettyprint?
{"class" => "prettyprint"}
end

tag("pre", pre_tag_attrs) do
tag("code", code_tag_attrs) do
code_block_body(node, lang)
literal(formatter.format(node.text.chomp, lexer))
else
code_tag_attrs = attrs(node)
pre_tag_attrs = if @options.prettyprint?
{"class" => "prettyprint"}
end

tag("pre", pre_tag_attrs) do
tag("code", code_tag_attrs) do
code_block_body(node, lang)
end
end
end
end

newline
end
newline
end
{% end %}

private def render_code_block_use_code_tag(node : Node)
languages = node.fence_language ? node.fence_language.split : nil
Expand Down
Loading