[Docutils-checkins] SF.net SVN: docutils:[7605] trunk

[<gr...@us...>]

Revision: 7605
          http://docutils.svn.sourceforge.net/docutils/?rev=7605&view=rev
Author:   grubert
Date:     2013-02-16 22:01:32 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
move comment "Man page generated from reStructuredText." to first line (always)

Modified Paths:
--------------
    trunk/docutils/docutils/writers/manpage.py
    trunk/docutils/test/test_writers/test_manpage.py
    trunk/sandbox/manpage-writer/expected/characters.man
    trunk/sandbox/manpage-writer/expected/compact_lists.man

Modified: trunk/docutils/docutils/writers/manpage.py
===================================================================
--- trunk/docutils/docutils/writers/manpage.py	2013-02-16 19:48:49 UTC (rev 7604)
+++ trunk/docutils/docutils/writers/manpage.py	2013-02-16 22:01:32 UTC (rev 7605)
@@ -246,7 +246,7 @@
 
     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 @@
         # .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 @@
 
     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
 

Modified: trunk/docutils/test/test_writers/test_manpage.py
===================================================================
--- trunk/docutils/test/test_writers/test_manpage.py	2013-02-16 19:48:49 UTC (rev 7604)
+++ trunk/docutils/test/test_writers/test_manpage.py	2013-02-16 22:01:32 UTC (rev 7605)
@@ -51,11 +51,11 @@
 
 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 @@
         ====== =====
 """, 
 '''\
+.\\" 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 @@
 
 """, 
 '''\
+.\\" 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.

Modified: trunk/sandbox/manpage-writer/expected/characters.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/characters.man	2013-02-16 19:48:49 UTC (rev 7604)
+++ trunk/sandbox/manpage-writer/expected/characters.man	2013-02-16 22:01:32 UTC (rev 7605)
@@ -1,8 +1,8 @@
+.\" Man page generated from reStructuredText.
+.
 .TH SPECIAL CHARACTERS  "" "" ""
 .SH NAME
 special characters \- test special characters
-.\" Man page generated from reStructuredText.
-.
 .SH SEE ALSO
 .sp
 In mercurial the following substitutions are in use:

Modified: trunk/sandbox/manpage-writer/expected/compact_lists.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/compact_lists.man	2013-02-16 19:48:49 UTC (rev 7604)
+++ trunk/sandbox/manpage-writer/expected/compact_lists.man	2013-02-16 22:01:32 UTC (rev 7605)
@@ -1,8 +1,8 @@
+.\" Man page generated from reStructuredText.
+.
 .TH   "" "" ""
 .SH NAME
  \- 
-.\" Man page generated from reStructuredText.
-.
 .INDENT 0.0
 .IP \(bu 2
 This is an ordinary simple bullet list.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.