summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL4
-rw-r--r--README4
-rw-r--r--VERSION2
-rw-r--r--doc/config.doc4
-rw-r--r--doc/language.doc10
-rw-r--r--doc/trouble.doc7
-rw-r--r--packages/rpm/doxygen.spec2
-rw-r--r--src/config.l6
-rw-r--r--src/docparser.cpp4
-rw-r--r--src/doctokenizer.h2
-rw-r--r--src/doctokenizer.l10
-rw-r--r--src/language.cpp6
-rw-r--r--src/rtfdocvisitor.cpp7
-rw-r--r--src/scanner.l2
-rw-r--r--src/translator_ca.h9
-rw-r--r--src/translator_jp.h15
-rw-r--r--src/translator_sr.h3
17 files changed, 63 insertions, 34 deletions
diff --git a/INSTALL b/INSTALL
index 15e5d56..9bec971 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.17-20020915
+DOXYGEN Version 1.2.18
Please read the installation section of the manual for instructions.
--------
-Dimitri van Heesch (15 September 2002)
+Dimitri van Heesch (18 September 2002)
diff --git a/README b/README
index ef80b4e..a41c386 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.17_20020915
+DOXYGEN Version 1.2.18
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) (15 September 2002)
+Dimitri van Heesch (dimitri@stack.nl) (18 September 2002)
diff --git a/VERSION b/VERSION
index 6ab16e8..591bdbc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.17-20020915
+1.2.18
diff --git a/doc/config.doc b/doc/config.doc
index 974f7f4..ab0da8e 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -1148,14 +1148,14 @@ EXTRA_PACKAGES = times
\anchor cfg_xml_schema
<dt>\c XML_SCHEMA <dd>
\addindex XML_SCHEMA
- The XML_SCHEMA file can be used to specify an XML schema,
+ The XML_SCHEMA tag can be used to specify an XML schema,
which can be used by a validating XML parser to check the
syntax of the XML files.
\anchor cfg_xml_dtd
<dt>\c XML_DTD <dd>
\addindex XML_DTD
- The XML_DTD file can be used to specify an XML DTD,
+ The XML_DTD tag can be used to specify an XML DTD,
which can be used by a validating XML parser to check the
syntax of the XML files.
diff --git a/doc/language.doc b/doc/language.doc
index 5f259fa..430de07 100644
--- a/doc/language.doc
+++ b/doc/language.doc
@@ -25,7 +25,7 @@ Doxygen has built-in support for multiple languages. This means
that the text fragments that doxygen generates can be produced in
languages other than English (the default) at configuration time.
-Currently (version 1.2.14-20020317), 28 languages
+Currently (version 1.2.18), 28 languages
are supported (sorted alphabetically):
Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian,
Czech, Danish, Dutch, English, Finnish,
@@ -61,7 +61,7 @@ when the translator was updated.
<TD>Catalan</TD>
<TD>Albert Mora</TD>
<TD>amora@NOSPAM.iua.upf.es</TD>
- <TD>up-to-date</TD>
+ <TD>1.2.17</TD>
</TR>
<TR BGCOLOR="#ffffff">
<TD>Chinese</TD>
@@ -145,7 +145,7 @@ when the translator was updated.
<TD>Japanese</TD>
<TD>Ryunosuke Sato<br>Kenji Nagamatsu</TD>
<TD>puyo@NOSPAM.mint.freemail.ne.jp<br>naga@NOSPAM.joyful.club.ne.jp</TD>
- <TD>1.2.17</TD>
+ <TD>up-to-date</TD>
</TR>
<TR BGCOLOR="#ffffff">
<TD>Korean</TD>
@@ -232,7 +232,7 @@ when the translator was updated.
\hline
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt chino@icmc.sc.usp.br} & up-to-date \\
\hline
- Catalan & Albert Mora & {\tt amora@iua.upf.es} & up-to-date \\
+ Catalan & Albert Mora & {\tt amora@iua.upf.es} & 1.2.17 \\
\hline
Chinese & Wei Liu & {\tt liuwei@asiainfo.com} & 1.2.13 \\
& Wang Weihan & {\tt wangweihan@capinfo.com.cn} & \\
@@ -263,7 +263,7 @@ when the translator was updated.
Italian & Alessandro Falappa & {\tt alessandro@falappa.net} & up-to-date \\
& Ahmed Aldo Faisal & {\tt aaf23@cam.ac.uk} & \\
\hline
- Japanese & Ryunosuke Sato & {\tt puyo@mint.freemail.ne.jp} & 1.2.17 \\
+ Japanese & Ryunosuke Sato & {\tt puyo@mint.freemail.ne.jp} & up-to-date \\
& Kenji Nagamatsu & {\tt naga@joyful.club.ne.jp} & \\
\hline
Korean & Richard Kim & {\tt ryk@dspwiz.com} & 1.2.13 \\
diff --git a/doc/trouble.doc b/doc/trouble.doc
index fbfe36b..fd695e2 100644
--- a/doc/trouble.doc
+++ b/doc/trouble.doc
@@ -101,9 +101,14 @@ Always try to include the following information in your bug report:
actual bug!).
If you send only a (vague) description of a bug, you are usually not very
-helpful and will costs me much more time to figure out what you mean.
+helpful and it will cost me much more time to figure out what you mean.
In the worst-case your bug report may even be completely ignored by me!
My e-mail address: dimitri@stack.nl
+
+Note that you can also post bug report to the developers mailing list
+or use the bug tracker at sourceforge (though I do not really like the
+latter because of its web interface).
+
*/
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 034ada1..ff621d6 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.2.17_20020915
+Version: 1.2.18
Release: 1
Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
diff --git a/src/config.l b/src/config.l
index 088c126..daf461d 100644
--- a/src/config.l
+++ b/src/config.l
@@ -2166,16 +2166,18 @@ void Config::create()
);
cs = addString(
"XML_SCHEMA",
- "The XML_SCHEMA file can be used to specify an XML schema, \n"
+ "The XML_SCHEMA tag can be used to specify an XML schema, \n"
"which can be used by a validating XML parser to check the \n"
"syntax of the XML files. \n"
);
+ cs->addDependency("GENERATE_XML");
cs = addString(
"XML_DTD",
- "The XML_DTD file can be used to specify an XML DTD, \n"
+ "The XML_DTD tag can be used to specify an XML DTD, \n"
"which can be used by a validating XML parser to check the \n"
"syntax of the XML files. \n"
);
+ cs->addDependency("GENERATE_XML");
//--------------------------------------------------------------------------
addInfo( "DEF","configuration options for the AutoGen Definitions output");
//--------------------------------------------------------------------------
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 415e9cd..14968e7 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -860,7 +860,7 @@ static int internalValidatingParseDoc(DocNode *parent,QList<DocNode> &children,
{
int retval = RetVal_OK;
- doctokenizerYYinit(doc);
+ doctokenizerYYinit(doc,g_fileName);
// first parse any number of paragraphs
bool isFirst=FALSE;
@@ -4043,7 +4043,7 @@ DocNode *validatingParseDoc(const char *fileName,int startLine,
g_paramsFound.clear();
doctokenizerYYlineno=startLine;
- doctokenizerYYinit(input);
+ doctokenizerYYinit(input,g_fileName);
// build abstract syntax tree
DocRoot *root = new DocRoot;
diff --git a/src/doctokenizer.h b/src/doctokenizer.h
index 7bda1b0..07b6324 100644
--- a/src/doctokenizer.h
+++ b/src/doctokenizer.h
@@ -107,7 +107,7 @@ extern FILE *doctokenizerYYin;
const char *tokToString(int token);
// operations on the scanner
-void doctokenizerYYinit(const char *input);
+void doctokenizerYYinit(const char *input,const char *fileName);
void doctokenizerYYcleanup();
void doctokenizerYYpushContext();
bool doctokenizerYYpopContext();
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 1ec3e44..9962e52 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -26,6 +26,7 @@
#include "doctokenizer.h"
#include "cmdmapper.h"
#include "config.h"
+#include "message.h"
#define YY_NEVER_INTERACTIVE 1
@@ -35,6 +36,7 @@ static int g_commentState;
TokenInfo *g_token = 0;
static int g_inputPos = 0;
static const char *g_inputString;
+static QCString g_fileName;
struct DocLexerContext
{
@@ -265,7 +267,6 @@ HTMLTAG "<"(("/")?){ID}({BLANK}+{ATTRIB})*">"
%x St_IntRef
%%
- /* TODO: \~lang_id */
<St_Para>\r /* skip carriage return */
<St_Para>^{LISTITEM} { /* list item */
QCString text=yytext;
@@ -585,19 +586,20 @@ HTMLTAG "<"(("/")?){ID}({BLANK}+{ATTRIB})*">"
<St_Comment>[^-\n]+ /* inside html comment */
<St_Comment>. /* inside html comment */
<*>\n {
- printf("Error: Unexpected new line character at line %d\n",yylineno);
+ warn(g_fileName,yylineno,"Error: Unexpected new line character");
}
<*>. {
- printf("Error: Unexpected character `%s' at line %d\n",yytext,yylineno);
+ warn(g_fileName,yylineno,"Error: Unexpected character `%s'",yytext);
}
%%
//--------------------------------------------------------------------------
-void doctokenizerYYinit(const char *input)
+void doctokenizerYYinit(const char *input,const char *fileName)
{
g_inputString = input;
g_inputPos = 0;
+ g_fileName = fileName;
BEGIN(St_Para);
}
diff --git a/src/language.cpp b/src/language.cpp
index 28ed750..85f5858 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -279,6 +279,12 @@ bool setTranslator(const char *langName)
theTranslator=new TranslatorSerbian;
}
#endif
+#ifdef LANG_CA
+ else if (L_EQUAL("catalan"))
+ {
+ theTranslator=new TranslatorCatalan;
+ }
+#endif
// else if (L_EQUAL("japanese-sjis"))
// {
// theTranslator=new TranslatorJapaneseSjis;
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index 48f202c..40f3398 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -443,6 +443,7 @@ void RTFDocVisitor::visitPre(DocSimpleSect *s)
{
m_t << "{"; // start desc
m_t << "{\\b "; // start bold
+ m_t << "\\par" << endl;
switch(s->type())
{
case DocSimpleSect::See:
@@ -956,7 +957,7 @@ void RTFDocVisitor::visitPre(DocXRefItem *x)
{
filter(x->title());
}
- m_t << "}"; // end bold
+ m_t << ":}"; // end bold
m_t << "\\par" << endl;
incIndentLevel();
m_t << rtf_Style_Reset << getStyle("DescContinue");
@@ -964,7 +965,9 @@ void RTFDocVisitor::visitPre(DocXRefItem *x)
void RTFDocVisitor::visitPost(DocXRefItem *)
{
- m_t << "}" << endl; // end param list
+ m_t << "\\par" << endl;
+ decIndentLevel();
+ m_t << "}" << endl; // end xref item
}
void RTFDocVisitor::visitPre(DocInternalRef *ref)
diff --git a/src/scanner.l b/src/scanner.l
index d4754fa..1d7eec8 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4295,7 +4295,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
<Doc,ClassDoc,PageDoc,ExampleDoc,AfterDoc>"\\"[a-z_A-Z][a-z_A-Z0-9]*[\\] { // directory type of text
current->doc+=yytext;
}
-<Doc,ClassDoc,PageDoc,ExampleDoc,AfterDoc,CopyArgComment>{CMD}[a-z_A-Z][a-z_A-Z0-9]* {
+<Doc,ClassDoc,PageDoc,ExampleDoc,AfterDoc,CopyArgComment,SkipSection>{CMD}[a-z_A-Z][a-z_A-Z0-9]* {
bool handled=FALSE;
if ( useOverrideCommands)
{
diff --git a/src/translator_ca.h b/src/translator_ca.h
index 51c5969..e00aec9 100644
--- a/src/translator_ca.h
+++ b/src/translator_ca.h
@@ -39,7 +39,7 @@
// Translator class (by the local maintainer) when the localized
// translator is made up-to-date again.
-class TranslatorCatalan : public Translator
+class TranslatorCatalan : public TranslatorAdapter_1_2_17
{
public:
@@ -309,12 +309,12 @@ class TranslatorCatalan : public Translator
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="totes les funcions, variables, definicions, enumeracions, i definicions de tipus";
- if (!extractAll) result+="documentades ";
+ if (!extractAll) result+="documentades ";
}
else
{
result+="tots els membres de l'arxiu";
- if (!extractAll) result+="documentat ";
+ if (!extractAll) result+="documentat ";
}
result+=" amb enllaços ";
if (extractAll)
@@ -1091,7 +1091,7 @@ class TranslatorCatalan : public Translator
"<li>Una sageta puntejada de color porpra indica que una classe és continguda o usada per una altra classe."
" La sageta s'etiqueta amb la variable o variables a través de les quals la classe o estructura apuntada és accessible.\n"
"<li>Una sageta puntejada de color groc indica la relació entre una instància template i la classe template de què ha set instanciada."
- " La sageta s'etiqueta amb els paràmetres template de la instància.\n"
+ " La sageta s'etiqueta amb els paràmetres template de la instància.\n"
"</ul>\n";
}
/*! text for the link to the legend page */
@@ -1399,7 +1399,6 @@ class TranslatorCatalan : public Translator
{
return "Taula de Continguts";
}
-
};
#endif
diff --git a/src/translator_jp.h b/src/translator_jp.h
index ab6a10a..52c9d9b 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -61,7 +61,7 @@ class TranslatorJapaneseEn : public TranslatorEnglish
}
};
-class TranslatorJapanese : public TranslatorAdapter_1_2_17
+class TranslatorJapanese : public Translator
{
private:
/*! The decode() can change euc into sjis */
@@ -1375,6 +1375,17 @@ class TranslatorJapanese : public TranslatorAdapter_1_2_17
{
return decode("Ìܼ¡");
}
-};
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.17
+//////////////////////////////////////////////////////////////////////////
+
+ /*! Used as the header of the list of item that have been
+ * flagged deprecated
+ */
+ virtual QCString trDeprecatedList()
+ {
+ return "Èó¿ä¾©°ìÍ÷";
+ }
+};
#endif
diff --git a/src/translator_sr.h b/src/translator_sr.h
index 1934084..17c0757 100644
--- a/src/translator_sr.h
+++ b/src/translator_sr.h
@@ -22,7 +22,8 @@
class TranslatorSerbian : public TranslatorAdapter_1_2_17
{
- QCString decode(const QCString& sInput)
+private:
+ QCString decode(const QCString& sInput)
{
#ifdef _WIN32
return ISO88592ToWin1250(sInput);
generated by cgit v0.12 at 2024-07-05 02:14:15 (GMT)