diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.xml | 2 | ||||
| -rw-r--r-- | src/doxygen.cpp | 9 | ||||
| -rw-r--r-- | src/htmlgen.cpp | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/config.xml b/src/config.xml index 6cd7997..4d9a048 100644 --- a/src/config.xml +++ b/src/config.xml @@ -2331,7 +2331,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. <value name="NativeMML" desc="(i.e. MathML)"/> <value name="SVG"/> </option> - <option type='string' id='MATHJAX_RELPATH' format='string' defval='http://cdn.mathjax.org/mathjax/latest' depends='USE_MATHJAX'> + <option type='string' id='MATHJAX_RELPATH' format='string' defval='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/' depends='USE_MATHJAX'> <docs> <![CDATA[ When MathJax is enabled you need to specify the location relative to the diff --git a/src/doxygen.cpp b/src/doxygen.cpp index d3554cf..ec97d43 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -2112,9 +2112,8 @@ static void findUsingDeclImports(EntryNav *rootNav) (rootNav->parent()->section()&Entry::COMPOUND_MASK) // in a class/struct member ) { - //printf("Found using declaration %s at line %d of %s inside section %x\n", - // root->name.data(),root->startLine,root->fileName.data(), - // root->parent->section); + //printf("Found using declaration %s inside section %x\n", + // rootNav->name().data(), rootNav->parent()->section()); QCString fullName=removeRedundantWhiteSpace(rootNav->parent()->name()); fullName=stripAnonymousNamespaceScope(fullName); fullName=stripTemplateSpecifiersFromScope(fullName); @@ -2130,7 +2129,7 @@ static void findUsingDeclImports(EntryNav *rootNav) ClassDef *bcd = getResolvedClass(cd,0,scope); // todo: file in fileScope parameter if (bcd) { - //printf("found class %s\n",bcd->name().data()); + //printf("found class %s memName=%s\n",bcd->name().data(),memName.data()); MemberNameInfoSDict *mndict=bcd->memberNameInfoSDict(); if (mndict) { @@ -11181,7 +11180,6 @@ void parseInput() g_s.end(); g_s.begin("Searching for members imported via using declarations...\n"); - findUsingDeclImports(rootNav); // this should be after buildTypedefList in order to properly import // used typedefs findUsingDeclarations(rootNav); @@ -11249,6 +11247,7 @@ void parseInput() g_s.begin("Searching for member function documentation...\n"); findObjCMethodDefinitions(rootNav); findMemberDocumentation(rootNav); // may introduce new members ! + findUsingDeclImports(rootNav); // may introduce new members ! transferRelatedFunctionDocumentation(); transferFunctionDocumentation(); diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index f80eb43..e576059 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -375,7 +375,7 @@ static QCString substituteHtmlKeywords(const QCString &s, mathJaxJs += "\n"; } mathJaxJs += "</script>"; - mathJaxJs += "<script type=\"text/javascript\" src=\"" + path + "MathJax.js\"></script>\n"; + mathJaxJs += "<script type=\"text/javascript\" async src=\"" + path + "MathJax.js\"></script>\n"; } // first substitute generic keywords |