diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/config.xml | 4 | ||||
-rw-r--r-- | src/groupdef.cpp | 8 | ||||
-rw-r--r-- | src/groupdef.h | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/config.xml b/src/config.xml index 38a18d8..0701924 100644 --- a/src/config.xml +++ b/src/config.xml @@ -2463,7 +2463,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. <![CDATA[ When MathJax is enabled you can set the default output format to be used for the MathJax output. - See <a href="http://docs.mathjax.org/en/latest/output.html">the MathJax site</a> + See <a href="http://docs.mathjax.org/en/v2.7-latest/output.html">the MathJax site</a> for more details. ]]> </docs> @@ -2502,7 +2502,7 @@ MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols The \c MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces of code that will be used on startup of the MathJax code. See -<a href="http://docs.mathjax.org/en/latest/output.html">the MathJax site</a> +<a href="http://docs.mathjax.org/en/v2.7-latest/output.html">the MathJax site</a> for more details. ]]> </docs> diff --git a/src/groupdef.cpp b/src/groupdef.cpp index bad8526..57e2226 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -890,9 +890,7 @@ void GroupDefImpl::writeBriefDescription(OutputList &ol) ol.writeString(" \n"); ol.enable(OutputGenerator::RTF); - if (Config_getBool(REPEAT_BRIEF) || - !documentation().isEmpty() - ) + if (hasDetailedDescription()) { ol.disableAllBut(OutputGenerator::Html); ol.startTextLink(0,"details"); @@ -1783,8 +1781,8 @@ void GroupDefImpl::updateLanguage(const Definition *d) bool GroupDefImpl::hasDetailedDescription() const { static bool repeatBrief = Config_getBool(REPEAT_BRIEF); - return ((!briefDescription().isEmpty() && repeatBrief) || - !documentation().isEmpty()); + return ((!briefDescription().isEmpty() && repeatBrief) || !documentation().isEmpty() || !inbodyDocumentation().isEmpty()) && + (m_pageDict->count()!=(uint)numDocMembers()); } // --- Cast functions diff --git a/src/groupdef.h b/src/groupdef.h index 0df5344..0a1ec9d 100644 --- a/src/groupdef.h +++ b/src/groupdef.h @@ -23,6 +23,7 @@ #include "sortdict.h" #include "definition.h" #include "dirdef.h" +#include "layout.h" class MemberList; class FileList; |