Don't emit a trailing newline in nowrap mode (fixes #1514.)

2 files changed, 9 insertions, 1 deletions

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 '</span>'), 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 '</span>')
+            else:
+                line.extend((lspan and '</span>', lsep))
             yield 1, ''.join(line)
 
     def _lookup_ctag(self, token):