diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp
index 60e023c157b..9a12ab32b7f 100644
--- a/mozilla/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/htmlparser/src/CNavDTD.cpp
@@ -140,6 +140,14 @@ CTagStack::~CTagStack() {
     mSize=mCount=0;
   }
 
+/**
+ * Resets state of stack to be empty.
+ * @update  gess7/9/98
+ */
+void CTagStack::Empty(void) {
+  mCount=0;
+}
+
 /**
  * 
  * @update  gess7/9/98
@@ -1013,8 +1021,11 @@ nsresult CNavDTD::HandleScriptToken(CToken* aToken, nsCParserNode& aNode) {
     if(NS_OK==result) {
       CollectSkippedContent(aNode,attrCount);
       if(NS_OK==result) {
+          //Boy is this an evil hack...
+        mContextStack.Pop();
         result=AddLeaf(aNode);
-        if(NS_OK==result)
+          mContextStack.Push(eHTMLTag_head);
+          if(NS_OK==result)
           result=CloseHead(aNode);
       }
     }
@@ -1997,7 +2008,7 @@ eHTMLTags CNavDTD::GetDefaultParentTagFor(eHTMLTags aTag) const{
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag)  {
+PRBool CNavDTD::ForwardPropagate(CTagStack& aStack,eHTMLTags aParentTag,eHTMLTags aChildTag)  {
   PRBool result=PR_FALSE;
 
   switch(aParentTag) {
@@ -2006,15 +2017,15 @@ PRBool CNavDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTag
         static char  tableTags[]={eHTMLTag_tr,eHTMLTag_td,0};
         if(strchr(tableTags,aChildTag)) {
           //if you're here, we know we can correctly backward propagate.
-          return BackwardPropagate(aVector,aParentTag,aChildTag);
+          return BackwardPropagate(aStack,aParentTag,aChildTag);
         }
       }
       //otherwise, intentionally fall through...
 
     case eHTMLTag_tr:
       if(PR_TRUE==CanContain((PRInt32)eHTMLTag_td,(PRInt32)aChildTag)) {
-        aVector.Append((PRUnichar)eHTMLTag_td);
-        result=BackwardPropagate(aVector,aParentTag,eHTMLTag_td);
+        aStack.Push(eHTMLTag_td);
+        result=BackwardPropagate(aStack,aParentTag,eHTMLTag_td);
 //        result=PR_TRUE;
       }
 
@@ -2041,20 +2052,14 @@ PRBool CNavDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTag
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
+PRBool CNavDTD::BackwardPropagate(CTagStack& aStack,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
 
-  eHTMLTags theParentTag=(eHTMLTags)aChildTag;
+  eHTMLTags theParentTag=aChildTag;
 
-//  aVector.Truncate();
-
-    //create the necessary stack of parent tags...
-    //continue your search until you run out of known parents,
-    //or you find the specific parent you were given (aParentTag).
-//  aVector.Append((PRUnichar)aChildTag);
   do {
     theParentTag=(eHTMLTags)GetDefaultParentTagFor(theParentTag);
     if(theParentTag!=eHTMLTag_unknown) {
-      aVector.Append((PRUnichar)theParentTag);
+      aStack.Push(theParentTag);
     }
   } while((theParentTag!=eHTMLTag_unknown) && (theParentTag!=aParentTag));
   
@@ -2350,11 +2355,9 @@ nsresult CNavDTD::OpenBody(const nsIParserNode& aNode){
 
       result=CloseContainersTo(0,eHTMLTag_html,PR_TRUE);  //close current stack containers.
 
-      CHTMLToken    token(gEmpty);
+      CHTMLToken    token(gEmpty,eHTMLTag_html);
       nsCParserNode htmlNode(&token,mLineNumber);
-
-      token.SetTypeID(eHTMLTag_html);  //open the html container...
-      result=OpenHTML(htmlNode);
+      result=OpenHTML(htmlNode);  //open the html container...
     }
   }
 
@@ -2682,6 +2685,8 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode& aNode){
   return result;
 }
 
+CTagStack kPropagationStack;
+
 /**
  *  This method gets called to create a valid context stack
  *  for the given child. We compare the current stack to the
@@ -2694,60 +2699,58 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode& aNode){
  *  @return  true if we succeeded, otherwise false
  */
 nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChildTag){
-  nsAutoString  theVector;
   
-  nsresult  result=NS_OK;
-  PRInt32   pos=0;
+  kPropagationStack.Empty();
+  
+  nsresult  result=(nsresult)kContextMismatch;
   PRInt32   cnt=0;
   eHTMLTags theTop=GetTopNode();
+  PRBool    bResult=ForwardPropagate(kPropagationStack,theTop,aChildTag);
   
-  if(PR_TRUE==ForwardPropagate(theVector,theTop,aChildTag)){
-    //add code here to build up context stack based on forward propagated context vector...
-    pos=0;
-    cnt=theVector.Length()-1;
-    if(mContextStack.Last()==(eHTMLTags)theVector[cnt])
-      result=NS_OK;
-    else result=(nsresult)kContextMismatch;
-  }
-  else {
-    PRBool tempResult;
+  if(PR_FALSE==bResult){
+
     if(eHTMLTag_unknown!=theTop) {
-      tempResult=BackwardPropagate(theVector,theTop,aChildTag);
-      if(eHTMLTag_html!=theTop)
-        BackwardPropagate(theVector,eHTMLTag_html,theTop);
-    }
-    else tempResult=BackwardPropagate(theVector,eHTMLTag_html,aChildTag);
+      bResult=BackwardPropagate(kPropagationStack,theTop,aChildTag);
 
-    if(PR_TRUE==tempResult) {
+     /*****************************************************************************
+        OH NOOOO!...
 
-      //propagation worked, so pop unwanted containers, push new ones, then exit...
-      pos=0;
-      cnt=theVector.Length();
-      result=NS_OK;
-      while(pos<mContextStack.mCount) {
-        if(mContextStack.mTags[pos]==(eHTMLTags)theVector[cnt-1-pos]) {
-          pos++;
-        }
-        else {
-          //if you're here, you have something on the stack
-          //that doesn't match your needed tags order.
-          result=CloseContainersTo(pos,eHTMLTag_unknown,PR_TRUE);
-          break;
-        }
-      } //while
-    } //elseif
-    else result=(nsresult)kCantPropagate;
+        We found a pretty fundamental flaw in the backward propagation code.
+        The previous version propagated from a child to a target parent, and
+        then again from the target parent to the root. 
+        Only thing is, that won't work in cases where a container exists that's 
+        not in the usual hiearchy:
+          
+          <html><body>
+            <div>
+              <table>
+                <!--missing TR>
+                  <td>cell text</td>
+                </tr>
+              </table> ...etc...
+
+        In this case, we'd propagate fine from the <TD> to the <TABLE>, and
+        then from the table to the <html>. Unfortunately, the <DIV> won't show
+        up in the propagated form, and then we get out of sync with the actual
+        context stack when it comes to autogenerate containers.
+      ******************************************************************************/
+      
+    } //if
+    else bResult=BackwardPropagate(kPropagationStack,eHTMLTag_html,aChildTag);
   } //elseif
 
-    //now, build up the stack according to the tags 
-    //you have that aren't in the stack...
-  if(NS_OK==result){
-    int i=0;
-    for(i=pos;i<cnt;i++) {
-//      CStartToken* st=new CStartToken((eHTMLTags)theVector[cnt-1-i]);
-      CToken* theToken=gTokenRecycler.CreateTokenOfType(eToken_start,(eHTMLTags)theVector[cnt-1-i],gEmpty);
+  if((0==mContextStack.mCount) || (mContextStack.Last()==kPropagationStack.Pop()))
+    result=NS_OK;
+
+  //now, build up the stack according to the tags 
+  //you have that aren't in the stack...
+  if(PR_TRUE==bResult){
+    while(kPropagationStack.mCount>0) {
+      eHTMLTags theTag=kPropagationStack.Pop();
+      CToken* theToken=gTokenRecycler.CreateTokenOfType(eToken_start,theTag,gEmpty);
       HandleStartToken(theToken);
     }
+    result=NS_OK;
   }
   return result;
 }
@@ -3018,16 +3021,14 @@ CNavDTD::ConsumeStartTag(PRUnichar aChar,CScanner& aScanner,CToken*& aToken) {
     
           if((NS_OK==result) && skippedToken){
               //now we strip the ending sequence from our new SkippedContent token...
-            PRInt32 slen=str.Length()+3;
-            nsString& skippedText=skippedToken->GetStringValueXXX();
-    
-            skippedText.Cut(skippedText.Length()-slen,slen);
+            //PRInt32 slen=str.Length()+3;
+            nsString& skippedText=((CSkippedContentToken*)skippedToken)->GetKey();    
             mTokenDeque.Push(skippedToken);
   
             //In the case that we just read a given tag, we should go and
             //consume all the tag content itself (and throw it all away).
 
-            CToken* endtoken=gTokenRecycler.CreateTokenOfType(eToken_end,theTag,gEmpty);
+            CToken* endtoken=gTokenRecycler.CreateTokenOfType(eToken_end,theTag,skippedToken->GetStringValueXXX());
             mTokenDeque.Push(endtoken);
           } //if
         } //if
diff --git a/mozilla/htmlparser/src/CNavDTD.h b/mozilla/htmlparser/src/CNavDTD.h
index 872d186f95d..75c6cf1c53f 100644
--- a/mozilla/htmlparser/src/CNavDTD.h
+++ b/mozilla/htmlparser/src/CNavDTD.h
@@ -124,6 +124,7 @@ public:
   eHTMLTags Pop();
   eHTMLTags First() const;
   eHTMLTags Last() const;
+  void      Empty(void); 
 
   int       mSize;
   int       mCount;
@@ -368,7 +369,7 @@ CLASS_EXPORT_HTMLPARS CNavDTD : public nsIDTD {
      * @param   aChild -- tag type of child
      * @return  True if closure was achieved -- other false
      */
-    virtual PRBool ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag);
+    virtual PRBool ForwardPropagate(CTagStack& aTagStack,eHTMLTags aParentTag,eHTMLTags aChildTag);
 
     /**
      * This method tries to design a context map (without actually
@@ -379,7 +380,7 @@ CLASS_EXPORT_HTMLPARS CNavDTD : public nsIDTD {
      * @param   aChild -- tag type of child
      * @return  True if closure was achieved -- other false
      */
-    virtual PRBool BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const;
+    virtual PRBool BackwardPropagate(CTagStack& aTagStack,eHTMLTags aParentTag,eHTMLTags aChildTag) const;
 
     /**
      * Ask parser if a given container is open ANYWHERE on stack
diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp
index 78d27bc053e..99c39e40da9 100644
--- a/mozilla/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/htmlparser/src/COtherDTD.cpp
@@ -443,39 +443,6 @@ eHTMLTags COtherDTD::GetDefaultParentTagFor(eHTMLTags aTag) const{
 }
 
 
-/**
- * This method tries to design a context vector (without actually
- * changing our parser state) from the parent down to the
- * child. 
- *
- * @update  gess4/6/98
- * @param   aVector is the string where we store our output vector
- *          in bottom-up order.
- * @param   aParent -- tag type of parent
- * @param   aChild -- tag type of child
- * @return  TRUE if propagation closes; false otherwise
- */
-PRBool COtherDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) {
-  return CNavDTD::ForwardPropagate(aVector,aParentTag,aChildTag);
-}
-
-
-/**
- * This method tries to design a context map (without actually
- * changing our parser state) from the child up to the parent.
- *
- * @update  gess4/6/98
- * @param   aVector is the string where we store our output vector
- *          in bottom-up order.
- * @param   aParent -- tag type of parent
- * @param   aChild -- tag type of child
- * @return  TRUE if propagation closes; false otherwise
- */
-PRBool COtherDTD::BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
-  return CNavDTD::BackwardPropagate(aVector,aParentTag,aChildTag);
-}
-
-
 /*********************************************
   Here comes code that handles the interface
   to our content sink.
diff --git a/mozilla/htmlparser/src/COtherDTD.h b/mozilla/htmlparser/src/COtherDTD.h
index 7b7cc6131fd..a29e52c02ea 100644
--- a/mozilla/htmlparser/src/COtherDTD.h
+++ b/mozilla/htmlparser/src/COtherDTD.h
@@ -207,29 +207,7 @@ class COtherDTD : public CNavDTD {
      */
     virtual eHTMLTags GetDefaultParentTagFor(eHTMLTags aTag) const;
 
-    /**
-     * This method tries to design a context map (without actually
-     * changing our parser state) from the parent down to the
-     * child. 
-     *
-     * @update  gess4/6/98
-     * @param   aParent -- tag type of parent
-     * @param   aChild -- tag type of child
-     * @return  True if closure was achieved -- other false
-     */
-    virtual PRBool ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag);
-
-    /**
-     * This method tries to design a context map (without actually
-     * changing our parser state) from the child up to the parent.
-     *
-     * @update  gess4/6/98
-     * @param   aParent -- tag type of parent
-     * @param   aChild -- tag type of child
-     * @return  True if closure was achieved -- other false
-     */
-    virtual PRBool BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const;
-
+   
     /**
      * This method gets called when a start token has been consumed and needs 
      * to be handled (possibly added to content model via sink).
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 3ae28998d4f..c995d2d43da 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -107,8 +107,8 @@ static StrToUnicodeStruct gStrToUnicodeTable[] =
  *  @param   
  *  @return  
  */
