diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-27 07:21:50 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-27 07:21:50 (GMT) |
| commit | c375fe1a8509c3a29db0fa56451271d3b442e429 (patch) | |
| tree | 92f28f81bbe63b90f1adc1d44a9d407d76e8d8b6 | |
| parent | f2935bef5175832594812a11c3b73f169a28a94b (diff) | |
| parent | fac9a7ce54f68fe7ba3f624f4ea16a200034b763 (diff) | |
| download | Doxygen-c375fe1a8509c3a29db0fa56451271d3b442e429.zip Doxygen-c375fe1a8509c3a29db0fa56451271d3b442e429.tar.gz Doxygen-c375fe1a8509c3a29db0fa56451271d3b442e429.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/doxygen.cpp | 2 | ||||
| -rw-r--r-- | src/fortranscanner.l | 2 |
2 files changed, 2 insertions, 2 deletions
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"); 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; |