You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/10/09 18:16:19 UTC
[maven-doxia] branch DOXIA-676 updated (377c8e6e -> 61000025)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIA-676
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
discard 377c8e6e [DOXIA-676] Remove all obsolete elements in HTML5 and add new ones
new 61000025 [DOXIA-676] Remove all obsolete elements in HTML5 and add new ones
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (377c8e6e)
\
N -- N -- N refs/heads/DOXIA-676 (61000025)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven-doxia] 01/01: [DOXIA-676] Remove all obsolete elements in HTML5 and add new ones
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-676
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 61000025f4195b5ecf56317f28c84396ac540eb1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 2 01:15:46 2022 +0200
[DOXIA-676] Remove all obsolete elements in HTML5 and add new ones
This closes #124
---
.../org/apache/maven/doxia/markup/HtmlMarkup.java | 305 ++++++++++-----------
.../org/apache/maven/doxia/util/HtmlTools.java | 41 +--
2 files changed, 163 insertions(+), 183 deletions(-)
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java b/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
index 7c499a67..fb9f19cf 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
@@ -25,13 +25,13 @@ import javax.swing.text.html.HTML.Tag;
/**
* List of <code>Html</code> tags.
* <p>
- * This should contain all valid XHTML 1.0 and HTML5 tags, comprising the tags
+ * This should contain all valid HTML5 tags, comprising the tags
* in {@link javax.swing.text.html.HTML.Tag} plus several others.
* </p>
*
* @see <a href=
- * "https://www.w3.org/TR/2012/WD-html-markup-20121011/elements-by-function.html">
- * https://www.w3.org/TR/2012/WD-html-markup-20121011/elements-by-function.html</a>
+ * "https://www.tutorialrepublic.com/html-reference/html5-tags.php">
+ * https://www.tutorialrepublic.com/html-reference/html5-tags.php</a>
* @author ltheussl
* @since 1.0
*/
@@ -64,13 +64,13 @@ public interface HtmlMarkup
int CDATA_TYPE = 5;
// ----------------------------------------------------------------------
- // All XHTML 1.0 tags
+ // All HTML5 1.0 tags
// ----------------------------------------------------------------------
- /** Xhtml tag for <code>a</code>. */
+ /** HTML5 tag for <code>a</code>. */
Tag A = Tag.A;
- /** Xhtml tag for <code>abbr</code>. */
+ /** HTML5 tag for <code>abbr</code>. */
Tag ABBR = new Tag()
{
/** {@inheritDoc} */
@@ -81,27 +81,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>acronym</code>. */
- Tag ACRONYM = new Tag()
- {
- /** {@inheritDoc} */
- @Override
- public String toString()
- {
- return "acronym";
- }
- };
-
- /** Xhtml tag for <code>address</code>. */
+ /** HTML5 tag for <code>address</code>. */
Tag ADDRESS = Tag.ADDRESS;
- /** Xhtml tag for <code>applet</code>. */
- Tag APPLET = Tag.APPLET;
-
- /** Xhtml tag for <code>area</code>. */
+ /** HTML5 tag for <code>area</code>. */
Tag AREA = Tag.AREA;
- /** Html5 tag for <code>article</code>. */
+ /** HTML5 tag for <code>article</code>. */
Tag ARTICLE = new Tag()
{
/** {@inheritDoc} */
@@ -112,7 +98,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>aside</code>. */
+ /** HTML5 tag for <code>aside</code>. */
Tag ASIDE = new Tag()
{
/** {@inheritDoc} */
@@ -123,7 +109,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>audio</code>. */
+ /** HTML5 tag for <code>audio</code>. */
Tag AUDIO = new Tag()
{
/** {@inheritDoc} */
@@ -134,16 +120,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>b</code>. */
+ /** HTML5 tag for <code>b</code>. */
Tag B = Tag.B;
- /** Xhtml tag for <code>base</code>. */
+ /** HTML5 tag for <code>base</code>. */
Tag BASE = Tag.BASE;
- /** Xhtml tag for <code>basefont</code>. */
- Tag BASEFONT = Tag.BASEFONT;
-
- /** Html5 tag for <code>bdi</code>. */
+ /** HTML5 tag for <code>bdi</code>. */
Tag BDI = new Tag()
{
/** {@inheritDoc} */
@@ -154,7 +137,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>bdo</code>. */
+ /** HTML5 tag for <code>bdo</code>. */
Tag BDO = new Tag()
{
/** {@inheritDoc} */
@@ -165,19 +148,16 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>big</code>. */
- Tag BIG = Tag.BIG;
-
- /** Xhtml tag for <code>blockquote</code>. */
+ /** HTML5 tag for <code>blockquote</code>. */
Tag BLOCKQUOTE = Tag.BLOCKQUOTE;
- /** Xhtml tag for <code>body</code>. */
+ /** HTML5 tag for <code>body</code>. */
Tag BODY = Tag.BODY;
- /** Xhtml tag for <code>br</code>. */
+ /** HTML5 tag for <code>br</code>. */
Tag BR = Tag.BR;
- /** Xhtml tag for <code>button</code>. */
+ /** HTML5 tag for <code>button</code>. */
Tag BUTTON = new Tag()
{
/** {@inheritDoc} */
@@ -188,7 +168,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>canvas</code>. */
+ /** HTML5 tag for <code>canvas</code>. */
Tag CANVAS = new Tag()
{
/** {@inheritDoc} */
@@ -199,19 +179,16 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>caption</code>. */
+ /** HTML5 tag for <code>caption</code>. */
Tag CAPTION = Tag.CAPTION;
- /** Xhtml tag for <code>center</code>. */
- Tag CENTER = Tag.CENTER;
-
- /** Xhtml tag for <code>cite</code>. */
+ /** HTML5 tag for <code>cite</code>. */
Tag CITE = Tag.CITE;
- /** Xhtml tag for <code>code</code>. */
+ /** HTML5 tag for <code>code</code>. */
Tag CODE = Tag.CODE;
- /** Xhtml tag for <code>col</code>. */
+ /** HTML5 tag for <code>col</code>. */
Tag COL = new Tag()
{
/** {@inheritDoc} */
@@ -222,7 +199,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>colgroup</code>. */
+ /** HTML5 tag for <code>colgroup</code>. */
Tag COLGROUP = new Tag()
{
/** {@inheritDoc} */
@@ -233,7 +210,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>command</code>. */
+ /** HTML5 tag for <code>command</code>. */
Tag COMMAND = new Tag()
{
/** {@inheritDoc} */
@@ -244,7 +221,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>data</code>. */
+ /** HTML5 tag for <code>data</code>. */
Tag DATA = new Tag()
{
/** {@inheritDoc} */
@@ -255,7 +232,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>datalist</code>. */
+ /** HTML5 tag for <code>datalist</code>. */
Tag DATALIST = new Tag()
{
/** {@inheritDoc} */
@@ -266,10 +243,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>dd</code>. */
+ /** HTML5 tag for <code>dd</code>. */
Tag DD = Tag.DD;
- /** Xhtml tag for <code>del</code>. */
+ /** HTML5 tag for <code>del</code>. */
Tag DEL = new Tag()
{
/** {@inheritDoc} */
@@ -280,7 +257,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>details</code>. */
+ /** HTML5 tag for <code>details</code>. */
Tag DETAILS = new Tag()
{
/** {@inheritDoc} */
@@ -291,10 +268,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>dfn</code>. */
+ /** HTML5 tag for <code>dfn</code>. */
Tag DFN = Tag.DFN;
- /** Html5 tag for <code>dialog</code>. */
+ /** HTML5 tag for <code>dialog</code>. */
Tag DIALOG = new Tag()
{
/** {@inheritDoc} */
@@ -305,22 +282,19 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>dir</code>. */
- Tag DIR = Tag.DIR;
-
- /** Xhtml tag for <code>div</code>. */
+ /** HTML5 tag for <code>div</code>. */
Tag DIV = Tag.DIV;
- /** Xhtml tag for <code>dl</code>. */
+ /** HTML5 tag for <code>dl</code>. */
Tag DL = Tag.DL;
- /** Xhtml tag for <code>dt</code>. */
+ /** HTML5 tag for <code>dt</code>. */
Tag DT = Tag.DT;
- /** Xhtml tag for <code>em</code>. */
+ /** HTML5 tag for <code>em</code>. */
Tag EM = Tag.EM;
- /** Html5 tag for <code>embed</code>. */
+ /** HTML5 tag for <code>embed</code>. */
Tag EMBED = new Tag()
{
/** {@inheritDoc} */
@@ -331,7 +305,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>fieldset</code>. */
+ /** HTML5 tag for <code>fieldset</code>. */
Tag FIELDSET = new Tag()
{
/** {@inheritDoc} */
@@ -342,7 +316,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>figcaption</code>. */
+ /** HTML5 tag for <code>figcaption</code>. */
Tag FIGCAPTION = new Tag()
{
/** {@inheritDoc} */
@@ -353,7 +327,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>figure</code>. */
+ /** HTML5 tag for <code>figure</code>. */
Tag FIGURE = new Tag()
{
/** {@inheritDoc} */
@@ -364,10 +338,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>font</code>. */
- Tag FONT = Tag.FONT;
-
- /** Html5 tag for <code>footer</code>. */
+ /** HTML5 tag for <code>footer</code>. */
Tag FOOTER = new Tag()
{
/** {@inheritDoc} */
@@ -378,34 +349,28 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>form</code>. */
+ /** HTML5 tag for <code>form</code>. */
Tag FORM = Tag.FORM;
- /** Xhtml tag for <code>frame</code>. */
- Tag FRAME = Tag.FRAME;
-
- /** Xhtml tag for <code>frameset</code>. */
- Tag FRAMESET = Tag.FRAMESET;
-
- /** Xhtml tag for <code>h1</code>. */
+ /** HTML5 tag for <code>h1</code>. */
Tag H1 = Tag.H1;
- /** Xhtml tag for <code>h2</code>. */
+ /** HTML5 tag for <code>h2</code>. */
Tag H2 = Tag.H2 ;
- /** Xhtml tag for <code>h3</code>. */
+ /** HTML5 tag for <code>h3</code>. */
Tag H3 = Tag.H3;
- /** Xhtml tag for <code>h4</code>. */
+ /** HTML5 tag for <code>h4</code>. */
Tag H4 = Tag.H4;
- /** Xhtml tag for <code>h5</code>. */
+ /** HTML5 tag for <code>h5</code>. */
Tag H5 = Tag.H5;
- /** Xhtml tag for <code>head</code>. */
+ /** HTML5 tag for <code>head</code>. */
Tag HEAD = Tag.HEAD;
- /** Html5 tag for <code>header</code>. */
+ /** HTML5 tag for <code>header</code>. */
Tag HEADER = new Tag()
{
/** {@inheritDoc} */
@@ -416,7 +381,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>hgroup</code>. */
+ /** HTML5 tag for <code>hgroup</code>. */
Tag HGROUP = new Tag()
{
/** {@inheritDoc} */
@@ -427,16 +392,16 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>hr</code>. */
+ /** HTML5 tag for <code>hr</code>. */
Tag HR = Tag.HR;
- /** Xhtml tag for <code>html</code>. */
+ /** HTML5 tag for <code>html</code>. */
Tag HTML = Tag.HTML;
- /** Xhtml tag for <code>i</code>. */
+ /** HTML5 tag for <code>i</code>. */
Tag I = Tag.I;
- /** Xhtml tag for <code>iframe</code>. */
+ /** HTML5 tag for <code>iframe</code>. */
Tag IFRAME = new Tag()
{
/** {@inheritDoc} */
@@ -447,13 +412,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>img</code>. */
+ /** HTML5 tag for <code>img</code>. */
Tag IMG = Tag.IMG;
- /** Xhtml tag for <code>input</code>. */
+ /** HTML5 tag for <code>input</code>. */
Tag INPUT = Tag.INPUT;
- /** Xhtml tag for <code>ins</code>. */
+ /** HTML5 tag for <code>ins</code>. */
Tag INS = new Tag()
{
/** {@inheritDoc} */
@@ -464,13 +429,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>isindex</code>. */
- Tag ISINDEX = Tag.ISINDEX;
-
- /** Xhtml tag for <code>kbd</code>. */
+ /** HTML5 tag for <code>kbd</code>. */
Tag KBD = Tag.KBD;
- /** Html5 tag for <code>keygen</code>. */
+ /** HTML5 tag for <code>keygen</code>. */
Tag KEYGEN = new Tag()
{
/** {@inheritDoc} */
@@ -481,7 +443,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>label</code>. */
+ /** HTML5 tag for <code>label</code>. */
Tag LABEL = new Tag()
{
/** {@inheritDoc} */
@@ -492,7 +454,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>legend</code>. */
+ /** HTML5 tag for <code>legend</code>. */
Tag LEGEND = new Tag()
{
/** {@inheritDoc} */
@@ -503,16 +465,16 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>li</code>. */
+ /** HTML5 tag for <code>li</code>. */
Tag LI = Tag.LI;
- /** Xhtml tag for <code>link</code>. */
+ /** HTML5 tag for <code>link</code>. */
Tag LINK = Tag.LINK;
- /** Xhtml tag for <code>map</code>. */
+ /** HTML5 tag for <code>map</code>. */
Tag MAP = Tag.MAP;
- /** Html5 tag for <code>main</code>. */
+ /** HTML5 tag for <code>main</code>. */
Tag MAIN = new Tag()
{
/** {@inheritDoc} */
@@ -523,7 +485,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>mark</code>. */
+ /** HTML5 tag for <code>mark</code>. */
Tag MARK = new Tag()
{
/** {@inheritDoc} */
@@ -534,13 +496,24 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>menu</code>. */
+ /** HTML5 tag for <code>menu</code>. */
Tag MENU = Tag.MENU;
- /** Xhtml tag for <code>meta</code>. */
+ /** HTML5 tag for <code>menuitem</code>. */
+ Tag MENUITEM = new Tag()
+ {
+ /** {@inheritDoc} */
+ @Override
+ public String toString()
+ {
+ return "menuitem";
+ }
+ };
+
+ /** HTML5 tag for <code>meta</code>. */
Tag META = Tag.META;
- /** Html5 tag for <code>meter</code>. */
+ /** HTML5 tag for <code>meter</code>. */
Tag METER = new Tag()
{
/** {@inheritDoc} */
@@ -551,7 +524,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>nav</code>. */
+ /** HTML5 tag for <code>nav</code>. */
Tag NAV = new Tag()
{
/** {@inheritDoc} */
@@ -562,10 +535,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>noframes</code>. */
- Tag NOFRAMES = Tag.NOFRAMES;
-
- /** Xhtml tag for <code>noscript</code>. */
+ /** HTML5 tag for <code>noscript</code>. */
Tag NOSCRIPT = new Tag()
{
/** {@inheritDoc} */
@@ -576,13 +546,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>object</code>. */
+ /** HTML5 tag for <code>object</code>. */
Tag OBJECT = Tag.OBJECT;
- /** Xhtml tag for <code>ol</code>. */
+ /** HTML5 tag for <code>ol</code>. */
Tag OL = Tag.OL;
- /** Xhtml tag for <code>optgroup</code>. */
+ /** HTML5 tag for <code>optgroup</code>. */
Tag OPTGROUP = new Tag()
{
/** {@inheritDoc} */
@@ -593,10 +563,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>option</code>. */
+ /** HTML5 tag for <code>option</code>. */
Tag OPTION = Tag.OPTION;
- /** Html5 tag for <code>output</code>. */
+ /** HTML5 tag for <code>output</code>. */
Tag OUTPUT = new Tag()
{
/** {@inheritDoc} */
@@ -607,13 +577,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>p</code>. */
+ /** HTML5 tag for <code>p</code>. */
Tag P = Tag.P;
- /** Xhtml tag for <code>param</code>. */
+ /** HTML5 tag for <code>param</code>. */
Tag PARAM = Tag.PARAM;
- /** Html5 tag for <code>picture</code>. */
+ /** HTML5 tag for <code>picture</code>. */
Tag PICTURE = new Tag()
{
/** {@inheritDoc} */
@@ -624,10 +594,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>pre</code>. */
+ /** HTML5 tag for <code>pre</code>. */
Tag PRE = Tag.PRE;
- /** Html5 tag for <code>progress</code>. */
+ /** HTML5 tag for <code>progress</code>. */
Tag PROGRESS = new Tag()
{
/** {@inheritDoc} */
@@ -638,7 +608,7 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>q</code>. */
+ /** HTML5 tag for <code>q</code>. */
Tag Q = new Tag()
{
/** {@inheritDoc} */
@@ -649,7 +619,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>rb</code>. */
+ /** HTML5 tag for <code>rb</code>. */
Tag RB = new Tag()
{
/** {@inheritDoc} */
@@ -660,7 +630,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>rp</code>. */
+ /** HTML5 tag for <code>rp</code>. */
Tag RP = new Tag()
{
/** {@inheritDoc} */
@@ -671,7 +641,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>rt</code>. */
+ /** HTML5 tag for <code>rt</code>. */
Tag RT = new Tag()
{
/** {@inheritDoc} */
@@ -682,7 +652,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>rtc</code>. */
+ /** HTML5 tag for <code>rtc</code>. */
Tag RTC = new Tag()
{
/** {@inheritDoc} */
@@ -693,7 +663,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>ruby</code>. */
+ /** HTML5 tag for <code>ruby</code>. */
Tag RUBY = new Tag()
{
/** {@inheritDoc} */
@@ -704,16 +674,16 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>s</code>. */
+ /** HTML5 tag for <code>s</code>. */
Tag S = Tag.S;
- /** Xhtml tag for <code>samp</code>. */
+ /** HTML5 tag for <code>samp</code>. */
Tag SAMP = Tag.SAMP;
- /** Xhtml tag for <code>script</code>. */
+ /** HTML5 tag for <code>script</code>. */
Tag SCRIPT = Tag.SCRIPT;
- /** Html5 tag for <code>section</code>. */
+ /** HTML5 tag for <code>section</code>. */
Tag SECTION = new Tag()
{
/** {@inheritDoc} */
@@ -724,13 +694,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>select</code>. */
+ /** HTML5 tag for <code>select</code>. */
Tag SELECT = Tag.SELECT;
- /** Xhtml tag for <code>small</code>. */
+ /** HTML5 tag for <code>small</code>. */
Tag SMALL = Tag.SMALL;
- /** Html5 tag for <code>source</code>. */
+ /** HTML5 tag for <code>source</code>. */
Tag SOURCE = new Tag()
{
/** {@inheritDoc} */
@@ -741,22 +711,19 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>span</code>. */
+ /** HTML5 tag for <code>span</code>. */
Tag SPAN = Tag.SPAN;
- /** Xhtml tag for <code>strike</code>. */
- Tag STRIKE = Tag.STRIKE;
-
- /** Xhtml tag for <code>strong</code>. */
+ /** HTML5 tag for <code>strong</code>. */
Tag STRONG = Tag.STRONG;
- /** Xhtml tag for <code>style</code>. */
+ /** HTML5 tag for <code>style</code>. */
Tag STYLE = Tag.STYLE;
- /** Xhtml tag for <code>sub</code>. */
+ /** HTML5 tag for <code>sub</code>. */
Tag SUB = Tag.SUB;
- /** Html5 tag for <code>summary</code>. */
+ /** HTML5 tag for <code>summary</code>. */
Tag SUMMARY = new Tag()
{
/** {@inheritDoc} */
@@ -767,13 +734,24 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>sup</code>. */
+ /** HTML5 tag for <code>sup</code>. */
Tag SUP = Tag.SUP;
- /** Xhtml tag for <code>table</code>. */
+ /** HTML5 tag for <code>svg</code>. */
+ Tag SVG = new Tag()
+ {
+ /** {@inheritDoc} */
+ @Override
+ public String toString()
+ {
+ return "svg";
+ }
+ };
+
+ /** HTML5 tag for <code>table</code>. */
Tag TABLE = Tag.TABLE;
- /** Xhtml tag for <code>tbody</code>. */
+ /** HTML5 tag for <code>tbody</code>. */
Tag TBODY = new Tag()
{
/** {@inheritDoc} */
@@ -784,10 +762,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>td</code>. */
+ /** HTML5 tag for <code>td</code>. */
Tag TD = Tag.TD;
- /** Html5 tag for <code>template</code>. */
+ /** HTML5 tag for <code>template</code>. */
Tag TEMPLATE = new Tag()
{
/** {@inheritDoc} */
@@ -798,10 +776,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>textarea</code>. */
+ /** HTML5 tag for <code>textarea</code>. */
Tag TEXTAREA = Tag.TEXTAREA;
- /** Xhtml tag for <code>tfoot</code>. */
+ /** HTML5 tag for <code>tfoot</code>. */
Tag TFOOT = new Tag()
{
/** {@inheritDoc} */
@@ -812,10 +790,10 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>th</code>. */
+ /** HTML5 tag for <code>th</code>. */
Tag TH = Tag.TH;
- /** Xhtml tag for <code>thead</code>. */
+ /** HTML5 tag for <code>thead</code>. */
Tag THEAD = new Tag()
{
/** {@inheritDoc} */
@@ -826,7 +804,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>time</code>. */
+ /** HTML5 tag for <code>time</code>. */
Tag TIME = new Tag()
{
/** {@inheritDoc} */
@@ -837,13 +815,13 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>title</code>. */
+ /** HTML5 tag for <code>title</code>. */
Tag TITLE = Tag.TITLE;
- /** Xhtml tag for <code>tr</code>. */
+ /** HTML5 tag for <code>tr</code>. */
Tag TR = Tag.TR;
- /** Html5 tag for <code>track</code>. */
+ /** HTML5 tag for <code>track</code>. */
Tag TRACK = new Tag()
{
/** {@inheritDoc} */
@@ -854,19 +832,16 @@ public interface HtmlMarkup
}
};
- /** Xhtml tag for <code>tt</code>. */
- Tag TT = Tag.TT;
-
- /** Xhtml tag for <code>u</code>. */
+ /** HTML5 tag for <code>u</code>. */
Tag U = Tag.U;
- /** Xhtml tag for <code>ul</code>. */
+ /** HTML5 tag for <code>ul</code>. */
Tag UL = Tag.UL;
- /** Xhtml tag for <code>var</code>. */
+ /** HTML5 tag for <code>var</code>. */
Tag VAR = Tag.VAR ;
- /** Html5 tag for <code>video</code>. */
+ /** HTML5 tag for <code>video</code>. */
Tag VIDEO = new Tag()
{
/** {@inheritDoc} */
@@ -877,7 +852,7 @@ public interface HtmlMarkup
}
};
- /** Html5 tag for <code>wbr</code>. */
+ /** HTML5 tag for <code>wbr</code>. */
Tag WBR = new Tag()
{
/** {@inheritDoc} */
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
index 14cfe75e..f142132f 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
@@ -41,24 +41,29 @@ public class HtmlTools
{
private static final Tag[] ALL_TAGS =
{
- HtmlMarkup.A, HtmlMarkup.ABBR, HtmlMarkup.ACRONYM, HtmlMarkup.ADDRESS, HtmlMarkup.APPLET,
- HtmlMarkup.AREA, HtmlMarkup.B, HtmlMarkup.BASE, HtmlMarkup.BASEFONT, HtmlMarkup.BDO, HtmlMarkup.BIG,
- HtmlMarkup.BLOCKQUOTE, HtmlMarkup.BODY, HtmlMarkup.BR, HtmlMarkup.BUTTON, HtmlMarkup.CAPTION,
- HtmlMarkup.CENTER, HtmlMarkup.CITE, HtmlMarkup.CODE, HtmlMarkup.COL, HtmlMarkup.COLGROUP,
- HtmlMarkup.DD, HtmlMarkup.DEL, HtmlMarkup.DFN, HtmlMarkup.DIR, HtmlMarkup.DIV, HtmlMarkup.DL,
- HtmlMarkup.DT, HtmlMarkup.EM, HtmlMarkup.FIELDSET, HtmlMarkup.FONT, HtmlMarkup.FORM,
- HtmlMarkup.FRAME, HtmlMarkup.FRAMESET, HtmlMarkup.H1, HtmlMarkup.H2, HtmlMarkup.H3, HtmlMarkup.H4,
- HtmlMarkup.H5, HtmlMarkup.HEAD, HtmlMarkup.HR, HtmlMarkup.HTML, HtmlMarkup.I,
- HtmlMarkup.IFRAME, HtmlMarkup.IMG, HtmlMarkup.INPUT, HtmlMarkup.INS, HtmlMarkup.ISINDEX,
- HtmlMarkup.KBD, HtmlMarkup.KEYGEN, HtmlMarkup.LABEL, HtmlMarkup.LEGEND, HtmlMarkup.LI,
- HtmlMarkup.LINK, HtmlMarkup.MAP, HtmlMarkup.MENU, HtmlMarkup.META, HtmlMarkup.NOFRAMES,
- HtmlMarkup.NOSCRIPT, HtmlMarkup.OBJECT, HtmlMarkup.OL, HtmlMarkup.OPTGROUP, HtmlMarkup.OPTION,
- HtmlMarkup.P, HtmlMarkup.PARAM, HtmlMarkup.PRE, HtmlMarkup.Q, HtmlMarkup.S, HtmlMarkup.SAMP,
- HtmlMarkup.SCRIPT, HtmlMarkup.SELECT, HtmlMarkup.SMALL, HtmlMarkup.SPAN, HtmlMarkup.STRIKE,
- HtmlMarkup.STRONG, HtmlMarkup.STYLE, HtmlMarkup.SUB, HtmlMarkup.SUP, HtmlMarkup.TABLE,
- HtmlMarkup.TBODY, HtmlMarkup.TD, HtmlMarkup.TEXTAREA, HtmlMarkup.TFOOT, HtmlMarkup.TH,
- HtmlMarkup.THEAD, HtmlMarkup.TITLE, HtmlMarkup.TR, HtmlMarkup.TT, HtmlMarkup.U, HtmlMarkup.UL,
- HtmlMarkup.VAR
+ HtmlMarkup.A, HtmlMarkup.ABBR, HtmlMarkup.ADDRESS, HtmlMarkup.AREA, HtmlMarkup.ARTICLE,
+ HtmlMarkup.ASIDE, HtmlMarkup.AUDIO, HtmlMarkup.B, HtmlMarkup.BASE, HtmlMarkup.BDI,
+ HtmlMarkup.BDO, HtmlMarkup.BLOCKQUOTE, HtmlMarkup.BODY, HtmlMarkup.BR, HtmlMarkup.BUTTON,
+ HtmlMarkup.CANVAS, HtmlMarkup.CAPTION, HtmlMarkup.CITE, HtmlMarkup.CODE, HtmlMarkup.COL,
+ HtmlMarkup.COLGROUP, HtmlMarkup.COMMAND, HtmlMarkup.DATA, HtmlMarkup.DATALIST, HtmlMarkup.DD,
+ HtmlMarkup.DEL, HtmlMarkup.DETAILS, HtmlMarkup.DFN, HtmlMarkup.DIALOG, HtmlMarkup.DIV,
+ HtmlMarkup.DL, HtmlMarkup.DT, HtmlMarkup.EM, HtmlMarkup.EMBED, HtmlMarkup.FIELDSET,
+ HtmlMarkup.FIGCAPTION, HtmlMarkup.FIGURE, HtmlMarkup.FOOTER, HtmlMarkup.FORM, HtmlMarkup.H1,
+ HtmlMarkup.H2, HtmlMarkup.H3, HtmlMarkup.H4, HtmlMarkup.H5, HtmlMarkup.HEAD,
+ HtmlMarkup.HEADER, HtmlMarkup.HGROUP, HtmlMarkup.HR, HtmlMarkup.HTML, HtmlMarkup.I,
+ HtmlMarkup.IFRAME, HtmlMarkup.IMG, HtmlMarkup.INPUT, HtmlMarkup.INS, HtmlMarkup.KBD,
+ HtmlMarkup.KEYGEN, HtmlMarkup.LABEL, HtmlMarkup.LEGEND, HtmlMarkup.LI, HtmlMarkup.LINK,
+ HtmlMarkup.MAIN, HtmlMarkup.MAP, HtmlMarkup.MARK, HtmlMarkup.MENU, HtmlMarkup.MENUITEM,
+ HtmlMarkup.META, HtmlMarkup.METER, HtmlMarkup.NAV, HtmlMarkup.NOSCRIPT, HtmlMarkup.OBJECT,
+ HtmlMarkup.OL, HtmlMarkup.OPTGROUP, HtmlMarkup.OPTION, HtmlMarkup.OUTPUT, HtmlMarkup.P,
+ HtmlMarkup.PARAM, HtmlMarkup.PICTURE, HtmlMarkup.PRE, HtmlMarkup.PROGRESS, HtmlMarkup.Q,
+ HtmlMarkup.RP, HtmlMarkup.RT, HtmlMarkup.RUBY, HtmlMarkup.S, HtmlMarkup.SAMP,
+ HtmlMarkup.SECTION, HtmlMarkup.SCRIPT, HtmlMarkup.SELECT, HtmlMarkup.SMALL,
+ HtmlMarkup.SOURCE, HtmlMarkup.SPAN, HtmlMarkup.STRONG, HtmlMarkup.STYLE, HtmlMarkup.SUB,
+ HtmlMarkup.SUMMARY, HtmlMarkup.SUP, HtmlMarkup.SVG, HtmlMarkup.TABLE, HtmlMarkup.TBODY,
+ HtmlMarkup.TD, HtmlMarkup.TEMPLATE, HtmlMarkup.TEXTAREA, HtmlMarkup.TFOOT, HtmlMarkup.TH,
+ HtmlMarkup.THEAD, HtmlMarkup.TIME, HtmlMarkup.TITLE, HtmlMarkup.TR, HtmlMarkup.TRACK,
+ HtmlMarkup.U, HtmlMarkup.UL, HtmlMarkup.VAR, HtmlMarkup.VIDEO, HtmlMarkup.WBR
};
private static final Map<String, Tag> TAG_MAP = new HashMap<>( ALL_TAGS.length );