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

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
586b3b69 · albert-github · 45934e88 · 586b3b69
Commit 586b3b69 authored Jan 04, 2014 by albert-github
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

latexgen.cpp src/latexgen.cpp +20 -8

No files found.
--- 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,
+          QGString genStringName;
-              Config_getString("PROJECT_NAME"),
+          FTextStream tgName(&genStringName);
-              Config_getString("PROJECT_NUMBER"),
+          filterLatexString(tgName, Config_getString("PROJECT_NAME"), FALSE,FALSE,FALSE);
-              Config_getString("PROJECT_BRIEF"));
+          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,
+        QGString genStringName;
-              Config_getString("PROJECT_NAME"),
+        FTextStream tgName(&genStringName);
-              Config_getString("PROJECT_NUMBER"),
+        filterLatexString(tgName, Config_getString("PROJECT_NAME"), FALSE,FALSE,FALSE);
-              Config_getString("PROJECT_BRIEF"));
+        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;
  }