From 586b3b69238fb09d55a03c5d50fc1b7d3e65ed97 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 4 Jan 2014 15:39:08 +0100 Subject: [PATCH] Bug 626172 - Latex $projectname with "&" gets no escaped The variable elements in the header en footer should be converted to latex string, now they are in the format as defined in the Doxyfile --- src/latexgen.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 93eed7e90a5..5e824ea0176 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -607,10 +607,16 @@ void LatexGenerator::startIndexSection(IndexSections is) else { QCString header = fileToString(latexHeader); - t << substituteKeywords(header,0, - Config_getString("PROJECT_NAME"), - Config_getString("PROJECT_NUMBER"), - Config_getString("PROJECT_BRIEF")); + QGString genStringName; + FTextStream tgName(&genStringName); + filterLatexString(tgName, Config_getString("PROJECT_NAME"), FALSE,FALSE,FALSE); + QGString genStringNumber; + FTextStream tgNumber(&genStringNumber); + filterLatexString(tgNumber, Config_getString("PROJECT_NUMBER"), FALSE,FALSE,FALSE); + QGString genStringBrief; + FTextStream tgBrief(&genStringBrief); + filterLatexString(tgBrief, Config_getString("PROJECT_BRIEF"), FALSE,FALSE,FALSE); + t << substituteKeywords(header,0, genStringName, genStringNumber, genStringBrief); } } break; @@ -1005,10 +1011,16 @@ void LatexGenerator::endIndexSection(IndexSections is) else { QCString footer = fileToString(latexFooter); - t << substituteKeywords(footer,0, - Config_getString("PROJECT_NAME"), - Config_getString("PROJECT_NUMBER"), - Config_getString("PROJECT_BRIEF")); + QGString genStringName; + FTextStream tgName(&genStringName); + filterLatexString(tgName, Config_getString("PROJECT_NAME"), FALSE,FALSE,FALSE); + QGString genStringNumber; + FTextStream tgNumber(&genStringNumber); + filterLatexString(tgNumber, Config_getString("PROJECT_NUMBER"), FALSE,FALSE,FALSE); + QGString genStringBrief; + FTextStream tgBrief(&genStringBrief); + filterLatexString(tgBrief, Config_getString("PROJECT_BRIEF"), FALSE,FALSE,FALSE); + t << substituteKeywords(footer,0, genStringName, genStringNumber, genStringBrief); } break; }