From bbd7509dbe6865e8f74d155c6f149b27828361d7 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Mon, 23 Nov 1998 16:30:18 +0000 Subject: [PATCH] Fix up the extraction of optional parameters a little. Be more informative in an exception message. --- Doc/tools/latex2esis.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/tools/latex2esis.py b/Doc/tools/latex2esis.py index d186a66f4bb..afa2d865845 100755 --- a/Doc/tools/latex2esis.py +++ b/Doc/tools/latex2esis.py @@ -26,7 +26,7 @@ class LaTeXFormatError(Error): _begin_macro_rx = re.compile("[\\\\]([a-zA-Z]+[*]?)({|\\s*\n?)") _comment_rx = re.compile("%+[ \t]*(.*)\n") _text_rx = re.compile(r"[^]%\\{}]+") -_optional_rx = re.compile(r"[[]([^]]*)[]]") +_optional_rx = re.compile(r"\s*[[]([^]]*)[]]") _parameter_rx = re.compile("[ \n]*{([^}]*)}") _token_rx = re.compile(r"[a-zA-Z][a-zA-Z0-9.-]*$") _start_group_rx = re.compile("[ \n]*{") @@ -181,8 +181,8 @@ def subconvert(line, ofp, table, discards, autoclosing, knownempty, m = _parameter_rx.match(line) if not m: raise LaTeXFormatError( - "could not extract parameter group: " - + `line`) + "could not extract parameter %s for %s: %s" + % (attrname, macroname, `line[:100]`)) value = m.group(1) if _token_rx.match(value): dtype = "TOKEN"