summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-08-27 13:42:26 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-08-27 13:42:26 (GMT)
commitcfac0824b1d201fac37772ac42662901efc88ba7 (patch)
treea2aecf7a3c6580f0b776c1624164d40e7bae0973
parent0e2e8916f81892c891a33c5435024776ca0f570f (diff)
parent663544cc0caf9109ea10c33f38b1e07e7a01a575 (diff)
downloadDoxygen-cfac0824b1d201fac37772ac42662901efc88ba7.zip
Doxygen-cfac0824b1d201fac37772ac42662901efc88ba7.tar.gz
Doxygen-cfac0824b1d201fac37772ac42662901efc88ba7.tar.bz2
Merge pull request #386 from albert-github/feature/bug_753909
Bug 753909 - Copy and paste of code fragment from CHM merges all pasted text into single line
-rw-r--r--src/htmlgen.cpp2
-rw-r--r--templates/html/doxygen.css5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index e8da420..e6431e8 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -653,7 +653,7 @@ void HtmlCodeGenerator::startCodeLine(bool hasLineNumbers)
void HtmlCodeGenerator::endCodeLine()
{
- if (m_streamSet) m_t << "</div>\n";
+ if (m_streamSet) m_t << "</div>";
}
void HtmlCodeGenerator::startFontClass(const char *s)
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 8383f5a..583d973 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -206,6 +206,11 @@ div.line {
transition-duration: 0.5s;
}
+div.line:after {
+ content:"\000A";
+ white-space: pre;
+}
+
div.line.glow {
background-color: cyan;
box-shadow: 0 0 10px cyan;