Merge pull request #219 from albert-github/feature/bug_latex_index_toc (94c31422) · Commits · Elphel / doxverilog

src/cite.cpp

+14 −5

Original line number	Original line	Diff line number	Diff line
	@@ -62,9 +62,14 @@ void CiteDict::writeLatexBibliography(FTextStream &t)
	unit = "chapter";		unit = "chapter";
	t << "% Bibliography\n"		t << "% Bibliography\n"
	"\\newpage\n"		"\\newpage\n"
	"\\phantomsection\n"		"\\phantomsection\n";
	"\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trCiteReferences() << "}\n"		bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS");
	"\\bibliographystyle{" << style << "}\n"		if (!pdfHyperlinks)
			{
			t << "\\clearemptydoublepage\n";
			t << "\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trCiteReferences() << "}\n";
			}
			t << "\\bibliographystyle{" << style << "}\n"
	"\\bibliography{";		"\\bibliography{";
	QStrList &citeDataList = Config_getList("CITE_BIB_FILES");		QStrList &citeDataList = Config_getList("CITE_BIB_FILES");
	QCString latexOutputDir = Config_getString("LATEX_OUTPUT")+"/";		QCString latexOutputDir = Config_getString("LATEX_OUTPUT")+"/";
	@@ -87,8 +92,12 @@ void CiteDict::writeLatexBibliography(FTextStream &t)
	}		}
	bibdata = citeDataList.next();		bibdata = citeDataList.next();
	}		}
	t << "}\n"		t << "}\n";
	"\n";		if (pdfHyperlinks)
			{
			t << "\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trCiteReferences() << "}\n";
			}
			t << "\n";
	}		}

	void CiteDict::insert(const char *label)		void CiteDict::insert(const char *label)

src/latexgen.cpp

+4 −14

Original line number	Original line	Diff line number	Diff line
	@@ -543,8 +543,10 @@ static void writeDefaultFooter(FTextStream &t)
	else		else
	unit = "chapter";		unit = "chapter";
	t << "% Index\n"		t << "% Index\n"
			"\\backmatter\n"
	"\\newpage\n"		"\\newpage\n"
	"\\phantomsection\n"		"\\phantomsection\n"
			"\\clearemptydoublepage\n"
	"\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trRTFGeneralIndex() << "}\n"		"\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trRTFGeneralIndex() << "}\n"
	"\\printindex\n"		"\\printindex\n"
	"\n"		"\n"
	@@ -1260,7 +1262,7 @@ void LatexGenerator::startTitleHead(const char *fileName)
	static bool usePDFLatex = Config_getBool("USE_PDFLATEX");		static bool usePDFLatex = Config_getBool("USE_PDFLATEX");
	if (usePDFLatex && pdfHyperlinks && fileName)		if (usePDFLatex && pdfHyperlinks && fileName)
	{		{
	t << "\\hypertarget{" << stripPath(fileName) << "}{";		t << "\\hypertarget{" << stripPath(fileName) << "}{}";
	}		}
	if (Config_getBool("COMPACT_LATEX"))		if (Config_getBool("COMPACT_LATEX"))
	{		{
	@@ -1274,8 +1276,6 @@ void LatexGenerator::startTitleHead(const char *fileName)

	void LatexGenerator::endTitleHead(const char fileName,const char name)		void LatexGenerator::endTitleHead(const char fileName,const char name)
	{		{
	static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS");
	static bool usePDFLatex = Config_getBool("USE_PDFLATEX");
	t << "}" << endl;		t << "}" << endl;
	if (name)		if (name)
	{		{
	@@ -1285,10 +1285,6 @@ void LatexGenerator::endTitleHead(const char fileName,const char name)
	escapeMakeIndexChars(name);		escapeMakeIndexChars(name);
	t << "}}" << endl;		t << "}}" << endl;
	}		}
	if (usePDFLatex && pdfHyperlinks && fileName)
	{
	t << "}" << endl;
	}
	}		}

	void LatexGenerator::startTitle()		void LatexGenerator::startTitle()
	@@ -1428,18 +1424,12 @@ void LatexGenerator::startDoxyAnchor(const char fName,const char ,
	t << "\\hypertarget{";		t << "\\hypertarget{";
	if (fName) t << stripPath(fName);		if (fName) t << stripPath(fName);
	if (anchor) t << "_" << anchor;		if (anchor) t << "_" << anchor;
	t << "}{";		t << "}{}";
	}		}
	}		}

	void LatexGenerator::endDoxyAnchor(const char fName,const char anchor)		void LatexGenerator::endDoxyAnchor(const char fName,const char anchor)
	{		{
	static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS");
	static bool usePDFLatex = Config_getBool("USE_PDFLATEX");
	if (usePDFLatex && pdfHyperlinks)
	{
	t << "}";
	}
	t << "\\label{";		t << "\\label{";
	if (fName) t << stripPath(fName);		if (fName) t << stripPath(fName);
	if (anchor) t << "_" << anchor;		if (anchor) t << "_" << anchor;

Admin message