Log message for revision 66731: Merged 2.8 branch r30721:30722 into the trunk. (Fix for collector #1770 that never made it.)
Changed: U Zope/trunk/lib/python/reStructuredText/__init__.py U Zope/trunk/lib/python/reStructuredText/tests/testReST.py -=- Modified: Zope/trunk/lib/python/reStructuredText/__init__.py =================================================================== --- Zope/trunk/lib/python/reStructuredText/__init__.py 2006-04-09 15:37:24 UTC (rev 66730) +++ Zope/trunk/lib/python/reStructuredText/__init__.py 2006-04-09 15:39:14 UTC (rev 66731) @@ -141,16 +141,25 @@ 'title': parts['title'], } + subheader = '<h%(level)s class="subtitle">%(subtitle)s</h%(level)s>\n' % { + 'level': initial_header_level+1, + 'subtitle': parts['subtitle'], + } + body = '%(docinfo)s%(body)s' % { 'docinfo': parts['docinfo'], 'body': parts['body'], } + + output = '' if parts['title']: - output = header + body - else: - output = body + output = output + header + if parts['subtitle']: + output = output + subheader + output = output + body + warnings = ''.join(warning_stream.messages) if output_encoding != 'unicode': Modified: Zope/trunk/lib/python/reStructuredText/tests/testReST.py =================================================================== --- Zope/trunk/lib/python/reStructuredText/tests/testReST.py 2006-04-09 15:37:24 UTC (rev 66730) +++ Zope/trunk/lib/python/reStructuredText/tests/testReST.py 2006-04-09 15:39:14 UTC (rev 66731) @@ -65,8 +65,23 @@ expected = '<h%d><a id="von-v-geln-und-fen" name="von-v-geln-und-fen">Von Vögeln und Öfen</a></h%d>' %\ (level+1, level+1) self.assertEqual(expected in html, True) - + def testWithSingleSubtitle(self): + input = ''' +title +----- +subtitle +++++++++ +text +''' + expected='''<h3 class="title">title</h3> +<h4 class="subtitle">subtitle</h4> +<p>text</p> +''' + output = HTML(input) + self.assertEquals(output, expected) + + def test_suite(): from unittest import TestSuite, makeSuite return TestSuite((makeSuite(TestReST),)) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins