From a62d9f8f1c2c97d454ff33bc1a4911d1362d9766 Mon Sep 17 00:00:00 2001 From: dimitri Date: Sun, 4 Oct 2009 20:20:24 +0000 Subject: Release-1.6.1-20091004 --- INSTALL | 4 +- README | 4 +- addon/doxywizard/doxywizard.cpp | 11 +- configure | 2 +- doc/config.doc | 38 ++- doc/language.doc | 10 +- doc/translator.py | 47 +++- doc/translator_report.txt | 253 +++++++++----------- src/bufstr.h | 4 + src/classdef.cpp | 4 +- src/config.l | 20 -- src/config.xml | 7 +- src/configoptions.cpp | 9 +- src/definition.cpp | 5 +- src/dirdef.cpp | 5 +- src/dot.cpp | 519 ++++++++++++++++++++-------------------- src/dot.h | 4 + src/doxygen.cpp | 186 ++++---------- src/filedef.cpp | 4 +- src/formula.cpp | 6 +- src/groupdef.cpp | 4 +- src/htmlgen.cpp | 2 +- src/latexgen.cpp | 53 ++-- src/libdoxycfg.t | 3 + src/memberdef.cpp | 20 +- src/membergroup.cpp | 8 +- src/namespacedef.cpp | 4 +- src/pagedef.cpp | 5 +- src/pre.h | 3 +- src/pre.l | 90 +++++-- src/scanner.l | 9 +- src/translator_cz.h | 5 +- src/translator_fr.h | 47 +++- src/translator_pl.h | 449 +++++++++++++++++----------------- src/util.cpp | 184 +++++++++++--- src/util.h | 7 +- src/vhdldocgen.cpp | 62 ++--- src/vhdldocgen.h | 2 +- 38 files changed, 1118 insertions(+), 981 deletions(-) diff --git a/INSTALL b/INSTALL index cd4eb55..0a2c3d0 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.6.1 +DOXYGEN Version 1.6.1-20091004 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (25 August 2009) +Dimitri van Heesch (04 October 2009) diff --git a/README b/README index 293d70c..99f0029 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.6.1 +DOXYGEN Version 1.6.1_20091004 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) (25 August 2009) +Dimitri van Heesch (dimitri@stack.nl) (04 October 2009) diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 2c30b14..a14aa4e 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -185,7 +185,7 @@ void MainWindow::about() t << QString::fromAscii("
A tool to configure and run doxygen version ")+ QString::fromAscii(versionString)+ QString::fromAscii(" on your source files.


" - "

Written by
Dimitri van Heesch
© 2000-2008

" + "

Written by
Dimitri van Heesch
© 2000-2009

" ""); QMessageBox::about(this,tr("Doxygen GUI"),msg); } @@ -230,7 +230,14 @@ void MainWindow::saveConfig(const QString &fileName) { if (fileName.isEmpty()) return; QFile f(fileName); - if (!f.open(QIODevice::WriteOnly)) return; + if (!f.open(QIODevice::WriteOnly)) + { + QMessageBox::warning(this, + tr("Error saving"), + tr("Error: cannot open the file ")+fileName+tr(" for writing!\n")+ + tr("Reason given: ")+f.error()); + return; + } QTextStream t(&f); m_expert->writeConfig(t,false); updateConfigFileName(fileName); diff --git a/configure b/configure index 5b53142..9243607 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=NO +doxygen_version_mmn=20091004 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` diff --git a/doc/config.doc b/doc/config.doc index f049986..9844686 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -61,8 +61,8 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_alphabetical_index ALPHABETICAL_INDEX \refitem cfg_always_detailed_sec ALWAYS_DETAILED_SEC \refitem cfg_binary_toc BINARY_TOC -\refitem cfg_builtin_stl_support BUILTIN_STL_SUPPORT \refitem cfg_brief_member_desc BRIEF_MEMBER_DESC +\refitem cfg_builtin_stl_support BUILTIN_STL_SUPPORT \refitem cfg_call_graph CALL_GRAPH \refitem cfg_caller_graph CALLER_GRAPH \refitem cfg_case_sense_names CASE_SENSE_NAMES @@ -80,6 +80,7 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_distribute_group_doc DISTRIBUTE_GROUP_DOC \refitem cfg_docset_bundle_id DOCSET_BUNDLE_ID \refitem cfg_docset_feedname DOCSET_FEEDNAME +\refitem cfg_dot_cleanup DOT_CLEANUP \refitem cfg_dot_fontname DOT_FONTNAME \refitem cfg_dot_fontpath DOT_FONTPATH \refitem cfg_dot_fontsize DOT_FONTSIZE @@ -91,8 +92,8 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_dotfile_dirs DOTFILE_DIRS \refitem cfg_doxyfile_encoding DOXYFILE_ENCODING \refitem cfg_enable_preprocessing ENABLE_PREPROCESSING -\refitem cfg_enum_values_per_line ENUM_VALUES_PER_LINE \refitem cfg_enabled_sections ENABLED_SECTIONS +\refitem cfg_enum_values_per_line ENUM_VALUES_PER_LINE \refitem cfg_example_path EXAMPLE_PATH \refitem cfg_example_patterns EXAMPLE_PATTERNS \refitem cfg_example_recursive EXAMPLE_RECURSIVE @@ -146,6 +147,7 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_hide_undoc_relations HIDE_UNDOC_RELATIONS \refitem cfg_html_align_members HTML_ALIGN_MEMBERS \refitem cfg_html_dynamic_sections HTML_DYNAMIC_SECTIONS +\refitem cfg_html_file_extension HTML_FILE_EXTENSION \refitem cfg_html_footer HTML_FOOTER \refitem cfg_html_header HTML_HEADER \refitem cfg_html_output HTML_OUTPUT @@ -155,6 +157,7 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_image_path IMAGE_PATH \refitem cfg_include_graph INCLUDE_GRAPH \refitem cfg_include_path INCLUDE_PATH +\refitem cfg_included_by_graph INCLUDED_BY_GRAPH \refitem cfg_inherit_docs INHERIT_DOCS \refitem cfg_inline_info INLINE_INFO \refitem cfg_inline_inherited_memb INLINE_INHERITED_MEMB @@ -189,23 +192,23 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_pdf_hyperlinks PDF_HYPERLINKS \refitem cfg_perl_path PERL_PATH \refitem cfg_perlmod_latex PERLMOD_LATEX -\refitem cfg_perlmod_pretty PERLMOD_PRETTY \refitem cfg_perlmod_makevar_prefix PERLMOD_MAKEVAR_PREFIX +\refitem cfg_perlmod_pretty PERLMOD_PRETTY \refitem cfg_predefined PREDEFINED \refitem cfg_project_name PROJECT_NAME \refitem cfg_project_number PROJECT_NUMBER -\refitem cfg_qhp_namespace QHP_NAMESPACE -\refitem cfg_qhp_virtual_folder QHP_VIRTUAL_FOLDER -\refitem cfg_qhp_cust_filter_name QHP_CUST_FILTER_NAME +\refitem cfg_qhg_location QHG_LOCATION \refitem cfg_qhp_cust_filter_attrs QHP_CUST_FILTER_ATTRS +\refitem cfg_qhp_cust_filter_name QHP_CUST_FILTER_NAME +\refitem cfg_qhp_namespace QHP_NAMESPACE \refitem cfg_qhp_sect_filter_attrs QHP_SECT_FILTER_ATTRS -\refitem cfg_qhg_location QHG_LOCATION +\refitem cfg_qhp_virtual_folder QHP_VIRTUAL_FOLDER \refitem cfg_qt_autobrief QT_AUTOBRIEF \refitem cfg_quiet QUIET \refitem cfg_recursive RECURSIVE \refitem cfg_referenced_by_relation REFERENCED_BY_RELATION -\refitem cfg_references_relation REFERENCES_RELATION \refitem cfg_references_link_source REFERENCES_LINK_SOURCE +\refitem cfg_references_relation REFERENCES_RELATION \refitem cfg_repeat_brief REPEAT_BRIEF \refitem cfg_rtf_extensions_file RTF_EXTENSIONS_FILE \refitem cfg_rtf_hyperlinks RTF_HYPERLINKS @@ -219,13 +222,14 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_show_files SHOW_FILES \refitem cfg_show_include_files SHOW_INCLUDE_FILES \refitem cfg_show_namespaces SHOW_NAMESPACES +\refitem cfg_show_used_files SHOW_USED_FILES \refitem cfg_sip_support SIP_SUPPORT \refitem cfg_skip_function_macros SKIP_FUNCTION_MACROS \refitem cfg_sort_brief_docs SORT_BRIEF_DOCS \refitem cfg_sort_by_scope_name SORT_BY_SCOPE_NAME -\refitem cfg_sort_members_constructors_first SORT_MEMBERS_CTORS_1ST \refitem cfg_sort_group_names SORT_GROUP_NAMES \refitem cfg_sort_member_docs SORT_MEMBER_DOCS +\refitem cfg_sort_members_constructors_first SORT_MEMBERS_CTORS_1ST \refitem cfg_source_browser SOURCE_BROWSER \refitem cfg_strip_code_comments STRIP_CODE_COMMENTS \refitem cfg_strip_from_inc_path STRIP_FROM_INC_PATH @@ -240,8 +244,8 @@ followed by the descriptions of the tags grouped by category. \refitem cfg_typedef_hides_struct TYPEDEF_HIDES_STRUCT \refitem cfg_uml_look UML_LOOK \refitem cfg_use_htags USE_HTAGS +\refitem cfg_use_inline_trees USE_INLINE_TREES \refitem cfg_use_pdflatex USE_PDFLATEX -\refitem cfg_use_windows_encoding USE_WINDOWS_ENCODING \refitem cfg_verbatim_headers VERBATIM_HEADERS \refitem cfg_warn_format WARN_FORMAT \refitem cfg_warn_if_doc_error WARN_IF_DOC_ERROR @@ -312,17 +316,6 @@ followed by the descriptions of the tags grouped by category. Lithuanian, Norwegian, Persian, Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. -\anchor cfg_use_windows_encoding -

\c USE_WINDOWS_ENCODING
- \addindex USE_WINDOWS_ENCODING - This tag can be used to specify the encoding used in the generated output. - The encoding is not always determined by the language that is chosen, - but also whether or not the output is meant for Windows or non-Windows users. - In case there is a difference, setting the \c USE_WINDOWS_ENCODING tag to \c YES - forces the Windows encoding, (this is the default for the Windows binary), - whereas setting the tag to \c NO uses a Unix-style encoding (the default for - all platforms other than Windows). - \anchor cfg_brief_member_desc
\c BRIEF_MEMBER_DESC
\addindex BRIEF_MEMBER_DESC @@ -1565,6 +1558,9 @@ and Class Hierarchy pages using a tree view instead of an ordered list. \addindex LATEX_CMD_NAME The \c LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be invoked. If left blank `latex' will be used as the default command name. + Note that when enabling USE_PDFLATEX this option is only used for + generating bitmaps for formulas in the HTML output, but not in the + Makefile that is written to the output directory. \anchor cfg_makeindex_cmd_name
\c MAKEINDEX_CMD_NAME
diff --git a/doc/language.doc b/doc/language.doc index 78d7afc..4494aad 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other than English (the default). The output language is chosen through the configuration file (with default name and known as Doxyfile). -Currently (version 1.6.0), 38 languages +Currently (version 1.6.1), 38 languages are supported (sorted alphabetically): Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, @@ -56,7 +56,7 @@ when the translator was updated. Afrikaans Johan Prinsloo johan at zippysnoek dot com - 1.4.6 + 1.6.0 Arabic @@ -218,7 +218,7 @@ when the translator was updated. Polish Piotr Kaminski
Grzegorz Kowal
Krzysztof Kral Piotr.Kaminski at ctm dot gdynia dot pl
g_kowal at poczta dot onet dot pl
krzysztof.kral at gmail dot com - 1.6.0 + up-to-date Portuguese @@ -307,7 +307,7 @@ when the translator was updated. \hline \hline - Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & 1.4.6 \\ + Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & 1.6.0 \\ \hline Arabic & Moaz Reyad & {\tt\tiny moazreyad@yahoo.com} & 1.4.6 \\ \hline @@ -373,7 +373,7 @@ when the translator was updated. \hline Persian & Ali Nadalizadeh & {\tt\tiny nadalizadeh@gmail.com} & 1.6.0 \\ \hline - Polish & Piotr Kaminski & {\tt\tiny Piotr.Kaminski@ctm.gdynia.pl} & 1.6.0 \\ + Polish & Piotr Kaminski & {\tt\tiny Piotr.Kaminski@ctm.gdynia.pl} & up-to-date \\ ~ & Grzegorz Kowal & {\tt\tiny g\_kowal@poczta.onet.pl} & ~ \\ ~ & Krzysztof Kral & {\tt\tiny krzysztof.kral@gmail.com} & ~ \\ \hline diff --git a/doc/translator.py b/doc/translator.py index c53fd71..95ee485 100644 --- a/doc/translator.py +++ b/doc/translator.py @@ -48,8 +48,10 @@ 2005/02/28 - Slight modification to generate "mailto.txt" auxiliary file. 2005/08/15 - Doxygen's root directory determined primarily from DOXYGEN environment variable. When not found, then relatively to the script. - 2007/03/20 - The "translate me!" searched in comments and reported if found. - 2009/05/09 - Changed HTML output to make it confirm to XHTML DTD + 2007/03/20 - The "translate me!" searched in comments and reported if found. + 2008/06/09 - Warning when the MAX_DOT_GRAPH_HEIGHT is still part of trLegendDocs(). + 2009/05/09 - Changed HTML output to fit it with XHTML DTD + 2009/09/02 - Added percentage info to the report (implemented / to be implemented). """ from __future__ import generators @@ -166,6 +168,7 @@ class Transl: self.prototypeDic = {} # uniPrototype -> prototype self.translateMeText = 'translate me!' self.translateMeFlag = False # comments with "translate me!" found + self.txtMAX_DOT_GRAPH_HEIGHT_flag = False # found in string in trLegendDocs() self.obsoleteMethods = None # list of prototypes to be removed self.missingMethods = None # list of prototypes to be implemented self.implementedMethods = None # list of implemented required methods @@ -769,6 +772,8 @@ class Transl: # identifiers. prototype = '' # readable prototype (with everything) uniPrototype = '' # unified prototype (without arg. identifiers) + warning = '' # warning message -- if something special detected + methodId = None # processed method id # Collect the method prototypes. Stop on the closing # curly brace followed by the semicolon (end of class). @@ -823,6 +828,7 @@ class Transl: if tokenId == 'id': prototype += ' ' + tokenStr uniPrototype += ' ' + tokenStr + methodId = tokenStr # for reporting status = 5 else: self.__unexpectedToken(status, tokenId, tokenLineNo) @@ -884,9 +890,17 @@ class Transl: # Insert new dictionary item. assert(not self.prototypeDic.has_key(uniPrototype)) self.prototypeDic[uniPrototype] = prototype - status = 2 # body consumed + status = 2 # body consumed + methodId = None # outside of any method elif tokenId == 'lcurly': curlyCnt += 1 + + # Warn in special case. + elif methodId == 'trLegendDocs' and tokenId == 'string' \ + and tokenStr.find('MAX_DOT_GRAPH_HEIGHT') >= 0: + self.txtMAX_DOT_GRAPH_HEIGHT_flag = True + + elif status == 11: # probably the end of class if tokenId == 'semic': status = 777 @@ -1114,10 +1128,17 @@ class Transl: self.adaptMinClass = adaptMinClass self.readableStatus = adaptMinVersion # simplified - # If everything seems OK, but the explicit mark self.translateMeText - # in comments was found, something must be translated. - if not self.note and self.status == '' and self.translateMeFlag: - self.note = 'The "%s" found in a comment.' % self.translateMeText + # If everything seems OK, some explicit warning flags still could + # be set. + if not self.note and self.status == '' and \ + (self.translateMeFlag or self.txtMAX_DOT_GRAPH_HEIGHT_flag): + self.note = '' + if self.translateMeFlag: + self.note += 'The "%s" found in a comment.' % self.translateMeText + if self.note != '': + self.note += '\n\t\t' + if self.txtMAX_DOT_GRAPH_HEIGHT_flag: + self.note += 'The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs()' # If everything seems OK, but there are obsolete methods, set # the note to clean-up source. This note will be used only when @@ -1138,18 +1159,21 @@ class Transl: # Report the number of not implemented methods. fout.write('\n\n\n') fout.write(self.classId + ' (' + self.baseClassId + ')') + percentImplemented = 100 # init + allNum = len(self.manager.requiredMethodsDic) if self.missingMethods: num = len(self.missingMethods) + percentImplemented = 100 * (allNum - num) / allNum fout.write(' %d' % num) fout.write(' method') if num > 1: fout.write('s') - fout.write(' to implement') + fout.write(' to implement (%d %%)' % (100 * num / allNum)) fout.write('\n' + '-' * len(self.classId)) # Write the info about the implemented required methods. fout.write('\n\n Implements %d' % len(self.implementedMethods)) - fout.write(' of the required methods.') + fout.write(' of the required methods (%d %%).' % percentImplemented) # Report the missing method, but only when it is not English-based # translator. @@ -1541,6 +1565,7 @@ class TrManager: adaptMinVersion = '9.9.99' mailtoLst = [] + numRequired = len(self.requiredMethodsDic) for x in self.adaptIdLst: obj = self.__translDic[x] f.write(' %-30s' % obj.classId) @@ -1548,7 +1573,9 @@ class TrManager: numimpl = len(obj.missingMethods) pluralS = '' if numimpl > 1: pluralS = 's' - f.write('\t%2d method%s to implement' % (numimpl, pluralS)) + percent = 100 * numimpl / numRequired + f.write('\t%2d method%s to implement (%d %%)' % ( + numimpl, pluralS, percent)) if obj.note: f.write('\n\tNote: ' + obj.note + '\n') f.write('\n') diff --git a/doc/translator_report.txt b/doc/translator_report.txt index d84e8b0..f3f12e0 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -1,4 +1,4 @@ -(1.6.0) +(1.6.1) Doxygen supports the following 38 languages (sorted alphabetically): @@ -10,7 +10,7 @@ Persian, Polish, Portuguese, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese. -Of them, 4 translators are up-to-date, 34 translators are based on +Of them, 5 translators are up-to-date, 33 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- @@ -23,6 +23,7 @@ still may be some details listed even for them: TranslatorDutch TranslatorEnglish TranslatorKorean + TranslatorPolish -- Remove the obsolete methods (never used). ---------------------------------------------------------------------- The following translator classes need some maintenance (the most @@ -30,40 +31,39 @@ obsolete at the end). The other info shows the estimation of Doxygen version when the class was last updated and number of methods that must be implemented to become up-to-date: - TranslatorVietnamese 1.6.0 5 methods to implement - TranslatorTurkish 1.6.0 5 methods to implement - TranslatorSwedish 1.6.0 5 methods to implement - TranslatorSpanish 1.6.0 5 methods to implement - TranslatorSerbian 1.6.0 5 methods to implement - TranslatorSerbianCyrilic 1.6.0 5 methods to implement - TranslatorRussian 1.6.0 5 methods to implement - TranslatorRomanian 1.6.0 5 methods to implement - TranslatorPolish 1.6.0 5 methods to implement - TranslatorPersian 1.6.0 5 methods to implement - TranslatorMacedonian 1.6.0 5 methods to implement - TranslatorJapanese 1.6.0 5 methods to implement - TranslatorItalian 1.6.0 5 methods to implement - TranslatorGerman 1.6.0 5 methods to implement - TranslatorFinnish 1.6.0 5 methods to implement - TranslatorEsperanto 1.6.0 5 methods to implement - TranslatorCroatian 1.6.0 5 methods to implement - TranslatorChinese 1.6.0 5 methods to implement - TranslatorChinesetraditional 1.6.0 5 methods to implement - TranslatorCatalan 1.6.0 5 methods to implement - TranslatorBrazilian 1.6.0 5 methods to implement - TranslatorGreek 1.5.4 27 methods to implement - TranslatorFrench 1.5.4 27 methods to implement - TranslatorDanish 1.5.4 27 methods to implement - TranslatorSlovene 1.4.6 29 methods to implement - TranslatorNorwegian 1.4.6 28 methods to implement - TranslatorLithuanian 1.4.6 29 methods to implement - TranslatorIndonesian 1.4.6 28 methods to implement - TranslatorHungarian 1.4.6 29 methods to implement - TranslatorArabic 1.4.6 28 methods to implement - TranslatorAfrikaans 1.4.6 29 methods to implement - TranslatorUkrainian 1.4.1 29 methods to implement - TranslatorPortuguese 1.3.3 40 methods to implement - TranslatorSlovak 1.2.18 49 methods to implement + TranslatorVietnamese 1.6.0 5 methods to implement (2 %) + TranslatorTurkish 1.6.0 5 methods to implement (2 %) + TranslatorSwedish 1.6.0 5 methods to implement (2 %) + TranslatorSpanish 1.6.0 5 methods to implement (2 %) + TranslatorSerbian 1.6.0 5 methods to implement (2 %) + TranslatorSerbianCyrilic 1.6.0 5 methods to implement (2 %) + TranslatorRussian 1.6.0 5 methods to implement (2 %) + TranslatorRomanian 1.6.0 5 methods to implement (2 %) + TranslatorPersian 1.6.0 5 methods to implement (2 %) + TranslatorMacedonian 1.6.0 5 methods to implement (2 %) + TranslatorJapanese 1.6.0 5 methods to implement (2 %) + TranslatorItalian 1.6.0 5 methods to implement (2 %) + TranslatorGerman 1.6.0 5 methods to implement (2 %) + TranslatorFinnish 1.6.0 5 methods to implement (2 %) + TranslatorEsperanto 1.6.0 5 methods to implement (2 %) + TranslatorCroatian 1.6.0 5 methods to implement (2 %) + TranslatorChinese 1.6.0 5 methods to implement (2 %) + TranslatorChinesetraditional 1.6.0 5 methods to implement (2 %) + TranslatorCatalan 1.6.0 5 methods to implement (2 %) + 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 %) + TranslatorLithuanian 1.4.6 29 methods to implement (13 %) + TranslatorIndonesian 1.4.6 28 methods to implement (12 %) + TranslatorHungarian 1.4.6 29 methods to implement (13 %) + TranslatorArabic 1.4.6 28 methods to implement (12 %) + TranslatorUkrainian 1.4.1 29 methods to implement (13 %) + TranslatorPortuguese 1.3.3 40 methods to implement (18 %) + TranslatorSlovak 1.2.18 49 methods to implement (22 %) ---------------------------------------------------------------------- The following translator classes derive directly from the @@ -91,48 +91,24 @@ Details for translators (classes sorted alphabetically): -TranslatorAfrikaans (TranslatorAdapter_1_4_6) 29 methods to implement +TranslatorAfrikaans (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------- - Implements 192 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): - virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) virtual QCString trSearching() virtual QCString trNoMatches() - virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) virtual QCString trLoading() - virtual QCString trSubprograms() - virtual QCString trModulesListDescription(bool extractAll) - virtual QCString trModulesList() - virtual QCString trTypeConstraints() virtual QCString trGlobalNamespace() - 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 trDirRelation(const char * name) - virtual QCString trCompoundListFortran() - virtual QCString trDataTypes() - virtual QCString trCompoundIndexFortran() - virtual QCString trSubprogram(bool first_capital, bool singular) - virtual QCString trCallerGraph() - virtual QCString trEnumerationValueDocumentation() - 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() -TranslatorArabic (TranslatorAdapter_1_4_6) 28 methods to implement +TranslatorArabic (TranslatorAdapter_1_4_6) 28 methods to implement (12 %) ---------------- - Implements 193 of the required methods. + Implements 193 of the required methods (87 %). Missing methods (should be implemented): @@ -178,10 +154,10 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 28 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorBrazilian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorBrazilian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -192,10 +168,10 @@ TranslatorBrazilian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorCatalan (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorCatalan (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -206,10 +182,10 @@ TranslatorCatalan (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorChinese (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorChinese (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -220,10 +196,10 @@ TranslatorChinese (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorChinesetraditional (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorChinesetraditional (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ---------------------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -234,10 +210,10 @@ TranslatorChinesetraditional (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorCroatian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorCroatian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------ - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -248,10 +224,10 @@ TranslatorCroatian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorDanish (TranslatorAdapter_1_5_4) 27 methods to implement +TranslatorDanish (TranslatorAdapter_1_5_4) 27 methods to implement (12 %) ---------------- - Implements 194 of the required methods. + Implements 194 of the required methods (87 %). Missing methods (should be implemented): @@ -284,10 +260,10 @@ TranslatorDanish (TranslatorAdapter_1_5_4) 27 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorEsperanto (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorEsperanto (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -298,10 +274,10 @@ TranslatorEsperanto (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorFinnish (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorFinnish (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -312,23 +288,19 @@ TranslatorFinnish (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorFrench (TranslatorAdapter_1_5_4) 27 methods to implement +TranslatorFrench (TranslatorAdapter_1_5_4) 22 methods to implement (9 %) ---------------- - Implements 194 of the required methods. + Implements 199 of the required methods (90 %). Missing methods (should be implemented): virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) - virtual QCString trSearching() - virtual QCString trNoMatches() virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) - virtual QCString trLoading() virtual QCString trSubprograms() virtual QCString trModulesListDescription(bool extractAll) virtual QCString trModulesList() virtual QCString trTypeConstraints() - virtual QCString trGlobalNamespace() virtual QCString trMemberFunctionDocumentationFortran() virtual QCString trCompoundListDescriptionFortran() virtual QCString trTypeDocumentation() @@ -336,7 +308,6 @@ TranslatorFrench (TranslatorAdapter_1_5_4) 27 methods to implement virtual QCString trModulesMemberDescription(bool extractAll) virtual QCString trModulesMembers() virtual QCString trModulesIndex() - virtual QCString trDirRelation(const char * name) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trCompoundIndexFortran() @@ -348,10 +319,10 @@ TranslatorFrench (TranslatorAdapter_1_5_4) 27 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorGerman (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorGerman (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ---------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -362,10 +333,10 @@ TranslatorGerman (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorGreek (TranslatorAdapter_1_5_4) 27 methods to implement +TranslatorGreek (TranslatorAdapter_1_5_4) 27 methods to implement (12 %) --------------- - Implements 194 of the required methods. + Implements 194 of the required methods (87 %). Missing methods (should be implemented): @@ -410,10 +381,10 @@ TranslatorGreek (TranslatorAdapter_1_5_4) 27 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorHungarian (TranslatorAdapter_1_4_6) 29 methods to implement +TranslatorHungarian (TranslatorAdapter_1_4_6) 29 methods to implement (13 %) ------------------- - Implements 192 of the required methods. + Implements 192 of the required methods (86 %). Missing methods (should be implemented): @@ -448,10 +419,10 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 29 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorIndonesian (TranslatorAdapter_1_4_6) 28 methods to implement +TranslatorIndonesian (TranslatorAdapter_1_4_6) 28 methods to implement (12 %) -------------------- - Implements 193 of the required methods. + Implements 193 of the required methods (87 %). Missing methods (should be implemented): @@ -497,10 +468,10 @@ TranslatorIndonesian (TranslatorAdapter_1_4_6) 28 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorItalian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorItalian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -511,10 +482,10 @@ TranslatorItalian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorJapanese (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorJapanese (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------ - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -537,10 +508,10 @@ TranslatorJapanese (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorJapaneseEn (TranslatorEnglish) 216 methods to implement +TranslatorJapaneseEn (TranslatorEnglish) 216 methods to implement (97 %) -------------------- - Implements 5 of the required methods. + Implements 5 of the required methods (2 %). This English-based translator implements the following methods: @@ -551,10 +522,10 @@ TranslatorJapaneseEn (TranslatorEnglish) 216 methods to implement virtual QCString latexLanguageSupportCommand() -TranslatorKoreanEn (TranslatorEnglish) 216 methods to implement +TranslatorKoreanEn (TranslatorEnglish) 216 methods to implement (97 %) ------------------ - Implements 5 of the required methods. + Implements 5 of the required methods (2 %). This English-based translator implements the following methods: @@ -565,10 +536,10 @@ TranslatorKoreanEn (TranslatorEnglish) 216 methods to implement virtual QCString latexLanguageSupportCommand() -TranslatorLithuanian (TranslatorAdapter_1_4_6) 29 methods to implement +TranslatorLithuanian (TranslatorAdapter_1_4_6) 29 methods to implement (13 %) -------------------- - Implements 192 of the required methods. + Implements 192 of the required methods (86 %). Missing methods (should be implemented): @@ -603,10 +574,10 @@ TranslatorLithuanian (TranslatorAdapter_1_4_6) 29 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorMacedonian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorMacedonian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) -------------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -617,10 +588,10 @@ TranslatorMacedonian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorNorwegian (TranslatorAdapter_1_4_6) 28 methods to implement +TranslatorNorwegian (TranslatorAdapter_1_4_6) 28 methods to implement (12 %) ------------------- - Implements 193 of the required methods. + Implements 193 of the required methods (87 %). Missing methods (should be implemented): @@ -666,10 +637,10 @@ TranslatorNorwegian (TranslatorAdapter_1_4_6) 28 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorPersian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorPersian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -680,18 +651,10 @@ TranslatorPersian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorPolish (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorPolish (Translator) ---------------- - Implements 216 of the required methods. - - Missing methods (should be implemented): - - virtual QCString trSearching() - virtual QCString trNoMatches() - virtual QCString trLoading() - virtual QCString trGlobalNamespace() - virtual QCString trDirRelation(const char * name) + Implements 221 of the required methods (100 %). Obsolete methods (should be removed, never used): @@ -706,10 +669,10 @@ TranslatorPolish (TranslatorAdapter_1_6_0) 5 methods to implement QCString trNoDescriptionAvailable() -TranslatorPortuguese (TranslatorAdapter_1_3_3) 40 methods to implement +TranslatorPortuguese (TranslatorAdapter_1_3_3) 40 methods to implement (18 %) -------------------- - Implements 181 of the required methods. + Implements 181 of the required methods (81 %). Missing methods (should be implemented): @@ -767,10 +730,10 @@ TranslatorPortuguese (TranslatorAdapter_1_3_3) 40 methods to implement QCString trNoDescriptionAvailable() -TranslatorRomanian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorRomanian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------ - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -781,10 +744,10 @@ TranslatorRomanian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorRussian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorRussian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -795,10 +758,10 @@ TranslatorRussian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorSerbian (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorSerbian (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -809,10 +772,10 @@ TranslatorSerbian (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ------------------------ - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -823,10 +786,10 @@ TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorSlovak (TranslatorAdapter_1_2_18) 49 methods to implement +TranslatorSlovak (TranslatorAdapter_1_2_18) 49 methods to implement (22 %) ---------------- - Implements 172 of the required methods. + Implements 172 of the required methods (77 %). Missing methods (should be implemented): @@ -893,10 +856,10 @@ TranslatorSlovak (TranslatorAdapter_1_2_18) 49 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorSlovene (TranslatorAdapter_1_4_6) 29 methods to implement +TranslatorSlovene (TranslatorAdapter_1_4_6) 29 methods to implement (13 %) ----------------- - Implements 192 of the required methods. + Implements 192 of the required methods (86 %). Missing methods (should be implemented): @@ -931,10 +894,10 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 29 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorSpanish (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorSpanish (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -945,10 +908,10 @@ TranslatorSpanish (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorSwedish (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorSwedish (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -959,10 +922,10 @@ TranslatorSwedish (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorTurkish (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorTurkish (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) ----------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): @@ -973,10 +936,10 @@ TranslatorTurkish (TranslatorAdapter_1_6_0) 5 methods to implement virtual QCString trDirRelation(const char * name) -TranslatorUkrainian (TranslatorAdapter_1_4_1) 29 methods to implement +TranslatorUkrainian (TranslatorAdapter_1_4_1) 29 methods to implement (13 %) ------------------- - Implements 192 of the required methods. + Implements 192 of the required methods (86 %). Missing methods (should be implemented): @@ -1023,10 +986,10 @@ TranslatorUkrainian (TranslatorAdapter_1_4_1) 29 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorVietnamese (TranslatorAdapter_1_6_0) 5 methods to implement +TranslatorVietnamese (TranslatorAdapter_1_6_0) 5 methods to implement (2 %) -------------------- - Implements 216 of the required methods. + Implements 216 of the required methods (97 %). Missing methods (should be implemented): diff --git a/src/bufstr.h b/src/bufstr.h index 80da421..4ce1dae 100644 --- a/src/bufstr.h +++ b/src/bufstr.h @@ -69,6 +69,10 @@ class BufStr } m_buf = (char *)realloc(m_buf,m_size); } + int size() const + { + return m_size; + } char *data() const { return m_buf; diff --git a/src/classdef.cpp b/src/classdef.cpp index 55cc4f2..73bb09c 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -3089,10 +3089,12 @@ void ClassDef::addListReferences() { LockingPtr< QList > xrefItems = xrefListItems(); addRefItem(xrefItems.pointer(), + qualifiedName(), fortranOpt?theTranslator->trType(TRUE,TRUE): theTranslator->trClass(TRUE,TRUE), getOutputFileBase(), - displayName() + displayName(), + 0 ); } if (m_impl->memberGroupSDict) diff --git a/src/config.l b/src/config.l index e433669..df07204 100644 --- a/src/config.l +++ b/src/config.l @@ -1395,26 +1395,6 @@ void Config::check() config_err("Warning: Specifying QCH_FILE requires QHG_LOCATION to be set.\n"); } - if (Config_getBool("HAVE_DOT")) - { - QCString curFontPath = Config_getString("DOT_FONTPATH"); - if (curFontPath.isEmpty()) - { - portable_getenv("DOTFONTPATH"); - QCString newFontPath = "."; - if (!curFontPath.isEmpty()) - { - newFontPath+=portable_pathListSeparator(); - newFontPath+=curFontPath; - } - portable_setenv("DOTFONTPATH",newFontPath); - } - else - { - portable_setenv("DOTFONTPATH",curFontPath); - } - } - 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 a2cb0af..8395f54 100644 --- a/src/config.xml +++ b/src/config.xml @@ -139,7 +139,7 @@ the path. The tag can be used to show relative paths in the file list. If left blank the directory from which doxygen is run is used as the path to strip. ' depends='FULL_PATH_NAMES'> - +