From 7a3de4c3c8aac25c38b6e93bb0927de40cd1c650 Mon Sep 17 00:00:00 2001 From: dimitri Date: Fri, 22 May 2009 11:07:08 +0000 Subject: Release-1.5.9-20090522 --- INSTALL | 4 +- README | 4 +- addon/doxywizard/doxywizard.cpp | 4 +- doc/commands.doc | 71 ++++-- doc/diagrams.doc | 2 +- doc/index.doc | 8 +- doc/language.doc | 73 ++++--- doc/language.tpl | 4 +- doc/maintainers.txt | 1 + doc/output.doc | 2 +- doc/translator.py | 23 +- doc/translator_report.txt | 68 +----- src/classdef.cpp | 41 ++-- src/commentcnv.l | 9 +- src/definition.cpp | 3 +- src/diagram.cpp | 4 +- src/dirdef.cpp | 21 +- src/docparser.h | 6 + src/dot.cpp | 144 ++++++------ src/doxygen.css | 50 +++++ src/doxygen_css.h | 50 +++++ src/filedef.cpp | 20 +- src/formula.cpp | 1 - src/ftvhelp.cpp | 26 ++- src/ftvhelp.h | 4 +- src/groupdef.cpp | 27 ++- src/htmldocvisitor.cpp | 473 +++++++++++++++++++++++++++++++++++----- src/htmldocvisitor.h | 4 + src/htmlgen.cpp | 129 ++++++----- src/htmlgen.h | 22 +- src/index.cpp | 70 ++++-- src/latexgen.cpp | 1 + src/latexgen.h | 8 +- src/mangen.cpp | 15 +- src/mangen.h | 12 +- src/memberdef.cpp | 71 ++++-- src/msc.cpp | 2 +- src/namespacedef.cpp | 20 +- src/outputgen.h | 22 +- src/outputlist.h | 24 +- src/pagedef.cpp | 2 +- src/pre.l | 12 +- src/rtfgen.cpp | 18 +- src/rtfgen.h | 10 +- src/scanner.l | 7 +- src/translator_en.h | 23 +- src/translator_pl.h | 234 ++++++++++++++++++-- src/vhdlcode.l | 4 +- src/vhdldocgen.cpp | 21 +- src/vhdldocgen.h | 2 +- src/vhdlscanner.l | 15 +- 51 files changed, 1378 insertions(+), 513 deletions(-) diff --git a/INSTALL b/INSTALL index 62d4f6e..79fd565 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.5.9 +DOXYGEN Version 1.5.9-20090522 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (30 April 2009) +Dimitri van Heesch (22 May 2009) diff --git a/README b/README index e273e46..604f849 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.5.9 +DOXYGEN Version 1.5.9_20090522 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) (30 April 2009) +Dimitri van Heesch (dimitri@stack.nl) (22 May 2009) diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 63d7efe..5928524 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -8,8 +8,8 @@ const int messageTimeout = 5000; //!< status bar message timeout in millisec. MainWindow &MainWindow::instance() { - static MainWindow theInstance; - return theInstance; + static MainWindow *theInstance = new MainWindow; + return *theInstance; } MainWindow::MainWindow() diff --git a/doc/commands.doc b/doc/commands.doc index 4d8e5f7..6e9c2e8 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -181,9 +181,14 @@ documentation: The following subsections provide a list of all commands that are recognized by doxygen. Unrecognized commands are treated as normal text. -

\htmlonly
--- \endhtmlonly - Structural indicators - \htmlonly ---
\endhtmlonly

+ +\htmlonly
\endhtmlonly +

+\htmlonly --- \endhtmlonly +Structural indicators +\htmlonly --- \endhtmlonly +

+\htmlonly
\endhtmlonly \section cmdaddtogroup \\addtogroup [(title)] \addindex \\addtogroup @@ -383,6 +388,7 @@ doxygen. Unrecognized commands are treated as normal text. (e.g. C). The file \c manual.c in the example directory shows how to use this command. + \htmlonly Click here for the corresponding HTML documentation that is generated by doxygen. @@ -484,6 +490,7 @@ doxygen. Unrecognized commands are treated as normal text. (e.g. C). The file \c manual.c in the example directory shows how to use this command. + \htmlonly Click here for the corresponding HTML documentation that is generated by doxygen. @@ -581,6 +588,7 @@ doxygen. Unrecognized commands are treated as normal text. \ref cmdprivate "\\private". The file \c manual.c in the example directory shows how to use this command. + \htmlonly Click here for the corresponding HTML documentation that is generated by doxygen. @@ -856,9 +864,13 @@ doxygen. Unrecognized commands are treated as normal text.
-

\htmlonly
--- \endhtmlonly - Section indicators - \htmlonly ---
\endhtmlonly

+\htmlonly
\endhtmlonly +

+\htmlonly --- \endhtmlonly +Section indicators +\htmlonly --- \endhtmlonly +

+\htmlonly
\endhtmlonly
\section cmdattention \\attention { attention text } @@ -1125,7 +1137,9 @@ class Example { }; \endverbatim -

Where the following aliases are defined in the configuration file:

+ + Where the following aliases are defined in the configuration file: + \verbatim ALIASES = "english=\if english" \ "endenglish=\endif" \ @@ -1442,9 +1456,14 @@ void memcpy(void *dest, const void *src, size_t n); \\xrefitem command.


-

\htmlonly
--- \endhtmlonly - Commands to create links - \htmlonly ---
\endhtmlonly

+ +\htmlonly
\endhtmlonly +

+\htmlonly --- \endhtmlonly +Commands to create links +\htmlonly --- \endhtmlonly +

+\htmlonly
\endhtmlonly \section cmdaddindex \\addindex (text) @@ -1617,9 +1636,13 @@ Make sure you have first read \ref intro "the introduction".
-

\htmlonly
--- \endhtmlonly - Commands for displaying examples - \htmlonly ---
\endhtmlonly

+\htmlonly
\endhtmlonly +

+\htmlonly --- \endhtmlonly +Commands for displaying examples +\htmlonly --- \endhtmlonly +

+\htmlonly
\endhtmlonly \section cmddontinclude \\dontinclude @@ -1786,9 +1809,14 @@ Make sure you have first read \ref intro "the introduction". \ref cfg_example_path "EXAMPLE_PATH" tag of doxygen's configuration file.
-

