diff options
author | gbrandl <devnull@localhost> | 2007-02-13 23:29:24 +0100 |
---|---|---|
committer | gbrandl <devnull@localhost> | 2007-02-13 23:29:24 +0100 |
commit | 0fa948e73c48996de904aeb2f0e4990fc40385ec (patch) | |
tree | 717883743e5dae200f38450dea3b46012c32a1ee | |
parent | b3b5dae666a11efd0beac407f525cf2806bc3757 (diff) | |
download | pygments-0fa948e73c48996de904aeb2f0e4990fc40385ec.tar.gz |
[svn] Another two fixes.
-rw-r--r-- | pygments/formatters/html.py | 6 | ||||
-rw-r--r-- | pygments/lexers/agile.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py index 97165d00..565f35b9 100644 --- a/pygments/formatters/html.py +++ b/pygments/formatters/html.py @@ -465,12 +465,10 @@ class HtmlFormatter(Formatter): lspan = cspan else: line += parts[-1] - elif line: - # we neither have to open a new span nor set lspan - pass - else: + elif parts[-1]: line = cspan + parts[-1] lspan = cspan + # else we neither have to open a new span nor set lspan if line: yield 1, line + (lspan and '</span>') + lsep diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py index d19e79ca..1a1a26d3 100644 --- a/pygments/lexers/agile.py +++ b/pygments/lexers/agile.py @@ -205,7 +205,7 @@ class PythonConsoleLexer(Lexer): tbindex = match.start() elif tb: curtb += line - if not line.startswith(' '): + if not (line.startswith(' ') or line.strip() == '...'): tb = 0 for i, t, v in tblexer.get_tokens_unprocessed(curtb): yield tbindex+i, t, v |