Merge pull request github#502 from github/fix-dat-rst

Fix a couple of RST issues

Author: gjtorikian

lib/github/commands/rest2html

@@ -44,11 +44,13 @@ except:
 
 import codecs
 
+from docutils import nodes
+from docutils.parsers.rst import roles
 from docutils.core import publish_parts
 from docutils.writers.html4css1 import Writer, HTMLTranslator
 
 SETTINGS = {
-    'cloak_email_addresses': True,
+    'cloak_email_addresses': False,
     'file_insertion_enabled': False,
     'raw_enabled': False,
     'strip_comments': True,
@@ -127,6 +129,10 @@ class GitHubHTMLTranslator(HTMLTranslator):
         self.body.append(self.starttag(node, 'img', **atts))
       self.body.append(self.context.pop())
 
+def kbd(name, rawtext, text, lineno, inliner, options=None, content=None):
+
+  return [nodes.raw('', '<kbd>%s</kbd>' % text, format='html')], []
+
 def main():
     """
     Parses the given ReST file or the redirected string input and returns the
@@ -145,6 +151,8 @@ def main():
     writer = Writer()
     writer.translator_class = GitHubHTMLTranslator
 
+    roles.register_canonical_role('kbd', kbd)
+
     parts = publish_parts(text, writer=writer, settings_overrides=SETTINGS)
     if 'html_body' in parts:
         html = parts['html_body']

test/markups/README.rst

@@ -55,3 +55,7 @@ Field list
 	but no problem!
 :123456789 12345: this is not so long, but long enough for the default!
 :123456789 1234: this should work even with the default :)
+
+[email protected]
+
+Press :kbd:`Ctrl+C` to quit

test/markups/README.rst.html

@@ -72,4 +72,8 @@ <h2><a href="#id2">Field list</a></h2>
 <td>this should work even with the default :)</td>
 </tr>
 </tbody>
-</table>
+</table>
+
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+
+<p>Press <kbd>Ctrl+C</kbd> to quit</p>