From 0c751ba9f9a73ad649bf64cef4c9fdb82743b2f6 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 27 Oct 2009 20:10:16 +0000 Subject: Release-1.6.1-20091027 --- INSTALL | 4 +- README | 4 +- addon/doxywizard/doxywizard.cpp | 42 ++-- addon/doxywizard/expert.cpp | 3 +- addon/doxywizard/inputstring.cpp | 12 +- addon/doxywizard/inputstring.h | 4 +- addon/doxywizard/inputstrlist.h | 12 +- configure | 2 +- doc/autolink.doc | 5 +- doc/commands.doc | 15 +- doc/customize.doc | 6 + doc/language.doc | 4 +- doc/translator_report.txt | 33 +-- qtools/Doxyfile | 4 +- qtools/qglobal.h | 5 +- src/classdef.cpp | 2 + src/cmdmapper.cpp | 1 + src/cmdmapper.h | 3 +- src/code.l | 3 +- src/commentscan.h | 5 +- src/commentscan.l | 26 ++- src/config.l | 12 -- src/config.xml | 2 +- src/dbusxmlscanner.cpp | 4 +- src/definition.cpp | 17 +- src/docparser.cpp | 449 ++++++++++++++++++++------------------- src/docparser.h | 23 +- src/docsets.cpp | 256 +++++++++++++--------- src/docsets.h | 8 +- src/doctokenizer.l | 4 +- src/dot.cpp | 2 +- src/doxygen.cpp | 46 ++-- src/fortrancode.l | 2 +- src/fortranscanner.l | 3 +- src/ftvhelp.h | 7 +- src/htmldocvisitor.cpp | 44 +++- src/htmlhelp.cpp | 52 +++-- src/htmlhelp.h | 8 +- src/index.cpp | 28 ++- src/index.h | 39 ++-- src/memberdef.cpp | 91 ++------ src/namespacedef.cpp | 2 + src/pagedef.cpp | 3 +- src/pre.l | 3 +- src/pycode.l | 2 +- src/pyscanner.l | 3 +- src/qhp.cpp | 98 ++++++--- src/qhp.h | 12 +- src/rtfgen.cpp | 4 +- src/scanner.l | 9 +- src/search.js | 36 ++-- src/search_js.h | 36 ++-- src/translator_fr.h | 217 ++++++++++++++++++- src/util.cpp | 40 ++-- src/vhdlcode.l | 3 +- src/vhdlscanner.l | 3 +- 56 files changed, 1050 insertions(+), 713 deletions(-) diff --git a/INSTALL b/INSTALL index 0a2c3d0..fa4394d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.6.1-20091004 +DOXYGEN Version 1.6.1-20091027 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (04 October 2009) +Dimitri van Heesch (27 October 2009) diff --git a/README b/README index 99f0029..0242594 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.6.1_20091004 +DOXYGEN Version 1.6.1_20091027 Please read INSTALL for compilation instructions. @@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (04 October 2009) +Dimitri van Heesch (dimitri@stack.nl) (27 October 2009) diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index a14aa4e..2001687 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -85,10 +85,6 @@ MainWindow::MainWindow() m_launchHtml = new QPushButton(tr("Show HTML output")); launchLayout->addWidget(m_launchHtml); -#if 0 - m_launchPdf = new QPushButton(tr("Show PDF output")); - launchLayout->addWidget(m_launchPdf); -#endif launchLayout->addStretch(1); grid->addLayout(launchLayout,1,0); runTabLayout->addLayout(grid); @@ -300,24 +296,12 @@ void MainWindow::loadSettings() { QVariant geometry = m_settings.value(QString::fromAscii("main/geometry"), QVariant::Invalid); QVariant state = m_settings.value(QString::fromAscii("main/state"), QVariant::Invalid); - //QVariant expState = m_settings.value(QString::fromAscii("expert/state"), QVariant::Invalid); - //QVariant expState2 = m_settings.value(QString::fromAscii("expert/state2"), QVariant::Invalid); QVariant wizState = m_settings.value(QString::fromAscii("wizard/state"), QVariant::Invalid); QVariant loadSettings = m_settings.value(QString::fromAscii("wizard/loadsettings"), QVariant::Invalid); - //QVariant workingDir = m_settings.value(QString::fromAscii("main/defdir"), QVariant::Invalid); if (geometry !=QVariant::Invalid) restoreGeometry(geometry.toByteArray()); if (state !=QVariant::Invalid) restoreState (state.toByteArray()); - //if (expState !=QVariant::Invalid) m_expert->restoreState(expState.toByteArray()); - //if (expState2 !=QVariant::Invalid) m_expert->restoreInnerState(expState2.toByteArray()); if (wizState !=QVariant::Invalid) m_wizard->restoreState(wizState.toByteArray()); - //if (workingDir!=QVariant::Invalid) - //{ - // QString dir = workingDir.toString(); - // m_workingDir->setText(dir); - // QDir::setCurrent(dir); - // m_run->setEnabled(!dir.isEmpty()); - //} if (loadSettings!=QVariant::Invalid && loadSettings.toBool()) { m_expert->loadSettings(&m_settings); @@ -337,8 +321,6 @@ void MainWindow::saveSettings() m_settings.setValue(QString::fromAscii("main/geometry"), saveGeometry()); m_settings.setValue(QString::fromAscii("main/state"), saveState()); - //m_settings.setValue(QString::fromAscii("expert/state"), m_expert->saveState()); - //m_settings.setValue(QString::fromAscii("expert/state2"), m_expert->saveInnerState()); m_settings.setValue(QString::fromAscii("wizard/state"), m_wizard->saveState()); } @@ -387,15 +369,19 @@ void MainWindow::runDoxygen() #if defined(Q_OS_MACX) doxygenPath = qApp->applicationDirPath()+QString::fromAscii("/../Resources/"); qDebug() << tr("Doxygen path: ") << doxygenPath; - if ( !QFile(doxygenPath + QString::fromAscii("doxygen")).exists() ) { - // No doygen binary in the resources, if there is a system doxygen binary, use that instead - if ( QFile(QString::fromAscii("/usr/local/bin/doxygen")).exists() ) - doxygenPath = QString::fromAscii("/usr/local/bin/"); - else { - qDebug() << tr("Can't find the doxygen command, make sure it's in your $$PATH"); - doxygenPath = QString::fromAscii(""); - } - } + if ( !QFile(doxygenPath + QString::fromAscii("doxygen")).exists() ) + { + // No doygen binary in the resources, if there is a system doxygen binary, use that instead + if ( QFile(QString::fromAscii("/usr/local/bin/doxygen")).exists() ) + { + doxygenPath = QString::fromAscii("/usr/local/bin/"); + } + else + { + qDebug() << tr("Can't find the doxygen command, make sure it's in your $$PATH"); + doxygenPath = QString::fromAscii(""); + } + } qDebug() << tr("Getting doxygen from: ") << doxygenPath; #endif @@ -423,7 +409,7 @@ void MainWindow::runDoxygen() QTextStream t(m_runProcess); m_expert->writeConfig(t,false); m_runProcess->closeWriteChannel(); - + if (m_runProcess->state() == QProcess::NotRunning) { m_outputLog->append(QString::fromAscii("*** Failed to run doxygen\n")); diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp index 7c16c28..9b665ca 100644 --- a/addon/doxywizard/expert.cpp +++ b/addon/doxywizard/expert.cpp @@ -158,7 +158,8 @@ QWidget *Expert::createTopicWidget(QDomElement &elem) child.attribute(SA("id")), child.attribute(SA("defval")), mode, - child.attribute(SA("docs")) + child.attribute(SA("docs")), + child.attribute(SA("abspath")) ); m_options.insert( child.attribute(SA("id")), diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp index 7b0aea0..58ace8b 100644 --- a/addon/doxywizard/inputstring.cpp +++ b/addon/doxywizard/inputstring.cpp @@ -21,8 +21,10 @@ InputString::InputString( QGridLayout *layout,int &row, const QString & id, const QString &s, - StringMode m, const QString &docs ) - : m_default(s), m_sm(m), m_index(0), m_docs(docs), m_id(id) + StringMode m, const QString &docs, + const QString &absPath ) + : m_default(s), m_sm(m), m_index(0), m_docs(docs), m_id(id), + m_absPath(absPath==QString::fromAscii("1")) { m_lab = new HelpLabel(id); if (m==StringFixed) @@ -126,7 +128,7 @@ void InputString::browse() QDir dir(path); if (!MainWindow::instance().configFileName().isEmpty() && dir.exists()) { - fileName = dir.relativeFilePath(fileName); + fileName = m_absPath ? fileName : dir.relativeFilePath(fileName); } setValue(fileName); } @@ -140,10 +142,10 @@ void InputString::browse() QDir dir(path); if (!MainWindow::instance().configFileName().isEmpty() && dir.exists()) { - dirName = dir.relativeFilePath(dirName); + dirName = m_absPath ? dirName : dir.relativeFilePath(dirName); } setValue(dirName); - } + } } } diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h index 13efb44..9d69a09 100644 --- a/addon/doxywizard/inputstring.h +++ b/addon/doxywizard/inputstring.h @@ -41,7 +41,8 @@ class InputString : public QObject, public Input InputString( QGridLayout *layout,int &row, const QString &id, const QString &s, StringMode m, - const QString &docs ); + const QString &docs, + const QString &absPath = QString() ); ~InputString(); void addValue(QString s); void setDefault(); @@ -83,6 +84,7 @@ class InputString : public QObject, public Input QVariant m_value; QString m_docs; QString m_id; + bool m_absPath; }; #endif diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h index 912f441..24717a9 100644 --- a/addon/doxywizard/inputstrlist.h +++ b/addon/doxywizard/inputstrlist.h @@ -33,14 +33,14 @@ class InputStrList : public QObject, public Input Q_OBJECT public: - enum ListMode { ListString = 0, - ListFile = 1, - ListDir = 2, - ListFileDir = ListFile | ListDir + enum ListMode { ListString = 0, + ListFile = 1, + ListDir = 2, + ListFileDir = ListFile | ListDir }; - + InputStrList( QGridLayout *layout,int &row, - const QString &id, const QStringList &sl, + const QString &id, const QStringList &sl, ListMode v, const QString &docs); void setValue(const QStringList &sl); diff --git a/configure b/configure index 9243607..f9d7fa2 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ doxygen_version_minor=6 doxygen_version_revision=1 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=20091004 +doxygen_version_mmn=20091027 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` diff --git a/doc/autolink.doc b/doc/autolink.doc index 96ce3bc..767fb5f 100644 --- a/doc/autolink.doc +++ b/doc/autolink.doc @@ -38,11 +38,12 @@ \section linkclass Links to classes. All words in the documentation that correspond to a documented class and - contain at least one upper case character will automatically be replaced by - a link to the page containing the + contain at least one non-lower case character will automatically be + replaced by a link to the page containing the documentation of the class. If you want to prevent that a word that corresponds to a documented class is replaced by a link you should put a \% in front of the word. + To link to an all lower case symbol, use \ref cmdref "\\ref". \section linkfile Links to files. diff --git a/doc/commands.doc b/doc/commands.doc index 43948a4..b56ebf3 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -176,6 +176,7 @@ documentation: \refitem cmdgt \\\> \refitem cmdhash \\\# \refitem cmdperc \\\% +\refitem cmdquot \\\" \endsecreflist The following subsections provide a list of all commands that are recognized by @@ -224,6 +225,7 @@ Structural indicators \sa page \ref grouping "Grouping", sections \ref cmddefgroup "\\defgroup", \ref cmdingroup "\\ingroup" and \ref cmdweakgroup "\\weakgroup". +
\section cmdcallgraph \\callgraph \addindex \\callgraph @@ -324,7 +326,6 @@ Structural indicators stripped from the full path before it appears in the output.
- \section cmdenum \\enum \addindex \\enum @@ -884,6 +885,7 @@ Section indicators The \\attention command ends when a blank line or some other sectioning command is encountered. +
\section cmdauthor \\author { list of authors } \addindex \\author @@ -1423,6 +1425,7 @@ void memcpy(void *dest, const void *src, size_t n); sectioning command is encountered. See section \ref cmdauthor "\\author" for an example. +
\section cmdxrefitem \\xrefitem "(heading)" "(list title)" {text} \addindex \\xrefitem @@ -1465,6 +1468,7 @@ Commands to create links \htmlonly \endhtmlonly +
\section cmdaddindex \\addindex (text) \addindex \\addindex @@ -1644,6 +1648,7 @@ Commands for displaying examples \htmlonly \endhtmlonly +
\section cmddontinclude \\dontinclude \addindex \\dontinclude @@ -2453,6 +2458,7 @@ class Receiver This command writes the \> character to the output. This character has to be escaped because it has a special meaning in HTML. +
\section cmdperc \\\% \addindex \\\% @@ -2461,7 +2467,14 @@ class Receiver prevent auto-linking to word that is also a documented class or struct.
+\section cmdquot \\\" + \addindex \\\" + This command writes the \" character to the output. This + character has to be escaped in some cases, because it is used to + prevent auto-linking to word that is also a documented class or struct. + +
\htmlonly
\endhtmlonly

