1.1 --- a/TO_DO.txt Sat Apr 13 19:49:24 2013 +0200
1.2 +++ b/TO_DO.txt Sat Apr 13 19:51:00 2013 +0200
1.3 @@ -1,8 +1,8 @@
1.4 DEV/MailmanOnLaunchpad (589838)
1.5
1.6 - Preformatted regions are not being formatted
1.7 - The previous version (15958128) had a newline at the start of the CDATA section and thus avoided this problem
1.8 - The problem might be that such regions when on a separate line might also require a newline after {{{ to be recognised
1.9 + (Preformatted regions are not being formatted
1.10 + The previous version (15958128) had a newline at the start of the CDATA section and thus avoided this problem
1.11 + The problem is that preformatted regions containing newlines require a newline immediately after {{{ to be recognised)
1.12
1.13 DEV/GSoC 2011 - Conversion from Confluence wiki to Moin (11960378)
1.14
2.1 --- a/xmlparser.py Sat Apr 13 19:49:24 2013 +0200
2.2 +++ b/xmlparser.py Sat Apr 13 19:51:00 2013 +0200
2.3 @@ -313,6 +313,12 @@
2.4 conversion = "%s#!table\n%%s\n%s" % (opening, closing)
2.5
2.6 else:
2.7 + # Preformatted sections containing newlines must contain an initial
2.8 + # newline.
2.9 +
2.10 + if text.find("\n") != -1 and not text.startswith("\n"):
2.11 + opening += "\n"
2.12 +
2.13 conversion = "%s%%s%s" % (opening, closing)
2.14
2.15 # Handle the common case and simpler special cases.
2.16 @@ -387,7 +393,7 @@
2.17 nodes.append("\n")
2.18
2.19 # Without preceding text, save any block node state for non-block
2.20 - # elements so that new line separators can be added at another
2.21 + # elements so that newline separators can be added at another
2.22 # level.
2.23
2.24 elif name in block_tags and parent not in block_tags: