From ecaa2e3e5c972564b1e961f67e50f1bbde13d4be Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Fri, 23 Aug 2013 21:46:36 +0200 Subject: Bug 693537 - Create possibility to keep user comments in Doxyfile --- src/config.h | 3 ++- src/config.l | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index 7d72f52..3dcf8de 100644 --- a/src/config.h +++ b/src/config.h @@ -22,6 +22,7 @@ #include #include #include +#include #include "ftextstream.h" @@ -518,7 +519,7 @@ class Config { QCString result=m_userComment; m_userComment.resize(0); - return result; + return result.replace(QRegExp("\r"),""); } protected: diff --git a/src/config.l b/src/config.l index f3b0962..19f0267 100644 --- a/src/config.l +++ b/src/config.l @@ -856,7 +856,7 @@ void Config::writeTemplate(FTextStream &t,bool sl,bool upd) if (m_userComment) { t << "\n"; - t << m_userComment; + t << takeUserComment(); } } -- cgit v0.12 From fe79a1159577c8dd026c54e24713595c8483c965 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Fri, 23 Aug 2013 21:53:10 +0200 Subject: Bug 701949 - Latex: Hyperlinks for \secreflist / \refitem --- src/latexdocvisitor.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index cdcf8b4..19e6903 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -1296,15 +1296,25 @@ void LatexDocVisitor::visitPost(DocRef *ref) } } -void LatexDocVisitor::visitPre(DocSecRefItem *) +void LatexDocVisitor::visitPre(DocSecRefItem *ref) { if (m_hide) return; m_t << "\\item \\contentsline{section}{"; + static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + if (pdfHyperlinks) + { + m_t << "\\hyperlink{" << ref->file() << "_" << ref->anchor() << "}{" ; + } } void LatexDocVisitor::visitPost(DocSecRefItem *ref) { if (m_hide) return; + static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + if (pdfHyperlinks) + { + m_t << "}"; + } m_t << "}{\\ref{" << ref->file() << "_" << ref->anchor() << "}}{}" << endl; } -- cgit v0.12 From d094c8ffa9b781c32be9ba1bce9890c32dcb6540 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 25 Aug 2013 17:45:27 +0200 Subject: Small spelling correction to generate an rtf extensions file -> to generate a rtf extensions file --- src/doxygen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 14d34c0..972d758 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9780,7 +9780,7 @@ static void usage(const char *name) msg(" RTF: %s -w rtf styleSheetFile\n",name); msg(" HTML: %s -w html headerFile footerFile styleSheetFile [configFile]\n",name); msg(" LaTeX: %s -w latex headerFile footerFile styleSheetFile [configFile]\n\n",name); - msg("6) Use doxygen to generate an rtf extensions file\n"); + msg("6) Use doxygen to generate a rtf extensions file\n"); msg(" RTF: %s -e rtf extensionsFile\n\n",name); msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n"); msg("If configName is omitted `Doxyfile' will be used as a default.\n\n"); -- cgit v0.12 From b7c3088d382ba6e0f14c4fa9a7ce83f2253499b5 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 26 Aug 2013 19:18:29 +0200 Subject: Bug 706804 - Fortran: Doxygen mixes up function-attributes with the return type test string should not be equal to "function" but should contain "function" --- src/fortranscanner.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 3ed0031..327febf 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -1998,7 +1998,7 @@ static void addSubprogram(const char *text) subrCurrent.prepend(current); current->section = Entry::FUNCTION_SEC ; QCString subtype = text; subtype=subtype.lower().stripWhiteSpace(); - functionLine = subtype=="function"; + functionLine = (subtype.find("function") != -1); current->type += " " + subtype; current->type = current->type.stripWhiteSpace(); current->fileName = yyFileName; -- cgit v0.12 From f2935bef5175832594812a11c3b73f169a28a94b Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 27 Aug 2013 09:19:04 +0200 Subject: Bug 706813 - RPM build via spec file fails --- packages/rpm/doxygen.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rpm/doxygen.spec.in b/packages/rpm/doxygen.spec.in index 2888ef2..f78322a 100644 --- a/packages/rpm/doxygen.spec.in +++ b/packages/rpm/doxygen.spec.in @@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc README LICENSE LANGUAGE.HOWTO examples ./latex/*.pdf +%doc README.md LICENSE LANGUAGE.HOWTO examples ./latex/*.pdf %doc /usr/man/man1/doxygen.1.gz %{_bindir}/doxygen -- cgit v0.12 From 376cb74cc75230516b27870038f459ae96d1968a Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 27 Aug 2013 12:06:02 +0200 Subject: Bug 706874 - Doxygen crash if missing new-line in a snippet --- src/util.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util.cpp b/src/util.cpp index 58214bd..781a678 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -7682,6 +7682,7 @@ QCString extractBlock(const QCString text,const QCString marker) p=i+1; } l1=p; + int lp=i; if (found) { while ((i=text.find('\n',p))!=-1) @@ -7692,10 +7693,15 @@ QCString extractBlock(const QCString text,const QCString marker) break; } p=i+1; + lp=i; } } + if (l2==-1) // marker at last line without newline (see bug706874) + { + l2=lp; + } //printf("text=[%s]\n",text.mid(l1,l2-l1).data()); - return text.mid(l1,l2-l1); + return l2>l1 ? text.mid(l1,l2-l1) : QCString(); } /** Returns a string representation of \a lang. */ -- cgit v0.12 From 411b252d03cb28893c209674c620352df6e14944 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 27 Aug 2013 14:26:57 +0200 Subject: Bug 683897 - class list not sorted? --- addon/doxywizard/configdoc.cpp | 3 ++- doc/config.doc | 3 ++- src/config.xml | 3 ++- src/configoptions.cpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addon/doxywizard/configdoc.cpp b/addon/doxywizard/configdoc.cpp index c439322..5bcccb6 100644 --- a/addon/doxywizard/configdoc.cpp +++ b/addon/doxywizard/configdoc.cpp @@ -523,7 +523,8 @@ void addConfigDocs(DocIntf *doc) "SORT_BRIEF_DOCS", "If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief\n" "descriptions of file, namespace and class members alphabetically by member\n" - "name. If set to NO the members will appear in declaration order.\n" + "name. If set to NO the members will appear in declaration order. Note the this\n" + "will also influence the order of the classes in the class list.\n" "The default value is: NO." ); doc->add( diff --git a/doc/config.doc b/doc/config.doc index 99c4e83..de563ad 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -1056,7 +1056,8 @@ The default value is: YES. If the \c SORT_BRIEF_DOCS tag is set to \c YES then doxygen will sort the brief descriptions of file, namespace and class members alphabetically by member name. If set to \c NO the members will appear in - declaration order. + declaration order. Note the this will also influence the order of the + classes in the class list. The default value is: NO. diff --git a/src/config.xml b/src/config.xml index d7ace9f..1174fab 100644 --- a/src/config.xml +++ b/src/config.xml @@ -911,7 +911,8 @@ Go to the next section or return to the If the \c SORT_BRIEF_DOCS tag is set to \c YES then doxygen will sort the brief descriptions of file, namespace and class members alphabetically by member name. If set to \c NO the members will appear in - declaration order. + declaration order. Note the this will also influence the order of the + classes in the class list. ]]> diff --git a/src/configoptions.cpp b/src/configoptions.cpp index 7f7d454..d37163b 100644 --- a/src/configoptions.cpp +++ b/src/configoptions.cpp @@ -705,7 +705,8 @@ void addConfigOptions(Config *cfg) "SORT_BRIEF_DOCS", "If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief\n" "descriptions of file, namespace and class members alphabetically by member\n" - "name. If set to NO the members will appear in declaration order.\n" + "name. If set to NO the members will appear in declaration order. Note the this\n" + "will also influence the order of the classes in the class list.\n" "The default value is: NO.", FALSE ); -- cgit v0.12 From d65f3313739177d4d8ce27f607edf9517dc66de3 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 27 Aug 2013 21:20:32 +0200 Subject: Bug 706916 - C++ exception specifications are no longer parsed correctly --- src/pre.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pre.l b/src/pre.l index a54db2c..2b217b3 100644 --- a/src/pre.l +++ b/src/pre.l @@ -1769,8 +1769,8 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } BEGIN(CopyLine); } -^{B}*[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]+{B}*"("[^\(\)\n]*"("[^\)\n]*")"[^\)\n]*")"{B}*\n | // function list macro with one (...) argument, e.g. for K_GLOBAL_STATIC_WITH_ARGS -^{B}*[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]+{B}*"("[^\)\n]*")"{B}*\n { // function like macro +^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\(\)\n]*"("[^\)\n]*")"[^\)\n]*")"{B}*\n | // function list macro with one (...) argument, e.g. for K_GLOBAL_STATIC_WITH_ARGS +^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\)\n]*")"{B}*\n { // function like macro static bool skipFuncMacros = Config_getBool("SKIP_FUNCTION_MACROS"); QCString name(yytext); name=name.left(name.find('(')).stripWhiteSpace(); -- cgit v0.12