From a50c7551d3e8cb18514f517d36b6ba343596a426 Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 12 Jun 2018 15:33:43 +0200 Subject: Bug 792449 - markdown plantuml use of graphviz fail if plantuml work i code file Added the commandExtension as required by plantuml in case the path is given. --- src/plantuml.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plantuml.cpp b/src/plantuml.cpp index 609d5fd..89e6e9e 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -88,7 +88,9 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp { pumlArgs += "-graphvizdot \""; pumlArgs += dotPath; - pumlArgs += "dot\" "; + pumlArgs += "dot"; + pumlArgs += portable_commandExtension(); + pumlArgs += "\" "; } pumlArgs+="-o \""; pumlArgs+=outDir; -- cgit v0.12 From 179f80e666d6c017f7130b6b26e687f2b5ea54d9 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 18 Jun 2018 14:44:08 +0200 Subject: Bug 630931 - \cond after @string literal containing backslash fails in C# Special handling in preprocessor for CSharp literal strings (i.e. strings starting with @). --- src/pre.l | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pre.l b/src/pre.l index 37f7115..c763f1a 100644 --- a/src/pre.l +++ b/src/pre.l @@ -1739,6 +1739,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) %x SkipString %x CopyLine %x CopyString +%x CopyStringCs %x CopyStringFtn %x Include %x IncludeID @@ -1849,6 +1850,11 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) "'"."'" { outputArray(yytext,(int)yyleng); } +@\" { + if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_CSharp) REJECT; + outputArray(yytext,(int)yyleng); + BEGIN( CopyStringCs ); + } \" { outputChar(*yytext); BEGIN( CopyString ); @@ -1861,10 +1867,13 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) [^\"\\\r\n]+ { outputArray(yytext,(int)yyleng); } +[^\"\r\n]+ { + outputArray(yytext,(int)yyleng); + } \\. { outputArray(yytext,(int)yyleng); } -\" { +\" { outputChar(*yytext); BEGIN( CopyLine ); } -- cgit v0.12 From ad244059b3ffc896905f1000ad40b435d8bbe823 Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 27 Jun 2018 15:31:29 +0200 Subject: Bug 565713 - Fortran: Does not recognize backslash at end of documentation line Don't remove the end backslash in case of Fortran --- src/pre.l | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pre.l b/src/pre.l index 37f7115..facd696 100644 --- a/src/pre.l +++ b/src/pre.l @@ -1934,6 +1934,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } } "\\"\r?/\n { // strip line continuation characters + if (getLanguageFromFileName(g_yyFileName)==SrcLangExt_Fortran) outputChar(*yytext); } . { outputChar(*yytext); -- cgit v0.12 From 95a2966f86a0765d871581b90df2d8668ba43969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armin=20M=C3=BCller?= <27155134+arm-in@users.noreply.github.com> Date: Thu, 28 Jun 2018 18:18:04 +0200 Subject: Update qglist.cpp --- qtools/qglist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtools/qglist.cpp b/qtools/qglist.cpp index f464a73..731d9fd 100644 --- a/qtools/qglist.cpp +++ b/qtools/qglist.cpp @@ -235,7 +235,7 @@ QGList& QGList::operator=( const QGList &list ) } /*! - Compares this list with \a list. Retruns TRUE if the lists + Compares this list with \a list. Returns TRUE if the lists contain the same data, else FALSE. */ -- cgit v0.12 From c049fd3c86a8a88b08eafae7ebd4326e42fb87c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armin=20M=C3=BCller?= <27155134+arm-in@users.noreply.github.com> Date: Thu, 28 Jun 2018 18:18:37 +0200 Subject: Update qlist.doc --- qtools/qlist.doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtools/qlist.doc b/qtools/qlist.doc index 6b4278c..59cc971 100644 --- a/qtools/qlist.doc +++ b/qtools/qlist.doc @@ -168,7 +168,7 @@ /*! \fn bool QList::operator==(const QList &list ) const - Compares this list with \a list. Retruns TRUE if the lists + Compares this list with \a list. Returns TRUE if the lists contain the same data, else FALSE. */ -- cgit v0.12 From 30362ecc6da4123a9d87e9c74a6918aa23cc1403 Mon Sep 17 00:00:00 2001 From: Austin Hale <32556981+austinbhale@users.noreply.github.com> Date: Wed, 11 Jul 2018 10:23:57 -0400 Subject: PATCH -- updates reference link with no closing For external tagfiles, there is an issue with the links being provided from the file list. Whenever there is a reference in HtmlGenerator::startIndexItem, the href had never been closed with an end quote and close bracket. For example, this addition addresses the following issue beginning at href:   Since the file path is true for ref and not f, the proposed changes will provide an external link to the tagfile beside the icon. Running Doxygen 1.8.14 on HP-UX B.11.31. --- src/htmlgen.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 32eaff6..121106a 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -1117,7 +1117,8 @@ void HtmlGenerator::startIndexItem(const char *ref,const char *f) } t << "href=\""; t << externalRef(relPath,ref,TRUE); - if (f) t << f << Doxygen::htmlFileExtension << "\">"; + if (f) t << f << Doxygen::htmlFileExtension; + t << "\">"; } else { -- cgit v0.12 From 135412e4e9af74cda860205b4c8104098c2b65aa Mon Sep 17 00:00:00 2001 From: albert-github Date: Fri, 13 Jul 2018 14:22:13 +0200 Subject: Wrong link generated for inherited members when tag files are used. In case a tag file is used and `EXT_LINKS_IN_WINDOW` is set to `YES` a link is generated of the form: `Public Member Functions inherited from ` instead of `Public Member Functions inherited from ` When `EXT_LINKS_IN_WINDOW` is set to `NO` a correct link is generated but the external documentation comes straight forward in the current window. (relevant link: https://stackoverflow.com/questions/51323207/doxygen-external-link-to-qt-classes) --- src/htmlgen.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 32eaff6..98f39a6 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -2717,13 +2717,16 @@ void HtmlGenerator::writeInheritedSectionTitle( DBG_HTML(t << "" << endl;) QCString a = anchor; if (!a.isEmpty()) a.prepend("#"); - QCString classLink = QCString(" Date: Thu, 19 Jul 2018 18:56:38 +0200 Subject: Bug 610436 - " i.e. XML CDATA sections in an analogous way top HTML comment but in this case the text is retained (as normal doxygen comment) and the special XML characters `<`,`>` and `&` are taken as if they were escaped. --- doc/xmlcmds.doc | 3 +++ src/commentscan.l | 36 +++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/doc/xmlcmds.doc b/doc/xmlcmds.doc index 501bf91..848858d 100644 --- a/doc/xmlcmds.doc +++ b/doc/xmlcmds.doc @@ -70,6 +70,9 @@ Here is the list of tags supported by doxygen:
  • \ Refers to a parameter with name "paramName". Similar to using \ref cmda "\\a".
  • \ Identifies a property. Ignored by doxygen. +
  • \ The text inside this tag (on the ...) is handled as normal + doxygen comment except for the XML special characters `<`, `>` and + `&` that are used as if they were escaped. Here is an example of a typical piece of code using some of the above commands: diff --git a/src/commentscan.l b/src/commentscan.l index aae403d..42318d1 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -989,6 +989,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" %x CiteLabel %x CopyDoc %x GuardExpr +%x CdataSection %% @@ -1081,13 +1082,16 @@ RCSTAG "$"{ID}":"[^\n$]+"$" insidePre=FALSE; addOutput(yytext); } -{RCSTAG} { // RCS tag which end a brief description - setOutput(OutputDoc); - REJECT; - } -"