Release-1.4.1-20050129

INSTALL

-DOXYGEN Version 1.4.1
+DOXYGEN Version 1.4.1-20050129
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (09 January 2005)
+Dimitri van Heesch (29 January 2005)

Makefile.in

@@ -44,11 +44,17 @@ distclean: clean
 	-rm -f addon/doxywizard/moc/moc_*
 	-rm -f addon/doxywizard/config.cpp
 
+DATE=$(shell date "+%B %Y")
 
 install: doxywizard_install 
 	$(INSTTOOL) -d $(INSTALL)/bin
 	$(INSTTOOL) -m 755 bin/doxygen    $(INSTALL)/bin
 	$(INSTTOOL) -m 755 bin/doxytag    $(INSTALL)/bin
+	$(INSTTOOL) -d $(INSTALL)/man/man1
+	cat doc/doxygen.1    | sed -e "s/DATE/\$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/man/man1/doxygen.1 ; \
+	cat doc/doxytag.1    | sed -e "s/DATE/\$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/man/man1/doxytag.1 ; \
+	cat doc/doxywizard.1 | sed -e "s/DATE/\$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/man/man1/doxywizard.1 ;
+
 
 install_docs: install
 	$(INSTTOOL) -d $(DOCDIR)

README

-DOXYGEN Version 1.4.1
+DOXYGEN Version 1.4.1_20050129
 
 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) (09 January 2005)
+Dimitri van Heesch (dimitri@stack.nl) (29 January 2005)

VERSION

-1.4.1
+1.4.1-20050129

doc/arch.doc

