diff --git a/README.md b/README.md index d3a99f1..cf80cef 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/spec/markd_spec.cr b/spec/markd_spec.cr index e1d284b..e90fe1a 100644 --- a/spec/markd_spec.cr +++ b/spec/markd_spec.cr @@ -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(%(
x\n
\n)) + Markd.to_html("```language-\nx\n```").should eq(%(
x\n
\n)) + end + + it "highlights R fences with Tartrazine using either language label" do + {{ run("./support/tartrazine_languages.cr") }} end end diff --git a/spec/support/tartrazine_languages.cr b/spec/support/tartrazine_languages.cr new file mode 100644 index 0000000..2d9094d --- /dev/null +++ b/spec/support/tartrazine_languages.cr @@ -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 diff --git a/src/markd/renderers/html_renderer.cr b/src/markd/renderers/html_renderer.cr index a6f65d6..d7d184e 100644 --- a/src/markd/renderers/html_renderer.cr +++ b/src/markd/renderers/html_renderer.cr @@ -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