-CHTMLToken::CHTMLToken(const nsString& aName) : CToken(aName) {
-  mTypeID=eHTMLTag_unknown;
+CHTMLToken::CHTMLToken(const nsString& aName,eHTMLTags aTag) : CToken(aName) {
+  mTypeID=aTag;
 }
 
 /*
@@ -154,7 +154,7 @@ CStartToken::CStartToken(eHTMLTags aTag) : CHTMLToken(aTag) {
  *  @param   
  *  @return  
  */
-CStartToken::CStartToken(nsString& aString) : CHTMLToken(aString) {
+CStartToken::CStartToken(nsString& aString,eHTMLTags aTag) : CHTMLToken(aString,aTag) {
   mAttributed=PR_FALSE;
   mEmpty=PR_FALSE;
 }
@@ -1357,7 +1357,9 @@ nsresult CSkippedContentToken::Consume(PRUnichar,CScanner& aScanner) {
     result=aScanner.ReadUntil(temp,terminals,PR_TRUE);
     done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
   }
-  mTextValue=temp;
+  int len=temp.Length();
+  temp.Truncate(len-mTextValue.Length());
+  mTextKey=temp;
   return result;
 }
 
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.h b/mozilla/htmlparser/src/nsHTMLTokens.h
index e92338685f3..b72f4232108 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/htmlparser/src/nsHTMLTokens.h
@@ -73,7 +73,7 @@ class CHTMLToken : public CToken {
 public:
 
                         CHTMLToken(eHTMLTags aTag);
-                        CHTMLToken(const nsString& aString);
+                        CHTMLToken(const nsString& aString,eHTMLTags aTag=eHTMLTag_unknown);
     virtual void        SetStringValue(const char* name);
 
 protected:
@@ -89,7 +89,7 @@ protected:
 class CStartToken: public CHTMLToken {
   public:
                         CStartToken(eHTMLTags aTag);
-                        CStartToken(nsString& aName);
+                        CStartToken(nsString& aName,eHTMLTags aTag=eHTMLTag_unknown);
     virtual nsresult    Consume(PRUnichar aChar,CScanner& aScanner);
     virtual PRInt32     GetTypeID(void);
     virtual const char* GetClassName(void);
diff --git a/mozilla/htmlparser/src/nsParserNode.cpp b/mozilla/htmlparser/src/nsParserNode.cpp
index b70cc7ad10f..c18127336e6 100644
--- a/mozilla/htmlparser/src/nsParserNode.cpp
+++ b/mozilla/htmlparser/src/nsParserNode.cpp
@@ -183,7 +183,7 @@ const nsString& nsCParserNode::GetSkippedContent() const {
     if(mAttributes[mAttributeCount-1]) {
       CSkippedContentToken* sc=(CSkippedContentToken*)(mAttributes[mAttributeCount-1]);
       if(sc) {
-        return sc->GetStringValueXXX();
+        return sc->GetKey();
       }
     }
   }
diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp
index 6046f274ff1..9e55085071e 100644
--- a/mozilla/htmlparser/src/nsScanner.cpp
+++ b/mozilla/htmlparser/src/nsScanner.cpp
@@ -438,20 +438,20 @@ nsresult CScanner::ReadWhile(nsString& aString,
 nsresult CScanner::ReadUntil(nsString& aString,
                              nsString& aTerminalSet,
                              PRBool addTerminal){
-  PRUnichar ch=0;
-  nsresult   result=NS_OK;
+  PRUnichar theChar=0;
+  nsresult  result=NS_OK;
 
   while(NS_OK == result) {
-    result=GetChar(ch);
+    result=GetChar(theChar);
     if(NS_OK==result) {
-      PRInt32 pos=aTerminalSet.Find(ch);
+      PRInt32 pos=aTerminalSet.Find(theChar);
       if(kNotFound!=pos) {
         if(addTerminal)
-          aString+=ch;
-        else PutBack(ch);
+          aString+=theChar;
+        else PutBack(theChar);
         break;
       }
-      else aString+=ch;
+      else aString+=theChar;
     }
   }
   return result;
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 60e023c157b..9a12ab32b7f 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -140,6 +140,14 @@ CTagStack::~CTagStack() {
     mSize=mCount=0;
   }
 
+/**
+ * Resets state of stack to be empty.
+ * @update  gess7/9/98
+ */
+void CTagStack::Empty(void) {
+  mCount=0;
+}
+
 /**
  * 
  * @update  gess7/9/98
@@ -1013,8 +1021,11 @@ nsresult CNavDTD::HandleScriptToken(CToken* aToken, nsCParserNode& aNode) {
     if(NS_OK==result) {
       CollectSkippedContent(aNode,attrCount);
       if(NS_OK==result) {
+          //Boy is this an evil hack...
+        mContextStack.Pop();
         result=AddLeaf(aNode);
-        if(NS_OK==result)
+          mContextStack.Push(eHTMLTag_head);
+          if(NS_OK==result)
           result=CloseHead(aNode);
       }
     }
@@ -1997,7 +2008,7 @@ eHTMLTags CNavDTD::GetDefaultParentTagFor(eHTMLTags aTag) const{
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag)  {
+PRBool CNavDTD::ForwardPropagate(CTagStack& aStack,eHTMLTags aParentTag,eHTMLTags aChildTag)  {
   PRBool result=PR_FALSE;
 
   switch(aParentTag) {
@@ -2006,15 +2017,15 @@ PRBool CNavDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTag
         static char  tableTags[]={eHTMLTag_tr,eHTMLTag_td,0};
         if(strchr(tableTags,aChildTag)) {
           //if you're here, we know we can correctly backward propagate.
-          return BackwardPropagate(aVector,aParentTag,aChildTag);
+          return BackwardPropagate(aStack,aParentTag,aChildTag);
         }
       }
       //otherwise, intentionally fall through...
 
     case eHTMLTag_tr:
       if(PR_TRUE==CanContain((PRInt32)eHTMLTag_td,(PRInt32)aChildTag)) {
-        aVector.Append((PRUnichar)eHTMLTag_td);
-        result=BackwardPropagate(aVector,aParentTag,eHTMLTag_td);
+        aStack.Push(eHTMLTag_td);
+        result=BackwardPropagate(aStack,aParentTag,eHTMLTag_td);
 //        result=PR_TRUE;
       }
 
@@ -2041,20 +2052,14 @@ PRBool CNavDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTag
  * @param   aChild -- tag type of child
  * @return  TRUE if propagation closes; false otherwise
  */
-PRBool CNavDTD::BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
+PRBool CNavDTD::BackwardPropagate(CTagStack& aStack,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
 
-  eHTMLTags theParentTag=(eHTMLTags)aChildTag;
+  eHTMLTags theParentTag=aChildTag;
 
-//  aVector.Truncate();
-
-    //create the necessary stack of parent tags...
-    //continue your search until you run out of known parents,
-    //or you find the specific parent you were given (aParentTag).
-//  aVector.Append((PRUnichar)aChildTag);
   do {
     theParentTag=(eHTMLTags)GetDefaultParentTagFor(theParentTag);
     if(theParentTag!=eHTMLTag_unknown) {
-      aVector.Append((PRUnichar)theParentTag);
+      aStack.Push(theParentTag);
     }
   } while((theParentTag!=eHTMLTag_unknown) && (theParentTag!=aParentTag));
   
@@ -2350,11 +2355,9 @@ nsresult CNavDTD::OpenBody(const nsIParserNode& aNode){
 
       result=CloseContainersTo(0,eHTMLTag_html,PR_TRUE);  //close current stack containers.
 
-      CHTMLToken    token(gEmpty);
+      CHTMLToken    token(gEmpty,eHTMLTag_html);
       nsCParserNode htmlNode(&token,mLineNumber);
-
-      token.SetTypeID(eHTMLTag_html);  //open the html container...
-      result=OpenHTML(htmlNode);
+      result=OpenHTML(htmlNode);  //open the html container...
     }
   }
 
@@ -2682,6 +2685,8 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode& aNode){
   return result;
 }
 
+CTagStack kPropagationStack;
+
 /**
  *  This method gets called to create a valid context stack
  *  for the given child. We compare the current stack to the
@@ -2694,60 +2699,58 @@ nsresult CNavDTD::AddLeaf(const nsIParserNode& aNode){
  *  @return  true if we succeeded, otherwise false
  */
 nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChildTag){
-  nsAutoString  theVector;
   
-  nsresult  result=NS_OK;
-  PRInt32   pos=0;
+  kPropagationStack.Empty();
+  
+  nsresult  result=(nsresult)kContextMismatch;
   PRInt32   cnt=0;
   eHTMLTags theTop=GetTopNode();
+  PRBool    bResult=ForwardPropagate(kPropagationStack,theTop,aChildTag);
   
-  if(PR_TRUE==ForwardPropagate(theVector,theTop,aChildTag)){
-    //add code here to build up context stack based on forward propagated context vector...
-    pos=0;
-    cnt=theVector.Length()-1;
-    if(mContextStack.Last()==(eHTMLTags)theVector[cnt])
-      result=NS_OK;
-    else result=(nsresult)kContextMismatch;
-  }
-  else {
-    PRBool tempResult;
+  if(PR_FALSE==bResult){
+
     if(eHTMLTag_unknown!=theTop) {
-      tempResult=BackwardPropagate(theVector,theTop,aChildTag);
-      if(eHTMLTag_html!=theTop)
-        BackwardPropagate(theVector,eHTMLTag_html,theTop);
-    }
-    else tempResult=BackwardPropagate(theVector,eHTMLTag_html,aChildTag);
+      bResult=BackwardPropagate(kPropagationStack,theTop,aChildTag);
 
-    if(PR_TRUE==tempResult) {
+     /*****************************************************************************
+        OH NOOOO!...
 
-      //propagation worked, so pop unwanted containers, push new ones, then exit...
-      pos=0;
-      cnt=theVector.Length();
-      result=NS_OK;
-      while(pos<mContextStack.mCount) {
-        if(mContextStack.mTags[pos]==(eHTMLTags)theVector[cnt-1-pos]) {
-          pos++;
-        }
-        else {
-          //if you're here, you have something on the stack
-          //that doesn't match your needed tags order.
-          result=CloseContainersTo(pos,eHTMLTag_unknown,PR_TRUE);
-          break;
-        }
-      } //while
-    } //elseif
-    else result=(nsresult)kCantPropagate;
+        We found a pretty fundamental flaw in the backward propagation code.
+        The previous version propagated from a child to a target parent, and
+        then again from the target parent to the root. 
+        Only thing is, that won't work in cases where a container exists that's 
+        not in the usual hiearchy:
+          
+          <html><body>
+            <div>
+              <table>
+                <!--missing TR>
+                  <td>cell text</td>
+                </tr>
+              </table> ...etc...
+
+        In this case, we'd propagate fine from the <TD> to the <TABLE>, and
+        then from the table to the <html>. Unfortunately, the <DIV> won't show
+        up in the propagated form, and then we get out of sync with the actual
+        context stack when it comes to autogenerate containers.
+      ******************************************************************************/
+      
+    } //if
+    else bResult=BackwardPropagate(kPropagationStack,eHTMLTag_html,aChildTag);
   } //elseif
 
-    //now, build up the stack according to the tags 
-    //you have that aren't in the stack...
-  if(NS_OK==result){
-    int i=0;
-    for(i=pos;i<cnt;i++) {
-//      CStartToken* st=new CStartToken((eHTMLTags)theVector[cnt-1-i]);
-      CToken* theToken=gTokenRecycler.CreateTokenOfType(eToken_start,(eHTMLTags)theVector[cnt-1-i],gEmpty);
+  if((0==mContextStack.mCount) || (mContextStack.Last()==kPropagationStack.Pop()))
+    result=NS_OK;
+
+  //now, build up the stack according to the tags 
+  //you have that aren't in the stack...
+  if(PR_TRUE==bResult){
+    while(kPropagationStack.mCount>0) {
+      eHTMLTags theTag=kPropagationStack.Pop();
+      CToken* theToken=gTokenRecycler.CreateTokenOfType(eToken_start,theTag,gEmpty);
       HandleStartToken(theToken);
     }
+    result=NS_OK;
   }
   return result;
 }
@@ -3018,16 +3021,14 @@ CNavDTD::ConsumeStartTag(PRUnichar aChar,CScanner& aScanner,CToken*& aToken) {
     
           if((NS_OK==result) && skippedToken){
               //now we strip the ending sequence from our new SkippedContent token...
-            PRInt32 slen=str.Length()+3;
-            nsString& skippedText=skippedToken->GetStringValueXXX();
-    
-            skippedText.Cut(skippedText.Length()-slen,slen);
+            //PRInt32 slen=str.Length()+3;
+            nsString& skippedText=((CSkippedContentToken*)skippedToken)->GetKey();    
             mTokenDeque.Push(skippedToken);
   
             //In the case that we just read a given tag, we should go and
             //consume all the tag content itself (and throw it all away).
 
-            CToken* endtoken=gTokenRecycler.CreateTokenOfType(eToken_end,theTag,gEmpty);
+            CToken* endtoken=gTokenRecycler.CreateTokenOfType(eToken_end,theTag,skippedToken->GetStringValueXXX());
             mTokenDeque.Push(endtoken);
           } //if
         } //if
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.h b/mozilla/parser/htmlparser/src/CNavDTD.h
index 872d186f95d..75c6cf1c53f 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.h
+++ b/mozilla/parser/htmlparser/src/CNavDTD.h
@@ -124,6 +124,7 @@ public:
   eHTMLTags Pop();
   eHTMLTags First() const;
   eHTMLTags Last() const;
+  void      Empty(void); 
 
   int       mSize;
   int       mCount;
@@ -368,7 +369,7 @@ CLASS_EXPORT_HTMLPARS CNavDTD : public nsIDTD {
      * @param   aChild -- tag type of child
      * @return  True if closure was achieved -- other false
      */
-    virtual PRBool ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag);
+    virtual PRBool ForwardPropagate(CTagStack& aTagStack,eHTMLTags aParentTag,eHTMLTags aChildTag);
 
     /**
      * This method tries to design a context map (without actually
@@ -379,7 +380,7 @@ CLASS_EXPORT_HTMLPARS CNavDTD : public nsIDTD {
      * @param   aChild -- tag type of child
      * @return  True if closure was achieved -- other false
      */
-    virtual PRBool BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const;
+    virtual PRBool BackwardPropagate(CTagStack& aTagStack,eHTMLTags aParentTag,eHTMLTags aChildTag) const;
 
     /**
      * Ask parser if a given container is open ANYWHERE on stack
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp
index 78d27bc053e..99c39e40da9 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp
@@ -443,39 +443,6 @@ eHTMLTags COtherDTD::GetDefaultParentTagFor(eHTMLTags aTag) const{
 }
 
 
-/**
- * This method tries to design a context vector (without actually
- * changing our parser state) from the parent down to the
- * child. 
- *
- * @update  gess4/6/98
- * @param   aVector is the string where we store our output vector
- *          in bottom-up order.
- * @param   aParent -- tag type of parent
- * @param   aChild -- tag type of child
- * @return  TRUE if propagation closes; false otherwise
- */
-PRBool COtherDTD::ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) {
-  return CNavDTD::ForwardPropagate(aVector,aParentTag,aChildTag);
-}
-
-
-/**
- * This method tries to design a context map (without actually
- * changing our parser state) from the child up to the parent.
- *
- * @update  gess4/6/98
- * @param   aVector is the string where we store our output vector
- *          in bottom-up order.
- * @param   aParent -- tag type of parent
- * @param   aChild -- tag type of child
- * @return  TRUE if propagation closes; false otherwise
- */
-PRBool COtherDTD::BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const {
-  return CNavDTD::BackwardPropagate(aVector,aParentTag,aChildTag);
-}
-
-
 /*********************************************
   Here comes code that handles the interface
   to our content sink.
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.h b/mozilla/parser/htmlparser/src/COtherDTD.h
index 7b7cc6131fd..a29e52c02ea 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.h
+++ b/mozilla/parser/htmlparser/src/COtherDTD.h
@@ -207,29 +207,7 @@ class COtherDTD : public CNavDTD {
      */
     virtual eHTMLTags GetDefaultParentTagFor(eHTMLTags aTag) const;
 
-    /**
-     * This method tries to design a context map (without actually
-     * changing our parser state) from the parent down to the
-     * child. 
-     *
-     * @update  gess4/6/98
-     * @param   aParent -- tag type of parent
-     * @param   aChild -- tag type of child
-     * @return  True if closure was achieved -- other false
-     */
-    virtual PRBool ForwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag);
-
-    /**
-     * This method tries to design a context map (without actually
-     * changing our parser state) from the child up to the parent.
-     *
-     * @update  gess4/6/98
-     * @param   aParent -- tag type of parent
-     * @param   aChild -- tag type of child
-     * @return  True if closure was achieved -- other false
-     */
-    virtual PRBool BackwardPropagate(nsString& aVector,eHTMLTags aParentTag,eHTMLTags aChildTag) const;
-
+   
     /**
      * This method gets called when a start token has been consumed and needs 
      * to be handled (possibly added to content model via sink).
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 3ae28998d4f..c995d2d43da 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -107,8 +107,8 @@ static StrToUnicodeStruct gStrToUnicodeTable[] =
  *  @param   
  *  @return  
  */
-CHTMLToken::CHTMLToken(const nsString& aName) : CToken(aName) {
-  mTypeID=eHTMLTag_unknown;
+CHTMLToken::CHTMLToken(const nsString& aName,eHTMLTags aTag) : CToken(aName) {
+  mTypeID=aTag;
 }
 
 /*
@@ -154,7 +154,7 @@ CStartToken::CStartToken(eHTMLTags aTag) : CHTMLToken(aTag) {
  *  @param   
  *  @return  
  */
-CStartToken::CStartToken(nsString& aString) : CHTMLToken(aString) {
+CStartToken::CStartToken(nsString& aString,eHTMLTags aTag) : CHTMLToken(aString,aTag) {
   mAttributed=PR_FALSE;
   mEmpty=PR_FALSE;
 }
@@ -1357,7 +1357,9 @@ nsresult CSkippedContentToken::Consume(PRUnichar,CScanner& aScanner) {
     result=aScanner.ReadUntil(temp,terminals,PR_TRUE);
     done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
   }
-  mTextValue=temp;
+  int len=temp.Length();
+  temp.Truncate(len-mTextValue.Length());
+  mTextKey=temp;
   return result;
 }
 
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.h b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
index e92338685f3..b72f4232108 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
@@ -73,7 +73,7 @@ class CHTMLToken : public CToken {
 public:
 
                         CHTMLToken(eHTMLTags aTag);
-                        CHTMLToken(const nsString& aString);
+                        CHTMLToken(const nsString& aString,eHTMLTags aTag=eHTMLTag_unknown);
     virtual void        SetStringValue(const char* name);
 
 protected:
@@ -89,7 +89,7 @@ protected:
 class CStartToken: public CHTMLToken {
   public:
                         CStartToken(eHTMLTags aTag);
-                        CStartToken(nsString& aName);
+                        CStartToken(nsString& aName,eHTMLTags aTag=eHTMLTag_unknown);
     virtual nsresult    Consume(PRUnichar aChar,CScanner& aScanner);
     virtual PRInt32     GetTypeID(void);
     virtual const char* GetClassName(void);
diff --git a/mozilla/parser/htmlparser/src/nsParserNode.cpp b/mozilla/parser/htmlparser/src/nsParserNode.cpp
index b70cc7ad10f..c18127336e6 100644
--- a/mozilla/parser/htmlparser/src/nsParserNode.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserNode.cpp
@@ -183,7 +183,7 @@ const nsString& nsCParserNode::GetSkippedContent() const {
     if(mAttributes[mAttributeCount-1]) {
       CSkippedContentToken* sc=(CSkippedContentToken*)(mAttributes[mAttributeCount-1]);
       if(sc) {
-        return sc->GetStringValueXXX();
+        return sc->GetKey();
       }
     }
   }
diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp
index 6046f274ff1..9e55085071e 100644
--- a/mozilla/parser/htmlparser/src/nsScanner.cpp
+++ b/mozilla/parser/htmlparser/src/nsScanner.cpp
@@ -438,20 +438,20 @@ nsresult CScanner::ReadWhile(nsString& aString,
 nsresult CScanner::ReadUntil(nsString& aString,
                              nsString& aTerminalSet,
                              PRBool addTerminal){
-  PRUnichar ch=0;
-  nsresult   result=NS_OK;
+  PRUnichar theChar=0;
+  nsresult  result=NS_OK;
 
   while(NS_OK == result) {
-    result=GetChar(ch);
+    result=GetChar(theChar);
     if(NS_OK==result) {
-      PRInt32 pos=aTerminalSet.Find(ch);
+      PRInt32 pos=aTerminalSet.Find(theChar);
       if(kNotFound!=pos) {
         if(addTerminal)
-          aString+=ch;
-        else PutBack(ch);
+          aString+=theChar;
+        else PutBack(theChar);
         break;
       }
-      else aString+=ch;
+      else aString+=theChar;
     }
   }
   return result;