diff options
author | grubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2013-02-16 22:01:32 +0000 |
---|---|---|
committer | grubert <grubert@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2013-02-16 22:01:32 +0000 |
commit | fa373c2178a5c3b2c849f7253d1edccd599987a2 (patch) | |
tree | 4c5b29f8343b23f102a913178a1a061e455211ed | |
parent | 2561b46a5f7305b2b7d68e9e400162a5e923c916 (diff) | |
download | docutils-fa373c2178a5c3b2c849f7253d1edccd599987a2.tar.gz |
move comment "Man page generated from reStructuredText." to first line (always)
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7605 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r-- | docutils/writers/manpage.py | 6 | ||||
-rw-r--r-- | test/test_writers/test_manpage.py | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/docutils/writers/manpage.py b/docutils/writers/manpage.py index 94c1cad72..74fc55a2d 100644 --- a/docutils/writers/manpage.py +++ b/docutils/writers/manpage.py @@ -246,7 +246,7 @@ class Translator(nodes.NodeVisitor): def ensure_eol(self): """Ensure the last line in body is terminated by new line.""" - if self.body[-1][-1] != '\n': + if len(self.body) > 0 and self.body[-1][-1] != '\n': self.body.append('\n') def astext(self): @@ -377,7 +377,7 @@ class Translator(nodes.NodeVisitor): # .TH title_upper section date source manual if self.header_written: return - self.body.append(self.header()) + self.head.append(self.header()) self.body.append(MACRO_DEF) self.header_written = 1 @@ -573,7 +573,7 @@ class Translator(nodes.NodeVisitor): def visit_document(self, node): # no blank line between comment and header. - self.body.append(self.comment(self.document_start).rstrip()+'\n') + self.head.append(self.comment(self.document_start).rstrip()+'\n') # writing header is postboned self.header_written = 0 diff --git a/test/test_writers/test_manpage.py b/test/test_writers/test_manpage.py index faf4b900b..e38c1e551 100644 --- a/test/test_writers/test_manpage.py +++ b/test/test_writers/test_manpage.py @@ -51,11 +51,11 @@ totest = {} totest['blank'] = [ ["", - r""".TH "" "" "" + r""".\" Man page generated from reStructuredText. +. +.TH "" "" "" .SH NAME \- -.\" Man page generated from reStructuredText. -. .\" Generated by docutils manpage writer. . """], @@ -191,11 +191,11 @@ totest['table'] = [ ====== ===== """, '''\ +.\\" Man page generated from reStructuredText. +. .TH "" "" "" .SH NAME \\- \n\ -.\\" Man page generated from reStructuredText. -. .INDENT 0.0 .INDENT 3.5 .TS @@ -248,11 +248,11 @@ $ bla bla bla """, """\ +.\\" Man page generated from reStructuredText. +. .TH "" "" "" .SH NAME \\- \n\ -.\\" Man page generated from reStructuredText. -. optin group with dot as group item .INDENT 0.0 .TP @@ -304,11 +304,11 @@ Section """, '''\ +.\\" Man page generated from reStructuredText. +. .TH DEFINITION LIST TEST "" "" "" .SH NAME Definition List Test \\- \n\ -.\\" Man page generated from reStructuredText. -. .SS Abstract .sp Docinfo is required. |