resolves #921 put source language class names on child code element of pre element

2 files changed, 15 insertions, 3 deletions

diff --git a/lib/asciidoctor/converter/html5.rb b/lib/asciidoctor/converter/html5.rb
index 15ad587e..d48b0c8a 100644
--- a/lib/asciidoctor/converter/html5.rb
+++ b/lib/asciidoctor/converter/html5.rb
@@ -530,9 +530,8 @@ Your browser does not support the audio tag.
           pre_class = nowrap ? ' class="highlight nowrap"' : ' class="highlight"'
           code_class = language ? %( class="#{language_classes}") : nil
         when 'prettify'
-          pre_class = %( class="prettyprint#{nowrap ? ' nowrap' : nil}#{(node.attr? 'linenums') ? ' linenums' : nil})
-          pre_class = language ? %(#{pre_class} #{language_classes}") : %(#{pre_class}")
-          code_class = nil
+          pre_class = %( class="prettyprint#{nowrap ? ' nowrap' : nil}#{(node.attr? 'linenums') ? ' linenums' : nil}")
+          code_class = language ? %( class="#{language_classes}") : nil
         when 'html-pipeline'
           pre_class = language ? %( lang="#{language}") : nil
           code_class = nil
diff --git a/test/blocks_test.rb b/test/blocks_test.rb
index 1003ed5c..96038c46 100644
--- a/test/blocks_test.rb
+++ b/test/blocks_test.rb
@@ -2106,6 +2106,19 @@ html = CodeRay.scan("puts 'Hello, world!'", :ruby).div(:line_numbers => :table)
       assert_match(/hljs.initHighlightingOnLoad/, output)
     end
 
+    test 'should add language classes to child code element when source-highlighter is prettify' do
+      input = <<-EOS
+[source,ruby]
+----
+puts "foo"
+----
+      EOS
+
+      output = render_embedded_string input, :attributes => {'source-highlighter' => 'prettify'}
+      assert_css 'pre[class="prettyprint"]', output, 1
+      assert_css 'pre > code[class="ruby language-ruby"]', output, 1
+    end
+
     test 'should set lang attribute on pre when source-highlighter is html-pipeline' do
       input = <<-EOS
 [source,ruby]