From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 19 May 2018 11:31:02 +0000 (+0200)
Subject: m.code: don't blow up if inline literal doesn't have language.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=c33a060ac7ad0b4e8001997894b0e01db15db543;p=blog.git

m.code: don't blow up if inline literal doesn't have language.
---

diff --git a/pelican-plugins/m/code.py b/pelican-plugins/m/code.py
index 4bf996d3..cc999e9e 100644
--- a/pelican-plugins/m/code.py
+++ b/pelican-plugins/m/code.py
@@ -183,9 +183,16 @@ def code(role, rawtext, text, lineno, inliner, options={}, content=[]):
         classes += options['classes']
         del options['classes']
 
-    # Not sure why language is duplicated in classes?
-    language = options.get('language', '')
+    # If language is not specified, render a simple literal
+    if not 'language' in options:
+        content = nodes.raw('', utils.unescape(text), format='html')
+        node = nodes.literal(rawtext, '', **options)
+        node.append(content)
+        return [node], []
+
+    language = options['language']
     del options['language']
+    # Not sure why language is duplicated in classes?
     if language in classes: classes.remove(language)
 
     class_, highlighted = _highlight(utils.unescape(text), language, options)
diff --git a/pelican-plugins/m/test/code/page.html b/pelican-plugins/m/test/code/page.html
index 16406a9d..6be7cc2e 100644
--- a/pelican-plugins/m/test/code/page.html
+++ b/pelican-plugins/m/test/code/page.html
@@ -29,7 +29,8 @@
 <pre class="m-inverted m-code"><span class="kt">int</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
 <span class="hll">    <span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
 </span><span class="p">}</span></pre>
-<p>Inline code is here: <code class="cpp m-code"><span class="k">constexpr</span></code></p>
+<p>Inline code is here: <code class="cpp m-code"><span class="k">constexpr</span></code>. Code without a language should be
+rendered as plain monospace text: <code>code</code>.</p>
 <pre class="m-console">!<span class="g g-AnsiBlue">[</span><span class="g g-AnsiBrightWhite">mosra@don-perverzo </span><span class="g g-AnsiWhite">m.css</span><span class="g g-AnsiBlue">]</span><span class="g g-AnsiBrightCyan">$ </span>ls
 CONTRIBUTING.rst  CREDITS.rst  <span class="g g-AnsiBrightBlue">doc</span>      <span class="g g-AnsiBrightBlue">pelican-plugins</span>  README.rst
 COPYING           <span class="g g-AnsiBrightBlue">css</span>          <span class="g g-AnsiBrightBlue">doxygen</span>  <span class="g g-AnsiBrightBlue">pelican-theme</span>    <span class="g g-AnsiBrightBlue">site</span></pre>
diff --git a/pelican-plugins/m/test/code/page.rst b/pelican-plugins/m/test/code/page.rst
index 7cccd0a8..48c5906a 100644
--- a/pelican-plugins/m/test/code/page.rst
+++ b/pelican-plugins/m/test/code/page.rst
@@ -20,7 +20,8 @@ m.code
         return 1;
     }
 
-Inline code is here: :cpp:`constexpr`
+Inline code is here: :cpp:`constexpr`. Code without a language should be
+rendered as plain monospace text: :code:`code`.
 
 .. include:: console.ansi
     :code: ansi