diff options
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | addon/doxywizard/wizard.cpp | 6 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | doc/config.doc | 12 | ||||
| -rw-r--r-- | doc/dbusxml.doc | 8 | ||||
| -rw-r--r-- | doc/language.doc | 86 | ||||
| -rw-r--r-- | doc/translator_report.txt | 454 | ||||
| -rw-r--r-- | packages/rpm/doxygen.spec.in | 4 | ||||
| -rw-r--r-- | src/commentscan.l | 3 | ||||
| -rw-r--r-- | src/config.xml | 8 | ||||
| -rw-r--r-- | src/configoptions.cpp | 12 | ||||
| -rw-r--r-- | src/dbusxmlscanner.cpp | 17 | ||||
| -rw-r--r-- | src/dirdef.cpp | 10 | ||||
| -rw-r--r-- | src/doctokenizer.l | 2 | ||||
| -rw-r--r-- | src/doxygen.cpp | 4 | ||||
| -rw-r--r-- | src/ftvhelp.cpp | 2 | ||||
| -rw-r--r-- | src/htmlgen.cpp | 2 | ||||
| -rw-r--r-- | src/index.cpp | 42 | ||||
| -rw-r--r-- | src/membergroup.cpp | 61 | ||||
| -rw-r--r-- | src/membergroup.h | 9 | ||||
| -rw-r--r-- | src/pre.l | 101 | ||||
| -rw-r--r-- | src/translator_cz.h | 60 | ||||
| -rw-r--r-- | src/translator_za.h | 226 | ||||
| -rw-r--r-- | src/util.cpp | 3 | ||||
| -rw-r--r-- | src/vhdlcode.l | 2 |
27 files changed, 945 insertions, 200 deletions
@@ -1,7 +1,7 @@ -DOXYGEN Version 1.6.0 +DOXYGEN Version 1.6.1 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (20 August 2009) +Dimitri van Heesch (25 August 2009) diff --git a/Makefile.in b/Makefile.in index 4486131..781d359 100644 --- a/Makefile.in +++ b/Makefile.in @@ -105,7 +105,6 @@ rpm: dist mkdir $(DISTDIR)/packages mkdir $(DISTDIR)/packages/rpm cp packages/rpm/doxygen.spec $(DISTDIR)/packages/rpm - tar -rvf $(DISTDIR).src.tar $(DISTDIR)/packages/rpm/doxygen.spec rm -rf $(DISTDIR) gzip -9v $(DISTDIR).src.tar rpmbuild -ta %%WITHDOXYWIZARD%% $(DISTDIR).src.tar.gz @@ -1,4 +1,4 @@ -DOXYGEN Version 1.6.0 +DOXYGEN Version 1.6.1 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) (20 August 2009) +Dimitri van Heesch (dimitri@stack.nl) (25 August 2009) diff --git a/addon/doxywizard/wizard.cpp b/addon/doxywizard/wizard.cpp index 7346bd2..b756d0f 100644 --- a/addon/doxywizard/wizard.cpp +++ b/addon/doxywizard/wizard.cpp @@ -568,17 +568,17 @@ void Step3::setHtmlOptions(int id) if (id==0) // plain HTML { updateBoolOption(m_modelData,STR_GENERATE_HTMLHELP,false); - updateStringOption(m_modelData,STR_GENERATE_TREEVIEW,QString::fromAscii("NONE")); + updateBoolOption(m_modelData,STR_GENERATE_TREEVIEW,false); } else if (id==1) // with navigation tree { updateBoolOption(m_modelData,STR_GENERATE_HTMLHELP,false); - updateStringOption(m_modelData,STR_GENERATE_TREEVIEW,QString::fromAscii("ALL")); + updateBoolOption(m_modelData,STR_GENERATE_TREEVIEW,true); } else if (id==2) // with compiled help { updateBoolOption(m_modelData,STR_GENERATE_HTMLHELP,true); - updateStringOption(m_modelData,STR_GENERATE_TREEVIEW,QString::fromAscii("NONE")); + updateBoolOption(m_modelData,STR_GENERATE_TREEVIEW,false); } } @@ -17,7 +17,7 @@ doxygen_version_major=1 doxygen_version_minor=6 -doxygen_version_revision=0 +doxygen_version_revision=1 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. doxygen_version_mmn=NO diff --git a/doc/config.doc b/doc/config.doc index a826c7a..f049986 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -1508,16 +1508,16 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn" \addindex GENERATE_TREEVIEW The GENERATE_TREEVIEW tag is used to specify whether a tree-like index structure should be generated to display hierarchical information. - If the tag value is set to FRAME, a side panel will be generated + If the tag value is set to YES, a side panel will be generated containing a tree-like index structure (just like the one that is generated for HTML Help). For this to work a browser that supports - JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). - Windows users are probably better off using the HTML help feature. + JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). + Windows users are probably better off using the HTML help feature. Via custom stylesheets (see \ref cfg_html_stylesheet "HTML_STYLESHEET") - one can further \ref doxygen_finetune "fine tune" the look of the index. - As an example, the default style sheet generated by doxygen has an - example that shows how to put an image at the root of the tree instead of + one can further \ref doxygen_finetune "fine tune" the look of the index. + As an example, the default style sheet generated by doxygen has an + example that shows how to put an image at the root of the tree instead of the \ref cfg_project_name "project name". \anchor cfg_use_inline_trees diff --git a/doc/dbusxml.doc b/doc/dbusxml.doc index a8710cb..e487126 100644 --- a/doc/dbusxml.doc +++ b/doc/dbusxml.doc @@ -9,6 +9,14 @@ all XML comments starting with '*' or '!'. An additional '<' can be used to assign the documentation string to the previous entity instead of the one following the comment. +Note that before the parsing of DBus XML file works one has to +assign the .xml extension to the DBus XML parser using the +following configuration option: + +\verbatim +EXTENSION_MAPPING = xml=dbusxml +\endverbatim + \section dbusxml_supported Supported XML elements and attributes <p>The following DBus XML elemets can be annotated: diff --git a/doc/language.doc b/doc/language.doc index 2058967..78d7afc 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.5.9), 38 languages +Currently (version 1.6.0), 38 languages are supported (sorted alphabetically): Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, @@ -68,31 +68,31 @@ when the translator was updated. <td>Brazilian Portuguese</td> <td>Fabio "FJTC" Jun Takada Chino</td> <td>jun-chino at uol dot com dot br</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Catalan</td> <td>Maximiliano Pin<br/>Albert Mora</td> <td>max.pin at bitroit dot com<br/>amora at iua dot upf dot es</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Chinese</td> <td>Li Daobing<br/>Wei Liu</td> <td>lidaobing at gmail dot com<br/>liuwei at asiainfo dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Chinese Traditional</td> <td>Daniel YC Lin<br/>Gary Lee</td> <td>dlin.tw at gmail dot com<br/>garywlee at gmail dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Croatian</td> <td>Boris Bralo</td> <td>boris.bralo at zg dot htnet dot hr</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Czech</td> @@ -122,13 +122,13 @@ when the translator was updated. <td>Esperanto</td> <td>Ander Martinez</td> <td>dwarfnauko at gmail dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Finnish</td> <td>Antti Laine</td> <td>antti.a.laine at tut dot fi</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>French</td> @@ -140,7 +140,7 @@ when the translator was updated. <td>German</td> <td>Jens Seidel</td> <td>jensseidel at users dot sf dot net</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Greek</td> @@ -164,13 +164,13 @@ when the translator was updated. <td>Italian</td> <td>Alessandro Falappa<br/>Ahmed Aldo Faisal</td> <td>alessandro at falappa dot net<br/>aaf23 at cam dot ac dot uk</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Japanese</td> <td>Hiroki Iseri<br/>Ryunosuke Satoh<br/>Kenji Nagamatsu<br/>Iwasa Kazmi</td> <td>goyoki at gmail dot com<br/>sun594 at hotmail dot com<br/>naga at joyful dot club dot ne dot jp<br/>iwasa at cosmo-system dot jp</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>JapaneseEn</td> @@ -200,7 +200,7 @@ when the translator was updated. <td>Macedonian</td> <td>Slave Jovanovski</td> <td>slavejovanovski at yahoo dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Norwegian</td> @@ -212,13 +212,13 @@ when the translator was updated. <td>Persian</td> <td>Ali Nadalizadeh</td> <td>nadalizadeh at gmail dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Polish</td> <td>Piotr Kaminski<br/>Grzegorz Kowal<br/>Krzysztof Kral</td> <td>Piotr.Kaminski at ctm dot gdynia dot pl<br/>g_kowal at poczta dot onet dot pl<br/>krzysztof.kral at gmail dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Portuguese</td> @@ -230,25 +230,25 @@ when the translator was updated. <td>Romanian</td> <td>Ionut Dumitrascu<br/>Alexandru Iosup</td> <td>reddumy at yahoo dot com<br/>aiosup at yahoo dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Russian</td> <td>Alexandr Chelpanov</td> <td>cav at cryptopro dot ru</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Serbian</td> <td>Dejan Milosavljevic</td> <td>dmilos at email dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>SerbianCyrilic</td> <td>Nedeljko Stefanovic</td> <td>stenedjo at yahoo dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Slovak</td> @@ -266,19 +266,19 @@ when the translator was updated. <td>Spanish</td> <td>Bartomeu<br/>Francisco Oltra Thennet<br/>David Vaquero</td> <td>bartomeu at loteria3cornella dot com<br/>foltra at puc dot cl<br/>david at grupoikusnet dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Swedish</td> <td>Mikael Hallin</td> <td>mikaelhallin at yahoo dot se</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Turkish</td> <td>Emin Ilker Cetinbas</td> <td>niw3 at yahoo dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <tr bgcolor="#ffffff"> <td>Ukrainian</td> @@ -290,7 +290,7 @@ when the translator was updated. <td>Vietnamese</td> <td>Dang Minh Tuan</td> <td>tuanvietkey at gmail dot com</td> - <td>up-to-date</td> + <td>1.6.0</td> </tr> <!-- table content end --> </table> @@ -311,18 +311,18 @@ when the translator was updated. \hline Arabic & Moaz Reyad & {\tt\tiny moazreyad@yahoo.com} & 1.4.6 \\ \hline - Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & up-to-date \\ + Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & 1.6.0 \\ \hline - Catalan & Maximiliano Pin & {\tt\tiny max.pin@bitroit.com} & up-to-date \\ + Catalan & Maximiliano Pin & {\tt\tiny max.pin@bitroit.com} & 1.6.0 \\ ~ & Albert Mora & {\tt\tiny amora@iua.upf.es} & ~ \\ \hline - Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & up-to-date \\ + Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.6.0 \\ ~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\ \hline - Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin.tw@gmail.com} & up-to-date \\ + Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin.tw@gmail.com} & 1.6.0 \\ ~ & Gary Lee & {\tt\tiny garywlee@gmail.com} & ~ \\ \hline - Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.htnet.hr} & up-to-date \\ + Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.htnet.hr} & 1.6.0 \\ \hline Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & up-to-date \\ \hline @@ -332,13 +332,13 @@ when the translator was updated. \hline English & Dimitri van Heesch & {\tt\tiny dimitri@stack.nl} & up-to-date \\ \hline - Esperanto & Ander Martinez & {\tt\tiny dwarfnauko@gmail.com} & up-to-date \\ + Esperanto & Ander Martinez & {\tt\tiny dwarfnauko@gmail.com} & 1.6.0 \\ \hline - Finnish & Antti Laine & {\tt\tiny antti.a.laine@tut.fi} & up-to-date \\ + 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 \\ \hline - German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & up-to-date \\ + German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & 1.6.0 \\ \hline Greek & Paul Gessos & {\tt\tiny nickreserved@yahoo.com} & 1.5.4 \\ \hline @@ -347,10 +347,10 @@ when the translator was updated. \hline Indonesian & Hendy Irawan & {\tt\tiny ceefour@gauldong.net} & 1.4.6 \\ \hline - Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & up-to-date \\ + Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & 1.6.0 \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\ \hline - Japanese & Hiroki Iseri & {\tt\tiny goyoki@gmail.com} & up-to-date \\ + Japanese & Hiroki Iseri & {\tt\tiny goyoki@gmail.com} & 1.6.0 \\ ~ & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & ~ \\ ~ & Kenji Nagamatsu & {\tt\tiny naga@joyful.club.ne.jp} & ~ \\ ~ & Iwasa Kazmi & {\tt\tiny iwasa@cosmo-system.jp} & ~ \\ @@ -367,42 +367,42 @@ when the translator was updated. ~ & Mindaugas Radzius & {\tt\tiny mindaugasradzius@takas.lt} & ~ \\ ~ & Aidas Berukstis & {\tt\tiny aidasber@takas.lt} & ~ \\ \hline - Macedonian & Slave Jovanovski & {\tt\tiny slavejovanovski@yahoo.com} & up-to-date \\ + Macedonian & Slave Jovanovski & {\tt\tiny slavejovanovski@yahoo.com} & 1.6.0 \\ \hline Norwegian & Lars Erik Jordet & {\tt\tiny lejordet@gmail.com} & 1.4.6 \\ \hline - Persian & Ali Nadalizadeh & {\tt\tiny nadalizadeh@gmail.com} & up-to-date \\ + Persian & Ali Nadalizadeh & {\tt\tiny nadalizadeh@gmail.com} & 1.6.0 \\ \hline - Polish & Piotr Kaminski & {\tt\tiny Piotr.Kaminski@ctm.gdynia.pl} & up-to-date \\ + Polish & Piotr Kaminski & {\tt\tiny Piotr.Kaminski@ctm.gdynia.pl} & 1.6.0 \\ ~ & Grzegorz Kowal & {\tt\tiny g\_kowal@poczta.onet.pl} & ~ \\ ~ & Krzysztof Kral & {\tt\tiny krzysztof.kral@gmail.com} & ~ \\ \hline Portuguese & Rui Godinho Lopes & {\tt\tiny ruiglopes@yahoo.com} & 1.3.3 \\ \hline - Romanian & Ionut Dumitrascu & {\tt\tiny reddumy@yahoo.com} & up-to-date \\ + Romanian & Ionut Dumitrascu & {\tt\tiny reddumy@yahoo.com} & 1.6.0 \\ ~ & Alexandru Iosup & {\tt\tiny aiosup@yahoo.com} & ~ \\ \hline - Russian & Alexandr Chelpanov & {\tt\tiny cav@cryptopro.ru} & up-to-date \\ + Russian & Alexandr Chelpanov & {\tt\tiny cav@cryptopro.ru} & 1.6.0 \\ \hline - Serbian & Dejan Milosavljevic & {\tt\tiny dmilos@email.com} & up-to-date \\ + Serbian & Dejan Milosavljevic & {\tt\tiny dmilos@email.com} & 1.6.0 \\ \hline - SerbianCyrilic & Nedeljko Stefanovic & {\tt\tiny stenedjo@yahoo.com} & up-to-date \\ + SerbianCyrilic & Nedeljko Stefanovic & {\tt\tiny stenedjo@yahoo.com} & 1.6.0 \\ \hline Slovak & Stanislav Kudl\'{a}\v{c} & {\tt\tiny skudlac@pobox.sk} & 1.2.18 \\ \hline Slovene & Matja\v{z} Ostrover\v{s}nik & {\tt\tiny matjaz.ostroversnik@ostri.org} & 1.4.6 \\ \hline - Spanish & Bartomeu & {\tt\tiny bartomeu@loteria3cornella.com} & up-to-date \\ + Spanish & Bartomeu & {\tt\tiny bartomeu@loteria3cornella.com} & 1.6.0 \\ ~ & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & ~ \\ ~ & David Vaquero & {\tt\tiny david@grupoikusnet.com} & ~ \\ \hline - Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & up-to-date \\ + Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.6.0 \\ \hline - Turkish & Emin Ilker Cetinbas & {\tt\tiny niw3@yahoo.com} & up-to-date \\ + Turkish & Emin Ilker Cetinbas & {\tt\tiny niw3@yahoo.com} & 1.6.0 \\ \hline Ukrainian & Olexij Tkatchenko & {\tt\tiny olexij.tkatchenko@parcs.de} & 1.4.1 \\ \hline - Vietnamese & Dang Minh Tuan & {\tt\tiny tuanvietkey@gmail.com} & up-to-date \\ + Vietnamese & Dang Minh Tuan & {\tt\tiny tuanvietkey@gmail.com} & 1.6.0 \\ \hline \end{tabular} \endlatexonly diff --git a/doc/translator_report.txt b/doc/translator_report.txt index 2d86d6c..d84e8b0 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -1,4 +1,4 @@ -(1.5.9) +(1.6.0) Doxygen supports the following 38 languages (sorted alphabetically): @@ -10,40 +10,19 @@ Persian, Polish, Portuguese, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese. -Of them, 25 translators are up-to-date, 13 translators are based on +Of them, 4 translators are up-to-date, 34 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- The following translator classes are up-to-date (sorted alphabetically). This means that they derive from the Translator class -and they implement all 216 of the required methods. Anyway, there +and they implement all 221 of the required methods. Anyway, there still may be some details listed even for them: - TranslatorBrazilian - TranslatorCatalan - TranslatorChinesetraditional - TranslatorChinese - TranslatorCroatian TranslatorCzech TranslatorDutch TranslatorEnglish - TranslatorEsperanto - TranslatorFinnish - TranslatorGerman - TranslatorItalian - TranslatorJapanese -- Remove the obsolete methods (never used). TranslatorKorean - TranslatorMacedonian - TranslatorPersian - TranslatorPolish -- Remove the obsolete methods (never used). - TranslatorRomanian - TranslatorRussian - TranslatorSerbianCyrilic - TranslatorSerbian - TranslatorSpanish - TranslatorSwedish -- The "translate me!" found in a comment. - TranslatorTurkish - TranslatorVietnamese ---------------------------------------------------------------------- The following translator classes need some maintenance (the most @@ -51,19 +30,40 @@ 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: - TranslatorGreek 1.5.4 22 methods to implement - TranslatorFrench 1.5.4 22 methods to implement - TranslatorDanish 1.5.4 22 methods to implement - TranslatorSlovene 1.4.6 24 methods to implement - TranslatorNorwegian 1.4.6 23 methods to implement - TranslatorLithuanian 1.4.6 24 methods to implement - TranslatorIndonesian 1.4.6 23 methods to implement - TranslatorHungarian 1.4.6 24 methods to implement - TranslatorArabic 1.4.6 23 methods to implement - TranslatorAfrikaans 1.4.6 24 methods to implement - TranslatorUkrainian 1.4.1 24 methods to implement - TranslatorPortuguese 1.3.3 35 methods to implement - TranslatorSlovak 1.2.18 44 methods to implement + 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 ---------------------------------------------------------------------- The following translator classes derive directly from the @@ -81,6 +81,7 @@ The situation should be checked. The .cpp files and .h files excluding the '*translator*' files in doxygen/src directory were simply searched for occurence of the method identifiers: + QCString idLanguageCharset() QCString trDCOPMethods() QCString trFunctionPrototypeDocumentation() @@ -90,7 +91,7 @@ Details for translators (classes sorted alphabetically): -TranslatorAfrikaans (TranslatorAdapter_1_4_6) 24 methods to implement +TranslatorAfrikaans (TranslatorAdapter_1_4_6) 29 methods to implement ------------------- Implements 192 of the required methods. @@ -98,11 +99,15 @@ TranslatorAfrikaans (TranslatorAdapter_1_4_6) 24 methods to implement 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() @@ -110,6 +115,7 @@ TranslatorAfrikaans (TranslatorAdapter_1_4_6) 24 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() @@ -123,7 +129,7 @@ TranslatorAfrikaans (TranslatorAdapter_1_4_6) 24 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorArabic (TranslatorAdapter_1_4_6) 23 methods to implement +TranslatorArabic (TranslatorAdapter_1_4_6) 28 methods to implement ---------------- Implements 193 of the required methods. @@ -131,11 +137,15 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 23 methods to implement 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() @@ -143,6 +153,7 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 23 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() @@ -167,7 +178,77 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 23 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorDanish (TranslatorAdapter_1_5_4) 22 methods to implement +TranslatorBrazilian (TranslatorAdapter_1_6_0) 5 methods to implement +------------------- + + 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) + + +TranslatorCatalan (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorChinese (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorChinesetraditional (TranslatorAdapter_1_6_0) 5 methods to implement +---------------------------- + + 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) + + +TranslatorCroatian (TranslatorAdapter_1_6_0) 5 methods to implement +------------------ + + 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) + + +TranslatorDanish (TranslatorAdapter_1_5_4) 27 methods to implement ---------------- Implements 194 of the required methods. @@ -175,11 +256,15 @@ TranslatorDanish (TranslatorAdapter_1_5_4) 22 methods to implement 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() @@ -187,6 +272,7 @@ TranslatorDanish (TranslatorAdapter_1_5_4) 22 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() @@ -198,7 +284,35 @@ TranslatorDanish (TranslatorAdapter_1_5_4) 22 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorFrench (TranslatorAdapter_1_5_4) 22 methods to implement +TranslatorEsperanto (TranslatorAdapter_1_6_0) 5 methods to implement +------------------- + + 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) + + +TranslatorFinnish (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorFrench (TranslatorAdapter_1_5_4) 27 methods to implement ---------------- Implements 194 of the required methods. @@ -206,11 +320,15 @@ TranslatorFrench (TranslatorAdapter_1_5_4) 22 methods to implement 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() @@ -218,6 +336,7 @@ TranslatorFrench (TranslatorAdapter_1_5_4) 22 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() @@ -229,7 +348,21 @@ TranslatorFrench (TranslatorAdapter_1_5_4) 22 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorGreek (TranslatorAdapter_1_5_4) 22 methods to implement +TranslatorGerman (TranslatorAdapter_1_6_0) 5 methods to implement +---------------- + + 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) + + +TranslatorGreek (TranslatorAdapter_1_5_4) 27 methods to implement --------------- Implements 194 of the required methods. @@ -237,11 +370,15 @@ TranslatorGreek (TranslatorAdapter_1_5_4) 22 methods to implement 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() @@ -249,6 +386,7 @@ TranslatorGreek (TranslatorAdapter_1_5_4) 22 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() @@ -272,7 +410,7 @@ TranslatorGreek (TranslatorAdapter_1_5_4) 22 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorHungarian (TranslatorAdapter_1_4_6) 24 methods to implement +TranslatorHungarian (TranslatorAdapter_1_4_6) 29 methods to implement ------------------- Implements 192 of the required methods. @@ -280,11 +418,15 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 24 methods to implement 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() @@ -292,6 +434,7 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 24 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() @@ -305,7 +448,7 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 24 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorIndonesian (TranslatorAdapter_1_4_6) 23 methods to implement +TranslatorIndonesian (TranslatorAdapter_1_4_6) 28 methods to implement -------------------- Implements 193 of the required methods. @@ -313,11 +456,15 @@ TranslatorIndonesian (TranslatorAdapter_1_4_6) 23 methods to implement 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() @@ -325,6 +472,7 @@ TranslatorIndonesian (TranslatorAdapter_1_4_6) 23 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() @@ -349,11 +497,33 @@ TranslatorIndonesian (TranslatorAdapter_1_4_6) 23 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorJapanese (Translator) +TranslatorItalian (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorJapanese (TranslatorAdapter_1_6_0) 5 methods to implement ------------------ 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) + Obsolete methods (should be removed, never used): virtual QCString trHeaderFilesDescription() @@ -367,7 +537,7 @@ TranslatorJapanese (Translator) virtual QCString trNoDescriptionAvailable() -TranslatorJapaneseEn (TranslatorEnglish) 211 methods to implement +TranslatorJapaneseEn (TranslatorEnglish) 216 methods to implement -------------------- Implements 5 of the required methods. @@ -381,7 +551,7 @@ TranslatorJapaneseEn (TranslatorEnglish) 211 methods to implement virtual QCString latexLanguageSupportCommand() -TranslatorKoreanEn (TranslatorEnglish) 211 methods to implement +TranslatorKoreanEn (TranslatorEnglish) 216 methods to implement ------------------ Implements 5 of the required methods. @@ -395,7 +565,7 @@ TranslatorKoreanEn (TranslatorEnglish) 211 methods to implement virtual QCString latexLanguageSupportCommand() -TranslatorLithuanian (TranslatorAdapter_1_4_6) 24 methods to implement +TranslatorLithuanian (TranslatorAdapter_1_4_6) 29 methods to implement -------------------- Implements 192 of the required methods. @@ -403,11 +573,15 @@ TranslatorLithuanian (TranslatorAdapter_1_4_6) 24 methods to implement 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() @@ -415,6 +589,7 @@ TranslatorLithuanian (TranslatorAdapter_1_4_6) 24 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() @@ -428,7 +603,21 @@ TranslatorLithuanian (TranslatorAdapter_1_4_6) 24 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorNorwegian (TranslatorAdapter_1_4_6) 23 methods to implement +TranslatorMacedonian (TranslatorAdapter_1_6_0) 5 methods to implement +-------------------- + + 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) + + +TranslatorNorwegian (TranslatorAdapter_1_4_6) 28 methods to implement ------------------- Implements 193 of the required methods. @@ -436,11 +625,15 @@ TranslatorNorwegian (TranslatorAdapter_1_4_6) 23 methods to implement 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() @@ -448,6 +641,7 @@ TranslatorNorwegian (TranslatorAdapter_1_4_6) 23 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() @@ -472,11 +666,33 @@ TranslatorNorwegian (TranslatorAdapter_1_4_6) 23 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorPolish (Translator) +TranslatorPersian (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorPolish (TranslatorAdapter_1_6_0) 5 methods to implement ---------------- 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) + Obsolete methods (should be removed, never used): QCString trHeaderFilesDescription() @@ -490,7 +706,7 @@ TranslatorPolish (Translator) QCString trNoDescriptionAvailable() -TranslatorPortuguese (TranslatorAdapter_1_3_3) 35 methods to implement +TranslatorPortuguese (TranslatorAdapter_1_3_3) 40 methods to implement -------------------- Implements 181 of the required methods. @@ -498,9 +714,12 @@ TranslatorPortuguese (TranslatorAdapter_1_3_3) 35 methods to implement Missing methods (should be implemented): virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) + virtual QCString trSearching() virtual QCString trOverloadText() virtual QCString trDirIndex() + 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() @@ -508,6 +727,7 @@ TranslatorPortuguese (TranslatorAdapter_1_3_3) 35 methods to implement virtual QCString trSearchResultsTitle() virtual QCString trDirectories() virtual QCString trTypeConstraints() + virtual QCString trGlobalNamespace() virtual QCString trMemberFunctionDocumentationFortran() virtual QCString trDirDescription() virtual QCString trCompoundListDescriptionFortran() @@ -516,6 +736,7 @@ TranslatorPortuguese (TranslatorAdapter_1_3_3) 35 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 trSearchResults(int numDocuments) @@ -546,7 +767,63 @@ TranslatorPortuguese (TranslatorAdapter_1_3_3) 35 methods to implement QCString trNoDescriptionAvailable() -TranslatorSlovak (TranslatorAdapter_1_2_18) 44 methods to implement +TranslatorRomanian (TranslatorAdapter_1_6_0) 5 methods to implement +------------------ + + 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) + + +TranslatorRussian (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorSerbian (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 5 methods to implement +------------------------ + + 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) + + +TranslatorSlovak (TranslatorAdapter_1_2_18) 49 methods to implement ---------------- Implements 172 of the required methods. @@ -554,10 +831,13 @@ TranslatorSlovak (TranslatorAdapter_1_2_18) 44 methods to implement Missing methods (should be implemented): virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) + virtual QCString trSearching() virtual QCString trOverloadText() virtual QCString trEventDocumentation() virtual QCString trDirIndex() + virtual QCString trNoMatches() virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) + virtual QCString trLoading() virtual QCString trSubprograms() virtual QCString trPackageMembers() virtual QCString trStaticPackageMembers() @@ -567,6 +847,7 @@ TranslatorSlovak (TranslatorAdapter_1_2_18) 44 methods to implement virtual QCString trSearchResultsTitle() virtual QCString trDirectories() virtual QCString trTypeConstraints() + virtual QCString trGlobalNamespace() virtual QCString trMemberFunctionDocumentationFortran() virtual QCString trDirDescription() virtual QCString trStaticPackageAttribs() @@ -577,6 +858,7 @@ TranslatorSlovak (TranslatorAdapter_1_2_18) 44 methods to implement virtual QCString trModulesMemberDescription(bool extractAll) virtual QCString trModulesMembers() virtual QCString trModulesIndex() + virtual QCString trDirRelation(const char * name) virtual QCString trPackageTypes() virtual QCString trCompoundListFortran() virtual QCString trDataTypes() @@ -611,7 +893,7 @@ TranslatorSlovak (TranslatorAdapter_1_2_18) 44 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorSlovene (TranslatorAdapter_1_4_6) 24 methods to implement +TranslatorSlovene (TranslatorAdapter_1_4_6) 29 methods to implement ----------------- Implements 192 of the required methods. @@ -619,11 +901,15 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 24 methods to implement 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() @@ -631,6 +917,7 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 24 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() @@ -644,13 +931,49 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 24 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorSwedish (Translator) +TranslatorSpanish (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorSwedish (TranslatorAdapter_1_6_0) 5 methods to implement +----------------- + + 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) + + +TranslatorTurkish (TranslatorAdapter_1_6_0) 5 methods to implement ----------------- 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) + -TranslatorUkrainian (TranslatorAdapter_1_4_1) 24 methods to implement +TranslatorUkrainian (TranslatorAdapter_1_4_1) 29 methods to implement ------------------- Implements 192 of the required methods. @@ -658,12 +981,16 @@ TranslatorUkrainian (TranslatorAdapter_1_4_1) 24 methods to implement Missing methods (should be implemented): virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) + virtual QCString trSearching() virtual QCString trOverloadText() + 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() @@ -671,6 +998,7 @@ TranslatorUkrainian (TranslatorAdapter_1_4_1) 24 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() @@ -692,4 +1020,18 @@ TranslatorUkrainian (TranslatorAdapter_1_4_1) 24 methods to implement virtual QCString trInterfaces() virtual QCString trHeaderFiles() virtual QCString trBugsAndLimitations() - virtual QCString trNoDescriptionAvailable()
\ No newline at end of file + virtual QCString trNoDescriptionAvailable() + + +TranslatorVietnamese (TranslatorAdapter_1_6_0) 5 methods to implement +-------------------- + + 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)
\ No newline at end of file diff --git a/packages/rpm/doxygen.spec.in b/packages/rpm/doxygen.spec.in index 39edc42..c97b229 100644 --- a/packages/rpm/doxygen.spec.in +++ b/packages/rpm/doxygen.spec.in @@ -14,7 +14,7 @@ URL: http://www.stack.nl/~dimitri/doxygen/index.html Vendor: Dimitri van Heesch License: GNU General Public License Group: Development/Tools -Source: %{name}-%{version}_%{revision}.src.tar.gz +Source: %{name}-%{version}.src.tar.gz BuildRoot: %{buildroot} BuildPrereq: libstdc++-devel >= 2.96, /usr/bin/perl, /usr/bin/latex, /usr/bin/dvips, /usr/bin/gs Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv, libstdc++ >= 2.96 @@ -48,7 +48,7 @@ install. %endif %prep -%setup -q -n %{name}-%{version}_%{revision} +%setup -q -n %{name}-%{version} ./configure %{?_with_doxywizard} --prefix $RPM_BUILD_ROOT/usr %build diff --git a/src/commentscan.l b/src/commentscan.l index 88f4008..d7d064d 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1021,7 +1021,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <Comment>^{B}*"."{B}*/\n { // explicit end autolist: e.g " ." addOutput(yytext); } -<Comment>"."[a-z_A-Z0-9] { // . at start or in the middle of a word +<Comment>("."+)[a-z_A-Z0-9] { // . at start or in the middle of a word, or ellipsis addOutput(yytext); } <Comment>".\\"[ \t] { // . with escaped space. @@ -2626,6 +2626,7 @@ static void groupAddDocs(Entry *e,const char *fileName) { info->doc = g_memberGroupDocs; info->docFile = fileName; + info->setRefItems(e->sli); } e->doc.resize(0); e->brief.resize(0); diff --git a/src/config.xml b/src/config.xml index aa09dcb..a2cb0af 100644 --- a/src/config.xml +++ b/src/config.xml @@ -449,6 +449,11 @@ The appearance of the initializer of individual variables and defines in the documentation can be controlled using \showinitializer or \hideinitializer command in the documentation regardless of this setting. ' minval='0' maxval='10000' defval='30'/> + <option type='bool' id='SHOW_USED_FILES' docs=' +Set the SHOW_USED_FILES tag to NO to disable the list of files generated +at the bottom of the documentation of classes and structs. If set to YES the +list will mention the files that were used to generate the documentation. +' defval='1'/> <option type='bool' id='SHOW_DIRECTORIES' docs=' If the sources in your project are distributed over multiple directories then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy @@ -884,7 +889,7 @@ that doxygen will group on one line in the generated HTML documentation. <option type='bool' id='GENERATE_TREEVIEW' defval='0' docs=' The GENERATE_TREEVIEW tag is used to specify whether a tree-like index structure should be generated to display hierarchical information. -If the tag value is set to FRAME, a side panel will be generated +If the tag value is set to YES, a side panel will be generated containing a tree-like index structure (just like the one that is generated for HTML Help). For this to work a browser that supports JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). @@ -1374,7 +1379,6 @@ If the DOT_CLEANUP tag is set to YES (the default) Doxygen will remove the intermediate dot files that are used to generate the various graphs. ' defval='1' depends='HAVE_DOT'/> - <option type='obsolete' id='SHOW_USED_FILES'/> <option type='obsolete' id='USE_WINDOWS_ENCODING'/> <option type='obsolete' id='DETAILS_AT_TOP'/> <option type='obsolete' id='QTHELP_FILE'/> diff --git a/src/configoptions.cpp b/src/configoptions.cpp index 9d9c489..2aad2bc 100644 --- a/src/configoptions.cpp +++ b/src/configoptions.cpp @@ -636,6 +636,14 @@ void addConfigOptions(Config *cfg) ); //---- cb = cfg->addBool( + "SHOW_USED_FILES", + "Set the SHOW_USED_FILES tag to NO to disable the list of files generated\n" + "at the bottom of the documentation of classes and structs. If set to YES the\n" + "list will mention the files that were used to generate the documentation.", + TRUE + ); + //---- + cb = cfg->addBool( "SHOW_DIRECTORIES", "If the sources in your project are distributed over multiple directories\n" "then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy\n" @@ -1293,7 +1301,7 @@ void addConfigOptions(Config *cfg) "GENERATE_TREEVIEW", "The GENERATE_TREEVIEW tag is used to specify whether a tree-like index\n" "structure should be generated to display hierarchical information.\n" - "If the tag value is set to FRAME, a side panel will be generated\n" + "If the tag value is set to YES, a side panel will be generated\n" "containing a tree-like index structure (just like the one that\n" "is generated for HTML Help). For this to work a browser that supports\n" "JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).\n" @@ -2089,8 +2097,6 @@ void addConfigOptions(Config *cfg) ); cb->addDependency("HAVE_DOT"); //---- - cfg->addObsolete("SHOW_USED_FILES"); - //---- cfg->addObsolete("USE_WINDOWS_ENCODING"); //---- cfg->addObsolete("DETAILS_AT_TOP"); diff --git a/src/dbusxmlscanner.cpp b/src/dbusxmlscanner.cpp index 8a07d81..514039f 100644 --- a/src/dbusxmlscanner.cpp +++ b/src/dbusxmlscanner.cpp @@ -354,6 +354,7 @@ public: // Interface: if (DBUS("interface")) { + CONDITION(m_currentInterface, "end of interface found without start."); m_currentInterface->endBodyLine = lineNumber(); closeScopes(); m_currentInterface = 0; @@ -361,6 +362,8 @@ public: if (DBUS("method") || DBUS("signal")) { + CONDITION(m_currentMethod, "end of method found without start."); + CONDITION(m_currentInterface, "end of method found outside interface."); m_currentMethod->endBodyLine = lineNumber(); m_currentInterface->addSubEntry(m_currentMethod); m_currentMethod = 0; @@ -368,6 +371,8 @@ public: if (DBUS("property")) { + CONDITION(m_currentMethod, "end of property found without start."); + CONDITION(m_currentInterface, "end of property found outside interface."); m_currentProperty->endBodyLine = lineNumber(); m_currentInterface->addSubEntry(m_currentProperty); m_currentProperty = 0; @@ -375,6 +380,7 @@ public: if (DBUS("arg")) { + CONDITION(m_currentMethod, "end of arg found outside method."); m_currentMethod->argList->append(m_currentArgument); m_currentArgument = 0; } @@ -382,6 +388,7 @@ public: if (EXTENSION("namespace")) { Entry * current = m_namespaceStack.last(); + CONDITION(current, "end of namespace without start."); m_namespaceStack.removeLast(); current->endBodyLine = lineNumber(); @@ -391,6 +398,7 @@ public: if (EXTENSION("struct")) { StructData * data = m_structStack.last(); + CONDITION(data, "end of struct without start."); data->entry->endBodyLine = lineNumber(); @@ -408,11 +416,14 @@ public: if (EXTENSION("member")) { - m_structStack.last()->entry->addSubEntry(m_currentEntry); + StructData * data = m_structStack.last(); + CONDITION(data, "end of struct without start"); + data->entry->addSubEntry(m_currentEntry); } if (EXTENSION("enum") || EXTENSION("flagset")) { + CONDITION(m_currentEnum, "end of enum without start"); m_currentEnum->endBodyLine = lineNumber(); closeScopes(); @@ -421,6 +432,7 @@ public: if (EXTENSION("value")) { + CONDITION(m_currentEntry, "end of value without start"); m_currentEntry->endBodyLine = lineNumber(); m_currentEnum->addSubEntry(m_currentEntry); @@ -847,7 +859,8 @@ void DBusXMLScanner::parseInput(const char * fileName, reader.parse(inputSource); if (handler.errorString()) - { err("ERROR parsing XML: %s\n", handler.errorString().utf8().data()); } + { err("DBus XML Parser: Error at line %d: %s\n", + handler.locator()->lineNumber(),handler.errorString().utf8().data()); } groupLeaveFile(fileName, 1); } diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 6a0c12d..56f713c 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -702,10 +702,12 @@ void DirRelation::writeDocumentation(OutputList &ol) ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); - QCString shortTitle=m_src->shortName()+" → "+ - m_dst->dir()->shortName()+" Relation";//theTranslator->trDirRelation(m_shortName); - QCString title=m_src->displayName()+" -> "+ - m_dst->dir()->shortName()+" Relation";//theTranslator->trDirRelation(m_dispName); + QCString shortTitle=theTranslator->trDirRelation( + m_src->shortName()+" → "+ + m_dst->dir()->shortName()); + QCString title=theTranslator->trDirRelation( + m_src->displayName()+" -> "+ + m_dst->dir()->shortName()); startFile(ol,getOutputFileBase(),getOutputFileBase(),title); // write navigation path diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 399371e..cc9fbad 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -725,7 +725,7 @@ REFWORD ("#"|"::")?({ID}{TEMPLPART}?("."|"#"|"::"|"-"|"/"))*({ID}(":")?){FUNCA unput(' '); return 0; } -<St_Ref>{WS}+"\"" { // white space following by quoted string +<St_Ref>{WS}+"\""{WS}* { // white space following by quoted string BEGIN(St_Ref2); } <St_Ref>\n { // new line diff --git a/src/doxygen.cpp b/src/doxygen.cpp index d256e8f..f53a291 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -6330,6 +6330,7 @@ static void findEnums(EntryNav *rootNav) md->setMemberGroupId(root->mGrpId); md->enableCallGraph(root->callGraph); md->enableCallerGraph(root->callerGraph); + //printf("%s::setRefItems(%d)\n",md->name().data(),root->sli?root->sli->count():-1); md->setRefItems(root->sli); //printf("found enum %s nd=%p\n",name.data(),nd); bool defSet=FALSE; @@ -6755,8 +6756,9 @@ static void findEnumDocumentation(EntryNav *rootNav) { md->setMemberGroupId(root->mGrpId); } - + md->addSectionsToDefinition(root->anchors); + md->setRefItems(root->sli); GroupDef *gd=md->getGroupDef(); if (gd==0 &&root->groups->first()!=0) // member not grouped but out-of-line documentation is diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index 17b4466..c1fcf54 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -590,7 +590,7 @@ void FTVHelp::generateTreeView(QString* OutString) //t << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n"; t << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n"; t << "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n"; - t << "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n"; + t << "<meta http-equiv=\"Content-Type\" content=\"text/xhtml;charset=UTF-8\"/>\n"; t << "<title>"; if (Config_getString("PROJECT_NAME").isEmpty()) { diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 66d3ea4..fbea282 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -672,7 +672,7 @@ static void writeDefaultHeaderFile(QTextStream &t, const char *title, // t << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"; t << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; t << "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n" - "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"/>\n" + "<meta http-equiv=\"Content-Type\" content=\"text/xhtml;charset=UTF-8\"/>\n" "<title>"; t << convertToHtml(title); t << "</title>\n"; diff --git a/src/index.cpp b/src/index.cpp index 39171a2..6646075 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -2523,6 +2523,7 @@ void writeSearchIndex() t << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"" " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">" << endl; t << "<html><head><title></title>" << endl; + t << "<meta http-equiv=\"Content-Type\" content=\"text/xhtml;charset=UTF-8\"/>" << endl; t << "<link rel=\"stylesheet\" type=\"text/css\" href=\"search.css\"/>" << endl; t << "<script type=\"text/javascript\" src=\"search.js\"></script>" << endl; t << "</head>" << endl; @@ -2552,17 +2553,30 @@ void writeSearchIndex() << "return searchResults.Nav(event," << itemCount << ")\" " << "onkeyup=\"" << "return searchResults.Nav(event," << itemCount << ")\" " - << "class=\"SRSymbol\" href=\"../" - << d->getOutputFileBase() << Doxygen::htmlFileExtension; + << "class=\"SRSymbol\" "; + if (!d->getReference().isEmpty()) + { + QCString *dest; + t << "doxygen=\"" << d->getReference() << ":../"; + if ((dest=Doxygen::tagDestinationDict[d->getReference()])) t << *dest << "/"; + t << "\" "; + t << "href=\"../"; + if ((dest=Doxygen::tagDestinationDict[d->getReference()])) t << *dest << "/"; + } + else + { + t << "href=\"../"; + } + t << d->getOutputFileBase() << Doxygen::htmlFileExtension; if (isMemberDef) { t << "#" << ((MemberDef *)d)->anchor(); } t << "\" target=\""; if (treeView) t << "basefrm"; else t << "_parent"; - t << "\">" - << convertToXML(d->localName()) - << "</a>" << endl; + t << "\">"; + t << convertToXML(d->localName()); + t << "</a>" << endl; if (d->getOuterScope()!=Doxygen::globalScope) { t << " <span class=\"SRScope\">" @@ -2622,8 +2636,21 @@ void writeSearchIndex() << "onkeyup=\"" << "return searchResults.NavChild(event," << itemCount << "," << childCount << ")\" " - << "class=\"SRScope\" href=\"../" << - d->getOutputFileBase() << Doxygen::htmlFileExtension; + << "class=\"SRScope\" "; + if (!d->getReference().isEmpty()) + { + QCString *dest; + t << "doxygen=\"" << d->getReference() << ":../"; + if ((dest=Doxygen::tagDestinationDict[d->getReference()])) t << *dest << "/"; + t << "\" "; + t << "href=\"../"; + if ((dest=Doxygen::tagDestinationDict[d->getReference()])) t << *dest << "/"; + } + else + { + t << "href=\"../"; + } + t << d->getOutputFileBase() << Doxygen::htmlFileExtension; if (isMemberDef) { t << "#" << ((MemberDef *)d)->anchor(); @@ -2791,6 +2818,7 @@ void writeSearchIndex() t << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" " "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">" << endl; t << "<html><head><title></title>" << endl; + t << "<meta http-equiv=\"Content-Type\" content=\"text/xhtml;charset=UTF-8\"/>" << endl; t << "<link rel=\"stylesheet\" type=\"text/css\" href=\"search.css\"/>" << endl; t << "<script type=\"text/javascript\" src=\"search.js\"></script>" << endl; t << "</head>" << endl; diff --git a/src/membergroup.cpp b/src/membergroup.cpp index f20ae0f..a191354 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -28,6 +28,8 @@ #include "doxygen.h" #include "docparser.h" #include "marshal.h" +#include "entry.h" +#include "md5.h" //static QCString idToName(int id) //{ @@ -55,6 +57,8 @@ MemberGroup::MemberGroup(Definition *parent, m_numDocMembers = -1; m_parent = parent; m_docFile = docFile; + m_xrefListItems = 0; + doc.prepend("<a name=\""+anchor()+"\"></a>"); //printf("Member group docs=`%s'\n",doc.data()); } @@ -200,9 +204,9 @@ void MemberGroup::distributeMemberGroupDocumentation() } } -int MemberGroup::varCount() const -{ - return memberList->varCount(); +int MemberGroup::varCount() const +{ + return memberList->varCount(); } int MemberGroup::funcCount() const @@ -255,9 +259,23 @@ void MemberGroup::setInGroup(bool b) memberList->setInGroup(b); } +QCString MemberGroup::anchor() const +{ + uchar md5_sig[16]; + QCString sigStr(33); + MD5Buffer((const unsigned char *)grpHeader.data(),grpHeader.length(),md5_sig); + MD5SigToString(md5_sig,sigStr.data(),33); + return "amgrp"+sigStr; +} + void MemberGroup::addListReferences(Definition *def) { memberList->addListReferences(def); + if (m_xrefListItems && def) + { + addRefItem(m_xrefListItems,theTranslator->trGroup(TRUE,TRUE), + def->getOutputFileBase()+"#"+anchor(),grpHeader,0); + } } void MemberGroup::findSectionsInDocumentation() @@ -280,6 +298,7 @@ void MemberGroup::marshal(StorageIntf *s) marshalInt(s,m_numDocMembers); marshalObjPointer(s,m_parent); marshalQCString(s,m_docFile); + marshalItemInfoList (Doxygen::symbolStorage,m_xrefListItems); } void MemberGroup::unmarshal(StorageIntf *s) @@ -296,5 +315,41 @@ void MemberGroup::unmarshal(StorageIntf *s) m_numDocMembers = unmarshalInt(s); m_parent = (Definition *)unmarshalObjPointer(s); m_docFile = unmarshalQCString(s); + m_xrefListItems = unmarshalItemInfoList (Doxygen::symbolStorage); } +void MemberGroup::setRefItems(const QList<ListItemInfo> *sli) +{ + if (sli) + { + // deep copy the list + if (m_xrefListItems==0) + { + m_xrefListItems=new QList<ListItemInfo>; + m_xrefListItems->setAutoDelete(TRUE); + } + QListIterator<ListItemInfo> slii(*sli); + ListItemInfo *lii; + for (slii.toFirst();(lii=slii.current());++slii) + { + m_xrefListItems->append(new ListItemInfo(*lii)); + } + } +} +//-------------------------------------------------------------------------- + +void MemberGroupInfo::setRefItems(const QList<ListItemInfo> *sli) +{ + if (!sli) return; + if (m_sli==0) + { + m_sli = new QList<ListItemInfo>; + m_sli->setAutoDelete(TRUE); + } + QListIterator<ListItemInfo> slii(*sli); + ListItemInfo *ili; + for (slii.toFirst();(ili=slii.current());++slii) + { + m_sli->append(new ListItemInfo(*ili)); + } +} diff --git a/src/membergroup.h b/src/membergroup.h index e7bd457..ddef6fc 100644 --- a/src/membergroup.h +++ b/src/membergroup.h @@ -34,6 +34,7 @@ class GroupDef; class OutputList; class Definition; class StorageIntf; +struct ListItemInfo; class MemberGroup { @@ -74,8 +75,10 @@ class MemberGroup int numDocMembers() const; void setInGroup(bool b); void addListReferences(Definition *d); + void setRefItems(const QList<ListItemInfo> *sli); MemberList *members() const { return memberList; } Definition *parent() const { return m_parent; } + QCString anchor() const; void marshal(StorageIntf *s); void unmarshal(StorageIntf *s); @@ -93,6 +96,7 @@ class MemberGroup int m_numDocMembers; Definition *m_parent; QCString m_docFile; + QList<ListItemInfo> *m_xrefListItems; }; class MemberGroupList : public QList<MemberGroup> @@ -113,12 +117,17 @@ class MemberGroupSDict : public SIntDict<MemberGroup> ~MemberGroupSDict() {} }; + struct MemberGroupInfo { + MemberGroupInfo() : m_sli(0) {} + ~MemberGroupInfo() { delete m_sli; m_sli=0; } + void setRefItems(const QList<ListItemInfo> *sli); QCString header; QCString doc; QCString docFile; QCString compoundName; + QList<ListItemInfo> *m_sli; }; //class MemberGroupDict : public QIntDict<MemberGroup> @@ -179,26 +179,31 @@ static Define *isDefined(const char *name) static QDict<void> g_allIncludes(10009); -static FileState *checkAndOpenFile(const QCString &fileName) +static FileState *checkAndOpenFile(const QCString &fileName,bool &alreadyIncluded) { + alreadyIncluded = FALSE; FileState *fs = 0; - //printf("checkAndOpenFile(%s)\n",absName.data()); + //printf("checkAndOpenFile(%s)\n",fileName.data()); QFileInfo fi(fileName); if (fi.exists() && fi.isFile()) { QCString absName = convertToQCString(fi.absFilePath()); -#if 1 // global guard - if (g_allIncludes.find(absName)) return 0; // already done - g_allIncludes.insert(absName,(void *)0x8); + if (g_curlyCount==0) // not #include inside { ... } + { + if (g_allIncludes.find(absName)==0) + { + alreadyIncluded = TRUE; + //printf(" already included 1\n"); + return 0; // already done + } + g_allIncludes.insert(absName,(void *)0x8); + } // check include stack for absName -#endif -#if 0 // stack based recusive inclusion detection QStack<FileState> tmpStack; g_includeStack.setAutoDelete(FALSE); - bool alreadyIncluded=FALSE; while ((fs=g_includeStack.pop())) { if (fs->fileName==absName) alreadyIncluded=TRUE; @@ -210,37 +215,52 @@ static FileState *checkAndOpenFile(const QCString &fileName) } g_includeStack.setAutoDelete(TRUE); - if (alreadyIncluded) return 0; -#endif + if (alreadyIncluded) + { + //printf(" already included 2\n"); + return 0; + } //printf("#include %s\n",absName.data()); fs = new FileState; - + alreadyIncluded = FALSE; + QCString filterName = getFileFilter(absName); if (!filterName.isEmpty()) { fs->isPlainFile = FALSE; QCString cmd = filterName+" \""+absName+"\""; fs->filePtr=portable_popen(cmd,"r"); - if (!fs->filePtr) err("Error: could not execute filter %s\n",cmd.data()); + if (!fs->filePtr) + { + err("Error: could not execute filter %s, reason: %s\n",cmd.data(), + strerror(errno)); + } } else { fs->isPlainFile = TRUE; fs->filePtr=fopen(absName,"r"); - if (!fs->filePtr) err("Error: could not open file %s for reading\n",absName.data()); + if (!fs->filePtr) + { + err("Error: could not open file %s for reading, reason: %s \n", + absName.data(),strerror(errno)); + } } if (!fs->filePtr) // error -> cleanup { delete fs; fs=0; } - fs->oldYYin = preYYin; + else + { + fs->oldYYin = preYYin; + } } return fs; } -static FileState *findFile(const char *fileName,bool localInclude) +static FileState *findFile(const char *fileName,bool localInclude,bool &alreadyIncluded) { //printf("** findFile(%s,%d) g_yyFileName=%s\n",fileName,localInclude,g_yyFileName.data()); if (localInclude && !g_yyFileName.isEmpty()) @@ -249,13 +269,17 @@ static FileState *findFile(const char *fileName,bool localInclude) if (fi.exists()) { QCString absName = QCString(fi.dirPath(TRUE).data())+"/"+fileName; - FileState *fs = checkAndOpenFile(absName); + FileState *fs = checkAndOpenFile(absName,alreadyIncluded); if (fs) { setFileName(absName); g_yyLineNr=1; return fs; } + else if (alreadyIncluded) + { + return 0; + } } } if (g_pathList==0) @@ -266,13 +290,17 @@ static FileState *findFile(const char *fileName,bool localInclude) while (s) { QCString absName = (QCString)s+"/"+fileName; - FileState *fs = checkAndOpenFile(absName); + FileState *fs = checkAndOpenFile(absName,alreadyIncluded); if (fs) { setFileName(absName); g_yyLineNr=1; return fs; } + else if (alreadyIncluded) + { + return 0; + } s=g_pathList->next(); } @@ -1081,10 +1109,10 @@ void addDefine() int l=g_defLitText.find('\n'); if (l>0 && g_defLitText.left(l).stripWhiteSpace()=="\\") { - // strip first line if it only contains a slash + // strip first line if it only contains a slash g_defLitText = g_defLitText.right(g_defLitText.length()-l-1); } - else if (l>0) + else if (l>0) { // align the items on the first line with the items on the second line int k=l+1; @@ -1094,7 +1122,7 @@ void addDefine() g_defLitText=g_defLitText.mid(l+1,k-l-1)+g_defLitText.stripWhiteSpace(); } md->setInitializer(g_defLitText.stripWhiteSpace()); - + md->setFileDef(g_inputFileDef); md->setDefinition("#define "+g_defName); @@ -1106,7 +1134,7 @@ void addDefine() } mn->append(md); if (g_yyFileDef) g_yyFileDef->insertMember(md); - + //Define *d; //if ((d=defineDict[g_defName])==0) defineDict.insert(g_defName,newDefine()); } @@ -1114,7 +1142,7 @@ void addDefine() static inline void outputChar(char c) { if (g_includeStack.isEmpty() || g_curlyCount>0) g_outputBuf->addChar(c); -} +} static inline void outputArray(const char *a,int len) { @@ -1125,32 +1153,34 @@ static void readIncludeFile(const QCString &inc) { if (!Config_getBool("SEARCH_INCLUDES")) return; // do not read include files uint i=0; - + // find the start of the include file name while (i<inc.length() && (inc.at(i)==' ' || inc.at(i)=='"' || inc.at(i)=='<') ) i++; uint s=i; - + // was it a local include? bool localInclude = s>0 && inc.at(s-1)=='"'; - + // find the end of the include file name - while (i<inc.length() && inc.at(i)!='"' && inc.at(i)!='>') i++; + while (i<inc.length() && inc.at(i)!='"' && inc.at(i)!='>') i++; if (s<inc.length() && i>s) // valid include file name found { // extract include path+name - QCString incFileName=inc.mid(s,i-s).stripWhiteSpace(); + QCString incFileName=inc.mid(s,i-s).stripWhiteSpace(); QCString oldFileName = g_yyFileName.copy(); FileDef *oldFileDef = g_yyFileDef; int oldLineNr = g_yyLineNr; //printf("Searching for `%s'\n",incFileName.data()); - + // findFile will overwrite g_yyFileDef if found FileState *fs; - if ((fs=findFile(incFileName,localInclude))) // see if the include file can be found + bool alreadyIncluded = FALSE; + //printf("calling findFile(%s)\n",incFileName.data()); + if ((fs=findFile(incFileName,localInclude,alreadyIncluded))) // see if the include file can be found { //printf("Found include file!\n"); if (Debug::isFlagSet(Debug::Preprocessor)) @@ -1158,7 +1188,7 @@ static void readIncludeFile(const QCString &inc) for (i=0;i<g_includeStack.count();i++) msg(" "); msg("#include %s: parsing...\n",incFileName.data()); } - if (oldFileDef) + if (oldFileDef) { // add include dependency to the file in which the #include was found oldFileDef->addIncludeDependency(g_yyFileDef,incFileName,localInclude,g_isImported); @@ -1181,14 +1211,15 @@ static void readIncludeFile(const QCString &inc) QCString lineStr(g_yyFileName.length()+20); lineStr.sprintf("# 1 \"%s\" 1\n",g_yyFileName.data()); outputArray(lineStr.data(),lineStr.length()); - + //fprintf(stderr,"Switching to include file %s\n",incFileName.data()); preYYin=fs->filePtr; yy_switch_to_buffer(yy_create_buffer(preYYin, YY_BUF_SIZE)); - } + } else { - if (oldFileDef) + //printf(" calling findFile(%s) alreadyInc=%d\n",incFileName.data(),alreadyIncluded); + if (oldFileDef) { bool ambig; FileDef *fd = findFileDef(Doxygen::inputNameDict,incFileName,ambig); @@ -1199,7 +1230,7 @@ static void readIncludeFile(const QCString &inc) if (fd) { //printf("Adding include dependency (2) %s->%s ambig=%d\n",oldFileDef->name().data(),fd->name().data(),ambig); - fd->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,g_isImported); + fd->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,g_isImported); } } if (Debug::isFlagSet(Debug::Preprocessor)) @@ -1207,7 +1238,7 @@ static void readIncludeFile(const QCString &inc) msg("#include %s: not found or already included! skipping...\n",incFileName.data()); //printf("Error: include file %s not found\n",yytext); } - if (g_curlyCount>0) // failed to find #include inside { ... } + if (g_curlyCount>0 && !alreadyIncluded) // failed to find #include inside { ... } { warn(g_yyFileName,g_yyLineNr,"Warning: include file %s not found, perhaps you forgot to add its directory to INCLUDE_PATH?",incFileName.data()); } diff --git a/src/translator_cz.h b/src/translator_cz.h index cd02dac..daad247 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -20,6 +20,8 @@ // Updates: // -------- +// 2009/08/24 - +// 2008/06/09 - Corrections in trLegendDocs(). // 2007/11/13 - Update for "new since 1.5.4 (mainly for Fortran)". // 2007/03/20 - removing decode(), conversion of literals to UTF-8. // 2006/06/13 - translation of the trEnumerationValueDocumentation(). @@ -77,7 +79,7 @@ // something else. It is difficult to find the general translation // for all kinds in the Czech language. -class TranslatorCzech : public TranslatorAdapter_1_6_0 +class TranslatorCzech : public Translator { public: // --- Language control methods ------------------- @@ -1053,7 +1055,7 @@ class TranslatorCzech : public TranslatorAdapter_1_6_0 /*! page explaining how the dot graph's should be interpreted */ virtual QCString trLegendDocs() { - QCString result( + return "Zde naleznete vysvětlení, jak mají být interpretovány grafy, " "které byly generovány programem doxygen.<p>\n" "Uvažujte následující příklad:\n" @@ -1064,22 +1066,21 @@ class TranslatorCzech : public TranslatorAdapter_1_6_0 "/*! Třída, u které došlo k ořezání grafu. Vztah dědičnosti " "je skryt. */\n" "class Truncated : public Invisible { };\n\n" + "/* Třída, která není dokumentována komentáři programu doxygen. */\n" + "class Undocumented { };\n\n" "/*! Bázová třída děděná veřejně (public inheritance). */\n" "class PublicBase : public Truncated { };\n\n" + "/*! Šablona třídy. */\n" + "template<class T> class Templ { };\n\n" "/*! Bázová třída, použitá pro chráněné dědění " "(protected inheritance). */\n" "class ProtectedBase { };\n\n" "/*! Bázová třída, využitá pro privátní dědění " "(private inheritance). */\n" "class PrivateBase { };\n\n" - "/* Třída, která není dokumentována komentáři programu doxygen. */\n" - "class Undocumented { };\n\n" - "/*! Šablona třídy. */\n" - "template<class T> class Templ { };\n\n" "/*! Třída, která je využívána třídou Inherited. */\n" "class Used { };\n\n" - "/*! Odvozená třída, která různým způsobem dědí z více bázových " - "tříd. */\n" + "/*! Odvozená třída, která dědí z více tříd. */\n" "class Inherited : public PublicBase,\n" " protected ProtectedBase,\n" " private PrivateBase,\n" @@ -1090,13 +1091,12 @@ class TranslatorCzech : public TranslatorAdapter_1_6_0 " Used *m_usedClass;\n" "};\n" "\\endcode\n" - "Pokud je položka \\c MAX_DOT_GRAPH_HEIGHT konfiguračního souboru " - "nastavena na hodnotu 200, bude vygenerován následující graf:" + "K výše uvedenému bude vygenerován následující graf:" "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" "<p>\n" "Bloky (tj. uzly) v uvedeném grafu mají následující význam:\n" "<ul>\n" - "<li>Černě vyplněný obdélník reprezentuje strukturu nebo třídu, " + "<li>Šedě vyplněný obdélník reprezentuje strukturu nebo třídu, " "pro kterou byl graf generován.\n" "<li>Obdélník s černým obrysem označuje dokumentovanou " "strukturu nebo třídu.\n" @@ -1125,9 +1125,7 @@ class TranslatorCzech : public TranslatorAdapter_1_6_0 "a šablonou třídy, na základě které byla\n" "instance šablony vytvořena. V popisu šipky jsou uvedeny příslušné" " parametry šablony.\n" - "</ul>\n"); - - return result; + "</ul>\n"; } /*! text for the link to the legend page */ virtual QCString trLegend() @@ -1816,6 +1814,40 @@ class TranslatorCzech : public TranslatorAdapter_1_6_0 return "Omezení typů (Type Constraints)"; } +////////////////////////////////////////////////////////////////////////// +// new since 1.6.0 (mainly for the new search engine) +////////////////////////////////////////////////////////////////////////// + + /*! directory relation for \a name */ + virtual QCString trDirRelation(const char *name) + { + return "Relace "+QCString(name); + } + + /*! Loading message shown when loading search results */ + virtual QCString trLoading() + { + return "Načítám..."; + } + + /*! Label used for search results in the global namespace */ + virtual QCString trGlobalNamespace() + { + return "Globální prostor jmen"; + } + + /*! Message shown while searching */ + virtual QCString trSearching() + { + return "Vyhledávám..."; + } + + /*! Text shown when no search results are found */ + virtual QCString trNoMatches() + { + return "Nic se nenašlo"; + } + }; #endif // TRANSLATOR_CZ_H diff --git a/src/translator_za.h b/src/translator_za.h index 1e45be3..2a5f299 100644 --- a/src/translator_za.h +++ b/src/translator_za.h @@ -14,7 +14,7 @@ * input used in their production; they are not affected by this license. * */ - + /* * Bronne vir hierdie vertaling (Sources for this translation): * Die Stigting vir Afrikaans se rekenaartermelys: @@ -26,7 +26,7 @@ #ifndef TRANSLATOR_ZA_H #define TRANSLATOR_ZA_H -class TranslatorAfrikaans : public TranslatorAdapter_1_4_6 +class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 { public: @@ -1022,7 +1022,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_4_6 " protected ProtectedBase,\n" " private PrivateBase,\n" " public Ongedokumenteer,\n" - " public Templ<int>\n" + " public Templ<int>\n" "{\n" " private:\n" " Used *m_usedClass;\n" @@ -1260,7 +1260,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_4_6 { QCString result((first_capital ? "Bladsy" : "bladsy")); if (!singular) result+="e"; - return result; + return result; } /*! This is used for translation of the word that will possibly @@ -1268,12 +1268,12 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_4_6 * of the category. */ virtual QCString trMember(bool first_capital, bool singular) - { + { QCString result((first_capital ? "Lid" : "lid")); if (!singular) result = (first_capital ? "Lede" : "lede"); return result; } - + /*! This is used for translation of the word that will possibly * be followed by a single name or by a list of names * of the category. @@ -1548,8 +1548,220 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_4_6 "funksie in die argument(e) wat dit aanvaar."; } +////////////////////////////////////////////////////////////////////////// +// new since 1.4.6 +////////////////////////////////////////////////////////////////////////// + + /*! This is used to introduce a caller (or called-by) graph */ + virtual QCString trCallerGraph() + { + return "Hier is die roep skema vir die funksie:"; + } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for enumeration values + */ + virtual QCString trEnumerationValueDocumentation() + { return "Enumerator Dokumentasie"; } + +////////////////////////////////////////////////////////////////////////// +// new since 1.5.4 (mainly for Fortran) +////////////////////////////////////////////////////////////////////////// + + /*! header that is put before the list of member subprograms (Fortran). */ + virtual QCString trMemberFunctionDocumentationFortran() + { return "Lede Funksie/Subroetine Dokumentasie"; } + + /*! This is put above each page as a link to the list of annotated data types (Fortran). */ + virtual QCString trCompoundListFortran() + { return "Data Tipes Lys"; } + + /*! This is put above each page as a link to all members of compounds (Fortran). */ + virtual QCString trCompoundMembersFortran() + { return "Data Velde"; } + + /*! This is an introduction to the annotated compound list (Fortran). */ + virtual QCString trCompoundListDescriptionFortran() + { return "Hier is die data tipes met kort beskrywings:"; } + + /*! This is an introduction to the page with all data types (Fortran). */ + virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) + { + QCString result="Hier is 'n lys van alle "; + if (!extractAll) + { + result+="gedokumenteerde "; + } + result+="data tipe lede"; + result+=" met skakels na "; + if (!extractAll) + { + result+="die data strukture dokumentasie vir elke lid"; + } + else + { + result+="die data tipes waaraan hulle behoort:"; + } + return result; + } + + /*! This is used in LaTeX as the title of the chapter with the + * annotated compound index (Fortran). + */ + virtual QCString trCompoundIndexFortran() + { return "Data Tipe Indeks"; } + + /*! This is used in LaTeX as the title of the chapter containing + * the documentation of all data types (Fortran). + */ + virtual QCString trTypeDocumentation() + { return "Data Tipe Dokumentasie"; } + + /*! This is used in the documentation of a file as a header before the + * list of (global) subprograms (Fortran). + */ + virtual QCString trSubprograms() + { return "Funksies/Subroetines"; } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for subprograms (Fortran) + */ + virtual QCString trSubprogramDocumentation() + { return "Funksies/Subroetine Dokumentasie"; } + + /*! This is used in the documentation of a file/namespace/group before + * the list of links to documented compounds (Fortran) + */ + virtual QCString trDataTypes() + { return "Data Tipes"; } + + /*! used as the title of page containing all the index of all modules (Fortran). */ + virtual QCString trModulesList() + { return "Modules Lys"; } + + /*! used as an introduction to the modules list (Fortran) */ + virtual QCString trModulesListDescription(bool extractAll) + { + QCString result="Hier is 'n lys van alle "; + if (!extractAll) result+="gedokumenteerde "; + result+="modules met kort beskrywings:"; + return result; + } + + /*! used as the title of the HTML page of a module/type (Fortran) */ + virtual QCString trCompoundReferenceFortran(const char *clName, + ClassDef::CompoundType compType, + bool isTemplate) + { + QCString result=(QCString)clName; + switch(compType) + { + case ClassDef::Class: result+=" Module"; break; + case ClassDef::Struct: result+=" Tipe"; break; + case ClassDef::Union: result+=" Unie"; break; + case ClassDef::Interface: result+=" Interflak"; break; + case ClassDef::Protocol: result+=" Protokol"; break; + case ClassDef::Category: result+=" Kategorie"; break; + case ClassDef::Exception: result+=" Eksepsie"; break; + } + if (isTemplate) result+=" Template"; + result+=" Bron"; + return result; + } + /*! used as the title of the HTML page of a module (Fortran) */ + virtual QCString trModuleReference(const char *namespaceName) + { + QCString result=namespaceName; + result+=" Module Bron"; + return result; + } + + /*! This is put above each page as a link to all members of modules. (Fortran) */ + virtual QCString trModulesMembers() + { return "Module Lede"; } + + /*! This is an introduction to the page with all modules members (Fortran) */ + virtual QCString trModulesMemberDescription(bool extractAll) + { + QCString result="Hier is 'n lys van alle "; + if (!extractAll) result+="gedokumenteerde "; + result+="module lede met skakels na "; + if (extractAll) + { + result+="die module dokumentasie vir elke lid:"; + } + else + { + result+="die modules waaraan hulle behoort:"; + } + return result; + } + + /*! This is used in LaTeX as the title of the chapter with the + * index of all modules (Fortran). + */ + virtual QCString trModulesIndex() + { return "Modules Indeks"; } + + /*! This is used for translation of the word that will possibly + * be followed by a single name or by a list of names + * of the category. + */ + virtual QCString trModule(bool first_capital, bool singular) + { + QCString result((first_capital ? "Module" : "module")); + if (!singular) result+="s"; + return result; + } + /*! This is put at the bottom of a module documentation page and is + * followed by a list of files that were used to generate the page. + */ + virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, + bool single) + { + // single is true implies a single file + QCString result=(QCString)"The documentation for this "; + switch(compType) + { + case ClassDef::Class: result+="module"; break; + case ClassDef::Struct: result+="tipe"; break; + case ClassDef::Union: result+="unie"; break; + case ClassDef::Interface: result+="Interflak"; break; + case ClassDef::Protocol: result+="protokcol"; break; + case ClassDef::Category: result+="kategorie"; break; + case ClassDef::Exception: result+="eksepsie"; break; + } + result+=" is gegenereer vanaf die foldende leer"; + if (single) result+=":"; else result+="s:"; + return result; + } + /*! This is used for translation of the word that will possibly + * be followed by a single name or by a list of names + * of the category. + */ + virtual QCString trType(bool first_capital, bool singular) + { + QCString result((first_capital ? "Tipe" : "tipe")); + if (!singular) result+="s"; + return result; + } + /*! This is used for translation of the word that will possibly + * be followed by a single name or by a list of names + * of the category. + */ + virtual QCString trSubprogram(bool first_capital, bool singular) + { + QCString result((first_capital ? "Subprogram" : "subprogram")); + if (!singular) result+="me"; + return result; + } + + /*! C# Type Constraint list */ + virtual QCString trTypeConstraints() + { + return "Tipe Limiete"; + } }; #endif - diff --git a/src/util.cpp b/src/util.cpp index d6440d3..c164c2d 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5399,6 +5399,7 @@ void addMembersToMemberGroup(MemberList *ml, } md = ml->take(index); // remove from member list mg->insertMember(md); // insert in member group + mg->setRefItems(info->m_sli); md->setMemberGroup(mg); continue; } @@ -6502,7 +6503,7 @@ void initDefaultExtensionMapping() updateLanguageMapping(".f90", "fortran"); updateLanguageMapping(".vhd", "vhdl"); updateLanguageMapping(".vhdl", "vhdl"); - updateLanguageMapping(".xml", "dbusxml"); + //updateLanguageMapping(".xml", "dbusxml"); } SrcLangExt getLanguageFromFileName(const QCString fileName) diff --git a/src/vhdlcode.l b/src/vhdlcode.l index c5df9f0..57d5eaf 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -579,7 +579,7 @@ static void startFontClass(const char *s) static void writeFont(const char *s,const char* text) { if (s==0 || text==0) return; - printf("writeFont(%d,\"%s\")\n",g_yyLineNr,text); + //printf("writeFont(%d,\"%s\")\n",g_yyLineNr,text); g_code->startFontClass(s); g_code->codify(text); g_code->endFontClass(); |