Merge branch 'master' of https://github.com/Cryclops/doxygen into Cry…

…clops-master

doc/dbusxml.doc

@@ -9,6 +9,11 @@ all XML comments starting with '*' or '!'.  An additional '<' can be
 used to assign the documentation string to the previous entity instead
 of the one following the comment.
 
+Doxygen will also show syntax highlighting for XML examples. Note that
+in order for XML comments to show up, you must use 2 exclamation marks
+instead of one. The extra ! will be stripped out for you. This is due
+to a conflict with Doxygen's hidden comments.
+
 Note that before the parsing of DBus XML file works one has to
 assign the .xml extension to the DBus XML parser using the
 following configuration option:

src/Makefile.in

@@ -48,6 +48,6 @@ distclean: clean
 	       ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
 	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
-	       vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp
+	       xmlcode.cpp vhdlscanner.cpp vhdlcode.cpp tclscanner.cpp
 
 FORCE:

src/dbusxmlscanner.cpp

@@ -28,6 +28,11 @@
 #include "util.h"
 #include "arguments.h"
 
+#include "outputgen.h"
+#include "memberdef.h"
+
+#include "xmlcode.h"
+
 // -----------------------------------------------------------------------
 // Convenience defines:
 // -----------------------------------------------------------------------
@@ -855,24 +860,30 @@ void DBusXMLScanner::parseInput(const char * fileName,
 bool DBusXMLScanner::needsPreprocessing(const QCString & /* extension */)
 { return (false); }
 
-void DBusXMLScanner::parseCode(CodeOutputInterface & /* codeOutIntf */,
-                               const char * /* scopeName */,
-                               const QCString & /* input */,
-                               SrcLangExt /* lang */,
-                               bool /* isExampleBlock */,
-                               const char * /* exampleName */,
-                               FileDef * /* fileDef */,
-                               int /* startLine */,
-                               int /* endLine */,
-                               bool /* inlineFragment */,
-                               MemberDef * /* memberDef */,
-                               bool /*showLineNumbers*/,
-                               Definition * /* searchCtx */,
-                               bool /*collectXRefs*/ )
-{ }
+void DBusXMLScanner::parseCode(CodeOutputInterface & codeOutIntf,
+                               const char * scopeName,
+                               const QCString & input,
+                               SrcLangExt /*lang*/,
+                               bool isExampleBlock,
+                               const char * exampleName,
+                               FileDef * fileDef,
+                               int startLine,
+                               int endLine,
+                               bool inlineFragment,
+                               MemberDef * memberDef,
+                               bool showLineNumbers,
+                               Definition * searchCtx,
+                               bool collectXRefs )
+{      
+      parseXmlCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
+                    fileDef,startLine,endLine,inlineFragment,memberDef,
+                    showLineNumbers,searchCtx,collectXRefs);
+}
 
 void DBusXMLScanner::resetCodeParserState()
-{ }
+{
+    resetXmlCodeParserState();
+}
 
 void DBusXMLScanner::parsePrototype(const char * /* text */)
 { }

src/libdoxygen.pro.in

@@ -122,6 +122,7 @@ HEADERS      =	arguments.h \
                 xmlgen.h \
                 docbookvisitor.h \
                 docbookgen.h \
+            xmlcode.h \
 		vhdljjparser.h 
 
 
@@ -217,6 +218,7 @@ SOURCES      =	arguments.cpp \
                 ../generated_src/doxygen/doctokenizer.cpp \
 		../generated_src/doxygen/pre.cpp \
 		../generated_src/doxygen/pycode.cpp \
+		../generated_src/doxygen/xmlcode.cpp \
 		../generated_src/doxygen/pyscanner.cpp \
 		../generated_src/doxygen/scanner.cpp \
                 ../generated_src/doxygen/tclscanner.cpp \

src/libdoxygen.t.in

@@ -71,6 +71,9 @@ sub GenerateLex {
 #$ GenerateDep("\$(GENERATED_SRC)/pycode.cpp","pycode.l");
 #$ GenerateLex("pycode",0);
 
+#$ GenerateDep("\$(GENERATED_SRC)/xmlcode.cpp","xmlcode.l");
+#$ GenerateLex("xmlcode",0);
+
 #$ GenerateDep("\$(GENERATED_SRC)/fortranscanner.cpp","fortranscanner.l");
 #$ GenerateLex("fortranscanner",1);
 

src/util.cpp

@@ -6876,7 +6876,7 @@ void initDefaultExtensionMapping()
   updateLanguageMapping(".md",       "md");
   updateLanguageMapping(".markdown", "md");
 
-  //updateLanguageMapping(".xml",   "dbusxml");
+  updateLanguageMapping(".xml",   "dbusxml");
 }
 
 SrcLangExt getLanguageFromFileName(const QCString fileName)

src/xmlcode.h

@@ -0,0 +1,37 @@
+/******************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2014 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 XMLCODE_H
+#define XMLCODE_H
+
+#include "types.h"
+
+class CodeOutputInterface;
+class FileDef;
+class MemberDef;
+class QCString;
+class Definition;
+
+extern void parseXmlCode(CodeOutputInterface &,const char *,const QCString &,
+             bool ,const char *,FileDef *fd,
+	     int startLine,int endLine,bool inlineFragment,
+             MemberDef *memberDef,bool showLineNumbers,Definition *searchCtx,
+             bool collectXRefs);
+extern void resetXmlCodeParserState();
+
+#endif