From: Fred Drake <fdrake@acm.org>
Date: Fri, 6 Jul 2001 21:01:19 +0000 (+0000)
Subject: Allow optional arguments to LaTeX macros to span lines.  This is legal in
X-Git-Tag: v2.2a3~1318
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5fc0ab09937c429ee3dc77cb345269cde0367b7;p=thirdparty%2FPython%2Fcpython.git

Allow optional arguments to LaTeX macros to span lines.  This is legal in
LaTeX and we have at least one occurance of that in the content, so this
script needs to support it as well.
---

diff --git a/Doc/tools/sgmlconv/latex2esis.py b/Doc/tools/sgmlconv/latex2esis.py
index 74e1dc7e12fb..e694f5604da0 100755
--- a/Doc/tools/sgmlconv/latex2esis.py
+++ b/Doc/tools/sgmlconv/latex2esis.py
@@ -56,7 +56,7 @@ _end_env_rx = re.compile(r"[\\]end{([^}]*)}")
 _begin_macro_rx = re.compile(r"[\\]([a-zA-Z]+[*]?) ?({|\s*\n?)")
 _comment_rx = re.compile("%+ ?(.*)\n[ \t]*")
 _text_rx = re.compile(r"[^]~%\\{}]+")
-_optional_rx = re.compile(r"\s*[[]([^]]*)[]]")
+_optional_rx = re.compile(r"\s*[[]([^]]*)[]]", re.MULTILINE)
 # _parameter_rx is this complicated to allow {...} inside a parameter;
 # this is useful to match tabular layout specifications like {c|p{24pt}}
 _parameter_rx = re.compile("[ \n]*{(([^{}}]|{[^}]*})*)}")