From b655037884e82e257794004d4e88d3a9ed29d5c3 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Wed, 29 Jun 2011 20:14:58 +0000 Subject: Release-1.7.4-20110629 --- INSTALL | 4 +- README | 4 +- configure | 2 +- doc/config.doc | 24 ++++---- doc/starting.doc | 2 +- qtools/Doxyfile | 20 ++++--- src/commentcnv.l | 34 +++++++++-- src/config.xml | 30 +++++----- src/configoptions.cpp | 21 +++---- src/dot.cpp | 87 ++++++++++++++++++--------- src/dot.h | 20 ++++--- src/doxygen.cpp | 2 + src/doxygen.css | 31 +++++++++- src/doxygen_css.h | 31 +++++++++- src/fortranscanner.l | 82 +++++++++++++++++++++----- src/htmlgen.cpp | 153 ++++++++++++++++++++---------------------------- src/htmlgen.h | 6 +- src/latexdocvisitor.cpp | 6 +- src/latexgen.cpp | 14 +++-- src/latexgen.h | 6 +- src/layout.cpp | 6 +- src/mangen.h | 6 +- src/outputgen.cpp | 5 +- src/qhp.cpp | 5 ++ src/rtfgen.cpp | 8 ++- src/rtfgen.h | 8 +-- src/scanner.l | 2 +- src/search.js | 4 +- src/search_js.h | 4 +- src/svgpan.js | 100 +++++++++++++++++++------------ src/svgpan_js.h | 100 +++++++++++++++++++------------ 31 files changed, 524 insertions(+), 303 deletions(-) diff --git a/INSTALL b/INSTALL index 0bb247b..a9978b7 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.7.4-20110606 +DOXYGEN Version 1.7.4-20110629 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (06 June 2011) +Dimitri van Heesch (29 June 2011) diff --git a/README b/README index a366352..d59d4c4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.7.4_20110606 +DOXYGEN Version 1.7.4_20110629 Please read INSTALL for compilation instructions. @@ -26,4 +26,4 @@ forum. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (06 June 2011) +Dimitri van Heesch (dimitri@stack.nl) (29 June 2011) diff --git a/configure b/configure index 167c086..b209027 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ doxygen_version_minor=7 doxygen_version_revision=4 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=20110606 +doxygen_version_mmn=20110629 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` diff --git a/doc/config.doc b/doc/config.doc index 7f98fd0..c39befa 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -2282,14 +2282,13 @@ install and use dot, since it yields more powerful graphs. \anchor cfg_dot_fontname
\c DOT_FONTNAME
\addindex DOT_FONTNAME - By default doxygen will write a font called \c FreeSans.ttf to the output - directory and reference it in all dot files that doxygen generates. This - font does not include all possible unicode characters however, so when you need - these (or just want a differently looking font) you can specify the font name - using \c DOT_FONTNAME. You need to make sure dot is able to find the font, - which can be done by putting it in a standard location or by setting the - \c DOTFONTPATH environment variable or by setting \c DOT_FONTPATH to the directory - containing the font. + By default doxygen will use the Helvetica font for all dot files that + doxygen generates. + When you want a differently looking font you can specify the font name + using \c DOT_FONTNAME. You need to make sure dot is able to find the font, + which can be done by putting it in a standard location or by setting the + \c DOTFONTPATH environment variable or by setting \c DOT_FONTPATH to the + directory containing the font. \anchor cfg_dot_fontsize
\c DOT_FONTSIZE
@@ -2422,13 +2421,18 @@ The default size is 10pt. The \c DOT_IMAGE_FORMAT tag can be used to set the image format of the images generated by dot. Possible values are svg, png, jpg, or gif. If left blank png will be used. + \note If you choose \c svg you need to set + HTML_FILE_EXTENSION to xhtml in order to make the SVG files + visible in IE 9+ (other browsers do not have this requirement). \anchor cfg_interactive_svg
\c INTERACTIVE_SVG If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to enable generation of interactive SVG images that allow zooming and panning. - Note that this requires a modern browser. For Internet Explorer you will need - at least version 9. + Note that this requires a modern browser other than Internet Explorer. + Tested and working are Firefox, Chrome, Safari, and Opera. + \note For IE 9+ you need to set \c HTML_FILE_EXTENSION to xhtml in order + to make the SVG files visible. Older versions of IE do not have SVG support. \anchor cfg_dot_path
\c DOT_PATH
diff --git a/doc/starting.doc b/doc/starting.doc index 6b76be7..e6edf1d 100644 --- a/doc/starting.doc +++ b/doc/starting.doc @@ -204,7 +204,7 @@ In this case the \c Makefile will only contain a target to build \addindex RTF Doxygen combines the RTF output to a single file called refman.rtf. This file is optimized for importing into the Microsoft Word. Certain information -is encoded using field. To show the actual value you need to +is encoded using so called fields. To show the actual value you need to select all (Edit - select all) and then toggle fields (right click and select the option from the drop down menu). diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 329fb48..49929f5 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.7.2 +# Doxyfile 1.7.4 #--------------------------------------------------------------------------- # Project related configuration options @@ -6,6 +6,8 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Qtools PROJECT_NUMBER = +PROJECT_BRIEF = +PROJECT_LOGO = OUTPUT_DIRECTORY = ../qtools_docs CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -36,6 +38,7 @@ SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES +INLINE_GROUPED_CLASSES = NO TYPEDEF_HIDES_STRUCT = NO SYMBOL_CACHE_SIZE = 0 #--------------------------------------------------------------------------- @@ -128,16 +131,17 @@ IGNORE_PREFIX = Q #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = -HTML_FILE_EXTENSION = .html +HTML_FILE_EXTENSION = .xhtml HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = +HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_GAMMA = 80 HTML_TIMESTAMP = YES HTML_ALIGN_MEMBERS = YES -HTML_DYNAMIC_SECTIONS = NO +HTML_DYNAMIC_SECTIONS = YES GENERATE_DOCSET = YES DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project @@ -171,7 +175,7 @@ FORMULA_TRANSPARENT = YES USE_MATHJAX = NO MATHJAX_RELPATH = http://www.mathjax.org/mathjax SEARCHENGINE = YES -SERVER_BASED_SEARCH = YES +SERVER_BASED_SEARCH = NO #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -183,6 +187,7 @@ COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = +LATEX_FOOTER = PDF_HYPERLINKS = YES USE_PDFLATEX = YES LATEX_BATCHMODE = NO @@ -249,9 +254,9 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = NO MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO +HAVE_DOT = YES DOT_NUM_THREADS = 0 -DOT_FONTNAME = FreeSans.ttf +DOT_FONTNAME = DOT_FONTSIZE = 10 DOT_FONTPATH = CLASS_GRAPH = YES @@ -265,7 +270,8 @@ CALL_GRAPH = NO CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg +INTERACTIVE_SVG = YES DOT_PATH = DOTFILE_DIRS = MSCFILE_DIRS = diff --git a/src/commentcnv.l b/src/commentcnv.l index 6884865..ac72394 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -64,6 +64,8 @@ static QCString g_blockName; static int g_lastCommentContext; static bool g_inSpecialComment; static bool g_inRoseComment; +static int g_stringContext; +static int g_charContext; static int g_javaBlock; static bool g_specialComment; @@ -310,10 +312,12 @@ void replaceComment(int offset); } "\"" { /* start of a string */ copyToOutput(yytext,yyleng); + g_stringContext = YY_START; BEGIN(SkipString); } ' { copyToOutput(yytext,yyleng); + g_charContext = YY_START; BEGIN(SkipChar); } \n { /* new line */ @@ -506,7 +510,7 @@ void replaceComment(int offset); } "\"" { /* end of string */ copyToOutput(yytext,yyleng); - BEGIN(Scan); + BEGIN(g_stringContext); } . { /* any other string character */ copyToOutput(yytext,yyleng); @@ -519,7 +523,7 @@ void replaceComment(int offset); } ' { /* end of character literal */ copyToOutput(yytext,yyleng); - BEGIN(Scan); + BEGIN(g_charContext); } . { /* any other string character */ copyToOutput(yytext,yyleng); @@ -528,10 +532,10 @@ void replaceComment(int offset); copyToOutput(yytext,yyleng); } -[^\\!@*\n{]* { /* anything that is not a '*' or command */ +[^\\!@*\n{\"]* { /* anything that is not a '*' or command */ copyToOutput(yytext,yyleng); } -"*"+[^*/\\@\n]* { /* stars without slashes */ +"*"+[^*/\\@\n{\"]* { /* stars without slashes */ copyToOutput(yytext,yyleng); } "\"\"\"" { /* end of Python docstring */ @@ -593,6 +597,16 @@ void replaceComment(int offset); BEGIN(Scan); } } +"'" { + g_charContext = YY_START; + copyToOutput(yytext,yyleng); + BEGIN(SkipChar); + } +"\"" { + g_stringContext = YY_START; + copyToOutput(yytext,yyleng); + BEGIN(SkipString); + } . { copyToOutput(yytext,yyleng); } @@ -734,6 +748,18 @@ void replaceComment(int offset); } ^[ \t]*"//"[/!]/[^\n]+ { // skip leading special comments (see bug 618079) } +"*/" { // oops, end of comment in the middle of an alias? + if (g_lang==SrcLangExt_Python) + { + REJECT; + } + else // abort the alias, restart scanning + { + copyToOutput(g_aliasString,g_aliasString.length()); + copyToOutput(yytext,yyleng); + BEGIN(Scan); + } + } [^{}\n\\\*]+ { g_aliasString+=yytext; g_lastEscaped=FALSE; diff --git a/src/config.xml b/src/config.xml index 6893283..9f081c4 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1405,23 +1405,21 @@ explicitly to a value larger than 0 to get control over the balance between CPU load and processing speed. ' defval='0' minval='0' maxval='32'/>