From 142b4807d2ae7479691bd0800d28364b9857b82f Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Mon, 20 Jul 2009 20:05:52 +0000 Subject: Release-1.5.9-20090720 --- INSTALL | 4 +- README | 4 +- addon/doxywizard/Makefile.in | 6 +- configure | 2 +- doc/config.doc | 37 +- doc/dbusxml.doc | 141 +++++++ doc/installdox_usage.doc | 7 +- doc/starting.doc | 8 +- examples/dbusxml.cfg | 10 + examples/dbusxml.xml | 78 ++++ qtools/Doxyfile | 15 +- src/commentcnv.l | 2 +- src/config.xml | 14 +- src/configoptions.cpp | 21 +- src/dbusxmlscanner.cpp | 874 +++++++++++++++++++++++++++++++++++++++++++ src/dbusxmlscanner.h | 57 +++ src/docparser.h | 1 + src/docsets.cpp | 1 + src/doxygen.cpp | 38 +- src/doxygen.h | 1 - src/fortranscanner.l | 23 +- src/ftvhelp.cpp | 6 +- src/htmlgen.cpp | 123 ++---- src/index.cpp | 72 +++- src/latexgen.cpp | 9 +- src/libdoxygen.pro.in | 2 + src/portable.cpp | 5 + src/portable.h | 1 + src/pre.l | 5 +- src/scanner.l | 33 +- src/search.css | 50 ++- src/search.js | 352 ++++++++++++++--- src/search_css.h | 50 ++- src/search_js.h | 352 ++++++++++++++--- src/util.cpp | 45 +-- src/util.h | 3 +- 36 files changed, 2072 insertions(+), 380 deletions(-) create mode 100644 doc/dbusxml.doc create mode 100644 examples/dbusxml.cfg create mode 100644 examples/dbusxml.xml create mode 100644 src/dbusxmlscanner.cpp create mode 100644 src/dbusxmlscanner.h diff --git a/INSTALL b/INSTALL index 81b8294..012b839 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.5.9-20090622 +DOXYGEN Version 1.5.9-20090720 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (22 June 2009) +Dimitri van Heesch (20 July 2009) diff --git a/README b/README index 8d60917..6d0ac8a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.5.9_20090622 +DOXYGEN Version 1.5.9_20090720 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) (22 June 2009) +Dimitri van Heesch (dimitri@stack.nl) (20 July 2009) diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in index fa459c2..75a3a6d 100644 --- a/addon/doxywizard/Makefile.in +++ b/addon/doxywizard/Makefile.in @@ -10,16 +10,16 @@ # See the GNU General Public License for more details. # -QMAKE = qmake +QMAKE=qmake all: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard Makefile.doxywizard: doxywizard.pro - $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard + $(QMAKE) doxywizard.pro -o Makefile.doxywizard qmake: - $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard + $(QMAKE) doxywizard.pro -o Makefile.doxywizard clean: Makefile.doxywizard $(MAKE) -f Makefile.doxywizard clean diff --git a/configure b/configure index 4675673..dc6bf06 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ doxygen_version_minor=5 doxygen_version_revision=9 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=20090622 +doxygen_version_mmn=20090720 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` diff --git a/doc/config.doc b/doc/config.doc index 7f9fe92..4679a4c 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -1431,6 +1431,26 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn" If non-empty doxygen will try to run qhelpgenerator on the generated .qhp file. +\anchor cfg_searchengine +
\c SEARCHENGINE
+ \addindex SEARCHENGINE + The \c SEARCHENGINE tag specifies whether or not the HTML output should + contain a search function. Possible values are \c YES and \c NO. + If set to YES, doxygen will produce a search index, and a search box at + the top of each page (or in the side bar in case GENERATE_TREE is enabled). + The search engine is implemented using javascript and DHTML and should + work on any modern browser. + + It is possible to search using the keyboard; + to jump to the search box use access key + S (what the access key is + depends on the OS and browser, but it is typically CTRL, ALT/option, or both). + Inside the search box use the cursor down key to jump into the search + results window, the results can be navigated using the cursor keys. + Press Enter to select an item or escape to cancel the search. The + filter options can be selected when the cursor is inside the search box + by pressing Shift+cursor down. Also here use the cursor keys to + select a filter and enter or escape to activate or cancel the filter option. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +*/ diff --git a/doc/installdox_usage.doc b/doc/installdox_usage.doc index 59057b1..b1415a5 100644 --- a/doc/installdox_usage.doc +++ b/doc/installdox_usage.doc @@ -18,14 +18,11 @@ Installdox is a perl script that is generated by doxygen whenever tag files are used (See \c TAGFILES -in section \ref config_extref) -or the search engine is enabled (See \c SEARCHENGINE -in section \ref config_search). The script is +in section \ref config_extref). The script is located in the same directory where the HTML files are located. Its purpose is to set the location of the external documentation -for each tag file and to set the correct links to the search engine -at install time. +for each tag file at install time. Calling \c installdox with option -h at the command line will give you a brief description of the usage of the program. diff --git a/doc/starting.doc b/doc/starting.doc index 29ebc39..8e3e0d2 100644 --- a/doc/starting.doc +++ b/doc/starting.doc @@ -157,12 +157,8 @@ a browser that supports cascading style sheets (CSS) should be used generated output). Some of the features the HTML section (such as -\ref cfg_generate_treeview "GENERATE_TREEVIEW") require a browser that -supports DHTML and Javascript. - -If you plan to use the search engine (see -\ref cfg_searchengine "SEARCHENGINE"), you should view the HTML output -via a PHP-enabled web server (e.g. apache with the PHP module installed). +\ref cfg_generate_treeview "GENERATE_TREEVIEW" or the search engine) +require a browser that supports DHTML and Javascript. \subsection latex_out LaTeX output \addindex LaTeX diff --git a/examples/dbusxml.cfg b/examples/dbusxml.cfg new file mode 100644 index 0000000..3620a4a --- /dev/null +++ b/examples/dbusxml.cfg @@ -0,0 +1,10 @@ +PROJECT_NAME = "DBusXMLDocs" +OUTPUT_DIRECTORY = dbusxml +GENERATE_LATEX = NO +GENERATE_MAN = NO +GENERATE_RTF = NO +CASE_SENSE_NAMES = NO +INPUT = dbusxml.xml +QUIET = YES +JAVADOC_AUTOBRIEF = YES +EXTRACT_ALL = YES diff --git a/examples/dbusxml.xml b/examples/dbusxml.xml new file mode 100644 index 0000000..4ab7f78 --- /dev/null +++ b/examples/dbusxml.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 3ee0cd3..21e3bd0 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -149,14 +149,15 @@ QHP_SECT_FILTER_ATTRS = QHG_LOCATION = DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES +GENERATE_TREEVIEW = NO USE_INLINE_TREES = NO TREEVIEW_WIDTH = 250 FORMULA_FONTSIZE = 10 +SEARCHENGINE = YES #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -GENERATE_LATEX = NO +GENERATE_LATEX = YES LATEX_OUTPUT = LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex @@ -164,11 +165,11 @@ COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO -LATEX_SOURCE_CODE = NO +LATEX_SOURCE_CODE = YES #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -254,7 +255,3 @@ DOT_TRANSPARENT = YES DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Options related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES diff --git a/src/commentcnv.l b/src/commentcnv.l index 33d0c04..c18605d 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -348,7 +348,7 @@ void replaceComment(int offset); copyToOutput(yytext,yyleng); BEGIN(CComment); } -"##" { +"#"("#")? { if (g_lang!=SrcLangExt_Python) { REJECT; diff --git a/src/config.xml b/src/config.xml index 882c96b..55d809d 100644 --- a/src/config.xml +++ b/src/config.xml @@ -898,6 +898,14 @@ when you change the font size after a successful doxygen run you need to manually remove any form_*.png images from the HTML output directory to force them to be regenerated. ' minval='8' maxval='50' defval='10' depends='GENERATE_HTML'/> +