зеркало из https://github.com/mozilla/gecko-dev.git
fixed bugs 4041 and 8047
This commit is contained in:
rickg%netscape.com
Родитель
1e65a8281c
Коммит
02ec2986df
|
|
@ -1984,6 +1984,7 @@ PRBool CNavDTD::CanOmit(eHTMLTags aParent,eHTMLTags aChild) const {
|
|||
return PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -2005,7 +2006,7 @@ PRBool CNavDTD::IsContainer(PRInt32 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.
|
||||
|
|
|
|||
|
|
@ -438,7 +438,7 @@ nsHTMLElement gHTMLElements[] = {
|
|||
/*rootnodes,endrootnodes*/ &gRootTags, &gRootTags,
|
||||
/*autoclose starttags and endtags*/ &gDTCloseTags,0,0,
|
||||
/*parent,incl,exclgroups*/ kInlineEntity, kFlowEntity, kNone,
|
||||
/*special props, prop-range*/ kNoPropagate,kDefaultPropRange,
|
||||
/*special props, prop-range*/ kNoPropagate|kMustCloseSelf,kDefaultPropRange,
|
||||
/*special parents,kids,skip*/ &gInDL,0,eHTMLTag_unknown},
|
||||
|
||||
{ /*tag*/ eHTMLTag_del,
|
||||
|
|
@ -549,7 +549,7 @@ nsHTMLElement gHTMLElements[] = {
|
|||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_body,
|
||||
/*rootnodes,endrootnodes*/ &gFramesetParents,&gInHTML,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,
|
||||
/*parent,incl,exclgroups*/ kHTMLContent, kSelf, kNone,
|
||||
/*parent,incl,exclgroups*/ kHTMLContent, kSelf, kAllTags,
|
||||
/*special props, prop-range*/ kOmitWS|kNoPropagate|kNoStyleLeaksIn, kNoPropRange,
|
||||
/*special parents,kids,skip*/ &gInHTML,&gFramesetKids,eHTMLTag_unknown},
|
||||
|
||||
|
|
@ -1147,7 +1147,7 @@ nsHTMLElement gHTMLElements[] = {
|
|||
/*special parents,kids,skip*/ 0,0,eHTMLTag_xmp},
|
||||
|
||||
{ /*tag*/ eHTMLTag_text,
|
||||
/*req-parent excl-parent*/ eHTMLTag_body,eHTMLTag_unknown,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
/*rootnodes,endrootnodes*/ &gInBody,&gInBody,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,
|
||||
/*parent,incl,exclgroups*/ kFlowEntity, kNone, kNone,
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ static const int kTable = 0x10000;// TR,TD,THEAD,TBODY,TFOOT,CAPTION,TH
|
|||
static const int kInlineEntity = (kPCDATA|kFontStyle|kPhrase|kSpecial|kFormControl|kExtensions); // #PCDATA, %fontstyle, %phrase, %special, %formctrl
|
||||
static const int kBlockEntity = (kHeading|kList|kPreformatted|kBlock); // %heading, %list, %preformatted, %blockmisc
|
||||
static const int kFlowEntity = (kBlockEntity|kInlineEntity); // %block, %inline
|
||||
static const int kAllTags = 0xffffff;
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1984,6 +1984,7 @@ PRBool CNavDTD::CanOmit(eHTMLTags aParent,eHTMLTags aChild) const {
|
|||
return PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -2005,7 +2006,7 @@ PRBool CNavDTD::IsContainer(PRInt32 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.
|
||||
|
|
|
|||
|
|
@ -438,7 +438,7 @@ nsHTMLElement gHTMLElements[] = {
|
|||
/*rootnodes,endrootnodes*/ &gRootTags, &gRootTags,
|
||||
/*autoclose starttags and endtags*/ &gDTCloseTags,0,0,
|
||||
/*parent,incl,exclgroups*/ kInlineEntity, kFlowEntity, kNone,
|
||||
/*special props, prop-range*/ kNoPropagate,kDefaultPropRange,
|
||||
/*special props, prop-range*/ kNoPropagate|kMustCloseSelf,kDefaultPropRange,
|
||||
/*special parents,kids,skip*/ &gInDL,0,eHTMLTag_unknown},
|
||||
|
||||
{ /*tag*/ eHTMLTag_del,
|
||||
|
|
@ -549,7 +549,7 @@ nsHTMLElement gHTMLElements[] = {
|
|||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_body,
|
||||
/*rootnodes,endrootnodes*/ &gFramesetParents,&gInHTML,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,
|
||||
/*parent,incl,exclgroups*/ kHTMLContent, kSelf, kNone,
|
||||
/*parent,incl,exclgroups*/ kHTMLContent, kSelf, kAllTags,
|
||||
/*special props, prop-range*/ kOmitWS|kNoPropagate|kNoStyleLeaksIn, kNoPropRange,
|
||||
/*special parents,kids,skip*/ &gInHTML,&gFramesetKids,eHTMLTag_unknown},
|
||||
|
||||
|
|
@ -1147,7 +1147,7 @@ nsHTMLElement gHTMLElements[] = {
|
|||
/*special parents,kids,skip*/ 0,0,eHTMLTag_xmp},
|
||||
|
||||
{ /*tag*/ eHTMLTag_text,
|
||||
/*req-parent excl-parent*/ eHTMLTag_body,eHTMLTag_unknown,
|
||||
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
|
||||
/*rootnodes,endrootnodes*/ &gInBody,&gInBody,
|
||||
/*autoclose starttags and endtags*/ 0,0,0,
|
||||
/*parent,incl,exclgroups*/ kFlowEntity, kNone, kNone,
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ static const int kTable = 0x10000;// TR,TD,THEAD,TBODY,TFOOT,CAPTION,TH
|
|||
static const int kInlineEntity = (kPCDATA|kFontStyle|kPhrase|kSpecial|kFormControl|kExtensions); // #PCDATA, %fontstyle, %phrase, %special, %formctrl
|
||||
static const int kBlockEntity = (kHeading|kList|kPreformatted|kBlock); // %heading, %list, %preformatted, %blockmisc
|
||||
static const int kFlowEntity = (kBlockEntity|kInlineEntity); // %block, %inline
|
||||
static const int kAllTags = 0xffffff;
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче