From 9f73fbb57f0f2b2ec5c7301b9fc632cde6bd187d Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Wed, 4 Sep 2013 21:15:35 -0400 Subject: [PATCH] Correct in HTML output Fix issue where HTML export has too many closing span tags in it. Thanks to Martin Ueding von.kde.org@martin-ueding.de for patch. REVIEW: 112507 BUG: 324476 FIXED-IN: 4.12 --- src/TerminalCharacterDecoder.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp index 0615d5dc..e1d49fc3 100644 --- a/src/TerminalCharacterDecoder.cpp +++ b/src/TerminalCharacterDecoder.cpp @@ -184,8 +184,10 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP if (characters[i].rendition != _lastRendition || characters[i].foregroundColor != _lastForeColor || characters[i].backgroundColor != _lastBackColor) { - if (_innerSpanOpen) + if (_innerSpanOpen) { closeSpan(text); + _innerSpanOpen = false; + } _lastRendition = characters[i].rendition; _lastForeColor = characters[i].foregroundColor; @@ -249,8 +251,10 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP } //close any remaining open inner spans - if (_innerSpanOpen) + if (_innerSpanOpen) { closeSpan(text); + _innerSpanOpen = false; + } //start new line text.append("
");