summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL4
-rw-r--r--README4
-rw-r--r--VERSION2
-rwxr-xr-xconfigure3
-rw-r--r--doc/maintainers.txt1
-rw-r--r--packages/rpm/doxygen.spec2
-rw-r--r--qtools/scstring.cpp8
-rw-r--r--src/declinfo.l2
-rw-r--r--src/docparser.cpp1
-rw-r--r--src/groupdef.cpp4
-rw-r--r--src/scanner.l34
-rw-r--r--src/translator_ke.h15
-rw-r--r--src/translator_kr.h365
-rw-r--r--src/util.cpp12
14 files changed, 300 insertions, 157 deletions
diff --git a/INSTALL b/INSTALL
index 81fe1eb..039e19c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
-DOXYGEN Version 1.3.9.1-20041221
+DOXYGEN Version 1.3.9.1-20041224
Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions.
--------
-Dimitri van Heesch (21 December 2004)
+Dimitri van Heesch (24 December 2004)
diff --git a/README b/README
index 94640ac..37e90c7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.3.9.1_20041221
+DOXYGEN Version 1.3.9.1_20041224
Please read INSTALL for compilation instructions.
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy,
-Dimitri van Heesch (dimitri@stack.nl) (21 December 2004)
+Dimitri van Heesch (dimitri@stack.nl) (24 December 2004)
diff --git a/VERSION b/VERSION
index 7256b0f..f33edb0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.9.1-20041221
+1.3.9.1-20041224
diff --git a/configure b/configure
index 0a35411..cbee394 100755
--- a/configure
+++ b/configure
@@ -517,6 +517,9 @@ done
# - generating src/lang_cfg.h
+if test -e "src/lang_cfg.h"; then
+ chmod u+w src/lang_cfg.h # make sure file can be overwritten
+fi
echo -n " Generating src/lang_cfg.h..."
echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>);
chomp @l;
diff --git a/doc/maintainers.txt b/doc/maintainers.txt
index 4122e39..b3bed25 100644
--- a/doc/maintainers.txt
+++ b/doc/maintainers.txt
@@ -67,6 +67,7 @@ Kenji Nagamatsu: naga@joyful.club.ne.jp
Iwasa Kazmi: iwasa@cosmo-system.jp
TranslatorKorean
+SooYoung Jung: jung5000@gmail.com
Richard Kim: ryk@dspwiz.com
TranslatorLithuanian
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 7fb95b7..c9d35ca 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,6 +1,6 @@
Summary: A documentation system for C/C++.
Name: doxygen
-Version: 1.3.9.1_20041221
+Version: 1.3.9.1_20041224
Release: 1
Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
diff --git a/qtools/scstring.cpp b/qtools/scstring.cpp
index a265afe..4a36755 100644
--- a/qtools/scstring.cpp
+++ b/qtools/scstring.cpp
@@ -151,7 +151,7 @@ SCString &SCString::sprintf( const char *format, ... )
int SCString::find( char c, int index, bool cs ) const
{
uint len = length();
- if ( m_data==0 || (uint)index>=len ) // index outside string
+ if ( m_data==0 || (uint)index>len ) // index outside string
return -1;
register const char *d;
if ( cs ) // case sensitive
@@ -173,7 +173,7 @@ int SCString::find( char c, int index, bool cs ) const
int SCString::find( const char *str, int index, bool cs ) const
{
uint l = length();
- if ( m_data==0 || (uint)index >= l ) // index outside string
+ if ( m_data==0 || (uint)index > l ) // index outside string
return -1;
if ( !str ) // no search string
return -1;
@@ -222,7 +222,7 @@ int SCString::findRev( char c, int index, bool cs) const
}
index = len;
}
- else if ( (uint)index >= len ) // bad index
+ else if ( (uint)index > len ) // bad index
{
return -1;
}
@@ -247,7 +247,7 @@ int SCString::findRev( const char *str, int index, bool cs) const
uint len = length();
if ( index < 0 ) // neg index ==> start from end
index = len-slen;
- else if ( (uint)index >= len ) // bad index
+ else if ( (uint)index > len ) // bad index
return -1;
else if ( (uint)(index + slen) > len ) // str would be too long
index = len - slen;
diff --git a/src/declinfo.l b/src/declinfo.l
index 0c67a80..50924d7 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -113,7 +113,7 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+)
%%
-<Start>"operator" { // operator rule must be before {ID} rule
+<Start>"operator"/({B}*"["{B}*"]")* { // operator rule must be before {ID} rule
name += yytext;
BEGIN(Operator);
}
diff --git a/src/docparser.cpp b/src/docparser.cpp
index e7e970a..8e1a487 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -840,6 +840,7 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children)
QString name = linkToText(g_token->name,TRUE);
int len = g_token->name.length();
ClassDef *cd=0;
+ //printf("handleLinkedWord(%s)\n",name.data());
if (!g_insideHtmlLink &&
resolveRef(g_context,g_token->name,g_inSeeBlock,&compound,&member))
{
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 260348c..0d0e401 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -578,8 +578,8 @@ void GroupDef::writeDocumentation(OutputList &ol)
while (gd)
{
ol.startMemberItem(0);
- ol.docify(theTranslator->trGroup(FALSE,TRUE));
- ol.docify(" ");
+ //ol.docify(theTranslator->trGroup(FALSE,TRUE));
+ //ol.docify(" ");
ol.insertMemberAlign();
ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,gd->groupTitle());
if (!Config_getString("GENERATE_TAGFILE").isEmpty())
diff --git a/src/scanner.l b/src/scanner.l
index 7708a38..0d8c09d 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4637,18 +4637,18 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
<GroupDocArg2>"\\"{B}*"\n" { yyLineNr++;
}
-<GroupDocArg2>[^\n\*]+ {
+<GroupDocArg2>[^\n\\\*]+ {
current->type += yytext;
current->type = current->type.stripWhiteSpace();
}
-<GroupDocArg2>"\n" {
+<GroupDocArg2>"\\_linebr"|"\n" {
if( current->groupDocType == Entry::GROUPDOC_NORMAL &&
current->type.length() == 0 )
warn(yyFileName,yyLineNr,
"Warning: missing title after "
"\\defgroup %s", current->name.data()
);
- yyLineNr++;
+ if (*yytext=='\n') yyLineNr++;
newDocState();
}
<ClassDocArg2>{FILE} {
@@ -4658,6 +4658,9 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
<ClassDocArg2>"\\"{B}*"\n" { yyLineNr++;
}
+<ClassDocArg2>"\\_linebr" {
+ newDocState();
+ }
<ClassDocArg2>"\n" { yyLineNr++;
newDocState();
}
@@ -4672,7 +4675,7 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
<ClassDocArg3>"\\"{B}*"\n" { yyLineNr++;
}
-<ClassDocArg3>"\n" { yyLineNr++;
+<ClassDocArg3>"\n"|"\\linebr" { yyLineNr++;
newDocState();
}
<ClassDocArg3>{B}*"*/" {
@@ -4685,9 +4688,9 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
<FileDocArg1>"\\"{B}*"\n" { yyLineNr++;
}
-<FileDocArg1>"\n" {
+<FileDocArg1>"\n"|"\\_linebr" {
current->name = yyFileName;
- yyLineNr++;
+ if (*yytext=='\n') yyLineNr++;
newDocState();
if (lastFileDocContext==LineDoc)
{
@@ -4705,13 +4708,13 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
<PageDocArg1>"\\"{B}*"\n" { yyLineNr++;
current->doc+="\n";
}
-<PageDocArg1>"\n" {
+<PageDocArg1>"\n"|"\\_linebr" {
warn(yyFileName,yyLineNr,
"Warning: missing argument after "
"\\page."
);
current->doc+="\n";
- yyLineNr++;
+ if (*yytext=='\n') yyLineNr++;
BEGIN( Doc );
}
<PageDocArg2>.*"\n" {
@@ -4728,12 +4731,12 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
<EnumDocArg1>"\\"{B}*"\n" { yyLineNr++;
current->doc+="\n";
}
-<EnumDocArg1>"\n" {
+<EnumDocArg1>"\n"|"\\_linebr" {
warn(yyFileName,yyLineNr,
"Warning: missing argument after \\enum."
);
current->doc+="\n";
- yyLineNr++;
+ if (*yytext=='\n') yyLineNr++;
BEGIN( Doc );
}
<PageDoc>{CMD}"refitem".*"\n" {
@@ -4766,8 +4769,8 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
startGroupInDoc();
newDocState();
}
-<GroupHeader>\n {
- yyLineNr++;
+<GroupHeader>\n|"\\_linebr" {
+ if (*yytext=='\n') yyLineNr++;
current->doc+="\n";
//printf("Found memberGroup=`%s'\n",memberGroupHeader.data());
startGroupInDoc();
@@ -5328,7 +5331,10 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
new Grouping(yytext, Grouping::GROUPING_INGROUP)
);
}
-<GroupName>\n {
+<GroupName>"\\_linebr" {
+ BEGIN( lastGroupContext );
+ }
+<GroupName>"\n" {
yyLineNr++;
BEGIN( lastGroupContext );
}
@@ -5699,7 +5705,7 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
unput('/');unput('*');
BEGIN( tmpDocType );
}
-<Doc,JavaDoc,LineDoc,ClassDocBrief,AfterDocBrief,AfterDocLine,CopyArgCommentLine,ClassDoc,PageDoc,AfterDoc,CopyArgComment>"\\_linebr " {
+<Doc,JavaDoc,LineDoc,ClassDocBrief,AfterDocBrief,AfterDocLine,CopyArgCommentLine,ClassDoc,PageDoc,AfterDoc,CopyArgComment,DocInternal,DocInternalLine>"\\_linebr " {
// used to compensate for misalignments due to \n's inside ALIASES
current->doc += '\n';
}
diff --git a/src/translator_ke.h b/src/translator_ke.h
index cc7a106..ec048bb 100644
--- a/src/translator_ke.h
+++ b/src/translator_ke.h
@@ -15,6 +15,16 @@
*
*/
+//
+// Update:
+//
+// 2004.12.22 (SooYoung Jung: jung5000@gmail.com)
+// - LaTex and RTF were not generated correctly.
+// Corrected trRTFansicp and trRTFCharSet.
+// It was wrong.
+//
+//
+
#ifndef TRANSLATOR_KE_H
#define TRANSLATOR_KE_H
@@ -32,10 +42,9 @@ class TranslatorKoreanEn : public TranslatorEnglish
{
return "euc-kr";
}
-
virtual QCString trRTFansicp()
{
- return "1252";
+ return "949";
}
/*! Used as ansicpg for RTF fcharset
@@ -43,7 +52,7 @@ class TranslatorKoreanEn : public TranslatorEnglish
*/
virtual QCString trRTFCharSet()
{
- return "0";
+ return "129";
}
};
diff --git a/src/translator_kr.h b/src/translator_kr.h
index 337df87..e00e18e 100644
--- a/src/translator_kr.h
+++ b/src/translator_kr.h
@@ -1,12 +1,12 @@
/******************************************************************************
*
- *
+ *
*
* Copyright (C) 1997-2004 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.
*
@@ -15,35 +15,83 @@
*
*/
+#ifndef TRANSLATOR_KR_H
+#define TRANSLATOR_KR_H
+
+/*!
+ When defining a translator class for the new language, follow
+ the description in the documentation. One of the steps says
+ that you should copy the translator_en.h (this) file to your
+ translator_xx.h new file. Your new language should use the
+ Translator class as the base class. This means that you need to
+ implement exactly the same (pure virtual) methods as the
+ TranslatorEnglish does. Because of this, it is a good idea to
+ start with the copy of TranslatorEnglish and replace the strings
+ one by one.
+
+ It is not necessary to include "translator.h" or
+ "translator_adapter.h" here. The files are included in the
+ language.cpp correctly. Not including any of the mentioned
+ files frees the maintainer from thinking about whether the
+ first, the second, or both files should be included or not, and
+ why. This holds namely for localized translators because their
+ base class is changed occasionaly to adapter classes when the
+ Translator class changes the interface, or back to the
+ Translator class (by the local maintainer) when the localized
+ translator is made up-to-date again.
+*/
+
/*
Ãʱâ ÀÛ¾÷ÀÚ: ryk
TODO ÁÖ¼®À» º¸¸é 11/22/01, doxygen ¹öÀü 1.2.11±îÁö ¼ö°íÇØ ÁֽŠ°Í °°½À´Ï´Ù.
ÃÖ±Ù °»½ÅÀÚ: Astromaker(http://ngps.net/)
gpgiki(http://www.gpgstudy.com/gpgiki/)
-*/
-
-
-#ifndef TRANSLATOR_KR_H
-#define TRANSLATOR_KR_H
-
-class TranslatorKorean : public TranslatorAdapter_1_3_8
+ */
+
+//
+// Update:
+//
+// 2004.12.22 (SooYoung Jung: jung5000@gmail.com)
+// - LaTex and RTF were not generated correctly.
+// Corrected trRTFansicp and trRTFCharSet.
+// It was wrong.
+// - Adapting 1.3.9 and added "new since 1.3.9"
+// - Çؼ®ÀÌ À߸øµÈ ºÎºÐÀÌ ²Ò³ª ÀÖ¾î º¸ÀÓ..
+//
+
+
+class TranslatorKorean : public TranslatorAdapter_1_3_9
{
+ private:
+ /*! The decode() can change euc into sjis */
+ inline QCString decode(const QCString & sInput)
+ {
+ if (Config_getBool("USE_WINDOWS_ENCODING"))
+ {
+ return JapaneseEucToSjis(sInput);
+ }
+ else
+ {
+ return sInput;
+ }
+ }
+
public:
// --- Language control methods -------------------
-
- /*! Used for identification of the language. The identification
- * should not be translated. It should be replaced by the name
+
+ /*! Used for identification of the language. The identification
+ * should not be translated. It should be replaced by the name
* of the language in English using lower-case characters only
- * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
+ * (e.g. "czech", "japanese", "russian", etc.). It should be equal to
* the identification used in language.cpp.
*/
virtual QCString idLanguage()
{ return "korean"; }
-
- /*! Used to get the LaTeX command(s) for the language support.
+
+ /*! Used to get the LaTeX command(s) for the language support.
* This method should return string with commands that switch
- * LaTeX to the desired language. For example
+ * LaTeX to the desired language. For example
* <pre>"\\usepackage[german]{babel}\n"
* </pre>
* or
@@ -51,7 +99,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
* "\\usepackage[latin2]{inputenc}\n"
* "\\usepackage[T1]{fontenc}\n"
* </pre>
- *
+ *
* The English LaTeX does not use such commands. Because of this
* the empty string is returned in this implementation.
*/
@@ -97,7 +145,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
/*! header that is put before the list of member attributes. */
virtual QCString trMemberDataDocumentation()
- {
+ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "¸â¹ö º¯¼ö ¹®¼­È­";
@@ -152,7 +200,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
// 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()
@@ -175,7 +223,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
return "º¹ÇÕ±¸Á¶(Ŭ·¡½º, ±¸Á¶Ã¼, °ø¿ëü)";
}
}
-
+
/*! This is put above each page as a link to the list of documented files */
virtual QCString trFileList()
{ return "ÆÄÀÏ ¸ñ·Ï"; } //"ÆÄÀÏ ¸ñ·Ï", "ÆÄÀÏ ¸®½ºÆ®"
@@ -267,6 +315,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
result+="¸µÅ© µÈ Ŭ·¡½º ¸â¹ö´Â ";
}
+
if (extractAll)
result+="±× ¸â¹ö¿¡ ´ëÇÑ Å¬·¡½º ¹®¼­È­·Î °©´Ï´Ù.";
else
@@ -316,19 +365,19 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
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()
@@ -380,37 +429,37 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
virtual QCString trDefines()
{ return "¸ÅÅ©·Î, #define"; }
- /*! 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 "ŸÀÔ Á¤ÀÇ"; }
- /*! 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,50 +471,59 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
virtual QCString trDefineDocumentation()
{ return "#define ¹®¼­È­"; }
- /*! 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 "ŸÀÔ Á¤ÀÇ ¹®¼­È­"; }
- /*! 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 enumeration values
*/
virtual QCString trEnumerationValueDocumentation()
{ 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()
- { return "º¹ÇÕ±¸Á¶"; }
+ {
+ if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ {
+ return "Data Structures";
+ }
+ else
+ {
+ return "Classes";
+ }
+ }
- /*! 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)
{
@@ -486,7 +544,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
return (QCString)clName+"¿¡ ´ëÇÑ »ó¼Ó µµÇ¥";
}
-
+
/*! this text is generated when the \\internal command is used. */
virtual QCString trForInternalUseOnly()
{ return "³»ºÎ »ç¿ë¸¸À» À§ÇØ"; }
@@ -534,7 +592,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990307
//////////////////////////////////////////////////////////////////////////
-
+
/*! used as the title of page containing all the index of all namespaces. */
virtual QCString trNamespaceList()
{ return "namespace ¸ñ·Ï"; }
@@ -552,14 +610,14 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
* friends of a class
*/
virtual QCString trFriends()
- { return "friend"; }
-
+ { return "Friends"; }
+
//////////////////////////////////////////////////////////////////////////
// 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 "friend, ±×¸®°í °ü·ÃµÈ ÇÔ¼ö ¹®¼­È­"; }
@@ -585,6 +643,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
case ClassDef::Category: result+=" category"; break; // translate me!
case ClassDef::Exception: result+=" ¿¹¿Ü"; break;
}
+ if (isTemplate) result+=" ÅÛÇø´";
result+=" ÂüÁ¶";
return result;
}
@@ -634,23 +693,23 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
QCString result;
int i;
// the inherits list contain `numEntries' classes
- for (i=0;i<numEntries;i++)
+ for (i=0;i<numEntries;i++)
{
// use generateMarker to generate placeholders for the class links!
- result+=generateMarker(i); // generate marker for entry i in the list
+ result+=generateMarker(i); // generate marker for entry i in the list
// (order is left to right)
-
+
if (i!=numEntries-1) // not the last entry, so we need a separator
{
- if (i<numEntries-2) // not the fore last entry
+ if (i<numEntries-2) // not the fore last entry
result+=", ";
else // the fore last entry
result+=", °ú ";
}
}
- return result;
+ return result;
}
-
+
/*! used in class documentation to produce a list of base classes,
* if class diagrams are disabled.
*/
@@ -667,7 +726,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
return trWriteList(numEntries)+"¿¡ ÀÇÇØ »ó¼ÓµÇ¾ú½À´Ï´Ù.";
}
- /*! used in member documentation blocks to produce a list of
+ /*! used in member documentation blocks to produce a list of
* members that are hidden by this one.
*/
virtual QCString trReimplementedFromList(int numEntries)
@@ -700,7 +759,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
result+="¸µÅ©µµ ÀÖ½À´Ï´Ù.";
return result;
}
- /*! 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 namespaces.
*/
virtual QCString trNamespaceIndex()
@@ -720,7 +779,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
* namespaces in a file.
*/
virtual QCString trNamespaces()
- { return "namespace"; }
+ { return "Namespaces"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990728
@@ -769,7 +828,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
virtual QCString trMainPage()
{ return "¸ÞÀÎ ÆäÀÌÁö"; }
- /*! This is used in references to page that are put in the LaTeX
+ /*! This is used in references to page that are put in the LaTeX
* documentation. It should be an abbreviation of the word page.
*/
virtual QCString trPageAbbreviation()
@@ -875,7 +934,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
//////////////////////////////////////////////////////////////////////////
// new since 1.1.0
//////////////////////////////////////////////////////////////////////////
-
+
virtual QCString trNote()
{
return "³ëÆ®";
@@ -965,7 +1024,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
return "Since"; // TODO: Need to be translated. -ryk11/22/01.
}
-
+
//////////////////////////////////////////////////////////////////////////
// new since 1.1.5
//////////////////////////////////////////////////////////////////////////
@@ -975,7 +1034,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
return "¹ü·Ê";
}
- /*! page explaining how the dot graph's should be interpreted
+ /*! page explaining how the dot graph's should be interpreted
* The %A in the text below are to prevent link to classes called "A".
*/
virtual QCString trLegendDocs()
@@ -1063,11 +1122,11 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
return "¹ü·Ê";
}
-
+
//////////////////////////////////////////////////////////////////////////
// new since 1.2.0
//////////////////////////////////////////////////////////////////////////
-
+
/*! Used as a marker that is put before a test item */
virtual QCString trTest()
{
@@ -1156,11 +1215,11 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
return "°ª:"; // TODO: Need to be translated. -ryk11/22/01.
}
-
+
//////////////////////////////////////////////////////////////////////////
// new since 1.2.5
//////////////////////////////////////////////////////////////////////////
-
+
/*! Used as a marker that is put before a \\bug item */
virtual QCString trBug()
{
@@ -1176,9 +1235,9 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
// new since 1.2.6
//////////////////////////////////////////////////////////////////////////
- /*! Used as ansicpg for RTF file
- *
- * The following table shows the correlation of Charset name, Charset Value and
+ /*! Used as ansicpg for RTF file
+ *
+ * The following table shows the correlation of Charset name, Charset Value and
* <pre>
* Codepage number:
* Charset Name Charset Value(hex) Codepage number
@@ -1199,20 +1258,20 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
* GB2313_CHARSET 134 (x86) 936
* CHINESEBIG5_CHARSET 136 (x88) 950
* </pre>
- *
+ *
*/
virtual QCString trRTFansicp()
{
- return "1252";
+ return "949";
}
+
-
- /*! Used as ansicpg for RTF fcharset
+ /*! Used as ansicpg for RTF fcharset
* \see trRTFansicp() for a table of possible values.
*/
virtual QCString trRTFCharSet()
{
- return "0";
+ return "129";
}
/*! Used as header RTF general index */
@@ -1220,9 +1279,9 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
{
return "À妽º"; // TODO: Need to be translated. -ryk11/22/01.
}
-
+
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trClass(bool first_capital, bool singular)
@@ -1233,7 +1292,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
}
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trFile(bool first_capital, bool singular)
@@ -1244,18 +1303,18 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
}
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trNamespace(bool first_capital, bool singular)
- {
+ {
QCString result((first_capital ? "Namespace" : "namespace"));
if (!singular) result+="s";
return result; // TODO: Need to be translated. -ryk11/22/01.
}
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trGroup(bool first_capital, bool singular)
@@ -1266,7 +1325,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
}
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trPage(bool first_capital, bool singular)
@@ -1277,7 +1336,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
}
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trMember(bool first_capital, bool singular)
@@ -1286,9 +1345,9 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
if (!singular) result+="µé";
return result; // TODO: Need to be translated. -ryk11/22/01.
}
-
+
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trField(bool first_capital, bool singular)
@@ -1299,11 +1358,11 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
}
/*! This is used for translation of the word that will possibly
- * be followed by a single name or by a list of names
+ * be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trGlobal(bool first_capital, bool singular)
- {
+ {
QCString result((first_capital ? "Global" : "global"));
if (!singular) result+="s";
return result; // TODO: Need to be translated. -ryk11/22/01.
@@ -1337,7 +1396,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
// new since 1.2.13
//////////////////////////////////////////////////////////////////////////
- /*! used in member documentation blocks to produce a list of
+ /*! used in member documentation blocks to produce a list of
* members that are implemented by this one.
*/
virtual QCString trImplementedFromList(int numEntries)
@@ -1371,8 +1430,8 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
// new since 1.2.17
//////////////////////////////////////////////////////////////////////////
- /*! Used as the header of the list of item that have been
- * flagged deprecated
+ /*! Used as the header of the list of item that have been
+ * flagged deprecated
*/
virtual QCString trDeprecatedList()
{
@@ -1383,7 +1442,7 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
// new since 1.2.18
//////////////////////////////////////////////////////////////////////////
- /*! Used as a header for declaration section of the events found in
+ /*! Used as a header for declaration section of the events found in
* a C# program
*/
virtual QCString trEvents()
@@ -1401,50 +1460,50 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
//////////////////////////////////////////////////////////////////////////
/*! Used as a heading for a list of Java class types with package scope.
- */
+ */
virtual QCString trPackageTypes()
{
return "ÆÐÅ°Áö ŸÀÔµé"; //"Package Types";
}
- /*! Used as a heading for a list of Java class functions with package
- * scope.
- */
+ /*! Used as a heading for a list of Java class functions with package
+ * scope.
+ */
virtual QCString trPackageMembers()
{
return "ÆÐÅ°Áö ÇÔ¼öµé"; //"Package Functions";
}
- /*! Used as a heading for a list of static Java class functions with
- * package scope.
- */
+ /*! Used as a heading for a list of static Java class functions with
+ * package scope.
+ */
virtual QCString trStaticPackageMembers()
{
return "Á¤Àû ÆÐÅ°Áö ÇÔ¼öµé"; //"Static Package Functions";
}
- /*! Used as a heading for a list of Java class variables with package
- * scope.
- */
+ /*! Used as a heading for a list of Java class variables with package
+ * scope.
+ */
virtual QCString trPackageAttribs()
{
return "ÆÐÅ°Áö ¼Ó¼ºµé"; //"Package Attributes";
}
- /*! Used as a heading for a list of static Java class variables with
- * package scope.
- */
+ /*! Used as a heading for a list of static Java class variables with
+ * package scope.
+ */
virtual QCString trStaticPackageAttribs()
{
return "Á¤Àû ÆÐÅ°Áö ¼Ó¼ºµé"; //"Static Package Attributes";
}
-
+
//////////////////////////////////////////////////////////////////////////
// new since 1.3.1
//////////////////////////////////////////////////////////////////////////
- /*! Used in the quick index of a class/file/namespace member list page
- * to link to the unfiltered list of all members.
- */
+ /*! Used in the quick index of a class/file/namespace member list page
+ * to link to the unfiltered list of all members.
+ */
virtual QCString trAll()
{
- return "All";
+ return "¸ðµÎ";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
@@ -1452,33 +1511,34 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
return "´ÙÀ½Àº ÀÌ ÇÔ¼ö¿¡ ´ëÇÑ È£Ãâ ±×·¡ÇÁÀÔ´Ï´Ù:";
//"Here is the call graph for this function:";
}
+
//////////////////////////////////////////////////////////////////////////
// new since 1.3.3
//////////////////////////////////////////////////////////////////////////
- /*! When the search engine is enabled this text is put in the header
- * of each page before the field where one can enter the text to search
- * for.
- */
+ /*! When the search engine is enabled this text is put in the header
+ * of each page before the field where one can enter the text to search
+ * for.
+ */
virtual QCString trSearchForIndex()
{
return "°Ë»ö: "; //"Search for";
}
/*! This string is used as the title for the page listing the search
- * results.
- */
+ * results.
+ */
virtual QCString trSearchResultsTitle()
{
return "°Ë»ö °á°ú";//"Search Results";
}
/*! This string is put just before listing the search results. The
- * text can be different depending on the number of documents found.
- * Inside the text you can put the special marker $num to insert
- * the number representing the actual number of search results.
- * The @a numDocuments parameter can be either 0, 1 or 2, where the
- * value 2 represents 2 or more matches. HTML markup is allowed inside
- * the returned string.
- */
+ * text can be different depending on the number of documents found.
+ * Inside the text you can put the special marker $num to insert
+ * the number representing the actual number of search results.
+ * The @a numDocuments parameter can be either 0, 1 or 2, where the
+ * value 2 represents 2 or more matches. HTML markup is allowed inside
+ * the returned string.
+ */
virtual QCString trSearchResults(int numDocuments)
{
if (numDocuments==0)
@@ -1499,13 +1559,74 @@ class TranslatorKorean : public TranslatorAdapter_1_3_8
"óÀ½¿¡ ³ª¿À´Â °ÍÀÌ °¡Àå ÀÏÄ¡ÇÏ´Â ¹®¼­ÀÔ´Ï´Ù.";
}
}
- /*! This string is put before the list of matched words, for each search
- * result. What follows is the list of words that matched the query.
- */
+ /*! This string is put before the list of matched words, for each search
+ * result. What follows is the list of words that matched the query.
+ */
virtual QCString trSearchMatches()
{
- return "Matches:";
+ return "°á°ú:";
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.8
+//////////////////////////////////////////////////////////////////////////
+
+ /*! This is used in HTML as the title of page with source code for file filename
+ */
+ virtual QCString trSourceFile(QCString& filename)
+ {
+ return filename + " ¼Ò½º ÆÄÀÏ";
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.9
+//////////////////////////////////////////////////////////////////////////
+
+ /*! This is used as the name of the chapter containing the directory
+ * hierarchy.
+ */
+ virtual QCString trDirIndex()
+ { return "µð·ºÅ丮 °èÃþµµ"; }
+
+ /*! This is used as the name of the chapter containing the documentation
+ * of the directories.
+ */
+ virtual QCString trDirDocumentation()
+ { return "µð·ºÅ丮 ¹®¼­"; }
+
+ /*! This is used as the title of the directory index and also in the
+ * Quick links of a HTML page, to link to the directory hierarchy.
+ */
+ virtual QCString trDirectories()
+ { return "µð·ºÅ丮"; }
+
+ /*! This returns a sentences that introduces the directory hierarchy.
+ * and the fact that it is sorted alphabetically per level
+ */
+ virtual QCString trDirDescription()
+ { return "ÀÌ µð·ºÅ丮 °èÃþÀº ¾ËÆĺª ¼øÀ¸·Î Á¤·ÄµÇ¾îÀÖ½À´Ï´Ù. (¿ÏÀüÇÏÁö´Â ¾ÊÀ½)";
+
+
}
+
+ /*! This returns the title of a directory page. The name of the
+ * directory is passed via \a dirName.
+ */
+ virtual QCString trDirReference(const char *dirName)
+ { QCString result=dirName; result+=" µð·ºÅ丮 ÂüÁ¶"; return result; }
+
+ /*! This returns the word directory with or without starting capital
+ * (\a first_capital) and in sigular or plural form (\a singular).
+ */
+ virtual QCString trDir(bool /*first_capital*/, bool /*singular*/)
+ {
+ // QCString result((first_capital ? "Director" : "director"));
+ // if (singular) result+="y"; else result+="ies";
+
+ // return result;
+ return "µð·ºÅÍ";
+ }
+
};
#endif
diff --git a/src/util.cpp b/src/util.cpp
index 8f8c835..bf30aff 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3372,7 +3372,7 @@ bool resolveRef(/* in */ const char *scName,
return FALSE;
}
- //printf("scName=%s name=%s\n",scName,fullName.data());
+ //printf("scName=%s fullName=%s\n",scName,fullName.data());
// check if this is a class or namespace reference
if (scName!=fullName && getScopeDefs(scName,fullName,cd,nd))
@@ -3388,15 +3388,17 @@ bool resolveRef(/* in */ const char *scName,
}
return TRUE;
}
- else if (scName==fullName || (!inSeeBlock && scopePos==-1)) // nothing to link => output plain text
+ else if (scName==fullName || (!inSeeBlock && scopePos==-1))
+ // nothing to link => output plain text
{
+ //printf("found scName=%s fullName=%s scName==fullName=%d "
+ // "inSeeBlock=%d scopePos=%d!\n",
+ // scName,fullName.data(),scName==fullName,inSeeBlock,scopePos);
return FALSE;
}
// continue search...
}
- //printf("scopeContext=%s scopeUser=%s\n",scopeContext.data(),scopeUser.data());
-
// extract userscope+name
QCString nameStr=fullName.left(endNamePos);
@@ -3561,7 +3563,7 @@ bool resolveLink(/* in */ const char *scName,
*resContext=0;
QCString linkRef=lr;
- printf("ResolveLink linkRef=%s\n",lr);
+ //printf("ResolveLink linkRef=%s\n",lr);
FileDef *fd;
GroupDef *gd;
PageDef *pd;