зеркало из https://github.com/mozilla/pjs.git
Bug 44458, enable XHTML entities when an XHTML doctype with public id is present in an XML document. r=rbs@maths.uq.edu.au, sr=jst.
This commit is contained in:
heikki%netscape.com
Родитель
60b676ca4d
Коммит
71ac1f4761
|
|
@ -191,6 +191,9 @@ sub InstallNonChromeResources()
|
|||
#//
|
||||
#// Make aliases of resource files
|
||||
#//
|
||||
|
||||
MakeAlias(":mozilla:content:xml:content:src:xhtml11.dtd", "$dist_dir"."dtd:");
|
||||
|
||||
if (! $main::options{mathml})
|
||||
{
|
||||
MakeAlias(":mozilla:layout:html:document:src:ua.css", "$resource_dir");
|
||||
|
|
|
|||
|
|
@ -64,3 +64,8 @@ INCLUDES += \
|
|||
-I$(srcdir)/../../../base/src \
|
||||
$(NULL)
|
||||
|
||||
EXPORT_RESOURCE_CONTENT = \
|
||||
$(srcdir)/xhtml11.dtd \
|
||||
$(NULL)
|
||||
libs::
|
||||
$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ include <$(DEPTH)\config\rules.mak>
|
|||
|
||||
libs:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
$(MAKE_INSTALL) xhtml11.dtd $(DIST)\bin\dtd
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
|
|
|||
|
|
@ -288,9 +288,6 @@ nsXMLElement::SetAttr(nsINodeInfo *aNodeInfo,
|
|||
// we do not need to check other attributes. If there
|
||||
// is no href attribute, then this link is simply
|
||||
// untraversible [XLink 3.2].
|
||||
// XXX If a parent of this element is already a simple link, then this
|
||||
// must not create a link of its own, this is just a normal element
|
||||
// inside the parent simple XLink element [XLink 3.2].
|
||||
mIsLink = PR_TRUE;
|
||||
} else {
|
||||
mIsLink = PR_FALSE;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,284 @@
|
|||
<!--
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 2000 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
-->
|
||||
|
||||
<!--
|
||||
* Predefined HTML entities to be loaded when parsing XHTML documents.
|
||||
* The contents match mozilla/htmlparser/src/nsHTMLEntityList.h,
|
||||
* except that Navigator entity extensions are not included.
|
||||
-->
|
||||
|
||||
<!-- ISO 8859-1 entities -->
|
||||
<!ENTITY nbsp " ">
|
||||
<!ENTITY iexcl "¡">
|
||||
<!ENTITY cent "¢">
|
||||
<!ENTITY pound "£">
|
||||
<!ENTITY curren "¤">
|
||||
<!ENTITY yen "¥">
|
||||
<!ENTITY brvbar "¦">
|
||||
<!ENTITY sect "§">
|
||||
<!ENTITY uml "¨">
|
||||
<!ENTITY copy "©">
|
||||
<!ENTITY ordf "ª">
|
||||
<!ENTITY laquo "«">
|
||||
<!ENTITY not "¬">
|
||||
<!ENTITY shy "­">
|
||||
<!ENTITY reg "®">
|
||||
<!ENTITY macr "¯">
|
||||
<!ENTITY deg "°">
|
||||
<!ENTITY plusmn "±">
|
||||
<!ENTITY sup2 "²">
|
||||
<!ENTITY sup3 "³">
|
||||
<!ENTITY acute "´">
|
||||
<!ENTITY micro "µ">
|
||||
<!ENTITY para "¶">
|
||||
<!ENTITY middot "·">
|
||||
<!ENTITY cedil "¸">
|
||||
<!ENTITY sup1 "¹">
|
||||
<!ENTITY ordm "º">
|
||||
<!ENTITY raquo "»">
|
||||
<!ENTITY frac14 "¼">
|
||||
<!ENTITY frac12 "½">
|
||||
<!ENTITY frac34 "¾">
|
||||
<!ENTITY iquest "¿">
|
||||
<!ENTITY Agrave "À">
|
||||
<!ENTITY Aacute "Á">
|
||||
<!ENTITY Acirc "Â">
|
||||
<!ENTITY Atilde "Ã">
|
||||
<!ENTITY Auml "Ä">
|
||||
<!ENTITY Aring "Å">
|
||||
<!ENTITY AElig "Æ">
|
||||
<!ENTITY Ccedil "Ç">
|
||||
<!ENTITY Egrave "È">
|
||||
<!ENTITY Eacute "É">
|
||||
<!ENTITY Ecirc "Ê">
|
||||
<!ENTITY Euml "Ë">
|
||||
<!ENTITY Igrave "Ì">
|
||||
<!ENTITY Iacute "Í">
|
||||
<!ENTITY Icirc "Î">
|
||||
<!ENTITY Iuml "Ï">
|
||||
<!ENTITY ETH "Ð">
|
||||
<!ENTITY Ntilde "Ñ">
|
||||
<!ENTITY Ograve "Ò">
|
||||
<!ENTITY Oacute "Ó">
|
||||
<!ENTITY Ocirc "Ô">
|
||||
<!ENTITY Otilde "Õ">
|
||||
<!ENTITY Ouml "Ö">
|
||||
<!ENTITY times "×">
|
||||
<!ENTITY Oslash "Ø">
|
||||
<!ENTITY Ugrave "Ù">
|
||||
<!ENTITY Uacute "Ú">
|
||||
<!ENTITY Ucirc "Û">
|
||||
<!ENTITY Uuml "Ü">
|
||||
<!ENTITY Yacute "Ý">
|
||||
<!ENTITY THORN "Þ">
|
||||
<!ENTITY szlig "ß">
|
||||
<!ENTITY agrave "à">
|
||||
<!ENTITY aacute "á">
|
||||
<!ENTITY acirc "â">
|
||||
<!ENTITY atilde "ã">
|
||||
<!ENTITY auml "ä">
|
||||
<!ENTITY aring "å">
|
||||
<!ENTITY aelig "æ">
|
||||
<!ENTITY ccedil "ç">
|
||||
<!ENTITY egrave "è">
|
||||
<!ENTITY eacute "é">
|
||||
<!ENTITY ecirc "ê">
|
||||
<!ENTITY euml "ë">
|
||||
<!ENTITY igrave "ì">
|
||||
<!ENTITY iacute "í">
|
||||
<!ENTITY icirc "î">
|
||||
<!ENTITY iuml "ï">
|
||||
<!ENTITY eth "ð">
|
||||
<!ENTITY ntilde "ñ">
|
||||
<!ENTITY ograve "ò">
|
||||
<!ENTITY oacute "ó">
|
||||
<!ENTITY ocirc "ô">
|
||||
<!ENTITY otilde "õ">
|
||||
<!ENTITY ouml "ö">
|
||||
<!ENTITY divide "÷">
|
||||
<!ENTITY oslash "ø">
|
||||
<!ENTITY ugrave "ù">
|
||||
<!ENTITY uacute "ú">
|
||||
<!ENTITY ucirc "û">
|
||||
<!ENTITY uuml "ü">
|
||||
<!ENTITY yacute "ý">
|
||||
<!ENTITY thorn "þ">
|
||||
<!ENTITY yuml "ÿ">
|
||||
|
||||
<!-- Mathematical symbols and Greek letters -->
|
||||
<!ENTITY fnof "ƒ">
|
||||
<!ENTITY Alpha "Α">
|
||||
<!ENTITY Beta "Β">
|
||||
<!ENTITY Gamma "Γ">
|
||||
<!ENTITY Delta "Δ">
|
||||
<!ENTITY Epsilon "Ε">
|
||||
<!ENTITY Zeta "Ζ">
|
||||
<!ENTITY Eta "Η">
|
||||
<!ENTITY Theta "Θ">
|
||||
<!ENTITY Iota "Ι">
|
||||
<!ENTITY Kappa "Κ">
|
||||
<!ENTITY Lambda "Λ">
|
||||
<!ENTITY Mu "Μ">
|
||||
<!ENTITY Nu "Ν">
|
||||
<!ENTITY Xi "Ξ">
|
||||
<!ENTITY Omicron "Ο">
|
||||
<!ENTITY Pi "Π">
|
||||
<!ENTITY Rho "Ρ">
|
||||
<!ENTITY Sigma "Σ">
|
||||
<!ENTITY Tau "Τ">
|
||||
<!ENTITY Upsilon "Υ">
|
||||
<!ENTITY Phi "Φ">
|
||||
<!ENTITY Chi "Χ">
|
||||
<!ENTITY Psi "Ψ">
|
||||
<!ENTITY Omega "Ω">
|
||||
<!ENTITY alpha "α">
|
||||
<!ENTITY beta "β">
|
||||
<!ENTITY gamma "γ">
|
||||
<!ENTITY delta "δ">
|
||||
<!ENTITY epsilon "ε">
|
||||
<!ENTITY zeta "ζ">
|
||||
<!ENTITY eta "η">
|
||||
<!ENTITY theta "θ">
|
||||
<!ENTITY iota "ι">
|
||||
<!ENTITY kappa "κ">
|
||||
<!ENTITY lambda "λ">
|
||||
<!ENTITY mu "μ">
|
||||
<!ENTITY nu "ν">
|
||||
<!ENTITY xi "ξ">
|
||||
<!ENTITY omicron "ο">
|
||||
<!ENTITY pi "π">
|
||||
<!ENTITY rho "ρ">
|
||||
<!ENTITY sigmaf "ς">
|
||||
<!ENTITY sigma "σ">
|
||||
<!ENTITY tau "τ">
|
||||
<!ENTITY upsilon "υ">
|
||||
<!ENTITY phi "φ">
|
||||
<!ENTITY chi "χ">
|
||||
<!ENTITY psi "ψ">
|
||||
<!ENTITY omega "ω">
|
||||
<!ENTITY thetasym "ϑ">
|
||||
<!ENTITY upsih "ϒ">
|
||||
<!ENTITY piv "ϖ">
|
||||
<!ENTITY bull "•">
|
||||
<!ENTITY hellip "…">
|
||||
<!ENTITY prime "′">
|
||||
<!ENTITY Prime "″">
|
||||
<!ENTITY oline "‾">
|
||||
<!ENTITY frasl "⁄">
|
||||
<!ENTITY weierp "℘">
|
||||
<!ENTITY image "ℑ">
|
||||
<!ENTITY real "ℜ">
|
||||
<!ENTITY trade "™">
|
||||
<!ENTITY alefsym "ℵ">
|
||||
<!ENTITY larr "←">
|
||||
<!ENTITY uarr "↑">
|
||||
<!ENTITY rarr "→">
|
||||
<!ENTITY darr "↓">
|
||||
<!ENTITY harr "↔">
|
||||
<!ENTITY crarr "↵">
|
||||
<!ENTITY lArr "⇐">
|
||||
<!ENTITY uArr "⇑">
|
||||
<!ENTITY rArr "⇒">
|
||||
<!ENTITY dArr "⇓">
|
||||
<!ENTITY hArr "⇔">
|
||||
<!ENTITY forall "∀">
|
||||
<!ENTITY part "∂">
|
||||
<!ENTITY exist "∃">
|
||||
<!ENTITY empty "∅">
|
||||
<!ENTITY nabla "∇">
|
||||
<!ENTITY isin "∈">
|
||||
<!ENTITY notin "∉">
|
||||
<!ENTITY ni "∋">
|
||||
<!ENTITY prod "∏">
|
||||
<!ENTITY sum "∑">
|
||||
<!ENTITY minus "−">
|
||||
<!ENTITY lowast "∗">
|
||||
<!ENTITY radic "√">
|
||||
<!ENTITY prop "∝">
|
||||
<!ENTITY infin "∞">
|
||||
<!ENTITY ang "∠">
|
||||
<!ENTITY and "∧">
|
||||
<!ENTITY or "∨">
|
||||
<!ENTITY cap "∩">
|
||||
<!ENTITY cup "∪">
|
||||
<!ENTITY int "∫">
|
||||
<!ENTITY there4 "∴">
|
||||
<!ENTITY sim "∼">
|
||||
<!ENTITY cong "≅">
|
||||
<!ENTITY asymp "≈">
|
||||
<!ENTITY ne "≠">
|
||||
<!ENTITY equiv "≡">
|
||||
<!ENTITY le "≤">
|
||||
<!ENTITY ge "≥">
|
||||
<!ENTITY sub "⊂">
|
||||
<!ENTITY sup "⊃">
|
||||
<!ENTITY nsub "⊄">
|
||||
<!ENTITY sube "⊆">
|
||||
<!ENTITY supe "⊇">
|
||||
<!ENTITY oplus "⊕">
|
||||
<!ENTITY otimes "⊗">
|
||||
<!ENTITY perp "⊥">
|
||||
<!ENTITY sdot "⋅">
|
||||
<!ENTITY lceil "⌈">
|
||||
<!ENTITY rceil "⌉">
|
||||
<!ENTITY lfloor "⌊">
|
||||
<!ENTITY rfloor "⌋">
|
||||
<!ENTITY lang "〈">
|
||||
<!ENTITY rang "〉">
|
||||
<!ENTITY loz "◊">
|
||||
<!ENTITY spades "♠">
|
||||
<!ENTITY clubs "♣">
|
||||
<!ENTITY hearts "♥">
|
||||
<!ENTITY diams "♦">
|
||||
|
||||
<!-- Markup-significant and internationalization characters -->
|
||||
<!ENTITY quot """>
|
||||
<!ENTITY amp "&">
|
||||
<!ENTITY lt "<">
|
||||
<!ENTITY gt ">">
|
||||
<!ENTITY OElig "Œ">
|
||||
<!ENTITY oelig "œ">
|
||||
<!ENTITY Scaron "Š">
|
||||
<!ENTITY scaron "š">
|
||||
<!ENTITY Yuml "Ÿ">
|
||||
<!ENTITY circ "ˆ">
|
||||
<!ENTITY tilde "˜">
|
||||
<!ENTITY ensp " ">
|
||||
<!ENTITY emsp " ">
|
||||
<!ENTITY thinsp " ">
|
||||
<!ENTITY zwnj "‌">
|
||||
<!ENTITY zwj "‍">
|
||||
<!ENTITY lrm "‎">
|
||||
<!ENTITY rlm "‏">
|
||||
<!ENTITY ndash "–">
|
||||
<!ENTITY mdash "—">
|
||||
<!ENTITY lsquo "‘">
|
||||
<!ENTITY rsquo "’">
|
||||
<!ENTITY sbquo "‚">
|
||||
<!ENTITY ldquo "“">
|
||||
<!ENTITY rdquo "”">
|
||||
<!ENTITY bdquo "„">
|
||||
<!ENTITY dagger "†">
|
||||
<!ENTITY Dagger "‡">
|
||||
<!ENTITY permil "‰">
|
||||
<!ENTITY lsaquo "‹">
|
||||
<!ENTITY rsaquo "›">
|
||||
<!ENTITY euro "€">
|
||||
|
|
@ -403,9 +403,15 @@ struct nsCatalogEntry {
|
|||
const char* mLocalDTD;
|
||||
};
|
||||
|
||||
// The order of this table is guestimated to be in the optimum order
|
||||
static const nsCatalogEntry kCatalogTable[] = {
|
||||
{"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "mathml.dtd"},
|
||||
{"-//W3C//DTD SVG 20001102//EN", "svg.dtd"},
|
||||
{"-//W3C//DTD XHTML 1.0 Transitional//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.1//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.0 Strict//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.0 Frameset//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML Basic 1.0//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "mathml.dtd" },
|
||||
{"-//W3C//DTD SVG 20001102//EN", "svg.dtd" },
|
||||
{nsnull, nsnull}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -403,9 +403,15 @@ struct nsCatalogEntry {
|
|||
const char* mLocalDTD;
|
||||
};
|
||||
|
||||
// The order of this table is guestimated to be in the optimum order
|
||||
static const nsCatalogEntry kCatalogTable[] = {
|
||||
{"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "mathml.dtd"},
|
||||
{"-//W3C//DTD SVG 20001102//EN", "svg.dtd"},
|
||||
{"-//W3C//DTD XHTML 1.0 Transitional//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.1//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.0 Strict//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.0 Frameset//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML Basic 1.0//EN", "xhtml11.dtd" },
|
||||
{"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN", "mathml.dtd" },
|
||||
{"-//W3C//DTD SVG 20001102//EN", "svg.dtd" },
|
||||
{nsnull, nsnull}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -246,6 +246,7 @@ viewer:defaults:wallet:DistinguishedSchema.tbl
|
|||
viewer:defaults:wallet:SchemaStrings.tbl
|
||||
viewer:defaults:wallet:PositionalSchema.tbl
|
||||
viewer:defaults:wallet:StateSchema.tbl
|
||||
viewer:dtd:*
|
||||
viewer:res:html:*
|
||||
viewer:res:html.css
|
||||
viewer:res:quirk.css
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@ bin/res/rdf/folder-open.gif
|
|||
bin/res/rdf/loading.gif
|
||||
bin/res/ua.css
|
||||
bin/res/forms.css
|
||||
bin/dtd/*
|
||||
;debug menus reference samples dir - remove for actual releases:
|
||||
bin/res/samples/*
|
||||
bin/res/builtin/htmlBindings.xml
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@ bin\res\loading-image.gif
|
|||
bin\res\broken-image.gif
|
||||
bin\res\html\*
|
||||
bin\res\fonts\*
|
||||
bin\dtd\*
|
||||
bin\defaults\wallet\VcardSchema.tbl
|
||||
bin\defaults\wallet\FieldSchema.tbl
|
||||
bin\defaults\wallet\SchemaConcat.tbl
|
||||
|
|
|
|||
|
|
@ -295,6 +295,7 @@ bin/res/rdf/folder-open.gif
|
|||
bin/res/rdf/loading.gif
|
||||
bin/res/ua.css
|
||||
bin/res/forms.css
|
||||
bin/dtd/*
|
||||
;debug menus reference samples dir - remove for actual releases:
|
||||
bin/res/samples/*
|
||||
bin/res/builtin/htmlBindings.xml
|
||||
|
|
|
|||
|
|
@ -291,6 +291,7 @@ bin\res\loading-image.gif
|
|||
bin\res\broken-image.gif
|
||||
bin\res\html\*
|
||||
bin\res\fonts\*
|
||||
bin\dtd\*
|
||||
bin\defaults\wallet\VcardSchema.tbl
|
||||
bin\defaults\wallet\FieldSchema.tbl
|
||||
bin\defaults\wallet\SchemaConcat.tbl
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче