Commit 939d1c84 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Release-1.3.9.1-20041224

parent f1dfb258
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)
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)
1.3.9.1-20041221
1.3.9.1-20041224
......@@ -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;
......
......@@ -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
......
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
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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))
{
......
......@@ -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())
......
......@@ -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';
}
......
......@@ -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";
}
};
......
This diff is collapsed.
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment