From dcdd35ce2a0cda024525298a9a20d6c746539e6d Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 6 Jan 2015 10:45:23 +0100 Subject: Fortran: warning message about not documented module member When having a not documented MODULE member it is mentioned that a member in a 'namespace' is not documented. For Fortran this is a bit strange as Fortran does not know the term namespace, modules are handled as namespaces (in the pre 1.8.9 version a message was given about 'class', which is equally confusing). This patch changes in this case 'namespace' to 'module'. --- src/memberdef.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v0.12 From 05fcf8decc25bd2f1a2e7867ee8e5d9da1f08933 Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 6 Jan 2015 12:10:57 +0100 Subject: Bug 742408 - Configuring doxyfile to only output docbook produces erroneous warning Added missing test in list --- src/config.l | 1 + 1 file changed, 1 insertion(+) 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() ) -- cgit v0.12 From c9067c5bb9a1868e0963dc210cf3b7152c4aa79a Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 6 Jan 2015 13:28:52 +0100 Subject: Bug 742427 - latex compilation: \backmatter incompatible with COMPACT_LATEX=YES Removed \backmatter in case of COMPACT_LATEX --- src/latexgen.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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" -- cgit v0.12