Release-1.2.18

10 files changed, 44 insertions, 20 deletions

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);