Merge pull request #380 from dkasak/fenced-code-block-additional-tag

When rendering fenced code blocks, add `language-LANG` class as well.

CHANGES.md

@@ -3,6 +3,7 @@
 ## python-markdown2 2.4.0 (not yet released)
 
 - [pull #377] Fixed bug breaking strings elements in metadata lists
+- [pull #380] When rendering fenced code blocks, also add the `language-LANG` class
 
 
 ## python-markdown2 2.3.10

CONTRIBUTORS.txt

@@ -47,3 +47,4 @@ Gareth Simpson (github.com/xurble)
 Kat Hagan (github.com/codebykat)
 Stɑrry Shivɑm (github.com/starry69)
 André Nasturas (github.com/andrenasturas)
+Denis Kasak (github.com/dkasak)

lib/markdown2.py

@@ -1884,7 +1884,7 @@ def unhash_code(codeblock):
         pre_class_str = self._html_class_str_from_tag("pre")
 
         if "highlightjs-lang" in self.extras and lexer_name:
-            code_class_str = ' class="%s"' % lexer_name
+            code_class_str = ' class="%s language-%s"' % (lexer_name, lexer_name)
         else:
             code_class_str = self._html_class_str_from_tag("code")
 

test/tm-cases/highlightjs_lang.html

@@ -1,23 +1,17 @@
-<pre><code class="cpp">here is some cpp code
+<pre><code class="cpp language-cpp">here is some cpp code
 </code></pre>
 
-<pre><code class="lang-cpp">some lang-cpp code
-</code></pre>
-
-<pre><code class="language-cpp">and some language-cpp code
-</code></pre>
-
-<pre><code class="nohighlight">some code without highlighting
+<pre><code class="nohighlight language-nohighlight">some code without highlighting
 </code></pre>
 
 <p>That's using the <em>fenced-code-blocks</em> and <em>highlightjs-lang</em> extra.</p>
 
 <p>Here is an empty one (just to check):</p>
 
-<pre><code class="cpp">
+<pre><code class="cpp language-cpp">
 </code></pre>
 
 <p>Here is one at the end of the file:</p>
 
-<pre><code class="cpp">    is indentation maintained?
+<pre><code class="cpp language-cpp">    is indentation maintained?
 </code></pre>

test/tm-cases/highlightjs_lang.text

@@ -2,14 +2,6 @@
 here is some cpp code
 ```
 
-```lang-cpp
-some lang-cpp code
-```
-
-```language-cpp
-and some language-cpp code
-```
-
 ```nohighlight
 some code without highlighting
 ```