\htmlonly
--- \endhtmlonly - Commands for visual enhancements - \htmlonly ---
\endhtmlonly

+ +\htmlonly
\endhtmlonly +

+\htmlonly --- \endhtmlonly +Commands for visual enhancements +\htmlonly --- \endhtmlonly +

+\htmlonly
\endhtmlonly \section cmda \\a @@ -2432,11 +2460,16 @@ class Receiver character has to be escaped in some cases, because it is used to prevent auto-linking to word that is also a documented class or struct. -

\htmlonly
--- \endhtmlonly - Commands included for Qt compatibility - \htmlonly ---
\endhtmlonly


+\htmlonly
\endhtmlonly +

+\htmlonly --- \endhtmlonly +Commands included for Qt compatibility +\htmlonly --- \endhtmlonly +

+\htmlonly
\endhtmlonly + The following commands are supported to remain compatible to the Qt class browser generator. Do \e not use these commands in your own documentation.
    diff --git a/doc/diagrams.doc b/doc/diagrams.doc index 9295360..7e07cef 100644 --- a/doc/diagrams.doc +++ b/doc/diagrams.doc @@ -135,7 +135,7 @@ that doxygen can generate: \htmlonly Click here - for the corresponding HTML documentation that is generated by doxygen
    + for the corresponding HTML documentation that is generated by doxygen
    (EXTRACT_ALL = YES is used here). \endhtmlonly diff --git a/doc/index.doc b/doc/index.doc index 0debece..ed1abbf 100644 --- a/doc/index.doc +++ b/doc/index.doc @@ -18,8 +18,7 @@ \if logo_on
    \htmlonly -doxygen
    +doxygen
    Version: $(VERSION) \endhtmlonly
    @@ -118,7 +117,7 @@ The third part provides information for developers: \addindex license \addindex GPL -Copyright © 1997-2008 by +Copyright © 1997-2009 by Dimitri van Heesch.

    Permission to use, copy, modify, and distribute this software and its @@ -177,7 +176,6 @@ Thanks go to: given me a good start in writing doxygen.

  • All people at Qt Software, for creating a beautiful GUI Toolkit (which is very useful as a Windows/Unix platform abstraction layer :-) -
  • Kevin McBride for maintaining the subversion reporsitory for doxygen.
  • My brother Frank for rendering the logos.
  • Harm van der Heijden for adding HTML help support. @@ -187,8 +185,6 @@ Thanks go to:
  • Parker Waechter for adding the RTF output generator.
  • Joerg Baumann, for adding conditional documentation blocks, PDF links, and the configuration generator. -
  • Matthias Andree for providing a .spec script for building rpms from the - sources.
  • Tim Mensch for adding the todo command.
  • Christian Hammond for redesigning the web-site.
  • Ken Wong for providing the HTML tree view code. diff --git a/doc/language.doc b/doc/language.doc index 884fce8..a7da0df 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.8), 38 languages +Currently (version 1.5.9), 38 languages are supported (sorted alphabetically): Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, @@ -39,16 +39,16 @@ was generated from sources and shows approximately the last version when the translator was updated. \htmlonly - +
    - +
    - - - - + + + + @@ -72,20 +72,20 @@ when the translator was updated. - - + + - - + + - - + + @@ -150,8 +150,8 @@ when the translator was updated. - - + + @@ -162,15 +162,15 @@ when the translator was updated. - - + + - - - + + + @@ -180,8 +180,8 @@ when the translator was updated. - - + + @@ -192,8 +192,8 @@ when the translator was updated. - - + + @@ -216,8 +216,8 @@ when the translator was updated. - - + + @@ -228,8 +228,8 @@ when the translator was updated. - - + + @@ -264,15 +264,15 @@ when the translator was updated. - - + + - + @@ -350,7 +350,8 @@ when the translator was updated. Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & up-to-date \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\ \hline - Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.5.4 \\ + Japanese & Hiroki Iseri & {\tt\tiny goyoki@gmail.com} & up-to-date \\ + ~ & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & ~ \\ ~ & Kenji Nagamatsu & {\tt\tiny naga@joyful.club.ne.jp} & ~ \\ ~ & Iwasa Kazmi & {\tt\tiny iwasa@cosmo-system.jp} & ~ \\ \hline @@ -394,7 +395,7 @@ when the translator was updated. ~ & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & ~ \\ ~ & David Vaquero & {\tt\tiny david@grupoikusnet.com} & ~ \\ \hline - Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.4.6 \\ + Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & up-to-date \\ \hline Turkish & Emin Ilker Cetinbas & {\tt\tiny niw3@yahoo.com} & up-to-date \\ \hline @@ -623,7 +624,9 @@ script was developed (located in \c doxygen/doc directory). It extracts the important information about obsolete and new methods from the source files for each of the languages. The information is stored in the translator report ASCII file -(translator_report.txt). \htmlonly If you compiled this documentation +(translator_report.txt). + +\htmlonly If you compiled this documentation from sources and if you have also doxygen sources available the link doxygen/doc/translator_report.txt should be valid.\endhtmlonly diff --git a/doc/language.tpl b/doc/language.tpl index ca1900e..5664bd4 100644 --- a/doc/language.tpl +++ b/doc/language.tpl @@ -255,7 +255,9 @@ script was developed (located in \c doxygen/doc directory). It extracts the important information about obsolete and new methods from the source files for each of the languages. The information is stored in the translator report ASCII file -(%(translatorReportFileName)s). \htmlonly If you compiled this documentation +(%(translatorReportFileName)s). + +\htmlonly If you compiled this documentation from sources and if you have also doxygen sources available the link %(translatorReportLink)s should be valid.\endhtmlonly diff --git a/doc/maintainers.txt b/doc/maintainers.txt index c5f9f50..754cb1b 100644 --- a/doc/maintainers.txt +++ b/doc/maintainers.txt @@ -99,6 +99,7 @@ Ali Nadalizadeh: nadalizadeh@gmail.com TranslatorPolish Piotr Kaminski: Piotr.Kaminski@ctm.gdynia.pl Grzegorz Kowal: g_kowal@poczta.onet.pl +Krzysztof Kral: krzysztof.kral@gmail.com TranslatorPortuguese Rui Godinho Lopes: ruiglopes@yahoo.com diff --git a/doc/output.doc b/doc/output.doc index 6e37f91..cd2bea3 100644 --- a/doc/output.doc +++ b/doc/output.doc @@ -16,7 +16,7 @@ */ /*! \page output Output Formats -\section output Output Formats +\section output_sec Output Formats \addindex output formats diff --git a/doc/translator.py b/doc/translator.py index af65706..c53fd71 100644 --- a/doc/translator.py +++ b/doc/translator.py @@ -49,6 +49,7 @@ 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 """ from __future__ import generators @@ -1744,16 +1745,16 @@ class TrManager: # Define templates for HTML table parts of the documentation. htmlTableTpl = '''\ \\htmlonly -
    Language Maintainer Contact address - (replace the at and dot) Status Language Maintainer Contact address + (replace the at and dot) Status
    CatalanMaximiliano Pin
    Albert Mora
    max.pin at bitroit dot com
    amora at iua dot upf dot es
    Maximiliano Pin
    Albert Mora
    max.pin at bitroit dot com
    amora at iua dot upf dot es
    up-to-date
    ChineseLi Daobing
    Wei Liu
    lidaobing at gmail dot com
    liuwei at asiainfo dot com
    Li Daobing
    Wei Liu
    lidaobing at gmail dot com
    liuwei at asiainfo dot com
    up-to-date
    Chinese TraditionalDaniel YC Lin
    Gary Lee
    dlin.tw at gmail dot com
    garywlee at gmail dot com
    Daniel YC Lin
    Gary Lee
    dlin.tw at gmail dot com
    garywlee at gmail dot com
    up-to-date
    HungarianÁkos Kiss
    Földvári György
    akiss at users dot sourceforge dot net
    foldvari lost at cyberspace
    Ákos Kiss
    Földvári György
    akiss at users dot sourceforge dot net
    foldvari lost at cyberspace
    1.4.6
    ItalianAlessandro Falappa
    Ahmed Aldo Faisal
    alessandro at falappa dot net
    aaf23 at cam dot ac dot uk
    Alessandro Falappa
    Ahmed Aldo Faisal
    alessandro at falappa dot net
    aaf23 at cam dot ac dot uk
    up-to-date
    JapaneseRyunosuke Satoh
    Kenji Nagamatsu
    Iwasa Kazmi
    sun594 at hotmail dot com
    naga at joyful dot club dot ne dot jp
    iwasa at cosmo-system dot jp
    1.5.4Hiroki Iseri
    Ryunosuke Satoh
    Kenji Nagamatsu
    Iwasa Kazmi
    goyoki at gmail dot com
    sun594 at hotmail dot com
    naga at joyful dot club dot ne dot jp
    iwasa at cosmo-system dot jp
    up-to-date
    JapaneseEn
    KoreanKim Taedong
    SooYoung Jung
    Richard Kim
    fly1004 at gmail dot com
    jung5000 at gmail dot com
    ryk at dspwiz dot com
    Kim Taedong
    SooYoung Jung
    Richard Kim
    fly1004 at gmail dot com
    jung5000 at gmail dot com
    ryk at dspwiz dot com
    up-to-date
    LithuanianTomas Simonaitis
    Mindaugas Radzius
    Aidas Berukstis
    haden at homelan dot lt
    mindaugasradzius at takas dot lt
    aidasber at takas dot lt
    Tomas Simonaitis
    Mindaugas Radzius
    Aidas Berukstis
    haden at homelan dot lt
    mindaugasradzius at takas dot lt
    aidasber at takas dot lt
    1.4.6
    PolishPiotr Kaminski
    Grzegorz Kowal
    Piotr.Kaminski at ctm dot gdynia dot pl
    g_kowal at poczta dot onet dot pl
    Piotr Kaminski
    Grzegorz Kowal
    Piotr.Kaminski at ctm dot gdynia dot pl
    g_kowal at poczta dot onet dot pl
    1.4.6
    RomanianIonut Dumitrascu
    Alexandru Iosup
    reddumy at yahoo dot com
    aiosup at yahoo dot com
    Ionut Dumitrascu
    Alexandru Iosup
    reddumy at yahoo dot com
    aiosup at yahoo dot com
    up-to-date
    SpanishBartomeu
    Francisco Oltra Thennet
    David Vaquero
    bartomeu at loteria3cornella dot com
    foltra at puc dot cl
    david at grupoikusnet dot com
    Bartomeu
    Francisco Oltra Thennet
    David Vaquero
    bartomeu at loteria3cornella dot com
    foltra at puc dot cl
    david at grupoikusnet dot com
    up-to-date
    Swedish Mikael Hallin mikaelhallin at yahoo dot se1.4.6up-to-date
    Turkish
    +
    - +
    - - - - + + + + %s @@ -1792,20 +1793,20 @@ class TrManager: if not mm and self.__maintainersDic.has_key(obj.classId): lm = [ m[0] for m in self.__maintainersDic[obj.classId] ] - mm = '
    '.join(lm) + mm = '
    '.join(lm) le = [ m[1] for m in self.__maintainersDic[obj.classId] ] - ee = '
    '.join(le) + ee = '
    '.join(le) # Mangle the e-mail and replace the entity references. if ee and ee != ' ': # More than one maintainer address separated by
    can be used. - emails = ee.split('
    ') + emails = ee.split('
    ') mangled_list = [] for email in emails: name, domain = email.split('@') domain = domain.replace('.', ' dot ') mangled_list.append(name + ' at ' + domain) - ee = '
    '.join(mangled_list) + ee = '
    '.join(mangled_list) if mm: mm = mm.replace('č', 'č') diff --git a/doc/translator_report.txt b/doc/translator_report.txt index 771633d..c6c721d 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -1,4 +1,4 @@ -(1.5.8) +(1.5.9) 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, 22 translators are up-to-date, 16 translators are based on +Of them, 24 translators are up-to-date, 14 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- @@ -31,6 +31,7 @@ still may be some details listed even for them: TranslatorFinnish TranslatorGerman TranslatorItalian + TranslatorJapanese -- Remove the obsolete methods (never used). TranslatorKorean TranslatorMacedonian TranslatorPersian @@ -39,6 +40,7 @@ still may be some details listed even for them: TranslatorSerbianCyrilic TranslatorSerbian TranslatorSpanish + TranslatorSwedish -- The "translate me!" found in a comment. TranslatorTurkish TranslatorVietnamese @@ -48,11 +50,9 @@ 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: - TranslatorJapanese 1.5.4 22 methods to implement TranslatorGreek 1.5.4 22 methods to implement TranslatorFrench 1.5.4 22 methods to implement TranslatorDanish 1.5.4 22 methods to implement - TranslatorSwedish 1.4.6 24 methods to implement TranslatorSlovene 1.4.6 24 methods to implement TranslatorPolish 1.4.6 23 methods to implement TranslatorNorwegian 1.4.6 23 methods to implement @@ -349,35 +349,10 @@ TranslatorIndonesian (TranslatorAdapter_1_4_6) 23 methods to implement virtual QCString trNoDescriptionAvailable() -TranslatorJapanese (TranslatorAdapter_1_5_4) 22 methods to implement +TranslatorJapanese (Translator) ------------------ - Implements 194 of the required methods. - - Missing methods (should be implemented): - - virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) - virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) - virtual QCString trSubprograms() - virtual QCString trModulesListDescription(bool extractAll) - virtual QCString trModulesList() - virtual QCString trTypeConstraints() - 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 trCompoundListFortran() - virtual QCString trDataTypes() - virtual QCString trCompoundIndexFortran() - virtual QCString trSubprogram(bool first_capital, bool singular) - 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() + Implements 216 of the required methods. Obsolete methods (should be removed, never used): @@ -695,37 +670,10 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 24 methods to implement virtual QCString trSubprogramDocumentation() -TranslatorSwedish (TranslatorAdapter_1_4_6) 24 methods to implement +TranslatorSwedish (Translator) ----------------- - Implements 192 of the required methods. - - Missing methods (should be implemented): - - virtual QCString trCompoundMembersDescriptionFortran(bool extractAll) - virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, bool single) - virtual QCString trSubprograms() - virtual QCString trModulesListDescription(bool extractAll) - virtual QCString trModulesList() - virtual QCString trTypeConstraints() - 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 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() + Implements 216 of the required methods. TranslatorUkrainian (TranslatorAdapter_1_4_1) 24 methods to implement diff --git a/src/classdef.cpp b/src/classdef.cpp index 7bd4b48..198fc4d 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -844,7 +844,9 @@ void ClassDef::writeBriefDescription(OutputList &ol,bool exampleFlag) { if (!briefDescription().isEmpty()) { - ol.parseDoc(briefFile(),briefLine(),this,0,briefDescription(),TRUE,FALSE); + ol.startParagraph(); + ol.parseDoc(briefFile(),briefLine(),this,0, + briefDescription(),TRUE,FALSE,0,TRUE,FALSE); ol.pushGeneratorState(); ol.disable(OutputGenerator::RTF); ol.writeString(" \n"); @@ -862,10 +864,11 @@ void ClassDef::writeBriefDescription(OutputList &ol,bool exampleFlag) } ol.popGeneratorState(); - ol.pushGeneratorState(); - ol.disable(OutputGenerator::RTF); - ol.newParagraph(); - ol.popGeneratorState(); + //ol.pushGeneratorState(); + //ol.disable(OutputGenerator::RTF); + //ol.newParagraph(); // FIXME:PARA + //ol.popGeneratorState(); + ol.endParagraph(); } ol.writeSynopsis(); } @@ -903,7 +906,7 @@ void ClassDef::writeDetailedDescription(OutputList &ol, const QCString &pageType ol.pushGeneratorState(); ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::RTF); - ol.newParagraph(); + //ol.newParagraph(); // FIXME:PARA ol.enableAll(); ol.disableAllBut(OutputGenerator::Man); ol.writeString("\n\n"); @@ -912,7 +915,6 @@ void ClassDef::writeDetailedDescription(OutputList &ol, const QCString &pageType // write documentation if (!documentation().isEmpty()) { - //ol.newParagraph(); ol.parseDoc(docFile(),docLine(),this,0,documentation(),TRUE,FALSE); } // write type constraints @@ -922,9 +924,11 @@ void ClassDef::writeDetailedDescription(OutputList &ol, const QCString &pageType if (exampleFlag && m_impl->exampleSDict) { ol.startSimpleSect(BaseOutputDocInterface::Examples,0,0,theTranslator->trExamples()+": "); - ol.writeDescItem(); - ol.newParagraph(); + ol.startDescForItem(); + ol.startParagraph(); writeExample(ol,m_impl->exampleSDict); + ol.endParagraph(); + ol.endDescForItem(); ol.endSimpleSect(); } //ol.newParagraph(); @@ -972,7 +976,7 @@ void ClassDef::showUsedFiles(OutputList &ol) ol.startItemList(); } - ol.writeListItem(); + ol.startItemListItem(); QCString path=fd->getPath(); if (Config_getBool("FULL_PATH_NAMES")) { @@ -1015,8 +1019,9 @@ void ClassDef::showUsedFiles(OutputList &ol) { ol.docify(fname); } - ol.popGeneratorState(); + + ol.endItemListItem(); } file=m_impl->files.next(); } @@ -1089,6 +1094,7 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) if (m_impl->inherits && (count=m_impl->inherits->count())>0) { + ol.startParagraph(); //parseText(ol,theTranslator->trInherits()+" "); QCString inheritLine = theTranslator->trInheritsList(m_impl->inherits->count()); @@ -1147,12 +1153,13 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) index=newIndex+matchLen; } ol.parseText(inheritLine.right(inheritLine.length()-index)); - ol.newParagraph(); + ol.endParagraph(); } // write subclasses if (m_impl->inheritedBy && (count=m_impl->inheritedBy->count())>0) { + ol.startParagraph(); QCString inheritLine = theTranslator->trInheritedByList(m_impl->inheritedBy->count()); QRegExp marker("@[0-9]+"); int index=0,newIndex,matchLen; @@ -1179,7 +1186,7 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) index=newIndex+matchLen; } ol.parseText(inheritLine.right(inheritLine.length()-index)); - ol.newParagraph(); + ol.endParagraph(); } if (renderDiagram) @@ -1216,6 +1223,7 @@ void ClassDef::writeIncludeFiles(OutputList &ol) m_impl->incInfo->includeName.data(); if (!nm.isEmpty()) { + ol.startParagraph(); ol.startTypewriter(); bool isIDLorJava = nm.right(4)==".idl" || nm.right(5)==".pidl" || @@ -1257,7 +1265,7 @@ void ClassDef::writeIncludeFiles(OutputList &ol) if (isIDLorJava) ol.docify(";"); ol.endTypewriter(); - ol.newParagraph(); + ol.endParagraph(); } } } @@ -1271,10 +1279,11 @@ void ClassDef::writeAllMembersLink(OutputList &ol) { ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); - ol.newParagraph(); + ol.startParagraph(); ol.startTextLink(getMemberListFileName(),0); ol.parseText(theTranslator->trListOfAllMembers()); ol.endTextLink(); + ol.endParagraph(); ol.enableAll(); ol.popGeneratorState(); } @@ -1663,7 +1672,7 @@ void ClassDef::writeMemberList(OutputList &ol) ol.parseText(theTranslator->trIncludingInheritedMembers()); //ol.startItemList(); - ol.writeString("

    Language Maintainer Contact address - (replace the at and dot) Status Language Maintainer Contact address + (replace the at and dot) Status
    \n"); + ol.writeString("
    \n"); //MemberNameInfo *mni=m_impl->allMemberNameInfoList->first(); MemberNameInfoSDict::Iterator mnii(*m_impl->allMemberNameInfoSDict); diff --git a/src/commentcnv.l b/src/commentcnv.l index 4c71988..33d0c04 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -63,12 +63,14 @@ static int g_lastCommentContext; static bool g_inSpecialComment; static bool g_inRoseComment; static int g_javaBlock; +static bool g_specialComment; static QCString g_aliasString; static int g_blockCount; static int g_lastBlockContext; static bool g_pythonDocString; + static SrcLangExt g_lang; static void replaceCommentMarker(const char *s,int len) @@ -341,7 +343,8 @@ void replaceComment(int offset); g_readLineCtx=YY_START; BEGIN(ReadLine); } -"/*" { /* start of a C comment */ +"/*"[*!]? { /* start of a C comment */ + g_specialComment=yyleng==3; copyToOutput(yytext,yyleng); BEGIN(CComment); } @@ -640,6 +643,10 @@ void replaceComment(int offset); { ADDCHAR('/'); ADDCHAR('*'); + if (g_specialComment) + { + ADDCHAR('*'); + } } } } diff --git a/src/definition.cpp b/src/definition.cpp index 60709aa..36c1f69 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -819,6 +819,7 @@ void Definition::writeInlineCode(OutputList &ol,const char *scopeName) //printf("Read:\n`%s'\n\n",codeFragment.data()); MemberDef *thisMd = 0; if (definitionType()==TypeMember) thisMd = (MemberDef *)this; + ol.startParagraph(); ol.startCodeFragment(); pIntf->parseCode(ol, // codeOutIntf scopeName, // scope @@ -832,7 +833,7 @@ void Definition::writeInlineCode(OutputList &ol,const char *scopeName) thisMd // memberDef ); ol.endCodeFragment(); - ol.newParagraph(); + ol.endParagraph(); } } ol.popGeneratorState(); diff --git a/src/diagram.cpp b/src/diagram.cpp index bed02e1..75a0e00 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -175,9 +175,9 @@ static void writeMapArea(QTextStream &t,ClassDef *cd,QCString relPath, t << relPath; } t << cd->getOutputFileBase() << Doxygen::htmlFileExtension << "\" "; - t << "alt=\"" << cd->displayName(); + t << "alt=\"" << convertToXML(cd->displayName()); t << "\" shape=\"rect\" coords=\"" << x << "," << y << ","; - t << (x+w) << "," << (y+h) << "\">" << endl; + t << (x+w) << "," << (y+h) << "\"/>" << endl; } } //----------------------------------------------------------------------------- diff --git a/src/dirdef.cpp b/src/dirdef.cpp index dba1d85..6a0c12d 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -134,7 +134,7 @@ void DirDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.pushGeneratorState(); ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::RTF); - ol.newParagraph(); + // ol.newParagraph(); // FIXME:PARA ol.enableAll(); ol.disableAllBut(OutputGenerator::Man); ol.writeString("\n\n"); @@ -153,6 +153,7 @@ void DirDef::writeBriefDescription(OutputList &ol) { if (!briefDescription().isEmpty()) { + ol.startParagraph(); ol.parseDoc(briefFile(),briefLine(),this,0,briefDescription(),TRUE,FALSE); ol.pushGeneratorState(); ol.disable(OutputGenerator::RTF); @@ -170,10 +171,11 @@ void DirDef::writeBriefDescription(OutputList &ol) } ol.popGeneratorState(); - ol.pushGeneratorState(); - ol.disable(OutputGenerator::RTF); - ol.newParagraph(); - ol.popGeneratorState(); + //ol.pushGeneratorState(); + //ol.disable(OutputGenerator::RTF); + //ol.newParagraph(); + //ol.popGeneratorState(); + ol.endParagraph(); } ol.writeSynopsis(); } @@ -188,10 +190,11 @@ void DirDef::writeDirectoryGraph(OutputList &ol) { msg("Generating dependency graph for directory %s\n",displayName().data()); ol.disable(OutputGenerator::Man); - ol.newParagraph(); + ol.startParagraph(); ol.startDirDepGraph(); //TODO: ol.parseText(theTranslator->trDirDepGraph()); ol.endDirDepGraph(dirDep); + ol.endParagraph(); ol.enableAll(); } } @@ -220,6 +223,7 @@ void DirDef::writeSubDirList(OutputList &ol) } if (!dd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) { + ol.startParagraph(); ol.startMemberDescription(); ol.parseDoc(briefFile(),briefLine(),dd,0,dd->briefDescription(), FALSE, // indexWords @@ -229,7 +233,7 @@ void DirDef::writeSubDirList(OutputList &ol) TRUE // link from index ); ol.endMemberDescription(); - ol.newParagraph(); + ol.endParagraph(); } dd=m_subdirs.next(); } @@ -282,6 +286,7 @@ void DirDef::writeFileList(OutputList &ol) ol.endMemberItem(); if (!fd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) { + ol.startParagraph(); ol.startMemberDescription(); ol.parseDoc(briefFile(),briefLine(),fd,0,fd->briefDescription(), FALSE, // indexWords @@ -291,7 +296,7 @@ void DirDef::writeFileList(OutputList &ol) TRUE // link from index ); ol.endMemberDescription(); - ol.newParagraph(); + ol.endParagraph(); } fd=m_fileList->next(); } diff --git a/src/docparser.h b/src/docparser.h index cdc1379..fc930dd 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -473,6 +473,7 @@ class DocFormula : public DocNode int id() const { return m_id; } DocNode *parent() const { return m_parent; } void accept(DocVisitor *v) { v->visit(this); } + bool isInline() { return text().at(0)!='\\'; } private: DocNode *m_parent; @@ -574,6 +575,7 @@ class DocXRefItem : public CompAccept, public DocNode QString key() const { return m_key; } void accept(DocVisitor *v) { CompAccept::accept(this,v); } bool parse(); + const QList &children() const { return m_children; } private: DocNode *m_parent; @@ -838,6 +840,7 @@ class DocSecRefItem : public CompAccept, public DocNode DocNode *parent() const { return m_parent; } void accept(DocVisitor *v) { CompAccept::accept(this,v); } void parse(); + const QList &children() const { return m_children; } private: DocNode *m_parent; @@ -929,6 +932,7 @@ class DocSimpleSect : public CompAccept, public DocNode int parseRcs(); int parseXml(); void appendLinkWord(const QString &word); + const QList &children() const { return m_children; } private: DocNode * m_parent; @@ -1104,6 +1108,7 @@ class DocHtmlListItem : public CompAccept, public DocNode void accept(DocVisitor *v) { CompAccept::accept(this,v); } int parse(); int parseXml(); + const QList &children() const { return m_children; } private: DocNode * m_parent; @@ -1122,6 +1127,7 @@ class DocHtmlDescData : public CompAccept, public DocNode DocNode *parent() const { return m_parent; } void accept(DocVisitor *v) { CompAccept::accept(this,v); } int parse(); + const QList &children() const { return m_children; } private: DocNode * m_parent; diff --git a/src/dot.cpp b/src/dot.cpp index 48c319b..a5c87cd 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -41,7 +41,7 @@ #include #include -#define MAP_CMD "cmap" +#define MAP_CMD "cmapx" //#define FONTNAME "FreeSans" #define FONTNAME getDotFontName() @@ -141,75 +141,78 @@ static bool convertMapFile(QTextStream &t,const char *mapName, int numBytes = f.readLine(buf.data(),maxLineLen); buf[numBytes-1]='\0'; - // search for href="...", store ... part in link - int indexS = buf.find("href=\""), indexE; - if (indexS!=-1 && (indexE=buf.find('"',indexS+6))!=-1) + if (buf.left(5)=="ref().isEmpty()) + if (link.left(5)=="\\ref ") // \ref url { - if ((dest=Doxygen::tagDestinationDict[df->ref()])) - result += *dest + "/"; + result="href=\""; + // fake ref node to resolve the url + DocRef *df = new DocRef( (DocNode*) 0, link.mid(5), context ); + if (!df->ref().isEmpty()) + { + if ((dest=Doxygen::tagDestinationDict[df->ref()])) + result += *dest + "/"; + } + else if (!relPath.isEmpty()) + { + result += relPath; + } + if (!df->file().isEmpty()) + result += df->file().data() + Doxygen::htmlFileExtension; + if (!df->anchor().isEmpty()) + result += "#" + df->anchor(); + delete df; + result += "\""; } - else if (!relPath.isEmpty()) + else { - result += relPath; + result = "href=\"" + link + "\""; } - if (!df->file().isEmpty()) - result += df->file().data() + Doxygen::htmlFileExtension; - if (!df->anchor().isEmpty()) - result += "#" + df->anchor(); - delete df; - result += "\""; - } - else - { - result = "href=\"" + link + "\""; } - } - else // ref$url (external ref via tag file), or $url (local ref) - { - int marker = link.find('$'); - if (marker!=-1) + else // ref$url (external ref via tag file), or $url (local ref) { - QCString ref = link.left(marker); - QCString url = link.mid(marker+1); - if (!ref.isEmpty()) - { - result = "doxygen=\"" + ref + ":"; - if ((dest=Doxygen::tagDestinationDict[ref])) result += *dest + "/"; - result += "\" "; - } - result+= "href=\""; - if (!ref.isEmpty()) + int marker = link.find('$'); + if (marker!=-1) { - if ((dest=Doxygen::tagDestinationDict[ref])) result += *dest + "/"; + QCString ref = link.left(marker); + QCString url = link.mid(marker+1); + if (!ref.isEmpty()) + { + result = "doxygen=\"" + ref + ":"; + if ((dest=Doxygen::tagDestinationDict[ref])) result += *dest + "/"; + result += "\" "; + } + result+= "href=\""; + if (!ref.isEmpty()) + { + if ((dest=Doxygen::tagDestinationDict[ref])) result += *dest + "/"; + } + else if (!relPath.isEmpty()) + { + result += relPath; + } + result+= url + "\""; } - else if (!relPath.isEmpty()) + else // should not happen, but handle properly anyway { - result += relPath; + result = "href=\"" + link + "\""; } - result+= url + "\""; - } - else // should not happen, but handle properly anyway - { - result = "href=\"" + link + "\""; } + QCString leftPart = buf.left(indexS); + QCString rightPart = buf.mid(indexE+1); + buf = leftPart + result + rightPart; } - QCString leftPart = buf.left(indexS); - QCString rightPart = buf.mid(indexE+1); - buf = leftPart + result + rightPart; + t << buf; } - t << buf; } return TRUE; } @@ -1128,8 +1131,8 @@ void DotGfxHierarchyTable::writeGraph(QTextStream &out,const char *path) const // write image and map in a table row QCString mapLabel = convertNameToFile(n->m_label); out << "" << endl; //thisDir.remove(mapName); @@ -1915,7 +1918,7 @@ QCString DotClassGraph::writeGraph(QTextStream &out, if (format==BITMAP && generateImageMap) // produce HTML to include the image { QCString mapLabel = convertNameToFile(m_startNode->m_label+"_"+mapName); - out << "

    \"";
    " << endl; + out << "\"/>" << endl; QString tmpstr; QTextOStream tmpout(&tmpstr); tmpout.setEncoding(tmpout.UnicodeUTF8); convertMapFile(tmpout,baseName+".map",relPath); if (!tmpstr.isEmpty()) { - out << "" << endl; + out << "" << endl; out << tmpstr; out << "" << endl; } @@ -2245,10 +2248,9 @@ QCString DotInclDepGraph::writeGraph(QTextStream &out, if (format==BITMAP && generateImageMap) { - out << "

    \"";"; + << mapName << "_map\" alt=\"\"/>"; out << "
    " << endl; QString tmpstr; QTextOStream tmpout(&tmpstr); @@ -2256,7 +2258,7 @@ QCString DotInclDepGraph::writeGraph(QTextStream &out, convertMapFile(tmpout,baseName+".map",relPath); if (!tmpstr.isEmpty()) { - out << "" << endl; + out << "" << endl; out << tmpstr; out << "" << endl; } @@ -2539,7 +2541,7 @@ QCString DotCallGraph::writeGraph(QTextStream &out, GraphOutputFormat format, if (format==BITMAP && generateImageMap) { - out << "

    \"";"; @@ -2550,7 +2552,7 @@ QCString DotCallGraph::writeGraph(QTextStream &out, GraphOutputFormat format, convertMapFile(tmpout,baseName+".map",relPath); if (!tmpstr.isEmpty()) { - out << "" << endl; + out << "" << endl; out << tmpstr; out << "" << endl; } @@ -2681,11 +2683,11 @@ QCString DotDirDeps::writeGraph(QTextStream &out, if (format==BITMAP && generateImageMap) { - out << "

    \"";displayName(); - out << "\">"; + out << convertToXML(m_dir->displayName()); + out << "\"/>"; out << "
    " << endl; QString tmpstr; QTextOStream tmpout(&tmpstr); @@ -2693,7 +2695,7 @@ QCString DotDirDeps::writeGraph(QTextStream &out, convertMapFile(tmpout,baseName+".map",relPath,TRUE); if (!tmpstr.isEmpty()) { - out << "" << endl; + out << "" << endl; out << tmpstr; out << "" << endl; } @@ -3175,8 +3177,8 @@ QCString DotGroupCollaboration::writeGraph( QTextStream &t, GraphOutputFormat fo QCString mapLabel = convertNameToFile(baseName); t << "
    \"\"" << endl; - out << "" << endl; + << mapLabel << "_map\"/>" << endl; + out << "" << endl; convertMapFile(out,mapName,""); out << "
    \"\"" << endl; - t << "" << endl; + << mapLabel << "_map\"/>" << endl; + t << "" << endl; convertMapFile(t,mapName,relPath); t << "
    " << endl; thisDir.remove(mapName); diff --git a/src/doxygen.css b/src/doxygen.css index 3767dc9..b5debd1 100644 --- a/src/doxygen.css +++ b/src/doxygen.css @@ -1,3 +1,5 @@ +/* The standard CSS for doxygen */ + body, table, div, p, dl { font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; font-size: 12px; @@ -18,12 +20,40 @@ h3 { font-size: 100%; } +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd { + margin-top: 0px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + /* @end */ caption { font-weight: bold; } +span.legend { + font-size: 70%; + text-align: center; +} + div.qindex, div.navtab{ background-color: #e8eef2; border: 1px solid #84b0c7; @@ -161,6 +191,15 @@ img.formulaInl { vertical-align: middle; } +img.center { + border: 0; +} + +img.footer { + border: 0; + vertical-align: middle; +} + /* @group Code Colorization */ span.keyword { @@ -267,8 +306,13 @@ hr { border-top: 1px solid #ccc; } +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + .memTemplParams { color: #606060; + white-space: nowrap; } /* @end */ @@ -295,6 +339,7 @@ hr { .memitem { padding: 0; + margin-bottom: 10px; } .memname { @@ -312,8 +357,11 @@ hr { font-weight: bold; -webkit-border-top-left-radius: 8px; -webkit-border-top-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); -moz-border-radius-topleft: 8px; -moz-border-radius-topright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + } .memdoc { @@ -322,8 +370,10 @@ hr { border-top-width: 0; -webkit-border-bottom-left-radius: 8px; -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); -moz-border-radius-bottomleft: 8px; -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; } .paramkey { diff --git a/src/doxygen_css.h b/src/doxygen_css.h index 99c7b5d..1584e69 100644 --- a/src/doxygen_css.h +++ b/src/doxygen_css.h @@ -1,3 +1,5 @@ +"/* The standard CSS for doxygen */\n" +"\n" "body, table, div, p, dl {\n" " font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;\n" " font-size: 12px;\n" @@ -18,12 +20,40 @@ " font-size: 100%;\n" "}\n" "\n" +"dt {\n" +" font-weight: bold;\n" +"}\n" +"\n" +"div.multicol {\n" +" -moz-column-gap: 1em;\n" +" -webkit-column-gap: 1em;\n" +" -moz-column-count: 3;\n" +" -webkit-column-count: 3;\n" +"}\n" +"\n" +"p.startli, p.startdd {\n" +" margin-top: 0px;\n" +"}\n" +"\n" +"p.endli {\n" +" margin-bottom: 0px;\n" +"}\n" +"\n" +"p.enddd {\n" +" margin-bottom: 4px;\n" +"}\n" +"\n" "/* @end */\n" "\n" "caption {\n" " font-weight: bold;\n" "}\n" "\n" +"span.legend {\n" +" font-size: 70%;\n" +" text-align: center;\n" +"}\n" +"\n" "div.qindex, div.navtab{\n" " background-color: #e8eef2;\n" " border: 1px solid #84b0c7;\n" @@ -161,6 +191,15 @@ " vertical-align: middle;\n" "}\n" "\n" +"img.center {\n" +" border: 0;\n" +"}\n" +"\n" +"img.footer {\n" +" border: 0;\n" +" vertical-align: middle;\n" +"}\n" +"\n" "/* @group Code Colorization */\n" "\n" "span.keyword {\n" @@ -267,8 +306,13 @@ " border-top: 1px solid #ccc;\n" "}\n" "\n" +".memItemLeft, .memTemplItemLeft {\n" +" white-space: nowrap;\n" +"}\n" +"\n" ".memTemplParams {\n" " color: #606060;\n" +" white-space: nowrap;\n" "}\n" "\n" "/* @end */\n" @@ -295,6 +339,7 @@ "\n" ".memitem {\n" " padding: 0;\n" +" margin-bottom: 10px;\n" "}\n" "\n" ".memname {\n" @@ -312,8 +357,11 @@ " font-weight: bold;\n" " -webkit-border-top-left-radius: 8px;\n" " -webkit-border-top-right-radius: 8px;\n" +" -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);\n" " -moz-border-radius-topleft: 8px;\n" " -moz-border-radius-topright: 8px;\n" +" -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;\n" +"\n" "}\n" "\n" ".memdoc {\n" @@ -322,8 +370,10 @@ " border-top-width: 0;\n" " -webkit-border-bottom-left-radius: 8px;\n" " -webkit-border-bottom-right-radius: 8px;\n" +" -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);\n" " -moz-border-radius-bottomleft: 8px;\n" " -moz-border-radius-bottomright: 8px;\n" +" -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;\n" "}\n" "\n" ".paramkey {\n" diff --git a/src/filedef.cpp b/src/filedef.cpp index d25d51d..85aa6ed 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -186,7 +186,7 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.pushGeneratorState(); ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::RTF); - ol.newParagraph(); + // ol.newParagraph(); // FIXME:PARA ol.enableAll(); ol.disableAllBut(OutputGenerator::Man); ol.writeString("\n\n"); @@ -220,7 +220,9 @@ void FileDef::writeBriefDescription(OutputList &ol) { if (!briefDescription().isEmpty()) { - ol.parseDoc(briefFile(),briefLine(),this,0,briefDescription(),TRUE,FALSE); + ol.startParagraph(); + ol.parseDoc(briefFile(),briefLine(),this,0, + briefDescription(),TRUE,FALSE,0,TRUE,FALSE); ol.pushGeneratorState(); ol.disable(OutputGenerator::RTF); ol.writeString(" \n"); @@ -236,11 +238,12 @@ void FileDef::writeBriefDescription(OutputList &ol) ol.endTextLink(); } ol.popGeneratorState(); + ol.endParagraph(); - ol.pushGeneratorState(); - ol.disable(OutputGenerator::RTF); - ol.newParagraph(); - ol.popGeneratorState(); + //ol.pushGeneratorState(); + //ol.disable(OutputGenerator::RTF); + //ol.newParagraph(); + //ol.popGeneratorState(); } ol.writeSynopsis(); } @@ -337,7 +340,6 @@ void FileDef::writeIncludeGraph(OutputList &ol) { ol.startTextBlock(); ol.disable(OutputGenerator::Man); - ol.newParagraph(); ol.startInclDepGraph(); ol.parseText(theTranslator->trInclDepGraph(name())); ol.endInclDepGraph(incDepGraph); @@ -358,7 +360,6 @@ void FileDef::writeIncludedByGraph(OutputList &ol) { ol.startTextBlock(); ol.disable(OutputGenerator::Man); - ol.newParagraph(); ol.startInclDepGraph(); ol.parseText(theTranslator->trInclByDepGraph()); ol.endInclDepGraph(incDepGraph); @@ -376,10 +377,11 @@ void FileDef::writeSourceLink(OutputList &ol) if (generateSourceFile()) { ol.disableAllBut(OutputGenerator::Html); - ol.newParagraph(); + ol.startParagraph(); ol.startTextLink(includeName(),0); ol.parseText(theTranslator->trGotoSourceCode()); ol.endTextLink(); + ol.endParagraph(); ol.enableAll(); } } diff --git a/src/formula.cpp b/src/formula.cpp index 764792e..11ea644 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -1,5 +1,4 @@ /****************************************************************************** - i * * * Copyright (C) 1997-2008 by Dimitri van Heesch. diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index 1d27d2b..e602cfe 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -293,7 +293,7 @@ unsigned char ftv2vertline_png[] = { FTVImageInfo image_info[] = { - { " ", "ftv2blank.png",ftv2blank_png,174,16,22 }, + { " ", "ftv2blank.png",ftv2blank_png,174,16,22 }, { "*", "ftv2doc.png",ftv2doc_png,255,24,22 }, { "+", "ftv2folderclosed.png",ftv2folderclosed_png,259,24,22 }, { "-", "ftv2folderopen.png",ftv2folderopen_png,261,24,22 }, @@ -585,9 +585,10 @@ void FTVHelp::generateTreeView(QString* OutString) #if QT_VERSION >= 200 t.setEncoding(QTextStream::UnicodeUTF8); #endif - t << "\n"; - t << ""; - t << "\n"; + //t << "\n"; + t << "\n"; + t << "\n\n"; + t << "\n"; t << ""; if (Config_getString("PROJECT_NAME").isEmpty()) { @@ -597,12 +598,14 @@ void FTVHelp::generateTreeView(QString* OutString) { t << Config_getString("PROJECT_NAME"); } - t << "" << endl; + t << "\n" << endl; t << "" << endl; - t << " " << endl; - t << " " << endl; + t << " " << endl; + t << " " << endl; t << " " << endl; + t << " <body>" << endl; t << " <a href=\"main" << Doxygen::htmlFileExtension << "\">Frames are disabled. Click here to go to the main page.</a>" << endl; + t << " </body>" << endl; t << " " << endl; t << "" << endl; t << "" << endl; @@ -618,9 +621,10 @@ void FTVHelp::generateTreeView(QString* OutString) if (m_topLevelIndex) { + t << "\n"; t << "\n"; t << " \n"; - t << " \n"; + t << " \n"; t << " \n"; t << " \n"; t << " " << endl; + t << "\"/>" << endl; t << " TreeView\n"; } t << "