From 52dd1cba99c9f4f3495ee1e9b93ee615b80ba880 Mon Sep 17 00:00:00 2001 From: "Matth?us G. Chajdas" Date: Sat, 18 May 2019 14:48:13 +0200 Subject: Don't emit a trailing newline in nowrap mode (fixes #1514.) --- CHANGES | 2 ++ pygments/formatters/html.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index d0da916d..eaf47510 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,8 @@ Version 2.4.1 - Support CSS variables in stylesheets (PR#814) - Fix F# lexer name (PR#709) - Fix ``TerminalFormatter`` using bold for bright text (#1480) +- Don't emit a trailing newline in the HtmlFormatter when ``nowrap`` is set + (#1514) Version 2.4.0 ------------- diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py index d65c09ce..54e7df0e 100644 --- a/pygments/formatters/html.py +++ b/pygments/formatters/html.py @@ -803,7 +803,13 @@ class HtmlFormatter(Formatter): # else we neither have to open a new span nor set lspan if line: - line.extend(((lspan and ''), lsep)) + # If we're in nowrap mode, we try to make the output compact and + # omit the trailing newspace, this makes it easier to consume the + # HTML elsewhere + if self.nowrap: + line.append(lspan and '') + else: + line.extend((lspan and '', lsep)) yield 1, ''.join(line) def _lookup_ctag(self, token): -- cgit v1.2.1