@@ -216,10 +216,10 @@ if (open(F,"<Makefile.libdoxygen.old")) {
   }
   print "Processing Makefile.libdoxygen...\n";
   while (<F>) {
-    if ( s/\(LEX\) -P([a-z]+)YY -t $file/(LEX) -d -P\1YY -t $file/g ) {
+    if ( s/\(LEX\) -P([a-zA-Z]+)YY -t $file/(LEX) -d -P\1YY -t $file/g ) {
       print "Enabling debug info for $file\n";
     }
-    elsif ( s/\(LEX\) -d -P([a-z]+)YY -t $file/(LEX) -P\1YY -t $file/g ) {
+    elsif ( s/\(LEX\) -d -P([a-zA-Z]+)YY -t $file/(LEX) -P\1YY -t $file/g ) {
       print "Disabling debug info for $file\n";
     }
     print G "$_";

doc/doxygen.1

+.TH DOXYGEN "1" "DATE" "doxygen VERSION" "User Commands"
+.SH NAME
+doxygen \- manual page for doxygen VERSION
+.SH DESCRIPTION
+Doxygen version VERSION
+Copyright Dimitri van Heesch 1997-2005
+.PP
+You can use doxygen in a number of ways:
+.TP
+1) Use doxygen to generate a template configuration file:
+.IP
+doxygen [-s] \fB\-g\fR [configName]
+.IP
+If - is used for configName doxygen will write to standard output.
+.TP 
+2) Use doxygen to update an old configuration file:
+.IP
+doxygen [-s] \fB\-u\fR [configName]
+.TP
+3) Use doxygen to generate documentation using an existing configuration file:
+.IP
+doxygen [configName]
+.IP
+If - is used for configName doxygen will read from standard input.
+.TP
+4) Use doxygen to generate a template style sheet file for RTF, HTML or Latex.
+.TP
+RTF:
+doxygen \fB\-w\fR rtf styleSheetFile
+.TP
+HTML:
+doxygen \fB\-w\fR html headerFile footerFile styleSheetFile [configFile]
+.TP
+LaTeX: doxygen \fB\-w\fR latex headerFile styleSheetFile [configFile]
+.TP
+5) Use doxygen to generate an rtf extensions file
+.TP
+RTF:
+doxygen \fB\-e\fR rtf extensionsFile
+.PP
+If \fB\-s\fR is specified the comments in the config file will be omitted.
+If configName is omitted `Doxyfile' will be used as a default.
+.SH SEE ALSO
+doxytag(1), doxywizard(1).

doc/doxytag.1

+.TH DOXYTAG "1" "DATE" "doxytag VERSION" "User Commands"
+.SH NAME
+doxytag \- generates a tag file and/or a search index for a set of HTML files
+.SH SYNOPSIS
+.B doxytag
+[\fI-t tag_file\fR] [\fI-s index_file\fR] [ \fIhtml_file \fR[\fIhtml_file\fR...] ]
+.SH DESCRIPTION
+Generates a tag file and/or a search index for a set of HTML files.  Use
+doxysearch as a CGI program to search the tag file generated by doxytag.
+.SH OPTIONS
+.TP
+\fB\-t\fR <tag_file>
+Generate tag file <tag_file>.
+.TP
+\fB\-s\fR <index_file> Generate search index <index_file>.
+.PP
+If no HTML files are given all files in the current dir that
+have a .html extension are parsed.
+.SH SEE ALSO
+doxygen(1), doxywizard(1).

doc/doxywizard.1

+.TH DOXYWIZARD "1" "DATE" "doxywizard VERSION" "User Commands"
+.SH NAME
+doxywizard \- a tool to configure and run doxygen on your source files
+.SH SYNOPSIS
+.B doxywizard
+.SH DESCRIPTION
+Doxywizard is an interactive frontend to the doxygen tool to configure
+and run doxygen on your source files.
+.SH SEE ALSO
+doxygen(1), doxytag(1).

doc/faq.doc

@@ -63,7 +63,7 @@ PREDEFINED             = MY_MACRO()=
   </ol> 
 
 <li><b>When I set EXTRACT_ALL to NO none of my functions are shown in the 
-    documentation.</b></li>
+    documentation.</b>
 
 In order for global functions, variables, enums, typedefs, and defines 
 to be documented you should document the file in which these commands are
@@ -78,7 +78,6 @@ For member functions or functions that are part of a namespace you should
 document either the class or namespace.
  
 <li><b>How can I make doxygen ignore some code fragment?</b>
-<p>
 
 The new and easiest way is to add one comment block 
 with a \ref cmdcond "\\cond" command at the start and one comment block 

doc/language.doc

@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
 than English (the default). The output language is chosen through the
 configuration file (with default name and known as Doxyfile).
 
-Currently (version 1.4.0), 30 languages 
+Currently (version 1.4.1), 30 languages 
 are supported (sorted alphabetically):
 Afrikaans, Brazilian Portuguese, Catalan, Chinese, Chinese
 Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,

doc/output.doc

@@ -14,7 +14,7 @@
  * input used in their production; they are not affected by this license.
  *
  */
-/*! \page output.html
+/*! \page output.html Output Formats
 
 \section output Output Formats
 

doc/translator_report.txt

-(1.4.0)
+(1.4.1)
 
 Doxygen supports the following 30 languages (sorted alphabetically):
 

packages/rpm/doxygen.spec

 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.4.1
+Version: 1.4.1_20050129
 Release: 1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz

src/code.l

@@ -2394,10 +2394,17 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
 					  g_theCallContext.setClass(0);
   					  g_code->codify(yytext);
   					  if (--g_bracketCount<=0) 
+					  {
+					    if (g_name.isEmpty())
+					    {
+					      BEGIN( Body );
+					    }
+					    else
 					    {
 					      BEGIN( CallEnd ); 
 					    }
 					  }
+					}
 <CallEnd>[ \t\n]*			{ codifyLines(yytext); }
   /*
 <MemberCall2,FuncCall>")"[ \t\n]*[;:]	{

src/commentscan.h

+/******************************************************************************
+ *
+ * Copyright (C) 1997-2005 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 COMMENTSCAN_H
+#define COMMENTSCAN_H
+
+#include "qtbc.h"
+#include "entry.h"
+
+bool parseCommentBlock(/* in,out */ Entry *curEntry,
+                       /* in */     const QCString &comment,
+		       /* in */     const QCString &fileName,
+		       /* in */     int lineNr,
+		       /* in */     bool isBrief,
+		       /* in */     bool isJavaDocStyle,
+		       /* in,out */ Protection &prot
+		      );
+
+#endif

src/doctokenizer.l

@@ -308,9 +308,11 @@ OPMASK    ({BLANK}*{OPNORM}{FUNCARG})|({OPCAST}{FUNCARG})
 LNKWORD1  ("::"|"#")?{SCOPEMASK}
 CVSPEC    {BLANK}*("const"|"volatile")
 LNKWORD2  {SCOPEPRE}*"operator"{OPMASK}
-WORD1     [^ \t\n\r\\@<>()\[\]:;\?{}&$#,.]+|"{"|"}"|("\""[^"\n]*"\"")
+CHARWORD  [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,.]
+CHARWORDQ [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,."]
+WORD1     "%"?{CHARWORD}+|"{"|"}"|("\""[^"\n]*"\"")
 WORD2     "."|","|"("|")"|"["|"]"|":"|";"|"\?"
-WORD1NQ   [^ \t\n\r\\@<>()\[\]:;\?{}&$#,."]+ 
+WORD1NQ   "%"?{CHARWORDQ}+
 WORD2NQ   "."|","|"("|")"|"["|"]"|":"|";"|"\?"
 HTMLTAG   "<"(("/")?){ID}({WS}+{ATTRIB})*{WS}*">" 
 HTMLKEYL  "strong"|"center"|"table"|"caption"|"small"|"code"|"dfn"|"var"|"img"|"pre"|"sub"|"sup"|"tr"|"td"|"th"|"ol"|"ul"|"li"|"tt"|"kbd"|"em"|"hr"|"dl"|"dt"|"dd"|"br"|"i"|"a"|"b"|"p"

src/dot.cpp

@@ -569,6 +569,7 @@ static QCString convertLabel(const QCString &l)
       case '<':  result+="\\<"; break;
       case '>':  result+="\\>"; break;
       case '|':  result+="\\|"; break;
+      case '"':  result+="\\\""; break;
       default:   result+=c; break;
     }
   }

src/doxygen.cpp

@@ -7839,7 +7839,7 @@ static const char *getArg(int argc,char **argv,int &optind)
 
 //----------------------------------------------------------------------------
 
-//extern void commentScanTest();
+extern void commentScanTest();
 
 void initDoxygen()
 {
@@ -7868,8 +7868,6 @@ void initDoxygen()
   Doxygen::lookupCache.setAutoDelete(TRUE);
   Doxygen::directories.setAutoDelete(TRUE);
   Doxygen::dirRelations.setAutoDelete(TRUE);
-
- // commentScanTest();
 }
 
 void cleanUpDoxygen()

src/htmldocvisitor.cpp

@@ -722,7 +722,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
     }
     m_t << "<div align=\"center\">" << endl;
     m_t << "<img src=\"" << img->relPath() << img->name() << "\" alt=\"" 
-      << baseName << "\"" << htmlAttribsToString(img->attribs()) << ">" << endl;
+      << baseName << "\"" << ">" << endl;
     if (img->hasCaption())
     {
       m_t << "<p><strong>";

src/index.xsd

@@ -14,7 +14,7 @@
       <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="member" type="MemberType" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
-    <xsd:attribute name="refid" type="xsd:Name" use="required"/>
+    <xsd:attribute name="refid" type="xsd:string" use="required"/>
     <xsd:attribute name="kind" type="CompoundKind" use="required"/>
   </xsd:complexType>
 
@@ -22,7 +22,7 @@
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string"/>
     </xsd:sequence>
-    <xsd:attribute name="refid" type="xsd:Name" use="required"/>
+    <xsd:attribute name="refid" type="xsd:string" use="required"/>
     <xsd:attribute name="kind" type="MemberKind" use="required"/>
   </xsd:complexType>
   

src/index_xsd.h

@@ -14,7 +14,7 @@
 "      <xsd:element name=\"name\" type=\"xsd:string\"/>\n"
 "      <xsd:element name=\"member\" type=\"MemberType\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>\n"
 "    </xsd:sequence>\n"
-"    <xsd:attribute name=\"refid\" type=\"xsd:Name\" use=\"required\"/>\n"
+"    <xsd:attribute name=\"refid\" type=\"xsd:string\" use=\"required\"/>\n"
 "    <xsd:attribute name=\"kind\" type=\"CompoundKind\" use=\"required\"/>\n"
 "  </xsd:complexType>\n"
 "\n"
@@ -22,7 +22,7 @@
 "    <xsd:sequence>\n"
 "      <xsd:element name=\"name\" type=\"xsd:string\"/>\n"
 "    </xsd:sequence>\n"
-"    <xsd:attribute name=\"refid\" type=\"xsd:Name\" use=\"required\"/>\n"
+"    <xsd:attribute name=\"refid\" type=\"xsd:string\" use=\"required\"/>\n"
 "    <xsd:attribute name=\"kind\" type=\"MemberKind\" use=\"required\"/>\n"
 "  </xsd:complexType>\n"
 "  \n"

src/language.cpp

@@ -182,6 +182,8 @@ bool setTranslator(const char *langName)
   {
     theTranslator=new TranslatorJapanese;
   }
+#endif
+#ifdef LANG_JE
   else if (L_EQUAL("japanese-en"))
   {
     theTranslator=new TranslatorJapaneseEn;
@@ -236,6 +238,8 @@ bool setTranslator(const char *langName)
   {
     theTranslator=new TranslatorKorean;
   }
+#endif
+#ifdef LANG_KE
   else if (L_EQUAL("korean-en"))
   {
     theTranslator=new TranslatorKoreanEn;

src/libdoxygen.pro.in

@@ -22,6 +22,7 @@ HEADERS      =	bufstr.h \
                 cmdmapper.h \
                 code.h \
 		commentcnv.h \
+		commentscan.h \
                 compound_xsd.h \
                 config.h \
 		constexp.h \
@@ -183,8 +184,8 @@ SOURCES      =	ce_lex.cpp \
 		util.cpp \
 		version.cpp \
 		xmldocvisitor.cpp \
-                xmlgen.cpp 
-#		commentscan.cpp
+                xmlgen.cpp \
+		commentscan.cpp
 
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL 
 win32-msvc:TMAKE_CXXFLAGS  += -Zm200

src/pre.l

@@ -402,12 +402,12 @@ static void returnCharToStream(char c)
 static inline void addTillEndOfString(const QCString &expr,QCString *rest,
                                        uint &pos,char term,QCString &arg)
 {
-  char cc;
+  int cc;
   while ((cc=getNextChar(expr,rest,pos))!=EOF)
   {
-    if (cc=='\\') arg+=cc,cc=getNextChar(expr,rest,pos);
+    if (cc=='\\') arg+=(char)cc,cc=getNextChar(expr,rest,pos);
     else if (cc==term) return;
-    arg+=cc;
+    arg+=(char)cc;
   }
 }
 

src/scanner.h

@@ -23,7 +23,13 @@
 class OutputList;
 class Entry;
 
-extern void parseMain(Entry *);
-extern void parseMain(Entry *,const char *fileName);
+// Public interface provided by the language scanner
+void parseMain(Entry *);
+void parseMain(Entry *,const char *fileName);
+
+// Internal callback interface for comment block scanner
+void parsePrototype(const QCString &text);
+void handleGroupStartCommand(const char *header);
+void handleGroupEndCommand();
 
 #endif