From: <gr...@us...> - 2010-01-12 15:33:30
|
Author: grubert Date: 2010-01-12 16:33:20 +0100 (Tue, 12 Jan 2010) New Revision: 6218 Modified: trunk/docutils/HISTORY.txt trunk/docutils/docutils/writers/manpage.py Log: Remove trailing blanks in code (keep in sync with mercurial version). Modified: trunk/docutils/HISTORY.txt =================================================================== --- trunk/docutils/HISTORY.txt 2010-01-12 15:20:12 UTC (rev 6217) +++ trunk/docutils/HISTORY.txt 2010-01-12 15:33:20 UTC (rev 6218) @@ -47,6 +47,7 @@ * docutils/writers/manpage.py + - Remove trailing blanks in code (keep in sync with mercurial version). - Titles level 1, that is ``.SH``, always uppercase. - Apply patch from mg: literal text should be bold in man-pages. Modified: trunk/docutils/docutils/writers/manpage.py =================================================================== --- trunk/docutils/docutils/writers/manpage.py 2010-01-12 15:20:12 UTC (rev 6217) +++ trunk/docutils/docutils/writers/manpage.py 2010-01-12 15:33:20 UTC (rev 6218) @@ -7,7 +7,7 @@ Simple man page writer for reStructuredText. Man pages (short for "manual pages") contain system documentation on unix-like -systems. The pages are grouped in numbered sections: +systems. The pages are grouped in numbered sections: 1 executable programs and shell commands 2 system calls @@ -139,7 +139,7 @@ text.append('|%s|.\n' % ('|'.join(self._coldefs))) for row in self._rows: # row = array of cells. cell = array of lines. - text.append('_\n') # line above + text.append('_\n') # line above text.append('T{\n') for i in range(len(row)): cell = row[i] @@ -183,8 +183,8 @@ "title" : "", "title_upper": "", "subtitle" : "", "manual_section" : "", "manual_group" : "", - "author" : [], - "date" : "", + "author" : [], + "date" : "", "copyright" : "", "version" : "", } @@ -215,7 +215,7 @@ 'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'), 'option_list_item' : ('.TP\n', ''), - + 'reference' : (r'\fI\%', r'\fP'), 'emphasis': ('\\fI', '\\fP'), 'strong' : ('\\fB', '\\fP'), @@ -262,7 +262,7 @@ elif (self.body[i-1][:3] == '.B ' and self.body[i-2][:4] == '.TP\n'): self.body[i] = '.\n' - elif (self.body[i-1] == '\n' and + elif (self.body[i-1] == '\n' and self.body[i-2][0] != '.' and (self.body[i-3][:7] == '.TP\n.B ' or self.body[i-3][:4] == '\n.B ') @@ -563,10 +563,10 @@ def depart_document(self, node): if self._docinfo['author']: - self.body.append('.SH AUTHOR\n%s\n' + self.body.append('.SH AUTHOR\n%s\n' % ', '.join(self._docinfo['author'])) skip = ('author', 'copyright', 'date', - 'manual_group', 'manual_section', + 'manual_group', 'manual_section', 'subtitle', 'title', 'title_upper', 'version') for name in self._docinfo_keys: @@ -586,7 +586,7 @@ label = self.language.labels.get(name, name) self.body.append("\n%s: %s\n" % (label, self._docinfo[name]) ) if self._docinfo['copyright']: - self.body.append('.SH COPYRIGHT\n%s\n' + self.body.append('.SH COPYRIGHT\n%s\n' % self._docinfo['copyright']) self.body.append( self.comment( 'Generated by docutils manpage writer.\n' ) ) @@ -895,7 +895,7 @@ def visit_paragraph(self, node): # ``.PP`` : Start standard indented paragraph. # ``.LP`` : Start block paragraph, all except the first. - # ``.P [type]`` : Start paragraph type. + # ``.P [type]`` : Start paragraph type. # NOTE dont use paragraph starts because they reset indentation. # ``.sp`` is only vertical space self.ensure_eol() |