diff options
| author | Petr Prikryl <prikryl@atlas.cz> | 2015-01-09 13:33:48 (GMT) |
|---|---|---|
| committer | Petr Prikryl <prikryl@atlas.cz> | 2015-01-09 13:33:48 (GMT) |
| commit | 473e21792af620464cc960c7a8a48c158da7fab5 (patch) | |
| tree | bd7be9d87f2646c4c8850d9ce4777e18d6d40bb1 /src | |
| parent | eaa19e3a439a4652023b47b0cf47c7303484ef5d (diff) | |
| parent | cd8a78e657556aaa2f3a5fa2120d3181523985ba (diff) | |
| download | Doxygen-473e21792af620464cc960c7a8a48c158da7fab5.zip Doxygen-473e21792af620464cc960c7a8a48c158da7fab5.tar.gz Doxygen-473e21792af620464cc960c7a8a48c158da7fab5.tar.bz2 | |
Merge branch 'master' of https://github.com/doxygen/doxygen.git
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.l | 1 | ||||
| -rw-r--r-- | src/latexgen.cpp | 10 | ||||
| -rw-r--r-- | src/memberdef.cpp | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/config.l b/src/config.l index a10626e..4fa3b1e 100644 --- a/src/config.l +++ b/src/config.l @@ -1478,6 +1478,7 @@ void Config::check() !Config_getBool("GENERATE_XML") && !Config_getBool("GENERATE_PERLMOD") && !Config_getBool("GENERATE_RTF") && + !Config_getBool("GENERATE_DOCBOOK") && !Config_getBool("GENERATE_AUTOGEN_DEF") && Config_getString("GENERATE_TAGFILE").isEmpty() ) diff --git a/src/latexgen.cpp b/src/latexgen.cpp index d4d8fae..de2ed22 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -535,14 +535,18 @@ static void writeDefaultFooter(FTextStream &t) Doxygen::citeDict->writeLatexBibliography(t); // Index + t << "% Index\n"; QCString unit; if (Config_getBool("COMPACT_LATEX")) + { unit = "section"; + } else + { unit = "chapter"; - t << "% Index\n" - "\\backmatter\n" - "\\newpage\n" + t << "\\backmatter\n"; + } + t << "\\newpage\n" "\\phantomsection\n" "\\clearemptydoublepage\n" "\\addcontentsline{toc}{" << unit << "}{" << theTranslator->trRTFGeneralIndex() << "}\n" diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 9198960..4d7afef 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -3203,7 +3203,13 @@ void MemberDef::warnIfUndocumented() if (cd) t="class", d=cd; else if (nd) - t="namespace", d=nd; + { + d=nd; + if (d->getLanguage() == SrcLangExt_Fortran) + t="module"; + else + t="namespace"; + } else if (gd) t="group", d=gd; else |