Commit 4fcc4168 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Using & in the project name caused invalid HTML and LaTeX output

parent c7e46bcd
...@@ -1106,10 +1106,12 @@ static QCString substituteHtmlKeywords(const QCString &s, ...@@ -1106,10 +1106,12 @@ static QCString substituteHtmlKeywords(const QCString &s,
extraCssText = "<link href=\"$relpath^"+stripPath(extraCssFile)+"\" rel=\"stylesheet\" type=\"text/css\"/>\n"; extraCssText = "<link href=\"$relpath^"+stripPath(extraCssFile)+"\" rel=\"stylesheet\" type=\"text/css\"/>\n";
} }
if (timeStamp) { if (timeStamp)
generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), Config_getString("PROJECT_NAME")); {
generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), convertToHtml(Config_getString("PROJECT_NAME")));
} }
else { else
{
generatedBy = theTranslator->trGeneratedBy(); generatedBy = theTranslator->trGeneratedBy();
} }
...@@ -3084,7 +3086,7 @@ void HtmlGenerator::writeSearchPage() ...@@ -3084,7 +3086,7 @@ void HtmlGenerator::writeSearchPage()
FTextStream t(&cf); FTextStream t(&cf);
t << "<script language=\"php\">\n\n"; t << "<script language=\"php\">\n\n";
t << "$config = array(\n"; t << "$config = array(\n";
t << " 'PROJECT_NAME' => \"" << projectName << "\",\n"; t << " 'PROJECT_NAME' => \"" << convertToHtml(projectName) << "\",\n";
t << " 'GENERATE_TREEVIEW' => " << (generateTreeView?"true":"false") << ",\n"; t << " 'GENERATE_TREEVIEW' => " << (generateTreeView?"true":"false") << ",\n";
t << " 'DISABLE_INDEX' => " << (disableIndex?"true":"false") << ",\n"; t << " 'DISABLE_INDEX' => " << (disableIndex?"true":"false") << ",\n";
t << ");\n\n"; t << ");\n\n";
......
...@@ -366,8 +366,12 @@ static void writeDefaultHeaderPart1(FTextStream &t) ...@@ -366,8 +366,12 @@ static void writeDefaultHeaderPart1(FTextStream &t)
"\n"; "\n";
// Headers & footers // Headers & footers
QCString genString = QGString genString;
theTranslator->trGeneratedAt(dateToString(TRUE),Config_getString("PROJECT_NAME")); FTextStream tg(&genString);
filterLatexString(tg,
theTranslator->trGeneratedAt(dateToString(TRUE),
Config_getString("PROJECT_NAME")),
FALSE,FALSE,FALSE);
t << "% Headers & footers\n" t << "% Headers & footers\n"
"\\usepackage{fancyhdr}\n" "\\usepackage{fancyhdr}\n"
"\\pagestyle{fancyplain}\n" "\\pagestyle{fancyplain}\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment