From 2eccbfdb1a422e1ee594b1906de13d3f4a070c06 Mon Sep 17 00:00:00 2001 From: dimitri Date: Thu, 17 Feb 2011 19:40:38 +0000 Subject: Release-1.7.3-20110217 --- Doxyfile | 2 +- INSTALL | 4 +- README | 4 +- addon/doxywizard/wizard.cpp | 1 + configure | 2 +- doc/config.doc | 127 +++++++++++------ doc/doxygen.1 | 2 +- doc/language.doc | 4 +- doc/translator_report.txt | 22 +-- qtools/Doxyfile | 2 +- qtools/scstring.cpp | 9 +- src/code.l | 19 ++- src/commentscan.l | 3 +- src/config.xml | 14 ++ src/configoptions.cpp | 22 +++ src/docparser.cpp | 8 +- src/docparser.h | 2 +- src/doctokenizer.l | 5 +- src/dot.cpp | 1 + src/doxygen.cpp | 44 +++++- src/doxygen.css | 8 +- src/doxygen_css.h | 8 +- src/fortranscanner.l | 2 +- src/ftvhelp.cpp | 8 +- src/htmldocvisitor.cpp | 10 +- src/htmlgen.cpp | 329 ++++++++++++++++++++++++++++++++++++++++---- src/htmlgen.h | 2 +- src/htmlhelp.cpp | 12 ++ src/htmlhelp.h | 3 +- src/image.cpp | 1 - src/latexdocvisitor.cpp | 8 +- src/latexgen.cpp | 25 +++- src/latexgen.h | 1 + src/mandocvisitor.cpp | 16 +-- src/pagedef.cpp | 11 +- src/pre.l | 33 +++-- src/qhp.cpp | 4 +- src/rtfdocvisitor.cpp | 28 ++-- src/scanner.l | 22 ++- src/search.php | 2 +- src/search_php.h | 2 +- src/translator_it.h | 164 +++++++++++++++++----- src/util.cpp | 76 +++++----- src/util.h | 8 +- src/xmlgen.cpp | 2 +- 45 files changed, 807 insertions(+), 275 deletions(-) diff --git a/Doxyfile b/Doxyfile index c214224..fe3e33a 100644 --- a/Doxyfile +++ b/Doxyfile @@ -168,7 +168,7 @@ DOCSET_FEEDNAME = "Doxygen docs" DOCSET_BUNDLE_ID = org.doxygen.Doxygen DOCSET_PUBLISHER_ID = org.doxygen.Publisher DOCSET_PUBLISHER_NAME = Publisher -GENERATE_HTMLHELP = YES +GENERATE_HTMLHELP = NO CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO diff --git a/INSTALL b/INSTALL index 36ff039..f41a30c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.7.3-20110123 +DOXYGEN Version 1.7.3-20110217 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (23 January 2011) +Dimitri van Heesch (17 February 2011) diff --git a/README b/README index 0c97927..2468a81 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.7.3_20110123 +DOXYGEN Version 1.7.3_20110217 Please read INSTALL for compilation instructions. @@ -26,4 +26,4 @@ forum. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (23 January 2011) +Dimitri van Heesch (dimitri@stack.nl) (17 February 2011) diff --git a/addon/doxywizard/wizard.cpp b/addon/doxywizard/wizard.cpp index 3c15622..ce989e7 100644 --- a/addon/doxywizard/wizard.cpp +++ b/addon/doxywizard/wizard.cpp @@ -2,6 +2,7 @@ #include "input.h" #include "doxywizard.h" +#include #include // options configurable via the wizard diff --git a/configure b/configure index aaa84e4..eb43c20 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ doxygen_version_minor=7 doxygen_version_revision=3 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=20110123 +doxygen_version_mmn=20110217 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` diff --git a/doc/config.doc b/doc/config.doc index 8c72a23..0a3b0ce 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -161,6 +161,7 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_html_colorstyle_hue HTML_COLORSTYLE_HUE \refitem cfg_html_colorstyle_sat HTML_COLORSTYLE_SAT \refitem cfg_html_dynamic_sections HTML_DYNAMIC_SECTIONS +\refitem cfg_html_extra_files HTML_EXTRA_FILES \refitem cfg_html_file_extension HTML_FILE_EXTENSION \refitem cfg_html_footer HTML_FOOTER \refitem cfg_html_header HTML_HEADER @@ -185,6 +186,7 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_javadoc_autobrief JAVADOC_AUTOBRIEF \refitem cfg_latex_batchmode LATEX_BATCHMODE \refitem cfg_latex_cmd_name LATEX_CMD_NAME +\refitem cfg_latex_footer LATEX_FOOTER \refitem cfg_latex_header LATEX_HEADER \refitem cfg_latex_hide_indices LATEX_HIDE_INDICES \refitem cfg_latex_output LATEX_OUTPUT @@ -1280,21 +1282,18 @@ AClass::ANamespace, ANamespace::*Test
\c HTML_HEADER
\addindex HTML_HEADER The \c HTML_HEADER tag can be used to specify a user-defined HTML - header file for each generated HTML page. To get valid HTML the header file - should contain at least a \c \ and a \c \ tag, but it is - good idea to include the style sheet that is generated by doxygen as well. - Minimal example: -\verbatim - - - My title - - - -\endverbatim + header file for each generated HTML page. If the tag is left blank doxygen will generate a standard header. + To get valid HTML the header file that + includes any scripts and style sheets that doxygen + needs, it is highly recommended to start with a default header using +\verbatim +doxygen -w html new_header.html new_footer.html new_stylesheet.css YourConfigFile +\endverbatim + and then modify the file \c new_header.html. + The following markers have a special meaning inside the header and footer:
\$title
will be replaced with the title of the page. @@ -1303,55 +1302,83 @@ AClass::ANamespace, ANamespace::*Test
\$year
will be replaces with the current year.
\$doxygenversion
will be replaced with the version of doxygen
\$projectname
will be replaced with the name of - the project (see \c PROJECT_NAME) + the project (see \ref cfg_project_name "PROJECT_NAME")
\$projectnumber
will be replaced with the project number - (see \c PROJECT_NUMBER) + (see \ref cfg_project_number "PROJECT_NUMBER")
\$projectbrief
will be replaced with the project brief - description (see \c PROJECT_BRIEF) + description (see \ref cfg_project_brief "PROJECT_BRIEF")
\$projectlogo
will be replaced with the project logo - (see \c PROJECT_LOGO) + (see \ref cfg_project_logo "PROJECT_LOGO") +
\$treeview
will be replaced with links to + the javascript and style sheets needed for the navigation tree + (or an empty string when \ref cfg_generate_treeview "GENERATE_TREEVIEW" + is disabled). +
\$search
will be replaced with a links to + the javascript and style sheets needed for the search engine + (or an empty string when \ref cfg_searchengine "SEARCHENGINE" + is disabled). +
\$mathjax
will be replaced with a links to + the javascript and style sheets needed for the MathJax feature + (or an empty string when \ref cfg_use_mathjax "USE_MATHJAX" is disabled).
\$relpath\$
If \c CREATE_SUBDIRS is enabled, the command \$relpath\$ can be used to produce a relative path to the root of the HTML output directory, e.g. use \$relpath\$doxygen.css, to refer to the standard style sheet.
- - See also section \ref doxygen_usage for information on how to generate - the default header that doxygen normally uses. - @note 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 + To cope with differences in the layout of the header and footer that depend on + configuration settings, the header can also contain special blocks that + will be copied to the output or skipped depending on the configuration. + Such blocks have the following form: \verbatim -doxygen -w html header.html footer.html stylesheet.css YourConfigFile + + Some context copied when condition BLOCKNAME holds + + + Some context copied when condition BLOCKNAME does not hold + \endverbatim - and then modify that header. + The following block names are supported: +
+
DISABLE_INDEX
Content within this block is copied to the output + when the \ref cfg_disable_index "DISABLE_INDEX" option is enabled (so when the index is disabled). +
GENERATE_TREEVIEW
Content within this block is copied to the output + when the \ref cfg_generate_treeview "GENERATE_TREEVIEW" option is enabled. +
SEARCHENGINE
Content within this block is copied to the output + when the \ref cfg_searchengine "SEARCHENGINE" option is enabled. +
PROJECT_NAME
Content within the block is copied to the output + when the \ref cfg_project_name "PROJECT_NAME" option is not empty. +
PROJECT_NUMBER
Content within the block is copied to the output + when the \ref cfg_project_number "PROJECT_NUMBER" option is not empty. +
PROJECT_BRIEF
Content within the block is copied to the output + when the \ref cfg_project_brief "PROJECT_BRIEF" option is not empty. +
PROJECT_LOGO
Content within the block is copied to the output + when the \ref cfg_project_logo "PROJECT_LOGO" option is not empty. +
TITLEAREA
Content within this block is copied to the output + when a title is visible at the top of each page. This is the case + if either \ref cfg_project_name "PROJECT_NAME", + \ref cfg_project_brief "PROJECT_BRIEF", \ref cfg_project_logo "PROJECT_LOGO" + is filled in or if both \ref cfg_disable_index "DISABLE_INDEX" and + \ref cfg_searchengine "SEARCHENGINE" are enabled. +
+ + See also section \ref doxygen_usage for information on how to generate + the default header that doxygen normally uses. @note 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 \c GENERATE_TREEVIEW! + have to regenerate the default header when upgrading to a newer version of + doxygen. \anchor cfg_html_footer
\c HTML_FOOTER
\addindex HTML_FOOTER The \c HTML_FOOTER tag can be used to specify a user-defined HTML footer for - each generated HTML page. To get valid HTML the footer file should contain - at least a \c \ and a \c \ tag. A minimal example: -\verbatim - - -\endverbatim + each generated HTML page. If the tag is left blank doxygen will generate a standard footer. - The following commands have a special meaning inside the footer: - \$title, \$datetime, \$date, - \$doxygenversion, \$projectname, - \$projectnumber. - Doxygen will replace them by respectively - the title of the page, the current date and time, only the current date, - the version number of doxygen, the project name (see \c PROJECT_NAME), or the - project number (see \c PROJECT_NUMBER). + See \ref cfg_html_header "HTML_HEADER" for more information on + how to generate a default footer and what special commands can be + used inside the footer. See also section \ref doxygen_usage for information on how to generate the default footer that doxygen normally uses. @@ -1367,6 +1394,16 @@ doxygen -w html header.html footer.html stylesheet.css YourConfigFile See also section \ref doxygen_usage for information on how to generate the style sheet that doxygen normally uses. +\anchor cfg_html_extra_files +
\c HTML_EXTRA_FILES
+ \addindex HTML_EXTRA_FILES + The \c HTML_EXTRA_FILES tag can be used to specify one or more extra images or + other source files which should be copied to the HTML output directory. Note + that these files will be copied to the base HTML output directory. Use the + $relpath$ marker in the \c HTML_HEADER and/or \c HTML_FOOTER files to load these + files. In the \c HTML_STYLESHEET file, use the file name only. Also note that + the files will be copied as-is; there are no commands or markers available. + \anchor cfg_html_colorstyle_hue
\c HTML_COLORSTYLE_HUE
\addindex HTML_COLOR_STYLE_HUE @@ -1821,6 +1858,14 @@ EXTRA_PACKAGES = times the title of the page, the current date and time, only the current date, the version number of doxygen, the project name (see \c PROJECT_NAME), or the project number (see \c PROJECT_NUMBER). + +\anchor cfg_latex_footer +
\c LATEX_FOOTER
+ \addindex LATEX_FOOTER + The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for + the generated latex document. The footer should contain everything after + the last chapter. If it is left blank doxygen will generate a + standard footer. Notice: only use this tag if you know what you are doing! \anchor cfg_pdf_hyperlinks
\c PDF_HYPERLINKS
diff --git a/doc/doxygen.1 b/doc/doxygen.1 index 7006eb4..37e4adb 100644 --- a/doc/doxygen.1 +++ b/doc/doxygen.1 @@ -31,7 +31,7 @@ doxygen \fB\-w\fR rtf styleSheetFile HTML: doxygen \fB\-w\fR html headerFile footerFile styleSheetFile [configFile] .TP -LaTeX: doxygen \fB\-w\fR latex headerFile styleSheetFile [configFile] +LaTeX: doxygen \fB\-w\fR latex headerFile footerFile styleSheetFile [configFile] .TP 5) Use doxygen to generate an rtf extensions file .TP diff --git a/doc/language.doc b/doc/language.doc index f773ab6..9622e87 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -164,7 +164,7 @@ when the translator was updated. Italian Alessandro Falappa
Ahmed Aldo Faisal alessandro at falappa dot net
aaf23 at cam dot ac dot uk - 1.6.0 + up-to-date Japanese @@ -351,7 +351,7 @@ when the translator was updated. \hline Indonesian & Hendy Irawan & {\tt\tiny ceefour at gauldong dot net} & 1.4.6 \\ \hline - Italian & Alessandro Falappa & {\tt\tiny alessandro at falappa dot net} & 1.6.0 \\ + Italian & Alessandro Falappa & {\tt\tiny alessandro at falappa dot net} & up-to-date \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23 at cam dot ac dot uk} & ~ \\ \hline Japanese & Hiroki Iseri & {\tt\tiny goyoki at gmail dot com} & 1.6.0 \\ diff --git a/doc/translator_report.txt b/doc/translator_report.txt index 0d401aa..91bda18 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, 14 translators are up-to-date, 24 translators are based on +Of them, 15 translators are up-to-date, 23 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- @@ -28,6 +28,7 @@ still may be some details listed even for them: TranslatorEnglish TranslatorEsperanto TranslatorGreek + TranslatorItalian TranslatorKorean -- Change the base class to Translator. TranslatorPersian -- The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs() TranslatorSlovak @@ -64,7 +65,6 @@ must be implemented to become up-to-date: TranslatorJapanese 1.6.0 9 methods to implement (4 %) Note: Reimplementation using UTF-8 suggested. - TranslatorItalian 1.6.0 9 methods to implement (4 %) TranslatorFinnish 1.6.0 9 methods to implement (4 %) TranslatorChinesetraditional 1.6.0 9 methods to implement (4 %) Note: Reimplementation using UTF-8 suggested. @@ -379,24 +379,6 @@ TranslatorIndonesian (TranslatorAdapter_1_4_6) 32 methods to implement (14 %) virtual QCString trNoDescriptionAvailable() -TranslatorItalian (TranslatorAdapter_1_6_0) 9 methods to implement (4 %) ------------------ - - Implements 216 of the required methods (96 %). - - Missing methods (should be implemented): - - virtual QCString trSearching() - virtual QCString trNoMatches() - virtual QCString trLoading() - virtual QCString trDateTime(int year, int month, int day, int dayOfWeek, int hour, int minutes, int seconds, bool includeTime) - virtual QCString trFileIn(const char * name) - virtual QCString trGlobalNamespace() - virtual QCString trDirRelation(const char * name) - virtual QCString trDirDependency(const char * name) - virtual QCString trIncludesFileIn(const char * name) - - TranslatorJapanese (TranslatorAdapter_1_6_0) 9 methods to implement (4 %) ------------------ diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 9e2a9f4..329fb48 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -171,7 +171,7 @@ FORMULA_TRANSPARENT = YES USE_MATHJAX = NO MATHJAX_RELPATH = http://www.mathjax.org/mathjax SEARCHENGINE = YES -SERVER_BASED_SEARCH = NO +SERVER_BASED_SEARCH = YES #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- diff --git a/qtools/scstring.cpp b/qtools/scstring.cpp index 698e036..26d3a52 100644 --- a/qtools/scstring.cpp +++ b/qtools/scstring.cpp @@ -141,15 +141,16 @@ SCString &SCString::sprintf( const char *format, ... ) va_list ap; va_start( ap, format ); uint l = length(); - const uint minlen=256; + const uint minlen=4095; if (lgetPath()+"/"+absPath); - } + //QCString absPath = yytext; + //if (g_sourceFileDef && QDir::isRelativePath(absPath)) + //{ + // absPath = QDir::cleanDirPath(g_sourceFileDef->getPath()+"/"+absPath); + //} - //printf("looking for include %s -> %s\n",yytext,absPath.data()); - if ((fd=findFileDef(Doxygen::inputNameDict,absPath,ambig)) && - fd->isLinkable()) + FileDef *fd=findFileDef(Doxygen::inputNameDict,yytext,ambig); + //printf("looking for include %s -> %s fd=%p\n",yytext,absPath.data(),fd); + if (fd && fd->isLinkable()) { if (ambig) // multiple input files match the name { @@ -1925,9 +1924,9 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} found = TRUE; } } + //printf(" include file %s found=%d\n",fd ? fd->absFilePath().data() : "",found); if (found) { - //printf(" include file %s found=%d\n",fd->absFilePath().data(),found); g_code->writeCodeLink(fd->getReference(),fd->getOutputFileBase(),0,yytext,fd->briefDescriptionAsTooltip()); } else diff --git a/src/commentscan.l b/src/commentscan.l index d224600..3284e57 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2381,7 +2381,8 @@ static bool handleInternal(const QCString &) } else { - //addOutput("\\internal "); + // re-enabled for bug640828 + addOutput("\\internal "); } return FALSE; } diff --git a/src/config.xml b/src/config.xml index d08c996..cbdcb42 100644 --- a/src/config.xml +++ b/src/config.xml @@ -804,6 +804,14 @@ will generate a default style sheet. Note that doxygen will try to copy the style sheet file to the HTML output directory, so don't put your own stylesheet in the HTML output directory as well, or it will be erased! ' defval='' depends='GENERATE_HTML'/> +