From f4a1d0123c41647f2f05aeaa2ae14bd1806fbb5c Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 17 Apr 2020 06:12:55 -0400 Subject: Bug 1375701 - Atomize class attribute value in the parser in the innerHTML case Tag #1375 --- .../java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java | 4 ++-- .../java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java | 2 +- .../java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java | 2 +- .../java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'parser/html/java/htmlparser/src') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java index 9a3dc16b2..be7576ff0 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java @@ -798,13 +798,13 @@ public abstract class MetaScanner { } if (contentIndex == CONTENT.length && content == null) { content = Portability.newStringFromBuffer(strBuf, 0, strBufLen - // CPPONLY: , treeBuilder + // CPPONLY: , treeBuilder, false ); return; } if (charsetIndex == CHARSET.length && charset == null) { charset = Portability.newStringFromBuffer(strBuf, 0, strBufLen - // CPPONLY: , treeBuilder + // CPPONLY: , treeBuilder, false ); return; } diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java index 2b3f96625..8f941ce01 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java @@ -42,7 +42,7 @@ public final class Portability { } public static String newStringFromBuffer(@NoLength char[] buf, int offset, int length - // CPPONLY: , TreeBuilder treeBuilder + // CPPONLY: , TreeBuilder treeBuilder, boolean maybeAtomize ) { return new String(buf, offset, length); } diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java index 996bd9ceb..3d617fd01 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java @@ -917,7 +917,7 @@ public class Tokenizer implements Locator { */ protected String strBufToString() { String str = Portability.newStringFromBuffer(strBuf, 0, strBufLen - // CPPONLY: , tokenHandler + // CPPONLY: , tokenHandler, !newAttributesEachTime && attributeName == AttributeName.CLASS ); clearStrBufAfterUse(); return str; diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java index cc60f4c4b..ef9576ee3 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java @@ -3337,7 +3337,7 @@ public abstract class TreeBuilder implements TokenHandler, } charset = Portability.newStringFromBuffer(buffer, start, end - start - // CPPONLY: , tb + // CPPONLY: , tb, false ); } return charset; -- cgit v1.2.3 From 5f12940329ba496da5730863cae94cd8c0b145da Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 17 Apr 2020 06:34:38 -0400 Subject: Bug 1396584 - Remove support for multiple ShadowRoots Tag #1375 --- .../nu/validator/htmlparser/impl/ElementName.java | 390 ++++++++++----------- 1 file changed, 192 insertions(+), 198 deletions(-) (limited to 'parser/html/java/htmlparser/src') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java index 4e1acea50..b8e1b944c 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java @@ -2215,10 +2215,6 @@ public final class ElementName // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); - public static final ElementName SHADOW = new ElementName("shadow", "shadow", - // CPPONLY: NS_NewHTMLShadowElement, - // CPPONLY: NS_NewSVGUnknownElement, - TreeBuilder.OTHER); public static final ElementName VIEW = new ElementName("view", "view", // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGViewElement, @@ -2274,19 +2270,19 @@ public final class ElementName private final static @NoLength ElementName[] ELEMENT_NAMES = { VKERN, LOGBASE, - FIELDSET, + FOREIGNOBJECT, DATA, LI, - COMPLEXES, - QUOTIENT, + CANVAS, + TT, PRE, ARTICLE, DIALOG, ARCTAN, LISTENER, - RATIONALS, - MROOT, - MATRIXROW, + REALS, + MOMENT, + MROW, GEQ, G, DD, @@ -2296,12 +2292,12 @@ public final class ElementName INTERVAL, MN, BR, - POWER, - MMULTISCRIPTS, - CONTENT, - INTERSECT, - RT, - TFOOT, + NOTANUMBER, + MPRESCRIPTS, + CARTESIANPRODUCT, + LT, + NEST, + SCRIPT, APPLY, COS, MTD, @@ -2321,18 +2317,18 @@ public final class ElementName OPTION, MALIGNGROUP, FECOMPONENTTRANSFER, - MERROR, - VECTOR, - IMPLIES, - PRIMES, - APPLET, - EMPTYSET, - FEPOINTLIGHT, - LOWLIMIT, - NOTSUBSET, - PRODUCT, - SELECT, - MENU, + MUNDEROVER, + SELECTOR, + EXISTS, + NATURALNUMBERS, + DT, + DATALIST, + FESPOTLIGHT, + LIMIT, + MTEXT, + OUTPUT, + ROOT, + VECTORPRODUCT, FECOLORMATRIX, INFINITY, BIG, @@ -2371,30 +2367,30 @@ public final class ElementName OPTGROUP, CENTER, FEGAUSSIANBLUR, - MOVER, - NOBR, - SOLIDCOLOR, - ADDRESS, - DETAILS, - MS, - NOFRAMES, - PLUS, - TIMES, - BASEFONT, - DETERMINANT, - FONT_FACE_FORMAT, - FEOFFSET, - FONT, - INPUT, - LIST, - MOMENTABOUT, - NOSCRIPT, - OUTERPRODUCT, - PLAINTEXT, - RADIALGRADIENT, - SUBSET, - UPLIMIT, - FEDROPSHADOW, + METER, + MLABELEDTR, + TR, + ARCCOS, + DEFS, + INTEGERS, + MINUS, + PROGRESS, + SEMANTICS, + ARCCOT, + GT, + EQUIVALENT, + FRAMESET, + FEDISTANTLIGHT, + IDENT, + LINEARGRADIENT, + MSQRT, + NOTPRSUBSET, + OBJECT, + PRSUBSET, + RECT, + SCALARPRODUCT, + TEXT, + SDEV, VIEW, ISINDEX, FEMORPHOLOGY, @@ -2472,54 +2468,54 @@ public final class ElementName FOOTER, HANDLER, MARKER, - MUNDEROVER, - MLABELEDTR, - NOTANUMBER, - TR, - SELECTOR, - ARCCOS, - CANVAS, - DEFS, - EXISTS, - INTEGERS, - MPRESCRIPTS, - MINUS, - NATURALNUMBERS, - PROGRESS, - REALS, - SEMANTICS, - DT, - ARCCOT, - CARTESIANPRODUCT, - GT, - DATALIST, - EQUIVALENT, - FOREIGNOBJECT, - FRAMESET, - FESPOTLIGHT, - FEDISTANTLIGHT, - LT, - IDENT, - LIMIT, - LINEARGRADIENT, - MOMENT, - MSQRT, - MTEXT, - NOTPRSUBSET, - NEST, - OBJECT, - OUTPUT, - PRSUBSET, - TT, - RECT, - ROOT, - SCALARPRODUCT, - SCRIPT, - TEXT, - VECTORPRODUCT, - SDEV, - MROW, - SHADOW, + MOVER, + MERROR, + NOBR, + POWER, + SOLIDCOLOR, + VECTOR, + ADDRESS, + COMPLEXES, + DETAILS, + IMPLIES, + MS, + MMULTISCRIPTS, + NOFRAMES, + PRIMES, + PLUS, + RATIONALS, + TIMES, + APPLET, + BASEFONT, + CONTENT, + DETERMINANT, + EMPTYSET, + FONT_FACE_FORMAT, + FIELDSET, + FEOFFSET, + FEPOINTLIGHT, + FONT, + INTERSECT, + INPUT, + LOWLIMIT, + LIST, + MROOT, + MOMENTABOUT, + NOTSUBSET, + NOSCRIPT, + RT, + OUTERPRODUCT, + PRODUCT, + PLAINTEXT, + QUOTIENT, + RADIALGRADIENT, + SELECT, + SUBSET, + TFOOT, + UPLIMIT, + MENU, + FEDROPSHADOW, + MATRIXROW, APPROX, FECONVOLVEMATRIX, MATRIX, @@ -2672,24 +2668,23 @@ public final class ElementName HEADER, OR, MUNDER, - METER, }; private final static int[] ELEMENT_HASHES = { 1909280949, 1753057319, - 2001349704, + 2001309869, 1681770564, 1818230786, - 1983002201, - 2007257240, + 1982935782, + 2006974466, 58773795, 1747176599, 1782357526, 1897999926, 1970938456, - 1990969577, - 2005181733, - 2055515017, + 1990969429, + 2005160150, + 2055514836, 54061139, 62390273, 1730150402, @@ -2699,12 +2694,12 @@ public final class ElementName 1868641064, 1902641154, 1963982850, - 1973040373, - 1988486813, - 1999917383, - 2002882873, - 2005925890, - 2008851557, + 1971981018, + 1988486811, + 1999745104, + 2002780162, + 2005766372, + 2008340774, 2082727685, 51965171, 57200451, @@ -2724,18 +2719,18 @@ public final class ElementName 1905563974, 1938171179, 1967788867, - 1971628838, - 1976348214, - 1986140359, - 1989812374, - 1998724870, - 2000825752, - 2001392796, - 2004557976, - 2005543977, - 2006560839, - 2008125638, - 2021937364, + 1971467002, + 1974775352, + 1984294038, + 1988972590, + 1998585858, + 2000525512, + 2001392795, + 2004557973, + 2005324101, + 2006329158, + 2007803172, + 2009706573, 2068523853, 2087049448, 51434643, @@ -2774,30 +2769,30 @@ public final class ElementName 1939219752, 1966223078, 1968053806, - 1971466997, - 1971938532, - 1974771450, - 1982173479, - 1983633431, - 1986527234, - 1988763672, - 1990074116, - 1991909525, - 1999397992, - 2000439531, - 2001281328, - 2001349736, - 2001495140, - 2003183333, - 2004719812, - 2005279787, - 2005719336, - 2006036556, - 2006896969, - 2007781534, - 2008165414, - 2009276567, - 2051837468, + 1971465813, + 1971703386, + 1973420034, + 1982106678, + 1983533124, + 1986351224, + 1988502165, + 1990037800, + 1991350601, + 1998883894, + 2000158722, + 2000965834, + 2001349720, + 2001392798, + 2003062853, + 2004635806, + 2005231925, + 2005543979, + 2006028454, + 2006592552, + 2007601444, + 2008133709, + 2008994116, + 2041712436, 2060065124, 2070023911, 2085266636, @@ -2875,54 +2870,54 @@ public final class ElementName 1967795958, 1968840263, 1971461414, - 1971467002, - 1971703386, - 1971981018, - 1973420034, - 1974775352, - 1982106678, - 1982935782, - 1983533124, - 1984294038, - 1986351224, - 1988486811, - 1988502165, - 1988972590, - 1990037800, - 1990969429, - 1991350601, - 1998585858, - 1998883894, - 1999745104, - 2000158722, - 2000525512, - 2000965834, - 2001309869, - 2001349720, - 2001392795, - 2001392798, - 2002780162, - 2003062853, - 2004557973, - 2004635806, - 2005160150, - 2005231925, - 2005324101, - 2005543979, - 2005766372, - 2006028454, - 2006329158, - 2006592552, - 2006974466, - 2007601444, - 2007803172, - 2008133709, - 2008340774, - 2008994116, - 2009706573, - 2041712436, - 2055514836, - 2058653206, + 1971466997, + 1971628838, + 1971938532, + 1973040373, + 1974771450, + 1976348214, + 1982173479, + 1983002201, + 1983633431, + 1986140359, + 1986527234, + 1988486813, + 1988763672, + 1989812374, + 1990074116, + 1990969577, + 1991909525, + 1998724870, + 1999397992, + 1999917383, + 2000439531, + 2000825752, + 2001281328, + 2001349704, + 2001349736, + 2001392796, + 2001495140, + 2002882873, + 2003183333, + 2004557976, + 2004719812, + 2005181733, + 2005279787, + 2005543977, + 2005719336, + 2005925890, + 2006036556, + 2006560839, + 2006896969, + 2007257240, + 2007781534, + 2008125638, + 2008165414, + 2008851557, + 2009276567, + 2021937364, + 2051837468, + 2055515017, 2066000646, 2068523856, 2072193862, @@ -3075,6 +3070,5 @@ public final class ElementName 1968836118, 1970798594, 1971457766, - 1971465813, }; } -- cgit v1.2.3 From 48f602e65b0bcb10e3a8367dbbb70185e2e33125 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 17 Apr 2020 06:37:28 -0400 Subject: Bug 1402941 - Add HTMLSlotElement Tag #1375 --- .../nu/validator/htmlparser/impl/ElementName.java | 350 +++++++++++---------- 1 file changed, 178 insertions(+), 172 deletions(-) (limited to 'parser/html/java/htmlparser/src') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java index b8e1b944c..5ab5a4ff8 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java @@ -2175,6 +2175,10 @@ public final class ElementName // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); + public static final ElementName SLOT = new ElementName("slot", "slot", + // CPPONLY: NS_NewHTMLSlotElement, + // CPPONLY: NS_NewSVGUnknownElement, + TreeBuilder.OTHER); public static final ElementName SCRIPT = new ElementName("script", "script", // CPPONLY: NS_NewHTMLScriptElement, // CPPONLY: NS_NewSVGScriptElement, @@ -2270,18 +2274,18 @@ public final class ElementName private final static @NoLength ElementName[] ELEMENT_NAMES = { VKERN, LOGBASE, - FOREIGNOBJECT, + FIELDSET, DATA, LI, - CANVAS, - TT, + COMPLEXES, + QUOTIENT, PRE, ARTICLE, DIALOG, ARCTAN, LISTENER, - REALS, - MOMENT, + RATIONALS, + MROOT, MROW, GEQ, G, @@ -2292,11 +2296,11 @@ public final class ElementName INTERVAL, MN, BR, - NOTANUMBER, - MPRESCRIPTS, - CARTESIANPRODUCT, - LT, - NEST, + POWER, + MMULTISCRIPTS, + CONTENT, + INTERSECT, + RT, SCRIPT, APPLY, COS, @@ -2317,17 +2321,17 @@ public final class ElementName OPTION, MALIGNGROUP, FECOMPONENTTRANSFER, - MUNDEROVER, - SELECTOR, - EXISTS, - NATURALNUMBERS, - DT, - DATALIST, - FESPOTLIGHT, - LIMIT, - MTEXT, - OUTPUT, - ROOT, + MERROR, + VECTOR, + IMPLIES, + PRIMES, + APPLET, + EMPTYSET, + FEPOINTLIGHT, + LOWLIMIT, + NOTSUBSET, + PRODUCT, + SELECT, VECTORPRODUCT, FECOLORMATRIX, INFINITY, @@ -2367,28 +2371,28 @@ public final class ElementName OPTGROUP, CENTER, FEGAUSSIANBLUR, - METER, - MLABELEDTR, - TR, - ARCCOS, - DEFS, - INTEGERS, - MINUS, - PROGRESS, - SEMANTICS, - ARCCOT, - GT, - EQUIVALENT, - FRAMESET, - FEDISTANTLIGHT, - IDENT, - LINEARGRADIENT, - MSQRT, - NOTPRSUBSET, - OBJECT, - PRSUBSET, - RECT, - SCALARPRODUCT, + MOVER, + NOBR, + SOLIDCOLOR, + ADDRESS, + DETAILS, + MS, + NOFRAMES, + PLUS, + TIMES, + BASEFONT, + DETERMINANT, + FONT_FACE_FORMAT, + FEOFFSET, + FONT, + INPUT, + LIST, + MOMENTABOUT, + NOSCRIPT, + OUTERPRODUCT, + PLAINTEXT, + RADIALGRADIENT, + SUBSET, TEXT, SDEV, VIEW, @@ -2468,49 +2472,49 @@ public final class ElementName FOOTER, HANDLER, MARKER, - MOVER, - MERROR, - NOBR, - POWER, - SOLIDCOLOR, - VECTOR, - ADDRESS, - COMPLEXES, - DETAILS, - IMPLIES, - MS, - MMULTISCRIPTS, - NOFRAMES, - PRIMES, - PLUS, - RATIONALS, - TIMES, - APPLET, - BASEFONT, - CONTENT, - DETERMINANT, - EMPTYSET, - FONT_FACE_FORMAT, - FIELDSET, - FEOFFSET, - FEPOINTLIGHT, - FONT, - INTERSECT, - INPUT, - LOWLIMIT, - LIST, - MROOT, - MOMENTABOUT, - NOTSUBSET, - NOSCRIPT, - RT, - OUTERPRODUCT, - PRODUCT, - PLAINTEXT, - QUOTIENT, - RADIALGRADIENT, - SELECT, - SUBSET, + MUNDEROVER, + MLABELEDTR, + NOTANUMBER, + TR, + SELECTOR, + ARCCOS, + CANVAS, + DEFS, + EXISTS, + INTEGERS, + MPRESCRIPTS, + MINUS, + NATURALNUMBERS, + PROGRESS, + REALS, + SEMANTICS, + DT, + ARCCOT, + CARTESIANPRODUCT, + GT, + DATALIST, + EQUIVALENT, + FOREIGNOBJECT, + FRAMESET, + FESPOTLIGHT, + FEDISTANTLIGHT, + LT, + IDENT, + LIMIT, + LINEARGRADIENT, + MOMENT, + MSQRT, + MTEXT, + NOTPRSUBSET, + NEST, + OBJECT, + OUTPUT, + PRSUBSET, + TT, + RECT, + ROOT, + SCALARPRODUCT, + SLOT, TFOOT, UPLIMIT, MENU, @@ -2668,22 +2672,23 @@ public final class ElementName HEADER, OR, MUNDER, + METER, }; private final static int[] ELEMENT_HASHES = { 1909280949, 1753057319, - 2001309869, + 2001349704, 1681770564, 1818230786, - 1982935782, - 2006974466, + 1983002201, + 2007257240, 58773795, 1747176599, 1782357526, 1897999926, 1970938456, - 1990969429, - 2005160150, + 1990969577, + 2005181733, 2055514836, 54061139, 62390273, @@ -2694,11 +2699,11 @@ public final class ElementName 1868641064, 1902641154, 1963982850, - 1971981018, - 1988486811, - 1999745104, - 2002780162, - 2005766372, + 1973040373, + 1988486813, + 1999917383, + 2002882873, + 2005925890, 2008340774, 2082727685, 51965171, @@ -2719,17 +2724,17 @@ public final class ElementName 1905563974, 1938171179, 1967788867, - 1971467002, - 1974775352, - 1984294038, - 1988972590, - 1998585858, - 2000525512, - 2001392795, - 2004557973, - 2005324101, - 2006329158, - 2007803172, + 1971628838, + 1976348214, + 1986140359, + 1989812374, + 1998724870, + 2000825752, + 2001392796, + 2004557976, + 2005543977, + 2006560839, + 2008125638, 2009706573, 2068523853, 2087049448, @@ -2769,28 +2774,28 @@ public final class ElementName 1939219752, 1966223078, 1968053806, - 1971465813, - 1971703386, - 1973420034, - 1982106678, - 1983533124, - 1986351224, - 1988502165, - 1990037800, - 1991350601, - 1998883894, - 2000158722, - 2000965834, - 2001349720, - 2001392798, - 2003062853, - 2004635806, - 2005231925, - 2005543979, - 2006028454, - 2006592552, - 2007601444, - 2008133709, + 1971466997, + 1971938532, + 1974771450, + 1982173479, + 1983633431, + 1986527234, + 1988763672, + 1990074116, + 1991909525, + 1999397992, + 2000439531, + 2001281328, + 2001349736, + 2001495140, + 2003183333, + 2004719812, + 2005279787, + 2005719336, + 2006036556, + 2006896969, + 2007781534, + 2008165414, 2008994116, 2041712436, 2060065124, @@ -2870,49 +2875,49 @@ public final class ElementName 1967795958, 1968840263, 1971461414, - 1971466997, - 1971628838, - 1971938532, - 1973040373, - 1974771450, - 1976348214, - 1982173479, - 1983002201, - 1983633431, - 1986140359, - 1986527234, - 1988486813, - 1988763672, - 1989812374, - 1990074116, - 1990969577, - 1991909525, - 1998724870, - 1999397992, - 1999917383, - 2000439531, - 2000825752, - 2001281328, - 2001349704, - 2001349736, - 2001392796, - 2001495140, - 2002882873, - 2003183333, - 2004557976, - 2004719812, - 2005181733, - 2005279787, - 2005543977, - 2005719336, - 2005925890, - 2006036556, - 2006560839, - 2006896969, - 2007257240, - 2007781534, - 2008125638, - 2008165414, + 1971467002, + 1971703386, + 1971981018, + 1973420034, + 1974775352, + 1982106678, + 1982935782, + 1983533124, + 1984294038, + 1986351224, + 1988486811, + 1988502165, + 1988972590, + 1990037800, + 1990969429, + 1991350601, + 1998585858, + 1998883894, + 1999745104, + 2000158722, + 2000525512, + 2000965834, + 2001309869, + 2001349720, + 2001392795, + 2001392798, + 2002780162, + 2003062853, + 2004557973, + 2004635806, + 2005160150, + 2005231925, + 2005324101, + 2005543979, + 2005766372, + 2006028454, + 2006329158, + 2006592552, + 2006974466, + 2007601444, + 2007803172, + 2008133709, + 2008325940, 2008851557, 2009276567, 2021937364, @@ -3070,5 +3075,6 @@ public final class ElementName 1968836118, 1970798594, 1971457766, + 1971465813, }; } -- cgit v1.2.3 From 8beb65dd501cbdcfd6a793027b5de2a1fdfc7149 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 17 Apr 2020 07:08:22 -0400 Subject: Bug 1418002 - Remove HTMLContentElement Tag #1375 --- .../nu/validator/htmlparser/impl/ElementName.java | 162 ++++++++++----------- 1 file changed, 78 insertions(+), 84 deletions(-) (limited to 'parser/html/java/htmlparser/src') diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java index 5ab5a4ff8..4b87d3fde 100644 --- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java +++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java @@ -1987,10 +1987,6 @@ public final class ElementName // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGUnknownElement, TreeBuilder.OTHER); - public static final ElementName CONTENT = new ElementName("content", "content", - // CPPONLY: NS_NewHTMLContentElement, - // CPPONLY: NS_NewSVGUnknownElement, - TreeBuilder.OTHER); public static final ElementName GT = new ElementName("gt", "gt", // CPPONLY: NS_NewHTMLUnknownElement, // CPPONLY: NS_NewSVGUnknownElement, @@ -2277,14 +2273,14 @@ public final class ElementName FIELDSET, DATA, LI, - COMPLEXES, + CANVAS, QUOTIENT, PRE, ARTICLE, DIALOG, ARCTAN, LISTENER, - RATIONALS, + REALS, MROOT, MROW, GEQ, @@ -2296,9 +2292,9 @@ public final class ElementName INTERVAL, MN, BR, - POWER, - MMULTISCRIPTS, - CONTENT, + NOTANUMBER, + MPRESCRIPTS, + CARTESIANPRODUCT, INTERSECT, RT, SCRIPT, @@ -2321,11 +2317,11 @@ public final class ElementName OPTION, MALIGNGROUP, FECOMPONENTTRANSFER, - MERROR, - VECTOR, - IMPLIES, - PRIMES, - APPLET, + MUNDEROVER, + SELECTOR, + EXISTS, + NATURALNUMBERS, + DT, EMPTYSET, FEPOINTLIGHT, LOWLIMIT, @@ -2371,16 +2367,16 @@ public final class ElementName OPTGROUP, CENTER, FEGAUSSIANBLUR, - MOVER, - NOBR, - SOLIDCOLOR, - ADDRESS, - DETAILS, - MS, - NOFRAMES, - PLUS, - TIMES, - BASEFONT, + METER, + MLABELEDTR, + TR, + ARCCOS, + DEFS, + INTEGERS, + MINUS, + PROGRESS, + SEMANTICS, + ARCCOT, DETERMINANT, FONT_FACE_FORMAT, FEOFFSET, @@ -2472,25 +2468,25 @@ public final class ElementName FOOTER, HANDLER, MARKER, - MUNDEROVER, - MLABELEDTR, - NOTANUMBER, - TR, - SELECTOR, - ARCCOS, - CANVAS, - DEFS, - EXISTS, - INTEGERS, - MPRESCRIPTS, - MINUS, - NATURALNUMBERS, - PROGRESS, - REALS, - SEMANTICS, - DT, - ARCCOT, - CARTESIANPRODUCT, + MOVER, + MERROR, + NOBR, + POWER, + SOLIDCOLOR, + VECTOR, + ADDRESS, + COMPLEXES, + DETAILS, + IMPLIES, + MS, + MMULTISCRIPTS, + NOFRAMES, + PRIMES, + PLUS, + RATIONALS, + TIMES, + APPLET, + BASEFONT, GT, DATALIST, EQUIVALENT, @@ -2672,7 +2668,6 @@ public final class ElementName HEADER, OR, MUNDER, - METER, }; private final static int[] ELEMENT_HASHES = { 1909280949, @@ -2680,14 +2675,14 @@ public final class ElementName 2001349704, 1681770564, 1818230786, - 1983002201, + 1982935782, 2007257240, 58773795, 1747176599, 1782357526, 1897999926, 1970938456, - 1990969577, + 1990969429, 2005181733, 2055514836, 54061139, @@ -2699,9 +2694,9 @@ public final class ElementName 1868641064, 1902641154, 1963982850, - 1973040373, - 1988486813, - 1999917383, + 1971981018, + 1988486811, + 1999745104, 2002882873, 2005925890, 2008340774, @@ -2724,11 +2719,11 @@ public final class ElementName 1905563974, 1938171179, 1967788867, - 1971628838, - 1976348214, - 1986140359, - 1989812374, - 1998724870, + 1971467002, + 1974775352, + 1984294038, + 1988972590, + 1998585858, 2000825752, 2001392796, 2004557976, @@ -2774,16 +2769,16 @@ public final class ElementName 1939219752, 1966223078, 1968053806, - 1971466997, - 1971938532, - 1974771450, - 1982173479, - 1983633431, - 1986527234, - 1988763672, - 1990074116, - 1991909525, - 1999397992, + 1971465813, + 1971703386, + 1973420034, + 1982106678, + 1983533124, + 1986351224, + 1988502165, + 1990037800, + 1991350601, + 1998883894, 2000439531, 2001281328, 2001349736, @@ -2875,25 +2870,25 @@ public final class ElementName 1967795958, 1968840263, 1971461414, - 1971467002, - 1971703386, - 1971981018, - 1973420034, - 1974775352, - 1982106678, - 1982935782, - 1983533124, - 1984294038, - 1986351224, - 1988486811, - 1988502165, - 1988972590, - 1990037800, - 1990969429, - 1991350601, - 1998585858, - 1998883894, - 1999745104, + 1971466997, + 1971628838, + 1971938532, + 1973040373, + 1974771450, + 1976348214, + 1982173479, + 1983002201, + 1983633431, + 1986140359, + 1986527234, + 1988486813, + 1988763672, + 1989812374, + 1990074116, + 1990969577, + 1991909525, + 1998724870, + 1999397992, 2000158722, 2000525512, 2000965834, @@ -3075,6 +3070,5 @@ public final class ElementName 1968836118, 1970798594, 1971457766, - 1971465813, }; } -- cgit v1.2.3