\htmlonly --- \endhtmlonly diff --git a/doc/customize.doc b/doc/customize.doc index d840484..40ef398 100644 --- a/doc/customize.doc +++ b/doc/customize.doc @@ -87,6 +87,12 @@ doxygen -l optionally the name of the layout file can be specified, if omitted \c DoxygenLayout.xml will be used. +The next step is to mention the layout file in the config file +\verbatim +LAYOUT_FILE = DoxygenLayout.xml +\endverbatim +The change the layout all you need to do is edit the layout file. + The toplevel structure of the file looks as follows: \verbatim diff --git a/doc/language.doc b/doc/language.doc index 4494aad..3dbd686 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -134,7 +134,7 @@ when the translator was updated. French Xavier Outhier xouthier at yahoo dot fr - 1.5.4 + up-to-date German @@ -336,7 +336,7 @@ when the translator was updated. \hline Finnish & Antti Laine & {\tt\tiny antti.a.laine@tut.fi} & 1.6.0 \\ \hline - French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.5.4 \\ + French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & up-to-date \\ \hline German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & 1.6.0 \\ \hline diff --git a/doc/translator_report.txt b/doc/translator_report.txt index f3f12e0..bca0e8e 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -10,7 +10,7 @@ Persian, Polish, Portuguese, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese. -Of them, 5 translators are up-to-date, 33 translators are based on +Of them, 6 translators are up-to-date, 32 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- @@ -22,6 +22,7 @@ still may be some details listed even for them: TranslatorCzech TranslatorDutch TranslatorEnglish + TranslatorFrench -- The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs() TranslatorKorean TranslatorPolish -- Remove the obsolete methods (never used). @@ -53,7 +54,6 @@ must be implemented to become up-to-date: TranslatorBrazilian 1.6.0 5 methods to implement (2 %) TranslatorAfrikaans 1.6.0 5 methods to implement (2 %) TranslatorGreek 1.5.4 27 methods to implement (12 %) - TranslatorFrench 1.5.4 22 methods to implement (9 %) TranslatorDanish 1.5.4 27 methods to implement (12 %) TranslatorSlovene 1.4.6 29 methods to implement (13 %) TranslatorNorwegian 1.4.6 28 methods to implement (12 %) @@ -288,35 +288,10 @@ TranslatorFinnish (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) virtual QCString trDirRelation(const char * name) -TranslatorFrench (TranslatorAdapter_1_5_4) 22 methods to implement (9 %) +TranslatorFrench (Translator) ---------------- - Implements 199 of the required methods (90 %). - - Missing methods (should be implemented): - - virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) - virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) - virtual QCString trSubprograms() - virtual QCString trModulesListDescription(bool extractAll) - virtual QCString trModulesList() - virtual QCString trTypeConstraints() - virtual QCString trMemberFunctionDocumentationFortran() - virtual QCString trCompoundListDescriptionFortran() - virtual QCString trTypeDocumentation() - virtual QCString trModuleReference(const char * namespaceName) - virtual QCString trModulesMemberDescription(bool extractAll) - virtual QCString trModulesMembers() - virtual QCString trModulesIndex() - virtual QCString trCompoundListFortran() - virtual QCString trDataTypes() - virtual QCString trCompoundIndexFortran() - virtual QCString trSubprogram(bool first_capital, bool singular) - virtual QCString trCompoundReferenceFortran(const char * clName, ClassDef::CompoundType compType, bool isTemplate) - virtual QCString trType(bool first_capital, bool singular) - virtual QCString trModule(bool first_capital, bool singular) - virtual QCString trCompoundMembersFortran() - virtual QCString trSubprogramDocumentation() + Implements 221 of the required methods (100 %). TranslatorGerman (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 21e3bd0..58c8211 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -139,9 +139,9 @@ GENERATE_CHI = NO CHM_INDEX_ENCODING = BINARY_TOC = NO TOC_EXPAND = NO -GENERATE_QHP = NO +GENERATE_QHP = YES QCH_FILE = -QHP_NAMESPACE = +QHP_NAMESPACE = com.qtools QHP_VIRTUAL_FOLDER = doc QHP_CUST_FILTER_NAME = QHP_CUST_FILTER_ATTRS = diff --git a/qtools/qglobal.h b/qtools/qglobal.h index 5417861..700cb80 100644 --- a/qtools/qglobal.h +++ b/qtools/qglobal.h @@ -86,7 +86,10 @@ # if !defined(MAC_OS_X_VERSION_10_5) # define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 # endif -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) +# if !defined(MAC_OS_X_VERSION_10_6) +# define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1 +# endif +# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6) # error "This version of Mac OS X is unsupported" # endif #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) diff --git a/src/classdef.cpp b/src/classdef.cpp index 73bb09c..8003fe0 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1423,6 +1423,8 @@ void ClassDef::writeDocumentation(OutputList &ol) ol.popGeneratorState(); } + Doxygen::indexList.addIndexItem(this,0); + if (!Config_getString("GENERATE_TAGFILE").isEmpty()) { Doxygen::tagFile << " endFontClass(); } + endFontClass(); g_code->endCodeLine(); } diff --git a/src/commentscan.h b/src/commentscan.h index d01bea9..8c4f0ab 100644 --- a/src/commentscan.h +++ b/src/commentscan.h @@ -37,7 +37,8 @@ class ParserInterface; * Note that leading *'s are already stripped from the comment block. * @param[in] fileName The name of the file in which the comment is found. * Mainly used for producing warnings. - * @param[in] lineNr The line number at which the comment block was found. + * @param[in,out] lineNr The line number at which the comment block was found. + * When the function returns it will be set to the last line parsed. * @param[in] isBrief TRUE iff this comment block represents a brief description. * @param[in] isJavaDocStyle TRUE iff this comment block is in "JavaDoc" style. * This means that it starts as a brief description until the end of @@ -62,7 +63,7 @@ bool parseCommentBlock(ParserInterface *parser, Entry *curEntry, const QCString &comment, const QCString &fileName, - int lineNr, + int &lineNr, bool isBrief, bool isJavaDocStyle, bool isInbody, diff --git a/src/commentscan.l b/src/commentscan.l index d7d064d..8d0e340 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -451,12 +451,6 @@ static bool makeStructuralIndicator(Entry::Sections s) { if (!getDocSectionName(current->section).isEmpty()) { - //warn(yyFileName,yyLineNr, - // "Warning: found a structural command %s for a section already " - // "marked with structural command %s. Ignoring the latter command.", - // getDocSectionName(s).data(), - // getDocSectionName(current->section).data() - // ); return TRUE; } else @@ -2005,7 +1999,10 @@ static bool handlePage(const QCString &) static bool handleMainpage(const QCString &) { bool stop=makeStructuralIndicator(Entry::MAINPAGEDOC_SEC); - if (!stop) current->name = "mainpage"; + if (!stop) + { + current->name = "mainpage"; + } BEGIN( PageDocArg2 ); return stop; } @@ -2013,7 +2010,10 @@ static bool handleMainpage(const QCString &) static bool handleFile(const QCString &) { bool stop=makeStructuralIndicator(Entry::FILEDOC_SEC); - if (!stop) current->name = yyFileName; + if (!stop) + { + current->name = yyFileName; + } BEGIN( FileDocArg1 ); return stop; } @@ -2372,7 +2372,7 @@ bool parseCommentBlock(/* in */ ParserInterface *parser, /* in */ Entry *curEntry, /* in */ const QCString &comment, /* in */ const QCString &fileName, - /* in */ int lineNr, + /* in,out */ int &lineNr, /* in */ bool isBrief, /* in */ bool isAutoBriefOn, /* in */ bool isInbody, @@ -2456,8 +2456,16 @@ bool parseCommentBlock(/* in */ ParserInterface *parser, newEntryNeeded = needNewEntry; + // if we did not proceed during this call, it does not make + // sence to continue, since we get stuck. See bug 567346 for situations + // were this happens + if (parseMore && position==inputPosition) parseMore=FALSE; + if (parseMore) position=inputPosition; else position=0; + lineNr = yyLineNr; + //printf("position=%d parseMore=%d\n",position,parseMore); + return parseMore; } diff --git a/src/config.l b/src/config.l index df07204..5e83dff 100644 --- a/src/config.l +++ b/src/config.l @@ -1383,18 +1383,6 @@ void Config::check() Config_getBool("GENERATE_QHP")=qhp; } - // check QCH creation requirements - if (!Config_getString("QHG_LOCATION").isEmpty() && - !Config_getBool("GENERATE_QHP")) - { - config_err("Warning: Specifying QHG_LOCATION requires GENERATE_QHP=YES.\n"); - } - if (!Config_getString("QCH_FILE").isEmpty() && - Config_getString("QHG_LOCATION").isEmpty()) - { - config_err("Warning: Specifying QCH_FILE requires QHG_LOCATION to be set.\n"); - } - if (Config_getBool("OPTIMIZE_OUTPUT_JAVA") && Config_getBool("INLINE_INFO")) { // don't show inline info for Java output, since Java has no inline diff --git a/src/config.xml b/src/config.xml index 8395f54..677c02b 100644 --- a/src/config.xml +++ b/src/config.xml @@ -816,7 +816,7 @@ If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can be used to specify the location (absolute path including file name) of the HTML help compiler (hhc.exe). If non-empty doxygen will try to run the HTML help compiler on the generated index.hhp. -' defval='' depends='GENERATE_HTMLHELP'/> +' defval='' depends='GENERATE_HTMLHELP' abspath='1'/>