From ea633117d01d94e8d56ed94344e4b3e46b4eef03 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 27 Feb 2018 18:08:49 -0800 Subject: Remove bad c2rst and fix the other for sphinx 1.7.1 --- docs/c2rst.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/c2rst.py b/docs/c2rst.py index 3018e62af..9ca8bc1bb 100644 --- a/docs/c2rst.py +++ b/docs/c2rst.py @@ -1,10 +1,18 @@ import sphinx.parsers -import docutils.parsers.rst as rst class CStrip(sphinx.parsers.Parser): - def __init(self): - self.rst_parser = rst.Parser() + def __init__(self): + self.rst_parser = sphinx.parsers.RSTParser() - def parse(self, inputstring, document): - print(inputstring) - self.rst_parser(stripped, document) + def parse(self, inputstring, document): + # This setting is missing starting with Sphinx 1.7.1 so we set it ourself. + document.settings.tab_width = 4 + stripped = [] + for line in inputstring.split("\n"): + line = line.strip() + if line == "//|": + stripped.append("") + elif line.startswith("//| "): + stripped.append(line[len("//| "):]) + stripped = "\r\n".join(stripped) + self.rst_parser.parse(stripped, document) -- cgit v1.2.3