Merge pull request github#279 from fdr/titles-subtitles

Interpret titles and subtitles in rst

Author: gjtorikian

lib/github/commands/rest2html

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2 -S
+#!/usr/bin/env python
 """
 rest2html - A small wrapper file for parsing ReST files at GitHub.
 
@@ -32,6 +32,7 @@ import os
 
 # This fixes docutils failing with unicode parameters to CSV-Table. The -S
 # switch and the following 2 lines can be removed after upgrading to python 3.
+reload(sys)
 sys.setdefaultencoding('utf-8')
 import site
 
@@ -51,7 +52,9 @@ SETTINGS = {
     'file_insertion_enabled': False,
     'raw_enabled': False,
     'strip_comments': True,
-    'doctitle_xform': False,
+    'doctitle_xform': True,
+    'sectsubtitle_xform': True,
+    'initial_header_level': 2,
     'report_level': 3,
     'syntax_highlight' : 'none',
     'math_output' : 'latex'

test/markups/README.rst

@@ -1,8 +1,13 @@
 Header 1
 ========
+--------
+Subtitle
+--------
 
 Example text.
 
+.. contents:: Table of Contents
+
 Header 2
 --------
 

test/markups/README.rst.html

@@ -1,14 +1,21 @@
-<h1>Header 1</h1>
+<h1 class="title">Header 1</h1>
+<h2 class="subtitle" id="subtitle">Subtitle</h2>
 <p>Example text.</p>
-<h2>Header 2</h2>
+<div class="contents topic" id="table-of-contents">
+<p class="topic-title first">Table of Contents</p>
+<ul class="simple">
+<li><a class="reference internal" href="#header-2" id="id1">Header 2</a></li>
+</ul>
+</div>
+<h2><a class="toc-backref" href="#id1">Header 2</a></h2>
 <ol class="arabic simple">
 <li>Blah blah <tt class="docutils literal">code</tt> blah</li>
 <li>More <tt class="docutils literal">code</tt>, hooray</li>
 <li>Somé UTF-8°</li>
 </ol>
 <p>The UTF-8 quote character in this table used to cause python to go boom. Now docutils just displays an error inline so the user can fix it. Upgrading to Python 3 will fix this.</p>
 <div class="system-message">
-<p class="system-message-title">System Message: ERROR/3 (<tt class="docutils">&lt;string&gt;</tt>, line 17)</p>
+<p class="system-message-title">System Message: ERROR/3 (<tt class="docutils">&lt;string&gt;</tt>, line 22)</p>
 <p>Error with CSV data in &quot;csv-table&quot; directive:
 &quot;quotechar&quot; must be an 1-character string</p>
 <pre>

test/markups/README.rst.txt.html

@@ -1,4 +1,4 @@
-<h1>Header 1</h1>
+<h1 class="title">Header 1</h1>
 <p>Example text.</p>
 <h2>Header 2</h2>
 <ol class="arabic simple">