From 7f3f2e706922a2f798017727c31b11c2dba3d79c Mon Sep 17 00:00:00 2001
From: "rbs%maths.uq.edu.au"
 <rbs%maths.uq.edu.au@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 2 Oct 1999 11:05:49 +0000
Subject: [PATCH] Adding remaining MathML hooks. r:peterl.

git-svn-id: svn://10.0.0.236/trunk@49664 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/xml/document/src/Makefile.in     |  4 ++++
 mozilla/content/xml/document/src/makefile.win    |  3 +++
 .../content/xml/document/src/nsXMLDocument.cpp   | 16 ++++++++++++++++
 mozilla/layout/xml/document/src/Makefile.in      |  4 ++++
 mozilla/layout/xml/document/src/makefile.win     |  3 +++
 .../layout/xml/document/src/nsXMLDocument.cpp    | 16 ++++++++++++++++
 6 files changed, 46 insertions(+)

diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in
index 34847e8b1d6..a5aaea44cc9 100644
--- a/mozilla/content/xml/document/src/Makefile.in
+++ b/mozilla/content/xml/document/src/Makefile.in
@@ -50,3 +50,7 @@ INCLUDES	+= \
 		-I$(DIST)/public/raptor \
 		$(NULL)
 
+ifdef MOZ_MATHML
+INCLUDES += \
+        -I$(srcdir)/../../../mathml/content/src
+endif
diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win
index e4ca418b5dc..141de6e9fae 100644
--- a/mozilla/content/xml/document/src/makefile.win
+++ b/mozilla/content/xml/document/src/makefile.win
@@ -43,6 +43,9 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
   -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
   -I..\..\..\html\content\src -I..\..\..\html\document\src \
   -I..\..\..\xul\content\src -I..\..\..\xsl\document\src \
+!ifdef MOZ_MATHML
+  -I..\..\..\mathml\content\src \
+!endif
   -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
   -I$(PUBLIC)\expat
 
diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp
index 7d17831b1e8..e8faa22c1a8 100644
--- a/mozilla/content/xml/document/src/nsXMLDocument.cpp
+++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp
@@ -58,6 +58,12 @@
 #include "nsXULAtoms.h"
 #endif
 
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+#include "nsMathMLAtoms.h"
+#include "nsMathMLOperators.h"
+#endif
+
 static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
 static NS_DEFINE_IID(kIXMLDocumentIID, NS_IXMLDOCUMENT_IID);
@@ -96,6 +102,11 @@ nsXMLDocument::nsXMLDocument()
 #ifdef XSL
   mTransformMediator = nsnull;
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::AddRefTable();
+  nsMathMLAtoms::AddRefAtoms();
+#endif
 }
 
 nsXMLDocument::~nsXMLDocument()
@@ -116,6 +127,11 @@ nsXMLDocument::~nsXMLDocument()
 #ifdef XSL
   NS_IF_RELEASE(mTransformMediator);
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::ReleaseTable();
+  nsMathMLAtoms::ReleaseAtoms();
+#endif
 }
 
 NS_IMETHODIMP 
diff --git a/mozilla/layout/xml/document/src/Makefile.in b/mozilla/layout/xml/document/src/Makefile.in
index 34847e8b1d6..a5aaea44cc9 100644
--- a/mozilla/layout/xml/document/src/Makefile.in
+++ b/mozilla/layout/xml/document/src/Makefile.in
@@ -50,3 +50,7 @@ INCLUDES	+= \
 		-I$(DIST)/public/raptor \
 		$(NULL)
 
+ifdef MOZ_MATHML
+INCLUDES += \
+        -I$(srcdir)/../../../mathml/content/src
+endif
diff --git a/mozilla/layout/xml/document/src/makefile.win b/mozilla/layout/xml/document/src/makefile.win
index e4ca418b5dc..141de6e9fae 100644
--- a/mozilla/layout/xml/document/src/makefile.win
+++ b/mozilla/layout/xml/document/src/makefile.win
@@ -43,6 +43,9 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
   -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
   -I..\..\..\html\content\src -I..\..\..\html\document\src \
   -I..\..\..\xul\content\src -I..\..\..\xsl\document\src \
+!ifdef MOZ_MATHML
+  -I..\..\..\mathml\content\src \
+!endif
   -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
   -I$(PUBLIC)\expat
 
diff --git a/mozilla/layout/xml/document/src/nsXMLDocument.cpp b/mozilla/layout/xml/document/src/nsXMLDocument.cpp
index 7d17831b1e8..e8faa22c1a8 100644
--- a/mozilla/layout/xml/document/src/nsXMLDocument.cpp
+++ b/mozilla/layout/xml/document/src/nsXMLDocument.cpp
@@ -58,6 +58,12 @@
 #include "nsXULAtoms.h"
 #endif
 
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+#include "nsMathMLAtoms.h"
+#include "nsMathMLOperators.h"
+#endif
+
 static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
 static NS_DEFINE_IID(kIXMLDocumentIID, NS_IXMLDOCUMENT_IID);
@@ -96,6 +102,11 @@ nsXMLDocument::nsXMLDocument()
 #ifdef XSL
   mTransformMediator = nsnull;
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::AddRefTable();
+  nsMathMLAtoms::AddRefAtoms();
+#endif
 }
 
 nsXMLDocument::~nsXMLDocument()
@@ -116,6 +127,11 @@ nsXMLDocument::~nsXMLDocument()
 #ifdef XSL
   NS_IF_RELEASE(mTransformMediator);
 #endif
+//MathML Mod - DJF
+#ifdef MOZ_MATHML
+  nsMathMLOperators::ReleaseTable();
+  nsMathMLAtoms::ReleaseAtoms();
+#endif
 }
 
 NS_IMETHODIMP