diff --git a/mozilla/htmlparser/macbuild/htmlparser.mcp b/mozilla/htmlparser/macbuild/htmlparser.mcp
index 331b94ef6b4..9f068da16b3 100644
Binary files a/mozilla/htmlparser/macbuild/htmlparser.mcp and b/mozilla/htmlparser/macbuild/htmlparser.mcp differ
diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index 55161ec7f8c..1606d43a756 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -73,9 +73,11 @@ CPPSRCS		= \
 		nsToken.cpp \
 		nsTokenHandler.cpp \
 		nsHTMLContentSinkStream.cpp \
+		nsHTMLToTXTSinkStream.cpp \
 		nsValidDTD.cpp \
 		nsWellFormedDTD.cpp \
 		nsViewSourceHTML.cpp \
+		nsXIFDTD.cpp \
 		nsExpatDTD.cpp \
 		$(NULL)
 
@@ -96,6 +98,7 @@ EXPORTS		= \
 		nsIHTMLContentSink.h \
 		nsHTMLContentSinkStream.h \
 		nsIHTMLFragmentContentSink.h \
+		nsHTMLToTXTSinkStream.h \
 		nsHTMLEntities.h \
 		nsHTMLEntityList.h \
 		nsHTMLTags.h \
@@ -114,6 +117,7 @@ EXPORTS		= \
 		nsWellFormedDTD.h \
 		nsValidDTD.h \
 		CRtfDTD.h \
+		nsXIFDTD.h \
 		nsParserCIID.h \
 		nsExpatDTD.h \
 		nsParserError.h \
diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win
index 1d44930ed6b..fdedcd06545 100644
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@@ -51,12 +51,15 @@ CPPSRCS=					\
 	nsToken.cpp				\
 	nsTokenHandler.cpp			\
 	nsHTMLContentSinkStream.cpp		\
+	nsHTMLToTXTSinkStream.cpp		\
 	nsValidDTD.cpp				\
 	nsWellFormedDTD.cpp			\
 	nsViewSourceHTML.cpp \
+	nsXIFDTD.cpp				\
 	nsExpatDTD.cpp			\
 	prstrm.cpp				\
 	nsParserModule.cpp			\
+	nsXIFDTD.cpp				\
 	$(NULL)
 
 CPP_OBJS=					\
@@ -81,12 +84,15 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsToken.obj			\
 	.\$(OBJDIR)\nsTokenHandler.obj		\
 	.\$(OBJDIR)\nsHTMLContentSinkStream.obj	\
+	.\$(OBJDIR)\nsHTMLToTXTSinkStream.obj	\
 	.\$(OBJDIR)\nsValidDTD.obj		\
 	.\$(OBJDIR)\nsWellFormedDTD.obj		\
 	.\$(OBJDIR)\nsViewSourceHTML.obj		\
+	.\$(OBJDIR)\nsXIFDTD.obj		\
 	.\$(OBJDIR)\nsExpatDTD.obj		\
 	.\$(OBJDIR)\prstrm.obj			\
 	.\$(OBJDIR)\nsParserModule.obj		\
+	.\$(OBJDIR)\nsXIFDTD.obj		\
 	$(NULL)
 
 EXPORTS=					\
@@ -98,6 +104,7 @@ EXPORTS=					\
 	nsILoggingSink.h			\
 	nsHTMLContentSinkStream.h		\
 	nsIHTMLFragmentContentSink.h		\
+	nsHTMLToTXTSinkStream.h		\
 	nsHTMLEntities.h			\
 	nsHTMLEntityList.h			\
 	nsHTMLTags.h				\
@@ -115,6 +122,7 @@ EXPORTS=					\
 	CRTFDTD.h				\
 	COtherDTD.h				\
 	nsIDTD.h				\
+	nsXIFDTD.h				\
 	nsExpatDTD.h				\
 	nsParserCIID.h 				\
 	nsParserError.h 			\
