diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2011-01-23 17:25:30 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2011-01-23 17:25:30 (GMT) |
| commit | eba15fd2fe9a0b186fbf7b63d7eab729057c7f6b (patch) | |
| tree | 56f084a80118debb8b5569e59a7435a20fc82b03 /src | |
| parent | 2149c9cb1315b6a42457dd991171bf4fcf7d7015 (diff) | |
| download | Doxygen-eba15fd2fe9a0b186fbf7b63d7eab729057c7f6b.zip Doxygen-eba15fd2fe9a0b186fbf7b63d7eab729057c7f6b.tar.gz Doxygen-eba15fd2fe9a0b186fbf7b63d7eab729057c7f6b.tar.bz2 | |
Release-1.7.3-20110123
Diffstat (limited to 'src')
215 files changed, 664 insertions, 396 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 9b42d88..2defba8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2,7 +2,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/bufstr.h b/src/bufstr.h index 65b2b83..d9a93f0 100644 --- a/src/bufstr.h +++ b/src/bufstr.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/classdef.cpp b/src/classdef.cpp index 355763d..d92eada 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1136,7 +1136,7 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) // use the class name but with the template arguments as given // in the inheritance relation QCString displayName = insertTemplateSpecifierInScope( - cd->name(),bcd->templSpecifiers); + cd->displayName(),bcd->templSpecifiers); if (cd->isLinkable()) { diff --git a/src/classdef.h b/src/classdef.h index cd5cfdc..ed18fa3 100644 --- a/src/classdef.h +++ b/src/classdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/classlist.cpp b/src/classlist.cpp index 81f96b2..b802cc6 100644 --- a/src/classlist.cpp +++ b/src/classlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/classlist.h b/src/classlist.h index 431932d..8c9cdb3 100644 --- a/src/classlist.h +++ b/src/classlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/cmdmapper.cpp b/src/cmdmapper.cpp index 1682a95..c06d33e 100644 --- a/src/cmdmapper.cpp +++ b/src/cmdmapper.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/cmdmapper.h b/src/cmdmapper.h index 30e5b68..3b01030 100644 --- a/src/cmdmapper.h +++ b/src/cmdmapper.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1717,7 +1717,7 @@ SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID}) TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">" SCOPETNAME ((({ID}{TEMPLIST}?){BN}*"::"{BN}*)*)((~{BN}*)?{ID}) SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*"::"{BN}*)+ -KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize") +KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property") KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"set"|"sizeof"|"static"|"struct"|"__super"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|{KEYWORD_OBJC}) FLOWKW ("break"|"case"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"for"|"foreach"|"for each"|"goto"|"if"|"return"|"switch"|"throw"|"throws"|"try"|"while"|"@try"|"@catch"|"@finally") TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string") diff --git a/src/commentcnv.h b/src/commentcnv.h index b59f2bf..ae113a3 100644 --- a/src/commentcnv.h +++ b/src/commentcnv.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/commentcnv.l b/src/commentcnv.l index 36ce39e..6884865 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/commentscan.h b/src/commentscan.h index 914a231..a34dfc7 100644 --- a/src/commentscan.h +++ b/src/commentscan.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/commentscan.l b/src/commentscan.l index c51431b..d224600 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1,6 +1,6 @@ /***************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/config.h b/src/config.h index 2ae0979..ffa912f 100644 --- a/src/config.h +++ b/src/config.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/config.l b/src/config.l index 30ed8dc..99f9aac 100644 --- a/src/config.l +++ b/src/config.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1186,6 +1186,18 @@ void Config::check() s=aliasList.next(); } + // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled + if (Config_getBool("GENERATE_TREEVIEW") && Config_getBool("GENERATE_HTMLHELP")) + { + config_err("When enabling GENERATE_HTMLHELP the tree view (GENERATE_TREEVIEW) should be disabled. I'll do it for you.\n"); + Config_getBool("GENERATE_TREEVIEW")=FALSE; + } + if (Config_getBool("SEARCHENGINE") && Config_getBool("GENERATE_HTMLHELP")) + { + config_err("When enabling GENERATE_HTMLHELP the search engine (SEARCHENGINE) should be disabled. I'll do it for you.\n"); + Config_getBool("SEARCHENGINE")=FALSE; + } + // check dot image format QCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT"); dotImageFormat=dotImageFormat.stripWhiteSpace(); diff --git a/src/config.xml b/src/config.xml index adadfad..d08c996 100644 --- a/src/config.xml +++ b/src/config.xml @@ -16,8 +16,8 @@ This could be handy for archiving the generated documentation or if some version control system is used. ' defval=''/> <option type='string' id='PROJECT_BRIEF' format='string' docs=' -Using the PROJECT_BRIEF tag one can provide an optional one line description -for a project that appears at the top of each page and should give viewer +Using the PROJECT_BRIEF tag one can provide an optional one line description +for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short. ' defval=''/> <option type='string' id='PROJECT_LOGO' format='file' docs=' @@ -432,10 +432,10 @@ Note: This option applies only to the class list, not to the alphabetical list. ' defval='0'/> <option type='bool' id='STRICT_PROTO_MATCHING' docs=' -If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a -match between the prototype and the implementation of a member function even -if there is only one candidate or it is obvious which candidate to choose +match between the prototype and the implementation of a member function even +if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still accept a match between prototype and implementation in such cases. ' defval='0'/> @@ -782,7 +782,14 @@ doxygen will generate files with .html extension. <option type='string' id='HTML_HEADER' format='file' docs=' The HTML_HEADER tag can be used to specify a personal HTML header for each generated HTML page. If it is left blank doxygen will generate a -standard header. +standard header. Note that when using a custom header you are responsible +for the proper inclusion of any scripts and style sheets that doxygen +needs, which is dependent on the configuration options used. +It is adviced to generate a default header using "doxygen -w html +header.html footer.html stylesheet.css YourConfigFile" and then modify +that header. Note that the header is subject to change so you typically +have to redo this when upgrading to a newer version of doxygen or when +changing the value of configuration settings such as GENERATE_TREEVIEW! ' defval='' depends='GENERATE_HTML'/> <option type='string' id='HTML_FOOTER' format='file' docs=' The HTML_FOOTER tag can be used to specify a personal HTML footer for @@ -971,10 +978,10 @@ top of each HTML page. The value NO (the default) enables the index and the value YES disables it. ' defval='0' depends='GENERATE_HTML'/> <option type='int' id='ENUM_VALUES_PER_LINE' docs=' -This tag can be used to set the number of enum values (range [0,1..20]) -that doxygen will group on one line in the generated HTML documentation. -Note that a value of 0 will completely suppress the enum values from -appearing in the overview section. +The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +(range [0,1..20]) that doxygen will group on one line in the generated HTML +documentation. Note that a value of 0 will completely suppress the enum +values from appearing in the overview section. ' minval='0' maxval='20' defval='4' depends='GENERATE_HTML'/> <option type='bool' id='GENERATE_TREEVIEW' defval='0' docs=' The GENERATE_TREEVIEW tag is used to specify whether a tree-like index @@ -1025,7 +1032,7 @@ When MathJax is enabled you need to specify the location relative to the HTML output directory using the MATHJAX_RELPATH option. The destination directory should contain the MathJax.js script. For instance, if the mathjax directory is located at the same level as the HTML output directory, then -MATHJAX_RELPATH should be ../mathjax. The default value points to the +MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing MathJax, but it is strongly recommended to install a local copy of MathJax before deployment. @@ -1265,7 +1272,7 @@ PREDEFINED and EXPAND_AS_DEFINED tags. ' defval='0' depends='ENABLE_PREPROCESSING'/> <option type='bool' id='SEARCH_INCLUDES' docs=' If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -in the INCLUDE_PATH (see below) will be search if a #include is found. +pointed to by INCLUDE_PATH will be searched when a #include is found. ' defval='1' depends='ENABLE_PREPROCESSING'/> <option type='list' id='INCLUDE_PATH' format='dir' docs=' The INCLUDE_PATH tag can be used to specify one or more directories that @@ -1294,7 +1301,7 @@ instead of the = operator. If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this tag can be used to specify a list of macro names that should be expanded. The macro definition that is found in the sources will be used. -Use the PREDEFINED tag if you want to use a different macro definition that +Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code. ' depends='ENABLE_PREPROCESSING'> </option> @@ -1458,7 +1465,7 @@ relations between the files in the directories. ' defval='1' depends='HAVE_DOT'/> <option type='enum' id='DOT_IMAGE_FORMAT' defval='png' docs=' The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -generated by dot. Possible values are png, svg, gif or svg. +generated by dot. Possible values are svg, png, jpg, or gif. If left blank png will be used. ' depends='HAVE_DOT'> <value name='png'/> diff --git a/src/configoptions.cpp b/src/configoptions.cpp index 8522389..4fdaf90 100644 --- a/src/configoptions.cpp +++ b/src/configoptions.cpp @@ -45,7 +45,9 @@ void addConfigOptions(Config *cfg) //---- cs = cfg->addString( "PROJECT_BRIEF", - "Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short." + "Using the PROJECT_BRIEF tag one can provide an optional one line description\n" + "for a project that appears at the top of each page and should give viewer\n" + "a quick idea about the purpose of the project. Keep the description short." ); //---- cs = cfg->addString( @@ -616,8 +618,11 @@ void addConfigOptions(Config *cfg) //---- cb = cfg->addBool( "STRICT_PROTO_MATCHING", - "If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a\n" - "match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen\n" + "If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to\n" + "do proper type resolution of all parameters of a function it will reject a\n" + "match between the prototype and the implementation of a member function even\n" + "if there is only one candidate or it is obvious which candidate to choose\n" + "by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen\n" "will still accept a match between prototype and implementation in such cases.", FALSE ); @@ -1114,7 +1119,13 @@ void addConfigOptions(Config *cfg) "HTML_HEADER", "The HTML_HEADER tag can be used to specify a personal HTML header for\n" "each generated HTML page. If it is left blank doxygen will generate a\n" - "standard header." + "standard header. Note that when using a custom header you are responsible\n" + "for the proper inclusion of any scripts and style sheets that doxygen\n" + "needs, which is dependent on the configuration options used.\n" + "It is adviced to generate a default header using \"doxygen -w html\n" + "header.html footer.html stylesheet.css YourConfigFile\" and then modify\n" + "that header. Note that the header is subject to change so you typically\n" + "have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!" ); cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); @@ -1426,9 +1437,10 @@ void addConfigOptions(Config *cfg) //---- ci = cfg->addInt( "ENUM_VALUES_PER_LINE", - "This tag can be used to set the number of enum values (range [0,1..20])\n" - "that doxygen will group on one line in the generated HTML documentation.\n" - "Note that a value of 0 will completely suppress the enum values from appearing in the overview section.", + "The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values\n" + "(range [0,1..20]) that doxygen will group on one line in the generated HTML\n" + "documentation. Note that a value of 0 will completely suppress the enum\n" + "values from appearing in the overview section.", 0,20,4 ); ci->addDependency("GENERATE_HTML"); @@ -1510,7 +1522,8 @@ void addConfigOptions(Config *cfg) "HTML output directory using the MATHJAX_RELPATH option. The destination\n" "directory should contain the MathJax.js script. For instance, if the mathjax\n" "directory is located at the same level as the HTML output directory, then\n" - "MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing\n" + "MATHJAX_RELPATH should be ../mathjax. The default value points to the\n" + "mathjax.org site, so you can quickly see the result without installing\n" "MathJax, but it is strongly recommended to install a local copy of MathJax\n" "before deployment." ); @@ -1914,7 +1927,7 @@ void addConfigOptions(Config *cfg) cb = cfg->addBool( "SEARCH_INCLUDES", "If the SEARCH_INCLUDES tag is set to YES (the default) the includes files\n" - "in the INCLUDE_PATH (see below) will be search if a #include is found.", + "pointed to by INCLUDE_PATH will be searched when a #include is found.", TRUE ); cb->addDependency("ENABLE_PREPROCESSING"); @@ -1954,7 +1967,8 @@ void addConfigOptions(Config *cfg) "If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then\n" "this tag can be used to specify a list of macro names that should be expanded.\n" "The macro definition that is found in the sources will be used.\n" - "Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code." + "Use the PREDEFINED tag if you want to use a different macro definition that\n" + "overrules the definition found in the source code." ); cl->addDependency("ENABLE_PREPROCESSING"); //---- @@ -2213,7 +2227,7 @@ void addConfigOptions(Config *cfg) ce = cfg->addEnum( "DOT_IMAGE_FORMAT", "The DOT_IMAGE_FORMAT tag can be used to set the image format of the images\n" - "generated by dot. Possible values are png, svg, gif or svg.\n" + "generated by dot. Possible values are svg, png, jpg, or gif.\n" "If left blank png will be used.", "png" ); diff --git a/src/configoptions.h b/src/configoptions.h index 06874f2..d0b17f7 100644 --- a/src/configoptions.h +++ b/src/configoptions.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/constexp.h b/src/constexp.h index a0a26f3..9f762b8 100644 --- a/src/constexp.h +++ b/src/constexp.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/constexp.l b/src/constexp.l index 4d283da..8ebd10b 100644 --- a/src/constexp.l +++ b/src/constexp.l @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/constexp.y b/src/constexp.y index 9f230c2..b5fa9d1 100644 --- a/src/constexp.y +++ b/src/constexp.y @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2007 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp index 2bc0c69..9df5d2a 100644 --- a/src/cppvalue.cpp +++ b/src/cppvalue.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/cppvalue.h b/src/cppvalue.h index 4936d3d..c759453 100644 --- a/src/cppvalue.h +++ b/src/cppvalue.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/debug.cpp b/src/debug.cpp index bbddf0c..a8e0774 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/debug.h b/src/debug.h index 8693275..f192ffb 100644 --- a/src/debug.h +++ b/src/debug.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/declinfo.h b/src/declinfo.h index ad2418a..9562456 100644 --- a/src/declinfo.h +++ b/src/declinfo.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/declinfo.l b/src/declinfo.l index 13c0715..8bd57b8 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/defargs.h b/src/defargs.h index 59e46b3..aabbf79 100644 --- a/src/defargs.h +++ b/src/defargs.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/defargs.l b/src/defargs.l index 048d6f6..86f6484 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/defgen.cpp b/src/defgen.cpp index dea14e7..5a6133e 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/defgen.h b/src/defgen.h index fb80806..b4a77a5 100644 --- a/src/defgen.h +++ b/src/defgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/define.cpp b/src/define.cpp index 987a8c4..9bc9755 100644 --- a/src/define.cpp +++ b/src/define.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/define.h b/src/define.h index cfc5125..2e8a996 100644 --- a/src/define.h +++ b/src/define.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/definition.cpp b/src/definition.cpp index 5c62632..64a9f33 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/definition.h b/src/definition.h index 60d7f1f..5d7fd15 100644 --- a/src/definition.h +++ b/src/definition.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/diagram.cpp b/src/diagram.cpp index bb2d02e..9e6a933 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/diagram.h b/src/diagram.h index 1d1bde9..b2dacb3 100644 --- a/src/diagram.h +++ b/src/diagram.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/dirdef.h b/src/dirdef.h index e5e7ef2..1f20285 100644 --- a/src/dirdef.h +++ b/src/dirdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/docparser.cpp b/src/docparser.cpp index 55c1f0f..94a1dfb 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2546,6 +2546,10 @@ void DocDotFile::parse() bool ambig; FileDef *fd = findFileDef(Doxygen::dotFileNameDict,m_name,ambig); + if (fd==0 && m_name.right(4)!=".dot") // try with .dot extension as well + { + fd = findFileDef(Doxygen::dotFileNameDict,m_name+".dot",ambig); + } if (fd) { m_file = fd->absFilePath(); @@ -2626,6 +2630,10 @@ void DocMscFile::parse() bool ambig; FileDef *fd = findFileDef(Doxygen::mscFileNameDict,m_name,ambig); + if (fd==0 && m_name.right(4)!=".msc") // try with .msc extension as well + { + fd = findFileDef(Doxygen::mscFileNameDict,m_name+".msc",ambig); + } if (fd) { m_file = fd->absFilePath(); @@ -2639,7 +2647,7 @@ void DocMscFile::parse() } else { - warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: included dot file %s is not found " + warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: included msc file %s is not found " "in any of the paths specified via MSCFILE_DIRS!",qPrint(m_name)); } diff --git a/src/docparser.h b/src/docparser.h index 6494d08..af5f85d 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/docsets.cpp b/src/docsets.cpp index 17fbd7d..1c0b55d 100644 --- a/src/docsets.cpp +++ b/src/docsets.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/docsets.h b/src/docsets.h index 5244eb9..0b6e9af 100644 --- a/src/docsets.h +++ b/src/docsets.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/doctokenizer.h b/src/doctokenizer.h index 7660385..c639695 100644 --- a/src/doctokenizer.h +++ b/src/doctokenizer.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/doctokenizer.l b/src/doctokenizer.l index e9d509d..26cce5e 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/docvisitor.h b/src/docvisitor.h index 3a67d20..f65fd20 100644 --- a/src/docvisitor.h +++ b/src/docvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/dot.cpp b/src/dot.cpp index 134f51a..63e595a 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -3526,10 +3526,10 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir, * \param context the scope in which this graph is found (for resolving links) */ void writeDotImageMapFromFile(FTextStream &t, - const QCString& inFile, const QCString& outDir, - const QCString &relPath, const QCString &context) + const QCString &inFile, const QCString &outDir, + const QCString &relPath, const QCString &baseName, + const QCString &context) { - QCString outFile = inFile + ".map"; QDir d(outDir); if (!d.exists()) @@ -3537,17 +3537,19 @@ void writeDotImageMapFromFile(FTextStream &t, err("error: Output dir %s does not exist!\n",outDir.data()); exit(1); } + QCString mapName = baseName+".map"; + QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgName = baseName+"."+imgExt; + QCString absOutFile = QCString(d.absPath())+"/"+mapName; + DotRunner dotRun(inFile,d.absPath().data(),FALSE); - dotRun.addJob(MAP_CMD,outFile); + dotRun.addJob(MAP_CMD,absOutFile); dotRun.preventCleanUp(); if (!dotRun.run()) { return; } - QCString mapName = inFile+".map"; - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); - if (imgExt=="svg") // vector graphics { writeSVGFigureLink(t,relPath,inFile,inFile+".svg"); @@ -3557,16 +3559,15 @@ void writeDotImageMapFromFile(FTextStream &t, } else // bitmap graphics { - t << "<img src=\"" << relPath << inFile << "." - << imgExt << "\" alt=\"" - << inFile << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl + t << "<img src=\"" << relPath << imgName << "\" alt=\"" + << imgName << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl << "<map name=\"" << mapName << "\" id=\"" << mapName << "\">"; - convertMapFile(t, outFile, relPath ,TRUE, context); + convertMapFile(t, absOutFile, relPath ,TRUE, context); t << "</map>" << endl; } - d.remove(outFile); + d.remove(absOutFile); } //------------------------------------------------------------- @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -442,7 +442,8 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir, const char *outFile,GraphOutputFormat format); void writeDotImageMapFromFile(FTextStream &t, const QCString& inFile, const QCString& outDir, - const QCString& relPath,const QCString& context); + const QCString& relPath,const QCString& baseName, + const QCString& context); void writeDotDirDepGraph(FTextStream &t,DirDef *dd); diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 124c980..ca6c8ef 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -9134,7 +9134,7 @@ void dumpConfigAsXML() static void usage(const char *name) { - msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2010\n\n",versionString); + msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2011\n\n",versionString); msg("You can use doxygen in a number of ways:\n\n"); msg("1) Use doxygen to generate a template configuration file:\n"); msg(" %s [-s] -g [configName]\n\n",name); @@ -9393,9 +9393,10 @@ void readConfiguration(int argc, char **argv) } else if (stricmp(formatName,"html")==0) { - if (optind+4<argc) + if (optind+4<argc || QFileInfo("Doxyfile").exists()) { - if (!Config::instance()->parse(argv[optind+4])) + QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); + if (!Config::instance()->parse(df)) { err("error opening or reading configuration file %s!\n",argv[optind+4]); cleanUpDoxygen(); @@ -9403,6 +9404,10 @@ void readConfiguration(int argc, char **argv) } Config::instance()->substituteEnvironmentVars(); Config::instance()->convertStrToVal(); + // avoid bootstrapping issues when the config file already + // refers to the files that we are supposed to parse. + Config_getString("HTML_HEADER")=""; + Config_getString("HTML_FOOTER")=""; Config::instance()->check(); } else @@ -9451,6 +9456,7 @@ void readConfiguration(int argc, char **argv) } Config::instance()->substituteEnvironmentVars(); Config::instance()->convertStrToVal(); + Config_getString("LATEX_HEADER")=""; Config::instance()->check(); } else // use default config diff --git a/src/doxygen.css b/src/doxygen.css index c0705b0..037b132 100644 --- a/src/doxygen.css +++ b/src/doxygen.css @@ -724,7 +724,7 @@ dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.note { - border-color: #D0D000; + border-color: #D0C000; } dl.warning, dl.attention @@ -798,3 +798,23 @@ dl.bug border-bottom: 1px solid ##70; } +.image +{ + text-align: center; +} + +.dotgraph +{ + text-align: center; +} + +.mscgraph +{ + text-align: center; +} + +.caption +{ + font-weight: bold; +} + diff --git a/src/doxygen.h b/src/doxygen.h index d4edebc..9ed47e0 100644 --- a/src/doxygen.h +++ b/src/doxygen.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in index be3c41c..d3e6459 100644 --- a/src/doxygen.pro.in +++ b/src/doxygen.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/doxygen_css.h b/src/doxygen_css.h index 25af55f..a52861f 100644 --- a/src/doxygen_css.h +++ b/src/doxygen_css.h @@ -724,7 +724,7 @@ "\n" "dl.note\n" "{\n" -" border-color: #D0D000;\n" +" border-color: #D0C000;\n" "}\n" "\n" "dl.warning, dl.attention\n" @@ -798,3 +798,23 @@ " border-bottom: 1px solid ##70;\n" "}\n" "\n" +".image\n" +"{\n" +" text-align: center;\n" +"}\n" +"\n" +".dotgraph\n" +"{\n" +" text-align: center;\n" +"}\n" +"\n" +".mscgraph\n" +"{\n" +" text-align: center;\n" +"}\n" +"\n" +".caption\n" +"{\n" +" font-weight: bold;\n" +"}\n" +"\n" diff --git a/src/doxytag.l b/src/doxytag.l index f2d571f..f8e4540 100644 --- a/src/doxytag.l +++ b/src/doxytag.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -751,7 +751,7 @@ void parseFileOrDir(const char *fileName) void usage(const char *name) { - fprintf(stderr,"Doxytag version %s\nCopyright Dimitri van Heesch 1997-2010\n\n", + fprintf(stderr,"Doxytag version %s\nCopyright Dimitri van Heesch 1997-2011\n\n", versionString); fprintf(stderr," Generates a tag file and/or a search index for a set of HTML files\n\n"); fprintf(stderr,"Usage: %s [-t tag_file] [ html_file [html_file...] ]\n",name); diff --git a/src/doxytag.pro.in b/src/doxytag.pro.in index 31b65db..d448f97 100644 --- a/src/doxytag.pro.in +++ b/src/doxytag.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/doxytag.t b/src/doxytag.t index a7ac44c..c74c7ef 100644 --- a/src/doxytag.t +++ b/src/doxytag.t @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp index fe7d4f1..feea0ba 100644 --- a/src/eclipsehelp.cpp +++ b/src/eclipsehelp.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/eclipsehelp.h b/src/eclipsehelp.h index 2df764f..bfc6d60 100644 --- a/src/eclipsehelp.h +++ b/src/eclipsehelp.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/entry.cpp b/src/entry.cpp index 2bde394..cbd519e 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/entry.h b/src/entry.h index 6460fec..6f1e2e4 100644 --- a/src/entry.h +++ b/src/entry.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/example.h b/src/example.h index eaf6809..745045c 100644 --- a/src/example.h +++ b/src/example.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/filedef.cpp b/src/filedef.cpp index d049376..d2c6aa4 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/filedef.h b/src/filedef.h index b79653d..e9a7844 100644 --- a/src/filedef.h +++ b/src/filedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/filename.cpp b/src/filename.cpp index b791c83..73ca911 100644 --- a/src/filename.cpp +++ b/src/filename.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/filename.h b/src/filename.h index 8387bae..f1a563d 100644 --- a/src/filename.h +++ b/src/filename.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/formula.cpp b/src/formula.cpp index 486c56a..ff93951 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/formula.h b/src/formula.h index a97d778..79b9e7e 100644 --- a/src/formula.h +++ b/src/formula.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/fortrancode.h b/src/fortrancode.h index 8880a25..d89d846 100644 --- a/src/fortrancode.h +++ b/src/fortrancode.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/fortranscanner.h b/src/fortranscanner.h index 52215f6..6557045 100644 --- a/src/fortranscanner.h +++ b/src/fortranscanner.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 03f75d4..6fcc70a 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -87,6 +87,8 @@ struct SymbolModifiers { bool pointer; bool target; bool save; + bool deferred; + bool nonoverridable; bool nopass; bool pass; QCString passVar; @@ -94,7 +96,7 @@ struct SymbolModifiers { SymbolModifiers() : type(), returnName(), protection(NONE_P), direction(NONE_D), optional(FALSE), dimension(), allocatable(FALSE), external(FALSE), intrinsic(FALSE), parameter(FALSE), - pointer(FALSE), target(FALSE), save(FALSE), + pointer(FALSE), target(FALSE), save(FALSE), deferred(FALSE), nonoverridable(FALSE), nopass(FALSE), pass(FALSE), passVar() {} SymbolModifiers& operator|=(const SymbolModifiers &mdfs); @@ -119,6 +121,7 @@ static const char * inputString; static int inputPosition; static bool isFixedForm; static QCString inputStringPrepass; ///< Input string for prepass of line cont. '&' +static QCString inputStringSemi; ///< Input string after command separetor ';' static unsigned int inputPositionPrepass; static int lineCountPrepass = 0; @@ -195,6 +198,7 @@ static void truncatePrepass(int index); static void pushBuffer(QCString &buffer); static void popBuffer(); static void extractPrefix(QCString& text); +static QCString extractFromParens(const QCString name); //----------------------------------------------------------------------------- #undef YY_INPUT @@ -226,10 +230,10 @@ NOARGS {BS}"\n" NUM_TYPE (complex|integer|logical|real) KIND {ARGS} CHAR (CHARACTER{ARGS}?|CHARACTER{BS}"*"({BS}[0-9]+|{ARGS})) -TYPE_SPEC (({NUM_TYPE}({BS}"*"{BS}[0-9]+)?)|({NUM_TYPE}{KIND})|DOUBLE{BS_}PRECISION|{CHAR}|TYPE{ARGS}|PROCEDURE{ARGS}) +TYPE_SPEC (({NUM_TYPE}({BS}"*"{BS}[0-9]+)?)|({NUM_TYPE}{KIND})|DOUBLE{BS_}PRECISION|{CHAR}|TYPE{ARGS}|CLASS{ARGS}|PROCEDURE{ARGS}?) INTENT_SPEC intent{BS}"("{BS}(in|out|in{BS}out){BS}")" -ATTR_SPEC (ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PRIVATE|PUBLIC|SAVE|TARGET|NOPASS|PASS{ARGS}) +ATTR_SPEC (ALLOCATABLE|DIMENSION{ARGS}|EXTERNAL|{INTENT_SPEC}|INTRINSIC|OPTIONAL|PARAMETER|POINTER|PRIVATE|PUBLIC|SAVE|TARGET|NOPASS|PASS{ARGS}?|DEFERRED|NON_OVERRIDABLE) ACCESS_SPEC (PRIVATE|PUBLIC) LANGUAGE_BIND_SPEC BIND{BS}"("{BS}C{BS}(,{BS}NAME{BS}"="{BS}"\""(.*)"\""{BS})?")" /* Assume that attribute statements are almost the same as attributes. */ @@ -263,6 +267,7 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA %x ArrayInitializer %x Typedef %x TypedefBody +%x TypedefBodyContains %x InterfaceBody %x StrIgnore %x String @@ -373,7 +378,7 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA /*------ use handling ------------------------------------------------------------*/ -<Start,ModuleBody,TypedefBody,SubprogBody>"use"{BS_} { +<Start,ModuleBody,SubprogBody>"use"{BS_} { if(YY_START == Start) { addModule(NULL); @@ -424,7 +429,7 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA // interface body is a scope of its own } -^{BS}interface{BS_}{ID} { ifType = IF_GENERIC; +^{BS}interface{BS_}{ID}{ARGS}? { ifType = IF_GENERIC; yy_push_state(InterfaceBody); // extract generic name @@ -473,6 +478,7 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA } <ModuleBody>^{BS}{CONTAINS}/({BS}|\n|!) { BEGIN(ModuleBodyContains); } <SubprogBody>^{BS}{CONTAINS}/({BS}|\n|!) { BEGIN(SubprogBodyContains); } +<TypedefBody>^{BS}{CONTAINS}/({BS}|\n|!) { BEGIN(TypedefBodyContains); } /*------ module handling ------------------------------------------------------------*/ <Start>module|program{BS_} { // @@ -506,48 +512,103 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA /*------- type definition -------------------------------------------------------------------------------*/ -<Start,ModuleBody>"type"({BS_}|({COMMA}{ACCESS_SPEC}|{COMMA}{LANGUAGE_BIND_SPEC})) { +<Start,ModuleBody>^{BS}type { if(YY_START == Start) { addModule(NULL); yy_push_state(ModuleBody); //anon program } - yy_push_state(Typedef); - current->protection = defaultProtection; + yy_push_state(Typedef); + current->protection = defaultProtection; } -<Typedef>{ACCESS_SPEC} { - QCString type= yytext; +<Typedef>{ +{COMMA} {} + +{BS}"::"{BS} {} + +abstract { + current->spec |= Entry::AbstractClass; } -<Typedef>{LANGUAGE_BIND_SPEC} { - /* ignored for now */ +extends{ARGS} { + QCString basename = extractFromParens(yytext); + current->extends->append(new BaseInfo(basename, Public, Normal)); } -<Typedef>{ID} { /* type name found */ - //cout << "=========> got typedef " << yytext << ": " << yyLineNr << endl; - current->section = Entry::CLASS_SEC; // was Entry::STRUCT_SEC; - current->spec = Entry::Struct; - current->name = yytext; - - /* if type is part of a module, mod name is necessary for output */ - if ((current_root) && - (current_root->section == Entry::CLASS_SEC || - current_root->section == Entry::NAMESPACE_SEC)) - //current_root->section == Entry::INTERFACE_SEC)) - { - current->name= current_root->name+"::"+current->name; - } - current->fileName = yyFileName; - current->bodyLine = yyLineNr; - addCurrentEntry(); - startScope(last_entry); - BEGIN(TypedefBody); +public { + current->protection = Public; } -<TypedefBody>^{BS}"end"{BS}"type"({BS_}{ID})?{BS}/(\n|!) { /* end type definition */ - //printf("=========> got typedef end \n"); - if (!endScope(current_root)) - yyterminate(); - yy_pop_state(); - } +private { + current->protection = Private; + } +{LANGUAGE_BIND_SPEC} { + /* ignored for now */ + } +{ID} { /* type name found */ + current->section = Entry::CLASS_SEC; + current->spec |= Entry::Struct; + current->name = yytext; + current->fileName = yyFileName; + current->bodyLine = yyLineNr; + + /* if type is part of a module, mod name is necessary for output */ + if ((current_root) && + (current_root->section == Entry::CLASS_SEC + || current_root->section == Entry::NAMESPACE_SEC)) + { + current->name = current_root->name + "::" + current->name; + } + + addCurrentEntry(); + startScope(last_entry); + BEGIN(TypedefBody); + } +} + +<TypedefBodyContains>{ /* Type Bound Procedures */ +^{BS}PROCEDURE{ARGS}? { + current->type = QCString(yytext).simplifyWhiteSpace(); + } +^{BS}final { + current->spec |= Entry::Final; + current->type = QCString(yytext).simplifyWhiteSpace(); + } +^{BS}generic { + current->type = QCString(yytext).simplifyWhiteSpace(); + } +{COMMA} { + } +{ATTR_SPEC} { + currentModifiers |= QCString(yytext); + } +{BS}"::"{BS} { + } +{ID} { + QCString name = yytext; + modifiers[current_root][name.lower()] |= currentModifiers; + current->section = Entry::FUNCTION_SEC; + current->name = name; + current->fileName = yyFileName; + current->bodyLine = yyLineNr; + addCurrentEntry(); + } +{BS}"=>"[^(\n|\!)]* { /* Specific bindings come after the ID. */ + last_entry->args = yytext; + } +"\n" { + currentModifiers = SymbolModifiers(); + yyLineNr++; yyLineNr+=lineCountPrepass; lineCountPrepass=0; + docBlock.resize(0); + } +} + + +<TypedefBody,TypedefBodyContains>{ +^{BS}"end"{BS}"type"({BS_}{ID})?{BS}/(\n|!) { /* end type definition */ + if (!endScope(current_root)) + yyterminate(); + yy_pop_state(); + } +} /*------- module/global/typedef variable ---------------------------------------------------*/ @@ -563,19 +624,16 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA if (!endScope(current_root)) yyterminate(); yy_pop_state() ; - } + } <Start,ModuleBody,TypedefBody,SubprogBody>{ -^{BS}{TYPE_SPEC}/{SEPARATE} { +^{BS}{TYPE_SPEC}/{SEPARATE} { /* variable declaration starts */ if(YY_START == Start) { addModule(NULL); yy_push_state(ModuleBody); //anon program } - //fprintf(stderr,"4=========> got variable type: %s\n",yytext); - QCString help=yytext; - help= help.simplifyWhiteSpace(); - argType= help; + argType = QCString(yytext).simplifyWhiteSpace(); yy_push_state(AttributeList); } ^{BS}{PP_ID}{KIND}? { /* check for preprocessor symbol expand to type */ @@ -616,9 +674,20 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA <AttributeList>{ {COMMA} {} {BS} {} -{ATTR_SPEC} { /* update current modifiers */ - QCString tmp = yytext; - currentModifiers |= (tmp); +{ATTR_SPEC}. { /* update current modifierswhen it is an ATTR_SPEC and not a variable name */ + /* bug_625519 */ + QChar chr = yytext[yyleng-1]; + if (chr.isLetter() || chr.isDigit() || (chr == '_')) + { + REJECT; + } + else + { + QCString tmp = yytext; + tmp = tmp.left(tmp.length() - 1); + unput(yytext[yyleng-1]); + currentModifiers |= (tmp); + } } "::" { /* end attribute list */ BEGIN( Variable ); @@ -680,6 +749,12 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA yyLineNr++; yyLineNr+=lineCountPrepass; lineCountPrepass=0; docBlock.resize(0); } +<Variable>";".*"\n" { currentModifiers = SymbolModifiers(); + yy_pop_state(); // end variable deklaration list + docBlock.resize(0); + inputStringSemi =(const char*)(yytext+1); + pushBuffer(inputStringSemi); + } <Initialization,ArrayInitializer>"(/" { initializer+=yytext; initializerArrayScope++; @@ -721,7 +796,7 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA <Start,ModuleBody,SubprogBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains>^{BS}({PREFIX}{BS_})?{TYPE_SPEC}{BS}/{SUBPROG}{BS_} { if (ifType == IF_ABSTRACT || ifType == IF_SPECIFIC) { - addInterface(yytext, ifType); + addInterface("$interface$", ifType); startScope(last_entry); } @@ -823,7 +898,7 @@ PREFIX (RECURSIVE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,2}(RECURSIVE|PURE|ELEMENTA yy_pop_state(); } -<Start,SubprogBody,ModuleBody,TypedefBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains>"!>" { +<Start,SubprogBody,ModuleBody,TypedefBody,InterfaceBody,ModuleBodyContains,SubprogBodyContains,TypedefBodyContains>"!>" { yy_push_state(YY_START); current->docLine = yyLineNr; docBlockJavaStyle = FALSE; @@ -1208,6 +1283,8 @@ SymbolModifiers& SymbolModifiers::operator|=(const SymbolModifiers &mdfs) pointer |= mdfs.pointer; target |= mdfs.target; save |= mdfs.save; + deferred |= mdfs.deferred; + nonoverridable |= mdfs.nonoverridable; nopass |= mdfs.nopass; pass |= mdfs.pass; passVar = mdfs.passVar; @@ -1277,10 +1354,21 @@ SymbolModifiers& SymbolModifiers::operator|=(QCString mdfString) { newMdf.nopass = TRUE; } + else if (mdfString=="deferred") + { + newMdf.deferred = TRUE; + } + else if (mdfString=="non_overridable") + { + newMdf.nonoverridable = TRUE; + } else if (mdfString.contains("pass")) { newMdf.pass = TRUE; - newMdf.passVar = extractFromParens(mdfString); + if (mdfString.contains("(")) + newMdf.passVar = extractFromParens(mdfString); + else + newMdf.passVar = ""; } (*this) |= newMdf; @@ -1388,6 +1476,16 @@ static QCString applyModifiers(QCString typeName, SymbolModifiers& mdfs) typeName += ","; typeName += "save"; } + if (mdfs.deferred) + { + typeName += ","; + typeName += "deferred"; + } + if (mdfs.nonoverridable) + { + typeName += ","; + typeName += "non_overridable"; + } if (mdfs.nopass) { typeName += ","; @@ -1396,7 +1494,9 @@ static QCString applyModifiers(QCString typeName, SymbolModifiers& mdfs) if (mdfs.pass) { typeName += ","; - typeName += "pass(" + mdfs.passVar + ")"; + typeName += "pass"; + if (!mdfs.passVar.isEmpty()) + typeName += "(" + mdfs.passVar + ")"; } if (mdfs.protection == SymbolModifiers::PUBLIC) { diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index c1f8b34..f826c37 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * ftvhelp.cpp,v 1.0 2000/09/06 16:09:00 * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/ftvhelp.h b/src/ftvhelp.h index cdac6c8..5ec0d0d 100644 --- a/src/ftvhelp.h +++ b/src/ftvhelp.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 9150395..b1fb489 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/groupdef.h b/src/groupdef.h index 3482d0f..85e4b41 100644 --- a/src/groupdef.h +++ b/src/groupdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/htags.cpp b/src/htags.cpp index 087d216..036dcc9 100644 --- a/src/htags.cpp +++ b/src/htags.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/htags.h b/src/htags.h index cc39552..cb6d58f 100644 --- a/src/htags.h +++ b/src/htags.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/htmlattrib.h b/src/htmlattrib.h index ad0f0d8..531f29a 100644 --- a/src/htmlattrib.h +++ b/src/htmlattrib.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 081dcc9..9b864aa 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1191,13 +1191,13 @@ void HtmlDocVisitor::visitPre(DocImage *img) { baseName=baseName.right(baseName.length()-i-1); } - m_t << "<div align=\"center\">" << endl; + m_t << "<div class=\"image\">" << endl; m_t << "<img src=\"" << img->relPath() << img->name() << "\" alt=\"" << baseName << "\"" << htmlAttribsToString(img->attribs()) << "/>" << endl; if (img->hasCaption()) { - m_t << "<p><strong>"; + m_t << "<div class=\"caption\">" << endl; } } else // other format -> skip @@ -1214,7 +1214,7 @@ void HtmlDocVisitor::visitPost(DocImage *img) if (m_hide) return; if (img->hasCaption()) { - m_t << "</strong></p>"; + m_t << "</div>"; } m_t << "</div>" << endl; forceStartParagraph(img); @@ -1228,11 +1228,11 @@ void HtmlDocVisitor::visitPost(DocImage *img) void HtmlDocVisitor::visitPre(DocDotFile *df) { if (m_hide) return; + m_t << "<div class=\"dotgraph\">" << endl; writeDotFile(df->file(),df->relPath(),df->context()); - m_t << "<div align=\"center\">" << endl; if (df->hasCaption()) { - m_t << "<p><strong>"; + m_t << "<div class=\"caption\">" << endl; } } @@ -1241,7 +1241,7 @@ void HtmlDocVisitor::visitPost(DocDotFile *df) if (m_hide) return; if (df->hasCaption()) { - m_t << "</strong></p>" << endl; + m_t << "</div>" << endl; } m_t << "</div>" << endl; } @@ -1249,11 +1249,11 @@ void HtmlDocVisitor::visitPost(DocDotFile *df) void HtmlDocVisitor::visitPre(DocMscFile *df) { if (m_hide) return; + m_t << "<div class=\"mscgraph\">" << endl; writeMscFile(df->file(),df->relPath(),df->context()); - m_t << "<div align=\"center\">" << endl; if (df->hasCaption()) { - m_t << "<p><strong>"; + m_t << "<div class=\"caption\">" << endl; } } void HtmlDocVisitor::visitPost(DocMscFile *df) @@ -1261,7 +1261,7 @@ void HtmlDocVisitor::visitPost(DocMscFile *df) if (m_hide) return; if (df->hasCaption()) { - m_t << "</strong></p>" << endl; + m_t << "</div>" << endl; } m_t << "</div>" << endl; } @@ -1631,18 +1631,14 @@ void HtmlDocVisitor::writeDotFile(const QCString &fn,const QCString &relPath, { baseName=baseName.right(baseName.length()-i-1); } + if ((i=baseName.find('.'))!=-1) // strip extension + { + baseName=baseName.left(i); + } + baseName.prepend("dot_"); QCString outDir = Config_getString("HTML_OUTPUT"); writeDotGraphFromFile(fn,outDir,baseName,BITMAP); - QCString mapName = baseName+".map"; - QCString mapFile = fn+".map"; - //m_t << "<img src=\"" << relPath << baseName << "." - // << Config_getEnum("DOT_IMAGE_FORMAT") << "\" alt=\"" - // << baseName << "\" border=\"0\" usemap=\"#" << mapName << "\">" - // << endl; - //QCString imap = getDotImageMapFromFile(m_t,fn,baseName,outDir,relPath,context); - //m_t << "<map name=\"" << mapName << "\" id=\"" << mapName << "\">" - // << imap << "</map>" << endl; - writeDotImageMapFromFile(m_t,fn,outDir,relPath,context); + writeDotImageMapFromFile(m_t,fn,outDir,relPath,baseName,context); } void HtmlDocVisitor::writeMscFile(const QCString &fileName,const QCString &relPath, @@ -1650,18 +1646,18 @@ void HtmlDocVisitor::writeMscFile(const QCString &fileName,const QCString &relPa { QCString baseName=fileName; int i; - if ((i=baseName.findRev('/'))!=-1) + if ((i=baseName.findRev('/'))!=-1) // strip path { baseName=baseName.right(baseName.length()-i-1); } + if ((i=baseName.find('.'))!=-1) // strip extension + { + baseName=baseName.left(i); + } + baseName.prepend("msc_"); QCString outDir = Config_getString("HTML_OUTPUT"); writeMscGraphFromFile(fileName,outDir,baseName,MSC_BITMAP); - QCString mapName = baseName+".map"; - QCString mapFile = fileName+".map"; - m_t << "<img src=\"" << relPath << baseName << ".png\" alt=\"" - << baseName << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl; - QCString imap = getMscImageMapFromFile(fileName,outDir,relPath,context); - m_t << "<map name=\"" << mapName << "\" id=\"" << mapName << "\">" << imap << "</map>" << endl; + writeMscImageMapFromFile(m_t,fileName,outDir,relPath,baseName,context); } /** Used for items found inside a paragraph, which due to XHTML restrictions diff --git a/src/htmldocvisitor.h b/src/htmldocvisitor.h index c033e8b..e267a0f 100644 --- a/src/htmldocvisitor.h +++ b/src/htmldocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 4e916fc..2f05470 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -753,9 +753,10 @@ static void writeServerSearchBox(FTextStream &t,const char *relPath,bool highlig } } -static QCString getLogoName() +static QCString getLogoName(const char *projectLogo) { - static QCString projectLogo = Config_getString("PROJECT_LOGO"); + if (projectLogo==0) return ""; + if (projectLogo[0]=='$') return projectLogo; // marker is used QFileInfo fi(projectLogo); if (fi.exists()) { @@ -764,16 +765,16 @@ static QCString getLogoName() return ""; } -static void writeTitleArea(FTextStream &t,const char *relPath) +static void writeTitleArea(FTextStream &t,const char *relPath, + const char *projectName,const char *projectBrief, + const char *projectNumber,const char *projectLogo) { - QCString logoName = getLogoName(); - static QCString projectName = Config_getString("PROJECT_NAME"); - static QCString projectBrief = Config_getString("PROJECT_BRIEF"); - static QCString projectNumber = Config_getString("PROJECT_NUMBER"); + QCString logoName = getLogoName(projectLogo); static bool disableIndex = Config_getBool("DISABLE_INDEX"); static bool searchEngine = Config_getBool("SEARCHENGINE"); static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); - if (!(logoName.isEmpty() && projectName.isEmpty() && projectBrief.isEmpty()) || + if (!(logoName.isEmpty() && QCString(projectName).isEmpty() && + QCString(projectBrief).isEmpty()) || (disableIndex && searchEngine)) { t << "<div id=\"titlearea\">" << endl; @@ -784,19 +785,19 @@ static void writeTitleArea(FTextStream &t,const char *relPath) { t << " <td id=\"projectlogo\"><img alt=\"Logo\" src=\"" << relPath << logoName << "\"></td>" << endl; } - if (!(projectName.isEmpty() && projectBrief.isEmpty())) + if (!(QCString(projectName).isEmpty() && QCString(projectBrief).isEmpty())) { t << " <td style=\"padding-left: 0.5em;\">" << endl; - if (!projectName.isEmpty()) + if (!QCString(projectName).isEmpty()) { t << " <div id=\"projectname\">" << projectName; - if (!projectNumber.isEmpty()) + if (!QCString(projectNumber).isEmpty()) { t << " <span id=\"projectnumber\">" << projectNumber << "</span>"; } t << "</div>" << endl; } - if (!projectBrief.isEmpty()) + if (!QCString(projectBrief).isEmpty()) { t << " <div id=\"projectbrief\">" << projectBrief << "</div>" << endl; } @@ -916,7 +917,8 @@ static void writeDefaultNavTree(FTextStream &t,const char *relPathStr) } } -static void writeDefaultHeaderFile(FTextStream &t, const char *title, +static void writeDefaultHeaderFile(FTextStream &t, const char *name, + const char *title, const char *relPath,bool usePathCmd, bool searchPage=FALSE) { @@ -926,6 +928,12 @@ static void writeDefaultHeaderFile(FTextStream &t, const char *title, else relPathStr=relPath; + QCString id = name; + if (id.right(Doxygen::htmlFileExtension.length())==Doxygen::htmlFileExtension) + { + id=id.left(id.length()-Doxygen::htmlFileExtension.length()); + } + static bool searchEngine = Config_getBool("SEARCHENGINE"); static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); //if (searchEngine && !generateTreeView) @@ -940,6 +948,7 @@ static void writeDefaultHeaderFile(FTextStream &t, const char *title, "<title>"; t << convertToHtml(title); t << "</title>\n"; + t << "<link href=\"" << relPathStr << "tabs.css\" rel=\"stylesheet\" type=\"text/css\"/>\n"; if (searchEngine /* && !generateTreeView*/ ) { @@ -969,19 +978,26 @@ static void writeDefaultHeaderFile(FTextStream &t, const char *title, } t << "<link "; t << "href=\""; - if (Config_getString("HTML_STYLESHEET").isEmpty()) + QCString cssname=Config_getString("HTML_STYLESHEET"); + if (cssname.isEmpty()) { t << relPathStr << "doxygen.css"; } else { - QCString cssname=Config_getString("HTML_STYLESHEET"); - QFileInfo cssfi(cssname); - if (!cssfi.exists()) + if (usePathCmd) + { + t << relPathStr << cssname; + } + else { - err("error: user specified HTML style sheet file does not exist!\n"); + QFileInfo cssfi(cssname); + if (!cssfi.exists()) + { + err("error: user specified HTML style sheet file does not exist!\n"); + } + t << relPathStr << cssfi.fileName(); } - t << relPathStr << cssfi.fileName(); } t << "\" rel=\"stylesheet\" type=\"text/css\"/>\n"; @@ -1009,9 +1025,9 @@ static void writeDefaultHeaderFile(FTextStream &t, const char *title, void HtmlGenerator::writeHeaderFile(QFile &file) { FTextStream t(&file); - writeDefaultHeaderFile(t,"$title",relativePathToRoot(0),TRUE); + writeDefaultHeaderFile(t,file.name(),"$title",relativePathToRoot(0),TRUE); t << "<div id=\"top\"><!-- do not remove this div! -->" << endl; - writeTitleArea(t,"$relpath$"); + writeTitleArea(t,"$relpath$","$projectname","$projectbrief","$projectnumber","$projectlogo"); } void HtmlGenerator::writeFooterFile(QFile &file) @@ -1160,7 +1176,7 @@ void HtmlGenerator::startFile(const char *name,const char *, lastFile = fileName; if (g_header.isEmpty()) { - writeDefaultHeaderFile(t,dispTitle,relPath,FALSE); + writeDefaultHeaderFile(t,name,dispTitle,relPath,FALSE); } else { @@ -2561,6 +2577,10 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact, void HtmlGenerator::startQuickIndices() { static bool customHeader = !Config_getString("HTML_HEADER").isEmpty(); + static QCString projectName = Config_getString("PROJECT_NAME"); + static QCString projectBrief = Config_getString("PROJECT_BRIEF"); + static QCString projectNumber = Config_getString("PROJECT_NUMBER"); + static QCString projectLogo = Config_getString("PROJECT_LOGO"); if (!customHeader) { @@ -2570,7 +2590,7 @@ void HtmlGenerator::startQuickIndices() // t << " onmouseout=\"return navLeave()\" onmouseover=\"navEnter()\""; //} t << ">" << endl; - writeTitleArea(t,relPath); + writeTitleArea(t,relPath,projectName,projectBrief,projectNumber,projectLogo); } } @@ -2631,6 +2651,10 @@ void HtmlGenerator::writeQuickLinks(bool compact,HighlightedItem hli) void HtmlGenerator::writeSearchPage() { static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static QCString projectName = Config_getString("PROJECT_NAME"); + static QCString projectBrief = Config_getString("PROJECT_BRIEF"); + static QCString projectNumber = Config_getString("PROJECT_NUMBER"); + static QCString projectLogo = Config_getString("PROJECT_LOGO"); QCString fileName = Config_getString("HTML_OUTPUT")+"/search.php"; QFile f(fileName); if (f.open(IO_WriteOnly)) @@ -2638,7 +2662,7 @@ void HtmlGenerator::writeSearchPage() FTextStream t(&f); if (g_header.isEmpty()) { - writeDefaultHeaderFile(t,theTranslator->trSearch().data(),0,FALSE,TRUE); + writeDefaultHeaderFile(t,"search",theTranslator->trSearch().data(),0,FALSE,TRUE); } else { @@ -2657,7 +2681,7 @@ void HtmlGenerator::writeSearchPage() t << "--></script>\n"; } t << "<div id=\"top\">" << endl; - writeTitleArea(t,""); + writeTitleArea(t,"",projectName,projectBrief,projectNumber,projectLogo); if (!Config_getBool("DISABLE_INDEX")) { writeDefaultQuickLinks(t,TRUE,HLI_Search,""); diff --git a/src/htmlgen.h b/src/htmlgen.h index 21a1feb..db6bc3a 100644 --- a/src/htmlgen.h +++ b/src/htmlgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp index fb84938..65f6acb 100644 --- a/src/htmlhelp.cpp +++ b/src/htmlhelp.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -497,6 +497,36 @@ void HtmlHelp::createProjectFile() t << "open.png" << endl; t << "closed.png" << endl; } + if (Config_getBool("GENERATE_HTMLHELP")) + { + t << "ftv2blank.png" << endl; + t << "ftv2doc.png" << endl; + t << "ftv2folderclosed.png" << endl; + t << "ftv2folderopen.png" << endl; + t << "ftv2lastnode.png" << endl; + t << "ftv2link.png" << endl; + t << "ftv2mlastnode.png" << endl; + t << "ftv2mnode.png" << endl; + t << "ftv2node.png" << endl; + t << "ftv2plastnode.png" << endl; + t << "ftv2pnode.png" << endl; + t << "ftv2vertline.png" << endl; + } + if (Config_getBool("SEARCHENGINE")) + { + t << "search_l.png" << endl; + t << "search_m.png" << endl; + t << "search_r.png" << endl; + if (Config_getBool("SERVER_BASED_SEARCH")) + { + t << "mag.png" << endl; + } + else + { + t << "mag_sel.png" << endl; + t << "close.png" << endl; + } + } f.close(); } else diff --git a/src/htmlhelp.h b/src/htmlhelp.h index 0849007..87abe81 100644 --- a/src/htmlhelp.h +++ b/src/htmlhelp.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/image.cpp b/src/image.cpp index ac7c8d1..5f4c141 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/image.h b/src/image.h index ee0dd9e..1728485 100644 --- a/src/image.h +++ b/src/image.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/index.cpp b/src/index.cpp index babdb1d..35002de 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/index.h b/src/index.h index 26947a6..51a31c5 100644 --- a/src/index.h +++ b/src/index.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/instdox.cpp b/src/instdox.cpp index 6ad0ea7..56a3630 100644 --- a/src/instdox.cpp +++ b/src/instdox.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/instdox.h b/src/instdox.h index 87e8cb8..55c1864 100644 --- a/src/instdox.h +++ b/src/instdox.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/language.cpp b/src/language.cpp index db116e3..1264bdd 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/language.h b/src/language.h index da6e63d..e134b20 100644 --- a/src/language.h +++ b/src/language.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index 3c2e6f6..55e9634 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1383,14 +1383,11 @@ void LatexDocVisitor::startDotFile(const QCString &fileName, { baseName=baseName.right(baseName.length()-i-1); } - if (baseName.right(4)==".eps" || baseName.right(4)==".pdf") + if ((i=baseName.find('.'))!=-1) { - baseName=baseName.left(baseName.length()-4); - } - if (baseName.right(4)==".dot") - { - baseName=baseName.left(baseName.length()-4); + baseName=baseName.left(i); } + baseName.prepend("dot_"); QCString outDir = Config_getString("LATEX_OUTPUT"); QCString name = fileName; writeDotGraphFromFile(name,outDir,baseName,EPS); @@ -1450,14 +1447,12 @@ void LatexDocVisitor::startMscFile(const QCString &fileName, { baseName=baseName.right(baseName.length()-i-1); } - if (baseName.right(4)==".eps" || baseName.right(4)==".pdf") + if ((i=baseName.find('.'))!=-1) { - baseName=baseName.left(baseName.length()-4); - } - if (baseName.right(4)==".dot") - { - baseName=baseName.left(baseName.length()-4); + baseName=baseName.left(i); } + baseName.prepend("msc_"); + QCString outDir = Config_getString("LATEX_OUTPUT"); QCString name = fileName; writeMscGraphFromFile(name,outDir,baseName,MSC_EPS); @@ -1515,7 +1510,7 @@ void LatexDocVisitor::writeMscFile(const QCString &baseName) shortName=shortName.right(shortName.length()-i-1); } QCString outDir = Config_getString("LATEX_OUTPUT"); - writeMscGraphFromFile(baseName,outDir,baseName,MSC_EPS); + writeMscGraphFromFile(baseName,outDir,shortName,MSC_EPS); m_t << "\n\\begin{DoxyImageNoCaption}" " \\mbox{\\includegraphics"; m_t << "{" << shortName << "}"; diff --git a/src/latexdocvisitor.h b/src/latexdocvisitor.h index 39f110e..535c411 100644 --- a/src/latexdocvisitor.h +++ b/src/latexdocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 6804022..4d8b23b 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -782,12 +782,12 @@ void LatexGenerator::writeStyleSheetFile(QFile &f) t << theTranslator->trGeneratedAt( dateToString(TRUE), projectName ); t << " doxygen"; //t << " " << theTranslator->trWrittenBy() << " "; - //t << "Dimitri van Heesch \\copyright~1997-2010"; + //t << "Dimitri van Heesch \\copyright~1997-2011"; writeDefaultStyleSheetPart2(t); t << theTranslator->trGeneratedAt( dateToString(TRUE), projectName ); t << " doxygen"; //t << " << theTranslator->trWrittenBy() << " "; - //t << "Dimitri van Heesch \\copyright~1997-2010"; + //t << "Dimitri van Heesch \\copyright~1997-2011"; writeDefaultStyleSheetPart3(t); } diff --git a/src/latexgen.h b/src/latexgen.h index e9af96d..6088b58 100644 --- a/src/latexgen.h +++ b/src/latexgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/layout.cpp b/src/layout.cpp index d39a656..cefda0f 100644 --- a/src/layout.cpp +++ b/src/layout.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/layout.h b/src/layout.h index e28268d..e985077 100644 --- a/src/layout.h +++ b/src/layout.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/libdoxycfg.pro.in b/src/libdoxycfg.pro.in index 6ea626e..2adead6 100644 --- a/src/libdoxycfg.pro.in +++ b/src/libdoxycfg.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/libdoxycfg.t b/src/libdoxycfg.t index d3868b9..6682956 100644 --- a/src/libdoxycfg.t +++ b/src/libdoxycfg.t @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index b38adea..2aa0a78 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/libdoxygen.t b/src/libdoxygen.t index 3992118..fe5268b 100644 --- a/src/libdoxygen.t +++ b/src/libdoxygen.t @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2010 by Dimitri van Heesch. +# Copyright (C) 1997-2011 by Dimitri van Heesch. # # Permission to use, copy, modify, and distribute this software and its # documentation under the terms of the GNU General Public License is hereby diff --git a/src/lockingptr.h b/src/lockingptr.h index 8110a66..b16e5ca 100644 --- a/src/lockingptr.h +++ b/src/lockingptr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/logos.cpp b/src/logos.cpp index f7364a5..8f2dbd0 100644 --- a/src/logos.cpp +++ b/src/logos.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/logos.h b/src/logos.h index 4367106..438df13 100644 --- a/src/logos.h +++ b/src/logos.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/main.cpp b/src/main.cpp index 8a4afd8..854eed7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp index 5dd9f5e..443fd64 100644 --- a/src/mandocvisitor.cpp +++ b/src/mandocvisitor.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/mandocvisitor.h b/src/mandocvisitor.h index 0be4dd5..71eb667 100644 --- a/src/mandocvisitor.h +++ b/src/mandocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/mangen.cpp b/src/mangen.cpp index fc5f504..55069d8 100644 --- a/src/mangen.cpp +++ b/src/mangen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/mangen.h b/src/mangen.h index 8a997de..64ff5b0 100644 --- a/src/mangen.h +++ b/src/mangen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 6abc211..5508a3a 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/memberdef.h b/src/memberdef.h index f30b5a1..121780e 100644 --- a/src/memberdef.h +++ b/src/memberdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/membergroup.cpp b/src/membergroup.cpp index fefcc95..0e463f9 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/membergroup.h b/src/membergroup.h index 496a95d..326e59d 100644 --- a/src/membergroup.h +++ b/src/membergroup.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/memberlist.cpp b/src/memberlist.cpp index 8aeb42a..d41f7f9 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/memberlist.h b/src/memberlist.h index d222a48..7e93139 100644 --- a/src/memberlist.h +++ b/src/memberlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/membername.cpp b/src/membername.cpp index 65c8e75..8c6b735 100644 --- a/src/membername.cpp +++ b/src/membername.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/membername.h b/src/membername.h index f67f6a0..aeebf23 100644 --- a/src/membername.h +++ b/src/membername.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/message.cpp b/src/message.cpp index cece558..351d9c1 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/message.h b/src/message.h index 5a42d50..8437ef3 100644 --- a/src/message.h +++ b/src/message.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/msc.cpp b/src/msc.cpp index a60ce90..de28a6f 100644 --- a/src/msc.cpp +++ b/src/msc.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -85,6 +85,7 @@ static bool convertMapFile(QTextStream &t,const char *mapName,const QCString rel return TRUE; } + void writeMscGraphFromFile(const char *inFile,const char *outDir, const char *outFile,MscOutputFormat format) { @@ -113,12 +114,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, mscArgs+=" -i \""; mscArgs+=inFile; - if (QCString(inFile).right(4)!=".msc") // add extension if not given - { - mscArgs+=".msc"; - } mscArgs+="\" -o \""; - mscArgs+=outFile; mscArgs+=extension+"\""; int exitCode; @@ -163,10 +159,7 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension(); QCString mscArgs = "-T ismap -i \""; mscArgs+=inFile; - if (QCString(inFile).right(4)!=".msc") // add extension if not given - { - mscArgs+=".msc"; - } + QFileInfo fi(inFile); mscArgs+="\" -o \""; mscArgs+=outFile + "\""; @@ -189,4 +182,17 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, return result.data(); } +void writeMscImageMapFromFile(FTextStream &t,const QCString &inFile, + const QCString &outDir, + const QCString &relPath, + const QCString &baseName, + const QCString &context) +{ + QCString mapName = baseName+".map"; + QCString mapFile = inFile+".map"; + t << "<img src=\"" << relPath << baseName << ".png\" alt=\"" + << baseName << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl; + QCString imap = getMscImageMapFromFile(inFile,outDir,relPath,context); + t << "<map name=\"" << mapName << "\" id=\"" << mapName << "\">" << imap << "</map>" << endl; +} @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -20,6 +20,8 @@ #include "qtbc.h" +class FTextStream; + enum MscOutputFormat { MSC_BITMAP , MSC_EPS }; void writeMscGraphFromFile(const char *inFile,const char *outDir, @@ -28,5 +30,9 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, const QCString& relPath,const QCString& context); +void writeMscImageMapFromFile(FTextStream &t,const QCString &inFile, + const QCString &outDir, const QCString &relPath, + const QCString &baseName, const QCString &context); + #endif diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index d31ed1a..09cd662 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/namespacedef.h b/src/namespacedef.h index ac64576..0f1594e 100644 --- a/src/namespacedef.h +++ b/src/namespacedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/objcache.cpp b/src/objcache.cpp index 10d62f2..d16e57c 100644 --- a/src/objcache.cpp +++ b/src/objcache.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/objcache.h b/src/objcache.h index bc7800a..5e0a3e0 100644 --- a/src/objcache.h +++ b/src/objcache.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/outputgen.cpp b/src/outputgen.cpp index 2216bca..8aec61f 100644 --- a/src/outputgen.cpp +++ b/src/outputgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/outputgen.h b/src/outputgen.h index 6d7e672..a7d1ec8 100644 --- a/src/outputgen.h +++ b/src/outputgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/outputlist.cpp b/src/outputlist.cpp index e9868c5..b6f73dc 100644 --- a/src/outputlist.cpp +++ b/src/outputlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/outputlist.h b/src/outputlist.h index 5572004..532e87c 100644 --- a/src/outputlist.h +++ b/src/outputlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/pagedef.h b/src/pagedef.h index 40649ef..e6c9285 100644 --- a/src/pagedef.h +++ b/src/pagedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/parserintf.h b/src/parserintf.h index a7568fb..6e79162 100644 --- a/src/parserintf.h +++ b/src/parserintf.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index a274ba9..2b6641d 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * Authors: Dimitri van Heesch, Miguel Lobo. * * Permission to use, copy, modify, and distribute this software and its diff --git a/src/perlmodgen.h b/src/perlmodgen.h index 6885ad7..2f13ec5 100644 --- a/src/perlmodgen.h +++ b/src/perlmodgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/printdocvisitor.h b/src/printdocvisitor.h index b86236d..59f3655 100644 --- a/src/printdocvisitor.h +++ b/src/printdocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/pycode.h b/src/pycode.h index 79a11f5..230ba23 100644 --- a/src/pycode.h +++ b/src/pycode.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/pycode.l b/src/pycode.l index 116219a..0b2f715 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/pyscanner.h b/src/pyscanner.h index 1ebf470..c02d47f 100644 --- a/src/pyscanner.h +++ b/src/pyscanner.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/pyscanner.l b/src/pyscanner.l index d47b00e..a255538 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/reflist.cpp b/src/reflist.cpp index 519d972..b06013c 100644 --- a/src/reflist.cpp +++ b/src/reflist.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/reflist.h b/src/reflist.h index 17f8c99..90c07e3 100644 --- a/src/reflist.h +++ b/src/reflist.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index c0a4019..8d6170e 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/rtfdocvisitor.h b/src/rtfdocvisitor.h index ccadaa9..d739df6 100644 --- a/src/rtfdocvisitor.h +++ b/src/rtfdocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index fad3ae2..2bef5de 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Parker Waechter & Dimitri van Heesch. + * Copyright (C) 1997-2011 by Parker Waechter & Dimitri van Heesch. * * Style sheet additions by Alexander Bartolich * diff --git a/src/rtfgen.h b/src/rtfgen.h index f534505..0bfd724 100644 --- a/src/rtfgen.h +++ b/src/rtfgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Parker Waechter & Dimitri van Heesch. + * Copyright (C) 1997-2011 by Parker Waechter & Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/rtfstyle.cpp b/src/rtfstyle.cpp index dd6990b..9cc2064 100644 --- a/src/rtfstyle.cpp +++ b/src/rtfstyle.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/rtfstyle.h b/src/rtfstyle.h index deccde7..5d2b5ed 100644 --- a/src/rtfstyle.h +++ b/src/rtfstyle.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/scanner.h b/src/scanner.h index 8a3d8fb..62c1b09 100644 --- a/src/scanner.h +++ b/src/scanner.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/scanner.l b/src/scanner.l index 2fdf0f2..6abd7e7 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -2109,13 +2109,28 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) } <PreLineCtrl>"\""[^\n\"]*"\"" { yyFileName = stripQuotes(yytext); - current->program+=yytext; + if (lastPreLineCtrlContext==ReadBody || + lastPreLineCtrlContext==ReadNSBody || + lastPreLineCtrlContext==ReadBodyIntf) + { + current->program+=yytext; + } } <PreLineCtrl>. { - current->program+=yytext; + if (lastPreLineCtrlContext==ReadBody || + lastPreLineCtrlContext==ReadNSBody || + lastPreLineCtrlContext==ReadBodyIntf) + { + current->program+=yytext; + } } <PreLineCtrl>\n { - current->program+=yytext; + if (lastPreLineCtrlContext==ReadBody || + lastPreLineCtrlContext==ReadNSBody || + lastPreLineCtrlContext==ReadBodyIntf) + { + current->program+=yytext; + } yyLineNr++; BEGIN( lastPreLineCtrlContext ); } diff --git a/src/searchindex.cpp b/src/searchindex.cpp index d7b6661..f3a8b1f 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/searchindex.h b/src/searchindex.h index 87e928d..8022337 100644 --- a/src/searchindex.h +++ b/src/searchindex.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/section.h b/src/section.h index 6423ed4..c4c9517 100644 --- a/src/section.h +++ b/src/section.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/sortdict.h b/src/sortdict.h index 37b9b10..366e1ac 100644 --- a/src/sortdict.h +++ b/src/sortdict.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/store.cpp b/src/store.cpp index 55f3026..aafb4a4 100644 --- a/src/store.cpp +++ b/src/store.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/store.h b/src/store.h index 83a3347..10216a6 100644 --- a/src/store.h +++ b/src/store.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/tagreader.cpp b/src/tagreader.cpp index 700095c..0368dad 100644 --- a/src/tagreader.cpp +++ b/src/tagreader.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/tagreader.h b/src/tagreader.h index 3e7463a..ef05d5c 100644 --- a/src/tagreader.h +++ b/src/tagreader.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/textdocvisitor.cpp b/src/textdocvisitor.cpp index bddd436..2c70dec 100644 --- a/src/textdocvisitor.cpp +++ b/src/textdocvisitor.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/textdocvisitor.h b/src/textdocvisitor.h index 4c56935..2703693 100644 --- a/src/textdocvisitor.h +++ b/src/textdocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator.h b/src/translator.h index bd19092..e69b08c 100644 --- a/src/translator.h +++ b/src/translator.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_ar.h b/src/translator_ar.h index e344732..b6f6e7c 100644 --- a/src/translator_ar.h +++ b/src/translator_ar.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_br.h b/src/translator_br.h index 787e457..5d04b40 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_ca.h b/src/translator_ca.h index 6c90abd..8f72351 100644 --- a/src/translator_ca.h +++ b/src/translator_ca.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_cn.h b/src/translator_cn.h index f48c66e..a04ed5d 100644 --- a/src/translator_cn.h +++ b/src/translator_cn.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_cz.h b/src/translator_cz.h index e17f5f7..9d3e65c 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_de.h b/src/translator_de.h index 5188f45..ca92c2b 100644 --- a/src/translator_de.h +++ b/src/translator_de.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_dk.h b/src/translator_dk.h index d5014a0..be9dcc7 100644 --- a/src/translator_dk.h +++ b/src/translator_dk.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_en.h b/src/translator_en.h index a61e192..f6f01b1 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_eo.h b/src/translator_eo.h index 2dc830b..ebc6fc0 100644 --- a/src/translator_eo.h +++ b/src/translator_eo.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_es.h b/src/translator_es.h index a25a608..29ea370 100644 --- a/src/translator_es.h +++ b/src/translator_es.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_fa.h b/src/translator_fa.h index 5cdb725..4e77fc9 100644 --- a/src/translator_fa.h +++ b/src/translator_fa.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_fi.h b/src/translator_fi.h index 1defa7a..d35d698 100644 --- a/src/translator_fi.h +++ b/src/translator_fi.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_fr.h b/src/translator_fr.h index 95a7790..01a8025 100644 --- a/src/translator_fr.h +++ b/src/translator_fr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_gr.h b/src/translator_gr.h index a6044f5..c5b6c47 100644 --- a/src/translator_gr.h +++ b/src/translator_gr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2008 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_hr.h b/src/translator_hr.h index eeba2c8..6056b09 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_hu.h b/src/translator_hu.h index f33ae29..17ed254 100644 --- a/src/translator_hu.h +++ b/src/translator_hu.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_id.h b/src/translator_id.h index 7d09b9b..b139650 100644 --- a/src/translator_id.h +++ b/src/translator_id.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_it.h b/src/translator_it.h index 78f436c..b3ae4ed 100644 --- a/src/translator_it.h +++ b/src/translator_it.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_je.h b/src/translator_je.h index 793491c..1368e6f 100644 --- a/src/translator_je.h +++ b/src/translator_je.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_jp.h b/src/translator_jp.h index 444404f..fb01d2a 100644 --- a/src/translator_jp.h +++ b/src/translator_jp.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_ke.h b/src/translator_ke.h index 7eac37f..ce5b26e 100644 --- a/src/translator_ke.h +++ b/src/translator_ke.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_kr.h b/src/translator_kr.h index 419ef9d..3064758 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_lt.h b/src/translator_lt.h index 7d812f4..96aec3e 100644 --- a/src/translator_lt.h +++ b/src/translator_lt.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_mk.h b/src/translator_mk.h index 6fcd0a5..3ec5b55 100644 --- a/src/translator_mk.h +++ b/src/translator_mk.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_nl.h b/src/translator_nl.h index 7688882..8bffa4c 100644 --- a/src/translator_nl.h +++ b/src/translator_nl.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1188,7 +1188,7 @@ class TranslatorDutch : public Translator /*! header that is put before the list of member subprograms (Fortran). */ virtual QCString trMemberFunctionDocumentationFortran() - { return "Member Funcie/Subroutine Documentatie"; } + { return "Member Functie/Subroutine Documentatie"; } ////////////////////////////////////////////////////////////////////////// // new since 1.5.4 (mainly for Fortran) diff --git a/src/translator_no.h b/src/translator_no.h index ece980d..c4ed2b5 100644 --- a/src/translator_no.h +++ b/src/translator_no.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_pl.h b/src/translator_pl.h index 92f7aeb..db301be 100644 --- a/src/translator_pl.h +++ b/src/translator_pl.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_pt.h b/src/translator_pt.h index c9c4630..de8d160 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_ro.h b/src/translator_ro.h index 17be629..3fbbbf1 100644 --- a/src/translator_ro.h +++ b/src/translator_ro.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_ru.h b/src/translator_ru.h index 884d4ec..0dce0ca 100644 --- a/src/translator_ru.h +++ b/src/translator_ru.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_sc.h b/src/translator_sc.h index b3e94cb..ffc2f31 100644 --- a/src/translator_sc.h +++ b/src/translator_sc.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_si.h b/src/translator_si.h index c9c99f2..aa25943 100644 --- a/src/translator_si.h +++ b/src/translator_si.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_sk.h b/src/translator_sk.h index afcc0f2..6496fd6 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_sr.h b/src/translator_sr.h index 79257d4..d7af204 100644 --- a/src/translator_sr.h +++ b/src/translator_sr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_sv.h b/src/translator_sv.h index f324084..b95e05a 100644 --- a/src/translator_sv.h +++ b/src/translator_sv.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_tr.h b/src/translator_tr.h index a7b02f2..178a44b 100644 --- a/src/translator_tr.h +++ b/src/translator_tr.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1869,4 +1869,4 @@ class TranslatorTurkish : public Translator }; -#endif
\ No newline at end of file +#endif diff --git a/src/translator_tw.h b/src/translator_tw.h index f5a6b0e..8f8c973 100644 --- a/src/translator_tw.h +++ b/src/translator_tw.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_ua.h b/src/translator_ua.h index 205b675..3ace830 100644 --- a/src/translator_ua.h +++ b/src/translator_ua.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_vi.h b/src/translator_vi.h index 0ee8571..8a294fd 100644 --- a/src/translator_vi.h +++ b/src/translator_vi.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translator_za.h b/src/translator_za.h index a7af737..5c68163 100644 --- a/src/translator_za.h +++ b/src/translator_za.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/translatordecoder.h b/src/translatordecoder.h index aa3fe3c..a9df3d6 100644 --- a/src/translatordecoder.h +++ b/src/translatordecoder.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/util.cpp b/src/util.cpp index d61361c..35c656b 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -3229,6 +3229,7 @@ static QCString getCanonicalTypeForIdentifier( { //result = mType->qualifiedName(); // changed after 1.7.2 //result = mType->typeString(); + //printf("word=%s typeString=%s\n",word.data(),mType->typeString()); if (word!=mType->typeString()) { result = getCanonicalTypeForIdentifier(d,fs,mType->typeString(),tSpec,count++); @@ -3708,8 +3709,8 @@ bool getDefs(const QCString &scName,const QCString &memberName, if (memberName.isEmpty()) return FALSE; /* empty name => nothing to link */ QCString scopeName=scName; - //printf("Search for name=%s args=%s in scope=%s\n", - // memberName.data(),args,scopeName.data()); + //printf("Search for name=%s args=%s in scope=%s forceEmpty=%d\n", + // memberName.data(),args,scopeName.data(),forceEmptyScope); int is,im=0,pm=0; // strip common part of the scope from the scopeName @@ -3743,7 +3744,9 @@ bool getDefs(const QCString &scName,const QCString &memberName, MemberName *mn = Doxygen::memberNameSDict->find(mName); //printf("mName=%s mn=%p\n",mName.data(),mn); - if (!forceEmptyScope && mn && !(scopeName.isEmpty() && mScope.isEmpty())) + + if ((!forceEmptyScope || scopeName.isEmpty()) && // this was changed for bug638856, forceEmptyScope => empty scopeName + mn && !(scopeName.isEmpty() && mScope.isEmpty())) { //printf(" >member name '%s' found\n",mName.data()); int scopeOffset=scopeName.length(); @@ -4309,6 +4312,7 @@ QCString linkToText(const char *link,bool isFileName) return result; } +#if 0 /* * generate a reference to a class, namespace or member. * `scName' is the name of the scope that contains the documentation @@ -4331,7 +4335,7 @@ QCString linkToText(const char *link,bool isFileName) bool generateRef(OutputDocInterface &od,const char *scName, const char *name,bool inSeeBlock,const char *rt) { - //printf("generateRef(scName=%s,name=%s,rt=%s)\n",scName,name,rt); + //printf("generateRef(scName=%s,name=%s,inSee=%d,rt=%s)\n",scName,name,inSeeBlock,rt); Definition *compound; MemberDef *md; @@ -4376,10 +4380,11 @@ bool generateRef(OutputDocInterface &od,const char *scName, od.docify(linkText); return FALSE; } +#endif bool resolveLink(/* in */ const char *scName, /* in */ const char *lr, - /* in */ bool inSeeBlock, + /* in */ bool /*inSeeBlock*/, /* out */ Definition **resContext, /* out */ QCString &resAnchor ) @@ -4387,7 +4392,7 @@ bool resolveLink(/* in */ const char *scName, *resContext=0; QCString linkRef=lr; - //printf("ResolveLink linkRef=%s\n",lr); + //printf("ResolveLink linkRef=%s inSee=%d\n",lr,inSeeBlock); FileDef *fd; GroupDef *gd; PageDef *pd; @@ -4460,7 +4465,7 @@ bool resolveLink(/* in */ const char *scName, else // probably a member reference { MemberDef *md; - bool res = resolveRef(scName,lr,inSeeBlock,resContext,&md); + bool res = resolveRef(scName,lr,TRUE,resContext,&md); if (md) resAnchor=md->anchor(); return res; } @@ -4724,6 +4729,8 @@ QCString substituteKeywords(const QCString &s,const char *title,const QCString & result = substitute(result,"$doxygenversion",versionString); result = substitute(result,"$projectname",Config_getString("PROJECT_NAME")); result = substitute(result,"$projectnumber",Config_getString("PROJECT_NUMBER")); + result = substitute(result,"$projectbrief",Config_getString("PROJECT_BRIEF")); + result = substitute(result,"$projectlogo",Config_getString("PROJECT_LOGO")); result = substitute(result,"$relpath$",relPath); return result; } @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -154,8 +154,8 @@ bool resolveLink(/* in */ const char *scName, /* out */ QCString &resAnchor ); -bool generateRef(OutputDocInterface &od,const char *, - const char *,bool inSeeBlock,const char * =0); +//bool generateRef(OutputDocInterface &od,const char *, +// const char *,bool inSeeBlock,const char * =0); bool generateLink(OutputDocInterface &od,const char *, const char *,bool inSeeBlock,const char *); diff --git a/src/version.h b/src/version.h index 671138b..116ecdd 100644 --- a/src/version.h +++ b/src/version.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 1547e80..a6bae7b 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index bf9c349..71fdd3d 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h index 25708a3..7e75970 100644 --- a/src/vhdldocgen.h +++ b/src/vhdldocgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/vhdlscanner.h b/src/vhdlscanner.h index 2523990..9a80b42 100644 --- a/src/vhdlscanner.h +++ b/src/vhdlscanner.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/vhdlscanner.l b/src/vhdlscanner.l index 2e6f0ab..ab52515 100644 --- a/src/vhdlscanner.l +++ b/src/vhdlscanner.l @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index 5ebc070..87dd0ae 100644 --- a/src/xmldocvisitor.cpp +++ b/src/xmldocvisitor.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/xmldocvisitor.h b/src/xmldocvisitor.h index 137af25..8f31c42 100644 --- a/src/xmldocvisitor.h +++ b/src/xmldocvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 0539c5d..17a0d4c 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby diff --git a/src/xmlgen.h b/src/xmlgen.h index 1bee6d8..39869ee 100644 --- a/src/xmlgen.h +++ b/src/xmlgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2010 by Dimitri van Heesch. + * Copyright (C) 1997-2011 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby |