1.1 --- a/ImprovedTableParser.py Sun Oct 07 00:44:29 2012 +0200
1.2 +++ b/ImprovedTableParser.py Thu Nov 29 00:46:54 2012 +0100
1.3 @@ -26,7 +26,7 @@
1.4 "columns" : (r"\|\|[ \t]*", 0), # || ws-excl-nl
1.5
1.6 # At start of column text:
1.7 - "column" : (r"^\s*<(.*?)>\s*(.*)", re.DOTALL), # ws < attributes > ws
1.8 + "column" : (r"^\s*<([^<].*?)>\s*(.*)", re.DOTALL), # ws < not-< attributes > ws
1.9 }
1.10
1.11 patterns = {}
1.12 @@ -216,6 +216,7 @@
1.13
1.14 if columns:
1.15 extractAttributes(columns, row_attrs, table_attrs)
1.16 + span_columns(columns, columnnumber)
1.17
1.18 return table_attrs, rows
1.19