summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2021-06-10 11:05:11 (GMT)
committeralbert-github <albert.tests@gmail.com>2021-06-10 11:05:11 (GMT)
commitad4715242a2d4747902ed55afe43fdde700b7621 (patch)
treec8586516b7fa1ae78072b7155278aaa383e1d08e
parent8c8a0343662f69ce65ced20dc8c6025e7fc022cd (diff)
downloadDoxygen-ad4715242a2d4747902ed55afe43fdde700b7621.zip
Doxygen-ad4715242a2d4747902ed55afe43fdde700b7621.tar.gz
Doxygen-ad4715242a2d4747902ed55afe43fdde700b7621.tar.bz2
bug_765867 Ampersand not rendered correctly in HTML Help index
Corresponds to issue #5994 In the index the (index.hhk) the special HTML characters were not escaped (as done for the index.hhc (see HtmlHelp::addContentsItem). This is corrected.
-rw-r--r--src/htmlhelp.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 9887616..f776fa4 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -262,7 +262,7 @@ void HtmlHelpIndex::writeFields(std::ostream &t)
t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << field2URL(f.get(),FALSE);
t << "\">";
- t << "<param name=\"Name\" value=\"" << m_recoder.recode(level1) << "\">"
+ t << "<param name=\"Name\" value=\"" << convertToHtml(m_recoder.recode(level1),TRUE) << "\">"
"</OBJECT>\n";
}
else
@@ -272,14 +272,14 @@ void HtmlHelpIndex::writeFields(std::ostream &t)
t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << field2URL(f.get(),TRUE);
t << "\">";
- t << "<param name=\"Name\" value=\"" << m_recoder.recode(level1) << "\">"
+ t << "<param name=\"Name\" value=\"" << convertToHtml(m_recoder.recode(level1),TRUE) << "\">"
"</OBJECT>\n";
}
else
{
t << " <LI><OBJECT type=\"text/sitemap\">";
- t << "<param name=\"See Also\" value=\"" << m_recoder.recode(level1) << "\">";
- t << "<param name=\"Name\" value=\"" << m_recoder.recode(level1) << "\">"
+ t << "<param name=\"See Also\" value=\"" << convertToHtml(m_recoder.recode(level1),TRUE) << "\">";
+ t << "<param name=\"Name\" value=\"" << convertToHtml(m_recoder.recode(level1),TRUE) << "\">"
"</OBJECT>\n";
}
}
@@ -299,7 +299,7 @@ void HtmlHelpIndex::writeFields(std::ostream &t)
t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << field2URL(f.get(),FALSE);
t << "\">";
- t << "<param name=\"Name\" value=\"" << m_recoder.recode(level2) << "\">"
+ t << "<param name=\"Name\" value=\"" << convertToHtml(m_recoder.recode(level2),TRUE) << "\">"
"</OBJECT>\n";
}
}