From 4112ff58dee50c5c39e9490e16cdce75d46cf2c8 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Thu, 15 Mar 2012 16:03:54 +0000 Subject: [PATCH] Add support for not splitting output - Legacy-Id: 4089 --- ietf/idrfc/markup_txt.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ietf/idrfc/markup_txt.py b/ietf/idrfc/markup_txt.py index 9ef26d471..b4bb5d6f0 100644 --- a/ietf/idrfc/markup_txt.py +++ b/ietf/idrfc/markup_txt.py @@ -34,7 +34,7 @@ from django.utils.html import escape import string import re -def markup(content): +def markup(content, split=True): # normalize line endings to LF only content = content.replace("\r\n", "\n") content = content.replace("\r", "\n") @@ -63,8 +63,10 @@ def markup(content): content = re.sub("\n\n([0-9]+\\.|[A-Z]\\.[0-9]|Appendix|Status of|Abstract|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index)(.*)(?=\n\n)", """\n\n\g<1>\g<2>""", content) - n = content.find("\n", 5000) - content1 = "
"+content[:n+1]+"
\n" - content2 = "
"+content[n+1:]+"
\n" - - return (content1, content2) + if split: + n = content.find("\n", 5000) + content1 = "
"+content[:n+1]+"
\n" + content2 = "
"+content[n+1:]+"
\n" + return (content1, content2) + else: + return "
" + content + "
\n"