diff --git a/mozilla/parser/htmlparser/macbuild/htmlparser.mcp b/mozilla/parser/htmlparser/macbuild/htmlparser.mcp
index 331b94ef6b4..9f068da16b3 100644
Binary files a/mozilla/parser/htmlparser/macbuild/htmlparser.mcp and b/mozilla/parser/htmlparser/macbuild/htmlparser.mcp differ
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 55161ec7f8c..1606d43a756 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -73,9 +73,11 @@ CPPSRCS		= \
 		nsToken.cpp \
 		nsTokenHandler.cpp \
 		nsHTMLContentSinkStream.cpp \
+		nsHTMLToTXTSinkStream.cpp \
 		nsValidDTD.cpp \
 		nsWellFormedDTD.cpp \
 		nsViewSourceHTML.cpp \
+		nsXIFDTD.cpp \
 		nsExpatDTD.cpp \
 		$(NULL)
 
@@ -96,6 +98,7 @@ EXPORTS		= \
 		nsIHTMLContentSink.h \
 		nsHTMLContentSinkStream.h \
 		nsIHTMLFragmentContentSink.h \
+		nsHTMLToTXTSinkStream.h \
 		nsHTMLEntities.h \
 		nsHTMLEntityList.h \
 		nsHTMLTags.h \
@@ -114,6 +117,7 @@ EXPORTS		= \
 		nsWellFormedDTD.h \
 		nsValidDTD.h \
 		CRtfDTD.h \
+		nsXIFDTD.h \
 		nsParserCIID.h \
 		nsExpatDTD.h \
 		nsParserError.h \
diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win
index 1d44930ed6b..fdedcd06545 100644
--- a/mozilla/parser/htmlparser/src/makefile.win
+++ b/mozilla/parser/htmlparser/src/makefile.win
@@ -51,12 +51,15 @@ CPPSRCS=					\
 	nsToken.cpp				\
 	nsTokenHandler.cpp			\
 	nsHTMLContentSinkStream.cpp		\
+	nsHTMLToTXTSinkStream.cpp		\
 	nsValidDTD.cpp				\
 	nsWellFormedDTD.cpp			\
 	nsViewSourceHTML.cpp \
+	nsXIFDTD.cpp				\
 	nsExpatDTD.cpp			\
 	prstrm.cpp				\
 	nsParserModule.cpp			\
+	nsXIFDTD.cpp				\
 	$(NULL)
 
 CPP_OBJS=					\
@@ -81,12 +84,15 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsToken.obj			\
 	.\$(OBJDIR)\nsTokenHandler.obj		\
 	.\$(OBJDIR)\nsHTMLContentSinkStream.obj	\
+	.\$(OBJDIR)\nsHTMLToTXTSinkStream.obj	\
 	.\$(OBJDIR)\nsValidDTD.obj		\
 	.\$(OBJDIR)\nsWellFormedDTD.obj		\
 	.\$(OBJDIR)\nsViewSourceHTML.obj		\
+	.\$(OBJDIR)\nsXIFDTD.obj		\
 	.\$(OBJDIR)\nsExpatDTD.obj		\
 	.\$(OBJDIR)\prstrm.obj			\
 	.\$(OBJDIR)\nsParserModule.obj		\
+	.\$(OBJDIR)\nsXIFDTD.obj		\
 	$(NULL)
 
 EXPORTS=					\
@@ -98,6 +104,7 @@ EXPORTS=					\
 	nsILoggingSink.h			\
 	nsHTMLContentSinkStream.h		\
 	nsIHTMLFragmentContentSink.h		\
+	nsHTMLToTXTSinkStream.h		\
 	nsHTMLEntities.h			\
 	nsHTMLEntityList.h			\
 	nsHTMLTags.h				\
@@ -115,6 +122,7 @@ EXPORTS=					\
 	CRTFDTD.h				\
 	COtherDTD.h				\
 	nsIDTD.h				\
+	nsXIFDTD.h				\
 	nsExpatDTD.h				\
 	nsParserCIID.h 				\
 	nsParserError.h 			\