From 18a31da361142447f16ded3247570853852455cb Mon Sep 17 00:00:00 2001 From: Petr Prikryl Date: Mon, 24 Jun 2013 11:07:05 +0200 Subject: winbuild/pack_the_distribution_for_windows.py finalized and cleaned --- winbuild/pack_the_distribution_for_windows.py | 69 +++++++-------------------- 1 file changed, 18 insertions(+), 51 deletions(-) diff --git a/winbuild/pack_the_distribution_for_windows.py b/winbuild/pack_the_distribution_for_windows.py index 0c63394..a1b6c19 100644 --- a/winbuild/pack_the_distribution_for_windows.py +++ b/winbuild/pack_the_distribution_for_windows.py @@ -1,4 +1,4 @@ -#! python2 +#! python2 from __future__ import print_function @@ -10,37 +10,6 @@ import sys import textwrap -def getCurrentSubdirName(): - subdir, fname = os.path.split(os.path.realpath(__file__)) - return os.path.basename(subdir) - - -def getCurrentBranchName(): - result = None - cmd = 'git branch --list --no-color' - pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout - for line in pipe: - line = line.decode('utf-8') - if line.startswith('*'): - result = line[2:].rstrip() - pipe.close() - return result - - -def getUserName(): - user = None # init - p = subprocess.Popen('git config user.name', stdout=subprocess.PIPE) - user = p.communicate()[0] - user = user.decode('utf-8') - p.wait() - return user - - -def getUserInitials(): - user = getUserName() - return ''.join(s[0] for s in user.split()) - - def gitSHA_date_time(): cmd = 'git rev-parse --short HEAD' p = subprocess.Popen(cmd, stdout=subprocess.PIPE) @@ -62,16 +31,6 @@ def gitSHA_date_time(): return sha, dstamp, tstamp -def gitDescribe(): - result = None - cmd = 'git describe' - p = subprocess.Popen(cmd, stdout=subprocess.PIPE) - descr = p.communicate()[0] - descr = descr.decode('utf-8') - p.wait() - return descr.strip() - - def getDoxygenVersion(): # ... from the VERSION file. sdir, fname = getThisScriptPathAndName() @@ -206,10 +165,15 @@ def buildAndZipTranslatorReport(distr_dir): os.chdir(wd) # back to the original working directory -def xxx(): +def mailto(): - # Vytvoříme dopis. - subject = 'Windows binaries available for %s in SVN' % doxdir + # Information for the letter. + ver = getDoxygenVersion() + sha, dstamp, tstamp = gitSHA_date_time() + doxzipname = getBinariesZipBareName() + trzipname = getTranslatorReportZipBareName() + + subject = 'Windows binaries available for {}-{} at SourceForge'.format(ver, dstamp) subject = subject.replace(' ', '%20') body = textwrap.dedent('''\ @@ -223,7 +187,7 @@ def xxx(): This is the place where you should find also the next releases. Name of the archive file is - %s + {} The related translator report can be found inside the directory @@ -231,20 +195,20 @@ def xxx(): Name of the archive file is - %s + {} The binaries are NOT created automatically, so it may - happen that some newer SVN sources were not compiled + happen that some newer sources were not compiled because I am not present to do that or I forgot... ;) Regards, Petr -- - Petr Prikryl (prikryl at atlas dot cz)''') % (doxzipname, trzipname) + Petr Prikryl (prikryl at atlas dot cz)''').format(doxzipname, trzipname) body = body.replace('\n', '%0d') - # Zkonstruujeme URI a spustíme mailer pro odeslání dopisu. + # Make the mailto URI and launch the mailer. to_addr = 'doxygen-users@lists.sourceforge.net' mailtoURI = 'mailto:%s?subject=%s&body=%s' % (to_addr, subject, body) os.startfile(mailtoURI) @@ -262,4 +226,7 @@ if __name__ == '__main__': zipBinaries(dist_dir) # The translator report... - buildAndZipTranslatorReport(dist_dir) \ No newline at end of file + buildAndZipTranslatorReport(dist_dir) + + # Launch the mailer with the generated message body. + mailto() \ No newline at end of file -- cgit v0.12 From 07e988188ff1cbc77f213e5f6d4ad104375202e4 Mon Sep 17 00:00:00 2001 From: Petr Prikryl Date: Tue, 25 Jun 2013 09:58:29 +0200 Subject: src/unistd.h ignored This is a (generated) dummy file, that is needed for compiling files that are generated with flex under Windows 95/NT. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3eae438..df0f8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ Makefile /src/pyscanner.cpp /src/scanner.cpp /src/tclscanner.cpp +/src/unistd.h /src/version.cpp /src/vhdlcode.cpp /src/vhdlparser.cpp -- cgit v0.12 From b8c8a047e05f83f8cb818d8184878bc724b209b8 Mon Sep 17 00:00:00 2001 From: Petr Prikryl Date: Tue, 25 Jun 2013 10:13:01 +0200 Subject: TranslatorJapaneseEn and TranslatorKoreanEn converted to UTF-8 Actually, the translator_je.h and translator_ke.h use only ASCII characters. The idLanguageCharset() just returns "utf-8" now. The TranslatorDecoder not used for the translator classes. --- src/language.cpp | 5 ++--- src/translator_je.h | 9 +-------- src/translator_ke.h | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/language.cpp b/src/language.cpp index b0218d4..eb88455 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -21,7 +21,6 @@ #include "language.h" #include "lang_cfg.h" #include "translator.h" -#include "translatordecoder.h" #include "translator_en.h" #if !defined(ENGLISH_ONLY) #include "translator_adapter.h" @@ -231,7 +230,7 @@ bool setTranslator(const char *langName) #ifdef LANG_JE else if (L_EQUAL("japanese-en")) { - theTranslator=new TranslatorDecoder(new TranslatorJapaneseEn); + theTranslator=new TranslatorJapaneseEn; } #endif #ifdef LANG_ES @@ -285,7 +284,7 @@ bool setTranslator(const char *langName) #ifdef LANG_KE else if (L_EQUAL("korean-en")) { - theTranslator=new TranslatorDecoder(new TranslatorKoreanEn); + theTranslator=new TranslatorKoreanEn; } #endif #ifdef LANG_RO diff --git a/src/translator_je.h b/src/translator_je.h index c6bfdcb..a3195fa 100644 --- a/src/translator_je.h +++ b/src/translator_je.h @@ -41,14 +41,7 @@ class TranslatorJapaneseEn : public TranslatorEnglish /*! returns the name of the package that is included by LaTeX */ virtual QCString idLanguageCharset() { - //if (Config_getBool("USE_WINDOWS_ENCODING")) - //{ - // return "Shift_JIS"; - //} - //else - //{ - return "euc-jp"; - //} + return "utf-8"; } virtual QCString trRTFansicp() { diff --git a/src/translator_ke.h b/src/translator_ke.h index f089d38..437e426 100644 --- a/src/translator_ke.h +++ b/src/translator_ke.h @@ -40,7 +40,7 @@ class TranslatorKoreanEn : public TranslatorEnglish /*! returns the name of the package that is included by LaTeX */ virtual QCString idLanguageCharset() { - return "euc-kr"; + return "utf-8"; } virtual QCString trRTFansicp() { -- cgit v0.12 From 49009182a8dc05fb9c5bf52e521c1531c29a2183 Mon Sep 17 00:00:00 2001 From: Petr Prikryl Date: Tue, 25 Jun 2013 10:15:42 +0200 Subject: src/translatordecoder.h removed, winbuild/Doxygen.vcproj updated When running... doxygen/doc>py translator.py This script should be updated. All translators do use UTF-8 internally. The TranslatorDecoder adapter should be removed from the code and its usage should not be checked any more. (I do not believe I ever had so much time to add a check like this to the translator.py :) --- src/translatordecoder.h | 821 ------------------------------------------------ winbuild/Doxygen.vcproj | 4 - 2 files changed, 825 deletions(-) delete mode 100644 src/translatordecoder.h diff --git a/src/translatordecoder.h b/src/translatordecoder.h deleted file mode 100644 index 6537774..0000000 --- a/src/translatordecoder.h +++ /dev/null @@ -1,821 +0,0 @@ -/****************************************************************************** - * - * - * - * Copyright (C) 1997-2013 by Dimitri van Heesch. - * - * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software - * for any purpose. It is provided "as is" without express or implied warranty. - * See the GNU General Public License for more details. - * - * Documents produced by Doxygen are derivative works derived from the - * input used in their production; they are not affected by this license. - * - */ - -#ifndef TRANSLATORDECODER_H -#define TRANSLATORDECODER_H - -#include "translator.h" -#include "portable.h" - -/** Decoder adapter for translator file that are not yet UTF-8 encoded. */ -class TranslatorDecoder : public Translator -{ - public: - - TranslatorDecoder(Translator *translator) : m_translator(translator) - { - m_toUtf8 = portable_iconv_open("UTF-8",translator->idLanguageCharset()); - m_fromUtf8 = portable_iconv_open(translator->idLanguageCharset(),"UTF-8"); - } - virtual ~TranslatorDecoder() - { - if (m_toUtf8!=(void *)(-1)) portable_iconv_close(m_toUtf8); - if (m_fromUtf8!=(void *)(-1)) portable_iconv_close(m_fromUtf8); - delete m_translator; - } - - /*! This method is used to provide warning message that is displayed - * if the user chooses a language whose translation is not up to date. - * It is implemented by the adapter classes. - */ - virtual QCString updateNeededMessage() { return m_translator->updateNeededMessage(); } - - // Please, have a look at comments inside the translator_en.h file - // to learn the meaning of the following methods. The translator_en.h - // file contains the TranslatorEnglish implementation, which is - // always up-to-date (by definition). - - // --- Language control methods ------------------- - - QCString idLanguage() - { return m_translator->idLanguage(); } - QCString latexLanguageSupportCommand() - { return m_translator->latexLanguageSupportCommand(); } - QCString idLanguageCharset() - { return m_translator->idLanguageCharset(); } - - QCString recode(const QCString &s,void *cd) - { - if (cd==(void*)(-1)) return s; - int iSize = s.length(); - int oSize = iSize*4+1; - QCString output(oSize); - size_t iLeft = iSize; - size_t oLeft = oSize; - char *iPtr = s.data(); - char *oPtr = output.data(); - if (!portable_iconv(cd,&iPtr,&iLeft,&oPtr,&oLeft)) - { - oSize -= (int)oLeft; - output.resize(oSize+1); - output.at(oSize)='\0'; - return output; - } - else - { - return s; - } - } - QCString toUtf8(const QCString &s) - { - return recode(s,m_toUtf8); - } - QCString fromUtf8(const QCString &s) - { - return recode(s,m_fromUtf8); - } - - // --- Language translation methods ------------------- - - QCString trRelatedFunctions() - { return toUtf8(m_translator->trRelatedFunctions()); } - QCString trRelatedSubscript() - { return toUtf8(m_translator->trRelatedSubscript()); } - QCString trDetailedDescription() - { return toUtf8(m_translator->trDetailedDescription()); } - QCString trMemberTypedefDocumentation() - { return toUtf8(m_translator->trMemberTypedefDocumentation()); } - QCString trMemberEnumerationDocumentation() - { return toUtf8(m_translator->trMemberEnumerationDocumentation()); } - - QCString trMemberFunctionDocumentation() - { return toUtf8(m_translator->trMemberFunctionDocumentation()); } - QCString trMemberDataDocumentation() - { return toUtf8(m_translator->trMemberDataDocumentation()); } - QCString trMore() - { return toUtf8(m_translator->trMore()); } - QCString trListOfAllMembers() - { return toUtf8(m_translator->trListOfAllMembers()); } - QCString trMemberList() - { return toUtf8(m_translator->trMemberList()); } - QCString trThisIsTheListOfAllMembers() - { return toUtf8(m_translator->trThisIsTheListOfAllMembers()); } - QCString trIncludingInheritedMembers() - { return toUtf8(m_translator->trIncludingInheritedMembers()); } - QCString trGeneratedAutomatically(const char *s) - { return toUtf8(m_translator->trGeneratedAutomatically(fromUtf8(s))); } - QCString trEnumName() - { return toUtf8(m_translator->trEnumName()); } - QCString trEnumValue() - { return toUtf8(m_translator->trEnumValue()); } - QCString trDefinedIn() - { return toUtf8(m_translator->trDefinedIn()); } - - // quick reference sections - - QCString trModules() - { return toUtf8(m_translator->trModules()); } - QCString trClassHierarchy() - { return toUtf8(m_translator->trClassHierarchy()); } - QCString trCompoundList() - { return toUtf8(m_translator->trCompoundList()); } - - QCString trFileList() - { return toUtf8(m_translator->trFileList()); } - QCString trCompoundMembers() - { return toUtf8(m_translator->trCompoundMembers()); } - QCString trFileMembers() - { return toUtf8(m_translator->trFileMembers()); } - QCString trRelatedPages() - { return toUtf8(m_translator->trRelatedPages()); } - QCString trExamples() - { return toUtf8(m_translator->trExamples()); } - QCString trSearch() - { return toUtf8(m_translator->trSearch()); } - QCString trClassHierarchyDescription() - { return toUtf8(m_translator->trClassHierarchyDescription()); } - QCString trFileListDescription(bool extractAll) - { return toUtf8(m_translator->trFileListDescription(extractAll)); } - QCString trCompoundListDescription() - { return toUtf8(m_translator->trCompoundListDescription()); } - QCString trCompoundMembersDescription(bool extractAll) - { return toUtf8(m_translator->trCompoundMembersDescription(extractAll)); } - QCString trFileMembersDescription(bool extractAll) - { return toUtf8(m_translator->trFileMembersDescription(extractAll)); } - QCString trExamplesDescription() - { return toUtf8(m_translator->trExamplesDescription()); } - QCString trRelatedPagesDescription() - { return toUtf8(m_translator->trRelatedPagesDescription()); } - QCString trModulesDescription() - { return toUtf8(m_translator->trModulesDescription()); } - - // index titles (the project name is prepended for these) - - QCString trDocumentation() - { return toUtf8(m_translator->trDocumentation()); } - QCString trModuleIndex() - { return toUtf8(m_translator->trModuleIndex()); } - QCString trHierarchicalIndex() - { return toUtf8(m_translator->trHierarchicalIndex()); } - QCString trCompoundIndex() - { return toUtf8(m_translator->trCompoundIndex()); } - QCString trFileIndex() - { return toUtf8(m_translator->trFileIndex()); } - QCString trModuleDocumentation() - { return toUtf8(m_translator->trModuleDocumentation()); } - QCString trClassDocumentation() - { return toUtf8(m_translator->trClassDocumentation()); } - QCString trFileDocumentation() - { return toUtf8(m_translator->trFileDocumentation()); } - QCString trExampleDocumentation() - { return toUtf8(m_translator->trExampleDocumentation()); } - QCString trPageDocumentation() - { return toUtf8(m_translator->trPageDocumentation()); } - QCString trReferenceManual() - { return toUtf8(m_translator->trReferenceManual()); } - QCString trDefines() - { return toUtf8(m_translator->trDefines()); } - QCString trFuncProtos() - { return toUtf8(m_translator->trFuncProtos()); } - QCString trTypedefs() - { return toUtf8(m_translator->trTypedefs()); } - QCString trEnumerations() - { return toUtf8(m_translator->trEnumerations()); } - QCString trFunctions() - { return toUtf8(m_translator->trFunctions()); } - QCString trVariables() - { return toUtf8(m_translator->trVariables()); } - QCString trEnumerationValues() - { return toUtf8(m_translator->trEnumerationValues()); } - QCString trDefineDocumentation() - { return toUtf8(m_translator->trDefineDocumentation()); } - QCString trFunctionPrototypeDocumentation() - { return toUtf8(m_translator->trFunctionPrototypeDocumentation()); } - QCString trTypedefDocumentation() - { return toUtf8(m_translator->trTypedefDocumentation()); } - QCString trEnumerationTypeDocumentation() - { return toUtf8(m_translator->trEnumerationTypeDocumentation()); } - QCString trFunctionDocumentation() - { return toUtf8(m_translator->trFunctionDocumentation()); } - QCString trVariableDocumentation() - { return toUtf8(m_translator->trVariableDocumentation()); } - QCString trCompounds() - { return toUtf8(m_translator->trCompounds()); } - QCString trGeneratedAt(const char *date,const char *projName) - { return toUtf8(m_translator->trGeneratedAt(fromUtf8(date),fromUtf8(projName))); } - QCString trWrittenBy() - { return toUtf8(m_translator->trWrittenBy()); } - QCString trClassDiagram(const char *clName) - { return toUtf8(m_translator->trClassDiagram(fromUtf8(clName))); } - QCString trForInternalUseOnly() - { return toUtf8(m_translator->trForInternalUseOnly()); } - QCString trWarning() - { return toUtf8(m_translator->trWarning()); } - QCString trVersion() - { return toUtf8(m_translator->trVersion()); } - QCString trDate() - { return toUtf8(m_translator->trDate()); } - QCString trReturns() - { return toUtf8(m_translator->trReturns()); } - QCString trSeeAlso() - { return toUtf8(m_translator->trSeeAlso()); } - QCString trParameters() - { return toUtf8(m_translator->trParameters()); } - QCString trExceptions() - { return toUtf8(m_translator->trExceptions()); } - QCString trGeneratedBy() - { return toUtf8(m_translator->trGeneratedBy()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-990307 -////////////////////////////////////////////////////////////////////////// - - QCString trNamespaceList() - { return toUtf8(m_translator->trNamespaceList()); } - QCString trNamespaceListDescription(bool extractAll) - { return toUtf8(m_translator->trNamespaceListDescription(extractAll)); } - QCString trFriends() - { return toUtf8(m_translator->trFriends()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-990405 -////////////////////////////////////////////////////////////////////////// - - QCString trRelatedFunctionDocumentation() - { return toUtf8(m_translator->trRelatedFunctionDocumentation()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-990425 -////////////////////////////////////////////////////////////////////////// - - QCString trCompoundReference(const char *clName, - ClassDef::CompoundType compType, - bool isTemplate) - { return toUtf8(m_translator->trCompoundReference(fromUtf8(clName),compType,isTemplate)); } - - - QCString trFileReference(const char *fileName) - { return toUtf8(m_translator->trFileReference(fromUtf8(fileName))); } - QCString trNamespaceReference(const char *namespaceName) - { return toUtf8(m_translator->trNamespaceReference(fromUtf8(namespaceName))); } - - QCString trPublicMembers() - { return toUtf8(m_translator->trPublicMembers()); } - QCString trPublicSlots() - { return toUtf8(m_translator->trPublicSlots()); } - QCString trSignals() - { return toUtf8(m_translator->trSignals()); } - QCString trStaticPublicMembers() - { return toUtf8(m_translator->trStaticPublicMembers()); } - QCString trProtectedMembers() - { return toUtf8(m_translator->trProtectedMembers()); } - QCString trProtectedSlots() - { return toUtf8(m_translator->trProtectedSlots()); } - QCString trStaticProtectedMembers() - { return toUtf8(m_translator->trStaticProtectedMembers()); } - QCString trPrivateMembers() - { return toUtf8(m_translator->trPrivateMembers()); } - QCString trPrivateSlots() - { return toUtf8(m_translator->trPrivateSlots()); } - QCString trStaticPrivateMembers() - { return toUtf8(m_translator->trStaticPrivateMembers()); } - QCString trWriteList(int numEntries) - { return toUtf8(m_translator->trWriteList(numEntries)); } - QCString trInheritsList(int numEntries) - { return toUtf8(m_translator->trInheritsList(numEntries)); } - QCString trInheritedByList(int numEntries) - { return toUtf8(m_translator->trInheritedByList(numEntries)); } - QCString trReimplementedFromList(int numEntries) - { return toUtf8(m_translator->trReimplementedFromList(numEntries)); } - QCString trReimplementedInList(int numEntries) - { return toUtf8(m_translator->trReimplementedInList(numEntries)); } - QCString trNamespaceMembers() - { return toUtf8(m_translator->trNamespaceMembers()); } - QCString trNamespaceMemberDescription(bool extractAll) - { return toUtf8(m_translator->trNamespaceMemberDescription(extractAll)); } - - QCString trNamespaceIndex() - { return toUtf8(m_translator->trNamespaceIndex()); } - QCString trNamespaceDocumentation() - { return toUtf8(m_translator->trNamespaceDocumentation()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-990522 -////////////////////////////////////////////////////////////////////////// - - QCString trNamespaces() - { return toUtf8(m_translator->trNamespaces()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-990728 -////////////////////////////////////////////////////////////////////////// - - QCString trGeneratedFromFiles(ClassDef::CompoundType compType, - bool single) - { return toUtf8(m_translator->trGeneratedFromFiles(compType,single)); } - - - QCString trAlphabeticalList() - { return toUtf8(m_translator->trAlphabeticalList()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-990901 -////////////////////////////////////////////////////////////////////////// - - QCString trReturnValues() - { return toUtf8(m_translator->trReturnValues()); } - QCString trMainPage() - { return toUtf8(m_translator->trMainPage()); } - QCString trPageAbbreviation() - { return toUtf8(m_translator->trPageAbbreviation()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-991003 -////////////////////////////////////////////////////////////////////////// - - QCString trDefinedAtLineInSourceFile() - { return toUtf8(m_translator->trDefinedAtLineInSourceFile()); } - QCString trDefinedInSourceFile() - { return toUtf8(m_translator->trDefinedInSourceFile()); } - -////////////////////////////////////////////////////////////////////////// -// new since 0.49-991205 -////////////////////////////////////////////////////////////////////////// - - QCString trDeprecated() - { return toUtf8(m_translator->trDeprecated()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.0.0 -////////////////////////////////////////////////////////////////////////// - - QCString trCollaborationDiagram(const char *clName) - { return toUtf8(m_translator->trCollaborationDiagram(fromUtf8(clName))); } - QCString trInclDepGraph(const char *fName) - { return toUtf8(m_translator->trInclDepGraph(fromUtf8(fName))); } - QCString trConstructorDocumentation() - { return toUtf8(m_translator->trConstructorDocumentation()); } - QCString trGotoSourceCode() - { return toUtf8(m_translator->trGotoSourceCode()); } - QCString trGotoDocumentation() - { return toUtf8(m_translator->trGotoDocumentation()); } - QCString trPrecondition() - { return toUtf8(m_translator->trPrecondition()); } - QCString trPostcondition() - { return toUtf8(m_translator->trPostcondition()); } - QCString trInvariant() - { return toUtf8(m_translator->trInvariant()); } - QCString trInitialValue() - { return toUtf8(m_translator->trInitialValue()); } - QCString trCode() - { return toUtf8(m_translator->trCode()); } - - QCString trGraphicalHierarchy() - { return toUtf8(m_translator->trGraphicalHierarchy()); } - QCString trGotoGraphicalHierarchy() - { return toUtf8(m_translator->trGotoGraphicalHierarchy()); } - QCString trGotoTextualHierarchy() - { return toUtf8(m_translator->trGotoTextualHierarchy()); } - QCString trPageIndex() - { return toUtf8(m_translator->trPageIndex()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.1.0 -////////////////////////////////////////////////////////////////////////// - - QCString trNote() - { return toUtf8(m_translator->trNote()); } - QCString trPublicTypes() - { return toUtf8(m_translator->trPublicTypes()); } - QCString trPublicAttribs() - { return toUtf8(m_translator->trPublicAttribs()); } - QCString trStaticPublicAttribs() - { return toUtf8(m_translator->trStaticPublicAttribs()); } - QCString trProtectedTypes() - { return toUtf8(m_translator->trProtectedTypes()); } - QCString trProtectedAttribs() - { return toUtf8(m_translator->trProtectedAttribs()); } - QCString trStaticProtectedAttribs() - { return toUtf8(m_translator->trStaticProtectedAttribs()); } - QCString trPrivateTypes() - { return toUtf8(m_translator->trPrivateTypes()); } - QCString trPrivateAttribs() - { return toUtf8(m_translator->trPrivateAttribs()); } - QCString trStaticPrivateAttribs() - { return toUtf8(m_translator->trStaticPrivateAttribs()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.1.3 -////////////////////////////////////////////////////////////////////////// - - QCString trTodo() - { return toUtf8(m_translator->trTodo()); } - QCString trTodoList() - { return toUtf8(m_translator->trTodoList()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.1.4 -////////////////////////////////////////////////////////////////////////// - - QCString trReferencedBy() - { return toUtf8(m_translator->trReferencedBy()); } - QCString trRemarks() - { return toUtf8(m_translator->trRemarks()); } - QCString trAttention() - { return toUtf8(m_translator->trAttention()); } - QCString trInclByDepGraph() - { return toUtf8(m_translator->trInclByDepGraph()); } - QCString trSince() - { return toUtf8(m_translator->trSince()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.1.5 -////////////////////////////////////////////////////////////////////////// - - QCString trLegendTitle() - { return toUtf8(m_translator->trLegendTitle()); } - QCString trLegendDocs() - { return toUtf8(m_translator->trLegendDocs()); } - QCString trLegend() - { return toUtf8(m_translator->trLegend()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.0 -////////////////////////////////////////////////////////////////////////// - - QCString trTest() - { return toUtf8(m_translator->trTest()); } - QCString trTestList() - { return toUtf8(m_translator->trTestList()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.1 -////////////////////////////////////////////////////////////////////////// - - QCString trDCOPMethods() - { return toUtf8(m_translator->trDCOPMethods()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.2 -////////////////////////////////////////////////////////////////////////// - - QCString trProperties() - { return toUtf8(m_translator->trProperties()); } - QCString trPropertyDocumentation() - { return toUtf8(m_translator->trPropertyDocumentation()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.4 -////////////////////////////////////////////////////////////////////////// - - QCString trClasses() - { return toUtf8(m_translator->trClasses()); } - QCString trPackage(const char *name) - { return toUtf8(m_translator->trPackage(fromUtf8(name))); } - QCString trPackageList() - { return toUtf8(m_translator->trPackageList()); } - QCString trPackageListDescription() - { return toUtf8(m_translator->trPackageListDescription()); } - QCString trPackages() - { return toUtf8(m_translator->trPackages()); } - QCString trDefineValue() - { return toUtf8(m_translator->trDefineValue()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.5 -////////////////////////////////////////////////////////////////////////// - - QCString trBug() - { return toUtf8(m_translator->trBug()); } - QCString trBugList() - { return toUtf8(m_translator->trBugList()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.6 -////////////////////////////////////////////////////////////////////////// - - QCString trRTFansicp() - { return toUtf8(m_translator->trRTFansicp()); } - QCString trRTFCharSet() - { return toUtf8(m_translator->trRTFCharSet()); } - QCString trRTFGeneralIndex() - { return toUtf8(m_translator->trRTFGeneralIndex()); } - - // Translation of the word - - QCString trClass(bool first_capital, bool singular) - { return toUtf8(m_translator->trClass(first_capital,singular)); } - QCString trFile(bool first_capital, bool singular) - { return toUtf8(m_translator->trFile(first_capital,singular)); } - QCString trNamespace(bool first_capital, bool singular) - { return toUtf8(m_translator->trNamespace(first_capital,singular)); } - - QCString trGroup(bool first_capital, bool singular) - { return toUtf8(m_translator->trGroup(first_capital,singular)); } - QCString trPage(bool first_capital, bool singular) - { return toUtf8(m_translator->trPage(first_capital,singular)); } - QCString trMember(bool first_capital, bool singular) - { return toUtf8(m_translator->trMember(first_capital,singular)); } - QCString trGlobal(bool first_capital, bool singular) - { return toUtf8(m_translator->trGlobal(first_capital,singular)); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.7 -////////////////////////////////////////////////////////////////////////// - - QCString trAuthor(bool first_capital, bool singular) - { return toUtf8(m_translator->trAuthor(first_capital,singular)); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.11 -////////////////////////////////////////////////////////////////////////// - - QCString trReferences() - { return toUtf8(m_translator->trReferences()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.13 -////////////////////////////////////////////////////////////////////////// - - QCString trImplementedFromList(int numEntries) - { return toUtf8(m_translator->trImplementedFromList(numEntries)); } - QCString trImplementedInList(int numEntries) - { return toUtf8(m_translator->trImplementedInList(numEntries)); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.16 -////////////////////////////////////////////////////////////////////////// - - QCString trRTFTableOfContents() - { return toUtf8(m_translator->trRTFTableOfContents()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.17 -////////////////////////////////////////////////////////////////////////// - - QCString trDeprecatedList() - { return toUtf8(m_translator->trDeprecatedList()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.2.18 -////////////////////////////////////////////////////////////////////////// - - QCString trEvents() - { return toUtf8(m_translator->trEvents()); } - QCString trEventDocumentation() - { return toUtf8(m_translator->trEventDocumentation()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.3 -////////////////////////////////////////////////////////////////////////// - - QCString trPackageTypes() - { return toUtf8(m_translator->trPackageTypes()); } - QCString trPackageMembers() - { return toUtf8(m_translator->trPackageMembers()); } - QCString trStaticPackageMembers() - { return toUtf8(m_translator->trStaticPackageMembers()); } - QCString trPackageAttribs() - { return toUtf8(m_translator->trPackageAttribs()); } - QCString trStaticPackageAttribs() - { return toUtf8(m_translator->trStaticPackageAttribs()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.3.1 -////////////////////////////////////////////////////////////////////////// - - QCString trAll() - { return toUtf8(m_translator->trAll()); } - QCString trCallGraph() - { return toUtf8(m_translator->trCallGraph()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.3.3 -////////////////////////////////////////////////////////////////////////// - - QCString trSearchForIndex() - { return toUtf8(m_translator->trSearchForIndex()); } - QCString trSearchResultsTitle() - { return toUtf8(m_translator->trSearchResultsTitle()); } - QCString trSearchResults(int numDocuments) - { return toUtf8(m_translator->trSearchResults(numDocuments)); } - QCString trSearchMatches() - { return toUtf8(m_translator->trSearchMatches()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.3.8 -////////////////////////////////////////////////////////////////////////// - - QCString trSourceFile(QCString& filename) - { return toUtf8(m_translator->trSourceFile(filename)); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.3.9 -////////////////////////////////////////////////////////////////////////// - - QCString trDirIndex() - { return toUtf8(m_translator->trDirIndex()); } - QCString trDirDocumentation() - { return toUtf8(m_translator->trDirDocumentation()); } - QCString trDirectories() - { return toUtf8(m_translator->trDirectories()); } - QCString trDirDescription() - { return toUtf8(m_translator->trDirDescription()); } - QCString trDirReference(const char *dirName) - { return toUtf8(m_translator->trDirReference(fromUtf8(dirName))); } - QCString trDir(bool first_capital, bool singular) - { return toUtf8(m_translator->trDir(first_capital,singular)); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.4.1 -////////////////////////////////////////////////////////////////////////// - - QCString trOverloadText() - { return toUtf8(m_translator->trOverloadText()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.4.6 -////////////////////////////////////////////////////////////////////////// - - QCString trCallerGraph() - { return toUtf8(m_translator->trCallerGraph()); } - QCString trEnumerationValueDocumentation() - { return toUtf8(m_translator->trEnumerationValueDocumentation()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.5.4 -////////////////////////////////////////////////////////////////////////// - - QCString trMemberFunctionDocumentationFortran() - { return toUtf8(m_translator->trMemberFunctionDocumentationFortran()); } - QCString trCompoundListFortran() - { return toUtf8(m_translator->trCompoundListFortran()); } - QCString trCompoundMembersFortran() - { return toUtf8(m_translator->trCompoundMembersFortran()); } - QCString trCompoundListDescriptionFortran() - { return toUtf8(m_translator->trCompoundListDescriptionFortran()); } - QCString trCompoundMembersDescriptionFortran(bool extractAll) - { return toUtf8(m_translator->trCompoundMembersDescriptionFortran(extractAll)); } - QCString trCompoundIndexFortran() - { return toUtf8(m_translator->trCompoundIndexFortran()); } - QCString trTypeDocumentation() - { return toUtf8(m_translator->trTypeDocumentation()); } - QCString trSubprograms() - { return toUtf8(m_translator->trSubprograms()); } - QCString trSubprogramDocumentation() - { return toUtf8(m_translator->trSubprogramDocumentation()); } - QCString trDataTypes() - { return toUtf8(m_translator->trDataTypes()); } - QCString trModulesList() - { return toUtf8(m_translator->trModulesList()); } - QCString trModulesListDescription(bool extractAll) - { return toUtf8(m_translator->trModulesListDescription(extractAll)); } - QCString trCompoundReferenceFortran(const char *clName, - ClassDef::CompoundType compType, - bool isTemplate) - { return toUtf8(m_translator->trCompoundReferenceFortran(fromUtf8(clName),compType,isTemplate)); } - QCString trModuleReference(const char *namespaceName) - { return toUtf8(m_translator->trModuleReference(fromUtf8(namespaceName))); } - QCString trModulesMembers() - { return toUtf8(m_translator->trModulesMembers()); } - QCString trModulesMemberDescription(bool extractAll) - { return toUtf8(m_translator->trModulesMemberDescription(extractAll)); } - QCString trModulesIndex() - { return toUtf8(m_translator->trModulesIndex()); } - QCString trModule(bool first_capital, bool singular) - { return toUtf8(m_translator->trModule(first_capital,singular)); } - QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType, - bool single) - { return toUtf8(m_translator->trGeneratedFromFilesFortran(compType,single)); } - QCString trType(bool first_capital, bool singular) - { return toUtf8(m_translator->trType(first_capital,singular)); } - QCString trSubprogram(bool first_capital, bool singular) - { return toUtf8(m_translator->trSubprogram(first_capital,singular)); } - QCString trTypeConstraints() - { return toUtf8(m_translator->trTypeConstraints()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.6.0 -////////////////////////////////////////////////////////////////////////// - - QCString trDirRelation(const char *name) - { return toUtf8(m_translator->trDirRelation(fromUtf8(name))); } - QCString trLoading() - { return toUtf8(m_translator->trLoading()); } - QCString trGlobalNamespace() - { return toUtf8(m_translator->trGlobalNamespace()); } - QCString trSearching() - { return toUtf8(m_translator->trSearching()); } - QCString trNoMatches() - { return toUtf8(m_translator->trNoMatches()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.6.3 -////////////////////////////////////////////////////////////////////////// - - QCString trDirDependency(const char *name) - { return toUtf8(m_translator->trDirDependency(fromUtf8(name))); } - QCString trFileIn(const char *name) - { return toUtf8(m_translator->trFileIn(fromUtf8(name))); } - QCString trIncludesFileIn(const char *name) - { return toUtf8(m_translator->trIncludesFileIn(fromUtf8(name))); } - QCString trDateTime(int year,int month,int day,int dayOfWeek, - int hour,int minutes,int seconds,bool includeTime) - { return toUtf8(m_translator->trDateTime(year,month,day,dayOfWeek, - hour,minutes,seconds,includeTime)); - } - -////////////////////////////////////////////////////////////////////////// -// new since 1.7.5 -////////////////////////////////////////////////////////////////////////// - - QCString trCiteReferences() - { return toUtf8(m_translator->trCiteReferences()); } - QCString trCopyright() - { return toUtf8(m_translator->trCopyright()); } - QCString trDirDepGraph(const char *name) - { return toUtf8(m_translator->trDirDepGraph(fromUtf8(name))); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.0 -////////////////////////////////////////////////////////////////////////// - - QCString trDetailLevel() - { return toUtf8(m_translator->trDetailLevel()); } - QCString trTemplateParameters() - { return toUtf8(m_translator->trTemplateParameters()); } - QCString trAndMore(const QCString &number) - { return toUtf8(m_translator->trAndMore(fromUtf8(number))); } - QCString trEnumGeneratedFromFiles(bool single) - { return toUtf8(m_translator->trEnumGeneratedFromFiles(single)); } - QCString trEnumReference(const char *name) - { return toUtf8(m_translator->trEnumReference(fromUtf8(name))); } - QCString trInheritedFrom(const char *members,const char *what) - { return toUtf8(m_translator->trInheritedFrom(fromUtf8(members),fromUtf8(what))); } - QCString trAdditionalInheritedMembers() - { return toUtf8(m_translator->trAdditionalInheritedMembers()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.2 -////////////////////////////////////////////////////////////////////////// - - QCString trPanelSynchronisationTooltip(bool enable) - { return toUtf8(m_translator->trPanelSynchronisationTooltip(enable)); } - QCString trProvidedByCategory() - { return toUtf8(m_translator->trProvidedByCategory()); } - QCString trExtendsClass() - { return toUtf8(m_translator->trExtendsClass()); } - QCString trClassMethods() - { return toUtf8(m_translator->trClassMethods()); } - QCString trInstanceMethods() - { return toUtf8(m_translator->trInstanceMethods()); } - QCString trMethodDocumentation() - { return toUtf8(m_translator->trMethodDocumentation()); } - QCString trDesignOverview() - { return toUtf8(m_translator->trDesignOverview()); } - -////////////////////////////////////////////////////////////////////////// -// new since 1.8.4 -////////////////////////////////////////////////////////////////////////// - - QCString trInterfaces() - { return toUtf8(m_translator->trInterfaces()); } - QCString trServices() - { return toUtf8(m_translator->trServices()); } - QCString trConstantGroups() - { return toUtf8(m_translator->trConstantGroups()); } - QCString trConstantGroupReference(const char *namespaceName) - { return toUtf8(m_translator->trConstantGroupReference(fromUtf8(namespaceName))); } - QCString trServiceReference(const char *sName) - { return toUtf8(m_translator->trServiceReference(fromUtf8(sName))); } - QCString trSingletonReference(const char *sName) - { return toUtf8(m_translator->trSingletonReference(fromUtf8(sName))); } - QCString trServiceGeneratedFromFiles(bool single) - { return toUtf8(m_translator->trServiceGeneratedFromFiles(single)); } - QCString trSingletonGeneratedFromFiles(bool single) - { return toUtf8(m_translator->trSingletonGeneratedFromFiles(single)); } - - -////////////////////////////////////////////////////////////////////////// - private: - Translator *m_translator; - void *m_toUtf8; - void *m_fromUtf8; - -}; - -#endif diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj index fb4ae8d..7ab4653 100644 --- a/winbuild/Doxygen.vcproj +++ b/winbuild/Doxygen.vcproj @@ -4182,10 +4182,6 @@ > - - Date: Tue, 25 Jun 2013 10:22:23 +0200 Subject: doc/translator.py -- TranslatorDecoder checks removed --- doc/translator.py | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/doc/translator.py b/doc/translator.py index f60fa49..2abce71 100644 --- a/doc/translator.py +++ b/doc/translator.py @@ -61,6 +61,7 @@ 2010/09/27 - The underscore in \latexonly part of the generated language.doc was prefixed by backslash (was LaTeX related error). 2013/02/19 - Better diagnostics when translator_xx.h is too crippled. + 2013/06/25 - TranslatorDecoder checks removed after removing the class. """ from __future__ import generators @@ -185,7 +186,6 @@ class Transl: self.missingMethods = None # list of prototypes to be implemented self.implementedMethods = None # list of implemented required methods self.adaptMinClass = None # The newest adapter class that can be used - self.isDecodedTranslator = None # Flag related to internal usage of UTF-8 def __tokenGenerator(self): """Generator that reads the file and yields tokens as 4-tuples. @@ -1117,13 +1117,6 @@ class Transl: else: self.missingMethods.append(p) - # Set the least important note first if the translator is decoded. - # If yes, then it means that the implementation should be switched - # to UTF-8 later (suggestion). - self.isDecodedTranslator = self.classId in self.manager.decodedTranslators - if self.isDecodedTranslator: - self.note = 'Reimplementation using UTF-8 suggested.' - # Check whether adapter must be used or suggest the newest one. # Change the status and set the note accordingly. if self.baseClassId != 'Translator': @@ -1307,44 +1300,10 @@ class TrManager: self.numLang = None # excluding coupled En-based self.doxVersion = None # Doxygen version - # Capture the knowledge about translators that are not implemented - # to use UTF-8 internally. - self.decodedTranslators = self.getDecodedTranslators() - # Build objects where each one is responsible for one translator. self.__build() - def getDecodedTranslators(self): - """Parses language.cpp to find what translators do not use UTF-8 yet""" - decodedTranslators = [] - - # Regular expression to detect the lines like - # theTranslator=new TranslatorDecoder(new TranslatorSwedish); - rex = re.compile(r'^\s*theTranslator\s*=\s*new\s+.*$') - - # Regular expression to get the (optional) TranslatorDecoder and TranslatorXXX - rex2 = re.compile(r'\bTranslator\w+') - - # Parse the lines in the specific source code. - f = open(os.path.join(self.src_path, 'language.cpp'), 'rU') - for line in f: - if rex.match(line): - lst = rex2.findall(line) - if lst[0] == 'TranslatorDecoder': - decodedTranslators.append(lst[1]) - f.close() - - # Display warning when all translator implementations were converted - # to UTF-8. - if len(decodedTranslators) == 0: - print 'This script should be updated. All translators do use UTF-8' - print 'internally. The TranslatorDecoder adapter should be removed' - print 'from the code and its usage should not be checked any more.' - - return decodedTranslators - - def __build(self): """Find the translator files and build the objects for translators.""" -- cgit v0.12 From d274d6cf193b4e719804965671f23ab9c41f7727 Mon Sep 17 00:00:00 2001 From: Petr Prikryl Date: Tue, 25 Jun 2013 10:42:08 +0200 Subject: src/translator.h simplified, translator.cpp removed, ... winbuild/Doxygen.vcproj removed. The conversion tables/functions from within translator classes not used after conversion to UTF-8. --- src/translator.cpp | 249 -- src/translator.h | 85 +- winbuild/Doxygen.vcproj | 8496 +++++++++++++++++++++++------------------------ 3 files changed, 4259 insertions(+), 4571 deletions(-) delete mode 100644 src/translator.cpp diff --git a/src/translator.cpp b/src/translator.cpp deleted file mode 100644 index b161345..0000000 --- a/src/translator.cpp +++ /dev/null @@ -1,249 +0,0 @@ -/*! \file translator.cpp - * \brief Implementation of generally used translator methods. - * - * This file contains implementation of the translator methods that - * are not expected to be reimplemented by derived translator classes. - * It also contains static data tables used by the methods. - * - */ -#include "translator.h" -#include - -/*! The translation table used by Win1250ToISO88592() method. */ -const char Translator::Win1250ToISO88592Tab[] = -{ - '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87', - '\x88', '\x89', '\xA9', '\x8B', '\xA6', '\xAB', '\xAE', '\xAC', - '\x90', '\x91', '\x92', '\x93', '\x94', '\x2E', '\x96', '\x97', - '\x98', '\x99', '\xB9', '\x9B', '\xB6', '\xBB', '\xBE', '\xBC', - '\xA0', '\x20', '\x20', '\xA3', '\xA4', '\xA1', '\xA6', '\xA7', - '\x22', '\xA9', '\xAA', '\x3C', '\xAC', '\x2D', '\xAE', '\xAF', - '\x2E', '\x2B', '\x20', '\xB3', '\x27', '\x75', '\xB6', '\xB7', - '\x20', '\xB1', '\xBA', '\x3E', '\xA5', '\x22', '\xB5', '\xBF', - '\xC0', '\xC1', '\xC2', '\xC3', '\xC4', '\xC5', '\xC6', '\xC7', - '\xC8', '\xC9', '\xCA', '\xCB', '\xCC', '\xCD', '\xCE', '\xCF', - '\xD0', '\xD1', '\xD2', '\xD3', '\xD4', '\xD5', '\xD6', '\xD7', - '\xD8', '\xD9', '\xDA', '\xDB', '\xDC', '\xDD', '\xDE', '\xDF', - '\xE0', '\xE1', '\xE2', '\xE3', '\xE4', '\xE5', '\xE6', '\xE7', - '\xE8', '\xE9', '\xEA', '\xEB', '\xEC', '\xED', '\xEE', '\xEF', - '\xF0', '\xF1', '\xF2', '\xF3', '\xF4', '\xF5', '\xF6', '\x2D', - '\xF8', '\xF9', '\xFA', '\xFB', '\xFC', '\xFD', '\xFE', '\xFF', - '\0' -}; - - -/*! The translation table used by ISO88592ToWin1250() method. */ -const char Translator::ISO88592ToWin1250Tab[] = { - '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87', - '\x88', '\x89', '\x8A', '\x8B', '\x8C', '\x8D', '\x8E', '\x8F', - '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97', - '\x98', '\x99', '\x9A', '\x9B', '\x9C', '\x9D', '\x9E', '\x9F', - '\xA0', '\xA5', '\xA2', '\xA3', '\xA4', '\xBC', '\x8C', '\xA7', - '\xA8', '\x8A', '\xAA', '\x8D', '\x8F', '\xAD', '\x8E', '\xAF', - '\xB0', '\xB9', '\xB2', '\xB3', '\xB4', '\xBE', '\x9C', '\xB7', - '\xB8', '\x9A', '\xBA', '\x9D', '\x9F', '\xBD', '\x9E', '\xBF', - '\xC0', '\xC1', '\xC2', '\xC3', '\xC4', '\xC5', '\xC6', '\xC7', - '\xC8', '\xC9', '\xCA', '\xCB', '\xCC', '\xCD', '\xCE', '\xCF', - '\xD0', '\xD1', '\xD2', '\xD3', '\xD4', '\xD5', '\xD6', '\xD7', - '\xD8', '\xD9', '\xDA', '\xDB', '\xDC', '\xDD', '\xDE', '\xDF', - '\xE0', '\xE1', '\xE2', '\xE3', '\xE4', '\xE5', '\xE6', '\xE7', - '\xE8', '\xE9', '\xEA', '\xEB', '\xEC', '\xED', '\xEE', '\xEF', - '\xF0', '\xF1', '\xF2', '\xF3', '\xF4', '\xF5', '\xF6', '\xF7', - '\xF8', '\xF9', '\xFA', '\xFB', '\xFC', '\xFD', '\xFE', '\xFF', - '\0' -}; - - -/*! The translation table used by Koi8RToWindows1251() method. */ -const unsigned char Translator::Koi8RToWindows1251Tab[128] = -{ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, - 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, - 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, - 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, - 254,224,225,246,228,229,244,227,245,232,233,234,235,236,237,238, - 239,255,240,241,242,243,230,226,252,251,231,248,253,249,247,250, - 222,192,193,214,196,197,212,195,213,200,201,202,203,204,205,206, - 207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218 -}; - - -/*! The translation table used by Windows1251ToKoi8R() method. */ -const unsigned char Translator::Windows1251ToKoi8RTab[128] = -{ 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, - 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159, - 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, - 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, - 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240, - 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241, - 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208, - 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209 -}; - -/*! Returns the string converted from windows-1250 to iso-8859-2. */ -/* The method was designed initially for translator_cz.h. - * It is used for on-line encoding conversion related to - * conditional compilation in Unix/MS Windows environments - * (both use different encoding). Later, the translator_hr.h - * (by Boris Bralo) used and improved the same style. As the - * method with the translation table was the same, the - * decision to move it to this base class was made. The same - * holds for ISO88592ToWin1250() method. - * - * Alexandr Chelpanov used the same approach for - * Koi8RToWindows1251() and Windows1251ToKoi8R() methods. Notice, - * that he uses Unicode tables. - * - * It is recommended for possibly other similar methods in future. - */ -QCString Translator::Win1250ToISO88592(const QCString & sInput) -{ - // The conversion table for characters >127 - // - - QCString result; - int len = sInput.length(); - - for (int i = 0; i < len; ++i) - { - unsigned int c = sInput[i]; - result += (c > 127) ? Win1250ToISO88592Tab[c & 0x7F] : c; - } - return result; -} - - -/*! returns the string converted from iso-8859-2 to windows-1250 */ -/* See the comments of the Win1250ToISO88592() method for details. */ -QCString Translator::ISO88592ToWin1250(const QCString & sInput) -{ - // The conversion table for characters >127 - // - QCString result; - int len = sInput.length(); - - for (int i = 0; i < len; ++i) - { - unsigned int c = sInput[i]; - result += (c > 127) ? ISO88592ToWin1250Tab[c & 0x7F] : c; - } - return result; -} - - -/*! Returns the string converted from koi8-r to windows-1251. */ -/* The method was designed initially for translator_cz.h. - It is used for on-line encoding conversion related to conditional - compilation in Unix/MS Windows environments (both use different - encoding). Encoding table got from QT:qtextcodec.cpp - */ -QCString Translator::Koi8RToWindows1251( const QCString & sInput ) -{ - - QCString result(sInput); - int len = sInput.length(); - - const unsigned char * c = (const unsigned char *)(const char*)sInput; - unsigned char *dc = (unsigned char*)(const char*)result; - for( int i=0; i 127 ) - dc[i] = Koi8RToWindows1251Tab[c[i]-128]; - } - return result; -} - - -/*! returns the string converted from Windows-1251 to koi8-r */ -/* See the comments of the Koi8RToWindows1251() method for details. - Encoding table got from QT:qtextcodec.cpp */ -QCString Translator::Windows1251ToKoi8R( const QCString & sInput ) -{ - QCString result(sInput); - int len = sInput.length(); - - const unsigned char * c = (const unsigned char *)(const char*)sInput; - unsigned char *dc = (unsigned char*)(const char*)result; - for( int i=0; i 127 ) - dc[i] = Windows1251ToKoi8RTab[c[i]-128]; - } - return result; -} - -/*! returns the caracter converted from hankaku-kana to zenkakukana. - Thanks Yongmao Ni http://alfin.mine.utsunomiya-u.ac.jp/~niy/algo/ */ -unsigned int hankaku2zen(int hankaku) -{ - static unsigned int z[64] = { - 0x2121,0x2123,0x2156,0x2157,0x2122,0x2126,0x2572,0x2521, - 0x2523,0x2525,0x2527,0x2529,0x2563,0x2565,0x2567,0x2543, - 0x213c,0x2522,0x2524,0x2526,0x2528,0x252a,0x252b,0x252d, - 0x252f,0x2531,0x2533,0x2535,0x2537,0x2539,0x253b,0x253d, - 0x253f,0x2541,0x2544,0x2546,0x2548,0x254a,0x254b,0x254c, - 0x254d,0x254e,0x254f,0x2552,0x2555,0x2558,0x255b,0x255e, - 0x255f,0x2560,0x2561,0x2562,0x2564,0x2566,0x2568,0x2569, - 0x256a,0x256b,0x256c,0x256d,0x256f,0x2573,0x212b,0x212c }; - - if (hankaku < 0xa0 || hankaku > 0xdf) return 0; - return z[hankaku - 0xa0]; -} - -/*! returns the character converted from japaneseEUC to SJIS - Thanks Yongmao Ni http://alfin.mine.utsunomiya-u.ac.jp/~niy/algo/ */ -unsigned int euc2sjis(unsigned int euc) -{ - unsigned int jis; - unsigned int hib, lob; - - if ((euc & 0xff00) == 0x8e00) - jis = hankaku2zen(euc & 0xff); - else jis = euc & ~0x8080; - - hib = (jis >> 8) & 0xff; - lob = jis & 0xff; - lob += (hib & 1) ? 0x1f : 0x7d; - if (lob >= 0x7f) lob++; - hib = ((hib - 0x21) >> 1) + 0x81; - if (hib > 0x9f) hib += 0x40; - - return (hib << 8) | lob; -} - - -/*! returns the string converted from Japanese-EUC to SJIS */ - -QCString Translator::JapaneseEucToSjis( const QCString & sInput ) -{ - QString result; - int len = sInput.length(); - int c1,c2,sj; - - result.setUnicode(0, len); - QChar* uc = (QChar*)result.unicode(); // const_cast - const unsigned char * c = (const unsigned char *)(const char*)sInput; - - for( int i=0; i> 8; - uc[i+1] = sj & 0xff; - i+=2; - } - } - - return result.latin1(); - -} diff --git a/src/translator.h b/src/translator.h index 4de5da7..da832e3 100644 --- a/src/translator.h +++ b/src/translator.h @@ -1,12 +1,12 @@ /****************************************************************************** * - * + * * * Copyright (C) 1997-2013 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software * for any purpose. It is provided "as is" without express or implied warranty. * See the GNU General Public License for more details. * @@ -23,45 +23,22 @@ /** Abstract base class for all translatable text fragments. */ class Translator { - private: - /* Tables for encoding conversions. */ - static const char Win1250ToISO88592Tab[]; - static const char ISO88592ToWin1250Tab[]; - static const unsigned char Koi8RToWindows1251Tab[128]; - static const unsigned char Windows1251ToKoi8RTab[128]; - - protected: - /*! Returns the string converted from windows-1250 to iso-8859-2. */ - QCString Win1250ToISO88592(const QCString & sInput); - - /*! Returns the string converted from iso-8859-2 to windows-1250. */ - QCString ISO88592ToWin1250(const QCString & sInput); - - /*! Returns the string converted from koi8-r to windows-1251. */ - QCString Koi8RToWindows1251( const QCString & sInput ); - - /*! Returns the string converted from windows-1251 to koi8-r. */ - QCString Windows1251ToKoi8R( const QCString & sInput ); - - /*! Returns the string converted from Japanese-EUC to SJIS. */ - QCString JapaneseEucToSjis( const QCString & sInput ); - public: /*! This method is used to provide warning message that is displayed - * if the user chooses a language whose translation is not up to date. + * if the user chooses a language whose translation is not up to date. * It is implemented by the adapter classes. */ virtual QCString updateNeededMessage() { return ""; } virtual ~Translator() {} - + // Please, have a look at comments inside the translator_en.h file // to learn the meaning of the following methods. The translator_en.h - // file contains the TranslatorEnglish implementation, which is + // file contains the TranslatorEnglish implementation, which is // always up-to-date (by definition). - + // --- Language control methods ------------------- - + virtual QCString idLanguage() = 0; virtual QCString latexLanguageSupportCommand() = 0; virtual QCString idLanguageCharset() = 0; @@ -107,14 +84,14 @@ class Translator virtual QCString trRelatedPagesDescription() = 0; virtual QCString trModulesDescription() = 0; //virtual QCString trNoDescriptionAvailable() = 0; - - // index titles (the project name is prepended for these) + + // index titles (the project name is prepended for these) virtual QCString trDocumentation() = 0; virtual QCString trModuleIndex() = 0; virtual QCString trHierarchicalIndex() = 0; virtual QCString trCompoundIndex() = 0; - virtual QCString trFileIndex() = 0; + virtual QCString trFileIndex() = 0; virtual QCString trModuleDocumentation() = 0; virtual QCString trClassDocumentation() = 0; virtual QCString trFileDocumentation() = 0; @@ -153,17 +130,17 @@ class Translator ////////////////////////////////////////////////////////////////////////// // new since 0.49-990307 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trNamespaceList() = 0; virtual QCString trNamespaceListDescription(bool extractAll) = 0; virtual QCString trFriends() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 0.49-990405 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trRelatedFunctionDocumentation() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 0.49-990425 ////////////////////////////////////////////////////////////////////////// @@ -174,7 +151,7 @@ class Translator virtual QCString trFileReference(const char *fileName) = 0; virtual QCString trNamespaceReference(const char *namespaceName) = 0; - + virtual QCString trPublicMembers() = 0; virtual QCString trPublicSlots() = 0; virtual QCString trSignals() = 0; @@ -254,7 +231,7 @@ class Translator ////////////////////////////////////////////////////////////////////////// // new since 1.1.0 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trNote() = 0; virtual QCString trPublicTypes() = 0; virtual QCString trPublicAttribs() = 0; @@ -282,7 +259,7 @@ class Translator virtual QCString trAttention() = 0; virtual QCString trInclByDepGraph() = 0; virtual QCString trSince() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.1.5 ////////////////////////////////////////////////////////////////////////// @@ -290,11 +267,11 @@ class Translator virtual QCString trLegendTitle() = 0; virtual QCString trLegendDocs() = 0; virtual QCString trLegend() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.2.0 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trTest() = 0; virtual QCString trTestList() = 0; @@ -323,11 +300,11 @@ class Translator virtual QCString trPackages() = 0; //virtual QCString trPackageDocumentation() = 0; virtual QCString trDefineValue() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.2.5 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trBug() = 0; virtual QCString trBugList() = 0; @@ -388,12 +365,12 @@ class Translator * 222 — Thai * 238 — Eastern European * 254 — PC 437 - * 255 — OEM + * 255 — OEM * */ virtual QCString trRTFCharSet() = 0; virtual QCString trRTFGeneralIndex() = 0; - + // Translation of the word virtual QCString trClass(bool first_capital, bool singular) = 0; @@ -408,7 +385,7 @@ class Translator ////////////////////////////////////////////////////////////////////////// // new since 1.2.7 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trAuthor(bool first_capital, bool singular) = 0; ////////////////////////////////////////////////////////////////////////// @@ -423,7 +400,7 @@ class Translator virtual QCString trImplementedFromList(int numEntries) = 0; virtual QCString trImplementedInList(int numEntries) = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.2.16 ////////////////////////////////////////////////////////////////////////// @@ -435,7 +412,7 @@ class Translator ////////////////////////////////////////////////////////////////////////// virtual QCString trDeprecatedList() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.2.18 ////////////////////////////////////////////////////////////////////////// @@ -452,7 +429,7 @@ class Translator virtual QCString trStaticPackageMembers() = 0; virtual QCString trPackageAttribs() = 0; virtual QCString trStaticPackageAttribs() = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.3.1 ////////////////////////////////////////////////////////////////////////// @@ -495,14 +472,14 @@ class Translator ////////////////////////////////////////////////////////////////////////// // new since 1.4.6 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trCallerGraph() = 0; virtual QCString trEnumerationValueDocumentation() = 0; ////////////////////////////////////////////////////////////////////////// // new since 1.5.4 ////////////////////////////////////////////////////////////////////////// - + virtual QCString trMemberFunctionDocumentationFortran() = 0; virtual QCString trCompoundListFortran() = 0; virtual QCString trCompoundMembersFortran() = 0; @@ -549,7 +526,7 @@ class Translator virtual QCString trDateTime(int year,int month,int day,int dayOfWeek, int hour,int minutes,int seconds, bool includeTime) = 0; - + ////////////////////////////////////////////////////////////////////////// // new since 1.7.5 ////////////////////////////////////////////////////////////////////////// diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj index 7ab4653..5d53e04 100644 --- a/winbuild/Doxygen.vcproj +++ b/winbuild/Doxygen.vcproj @@ -1,4268 +1,4228 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12 From c84e679ca11f8945f449b8b8ad6d93c05d97839e Mon Sep 17 00:00:00 2001 From: Petr Prikryl Date: Tue, 25 Jun 2013 11:57:37 +0200 Subject: idLanguageCharset() method removed from all translator classes --- src/translator.h | 1 - src/translator_am.h | 270 ++++++++++++++++---------------- src/translator_ar.h | 346 ++++++++++++++++++++-------------------- src/translator_br.h | 94 ++++++----- src/translator_ca.h | 374 ++++++++++++++++++++++--------------------- src/translator_cn.h | 375 ++++++++++++++++++++++---------------------- src/translator_cz.h | 6 - src/translator_de.h | 306 ++++++++++++++++++------------------ src/translator_dk.h | 6 - src/translator_en.h | 391 +++++++++++++++++++++++---------------------- src/translator_eo.h | 14 +- src/translator_es.h | 344 ++++++++++++++++++++-------------------- src/translator_fa.h | 366 +++++++++++++++++++++---------------------- src/translator_fi.h | 442 ++++++++++++++++++++++++++------------------------- src/translator_fr.h | 7 - src/translator_gr.h | 6 - src/translator_hr.h | 272 ++++++++++++++++---------------- src/translator_hu.h | 6 - src/translator_id.h | 6 - src/translator_it.h | 64 ++++---- src/translator_je.h | 7 +- src/translator_jp.h | 6 +- src/translator_ke.h | 7 +- src/translator_kr.h | 6 - src/translator_lt.h | 6 - src/translator_lv.h | 7 - src/translator_mk.h | 384 ++++++++++++++++++++++----------------------- src/translator_nl.h | 244 ++++++++++++++--------------- src/translator_no.h | 6 - src/translator_pl.h | 386 ++++++++++++++++++++++----------------------- src/translator_pt.h | 150 +++++++++--------- src/translator_ro.h | 6 - src/translator_ru.h | 268 ++++++++++++++++--------------- src/translator_sc.h | 388 ++++++++++++++++++++++----------------------- src/translator_si.h | 4 - src/translator_sk.h | 6 - src/translator_sr.h | 444 ++++++++++++++++++++++++++-------------------------- src/translator_sv.h | 6 - src/translator_tr.h | 412 ++++++++++++++++++++++++------------------------ src/translator_tw.h | 6 - src/translator_ua.h | 8 +- src/translator_vi.h | 382 ++++++++++++++++++++++---------------------- src/translator_za.h | 6 - 43 files changed, 3298 insertions(+), 3543 deletions(-) diff --git a/src/translator.h b/src/translator.h index da832e3..9fbbddd 100644 --- a/src/translator.h +++ b/src/translator.h @@ -41,7 +41,6 @@ class Translator virtual QCString idLanguage() = 0; virtual QCString latexLanguageSupportCommand() = 0; - virtual QCString idLanguageCharset() = 0; // --- Language translation methods ------------------- diff --git a/src/translator_am.h b/src/translator_am.h index d8ab0fd..9700cc9 100644 --- a/src/translator_am.h +++ b/src/translator_am.h @@ -1,12 +1,12 @@ /****************************************************************************** * - * + * * * Copyright (C) 1997-2013 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software * for any purpose. It is provided "as is" without express or implied warranty. * See the GNU General Public License for more details. * @@ -33,13 +33,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 virtual QCString latexLanguageSupportCommand() { return "
\\usepackage[latin]{armtex}\n"
-			   "\\usepackage[armscii8]{inputenc}\n
"; - } - - /*! return the language charset. This will be used for the HTML output */ - virtual QCString idLanguageCharset() - { - return "utf-8"; + "\\usepackage[armscii8]{inputenc}\n"; } // --- Language translation methods ------------------- @@ -132,7 +126,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 // quick reference sections - /*! This is put above each page as a link to the list of all groups of + /*! This is put above each page as a link to the list of all groups of * compounds or files (see the \\group command). */ virtual QCString trModules() @@ -178,11 +172,11 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 { if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { - return "Գլոբալներ"; + return "Գլոբալներ"; } else { - return "Ֆայլի անդամներ"; + return "Ֆայլի անդամներ"; } } @@ -291,26 +285,26 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 virtual QCString trModulesDescription() { return "Բոլոր մոդուլների ցուցակը."; } - // index titles (the project name is prepended for these) + // index titles (the project name is prepended for these) /*! This is used in HTML as the title of index.html. */ virtual QCString trDocumentation() { return " - Փաստագրություն"; } - /*! This is used in LaTeX as the title of the chapter with the + /*! This is used in LaTeX as the title of the chapter with the * index of all groups. */ virtual QCString trModuleIndex() { return "Մոդուլներ"; } - /*! This is used in LaTeX as the title of the chapter with the + /*! This is used in LaTeX as the title of the chapter with the * class hierarchy. */ virtual QCString trHierarchicalIndex() { return "Դասակարգումներ"; } - /*! This is used in LaTeX as the title of the chapter with the + /*! This is used in LaTeX as the title of the chapter with the * annotated compound index. */ virtual QCString trCompoundIndex() @@ -374,43 +368,43 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 virtual QCString trReferenceManual() { return "Հղումների ձեռնարկ"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of defines */ virtual QCString trDefines() { return "Մակրոսներ"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of function prototypes */ virtual QCString trFuncProtos() { return "Ֆունկցիաների նախատիպեր"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of typedefs */ virtual QCString trTypedefs() { return "Տիպի սահմանումներ (typedef)"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of enumerations */ virtual QCString trEnumerations() { return "Համարակալումներ"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of (global) functions */ virtual QCString trFunctions() { return "Ֆունկցիաներ"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of (global) variables */ virtual QCString trVariables() { return "Փոփոխականներ"; } - /*! This is used in the documentation of a file as a header before the + /*! This is used in the documentation of a file as a header before the * list of (global) variables */ virtual QCString trEnumerationValues() @@ -422,37 +416,37 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 virtual QCString trDefineDocumentation() { return "Մակրոսներ"; } - /*! This is used in the documentation of a file/namespace before the list + /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for function prototypes */ virtual QCString trFunctionPrototypeDocumentation() { return "Ֆունկցիաների նախատիպեր"; } - /*! This is used in the documentation of a file/namespace before the list + /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for typedefs */ virtual QCString trTypedefDocumentation() { return "Տիպի սահմանումներ (typedef)"; } - /*! This is used in the documentation of a file/namespace before the list + /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for enumeration types */ virtual QCString trEnumerationTypeDocumentation() { return "Համարակալման տիպեր"; } - /*! This is used in the documentation of a file/namespace before the list + /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for functions */ virtual QCString trFunctionDocumentation() { return "Ֆունկցիաներ"; } - /*! This is used in the documentation of a file/namespace before the list + /*! This is used in the documentation of a file/namespace before the list * of documentation blocks for variables */ virtual QCString trVariableDocumentation() { return "Փոփոխականներ"; } - /*! This is used in the documentation of a file/namespace/group before + /*! This is used in the documentation of a file/namespace/group before * the list of links to documented compounds */ virtual QCString trCompounds() @@ -462,20 +456,20 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 return "Տվյալների կառուցվածք"; } else - { + { return "Դասեր"; } } - /*! This is used in the documentation of a group before the list of + /*! This is used in the documentation of a group before the list of * links to documented files */ - /*! This is used in the standard footer of each page and indicates when - * the page was generated + /*! This is used in the standard footer of each page and indicates when + * the page was generated */ virtual QCString trGeneratedAt(const char *date,const char *projName) - { + { QCString result=(QCString)"Ստեղծվել է "+date; if (projName) result+=projName+QCString(" -ի համար,"); result+=(QCString)" հետևյալ համակարգով."; @@ -529,11 +523,11 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*! this text is used in the title page of a LaTeX document. */ virtual QCString trGeneratedBy() { return "Ստեղծված է հետևյալ համակարգի կողմից"; } - + ////////////////////////////////////////////////////////////////////////// -// new since 0.49-990307 +// new since 0.49-990307 ////////////////////////////////////////////////////////////////////////// - + /*! used as the title of page containing all the index of all namespaces. */ virtual QCString trNamespaceList() { return "Անունների տարածությունների ցուցակ"; } @@ -556,13 +550,13 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 ////////////////////////////////////////////////////////////////////////// // new since 0.49-990405 ////////////////////////////////////////////////////////////////////////// - + /*! used in the class documentation as a header before the list of all - * related classes + * related classes */ virtual QCString trRelatedFunctionDocumentation() { return "Դասի ընկերներ և կապված ֆունկցիաներ"; } - + ////////////////////////////////////////////////////////////////////////// // new since 0.49-990425 ////////////////////////////////////////////////////////////////////////// @@ -574,7 +568,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 { QCString result=(QCString)clName; if (isTemplate) - { + { switch(compType) { case ClassDef::Class: result+=" Դասի"; break; @@ -618,7 +612,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 result+=" անունների տարածություններ"; return result; } - + virtual QCString trPublicMembers() { return "Բաց անդամ ֆունկցիաներ"; } virtual QCString trPublicSlots() @@ -639,7 +633,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 { return "Փակ սլոթեր"; } virtual QCString trStaticPrivateMembers() { return "Փակ ստատիկ անդամ ֆունկցիաներ"; } - + /*! this function is used to produce a comma-separated list of items. * use generateMarker(i) to indicate where item i should be put. */ @@ -648,23 +642,23 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 QCString result; int i; // the inherits list contain `numEntries' classes - for (i=0;i