\n"; - t << "

Root

\n"; + t << "

"; + QCString &projName = Config_getString("PROJECT_NAME"); + if (projName.isEmpty()) + { + t << "Root"; + } + else + { + t << projName; + } + t << "

\n"; t << "

\n"; generateTree(t,m_indentNodes[0],0); diff --git a/src/ftvhelp.h b/src/ftvhelp.h index 57a18be..3bcd7b9 100644 --- a/src/ftvhelp.h +++ b/src/ftvhelp.h @@ -46,8 +46,8 @@ class FTVHelp void generateLink(QTextStream &t,FTVNode *n); FTVHelp(); ~FTVHelp(); - QFile *m_cf; - QTextStream m_cts; + //QFile *m_cf; + //QTextStream m_cts; //int m_dc; static FTVHelp *m_theInstance; QList *m_indentNodes; diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index d58d4d2..5193586 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -753,7 +753,7 @@ void HtmlDocVisitor::visitPost(DocRef *) { if (m_hide) return; endLink(); - m_t << " "; + //m_t << " "; } void HtmlDocVisitor::visitPre(DocSecRefItem *ref) diff --git a/src/index.cpp b/src/index.cpp index f039e1d..eac41e1 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -2208,7 +2208,7 @@ void writePageIndex(OutputList &ol) } ol.writeString("\n"); if (hasHtmlHelp) htmlHelp->addContentsItem(FALSE,pageTitle,pageName); - if (hasFtvHelp) ftvHelp->addContentsItem(FALSE,0,pageName,0,pageTitle); + if (hasFtvHelp) ftvHelp->addContentsItem(FALSE,pi->getReference(),pi->getOutputFileBase(),0,pageTitle); } } endIndexHierarchy(ol,0); diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 7a348d8..5bb5784 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -460,6 +460,7 @@ void LatexGenerator::startProjectNumber() void LatexGenerator::startIndexSection(IndexSections is) { bool &compactLatex = Config_getBool("COMPACT_LATEX"); + bool &hideIndex = Config_getBool("LATEX_HIDE_INDICES"); QCString &latexHeader = Config_getString("LATEX_HEADER"); switch (is) { @@ -491,44 +492,47 @@ void LatexGenerator::startIndexSection(IndexSections is) // t << "{"; //Package Index}\n" // break; case isModuleIndex: - if (compactLatex) t << "\\section"; else t << "\\chapter"; - t << "{"; //Module Index}\n" + if (!hideIndex) + { + if (compactLatex) t << "\\section"; else t << "\\chapter"; + t << "{"; //Module Index}\n" + } break; case isNamespaceIndex: - if (compactLatex) t << "\\section"; else t << "\\chapter"; - t << "{"; //Namespace Index}\" + if (!hideIndex) + { + if (compactLatex) t << "\\section"; else t << "\\chapter"; + t << "{"; //Namespace Index}\" + } break; case isClassHierarchyIndex: - if (compactLatex) t << "\\section"; else t << "\\chapter"; - t << "{"; //Hierarchical Index}\n" + if (!hideIndex) + { + if (compactLatex) t << "\\section"; else t << "\\chapter"; + t << "{"; //Hierarchical Index}\n" + } break; case isCompoundIndex: - if (compactLatex) t << "\\section"; else t << "\\chapter"; - t << "{"; //Annotated Compound Index}\n" + if (!hideIndex) + { + if (compactLatex) t << "\\section"; else t << "\\chapter"; + t << "{"; //Annotated Compound Index}\n" + } break; case isFileIndex: - if (compactLatex) t << "\\section"; else t << "\\chapter"; - t << "{"; //Annotated File Index}\n" + if (!hideIndex) + { + if (compactLatex) t << "\\section"; else t << "\\chapter"; + t << "{"; //Annotated File Index}\n" + } break; case isPageIndex: - if (compactLatex) t << "\\section"; else t << "\\chapter"; - t << "{"; //Annotated Page Index}\n" + if (!hideIndex) + { + if (compactLatex) t << "\\section"; else t << "\\chapter"; + t << "{"; //Annotated Page Index}\n" + } break; -// case isPackageDocumentation: -// { -// PackageSDict::Iterator pdi(Doxygen::packageDict); -// PackageDef *pd=pdi.toFirst(); -// bool found=FALSE; -// while (pd && !found) -// { -// if (compactLatex) t << "\\section"; else t << "\\chapter"; -// t << "{"; -// found=TRUE; -// ++pdi; -// pd=pdi.current(); -// } -// } -// break; case isModuleDocumentation: { GroupSDict::Iterator gli(Doxygen::groupSDict); @@ -622,6 +626,7 @@ void LatexGenerator::startIndexSection(IndexSections is) void LatexGenerator::endIndexSection(IndexSections is) { bool &compactLatex = Config_getBool("COMPACT_LATEX"); + bool &hideIndex = Config_getBool("LATEX_HIDE_INDICES"); QCString &latexHeader = Config_getString("LATEX_HEADER"); switch (is) { @@ -642,48 +647,24 @@ void LatexGenerator::endIndexSection(IndexSections is) t << "\\input{" << indexName << "}\n"; } break; - //case isPackageIndex: - // t << "}\n\\input{packages}\n"; - // break; case isModuleIndex: - t << "}\n\\input{modules}\n"; + if (!hideIndex) t << "}\n\\input{modules}\n"; break; case isNamespaceIndex: - t << "}\n\\input{namespaces}\n"; + if (!hideIndex) t << "}\n\\input{namespaces}\n"; break; case isClassHierarchyIndex: - t << "}\n\\input{hierarchy}\n"; + if (!hideIndex) t << "}\n\\input{hierarchy}\n"; break; case isCompoundIndex: - t << "}\n\\input{annotated}\n"; + if (!hideIndex) t << "}\n\\input{annotated}\n"; break; case isFileIndex: - t << "}\n\\input{files}\n"; + if (!hideIndex) t << "}\n\\input{files}\n"; break; case isPageIndex: - t << "}\n\\input{pages}\n"; + if (!hideIndex) t << "}\n\\input{pages}\n"; break; - //case isPackageDocumentation: - // { - // PackageSDict::Iterator pdi(Doxygen::packageDict); - // PackageDef *pd=pdi.toFirst(); - // bool found=FALSE; - // while (pd && !found) - // { - // t << "}\n\\input{" << pd->getOutputFileBase() << "}\n"; - // found=TRUE; - // ++pdi; - // pd=pdi.current(); - // } - // while (pd) - // { - // if (compactLatex) t << "\\input"; else t << "\\include"; - // t << "{" << pd->getOutputFileBase() << "}\n"; - // ++pdi; - // pd=pdi.current(); - // } - // } - // break; case isModuleDocumentation: { GroupSDict::Iterator gli(Doxygen::groupSDict); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 3479db0..6cb6e71 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -981,7 +981,7 @@ bool MemberDef::isDetailedSectionLinkable() const ) || // has a multi-line initialization block //(initLines>0 && initLineshasDocumentation()); diff --git a/src/pre.l b/src/pre.l index 94ca9ef..7c85873 100644 --- a/src/pre.l +++ b/src/pre.l @@ -99,6 +99,7 @@ static bool g_nospaces; // add extra spaces during macro expansion static bool g_macroExpansion; // from the configuration static bool g_expandOnlyPredef; // from the configuration static int g_commentCount; +static bool g_insideComment; static void setFileName(const char *name) @@ -1534,6 +1535,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) QCString tmp=(QCString)"#define "+g_defName+g_defArgsStr; outputArray(tmp.data(),tmp.length()); g_quoteArg=FALSE; + g_insideComment=FALSE; BEGIN(DefineText); } {ID}/{B}*"\n" { @@ -1549,6 +1551,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) QCString tmp=(QCString)"#define "+g_defName; outputArray(tmp.data(),tmp.length()); g_quoteArg=FALSE; + g_insideComment=FALSE; BEGIN(DefineText); } else // define is a guard => hide @@ -1590,6 +1593,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) QCString tmp=(QCString)"#define "+g_defName+g_defArgsStr; outputArray(tmp.data(),tmp.length()); g_quoteArg=FALSE; + g_insideComment=FALSE; BEGIN(DefineText); } {ID}{B}*("..."?) { @@ -1608,6 +1612,12 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) "/**"|"/*!" { g_defText+=yytext; g_defLitText+=yytext; + g_insideComment=TRUE; + } +"*/" { + g_defText+=yytext; + g_defLitText+=yytext; + g_insideComment=FALSE; } "/*"|"/**<"|"/*!<" { outputArray(yytext,yyleng); @@ -1757,13 +1767,20 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) {B}* { g_defText += ' '; g_defLitText+=yytext; } {B}*"##"{B}* { g_defText += "##"; g_defLitText+=yytext; } "@" { g_defText += "@@"; g_defLitText+=yytext; } -\" { g_defText += *yytext; +\" { + g_defText += *yytext; g_defLitText+=yytext; - BEGIN(SkipDoubleQuote); + if (!g_insideComment) + { + BEGIN(SkipDoubleQuote); + } } \' { g_defText += *yytext; g_defLitText+=yytext; - BEGIN(SkipSingleQuote); + if (!g_insideComment) + { + BEGIN(SkipSingleQuote); + } } "//" { g_defText += yytext; g_defLitText+=yytext; } "/*" { g_defText += yytext; g_defLitText+=yytext; } diff --git a/src/scanner.l b/src/scanner.l index a82597d..d829cfd 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -194,6 +194,7 @@ static void initEntry() current->inside = memberGroupInside.copy(); if (!autoGroupStack.isEmpty()) { + //printf("Appending group %s\n",autoGroupStack.top()->groupname.data()); current->groups->append(new Grouping(*autoGroupStack.top())); } } @@ -534,7 +535,7 @@ UL [uU][lL] OL [oO][lL] DL [dD][lL] TITLE [tT][iI][tT][lL][eE] -CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) +CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'")) PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;] %option noyywrap @@ -2594,7 +2595,7 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;] BEGIN(SkipCPP); } ":" { - BEGIN(SkipInits); + if (!insidePHP) BEGIN(SkipInits); } [;{,] { current->name=current->name.simplifyWhiteSpace(); diff --git a/src/translator_cz.h b/src/translator_cz.h index 7d8f88a..d843e84 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -174,11 +174,14 @@ class TranslatorCzech : public Translator */ inline QCString decode(const QCString & sInput) { -#ifdef _WIN32 - return sInput; -#else - return Win1250ToISO88592(sInput); -#endif + if (Config_getBool("USE_WINDOWS_ENCONDING")) + { + return sInput; + } + else + { + return Win1250ToISO88592(sInput); + } } public: @@ -193,11 +196,14 @@ class TranslatorCzech : public Translator /*! return the language charset. This will be used for the HTML output */ virtual QCString idLanguageCharset() { -#ifdef _WIN32 + if (Config_getBool("USE_WINDOWS_ENCONDING")) + { return "windows-1250"; -#else + } + else + { return "iso-8859-2"; -#endif + } } // --- Language translation methods ------------------- diff --git a/src/translator_hr.h b/src/translator_hr.h index b512626..25e483e 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -46,32 +46,43 @@ // // 2001/11/13 // - Added strings for 1.2.13 +// +// 2003/02/26 +// - Added strings for 1.2.18 #ifndef TRANSLATOR_HR_H #define TRANSLATOR_HR_H -class TranslatorCroatian : public TranslatorAdapter_1_2_18 +class TranslatorCroatian : public Translator { private: /*! to avoid macro redefinition from translator_cz.h */ inline QCString decode(const QCString& sInput) { -#ifdef _WIN32 - return ISO88592ToWin1250(sInput); -#else - return sInput; -#endif + if (Config_getBool("USE_WINDOWS_ENCODING")) + { + return ISO88592ToWin1250(sInput); + } + else + { + return sInput; + } } public: QCString idLanguage() { return "croatian"; } QCString idLanguageCharset() -#ifdef _WIN32 - { return "windows-1250"; } -#else - { return "iso-8859-2"; } -#endif + { + if (Config_getBool("USE_WINDOWS_ENCODING")) + { + return "windows-1250"; + } + else + { + return "iso-8859-2"; + } + } QCString latexLanguageSupportCommand() { return "\\usepackage[croatian]{babel}\n"; } QCString trRelatedFunctions() @@ -1062,6 +1073,22 @@ class TranslatorCroatian : public TranslatorAdapter_1_2_18 { return "Popis zastarjelih metoda"; } +////////////////////////////////////////////////////////////////////////// +// new since 1.2.18 +////////////////////////////////////////////////////////////////////////// + + /*! Used as a header for declaration section of the events found in + * a C# program + */ + virtual QCString trEvents() + { + return decode("Doga�aji"); + } + /*! Header used for the documentation section of a class' events. */ + virtual QCString trEventDocumentation() + { + return decode("Dokumentacija doga�aja"); + } }; #endif diff --git a/src/translator_jp.h b/src/translator_jp.h index e4b6445..33b4a60 100644 --- a/src/translator_jp.h +++ b/src/translator_jp.h @@ -41,11 +41,14 @@ class TranslatorJapaneseEn : public TranslatorEnglish /*! returns the name of the package that is included by LaTeX */ virtual QCString idLanguageCharset() { -#ifdef __CYGWIN__ - return "Shift_JIS"; -#else - return "euc-jp"; -#endif + if (Config_getBool("USE_WINDOWS_ENCONDING")) + { + return "Shift_JIS"; + } + else + { + return "euc-jp"; + } } virtual QCString trRTFansicp() { @@ -66,13 +69,16 @@ class TranslatorJapanese : public Translator private: /*! The decode() can change euc into sjis */ inline QCString decode(const QCString & sInput) + { + if (Config_getBool("USE_WINDOWS_ENCONDING")) { -#ifdef __CYGWIN__ return JapaneseEucToSjis(sInput); -#else + } + else + { return sInput; -#endif } + } public: virtual QCString idLanguage() { return "japanese"; } @@ -83,11 +89,14 @@ class TranslatorJapanese : public Translator /*! returns the name of the package that is included by LaTeX */ virtual QCString idLanguageCharset() { -#ifdef __CYGWIN__ - return "Shift_JIS"; -#else - return "euc-jp"; -#endif + if (Config_getBool("USE_WINDOWS_ENCONDING")) + { + return "Shift_JIS"; + } + else + { + return "euc-jp"; + } } /*! used in the compound documentation before a list of related functions. */ diff --git a/src/translator_pl.h b/src/translator_pl.h index e21a2f1..501b16b 100644 --- a/src/translator_pl.h +++ b/src/translator_pl.h @@ -13,17 +13,28 @@ * Documents produced by Doxygen are derivative works derived from the * input used in their production; they are not affected by this license. * - * Polish translation was updated to version 1.2.17 by + * Polish translation was updated to version 1.3 by * Piotr Kaminski (Piotr.Kaminski@ctm.gdynia.pl) */ #ifndef TRANSLATOR_PL_H #define TRANSLATOR_PL_H -#include "translator_adapter.h" - -class TranslatorPolish : public TranslatorAdapter_1_2_17 +class TranslatorPolish : public Translator { + private: + /*! to avoid macro redefinition from translator_pl.h */ + inline QCString decode(const QCString& sInput) + { + if (Config_getBool("USE_WINDOWS_ENCODING")) + { + return ISO88592ToWin1250(sInput); + } + else + { + return sInput; + } + } public: // --- Language control methods ------------------- @@ -52,58 +63,67 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! return the language charset. This will be used for the HTML output */ virtual QCString idLanguageCharset() - { return "iso-8859-2"; } - + { + if (Config_getBool("USE_WINDOWS_ENCODING")) + { + return "windows-1250"; + } + else + { + return "iso-8859-2"; + } + } + // --- Language translation methods ------------------- /*! used in the compound documentation before a list of related functions. */ QCString trRelatedFunctions() - { return "Funkcje Powi�zane"; } + { return decode("Funkcje powi�zane"); } /*! subscript for the related functions. */ QCString trRelatedSubscript() - { return "(Zauwa�, �e to nie s� metody klas.)"; } + { return decode("(Zauwa�, �e to nie s� metody klas.)"); } /*! header that is put before the detailed description of files, classes and namespaces. */ QCString trDetailedDescription() - { return "Opis Szczeg�owy"; } + { return decode("Opis szczeg�owy"); } /*! header that is put before the list of typedefs. */ QCString trMemberTypedefDocumentation() - { return "Dokumentacja Sk�adowych Definicji Typu"; } + { return decode("Dokumentacja sk�adowych definicji typu"); } /*! header that is put before the list of enumerations. */ QCString trMemberEnumerationDocumentation() - { return "Dokumentacja Sk�adowych Wyliczanych"; } + { return decode("Dokumentacja sk�adowych wyliczanych"); } /*! header that is put before the list of member functions. */ QCString trMemberFunctionDocumentation() - { return "Dokumentacja Funkcji Sk�adowych"; } + { return decode("Dokumentacja funkcji sk�adowych"); } /*! header that is put before the list of member attributes. */ QCString trMemberDataDocumentation() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Dokumentacja P�l"; + return decode("Dokumentacja p�l"); } else { - return "Dokumentacja Atrybut�w Sk�adowych"; + return decode("Dokumentacja atrybut�w sk�adowych"); } } /*! this is the text of a link put after brief descriptions. */ QCString trMore() - { return "Wi�cej..."; } + { return decode("Wi�cej..."); } /*! put in the class documentation */ QCString trListOfAllMembers() - { return "Lista wszystkich sk�adowych."; } + { return decode("Lista wszystkich sk�adowych."); } /*! used as the title of the "list of all members" page of a class */ QCString trMemberList() - { return "Lista Sk�adowych"; } + { return decode("Lista sk�adowych"); } /*! this is the first part of a sentence that is followed by a class name */ QCString trThisIsTheListOfAllMembers() @@ -111,13 +131,13 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! this is the remainder of the sentence after the class name */ QCString trIncludingInheritedMembers() - { return ", uwzgl�dniaj�ca wszystkie dziedziczone sk�adowe."; } + { return decode(", uwzgl�dniaj�ca wszystkie dziedziczone sk�adowe."); } /*! this is put at the author sections at the bottom of man pages. * parameter s is name of the project name. */ QCString trGeneratedAutomatically(const char *s) - { QCString result="Wygenerowano automatycznie z kodu �r�d�owego programem Doxygen"; + { QCString result=decode("Wygenerowano automatycznie z kodu �r�d�owego programem Doxygen"); if (s) result+=(QCString)" dla "+s; result+="."; return result; @@ -129,7 +149,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! put after an enum value in the list of all members */ QCString trEnumValue() - { return "warto�� wyliczenia"; } + { return decode("warto�� wyliczenia"); } /*! put after an undocumented member in the list of all members */ QCString trDefinedIn() @@ -139,7 +159,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * parameter f is the name of the include file. */ QCString trVerbatimText(const char *f) - { return (QCString)"Tutaj znajduje si� zawarto�� pliku nag��wkowego "+f+"."; } + { return (QCString)decode("Tutaj znajduje si� zawarto�� pliku nag��wkowego ")+f+"."; } // quick reference sections @@ -147,43 +167,43 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * compounds or files (see the \\group command). */ QCString trModules() - { return "Modu�y"; } + { return decode("Modu�y"); } /*! This is put above each page as a link to the class hierarchy */ QCString trClassHierarchy() - { return "Hierarchia Klas"; } + { return "Hierarchia klas"; } /*! This is put above each page as a link to the list of annotated classes */ QCString trCompoundList() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Struktury Danych"; + return "Struktury danych"; } else { - return "Lista Klas"; + return "Lista klas"; } } /*! This is put above each page as a link to the list of documented files */ QCString trFileList() - { return "Lista Plik�w"; } + { return decode("Lista plik�w"); } /*! This is put above each page as a link to the list of all verbatim headers */ QCString trHeaderFiles() - { return "Pliki Nag��wkowe"; } + { return decode("Pliki nag��wkowe"); } /*! This is put above each page as a link to all members of compounds. */ QCString trCompoundMembers() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Pola Danych"; + return "Pola danych"; } else { - return "Sk�adowe Klas"; + return decode("Sk�adowe klas"); } } @@ -196,17 +216,17 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 } else { - return "Sk�adowe Plik�w"; + return decode("Sk�adowe plik�w"); } } /*! This is put above each page as a link to all related pages. */ QCString trRelatedPages() - { return "Dodatkowe Strony"; } + { return "Dodatkowe strony"; } /*! This is put above each page as a link to all examples. */ QCString trExamples() - { return "Przyk�ady"; } + { return decode("Przyk�ady"); } /*! This is put above each page as a link to the search engine. */ QCString trSearch() @@ -214,8 +234,8 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! This is an introduction to the class hierarchy. */ QCString trClassHierarchyDescription() - { return "Ta lista dziedziczenia posortowana jest z grubsza, " - "cho� nie ca�kowicie, alfabetycznie:"; + { return decode("Ta lista dziedziczenia posortowana jest z grubsza, " + "cho� nie ca�kowicie, alfabetycznie:"); } /*! This is an introduction to the list with all files. */ @@ -224,7 +244,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 QCString result="Tutaj znajduje si� lista wszystkich "; if (!extractAll) result+="udokumentowanych "; result+="plik�w z ich kr�tkimi opisami:"; - return result; + return decode(result); } /*! This is an introduction to the annotated compound list. */ @@ -233,12 +253,12 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Tutaj znajduj� si� struktury danych wraz z ich kr�tkimi opisami:"; + return decode("Tutaj znajduj� si� struktury danych wraz z ich kr�tkimi opisami:"); } else { - return "Tutaj znajduj� si� klasy, struktury, " - "unie i interfejsy wraz z ich kr�tkimi opisami:"; + return decode("Tutaj znajduj� si� klasy, struktury, " + "unie i interfejsy wraz z ich kr�tkimi opisami:"); } } @@ -281,7 +301,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 result+="klas, do kt�rych dana sk�adowa nale�y:"; } } - return result; + return decode(result); } /*! This is an introduction to the page with all file members. */ @@ -302,24 +322,24 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 result+="plik�w, do kt�rych one nale��:"; else result+="dokumentacji:"; - return result; + return decode(result); } /*! This is an introduction to the page with the list of all header files. */ QCString trHeaderFilesDescription() - { return "Tutaj znajduj� si� pliki nag��wkowe tworz�ce API:"; } + { return decode("Tutaj znajduj� si� pliki nag��wkowe tworz�ce API:"); } /*! This is an introduction to the page with the list of all examples */ QCString trExamplesDescription() - { return "Tutaj znajduje si� lista wszystkich przyk�ad�w:"; } + { return decode("Tutaj znajduje si� lista wszystkich przyk�ad�w:"); } /*! This is an introduction to the page with the list of related pages */ QCString trRelatedPagesDescription() - { return "Tutaj znajduje si� lista wszystkich stron dokumentacji:"; } + { return decode("Tutaj znajduje si� lista wszystkich stron dokumentacji:"); } /*! This is an introduction to the page with the list of class/file groups */ QCString trModulesDescription() - { return "Tutaj znajduje si� lista wszystkich grup:"; } + { return decode("Tutaj znajduje si� lista wszystkich grup:"); } /*! This sentences is used in the annotated class/file lists if no brief * description is given. @@ -338,13 +358,13 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * index of all groups. */ QCString trModuleIndex() - { return "Indeks Grup"; } + { return "Indeks grup"; } /*! This is used in LaTeX as the title of the chapter with the * class hierarchy. */ QCString trHierarchicalIndex() - { return "Indeks Hierarchiczny"; } + { return "Indeks hierarchiczny"; } /*! This is used in LaTeX as the title of the chapter with the * annotated compound index. @@ -353,11 +373,11 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Indeks Struktur Danych"; + return "Indeks struktur danych"; } else { - return "Indeks Klas"; + return "Indeks klas"; } } @@ -365,13 +385,13 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * list of all files. */ QCString trFileIndex() - { return "Indeks Plik�w"; } + { return decode("Indeks plik�w"); } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all groups. */ QCString trModuleDocumentation() - { return "Dokumentacja Grup"; } + { return "Dokumentacja grup"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all classes, structs and unions. @@ -380,11 +400,11 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Dokumentacja Struktur Danych"; + return "Dokumentacja struktur danych"; } else { - return "Dokumentacja Klas"; + return "Dokumentacja klas"; } } @@ -392,23 +412,23 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * the documentation of all files. */ QCString trFileDocumentation() - { return "Dokumentacja Plik�w"; } + { return decode("Dokumentacja plik�w"); } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all examples. */ QCString trExampleDocumentation() - { return "Dokumentacja Przyk�ad�w"; } + { return decode("Dokumentacja przyk�ad�w"); } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all related pages. */ QCString trPageDocumentation() - { return "Dokumentacja Stron"; } + { return "Dokumentacja stron"; } /*! This is used in LaTeX as the title of the document */ QCString trReferenceManual() - { return "Podr�cznik Referencji"; } + { return decode("Podr�cznik"); } /*! This is used in the documentation of a file as a header before the * list of defines @@ -420,13 +440,13 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * list of function prototypes */ QCString trFuncProtos() - { return "Prototypy Funkcji"; } + { return "Prototypy funkcji"; } /*! This is used in the documentation of a file as a header before the * list of typedefs */ QCString trTypedefs() - { return "Definicje Typ�w"; } + { return decode("Definicje typ�w"); } /*! This is used in the documentation of a file as a header before the * list of enumerations @@ -450,7 +470,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * list of (global) variables */ QCString trEnumerationValues() - { return "Warto�ci Wylicze�"; } + { return decode("Warto�ci wylicze�"); } /*! This is used in man pages as the author section. */ QCString trAuthor() @@ -460,43 +480,43 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * documentation blocks for defines */ QCString trDefineDocumentation() - { return "Dokumentacja Definicji"; } + { return "Dokumentacja definicji"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for function prototypes */ QCString trFunctionPrototypeDocumentation() - { return "Dokumentacja Prototyp�w Funkcji"; } + { return decode("Dokumentacja prototyp�w funkcji"); } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for typedefs */ QCString trTypedefDocumentation() - { return "Dokumentacja Definicji Typ�w"; } + { return decode("Dokumentacja definicji typ�w"); } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for enumeration types */ QCString trEnumerationTypeDocumentation() - { return "Dokumentacja Typ�w Wyliczanych"; } + { return decode("Dokumentacja typ�w wyliczanych"); } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for enumeration values */ QCString trEnumerationValueDocumentation() - { return "Dokumentacja Warto�ci Wyliczanych"; } + { return decode("Dokumentacja warto�ci wyliczanych"); } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for functions */ QCString trFunctionDocumentation() - { return "Dokumentacja Funkcji"; } + { return "Dokumentacja funkcji"; } /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for variables */ QCString trVariableDocumentation() - { return "Dokumentacja Zmiennych"; } + { return "Dokumentacja zmiennych"; } /*! This is used in the documentation of a file/namespace/group before * the list of links to documented compounds @@ -505,7 +525,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Struktury Danych"; + return "Struktury danych"; } else { @@ -544,19 +564,19 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! this text is generated when the \\internal command is used. */ QCString trForInternalUseOnly() - { return "Tylko do u�ytku wewn�trznego."; } + { return decode("Tylko do u�ytku wewn�trznego."); } /*! this text is generated when the \\reimp command is used. */ QCString trReimplementedForInternalReasons() - { return "Reimplementowana z wewn�trzych przyczyn; nie dotyczy API."; } + { return decode("Reimplementowana z wewn�trzych przyczyn; nie dotyczy API."); } /*! this text is generated when the \\warning command is used. */ QCString trWarning() - { return "Ostrze�enie"; } + { return decode("Ostrze�enie"); } /*! this text is generated when the \\bug command is used. */ QCString trBugsAndLimitations() - { return "B��dy i ograniczenia"; } + { return decode("B��dy i ograniczenia"); } /*! this text is generated when the \\version command is used. */ QCString trVersion() @@ -576,7 +596,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! this text is generated when the \\sa command is used. */ QCString trSeeAlso() - { return "Zobacz r�wnie�"; } + { return decode("Zobacz r�wnie�"); } /*! this text is generated when the \\param command is used. */ QCString trParameters() @@ -584,7 +604,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! this text is generated when the \\exception command is used. */ QCString trExceptions() - { return "Wyj�tki"; } + { return decode("Wyj�tki"); } /*! this text is used in the title page of a LaTeX document. */ QCString trGeneratedBy() @@ -594,7 +614,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! used as the title of page containing all the index of all namespaces. */ QCString trNamespaceList() - { return "Lista Przestrzeni Nazw"; } + { return "Lista przestrzeni nazw"; } /*! used as an introduction to the namespace list */ QCString trNamespaceListDescription(bool extractAll) @@ -602,7 +622,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 QCString result="Tutaj znajduj� si� wszystkie "; if (!extractAll) result+="udokumentowane "; result+="przestrzenie nazw wraz z ich kr�tkimi opisami:"; - return result; + return decode(result); } /*! used in the class documentation as a header before the list of all @@ -619,7 +639,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * related classes */ QCString trRelatedFunctionDocumentation() - { return "Dokumentacja Przyjaci� i Funkcji Zwi�zanych"; } + { return decode("Dokumentacja przyjaci� i funkcji zwi�zanych"); } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990425 @@ -631,14 +651,14 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 bool isTemplate) { QCString result="Dokumentacja"; - if (isTemplate) result+=" Szablonu"; + if (isTemplate) result+=" szablonu"; switch(compType) { - case ClassDef::Class: result+=" Klasy "; break; - case ClassDef::Struct: result+=" Struktury "; break; - case ClassDef::Union: result+=" Unii "; break; - case ClassDef::Interface: result+=" Interfejsu "; break; - case ClassDef::Exception: result+=" Wyj�tku "; break; + case ClassDef::Class: result+=" klasy "; break; + case ClassDef::Struct: result+=" struktury "; break; + case ClassDef::Union: result+=" unii "; break; + case ClassDef::Interface: result+=" interfejsu "; break; + case ClassDef::Exception: result+=decode(" wyj�tku "); break; } result+=(QCString)clName; return result; @@ -647,7 +667,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! used as the title of the HTML page of a file */ QCString trFileReference(const char *fileName) { - QCString result="Dokumentacja Pliku "; + QCString result="Dokumentacja pliku "; result+=fileName; return result; } @@ -655,32 +675,32 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! used as the title of the HTML page of a namespace */ QCString trNamespaceReference(const char *namespaceName) { - QCString result="Dokumentacja Przestrzeni Nazw "; + QCString result="Dokumentacja przestrzeni nazw "; result+=namespaceName; return result; } /* these are for the member sections of a class, struct or union */ QCString trPublicMembers() - { return "Metody Publiczne"; } + { return "Metody publiczne"; } QCString trPublicSlots() - { return "Sloty Publiczne"; } + { return "Sloty publiczne"; } QCString trSignals() - { return "Sygna�y"; } + { return decode("Sygna�y"); } QCString trStaticPublicMembers() - { return "Statyczne Metody Publiczne"; } + { return "Statyczne metody publiczne"; } QCString trProtectedMembers() - { return "Metody Chronione"; } + { return "Metody chronione"; } QCString trProtectedSlots() - { return "Sloty Chronione"; } + { return "Sloty chronione"; } QCString trStaticProtectedMembers() - { return "Statyczne Metody Chronione"; } + { return "Statyczne metody chronione"; } QCString trPrivateMembers() - { return "Metody Prywatne"; } + { return "Metody prywatne"; } QCString trPrivateSlots() - { return "Sloty Prywatne"; } + { return "Sloty prywatne"; } QCString trStaticPrivateMembers() - { return "Statyczne Metody Prywatne"; } + { return "Statyczne metody prywatne"; } /*! this function is used to produce a comma-separated list of items. * use generateMarker(i) to indicate where item i should be put. @@ -741,7 +761,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! This is put above each page as a link to all members of namespaces. */ QCString trNamespaceMembers() - { return "Sk�adowe Przestrzeni Nazw"; } + { return decode("Sk�adowe przestrzeni nazw"); } /*! This is an introduction to the page with all namespace members */ QCString trNamespaceMemberDescription(bool extractAll) @@ -753,19 +773,19 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 result+="dokumentacji przestrzeni nazw dla ka�dej sk�adowej:"; else result+="przestrzeni nazw do kt�rych sk�adowe te nale��:"; - return result; + return decode(result); } /*! This is used in LaTeX as the title of the chapter with the * index of all namespaces. */ QCString trNamespaceIndex() - { return "Indeks Przestrzeni Nazw"; } + { return "Indeks przestrzeni nazw"; } /*! This is used in LaTeX as the title of the chapter containing * the documentation of all namespaces. */ QCString trNamespaceDocumentation() - { return "Dokumentacja Przestrzeni Nazw"; } + { return "Dokumentacja przestrzeni nazw"; } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990522 @@ -775,7 +795,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 * namespaces in a file. */ QCString trNamespaces() - { return "Przestrzenie Nazw"; } + { return "Przestrzenie nazw"; } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990728 @@ -799,14 +819,14 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 } result+=" zosta�a wygenerowana z plik"; if (single) result+="u:"; else result+="�w:"; - return result; + return decode(result); } /*! This is in the (quick) index as a link to the alphabetical compound * list. */ QCString trAlphabeticalList() - { return "Lista Alfabetyczna"; } + { return "Lista alfabetyczna"; } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990901 @@ -814,12 +834,12 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! This is used as the heading text for the retval command. */ QCString trReturnValues() - { return "Zwracane warto�ci"; } + { return decode("Zwracane warto�ci"); } /*! This is in the (quick) index as a link to the main page (index.html) */ QCString trMainPage() - { return "Strona G��wna"; } + { return decode("Strona g��wna"); } /*! This is used in references to page that are put in the LaTeX * documentation. It should be an abbreviation of the word page. @@ -833,7 +853,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 QCString trSources() { - return "�r�d�a"; + return decode("�r�d�a"); } QCString trDefinedAtLineInSourceFile() { @@ -860,68 +880,68 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! this text is put before a collaboration diagram */ QCString trCollaborationDiagram(const char *clName) { - return (QCString)"Diagram wsp�pracy dla "+clName+":"; + return (QCString)decode("Diagram wsp�pracy dla ")+clName+":"; } /*! this text is put before an include dependency graph */ QCString trInclDepGraph(const char *fName) { - return (QCString)"Wykres zale�no�ci za��czania dla "+fName+":"; + return (QCString)decode("Wykres zale�no�ci za��czania dla ")+fName+":"; } /*! header that is put before the list of constructor/destructors. */ QCString trConstructorDocumentation() { - return "Dokumentacja Konstruktora i Destruktora"; + return "Dokumentacja konstruktora i destruktora"; } /*! Used in the file documentation to point to the corresponding sources. */ QCString trGotoSourceCode() { - return "Id� do kodu �r�d�owego tego pliku."; + return decode("Id� do kodu �r�d�owego tego pliku."); } /*! Used in the file sources to point to the corresponding documentation. */ QCString trGotoDocumentation() { - return "Id� do dokumentacji tego pliku."; + return decode("Id� do dokumentacji tego pliku."); } /*! Text for the \\pre command */ QCString trPrecondition() { - return "Warunek wst�pny"; + return decode("Warunek wst�pny"); } /*! Text for the \\post command */ QCString trPostcondition() { - return "Warunek ko�cowy"; + return decode("Warunek ko�cowy"); } /*! Text for the \\invariant command */ QCString trInvariant() { - return "Inwariant"; + return "Niezmiennik"; } /*! Text shown before a multi-line variable/enum initialization */ QCString trInitialValue() { - return "Inicjalizator:"; + return decode("Warto�� pocz�tkowa:"); } /*! Text used the source code in the file index */ QCString trCode() { - return "kod �r�d�owy"; + return decode("kod �r�d�owy"); } QCString trGraphicalHierarchy() { - return "Graficzna Hierarchia Klas"; + return "Graficzna hierarchia klas"; } QCString trGotoGraphicalHierarchy() { - return "Id� do graficznej hierarchi klas"; + return decode("Id� do graficznej hierarchi klas"); } QCString trGotoTextualHierarchy() { - return "Id� do tekstowej hierarchi klas"; + return decode("Id� do tekstowej hierarchi klas"); } QCString trPageIndex() { - return "Indeks Stron"; + return "Indeks stron"; } ////////////////////////////////////////////////////////////////////////// @@ -934,46 +954,46 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 } QCString trPublicTypes() { - return "Typy Publiczne"; + return "Typy publiczne"; } QCString trPublicAttribs() { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Pola Danych"; + return "Pola danych"; } else { - return "Atrybuty Publiczne"; + return "Atrybuty publiczne"; } } QCString trStaticPublicAttribs() { - return "Statyczne Atrybuty Publiczne"; + return "Statyczne atrybuty publiczne"; } QCString trProtectedTypes() { - return "Typy Chronione"; + return "Typy chronione"; } QCString trProtectedAttribs() { - return "Atrybuty Chronione"; + return "Atrybuty chronione"; } QCString trStaticProtectedAttribs() { - return "Statyczne Atrybuty Chronione"; + return "Statyczne atrybuty chronione"; } QCString trPrivateTypes() { - return "Typy Prywatne"; + return "Typy prywatne"; } QCString trPrivateAttribs() { - return "Atrybuty Prywatne"; + return "Atrybuty prywatne"; } QCString trStaticPrivateAttribs() { - return "Statyczne Atrybuty Prywatne"; + return "Statyczne atrybuty prywatne"; } ////////////////////////////////////////////////////////////////////////// @@ -983,12 +1003,12 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! Used as a marker that is put before a todo item */ QCString trTodo() { - return "Do Zrobienia"; + return "Do zrobienia"; } /*! Used as the header of the todo list */ QCString trTodoList() { - return "Lista Do Zrobienia"; + return "Lista rzeczy do zrobienia"; } ////////////////////////////////////////////////////////////////////////// @@ -997,11 +1017,11 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 QCString trReferencedBy() { - return "Odwo�ania w"; + return decode("Odwo�ania w"); } QCString trRemarks() { - return "Spostrze�enia"; + return decode("Spostrze�enia"); } QCString trAttention() { @@ -1009,8 +1029,8 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 } QCString trInclByDepGraph() { - return "Ten wykres pokazuje, kt�re pliki bezpo�rednio lub " - "po�rednio za��czaj� ten plik:"; + return decode("Ten wykres pokazuje, kt�re pliki bezpo�rednio lub " + "po�rednio za��czaj� ten plik:"); } QCString trSince() { @@ -1024,12 +1044,12 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 /*! title of the graph legend page */ QCString trLegendTitle() { - return "Legenda Wykresu"; + return "Legenda wykresu"; } /*! page explaining how the dot graph's should be interpreted */ QCString trLegendDocs() { - return + return decode( "Ta strona wyja�nia jak interpretowa� wykresy, kt�re s� wygenerowane " "przez doxygen.

\n" "Rozwa� nast�puj�cy przyk�ad:\n" @@ -1081,7 +1101,7 @@ class TranslatorPolish : public TranslatorAdapter_1_2_17 "