You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gi...@apache.org on 2022/02/22 08:28:49 UTC

[jspwiki-site] branch asf-site updated: Automatic Site Publish by Buildbot

This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new c40b874  Automatic Site Publish by Buildbot
c40b874 is described below

commit c40b874507ad0a8b881e4d77971ba03ed17845ec
Author: jenkins <bu...@apache.org>
AuthorDate: Tue Feb 22 08:28:44 2022 +0000

    Automatic Site Publish by Buildbot
---
 apidocs/2.11.2-SNAPSHOT/constant-values.html       |   4 +-
 apidocs/2.11.2-SNAPSHOT/index-all.html             |  52 +-
 apidocs/2.11.2-SNAPSHOT/member-search-index.js     |   2 +-
 apidocs/2.11.2-SNAPSHOT/member-search-index.zip    | Bin 46200 -> 46152 bytes
 .../org/apache/wiki/api/core/Command.html          |   8 +-
 .../org/apache/wiki/api/core/Context.html          |  33 +-
 .../auth/DefaultUserManager.JSONUserModule.html    |  10 +-
 .../org/apache/wiki/auth/DefaultUserManager.html   |   6 +-
 .../wiki/auth/user/AbstractUserDatabase.html       |   5 +-
 .../apache/wiki/htmltowiki/SyntaxDecorator.html    |  12 +-
 .../org/apache/wiki/htmltowiki/SyntaxDecorator.svg |   6 +-
 .../htmltowiki/XHtmlElementToWikiTranslator.html   |  18 +-
 .../htmltowiki/class-use/WhitespaceTrimWriter.html |  18 +-
 .../class-use/XHtmlElementToWikiTranslator.html    |  65 +-
 .../htmltowiki/class-use/XHtmlToWikiConfig.html    |  18 +-
 .../org/apache/wiki/htmltowiki/package.svg         |  24 +-
 .../apache/wiki/htmltowiki/syntax/BrDecorator.html |  12 +-
 .../apache/wiki/htmltowiki/syntax/BrDecorator.svg  |   8 +-
 .../wiki/htmltowiki/syntax/CodeDecorator.html      |  12 +-
 .../wiki/htmltowiki/syntax/CodeDecorator.svg       |   8 +-
 .../apache/wiki/htmltowiki/syntax/LiDecorator.html |  18 +-
 .../apache/wiki/htmltowiki/syntax/LiDecorator.svg  |  10 +-
 .../apache/wiki/htmltowiki/syntax/OlDecorator.html |  12 +-
 .../apache/wiki/htmltowiki/syntax/OlDecorator.svg  |   8 +-
 .../htmltowiki/syntax/PlainTextBoldDecorator.html  |  38 +-
 .../htmltowiki/syntax/PlainTextBoldDecorator.svg   |   7 +-
 .../htmltowiki/syntax/PlainTextCssDecorator.html   |  40 +-
 .../htmltowiki/syntax/PlainTextCssDecorator.svg    |   7 +-
 .../syntax/PlainTextCssSpecialDecorator.html       |  38 +-
 .../syntax/PlainTextCssSpecialDecorator.svg        |   7 +-
 .../wiki/htmltowiki/syntax/PlainTextDecorator.html |  32 +-
 .../wiki/htmltowiki/syntax/PlainTextDecorator.svg  |   7 +-
 .../syntax/PlainTextItalicDecorator.html           |  38 +-
 .../htmltowiki/syntax/PlainTextItalicDecorator.svg |   7 +-
 .../syntax/PlainTextMonospaceDecorator.html        |  12 +-
 .../syntax/PlainTextMonospaceDecorator.svg         |   8 +-
 .../apache/wiki/htmltowiki/syntax/TdDecorator.html |  12 +-
 .../apache/wiki/htmltowiki/syntax/TdDecorator.svg  |   8 +-
 .../htmltowiki/syntax/TextElementDecorator.html    |  12 +-
 .../htmltowiki/syntax/TextElementDecorator.svg     |   8 +-
 .../apache/wiki/htmltowiki/syntax/ThDecorator.html |  12 +-
 .../apache/wiki/htmltowiki/syntax/ThDecorator.svg  |   8 +-
 .../apache/wiki/htmltowiki/syntax/UlDecorator.html |  12 +-
 .../apache/wiki/htmltowiki/syntax/UlDecorator.svg  |   8 +-
 .../htmltowiki/syntax/WikiSyntaxDecorator.html     |   4 +-
 .../wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg |  10 +-
 .../syntax/class-use/PlainTextBoldDecorator.html   |   3 +-
 .../syntax/class-use/PlainTextCssDecorator.html    |   3 +-
 .../class-use/PlainTextCssSpecialDecorator.html    |   4 +-
 .../syntax/class-use/PlainTextItalicDecorator.html |   3 +-
 .../class-use/PlainTextMonospaceDecorator.html     |   3 +-
 .../syntax/jspwiki/JSPWikiSyntaxDecorator.html     |  12 +-
 .../syntax/jspwiki/JSPWikiSyntaxDecorator.svg      |  10 +-
 .../wiki/htmltowiki/syntax/jspwiki/package.svg     |  14 +-
 .../syntax/markdown/MarkdownSyntaxDecorator.html   |  12 +-
 .../syntax/markdown/MarkdownSyntaxDecorator.svg    |  10 +-
 .../wiki/htmltowiki/syntax/markdown/package.svg    |  14 +-
 .../org/apache/wiki/htmltowiki/syntax/package.svg  | 231 ++++---
 .../org/apache/wiki/ui/AbstractCommand.html        |   2 +-
 .../org/apache/wiki/ui/PageCommand.html            |   4 +-
 .../org/apache/wiki/ui/WikiCommand.html            |   4 +-
 apidocs/2.11.2-SNAPSHOT/overview-summary.html      |   2 +-
 apidocs/2.11.2-SNAPSHOT/package-search-index.zip   | Bin 618 -> 618 bytes
 .../src-html/org/apache/wiki/api/Release.html      |   2 +-
 .../src-html/org/apache/wiki/api/core/Command.html |   8 +-
 .../src-html/org/apache/wiki/api/core/Context.html |  26 +-
 .../auth/DefaultUserManager.JSONUserModule.html    | 321 +++++-----
 .../org/apache/wiki/auth/DefaultUserManager.html   | 321 +++++-----
 .../wiki/auth/user/AbstractUserDatabase.html       |  95 ++-
 .../apache/wiki/htmltowiki/SyntaxDecorator.html    |   6 +-
 ...ementToWikiTranslator.ElementDecoratorData.html | 668 ++++++++++-----------
 .../htmltowiki/XHtmlElementToWikiTranslator.html   | 668 ++++++++++-----------
 .../apache/wiki/htmltowiki/syntax/BrDecorator.html |   6 +-
 .../wiki/htmltowiki/syntax/CodeDecorator.html      |  10 +-
 .../apache/wiki/htmltowiki/syntax/LiDecorator.html |   8 +-
 .../apache/wiki/htmltowiki/syntax/OlDecorator.html |  10 +-
 .../htmltowiki/syntax/PlainTextBoldDecorator.html  | 117 ++--
 .../htmltowiki/syntax/PlainTextCssDecorator.html   | 139 +++--
 .../syntax/PlainTextCssSpecialDecorator.html       | 143 +++--
 .../wiki/htmltowiki/syntax/PlainTextDecorator.html |  69 +--
 .../syntax/PlainTextItalicDecorator.html           | 117 ++--
 .../syntax/PlainTextMonospaceDecorator.html        |  10 +-
 .../apache/wiki/htmltowiki/syntax/TdDecorator.html |   6 +-
 .../htmltowiki/syntax/TextElementDecorator.html    |   6 +-
 .../apache/wiki/htmltowiki/syntax/ThDecorator.html |   6 +-
 .../apache/wiki/htmltowiki/syntax/UlDecorator.html |  10 +-
 .../htmltowiki/syntax/WikiSyntaxDecorator.html     |   6 +-
 .../syntax/jspwiki/JSPWikiSyntaxDecorator.html     |  16 +-
 .../syntax/markdown/MarkdownSyntaxDecorator.html   |  16 +-
 .../org/apache/wiki/ui/AbstractCommand.html        |   2 +-
 apidocs/2.11.2-SNAPSHOT/type-search-index.zip      | Bin 4506 -> 4506 bytes
 development/changelog.html                         |  23 +
 development/i18n.html                              |  18 +-
 .../2.11.2-SNAPSHOT/cmp-jspwiki-210-adapters.html  |   2 +-
 .../cmp-jspwiki-210-test-adaptees.html             |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-api.html       |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-bootstrap.html |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-cache.html     |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-event.html     |   2 +-
 .../cmp-jspwiki-kendra-searchprovider.html         |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.diff      |  57 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.html      | 131 ++--
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.diff  |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.html  |   6 +-
 .../cmp-jspwiki-tika-searchprovider.html           |   2 +-
 japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-util.html      |   2 +-
 106 files changed, 1983 insertions(+), 2119 deletions(-)

diff --git a/apidocs/2.11.2-SNAPSHOT/constant-values.html b/apidocs/2.11.2-SNAPSHOT/constant-values.html
index 7847f1e..58113a9 100644
--- a/apidocs/2.11.2-SNAPSHOT/constant-values.html
+++ b/apidocs/2.11.2-SNAPSHOT/constant-values.html
@@ -128,7 +128,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <th class="colSecond" scope="row"><code><a href="org/apache/wiki/api/Release.html#BUILD">BUILD</a></code></th>
-<td class="colLast"><code>"03"</code></td>
+<td class="colLast"><code>"04"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a id="org.apache.wiki.api.Release.MINORREVISION">
@@ -156,7 +156,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <th class="colSecond" scope="row"><code><a href="org/apache/wiki/api/Release.html#VERSTR">VERSTR</a></code></th>
-<td class="colLast"><code>"2.11.2-git-03"</code></td>
+<td class="colLast"><code>"2.11.2-git-04"</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/apidocs/2.11.2-SNAPSHOT/index-all.html b/apidocs/2.11.2-SNAPSHOT/index-all.html
index 633c186..153204b 100644
--- a/apidocs/2.11.2-SNAPSHOT/index-all.html
+++ b/apidocs/2.11.2-SNAPSHOT/index-all.html
@@ -1121,7 +1121,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>BR</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/BrDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">BrDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/BrDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">BrDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/BrDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">BrDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/BrDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">BrDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/tags/BreadcrumbsTag.html" title="class in org.apache.wiki.tags"><span class="typeNameLink">BreadcrumbsTag</span></a> - Class in <a href="org/apache/wiki/tags/package-summary.html">org.apache.wiki.tags</a></dt>
 <dd>
@@ -1605,7 +1605,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>CODE</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/CodeDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">CodeDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/CodeDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">CodeDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/CodeDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">CodeDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/CodeDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">CodeDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/util/XHTML.html#col">col</a></span> - org.apache.wiki.util.<a href="org/apache/wiki/util/XHTML.html" title="enum in org.apache.wiki.util">XHTML</a></dt>
 <dd>&nbsp;</dd>
@@ -5814,7 +5814,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/api/core/Context.html#getHttpRequest()">getHttpRequest()</a></span> - Method in interface org.apache.wiki.api.core.<a href="org/apache/wiki/api/core/Context.html" title="interface in org.apache.wiki.api.core">Context</a></dt>
 <dd>
-<div class="block">If the request did originate from a HTTP request, then the HTTP request can be fetched here.</div>
+<div class="block">If the request did originate from an HTTP request, then the HTTP request can be fetched here.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/WikiContext.html#getHttpRequest()">getHttpRequest()</a></span> - Method in class org.apache.wiki.<a href="org/apache/wiki/WikiContext.html" title="class in org.apache.wiki">WikiContext</a></dt>
 <dd>
@@ -7371,7 +7371,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/api/core/Context.html#getURL(java.lang.String,java.lang.String)">getURL(String, String)</a></span> - Method in interface org.apache.wiki.api.core.<a href="org/apache/wiki/api/core/Context.html" title="interface in org.apache.wiki.api.core">Context</a></dt>
 <dd>
-<div class="block">Creates an URL for the given request context.</div>
+<div class="block">Creates a URL for the given request context.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/WikiContext.html#getURL(java.lang.String,java.lang.String)">getURL(String, String)</a></span> - Method in class org.apache.wiki.<a href="org/apache/wiki/WikiContext.html" title="class in org.apache.wiki">WikiContext</a></dt>
 <dd>
@@ -7379,7 +7379,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/api/core/Context.html#getURL(java.lang.String,java.lang.String,java.lang.String)">getURL(String, String, String)</a></span> - Method in interface org.apache.wiki.api.core.<a href="org/apache/wiki/api/core/Context.html" title="interface in org.apache.wiki.api.core">Context</a></dt>
 <dd>
-<div class="block">Returns an URL from a page.</div>
+<div class="block">Returns a URL from a page.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/api/core/Engine.html#getURL(java.lang.String,java.lang.String,java.lang.String)">getURL(String, String, String)</a></span> - Method in interface org.apache.wiki.api.core.<a href="org/apache/wiki/api/core/Engine.html" title="interface in org.apache.wiki.api.core">Engine</a></dt>
 <dd>
@@ -8435,15 +8435,15 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Message topic for role-checking information messages.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init(PrintWriter, Stack&lt;String&gt;, Stack&lt;String&gt;, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</a></span> - Method in class org.apache.w [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init(PrintWriter, Deque&lt;String&gt;, Deque&lt;String&gt;, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</a></span> - Method in class org.apache.w [...]
 <dd>
 <div class="block">Prepares the syntax decorator.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init(PrintWriter, Stack&lt;String&gt;, Stack&lt;String&gt;, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</a></span> - Method in class org.apache [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init(PrintWriter, Deque&lt;String&gt;, Deque&lt;String&gt;, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</a></span> - Method in class org.apache [...]
 <dd>
 <div class="block">Prepares the syntax decorator.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init(PrintWriter, Stack&lt;String&gt;, Stack&lt;String&gt;, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</a></span> - Method in interface org.apache.wiki.htmltowiki.<a  [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init(PrintWriter, Deque&lt;String&gt;, Deque&lt;String&gt;, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</a></span> - Method in interface org.apache.wiki.htmltowiki.<a  [...]
 <dd>
 <div class="block">Prepares the syntax decorator.</div>
 </dd>
@@ -9513,7 +9513,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>LI</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">LiDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">LiDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">LiDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">LiDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/diff/ContextualDiffProvider.html#LINE_BREAK_HTML">LINE_BREAK_HTML</a></span> - Static variable in class org.apache.wiki.diff.<a href="org/apache/wiki/diff/ContextualDiffProvider.html" title="class in org.apache.wiki.diff">ContextualDiffProvider</a></dt>
 <dd>&nbsp;</dd>
@@ -10510,7 +10510,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Opening wiki markup for an italic element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html#markupLi(java.util.Stack)">markupLi(Stack&lt;String&gt;)</a></span> - Method in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">LiDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html#markupLi(java.util.Deque)">markupLi(Deque&lt;String&gt;)</a></span> - Method in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/LiDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">LiDecorator</a></dt>
 <dd>
 <div class="block">Wiki markup for a <code>LI</code> element.</div>
 </dd>
@@ -10985,7 +10985,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>OL</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/OlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">OlDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/OlDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">OlDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/OlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">OlDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/OlDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">OlDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/pages/haddock/EditWikiPage.html#open(java.lang.String)">open(String)</a></span> - Static method in class org.apache.wiki.pages.haddock.<a href="org/apache/wiki/pages/haddock/EditWikiPage.html" title="class in org.apache.wiki.pages.haddock">EditWikiPage</a></dt>
 <dd>
@@ -12350,37 +12350,37 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a plain text handling bold.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator(PlainTextItalicDecorator, PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator(PlainTextItalicDecorator, PrintWriter, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html" title=" [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax"><span class="typeNameLink">PlainTextCssDecorator</span></a> - Class in <a href="org/apache/wiki/htmltowiki/syntax/package-summary.html">org.apache.wiki.htmltowiki.syntax</a></dt>
 <dd>
 <div class="block">Translates to wiki syntax from a plain text handling css classes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator(PlainTextBoldDecorator, PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/Plain [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator(PlainTextBoldDecorator, PrintWriter, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html" title="class i [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax"><span class="typeNameLink">PlainTextCssSpecialDecorator</span></a> - Class in <a href="org/apache/wiki/htmltowiki/syntax/package-summary.html">org.apache.wiki.htmltowiki.syntax</a></dt>
 <dd>
 <div class="block">Translates to wiki syntax from a plain text handling special css.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssSpecialDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmlt [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#%3Cinit%3E(java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssSpecialDecorator(PrintWriter, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDeco [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax"><span class="typeNameLink">PlainTextDecorator</span></a> - Class in <a href="org/apache/wiki/htmltowiki/syntax/package-summary.html">org.apache.wiki.htmltowiki.syntax</a></dt>
 <dd>
 <div class="block">Translates to wiki syntax from a plain text.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator(PlainTextCssDecorator, PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextDeco [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator(PlainTextCssDecorator, PrintWriter, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html" title="class in org.apach [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax"><span class="typeNameLink">PlainTextItalicDecorator</span></a> - Class in <a href="org/apache/wiki/htmltowiki/syntax/package-summary.html">org.apache.wiki.htmltowiki.syntax</a></dt>
 <dd>
 <div class="block">Translates to wiki syntax from a plain text handling italic.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltow [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.h [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax"><span class="typeNameLink">PlainTextMonospaceDecorator</span></a> - Class in <a href="org/apache/wiki/htmltowiki/syntax/package-summary.html">org.apache.wiki.htmltowiki.syntax</a></dt>
 <dd>
 <div class="block">Translates to wiki syntax from a plain text handling monospace.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki [...]
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/api/plugin/Plugin.html" title="interface in org.apache.wiki.api.plugin"><span class="typeNameLink">Plugin</span></a> - Interface in <a href="org/apache/wiki/api/plugin/package-summary.html">org.apache.wiki.api.plugin</a></dt>
 <dd>
@@ -12619,16 +12619,6 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/CodeDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/CodeDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">CodeDecorator</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextDecorator</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/TdDecorator.html#preStack">preStack</a></span> - Variable in class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/TdDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">TdDecorator</a></dt>
@@ -15547,7 +15537,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>TD</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/TdDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">TdDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/TdDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">TdDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/TdDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">TdDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/TdDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">TdDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/wiki/tags/TemplateDirTag.html" title="class in org.apache.wiki.tags"><span class="typeNameLink">TemplateDirTag</span></a> - Class in <a href="org/apache/wiki/tags/package-summary.html">org.apache.wiki.tags</a></dt>
 <dd>
@@ -15627,7 +15617,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>Text</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack)">TextElementDecorator(PrintWriter, Stack&lt;String&gt;)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">TextElementDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque)">TextElementDecorator(PrintWriter, Deque&lt;String&gt;)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">TextElementDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/api/engine/RenderApi.html#textToHTML(org.apache.wiki.api.core.Context,java.lang.String)">textToHTML(Context, String)</a></span> - Method in interface org.apache.wiki.api.engine.<a href="org/apache/wiki/api/engine/RenderApi.html" title="interface in org.apache.wiki.api.engine">RenderApi</a></dt>
 <dd>
@@ -15675,7 +15665,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>TH</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/ThDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">ThDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/ThDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">ThDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/ThDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">ThDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/ThDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">ThDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/util/XHTML.html#thead">thead</a></span> - org.apache.wiki.util.<a href="org/apache/wiki/util/XHTML.html" title="enum in org.apache.wiki.util">XHTML</a></dt>
 <dd>&nbsp;</dd>
@@ -15964,7 +15954,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Translates to wiki syntax from a <code>UL</code> element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/UlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">UlDecorator(PrintWriter, Stack&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/UlDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">UlDecorator</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/htmltowiki/syntax/UlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">UlDecorator(PrintWriter, Deque&lt;String&gt;, XHtmlElementToWikiTranslator)</a></span> - Constructor for class org.apache.wiki.htmltowiki.syntax.<a href="org/apache/wiki/htmltowiki/syntax/UlDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">UlDecorator</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/event/WikiEvent.html#UNDEFINED">UNDEFINED</a></span> - Static variable in class org.apache.wiki.event.<a href="org/apache/wiki/event/WikiEvent.html" title="class in org.apache.wiki.event">WikiEvent</a></dt>
 <dd>
diff --git a/apidocs/2.11.2-SNAPSHOT/member-search-index.js b/apidocs/2.11.2-SNAPSHOT/member-search-index.js
index 3813076..134370f 100644
--- a/apidocs/2.11.2-SNAPSHOT/member-search-index.js
+++ b/apidocs/2.11.2-SNAPSHOT/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a"},{"p":"org.apache.wiki.util","c":"XHTML","l":"a"},{"p":"org.apache.wiki.htmltowiki","c":"SyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.util","c":"XHTML","l":"abbr"},{"p":"org.apache.wiki.auth. [...]
\ No newline at end of file
+memberSearchIndex = [{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a"},{"p":"org.apache.wiki.util","c":"XHTML","l":"a"},{"p":"org.apache.wiki.htmltowiki","c":"SyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.util","c":"XHTML","l":"abbr"},{"p":"org.apache.wiki.auth. [...]
\ No newline at end of file
diff --git a/apidocs/2.11.2-SNAPSHOT/member-search-index.zip b/apidocs/2.11.2-SNAPSHOT/member-search-index.zip
index 5fbc319..cb55faf 100644
Binary files a/apidocs/2.11.2-SNAPSHOT/member-search-index.zip and b/apidocs/2.11.2-SNAPSHOT/member-search-index.zip differ
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Command.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Command.html
index 5679ea9..a50bf8b 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Command.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Command.html
@@ -138,13 +138,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  <p> Commands come in two flavors: "static" and "targeted." </p>
  <ul>
  <li><strong>Static commands</strong> are exactly what they sound like: static. They are <code>final</code>, threadsafe, and immutable.
- They have no intrinsic idea of the context they are acting in. For example, the static command <a href="../../ui/PageCommand.html#VIEW"><code>PageCommand.VIEW</code></a> embodies the
+ They have no intrinsic idea of the context they are acting in. For example, the static command <code>org.apache.wiki.ui.PageCommand#VIEW</code> embodies the
  idea of viewing a page &#8212; but exactly <em>which</em> page is left undefined. Static commands exist so that they can be freely
  shared and passed around without incurring the penalties of object creation. Static commands are a lot like naked request contexts
  ("edit", "view", etc.) except that they include additional, essential properties such as the associated URL pattern and content JSP.</li>
  <li><strong>Targeted commands</strong> "decorate" static commands by scoping a static Command at a specific target such as a WikiPage or
  GroupPrincipal. Targeted commands are created by calling an existing Command's <a href="#targetedCommand(java.lang.Object)"><code>targetedCommand(Object)</code></a> and supplying the target
- object. Implementing classes generally require a specific target type. For example, the <a href="../../ui/PageCommand.html" title="class in org.apache.wiki.ui"><code>PageCommand</code></a> class requires that the
+ object. Implementing classes generally require a specific target type. For example, the <code>org.apache.wiki.ui.PageCommand</code> class requires that the
  target object be of type <a href="Page.html" title="interface in org.apache.wiki.api.core"><code>Page</code></a>.</li>
  </ul>
  <p> Concrete implementations of Command include: </p>
@@ -350,9 +350,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <h4>requiredPermission</h4>
 <pre class="methodSignature">java.security.Permission&nbsp;<a href="../../../../../src-html/org/apache/wiki/api/core/Command.html#line.113">requiredPermission</a>()</pre>
 <div class="block">Returns the Permission required to successfully execute this Command. If no Permission is requred, this method returns
- <code>null</code>. For example, the static command <a href="../../ui/PageCommand.html#VIEW"><code>PageCommand.VIEW</code></a> doesn't require a permission because
+ <code>null</code>. For example, the static command <code>org.apache.wiki.ui.PageCommand#VIEW</code> doesn't require a permission because
  it isn't referring to a particular WikiPage. However, if this command targets a WikiPage called <code>Main</code>(via
- <a href="../../ui/PageCommand.html#targetedCommand(java.lang.Object)"><code>PageCommand.targetedCommand(Object)</code></a>, the resulting Command would require the permission
+ <code>org.apache.wiki.ui.PageCommand#targetedCommand(Object)</code>, the resulting Command would require the permission
  <code>PagePermission "<em>yourWiki</em>:Main", "view"</code>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Context.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Context.html
index 1c5b20a..7ffb974 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Context.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/api/core/Context.html
@@ -144,10 +144,6 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
   HttpSession. The Session contains information about the user's authentication status, and is consulted by <a href="#getCurrentUser()"><code>getCurrentUser()</code></a>
   object.</p>
   <p>Do not cache the WikiPage object that you get from the WikiContext; always use getPage()!</p></div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../plugin/Counter.html" title="class in org.apache.wiki.plugin"><code>Counter</code></a></dd>
-</dl>
 </li>
 </ul>
 </div>
@@ -264,7 +260,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <td class="colFirst"><code>javax.servlet.http.HttpServletRequest</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getHttpRequest()">getHttpRequest</a></span>()</code></th>
 <td class="colLast">
-<div class="block">If the request did originate from a HTTP request, then the HTTP request can be fetched here.</div>
+<div class="block">If the request did originate from an HTTP request, then the HTTP request can be fetched here.</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
@@ -300,7 +296,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getURL(java.lang.String,java.lang.String)">getURL</a></span>&#8203;(java.lang.String&nbsp;context,
       java.lang.String&nbsp;page)</code></th>
 <td class="colLast">
-<div class="block">Creates an URL for the given request context.</div>
+<div class="block">Creates a URL for the given request context.</div>
 </td>
 </tr>
 <tr id="i14" class="altColor">
@@ -309,7 +305,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
       java.lang.String&nbsp;page,
       java.lang.String&nbsp;params)</code></th>
 <td class="colLast">
-<div class="block">Returns an URL from a page.</div>
+<div class="block">Returns a URL from a page.</div>
 </td>
 </tr>
 <tr id="i15" class="rowColor">
@@ -421,7 +417,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <h4>VAR_EXECUTE_PLUGINS</h4>
 <pre>static final&nbsp;java.lang.String <a href="../../../../../src-html/org/apache/wiki/api/core/Context.html#line.48">VAR_EXECUTE_PLUGINS</a></pre>
 <div class="block">Variable name which tells whether plugins should be executed or not. Value can be either <code>Boolean.TRUE</code> or
-  <code>Boolean.FALSE</code>. While not set it's value is <code>null</code>.</div>
+  <code>Boolean.FALSE</code>. While not set its value is <code>null</code>.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../../constant-values.html#org.apache.wiki.api.core.Context.VAR_EXECUTE_PLUGINS">Constant Field Values</a></dd>
@@ -499,9 +495,6 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>A reference to the real page.</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../tags/InsertPageTag.html" title="class in org.apache.wiki.tags"><code>InsertPageTag</code></a>, 
-<a href="../../parser/JSPWikiMarkupParser.html" title="class in org.apache.wiki.parser"><code>JSPWikiMarkupParser</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -527,8 +520,6 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <dd>The previous real page</dd>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.14</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../tags/InsertPageTag.html" title="class in org.apache.wiki.tags"><code>InsertPageTag</code></a></dd>
 </dl>
 </li>
 </ul>
@@ -620,7 +611,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <h4>getHttpParameter</h4>
 <pre class="methodSignature">java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/api/core/Context.html#line.150">getHttpParameter</a>&#8203;(java.lang.String&nbsp;paramName)</pre>
 <div class="block">This method will safely return any HTTP parameters that might have been defined.  You should use this method instead
-  of peeking directly into the result of getHttpRequest(), since this method is smart enough to do all of the right things,
+  of peeking directly into the result of getHttpRequest(), since this method is smart enough to do all the right things,
   figure out UTF-8 encoded parameters, etc.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -639,8 +630,8 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <li class="blockList">
 <h4>getHttpRequest</h4>
 <pre class="methodSignature">javax.servlet.http.HttpServletRequest&nbsp;<a href="../../../../../src-html/org/apache/wiki/api/core/Context.html#line.159">getHttpRequest</a>()</pre>
-<div class="block">If the request did originate from a HTTP request, then the HTTP request can be fetched here.  However, it the request
-  did NOT originate from a HTTP request, then this method will return null, and YOU SHOULD CHECK FOR IT!</div>
+<div class="block">If the request did originate from an HTTP request, then the HTTP request can be fetched here.  However, if the request
+  did NOT originate from an HTTP request, then this method will return null, and YOU SHOULD CHECK FOR IT!</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>Null, if no HTTP request was done.</dd>
@@ -740,7 +731,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>WikiPage</code> - The WikiPage to which to link.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>An URL to the page.  This honours the current absolute/relative setting.</dd>
+<dd>A URL to the page.  This honours the current absolute/relative setting.</dd>
 </dl>
 </li>
 </ul>
@@ -782,13 +773,13 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <h4>getURL</h4>
 <pre class="methodSignature">default&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/api/core/Context.html#line.232">getURL</a>&#8203;(java.lang.String&nbsp;context,
                                 java.lang.String&nbsp;page)</pre>
-<div class="block">Creates an URL for the given request context.</div>
+<div class="block">Creates a URL for the given request context.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>context</code> - e.g. WikiContext.EDIT</dd>
 <dd><code>page</code> - The WikiPage to which to link</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>An URL to the page.</dd>
+<dd>A URL to the page.</dd>
 </dl>
 </li>
 </ul>
@@ -801,7 +792,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <pre class="methodSignature">default&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/api/core/Context.html#line.246">getURL</a>&#8203;(java.lang.String&nbsp;context,
                                 java.lang.String&nbsp;page,
                                 java.lang.String&nbsp;params)</pre>
-<div class="block">Returns an URL from a page. It this Context instance was constructed with an actual HttpServletRequest, we will attempt to
+<div class="block">Returns a URL from a page. It this Context instance was constructed with an actual HttpServletRequest, we will attempt to
   construct the URL using HttpUtil, which preserves the HTTPS portion if it was used.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -809,7 +800,7 @@ extends java.lang.Cloneable, <a href="Command.html" title="interface in org.apac
 <dd><code>page</code> - The WikiPage to which to link</dd>
 <dd><code>params</code> - A list of parameters, separated with "&amp;"</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>An URL to the given context and page.</dd>
+<dd>A URL to the given context and page.</dd>
 </dl>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html
index 6b1c2b0..c7c9c5f 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html
@@ -140,7 +140,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </dl>
 <hr>
 <object type="image/svg+xml" data="DefaultUserManager.JSONUserModule.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public static final class <a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.427">DefaultUserManager.JSONUserModule</a>
+<pre style="white-space:pre-wrap;">public static final class <a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.430">DefaultUserManager.JSONUserModule</a>
 extends java.lang.Object
 implements <a href="../ajax/WikiAjaxServlet.html" title="interface in org.apache.wiki.ajax">WikiAjaxServlet</a></pre>
 <div class="block">Implements the JSON API for usermanager.
@@ -240,7 +240,7 @@ implements <a href="../ajax/WikiAjaxServlet.html" title="interface in org.apache
 <ul class="blockListLast">
 <li class="blockList">
 <h4>JSONUserModule</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.435">JSONUserModule</a>&#8203;(<a href="DefaultUserManager.html" title="class in org.apache.wiki.auth">DefaultUserManager</a>&nbsp;mgr)</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.438">JSONUserModule</a>&#8203;(<a href="DefaultUserManager.html" title="class in org.apache.wiki.auth">DefaultUserManager</a>&nbsp;mgr)</pre>
 <div class="block">Create a new JSONUserModule.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -264,7 +264,7 @@ implements <a href="../ajax/WikiAjaxServlet.html" title="interface in org.apache
 <ul class="blockList">
 <li class="blockList">
 <h4>getServletMapping</h4>
-<pre class="methodSignature">public&nbsp;java.lang.String&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.440">getServletMapping</a>()</pre>
+<pre class="methodSignature">public&nbsp;java.lang.String&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.443">getServletMapping</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../ajax/WikiAjaxServlet.html#getServletMapping()">getServletMapping</a></code>&nbsp;in interface&nbsp;<code><a href="../ajax/WikiAjaxServlet.html" title="interface in org.apache.wiki.ajax">WikiAjaxServlet</a></code></dd>
@@ -277,7 +277,7 @@ implements <a href="../ajax/WikiAjaxServlet.html" title="interface in org.apache
 <ul class="blockList">
 <li class="blockList">
 <h4>service</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.445">service</a>&#8203;(javax.servlet.http.HttpServletRequest&nbsp;req,
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.448">service</a>&#8203;(javax.servlet.http.HttpServletRequest&nbsp;req,
                     javax.servlet.http.HttpServletResponse&nbsp;resp,
                     java.lang.String&nbsp;actionName,
                     java.util.List&lt;java.lang.String&gt;&nbsp;params)
@@ -298,7 +298,7 @@ implements <a href="../ajax/WikiAjaxServlet.html" title="interface in org.apache
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getUserInfo</h4>
-<pre class="methodSignature">public&nbsp;<a href="user/UserProfile.html" title="interface in org.apache.wiki.auth.user">UserProfile</a>&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.469">getUserInfo</a>&#8203;(java.lang.String&nbsp;uid)
+<pre class="methodSignature">public&nbsp;<a href="user/UserProfile.html" title="interface in org.apache.wiki.auth.user">UserProfile</a>&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html#line.472">getUserInfo</a>&#8203;(java.lang.String&nbsp;uid)
                         throws <a href="NoSuchPrincipalException.html" title="class in org.apache.wiki.auth">NoSuchPrincipalException</a></pre>
 <div class="block">Directly returns the UserProfile object attached to an uid.</div>
 <dl>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.html
index 3197614..0274458 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.html
@@ -532,7 +532,7 @@ implements <a href="UserManager.html" title="interface in org.apache.wiki.auth">
 <ul class="blockList">
 <li class="blockList">
 <h4>listWikiNames</h4>
-<pre class="methodSignature">public&nbsp;java.security.Principal[]&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.396">listWikiNames</a>()
+<pre class="methodSignature">public&nbsp;java.security.Principal[]&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.399">listWikiNames</a>()
                                         throws <a href="WikiSecurityException.html" title="class in org.apache.wiki.auth">WikiSecurityException</a></pre>
 <div class="block">A helper method for returning all of the known WikiNames in this system.</div>
 <dl>
@@ -551,7 +551,7 @@ implements <a href="UserManager.html" title="interface in org.apache.wiki.auth">
 <ul class="blockList">
 <li class="blockList">
 <h4>addWikiEventListener</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.408">addWikiEventListener</a>&#8203;(<a href="../event/WikiEventListener.html" title="interface in org.apache.wiki.event">WikiEventListener</a>&nbsp;listener)</pre>
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.411">addWikiEventListener</a>&#8203;(<a href="../event/WikiEventListener.html" title="interface in org.apache.wiki.event">WikiEventListener</a>&nbsp;listener)</pre>
 <div class="block">Registers a WikiEventListener with this instance.
  This is a convenience method.</div>
 <dl>
@@ -568,7 +568,7 @@ implements <a href="UserManager.html" title="interface in org.apache.wiki.auth">
 <ul class="blockListLast">
 <li class="blockList">
 <h4>removeWikiEventListener</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.417">removeWikiEventListener</a>&#8203;(<a href="../event/WikiEventListener.html" title="interface in org.apache.wiki.event">WikiEventListener</a>&nbsp;listener)</pre>
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/auth/DefaultUserManager.html#line.420">removeWikiEventListener</a>&#8203;(<a href="../event/WikiEventListener.html" title="interface in org.apache.wiki.event">WikiEventListener</a>&nbsp;listener)</pre>
 <div class="block">Un-registers a WikiEventListener with this instance.
  This is a convenience method.</div>
 <dl>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.html
index ba64370..316ca41 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.html
@@ -696,13 +696,12 @@ implements <a href="UserDatabase.html" title="interface in org.apache.wiki.auth.
 <ul class="blockList">
 <li class="blockList">
 <h4>getHash</h4>
-<pre class="methodSignature">protected&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html#line.258">getHash</a>&#8203;(java.lang.String&nbsp;text)</pre>
+<pre class="methodSignature">protected&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html#line.257">getHash</a>&#8203;(java.lang.String&nbsp;text)</pre>
 <div class="block">Private method that calculates the salted SHA-1 or SHA-256 hash of a given <code>String</code>. Note that as of JSPWiki 2.8, this method
  calculates a <em>salted</em> hash rather than a plain hash.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>text</code> - the text to hash</dd>
-<dd><code>text</code> - the algorithm used for the hash</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>the result hash</dd>
 </dl>
@@ -714,7 +713,7 @@ implements <a href="UserDatabase.html" title="interface in org.apache.wiki.auth.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>parseLong</h4>
-<pre class="methodSignature">protected&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html#line.293">parseLong</a>&#8203;(java.lang.String&nbsp;value)</pre>
+<pre class="methodSignature">protected&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html#line.292">parseLong</a>&#8203;(java.lang.String&nbsp;value)</pre>
 <div class="block">Parses a long integer from a supplied string, or returns 0 if not parsable.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.html
index aab5329..602c181 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.html
@@ -275,9 +275,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -458,15 +458,15 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>init</h4>
 <pre class="methodSignature">void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/SyntaxDecorator.html#line.45">init</a>&#8203;(java.io.PrintWriter&nbsp;out,
-          java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-          java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+          java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+          java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
           <a href="WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
           <a href="XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
           <a href="XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg
index ad6f3b6..aac3943 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="589px" preserveAspectRatio="none" style="width:775px;height:589px;background:#FFFFFF;" version="1.1" viewBox="0 0 775 589" width="775px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hdm0me4b2db8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hdm0me4b2db8)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="754" x="7" y="7"/><ellipse cx="312.75" cy="25.9688" fill=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="589px" preserveAspectRatio="none" style="width:787px;height:589px;background:#FFFFFF;" version="1.1" viewBox="0 0 787 589" width="787px" zoomAndPan="magnify"><defs><filter height="300%" id="f1k7c37ous1ov0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1k7c37ous1ov0)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="7" y="7"/><ellipse cx="318.75" cy="25.9688" fill=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
     hide empty methods
 
     interface "<size:14>SyntaxDecorator\n<size:10>org.apache.wiki.htmltowiki" as org.apache.wiki.htmltowiki.SyntaxDecorator [[SyntaxDecorator.html]] {
-        {abstract} +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+        {abstract} +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
         {abstract} +a(Element, String): void
         {abstract} +aFootnote(String, String): void
         {abstract} +aUndefined(Element): void
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html
index 89e8212..d712d6a 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html
@@ -132,7 +132,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <hr>
 <object type="image/svg+xml" data="XHtmlElementToWikiTranslator.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public class <a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.44">XHtmlElementToWikiTranslator</a>
+<pre style="white-space:pre-wrap;">public class <a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.45">XHtmlElementToWikiTranslator</a>
 extends java.lang.Object</pre>
 <div class="block">Converting XHtml to Wiki Markup.  This is the class which orchestrates all the heavy loading.</div>
 </li>
@@ -274,7 +274,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>XHtmlElementToWikiTranslator</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.60">XHtmlElementToWikiTranslator</a>&#8203;(<a href="../api/core/Engine.html" title="interface in org.apache.wiki.api.core">Engine</a>&nbsp;e,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.61">XHtmlElementToWikiTranslator</a>&#8203;(<a href="../api/core/Engine.html" title="interface in org.apache.wiki.api.core">Engine</a>&nbsp;e,
                                     org.jdom2.Element&nbsp;base)
                              throws org.jdom2.JDOMException,
                                     java.lang.ReflectiveOperationException</pre>
@@ -294,7 +294,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>XHtmlElementToWikiTranslator</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.71">XHtmlElementToWikiTranslator</a>&#8203;(<a href="../api/core/Engine.html" title="interface in org.apache.wiki.api.core">Engine</a>&nbsp;e,
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.72">XHtmlElementToWikiTranslator</a>&#8203;(<a href="../api/core/Engine.html" title="interface in org.apache.wiki.api.core">Engine</a>&nbsp;e,
                                     org.jdom2.Element&nbsp;base,
                                     <a href="XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config)
                              throws org.jdom2.JDOMException,
@@ -326,7 +326,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWikiString</h4>
-<pre class="methodSignature">public&nbsp;java.lang.String&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.98">getWikiString</a>()</pre>
+<pre class="methodSignature">public&nbsp;java.lang.String&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.99">getWikiString</a>()</pre>
 <div class="block">Outputs parsed wikitext.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -340,7 +340,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>translate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.102">translate</a>&#8203;(org.jdom2.Content&nbsp;element)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.103">translate</a>&#8203;(org.jdom2.Content&nbsp;element)
                throws org.jdom2.JDOMException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -354,7 +354,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>translateText</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.118">translateText</a>&#8203;(org.jdom2.Text&nbsp;element)</pre>
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.119">translateText</a>&#8203;(org.jdom2.Text&nbsp;element)</pre>
 </li>
 </ul>
 <a id="translateImage(org.jdom2.Element)">
@@ -363,7 +363,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>translateImage</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.122">translateImage</a>&#8203;(org.jdom2.Element&nbsp;base)</pre>
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.123">translateImage</a>&#8203;(org.jdom2.Element&nbsp;base)</pre>
 </li>
 </ul>
 <a id="translateChildren(org.jdom2.Element)">
@@ -372,7 +372,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>translateChildren</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.231">translateChildren</a>&#8203;(org.jdom2.Element&nbsp;base)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.232">translateChildren</a>&#8203;(org.jdom2.Element&nbsp;base)
                        throws org.jdom2.JDOMException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -386,7 +386,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>translateParagraph</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.306">translateParagraph</a>&#8203;(org.jdom2.Element&nbsp;base)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html#line.307">translateParagraph</a>&#8203;(org.jdom2.Element&nbsp;base)
                         throws org.jdom2.JDOMException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/WhitespaceTrimWriter.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/WhitespaceTrimWriter.html
index 90775c4..f95e05a 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/WhitespaceTrimWriter.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/WhitespaceTrimWriter.html
@@ -149,9 +149,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">SyntaxDecorator.</span><code><span class="memberNameLink"><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">SyntaxDecorator.</span><code><span class="memberNameLink"><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -220,9 +220,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">JSPWikiSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">JSPWikiSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -249,9 +249,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">MarkdownSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">MarkdownSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlElementToWikiTranslator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlElementToWikiTranslator.html
index 5483e09..a4ace8d 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlElementToWikiTranslator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlElementToWikiTranslator.html
@@ -149,9 +149,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">SyntaxDecorator.</span><code><span class="memberNameLink"><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">SyntaxDecorator.</span><code><span class="memberNameLink"><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -377,14 +377,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/BrDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">BrDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/BrDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">BrDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/CodeDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">CodeDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-             java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/CodeDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">CodeDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+             java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
              <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -439,14 +439,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/LiDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">LiDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/LiDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">LiDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/OlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">OlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/OlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">OlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -461,43 +461,38 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextBoldDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator</a></span>&#8203;(<a href="../syntax/PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextBoldDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator</a></span>&#8203;(<a href="../syntax/PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
                       java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextCssDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator</a></span>&#8203;(<a href="../syntax/PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextCssDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator</a></span>&#8203;(<a href="../syntax/PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
                      java.io.PrintWriter&nbsp;out,
-                     java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                      <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextCssSpecialDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssSpecialDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-                            java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextCssSpecialDecorator.html#%3Cinit%3E(java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssSpecialDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
                             <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator</a></span>&#8203;(<a href="../syntax/PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator</a></span>&#8203;(<a href="../syntax/PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
                   java.io.PrintWriter&nbsp;out,
-                  java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                   <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextItalicDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator</a></span>&#8203;(<a href="../syntax/PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextItalicDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator</a></span>&#8203;(<a href="../syntax/PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
                         java.io.PrintWriter&nbsp;out,
-                        java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                         <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextMonospaceDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator</a></span>&#8203;(<a href="../syntax/PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/PlainTextMonospaceDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator</a></span>&#8203;(<a href="../syntax/PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
                            java.io.PrintWriter&nbsp;out,
-                           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -533,8 +528,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/TdDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">TdDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/TdDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">TdDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -544,8 +539,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/ThDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">ThDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/ThDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">ThDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -560,8 +555,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/UlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">UlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../syntax/UlDecorator.html#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">UlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -589,9 +584,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">JSPWikiSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">JSPWikiSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -618,9 +613,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">MarkdownSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">MarkdownSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlToWikiConfig.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlToWikiConfig.html
index a434a1c..95cc218 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlToWikiConfig.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/class-use/XHtmlToWikiConfig.html
@@ -149,9 +149,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">SyntaxDecorator.</span><code><span class="memberNameLink"><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">SyntaxDecorator.</span><code><span class="memberNameLink"><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -255,9 +255,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">JSPWikiSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">JSPWikiSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/jspwiki/JSPWikiSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -284,9 +284,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><span class="typeNameLabel">MarkdownSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><span class="typeNameLabel">MarkdownSyntaxDecorator.</span><code><span class="memberNameLink"><a href="../syntax/markdown/MarkdownSyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg
index 53d6a19..27828c5 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="993px" preserveAspectRatio="none" style="width:1868px;height:993px;background:#FFFFFF;" version="1.1" viewBox="0 0 1868 993" width="1868px" zoomAndPan="magnify"><defs><filter height="300%" id="f1qenfj0i63476" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
-cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#f1qenfj0i63476)" points="16,165,233,165,240,187.2969,1851,187.2969,1851,970,16,970,16,165" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="240" y1="187.2969" y2="187.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="20" y="179.9951">org.apache.wiki.htmltowiki</text><!--MD5=[0d852700fd [...]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#f1qenfj0i63476)" points="501,6,557,6,564,28.2969,689,28.2969,689,140,501,140,501,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="501" x2="564" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="505" y="20.9951">java.io</text><!--MD5=[5b28aa672ccf90fdf7956b5ae9c93fe9]
-class org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><a href="XHtmlToWikiConfig.html" target="_top" title="XHtmlToWikiConfig.html" xlink:actuate="onRequest" xlink:href="XHtmlToWikiConfig.html" xlink:show="new" xlink:title="XHtmlToWikiConfig.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1qenfj0i63476)" height="252.875" id="org.apache.wiki.htmltowiki.XHtmlToWikiConfig" style="stroke:#A80036;stroke-width:1.5;" width="299" x="754.5" y="345.5"/><ellipse cx="843.25" [...]
-class org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><a href="WhitespaceTrimWriter.html" target="_top" title="WhitespaceTrimWriter.html" xlink:actuate="onRequest" xlink:href="WhitespaceTrimWriter.html" xlink:show="new" xlink:title="WhitespaceTrimWriter.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f1qenfj0i63476)" height="137.6328" id="org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.5;" width="248" x="471" y="403"/><ell [...]
-class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator--><a href="XHtmlElementToWikiTranslator.html" target="_top" title="XHtmlElementToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.html" xlink:type="simple"><rect codeLine="32" fill="#FEFECE" filter="url(#f1qenfj0i63476)" height="150.4375" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator" style="stroke:#A80036;stro [...]
-class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><a href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" target="_top" title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:type="simple"><rect codeLine="43" fill="#FEFECE" filter="url(#f1qenfj0i63476)"  [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="54" fill="#FEFECE" filter="url(#f1qenfj0i63476)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="754" x="1089" y="192"/><ellipse cx="1408.75" cy="208" fi [...]
-class org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><a href="HtmlStringToWikiTranslator.html" target="_top" title="HtmlStringToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="HtmlStringToWikiTranslator.html" xlink:show="new" xlink:title="HtmlStringToWikiTranslator.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f1qenfj0i63476)" height="112.0234" id="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" style="stroke:#A80036;stroke-width:1.5 [...]
-class java.io.Writer--><rect codeLine="110" fill="#FEFECE" filter="url(#f1qenfj0i63476)" height="99.2188" id="java.io.Writer" style="stroke:#A80036;stroke-width:1.5;" width="171" x="509.5" y="33"/><ellipse cx="571.75" cy="49" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M571.8594,44.3438 L570.7031,49.4219 L573.0313,49.4219 L571.8594,44.3438 Z M570.375,42.1094 L573.3594,42.1094 L576.7188,54.5 L574.2656,54.5 L573.5,51.4375 L570.2188,51.4375 L569.4688,54 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="993px" preserveAspectRatio="none" style="width:1880px;height:993px;background:#FFFFFF;" version="1.1" viewBox="0 0 1880 993" width="1880px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xqt4cvj2ewu" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
+cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#f1xqt4cvj2ewu)" points="16,165,233,165,240,187.2969,1863,187.2969,1863,970,16,970,16,165" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="240" y1="187.2969" y2="187.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="20" y="179.9951">org.apache.wiki.htmltowiki</text><!--MD5=[0d852700fda [...]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#f1xqt4cvj2ewu)" points="501,6,557,6,564,28.2969,689,28.2969,689,140,501,140,501,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="501" x2="564" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="505" y="20.9951">java.io</text><!--MD5=[5b28aa672ccf90fdf7956b5ae9c93fe9]
+class org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><a href="XHtmlToWikiConfig.html" target="_top" title="XHtmlToWikiConfig.html" xlink:actuate="onRequest" xlink:href="XHtmlToWikiConfig.html" xlink:show="new" xlink:title="XHtmlToWikiConfig.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" height="252.875" id="org.apache.wiki.htmltowiki.XHtmlToWikiConfig" style="stroke:#A80036;stroke-width:1.5;" width="299" x="754.5" y="345.5"/><ellipse cx="843.25"  [...]
+class org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><a href="WhitespaceTrimWriter.html" target="_top" title="WhitespaceTrimWriter.html" xlink:actuate="onRequest" xlink:href="WhitespaceTrimWriter.html" xlink:show="new" xlink:title="WhitespaceTrimWriter.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" height="137.6328" id="org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.5;" width="248" x="471" y="403"/><elli [...]
+class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator--><a href="XHtmlElementToWikiTranslator.html" target="_top" title="XHtmlElementToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.html" xlink:type="simple"><rect codeLine="32" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" height="150.4375" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator" style="stroke:#A80036;strok [...]
+class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><a href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" target="_top" title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:type="simple"><rect codeLine="43" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" h [...]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="54" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="1089" y="192"/><ellipse cx="1414.75" cy="208" fil [...]
+class org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><a href="HtmlStringToWikiTranslator.html" target="_top" title="HtmlStringToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="HtmlStringToWikiTranslator.html" xlink:show="new" xlink:title="HtmlStringToWikiTranslator.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" height="112.0234" id="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" style="stroke:#A80036;stroke-width:1.5; [...]
+class java.io.Writer--><rect codeLine="110" fill="#FEFECE" filter="url(#f1xqt4cvj2ewu)" height="99.2188" id="java.io.Writer" style="stroke:#A80036;stroke-width:1.5;" width="171" x="509.5" y="33"/><ellipse cx="571.75" cy="49" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M571.8594,44.3438 L570.7031,49.4219 L573.0313,49.4219 L571.8594,44.3438 Z M570.375,42.1094 L573.3594,42.1094 L576.7188,54.5 L574.2656,54.5 L573.5,51.4375 L570.2188,51.4375 L569.4688,54. [...]
 reverse link java.io.Writer to org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><path codeLine="105" d="M595,152.4719 C595,223.3506 595,332.3199 595,402.8884 " fill="none" id="java.io.Writer-backto-org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="588.0001,152.2261,595,132.2261,602.0001,152.226,588.0001,152.2261" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[52d57de5793f49c3c1bcfaa300453f3a]
 reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="106" d="M230,562.5908 C230,637.1706 230,741.6601 230,811.7057 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="230.0001" cy="555.1534" fill="#FFFFFF" rx="8" ry= [...]
 link org.apache.wiki.htmltowiki.XHtmlToWikiConfig to org.apache.wiki.htmltowiki.SyntaxDecorator--><!--MD5=[f54d3c6b6fe0b345c1e02858eca2b02f]
-link org.apache.wiki.htmltowiki.XHtmlToWikiConfig to org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="831.5" y="985.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[7979a60e42221dcb32b8fbea6bd99805]
+link org.apache.wiki.htmltowiki.XHtmlToWikiConfig to org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="837.5" y="985.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[235e9b33e442032a45f616f31f8cedf8]
 @startuml
     namespace org.apache.wiki.htmltowiki {
 
@@ -67,7 +67,7 @@ link org.apache.wiki.htmltowiki.XHtmlToWikiConfig to org.apache.wiki.htmltowiki.
         }
 
         interface SyntaxDecorator [[SyntaxDecorator.html]] {
-            {abstract} +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+            {abstract} +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
             {abstract} +a(Element, String): void
             {abstract} +aFootnote(String, String): void
             {abstract} +aUndefined(Element): void
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.html
index 838a4e8..2b53fad 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.html
@@ -166,7 +166,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">BrDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">BrDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -267,7 +267,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html#line.35">preStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -289,14 +289,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>BrDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html#line.38">BrDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                      java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg
index 4b65552..0ef436a 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:455px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 455 162" width="455px" zoomAndPan="magnify"><defs><filter height="300%" id="f1femm2jpiyk5h" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1femm2jpiyk5h)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="434" x="7" y="7"/><ellipse cx="134.75" cy="25.9688" fill="#A9DCDF"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:460px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 460 162" width="460px" zoomAndPan="magnify"><defs><filter height="300%" id="f1cqzs47ty3ukl" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1cqzs47ty3ukl)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="439" x="7" y="7"/><ellipse cx="137.25" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html"
 
     abstract class "<size:14>BrDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.BrDecorator [[BrDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
+        #preStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #BrDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #BrDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element, Element): void
         {abstract} #markupBr(): String
     }
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html
index 31b256b..fcaef61 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html
@@ -166,7 +166,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">CodeDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-             java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">CodeDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+             java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
              <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -273,7 +273,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html#line.35">preStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -295,14 +295,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CodeDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html#line.38">CodeDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                        java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                        java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                         <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg
index 45d9db1..288639e 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:471px;height:175px;background:#FFFFFF;" version="1.1" viewBox="0 0 471 175" width="471px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hrks99epfra3" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hrks99epfra3)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="450" x="7" y="7"/><ellipse cx="142.75" cy="25.9688" fil [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:476px;height:175px;background:#FFFFFF;" version="1.1" viewBox="0 0 476 175" width="476px" zoomAndPan="magnify"><defs><filter height="300%" id="fzbx04du1g5r9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fzbx04du1g5r9)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="455" x="7" y="7"/><ellipse cx="145.25" cy="25.9688" fill [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.h
 
     abstract class "<size:14>CodeDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.CodeDecorator [[CodeDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
+        #preStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #CodeDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #CodeDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element): void
         {abstract} #markupCodeOpen(): String
         {abstract} #markupCodeClose(): String
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.html
index 7d68384..9e7549f 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.html
@@ -161,7 +161,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#liStack">liStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">LiDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">LiDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -223,7 +223,7 @@ extends java.lang.Object</pre>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>protected abstract java.lang.String</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#markupLi(java.util.Stack)">markupLi</a></span>&#8203;(java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#markupLi(java.util.Deque)">markupLi</a></span>&#8203;(java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack)</code></th>
 <td class="colLast">
 <div class="block">Wiki markup for a <code>LI</code> element.</div>
 </td>
@@ -267,7 +267,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>liStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html#line.35">liStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html#line.35">liStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -289,14 +289,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>LiDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html#line.38">LiDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+                      java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
@@ -329,13 +329,13 @@ extends java.lang.Object</pre>
 </dl>
 </li>
 </ul>
-<a id="markupLi(java.util.Stack)">
+<a id="markupLi(java.util.Deque)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>markupLi</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html#line.70">markupLi</a>&#8203;(java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html#line.70">markupLi</a>&#8203;(java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack)</pre>
 <div class="block">Wiki markup for a <code>LI</code> element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg
index 84cf81e..0daca2e 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:451px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 451 162" width="451px" zoomAndPan="magnify"><defs><filter height="300%" id="f1dtq10iplqz4d" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1dtq10iplqz4d)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="430" x="7" y="7"/><ellipse cx="132.75" cy="25.9688" fill="#A9DCDF"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:456px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 456 162" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="fbw9k3l1y20gb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fbw9k3l1y20gb)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="7" y="7"/><ellipse cx="135.25" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,11 +7,11 @@ class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html"
 
     abstract class "<size:14>LiDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.LiDecorator [[LiDecorator.html]] {
         #out: PrintWriter
-        #liStack: Stack<String>
+        #liStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #LiDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #LiDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element, Element): void
-        {abstract} #markupLi(Stack<String>): String
+        {abstract} #markupLi(Deque<String>): String
     }
 
     center footer UMLDoclet 2.0.15, PlantUML 1.2021.13
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.html
index ea5012c..f78c2e1 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.html
@@ -161,7 +161,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#liStack">liStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">OlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">OlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -266,7 +266,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>liStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html#line.35">liStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html#line.35">liStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -288,14 +288,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>OlDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html#line.38">OlDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+                      java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg
index aac1da4..cd6102c 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:454px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 454 162" width="454px" zoomAndPan="magnify"><defs><filter height="300%" id="f1d3imi8me4z42" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1d3imi8me4z42)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="433" x="7" y="7"/><ellipse cx="134.25" cy="25.9688" fill="#A9DCDF"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:459px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 459 162" width="459px" zoomAndPan="magnify"><defs><filter height="300%" id="fyhozh5m019du" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fyhozh5m019du)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="438" x="7" y="7"/><ellipse cx="136.75" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html"
 
     abstract class "<size:14>OlDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.OlDecorator [[OlDecorator.html]] {
         #out: PrintWriter
-        #liStack: Stack<String>
+        #liStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #OlDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #OlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element): void
         {abstract} #markupOl(): String
     }
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html
index c088d20..4150c71 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html
@@ -132,7 +132,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <hr>
 <object type="image/svg+xml" data="PlainTextBoldDecorator.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.32">PlainTextBoldDecorator</a>
+<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.31">PlainTextBoldDecorator</a>
 extends java.lang.Object</pre>
 <div class="block">Translates to wiki syntax from a plain text handling bold.</div>
 </li>
@@ -166,11 +166,6 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a></code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ptid">ptid</a></span></code></th>
 <td class="colLast">&nbsp;</td>
@@ -195,9 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator</a></span>&#8203;(<a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator</a></span>&#8203;(<a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
                       java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -277,16 +271,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.34">out</a></pre>
-</li>
-</ul>
-<a id="preStack">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.33">out</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -295,7 +280,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>chain</h4>
-<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.36">chain</a></pre>
+<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.34">chain</a></pre>
 </li>
 </ul>
 <a id="ptid">
@@ -304,7 +289,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ptid</h4>
-<pre>protected final&nbsp;<a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.37">ptid</a></pre>
+<pre>protected final&nbsp;<a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.35">ptid</a></pre>
 </li>
 </ul>
 </li>
@@ -317,15 +302,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlainTextBoldDecorator</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.39">PlainTextBoldDecorator</a>&#8203;(<a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.37">PlainTextBoldDecorator</a>&#8203;(<a href="PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
                                  java.io.PrintWriter&nbsp;out,
-                                 java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                                  <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
@@ -345,7 +329,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.51">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.48">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
@@ -362,7 +346,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.66">decorate</a>&#8203;(org.jdom2.Element&nbsp;e)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.63">decorate</a>&#8203;(org.jdom2.Element&nbsp;e)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
@@ -379,7 +363,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupBoldOpen</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.77">markupBoldOpen</a>()</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.74">markupBoldOpen</a>()</pre>
 <div class="block">Opening wiki markup for a bold element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -393,7 +377,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>markupBoldClose</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.84">markupBoldClose</a>()</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html#line.81">markupBoldClose</a>()</pre>
 <div class="block">Closing wiki markup for a bold element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg
index 3a0487c..98c0e00 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:659px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 659 200" width="659px" zoomAndPan="magnify"><defs><filter height="300%" id="fj4gtri2f1c4b" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fj4gtri2f1c4b)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width="63 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:568px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 568 188" width="568px" zoomAndPan="magnify"><defs><filter height="300%" id="f1aohs6ck3my7c" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1aohs6ck3my7c)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width="54 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,10 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainT
 
     abstract class "<size:14>PlainTextBoldDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator [[PlainTextBoldDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
         #chain: XHtmlElementToWikiTranslator
         #ptid: PlainTextItalicDecorator
-        #PlainTextBoldDecorator(PlainTextItalicDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #PlainTextBoldDecorator(PlainTextItalicDecorator, PrintWriter, XHtmlElementToWikiTranslator)
         +decorate(ElementDecoratorData): void
         +decorate(Element): void
         {abstract} #markupBoldOpen(): String
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html
index eb5f676..eafe4bf 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html
@@ -132,7 +132,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <hr>
 <object type="image/svg+xml" data="PlainTextCssDecorator.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.31">PlainTextCssDecorator</a>
+<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.30">PlainTextCssDecorator</a>
 extends java.lang.Object</pre>
 <div class="block">Translates to wiki syntax from a plain text handling css classes.</div>
 </li>
@@ -166,11 +166,6 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a></code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ptbd">ptbd</a></span></code></th>
 <td class="colLast">&nbsp;</td>
@@ -195,9 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator</a></span>&#8203;(<a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator</a></span>&#8203;(<a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
                      java.io.PrintWriter&nbsp;out,
-                     java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                      <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -284,16 +278,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.33">out</a></pre>
-</li>
-</ul>
-<a id="preStack">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.34">preStack</a></pre>
+<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.32">out</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -302,7 +287,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>chain</h4>
-<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.35">chain</a></pre>
+<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.33">chain</a></pre>
 </li>
 </ul>
 <a id="ptbd">
@@ -311,7 +296,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ptbd</h4>
-<pre>protected final&nbsp;<a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.36">ptbd</a></pre>
+<pre>protected final&nbsp;<a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.34">ptbd</a></pre>
 </li>
 </ul>
 </li>
@@ -324,15 +309,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlainTextCssDecorator</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.38">PlainTextCssDecorator</a>&#8203;(<a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.36">PlainTextCssDecorator</a>&#8203;(<a href="PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
                                 java.io.PrintWriter&nbsp;out,
-                                java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                                 <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
@@ -352,7 +336,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.50">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.47">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
@@ -369,7 +353,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupCssDivOpen</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.73">markupCssDivOpen</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.70">markupCssDivOpen</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
 <div class="block">Opening wiki markup for a css element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -383,7 +367,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupCssDivClose</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.80">markupCssDivClose</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.77">markupCssDivClose</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
 <div class="block">Closing wiki markup for a css element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -397,7 +381,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupCssSpanOpen</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.87">markupCssSpanOpen</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.84">markupCssSpanOpen</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
 <div class="block">Opening wiki markup for a css element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -411,7 +395,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>markupCssSpanClose</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.94">markupCssSpanClose</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html#line.91">markupCssSpanClose</a>&#8203;(java.lang.String&nbsp;cssClass)</pre>
 <div class="block">Closing wiki markup for a css element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg
index a197b63..92a1218 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:655px;height:213px;background:#FFFFFF;" version="1.1" viewBox="0 0 655 213" width="655px" zoomAndPan="magnify"><defs><filter height="300%" id="figk4vhswh284" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#figk4vhswh284)" height="181.9844" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="634" x=" [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:564px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 564 200" width="564px" zoomAndPan="magnify"><defs><filter height="300%" id="fy3gly1aoq5ov" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fy3gly1aoq5ov)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="543" x=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,10 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTe
 
     abstract class "<size:14>PlainTextCssDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator [[PlainTextCssDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
         #chain: XHtmlElementToWikiTranslator
         #ptbd: PlainTextBoldDecorator
-        #PlainTextCssDecorator(PlainTextBoldDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #PlainTextCssDecorator(PlainTextBoldDecorator, PrintWriter, XHtmlElementToWikiTranslator)
         +decorate(ElementDecoratorData): void
         {abstract} #markupCssDivOpen(String): String
         {abstract} #markupCssDivClose(String): String
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html
index 71ab0d5..e7dde4f 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html
@@ -132,7 +132,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <hr>
 <object type="image/svg+xml" data="PlainTextCssSpecialDecorator.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.31">PlainTextCssSpecialDecorator</a>
+<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.30">PlainTextCssSpecialDecorator</a>
 extends java.lang.Object</pre>
 <div class="block">Translates to wiki syntax from a plain text handling special css.</div>
 </li>
@@ -165,11 +165,6 @@ extends java.lang.Object</pre>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#out">out</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
-<td class="colLast">&nbsp;</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -190,8 +185,7 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssSpecialDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-                            java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssSpecialDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
                             <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -278,16 +272,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.33">out</a></pre>
-</li>
-</ul>
-<a id="preStack">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.34">preStack</a></pre>
+<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.32">out</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -296,7 +281,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>chain</h4>
-<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.35">chain</a></pre>
+<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.33">chain</a></pre>
 </li>
 </ul>
 </li>
@@ -309,14 +294,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlainTextCssSpecialDecorator</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.37">PlainTextCssSpecialDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                                       java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.35">PlainTextCssSpecialDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
                                        <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
@@ -336,7 +320,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.48">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.45">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
@@ -353,7 +337,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupCssSpecialDivOpen</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.72">markupCssSpecialDivOpen</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.69">markupCssSpecialDivOpen</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
 <div class="block">Opening wiki markup for a css style element.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -369,7 +353,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupCssSpecialDivClose</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.80">markupCssSpecialDivClose</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.77">markupCssSpecialDivClose</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
 <div class="block">Closing wiki markup for a css style element.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -385,7 +369,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupCssSpecialOpen</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.88">markupCssSpecialOpen</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.85">markupCssSpecialOpen</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
 <div class="block">Opening wiki markup for a css style element.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -401,7 +385,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>markupCssSpecialClose</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.96">markupCssSpecialClose</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html#line.93">markupCssSpecialClose</a>&#8203;(java.lang.String&nbsp;cssStyle)</pre>
 <div class="block">Closing wiki markup for a css style element.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg
index 8b1b0fb..f3e440b 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:556px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 556 200" width="556px" zoomAndPan="magnify"><defs><filter height="300%" id="f1qv8l1mncug8a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1qv8l1mncug8a)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:465px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 465 188" width="465px" zoomAndPan="magnify"><defs><filter height="300%" id="fne4dtctxwsp5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fne4dtctxwsp5)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:# [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,8 @@ class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="
 
     abstract class "<size:14>PlainTextCssSpecialDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator [[PlainTextCssSpecialDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
         #chain: XHtmlElementToWikiTranslator
-        #PlainTextCssSpecialDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #PlainTextCssSpecialDecorator(PrintWriter, XHtmlElementToWikiTranslator)
         +decorate(ElementDecoratorData): void
         {abstract} #markupCssSpecialDivOpen(String): String
         {abstract} #markupCssSpecialDivClose(String): String
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html
index 3334b0e..d827d60 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html
@@ -132,7 +132,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <hr>
 <object type="image/svg+xml" data="PlainTextDecorator.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.38">PlainTextDecorator</a>
+<pre style="white-space:pre-wrap;">public class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.37">PlainTextDecorator</a>
 extends java.lang.Object</pre>
 <div class="block">Translates to wiki syntax from a plain text. Specifically, this decorator handles the following conversions, when needed:
  <ul>
@@ -173,11 +173,6 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a></code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ptcd">ptcd</a></span></code></th>
 <td class="colLast">&nbsp;</td>
@@ -200,9 +195,8 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator</a></span>&#8203;(<a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator</a></span>&#8203;(<a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
                   java.io.PrintWriter&nbsp;out,
-                  java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                   <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -261,16 +255,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.40">out</a></pre>
-</li>
-</ul>
-<a id="preStack">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.41">preStack</a></pre>
+<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.39">out</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -279,7 +264,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>chain</h4>
-<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.42">chain</a></pre>
+<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.40">chain</a></pre>
 </li>
 </ul>
 <a id="ptcd">
@@ -288,7 +273,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ptcd</h4>
-<pre>protected final&nbsp;<a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.43">ptcd</a></pre>
+<pre>protected final&nbsp;<a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.41">ptcd</a></pre>
 </li>
 </ul>
 </li>
@@ -301,15 +286,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlainTextDecorator</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.45">PlainTextDecorator</a>&#8203;(<a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.43">PlainTextDecorator</a>&#8203;(<a href="PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
                           java.io.PrintWriter&nbsp;out,
-                          java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                           <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
@@ -329,7 +313,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.57">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html#line.54">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg
index b2d5a29..6d2eed7 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:630px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 630 162" width="630px" zoomAndPan="magnify"><defs><filter height="300%" id="ffpm3spf1mqq7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ffpm3spf1mqq7)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="609" x="7" y="7"/><ellipse [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:539px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 539 149" width="539px" zoomAndPan="magnify"><defs><filter height="300%" id="ft9dq51p8rq0i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ft9dq51p8rq0i)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="518" x="7" y="7"/><ellipse [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,10 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextD
 
     class "<size:14>PlainTextDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.PlainTextDecorator [[PlainTextDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
         #chain: XHtmlElementToWikiTranslator
         #ptcd: PlainTextCssDecorator
-        +PlainTextDecorator(PlainTextCssDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        +PlainTextDecorator(PlainTextCssDecorator, PrintWriter, XHtmlElementToWikiTranslator)
         +decorate(ElementDecoratorData): void
     }
 
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html
index 2c67ae8..d6aba84 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html
@@ -132,7 +132,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <hr>
 <object type="image/svg+xml" data="PlainTextItalicDecorator.svg"  style="max-width:60%;float:right;"></object>
-<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.32">PlainTextItalicDecorator</a>
+<pre style="white-space:pre-wrap;">public abstract class <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.31">PlainTextItalicDecorator</a>
 extends java.lang.Object</pre>
 <div class="block">Translates to wiki syntax from a plain text handling italic.</div>
 </li>
@@ -166,11 +166,6 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>protected <a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a></code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ptmd">ptmd</a></span></code></th>
 <td class="colLast">&nbsp;</td>
@@ -195,9 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator</a></span>&#8203;(<a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator</a></span>&#8203;(<a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
                         java.io.PrintWriter&nbsp;out,
-                        java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                         <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -277,16 +271,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.34">out</a></pre>
-</li>
-</ul>
-<a id="preStack">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.io.PrintWriter <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.33">out</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -295,7 +280,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>chain</h4>
-<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.36">chain</a></pre>
+<pre>protected final&nbsp;<a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.34">chain</a></pre>
 </li>
 </ul>
 <a id="ptmd">
@@ -304,7 +289,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ptmd</h4>
-<pre>protected final&nbsp;<a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.37">ptmd</a></pre>
+<pre>protected final&nbsp;<a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a> <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.35">ptmd</a></pre>
 </li>
 </ul>
 </li>
@@ -317,15 +302,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlainTextItalicDecorator</h4>
-<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.39">PlainTextItalicDecorator</a>&#8203;(<a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
+<pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.37">PlainTextItalicDecorator</a>&#8203;(<a href="PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
                                    java.io.PrintWriter&nbsp;out,
-                                   java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                                    <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
@@ -345,7 +329,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.51">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.48">decorate</a>&#8203;(<a href="../XHtmlElementToWikiTranslator.ElementDecoratorData.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator.ElementDecoratorData</a>&nbsp;dto)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
@@ -362,7 +346,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>decorate</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.66">decorate</a>&#8203;(org.jdom2.Element&nbsp;e)
+<pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.63">decorate</a>&#8203;(org.jdom2.Element&nbsp;e)
               throws org.jdom2.JDOMException</pre>
 <div class="block">Translates the given XHTML element into wiki markup.</div>
 <dl>
@@ -379,7 +363,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>markupItalicOpen</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.77">markupItalicOpen</a>()</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.74">markupItalicOpen</a>()</pre>
 <div class="block">Opening wiki markup for an italic element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -393,7 +377,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>markupItalicClose</h4>
-<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.84">markupItalicClose</a>()</pre>
+<pre class="methodSignature">protected abstract&nbsp;java.lang.String&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html#line.81">markupItalicClose</a>()</pre>
 <div class="block">Closing wiki markup for an italic element.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg
index 23f6478..eccf6ec 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:698px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 698 200" width="698px" zoomAndPan="magnify"><defs><filter height="300%" id="f1k045gyarvz0f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1k045gyarvz0f)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1. [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:607px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 607 188" width="607px" zoomAndPan="magnify"><defs><filter height="300%" id="faeuoftx73qjk" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#faeuoftx73qjk)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.5; [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,10 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="Plai
 
     abstract class "<size:14>PlainTextItalicDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator [[PlainTextItalicDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
         #chain: XHtmlElementToWikiTranslator
         #ptmd: PlainTextMonospaceDecorator
-        #PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, XHtmlElementToWikiTranslator)
         +decorate(ElementDecoratorData): void
         +decorate(Element): void
         {abstract} #markupItalicOpen(): String
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html
index 318ce2c..decbad3 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html
@@ -166,7 +166,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -195,9 +195,9 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator</a></span>&#8203;(<a href="PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator</a></span>&#8203;(<a href="PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
                            java.io.PrintWriter&nbsp;out,
-                           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -286,7 +286,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html#line.35">preStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -317,7 +317,7 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -325,7 +325,7 @@ extends java.lang.Object</pre>
 <h4>PlainTextMonospaceDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html#line.39">PlainTextMonospaceDecorator</a>&#8203;(<a href="PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
                                       java.io.PrintWriter&nbsp;out,
-                                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                                      java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg
index 93ff50d..9258875 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:735px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 735 200" width="735px" zoomAndPan="magnify"><defs><filter height="300%" id="f1jqaryszs5wwe" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1jqaryszs5wwe)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A800 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:740px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 740 200" width="740px" zoomAndPan="magnify"><defs><filter height="300%" id="f1b33m7sri9esy" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1b33m7sri9esy)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A800 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,10 +7,10 @@ class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="P
 
     abstract class "<size:14>PlainTextMonospaceDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator [[PlainTextMonospaceDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
+        #preStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
         #ptcsd: PlainTextCssSpecialDecorator
-        #PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(ElementDecoratorData): void
         +decorate(Element): void
         {abstract} #markupMonospaceOpen(): String
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.html
index 39f28f6..e678c09 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.html
@@ -166,7 +166,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">TdDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">TdDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -266,7 +266,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html#line.35">preStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -288,14 +288,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TdDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html#line.38">TdDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                      java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg
index ebefe1c..ec1af31 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:456px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 456 162" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="f1mu06h6iloaft" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1mu06h6iloaft)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="7" y="7"/><ellipse cx="135.25" cy="25.9688" fill="#A9DCDF"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:461px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 461 162" width="461px" zoomAndPan="magnify"><defs><filter height="300%" id="f1upk7isn50gmf" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1upk7isn50gmf)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7" y="7"/><ellipse cx="137.75" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html"
 
     abstract class "<size:14>TdDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.TdDecorator [[TdDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
+        #preStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #TdDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #TdDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element): void
         {abstract} #markupTd(): String
     }
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html
index c11e493..a77babd 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html
@@ -161,7 +161,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -183,8 +183,8 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack)">TextElementDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-                    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack)</code></th>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque)">TextElementDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+                    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </table>
@@ -251,7 +251,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html#line.33">preStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html#line.33">preStack</a></pre>
 </li>
 </ul>
 </li>
@@ -264,14 +264,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TextElementDecorator</h4>
 <pre>public&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html#line.35">TextElementDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                            java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack)</pre>
+                            java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack)</pre>
 </li>
 </ul>
 </li>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg
index 5bf4941..aa384f7 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:331px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 331 136" width="331px" zoomAndPan="magnify"><defs><filter height="300%" id="fokpe4cbjvx1" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation [...]
-class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fokpe4cbjvx1)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="310" x="7" y="7 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:336px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 336 136" width="336px" zoomAndPan="magnify"><defs><filter height="300%" id="f1s1agkw8mq4ez" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1s1agkw8mq4ez)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="315" x="7" y= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,8 +7,8 @@ class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElem
 
     class "<size:14>TextElementDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.TextElementDecorator [[TextElementDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
-        +TextElementDecorator(PrintWriter, Stack<String>)
+        #preStack: Deque<String>
+        +TextElementDecorator(PrintWriter, Deque<String>)
         +decorate(Text): void
     }
 
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.html
index d7fb5bf..c7abcda 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.html
@@ -166,7 +166,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#preStack">preStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">ThDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">ThDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -266,7 +266,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>preStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html#line.35">preStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html#line.35">preStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -288,14 +288,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ThDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html#line.38">ThDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                      java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg
index 5d926da..4027ba9 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:456px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 456 162" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="fpokzgttiw8ul" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpokzgttiw8ul)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="7" y="7"/><ellipse cx="135.25" cy="25.9688" fill="#A9DCDF" r [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:461px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 461 162" width="461px" zoomAndPan="magnify"><defs><filter height="300%" id="f14aemhwtwzykt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14aemhwtwzykt)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7" y="7"/><ellipse cx="137.75" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html"
 
     abstract class "<size:14>ThDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.ThDecorator [[ThDecorator.html]] {
         #out: PrintWriter
-        #preStack: Stack<String>
+        #preStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #ThDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #ThDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element): void
         {abstract} #markupTh(): String
     }
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.html
index 4ee8d65..5a4ea94 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.html
@@ -161,7 +161,7 @@ extends java.lang.Object</pre>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>protected java.util.Stack&lt;java.lang.String&gt;</code></td>
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#liStack">liStack</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -190,8 +190,8 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">UlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-           java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">UlDecorator</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+           java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
            <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -266,7 +266,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>liStack</h4>
-<pre>protected final&nbsp;java.util.Stack&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html#line.35">liStack</a></pre>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; <a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html#line.35">liStack</a></pre>
 </li>
 </ul>
 <a id="chain">
@@ -288,14 +288,14 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="&lt;init&gt;(java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>UlDecorator</h4>
 <pre>protected&nbsp;<a href="../../../../../src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html#line.38">UlDecorator</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
+                      java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
                       <a href="../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg
index 2899194..a0fa1db 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:453px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 453 162" width="453px" zoomAndPan="magnify"><defs><filter height="300%" id="f1mljwxlgk8jis" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1mljwxlgk8jis)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="432" x="7" y="7"/><ellipse cx="133.75" cy="25.9688" fill="#A9DCDF"  [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:458px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 458 162" width="458px" zoomAndPan="magnify"><defs><filter height="300%" id="f17zq9wig64tsk" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f17zq9wig64tsk)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="437" x="7" y="7"/><ellipse cx="136.25" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -7,9 +7,9 @@ class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html"
 
     abstract class "<size:14>UlDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.UlDecorator [[UlDecorator.html]] {
         #out: PrintWriter
-        #liStack: Stack<String>
+        #liStack: Deque<String>
         #chain: XHtmlElementToWikiTranslator
-        #UlDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+        #UlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
         +decorate(Element): void
         {abstract} #markupUl(): String
     }
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html
index c76c731..e8ee689 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html
@@ -146,7 +146,7 @@ implements <a href="../SyntaxDecorator.html" title="interface in org.apache.wiki
 <div class="block"><p>Base Syntax decorator which translates to JSPWiki syntax. Delegates each kind of XHTML element to its specific
  decorator.</p>
  <p>This class is useful when developing a new wiki syntax decorator - just extend from it and provide the implementations of all
- the needed Decorators on the <a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)"><code>SyntaxDecorator.init(PrintWriter, Stack, Stack, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</code></a> method</p></div>
+ the needed Decorators on the <a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)"><code>SyntaxDecorator.init(PrintWriter, Deque, Deque, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)</code></a> method</p></div>
 </li>
 </ul>
 </div>
@@ -703,7 +703,7 @@ implements <a href="../SyntaxDecorator.html" title="interface in org.apache.wiki
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.apache.wiki.htmltowiki.<a href="../SyntaxDecorator.html" title="interface in org.apache.wiki.htmltowiki">SyntaxDecorator</a></h3>
-<code><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></code></li>
+<code><a href="../SyntaxDecorator.html#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg
index a8fe41f..cf568c0 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1734px" preserveAspectRatio="none" style="width:775px;height:1734px;background:#FFFFFF;" version="1.1" viewBox="0 0 775 1734" width="775px" zoomAndPan="magnify"><defs><filter height="300%" id="f34wtalcho19m" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f34wtalcho19m)" height="1078.3125" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="253.5" y="6 [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="88" fill="#FEFECE" filter="url(#f34wtalcho19m)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="754" x="7" y="7"/><ellipse cx="312.75" cy="25. [...]
-reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="131" d="M384,585.2414 C384,598.2152 384,611.3709 384,624.6561 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="377.0001,585.0111,384,565.0111,391.0001,585.011,377.0001,585.0111" style="stroke [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1734px" preserveAspectRatio="none" style="width:787px;height:1734px;background:#FFFFFF;" version="1.1" viewBox="0 0 787 1734" width="787px" zoomAndPan="magnify"><defs><filter height="300%" id="f1ttovietqhh92" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1ttovietqhh92)" height="1078.3125" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="259.5" y=" [...]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="88" fill="#FEFECE" filter="url(#f1ttovietqhh92)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="7" y="7"/><ellipse cx="318.75" cy="25 [...]
+reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="131" d="M390,585.2414 C390,598.2152 390,611.3709 390,624.6561 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="383.0001,585.0111,390,565.0111,397.0001,585.011,383.0001,585.0111" style="stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -91,7 +91,7 @@ reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmlt
     }
 
     interface "<size:14>SyntaxDecorator\n<size:10>org.apache.wiki.htmltowiki" as org.apache.wiki.htmltowiki.SyntaxDecorator [[../SyntaxDecorator.html]] {
-        {abstract} +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+        {abstract} +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
         {abstract} +a(Element, String): void
         {abstract} +aFootnote(String, String): void
         {abstract} +aUndefined(Element): void
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextBoldDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextBoldDecorator.html
index c510b45..17135c2 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextBoldDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextBoldDecorator.html
@@ -149,9 +149,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextCssDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator</a></span>&#8203;(<a href="../PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextCssDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextCssDecorator</a></span>&#8203;(<a href="../PlainTextBoldDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextBoldDecorator</a>&nbsp;ptbd,
                      java.io.PrintWriter&nbsp;out,
-                     java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                      <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssDecorator.html
index 130d95f..0dd4ad5 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssDecorator.html
@@ -149,9 +149,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator</a></span>&#8203;(<a href="../PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextDecorator</a></span>&#8203;(<a href="../PlainTextCssDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssDecorator</a>&nbsp;ptcd,
                   java.io.PrintWriter&nbsp;out,
-                  java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                   <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssSpecialDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssSpecialDecorator.html
index 33841d8..758bbfd 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssSpecialDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextCssSpecialDecorator.html
@@ -149,9 +149,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextMonospaceDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator</a></span>&#8203;(<a href="../PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextMonospaceDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator,java.io.PrintWriter,java.util.Deque,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextMonospaceDecorator</a></span>&#8203;(<a href="../PlainTextCssSpecialDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextCssSpecialDecorator</a>&nbsp;ptcsd,
                            java.io.PrintWriter&nbsp;out,
-                           java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                           java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                            <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextItalicDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextItalicDecorator.html
index b69d984..9756de7 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextItalicDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextItalicDecorator.html
@@ -149,9 +149,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextBoldDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator</a></span>&#8203;(<a href="../PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextBoldDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextBoldDecorator</a></span>&#8203;(<a href="../PlainTextItalicDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextItalicDecorator</a>&nbsp;ptid,
                       java.io.PrintWriter&nbsp;out,
-                      java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                       <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextMonospaceDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextMonospaceDecorator.html
index 06ca4e9..d1ea829 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextMonospaceDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/class-use/PlainTextMonospaceDecorator.html
@@ -149,9 +149,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextItalicDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,java.util.Stack,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator</a></span>&#8203;(<a href="../PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="../PlainTextItalicDecorator.html#%3Cinit%3E(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator,java.io.PrintWriter,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">PlainTextItalicDecorator</a></span>&#8203;(<a href="../PlainTextMonospaceDecorator.html" title="class in org.apache.wiki.htmltowiki.syntax">PlainTextMonospaceDecorator</a>&nbsp;ptmd,
                         java.io.PrintWriter&nbsp;out,
-                        java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
                         <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html
index 477c63a..b1e9239 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html
@@ -204,9 +204,9 @@ extends <a href="../WikiSyntaxDecorator.html" title="class in org.apache.wiki.ht
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -264,15 +264,15 @@ extends <a href="../WikiSyntaxDecorator.html" title="class in org.apache.wiki.ht
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>init</h4>
 <pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html#line.43">init</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                 java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-                 java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                 java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+                 java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                  <a href="../../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
                  <a href="../../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
                  <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg
index 24dfccf..a6c39b3 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:768px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 768 194" width="768px" zoomAndPan="magnify"><defs><filter height="300%" id="f55i20uu0hc4a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><a href="JSPWikiSyntaxDecorator.html" target="_top" title="JSPWikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="JSPWikiSyntaxDecorator.html" xlink:show="new" xlink:title="JSPWikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f55i20uu0hc4a)" height="58.7422" id="org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width: [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f55i20uu0hc4a)" height="37.9375" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="202" x="2 [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="11" d="M380.5,65.3533 C380.5,78.4123 380.5,92.7197 380.5,104.9146 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="373.5001,65.1479,380.5,45.1479,387.5001,65.1478,373.5001, [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:778px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 778 194" width="778px" zoomAndPan="magnify"><defs><filter height="300%" id="flbes5t4fzr16" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><a href="JSPWikiSyntaxDecorator.html" target="_top" title="JSPWikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="JSPWikiSyntaxDecorator.html" xlink:show="new" xlink:title="JSPWikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#flbes5t4fzr16)" height="58.7422" id="org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width: [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#flbes5t4fzr16)" height="37.9375" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="202" x="2 [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="11" d="M385.5,65.3533 C385.5,78.4123 385.5,92.7197 385.5,104.9146 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="378.5001,65.1479,385.5,45.1479,392.5001,65.1478,378.5001, [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
     hide empty methods
 
     class "<size:14>JSPWikiSyntaxDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax.jspwiki" as org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator [[JSPWikiSyntaxDecorator.html]] {
-        +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+        +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
     }
 
     abstract class "<size:14>WikiSyntaxDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator [[../WikiSyntaxDecorator.html]]
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg
index 85f40fb..1affe38 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="758px" preserveAspectRatio="none" style="width:797px;height:758px;background:#FFFFFF;" version="1.1" viewBox="0 0 797 758" width="797px" zoomAndPan="magnify"><defs><filter height="300%" id="f2n0x1nmogdox" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.htmltowiki.syntax.jspwiki--><polygon fill="#FFFFFF" filter="url(#f2n0x1nmogdox)" points="16,639,349,639,356,661.2969,780,661.2969,780,735,16,735,16,639" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="356" y1="661.2969" y2="661.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="327" x="20" y="653.9951">org.apache.wiki.htmltowiki.syntax.jspwik [...]
-cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f2n0x1nmogdox)" points="256,6,530,6,537,28.2969,540,28.2969,540,614,256,614,256,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="256" x2="537" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="260" y="20.9951">org.apache.wiki.htmltowiki.syntax</text><!--MD5=[38d54 [...]
-class org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><a href="JSPWikiSyntaxDecorator.html" target="_top" title="JSPWikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="JSPWikiSyntaxDecorator.html" xlink:show="new" xlink:title="JSPWikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f2n0x1nmogdox)" height="60.8047" id="org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width: [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f2n0x1nmogdox)" height="572.9922" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="252" x= [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="7" d="M398,626.2416 C398,641.3888 398,654.8274 398,665.7909 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="391.0001,626.1991,398,606.1991,405.0001,626.1991,391.0001,626.1 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="758px" preserveAspectRatio="none" style="width:805px;height:758px;background:#FFFFFF;" version="1.1" viewBox="0 0 805 758" width="805px" zoomAndPan="magnify"><defs><filter height="300%" id="f6xa5xavbjusv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+cluster org.apache.wiki.htmltowiki.syntax.jspwiki--><polygon fill="#FFFFFF" filter="url(#f6xa5xavbjusv)" points="16,639,349,639,356,661.2969,788,661.2969,788,735,16,735,16,639" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="356" y1="661.2969" y2="661.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="327" x="20" y="653.9951">org.apache.wiki.htmltowiki.syntax.jspwik [...]
+cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f6xa5xavbjusv)" points="260,6,534,6,541,28.2969,544,28.2969,544,614,260,614,260,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="260" x2="541" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="264" y="20.9951">org.apache.wiki.htmltowiki.syntax</text><!--MD5=[38d54 [...]
+class org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><a href="JSPWikiSyntaxDecorator.html" target="_top" title="JSPWikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="JSPWikiSyntaxDecorator.html" xlink:show="new" xlink:title="JSPWikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f6xa5xavbjusv)" height="60.8047" id="org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width: [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f6xa5xavbjusv)" height="572.9922" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="252" x= [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="7" d="M402,626.2416 C402,641.3888 402,654.8274 402,665.7909 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="395.0001,626.1991,402,606.1991,409.0001,626.1991,395.0001,626.1 [...]
 @startuml
     namespace org.apache.wiki.htmltowiki.syntax.jspwiki {
 
         class JSPWikiSyntaxDecorator [[JSPWikiSyntaxDecorator.html]] {
-            +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+            +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
         }
 
         org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator <|- - JSPWikiSyntaxDecorator
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html
index e7267f6..4bbf5d0 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html
@@ -204,9 +204,9 @@ extends <a href="../WikiSyntaxDecorator.html" title="class in org.apache.wiki.ht
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-    java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">init</a></span>&#8203;(java.io.PrintWriter&nbsp;out,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+    java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
     <a href="../../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
     <a href="../../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
     <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</code></th>
@@ -264,15 +264,15 @@ extends <a href="../WikiSyntaxDecorator.html" title="class in org.apache.wiki.ht
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a id="init(java.io.PrintWriter,java.util.Stack,java.util.Stack,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
+<a id="init(java.io.PrintWriter,java.util.Deque,java.util.Deque,org.apache.wiki.htmltowiki.WhitespaceTrimWriter,org.apache.wiki.htmltowiki.XHtmlToWikiConfig,org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>init</h4>
 <pre class="methodSignature">public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html#line.42">init</a>&#8203;(java.io.PrintWriter&nbsp;out,
-                 java.util.Stack&lt;java.lang.String&gt;&nbsp;liStack,
-                 java.util.Stack&lt;java.lang.String&gt;&nbsp;preStack,
+                 java.util.Deque&lt;java.lang.String&gt;&nbsp;liStack,
+                 java.util.Deque&lt;java.lang.String&gt;&nbsp;preStack,
                  <a href="../../WhitespaceTrimWriter.html" title="class in org.apache.wiki.htmltowiki">WhitespaceTrimWriter</a>&nbsp;outTrimmer,
                  <a href="../../XHtmlToWikiConfig.html" title="class in org.apache.wiki.htmltowiki">XHtmlToWikiConfig</a>&nbsp;config,
                  <a href="../../XHtmlElementToWikiTranslator.html" title="class in org.apache.wiki.htmltowiki">XHtmlElementToWikiTranslator</a>&nbsp;chain)</pre>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg
index 0b2a4a2..108b586 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:768px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 768 194" width="768px" zoomAndPan="magnify"><defs><filter height="300%" id="f1f54rpqmexung" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><a href="MarkdownSyntaxDecorator.html" target="_top" title="MarkdownSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="MarkdownSyntaxDecorator.html" xlink:show="new" xlink:title="MarkdownSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1f54rpqmexung)" height="58.7422" id="org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stro [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1f54rpqmexung)" height="37.9375" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="202" x=" [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="11" d="M380.5,65.3533 C380.5,78.4123 380.5,92.7197 380.5,104.9146 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="373.5001,65.1479,380.5,45.1479,387.5001,65.1478,373.5 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:778px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 778 194" width="778px" zoomAndPan="magnify"><defs><filter height="300%" id="fs9hbne5pq6wc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+class org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><a href="MarkdownSyntaxDecorator.html" target="_top" title="MarkdownSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="MarkdownSyntaxDecorator.html" xlink:show="new" xlink:title="MarkdownSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fs9hbne5pq6wc)" height="58.7422" id="org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;strok [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fs9hbne5pq6wc)" height="37.9375" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="202" x="2 [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="11" d="M385.5,65.3533 C385.5,78.4123 385.5,92.7197 385.5,104.9146 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="378.5001,65.1479,385.5,45.1479,392.5001,65.1478,378.5 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
     hide empty methods
 
     class "<size:14>MarkdownSyntaxDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax.markdown" as org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator [[MarkdownSyntaxDecorator.html]] {
-        +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+        +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
     }
 
     abstract class "<size:14>WikiSyntaxDecorator\n<size:10>org.apache.wiki.htmltowiki.syntax" as org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator [[../WikiSyntaxDecorator.html]]
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg
index 11804af..18c22bd 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="758px" preserveAspectRatio="none" style="width:797px;height:758px;background:#FFFFFF;" version="1.1" viewBox="0 0 797 758" width="797px" zoomAndPan="magnify"><defs><filter height="300%" id="f1oidi4q3do03r" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-cluster org.apache.wiki.htmltowiki.syntax.markdown--><polygon fill="#FFFFFF" filter="url(#f1oidi4q3do03r)" points="16,639,378,639,385,661.2969,780,661.2969,780,735,16,735,16,639" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="385" y1="661.2969" y2="661.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="356" x="20" y="653.9951">org.apache.wiki.htmltowiki.syntax.mark [...]
-cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f1oidi4q3do03r)" points="256,6,530,6,537,28.2969,540,28.2969,540,614,256,614,256,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="256" x2="537" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="260" y="20.9951">org.apache.wiki.htmltowiki.syntax</text><!--MD5=[c899 [...]
-class org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><a href="MarkdownSyntaxDecorator.html" target="_top" title="MarkdownSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="MarkdownSyntaxDecorator.html" xlink:show="new" xlink:title="MarkdownSyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1oidi4q3do03r)" height="60.8047" id="org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stro [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f1oidi4q3do03r)" height="572.9922" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="252" x [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="7" d="M398,626.2416 C398,641.3888 398,654.8274 398,665.7909 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="391.0001,626.1991,398,606.1991,405.0001,626.1991,391.0001,6 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="758px" preserveAspectRatio="none" style="width:805px;height:758px;background:#FFFFFF;" version="1.1" viewBox="0 0 805 758" width="805px" zoomAndPan="magnify"><defs><filter height="300%" id="f18bm034xn1mdj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+cluster org.apache.wiki.htmltowiki.syntax.markdown--><polygon fill="#FFFFFF" filter="url(#f18bm034xn1mdj)" points="16,639,378,639,385,661.2969,788,661.2969,788,735,16,735,16,639" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="385" y1="661.2969" y2="661.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="356" x="20" y="653.9951">org.apache.wiki.htmltowiki.syntax.mark [...]
+cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f18bm034xn1mdj)" points="260,6,534,6,541,28.2969,544,28.2969,544,614,260,614,260,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="260" x2="541" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="264" y="20.9951">org.apache.wiki.htmltowiki.syntax</text><!--MD5=[c899 [...]
+class org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><a href="MarkdownSyntaxDecorator.html" target="_top" title="MarkdownSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="MarkdownSyntaxDecorator.html" xlink:show="new" xlink:title="MarkdownSyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f18bm034xn1mdj)" height="60.8047" id="org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stro [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f18bm034xn1mdj)" height="572.9922" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="252" x [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="7" d="M402,626.2416 C402,641.3888 402,654.8274 402,665.7909 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="395.0001,626.1991,402,606.1991,409.0001,626.1991,395.0001,6 [...]
 @startuml
     namespace org.apache.wiki.htmltowiki.syntax.markdown {
 
         class MarkdownSyntaxDecorator [[MarkdownSyntaxDecorator.html]] {
-            +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+            +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
         }
 
         org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator <|- - MarkdownSyntaxDecorator
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg
index 6b3eb0e..1641222 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="3075px" preserveAspectRatio="none" style="width:14142px;height:3075px;background:#FFFFFF;" version="1.1" viewBox="0 0 14142 3075" width="14142px" zoomAndPan="magnify"><defs><filter height="300%" id="fgptkfonbt58" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" std [...]
-cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#fgptkfonbt58)" points="16,632,290,632,297,654.2969,14125,654.2969,14125,3052,16,3052,16,632" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="297" y1="654.2969" y2="654.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="20" y="646.9951">org.apache.wiki.htmltowiki.syntax</text><!- [...]
-cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#fgptkfonbt58)" points="6182,6,6399,6,6406,28.2969,6952,28.2969,6952,601,6182,601,6182,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="6182" x2="6406" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="6186" y="20.9951">org.apache.wiki.htmltowiki</text><!--MD5=[ed1ac7cb8a [...]
-class org.apache.wiki.htmltowiki.syntax.TableDecorator--><a href="TableDecorator.html" target="_top" title="TableDecorator.html" xlink:actuate="onRequest" xlink:href="TableDecorator.html" xlink:show="new" xlink:title="TableDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.5;" width="492" x="24" y="1422.5"/><ellipse cx="217.25" cy="14 [...]
-class org.apache.wiki.htmltowiki.syntax.DdDecorator--><a href="DdDecorator.html" target="_top" title="DdDecorator.html" xlink:actuate="onRequest" xlink:href="DdDecorator.html" xlink:show="new" xlink:title="DdDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="551.5" y="1422.5"/><ellipse cx="679.75" cy="1438.5" fill="#A [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="163.2422" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke: [...]
-class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="967.5" y="1416"/><ellipse cx="1141.75" cy="1432" fill="#A9DC [...]
-class org.apache.wiki.htmltowiki.syntax.H3Decorator--><a href="H3Decorator.html" target="_top" title="H3Decorator.html" xlink:actuate="onRequest" xlink:href="H3Decorator.html" xlink:show="new" xlink:title="H3Decorator.html" xlink:type="simple"><rect codeLine="40" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="1437.5" y="1422.5"/><ellipse cx="1565.75" cy="1438.5" fill=" [...]
-class org.apache.wiki.htmltowiki.syntax.SelectDecorator--><a href="SelectDecorator.html" target="_top" title="SelectDecorator.html" xlink:actuate="onRequest" xlink:href="SelectDecorator.html" xlink:show="new" xlink:title="SelectDecorator.html" xlink:type="simple"><rect codeLine="48" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="1817.5" y="1403.5"/><ellipse cx="194 [...]
-class org.apache.wiki.htmltowiki.syntax.H1Decorator--><a href="H1Decorator.html" target="_top" title="H1Decorator.html" xlink:actuate="onRequest" xlink:href="H1Decorator.html" xlink:show="new" xlink:title="H1Decorator.html" xlink:type="simple"><rect codeLine="59" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="2217.5" y="1422.5"/><ellipse cx="2345.75" cy="1438.5" fill=" [...]
-class org.apache.wiki.htmltowiki.syntax.DtDecorator--><a href="DtDecorator.html" target="_top" title="DtDecorator.html" xlink:actuate="onRequest" xlink:href="DtDecorator.html" xlink:show="new" xlink:title="DtDecorator.html" xlink:type="simple"><rect codeLine="67" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="2598" y="1422.5"/><ellipse cx="2726.25" cy="1438.5" fill="#A [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="75" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.5 [...]
-class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="86" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="450" x="3012" y="1409.5"/><ellipse cx="3185.25" cy="1425 [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="96" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="163.2422" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="634" x=" [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="108" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="609" x="9909.5" y="1422.5 [...]
-class org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><a href="TbodyDecorator.html" target="_top" title="TbodyDecorator.html" xlink:actuate="onRequest" xlink:href="TbodyDecorator.html" xlink:show="new" xlink:title="TbodyDecorator.html" xlink:type="simple"><rect codeLine="116" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.5;" width="364" x="3571" y="1429"/><ellipse cx="3698.75" cy=" [...]
-class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="123" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="430" x="3970" y="1416"/><ellipse cx="4144.25" cy="1432" fill="#A9DC [...]
-class org.apache.wiki.htmltowiki.syntax.ImageDecorator--><a href="ImageDecorator.html" target="_top" title="ImageDecorator.html" xlink:actuate="onRequest" xlink:href="ImageDecorator.html" xlink:show="new" xlink:title="ImageDecorator.html" xlink:type="simple"><rect codeLine="132" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.5;" width="383" x="4435.5" y="1403.5"/><ellipse cx="4571.75" [...]
-class org.apache.wiki.htmltowiki.syntax.OptionDecorator--><a href="OptionDecorator.html" target="_top" title="OptionDecorator.html" xlink:actuate="onRequest" xlink:href="OptionDecorator.html" xlink:show="new" xlink:title="OptionDecorator.html" xlink:type="simple"><rect codeLine="143" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.5;" width="367" x="4853.5" y="1429"/><ellipse cx="4980. [...]
-class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="150" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="433" x="5255.5" y="1416"/><ellipse cx="5430.75" cy="1432" fill="#A9 [...]
-class org.apache.wiki.htmltowiki.syntax.TheadDecorator--><a href="TheadDecorator.html" target="_top" title="TheadDecorator.html" xlink:actuate="onRequest" xlink:href="TheadDecorator.html" xlink:show="new" xlink:title="TheadDecorator.html" xlink:type="simple"><rect codeLine="159" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="5723.5" y="1429"/><ellipse cx="5850.75" cy [...]
-class org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><a href="UnderlineDecorator.html" target="_top" title="UnderlineDecorator.html" xlink:actuate="onRequest" xlink:href="UnderlineDecorator.html" xlink:show="new" xlink:title="UnderlineDecorator.html" xlink:type="simple"><rect codeLine="166" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.5;" width="384" x="6124" y="1416"/>< [...]
-class org.apache.wiki.htmltowiki.syntax.SupDecorator--><a href="SupDecorator.html" target="_top" title="SupDecorator.html" xlink:actuate="onRequest" xlink:href="SupDecorator.html" xlink:show="new" xlink:title="SupDecorator.html" xlink:type="simple"><rect codeLine="175" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="6543" y="1416"/><ellipse cx="6671.25" cy="1432" fill= [...]
-class org.apache.wiki.htmltowiki.syntax.HrDecorator--><a href="HrDecorator.html" target="_top" title="HrDecorator.html" xlink:actuate="onRequest" xlink:href="HrDecorator.html" xlink:show="new" xlink:title="HrDecorator.html" xlink:type="simple"><rect codeLine="184" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="343" x="6929.5" y="1422.5"/><ellipse cx="7058.25" cy="1438.5" fill= [...]
-class org.apache.wiki.htmltowiki.syntax.FormDecorator--><a href="FormDecorator.html" target="_top" title="FormDecorator.html" xlink:actuate="onRequest" xlink:href="FormDecorator.html" xlink:show="new" xlink:title="FormDecorator.html" xlink:type="simple"><rect codeLine="192" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.5;" width="359" x="7307.5" y="1416"/><ellipse cx="7435.75" cy="143 [...]
-class org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><a href="TextAreaDecorator.html" target="_top" title="TextAreaDecorator.html" xlink:actuate="onRequest" xlink:href="TextAreaDecorator.html" xlink:show="new" xlink:title="TextAreaDecorator.html" xlink:type="simple"><rect codeLine="201" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.5;" width="380" x="7702" y="1409.5"/><elli [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="211" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A800 [...]
-class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="222" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="432" x="8210" y="1416"/><ellipse cx="8384.25" cy="1432" fill="#A9DC [...]
-class org.apache.wiki.htmltowiki.syntax.MarkupHelper--><a href="MarkupHelper.html" target="_top" title="MarkupHelper.html" xlink:actuate="onRequest" xlink:href="MarkupHelper.html" xlink:show="new" xlink:title="MarkupHelper.html" xlink:type="simple"><rect codeLine="231" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.MarkupHelper" style="stroke:#A80036;stroke-width:1.5;" width="385" x="10357.5" y="877"/><ellipse cx="10502.25" cy="893" fil [...]
-class org.apache.wiki.htmltowiki.syntax.TrDecorator--><a href="TrDecorator.html" target="_top" title="TrDecorator.html" xlink:actuate="onRequest" xlink:href="TrDecorator.html" xlink:show="new" xlink:title="TrDecorator.html" xlink:type="simple"><rect codeLine="242" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="8677" y="1429"/><ellipse cx="8806.25" cy="1445" fill="#ADD1B [...]
-class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="249" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="434" x="9054" y="1416"/><ellipse cx="9228.75" cy="1432" fill="#A9DC [...]
-class org.apache.wiki.htmltowiki.syntax.SubDecorator--><a href="SubDecorator.html" target="_top" title="SubDecorator.html" xlink:actuate="onRequest" xlink:href="SubDecorator.html" xlink:show="new" xlink:title="SubDecorator.html" xlink:type="simple"><rect codeLine="258" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="9523" y="1416"/><ellipse cx="9651.25" cy="1432" fill= [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="267" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width="6 [...]
-class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="278" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="310" x="10553" [...]
-class org.apache.wiki.htmltowiki.syntax.PDecorator--><a href="PDecorator.html" target="_top" title="PDecorator.html" xlink:actuate="onRequest" xlink:href="PDecorator.html" xlink:show="new" xlink:title="PDecorator.html" xlink:type="simple"><rect codeLine="285" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.5;" width="337" x="10898.5" y="1416"/><ellipse cx="11027.75" cy="1432" fill="#A9DCDF [...]
-class org.apache.wiki.htmltowiki.syntax.InputDecorator--><a href="InputDecorator.html" target="_top" title="InputDecorator.html" xlink:actuate="onRequest" xlink:href="InputDecorator.html" xlink:show="new" xlink:title="InputDecorator.html" xlink:type="simple"><rect codeLine="294" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.5;" width="358" x="11271" y="1409.5"/><ellipse cx="11397.75" [...]
-class org.apache.wiki.htmltowiki.syntax.DlDecorator--><a href="DlDecorator.html" target="_top" title="DlDecorator.html" xlink:actuate="onRequest" xlink:href="DlDecorator.html" xlink:show="new" xlink:title="DlDecorator.html" xlink:type="simple"><rect codeLine="304" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="341" x="11664.5" y="1416"/><ellipse cx="11793.25" cy="1432" fill="# [...]
-class org.apache.wiki.htmltowiki.syntax.H4Decorator--><a href="H4Decorator.html" target="_top" title="H4Decorator.html" xlink:actuate="onRequest" xlink:href="H4Decorator.html" xlink:show="new" xlink:title="H4Decorator.html" xlink:type="simple"><rect codeLine="313" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="12040.5" y="1422.5"/><ellipse cx="12168.75" cy="1438.5" fil [...]
-class org.apache.wiki.htmltowiki.syntax.ADecorator--><a href="ADecorator.html" target="_top" title="ADecorator.html" xlink:actuate="onRequest" xlink:href="ADecorator.html" xlink:show="new" xlink:title="ADecorator.html" xlink:type="simple"><rect codeLine="321" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="188.8516" id="org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.5;" width="449" x="12420.5" y="1384"/><ellipse cx="12605.25" cy="1400" fill="#A9DCDF [...]
-class org.apache.wiki.htmltowiki.syntax.H2Decorator--><a href="H2Decorator.html" target="_top" title="H2Decorator.html" xlink:actuate="onRequest" xlink:href="H2Decorator.html" xlink:show="new" xlink:title="H2Decorator.html" xlink:type="simple"><rect codeLine="335" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="12904.5" y="1422.5"/><ellipse cx="13032.75" cy="1438.5" fil [...]
-class org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><a href="StrikeDecorator.html" target="_top" title="StrikeDecorator.html" xlink:actuate="onRequest" xlink:href="StrikeDecorator.html" xlink:show="new" xlink:title="StrikeDecorator.html" xlink:type="simple"><rect codeLine="343" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="363" x="13284.5" y="1416"/><ellipse cx="134 [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="352" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="585.7969" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="6436.5" y=" [...]
-class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="397" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="13682.5" y="1416"/><ellipse cx="13856.75" cy="1432" fill="# [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="453" fill="#FEFECE" filter="url(#fgptkfonbt58)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="754" x="6190" y="33"/><ellipse cx="6509.75" c [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="406" d="M3352.595,2453.1769 C3278.805,2495.0734 3187.0687,2547.1594 3112.6122,2589.4343 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3108.1835,2591.9489,3117.9849,2590.9836, [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="407" d="M7834.9283,1815.2288 C7039.7691,1869.7208 4967.2541,2011.7496 4164.3556,2066.772 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4159.3631,2067.1141,4168.6155,2070.4894,4164.3514,2066. [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="408" d="M10042.4518,1534.5195 C9994.4794,1548.672 9942.0452,1562.744 9893,1573 C9403.3382,1675.3947 8825.5975,1737.1486 8474.1968,1768.2719 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8469.0404,17 [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="409" d="M2618.8846,2736.6552 C2348.0284,2789.4856 1981.3302,2861.0099 1733.7559,2909.2991 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1728.6607,2910.2929,1738.26,29 [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="410" d="M3747.6547,2164.1769 C3696.4977,2205.823 3632.9733,2257.5372 3581.212,2299.6753 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3577.1909,2302.9489,3586.6958,2300.3689,3581.0684, [...]
-reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="411" d="M6567,613.5122 C6567,628.6609 6567,643.8667 6567,658.9927 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="6560.0001,613.2747,6567,593.2747,6574.0001,613.2747,6560.0001,613.2747" styl [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ADecorator--><path codeLine="412" d="M6697.6349,963.7272 C7180.5499,1006.7421 8910.7888,1157.8735 10340,1245 C10951.4651,1282.2757 11106.298,1257.8117 11717,1306 C12022.9026,1330.1377 12105.1434,1310.2403 12403,1384 C12407.0908,1385.013 12411.2054,1386.078 12415.3365,1387.1898 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ADecorato [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.BrDecorator--><path codeLine="413" d="M6697.7378,965.0458 C7069.4878,1004.2259 8162.2156,1133.8885 9037,1384 C9065.8703,1392.2544 9096.0537,1402.8621 9124.7779,1413.9714 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9129.7479,1415.9042,9122.8097, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.CodeDecorator--><path codeLine="414" d="M6436.1182,955.9 C5921.1513,972.7433 4035.9976,1048.9134 3489,1275 C3418.2163,1304.2565 3351.4196,1359.9854 3304.4038,1405.7367 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3300.7698,1409.2915,3310.0006, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DdDecorator--><path codeLine="415" d="M6436.3432,953.8421 C5638.4971,965.8317 1440.1209,1039.7923 923,1275 C855.7595,1305.5837 799.1918,1369.8397 763.7603,1418.0143 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="760.6103,1422.3309,769.1468,1417.41 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DlDecorator--><path codeLine="416" d="M6697.5143,961.2346 C7226.4984,998.9477 9262.4319,1146.8487 10934,1306 C11251.3443,1336.2146 11341.2927,1293.6485 11647,1384 C11672.1247,1391.4256 11697.9271,1402.1074 11722.0556,1413.6382 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><poly [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DtDecorator--><path codeLine="417" d="M6436.4527,958.3375 C5827.9233,988.5974 3285.8837,1123.2014 2967,1275 C2900.682,1306.5694 2844.4867,1370.3298 2809.0971,1418.1132 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="2805.9499,1422.3947,2814.5032,14 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.FormDecorator--><path codeLine="418" d="M6697.8365,1026.8755 C6878.5455,1130.2921 7201.5789,1315.1585 7372.9473,1413.2296 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7377.4699,1415.8178,7371.6452,1407.8759,7373.1302,1413.3344,7367.6718,1414.8 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.HrDecorator--><path codeLine="419" d="M6697.6311,1080.7964 C6806.7473,1188.3801 6957.4002,1336.9171 7040.2685,1418.6214 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7044.1629,1422.4612,7040.5623,1413.2941,7040.6024,1418.9508,7034.9457,1418.9909, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H1Decorator--><path codeLine="420" d="M6436.251,954.6126 C5963.5713,965.9735 4300.5211,1022.6034 2957,1275 C2786,1307.1244 2743.1662,1320.9515 2581,1384 C2554.0266,1394.487 2525.7038,1407.3885 2499.3748,1420.2498 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H2Decorator--><path codeLine="421" d="M6697.6103,964.1454 C7180.4398,1008.6175 8910.4183,1164.1801 10340,1245 C10715.6365,1266.2362 10810.0097,1261.3956 11186,1275 C11559.3432,1288.5086 11653.1682,1282.2496 12026,1306 C12409.4565,1330.4273 12517.3023,1279.3139 12887,1384 C12917.4506,1392.6226 12948.8595,1406.0993 12977.1548,1420.2015 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSynt [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H3Decorator--><path codeLine="422" d="M6436.1149,961.2696 C5923.0765,998.0079 3999.7439,1139.5191 2421,1306 C2144.3652,1335.1716 2066.2939,1303.5926 1800,1384 C1770.3279,1392.9595 1739.6376,1406.2367 1711.8032,1420.0259 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fil [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H4Decorator--><path codeLine="423" d="M6697.6893,962.8943 C7180.7941,1003.0075 8911.6099,1145.3145 10340,1245 C10777.5522,1275.5362 10888.026,1268.0772 11325,1306 C11635.9843,1332.9888 11723.5629,1295.8126 12023,1384 C12053.0232,1392.8422 12084.044,1406.2228 12112.0939,1420.1559 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H4Decor [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ImageDecorator--><path codeLine="424" d="M6436.2829,976.2387 C6144.4181,1032.1653 5419.4743,1181.1374 4836,1384 C4820.8314,1389.2738 4805.2553,1395.2312 4789.7765,1401.5259 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4784.9764,1403.4898,4794 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.InputDecorator--><path codeLine="425" d="M6697.7693,961.0805 C7207.1872,996.9219 9107.6757,1134.9977 10667,1306 C10928.1757,1334.6417 11001.2146,1308.9188 11253,1384 C11273.8685,1390.2229 11295.2843,1398.4071 11315.9524,1407.3599 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.0;"/ [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.LiDecorator--><path codeLine="426" d="M6436.243,969.5755 C6097.7036,1016.9411 5166.7423,1159.0618 4418,1384 C4389.7434,1392.4889 4360.1656,1403.0827 4331.934,1414.0781 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4327.0483,1415.9901,4336.8871,14 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OlDecorator--><path codeLine="427" d="M6436.2764,1014.8548 C6227.0374,1115.4615 5818.9581,1311.6749 5607.0279,1413.5756 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5602.3691,1415.8157,5612.2135,1415.5205,5606.8752,1413.649,5608.7468,1408.3107,5 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OptionDecorator--><path codeLine="428" d="M6436.3332,988.5598 C6195.9051,1057.1278 5668.5859,1213.5728 5238,1384 C5205.8772,1396.7143 5171.6197,1412.1038 5140.6562,1426.7388 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5136.1124,1428.8922,51 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PDecorator--><path codeLine="429" d="M6697.7424,963.9667 C7157.9851,1006.1207 8746.1496,1151.8231 10057,1275 C10424.7923,1309.5604 10529.4867,1270.4044 10881,1384 C10905.0719,1391.7791 10929.8538,1402.3476 10953.1663,1413.6044 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polyg [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><path codeLine="430" d="M6697.6084,967.858 C7073.8748,1013.6866 8192.5714,1150.9504 9120,1275 C9463.8917,1320.9978 9553.9008,1310.5902 9893,1384 C9939.7021,1394.1103 9989.5315,1407.4793 10035.6574,1420.9693 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.0; [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="431" d="M6436.0765,960.8139 C5881.6259,999.4431 3746.5903,1161.8268 3554,1384 C3467.3913,1483.9122 3556,1549.2748 3556,1681.5 C3556,1681.5 3556,1681.5 3556,1944.5 C3556,1970.8584 3565.8378,1992.4107 3581.8515,2010.0329 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" sty [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="432" d="M6697.718,954.0847 C7077.1644,963.6385 8152,1016.9607 8152,1314.5 C8152,1314.5 8152,1314.5 8152,1642.5 C8152,1663.3719 8152,1685.8665 8152,1706.9558 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" p [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="433" d="M6436.3451,953.3655 C5591.1853,963.0308 932,1029.2496 932,1314.5 C932,1314.5 932,1314.5 932,2811.5 C932,2871.378 1058.907,2908.8249 1188.404,2931.4493 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon  [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="434" d="M6436.3826,959.778 C5940.3832,990.5525 4175.1954,1111.6873 3651,1306 C3583.1184,1331.1629 3547.3288,1323.219 3508,1384 C3471.978,1439.6706 3485,1615.1916 3485,1681.5 C3485,1681.5 3485,1681.5 3485,2233.5 C3485,2254.1986 3485,2276.5649 3485,2297.3739 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmlt [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="435" d="M6436.2733,958.1989 C5790.9512,989.6412 2976,1136.9698 2976,1314.5 C2976,1314.5 2976,1314.5 2976,2522.5 C2976,2543.1986 2976,2565.5649 2976,2586.3739 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fil [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SelectDecorator--><path codeLine="436" d="M6436.2255,961.9483 C5965.0715,998.1571 4310.3809,1128.5016 2949,1275 C2614.5355,1310.9918 2521.606,1285.3518 2200,1384 C2184.0291,1388.8989 2167.7111,1394.8614 2151.6251,1401.3847 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.0;"/><poly [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><path codeLine="437" d="M6697.5882,964.5522 C7180.3406,1010.4414 8910.0848,1170.314 10340,1245 C11347.8792,1297.6426 11603.3994,1232.8761 12610,1306 C12903.2778,1327.305 12984.4626,1302.5235 13267,1384 C13293.2925,1391.5821 13320.4323,1402.3074 13345.8921,1413.8268 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.Str [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SubDecorator--><path codeLine="438" d="M6697.6211,956.8717 C7115.7852,975.4643 8455.5413,1058.3259 9506,1384 C9531.0761,1391.7744 9556.9495,1402.4151 9581.287,1413.759 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9585.8129,1415.8848,9579.3673,1 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SupDecorator--><path codeLine="439" d="M6651.6668,1245.2702 C6669.5859,1307.3388 6686.8539,1367.1519 6699.4159,1410.6644 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6700.8471,1415.6218,6702.1938,1405.8654,6699.4602,1410.818,6694.5077,1408.0845 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TableDecorator--><path codeLine="440" d="M6436.2717,955.507 C5696.2767,975.9577 2026.5938,1085.502 913,1275 C736.64,1305.0108 541.7583,1371.6847 413.2812,1420.5696 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="408.3582,1422.4464,418.1927,1422. [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><path codeLine="441" d="M6436.2183,960.7449 C6048.924,989.3502 4877.2566,1095.4638 3953,1384 C3917.8854,1394.9622 3881.0473,1410.9515 3848.6918,1426.6711 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3843.9514,1428.9878,3853.7 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TdDecorator--><path codeLine="442" d="M6436.3588,961.0454 C5902.3545,998.3129 3833.3276,1145.5721 2135,1306 C1816.7536,1336.0623 1730.0783,1306.3086 1420,1384 C1389.3295,1391.6846 1357.349,1402.5075 1327.2139,1414.0995 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><path codeLine="443" d="M6697.8144,999.8141 C6907.407,1077.0438 7330.8094,1235.6137 7684,1384 C7701.6137,1391.4 7719.9628,1399.3609 7738.1472,1407.4096 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7742.7662,1409.4575,77 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><path codeLine="444" d="M6697.5306,959.314 C7297.5718,993.9832 9793.4468,1149.895 10536,1384 C10567.7698,1394.0161 10600.3605,1410.1651 10628.5111,1426.3017 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10632.9902, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ThDecorator--><path codeLine="445" d="M6697.5657,965.0026 C7180.2399,1012.4606 8909.7463,1177.1043 10340,1245 C11106.8078,1281.4012 11299.5766,1255.4901 12067,1275 C12778.6426,1293.0918 12975.0728,1208.6065 13665,1384 C13695.4416,1391.7389 13727.1907,1402.5161 13757.1478,1414.0337 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ThDec [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TheadDecorator--><path codeLine="446" d="M6436.4077,1056.0195 C6296.7369,1167.2701 6080.7678,1339.2939 5972.5658,1425.479 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5968.4457,1428.7607,5977.9776,1426.2822,5972.3567,1425.6456,5972.9934,1420. [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TrDecorator--><path codeLine="447" d="M6697.5671,977.3877 C6971.0438,1030.7657 7623.9282,1159.2596 8170,1275 C8388.2525,1321.2588 8449.8444,1309.1091 8660,1384 C8692.1733,1395.4653 8725.9229,1411.1611 8755.8058,1426.4679 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fi [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UlDecorator--><path codeLine="448" d="M6697.5699,958.5752 C6977.7707,976.8564 7652.5383,1043.4063 8161,1275 C8235.215,1308.8034 8307.8374,1366.8522 8358.2341,1412.3221 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8362.1273,1415.8495,8358.1435,14 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><path codeLine="449" d="M6436.3538,1226.0447 C6403.4083,1295.1515 6370.9365,1363.2647 6348.0403,1411.2919 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6345.8548,1415.8764,6353.3385,1409.4737,6348.0065,1411.3631,6346.1 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="3025px" preserveAspectRatio="none" style="width:14098px;height:3025px;background:#FFFFFF;" version="1.1" viewBox="0 0 14098 3025" width="14098px" zoomAndPan="magnify"><defs><filter height="300%" id="f18l3dwy89vvhj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" s [...]
+cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f18l3dwy89vvhj)" points="16,632,290,632,297,654.2969,14081,654.2969,14081,3002,16,3002,16,632" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="297" y1="654.2969" y2="654.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="20" y="646.9951">org.apache.wiki.htmltowiki.syntax</text>< [...]
+cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#f18l3dwy89vvhj)" points="6199,6,6416,6,6423,28.2969,6981,28.2969,6981,601,6199,601,6199,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="6199" x2="6423" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="6203" y="20.9951">org.apache.wiki.htmltowiki</text><!--MD5=[ed1ac7cb [...]
+class org.apache.wiki.htmltowiki.syntax.TableDecorator--><a href="TableDecorator.html" target="_top" title="TableDecorator.html" xlink:actuate="onRequest" xlink:href="TableDecorator.html" xlink:show="new" xlink:title="TableDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.5;" width="492" x="24" y="1422.5"/><ellipse cx="217.25" cy=" [...]
+class org.apache.wiki.htmltowiki.syntax.DdDecorator--><a href="DdDecorator.html" target="_top" title="DdDecorator.html" xlink:actuate="onRequest" xlink:href="DdDecorator.html" xlink:show="new" xlink:title="DdDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="551.5" y="1422.5"/><ellipse cx="679.75" cy="1438.5" fill=" [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="strok [...]
+class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="30" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="968" y="1416"/><ellipse cx="1144.75" cy="1432" fill="#A9DC [...]
+class org.apache.wiki.htmltowiki.syntax.H3Decorator--><a href="H3Decorator.html" target="_top" title="H3Decorator.html" xlink:actuate="onRequest" xlink:href="H3Decorator.html" xlink:show="new" xlink:title="H3Decorator.html" xlink:type="simple"><rect codeLine="39" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="1443.5" y="1422.5"/><ellipse cx="1571.75" cy="1438.5" fill [...]
+class org.apache.wiki.htmltowiki.syntax.SelectDecorator--><a href="SelectDecorator.html" target="_top" title="SelectDecorator.html" xlink:actuate="onRequest" xlink:href="SelectDecorator.html" xlink:show="new" xlink:title="SelectDecorator.html" xlink:type="simple"><rect codeLine="47" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="1823.5" y="1403.5"/><ellipse cx="1 [...]
+class org.apache.wiki.htmltowiki.syntax.H1Decorator--><a href="H1Decorator.html" target="_top" title="H1Decorator.html" xlink:actuate="onRequest" xlink:href="H1Decorator.html" xlink:show="new" xlink:title="H1Decorator.html" xlink:type="simple"><rect codeLine="58" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="2223.5" y="1422.5"/><ellipse cx="2351.75" cy="1438.5" fill [...]
+class org.apache.wiki.htmltowiki.syntax.DtDecorator--><a href="DtDecorator.html" target="_top" title="DtDecorator.html" xlink:actuate="onRequest" xlink:href="DtDecorator.html" xlink:show="new" xlink:title="DtDecorator.html" xlink:type="simple"><rect codeLine="66" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="2604" y="1422.5"/><ellipse cx="2732.25" cy="1438.5" fill=" [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1 [...]
+class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="84" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="455" x="3018.5" y="1409.5"/><ellipse cx="3194.25" cy=" [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="94" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="543" x [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="105" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="518" x="9945" y="1429"/> [...]
+class org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><a href="TbodyDecorator.html" target="_top" title="TbodyDecorator.html" xlink:actuate="onRequest" xlink:href="TbodyDecorator.html" xlink:show="new" xlink:title="TbodyDecorator.html" xlink:type="simple"><rect codeLine="112" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.5;" width="364" x="3583" y="1429"/><ellipse cx="3710.75" cy [...]
+class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="119" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="3982.5" y="1416"/><ellipse cx="4159.25" cy="1432" fill="# [...]
+class org.apache.wiki.htmltowiki.syntax.ImageDecorator--><a href="ImageDecorator.html" target="_top" title="ImageDecorator.html" xlink:actuate="onRequest" xlink:href="ImageDecorator.html" xlink:show="new" xlink:title="ImageDecorator.html" xlink:type="simple"><rect codeLine="128" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.5;" width="383" x="4452.5" y="1403.5"/><ellipse cx="4588.7 [...]
+class org.apache.wiki.htmltowiki.syntax.OptionDecorator--><a href="OptionDecorator.html" target="_top" title="OptionDecorator.html" xlink:actuate="onRequest" xlink:href="OptionDecorator.html" xlink:show="new" xlink:title="OptionDecorator.html" xlink:type="simple"><rect codeLine="139" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.5;" width="367" x="4870.5" y="1429"/><ellipse cx="499 [...]
+class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="146" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="438" x="5273" y="1416"/><ellipse cx="5450.75" cy="1432" fill="#A9 [...]
+class org.apache.wiki.htmltowiki.syntax.TheadDecorator--><a href="TheadDecorator.html" target="_top" title="TheadDecorator.html" xlink:actuate="onRequest" xlink:href="TheadDecorator.html" xlink:show="new" xlink:title="TheadDecorator.html" xlink:type="simple"><rect codeLine="155" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="5746.5" y="1429"/><ellipse cx="5873.75"  [...]
+class org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><a href="UnderlineDecorator.html" target="_top" title="UnderlineDecorator.html" xlink:actuate="onRequest" xlink:href="UnderlineDecorator.html" xlink:show="new" xlink:title="UnderlineDecorator.html" xlink:type="simple"><rect codeLine="162" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.5;" width="384" x="6147" y="1416"/ [...]
+class org.apache.wiki.htmltowiki.syntax.SupDecorator--><a href="SupDecorator.html" target="_top" title="SupDecorator.html" xlink:actuate="onRequest" xlink:href="SupDecorator.html" xlink:show="new" xlink:title="SupDecorator.html" xlink:type="simple"><rect codeLine="171" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="6566" y="1416"/><ellipse cx="6694.25" cy="1432" fil [...]
+class org.apache.wiki.htmltowiki.syntax.HrDecorator--><a href="HrDecorator.html" target="_top" title="HrDecorator.html" xlink:actuate="onRequest" xlink:href="HrDecorator.html" xlink:show="new" xlink:title="HrDecorator.html" xlink:type="simple"><rect codeLine="180" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="343" x="6952.5" y="1422.5"/><ellipse cx="7081.25" cy="1438.5" fil [...]
+class org.apache.wiki.htmltowiki.syntax.FormDecorator--><a href="FormDecorator.html" target="_top" title="FormDecorator.html" xlink:actuate="onRequest" xlink:href="FormDecorator.html" xlink:show="new" xlink:title="FormDecorator.html" xlink:type="simple"><rect codeLine="188" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.5;" width="359" x="7330.5" y="1416"/><ellipse cx="7458.75" cy="1 [...]
+class org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><a href="TextAreaDecorator.html" target="_top" title="TextAreaDecorator.html" xlink:actuate="onRequest" xlink:href="TextAreaDecorator.html" xlink:show="new" xlink:title="TextAreaDecorator.html" xlink:type="simple"><rect codeLine="197" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.5;" width="380" x="7725" y="1409.5"/><el [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="207" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A8 [...]
+class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="218" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="437" x="8233.5" y="1416"/><ellipse cx="8410.25" cy="1432" fill="# [...]
+class org.apache.wiki.htmltowiki.syntax.MarkupHelper--><a href="MarkupHelper.html" target="_top" title="MarkupHelper.html" xlink:actuate="onRequest" xlink:href="MarkupHelper.html" xlink:show="new" xlink:title="MarkupHelper.html" xlink:type="simple"><rect codeLine="227" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.MarkupHelper" style="stroke:#A80036;stroke-width:1.5;" width="385" x="10346.5" y="877"/><ellipse cx="10491.25" cy="893" f [...]
+class org.apache.wiki.htmltowiki.syntax.TrDecorator--><a href="TrDecorator.html" target="_top" title="TrDecorator.html" xlink:actuate="onRequest" xlink:href="TrDecorator.html" xlink:show="new" xlink:title="TrDecorator.html" xlink:type="simple"><rect codeLine="238" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="8706" y="1429"/><ellipse cx="8835.25" cy="1445" fill="#ADD [...]
+class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="245" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="439" x="9083.5" y="1416"/><ellipse cx="9260.75" cy="1432" fill="# [...]
+class org.apache.wiki.htmltowiki.syntax.SubDecorator--><a href="SubDecorator.html" target="_top" title="SubDecorator.html" xlink:actuate="onRequest" xlink:href="SubDecorator.html" xlink:show="new" xlink:title="SubDecorator.html" xlink:type="simple"><rect codeLine="254" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="9558" y="1416"/><ellipse cx="9686.25" cy="1432" fil [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="263" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width= [...]
+class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="273" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="315" x="1049 [...]
+class org.apache.wiki.htmltowiki.syntax.PDecorator--><a href="PDecorator.html" target="_top" title="PDecorator.html" xlink:actuate="onRequest" xlink:href="PDecorator.html" xlink:show="new" xlink:title="PDecorator.html" xlink:type="simple"><rect codeLine="280" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.5;" width="337" x="10848.5" y="1416"/><ellipse cx="10977.75" cy="1432" fill="#A9DC [...]
+class org.apache.wiki.htmltowiki.syntax.InputDecorator--><a href="InputDecorator.html" target="_top" title="InputDecorator.html" xlink:actuate="onRequest" xlink:href="InputDecorator.html" xlink:show="new" xlink:title="InputDecorator.html" xlink:type="simple"><rect codeLine="289" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.5;" width="358" x="11221" y="1409.5"/><ellipse cx="11347.7 [...]
+class org.apache.wiki.htmltowiki.syntax.DlDecorator--><a href="DlDecorator.html" target="_top" title="DlDecorator.html" xlink:actuate="onRequest" xlink:href="DlDecorator.html" xlink:show="new" xlink:title="DlDecorator.html" xlink:type="simple"><rect codeLine="299" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="341" x="11614.5" y="1416"/><ellipse cx="11743.25" cy="1432" fill= [...]
+class org.apache.wiki.htmltowiki.syntax.H4Decorator--><a href="H4Decorator.html" target="_top" title="H4Decorator.html" xlink:actuate="onRequest" xlink:href="H4Decorator.html" xlink:show="new" xlink:title="H4Decorator.html" xlink:type="simple"><rect codeLine="308" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="11990.5" y="1422.5"/><ellipse cx="12118.75" cy="1438.5" f [...]
+class org.apache.wiki.htmltowiki.syntax.ADecorator--><a href="ADecorator.html" target="_top" title="ADecorator.html" xlink:actuate="onRequest" xlink:href="ADecorator.html" xlink:show="new" xlink:title="ADecorator.html" xlink:type="simple"><rect codeLine="316" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="188.8516" id="org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.5;" width="449" x="12370.5" y="1384"/><ellipse cx="12555.25" cy="1400" fill="#A9DC [...]
+class org.apache.wiki.htmltowiki.syntax.H2Decorator--><a href="H2Decorator.html" target="_top" title="H2Decorator.html" xlink:actuate="onRequest" xlink:href="H2Decorator.html" xlink:show="new" xlink:title="H2Decorator.html" xlink:type="simple"><rect codeLine="330" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="12854.5" y="1422.5"/><ellipse cx="12982.75" cy="1438.5" f [...]
+class org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><a href="StrikeDecorator.html" target="_top" title="StrikeDecorator.html" xlink:actuate="onRequest" xlink:href="StrikeDecorator.html" xlink:show="new" xlink:title="StrikeDecorator.html" xlink:type="simple"><rect codeLine="338" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="363" x="13234.5" y="1416"/><ellipse cx="1 [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="347" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="585.7969" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="6459.5" y [...]
+class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="392" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="13633" y="1416"/><ellipse cx="13809.75" cy="1432" fill="# [...]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="448" fill="#FEFECE" filter="url(#f18l3dwy89vvhj)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="6207" y="33"/><ellipse cx="6532.75" [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="401" d="M3371.3462,2416.0486 C3296.3164,2457.2786 3200.8344,2509.7473 3123.2043,2552.4062 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3118.5866,2554.9437,3128.4005,2554.114 [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="402" d="M7903.4124,1804.596 C7122.4283,1855.1955 4876.1302,2000.7317 4085.981,2051.925 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4080.7822,2052.2618,4090.0221,2055.6713,4085.7717,2051.93 [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="403" d="M10077.4697,1528.0126 C10031.0696,1544.5142 9977.7335,1561.5817 9928,1573 C9414.3003,1690.9398 8800.0372,1746.9821 8451.9095,1771.0745 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8446.8042 [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="404" d="M2622.2627,2698.3974 C2333.1361,2753.3695 1935.8633,2828.9036 1689.2225,2875.7978 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1684.1511,2876.7621,1693.7399, [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="405" d="M3729.5736,2139.1843 C3683.4363,2180.4101 3624.9442,2232.6757 3578.162,2274.4778 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3574.2448,2277.978,3583.6211,2274.9639,3577.9732, [...]
+reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="406" d="M6590,613.5122 C6590,628.6609 6590,643.8667 6590,658.9927 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="6583.0001,613.2747,6590,593.2747,6597.0001,613.2747,6583.0001,613.2747" styl [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ADecorator--><path codeLine="407" d="M6720.6967,963.7883 C7200.9761,1006.7781 8913.9031,1157.199 10329,1245 C10920.9262,1281.7266 11070.7884,1259.1571 11662,1306 C11970.0959,1330.4111 12052.9699,1309.8314 12353,1384 C12357.0912,1385.0114 12361.2062,1386.0748 12365.3377,1387.1851 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ADecora [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.BrDecorator--><path codeLine="408" d="M6720.667,965.1642 C7092.8559,1004.7066 8188.2903,1135.3361 9066,1384 C9095.3295,1392.3093 9126.017,1402.9803 9155.2129,1414.1426 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9159.8855,1415.9381,9152.9193,14 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.CodeDecorator--><path codeLine="409" d="M6459.1291,955.9374 C5943.1042,972.9475 4050.7819,1049.7385 3501,1275 C3429.6148,1304.2486 3362.0075,1359.978 3314.3647,1405.7315 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3310.682,1409.2864,3319.9352 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DdDecorator--><path codeLine="410" d="M6459.4594,953.8079 C5659.9934,965.6211 1442.3889,1038.8333 923,1275 C855.756,1305.5759 799.1889,1369.8332 763.7585,1418.0103 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="760.6085,1422.3271,769.1448,1417.414 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DlDecorator--><path codeLine="411" d="M6720.7487,961.7291 C7242.9466,1000.8201 9229.6846,1151.777 10862,1306 C11189.0445,1336.8995 11281.8196,1291.4031 11597,1384 C11622.1367,1391.3849 11647.9444,1402.0489 11672.0743,1413.575 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polyg [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DtDecorator--><path codeLine="412" d="M6459.3458,958.2843 C5848.8563,988.3676 3293.4984,1122.515 2973,1275 C2906.6754,1306.5555 2850.4811,1370.3182 2815.0936,1418.1059 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="2811.9467,1422.3878,2820.4996,14 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.FormDecorator--><path codeLine="413" d="M6720.8365,1026.8755 C6901.5455,1130.2921 7224.5789,1315.1585 7395.9473,1413.2296 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7400.4699,1415.8178,7394.6452,1407.8759,7396.1302,1413.3344,7390.6718,1414.8 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.HrDecorator--><path codeLine="414" d="M6720.6311,1080.7964 C6829.7473,1188.3801 6980.4002,1336.9171 7063.2685,1418.6214 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7067.1629,1422.4612,7063.5623,1413.2941,7063.6024,1418.9508,7057.9457,1418.9909, [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H1Decorator--><path codeLine="415" d="M6459.454,954.5316 C5985.6534,965.6371 4313.6272,1021.5593 2963,1275 C2791.9933,1307.0888 2749.1662,1320.9515 2587,1384 C2560.0266,1394.487 2531.7038,1407.3885 2505.3748,1420.2498 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill= [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H2Decorator--><path codeLine="416" d="M6720.6722,964.1978 C7200.8666,1008.6056 8913.5369,1163.3144 10329,1245 C11058.955,1287.1253 11243.307,1259.5577 11973,1306 C12357.7831,1330.4901 12466.0083,1279.0099 12837,1384 C12867.4519,1392.6179 12898.8613,1406.093 12927.1566,1420.1952 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H2Decora [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H3Decorator--><path codeLine="417" d="M6459.4549,961.1829 C5945.6283,997.7331 4013.1011,1139.0208 2427,1306 C2150.3602,1335.1237 2072.2939,1303.5926 1806,1384 C1776.3279,1392.9595 1745.6376,1406.2367 1717.8032,1420.0259 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fil [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H4Decorator--><path codeLine="418" d="M6720.7548,962.9169 C7201.2352,1002.8904 8914.7704,1144.189 10329,1245 C10751.0209,1275.083 10857.5462,1268.8065 11279,1306 C11588.1848,1333.2857 11675.2855,1296.217 11973,1384 C12003.0204,1392.8517 12034.0403,1406.2355 12062.0902,1420.1687 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H4Decora [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ImageDecorator--><path codeLine="419" d="M6459.3748,976.0717 C6166.8495,1031.7913 5438.8279,1180.5856 4853,1384 C4837.8293,1389.2677 4822.2517,1395.2208 4806.7719,1401.5128 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4801.9716,1403.4759,4811 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.InputDecorator--><path codeLine="420" d="M6720.7513,962.6245 C7216.8003,1003.176 9029.8328,1153.6079 10521,1306 C10824.5063,1337.0173 10909.8428,1299.5193 11203,1384 C11224.1792,1390.1033 11245.893,1398.3044 11266.8077,1407.3366 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.0;"/> [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.LiDecorator--><path codeLine="421" d="M6459.2241,969.6155 C6120.0849,1017.1359 5186.3744,1159.7062 4435,1384 C4406.6196,1392.4719 4376.9059,1403.0273 4348.5251,1413.9834 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4343.6134,1415.8886,4353.4508, [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OlDecorator--><path codeLine="422" d="M6459.4618,1014.5941 C6249.723,1115.1656 5839.7389,1311.7563 5627.1228,1413.7075 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5622.449,1415.9486,5632.2937,1415.6637,5626.9574,1413.7866,5628.8345,1408.4503,56 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OptionDecorator--><path codeLine="423" d="M6459.3352,988.4388 C6218.2542,1056.9587 5688.5913,1213.5317 5256,1384 C5223.7271,1396.7176 5189.3021,1412.1081 5158.1842,1426.743 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5153.6177,1428.8963,516 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PDecorator--><path codeLine="424" d="M6720.8564,961.6724 C7201.6365,997.7915 8915.5903,1131.6833 10322,1306 C10549.1251,1334.1509 10613.1208,1313.9505 10831,1384 C10855.0836,1391.743 10879.8707,1402.2951 10903.1848,1413.5471 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><path codeLine="425" d="M6720.7824,967.8085 C7098.1916,1013.5734 8221.6656,1150.8274 9153,1275 C9497.7835,1320.9692 9589.7101,1303.0753 9928,1384 C9975.4072,1395.3406 10026.1783,1411.5107 10071.0836,1427.2761 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1. [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="426" d="M6459.0692,960.7433 C5903.3385,999.1575 3759.3906,1161.0188 3566,1384 C3479.3658,1483.8901 3568,1549.2748 3568,1681.5 C3568,1681.5 3568,1681.5 3568,1931.5 C3568,1958.2508 3579.3474,1979.9197 3597.097,1997.4511 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" styl [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="427" d="M6720.718,954.0847 C7100.1644,963.6385 8175,1016.9607 8175,1314.5 C8175,1314.5 8175,1314.5 8175,1642.5 C8175,1663.1986 8175,1685.5649 8175,1706.3739 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" p [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="428" d="M6459.4945,953.3292 C5612.7148,962.7855 932,1028.0132 932,1314.5 C932,1314.5 932,1314.5 932,2774.5 C932,2841.362 1090.9896,2878.3299 1234.8102,2898.0927 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygo [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="429" d="M6459.2132,959.6699 C5961.5406,990.1032 4187.4731,1110.3052 3661,1306 C3593.8713,1330.9524 3558.7267,1323.7577 3520,1384 C3484.1436,1439.7774 3497,1615.1916 3497,1681.5 C3497,1681.5 3497,1681.5 3497,2208.5 C3497,2229.3366 3497,2251.9365 3497,2272.7185 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.ht [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="430" d="M6459.4578,958.1274 C5812.6175,989.3291 2982,1136.0641 2982,1314.5 C2982,1314.5 2982,1314.5 2982,2485.5 C2982,2506.1986 2982,2528.5649 2982,2549.3739 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fil [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SelectDecorator--><path codeLine="431" d="M6459.4261,961.8583 C5987.1514,997.8859 4323.5451,1128.0174 2955,1275 C2620.5281,1310.9225 2527.606,1285.3518 2206,1384 C2190.0291,1388.8989 2173.7111,1394.8614 2157.6251,1401.3847 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.0;"/><poly [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><path codeLine="432" d="M6720.6467,964.6596 C7200.7528,1010.6658 8913.1559,1170.2088 10329,1245 C11319.1014,1297.3016 11570.1349,1234.0135 12559,1306 C12852.7148,1327.3816 12934.0313,1302.4264 13217,1384 C13243.2932,1391.5798 13270.4333,1402.304 13295.8931,1413.8231 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.St [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SubDecorator--><path codeLine="433" d="M6720.713,956.869 C7139.9385,975.4705 8484.9637,1058.3946 9540,1384 C9565.191,1391.7744 9591.1916,1402.4153 9615.6533,1413.7592 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9620.2024,1415.885,9613.7422,140 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SupDecorator--><path codeLine="434" d="M6674.6668,1245.2702 C6692.5859,1307.3388 6709.8539,1367.1519 6722.4159,1410.6644 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6723.8471,1415.6218,6725.1938,1405.8654,6722.4602,1410.818,6717.5077,1408.0845 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TableDecorator--><path codeLine="435" d="M6459.3458,955.4703 C5717.7407,975.7674 2031.4351,1084.8109 913,1275 C736.6365,1304.9905 541.7556,1371.6683 413.2795,1420.5597 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="408.3565,1422.4368,418.191,14 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><path codeLine="436" d="M6459.3595,960.612 C6071.1394,988.916 4893.6915,1094.4228 3965,1384 C3929.8817,1394.9503 3893.0427,1410.9367 3860.6875,1426.6572 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3855.9471,1428.9741,3865.78 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TdDecorator--><path codeLine="437" d="M6459.3112,960.9941 C5923.9752,998.1332 3846.3072,1145.1737 2141,1306 C1822.7491,1336.014 1736.2473,1306.9864 1426,1384 C1394.9752,1391.7014 1362.6028,1402.5316 1332.0873,1414.1254 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><path codeLine="438" d="M6720.8144,999.8141 C6930.407,1077.0438 7353.8094,1235.6137 7707,1384 C7724.6137,1391.4 7742.9628,1399.3609 7761.1472,1407.4096 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7765.7662,1409.4575,77 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><path codeLine="439" d="M6720.644,959.768 C7313.5112,996.0441 9753.3983,1156.65 10481,1384 C10513.2221,1394.0683 10546.3572,1410.2297 10575.008,1426.3615 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10579.567,1428 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ThDecorator--><path codeLine="440" d="M6720.6242,965.1056 C7200.6523,1012.656 8912.8198,1176.8689 10329,1245 C11071.3721,1280.7148 11258.0094,1256.11 12001,1275 C12719.735,1293.2733 12917.8112,1208.3817 13615,1384 C13645.7934,1391.7567 13677.9316,1402.5418 13708.2668,1414.0615 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ThDecorat [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TheadDecorator--><path codeLine="441" d="M6459.4077,1056.0195 C6319.7369,1167.2701 6103.7678,1339.2939 5995.5658,1425.479 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5991.4457,1428.7607,6000.9776,1426.2822,5995.3567,1425.6456,5995.9934,1420. [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TrDecorator--><path codeLine="442" d="M6720.5472,977.4821 C6993.9865,1031.0371 7646.8046,1159.8446 8193,1275 C8413.425,1321.4726 8475.6397,1308.8337 8688,1384 C8720.3345,1395.445 8754.2609,1411.1354 8784.3034,1426.4434 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UlDecorator--><path codeLine="443" d="M6720.7384,958.8065 C7000.912,977.5262 7675.0723,1044.8603 8184,1275 C8258.8368,1308.8416 8332.3028,1366.8866 8383.3337,1412.3453 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8387.2761,1415.8719,8383.2353,14 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><path codeLine="444" d="M6459.3538,1226.0447 C6426.4083,1295.1515 6393.9365,1363.2647 6371.0403,1411.2919 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6368.8548,1415.8764,6376.3385,1409.4737,6371.0065,1411.3631,6369.1 [...]
 @startuml
     namespace org.apache.wiki.htmltowiki.syntax {
 
@@ -107,9 +107,8 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class PlainTextCssSpecialDecorator [[PlainTextCssSpecialDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
             #chain: XHtmlElementToWikiTranslator
-            #PlainTextCssSpecialDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #PlainTextCssSpecialDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
             {abstract} #markupCssSpecialDivOpen(String): String
             {abstract} #markupCssSpecialDivClose(String): String
@@ -119,9 +118,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class TdDecorator [[TdDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #TdDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #TdDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
             {abstract} #markupTd(): String
         }
@@ -163,9 +162,8 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class PlainTextItalicDecorator [[PlainTextItalicDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
             #chain: XHtmlElementToWikiTranslator
-            #PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
             +decorate(Element): void
             {abstract} #markupItalicOpen(): String
@@ -174,9 +172,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class CodeDecorator [[CodeDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #CodeDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #CodeDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
             {abstract} #markupCodeOpen(): String
             {abstract} #markupCodeClose(): String
@@ -184,9 +182,8 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class PlainTextCssDecorator [[PlainTextCssDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
             #chain: XHtmlElementToWikiTranslator
-            #PlainTextCssDecorator(PlainTextBoldDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #PlainTextCssDecorator(PlainTextBoldDecorator, PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
             {abstract} #markupCssDivOpen(String): String
             {abstract} #markupCssDivClose(String): String
@@ -196,9 +193,8 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         class PlainTextDecorator [[PlainTextDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
             #chain: XHtmlElementToWikiTranslator
-            +PlainTextDecorator(PlainTextCssDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            +PlainTextDecorator(PlainTextCssDecorator, PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
         }
 
@@ -211,11 +207,11 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class LiDecorator [[LiDecorator.html]] {
             #out: PrintWriter
-            #liStack: Stack<String>
+            #liStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #LiDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #LiDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element, Element): void
-            {abstract} #markupLi(Stack<String>): String
+            {abstract} #markupLi(Deque<String>): String
         }
 
         abstract class ImageDecorator [[ImageDecorator.html]] {
@@ -238,9 +234,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class OlDecorator [[OlDecorator.html]] {
             #out: PrintWriter
-            #liStack: Stack<String>
+            #liStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #OlDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #OlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
             {abstract} #markupOl(): String
         }
@@ -299,9 +295,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class PlainTextMonospaceDecorator [[PlainTextMonospaceDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
             +decorate(Element): void
             {abstract} #markupMonospaceOpen(): String
@@ -310,9 +306,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class UlDecorator [[UlDecorator.html]] {
             #out: PrintWriter
-            #liStack: Stack<String>
+            #liStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #UlDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #UlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
             {abstract} #markupUl(): String
         }
@@ -337,9 +333,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class BrDecorator [[BrDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #BrDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #BrDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element, Element): void
             {abstract} #markupBr(): String
         }
@@ -355,9 +351,8 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class PlainTextBoldDecorator [[PlainTextBoldDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
             #chain: XHtmlElementToWikiTranslator
-            #PlainTextBoldDecorator(PlainTextItalicDecorator, PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #PlainTextBoldDecorator(PlainTextItalicDecorator, PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
             +decorate(Element): void
             {abstract} #markupBoldOpen(): String
@@ -366,8 +361,8 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         class TextElementDecorator [[TextElementDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
-            +TextElementDecorator(PrintWriter, Stack<String>)
+            #preStack: Deque<String>
+            +TextElementDecorator(PrintWriter, Deque<String>)
             +decorate(Text): void
         }
 
@@ -485,9 +480,9 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
         abstract class ThDecorator [[ThDecorator.html]] {
             #out: PrintWriter
-            #preStack: Stack<String>
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #ThDecorator(PrintWriter, Stack<String>, XHtmlElementToWikiTranslator)
+            #ThDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
             {abstract} #markupTh(): String
         }
@@ -540,7 +535,7 @@ link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.ht
 
     namespace org.apache.wiki.htmltowiki {
         interface SyntaxDecorator [[../SyntaxDecorator.html]] {
-            {abstract} +init(PrintWriter, Stack<String>, Stack<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
+            {abstract} +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
             {abstract} +a(Element, String): void
             {abstract} +aFootnote(String, String): void
             {abstract} +aUndefined(Element): void
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/AbstractCommand.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/AbstractCommand.html
index 6b0c79a..9caeaef 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/AbstractCommand.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/AbstractCommand.html
@@ -302,7 +302,7 @@ implements <a href="../api/core/Command.html" title="interface in org.apache.wik
                           java.lang.Object&nbsp;target)</pre>
 <div class="block">Constructs a new Command with a specified wiki context, URL pattern, content template and target. The URL pattern is used to derive
  the JSP; if it is a "local" JSP (that is, it does not contain the <code>http://</code> or <code>https://</code> prefixes),
- then the JSP will be a cleansed version of the URL pattern; symbols (such as <code>%u</code>) will removed. If it the supplied
+ then the JSP will be a cleansed version of the URL pattern; symbols (such as <code>%u</code>) will be removed. If the supplied
  URL pattern points to a non-local destination, the JSP will be set to the value supplied, unmodified.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/PageCommand.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/PageCommand.html
index 74c5683..fd7672e 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/PageCommand.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/PageCommand.html
@@ -500,9 +500,9 @@ extends <a href="AbstractCommand.html" title="class in org.apache.wiki.ui">Abstr
 <pre class="methodSignature">public&nbsp;java.security.Permission&nbsp;<a href="../../../../src-html/org/apache/wiki/ui/PageCommand.html#line.123">requiredPermission</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../api/core/Command.html#requiredPermission()">Command</a></code></span></div>
 <div class="block">Returns the Permission required to successfully execute this Command. If no Permission is requred, this method returns
- <code>null</code>. For example, the static command <a href="#VIEW"><code>VIEW</code></a> doesn't require a permission because
+ <code>null</code>. For example, the static command <code>org.apache.wiki.ui.PageCommand#VIEW</code> doesn't require a permission because
  it isn't referring to a particular WikiPage. However, if this command targets a WikiPage called <code>Main</code>(via
- <a href="#targetedCommand(java.lang.Object)"><code>targetedCommand(Object)</code></a>, the resulting Command would require the permission
+ <code>org.apache.wiki.ui.PageCommand#targetedCommand(Object)</code>, the resulting Command would require the permission
  <code>PagePermission "<em>yourWiki</em>:Main", "view"</code>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/WikiCommand.html b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/WikiCommand.html
index ed3b3ac..95b669ab5 100644
--- a/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/WikiCommand.html
+++ b/apidocs/2.11.2-SNAPSHOT/org/apache/wiki/ui/WikiCommand.html
@@ -445,9 +445,9 @@ extends <a href="AbstractCommand.html" title="class in org.apache.wiki.ui">Abstr
 <pre class="methodSignature">public&nbsp;java.security.Permission&nbsp;<a href="../../../../src-html/org/apache/wiki/ui/WikiCommand.html#line.143">requiredPermission</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../api/core/Command.html#requiredPermission()">Command</a></code></span></div>
 <div class="block">Returns the Permission required to successfully execute this Command. If no Permission is requred, this method returns
- <code>null</code>. For example, the static command <a href="PageCommand.html#VIEW"><code>PageCommand.VIEW</code></a> doesn't require a permission because
+ <code>null</code>. For example, the static command <code>org.apache.wiki.ui.PageCommand#VIEW</code> doesn't require a permission because
  it isn't referring to a particular WikiPage. However, if this command targets a WikiPage called <code>Main</code>(via
- <a href="PageCommand.html#targetedCommand(java.lang.Object)"><code>PageCommand.targetedCommand(Object)</code></a>, the resulting Command would require the permission
+ <code>org.apache.wiki.ui.PageCommand#targetedCommand(Object)</code>, the resulting Command would require the permission
  <code>PagePermission "<em>yourWiki</em>:Main", "view"</code>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
diff --git a/apidocs/2.11.2-SNAPSHOT/overview-summary.html b/apidocs/2.11.2-SNAPSHOT/overview-summary.html
index ef773a6..b2bcdb6 100644
--- a/apidocs/2.11.2-SNAPSHOT/overview-summary.html
+++ b/apidocs/2.11.2-SNAPSHOT/overview-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (11.0.12) on Thu Jan 13 12:53:41 UTC 2022 -->
+<!-- Generated by javadoc (11.0.12) on Mon Feb 21 20:40:54 UTC 2022 -->
 <title>Apache JSPWiki 2.11.2-SNAPSHOT API</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <script type="text/javascript">window.location.replace('index.html')</script>
diff --git a/apidocs/2.11.2-SNAPSHOT/package-search-index.zip b/apidocs/2.11.2-SNAPSHOT/package-search-index.zip
index 1ac9dc6..0c52021 100644
Binary files a/apidocs/2.11.2-SNAPSHOT/package-search-index.zip and b/apidocs/2.11.2-SNAPSHOT/package-search-index.zip differ
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/Release.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/Release.html
index 10db2cb..e416190 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/Release.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/Release.html
@@ -78,7 +78,7 @@
 <span class="sourceLineNo">069</span><a id="line.69">     *  &lt;p&gt;</a>
 <span class="sourceLineNo">070</span><a id="line.70">     *  If the build identifier is empty, it is not added.</a>
 <span class="sourceLineNo">071</span><a id="line.71">     */</a>
-<span class="sourceLineNo">072</span><a id="line.72">    public static final String     BUILD         = "03";</a>
+<span class="sourceLineNo">072</span><a id="line.72">    public static final String     BUILD         = "04";</a>
 <span class="sourceLineNo">073</span><a id="line.73"></a>
 <span class="sourceLineNo">074</span><a id="line.74">    /**</a>
 <span class="sourceLineNo">075</span><a id="line.75">     *  This is the generic version string you should use when printing out the version.  It is of</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Command.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Command.html
index eb1b148..335fb90 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Command.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Command.html
@@ -36,13 +36,13 @@
 <span class="sourceLineNo">027</span><a id="line.27"> * &lt;p&gt; Commands come in two flavors: "static" and "targeted." &lt;/p&gt;</a>
 <span class="sourceLineNo">028</span><a id="line.28"> * &lt;ul&gt;</a>
 <span class="sourceLineNo">029</span><a id="line.29"> * &lt;li&gt;&lt;strong&gt;Static commands&lt;/strong&gt; are exactly what they sound like: static. They are &lt;code&gt;final&lt;/code&gt;, threadsafe, and immutable.</a>
-<span class="sourceLineNo">030</span><a id="line.30"> * They have no intrinsic idea of the context they are acting in. For example, the static command {@link org.apache.wiki.ui.PageCommand#VIEW} embodies the</a>
+<span class="sourceLineNo">030</span><a id="line.30"> * They have no intrinsic idea of the context they are acting in. For example, the static command {@code org.apache.wiki.ui.PageCommand#VIEW} embodies the</a>
 <span class="sourceLineNo">031</span><a id="line.31"> * idea of viewing a page &amp;#8212; but exactly &lt;em&gt;which&lt;/em&gt; page is left undefined. Static commands exist so that they can be freely</a>
 <span class="sourceLineNo">032</span><a id="line.32"> * shared and passed around without incurring the penalties of object creation. Static commands are a lot like naked request contexts</a>
 <span class="sourceLineNo">033</span><a id="line.33"> * ("edit", "view", etc.) except that they include additional, essential properties such as the associated URL pattern and content JSP.&lt;/li&gt;</a>
 <span class="sourceLineNo">034</span><a id="line.34"> * &lt;li&gt;&lt;strong&gt;Targeted commands&lt;/strong&gt; "decorate" static commands by scoping a static Command at a specific target such as a WikiPage or</a>
 <span class="sourceLineNo">035</span><a id="line.35"> * GroupPrincipal. Targeted commands are created by calling an existing Command's {@link #targetedCommand(Object)} and supplying the target</a>
-<span class="sourceLineNo">036</span><a id="line.36"> * object. Implementing classes generally require a specific target type. For example, the {@link org.apache.wiki.ui.PageCommand} class requires that the</a>
+<span class="sourceLineNo">036</span><a id="line.36"> * object. Implementing classes generally require a specific target type. For example, the {@code org.apache.wiki.ui.PageCommand} class requires that the</a>
 <span class="sourceLineNo">037</span><a id="line.37"> * target object be of type {@link org.apache.wiki.api.core.Page}.&lt;/li&gt;</a>
 <span class="sourceLineNo">038</span><a id="line.38"> * &lt;/ul&gt;</a>
 <span class="sourceLineNo">039</span><a id="line.39"> * &lt;p&gt; Concrete implementations of Command include: &lt;/p&gt;</a>
@@ -112,9 +112,9 @@
 <span class="sourceLineNo">103</span><a id="line.103"></a>
 <span class="sourceLineNo">104</span><a id="line.104">    /**</a>
 <span class="sourceLineNo">105</span><a id="line.105">     * Returns the Permission required to successfully execute this Command. If no Permission is requred, this method returns</a>
-<span class="sourceLineNo">106</span><a id="line.106">     * &lt;code&gt;null&lt;/code&gt;. For example, the static command {@link org.apache.wiki.ui.PageCommand#VIEW} doesn't require a permission because</a>
+<span class="sourceLineNo">106</span><a id="line.106">     * &lt;code&gt;null&lt;/code&gt;. For example, the static command {@code org.apache.wiki.ui.PageCommand#VIEW} doesn't require a permission because</a>
 <span class="sourceLineNo">107</span><a id="line.107">     * it isn't referring to a particular WikiPage. However, if this command targets a WikiPage called &lt;code&gt;Main&lt;/code&gt;(via</a>
-<span class="sourceLineNo">108</span><a id="line.108">     * {@link org.apache.wiki.ui.PageCommand#targetedCommand(Object)}, the resulting Command would require the permission</a>
+<span class="sourceLineNo">108</span><a id="line.108">     * {@code org.apache.wiki.ui.PageCommand#targetedCommand(Object)}, the resulting Command would require the permission</a>
 <span class="sourceLineNo">109</span><a id="line.109">     * &lt;code&gt;PagePermission "&lt;em&gt;yourWiki&lt;/em&gt;:Main", "view"&lt;/code&gt;.</a>
 <span class="sourceLineNo">110</span><a id="line.110">     *</a>
 <span class="sourceLineNo">111</span><a id="line.111">     * @return the required permission, or &lt;code&gt;null&lt;/code&gt; if not required</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Context.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Context.html
index 65b4da3..24730c4 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Context.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/api/core/Context.html
@@ -44,7 +44,7 @@
 <span class="sourceLineNo">035</span><a id="line.35"> *  object.&lt;/p&gt;</a>
 <span class="sourceLineNo">036</span><a id="line.36"> *  &lt;p&gt;Do not cache the WikiPage object that you get from the WikiContext; always use getPage()!&lt;/p&gt;</a>
 <span class="sourceLineNo">037</span><a id="line.37"> *</a>
-<span class="sourceLineNo">038</span><a id="line.38"> *  @see org.apache.wiki.plugin.Counter</a>
+<span class="sourceLineNo">038</span><a id="line.38"> *  @see {@code org.apache.wiki.plugin.Counter}</a>
 <span class="sourceLineNo">039</span><a id="line.39"> */</a>
 <span class="sourceLineNo">040</span><a id="line.40">public interface Context extends Cloneable, Command {</a>
 <span class="sourceLineNo">041</span><a id="line.41"></a>
@@ -52,7 +52,7 @@
 <span class="sourceLineNo">043</span><a id="line.43"></a>
 <span class="sourceLineNo">044</span><a id="line.44">    /**</a>
 <span class="sourceLineNo">045</span><a id="line.45">     *  Variable name which tells whether plugins should be executed or not. Value can be either {@code Boolean.TRUE} or</a>
-<span class="sourceLineNo">046</span><a id="line.46">     *  {@code Boolean.FALSE}. While not set it's value is {@code null}.</a>
+<span class="sourceLineNo">046</span><a id="line.46">     *  {@code Boolean.FALSE}. While not set its value is {@code null}.</a>
 <span class="sourceLineNo">047</span><a id="line.47">     */</a>
 <span class="sourceLineNo">048</span><a id="line.48">    String VAR_EXECUTE_PLUGINS = "_PluginContent.execute";</a>
 <span class="sourceLineNo">049</span><a id="line.49"></a>
@@ -84,8 +84,8 @@
 <span class="sourceLineNo">075</span><a id="line.75">     *  the Main page.  However, getRealPage() will return "LeftMenu".</a>
 <span class="sourceLineNo">076</span><a id="line.76">     *</a>
 <span class="sourceLineNo">077</span><a id="line.77">     *  @return A reference to the real page.</a>
-<span class="sourceLineNo">078</span><a id="line.78">     *  @see org.apache.wiki.tags.InsertPageTag</a>
-<span class="sourceLineNo">079</span><a id="line.79">     *  @see org.apache.wiki.parser.JSPWikiMarkupParser</a>
+<span class="sourceLineNo">078</span><a id="line.78">     *  @see {@code org.apache.wiki.tags.InsertPageTag}</a>
+<span class="sourceLineNo">079</span><a id="line.79">     *  @see {@code org.apache.wiki.parser.JSPWikiMarkupParser}</a>
 <span class="sourceLineNo">080</span><a id="line.80">     */</a>
 <span class="sourceLineNo">081</span><a id="line.81">    Page getRealPage();</a>
 <span class="sourceLineNo">082</span><a id="line.82"></a>
@@ -102,7 +102,7 @@
 <span class="sourceLineNo">093</span><a id="line.93">     *  @param wikiPage  The real WikiPage which is being rendered.</a>
 <span class="sourceLineNo">094</span><a id="line.94">     *  @return The previous real page</a>
 <span class="sourceLineNo">095</span><a id="line.95">     *  @since 2.3.14</a>
-<span class="sourceLineNo">096</span><a id="line.96">     *  @see org.apache.wiki.tags.InsertPageTag</a>
+<span class="sourceLineNo">096</span><a id="line.96">     *  @see {@code org.apache.wiki.tags.InsertPageTag}</a>
 <span class="sourceLineNo">097</span><a id="line.97">     */</a>
 <span class="sourceLineNo">098</span><a id="line.98">    Page setRealPage( Page wikiPage );</a>
 <span class="sourceLineNo">099</span><a id="line.99"></a>
@@ -149,7 +149,7 @@
 <span class="sourceLineNo">140</span><a id="line.140"></a>
 <span class="sourceLineNo">141</span><a id="line.141">    /**</a>
 <span class="sourceLineNo">142</span><a id="line.142">     *  This method will safely return any HTTP parameters that might have been defined.  You should use this method instead</a>
-<span class="sourceLineNo">143</span><a id="line.143">     *  of peeking directly into the result of getHttpRequest(), since this method is smart enough to do all of the right things,</a>
+<span class="sourceLineNo">143</span><a id="line.143">     *  of peeking directly into the result of getHttpRequest(), since this method is smart enough to do all the right things,</a>
 <span class="sourceLineNo">144</span><a id="line.144">     *  figure out UTF-8 encoded parameters, etc.</a>
 <span class="sourceLineNo">145</span><a id="line.145">     *</a>
 <span class="sourceLineNo">146</span><a id="line.146">     *  @since 2.0.13.</a>
@@ -159,8 +159,8 @@
 <span class="sourceLineNo">150</span><a id="line.150">    String getHttpParameter( String paramName );</a>
 <span class="sourceLineNo">151</span><a id="line.151"></a>
 <span class="sourceLineNo">152</span><a id="line.152">    /**</a>
-<span class="sourceLineNo">153</span><a id="line.153">     *  If the request did originate from a HTTP request, then the HTTP request can be fetched here.  However, it the request</a>
-<span class="sourceLineNo">154</span><a id="line.154">     *  did NOT originate from a HTTP request, then this method will return null, and YOU SHOULD CHECK FOR IT!</a>
+<span class="sourceLineNo">153</span><a id="line.153">     *  If the request did originate from an HTTP request, then the HTTP request can be fetched here.  However, if the request</a>
+<span class="sourceLineNo">154</span><a id="line.154">     *  did NOT originate from an HTTP request, then this method will return null, and YOU SHOULD CHECK FOR IT!</a>
 <span class="sourceLineNo">155</span><a id="line.155">     *</a>
 <span class="sourceLineNo">156</span><a id="line.156">     *  @return Null, if no HTTP request was done.</a>
 <span class="sourceLineNo">157</span><a id="line.157">     *  @since 2.0.13.</a>
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">203</span><a id="line.203">     *  A shortcut to generate a VIEW url.</a>
 <span class="sourceLineNo">204</span><a id="line.204">     *</a>
 <span class="sourceLineNo">205</span><a id="line.205">     *  @param WikiPage The WikiPage to which to link.</a>
-<span class="sourceLineNo">206</span><a id="line.206">     *  @return An URL to the page.  This honours the current absolute/relative setting.</a>
+<span class="sourceLineNo">206</span><a id="line.206">     *  @return A URL to the page.  This honours the current absolute/relative setting.</a>
 <span class="sourceLineNo">207</span><a id="line.207">     */</a>
 <span class="sourceLineNo">208</span><a id="line.208">    String getViewURL( String WikiPage );</a>
 <span class="sourceLineNo">209</span><a id="line.209"></a>
@@ -232,25 +232,25 @@
 <span class="sourceLineNo">223</span><a id="line.223">    Command getCommand();</a>
 <span class="sourceLineNo">224</span><a id="line.224"></a>
 <span class="sourceLineNo">225</span><a id="line.225">    /**</a>
-<span class="sourceLineNo">226</span><a id="line.226">     *  Creates an URL for the given request context.</a>
+<span class="sourceLineNo">226</span><a id="line.226">     *  Creates a URL for the given request context.</a>
 <span class="sourceLineNo">227</span><a id="line.227">     *</a>
 <span class="sourceLineNo">228</span><a id="line.228">     *  @param context e.g. WikiContext.EDIT</a>
 <span class="sourceLineNo">229</span><a id="line.229">     *  @param page The WikiPage to which to link</a>
-<span class="sourceLineNo">230</span><a id="line.230">     *  @return An URL to the page.</a>
+<span class="sourceLineNo">230</span><a id="line.230">     *  @return A URL to the page.</a>
 <span class="sourceLineNo">231</span><a id="line.231">     */</a>
 <span class="sourceLineNo">232</span><a id="line.232">    default String getURL( final String context, final String page ) {</a>
 <span class="sourceLineNo">233</span><a id="line.233">        return getURL( context, page, null );</a>
 <span class="sourceLineNo">234</span><a id="line.234">    }</a>
 <span class="sourceLineNo">235</span><a id="line.235"></a>
 <span class="sourceLineNo">236</span><a id="line.236">    /**</a>
-<span class="sourceLineNo">237</span><a id="line.237">     *  Returns an URL from a page. It this Context instance was constructed with an actual HttpServletRequest, we will attempt to</a>
+<span class="sourceLineNo">237</span><a id="line.237">     *  Returns a URL from a page. It this Context instance was constructed with an actual HttpServletRequest, we will attempt to</a>
 <span class="sourceLineNo">238</span><a id="line.238">     *  construct the URL using HttpUtil, which preserves the HTTPS portion if it was used.</a>
 <span class="sourceLineNo">239</span><a id="line.239">     *</a>
 <span class="sourceLineNo">240</span><a id="line.240">     *  @param context The request context (e.g. WikiContext.UPLOAD)</a>
 <span class="sourceLineNo">241</span><a id="line.241">     *  @param page The WikiPage to which to link</a>
 <span class="sourceLineNo">242</span><a id="line.242">     *  @param params A list of parameters, separated with "&amp;amp;"</a>
 <span class="sourceLineNo">243</span><a id="line.243">     *</a>
-<span class="sourceLineNo">244</span><a id="line.244">     *  @return An URL to the given context and page.</a>
+<span class="sourceLineNo">244</span><a id="line.244">     *  @return A URL to the given context and page.</a>
 <span class="sourceLineNo">245</span><a id="line.245">     */</a>
 <span class="sourceLineNo">246</span><a id="line.246">    default String getURL( final String context, final String page, final String params ) {</a>
 <span class="sourceLineNo">247</span><a id="line.247">        // FIXME: is rather slow</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html
index 7d5dcd9..cb7ef75 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.html
@@ -322,169 +322,172 @@
 <span class="sourceLineNo">313</span><a id="line.313">    /** {@inheritDoc} */</a>
 <span class="sourceLineNo">314</span><a id="line.314">    @Override</a>
 <span class="sourceLineNo">315</span><a id="line.315">    public void validateProfile( final Context context, final UserProfile profile ) {</a>
-<span class="sourceLineNo">316</span><a id="line.316">        final boolean isNew = profile.isNew();</a>
-<span class="sourceLineNo">317</span><a id="line.317">        final Session session = context.getWikiSession();</a>
-<span class="sourceLineNo">318</span><a id="line.318">        final InputValidator validator = new InputValidator( SESSION_MESSAGES, context );</a>
-<span class="sourceLineNo">319</span><a id="line.319">        final ResourceBundle rb = Preferences.getBundle( context, InternationalizationManager.CORE_BUNDLE );</a>
-<span class="sourceLineNo">320</span><a id="line.320"></a>
-<span class="sourceLineNo">321</span><a id="line.321">        //  Query the SpamFilter first</a>
-<span class="sourceLineNo">322</span><a id="line.322">        final FilterManager fm = m_engine.getManager( FilterManager.class );</a>
-<span class="sourceLineNo">323</span><a id="line.323">        final List&lt; PageFilter &gt; ls = fm.getFilterList();</a>
-<span class="sourceLineNo">324</span><a id="line.324">        for( final PageFilter pf : ls ) {</a>
-<span class="sourceLineNo">325</span><a id="line.325">            if( pf instanceof SpamFilter ) {</a>
-<span class="sourceLineNo">326</span><a id="line.326">                if( !( ( SpamFilter )pf ).isValidUserProfile( context, profile ) ) {</a>
-<span class="sourceLineNo">327</span><a id="line.327">                    session.addMessage( SESSION_MESSAGES, "Invalid userprofile" );</a>
-<span class="sourceLineNo">328</span><a id="line.328">                    return;</a>
-<span class="sourceLineNo">329</span><a id="line.329">                }</a>
-<span class="sourceLineNo">330</span><a id="line.330">                break;</a>
-<span class="sourceLineNo">331</span><a id="line.331">            }</a>
-<span class="sourceLineNo">332</span><a id="line.332">        }</a>
-<span class="sourceLineNo">333</span><a id="line.333"></a>
-<span class="sourceLineNo">334</span><a id="line.334">        // If container-managed auth and user not logged in, throw an error</a>
-<span class="sourceLineNo">335</span><a id="line.335">        if ( m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated()</a>
-<span class="sourceLineNo">336</span><a id="line.336">             &amp;&amp; !context.getWikiSession().isAuthenticated() ) {</a>
-<span class="sourceLineNo">337</span><a id="line.337">            session.addMessage( SESSION_MESSAGES, rb.getString("security.error.createprofilebeforelogin") );</a>
-<span class="sourceLineNo">338</span><a id="line.338">        }</a>
-<span class="sourceLineNo">339</span><a id="line.339"></a>
-<span class="sourceLineNo">340</span><a id="line.340">        validator.validateNotNull( profile.getLoginName(), rb.getString("security.user.loginname") );</a>
-<span class="sourceLineNo">341</span><a id="line.341">        validator.validateNotNull( profile.getFullname(), rb.getString("security.user.fullname") );</a>
-<span class="sourceLineNo">342</span><a id="line.342">        validator.validate( profile.getEmail(), rb.getString("security.user.email"), InputValidator.EMAIL );</a>
-<span class="sourceLineNo">343</span><a id="line.343"></a>
-<span class="sourceLineNo">344</span><a id="line.344">        // If new profile, passwords must match and can't be null</a>
-<span class="sourceLineNo">345</span><a id="line.345">        if( !m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated() ) {</a>
-<span class="sourceLineNo">346</span><a id="line.346">            final String password = profile.getPassword();</a>
-<span class="sourceLineNo">347</span><a id="line.347">            if( password == null ) {</a>
-<span class="sourceLineNo">348</span><a id="line.348">                if( isNew ) {</a>
-<span class="sourceLineNo">349</span><a id="line.349">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.blankpassword" ) );</a>
-<span class="sourceLineNo">350</span><a id="line.350">                }</a>
-<span class="sourceLineNo">351</span><a id="line.351">            } else {</a>
-<span class="sourceLineNo">352</span><a id="line.352">                final HttpServletRequest request = context.getHttpRequest();</a>
+<span class="sourceLineNo">316</span><a id="line.316">        final Session session = context.getWikiSession();</a>
+<span class="sourceLineNo">317</span><a id="line.317">        final InputValidator validator = new InputValidator( SESSION_MESSAGES, context );</a>
+<span class="sourceLineNo">318</span><a id="line.318">        final ResourceBundle rb = Preferences.getBundle( context, InternationalizationManager.CORE_BUNDLE );</a>
+<span class="sourceLineNo">319</span><a id="line.319"></a>
+<span class="sourceLineNo">320</span><a id="line.320">        //  Query the SpamFilter first</a>
+<span class="sourceLineNo">321</span><a id="line.321">        final FilterManager fm = m_engine.getManager( FilterManager.class );</a>
+<span class="sourceLineNo">322</span><a id="line.322">        final List&lt; PageFilter &gt; ls = fm.getFilterList();</a>
+<span class="sourceLineNo">323</span><a id="line.323">        for( final PageFilter pf : ls ) {</a>
+<span class="sourceLineNo">324</span><a id="line.324">            if( pf instanceof SpamFilter ) {</a>
+<span class="sourceLineNo">325</span><a id="line.325">                if( !( ( SpamFilter )pf ).isValidUserProfile( context, profile ) ) {</a>
+<span class="sourceLineNo">326</span><a id="line.326">                    session.addMessage( SESSION_MESSAGES, "Invalid userprofile" );</a>
+<span class="sourceLineNo">327</span><a id="line.327">                    return;</a>
+<span class="sourceLineNo">328</span><a id="line.328">                }</a>
+<span class="sourceLineNo">329</span><a id="line.329">                break;</a>
+<span class="sourceLineNo">330</span><a id="line.330">            }</a>
+<span class="sourceLineNo">331</span><a id="line.331">        }</a>
+<span class="sourceLineNo">332</span><a id="line.332"></a>
+<span class="sourceLineNo">333</span><a id="line.333">        // If container-managed auth and user not logged in, throw an error</a>
+<span class="sourceLineNo">334</span><a id="line.334">        if ( m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated()</a>
+<span class="sourceLineNo">335</span><a id="line.335">             &amp;&amp; !context.getWikiSession().isAuthenticated() ) {</a>
+<span class="sourceLineNo">336</span><a id="line.336">            session.addMessage( SESSION_MESSAGES, rb.getString("security.error.createprofilebeforelogin") );</a>
+<span class="sourceLineNo">337</span><a id="line.337">        }</a>
+<span class="sourceLineNo">338</span><a id="line.338"></a>
+<span class="sourceLineNo">339</span><a id="line.339">        validator.validateNotNull( profile.getLoginName(), rb.getString("security.user.loginname") );</a>
+<span class="sourceLineNo">340</span><a id="line.340">        validator.validateNotNull( profile.getFullname(), rb.getString("security.user.fullname") );</a>
+<span class="sourceLineNo">341</span><a id="line.341">        validator.validate( profile.getEmail(), rb.getString("security.user.email"), InputValidator.EMAIL );</a>
+<span class="sourceLineNo">342</span><a id="line.342"></a>
+<span class="sourceLineNo">343</span><a id="line.343">        if( !m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated() ) {</a>
+<span class="sourceLineNo">344</span><a id="line.344">            final String password = profile.getPassword();</a>
+<span class="sourceLineNo">345</span><a id="line.345">            if( password == null ) {</a>
+<span class="sourceLineNo">346</span><a id="line.346">                if( profile.isNew() ) {</a>
+<span class="sourceLineNo">347</span><a id="line.347">                    // If new profile, passwords must match and can't be null</a>
+<span class="sourceLineNo">348</span><a id="line.348">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.blankpassword" ) );</a>
+<span class="sourceLineNo">349</span><a id="line.349">                }</a>
+<span class="sourceLineNo">350</span><a id="line.350">            } else {</a>
+<span class="sourceLineNo">351</span><a id="line.351">                final HttpServletRequest request = context.getHttpRequest();</a>
+<span class="sourceLineNo">352</span><a id="line.352">                final String password0 = ( request == null ) ? null : request.getParameter( "password0" );</a>
 <span class="sourceLineNo">353</span><a id="line.353">                final String password2 = ( request == null ) ? null : request.getParameter( "password2" );</a>
 <span class="sourceLineNo">354</span><a id="line.354">                if( !password.equals( password2 ) ) {</a>
 <span class="sourceLineNo">355</span><a id="line.355">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.passwordnomatch" ) );</a>
 <span class="sourceLineNo">356</span><a id="line.356">                }</a>
-<span class="sourceLineNo">357</span><a id="line.357">            }</a>
-<span class="sourceLineNo">358</span><a id="line.358">        }</a>
-<span class="sourceLineNo">359</span><a id="line.359"></a>
-<span class="sourceLineNo">360</span><a id="line.360">        UserProfile otherProfile;</a>
-<span class="sourceLineNo">361</span><a id="line.361">        final String fullName = profile.getFullname();</a>
-<span class="sourceLineNo">362</span><a id="line.362">        final String loginName = profile.getLoginName();</a>
-<span class="sourceLineNo">363</span><a id="line.363">        final String email = profile.getEmail();</a>
-<span class="sourceLineNo">364</span><a id="line.364"></a>
-<span class="sourceLineNo">365</span><a id="line.365">        // It's illegal to use as a full name someone else's login name</a>
-<span class="sourceLineNo">366</span><a id="line.366">        try {</a>
-<span class="sourceLineNo">367</span><a id="line.367">            otherProfile = getUserDatabase().find( fullName );</a>
-<span class="sourceLineNo">368</span><a id="line.368">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !fullName.equals( otherProfile.getFullname() ) ) {</a>
-<span class="sourceLineNo">369</span><a id="line.369">                final Object[] args = { fullName };</a>
-<span class="sourceLineNo">370</span><a id="line.370">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalfullname" ), args ) );</a>
-<span class="sourceLineNo">371</span><a id="line.371">            }</a>
-<span class="sourceLineNo">372</span><a id="line.372">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
-<span class="sourceLineNo">373</span><a id="line.373"></a>
-<span class="sourceLineNo">374</span><a id="line.374">        // It's illegal to use as a login name someone else's full name</a>
-<span class="sourceLineNo">375</span><a id="line.375">        try {</a>
-<span class="sourceLineNo">376</span><a id="line.376">            otherProfile = getUserDatabase().find( loginName );</a>
-<span class="sourceLineNo">377</span><a id="line.377">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !loginName.equals( otherProfile.getLoginName() ) ) {</a>
-<span class="sourceLineNo">378</span><a id="line.378">                final Object[] args = { loginName };</a>
-<span class="sourceLineNo">379</span><a id="line.379">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalloginname" ), args ) );</a>
-<span class="sourceLineNo">380</span><a id="line.380">            }</a>
-<span class="sourceLineNo">381</span><a id="line.381">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
-<span class="sourceLineNo">382</span><a id="line.382"></a>
-<span class="sourceLineNo">383</span><a id="line.383">        // It's illegal to use multiple accounts with the same email</a>
-<span class="sourceLineNo">384</span><a id="line.384">        try {</a>
-<span class="sourceLineNo">385</span><a id="line.385">            otherProfile = getUserDatabase().findByEmail( email );</a>
-<span class="sourceLineNo">386</span><a id="line.386">            if( otherProfile != null &amp;&amp; !profile.getUid().equals( otherProfile.getUid() ) // Issue JSPWIKI-1042</a>
-<span class="sourceLineNo">387</span><a id="line.387">                    &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; StringUtils.lowerCase( email )</a>
-<span class="sourceLineNo">388</span><a id="line.388">                    .equals( StringUtils.lowerCase( otherProfile.getEmail() ) ) ) {</a>
-<span class="sourceLineNo">389</span><a id="line.389">                final Object[] args = { email };</a>
-<span class="sourceLineNo">390</span><a id="line.390">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.email.taken" ), args ) );</a>
-<span class="sourceLineNo">391</span><a id="line.391">            }</a>
-<span class="sourceLineNo">392</span><a id="line.392">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
-<span class="sourceLineNo">393</span><a id="line.393">    }</a>
-<span class="sourceLineNo">394</span><a id="line.394"></a>
-<span class="sourceLineNo">395</span><a id="line.395">    /** {@inheritDoc} */</a>
-<span class="sourceLineNo">396</span><a id="line.396">    @Override</a>
-<span class="sourceLineNo">397</span><a id="line.397">    public Principal[] listWikiNames() throws WikiSecurityException {</a>
-<span class="sourceLineNo">398</span><a id="line.398">        return getUserDatabase().getWikiNames();</a>
-<span class="sourceLineNo">399</span><a id="line.399">    }</a>
-<span class="sourceLineNo">400</span><a id="line.400"></a>
-<span class="sourceLineNo">401</span><a id="line.401">    // events processing .......................................................</a>
-<span class="sourceLineNo">402</span><a id="line.402"></a>
-<span class="sourceLineNo">403</span><a id="line.403">    /**</a>
-<span class="sourceLineNo">404</span><a id="line.404">     * Registers a WikiEventListener with this instance.</a>
-<span class="sourceLineNo">405</span><a id="line.405">     * This is a convenience method.</a>
-<span class="sourceLineNo">406</span><a id="line.406">     * @param listener the event listener</a>
-<span class="sourceLineNo">407</span><a id="line.407">     */</a>
-<span class="sourceLineNo">408</span><a id="line.408">    @Override public synchronized void addWikiEventListener( final WikiEventListener listener ) {</a>
-<span class="sourceLineNo">409</span><a id="line.409">        WikiEventManager.addWikiEventListener( this, listener );</a>
-<span class="sourceLineNo">410</span><a id="line.410">    }</a>
-<span class="sourceLineNo">411</span><a id="line.411"></a>
-<span class="sourceLineNo">412</span><a id="line.412">    /**</a>
-<span class="sourceLineNo">413</span><a id="line.413">     * Un-registers a WikiEventListener with this instance.</a>
-<span class="sourceLineNo">414</span><a id="line.414">     * This is a convenience method.</a>
-<span class="sourceLineNo">415</span><a id="line.415">     * @param listener the event listener</a>
-<span class="sourceLineNo">416</span><a id="line.416">     */</a>
-<span class="sourceLineNo">417</span><a id="line.417">    @Override public synchronized void removeWikiEventListener( final WikiEventListener listener ) {</a>
-<span class="sourceLineNo">418</span><a id="line.418">        WikiEventManager.removeWikiEventListener( this, listener );</a>
-<span class="sourceLineNo">419</span><a id="line.419">    }</a>
-<span class="sourceLineNo">420</span><a id="line.420"></a>
-<span class="sourceLineNo">421</span><a id="line.421">    /**</a>
-<span class="sourceLineNo">422</span><a id="line.422">     *  Implements the JSON API for usermanager.</a>
-<span class="sourceLineNo">423</span><a id="line.423">     *  &lt;p&gt;</a>
-<span class="sourceLineNo">424</span><a id="line.424">     *  Even though this gets serialized whenever container shuts down/restarts, this gets reinstalled to the session when JSPWiki starts.</a>
-<span class="sourceLineNo">425</span><a id="line.425">     *  This means that it's not actually necessary to save anything.</a>
-<span class="sourceLineNo">426</span><a id="line.426">     */</a>
-<span class="sourceLineNo">427</span><a id="line.427">    public static final class JSONUserModule implements WikiAjaxServlet {</a>
-<span class="sourceLineNo">428</span><a id="line.428"></a>
-<span class="sourceLineNo">429</span><a id="line.429">        private final DefaultUserManager m_manager;</a>
-<span class="sourceLineNo">430</span><a id="line.430"></a>
-<span class="sourceLineNo">431</span><a id="line.431">        /**</a>
-<span class="sourceLineNo">432</span><a id="line.432">         *  Create a new JSONUserModule.</a>
-<span class="sourceLineNo">433</span><a id="line.433">         *  @param mgr Manager</a>
-<span class="sourceLineNo">434</span><a id="line.434">         */</a>
-<span class="sourceLineNo">435</span><a id="line.435">        public JSONUserModule( final DefaultUserManager mgr )</a>
-<span class="sourceLineNo">436</span><a id="line.436">        {</a>
-<span class="sourceLineNo">437</span><a id="line.437">            m_manager = mgr;</a>
-<span class="sourceLineNo">438</span><a id="line.438">        }</a>
-<span class="sourceLineNo">439</span><a id="line.439"></a>
-<span class="sourceLineNo">440</span><a id="line.440">        @Override</a>
-<span class="sourceLineNo">441</span><a id="line.441">        public String getServletMapping() {</a>
-<span class="sourceLineNo">442</span><a id="line.442">            return JSON_USERS;</a>
-<span class="sourceLineNo">443</span><a id="line.443">        }</a>
-<span class="sourceLineNo">444</span><a id="line.444"></a>
-<span class="sourceLineNo">445</span><a id="line.445">        @Override</a>
-<span class="sourceLineNo">446</span><a id="line.446">        public void service( final HttpServletRequest req, final HttpServletResponse resp, final String actionName, final List&lt;String&gt; params) throws ServletException, IOException {</a>
-<span class="sourceLineNo">447</span><a id="line.447">            try {</a>
-<span class="sourceLineNo">448</span><a id="line.448">                if( params.size() &lt; 1 ) {</a>
-<span class="sourceLineNo">449</span><a id="line.449">                    return;</a>
-<span class="sourceLineNo">450</span><a id="line.450">                }</a>
-<span class="sourceLineNo">451</span><a id="line.451">                final String uid = params.get(0);</a>
-<span class="sourceLineNo">452</span><a id="line.452">                log.debug("uid="+uid);</a>
-<span class="sourceLineNo">453</span><a id="line.453">                if (StringUtils.isNotBlank(uid)) {</a>
-<span class="sourceLineNo">454</span><a id="line.454">                    final UserProfile prof = getUserInfo(uid);</a>
-<span class="sourceLineNo">455</span><a id="line.455">                    resp.getWriter().write(AjaxUtil.toJson(prof));</a>
-<span class="sourceLineNo">456</span><a id="line.456">                }</a>
-<span class="sourceLineNo">457</span><a id="line.457">            } catch (final NoSuchPrincipalException e) {</a>
-<span class="sourceLineNo">458</span><a id="line.458">                throw new ServletException(e);</a>
-<span class="sourceLineNo">459</span><a id="line.459">            }</a>
-<span class="sourceLineNo">460</span><a id="line.460">        }</a>
-<span class="sourceLineNo">461</span><a id="line.461"></a>
-<span class="sourceLineNo">462</span><a id="line.462">        /**</a>
-<span class="sourceLineNo">463</span><a id="line.463">         *  Directly returns the UserProfile object attached to an uid.</a>
-<span class="sourceLineNo">464</span><a id="line.464">         *</a>
-<span class="sourceLineNo">465</span><a id="line.465">         *  @param uid The user id (e.g. WikiName)</a>
-<span class="sourceLineNo">466</span><a id="line.466">         *  @return A UserProfile object</a>
-<span class="sourceLineNo">467</span><a id="line.467">         *  @throws NoSuchPrincipalException If such a name does not exist.</a>
-<span class="sourceLineNo">468</span><a id="line.468">         */</a>
-<span class="sourceLineNo">469</span><a id="line.469">        public UserProfile getUserInfo( final String uid ) throws NoSuchPrincipalException {</a>
-<span class="sourceLineNo">470</span><a id="line.470">            if( m_manager != null ) {</a>
-<span class="sourceLineNo">471</span><a id="line.471">                return m_manager.getUserDatabase().find( uid );</a>
-<span class="sourceLineNo">472</span><a id="line.472">            }</a>
-<span class="sourceLineNo">473</span><a id="line.473"></a>
-<span class="sourceLineNo">474</span><a id="line.474">            throw new IllegalStateException( "The manager is offline." );</a>
-<span class="sourceLineNo">475</span><a id="line.475">        }</a>
-<span class="sourceLineNo">476</span><a id="line.476">    }</a>
-<span class="sourceLineNo">477</span><a id="line.477"></a>
-<span class="sourceLineNo">478</span><a id="line.478">}</a>
+<span class="sourceLineNo">357</span><a id="line.357">                if( !profile.isNew() &amp;&amp; !getUserDatabase().validatePassword( profile.getLoginName(), password0 ) ) {</a>
+<span class="sourceLineNo">358</span><a id="line.358">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.passwordnomatch" ) );</a>
+<span class="sourceLineNo">359</span><a id="line.359">                }</a>
+<span class="sourceLineNo">360</span><a id="line.360">            }</a>
+<span class="sourceLineNo">361</span><a id="line.361">        }</a>
+<span class="sourceLineNo">362</span><a id="line.362"></a>
+<span class="sourceLineNo">363</span><a id="line.363">        UserProfile otherProfile;</a>
+<span class="sourceLineNo">364</span><a id="line.364">        final String fullName = profile.getFullname();</a>
+<span class="sourceLineNo">365</span><a id="line.365">        final String loginName = profile.getLoginName();</a>
+<span class="sourceLineNo">366</span><a id="line.366">        final String email = profile.getEmail();</a>
+<span class="sourceLineNo">367</span><a id="line.367"></a>
+<span class="sourceLineNo">368</span><a id="line.368">        // It's illegal to use as a full name someone else's login name</a>
+<span class="sourceLineNo">369</span><a id="line.369">        try {</a>
+<span class="sourceLineNo">370</span><a id="line.370">            otherProfile = getUserDatabase().find( fullName );</a>
+<span class="sourceLineNo">371</span><a id="line.371">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !fullName.equals( otherProfile.getFullname() ) ) {</a>
+<span class="sourceLineNo">372</span><a id="line.372">                final Object[] args = { fullName };</a>
+<span class="sourceLineNo">373</span><a id="line.373">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalfullname" ), args ) );</a>
+<span class="sourceLineNo">374</span><a id="line.374">            }</a>
+<span class="sourceLineNo">375</span><a id="line.375">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
+<span class="sourceLineNo">376</span><a id="line.376"></a>
+<span class="sourceLineNo">377</span><a id="line.377">        // It's illegal to use as a login name someone else's full name</a>
+<span class="sourceLineNo">378</span><a id="line.378">        try {</a>
+<span class="sourceLineNo">379</span><a id="line.379">            otherProfile = getUserDatabase().find( loginName );</a>
+<span class="sourceLineNo">380</span><a id="line.380">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !loginName.equals( otherProfile.getLoginName() ) ) {</a>
+<span class="sourceLineNo">381</span><a id="line.381">                final Object[] args = { loginName };</a>
+<span class="sourceLineNo">382</span><a id="line.382">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalloginname" ), args ) );</a>
+<span class="sourceLineNo">383</span><a id="line.383">            }</a>
+<span class="sourceLineNo">384</span><a id="line.384">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
+<span class="sourceLineNo">385</span><a id="line.385"></a>
+<span class="sourceLineNo">386</span><a id="line.386">        // It's illegal to use multiple accounts with the same email</a>
+<span class="sourceLineNo">387</span><a id="line.387">        try {</a>
+<span class="sourceLineNo">388</span><a id="line.388">            otherProfile = getUserDatabase().findByEmail( email );</a>
+<span class="sourceLineNo">389</span><a id="line.389">            if( otherProfile != null &amp;&amp; !profile.getUid().equals( otherProfile.getUid() ) // Issue JSPWIKI-1042</a>
+<span class="sourceLineNo">390</span><a id="line.390">                    &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; StringUtils.lowerCase( email )</a>
+<span class="sourceLineNo">391</span><a id="line.391">                    .equals( StringUtils.lowerCase( otherProfile.getEmail() ) ) ) {</a>
+<span class="sourceLineNo">392</span><a id="line.392">                final Object[] args = { email };</a>
+<span class="sourceLineNo">393</span><a id="line.393">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.email.taken" ), args ) );</a>
+<span class="sourceLineNo">394</span><a id="line.394">            }</a>
+<span class="sourceLineNo">395</span><a id="line.395">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
+<span class="sourceLineNo">396</span><a id="line.396">    }</a>
+<span class="sourceLineNo">397</span><a id="line.397"></a>
+<span class="sourceLineNo">398</span><a id="line.398">    /** {@inheritDoc} */</a>
+<span class="sourceLineNo">399</span><a id="line.399">    @Override</a>
+<span class="sourceLineNo">400</span><a id="line.400">    public Principal[] listWikiNames() throws WikiSecurityException {</a>
+<span class="sourceLineNo">401</span><a id="line.401">        return getUserDatabase().getWikiNames();</a>
+<span class="sourceLineNo">402</span><a id="line.402">    }</a>
+<span class="sourceLineNo">403</span><a id="line.403"></a>
+<span class="sourceLineNo">404</span><a id="line.404">    // events processing .......................................................</a>
+<span class="sourceLineNo">405</span><a id="line.405"></a>
+<span class="sourceLineNo">406</span><a id="line.406">    /**</a>
+<span class="sourceLineNo">407</span><a id="line.407">     * Registers a WikiEventListener with this instance.</a>
+<span class="sourceLineNo">408</span><a id="line.408">     * This is a convenience method.</a>
+<span class="sourceLineNo">409</span><a id="line.409">     * @param listener the event listener</a>
+<span class="sourceLineNo">410</span><a id="line.410">     */</a>
+<span class="sourceLineNo">411</span><a id="line.411">    @Override public synchronized void addWikiEventListener( final WikiEventListener listener ) {</a>
+<span class="sourceLineNo">412</span><a id="line.412">        WikiEventManager.addWikiEventListener( this, listener );</a>
+<span class="sourceLineNo">413</span><a id="line.413">    }</a>
+<span class="sourceLineNo">414</span><a id="line.414"></a>
+<span class="sourceLineNo">415</span><a id="line.415">    /**</a>
+<span class="sourceLineNo">416</span><a id="line.416">     * Un-registers a WikiEventListener with this instance.</a>
+<span class="sourceLineNo">417</span><a id="line.417">     * This is a convenience method.</a>
+<span class="sourceLineNo">418</span><a id="line.418">     * @param listener the event listener</a>
+<span class="sourceLineNo">419</span><a id="line.419">     */</a>
+<span class="sourceLineNo">420</span><a id="line.420">    @Override public synchronized void removeWikiEventListener( final WikiEventListener listener ) {</a>
+<span class="sourceLineNo">421</span><a id="line.421">        WikiEventManager.removeWikiEventListener( this, listener );</a>
+<span class="sourceLineNo">422</span><a id="line.422">    }</a>
+<span class="sourceLineNo">423</span><a id="line.423"></a>
+<span class="sourceLineNo">424</span><a id="line.424">    /**</a>
+<span class="sourceLineNo">425</span><a id="line.425">     *  Implements the JSON API for usermanager.</a>
+<span class="sourceLineNo">426</span><a id="line.426">     *  &lt;p&gt;</a>
+<span class="sourceLineNo">427</span><a id="line.427">     *  Even though this gets serialized whenever container shuts down/restarts, this gets reinstalled to the session when JSPWiki starts.</a>
+<span class="sourceLineNo">428</span><a id="line.428">     *  This means that it's not actually necessary to save anything.</a>
+<span class="sourceLineNo">429</span><a id="line.429">     */</a>
+<span class="sourceLineNo">430</span><a id="line.430">    public static final class JSONUserModule implements WikiAjaxServlet {</a>
+<span class="sourceLineNo">431</span><a id="line.431"></a>
+<span class="sourceLineNo">432</span><a id="line.432">        private final DefaultUserManager m_manager;</a>
+<span class="sourceLineNo">433</span><a id="line.433"></a>
+<span class="sourceLineNo">434</span><a id="line.434">        /**</a>
+<span class="sourceLineNo">435</span><a id="line.435">         *  Create a new JSONUserModule.</a>
+<span class="sourceLineNo">436</span><a id="line.436">         *  @param mgr Manager</a>
+<span class="sourceLineNo">437</span><a id="line.437">         */</a>
+<span class="sourceLineNo">438</span><a id="line.438">        public JSONUserModule( final DefaultUserManager mgr )</a>
+<span class="sourceLineNo">439</span><a id="line.439">        {</a>
+<span class="sourceLineNo">440</span><a id="line.440">            m_manager = mgr;</a>
+<span class="sourceLineNo">441</span><a id="line.441">        }</a>
+<span class="sourceLineNo">442</span><a id="line.442"></a>
+<span class="sourceLineNo">443</span><a id="line.443">        @Override</a>
+<span class="sourceLineNo">444</span><a id="line.444">        public String getServletMapping() {</a>
+<span class="sourceLineNo">445</span><a id="line.445">            return JSON_USERS;</a>
+<span class="sourceLineNo">446</span><a id="line.446">        }</a>
+<span class="sourceLineNo">447</span><a id="line.447"></a>
+<span class="sourceLineNo">448</span><a id="line.448">        @Override</a>
+<span class="sourceLineNo">449</span><a id="line.449">        public void service( final HttpServletRequest req, final HttpServletResponse resp, final String actionName, final List&lt;String&gt; params) throws ServletException, IOException {</a>
+<span class="sourceLineNo">450</span><a id="line.450">            try {</a>
+<span class="sourceLineNo">451</span><a id="line.451">                if( params.size() &lt; 1 ) {</a>
+<span class="sourceLineNo">452</span><a id="line.452">                    return;</a>
+<span class="sourceLineNo">453</span><a id="line.453">                }</a>
+<span class="sourceLineNo">454</span><a id="line.454">                final String uid = params.get(0);</a>
+<span class="sourceLineNo">455</span><a id="line.455">                log.debug("uid="+uid);</a>
+<span class="sourceLineNo">456</span><a id="line.456">                if (StringUtils.isNotBlank(uid)) {</a>
+<span class="sourceLineNo">457</span><a id="line.457">                    final UserProfile prof = getUserInfo(uid);</a>
+<span class="sourceLineNo">458</span><a id="line.458">                    resp.getWriter().write(AjaxUtil.toJson(prof));</a>
+<span class="sourceLineNo">459</span><a id="line.459">                }</a>
+<span class="sourceLineNo">460</span><a id="line.460">            } catch (final NoSuchPrincipalException e) {</a>
+<span class="sourceLineNo">461</span><a id="line.461">                throw new ServletException(e);</a>
+<span class="sourceLineNo">462</span><a id="line.462">            }</a>
+<span class="sourceLineNo">463</span><a id="line.463">        }</a>
+<span class="sourceLineNo">464</span><a id="line.464"></a>
+<span class="sourceLineNo">465</span><a id="line.465">        /**</a>
+<span class="sourceLineNo">466</span><a id="line.466">         *  Directly returns the UserProfile object attached to an uid.</a>
+<span class="sourceLineNo">467</span><a id="line.467">         *</a>
+<span class="sourceLineNo">468</span><a id="line.468">         *  @param uid The user id (e.g. WikiName)</a>
+<span class="sourceLineNo">469</span><a id="line.469">         *  @return A UserProfile object</a>
+<span class="sourceLineNo">470</span><a id="line.470">         *  @throws NoSuchPrincipalException If such a name does not exist.</a>
+<span class="sourceLineNo">471</span><a id="line.471">         */</a>
+<span class="sourceLineNo">472</span><a id="line.472">        public UserProfile getUserInfo( final String uid ) throws NoSuchPrincipalException {</a>
+<span class="sourceLineNo">473</span><a id="line.473">            if( m_manager != null ) {</a>
+<span class="sourceLineNo">474</span><a id="line.474">                return m_manager.getUserDatabase().find( uid );</a>
+<span class="sourceLineNo">475</span><a id="line.475">            }</a>
+<span class="sourceLineNo">476</span><a id="line.476"></a>
+<span class="sourceLineNo">477</span><a id="line.477">            throw new IllegalStateException( "The manager is offline." );</a>
+<span class="sourceLineNo">478</span><a id="line.478">        }</a>
+<span class="sourceLineNo">479</span><a id="line.479">    }</a>
+<span class="sourceLineNo">480</span><a id="line.480"></a>
+<span class="sourceLineNo">481</span><a id="line.481">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.html
index 7d5dcd9..cb7ef75 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/DefaultUserManager.html
@@ -322,169 +322,172 @@
 <span class="sourceLineNo">313</span><a id="line.313">    /** {@inheritDoc} */</a>
 <span class="sourceLineNo">314</span><a id="line.314">    @Override</a>
 <span class="sourceLineNo">315</span><a id="line.315">    public void validateProfile( final Context context, final UserProfile profile ) {</a>
-<span class="sourceLineNo">316</span><a id="line.316">        final boolean isNew = profile.isNew();</a>
-<span class="sourceLineNo">317</span><a id="line.317">        final Session session = context.getWikiSession();</a>
-<span class="sourceLineNo">318</span><a id="line.318">        final InputValidator validator = new InputValidator( SESSION_MESSAGES, context );</a>
-<span class="sourceLineNo">319</span><a id="line.319">        final ResourceBundle rb = Preferences.getBundle( context, InternationalizationManager.CORE_BUNDLE );</a>
-<span class="sourceLineNo">320</span><a id="line.320"></a>
-<span class="sourceLineNo">321</span><a id="line.321">        //  Query the SpamFilter first</a>
-<span class="sourceLineNo">322</span><a id="line.322">        final FilterManager fm = m_engine.getManager( FilterManager.class );</a>
-<span class="sourceLineNo">323</span><a id="line.323">        final List&lt; PageFilter &gt; ls = fm.getFilterList();</a>
-<span class="sourceLineNo">324</span><a id="line.324">        for( final PageFilter pf : ls ) {</a>
-<span class="sourceLineNo">325</span><a id="line.325">            if( pf instanceof SpamFilter ) {</a>
-<span class="sourceLineNo">326</span><a id="line.326">                if( !( ( SpamFilter )pf ).isValidUserProfile( context, profile ) ) {</a>
-<span class="sourceLineNo">327</span><a id="line.327">                    session.addMessage( SESSION_MESSAGES, "Invalid userprofile" );</a>
-<span class="sourceLineNo">328</span><a id="line.328">                    return;</a>
-<span class="sourceLineNo">329</span><a id="line.329">                }</a>
-<span class="sourceLineNo">330</span><a id="line.330">                break;</a>
-<span class="sourceLineNo">331</span><a id="line.331">            }</a>
-<span class="sourceLineNo">332</span><a id="line.332">        }</a>
-<span class="sourceLineNo">333</span><a id="line.333"></a>
-<span class="sourceLineNo">334</span><a id="line.334">        // If container-managed auth and user not logged in, throw an error</a>
-<span class="sourceLineNo">335</span><a id="line.335">        if ( m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated()</a>
-<span class="sourceLineNo">336</span><a id="line.336">             &amp;&amp; !context.getWikiSession().isAuthenticated() ) {</a>
-<span class="sourceLineNo">337</span><a id="line.337">            session.addMessage( SESSION_MESSAGES, rb.getString("security.error.createprofilebeforelogin") );</a>
-<span class="sourceLineNo">338</span><a id="line.338">        }</a>
-<span class="sourceLineNo">339</span><a id="line.339"></a>
-<span class="sourceLineNo">340</span><a id="line.340">        validator.validateNotNull( profile.getLoginName(), rb.getString("security.user.loginname") );</a>
-<span class="sourceLineNo">341</span><a id="line.341">        validator.validateNotNull( profile.getFullname(), rb.getString("security.user.fullname") );</a>
-<span class="sourceLineNo">342</span><a id="line.342">        validator.validate( profile.getEmail(), rb.getString("security.user.email"), InputValidator.EMAIL );</a>
-<span class="sourceLineNo">343</span><a id="line.343"></a>
-<span class="sourceLineNo">344</span><a id="line.344">        // If new profile, passwords must match and can't be null</a>
-<span class="sourceLineNo">345</span><a id="line.345">        if( !m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated() ) {</a>
-<span class="sourceLineNo">346</span><a id="line.346">            final String password = profile.getPassword();</a>
-<span class="sourceLineNo">347</span><a id="line.347">            if( password == null ) {</a>
-<span class="sourceLineNo">348</span><a id="line.348">                if( isNew ) {</a>
-<span class="sourceLineNo">349</span><a id="line.349">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.blankpassword" ) );</a>
-<span class="sourceLineNo">350</span><a id="line.350">                }</a>
-<span class="sourceLineNo">351</span><a id="line.351">            } else {</a>
-<span class="sourceLineNo">352</span><a id="line.352">                final HttpServletRequest request = context.getHttpRequest();</a>
+<span class="sourceLineNo">316</span><a id="line.316">        final Session session = context.getWikiSession();</a>
+<span class="sourceLineNo">317</span><a id="line.317">        final InputValidator validator = new InputValidator( SESSION_MESSAGES, context );</a>
+<span class="sourceLineNo">318</span><a id="line.318">        final ResourceBundle rb = Preferences.getBundle( context, InternationalizationManager.CORE_BUNDLE );</a>
+<span class="sourceLineNo">319</span><a id="line.319"></a>
+<span class="sourceLineNo">320</span><a id="line.320">        //  Query the SpamFilter first</a>
+<span class="sourceLineNo">321</span><a id="line.321">        final FilterManager fm = m_engine.getManager( FilterManager.class );</a>
+<span class="sourceLineNo">322</span><a id="line.322">        final List&lt; PageFilter &gt; ls = fm.getFilterList();</a>
+<span class="sourceLineNo">323</span><a id="line.323">        for( final PageFilter pf : ls ) {</a>
+<span class="sourceLineNo">324</span><a id="line.324">            if( pf instanceof SpamFilter ) {</a>
+<span class="sourceLineNo">325</span><a id="line.325">                if( !( ( SpamFilter )pf ).isValidUserProfile( context, profile ) ) {</a>
+<span class="sourceLineNo">326</span><a id="line.326">                    session.addMessage( SESSION_MESSAGES, "Invalid userprofile" );</a>
+<span class="sourceLineNo">327</span><a id="line.327">                    return;</a>
+<span class="sourceLineNo">328</span><a id="line.328">                }</a>
+<span class="sourceLineNo">329</span><a id="line.329">                break;</a>
+<span class="sourceLineNo">330</span><a id="line.330">            }</a>
+<span class="sourceLineNo">331</span><a id="line.331">        }</a>
+<span class="sourceLineNo">332</span><a id="line.332"></a>
+<span class="sourceLineNo">333</span><a id="line.333">        // If container-managed auth and user not logged in, throw an error</a>
+<span class="sourceLineNo">334</span><a id="line.334">        if ( m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated()</a>
+<span class="sourceLineNo">335</span><a id="line.335">             &amp;&amp; !context.getWikiSession().isAuthenticated() ) {</a>
+<span class="sourceLineNo">336</span><a id="line.336">            session.addMessage( SESSION_MESSAGES, rb.getString("security.error.createprofilebeforelogin") );</a>
+<span class="sourceLineNo">337</span><a id="line.337">        }</a>
+<span class="sourceLineNo">338</span><a id="line.338"></a>
+<span class="sourceLineNo">339</span><a id="line.339">        validator.validateNotNull( profile.getLoginName(), rb.getString("security.user.loginname") );</a>
+<span class="sourceLineNo">340</span><a id="line.340">        validator.validateNotNull( profile.getFullname(), rb.getString("security.user.fullname") );</a>
+<span class="sourceLineNo">341</span><a id="line.341">        validator.validate( profile.getEmail(), rb.getString("security.user.email"), InputValidator.EMAIL );</a>
+<span class="sourceLineNo">342</span><a id="line.342"></a>
+<span class="sourceLineNo">343</span><a id="line.343">        if( !m_engine.getManager( AuthenticationManager.class ).isContainerAuthenticated() ) {</a>
+<span class="sourceLineNo">344</span><a id="line.344">            final String password = profile.getPassword();</a>
+<span class="sourceLineNo">345</span><a id="line.345">            if( password == null ) {</a>
+<span class="sourceLineNo">346</span><a id="line.346">                if( profile.isNew() ) {</a>
+<span class="sourceLineNo">347</span><a id="line.347">                    // If new profile, passwords must match and can't be null</a>
+<span class="sourceLineNo">348</span><a id="line.348">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.blankpassword" ) );</a>
+<span class="sourceLineNo">349</span><a id="line.349">                }</a>
+<span class="sourceLineNo">350</span><a id="line.350">            } else {</a>
+<span class="sourceLineNo">351</span><a id="line.351">                final HttpServletRequest request = context.getHttpRequest();</a>
+<span class="sourceLineNo">352</span><a id="line.352">                final String password0 = ( request == null ) ? null : request.getParameter( "password0" );</a>
 <span class="sourceLineNo">353</span><a id="line.353">                final String password2 = ( request == null ) ? null : request.getParameter( "password2" );</a>
 <span class="sourceLineNo">354</span><a id="line.354">                if( !password.equals( password2 ) ) {</a>
 <span class="sourceLineNo">355</span><a id="line.355">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.passwordnomatch" ) );</a>
 <span class="sourceLineNo">356</span><a id="line.356">                }</a>
-<span class="sourceLineNo">357</span><a id="line.357">            }</a>
-<span class="sourceLineNo">358</span><a id="line.358">        }</a>
-<span class="sourceLineNo">359</span><a id="line.359"></a>
-<span class="sourceLineNo">360</span><a id="line.360">        UserProfile otherProfile;</a>
-<span class="sourceLineNo">361</span><a id="line.361">        final String fullName = profile.getFullname();</a>
-<span class="sourceLineNo">362</span><a id="line.362">        final String loginName = profile.getLoginName();</a>
-<span class="sourceLineNo">363</span><a id="line.363">        final String email = profile.getEmail();</a>
-<span class="sourceLineNo">364</span><a id="line.364"></a>
-<span class="sourceLineNo">365</span><a id="line.365">        // It's illegal to use as a full name someone else's login name</a>
-<span class="sourceLineNo">366</span><a id="line.366">        try {</a>
-<span class="sourceLineNo">367</span><a id="line.367">            otherProfile = getUserDatabase().find( fullName );</a>
-<span class="sourceLineNo">368</span><a id="line.368">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !fullName.equals( otherProfile.getFullname() ) ) {</a>
-<span class="sourceLineNo">369</span><a id="line.369">                final Object[] args = { fullName };</a>
-<span class="sourceLineNo">370</span><a id="line.370">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalfullname" ), args ) );</a>
-<span class="sourceLineNo">371</span><a id="line.371">            }</a>
-<span class="sourceLineNo">372</span><a id="line.372">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
-<span class="sourceLineNo">373</span><a id="line.373"></a>
-<span class="sourceLineNo">374</span><a id="line.374">        // It's illegal to use as a login name someone else's full name</a>
-<span class="sourceLineNo">375</span><a id="line.375">        try {</a>
-<span class="sourceLineNo">376</span><a id="line.376">            otherProfile = getUserDatabase().find( loginName );</a>
-<span class="sourceLineNo">377</span><a id="line.377">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !loginName.equals( otherProfile.getLoginName() ) ) {</a>
-<span class="sourceLineNo">378</span><a id="line.378">                final Object[] args = { loginName };</a>
-<span class="sourceLineNo">379</span><a id="line.379">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalloginname" ), args ) );</a>
-<span class="sourceLineNo">380</span><a id="line.380">            }</a>
-<span class="sourceLineNo">381</span><a id="line.381">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
-<span class="sourceLineNo">382</span><a id="line.382"></a>
-<span class="sourceLineNo">383</span><a id="line.383">        // It's illegal to use multiple accounts with the same email</a>
-<span class="sourceLineNo">384</span><a id="line.384">        try {</a>
-<span class="sourceLineNo">385</span><a id="line.385">            otherProfile = getUserDatabase().findByEmail( email );</a>
-<span class="sourceLineNo">386</span><a id="line.386">            if( otherProfile != null &amp;&amp; !profile.getUid().equals( otherProfile.getUid() ) // Issue JSPWIKI-1042</a>
-<span class="sourceLineNo">387</span><a id="line.387">                    &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; StringUtils.lowerCase( email )</a>
-<span class="sourceLineNo">388</span><a id="line.388">                    .equals( StringUtils.lowerCase( otherProfile.getEmail() ) ) ) {</a>
-<span class="sourceLineNo">389</span><a id="line.389">                final Object[] args = { email };</a>
-<span class="sourceLineNo">390</span><a id="line.390">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.email.taken" ), args ) );</a>
-<span class="sourceLineNo">391</span><a id="line.391">            }</a>
-<span class="sourceLineNo">392</span><a id="line.392">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
-<span class="sourceLineNo">393</span><a id="line.393">    }</a>
-<span class="sourceLineNo">394</span><a id="line.394"></a>
-<span class="sourceLineNo">395</span><a id="line.395">    /** {@inheritDoc} */</a>
-<span class="sourceLineNo">396</span><a id="line.396">    @Override</a>
-<span class="sourceLineNo">397</span><a id="line.397">    public Principal[] listWikiNames() throws WikiSecurityException {</a>
-<span class="sourceLineNo">398</span><a id="line.398">        return getUserDatabase().getWikiNames();</a>
-<span class="sourceLineNo">399</span><a id="line.399">    }</a>
-<span class="sourceLineNo">400</span><a id="line.400"></a>
-<span class="sourceLineNo">401</span><a id="line.401">    // events processing .......................................................</a>
-<span class="sourceLineNo">402</span><a id="line.402"></a>
-<span class="sourceLineNo">403</span><a id="line.403">    /**</a>
-<span class="sourceLineNo">404</span><a id="line.404">     * Registers a WikiEventListener with this instance.</a>
-<span class="sourceLineNo">405</span><a id="line.405">     * This is a convenience method.</a>
-<span class="sourceLineNo">406</span><a id="line.406">     * @param listener the event listener</a>
-<span class="sourceLineNo">407</span><a id="line.407">     */</a>
-<span class="sourceLineNo">408</span><a id="line.408">    @Override public synchronized void addWikiEventListener( final WikiEventListener listener ) {</a>
-<span class="sourceLineNo">409</span><a id="line.409">        WikiEventManager.addWikiEventListener( this, listener );</a>
-<span class="sourceLineNo">410</span><a id="line.410">    }</a>
-<span class="sourceLineNo">411</span><a id="line.411"></a>
-<span class="sourceLineNo">412</span><a id="line.412">    /**</a>
-<span class="sourceLineNo">413</span><a id="line.413">     * Un-registers a WikiEventListener with this instance.</a>
-<span class="sourceLineNo">414</span><a id="line.414">     * This is a convenience method.</a>
-<span class="sourceLineNo">415</span><a id="line.415">     * @param listener the event listener</a>
-<span class="sourceLineNo">416</span><a id="line.416">     */</a>
-<span class="sourceLineNo">417</span><a id="line.417">    @Override public synchronized void removeWikiEventListener( final WikiEventListener listener ) {</a>
-<span class="sourceLineNo">418</span><a id="line.418">        WikiEventManager.removeWikiEventListener( this, listener );</a>
-<span class="sourceLineNo">419</span><a id="line.419">    }</a>
-<span class="sourceLineNo">420</span><a id="line.420"></a>
-<span class="sourceLineNo">421</span><a id="line.421">    /**</a>
-<span class="sourceLineNo">422</span><a id="line.422">     *  Implements the JSON API for usermanager.</a>
-<span class="sourceLineNo">423</span><a id="line.423">     *  &lt;p&gt;</a>
-<span class="sourceLineNo">424</span><a id="line.424">     *  Even though this gets serialized whenever container shuts down/restarts, this gets reinstalled to the session when JSPWiki starts.</a>
-<span class="sourceLineNo">425</span><a id="line.425">     *  This means that it's not actually necessary to save anything.</a>
-<span class="sourceLineNo">426</span><a id="line.426">     */</a>
-<span class="sourceLineNo">427</span><a id="line.427">    public static final class JSONUserModule implements WikiAjaxServlet {</a>
-<span class="sourceLineNo">428</span><a id="line.428"></a>
-<span class="sourceLineNo">429</span><a id="line.429">        private final DefaultUserManager m_manager;</a>
-<span class="sourceLineNo">430</span><a id="line.430"></a>
-<span class="sourceLineNo">431</span><a id="line.431">        /**</a>
-<span class="sourceLineNo">432</span><a id="line.432">         *  Create a new JSONUserModule.</a>
-<span class="sourceLineNo">433</span><a id="line.433">         *  @param mgr Manager</a>
-<span class="sourceLineNo">434</span><a id="line.434">         */</a>
-<span class="sourceLineNo">435</span><a id="line.435">        public JSONUserModule( final DefaultUserManager mgr )</a>
-<span class="sourceLineNo">436</span><a id="line.436">        {</a>
-<span class="sourceLineNo">437</span><a id="line.437">            m_manager = mgr;</a>
-<span class="sourceLineNo">438</span><a id="line.438">        }</a>
-<span class="sourceLineNo">439</span><a id="line.439"></a>
-<span class="sourceLineNo">440</span><a id="line.440">        @Override</a>
-<span class="sourceLineNo">441</span><a id="line.441">        public String getServletMapping() {</a>
-<span class="sourceLineNo">442</span><a id="line.442">            return JSON_USERS;</a>
-<span class="sourceLineNo">443</span><a id="line.443">        }</a>
-<span class="sourceLineNo">444</span><a id="line.444"></a>
-<span class="sourceLineNo">445</span><a id="line.445">        @Override</a>
-<span class="sourceLineNo">446</span><a id="line.446">        public void service( final HttpServletRequest req, final HttpServletResponse resp, final String actionName, final List&lt;String&gt; params) throws ServletException, IOException {</a>
-<span class="sourceLineNo">447</span><a id="line.447">            try {</a>
-<span class="sourceLineNo">448</span><a id="line.448">                if( params.size() &lt; 1 ) {</a>
-<span class="sourceLineNo">449</span><a id="line.449">                    return;</a>
-<span class="sourceLineNo">450</span><a id="line.450">                }</a>
-<span class="sourceLineNo">451</span><a id="line.451">                final String uid = params.get(0);</a>
-<span class="sourceLineNo">452</span><a id="line.452">                log.debug("uid="+uid);</a>
-<span class="sourceLineNo">453</span><a id="line.453">                if (StringUtils.isNotBlank(uid)) {</a>
-<span class="sourceLineNo">454</span><a id="line.454">                    final UserProfile prof = getUserInfo(uid);</a>
-<span class="sourceLineNo">455</span><a id="line.455">                    resp.getWriter().write(AjaxUtil.toJson(prof));</a>
-<span class="sourceLineNo">456</span><a id="line.456">                }</a>
-<span class="sourceLineNo">457</span><a id="line.457">            } catch (final NoSuchPrincipalException e) {</a>
-<span class="sourceLineNo">458</span><a id="line.458">                throw new ServletException(e);</a>
-<span class="sourceLineNo">459</span><a id="line.459">            }</a>
-<span class="sourceLineNo">460</span><a id="line.460">        }</a>
-<span class="sourceLineNo">461</span><a id="line.461"></a>
-<span class="sourceLineNo">462</span><a id="line.462">        /**</a>
-<span class="sourceLineNo">463</span><a id="line.463">         *  Directly returns the UserProfile object attached to an uid.</a>
-<span class="sourceLineNo">464</span><a id="line.464">         *</a>
-<span class="sourceLineNo">465</span><a id="line.465">         *  @param uid The user id (e.g. WikiName)</a>
-<span class="sourceLineNo">466</span><a id="line.466">         *  @return A UserProfile object</a>
-<span class="sourceLineNo">467</span><a id="line.467">         *  @throws NoSuchPrincipalException If such a name does not exist.</a>
-<span class="sourceLineNo">468</span><a id="line.468">         */</a>
-<span class="sourceLineNo">469</span><a id="line.469">        public UserProfile getUserInfo( final String uid ) throws NoSuchPrincipalException {</a>
-<span class="sourceLineNo">470</span><a id="line.470">            if( m_manager != null ) {</a>
-<span class="sourceLineNo">471</span><a id="line.471">                return m_manager.getUserDatabase().find( uid );</a>
-<span class="sourceLineNo">472</span><a id="line.472">            }</a>
-<span class="sourceLineNo">473</span><a id="line.473"></a>
-<span class="sourceLineNo">474</span><a id="line.474">            throw new IllegalStateException( "The manager is offline." );</a>
-<span class="sourceLineNo">475</span><a id="line.475">        }</a>
-<span class="sourceLineNo">476</span><a id="line.476">    }</a>
-<span class="sourceLineNo">477</span><a id="line.477"></a>
-<span class="sourceLineNo">478</span><a id="line.478">}</a>
+<span class="sourceLineNo">357</span><a id="line.357">                if( !profile.isNew() &amp;&amp; !getUserDatabase().validatePassword( profile.getLoginName(), password0 ) ) {</a>
+<span class="sourceLineNo">358</span><a id="line.358">                    session.addMessage( SESSION_MESSAGES, rb.getString( "security.error.passwordnomatch" ) );</a>
+<span class="sourceLineNo">359</span><a id="line.359">                }</a>
+<span class="sourceLineNo">360</span><a id="line.360">            }</a>
+<span class="sourceLineNo">361</span><a id="line.361">        }</a>
+<span class="sourceLineNo">362</span><a id="line.362"></a>
+<span class="sourceLineNo">363</span><a id="line.363">        UserProfile otherProfile;</a>
+<span class="sourceLineNo">364</span><a id="line.364">        final String fullName = profile.getFullname();</a>
+<span class="sourceLineNo">365</span><a id="line.365">        final String loginName = profile.getLoginName();</a>
+<span class="sourceLineNo">366</span><a id="line.366">        final String email = profile.getEmail();</a>
+<span class="sourceLineNo">367</span><a id="line.367"></a>
+<span class="sourceLineNo">368</span><a id="line.368">        // It's illegal to use as a full name someone else's login name</a>
+<span class="sourceLineNo">369</span><a id="line.369">        try {</a>
+<span class="sourceLineNo">370</span><a id="line.370">            otherProfile = getUserDatabase().find( fullName );</a>
+<span class="sourceLineNo">371</span><a id="line.371">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !fullName.equals( otherProfile.getFullname() ) ) {</a>
+<span class="sourceLineNo">372</span><a id="line.372">                final Object[] args = { fullName };</a>
+<span class="sourceLineNo">373</span><a id="line.373">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalfullname" ), args ) );</a>
+<span class="sourceLineNo">374</span><a id="line.374">            }</a>
+<span class="sourceLineNo">375</span><a id="line.375">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
+<span class="sourceLineNo">376</span><a id="line.376"></a>
+<span class="sourceLineNo">377</span><a id="line.377">        // It's illegal to use as a login name someone else's full name</a>
+<span class="sourceLineNo">378</span><a id="line.378">        try {</a>
+<span class="sourceLineNo">379</span><a id="line.379">            otherProfile = getUserDatabase().find( loginName );</a>
+<span class="sourceLineNo">380</span><a id="line.380">            if( otherProfile != null &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; !loginName.equals( otherProfile.getLoginName() ) ) {</a>
+<span class="sourceLineNo">381</span><a id="line.381">                final Object[] args = { loginName };</a>
+<span class="sourceLineNo">382</span><a id="line.382">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.illegalloginname" ), args ) );</a>
+<span class="sourceLineNo">383</span><a id="line.383">            }</a>
+<span class="sourceLineNo">384</span><a id="line.384">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
+<span class="sourceLineNo">385</span><a id="line.385"></a>
+<span class="sourceLineNo">386</span><a id="line.386">        // It's illegal to use multiple accounts with the same email</a>
+<span class="sourceLineNo">387</span><a id="line.387">        try {</a>
+<span class="sourceLineNo">388</span><a id="line.388">            otherProfile = getUserDatabase().findByEmail( email );</a>
+<span class="sourceLineNo">389</span><a id="line.389">            if( otherProfile != null &amp;&amp; !profile.getUid().equals( otherProfile.getUid() ) // Issue JSPWIKI-1042</a>
+<span class="sourceLineNo">390</span><a id="line.390">                    &amp;&amp; !profile.equals( otherProfile ) &amp;&amp; StringUtils.lowerCase( email )</a>
+<span class="sourceLineNo">391</span><a id="line.391">                    .equals( StringUtils.lowerCase( otherProfile.getEmail() ) ) ) {</a>
+<span class="sourceLineNo">392</span><a id="line.392">                final Object[] args = { email };</a>
+<span class="sourceLineNo">393</span><a id="line.393">                session.addMessage( SESSION_MESSAGES, MessageFormat.format( rb.getString( "security.error.email.taken" ), args ) );</a>
+<span class="sourceLineNo">394</span><a id="line.394">            }</a>
+<span class="sourceLineNo">395</span><a id="line.395">        } catch( final NoSuchPrincipalException e ) { /* It's clean */ }</a>
+<span class="sourceLineNo">396</span><a id="line.396">    }</a>
+<span class="sourceLineNo">397</span><a id="line.397"></a>
+<span class="sourceLineNo">398</span><a id="line.398">    /** {@inheritDoc} */</a>
+<span class="sourceLineNo">399</span><a id="line.399">    @Override</a>
+<span class="sourceLineNo">400</span><a id="line.400">    public Principal[] listWikiNames() throws WikiSecurityException {</a>
+<span class="sourceLineNo">401</span><a id="line.401">        return getUserDatabase().getWikiNames();</a>
+<span class="sourceLineNo">402</span><a id="line.402">    }</a>
+<span class="sourceLineNo">403</span><a id="line.403"></a>
+<span class="sourceLineNo">404</span><a id="line.404">    // events processing .......................................................</a>
+<span class="sourceLineNo">405</span><a id="line.405"></a>
+<span class="sourceLineNo">406</span><a id="line.406">    /**</a>
+<span class="sourceLineNo">407</span><a id="line.407">     * Registers a WikiEventListener with this instance.</a>
+<span class="sourceLineNo">408</span><a id="line.408">     * This is a convenience method.</a>
+<span class="sourceLineNo">409</span><a id="line.409">     * @param listener the event listener</a>
+<span class="sourceLineNo">410</span><a id="line.410">     */</a>
+<span class="sourceLineNo">411</span><a id="line.411">    @Override public synchronized void addWikiEventListener( final WikiEventListener listener ) {</a>
+<span class="sourceLineNo">412</span><a id="line.412">        WikiEventManager.addWikiEventListener( this, listener );</a>
+<span class="sourceLineNo">413</span><a id="line.413">    }</a>
+<span class="sourceLineNo">414</span><a id="line.414"></a>
+<span class="sourceLineNo">415</span><a id="line.415">    /**</a>
+<span class="sourceLineNo">416</span><a id="line.416">     * Un-registers a WikiEventListener with this instance.</a>
+<span class="sourceLineNo">417</span><a id="line.417">     * This is a convenience method.</a>
+<span class="sourceLineNo">418</span><a id="line.418">     * @param listener the event listener</a>
+<span class="sourceLineNo">419</span><a id="line.419">     */</a>
+<span class="sourceLineNo">420</span><a id="line.420">    @Override public synchronized void removeWikiEventListener( final WikiEventListener listener ) {</a>
+<span class="sourceLineNo">421</span><a id="line.421">        WikiEventManager.removeWikiEventListener( this, listener );</a>
+<span class="sourceLineNo">422</span><a id="line.422">    }</a>
+<span class="sourceLineNo">423</span><a id="line.423"></a>
+<span class="sourceLineNo">424</span><a id="line.424">    /**</a>
+<span class="sourceLineNo">425</span><a id="line.425">     *  Implements the JSON API for usermanager.</a>
+<span class="sourceLineNo">426</span><a id="line.426">     *  &lt;p&gt;</a>
+<span class="sourceLineNo">427</span><a id="line.427">     *  Even though this gets serialized whenever container shuts down/restarts, this gets reinstalled to the session when JSPWiki starts.</a>
+<span class="sourceLineNo">428</span><a id="line.428">     *  This means that it's not actually necessary to save anything.</a>
+<span class="sourceLineNo">429</span><a id="line.429">     */</a>
+<span class="sourceLineNo">430</span><a id="line.430">    public static final class JSONUserModule implements WikiAjaxServlet {</a>
+<span class="sourceLineNo">431</span><a id="line.431"></a>
+<span class="sourceLineNo">432</span><a id="line.432">        private final DefaultUserManager m_manager;</a>
+<span class="sourceLineNo">433</span><a id="line.433"></a>
+<span class="sourceLineNo">434</span><a id="line.434">        /**</a>
+<span class="sourceLineNo">435</span><a id="line.435">         *  Create a new JSONUserModule.</a>
+<span class="sourceLineNo">436</span><a id="line.436">         *  @param mgr Manager</a>
+<span class="sourceLineNo">437</span><a id="line.437">         */</a>
+<span class="sourceLineNo">438</span><a id="line.438">        public JSONUserModule( final DefaultUserManager mgr )</a>
+<span class="sourceLineNo">439</span><a id="line.439">        {</a>
+<span class="sourceLineNo">440</span><a id="line.440">            m_manager = mgr;</a>
+<span class="sourceLineNo">441</span><a id="line.441">        }</a>
+<span class="sourceLineNo">442</span><a id="line.442"></a>
+<span class="sourceLineNo">443</span><a id="line.443">        @Override</a>
+<span class="sourceLineNo">444</span><a id="line.444">        public String getServletMapping() {</a>
+<span class="sourceLineNo">445</span><a id="line.445">            return JSON_USERS;</a>
+<span class="sourceLineNo">446</span><a id="line.446">        }</a>
+<span class="sourceLineNo">447</span><a id="line.447"></a>
+<span class="sourceLineNo">448</span><a id="line.448">        @Override</a>
+<span class="sourceLineNo">449</span><a id="line.449">        public void service( final HttpServletRequest req, final HttpServletResponse resp, final String actionName, final List&lt;String&gt; params) throws ServletException, IOException {</a>
+<span class="sourceLineNo">450</span><a id="line.450">            try {</a>
+<span class="sourceLineNo">451</span><a id="line.451">                if( params.size() &lt; 1 ) {</a>
+<span class="sourceLineNo">452</span><a id="line.452">                    return;</a>
+<span class="sourceLineNo">453</span><a id="line.453">                }</a>
+<span class="sourceLineNo">454</span><a id="line.454">                final String uid = params.get(0);</a>
+<span class="sourceLineNo">455</span><a id="line.455">                log.debug("uid="+uid);</a>
+<span class="sourceLineNo">456</span><a id="line.456">                if (StringUtils.isNotBlank(uid)) {</a>
+<span class="sourceLineNo">457</span><a id="line.457">                    final UserProfile prof = getUserInfo(uid);</a>
+<span class="sourceLineNo">458</span><a id="line.458">                    resp.getWriter().write(AjaxUtil.toJson(prof));</a>
+<span class="sourceLineNo">459</span><a id="line.459">                }</a>
+<span class="sourceLineNo">460</span><a id="line.460">            } catch (final NoSuchPrincipalException e) {</a>
+<span class="sourceLineNo">461</span><a id="line.461">                throw new ServletException(e);</a>
+<span class="sourceLineNo">462</span><a id="line.462">            }</a>
+<span class="sourceLineNo">463</span><a id="line.463">        }</a>
+<span class="sourceLineNo">464</span><a id="line.464"></a>
+<span class="sourceLineNo">465</span><a id="line.465">        /**</a>
+<span class="sourceLineNo">466</span><a id="line.466">         *  Directly returns the UserProfile object attached to an uid.</a>
+<span class="sourceLineNo">467</span><a id="line.467">         *</a>
+<span class="sourceLineNo">468</span><a id="line.468">         *  @param uid The user id (e.g. WikiName)</a>
+<span class="sourceLineNo">469</span><a id="line.469">         *  @return A UserProfile object</a>
+<span class="sourceLineNo">470</span><a id="line.470">         *  @throws NoSuchPrincipalException If such a name does not exist.</a>
+<span class="sourceLineNo">471</span><a id="line.471">         */</a>
+<span class="sourceLineNo">472</span><a id="line.472">        public UserProfile getUserInfo( final String uid ) throws NoSuchPrincipalException {</a>
+<span class="sourceLineNo">473</span><a id="line.473">            if( m_manager != null ) {</a>
+<span class="sourceLineNo">474</span><a id="line.474">                return m_manager.getUserDatabase().find( uid );</a>
+<span class="sourceLineNo">475</span><a id="line.475">            }</a>
+<span class="sourceLineNo">476</span><a id="line.476"></a>
+<span class="sourceLineNo">477</span><a id="line.477">            throw new IllegalStateException( "The manager is offline." );</a>
+<span class="sourceLineNo">478</span><a id="line.478">        }</a>
+<span class="sourceLineNo">479</span><a id="line.479">    }</a>
+<span class="sourceLineNo">480</span><a id="line.480"></a>
+<span class="sourceLineNo">481</span><a id="line.481">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html
index 778cca6..34ffcd6 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/auth/user/AbstractUserDatabase.html
@@ -198,7 +198,7 @@
 <span class="sourceLineNo">189</span><a id="line.189">     */</a>
 <span class="sourceLineNo">190</span><a id="line.190">    @Override</a>
 <span class="sourceLineNo">191</span><a id="line.191">    public boolean validatePassword( final String loginName, final String password ) {</a>
-<span class="sourceLineNo">192</span><a id="line.192">        String hashedPassword;</a>
+<span class="sourceLineNo">192</span><a id="line.192">        final String hashedPassword;</a>
 <span class="sourceLineNo">193</span><a id="line.193">        try {</a>
 <span class="sourceLineNo">194</span><a id="line.194">            final UserProfile profile = findByLoginName( loginName );</a>
 <span class="sourceLineNo">195</span><a id="line.195">            String storedPassword = profile.getPassword();</a>
@@ -261,53 +261,52 @@
 <span class="sourceLineNo">252</span><a id="line.252">     * calculates a &lt;em&gt;salted&lt;/em&gt; hash rather than a plain hash.</a>
 <span class="sourceLineNo">253</span><a id="line.253">     *</a>
 <span class="sourceLineNo">254</span><a id="line.254">     * @param text the text to hash</a>
-<span class="sourceLineNo">255</span><a id="line.255">     * @param text the algorithm used for the hash</a>
-<span class="sourceLineNo">256</span><a id="line.256">     * @return the result hash</a>
-<span class="sourceLineNo">257</span><a id="line.257">     */</a>
-<span class="sourceLineNo">258</span><a id="line.258">    protected String getHash( final String text ) {</a>
-<span class="sourceLineNo">259</span><a id="line.259">        try {</a>
-<span class="sourceLineNo">260</span><a id="line.260">            return CryptoUtil.getSaltedPassword( text.getBytes(StandardCharsets.UTF_8), SHA256_PREFIX );</a>
-<span class="sourceLineNo">261</span><a id="line.261">        } catch( final NoSuchAlgorithmException e ) {</a>
-<span class="sourceLineNo">262</span><a id="line.262">            log.error( String.format( "Error creating salted password hash: %s", e.getMessage() ) );</a>
-<span class="sourceLineNo">263</span><a id="line.263">            return text;</a>
-<span class="sourceLineNo">264</span><a id="line.264">        }</a>
-<span class="sourceLineNo">265</span><a id="line.265">    }</a>
-<span class="sourceLineNo">266</span><a id="line.266"></a>
-<span class="sourceLineNo">267</span><a id="line.267">    /**</a>
-<span class="sourceLineNo">268</span><a id="line.268">     * Private method that calculates the SHA-1 hash of a given &lt;code&gt;String&lt;/code&gt;</a>
-<span class="sourceLineNo">269</span><a id="line.269">     *</a>
-<span class="sourceLineNo">270</span><a id="line.270">     * @param text the text to hash</a>
-<span class="sourceLineNo">271</span><a id="line.271">     * @return the result hash</a>
-<span class="sourceLineNo">272</span><a id="line.272">     * @deprecated this method is retained for backwards compatibility purposes; use {@link #getHash(String, String)} instead</a>
-<span class="sourceLineNo">273</span><a id="line.273">     */</a>
-<span class="sourceLineNo">274</span><a id="line.274">    @Deprecated</a>
-<span class="sourceLineNo">275</span><a id="line.275">    String getShaHash(final String text ) {</a>
-<span class="sourceLineNo">276</span><a id="line.276">        try {</a>
-<span class="sourceLineNo">277</span><a id="line.277">            final MessageDigest md = MessageDigest.getInstance( "SHA" );</a>
-<span class="sourceLineNo">278</span><a id="line.278">            md.update( text.getBytes( StandardCharsets.UTF_8 ) );</a>
-<span class="sourceLineNo">279</span><a id="line.279">            final byte[] digestedBytes = md.digest();</a>
-<span class="sourceLineNo">280</span><a id="line.280">            return ByteUtils.bytes2hex( digestedBytes );</a>
-<span class="sourceLineNo">281</span><a id="line.281">        } catch( final NoSuchAlgorithmException e ) {</a>
-<span class="sourceLineNo">282</span><a id="line.282">            log.error( "Error creating SHA password hash:" + e.getMessage() );</a>
-<span class="sourceLineNo">283</span><a id="line.283">            return text;</a>
-<span class="sourceLineNo">284</span><a id="line.284">        }</a>
-<span class="sourceLineNo">285</span><a id="line.285">    }</a>
-<span class="sourceLineNo">286</span><a id="line.286"></a>
-<span class="sourceLineNo">287</span><a id="line.287">    /**</a>
-<span class="sourceLineNo">288</span><a id="line.288">     * Parses a long integer from a supplied string, or returns 0 if not parsable.</a>
-<span class="sourceLineNo">289</span><a id="line.289">     *</a>
-<span class="sourceLineNo">290</span><a id="line.290">     * @param value the string to parse</a>
-<span class="sourceLineNo">291</span><a id="line.291">     * @return the value parsed</a>
-<span class="sourceLineNo">292</span><a id="line.292">     */</a>
-<span class="sourceLineNo">293</span><a id="line.293">    protected long parseLong( final String value ) {</a>
-<span class="sourceLineNo">294</span><a id="line.294">        if( NumberUtils.isParsable( value ) ) {</a>
-<span class="sourceLineNo">295</span><a id="line.295">            return Long.parseLong( value );</a>
-<span class="sourceLineNo">296</span><a id="line.296">        } else {</a>
-<span class="sourceLineNo">297</span><a id="line.297">            return 0L;</a>
-<span class="sourceLineNo">298</span><a id="line.298">        }</a>
-<span class="sourceLineNo">299</span><a id="line.299">    }</a>
-<span class="sourceLineNo">300</span><a id="line.300"></a>
-<span class="sourceLineNo">301</span><a id="line.301">}</a>
+<span class="sourceLineNo">255</span><a id="line.255">     * @return the result hash</a>
+<span class="sourceLineNo">256</span><a id="line.256">     */</a>
+<span class="sourceLineNo">257</span><a id="line.257">    protected String getHash( final String text ) {</a>
+<span class="sourceLineNo">258</span><a id="line.258">        try {</a>
+<span class="sourceLineNo">259</span><a id="line.259">            return CryptoUtil.getSaltedPassword( text.getBytes(StandardCharsets.UTF_8), SHA256_PREFIX );</a>
+<span class="sourceLineNo">260</span><a id="line.260">        } catch( final NoSuchAlgorithmException e ) {</a>
+<span class="sourceLineNo">261</span><a id="line.261">            log.error( "Error creating salted password hash: {}", e.getMessage() );</a>
+<span class="sourceLineNo">262</span><a id="line.262">            return text;</a>
+<span class="sourceLineNo">263</span><a id="line.263">        }</a>
+<span class="sourceLineNo">264</span><a id="line.264">    }</a>
+<span class="sourceLineNo">265</span><a id="line.265"></a>
+<span class="sourceLineNo">266</span><a id="line.266">    /**</a>
+<span class="sourceLineNo">267</span><a id="line.267">     * Private method that calculates the SHA-1 hash of a given &lt;code&gt;String&lt;/code&gt;</a>
+<span class="sourceLineNo">268</span><a id="line.268">     *</a>
+<span class="sourceLineNo">269</span><a id="line.269">     * @param text the text to hash</a>
+<span class="sourceLineNo">270</span><a id="line.270">     * @return the result hash</a>
+<span class="sourceLineNo">271</span><a id="line.271">     * @deprecated this method is retained for backwards compatibility purposes; use {@link #getHash(String)} instead</a>
+<span class="sourceLineNo">272</span><a id="line.272">     */</a>
+<span class="sourceLineNo">273</span><a id="line.273">    @Deprecated</a>
+<span class="sourceLineNo">274</span><a id="line.274">    String getShaHash(final String text ) {</a>
+<span class="sourceLineNo">275</span><a id="line.275">        try {</a>
+<span class="sourceLineNo">276</span><a id="line.276">            final MessageDigest md = MessageDigest.getInstance( "SHA" );</a>
+<span class="sourceLineNo">277</span><a id="line.277">            md.update( text.getBytes( StandardCharsets.UTF_8 ) );</a>
+<span class="sourceLineNo">278</span><a id="line.278">            final byte[] digestedBytes = md.digest();</a>
+<span class="sourceLineNo">279</span><a id="line.279">            return ByteUtils.bytes2hex( digestedBytes );</a>
+<span class="sourceLineNo">280</span><a id="line.280">        } catch( final NoSuchAlgorithmException e ) {</a>
+<span class="sourceLineNo">281</span><a id="line.281">            log.error( "Error creating SHA password hash:" + e.getMessage() );</a>
+<span class="sourceLineNo">282</span><a id="line.282">            return text;</a>
+<span class="sourceLineNo">283</span><a id="line.283">        }</a>
+<span class="sourceLineNo">284</span><a id="line.284">    }</a>
+<span class="sourceLineNo">285</span><a id="line.285"></a>
+<span class="sourceLineNo">286</span><a id="line.286">    /**</a>
+<span class="sourceLineNo">287</span><a id="line.287">     * Parses a long integer from a supplied string, or returns 0 if not parsable.</a>
+<span class="sourceLineNo">288</span><a id="line.288">     *</a>
+<span class="sourceLineNo">289</span><a id="line.289">     * @param value the string to parse</a>
+<span class="sourceLineNo">290</span><a id="line.290">     * @return the value parsed</a>
+<span class="sourceLineNo">291</span><a id="line.291">     */</a>
+<span class="sourceLineNo">292</span><a id="line.292">    protected long parseLong( final String value ) {</a>
+<span class="sourceLineNo">293</span><a id="line.293">        if( NumberUtils.isParsable( value ) ) {</a>
+<span class="sourceLineNo">294</span><a id="line.294">            return Long.parseLong( value );</a>
+<span class="sourceLineNo">295</span><a id="line.295">        } else {</a>
+<span class="sourceLineNo">296</span><a id="line.296">            return 0L;</a>
+<span class="sourceLineNo">297</span><a id="line.297">        }</a>
+<span class="sourceLineNo">298</span><a id="line.298">    }</a>
+<span class="sourceLineNo">299</span><a id="line.299"></a>
+<span class="sourceLineNo">300</span><a id="line.300">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/SyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/SyntaxDecorator.html
index 09fdd78..15c7465 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/SyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/SyntaxDecorator.html
@@ -32,8 +32,8 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.Text;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Map;</a>
-<span class="sourceLineNo">027</span><a id="line.27">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
+<span class="sourceLineNo">027</span><a id="line.27">import java.util.Map;</a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29"></a>
 <span class="sourceLineNo">030</span><a id="line.30">/**</a>
@@ -51,7 +51,7 @@
 <span class="sourceLineNo">042</span><a id="line.42">     * @param config xhtml to wiki configuration object.</a>
 <span class="sourceLineNo">043</span><a id="line.43">     * @param chain chain (in the chain of responsabilities pattern) that is expected to be called by the different xhtml decorations.</a>
 <span class="sourceLineNo">044</span><a id="line.44">     */</a>
-<span class="sourceLineNo">045</span><a id="line.45">    void init( PrintWriter out, Stack&lt; String &gt; liStack, Stack&lt; String &gt; preStack, WhitespaceTrimWriter outTrimmer, XHtmlToWikiConfig config, XHtmlElementToWikiTranslator chain );</a>
+<span class="sourceLineNo">045</span><a id="line.45">    void init( PrintWriter out, Deque&lt; String &gt; liStack, Deque&lt; String &gt; preStack, WhitespaceTrimWriter outTrimmer, XHtmlToWikiConfig config, XHtmlElementToWikiTranslator chain );</a>
 <span class="sourceLineNo">046</span><a id="line.46"></a>
 <span class="sourceLineNo">047</span><a id="line.47">    /**</a>
 <span class="sourceLineNo">048</span><a id="line.48">     * Decorates an {@code a} element.</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.html
index 0e9e8c9..40b9f3d 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.html
@@ -41,344 +41,344 @@
 <span class="sourceLineNo">032</span><a id="line.32">import org.jdom2.xpath.XPathFactory;</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">035</span><a id="line.35">import java.util.Arrays;</a>
-<span class="sourceLineNo">036</span><a id="line.36">import java.util.LinkedHashMap;</a>
-<span class="sourceLineNo">037</span><a id="line.37">import java.util.Map;</a>
-<span class="sourceLineNo">038</span><a id="line.38">import java.util.Stack;</a>
-<span class="sourceLineNo">039</span><a id="line.39"></a>
+<span class="sourceLineNo">035</span><a id="line.35">import java.util.ArrayDeque;</a>
+<span class="sourceLineNo">036</span><a id="line.36">import java.util.Arrays;</a>
+<span class="sourceLineNo">037</span><a id="line.37">import java.util.Deque;</a>
+<span class="sourceLineNo">038</span><a id="line.38">import java.util.LinkedHashMap;</a>
+<span class="sourceLineNo">039</span><a id="line.39">import java.util.Map;</a>
 <span class="sourceLineNo">040</span><a id="line.40"></a>
-<span class="sourceLineNo">041</span><a id="line.41">/**</a>
-<span class="sourceLineNo">042</span><a id="line.42"> * Converting XHtml to Wiki Markup.  This is the class which orchestrates all the heavy loading.</a>
-<span class="sourceLineNo">043</span><a id="line.43"> */</a>
-<span class="sourceLineNo">044</span><a id="line.44">public class XHtmlElementToWikiTranslator {</a>
-<span class="sourceLineNo">045</span><a id="line.45"></a>
-<span class="sourceLineNo">046</span><a id="line.46">    private static final Logger LOG = LogManager.getLogger( XHtmlElementToWikiTranslator.class );</a>
-<span class="sourceLineNo">047</span><a id="line.47">    private static final String DEFAULT_SYNTAX_DECORATOR = "org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator";</a>
-<span class="sourceLineNo">048</span><a id="line.48"></a>
-<span class="sourceLineNo">049</span><a id="line.49">    private final Engine e;</a>
-<span class="sourceLineNo">050</span><a id="line.50">    private final XHtmlToWikiConfig config;</a>
-<span class="sourceLineNo">051</span><a id="line.51">    private final WhitespaceTrimWriter outTrimmer = new WhitespaceTrimWriter();</a>
-<span class="sourceLineNo">052</span><a id="line.52">    private final SyntaxDecorator syntax;</a>
-<span class="sourceLineNo">053</span><a id="line.53"></a>
-<span class="sourceLineNo">054</span><a id="line.54">    /**</a>
-<span class="sourceLineNo">055</span><a id="line.55">     *  Create a new translator using the default config.</a>
-<span class="sourceLineNo">056</span><a id="line.56">     *</a>
-<span class="sourceLineNo">057</span><a id="line.57">     *  @param base The base element from which to start translating.</a>
-<span class="sourceLineNo">058</span><a id="line.58">     *  @throws JDOMException If the DOM tree is faulty.</a>
-<span class="sourceLineNo">059</span><a id="line.59">     */</a>
-<span class="sourceLineNo">060</span><a id="line.60">    public XHtmlElementToWikiTranslator( final Engine e, final Element base ) throws JDOMException, ReflectiveOperationException {</a>
-<span class="sourceLineNo">061</span><a id="line.61">        this( e, base, new XHtmlToWikiConfig() );</a>
-<span class="sourceLineNo">062</span><a id="line.62">    }</a>
-<span class="sourceLineNo">063</span><a id="line.63"></a>
-<span class="sourceLineNo">064</span><a id="line.64">    /**</a>
-<span class="sourceLineNo">065</span><a id="line.65">     *  Create a new translator using the specified config.</a>
-<span class="sourceLineNo">066</span><a id="line.66">     *</a>
-<span class="sourceLineNo">067</span><a id="line.67">     *  @param base The base element from which to start translating.</a>
-<span class="sourceLineNo">068</span><a id="line.68">     *  @param config The config to use.</a>
-<span class="sourceLineNo">069</span><a id="line.69">     *  @throws JDOMException If the DOM tree is faulty.</a>
-<span class="sourceLineNo">070</span><a id="line.70">     */</a>
-<span class="sourceLineNo">071</span><a id="line.71">    public XHtmlElementToWikiTranslator( final Engine e, final Element base, final XHtmlToWikiConfig config ) throws JDOMException, ReflectiveOperationException {</a>
-<span class="sourceLineNo">072</span><a id="line.72">        this.e = e;</a>
-<span class="sourceLineNo">073</span><a id="line.73">        this.config = config;</a>
-<span class="sourceLineNo">074</span><a id="line.74">        syntax = getSyntaxDecorator();</a>
-<span class="sourceLineNo">075</span><a id="line.75">        final PrintWriter out = new PrintWriter( outTrimmer );</a>
-<span class="sourceLineNo">076</span><a id="line.76">        final Stack&lt; String &gt; liStack = new Stack&lt;&gt;();</a>
-<span class="sourceLineNo">077</span><a id="line.77">        final Stack&lt; String &gt; preStack = new PreStack();</a>
-<span class="sourceLineNo">078</span><a id="line.78"></a>
-<span class="sourceLineNo">079</span><a id="line.79">        syntax.init( out, liStack, preStack, outTrimmer, config, this );</a>
-<span class="sourceLineNo">080</span><a id="line.80">        translate( base );</a>
-<span class="sourceLineNo">081</span><a id="line.81">    }</a>
-<span class="sourceLineNo">082</span><a id="line.82"></a>
-<span class="sourceLineNo">083</span><a id="line.83">    SyntaxDecorator getSyntaxDecorator() throws ReflectiveOperationException {</a>
-<span class="sourceLineNo">084</span><a id="line.84">        String sdClass = e.getWikiProperties().getProperty( "jspwiki.syntax.decorator", DEFAULT_SYNTAX_DECORATOR );</a>
-<span class="sourceLineNo">085</span><a id="line.85">        if( !ClassUtil.assignable( sdClass, SyntaxDecorator.class.getName() ) ) {</a>
-<span class="sourceLineNo">086</span><a id="line.86">            LOG.warn( "{} does not subclass {} reverting to default syntax decorator.", sdClass, SyntaxDecorator.class.getName() );</a>
-<span class="sourceLineNo">087</span><a id="line.87">            sdClass = DEFAULT_SYNTAX_DECORATOR;</a>
-<span class="sourceLineNo">088</span><a id="line.88">        }</a>
-<span class="sourceLineNo">089</span><a id="line.89">        LOG.info( "Using {} as markup parser.", sdClass );</a>
-<span class="sourceLineNo">090</span><a id="line.90">        return ClassUtil.buildInstance( sdClass );</a>
-<span class="sourceLineNo">091</span><a id="line.91">    }</a>
-<span class="sourceLineNo">092</span><a id="line.92"></a>
-<span class="sourceLineNo">093</span><a id="line.93">    /**</a>
-<span class="sourceLineNo">094</span><a id="line.94">     * Outputs parsed wikitext.</a>
-<span class="sourceLineNo">095</span><a id="line.95">     *</a>
-<span class="sourceLineNo">096</span><a id="line.96">     * @return parsed wikitext.</a>
-<span class="sourceLineNo">097</span><a id="line.97">     */</a>
-<span class="sourceLineNo">098</span><a id="line.98">    public String getWikiString() {</a>
-<span class="sourceLineNo">099</span><a id="line.99">        return outTrimmer.toString();</a>
-<span class="sourceLineNo">100</span><a id="line.100">    }</a>
-<span class="sourceLineNo">101</span><a id="line.101"></a>
-<span class="sourceLineNo">102</span><a id="line.102">    public void translate( final Content element ) throws JDOMException {</a>
-<span class="sourceLineNo">103</span><a id="line.103">        if( element instanceof Text ) {</a>
-<span class="sourceLineNo">104</span><a id="line.104">            translateText( ( Text ) element );</a>
-<span class="sourceLineNo">105</span><a id="line.105">        } else if( element instanceof Element ) {</a>
-<span class="sourceLineNo">106</span><a id="line.106">            final Element base = ( Element )element;</a>
-<span class="sourceLineNo">107</span><a id="line.107">            if( "imageplugin".equals( base.getAttributeValue( "class" ) ) ) {</a>
-<span class="sourceLineNo">108</span><a id="line.108">                translateImage( base );</a>
-<span class="sourceLineNo">109</span><a id="line.109">            } else if( "wikiform".equals( base.getAttributeValue( "class" ) ) ) {</a>
-<span class="sourceLineNo">110</span><a id="line.110">                // only print the children if the div's class="wikiform", but not the div itself.</a>
-<span class="sourceLineNo">111</span><a id="line.111">                translateChildren( base );</a>
-<span class="sourceLineNo">112</span><a id="line.112">            } else {</a>
-<span class="sourceLineNo">113</span><a id="line.113">                translateParagraph( base );</a>
-<span class="sourceLineNo">114</span><a id="line.114">            }</a>
-<span class="sourceLineNo">115</span><a id="line.115">        }</a>
-<span class="sourceLineNo">116</span><a id="line.116">    }</a>
-<span class="sourceLineNo">117</span><a id="line.117"></a>
-<span class="sourceLineNo">118</span><a id="line.118">    public void translateText( final Text element ) {</a>
-<span class="sourceLineNo">119</span><a id="line.119">        syntax.text( element );</a>
-<span class="sourceLineNo">120</span><a id="line.120">    }</a>
-<span class="sourceLineNo">121</span><a id="line.121"></a>
-<span class="sourceLineNo">122</span><a id="line.122">    public void translateImage( final Element base ) {</a>
-<span class="sourceLineNo">123</span><a id="line.123">        Element child = XmlUtil.getXPathElement( base, "TBODY/TR/TD/*" );</a>
-<span class="sourceLineNo">124</span><a id="line.124">        if( child == null ) {</a>
-<span class="sourceLineNo">125</span><a id="line.125">            child = base;</a>
-<span class="sourceLineNo">126</span><a id="line.126">        }</a>
-<span class="sourceLineNo">127</span><a id="line.127">        final Element img;</a>
-<span class="sourceLineNo">128</span><a id="line.128">        final String href;</a>
-<span class="sourceLineNo">129</span><a id="line.129">        if( child.getName().equals( "A" ) ) {</a>
-<span class="sourceLineNo">130</span><a id="line.130">            img = child.getChild( "IMG" );</a>
-<span class="sourceLineNo">131</span><a id="line.131">            href = child.getAttributeValue( "href" );</a>
-<span class="sourceLineNo">132</span><a id="line.132">        } else {</a>
-<span class="sourceLineNo">133</span><a id="line.133">            img = child;</a>
-<span class="sourceLineNo">134</span><a id="line.134">            href = null;</a>
-<span class="sourceLineNo">135</span><a id="line.135">        }</a>
-<span class="sourceLineNo">136</span><a id="line.136">        if( img == null ) {</a>
-<span class="sourceLineNo">137</span><a id="line.137">            return;</a>
-<span class="sourceLineNo">138</span><a id="line.138">        }</a>
-<span class="sourceLineNo">139</span><a id="line.139">        final String src = config.trimLink( img.getAttributeValue( "src" ) );</a>
-<span class="sourceLineNo">140</span><a id="line.140">        if( src == null ) {</a>
-<span class="sourceLineNo">141</span><a id="line.141">            return;</a>
-<span class="sourceLineNo">142</span><a id="line.142">        }</a>
-<span class="sourceLineNo">143</span><a id="line.143"></a>
-<span class="sourceLineNo">144</span><a id="line.144">        final Map&lt; String, Object &gt; imageAttrs = new LinkedHashMap&lt;&gt;();</a>
-<span class="sourceLineNo">145</span><a id="line.145">        putIfNotEmpty( imageAttrs, "align", base.getAttributeValue( "align" ) );</a>
-<span class="sourceLineNo">146</span><a id="line.146">        putIfNotEmpty( imageAttrs, "height", img.getAttributeValue( "height" ) );</a>
-<span class="sourceLineNo">147</span><a id="line.147">        putIfNotEmpty( imageAttrs, "width", img.getAttributeValue( "width" ) );</a>
-<span class="sourceLineNo">148</span><a id="line.148">        putIfNotEmpty( imageAttrs, "alt", img.getAttributeValue( "alt" ) );</a>
-<span class="sourceLineNo">149</span><a id="line.149">        putIfNotEmpty( imageAttrs, "caption", emptyToNull( ( Element )XPathFactory.instance().compile(  "CAPTION" ).evaluateFirst( base ) ) );</a>
-<span class="sourceLineNo">150</span><a id="line.150">        putIfNotEmpty( imageAttrs, "link", href );</a>
-<span class="sourceLineNo">151</span><a id="line.151">        putIfNotEmpty( imageAttrs, "border", img.getAttributeValue( "border" ) );</a>
-<span class="sourceLineNo">152</span><a id="line.152">        putIfNotEmpty( imageAttrs, "style", base.getAttributeValue( "style" ) );</a>
-<span class="sourceLineNo">153</span><a id="line.153">        syntax.image( src, imageAttrs );</a>
-<span class="sourceLineNo">154</span><a id="line.154">    }</a>
-<span class="sourceLineNo">155</span><a id="line.155"></a>
-<span class="sourceLineNo">156</span><a id="line.156">    private void putIfNotEmpty( final Map&lt; String, Object &gt; map, final String key, final Object value ) {</a>
-<span class="sourceLineNo">157</span><a id="line.157">        if( value != null ) {</a>
-<span class="sourceLineNo">158</span><a id="line.158">            map.put( key, value );</a>
-<span class="sourceLineNo">159</span><a id="line.159">        }</a>
-<span class="sourceLineNo">160</span><a id="line.160">    }</a>
-<span class="sourceLineNo">161</span><a id="line.161"></a>
-<span class="sourceLineNo">162</span><a id="line.162">    private String emptyToNull( final Element e ) {</a>
-<span class="sourceLineNo">163</span><a id="line.163">        if( e == null ) {</a>
-<span class="sourceLineNo">164</span><a id="line.164">            return null;</a>
-<span class="sourceLineNo">165</span><a id="line.165">        }</a>
-<span class="sourceLineNo">166</span><a id="line.166">        final String s = e.getText();</a>
-<span class="sourceLineNo">167</span><a id="line.167">        return s == null ? null : ( s.replaceAll( "\\s", "" ).isEmpty() ? null : s );</a>
-<span class="sourceLineNo">168</span><a id="line.168">    }</a>
-<span class="sourceLineNo">169</span><a id="line.169"></a>
-<span class="sourceLineNo">170</span><a id="line.170">    private Map&lt; Object, Object &gt; getStylePropertiesLowerCase( final Element base ) {</a>
-<span class="sourceLineNo">171</span><a id="line.171">        final String n = base.getName().toLowerCase();</a>
-<span class="sourceLineNo">172</span><a id="line.172"></a>
-<span class="sourceLineNo">173</span><a id="line.173">        // "font-weight: bold; font-style: italic;"</a>
-<span class="sourceLineNo">174</span><a id="line.174">        String style = base.getAttributeValue( "style" );</a>
-<span class="sourceLineNo">175</span><a id="line.175">        if( style == null ) {</a>
-<span class="sourceLineNo">176</span><a id="line.176">            style = "";</a>
-<span class="sourceLineNo">177</span><a id="line.177">        }</a>
-<span class="sourceLineNo">178</span><a id="line.178"></a>
-<span class="sourceLineNo">179</span><a id="line.179">        if( n.equals( "p" ) || n.equals( "div" ) ) {</a>
-<span class="sourceLineNo">180</span><a id="line.180">            final String align = base.getAttributeValue( "align" );</a>
-<span class="sourceLineNo">181</span><a id="line.181">            if( align != null ) {</a>
-<span class="sourceLineNo">182</span><a id="line.182">                // only add the value of the align attribute if the text-align style didn't already exist.</a>
-<span class="sourceLineNo">183</span><a id="line.183">                if( !style.contains( "text-align" ) ) {</a>
-<span class="sourceLineNo">184</span><a id="line.184">                    style += ";text-align:" + align + ";";</a>
-<span class="sourceLineNo">185</span><a id="line.185">                }</a>
-<span class="sourceLineNo">186</span><a id="line.186">            }</a>
-<span class="sourceLineNo">187</span><a id="line.187">        }</a>
-<span class="sourceLineNo">188</span><a id="line.188"></a>
-<span class="sourceLineNo">189</span><a id="line.189">        if( n.equals( "font" ) ) {</a>
-<span class="sourceLineNo">190</span><a id="line.190">            final String color = base.getAttributeValue( "color" );</a>
-<span class="sourceLineNo">191</span><a id="line.191">            final String face = base.getAttributeValue( "face" );</a>
-<span class="sourceLineNo">192</span><a id="line.192">            final String size = base.getAttributeValue( "size" );</a>
-<span class="sourceLineNo">193</span><a id="line.193">            if( color != null ) {</a>
-<span class="sourceLineNo">194</span><a id="line.194">                style = style + "color:" + color + ";";</a>
-<span class="sourceLineNo">195</span><a id="line.195">            }</a>
-<span class="sourceLineNo">196</span><a id="line.196">            if( face != null ) {</a>
-<span class="sourceLineNo">197</span><a id="line.197">                style = style + "font-family:" + face + ";";</a>
-<span class="sourceLineNo">198</span><a id="line.198">            }</a>
-<span class="sourceLineNo">199</span><a id="line.199">            if( size != null ) {</a>
-<span class="sourceLineNo">200</span><a id="line.200">                switch ( size ) {</a>
-<span class="sourceLineNo">201</span><a id="line.201">                    case "1": style += "font-size:xx-small;"; break;</a>
-<span class="sourceLineNo">202</span><a id="line.202">                    case "2": style += "font-size:x-small;"; break;</a>
-<span class="sourceLineNo">203</span><a id="line.203">                    case "3": style += "font-size:small;"; break;</a>
-<span class="sourceLineNo">204</span><a id="line.204">                    case "4": style += "font-size:medium;"; break;</a>
-<span class="sourceLineNo">205</span><a id="line.205">                    case "5": style += "font-size:large;"; break;</a>
-<span class="sourceLineNo">206</span><a id="line.206">                    case "6": style += "font-size:x-large;"; break;</a>
-<span class="sourceLineNo">207</span><a id="line.207">                    case "7": style += "font-size:xx-large;"; break;</a>
-<span class="sourceLineNo">208</span><a id="line.208">                }</a>
-<span class="sourceLineNo">209</span><a id="line.209">            }</a>
-<span class="sourceLineNo">210</span><a id="line.210">        }</a>
-<span class="sourceLineNo">211</span><a id="line.211"></a>
-<span class="sourceLineNo">212</span><a id="line.212">        if( style.equals( "" ) ) {</a>
-<span class="sourceLineNo">213</span><a id="line.213">            return null;</a>
-<span class="sourceLineNo">214</span><a id="line.214">        }</a>
-<span class="sourceLineNo">215</span><a id="line.215"></a>
-<span class="sourceLineNo">216</span><a id="line.216">        final Map&lt; Object, Object &gt; m = new LinkedHashMap&lt;&gt;();</a>
-<span class="sourceLineNo">217</span><a id="line.217">        Arrays.stream( style.toLowerCase().split( ";" ) )</a>
-<span class="sourceLineNo">218</span><a id="line.218">              .filter( StringUtils::isNotEmpty )</a>
-<span class="sourceLineNo">219</span><a id="line.219">              .forEach( prop -&gt; m.put( prop.split( ":" )[ 0 ].trim(), prop.split( ":" )[ 1 ].trim() ) );</a>
-<span class="sourceLineNo">220</span><a id="line.220">        return m;</a>
-<span class="sourceLineNo">221</span><a id="line.221">    }</a>
-<span class="sourceLineNo">222</span><a id="line.222"></a>
-<span class="sourceLineNo">223</span><a id="line.223">    private String propsToStyleString( final Map&lt; Object, Object &gt;  styleProps ) {</a>
-<span class="sourceLineNo">224</span><a id="line.224">        final StringBuilder style = new StringBuilder();</a>
-<span class="sourceLineNo">225</span><a id="line.225">        for( final Map.Entry&lt; Object, Object &gt; entry : styleProps.entrySet() ) {</a>
-<span class="sourceLineNo">226</span><a id="line.226">            style.append( " " ).append( entry.getKey() ).append( ": " ).append( entry.getValue() ).append( ";" );</a>
-<span class="sourceLineNo">227</span><a id="line.227">        }</a>
-<span class="sourceLineNo">228</span><a id="line.228">        return style.toString();</a>
-<span class="sourceLineNo">229</span><a id="line.229">    }</a>
-<span class="sourceLineNo">230</span><a id="line.230"></a>
-<span class="sourceLineNo">231</span><a id="line.231">    public void translateChildren( final Element base ) throws JDOMException {</a>
-<span class="sourceLineNo">232</span><a id="line.232">        for( final Content c : base.getContent() ) {</a>
-<span class="sourceLineNo">233</span><a id="line.233">            if( c instanceof Element ) {</a>
-<span class="sourceLineNo">234</span><a id="line.234">                final Element e = ( Element )c;</a>
-<span class="sourceLineNo">235</span><a id="line.235">                final String n = e.getName().toLowerCase();</a>
-<span class="sourceLineNo">236</span><a id="line.236">                switch( n ) {</a>
-<span class="sourceLineNo">237</span><a id="line.237">                    case "h1": syntax.h1( e ); break;</a>
-<span class="sourceLineNo">238</span><a id="line.238">                    case "h2": syntax.h2( e ); break;</a>
-<span class="sourceLineNo">239</span><a id="line.239">                    case "h3": syntax.h3( e ); break;</a>
-<span class="sourceLineNo">240</span><a id="line.240">                    case "h4": syntax.h4( e ); break;</a>
-<span class="sourceLineNo">241</span><a id="line.241">                    case "p": syntax.p( e ); break;</a>
-<span class="sourceLineNo">242</span><a id="line.242">                    case "br": syntax.br( base, e ); break;</a>
-<span class="sourceLineNo">243</span><a id="line.243">                    case "hr": syntax.hr( e ); break;</a>
-<span class="sourceLineNo">244</span><a id="line.244">                    case "table": syntax.table( e ); break;</a>
-<span class="sourceLineNo">245</span><a id="line.245">                    case "tbody": syntax.tbody( e ); break;</a>
-<span class="sourceLineNo">246</span><a id="line.246">                    case "tr": syntax.tr( e ); break;</a>
-<span class="sourceLineNo">247</span><a id="line.247">                    case "td": syntax.td( e ); break;</a>
-<span class="sourceLineNo">248</span><a id="line.248">                    case "thead": syntax.thead( e ); break;</a>
-<span class="sourceLineNo">249</span><a id="line.249">                    case "th": syntax.th( e ); break;</a>
-<span class="sourceLineNo">250</span><a id="line.250">                    case "a": translateA( e ); break;</a>
-<span class="sourceLineNo">251</span><a id="line.251">                    case "b":</a>
-<span class="sourceLineNo">252</span><a id="line.252">                    case "strong": syntax.strong( e ); break;</a>
-<span class="sourceLineNo">253</span><a id="line.253">                    case "i":</a>
-<span class="sourceLineNo">254</span><a id="line.254">                    case "em":</a>
-<span class="sourceLineNo">255</span><a id="line.255">                    case "address": syntax.em( e ); break;</a>
-<span class="sourceLineNo">256</span><a id="line.256">                    case "u": syntax.underline( e ); break;</a>
-<span class="sourceLineNo">257</span><a id="line.257">                    case "strike": syntax.strike( e ); break;</a>
-<span class="sourceLineNo">258</span><a id="line.258">                    case "sub": syntax.sub( e ); break;</a>
-<span class="sourceLineNo">259</span><a id="line.259">                    case "sup": syntax.sup( e ); break;</a>
-<span class="sourceLineNo">260</span><a id="line.260">                    case "dl": syntax.dl( e ); break;</a>
-<span class="sourceLineNo">261</span><a id="line.261">                    case "dt": syntax.dt( e ); break;</a>
-<span class="sourceLineNo">262</span><a id="line.262">                    case "dd": syntax.dd( e ); break;</a>
-<span class="sourceLineNo">263</span><a id="line.263">                    case "ul": syntax.ul( e ); break;</a>
-<span class="sourceLineNo">264</span><a id="line.264">                    case "ol": syntax.ol( e ); break;</a>
-<span class="sourceLineNo">265</span><a id="line.265">                    case "li": syntax.li( base, e ); break;</a>
-<span class="sourceLineNo">266</span><a id="line.266">                    case "pre": syntax.pre( e ); break;</a>
-<span class="sourceLineNo">267</span><a id="line.267">                    case "code":</a>
-<span class="sourceLineNo">268</span><a id="line.268">                    case "tt": syntax.code( e ); break;</a>
-<span class="sourceLineNo">269</span><a id="line.269">                    case "img": syntax.img( e ); break;</a>
-<span class="sourceLineNo">270</span><a id="line.270">                    case "form": syntax.form( e ); break;</a>
-<span class="sourceLineNo">271</span><a id="line.271">                    case "input": syntax.input( e ); break;</a>
-<span class="sourceLineNo">272</span><a id="line.272">                    case "textarea": syntax.textarea( e ); break;</a>
-<span class="sourceLineNo">273</span><a id="line.273">                    case "select": syntax.select( e ); break;</a>
-<span class="sourceLineNo">274</span><a id="line.274">                    case "option": syntax.option( base, e ); break;</a>
-<span class="sourceLineNo">275</span><a id="line.275">                    default: translate( e ); break;</a>
-<span class="sourceLineNo">276</span><a id="line.276">                }</a>
-<span class="sourceLineNo">277</span><a id="line.277">            } else {</a>
-<span class="sourceLineNo">278</span><a id="line.278">                translate( c );</a>
-<span class="sourceLineNo">279</span><a id="line.279">            }</a>
-<span class="sourceLineNo">280</span><a id="line.280">        }</a>
-<span class="sourceLineNo">281</span><a id="line.281">    }</a>
-<span class="sourceLineNo">282</span><a id="line.282"></a>
-<span class="sourceLineNo">283</span><a id="line.283">    void translateA( final Element e ) throws JDOMException {</a>
-<span class="sourceLineNo">284</span><a id="line.284">        if( config.isNotIgnorableWikiMarkupLink( e ) ) {</a>
-<span class="sourceLineNo">285</span><a id="line.285">            if( e.getChild( "IMG" ) != null ) {</a>
-<span class="sourceLineNo">286</span><a id="line.286">                translateImage( e );</a>
-<span class="sourceLineNo">287</span><a id="line.287">            } else {</a>
-<span class="sourceLineNo">288</span><a id="line.288">                final String ref = config.trimLink( e.getAttributeValue( "href" ) );</a>
-<span class="sourceLineNo">289</span><a id="line.289">                if( ref == null ) {</a>
-<span class="sourceLineNo">290</span><a id="line.290">                    if( MarkupHelper.isUndefinedPageLink( e ) ) {</a>
-<span class="sourceLineNo">291</span><a id="line.291">                        syntax.aUndefined( e );</a>
-<span class="sourceLineNo">292</span><a id="line.292">                    } else {</a>
-<span class="sourceLineNo">293</span><a id="line.293">                        translate( e );</a>
-<span class="sourceLineNo">294</span><a id="line.294">                    }</a>
-<span class="sourceLineNo">295</span><a id="line.295">                } else if( MarkupHelper.isFootnoteLink( ref ) ) {</a>
-<span class="sourceLineNo">296</span><a id="line.296">                    final String href = ref.replaceFirst( "#ref-.+-(\\d+)", "$1" ); // convert "#ref-PageName-1" to just "1"</a>
-<span class="sourceLineNo">297</span><a id="line.297">                    final String textValue = e.getValue().substring( 1, ( e.getValue().length() - 1 ) ); // remove the brackets around "[1]"</a>
-<span class="sourceLineNo">298</span><a id="line.298">                    syntax.aFootnote( textValue, href );</a>
-<span class="sourceLineNo">299</span><a id="line.299">                } else {</a>
-<span class="sourceLineNo">300</span><a id="line.300">                    syntax.a( e, ref );</a>
-<span class="sourceLineNo">301</span><a id="line.301">                }</a>
-<span class="sourceLineNo">302</span><a id="line.302">            }</a>
-<span class="sourceLineNo">303</span><a id="line.303">        }</a>
-<span class="sourceLineNo">304</span><a id="line.304">    }</a>
-<span class="sourceLineNo">305</span><a id="line.305"></a>
-<span class="sourceLineNo">306</span><a id="line.306">    public void translateParagraph( final Element base ) throws JDOMException {</a>
-<span class="sourceLineNo">307</span><a id="line.307">        final ElementDecoratorData dto = buildElementDecoratorDataFrom( base );</a>
-<span class="sourceLineNo">308</span><a id="line.308">        syntax.paragraph( dto );</a>
-<span class="sourceLineNo">309</span><a id="line.309">    }</a>
-<span class="sourceLineNo">310</span><a id="line.310"></a>
-<span class="sourceLineNo">311</span><a id="line.311">    ElementDecoratorData buildElementDecoratorDataFrom( final Element base ) {</a>
-<span class="sourceLineNo">312</span><a id="line.312">        String n = base.getName().toLowerCase();</a>
-<span class="sourceLineNo">313</span><a id="line.313">        boolean bold = false;</a>
-<span class="sourceLineNo">314</span><a id="line.314">        boolean italic = false;</a>
-<span class="sourceLineNo">315</span><a id="line.315">        boolean monospace = false;</a>
-<span class="sourceLineNo">316</span><a id="line.316">        String cssSpecial = null;</a>
-<span class="sourceLineNo">317</span><a id="line.317">        final String cssClass = base.getAttributeValue( "class" );</a>
-<span class="sourceLineNo">318</span><a id="line.318"></a>
-<span class="sourceLineNo">319</span><a id="line.319">        // accomodate a FCKeditor bug with Firefox: when a link is removed, it becomes &lt;span class="wikipage"&gt;text&lt;/span&gt;.</a>
-<span class="sourceLineNo">320</span><a id="line.320">        final boolean ignoredCssClass = cssClass != null &amp;&amp; cssClass.matches( "wikipage|createpage|external|interwiki|attachment|inline-code" );</a>
-<span class="sourceLineNo">321</span><a id="line.321"></a>
-<span class="sourceLineNo">322</span><a id="line.322">        Map&lt; Object, Object &gt; styleProps = null;</a>
-<span class="sourceLineNo">323</span><a id="line.323"></a>
-<span class="sourceLineNo">324</span><a id="line.324">        // Only get the styles if it's not a link element. Styles for link elements are handled as an AugmentedWikiLink instead.</a>
-<span class="sourceLineNo">325</span><a id="line.325">        if( !n.equals( "a" ) ) {</a>
-<span class="sourceLineNo">326</span><a id="line.326">            styleProps = getStylePropertiesLowerCase( base );</a>
-<span class="sourceLineNo">327</span><a id="line.327">        }</a>
-<span class="sourceLineNo">328</span><a id="line.328"></a>
-<span class="sourceLineNo">329</span><a id="line.329">        if( "inline-code".equals( cssClass ) ) {</a>
-<span class="sourceLineNo">330</span><a id="line.330">            monospace = true;</a>
-<span class="sourceLineNo">331</span><a id="line.331">        }</a>
-<span class="sourceLineNo">332</span><a id="line.332"></a>
-<span class="sourceLineNo">333</span><a id="line.333">        if( styleProps != null ) {</a>
-<span class="sourceLineNo">334</span><a id="line.334">            final String weight = ( String ) styleProps.remove( "font-weight" );</a>
-<span class="sourceLineNo">335</span><a id="line.335">            final String style = ( String ) styleProps.remove( "font-style" );</a>
-<span class="sourceLineNo">336</span><a id="line.336"></a>
-<span class="sourceLineNo">337</span><a id="line.337">            if ( n.equals( "p" ) ) {</a>
-<span class="sourceLineNo">338</span><a id="line.338">                // change it, so we can print out the css styles for &lt;p&gt;</a>
-<span class="sourceLineNo">339</span><a id="line.339">                n = "div";</a>
-<span class="sourceLineNo">340</span><a id="line.340">            }</a>
-<span class="sourceLineNo">341</span><a id="line.341"></a>
-<span class="sourceLineNo">342</span><a id="line.342">            italic = "oblique".equals( style ) || "italic".equals( style );</a>
-<span class="sourceLineNo">343</span><a id="line.343">            bold = "bold".equals( weight ) || "bolder".equals( weight );</a>
-<span class="sourceLineNo">344</span><a id="line.344">            if ( !styleProps.isEmpty() ) {</a>
-<span class="sourceLineNo">345</span><a id="line.345">                cssSpecial = propsToStyleString( styleProps );</a>
-<span class="sourceLineNo">346</span><a id="line.346">            }</a>
-<span class="sourceLineNo">347</span><a id="line.347">        }</a>
-<span class="sourceLineNo">348</span><a id="line.348"></a>
-<span class="sourceLineNo">349</span><a id="line.349">        final ElementDecoratorData dto = new ElementDecoratorData();</a>
-<span class="sourceLineNo">350</span><a id="line.350">        dto.base = base;</a>
-<span class="sourceLineNo">351</span><a id="line.351">        dto.bold = bold;</a>
-<span class="sourceLineNo">352</span><a id="line.352">        dto.cssClass = cssClass;</a>
-<span class="sourceLineNo">353</span><a id="line.353">        dto.cssSpecial = cssSpecial;</a>
-<span class="sourceLineNo">354</span><a id="line.354">        dto.htmlBase = n;</a>
-<span class="sourceLineNo">355</span><a id="line.355">        dto.ignoredCssClass = ignoredCssClass;</a>
-<span class="sourceLineNo">356</span><a id="line.356">        dto.italic = italic;</a>
-<span class="sourceLineNo">357</span><a id="line.357">        dto.monospace = monospace;</a>
-<span class="sourceLineNo">358</span><a id="line.358">        return dto;</a>
-<span class="sourceLineNo">359</span><a id="line.359">    }</a>
-<span class="sourceLineNo">360</span><a id="line.360"></a>
-<span class="sourceLineNo">361</span><a id="line.361">    private class PreStack extends Stack&lt; String &gt; {</a>
-<span class="sourceLineNo">362</span><a id="line.362"></a>
-<span class="sourceLineNo">363</span><a id="line.363">        @Override</a>
-<span class="sourceLineNo">364</span><a id="line.364">        public String push( final String item ) {</a>
-<span class="sourceLineNo">365</span><a id="line.365">            final String push = super.push( item );</a>
-<span class="sourceLineNo">366</span><a id="line.366">            outTrimmer.setWhitespaceTrimMode( isEmpty() );</a>
-<span class="sourceLineNo">367</span><a id="line.367">            return push;</a>
+<span class="sourceLineNo">041</span><a id="line.41"></a>
+<span class="sourceLineNo">042</span><a id="line.42">/**</a>
+<span class="sourceLineNo">043</span><a id="line.43"> * Converting XHtml to Wiki Markup.  This is the class which orchestrates all the heavy loading.</a>
+<span class="sourceLineNo">044</span><a id="line.44"> */</a>
+<span class="sourceLineNo">045</span><a id="line.45">public class XHtmlElementToWikiTranslator {</a>
+<span class="sourceLineNo">046</span><a id="line.46"></a>
+<span class="sourceLineNo">047</span><a id="line.47">    private static final Logger LOG = LogManager.getLogger( XHtmlElementToWikiTranslator.class );</a>
+<span class="sourceLineNo">048</span><a id="line.48">    private static final String DEFAULT_SYNTAX_DECORATOR = "org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator";</a>
+<span class="sourceLineNo">049</span><a id="line.49"></a>
+<span class="sourceLineNo">050</span><a id="line.50">    private final Engine e;</a>
+<span class="sourceLineNo">051</span><a id="line.51">    private final XHtmlToWikiConfig config;</a>
+<span class="sourceLineNo">052</span><a id="line.52">    private final WhitespaceTrimWriter outTrimmer = new WhitespaceTrimWriter();</a>
+<span class="sourceLineNo">053</span><a id="line.53">    private final SyntaxDecorator syntax;</a>
+<span class="sourceLineNo">054</span><a id="line.54"></a>
+<span class="sourceLineNo">055</span><a id="line.55">    /**</a>
+<span class="sourceLineNo">056</span><a id="line.56">     *  Create a new translator using the default config.</a>
+<span class="sourceLineNo">057</span><a id="line.57">     *</a>
+<span class="sourceLineNo">058</span><a id="line.58">     *  @param base The base element from which to start translating.</a>
+<span class="sourceLineNo">059</span><a id="line.59">     *  @throws JDOMException If the DOM tree is faulty.</a>
+<span class="sourceLineNo">060</span><a id="line.60">     */</a>
+<span class="sourceLineNo">061</span><a id="line.61">    public XHtmlElementToWikiTranslator( final Engine e, final Element base ) throws JDOMException, ReflectiveOperationException {</a>
+<span class="sourceLineNo">062</span><a id="line.62">        this( e, base, new XHtmlToWikiConfig() );</a>
+<span class="sourceLineNo">063</span><a id="line.63">    }</a>
+<span class="sourceLineNo">064</span><a id="line.64"></a>
+<span class="sourceLineNo">065</span><a id="line.65">    /**</a>
+<span class="sourceLineNo">066</span><a id="line.66">     *  Create a new translator using the specified config.</a>
+<span class="sourceLineNo">067</span><a id="line.67">     *</a>
+<span class="sourceLineNo">068</span><a id="line.68">     *  @param base The base element from which to start translating.</a>
+<span class="sourceLineNo">069</span><a id="line.69">     *  @param config The config to use.</a>
+<span class="sourceLineNo">070</span><a id="line.70">     *  @throws JDOMException If the DOM tree is faulty.</a>
+<span class="sourceLineNo">071</span><a id="line.71">     */</a>
+<span class="sourceLineNo">072</span><a id="line.72">    public XHtmlElementToWikiTranslator( final Engine e, final Element base, final XHtmlToWikiConfig config ) throws JDOMException, ReflectiveOperationException {</a>
+<span class="sourceLineNo">073</span><a id="line.73">        this.e = e;</a>
+<span class="sourceLineNo">074</span><a id="line.74">        this.config = config;</a>
+<span class="sourceLineNo">075</span><a id="line.75">        syntax = getSyntaxDecorator();</a>
+<span class="sourceLineNo">076</span><a id="line.76">        final PrintWriter out = new PrintWriter( outTrimmer );</a>
+<span class="sourceLineNo">077</span><a id="line.77">        final Deque&lt; String &gt; liStack = new ArrayDeque&lt;&gt;();</a>
+<span class="sourceLineNo">078</span><a id="line.78">        final Deque&lt; String &gt; preStack = new PreDeque();</a>
+<span class="sourceLineNo">079</span><a id="line.79"></a>
+<span class="sourceLineNo">080</span><a id="line.80">        syntax.init( out, liStack, preStack, outTrimmer, config, this );</a>
+<span class="sourceLineNo">081</span><a id="line.81">        translate( base );</a>
+<span class="sourceLineNo">082</span><a id="line.82">    }</a>
+<span class="sourceLineNo">083</span><a id="line.83"></a>
+<span class="sourceLineNo">084</span><a id="line.84">    SyntaxDecorator getSyntaxDecorator() throws ReflectiveOperationException {</a>
+<span class="sourceLineNo">085</span><a id="line.85">        String sdClass = e.getWikiProperties().getProperty( "jspwiki.syntax.decorator", DEFAULT_SYNTAX_DECORATOR );</a>
+<span class="sourceLineNo">086</span><a id="line.86">        if( !ClassUtil.assignable( sdClass, SyntaxDecorator.class.getName() ) ) {</a>
+<span class="sourceLineNo">087</span><a id="line.87">            LOG.warn( "{} does not subclass {} reverting to default syntax decorator.", sdClass, SyntaxDecorator.class.getName() );</a>
+<span class="sourceLineNo">088</span><a id="line.88">            sdClass = DEFAULT_SYNTAX_DECORATOR;</a>
+<span class="sourceLineNo">089</span><a id="line.89">        }</a>
+<span class="sourceLineNo">090</span><a id="line.90">        LOG.info( "Using {} as markup parser.", sdClass );</a>
+<span class="sourceLineNo">091</span><a id="line.91">        return ClassUtil.buildInstance( sdClass );</a>
+<span class="sourceLineNo">092</span><a id="line.92">    }</a>
+<span class="sourceLineNo">093</span><a id="line.93"></a>
+<span class="sourceLineNo">094</span><a id="line.94">    /**</a>
+<span class="sourceLineNo">095</span><a id="line.95">     * Outputs parsed wikitext.</a>
+<span class="sourceLineNo">096</span><a id="line.96">     *</a>
+<span class="sourceLineNo">097</span><a id="line.97">     * @return parsed wikitext.</a>
+<span class="sourceLineNo">098</span><a id="line.98">     */</a>
+<span class="sourceLineNo">099</span><a id="line.99">    public String getWikiString() {</a>
+<span class="sourceLineNo">100</span><a id="line.100">        return outTrimmer.toString();</a>
+<span class="sourceLineNo">101</span><a id="line.101">    }</a>
+<span class="sourceLineNo">102</span><a id="line.102"></a>
+<span class="sourceLineNo">103</span><a id="line.103">    public void translate( final Content element ) throws JDOMException {</a>
+<span class="sourceLineNo">104</span><a id="line.104">        if( element instanceof Text ) {</a>
+<span class="sourceLineNo">105</span><a id="line.105">            translateText( ( Text ) element );</a>
+<span class="sourceLineNo">106</span><a id="line.106">        } else if( element instanceof Element ) {</a>
+<span class="sourceLineNo">107</span><a id="line.107">            final Element base = ( Element )element;</a>
+<span class="sourceLineNo">108</span><a id="line.108">            if( "imageplugin".equals( base.getAttributeValue( "class" ) ) ) {</a>
+<span class="sourceLineNo">109</span><a id="line.109">                translateImage( base );</a>
+<span class="sourceLineNo">110</span><a id="line.110">            } else if( "wikiform".equals( base.getAttributeValue( "class" ) ) ) {</a>
+<span class="sourceLineNo">111</span><a id="line.111">                // only print the children if the div's class="wikiform", but not the div itself.</a>
+<span class="sourceLineNo">112</span><a id="line.112">                translateChildren( base );</a>
+<span class="sourceLineNo">113</span><a id="line.113">            } else {</a>
+<span class="sourceLineNo">114</span><a id="line.114">                translateParagraph( base );</a>
+<span class="sourceLineNo">115</span><a id="line.115">            }</a>
+<span class="sourceLineNo">116</span><a id="line.116">        }</a>
+<span class="sourceLineNo">117</span><a id="line.117">    }</a>
+<span class="sourceLineNo">118</span><a id="line.118"></a>
+<span class="sourceLineNo">119</span><a id="line.119">    public void translateText( final Text element ) {</a>
+<span class="sourceLineNo">120</span><a id="line.120">        syntax.text( element );</a>
+<span class="sourceLineNo">121</span><a id="line.121">    }</a>
+<span class="sourceLineNo">122</span><a id="line.122"></a>
+<span class="sourceLineNo">123</span><a id="line.123">    public void translateImage( final Element base ) {</a>
+<span class="sourceLineNo">124</span><a id="line.124">        Element child = XmlUtil.getXPathElement( base, "TBODY/TR/TD/*" );</a>
+<span class="sourceLineNo">125</span><a id="line.125">        if( child == null ) {</a>
+<span class="sourceLineNo">126</span><a id="line.126">            child = base;</a>
+<span class="sourceLineNo">127</span><a id="line.127">        }</a>
+<span class="sourceLineNo">128</span><a id="line.128">        final Element img;</a>
+<span class="sourceLineNo">129</span><a id="line.129">        final String href;</a>
+<span class="sourceLineNo">130</span><a id="line.130">        if( child.getName().equals( "A" ) ) {</a>
+<span class="sourceLineNo">131</span><a id="line.131">            img = child.getChild( "IMG" );</a>
+<span class="sourceLineNo">132</span><a id="line.132">            href = child.getAttributeValue( "href" );</a>
+<span class="sourceLineNo">133</span><a id="line.133">        } else {</a>
+<span class="sourceLineNo">134</span><a id="line.134">            img = child;</a>
+<span class="sourceLineNo">135</span><a id="line.135">            href = null;</a>
+<span class="sourceLineNo">136</span><a id="line.136">        }</a>
+<span class="sourceLineNo">137</span><a id="line.137">        if( img == null ) {</a>
+<span class="sourceLineNo">138</span><a id="line.138">            return;</a>
+<span class="sourceLineNo">139</span><a id="line.139">        }</a>
+<span class="sourceLineNo">140</span><a id="line.140">        final String src = config.trimLink( img.getAttributeValue( "src" ) );</a>
+<span class="sourceLineNo">141</span><a id="line.141">        if( src == null ) {</a>
+<span class="sourceLineNo">142</span><a id="line.142">            return;</a>
+<span class="sourceLineNo">143</span><a id="line.143">        }</a>
+<span class="sourceLineNo">144</span><a id="line.144"></a>
+<span class="sourceLineNo">145</span><a id="line.145">        final Map&lt; String, Object &gt; imageAttrs = new LinkedHashMap&lt;&gt;();</a>
+<span class="sourceLineNo">146</span><a id="line.146">        putIfNotEmpty( imageAttrs, "align", base.getAttributeValue( "align" ) );</a>
+<span class="sourceLineNo">147</span><a id="line.147">        putIfNotEmpty( imageAttrs, "height", img.getAttributeValue( "height" ) );</a>
+<span class="sourceLineNo">148</span><a id="line.148">        putIfNotEmpty( imageAttrs, "width", img.getAttributeValue( "width" ) );</a>
+<span class="sourceLineNo">149</span><a id="line.149">        putIfNotEmpty( imageAttrs, "alt", img.getAttributeValue( "alt" ) );</a>
+<span class="sourceLineNo">150</span><a id="line.150">        putIfNotEmpty( imageAttrs, "caption", emptyToNull( ( Element )XPathFactory.instance().compile(  "CAPTION" ).evaluateFirst( base ) ) );</a>
+<span class="sourceLineNo">151</span><a id="line.151">        putIfNotEmpty( imageAttrs, "link", href );</a>
+<span class="sourceLineNo">152</span><a id="line.152">        putIfNotEmpty( imageAttrs, "border", img.getAttributeValue( "border" ) );</a>
+<span class="sourceLineNo">153</span><a id="line.153">        putIfNotEmpty( imageAttrs, "style", base.getAttributeValue( "style" ) );</a>
+<span class="sourceLineNo">154</span><a id="line.154">        syntax.image( src, imageAttrs );</a>
+<span class="sourceLineNo">155</span><a id="line.155">    }</a>
+<span class="sourceLineNo">156</span><a id="line.156"></a>
+<span class="sourceLineNo">157</span><a id="line.157">    private void putIfNotEmpty( final Map&lt; String, Object &gt; map, final String key, final Object value ) {</a>
+<span class="sourceLineNo">158</span><a id="line.158">        if( value != null ) {</a>
+<span class="sourceLineNo">159</span><a id="line.159">            map.put( key, value );</a>
+<span class="sourceLineNo">160</span><a id="line.160">        }</a>
+<span class="sourceLineNo">161</span><a id="line.161">    }</a>
+<span class="sourceLineNo">162</span><a id="line.162"></a>
+<span class="sourceLineNo">163</span><a id="line.163">    private String emptyToNull( final Element e ) {</a>
+<span class="sourceLineNo">164</span><a id="line.164">        if( e == null ) {</a>
+<span class="sourceLineNo">165</span><a id="line.165">            return null;</a>
+<span class="sourceLineNo">166</span><a id="line.166">        }</a>
+<span class="sourceLineNo">167</span><a id="line.167">        final String s = e.getText();</a>
+<span class="sourceLineNo">168</span><a id="line.168">        return s == null ? null : ( s.replaceAll( "\\s", "" ).isEmpty() ? null : s );</a>
+<span class="sourceLineNo">169</span><a id="line.169">    }</a>
+<span class="sourceLineNo">170</span><a id="line.170"></a>
+<span class="sourceLineNo">171</span><a id="line.171">    private Map&lt; Object, Object &gt; getStylePropertiesLowerCase( final Element base ) {</a>
+<span class="sourceLineNo">172</span><a id="line.172">        final String n = base.getName().toLowerCase();</a>
+<span class="sourceLineNo">173</span><a id="line.173"></a>
+<span class="sourceLineNo">174</span><a id="line.174">        // "font-weight: bold; font-style: italic;"</a>
+<span class="sourceLineNo">175</span><a id="line.175">        String style = base.getAttributeValue( "style" );</a>
+<span class="sourceLineNo">176</span><a id="line.176">        if( style == null ) {</a>
+<span class="sourceLineNo">177</span><a id="line.177">            style = "";</a>
+<span class="sourceLineNo">178</span><a id="line.178">        }</a>
+<span class="sourceLineNo">179</span><a id="line.179"></a>
+<span class="sourceLineNo">180</span><a id="line.180">        if( n.equals( "p" ) || n.equals( "div" ) ) {</a>
+<span class="sourceLineNo">181</span><a id="line.181">            final String align = base.getAttributeValue( "align" );</a>
+<span class="sourceLineNo">182</span><a id="line.182">            if( align != null ) {</a>
+<span class="sourceLineNo">183</span><a id="line.183">                // only add the value of the align attribute if the text-align style didn't already exist.</a>
+<span class="sourceLineNo">184</span><a id="line.184">                if( !style.contains( "text-align" ) ) {</a>
+<span class="sourceLineNo">185</span><a id="line.185">                    style += ";text-align:" + align + ";";</a>
+<span class="sourceLineNo">186</span><a id="line.186">                }</a>
+<span class="sourceLineNo">187</span><a id="line.187">            }</a>
+<span class="sourceLineNo">188</span><a id="line.188">        }</a>
+<span class="sourceLineNo">189</span><a id="line.189"></a>
+<span class="sourceLineNo">190</span><a id="line.190">        if( n.equals( "font" ) ) {</a>
+<span class="sourceLineNo">191</span><a id="line.191">            final String color = base.getAttributeValue( "color" );</a>
+<span class="sourceLineNo">192</span><a id="line.192">            final String face = base.getAttributeValue( "face" );</a>
+<span class="sourceLineNo">193</span><a id="line.193">            final String size = base.getAttributeValue( "size" );</a>
+<span class="sourceLineNo">194</span><a id="line.194">            if( color != null ) {</a>
+<span class="sourceLineNo">195</span><a id="line.195">                style = style + "color:" + color + ";";</a>
+<span class="sourceLineNo">196</span><a id="line.196">            }</a>
+<span class="sourceLineNo">197</span><a id="line.197">            if( face != null ) {</a>
+<span class="sourceLineNo">198</span><a id="line.198">                style = style + "font-family:" + face + ";";</a>
+<span class="sourceLineNo">199</span><a id="line.199">            }</a>
+<span class="sourceLineNo">200</span><a id="line.200">            if( size != null ) {</a>
+<span class="sourceLineNo">201</span><a id="line.201">                switch ( size ) {</a>
+<span class="sourceLineNo">202</span><a id="line.202">                    case "1": style += "font-size:xx-small;"; break;</a>
+<span class="sourceLineNo">203</span><a id="line.203">                    case "2": style += "font-size:x-small;"; break;</a>
+<span class="sourceLineNo">204</span><a id="line.204">                    case "3": style += "font-size:small;"; break;</a>
+<span class="sourceLineNo">205</span><a id="line.205">                    case "4": style += "font-size:medium;"; break;</a>
+<span class="sourceLineNo">206</span><a id="line.206">                    case "5": style += "font-size:large;"; break;</a>
+<span class="sourceLineNo">207</span><a id="line.207">                    case "6": style += "font-size:x-large;"; break;</a>
+<span class="sourceLineNo">208</span><a id="line.208">                    case "7": style += "font-size:xx-large;"; break;</a>
+<span class="sourceLineNo">209</span><a id="line.209">                }</a>
+<span class="sourceLineNo">210</span><a id="line.210">            }</a>
+<span class="sourceLineNo">211</span><a id="line.211">        }</a>
+<span class="sourceLineNo">212</span><a id="line.212"></a>
+<span class="sourceLineNo">213</span><a id="line.213">        if( style.equals( "" ) ) {</a>
+<span class="sourceLineNo">214</span><a id="line.214">            return null;</a>
+<span class="sourceLineNo">215</span><a id="line.215">        }</a>
+<span class="sourceLineNo">216</span><a id="line.216"></a>
+<span class="sourceLineNo">217</span><a id="line.217">        final Map&lt; Object, Object &gt; m = new LinkedHashMap&lt;&gt;();</a>
+<span class="sourceLineNo">218</span><a id="line.218">        Arrays.stream( style.toLowerCase().split( ";" ) )</a>
+<span class="sourceLineNo">219</span><a id="line.219">              .filter( StringUtils::isNotEmpty )</a>
+<span class="sourceLineNo">220</span><a id="line.220">              .forEach( prop -&gt; m.put( prop.split( ":" )[ 0 ].trim(), prop.split( ":" )[ 1 ].trim() ) );</a>
+<span class="sourceLineNo">221</span><a id="line.221">        return m;</a>
+<span class="sourceLineNo">222</span><a id="line.222">    }</a>
+<span class="sourceLineNo">223</span><a id="line.223"></a>
+<span class="sourceLineNo">224</span><a id="line.224">    private String propsToStyleString( final Map&lt; Object, Object &gt;  styleProps ) {</a>
+<span class="sourceLineNo">225</span><a id="line.225">        final StringBuilder style = new StringBuilder();</a>
+<span class="sourceLineNo">226</span><a id="line.226">        for( final Map.Entry&lt; Object, Object &gt; entry : styleProps.entrySet() ) {</a>
+<span class="sourceLineNo">227</span><a id="line.227">            style.append( " " ).append( entry.getKey() ).append( ": " ).append( entry.getValue() ).append( ";" );</a>
+<span class="sourceLineNo">228</span><a id="line.228">        }</a>
+<span class="sourceLineNo">229</span><a id="line.229">        return style.toString();</a>
+<span class="sourceLineNo">230</span><a id="line.230">    }</a>
+<span class="sourceLineNo">231</span><a id="line.231"></a>
+<span class="sourceLineNo">232</span><a id="line.232">    public void translateChildren( final Element base ) throws JDOMException {</a>
+<span class="sourceLineNo">233</span><a id="line.233">        for( final Content c : base.getContent() ) {</a>
+<span class="sourceLineNo">234</span><a id="line.234">            if( c instanceof Element ) {</a>
+<span class="sourceLineNo">235</span><a id="line.235">                final Element e = ( Element )c;</a>
+<span class="sourceLineNo">236</span><a id="line.236">                final String n = e.getName().toLowerCase();</a>
+<span class="sourceLineNo">237</span><a id="line.237">                switch( n ) {</a>
+<span class="sourceLineNo">238</span><a id="line.238">                    case "h1": syntax.h1( e ); break;</a>
+<span class="sourceLineNo">239</span><a id="line.239">                    case "h2": syntax.h2( e ); break;</a>
+<span class="sourceLineNo">240</span><a id="line.240">                    case "h3": syntax.h3( e ); break;</a>
+<span class="sourceLineNo">241</span><a id="line.241">                    case "h4": syntax.h4( e ); break;</a>
+<span class="sourceLineNo">242</span><a id="line.242">                    case "p": syntax.p( e ); break;</a>
+<span class="sourceLineNo">243</span><a id="line.243">                    case "br": syntax.br( base, e ); break;</a>
+<span class="sourceLineNo">244</span><a id="line.244">                    case "hr": syntax.hr( e ); break;</a>
+<span class="sourceLineNo">245</span><a id="line.245">                    case "table": syntax.table( e ); break;</a>
+<span class="sourceLineNo">246</span><a id="line.246">                    case "tbody": syntax.tbody( e ); break;</a>
+<span class="sourceLineNo">247</span><a id="line.247">                    case "tr": syntax.tr( e ); break;</a>
+<span class="sourceLineNo">248</span><a id="line.248">                    case "td": syntax.td( e ); break;</a>
+<span class="sourceLineNo">249</span><a id="line.249">                    case "thead": syntax.thead( e ); break;</a>
+<span class="sourceLineNo">250</span><a id="line.250">                    case "th": syntax.th( e ); break;</a>
+<span class="sourceLineNo">251</span><a id="line.251">                    case "a": translateA( e ); break;</a>
+<span class="sourceLineNo">252</span><a id="line.252">                    case "b":</a>
+<span class="sourceLineNo">253</span><a id="line.253">                    case "strong": syntax.strong( e ); break;</a>
+<span class="sourceLineNo">254</span><a id="line.254">                    case "i":</a>
+<span class="sourceLineNo">255</span><a id="line.255">                    case "em":</a>
+<span class="sourceLineNo">256</span><a id="line.256">                    case "address": syntax.em( e ); break;</a>
+<span class="sourceLineNo">257</span><a id="line.257">                    case "u": syntax.underline( e ); break;</a>
+<span class="sourceLineNo">258</span><a id="line.258">                    case "strike": syntax.strike( e ); break;</a>
+<span class="sourceLineNo">259</span><a id="line.259">                    case "sub": syntax.sub( e ); break;</a>
+<span class="sourceLineNo">260</span><a id="line.260">                    case "sup": syntax.sup( e ); break;</a>
+<span class="sourceLineNo">261</span><a id="line.261">                    case "dl": syntax.dl( e ); break;</a>
+<span class="sourceLineNo">262</span><a id="line.262">                    case "dt": syntax.dt( e ); break;</a>
+<span class="sourceLineNo">263</span><a id="line.263">                    case "dd": syntax.dd( e ); break;</a>
+<span class="sourceLineNo">264</span><a id="line.264">                    case "ul": syntax.ul( e ); break;</a>
+<span class="sourceLineNo">265</span><a id="line.265">                    case "ol": syntax.ol( e ); break;</a>
+<span class="sourceLineNo">266</span><a id="line.266">                    case "li": syntax.li( base, e ); break;</a>
+<span class="sourceLineNo">267</span><a id="line.267">                    case "pre": syntax.pre( e ); break;</a>
+<span class="sourceLineNo">268</span><a id="line.268">                    case "code":</a>
+<span class="sourceLineNo">269</span><a id="line.269">                    case "tt": syntax.code( e ); break;</a>
+<span class="sourceLineNo">270</span><a id="line.270">                    case "img": syntax.img( e ); break;</a>
+<span class="sourceLineNo">271</span><a id="line.271">                    case "form": syntax.form( e ); break;</a>
+<span class="sourceLineNo">272</span><a id="line.272">                    case "input": syntax.input( e ); break;</a>
+<span class="sourceLineNo">273</span><a id="line.273">                    case "textarea": syntax.textarea( e ); break;</a>
+<span class="sourceLineNo">274</span><a id="line.274">                    case "select": syntax.select( e ); break;</a>
+<span class="sourceLineNo">275</span><a id="line.275">                    case "option": syntax.option( base, e ); break;</a>
+<span class="sourceLineNo">276</span><a id="line.276">                    default: translate( e ); break;</a>
+<span class="sourceLineNo">277</span><a id="line.277">                }</a>
+<span class="sourceLineNo">278</span><a id="line.278">            } else {</a>
+<span class="sourceLineNo">279</span><a id="line.279">                translate( c );</a>
+<span class="sourceLineNo">280</span><a id="line.280">            }</a>
+<span class="sourceLineNo">281</span><a id="line.281">        }</a>
+<span class="sourceLineNo">282</span><a id="line.282">    }</a>
+<span class="sourceLineNo">283</span><a id="line.283"></a>
+<span class="sourceLineNo">284</span><a id="line.284">    void translateA( final Element e ) throws JDOMException {</a>
+<span class="sourceLineNo">285</span><a id="line.285">        if( config.isNotIgnorableWikiMarkupLink( e ) ) {</a>
+<span class="sourceLineNo">286</span><a id="line.286">            if( e.getChild( "IMG" ) != null ) {</a>
+<span class="sourceLineNo">287</span><a id="line.287">                translateImage( e );</a>
+<span class="sourceLineNo">288</span><a id="line.288">            } else {</a>
+<span class="sourceLineNo">289</span><a id="line.289">                final String ref = config.trimLink( e.getAttributeValue( "href" ) );</a>
+<span class="sourceLineNo">290</span><a id="line.290">                if( ref == null ) {</a>
+<span class="sourceLineNo">291</span><a id="line.291">                    if( MarkupHelper.isUndefinedPageLink( e ) ) {</a>
+<span class="sourceLineNo">292</span><a id="line.292">                        syntax.aUndefined( e );</a>
+<span class="sourceLineNo">293</span><a id="line.293">                    } else {</a>
+<span class="sourceLineNo">294</span><a id="line.294">                        translate( e );</a>
+<span class="sourceLineNo">295</span><a id="line.295">                    }</a>
+<span class="sourceLineNo">296</span><a id="line.296">                } else if( MarkupHelper.isFootnoteLink( ref ) ) {</a>
+<span class="sourceLineNo">297</span><a id="line.297">                    final String href = ref.replaceFirst( "#ref-.+-(\\d+)", "$1" ); // convert "#ref-PageName-1" to just "1"</a>
+<span class="sourceLineNo">298</span><a id="line.298">                    final String textValue = e.getValue().substring( 1, ( e.getValue().length() - 1 ) ); // remove the brackets around "[1]"</a>
+<span class="sourceLineNo">299</span><a id="line.299">                    syntax.aFootnote( textValue, href );</a>
+<span class="sourceLineNo">300</span><a id="line.300">                } else {</a>
+<span class="sourceLineNo">301</span><a id="line.301">                    syntax.a( e, ref );</a>
+<span class="sourceLineNo">302</span><a id="line.302">                }</a>
+<span class="sourceLineNo">303</span><a id="line.303">            }</a>
+<span class="sourceLineNo">304</span><a id="line.304">        }</a>
+<span class="sourceLineNo">305</span><a id="line.305">    }</a>
+<span class="sourceLineNo">306</span><a id="line.306"></a>
+<span class="sourceLineNo">307</span><a id="line.307">    public void translateParagraph( final Element base ) throws JDOMException {</a>
+<span class="sourceLineNo">308</span><a id="line.308">        final ElementDecoratorData dto = buildElementDecoratorDataFrom( base );</a>
+<span class="sourceLineNo">309</span><a id="line.309">        syntax.paragraph( dto );</a>
+<span class="sourceLineNo">310</span><a id="line.310">    }</a>
+<span class="sourceLineNo">311</span><a id="line.311"></a>
+<span class="sourceLineNo">312</span><a id="line.312">    ElementDecoratorData buildElementDecoratorDataFrom( final Element base ) {</a>
+<span class="sourceLineNo">313</span><a id="line.313">        String n = base.getName().toLowerCase();</a>
+<span class="sourceLineNo">314</span><a id="line.314">        boolean bold = false;</a>
+<span class="sourceLineNo">315</span><a id="line.315">        boolean italic = false;</a>
+<span class="sourceLineNo">316</span><a id="line.316">        boolean monospace = false;</a>
+<span class="sourceLineNo">317</span><a id="line.317">        String cssSpecial = null;</a>
+<span class="sourceLineNo">318</span><a id="line.318">        final String cssClass = base.getAttributeValue( "class" );</a>
+<span class="sourceLineNo">319</span><a id="line.319"></a>
+<span class="sourceLineNo">320</span><a id="line.320">        // accomodate a FCKeditor bug with Firefox: when a link is removed, it becomes &lt;span class="wikipage"&gt;text&lt;/span&gt;.</a>
+<span class="sourceLineNo">321</span><a id="line.321">        final boolean ignoredCssClass = cssClass != null &amp;&amp; cssClass.matches( "wikipage|createpage|external|interwiki|attachment|inline-code" );</a>
+<span class="sourceLineNo">322</span><a id="line.322"></a>
+<span class="sourceLineNo">323</span><a id="line.323">        Map&lt; Object, Object &gt; styleProps = null;</a>
+<span class="sourceLineNo">324</span><a id="line.324"></a>
+<span class="sourceLineNo">325</span><a id="line.325">        // Only get the styles if it's not a link element. Styles for link elements are handled as an AugmentedWikiLink instead.</a>
+<span class="sourceLineNo">326</span><a id="line.326">        if( !n.equals( "a" ) ) {</a>
+<span class="sourceLineNo">327</span><a id="line.327">            styleProps = getStylePropertiesLowerCase( base );</a>
+<span class="sourceLineNo">328</span><a id="line.328">        }</a>
+<span class="sourceLineNo">329</span><a id="line.329"></a>
+<span class="sourceLineNo">330</span><a id="line.330">        if( "inline-code".equals( cssClass ) ) {</a>
+<span class="sourceLineNo">331</span><a id="line.331">            monospace = true;</a>
+<span class="sourceLineNo">332</span><a id="line.332">        }</a>
+<span class="sourceLineNo">333</span><a id="line.333"></a>
+<span class="sourceLineNo">334</span><a id="line.334">        if( styleProps != null ) {</a>
+<span class="sourceLineNo">335</span><a id="line.335">            final String weight = ( String ) styleProps.remove( "font-weight" );</a>
+<span class="sourceLineNo">336</span><a id="line.336">            final String style = ( String ) styleProps.remove( "font-style" );</a>
+<span class="sourceLineNo">337</span><a id="line.337"></a>
+<span class="sourceLineNo">338</span><a id="line.338">            if ( n.equals( "p" ) ) {</a>
+<span class="sourceLineNo">339</span><a id="line.339">                // change it, so we can print out the css styles for &lt;p&gt;</a>
+<span class="sourceLineNo">340</span><a id="line.340">                n = "div";</a>
+<span class="sourceLineNo">341</span><a id="line.341">            }</a>
+<span class="sourceLineNo">342</span><a id="line.342"></a>
+<span class="sourceLineNo">343</span><a id="line.343">            italic = "oblique".equals( style ) || "italic".equals( style );</a>
+<span class="sourceLineNo">344</span><a id="line.344">            bold = "bold".equals( weight ) || "bolder".equals( weight );</a>
+<span class="sourceLineNo">345</span><a id="line.345">            if ( !styleProps.isEmpty() ) {</a>
+<span class="sourceLineNo">346</span><a id="line.346">                cssSpecial = propsToStyleString( styleProps );</a>
+<span class="sourceLineNo">347</span><a id="line.347">            }</a>
+<span class="sourceLineNo">348</span><a id="line.348">        }</a>
+<span class="sourceLineNo">349</span><a id="line.349"></a>
+<span class="sourceLineNo">350</span><a id="line.350">        final ElementDecoratorData dto = new ElementDecoratorData();</a>
+<span class="sourceLineNo">351</span><a id="line.351">        dto.base = base;</a>
+<span class="sourceLineNo">352</span><a id="line.352">        dto.bold = bold;</a>
+<span class="sourceLineNo">353</span><a id="line.353">        dto.cssClass = cssClass;</a>
+<span class="sourceLineNo">354</span><a id="line.354">        dto.cssSpecial = cssSpecial;</a>
+<span class="sourceLineNo">355</span><a id="line.355">        dto.htmlBase = n;</a>
+<span class="sourceLineNo">356</span><a id="line.356">        dto.ignoredCssClass = ignoredCssClass;</a>
+<span class="sourceLineNo">357</span><a id="line.357">        dto.italic = italic;</a>
+<span class="sourceLineNo">358</span><a id="line.358">        dto.monospace = monospace;</a>
+<span class="sourceLineNo">359</span><a id="line.359">        return dto;</a>
+<span class="sourceLineNo">360</span><a id="line.360">    }</a>
+<span class="sourceLineNo">361</span><a id="line.361"></a>
+<span class="sourceLineNo">362</span><a id="line.362">    private class PreDeque extends ArrayDeque&lt; String &gt; {</a>
+<span class="sourceLineNo">363</span><a id="line.363"></a>
+<span class="sourceLineNo">364</span><a id="line.364">        @Override</a>
+<span class="sourceLineNo">365</span><a id="line.365">        public void addFirst( final String item ) {</a>
+<span class="sourceLineNo">366</span><a id="line.366">            super.addFirst( item );</a>
+<span class="sourceLineNo">367</span><a id="line.367">            outTrimmer.setWhitespaceTrimMode( isEmpty() );</a>
 <span class="sourceLineNo">368</span><a id="line.368">        }</a>
 <span class="sourceLineNo">369</span><a id="line.369"></a>
 <span class="sourceLineNo">370</span><a id="line.370">        @Override</a>
-<span class="sourceLineNo">371</span><a id="line.371">        public synchronized String pop() {</a>
-<span class="sourceLineNo">372</span><a id="line.372">            final String pop = super.pop();</a>
+<span class="sourceLineNo">371</span><a id="line.371">        public String removeFirst() {</a>
+<span class="sourceLineNo">372</span><a id="line.372">            final String pop = super.removeFirst();</a>
 <span class="sourceLineNo">373</span><a id="line.373">            outTrimmer.setWhitespaceTrimMode( isEmpty() );</a>
 <span class="sourceLineNo">374</span><a id="line.374">            return pop;</a>
 <span class="sourceLineNo">375</span><a id="line.375">        }</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html
index 0e9e8c9..40b9f3d 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.html
@@ -41,344 +41,344 @@
 <span class="sourceLineNo">032</span><a id="line.32">import org.jdom2.xpath.XPathFactory;</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">035</span><a id="line.35">import java.util.Arrays;</a>
-<span class="sourceLineNo">036</span><a id="line.36">import java.util.LinkedHashMap;</a>
-<span class="sourceLineNo">037</span><a id="line.37">import java.util.Map;</a>
-<span class="sourceLineNo">038</span><a id="line.38">import java.util.Stack;</a>
-<span class="sourceLineNo">039</span><a id="line.39"></a>
+<span class="sourceLineNo">035</span><a id="line.35">import java.util.ArrayDeque;</a>
+<span class="sourceLineNo">036</span><a id="line.36">import java.util.Arrays;</a>
+<span class="sourceLineNo">037</span><a id="line.37">import java.util.Deque;</a>
+<span class="sourceLineNo">038</span><a id="line.38">import java.util.LinkedHashMap;</a>
+<span class="sourceLineNo">039</span><a id="line.39">import java.util.Map;</a>
 <span class="sourceLineNo">040</span><a id="line.40"></a>
-<span class="sourceLineNo">041</span><a id="line.41">/**</a>
-<span class="sourceLineNo">042</span><a id="line.42"> * Converting XHtml to Wiki Markup.  This is the class which orchestrates all the heavy loading.</a>
-<span class="sourceLineNo">043</span><a id="line.43"> */</a>
-<span class="sourceLineNo">044</span><a id="line.44">public class XHtmlElementToWikiTranslator {</a>
-<span class="sourceLineNo">045</span><a id="line.45"></a>
-<span class="sourceLineNo">046</span><a id="line.46">    private static final Logger LOG = LogManager.getLogger( XHtmlElementToWikiTranslator.class );</a>
-<span class="sourceLineNo">047</span><a id="line.47">    private static final String DEFAULT_SYNTAX_DECORATOR = "org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator";</a>
-<span class="sourceLineNo">048</span><a id="line.48"></a>
-<span class="sourceLineNo">049</span><a id="line.49">    private final Engine e;</a>
-<span class="sourceLineNo">050</span><a id="line.50">    private final XHtmlToWikiConfig config;</a>
-<span class="sourceLineNo">051</span><a id="line.51">    private final WhitespaceTrimWriter outTrimmer = new WhitespaceTrimWriter();</a>
-<span class="sourceLineNo">052</span><a id="line.52">    private final SyntaxDecorator syntax;</a>
-<span class="sourceLineNo">053</span><a id="line.53"></a>
-<span class="sourceLineNo">054</span><a id="line.54">    /**</a>
-<span class="sourceLineNo">055</span><a id="line.55">     *  Create a new translator using the default config.</a>
-<span class="sourceLineNo">056</span><a id="line.56">     *</a>
-<span class="sourceLineNo">057</span><a id="line.57">     *  @param base The base element from which to start translating.</a>
-<span class="sourceLineNo">058</span><a id="line.58">     *  @throws JDOMException If the DOM tree is faulty.</a>
-<span class="sourceLineNo">059</span><a id="line.59">     */</a>
-<span class="sourceLineNo">060</span><a id="line.60">    public XHtmlElementToWikiTranslator( final Engine e, final Element base ) throws JDOMException, ReflectiveOperationException {</a>
-<span class="sourceLineNo">061</span><a id="line.61">        this( e, base, new XHtmlToWikiConfig() );</a>
-<span class="sourceLineNo">062</span><a id="line.62">    }</a>
-<span class="sourceLineNo">063</span><a id="line.63"></a>
-<span class="sourceLineNo">064</span><a id="line.64">    /**</a>
-<span class="sourceLineNo">065</span><a id="line.65">     *  Create a new translator using the specified config.</a>
-<span class="sourceLineNo">066</span><a id="line.66">     *</a>
-<span class="sourceLineNo">067</span><a id="line.67">     *  @param base The base element from which to start translating.</a>
-<span class="sourceLineNo">068</span><a id="line.68">     *  @param config The config to use.</a>
-<span class="sourceLineNo">069</span><a id="line.69">     *  @throws JDOMException If the DOM tree is faulty.</a>
-<span class="sourceLineNo">070</span><a id="line.70">     */</a>
-<span class="sourceLineNo">071</span><a id="line.71">    public XHtmlElementToWikiTranslator( final Engine e, final Element base, final XHtmlToWikiConfig config ) throws JDOMException, ReflectiveOperationException {</a>
-<span class="sourceLineNo">072</span><a id="line.72">        this.e = e;</a>
-<span class="sourceLineNo">073</span><a id="line.73">        this.config = config;</a>
-<span class="sourceLineNo">074</span><a id="line.74">        syntax = getSyntaxDecorator();</a>
-<span class="sourceLineNo">075</span><a id="line.75">        final PrintWriter out = new PrintWriter( outTrimmer );</a>
-<span class="sourceLineNo">076</span><a id="line.76">        final Stack&lt; String &gt; liStack = new Stack&lt;&gt;();</a>
-<span class="sourceLineNo">077</span><a id="line.77">        final Stack&lt; String &gt; preStack = new PreStack();</a>
-<span class="sourceLineNo">078</span><a id="line.78"></a>
-<span class="sourceLineNo">079</span><a id="line.79">        syntax.init( out, liStack, preStack, outTrimmer, config, this );</a>
-<span class="sourceLineNo">080</span><a id="line.80">        translate( base );</a>
-<span class="sourceLineNo">081</span><a id="line.81">    }</a>
-<span class="sourceLineNo">082</span><a id="line.82"></a>
-<span class="sourceLineNo">083</span><a id="line.83">    SyntaxDecorator getSyntaxDecorator() throws ReflectiveOperationException {</a>
-<span class="sourceLineNo">084</span><a id="line.84">        String sdClass = e.getWikiProperties().getProperty( "jspwiki.syntax.decorator", DEFAULT_SYNTAX_DECORATOR );</a>
-<span class="sourceLineNo">085</span><a id="line.85">        if( !ClassUtil.assignable( sdClass, SyntaxDecorator.class.getName() ) ) {</a>
-<span class="sourceLineNo">086</span><a id="line.86">            LOG.warn( "{} does not subclass {} reverting to default syntax decorator.", sdClass, SyntaxDecorator.class.getName() );</a>
-<span class="sourceLineNo">087</span><a id="line.87">            sdClass = DEFAULT_SYNTAX_DECORATOR;</a>
-<span class="sourceLineNo">088</span><a id="line.88">        }</a>
-<span class="sourceLineNo">089</span><a id="line.89">        LOG.info( "Using {} as markup parser.", sdClass );</a>
-<span class="sourceLineNo">090</span><a id="line.90">        return ClassUtil.buildInstance( sdClass );</a>
-<span class="sourceLineNo">091</span><a id="line.91">    }</a>
-<span class="sourceLineNo">092</span><a id="line.92"></a>
-<span class="sourceLineNo">093</span><a id="line.93">    /**</a>
-<span class="sourceLineNo">094</span><a id="line.94">     * Outputs parsed wikitext.</a>
-<span class="sourceLineNo">095</span><a id="line.95">     *</a>
-<span class="sourceLineNo">096</span><a id="line.96">     * @return parsed wikitext.</a>
-<span class="sourceLineNo">097</span><a id="line.97">     */</a>
-<span class="sourceLineNo">098</span><a id="line.98">    public String getWikiString() {</a>
-<span class="sourceLineNo">099</span><a id="line.99">        return outTrimmer.toString();</a>
-<span class="sourceLineNo">100</span><a id="line.100">    }</a>
-<span class="sourceLineNo">101</span><a id="line.101"></a>
-<span class="sourceLineNo">102</span><a id="line.102">    public void translate( final Content element ) throws JDOMException {</a>
-<span class="sourceLineNo">103</span><a id="line.103">        if( element instanceof Text ) {</a>
-<span class="sourceLineNo">104</span><a id="line.104">            translateText( ( Text ) element );</a>
-<span class="sourceLineNo">105</span><a id="line.105">        } else if( element instanceof Element ) {</a>
-<span class="sourceLineNo">106</span><a id="line.106">            final Element base = ( Element )element;</a>
-<span class="sourceLineNo">107</span><a id="line.107">            if( "imageplugin".equals( base.getAttributeValue( "class" ) ) ) {</a>
-<span class="sourceLineNo">108</span><a id="line.108">                translateImage( base );</a>
-<span class="sourceLineNo">109</span><a id="line.109">            } else if( "wikiform".equals( base.getAttributeValue( "class" ) ) ) {</a>
-<span class="sourceLineNo">110</span><a id="line.110">                // only print the children if the div's class="wikiform", but not the div itself.</a>
-<span class="sourceLineNo">111</span><a id="line.111">                translateChildren( base );</a>
-<span class="sourceLineNo">112</span><a id="line.112">            } else {</a>
-<span class="sourceLineNo">113</span><a id="line.113">                translateParagraph( base );</a>
-<span class="sourceLineNo">114</span><a id="line.114">            }</a>
-<span class="sourceLineNo">115</span><a id="line.115">        }</a>
-<span class="sourceLineNo">116</span><a id="line.116">    }</a>
-<span class="sourceLineNo">117</span><a id="line.117"></a>
-<span class="sourceLineNo">118</span><a id="line.118">    public void translateText( final Text element ) {</a>
-<span class="sourceLineNo">119</span><a id="line.119">        syntax.text( element );</a>
-<span class="sourceLineNo">120</span><a id="line.120">    }</a>
-<span class="sourceLineNo">121</span><a id="line.121"></a>
-<span class="sourceLineNo">122</span><a id="line.122">    public void translateImage( final Element base ) {</a>
-<span class="sourceLineNo">123</span><a id="line.123">        Element child = XmlUtil.getXPathElement( base, "TBODY/TR/TD/*" );</a>
-<span class="sourceLineNo">124</span><a id="line.124">        if( child == null ) {</a>
-<span class="sourceLineNo">125</span><a id="line.125">            child = base;</a>
-<span class="sourceLineNo">126</span><a id="line.126">        }</a>
-<span class="sourceLineNo">127</span><a id="line.127">        final Element img;</a>
-<span class="sourceLineNo">128</span><a id="line.128">        final String href;</a>
-<span class="sourceLineNo">129</span><a id="line.129">        if( child.getName().equals( "A" ) ) {</a>
-<span class="sourceLineNo">130</span><a id="line.130">            img = child.getChild( "IMG" );</a>
-<span class="sourceLineNo">131</span><a id="line.131">            href = child.getAttributeValue( "href" );</a>
-<span class="sourceLineNo">132</span><a id="line.132">        } else {</a>
-<span class="sourceLineNo">133</span><a id="line.133">            img = child;</a>
-<span class="sourceLineNo">134</span><a id="line.134">            href = null;</a>
-<span class="sourceLineNo">135</span><a id="line.135">        }</a>
-<span class="sourceLineNo">136</span><a id="line.136">        if( img == null ) {</a>
-<span class="sourceLineNo">137</span><a id="line.137">            return;</a>
-<span class="sourceLineNo">138</span><a id="line.138">        }</a>
-<span class="sourceLineNo">139</span><a id="line.139">        final String src = config.trimLink( img.getAttributeValue( "src" ) );</a>
-<span class="sourceLineNo">140</span><a id="line.140">        if( src == null ) {</a>
-<span class="sourceLineNo">141</span><a id="line.141">            return;</a>
-<span class="sourceLineNo">142</span><a id="line.142">        }</a>
-<span class="sourceLineNo">143</span><a id="line.143"></a>
-<span class="sourceLineNo">144</span><a id="line.144">        final Map&lt; String, Object &gt; imageAttrs = new LinkedHashMap&lt;&gt;();</a>
-<span class="sourceLineNo">145</span><a id="line.145">        putIfNotEmpty( imageAttrs, "align", base.getAttributeValue( "align" ) );</a>
-<span class="sourceLineNo">146</span><a id="line.146">        putIfNotEmpty( imageAttrs, "height", img.getAttributeValue( "height" ) );</a>
-<span class="sourceLineNo">147</span><a id="line.147">        putIfNotEmpty( imageAttrs, "width", img.getAttributeValue( "width" ) );</a>
-<span class="sourceLineNo">148</span><a id="line.148">        putIfNotEmpty( imageAttrs, "alt", img.getAttributeValue( "alt" ) );</a>
-<span class="sourceLineNo">149</span><a id="line.149">        putIfNotEmpty( imageAttrs, "caption", emptyToNull( ( Element )XPathFactory.instance().compile(  "CAPTION" ).evaluateFirst( base ) ) );</a>
-<span class="sourceLineNo">150</span><a id="line.150">        putIfNotEmpty( imageAttrs, "link", href );</a>
-<span class="sourceLineNo">151</span><a id="line.151">        putIfNotEmpty( imageAttrs, "border", img.getAttributeValue( "border" ) );</a>
-<span class="sourceLineNo">152</span><a id="line.152">        putIfNotEmpty( imageAttrs, "style", base.getAttributeValue( "style" ) );</a>
-<span class="sourceLineNo">153</span><a id="line.153">        syntax.image( src, imageAttrs );</a>
-<span class="sourceLineNo">154</span><a id="line.154">    }</a>
-<span class="sourceLineNo">155</span><a id="line.155"></a>
-<span class="sourceLineNo">156</span><a id="line.156">    private void putIfNotEmpty( final Map&lt; String, Object &gt; map, final String key, final Object value ) {</a>
-<span class="sourceLineNo">157</span><a id="line.157">        if( value != null ) {</a>
-<span class="sourceLineNo">158</span><a id="line.158">            map.put( key, value );</a>
-<span class="sourceLineNo">159</span><a id="line.159">        }</a>
-<span class="sourceLineNo">160</span><a id="line.160">    }</a>
-<span class="sourceLineNo">161</span><a id="line.161"></a>
-<span class="sourceLineNo">162</span><a id="line.162">    private String emptyToNull( final Element e ) {</a>
-<span class="sourceLineNo">163</span><a id="line.163">        if( e == null ) {</a>
-<span class="sourceLineNo">164</span><a id="line.164">            return null;</a>
-<span class="sourceLineNo">165</span><a id="line.165">        }</a>
-<span class="sourceLineNo">166</span><a id="line.166">        final String s = e.getText();</a>
-<span class="sourceLineNo">167</span><a id="line.167">        return s == null ? null : ( s.replaceAll( "\\s", "" ).isEmpty() ? null : s );</a>
-<span class="sourceLineNo">168</span><a id="line.168">    }</a>
-<span class="sourceLineNo">169</span><a id="line.169"></a>
-<span class="sourceLineNo">170</span><a id="line.170">    private Map&lt; Object, Object &gt; getStylePropertiesLowerCase( final Element base ) {</a>
-<span class="sourceLineNo">171</span><a id="line.171">        final String n = base.getName().toLowerCase();</a>
-<span class="sourceLineNo">172</span><a id="line.172"></a>
-<span class="sourceLineNo">173</span><a id="line.173">        // "font-weight: bold; font-style: italic;"</a>
-<span class="sourceLineNo">174</span><a id="line.174">        String style = base.getAttributeValue( "style" );</a>
-<span class="sourceLineNo">175</span><a id="line.175">        if( style == null ) {</a>
-<span class="sourceLineNo">176</span><a id="line.176">            style = "";</a>
-<span class="sourceLineNo">177</span><a id="line.177">        }</a>
-<span class="sourceLineNo">178</span><a id="line.178"></a>
-<span class="sourceLineNo">179</span><a id="line.179">        if( n.equals( "p" ) || n.equals( "div" ) ) {</a>
-<span class="sourceLineNo">180</span><a id="line.180">            final String align = base.getAttributeValue( "align" );</a>
-<span class="sourceLineNo">181</span><a id="line.181">            if( align != null ) {</a>
-<span class="sourceLineNo">182</span><a id="line.182">                // only add the value of the align attribute if the text-align style didn't already exist.</a>
-<span class="sourceLineNo">183</span><a id="line.183">                if( !style.contains( "text-align" ) ) {</a>
-<span class="sourceLineNo">184</span><a id="line.184">                    style += ";text-align:" + align + ";";</a>
-<span class="sourceLineNo">185</span><a id="line.185">                }</a>
-<span class="sourceLineNo">186</span><a id="line.186">            }</a>
-<span class="sourceLineNo">187</span><a id="line.187">        }</a>
-<span class="sourceLineNo">188</span><a id="line.188"></a>
-<span class="sourceLineNo">189</span><a id="line.189">        if( n.equals( "font" ) ) {</a>
-<span class="sourceLineNo">190</span><a id="line.190">            final String color = base.getAttributeValue( "color" );</a>
-<span class="sourceLineNo">191</span><a id="line.191">            final String face = base.getAttributeValue( "face" );</a>
-<span class="sourceLineNo">192</span><a id="line.192">            final String size = base.getAttributeValue( "size" );</a>
-<span class="sourceLineNo">193</span><a id="line.193">            if( color != null ) {</a>
-<span class="sourceLineNo">194</span><a id="line.194">                style = style + "color:" + color + ";";</a>
-<span class="sourceLineNo">195</span><a id="line.195">            }</a>
-<span class="sourceLineNo">196</span><a id="line.196">            if( face != null ) {</a>
-<span class="sourceLineNo">197</span><a id="line.197">                style = style + "font-family:" + face + ";";</a>
-<span class="sourceLineNo">198</span><a id="line.198">            }</a>
-<span class="sourceLineNo">199</span><a id="line.199">            if( size != null ) {</a>
-<span class="sourceLineNo">200</span><a id="line.200">                switch ( size ) {</a>
-<span class="sourceLineNo">201</span><a id="line.201">                    case "1": style += "font-size:xx-small;"; break;</a>
-<span class="sourceLineNo">202</span><a id="line.202">                    case "2": style += "font-size:x-small;"; break;</a>
-<span class="sourceLineNo">203</span><a id="line.203">                    case "3": style += "font-size:small;"; break;</a>
-<span class="sourceLineNo">204</span><a id="line.204">                    case "4": style += "font-size:medium;"; break;</a>
-<span class="sourceLineNo">205</span><a id="line.205">                    case "5": style += "font-size:large;"; break;</a>
-<span class="sourceLineNo">206</span><a id="line.206">                    case "6": style += "font-size:x-large;"; break;</a>
-<span class="sourceLineNo">207</span><a id="line.207">                    case "7": style += "font-size:xx-large;"; break;</a>
-<span class="sourceLineNo">208</span><a id="line.208">                }</a>
-<span class="sourceLineNo">209</span><a id="line.209">            }</a>
-<span class="sourceLineNo">210</span><a id="line.210">        }</a>
-<span class="sourceLineNo">211</span><a id="line.211"></a>
-<span class="sourceLineNo">212</span><a id="line.212">        if( style.equals( "" ) ) {</a>
-<span class="sourceLineNo">213</span><a id="line.213">            return null;</a>
-<span class="sourceLineNo">214</span><a id="line.214">        }</a>
-<span class="sourceLineNo">215</span><a id="line.215"></a>
-<span class="sourceLineNo">216</span><a id="line.216">        final Map&lt; Object, Object &gt; m = new LinkedHashMap&lt;&gt;();</a>
-<span class="sourceLineNo">217</span><a id="line.217">        Arrays.stream( style.toLowerCase().split( ";" ) )</a>
-<span class="sourceLineNo">218</span><a id="line.218">              .filter( StringUtils::isNotEmpty )</a>
-<span class="sourceLineNo">219</span><a id="line.219">              .forEach( prop -&gt; m.put( prop.split( ":" )[ 0 ].trim(), prop.split( ":" )[ 1 ].trim() ) );</a>
-<span class="sourceLineNo">220</span><a id="line.220">        return m;</a>
-<span class="sourceLineNo">221</span><a id="line.221">    }</a>
-<span class="sourceLineNo">222</span><a id="line.222"></a>
-<span class="sourceLineNo">223</span><a id="line.223">    private String propsToStyleString( final Map&lt; Object, Object &gt;  styleProps ) {</a>
-<span class="sourceLineNo">224</span><a id="line.224">        final StringBuilder style = new StringBuilder();</a>
-<span class="sourceLineNo">225</span><a id="line.225">        for( final Map.Entry&lt; Object, Object &gt; entry : styleProps.entrySet() ) {</a>
-<span class="sourceLineNo">226</span><a id="line.226">            style.append( " " ).append( entry.getKey() ).append( ": " ).append( entry.getValue() ).append( ";" );</a>
-<span class="sourceLineNo">227</span><a id="line.227">        }</a>
-<span class="sourceLineNo">228</span><a id="line.228">        return style.toString();</a>
-<span class="sourceLineNo">229</span><a id="line.229">    }</a>
-<span class="sourceLineNo">230</span><a id="line.230"></a>
-<span class="sourceLineNo">231</span><a id="line.231">    public void translateChildren( final Element base ) throws JDOMException {</a>
-<span class="sourceLineNo">232</span><a id="line.232">        for( final Content c : base.getContent() ) {</a>
-<span class="sourceLineNo">233</span><a id="line.233">            if( c instanceof Element ) {</a>
-<span class="sourceLineNo">234</span><a id="line.234">                final Element e = ( Element )c;</a>
-<span class="sourceLineNo">235</span><a id="line.235">                final String n = e.getName().toLowerCase();</a>
-<span class="sourceLineNo">236</span><a id="line.236">                switch( n ) {</a>
-<span class="sourceLineNo">237</span><a id="line.237">                    case "h1": syntax.h1( e ); break;</a>
-<span class="sourceLineNo">238</span><a id="line.238">                    case "h2": syntax.h2( e ); break;</a>
-<span class="sourceLineNo">239</span><a id="line.239">                    case "h3": syntax.h3( e ); break;</a>
-<span class="sourceLineNo">240</span><a id="line.240">                    case "h4": syntax.h4( e ); break;</a>
-<span class="sourceLineNo">241</span><a id="line.241">                    case "p": syntax.p( e ); break;</a>
-<span class="sourceLineNo">242</span><a id="line.242">                    case "br": syntax.br( base, e ); break;</a>
-<span class="sourceLineNo">243</span><a id="line.243">                    case "hr": syntax.hr( e ); break;</a>
-<span class="sourceLineNo">244</span><a id="line.244">                    case "table": syntax.table( e ); break;</a>
-<span class="sourceLineNo">245</span><a id="line.245">                    case "tbody": syntax.tbody( e ); break;</a>
-<span class="sourceLineNo">246</span><a id="line.246">                    case "tr": syntax.tr( e ); break;</a>
-<span class="sourceLineNo">247</span><a id="line.247">                    case "td": syntax.td( e ); break;</a>
-<span class="sourceLineNo">248</span><a id="line.248">                    case "thead": syntax.thead( e ); break;</a>
-<span class="sourceLineNo">249</span><a id="line.249">                    case "th": syntax.th( e ); break;</a>
-<span class="sourceLineNo">250</span><a id="line.250">                    case "a": translateA( e ); break;</a>
-<span class="sourceLineNo">251</span><a id="line.251">                    case "b":</a>
-<span class="sourceLineNo">252</span><a id="line.252">                    case "strong": syntax.strong( e ); break;</a>
-<span class="sourceLineNo">253</span><a id="line.253">                    case "i":</a>
-<span class="sourceLineNo">254</span><a id="line.254">                    case "em":</a>
-<span class="sourceLineNo">255</span><a id="line.255">                    case "address": syntax.em( e ); break;</a>
-<span class="sourceLineNo">256</span><a id="line.256">                    case "u": syntax.underline( e ); break;</a>
-<span class="sourceLineNo">257</span><a id="line.257">                    case "strike": syntax.strike( e ); break;</a>
-<span class="sourceLineNo">258</span><a id="line.258">                    case "sub": syntax.sub( e ); break;</a>
-<span class="sourceLineNo">259</span><a id="line.259">                    case "sup": syntax.sup( e ); break;</a>
-<span class="sourceLineNo">260</span><a id="line.260">                    case "dl": syntax.dl( e ); break;</a>
-<span class="sourceLineNo">261</span><a id="line.261">                    case "dt": syntax.dt( e ); break;</a>
-<span class="sourceLineNo">262</span><a id="line.262">                    case "dd": syntax.dd( e ); break;</a>
-<span class="sourceLineNo">263</span><a id="line.263">                    case "ul": syntax.ul( e ); break;</a>
-<span class="sourceLineNo">264</span><a id="line.264">                    case "ol": syntax.ol( e ); break;</a>
-<span class="sourceLineNo">265</span><a id="line.265">                    case "li": syntax.li( base, e ); break;</a>
-<span class="sourceLineNo">266</span><a id="line.266">                    case "pre": syntax.pre( e ); break;</a>
-<span class="sourceLineNo">267</span><a id="line.267">                    case "code":</a>
-<span class="sourceLineNo">268</span><a id="line.268">                    case "tt": syntax.code( e ); break;</a>
-<span class="sourceLineNo">269</span><a id="line.269">                    case "img": syntax.img( e ); break;</a>
-<span class="sourceLineNo">270</span><a id="line.270">                    case "form": syntax.form( e ); break;</a>
-<span class="sourceLineNo">271</span><a id="line.271">                    case "input": syntax.input( e ); break;</a>
-<span class="sourceLineNo">272</span><a id="line.272">                    case "textarea": syntax.textarea( e ); break;</a>
-<span class="sourceLineNo">273</span><a id="line.273">                    case "select": syntax.select( e ); break;</a>
-<span class="sourceLineNo">274</span><a id="line.274">                    case "option": syntax.option( base, e ); break;</a>
-<span class="sourceLineNo">275</span><a id="line.275">                    default: translate( e ); break;</a>
-<span class="sourceLineNo">276</span><a id="line.276">                }</a>
-<span class="sourceLineNo">277</span><a id="line.277">            } else {</a>
-<span class="sourceLineNo">278</span><a id="line.278">                translate( c );</a>
-<span class="sourceLineNo">279</span><a id="line.279">            }</a>
-<span class="sourceLineNo">280</span><a id="line.280">        }</a>
-<span class="sourceLineNo">281</span><a id="line.281">    }</a>
-<span class="sourceLineNo">282</span><a id="line.282"></a>
-<span class="sourceLineNo">283</span><a id="line.283">    void translateA( final Element e ) throws JDOMException {</a>
-<span class="sourceLineNo">284</span><a id="line.284">        if( config.isNotIgnorableWikiMarkupLink( e ) ) {</a>
-<span class="sourceLineNo">285</span><a id="line.285">            if( e.getChild( "IMG" ) != null ) {</a>
-<span class="sourceLineNo">286</span><a id="line.286">                translateImage( e );</a>
-<span class="sourceLineNo">287</span><a id="line.287">            } else {</a>
-<span class="sourceLineNo">288</span><a id="line.288">                final String ref = config.trimLink( e.getAttributeValue( "href" ) );</a>
-<span class="sourceLineNo">289</span><a id="line.289">                if( ref == null ) {</a>
-<span class="sourceLineNo">290</span><a id="line.290">                    if( MarkupHelper.isUndefinedPageLink( e ) ) {</a>
-<span class="sourceLineNo">291</span><a id="line.291">                        syntax.aUndefined( e );</a>
-<span class="sourceLineNo">292</span><a id="line.292">                    } else {</a>
-<span class="sourceLineNo">293</span><a id="line.293">                        translate( e );</a>
-<span class="sourceLineNo">294</span><a id="line.294">                    }</a>
-<span class="sourceLineNo">295</span><a id="line.295">                } else if( MarkupHelper.isFootnoteLink( ref ) ) {</a>
-<span class="sourceLineNo">296</span><a id="line.296">                    final String href = ref.replaceFirst( "#ref-.+-(\\d+)", "$1" ); // convert "#ref-PageName-1" to just "1"</a>
-<span class="sourceLineNo">297</span><a id="line.297">                    final String textValue = e.getValue().substring( 1, ( e.getValue().length() - 1 ) ); // remove the brackets around "[1]"</a>
-<span class="sourceLineNo">298</span><a id="line.298">                    syntax.aFootnote( textValue, href );</a>
-<span class="sourceLineNo">299</span><a id="line.299">                } else {</a>
-<span class="sourceLineNo">300</span><a id="line.300">                    syntax.a( e, ref );</a>
-<span class="sourceLineNo">301</span><a id="line.301">                }</a>
-<span class="sourceLineNo">302</span><a id="line.302">            }</a>
-<span class="sourceLineNo">303</span><a id="line.303">        }</a>
-<span class="sourceLineNo">304</span><a id="line.304">    }</a>
-<span class="sourceLineNo">305</span><a id="line.305"></a>
-<span class="sourceLineNo">306</span><a id="line.306">    public void translateParagraph( final Element base ) throws JDOMException {</a>
-<span class="sourceLineNo">307</span><a id="line.307">        final ElementDecoratorData dto = buildElementDecoratorDataFrom( base );</a>
-<span class="sourceLineNo">308</span><a id="line.308">        syntax.paragraph( dto );</a>
-<span class="sourceLineNo">309</span><a id="line.309">    }</a>
-<span class="sourceLineNo">310</span><a id="line.310"></a>
-<span class="sourceLineNo">311</span><a id="line.311">    ElementDecoratorData buildElementDecoratorDataFrom( final Element base ) {</a>
-<span class="sourceLineNo">312</span><a id="line.312">        String n = base.getName().toLowerCase();</a>
-<span class="sourceLineNo">313</span><a id="line.313">        boolean bold = false;</a>
-<span class="sourceLineNo">314</span><a id="line.314">        boolean italic = false;</a>
-<span class="sourceLineNo">315</span><a id="line.315">        boolean monospace = false;</a>
-<span class="sourceLineNo">316</span><a id="line.316">        String cssSpecial = null;</a>
-<span class="sourceLineNo">317</span><a id="line.317">        final String cssClass = base.getAttributeValue( "class" );</a>
-<span class="sourceLineNo">318</span><a id="line.318"></a>
-<span class="sourceLineNo">319</span><a id="line.319">        // accomodate a FCKeditor bug with Firefox: when a link is removed, it becomes &lt;span class="wikipage"&gt;text&lt;/span&gt;.</a>
-<span class="sourceLineNo">320</span><a id="line.320">        final boolean ignoredCssClass = cssClass != null &amp;&amp; cssClass.matches( "wikipage|createpage|external|interwiki|attachment|inline-code" );</a>
-<span class="sourceLineNo">321</span><a id="line.321"></a>
-<span class="sourceLineNo">322</span><a id="line.322">        Map&lt; Object, Object &gt; styleProps = null;</a>
-<span class="sourceLineNo">323</span><a id="line.323"></a>
-<span class="sourceLineNo">324</span><a id="line.324">        // Only get the styles if it's not a link element. Styles for link elements are handled as an AugmentedWikiLink instead.</a>
-<span class="sourceLineNo">325</span><a id="line.325">        if( !n.equals( "a" ) ) {</a>
-<span class="sourceLineNo">326</span><a id="line.326">            styleProps = getStylePropertiesLowerCase( base );</a>
-<span class="sourceLineNo">327</span><a id="line.327">        }</a>
-<span class="sourceLineNo">328</span><a id="line.328"></a>
-<span class="sourceLineNo">329</span><a id="line.329">        if( "inline-code".equals( cssClass ) ) {</a>
-<span class="sourceLineNo">330</span><a id="line.330">            monospace = true;</a>
-<span class="sourceLineNo">331</span><a id="line.331">        }</a>
-<span class="sourceLineNo">332</span><a id="line.332"></a>
-<span class="sourceLineNo">333</span><a id="line.333">        if( styleProps != null ) {</a>
-<span class="sourceLineNo">334</span><a id="line.334">            final String weight = ( String ) styleProps.remove( "font-weight" );</a>
-<span class="sourceLineNo">335</span><a id="line.335">            final String style = ( String ) styleProps.remove( "font-style" );</a>
-<span class="sourceLineNo">336</span><a id="line.336"></a>
-<span class="sourceLineNo">337</span><a id="line.337">            if ( n.equals( "p" ) ) {</a>
-<span class="sourceLineNo">338</span><a id="line.338">                // change it, so we can print out the css styles for &lt;p&gt;</a>
-<span class="sourceLineNo">339</span><a id="line.339">                n = "div";</a>
-<span class="sourceLineNo">340</span><a id="line.340">            }</a>
-<span class="sourceLineNo">341</span><a id="line.341"></a>
-<span class="sourceLineNo">342</span><a id="line.342">            italic = "oblique".equals( style ) || "italic".equals( style );</a>
-<span class="sourceLineNo">343</span><a id="line.343">            bold = "bold".equals( weight ) || "bolder".equals( weight );</a>
-<span class="sourceLineNo">344</span><a id="line.344">            if ( !styleProps.isEmpty() ) {</a>
-<span class="sourceLineNo">345</span><a id="line.345">                cssSpecial = propsToStyleString( styleProps );</a>
-<span class="sourceLineNo">346</span><a id="line.346">            }</a>
-<span class="sourceLineNo">347</span><a id="line.347">        }</a>
-<span class="sourceLineNo">348</span><a id="line.348"></a>
-<span class="sourceLineNo">349</span><a id="line.349">        final ElementDecoratorData dto = new ElementDecoratorData();</a>
-<span class="sourceLineNo">350</span><a id="line.350">        dto.base = base;</a>
-<span class="sourceLineNo">351</span><a id="line.351">        dto.bold = bold;</a>
-<span class="sourceLineNo">352</span><a id="line.352">        dto.cssClass = cssClass;</a>
-<span class="sourceLineNo">353</span><a id="line.353">        dto.cssSpecial = cssSpecial;</a>
-<span class="sourceLineNo">354</span><a id="line.354">        dto.htmlBase = n;</a>
-<span class="sourceLineNo">355</span><a id="line.355">        dto.ignoredCssClass = ignoredCssClass;</a>
-<span class="sourceLineNo">356</span><a id="line.356">        dto.italic = italic;</a>
-<span class="sourceLineNo">357</span><a id="line.357">        dto.monospace = monospace;</a>
-<span class="sourceLineNo">358</span><a id="line.358">        return dto;</a>
-<span class="sourceLineNo">359</span><a id="line.359">    }</a>
-<span class="sourceLineNo">360</span><a id="line.360"></a>
-<span class="sourceLineNo">361</span><a id="line.361">    private class PreStack extends Stack&lt; String &gt; {</a>
-<span class="sourceLineNo">362</span><a id="line.362"></a>
-<span class="sourceLineNo">363</span><a id="line.363">        @Override</a>
-<span class="sourceLineNo">364</span><a id="line.364">        public String push( final String item ) {</a>
-<span class="sourceLineNo">365</span><a id="line.365">            final String push = super.push( item );</a>
-<span class="sourceLineNo">366</span><a id="line.366">            outTrimmer.setWhitespaceTrimMode( isEmpty() );</a>
-<span class="sourceLineNo">367</span><a id="line.367">            return push;</a>
+<span class="sourceLineNo">041</span><a id="line.41"></a>
+<span class="sourceLineNo">042</span><a id="line.42">/**</a>
+<span class="sourceLineNo">043</span><a id="line.43"> * Converting XHtml to Wiki Markup.  This is the class which orchestrates all the heavy loading.</a>
+<span class="sourceLineNo">044</span><a id="line.44"> */</a>
+<span class="sourceLineNo">045</span><a id="line.45">public class XHtmlElementToWikiTranslator {</a>
+<span class="sourceLineNo">046</span><a id="line.46"></a>
+<span class="sourceLineNo">047</span><a id="line.47">    private static final Logger LOG = LogManager.getLogger( XHtmlElementToWikiTranslator.class );</a>
+<span class="sourceLineNo">048</span><a id="line.48">    private static final String DEFAULT_SYNTAX_DECORATOR = "org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator";</a>
+<span class="sourceLineNo">049</span><a id="line.49"></a>
+<span class="sourceLineNo">050</span><a id="line.50">    private final Engine e;</a>
+<span class="sourceLineNo">051</span><a id="line.51">    private final XHtmlToWikiConfig config;</a>
+<span class="sourceLineNo">052</span><a id="line.52">    private final WhitespaceTrimWriter outTrimmer = new WhitespaceTrimWriter();</a>
+<span class="sourceLineNo">053</span><a id="line.53">    private final SyntaxDecorator syntax;</a>
+<span class="sourceLineNo">054</span><a id="line.54"></a>
+<span class="sourceLineNo">055</span><a id="line.55">    /**</a>
+<span class="sourceLineNo">056</span><a id="line.56">     *  Create a new translator using the default config.</a>
+<span class="sourceLineNo">057</span><a id="line.57">     *</a>
+<span class="sourceLineNo">058</span><a id="line.58">     *  @param base The base element from which to start translating.</a>
+<span class="sourceLineNo">059</span><a id="line.59">     *  @throws JDOMException If the DOM tree is faulty.</a>
+<span class="sourceLineNo">060</span><a id="line.60">     */</a>
+<span class="sourceLineNo">061</span><a id="line.61">    public XHtmlElementToWikiTranslator( final Engine e, final Element base ) throws JDOMException, ReflectiveOperationException {</a>
+<span class="sourceLineNo">062</span><a id="line.62">        this( e, base, new XHtmlToWikiConfig() );</a>
+<span class="sourceLineNo">063</span><a id="line.63">    }</a>
+<span class="sourceLineNo">064</span><a id="line.64"></a>
+<span class="sourceLineNo">065</span><a id="line.65">    /**</a>
+<span class="sourceLineNo">066</span><a id="line.66">     *  Create a new translator using the specified config.</a>
+<span class="sourceLineNo">067</span><a id="line.67">     *</a>
+<span class="sourceLineNo">068</span><a id="line.68">     *  @param base The base element from which to start translating.</a>
+<span class="sourceLineNo">069</span><a id="line.69">     *  @param config The config to use.</a>
+<span class="sourceLineNo">070</span><a id="line.70">     *  @throws JDOMException If the DOM tree is faulty.</a>
+<span class="sourceLineNo">071</span><a id="line.71">     */</a>
+<span class="sourceLineNo">072</span><a id="line.72">    public XHtmlElementToWikiTranslator( final Engine e, final Element base, final XHtmlToWikiConfig config ) throws JDOMException, ReflectiveOperationException {</a>
+<span class="sourceLineNo">073</span><a id="line.73">        this.e = e;</a>
+<span class="sourceLineNo">074</span><a id="line.74">        this.config = config;</a>
+<span class="sourceLineNo">075</span><a id="line.75">        syntax = getSyntaxDecorator();</a>
+<span class="sourceLineNo">076</span><a id="line.76">        final PrintWriter out = new PrintWriter( outTrimmer );</a>
+<span class="sourceLineNo">077</span><a id="line.77">        final Deque&lt; String &gt; liStack = new ArrayDeque&lt;&gt;();</a>
+<span class="sourceLineNo">078</span><a id="line.78">        final Deque&lt; String &gt; preStack = new PreDeque();</a>
+<span class="sourceLineNo">079</span><a id="line.79"></a>
+<span class="sourceLineNo">080</span><a id="line.80">        syntax.init( out, liStack, preStack, outTrimmer, config, this );</a>
+<span class="sourceLineNo">081</span><a id="line.81">        translate( base );</a>
+<span class="sourceLineNo">082</span><a id="line.82">    }</a>
+<span class="sourceLineNo">083</span><a id="line.83"></a>
+<span class="sourceLineNo">084</span><a id="line.84">    SyntaxDecorator getSyntaxDecorator() throws ReflectiveOperationException {</a>
+<span class="sourceLineNo">085</span><a id="line.85">        String sdClass = e.getWikiProperties().getProperty( "jspwiki.syntax.decorator", DEFAULT_SYNTAX_DECORATOR );</a>
+<span class="sourceLineNo">086</span><a id="line.86">        if( !ClassUtil.assignable( sdClass, SyntaxDecorator.class.getName() ) ) {</a>
+<span class="sourceLineNo">087</span><a id="line.87">            LOG.warn( "{} does not subclass {} reverting to default syntax decorator.", sdClass, SyntaxDecorator.class.getName() );</a>
+<span class="sourceLineNo">088</span><a id="line.88">            sdClass = DEFAULT_SYNTAX_DECORATOR;</a>
+<span class="sourceLineNo">089</span><a id="line.89">        }</a>
+<span class="sourceLineNo">090</span><a id="line.90">        LOG.info( "Using {} as markup parser.", sdClass );</a>
+<span class="sourceLineNo">091</span><a id="line.91">        return ClassUtil.buildInstance( sdClass );</a>
+<span class="sourceLineNo">092</span><a id="line.92">    }</a>
+<span class="sourceLineNo">093</span><a id="line.93"></a>
+<span class="sourceLineNo">094</span><a id="line.94">    /**</a>
+<span class="sourceLineNo">095</span><a id="line.95">     * Outputs parsed wikitext.</a>
+<span class="sourceLineNo">096</span><a id="line.96">     *</a>
+<span class="sourceLineNo">097</span><a id="line.97">     * @return parsed wikitext.</a>
+<span class="sourceLineNo">098</span><a id="line.98">     */</a>
+<span class="sourceLineNo">099</span><a id="line.99">    public String getWikiString() {</a>
+<span class="sourceLineNo">100</span><a id="line.100">        return outTrimmer.toString();</a>
+<span class="sourceLineNo">101</span><a id="line.101">    }</a>
+<span class="sourceLineNo">102</span><a id="line.102"></a>
+<span class="sourceLineNo">103</span><a id="line.103">    public void translate( final Content element ) throws JDOMException {</a>
+<span class="sourceLineNo">104</span><a id="line.104">        if( element instanceof Text ) {</a>
+<span class="sourceLineNo">105</span><a id="line.105">            translateText( ( Text ) element );</a>
+<span class="sourceLineNo">106</span><a id="line.106">        } else if( element instanceof Element ) {</a>
+<span class="sourceLineNo">107</span><a id="line.107">            final Element base = ( Element )element;</a>
+<span class="sourceLineNo">108</span><a id="line.108">            if( "imageplugin".equals( base.getAttributeValue( "class" ) ) ) {</a>
+<span class="sourceLineNo">109</span><a id="line.109">                translateImage( base );</a>
+<span class="sourceLineNo">110</span><a id="line.110">            } else if( "wikiform".equals( base.getAttributeValue( "class" ) ) ) {</a>
+<span class="sourceLineNo">111</span><a id="line.111">                // only print the children if the div's class="wikiform", but not the div itself.</a>
+<span class="sourceLineNo">112</span><a id="line.112">                translateChildren( base );</a>
+<span class="sourceLineNo">113</span><a id="line.113">            } else {</a>
+<span class="sourceLineNo">114</span><a id="line.114">                translateParagraph( base );</a>
+<span class="sourceLineNo">115</span><a id="line.115">            }</a>
+<span class="sourceLineNo">116</span><a id="line.116">        }</a>
+<span class="sourceLineNo">117</span><a id="line.117">    }</a>
+<span class="sourceLineNo">118</span><a id="line.118"></a>
+<span class="sourceLineNo">119</span><a id="line.119">    public void translateText( final Text element ) {</a>
+<span class="sourceLineNo">120</span><a id="line.120">        syntax.text( element );</a>
+<span class="sourceLineNo">121</span><a id="line.121">    }</a>
+<span class="sourceLineNo">122</span><a id="line.122"></a>
+<span class="sourceLineNo">123</span><a id="line.123">    public void translateImage( final Element base ) {</a>
+<span class="sourceLineNo">124</span><a id="line.124">        Element child = XmlUtil.getXPathElement( base, "TBODY/TR/TD/*" );</a>
+<span class="sourceLineNo">125</span><a id="line.125">        if( child == null ) {</a>
+<span class="sourceLineNo">126</span><a id="line.126">            child = base;</a>
+<span class="sourceLineNo">127</span><a id="line.127">        }</a>
+<span class="sourceLineNo">128</span><a id="line.128">        final Element img;</a>
+<span class="sourceLineNo">129</span><a id="line.129">        final String href;</a>
+<span class="sourceLineNo">130</span><a id="line.130">        if( child.getName().equals( "A" ) ) {</a>
+<span class="sourceLineNo">131</span><a id="line.131">            img = child.getChild( "IMG" );</a>
+<span class="sourceLineNo">132</span><a id="line.132">            href = child.getAttributeValue( "href" );</a>
+<span class="sourceLineNo">133</span><a id="line.133">        } else {</a>
+<span class="sourceLineNo">134</span><a id="line.134">            img = child;</a>
+<span class="sourceLineNo">135</span><a id="line.135">            href = null;</a>
+<span class="sourceLineNo">136</span><a id="line.136">        }</a>
+<span class="sourceLineNo">137</span><a id="line.137">        if( img == null ) {</a>
+<span class="sourceLineNo">138</span><a id="line.138">            return;</a>
+<span class="sourceLineNo">139</span><a id="line.139">        }</a>
+<span class="sourceLineNo">140</span><a id="line.140">        final String src = config.trimLink( img.getAttributeValue( "src" ) );</a>
+<span class="sourceLineNo">141</span><a id="line.141">        if( src == null ) {</a>
+<span class="sourceLineNo">142</span><a id="line.142">            return;</a>
+<span class="sourceLineNo">143</span><a id="line.143">        }</a>
+<span class="sourceLineNo">144</span><a id="line.144"></a>
+<span class="sourceLineNo">145</span><a id="line.145">        final Map&lt; String, Object &gt; imageAttrs = new LinkedHashMap&lt;&gt;();</a>
+<span class="sourceLineNo">146</span><a id="line.146">        putIfNotEmpty( imageAttrs, "align", base.getAttributeValue( "align" ) );</a>
+<span class="sourceLineNo">147</span><a id="line.147">        putIfNotEmpty( imageAttrs, "height", img.getAttributeValue( "height" ) );</a>
+<span class="sourceLineNo">148</span><a id="line.148">        putIfNotEmpty( imageAttrs, "width", img.getAttributeValue( "width" ) );</a>
+<span class="sourceLineNo">149</span><a id="line.149">        putIfNotEmpty( imageAttrs, "alt", img.getAttributeValue( "alt" ) );</a>
+<span class="sourceLineNo">150</span><a id="line.150">        putIfNotEmpty( imageAttrs, "caption", emptyToNull( ( Element )XPathFactory.instance().compile(  "CAPTION" ).evaluateFirst( base ) ) );</a>
+<span class="sourceLineNo">151</span><a id="line.151">        putIfNotEmpty( imageAttrs, "link", href );</a>
+<span class="sourceLineNo">152</span><a id="line.152">        putIfNotEmpty( imageAttrs, "border", img.getAttributeValue( "border" ) );</a>
+<span class="sourceLineNo">153</span><a id="line.153">        putIfNotEmpty( imageAttrs, "style", base.getAttributeValue( "style" ) );</a>
+<span class="sourceLineNo">154</span><a id="line.154">        syntax.image( src, imageAttrs );</a>
+<span class="sourceLineNo">155</span><a id="line.155">    }</a>
+<span class="sourceLineNo">156</span><a id="line.156"></a>
+<span class="sourceLineNo">157</span><a id="line.157">    private void putIfNotEmpty( final Map&lt; String, Object &gt; map, final String key, final Object value ) {</a>
+<span class="sourceLineNo">158</span><a id="line.158">        if( value != null ) {</a>
+<span class="sourceLineNo">159</span><a id="line.159">            map.put( key, value );</a>
+<span class="sourceLineNo">160</span><a id="line.160">        }</a>
+<span class="sourceLineNo">161</span><a id="line.161">    }</a>
+<span class="sourceLineNo">162</span><a id="line.162"></a>
+<span class="sourceLineNo">163</span><a id="line.163">    private String emptyToNull( final Element e ) {</a>
+<span class="sourceLineNo">164</span><a id="line.164">        if( e == null ) {</a>
+<span class="sourceLineNo">165</span><a id="line.165">            return null;</a>
+<span class="sourceLineNo">166</span><a id="line.166">        }</a>
+<span class="sourceLineNo">167</span><a id="line.167">        final String s = e.getText();</a>
+<span class="sourceLineNo">168</span><a id="line.168">        return s == null ? null : ( s.replaceAll( "\\s", "" ).isEmpty() ? null : s );</a>
+<span class="sourceLineNo">169</span><a id="line.169">    }</a>
+<span class="sourceLineNo">170</span><a id="line.170"></a>
+<span class="sourceLineNo">171</span><a id="line.171">    private Map&lt; Object, Object &gt; getStylePropertiesLowerCase( final Element base ) {</a>
+<span class="sourceLineNo">172</span><a id="line.172">        final String n = base.getName().toLowerCase();</a>
+<span class="sourceLineNo">173</span><a id="line.173"></a>
+<span class="sourceLineNo">174</span><a id="line.174">        // "font-weight: bold; font-style: italic;"</a>
+<span class="sourceLineNo">175</span><a id="line.175">        String style = base.getAttributeValue( "style" );</a>
+<span class="sourceLineNo">176</span><a id="line.176">        if( style == null ) {</a>
+<span class="sourceLineNo">177</span><a id="line.177">            style = "";</a>
+<span class="sourceLineNo">178</span><a id="line.178">        }</a>
+<span class="sourceLineNo">179</span><a id="line.179"></a>
+<span class="sourceLineNo">180</span><a id="line.180">        if( n.equals( "p" ) || n.equals( "div" ) ) {</a>
+<span class="sourceLineNo">181</span><a id="line.181">            final String align = base.getAttributeValue( "align" );</a>
+<span class="sourceLineNo">182</span><a id="line.182">            if( align != null ) {</a>
+<span class="sourceLineNo">183</span><a id="line.183">                // only add the value of the align attribute if the text-align style didn't already exist.</a>
+<span class="sourceLineNo">184</span><a id="line.184">                if( !style.contains( "text-align" ) ) {</a>
+<span class="sourceLineNo">185</span><a id="line.185">                    style += ";text-align:" + align + ";";</a>
+<span class="sourceLineNo">186</span><a id="line.186">                }</a>
+<span class="sourceLineNo">187</span><a id="line.187">            }</a>
+<span class="sourceLineNo">188</span><a id="line.188">        }</a>
+<span class="sourceLineNo">189</span><a id="line.189"></a>
+<span class="sourceLineNo">190</span><a id="line.190">        if( n.equals( "font" ) ) {</a>
+<span class="sourceLineNo">191</span><a id="line.191">            final String color = base.getAttributeValue( "color" );</a>
+<span class="sourceLineNo">192</span><a id="line.192">            final String face = base.getAttributeValue( "face" );</a>
+<span class="sourceLineNo">193</span><a id="line.193">            final String size = base.getAttributeValue( "size" );</a>
+<span class="sourceLineNo">194</span><a id="line.194">            if( color != null ) {</a>
+<span class="sourceLineNo">195</span><a id="line.195">                style = style + "color:" + color + ";";</a>
+<span class="sourceLineNo">196</span><a id="line.196">            }</a>
+<span class="sourceLineNo">197</span><a id="line.197">            if( face != null ) {</a>
+<span class="sourceLineNo">198</span><a id="line.198">                style = style + "font-family:" + face + ";";</a>
+<span class="sourceLineNo">199</span><a id="line.199">            }</a>
+<span class="sourceLineNo">200</span><a id="line.200">            if( size != null ) {</a>
+<span class="sourceLineNo">201</span><a id="line.201">                switch ( size ) {</a>
+<span class="sourceLineNo">202</span><a id="line.202">                    case "1": style += "font-size:xx-small;"; break;</a>
+<span class="sourceLineNo">203</span><a id="line.203">                    case "2": style += "font-size:x-small;"; break;</a>
+<span class="sourceLineNo">204</span><a id="line.204">                    case "3": style += "font-size:small;"; break;</a>
+<span class="sourceLineNo">205</span><a id="line.205">                    case "4": style += "font-size:medium;"; break;</a>
+<span class="sourceLineNo">206</span><a id="line.206">                    case "5": style += "font-size:large;"; break;</a>
+<span class="sourceLineNo">207</span><a id="line.207">                    case "6": style += "font-size:x-large;"; break;</a>
+<span class="sourceLineNo">208</span><a id="line.208">                    case "7": style += "font-size:xx-large;"; break;</a>
+<span class="sourceLineNo">209</span><a id="line.209">                }</a>
+<span class="sourceLineNo">210</span><a id="line.210">            }</a>
+<span class="sourceLineNo">211</span><a id="line.211">        }</a>
+<span class="sourceLineNo">212</span><a id="line.212"></a>
+<span class="sourceLineNo">213</span><a id="line.213">        if( style.equals( "" ) ) {</a>
+<span class="sourceLineNo">214</span><a id="line.214">            return null;</a>
+<span class="sourceLineNo">215</span><a id="line.215">        }</a>
+<span class="sourceLineNo">216</span><a id="line.216"></a>
+<span class="sourceLineNo">217</span><a id="line.217">        final Map&lt; Object, Object &gt; m = new LinkedHashMap&lt;&gt;();</a>
+<span class="sourceLineNo">218</span><a id="line.218">        Arrays.stream( style.toLowerCase().split( ";" ) )</a>
+<span class="sourceLineNo">219</span><a id="line.219">              .filter( StringUtils::isNotEmpty )</a>
+<span class="sourceLineNo">220</span><a id="line.220">              .forEach( prop -&gt; m.put( prop.split( ":" )[ 0 ].trim(), prop.split( ":" )[ 1 ].trim() ) );</a>
+<span class="sourceLineNo">221</span><a id="line.221">        return m;</a>
+<span class="sourceLineNo">222</span><a id="line.222">    }</a>
+<span class="sourceLineNo">223</span><a id="line.223"></a>
+<span class="sourceLineNo">224</span><a id="line.224">    private String propsToStyleString( final Map&lt; Object, Object &gt;  styleProps ) {</a>
+<span class="sourceLineNo">225</span><a id="line.225">        final StringBuilder style = new StringBuilder();</a>
+<span class="sourceLineNo">226</span><a id="line.226">        for( final Map.Entry&lt; Object, Object &gt; entry : styleProps.entrySet() ) {</a>
+<span class="sourceLineNo">227</span><a id="line.227">            style.append( " " ).append( entry.getKey() ).append( ": " ).append( entry.getValue() ).append( ";" );</a>
+<span class="sourceLineNo">228</span><a id="line.228">        }</a>
+<span class="sourceLineNo">229</span><a id="line.229">        return style.toString();</a>
+<span class="sourceLineNo">230</span><a id="line.230">    }</a>
+<span class="sourceLineNo">231</span><a id="line.231"></a>
+<span class="sourceLineNo">232</span><a id="line.232">    public void translateChildren( final Element base ) throws JDOMException {</a>
+<span class="sourceLineNo">233</span><a id="line.233">        for( final Content c : base.getContent() ) {</a>
+<span class="sourceLineNo">234</span><a id="line.234">            if( c instanceof Element ) {</a>
+<span class="sourceLineNo">235</span><a id="line.235">                final Element e = ( Element )c;</a>
+<span class="sourceLineNo">236</span><a id="line.236">                final String n = e.getName().toLowerCase();</a>
+<span class="sourceLineNo">237</span><a id="line.237">                switch( n ) {</a>
+<span class="sourceLineNo">238</span><a id="line.238">                    case "h1": syntax.h1( e ); break;</a>
+<span class="sourceLineNo">239</span><a id="line.239">                    case "h2": syntax.h2( e ); break;</a>
+<span class="sourceLineNo">240</span><a id="line.240">                    case "h3": syntax.h3( e ); break;</a>
+<span class="sourceLineNo">241</span><a id="line.241">                    case "h4": syntax.h4( e ); break;</a>
+<span class="sourceLineNo">242</span><a id="line.242">                    case "p": syntax.p( e ); break;</a>
+<span class="sourceLineNo">243</span><a id="line.243">                    case "br": syntax.br( base, e ); break;</a>
+<span class="sourceLineNo">244</span><a id="line.244">                    case "hr": syntax.hr( e ); break;</a>
+<span class="sourceLineNo">245</span><a id="line.245">                    case "table": syntax.table( e ); break;</a>
+<span class="sourceLineNo">246</span><a id="line.246">                    case "tbody": syntax.tbody( e ); break;</a>
+<span class="sourceLineNo">247</span><a id="line.247">                    case "tr": syntax.tr( e ); break;</a>
+<span class="sourceLineNo">248</span><a id="line.248">                    case "td": syntax.td( e ); break;</a>
+<span class="sourceLineNo">249</span><a id="line.249">                    case "thead": syntax.thead( e ); break;</a>
+<span class="sourceLineNo">250</span><a id="line.250">                    case "th": syntax.th( e ); break;</a>
+<span class="sourceLineNo">251</span><a id="line.251">                    case "a": translateA( e ); break;</a>
+<span class="sourceLineNo">252</span><a id="line.252">                    case "b":</a>
+<span class="sourceLineNo">253</span><a id="line.253">                    case "strong": syntax.strong( e ); break;</a>
+<span class="sourceLineNo">254</span><a id="line.254">                    case "i":</a>
+<span class="sourceLineNo">255</span><a id="line.255">                    case "em":</a>
+<span class="sourceLineNo">256</span><a id="line.256">                    case "address": syntax.em( e ); break;</a>
+<span class="sourceLineNo">257</span><a id="line.257">                    case "u": syntax.underline( e ); break;</a>
+<span class="sourceLineNo">258</span><a id="line.258">                    case "strike": syntax.strike( e ); break;</a>
+<span class="sourceLineNo">259</span><a id="line.259">                    case "sub": syntax.sub( e ); break;</a>
+<span class="sourceLineNo">260</span><a id="line.260">                    case "sup": syntax.sup( e ); break;</a>
+<span class="sourceLineNo">261</span><a id="line.261">                    case "dl": syntax.dl( e ); break;</a>
+<span class="sourceLineNo">262</span><a id="line.262">                    case "dt": syntax.dt( e ); break;</a>
+<span class="sourceLineNo">263</span><a id="line.263">                    case "dd": syntax.dd( e ); break;</a>
+<span class="sourceLineNo">264</span><a id="line.264">                    case "ul": syntax.ul( e ); break;</a>
+<span class="sourceLineNo">265</span><a id="line.265">                    case "ol": syntax.ol( e ); break;</a>
+<span class="sourceLineNo">266</span><a id="line.266">                    case "li": syntax.li( base, e ); break;</a>
+<span class="sourceLineNo">267</span><a id="line.267">                    case "pre": syntax.pre( e ); break;</a>
+<span class="sourceLineNo">268</span><a id="line.268">                    case "code":</a>
+<span class="sourceLineNo">269</span><a id="line.269">                    case "tt": syntax.code( e ); break;</a>
+<span class="sourceLineNo">270</span><a id="line.270">                    case "img": syntax.img( e ); break;</a>
+<span class="sourceLineNo">271</span><a id="line.271">                    case "form": syntax.form( e ); break;</a>
+<span class="sourceLineNo">272</span><a id="line.272">                    case "input": syntax.input( e ); break;</a>
+<span class="sourceLineNo">273</span><a id="line.273">                    case "textarea": syntax.textarea( e ); break;</a>
+<span class="sourceLineNo">274</span><a id="line.274">                    case "select": syntax.select( e ); break;</a>
+<span class="sourceLineNo">275</span><a id="line.275">                    case "option": syntax.option( base, e ); break;</a>
+<span class="sourceLineNo">276</span><a id="line.276">                    default: translate( e ); break;</a>
+<span class="sourceLineNo">277</span><a id="line.277">                }</a>
+<span class="sourceLineNo">278</span><a id="line.278">            } else {</a>
+<span class="sourceLineNo">279</span><a id="line.279">                translate( c );</a>
+<span class="sourceLineNo">280</span><a id="line.280">            }</a>
+<span class="sourceLineNo">281</span><a id="line.281">        }</a>
+<span class="sourceLineNo">282</span><a id="line.282">    }</a>
+<span class="sourceLineNo">283</span><a id="line.283"></a>
+<span class="sourceLineNo">284</span><a id="line.284">    void translateA( final Element e ) throws JDOMException {</a>
+<span class="sourceLineNo">285</span><a id="line.285">        if( config.isNotIgnorableWikiMarkupLink( e ) ) {</a>
+<span class="sourceLineNo">286</span><a id="line.286">            if( e.getChild( "IMG" ) != null ) {</a>
+<span class="sourceLineNo">287</span><a id="line.287">                translateImage( e );</a>
+<span class="sourceLineNo">288</span><a id="line.288">            } else {</a>
+<span class="sourceLineNo">289</span><a id="line.289">                final String ref = config.trimLink( e.getAttributeValue( "href" ) );</a>
+<span class="sourceLineNo">290</span><a id="line.290">                if( ref == null ) {</a>
+<span class="sourceLineNo">291</span><a id="line.291">                    if( MarkupHelper.isUndefinedPageLink( e ) ) {</a>
+<span class="sourceLineNo">292</span><a id="line.292">                        syntax.aUndefined( e );</a>
+<span class="sourceLineNo">293</span><a id="line.293">                    } else {</a>
+<span class="sourceLineNo">294</span><a id="line.294">                        translate( e );</a>
+<span class="sourceLineNo">295</span><a id="line.295">                    }</a>
+<span class="sourceLineNo">296</span><a id="line.296">                } else if( MarkupHelper.isFootnoteLink( ref ) ) {</a>
+<span class="sourceLineNo">297</span><a id="line.297">                    final String href = ref.replaceFirst( "#ref-.+-(\\d+)", "$1" ); // convert "#ref-PageName-1" to just "1"</a>
+<span class="sourceLineNo">298</span><a id="line.298">                    final String textValue = e.getValue().substring( 1, ( e.getValue().length() - 1 ) ); // remove the brackets around "[1]"</a>
+<span class="sourceLineNo">299</span><a id="line.299">                    syntax.aFootnote( textValue, href );</a>
+<span class="sourceLineNo">300</span><a id="line.300">                } else {</a>
+<span class="sourceLineNo">301</span><a id="line.301">                    syntax.a( e, ref );</a>
+<span class="sourceLineNo">302</span><a id="line.302">                }</a>
+<span class="sourceLineNo">303</span><a id="line.303">            }</a>
+<span class="sourceLineNo">304</span><a id="line.304">        }</a>
+<span class="sourceLineNo">305</span><a id="line.305">    }</a>
+<span class="sourceLineNo">306</span><a id="line.306"></a>
+<span class="sourceLineNo">307</span><a id="line.307">    public void translateParagraph( final Element base ) throws JDOMException {</a>
+<span class="sourceLineNo">308</span><a id="line.308">        final ElementDecoratorData dto = buildElementDecoratorDataFrom( base );</a>
+<span class="sourceLineNo">309</span><a id="line.309">        syntax.paragraph( dto );</a>
+<span class="sourceLineNo">310</span><a id="line.310">    }</a>
+<span class="sourceLineNo">311</span><a id="line.311"></a>
+<span class="sourceLineNo">312</span><a id="line.312">    ElementDecoratorData buildElementDecoratorDataFrom( final Element base ) {</a>
+<span class="sourceLineNo">313</span><a id="line.313">        String n = base.getName().toLowerCase();</a>
+<span class="sourceLineNo">314</span><a id="line.314">        boolean bold = false;</a>
+<span class="sourceLineNo">315</span><a id="line.315">        boolean italic = false;</a>
+<span class="sourceLineNo">316</span><a id="line.316">        boolean monospace = false;</a>
+<span class="sourceLineNo">317</span><a id="line.317">        String cssSpecial = null;</a>
+<span class="sourceLineNo">318</span><a id="line.318">        final String cssClass = base.getAttributeValue( "class" );</a>
+<span class="sourceLineNo">319</span><a id="line.319"></a>
+<span class="sourceLineNo">320</span><a id="line.320">        // accomodate a FCKeditor bug with Firefox: when a link is removed, it becomes &lt;span class="wikipage"&gt;text&lt;/span&gt;.</a>
+<span class="sourceLineNo">321</span><a id="line.321">        final boolean ignoredCssClass = cssClass != null &amp;&amp; cssClass.matches( "wikipage|createpage|external|interwiki|attachment|inline-code" );</a>
+<span class="sourceLineNo">322</span><a id="line.322"></a>
+<span class="sourceLineNo">323</span><a id="line.323">        Map&lt; Object, Object &gt; styleProps = null;</a>
+<span class="sourceLineNo">324</span><a id="line.324"></a>
+<span class="sourceLineNo">325</span><a id="line.325">        // Only get the styles if it's not a link element. Styles for link elements are handled as an AugmentedWikiLink instead.</a>
+<span class="sourceLineNo">326</span><a id="line.326">        if( !n.equals( "a" ) ) {</a>
+<span class="sourceLineNo">327</span><a id="line.327">            styleProps = getStylePropertiesLowerCase( base );</a>
+<span class="sourceLineNo">328</span><a id="line.328">        }</a>
+<span class="sourceLineNo">329</span><a id="line.329"></a>
+<span class="sourceLineNo">330</span><a id="line.330">        if( "inline-code".equals( cssClass ) ) {</a>
+<span class="sourceLineNo">331</span><a id="line.331">            monospace = true;</a>
+<span class="sourceLineNo">332</span><a id="line.332">        }</a>
+<span class="sourceLineNo">333</span><a id="line.333"></a>
+<span class="sourceLineNo">334</span><a id="line.334">        if( styleProps != null ) {</a>
+<span class="sourceLineNo">335</span><a id="line.335">            final String weight = ( String ) styleProps.remove( "font-weight" );</a>
+<span class="sourceLineNo">336</span><a id="line.336">            final String style = ( String ) styleProps.remove( "font-style" );</a>
+<span class="sourceLineNo">337</span><a id="line.337"></a>
+<span class="sourceLineNo">338</span><a id="line.338">            if ( n.equals( "p" ) ) {</a>
+<span class="sourceLineNo">339</span><a id="line.339">                // change it, so we can print out the css styles for &lt;p&gt;</a>
+<span class="sourceLineNo">340</span><a id="line.340">                n = "div";</a>
+<span class="sourceLineNo">341</span><a id="line.341">            }</a>
+<span class="sourceLineNo">342</span><a id="line.342"></a>
+<span class="sourceLineNo">343</span><a id="line.343">            italic = "oblique".equals( style ) || "italic".equals( style );</a>
+<span class="sourceLineNo">344</span><a id="line.344">            bold = "bold".equals( weight ) || "bolder".equals( weight );</a>
+<span class="sourceLineNo">345</span><a id="line.345">            if ( !styleProps.isEmpty() ) {</a>
+<span class="sourceLineNo">346</span><a id="line.346">                cssSpecial = propsToStyleString( styleProps );</a>
+<span class="sourceLineNo">347</span><a id="line.347">            }</a>
+<span class="sourceLineNo">348</span><a id="line.348">        }</a>
+<span class="sourceLineNo">349</span><a id="line.349"></a>
+<span class="sourceLineNo">350</span><a id="line.350">        final ElementDecoratorData dto = new ElementDecoratorData();</a>
+<span class="sourceLineNo">351</span><a id="line.351">        dto.base = base;</a>
+<span class="sourceLineNo">352</span><a id="line.352">        dto.bold = bold;</a>
+<span class="sourceLineNo">353</span><a id="line.353">        dto.cssClass = cssClass;</a>
+<span class="sourceLineNo">354</span><a id="line.354">        dto.cssSpecial = cssSpecial;</a>
+<span class="sourceLineNo">355</span><a id="line.355">        dto.htmlBase = n;</a>
+<span class="sourceLineNo">356</span><a id="line.356">        dto.ignoredCssClass = ignoredCssClass;</a>
+<span class="sourceLineNo">357</span><a id="line.357">        dto.italic = italic;</a>
+<span class="sourceLineNo">358</span><a id="line.358">        dto.monospace = monospace;</a>
+<span class="sourceLineNo">359</span><a id="line.359">        return dto;</a>
+<span class="sourceLineNo">360</span><a id="line.360">    }</a>
+<span class="sourceLineNo">361</span><a id="line.361"></a>
+<span class="sourceLineNo">362</span><a id="line.362">    private class PreDeque extends ArrayDeque&lt; String &gt; {</a>
+<span class="sourceLineNo">363</span><a id="line.363"></a>
+<span class="sourceLineNo">364</span><a id="line.364">        @Override</a>
+<span class="sourceLineNo">365</span><a id="line.365">        public void addFirst( final String item ) {</a>
+<span class="sourceLineNo">366</span><a id="line.366">            super.addFirst( item );</a>
+<span class="sourceLineNo">367</span><a id="line.367">            outTrimmer.setWhitespaceTrimMode( isEmpty() );</a>
 <span class="sourceLineNo">368</span><a id="line.368">        }</a>
 <span class="sourceLineNo">369</span><a id="line.369"></a>
 <span class="sourceLineNo">370</span><a id="line.370">        @Override</a>
-<span class="sourceLineNo">371</span><a id="line.371">        public synchronized String pop() {</a>
-<span class="sourceLineNo">372</span><a id="line.372">            final String pop = super.pop();</a>
+<span class="sourceLineNo">371</span><a id="line.371">        public String removeFirst() {</a>
+<span class="sourceLineNo">372</span><a id="line.372">            final String pop = super.removeFirst();</a>
 <span class="sourceLineNo">373</span><a id="line.373">            outTrimmer.setWhitespaceTrimMode( isEmpty() );</a>
 <span class="sourceLineNo">374</span><a id="line.374">            return pop;</a>
 <span class="sourceLineNo">375</span><a id="line.375">        }</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html
index 92b01e7..78d83cc 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/BrDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class BrDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; preStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected BrDecorator( final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected BrDecorator( final PrintWriter out, final Deque&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.preStack = preStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html
index edcc593..2f86be2 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/CodeDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class CodeDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; preStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected CodeDecorator( final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected CodeDecorator( final PrintWriter out, final Deque&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.preStack = preStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
@@ -57,9 +57,9 @@
 <span class="sourceLineNo">048</span><a id="line.48">     */</a>
 <span class="sourceLineNo">049</span><a id="line.49">    public void decorate( final Element e ) throws JDOMException {</a>
 <span class="sourceLineNo">050</span><a id="line.50">        out.print( markupCodeOpen() );</a>
-<span class="sourceLineNo">051</span><a id="line.51">        preStack.push( markupCodeOpen() );</a>
+<span class="sourceLineNo">051</span><a id="line.51">        preStack.addFirst( markupCodeOpen() );</a>
 <span class="sourceLineNo">052</span><a id="line.52">        chain.translate( e );</a>
-<span class="sourceLineNo">053</span><a id="line.53">        preStack.pop();</a>
+<span class="sourceLineNo">053</span><a id="line.53">        preStack.removeFirst();</a>
 <span class="sourceLineNo">054</span><a id="line.54">        out.print( markupCodeClose() );</a>
 <span class="sourceLineNo">055</span><a id="line.55">        // NOTE: don't print a newline after the closing brackets because if the Text is inside</a>
 <span class="sourceLineNo">056</span><a id="line.56">        // a table or list, it would break it if there was a subsequent row or list item.</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html
index 558b2e7..58c2e6a 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/LiDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class LiDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; liStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; liStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected LiDecorator( final PrintWriter out, final Stack&lt; String &gt; liStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected LiDecorator( final PrintWriter out, final Deque&lt; String &gt; liStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.liStack = liStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
@@ -76,7 +76,7 @@
 <span class="sourceLineNo">067</span><a id="line.67">     *</a>
 <span class="sourceLineNo">068</span><a id="line.68">     * @return Wiki markup for a {@code LI} element.</a>
 <span class="sourceLineNo">069</span><a id="line.69">     */</a>
-<span class="sourceLineNo">070</span><a id="line.70">    protected abstract String markupLi( Stack&lt; String &gt; liStack );</a>
+<span class="sourceLineNo">070</span><a id="line.70">    protected abstract String markupLi( Deque&lt; String &gt; liStack );</a>
 <span class="sourceLineNo">071</span><a id="line.71"></a>
 <span class="sourceLineNo">072</span><a id="line.72">}</a>
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html
index 6167814..c165bff 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/OlDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class OlDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; liStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; liStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected OlDecorator( final PrintWriter out, final Stack&lt; String &gt; liStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected OlDecorator( final PrintWriter out, final Deque&lt; String &gt; liStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.liStack = liStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
@@ -57,9 +57,9 @@
 <span class="sourceLineNo">048</span><a id="line.48">     */</a>
 <span class="sourceLineNo">049</span><a id="line.49">    public void decorate( final Element e ) throws JDOMException {</a>
 <span class="sourceLineNo">050</span><a id="line.50">        out.println();</a>
-<span class="sourceLineNo">051</span><a id="line.51">        liStack.push( markupOl() );</a>
+<span class="sourceLineNo">051</span><a id="line.51">        liStack.addFirst( markupOl() );</a>
 <span class="sourceLineNo">052</span><a id="line.52">        chain.translate( e );</a>
-<span class="sourceLineNo">053</span><a id="line.53">        liStack.pop();</a>
+<span class="sourceLineNo">053</span><a id="line.53">        liStack.removeFirst();</a>
 <span class="sourceLineNo">054</span><a id="line.54">    }</a>
 <span class="sourceLineNo">055</span><a id="line.55"></a>
 <span class="sourceLineNo">056</span><a id="line.56">    /**</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html
index 82425ca..e1b3771 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.html
@@ -32,67 +32,64 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26"></a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
-<span class="sourceLineNo">028</span><a id="line.28"></a>
-<span class="sourceLineNo">029</span><a id="line.29">/**</a>
-<span class="sourceLineNo">030</span><a id="line.30"> * Translates to wiki syntax from a plain text handling bold.</a>
-<span class="sourceLineNo">031</span><a id="line.31"> */</a>
-<span class="sourceLineNo">032</span><a id="line.32">public abstract class PlainTextBoldDecorator {</a>
-<span class="sourceLineNo">033</span><a id="line.33"></a>
-<span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
-<span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
-<span class="sourceLineNo">037</span><a id="line.37">    final protected PlainTextItalicDecorator ptid;</a>
-<span class="sourceLineNo">038</span><a id="line.38"></a>
-<span class="sourceLineNo">039</span><a id="line.39">    protected PlainTextBoldDecorator( final PlainTextItalicDecorator ptid, final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
-<span class="sourceLineNo">040</span><a id="line.40">        this.out = out;</a>
-<span class="sourceLineNo">041</span><a id="line.41">        this.preStack = preStack;</a>
-<span class="sourceLineNo">042</span><a id="line.42">        this.chain = chain;</a>
-<span class="sourceLineNo">043</span><a id="line.43">        this.ptid = ptid;</a>
-<span class="sourceLineNo">044</span><a id="line.44">    }</a>
-<span class="sourceLineNo">045</span><a id="line.45"></a>
-<span class="sourceLineNo">046</span><a id="line.46">    /**</a>
-<span class="sourceLineNo">047</span><a id="line.47">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">048</span><a id="line.48">     *</a>
-<span class="sourceLineNo">049</span><a id="line.49">     * @param dto XHTML element being translated.</a>
-<span class="sourceLineNo">050</span><a id="line.50">     */</a>
-<span class="sourceLineNo">051</span><a id="line.51">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
-<span class="sourceLineNo">052</span><a id="line.52">        if( dto.bold ) {</a>
-<span class="sourceLineNo">053</span><a id="line.53">            out.print( markupBoldOpen() );</a>
-<span class="sourceLineNo">054</span><a id="line.54">        }</a>
-<span class="sourceLineNo">055</span><a id="line.55">        ptid.decorate( dto );</a>
-<span class="sourceLineNo">056</span><a id="line.56">        if( dto.bold ) {</a>
-<span class="sourceLineNo">057</span><a id="line.57">            out.print( markupBoldClose() );</a>
-<span class="sourceLineNo">058</span><a id="line.58">        }</a>
-<span class="sourceLineNo">059</span><a id="line.59">    }</a>
-<span class="sourceLineNo">060</span><a id="line.60"></a>
-<span class="sourceLineNo">061</span><a id="line.61">    /**</a>
-<span class="sourceLineNo">062</span><a id="line.62">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">063</span><a id="line.63">     *</a>
-<span class="sourceLineNo">064</span><a id="line.64">     * @param e XHTML element being translated.</a>
-<span class="sourceLineNo">065</span><a id="line.65">     */</a>
-<span class="sourceLineNo">066</span><a id="line.66">    public void decorate( final Element e ) throws JDOMException {</a>
-<span class="sourceLineNo">067</span><a id="line.67">        out.print( markupBoldOpen() );</a>
-<span class="sourceLineNo">068</span><a id="line.68">        chain.translate( e );</a>
-<span class="sourceLineNo">069</span><a id="line.69">        out.print( markupBoldClose() );</a>
-<span class="sourceLineNo">070</span><a id="line.70">    }</a>
-<span class="sourceLineNo">071</span><a id="line.71"></a>
-<span class="sourceLineNo">072</span><a id="line.72">    /**</a>
-<span class="sourceLineNo">073</span><a id="line.73">     * Opening wiki markup for a bold element.</a>
-<span class="sourceLineNo">074</span><a id="line.74">     *</a>
-<span class="sourceLineNo">075</span><a id="line.75">     * @return Opening wiki markup for a bold element.</a>
-<span class="sourceLineNo">076</span><a id="line.76">     */</a>
-<span class="sourceLineNo">077</span><a id="line.77">    protected abstract String markupBoldOpen();</a>
-<span class="sourceLineNo">078</span><a id="line.78"></a>
-<span class="sourceLineNo">079</span><a id="line.79">    /**</a>
-<span class="sourceLineNo">080</span><a id="line.80">     * Closing wiki markup for a bold element.</a>
-<span class="sourceLineNo">081</span><a id="line.81">     *</a>
-<span class="sourceLineNo">082</span><a id="line.82">     * @return Closing wiki markup for a bold element.</a>
-<span class="sourceLineNo">083</span><a id="line.83">     */</a>
-<span class="sourceLineNo">084</span><a id="line.84">    protected abstract String markupBoldClose();</a>
-<span class="sourceLineNo">085</span><a id="line.85"></a>
-<span class="sourceLineNo">086</span><a id="line.86">}</a>
+<span class="sourceLineNo">028</span><a id="line.28">/**</a>
+<span class="sourceLineNo">029</span><a id="line.29"> * Translates to wiki syntax from a plain text handling bold.</a>
+<span class="sourceLineNo">030</span><a id="line.30"> */</a>
+<span class="sourceLineNo">031</span><a id="line.31">public abstract class PlainTextBoldDecorator {</a>
+<span class="sourceLineNo">032</span><a id="line.32"></a>
+<span class="sourceLineNo">033</span><a id="line.33">    final protected PrintWriter out;</a>
+<span class="sourceLineNo">034</span><a id="line.34">    final protected XHtmlElementToWikiTranslator chain;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected PlainTextItalicDecorator ptid;</a>
+<span class="sourceLineNo">036</span><a id="line.36"></a>
+<span class="sourceLineNo">037</span><a id="line.37">    protected PlainTextBoldDecorator( final PlainTextItalicDecorator ptid, final PrintWriter out, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">        this.out = out;</a>
+<span class="sourceLineNo">039</span><a id="line.39">        this.chain = chain;</a>
+<span class="sourceLineNo">040</span><a id="line.40">        this.ptid = ptid;</a>
+<span class="sourceLineNo">041</span><a id="line.41">    }</a>
+<span class="sourceLineNo">042</span><a id="line.42"></a>
+<span class="sourceLineNo">043</span><a id="line.43">    /**</a>
+<span class="sourceLineNo">044</span><a id="line.44">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">045</span><a id="line.45">     *</a>
+<span class="sourceLineNo">046</span><a id="line.46">     * @param dto XHTML element being translated.</a>
+<span class="sourceLineNo">047</span><a id="line.47">     */</a>
+<span class="sourceLineNo">048</span><a id="line.48">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
+<span class="sourceLineNo">049</span><a id="line.49">        if( dto.bold ) {</a>
+<span class="sourceLineNo">050</span><a id="line.50">            out.print( markupBoldOpen() );</a>
+<span class="sourceLineNo">051</span><a id="line.51">        }</a>
+<span class="sourceLineNo">052</span><a id="line.52">        ptid.decorate( dto );</a>
+<span class="sourceLineNo">053</span><a id="line.53">        if( dto.bold ) {</a>
+<span class="sourceLineNo">054</span><a id="line.54">            out.print( markupBoldClose() );</a>
+<span class="sourceLineNo">055</span><a id="line.55">        }</a>
+<span class="sourceLineNo">056</span><a id="line.56">    }</a>
+<span class="sourceLineNo">057</span><a id="line.57"></a>
+<span class="sourceLineNo">058</span><a id="line.58">    /**</a>
+<span class="sourceLineNo">059</span><a id="line.59">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">060</span><a id="line.60">     *</a>
+<span class="sourceLineNo">061</span><a id="line.61">     * @param e XHTML element being translated.</a>
+<span class="sourceLineNo">062</span><a id="line.62">     */</a>
+<span class="sourceLineNo">063</span><a id="line.63">    public void decorate( final Element e ) throws JDOMException {</a>
+<span class="sourceLineNo">064</span><a id="line.64">        out.print( markupBoldOpen() );</a>
+<span class="sourceLineNo">065</span><a id="line.65">        chain.translate( e );</a>
+<span class="sourceLineNo">066</span><a id="line.66">        out.print( markupBoldClose() );</a>
+<span class="sourceLineNo">067</span><a id="line.67">    }</a>
+<span class="sourceLineNo">068</span><a id="line.68"></a>
+<span class="sourceLineNo">069</span><a id="line.69">    /**</a>
+<span class="sourceLineNo">070</span><a id="line.70">     * Opening wiki markup for a bold element.</a>
+<span class="sourceLineNo">071</span><a id="line.71">     *</a>
+<span class="sourceLineNo">072</span><a id="line.72">     * @return Opening wiki markup for a bold element.</a>
+<span class="sourceLineNo">073</span><a id="line.73">     */</a>
+<span class="sourceLineNo">074</span><a id="line.74">    protected abstract String markupBoldOpen();</a>
+<span class="sourceLineNo">075</span><a id="line.75"></a>
+<span class="sourceLineNo">076</span><a id="line.76">    /**</a>
+<span class="sourceLineNo">077</span><a id="line.77">     * Closing wiki markup for a bold element.</a>
+<span class="sourceLineNo">078</span><a id="line.78">     *</a>
+<span class="sourceLineNo">079</span><a id="line.79">     * @return Closing wiki markup for a bold element.</a>
+<span class="sourceLineNo">080</span><a id="line.80">     */</a>
+<span class="sourceLineNo">081</span><a id="line.81">    protected abstract String markupBoldClose();</a>
+<span class="sourceLineNo">082</span><a id="line.82"></a>
+<span class="sourceLineNo">083</span><a id="line.83">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html
index e10975e..d2998bf 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.html
@@ -31,78 +31,75 @@
 <span class="sourceLineNo">022</span><a id="line.22">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">023</span><a id="line.23"></a>
 <span class="sourceLineNo">024</span><a id="line.24">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">025</span><a id="line.25">import java.util.Stack;</a>
+<span class="sourceLineNo">025</span><a id="line.25"></a>
 <span class="sourceLineNo">026</span><a id="line.26"></a>
-<span class="sourceLineNo">027</span><a id="line.27"></a>
-<span class="sourceLineNo">028</span><a id="line.28">/**</a>
-<span class="sourceLineNo">029</span><a id="line.29"> * Translates to wiki syntax from a plain text handling css classes.</a>
-<span class="sourceLineNo">030</span><a id="line.30"> */</a>
-<span class="sourceLineNo">031</span><a id="line.31">public abstract class PlainTextCssDecorator {</a>
-<span class="sourceLineNo">032</span><a id="line.32"></a>
-<span class="sourceLineNo">033</span><a id="line.33">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">034</span><a id="line.34">    final protected Stack&lt; String &gt; preStack;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected XHtmlElementToWikiTranslator chain;</a>
-<span class="sourceLineNo">036</span><a id="line.36">    final protected PlainTextBoldDecorator ptbd;</a>
-<span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected PlainTextCssDecorator( final PlainTextBoldDecorator ptbd, final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
-<span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
-<span class="sourceLineNo">040</span><a id="line.40">        this.preStack = preStack;</a>
-<span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
-<span class="sourceLineNo">042</span><a id="line.42">        this.ptbd = ptbd;</a>
-<span class="sourceLineNo">043</span><a id="line.43">    }</a>
-<span class="sourceLineNo">044</span><a id="line.44"></a>
-<span class="sourceLineNo">045</span><a id="line.45">    /**</a>
-<span class="sourceLineNo">046</span><a id="line.46">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">047</span><a id="line.47">     *</a>
-<span class="sourceLineNo">048</span><a id="line.48">     * @param dto XHTML element being translated.</a>
-<span class="sourceLineNo">049</span><a id="line.49">     */</a>
-<span class="sourceLineNo">050</span><a id="line.50">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
-<span class="sourceLineNo">051</span><a id="line.51">        if( dto.cssClass != null &amp;&amp; !dto.ignoredCssClass ) {</a>
-<span class="sourceLineNo">052</span><a id="line.52">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
-<span class="sourceLineNo">053</span><a id="line.53">                out.print( markupCssDivOpen( dto.cssClass ) );</a>
-<span class="sourceLineNo">054</span><a id="line.54">            } else if( MarkupHelper.isHtmlBaseSpan( dto ) ) {</a>
-<span class="sourceLineNo">055</span><a id="line.55">                out.print( markupCssSpanOpen( dto.cssClass ) );</a>
-<span class="sourceLineNo">056</span><a id="line.56">            }</a>
-<span class="sourceLineNo">057</span><a id="line.57">        }</a>
-<span class="sourceLineNo">058</span><a id="line.58">        ptbd.decorate( dto );</a>
-<span class="sourceLineNo">059</span><a id="line.59">        if( dto.cssClass != null &amp;&amp; !dto.ignoredCssClass ) {</a>
-<span class="sourceLineNo">060</span><a id="line.60">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
-<span class="sourceLineNo">061</span><a id="line.61">                out.print( markupCssDivClose( dto.cssClass ) );</a>
-<span class="sourceLineNo">062</span><a id="line.62">            } else if( MarkupHelper.isHtmlBaseSpan( dto ) ) {</a>
-<span class="sourceLineNo">063</span><a id="line.63">                out.print( markupCssSpanClose( dto.cssClass ) );</a>
-<span class="sourceLineNo">064</span><a id="line.64">            }</a>
-<span class="sourceLineNo">065</span><a id="line.65">        }</a>
-<span class="sourceLineNo">066</span><a id="line.66">    }</a>
-<span class="sourceLineNo">067</span><a id="line.67"></a>
-<span class="sourceLineNo">068</span><a id="line.68">    /**</a>
-<span class="sourceLineNo">069</span><a id="line.69">     * Opening wiki markup for a css element.</a>
-<span class="sourceLineNo">070</span><a id="line.70">     *</a>
-<span class="sourceLineNo">071</span><a id="line.71">     * @return Opening wiki markup for a css element.</a>
-<span class="sourceLineNo">072</span><a id="line.72">     */</a>
-<span class="sourceLineNo">073</span><a id="line.73">    protected abstract String markupCssDivOpen( String cssClass );</a>
-<span class="sourceLineNo">074</span><a id="line.74"></a>
-<span class="sourceLineNo">075</span><a id="line.75">    /**</a>
-<span class="sourceLineNo">076</span><a id="line.76">     * Closing wiki markup for a css element.</a>
-<span class="sourceLineNo">077</span><a id="line.77">     *</a>
-<span class="sourceLineNo">078</span><a id="line.78">     * @return Closing wiki markup for a css element.</a>
-<span class="sourceLineNo">079</span><a id="line.79">     */</a>
-<span class="sourceLineNo">080</span><a id="line.80">    protected abstract String markupCssDivClose( String cssClass );</a>
-<span class="sourceLineNo">081</span><a id="line.81"></a>
-<span class="sourceLineNo">082</span><a id="line.82">    /**</a>
-<span class="sourceLineNo">083</span><a id="line.83">     * Opening wiki markup for a css element.</a>
-<span class="sourceLineNo">084</span><a id="line.84">     *</a>
-<span class="sourceLineNo">085</span><a id="line.85">     * @return Opening wiki markup for a css element.</a>
-<span class="sourceLineNo">086</span><a id="line.86">     */</a>
-<span class="sourceLineNo">087</span><a id="line.87">    protected abstract String markupCssSpanOpen( String cssClass );</a>
-<span class="sourceLineNo">088</span><a id="line.88"></a>
-<span class="sourceLineNo">089</span><a id="line.89">    /**</a>
-<span class="sourceLineNo">090</span><a id="line.90">     * Closing wiki markup for a css element.</a>
-<span class="sourceLineNo">091</span><a id="line.91">     *</a>
-<span class="sourceLineNo">092</span><a id="line.92">     * @return Closing wiki markup for a css element.</a>
-<span class="sourceLineNo">093</span><a id="line.93">     */</a>
-<span class="sourceLineNo">094</span><a id="line.94">    protected abstract String markupCssSpanClose( String cssClass );</a>
-<span class="sourceLineNo">095</span><a id="line.95"></a>
-<span class="sourceLineNo">096</span><a id="line.96">}</a>
+<span class="sourceLineNo">027</span><a id="line.27">/**</a>
+<span class="sourceLineNo">028</span><a id="line.28"> * Translates to wiki syntax from a plain text handling css classes.</a>
+<span class="sourceLineNo">029</span><a id="line.29"> */</a>
+<span class="sourceLineNo">030</span><a id="line.30">public abstract class PlainTextCssDecorator {</a>
+<span class="sourceLineNo">031</span><a id="line.31"></a>
+<span class="sourceLineNo">032</span><a id="line.32">    final protected PrintWriter out;</a>
+<span class="sourceLineNo">033</span><a id="line.33">    final protected XHtmlElementToWikiTranslator chain;</a>
+<span class="sourceLineNo">034</span><a id="line.34">    final protected PlainTextBoldDecorator ptbd;</a>
+<span class="sourceLineNo">035</span><a id="line.35"></a>
+<span class="sourceLineNo">036</span><a id="line.36">    protected PlainTextCssDecorator( final PlainTextBoldDecorator ptbd, final PrintWriter out, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">037</span><a id="line.37">        this.out = out;</a>
+<span class="sourceLineNo">038</span><a id="line.38">        this.chain = chain;</a>
+<span class="sourceLineNo">039</span><a id="line.39">        this.ptbd = ptbd;</a>
+<span class="sourceLineNo">040</span><a id="line.40">    }</a>
+<span class="sourceLineNo">041</span><a id="line.41"></a>
+<span class="sourceLineNo">042</span><a id="line.42">    /**</a>
+<span class="sourceLineNo">043</span><a id="line.43">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">044</span><a id="line.44">     *</a>
+<span class="sourceLineNo">045</span><a id="line.45">     * @param dto XHTML element being translated.</a>
+<span class="sourceLineNo">046</span><a id="line.46">     */</a>
+<span class="sourceLineNo">047</span><a id="line.47">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
+<span class="sourceLineNo">048</span><a id="line.48">        if( dto.cssClass != null &amp;&amp; !dto.ignoredCssClass ) {</a>
+<span class="sourceLineNo">049</span><a id="line.49">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
+<span class="sourceLineNo">050</span><a id="line.50">                out.print( markupCssDivOpen( dto.cssClass ) );</a>
+<span class="sourceLineNo">051</span><a id="line.51">            } else if( MarkupHelper.isHtmlBaseSpan( dto ) ) {</a>
+<span class="sourceLineNo">052</span><a id="line.52">                out.print( markupCssSpanOpen( dto.cssClass ) );</a>
+<span class="sourceLineNo">053</span><a id="line.53">            }</a>
+<span class="sourceLineNo">054</span><a id="line.54">        }</a>
+<span class="sourceLineNo">055</span><a id="line.55">        ptbd.decorate( dto );</a>
+<span class="sourceLineNo">056</span><a id="line.56">        if( dto.cssClass != null &amp;&amp; !dto.ignoredCssClass ) {</a>
+<span class="sourceLineNo">057</span><a id="line.57">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
+<span class="sourceLineNo">058</span><a id="line.58">                out.print( markupCssDivClose( dto.cssClass ) );</a>
+<span class="sourceLineNo">059</span><a id="line.59">            } else if( MarkupHelper.isHtmlBaseSpan( dto ) ) {</a>
+<span class="sourceLineNo">060</span><a id="line.60">                out.print( markupCssSpanClose( dto.cssClass ) );</a>
+<span class="sourceLineNo">061</span><a id="line.61">            }</a>
+<span class="sourceLineNo">062</span><a id="line.62">        }</a>
+<span class="sourceLineNo">063</span><a id="line.63">    }</a>
+<span class="sourceLineNo">064</span><a id="line.64"></a>
+<span class="sourceLineNo">065</span><a id="line.65">    /**</a>
+<span class="sourceLineNo">066</span><a id="line.66">     * Opening wiki markup for a css element.</a>
+<span class="sourceLineNo">067</span><a id="line.67">     *</a>
+<span class="sourceLineNo">068</span><a id="line.68">     * @return Opening wiki markup for a css element.</a>
+<span class="sourceLineNo">069</span><a id="line.69">     */</a>
+<span class="sourceLineNo">070</span><a id="line.70">    protected abstract String markupCssDivOpen( String cssClass );</a>
+<span class="sourceLineNo">071</span><a id="line.71"></a>
+<span class="sourceLineNo">072</span><a id="line.72">    /**</a>
+<span class="sourceLineNo">073</span><a id="line.73">     * Closing wiki markup for a css element.</a>
+<span class="sourceLineNo">074</span><a id="line.74">     *</a>
+<span class="sourceLineNo">075</span><a id="line.75">     * @return Closing wiki markup for a css element.</a>
+<span class="sourceLineNo">076</span><a id="line.76">     */</a>
+<span class="sourceLineNo">077</span><a id="line.77">    protected abstract String markupCssDivClose( String cssClass );</a>
+<span class="sourceLineNo">078</span><a id="line.78"></a>
+<span class="sourceLineNo">079</span><a id="line.79">    /**</a>
+<span class="sourceLineNo">080</span><a id="line.80">     * Opening wiki markup for a css element.</a>
+<span class="sourceLineNo">081</span><a id="line.81">     *</a>
+<span class="sourceLineNo">082</span><a id="line.82">     * @return Opening wiki markup for a css element.</a>
+<span class="sourceLineNo">083</span><a id="line.83">     */</a>
+<span class="sourceLineNo">084</span><a id="line.84">    protected abstract String markupCssSpanOpen( String cssClass );</a>
+<span class="sourceLineNo">085</span><a id="line.85"></a>
+<span class="sourceLineNo">086</span><a id="line.86">    /**</a>
+<span class="sourceLineNo">087</span><a id="line.87">     * Closing wiki markup for a css element.</a>
+<span class="sourceLineNo">088</span><a id="line.88">     *</a>
+<span class="sourceLineNo">089</span><a id="line.89">     * @return Closing wiki markup for a css element.</a>
+<span class="sourceLineNo">090</span><a id="line.90">     */</a>
+<span class="sourceLineNo">091</span><a id="line.91">    protected abstract String markupCssSpanClose( String cssClass );</a>
+<span class="sourceLineNo">092</span><a id="line.92"></a>
+<span class="sourceLineNo">093</span><a id="line.93">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html
index acc454c..39b92bc 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.html
@@ -31,80 +31,77 @@
 <span class="sourceLineNo">022</span><a id="line.22">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">023</span><a id="line.23"></a>
 <span class="sourceLineNo">024</span><a id="line.24">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">025</span><a id="line.25">import java.util.Stack;</a>
+<span class="sourceLineNo">025</span><a id="line.25"></a>
 <span class="sourceLineNo">026</span><a id="line.26"></a>
-<span class="sourceLineNo">027</span><a id="line.27"></a>
-<span class="sourceLineNo">028</span><a id="line.28">/**</a>
-<span class="sourceLineNo">029</span><a id="line.29"> * Translates to wiki syntax from a plain text handling special css.</a>
-<span class="sourceLineNo">030</span><a id="line.30"> */</a>
-<span class="sourceLineNo">031</span><a id="line.31">public abstract class PlainTextCssSpecialDecorator {</a>
-<span class="sourceLineNo">032</span><a id="line.32"></a>
-<span class="sourceLineNo">033</span><a id="line.33">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">034</span><a id="line.34">    final protected Stack&lt; String &gt; preStack;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected XHtmlElementToWikiTranslator chain;</a>
-<span class="sourceLineNo">036</span><a id="line.36"></a>
-<span class="sourceLineNo">037</span><a id="line.37">    protected PlainTextCssSpecialDecorator( final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
-<span class="sourceLineNo">038</span><a id="line.38">        this.out = out;</a>
-<span class="sourceLineNo">039</span><a id="line.39">        this.preStack = preStack;</a>
-<span class="sourceLineNo">040</span><a id="line.40">        this.chain = chain;</a>
-<span class="sourceLineNo">041</span><a id="line.41">    }</a>
-<span class="sourceLineNo">042</span><a id="line.42"></a>
-<span class="sourceLineNo">043</span><a id="line.43">    /**</a>
-<span class="sourceLineNo">044</span><a id="line.44">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">045</span><a id="line.45">     *</a>
-<span class="sourceLineNo">046</span><a id="line.46">     * @param dto XHTML element being translated.</a>
-<span class="sourceLineNo">047</span><a id="line.47">     */</a>
-<span class="sourceLineNo">048</span><a id="line.48">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
-<span class="sourceLineNo">049</span><a id="line.49">        if( dto.cssSpecial != null ) {</a>
-<span class="sourceLineNo">050</span><a id="line.50">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
-<span class="sourceLineNo">051</span><a id="line.51">                out.print( markupCssSpecialDivOpen( dto.cssSpecial ) );</a>
-<span class="sourceLineNo">052</span><a id="line.52">            } else {</a>
-<span class="sourceLineNo">053</span><a id="line.53">                out.print( markupCssSpecialOpen( dto.cssSpecial ) );</a>
-<span class="sourceLineNo">054</span><a id="line.54">            }</a>
-<span class="sourceLineNo">055</span><a id="line.55">        }</a>
-<span class="sourceLineNo">056</span><a id="line.56">        chain.translateChildren( dto.base );</a>
-<span class="sourceLineNo">057</span><a id="line.57">        if( dto.cssSpecial != null ) {</a>
-<span class="sourceLineNo">058</span><a id="line.58">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
-<span class="sourceLineNo">059</span><a id="line.59">                out.print( markupCssSpecialDivClose( dto.cssSpecial ) );</a>
-<span class="sourceLineNo">060</span><a id="line.60">            } else {</a>
-<span class="sourceLineNo">061</span><a id="line.61">                out.print( markupCssSpecialClose( dto.cssSpecial ) );</a>
-<span class="sourceLineNo">062</span><a id="line.62">            }</a>
-<span class="sourceLineNo">063</span><a id="line.63">        }</a>
-<span class="sourceLineNo">064</span><a id="line.64">    }</a>
-<span class="sourceLineNo">065</span><a id="line.65"></a>
-<span class="sourceLineNo">066</span><a id="line.66">    /**</a>
-<span class="sourceLineNo">067</span><a id="line.67">     * Opening wiki markup for a css style element.</a>
-<span class="sourceLineNo">068</span><a id="line.68">     *</a>
-<span class="sourceLineNo">069</span><a id="line.69">     * @param cssStyle css styles to apply</a>
-<span class="sourceLineNo">070</span><a id="line.70">     * @return Opening wiki markup for a css style element.</a>
-<span class="sourceLineNo">071</span><a id="line.71">     */</a>
-<span class="sourceLineNo">072</span><a id="line.72">    protected abstract String markupCssSpecialDivOpen( String cssStyle );</a>
-<span class="sourceLineNo">073</span><a id="line.73"></a>
-<span class="sourceLineNo">074</span><a id="line.74">    /**</a>
-<span class="sourceLineNo">075</span><a id="line.75">     * Closing wiki markup for a css style element.</a>
-<span class="sourceLineNo">076</span><a id="line.76">     *</a>
-<span class="sourceLineNo">077</span><a id="line.77">     * @param cssStyle css styles to apply</a>
-<span class="sourceLineNo">078</span><a id="line.78">     * @return Closing wiki markup for a css style element.</a>
-<span class="sourceLineNo">079</span><a id="line.79">     */</a>
-<span class="sourceLineNo">080</span><a id="line.80">    protected abstract String markupCssSpecialDivClose( String cssStyle );</a>
-<span class="sourceLineNo">081</span><a id="line.81"></a>
-<span class="sourceLineNo">082</span><a id="line.82">    /**</a>
-<span class="sourceLineNo">083</span><a id="line.83">     * Opening wiki markup for a css style element.</a>
-<span class="sourceLineNo">084</span><a id="line.84">     *</a>
-<span class="sourceLineNo">085</span><a id="line.85">     * @param cssStyle css styles to apply</a>
-<span class="sourceLineNo">086</span><a id="line.86">     * @return Opening wiki markup for a css style element.</a>
-<span class="sourceLineNo">087</span><a id="line.87">     */</a>
-<span class="sourceLineNo">088</span><a id="line.88">    protected abstract String markupCssSpecialOpen( String cssStyle );</a>
-<span class="sourceLineNo">089</span><a id="line.89"></a>
-<span class="sourceLineNo">090</span><a id="line.90">    /**</a>
-<span class="sourceLineNo">091</span><a id="line.91">     * Closing wiki markup for a css style element.</a>
-<span class="sourceLineNo">092</span><a id="line.92">     *</a>
-<span class="sourceLineNo">093</span><a id="line.93">     * @param cssStyle css styles to apply</a>
-<span class="sourceLineNo">094</span><a id="line.94">     * @return Closing wiki markup for a css style element.</a>
-<span class="sourceLineNo">095</span><a id="line.95">     */</a>
-<span class="sourceLineNo">096</span><a id="line.96">    protected abstract String markupCssSpecialClose( String cssStyle );</a>
-<span class="sourceLineNo">097</span><a id="line.97"></a>
-<span class="sourceLineNo">098</span><a id="line.98">}</a>
+<span class="sourceLineNo">027</span><a id="line.27">/**</a>
+<span class="sourceLineNo">028</span><a id="line.28"> * Translates to wiki syntax from a plain text handling special css.</a>
+<span class="sourceLineNo">029</span><a id="line.29"> */</a>
+<span class="sourceLineNo">030</span><a id="line.30">public abstract class PlainTextCssSpecialDecorator {</a>
+<span class="sourceLineNo">031</span><a id="line.31"></a>
+<span class="sourceLineNo">032</span><a id="line.32">    final protected PrintWriter out;</a>
+<span class="sourceLineNo">033</span><a id="line.33">    final protected XHtmlElementToWikiTranslator chain;</a>
+<span class="sourceLineNo">034</span><a id="line.34"></a>
+<span class="sourceLineNo">035</span><a id="line.35">    protected PlainTextCssSpecialDecorator( final PrintWriter out, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">036</span><a id="line.36">        this.out = out;</a>
+<span class="sourceLineNo">037</span><a id="line.37">        this.chain = chain;</a>
+<span class="sourceLineNo">038</span><a id="line.38">    }</a>
+<span class="sourceLineNo">039</span><a id="line.39"></a>
+<span class="sourceLineNo">040</span><a id="line.40">    /**</a>
+<span class="sourceLineNo">041</span><a id="line.41">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">042</span><a id="line.42">     *</a>
+<span class="sourceLineNo">043</span><a id="line.43">     * @param dto XHTML element being translated.</a>
+<span class="sourceLineNo">044</span><a id="line.44">     */</a>
+<span class="sourceLineNo">045</span><a id="line.45">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
+<span class="sourceLineNo">046</span><a id="line.46">        if( dto.cssSpecial != null ) {</a>
+<span class="sourceLineNo">047</span><a id="line.47">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
+<span class="sourceLineNo">048</span><a id="line.48">                out.print( markupCssSpecialDivOpen( dto.cssSpecial ) );</a>
+<span class="sourceLineNo">049</span><a id="line.49">            } else {</a>
+<span class="sourceLineNo">050</span><a id="line.50">                out.print( markupCssSpecialOpen( dto.cssSpecial ) );</a>
+<span class="sourceLineNo">051</span><a id="line.51">            }</a>
+<span class="sourceLineNo">052</span><a id="line.52">        }</a>
+<span class="sourceLineNo">053</span><a id="line.53">        chain.translateChildren( dto.base );</a>
+<span class="sourceLineNo">054</span><a id="line.54">        if( dto.cssSpecial != null ) {</a>
+<span class="sourceLineNo">055</span><a id="line.55">            if( MarkupHelper.isHtmlBaseDiv( dto ) ) {</a>
+<span class="sourceLineNo">056</span><a id="line.56">                out.print( markupCssSpecialDivClose( dto.cssSpecial ) );</a>
+<span class="sourceLineNo">057</span><a id="line.57">            } else {</a>
+<span class="sourceLineNo">058</span><a id="line.58">                out.print( markupCssSpecialClose( dto.cssSpecial ) );</a>
+<span class="sourceLineNo">059</span><a id="line.59">            }</a>
+<span class="sourceLineNo">060</span><a id="line.60">        }</a>
+<span class="sourceLineNo">061</span><a id="line.61">    }</a>
+<span class="sourceLineNo">062</span><a id="line.62"></a>
+<span class="sourceLineNo">063</span><a id="line.63">    /**</a>
+<span class="sourceLineNo">064</span><a id="line.64">     * Opening wiki markup for a css style element.</a>
+<span class="sourceLineNo">065</span><a id="line.65">     *</a>
+<span class="sourceLineNo">066</span><a id="line.66">     * @param cssStyle css styles to apply</a>
+<span class="sourceLineNo">067</span><a id="line.67">     * @return Opening wiki markup for a css style element.</a>
+<span class="sourceLineNo">068</span><a id="line.68">     */</a>
+<span class="sourceLineNo">069</span><a id="line.69">    protected abstract String markupCssSpecialDivOpen( String cssStyle );</a>
+<span class="sourceLineNo">070</span><a id="line.70"></a>
+<span class="sourceLineNo">071</span><a id="line.71">    /**</a>
+<span class="sourceLineNo">072</span><a id="line.72">     * Closing wiki markup for a css style element.</a>
+<span class="sourceLineNo">073</span><a id="line.73">     *</a>
+<span class="sourceLineNo">074</span><a id="line.74">     * @param cssStyle css styles to apply</a>
+<span class="sourceLineNo">075</span><a id="line.75">     * @return Closing wiki markup for a css style element.</a>
+<span class="sourceLineNo">076</span><a id="line.76">     */</a>
+<span class="sourceLineNo">077</span><a id="line.77">    protected abstract String markupCssSpecialDivClose( String cssStyle );</a>
+<span class="sourceLineNo">078</span><a id="line.78"></a>
+<span class="sourceLineNo">079</span><a id="line.79">    /**</a>
+<span class="sourceLineNo">080</span><a id="line.80">     * Opening wiki markup for a css style element.</a>
+<span class="sourceLineNo">081</span><a id="line.81">     *</a>
+<span class="sourceLineNo">082</span><a id="line.82">     * @param cssStyle css styles to apply</a>
+<span class="sourceLineNo">083</span><a id="line.83">     * @return Opening wiki markup for a css style element.</a>
+<span class="sourceLineNo">084</span><a id="line.84">     */</a>
+<span class="sourceLineNo">085</span><a id="line.85">    protected abstract String markupCssSpecialOpen( String cssStyle );</a>
+<span class="sourceLineNo">086</span><a id="line.86"></a>
+<span class="sourceLineNo">087</span><a id="line.87">    /**</a>
+<span class="sourceLineNo">088</span><a id="line.88">     * Closing wiki markup for a css style element.</a>
+<span class="sourceLineNo">089</span><a id="line.89">     *</a>
+<span class="sourceLineNo">090</span><a id="line.90">     * @param cssStyle css styles to apply</a>
+<span class="sourceLineNo">091</span><a id="line.91">     * @return Closing wiki markup for a css style element.</a>
+<span class="sourceLineNo">092</span><a id="line.92">     */</a>
+<span class="sourceLineNo">093</span><a id="line.93">    protected abstract String markupCssSpecialClose( String cssStyle );</a>
+<span class="sourceLineNo">094</span><a id="line.94"></a>
+<span class="sourceLineNo">095</span><a id="line.95">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html
index e500076..fbe51f8 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.html
@@ -31,43 +31,40 @@
 <span class="sourceLineNo">022</span><a id="line.22">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">023</span><a id="line.23"></a>
 <span class="sourceLineNo">024</span><a id="line.24">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">025</span><a id="line.25">import java.util.Stack;</a>
+<span class="sourceLineNo">025</span><a id="line.25"></a>
 <span class="sourceLineNo">026</span><a id="line.26"></a>
-<span class="sourceLineNo">027</span><a id="line.27"></a>
-<span class="sourceLineNo">028</span><a id="line.28">/**</a>
-<span class="sourceLineNo">029</span><a id="line.29"> * Translates to wiki syntax from a plain text. Specifically, this decorator handles the following conversions, when needed:</a>
-<span class="sourceLineNo">030</span><a id="line.30"> * &lt;ul&gt;</a>
-<span class="sourceLineNo">031</span><a id="line.31"> *     &lt;li&gt;Bold elements&lt;/li&gt;</a>
-<span class="sourceLineNo">032</span><a id="line.32"> *     &lt;li&gt;Italic elements&lt;/li&gt;</a>
-<span class="sourceLineNo">033</span><a id="line.33"> *     &lt;li&gt;Monospace elements&lt;/li&gt;</a>
-<span class="sourceLineNo">034</span><a id="line.34"> *     &lt;li&gt;Css classes&lt;/li&gt;</a>
-<span class="sourceLineNo">035</span><a id="line.35"> *     &lt;li&gt;Css styles&lt;/li&gt;</a>
-<span class="sourceLineNo">036</span><a id="line.36"> * &lt;/ul&gt;</a>
-<span class="sourceLineNo">037</span><a id="line.37"> */</a>
-<span class="sourceLineNo">038</span><a id="line.38">public class PlainTextDecorator {</a>
-<span class="sourceLineNo">039</span><a id="line.39"></a>
-<span class="sourceLineNo">040</span><a id="line.40">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">041</span><a id="line.41">    final protected Stack&lt; String &gt; preStack;</a>
-<span class="sourceLineNo">042</span><a id="line.42">    final protected XHtmlElementToWikiTranslator chain;</a>
-<span class="sourceLineNo">043</span><a id="line.43">    final protected PlainTextCssDecorator ptcd;</a>
-<span class="sourceLineNo">044</span><a id="line.44"></a>
-<span class="sourceLineNo">045</span><a id="line.45">    public PlainTextDecorator( final PlainTextCssDecorator ptcd, final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
-<span class="sourceLineNo">046</span><a id="line.46">        this.out = out;</a>
-<span class="sourceLineNo">047</span><a id="line.47">        this.preStack = preStack;</a>
-<span class="sourceLineNo">048</span><a id="line.48">        this.chain = chain;</a>
-<span class="sourceLineNo">049</span><a id="line.49">        this.ptcd = ptcd;</a>
-<span class="sourceLineNo">050</span><a id="line.50">    }</a>
-<span class="sourceLineNo">051</span><a id="line.51"></a>
-<span class="sourceLineNo">052</span><a id="line.52">    /**</a>
-<span class="sourceLineNo">053</span><a id="line.53">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">054</span><a id="line.54">     *</a>
-<span class="sourceLineNo">055</span><a id="line.55">     * @param dto XHTML element being translated.</a>
-<span class="sourceLineNo">056</span><a id="line.56">     */</a>
-<span class="sourceLineNo">057</span><a id="line.57">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
-<span class="sourceLineNo">058</span><a id="line.58">        ptcd.decorate( dto );</a>
-<span class="sourceLineNo">059</span><a id="line.59">    }</a>
-<span class="sourceLineNo">060</span><a id="line.60"></a>
-<span class="sourceLineNo">061</span><a id="line.61">}</a>
+<span class="sourceLineNo">027</span><a id="line.27">/**</a>
+<span class="sourceLineNo">028</span><a id="line.28"> * Translates to wiki syntax from a plain text. Specifically, this decorator handles the following conversions, when needed:</a>
+<span class="sourceLineNo">029</span><a id="line.29"> * &lt;ul&gt;</a>
+<span class="sourceLineNo">030</span><a id="line.30"> *     &lt;li&gt;Bold elements&lt;/li&gt;</a>
+<span class="sourceLineNo">031</span><a id="line.31"> *     &lt;li&gt;Italic elements&lt;/li&gt;</a>
+<span class="sourceLineNo">032</span><a id="line.32"> *     &lt;li&gt;Monospace elements&lt;/li&gt;</a>
+<span class="sourceLineNo">033</span><a id="line.33"> *     &lt;li&gt;Css classes&lt;/li&gt;</a>
+<span class="sourceLineNo">034</span><a id="line.34"> *     &lt;li&gt;Css styles&lt;/li&gt;</a>
+<span class="sourceLineNo">035</span><a id="line.35"> * &lt;/ul&gt;</a>
+<span class="sourceLineNo">036</span><a id="line.36"> */</a>
+<span class="sourceLineNo">037</span><a id="line.37">public class PlainTextDecorator {</a>
+<span class="sourceLineNo">038</span><a id="line.38"></a>
+<span class="sourceLineNo">039</span><a id="line.39">    final protected PrintWriter out;</a>
+<span class="sourceLineNo">040</span><a id="line.40">    final protected XHtmlElementToWikiTranslator chain;</a>
+<span class="sourceLineNo">041</span><a id="line.41">    final protected PlainTextCssDecorator ptcd;</a>
+<span class="sourceLineNo">042</span><a id="line.42"></a>
+<span class="sourceLineNo">043</span><a id="line.43">    public PlainTextDecorator( final PlainTextCssDecorator ptcd, final PrintWriter out, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">044</span><a id="line.44">        this.out = out;</a>
+<span class="sourceLineNo">045</span><a id="line.45">        this.chain = chain;</a>
+<span class="sourceLineNo">046</span><a id="line.46">        this.ptcd = ptcd;</a>
+<span class="sourceLineNo">047</span><a id="line.47">    }</a>
+<span class="sourceLineNo">048</span><a id="line.48"></a>
+<span class="sourceLineNo">049</span><a id="line.49">    /**</a>
+<span class="sourceLineNo">050</span><a id="line.50">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">051</span><a id="line.51">     *</a>
+<span class="sourceLineNo">052</span><a id="line.52">     * @param dto XHTML element being translated.</a>
+<span class="sourceLineNo">053</span><a id="line.53">     */</a>
+<span class="sourceLineNo">054</span><a id="line.54">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
+<span class="sourceLineNo">055</span><a id="line.55">        ptcd.decorate( dto );</a>
+<span class="sourceLineNo">056</span><a id="line.56">    }</a>
+<span class="sourceLineNo">057</span><a id="line.57"></a>
+<span class="sourceLineNo">058</span><a id="line.58">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html
index ee1a89e..02cbfbb 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.html
@@ -32,67 +32,64 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26"></a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
-<span class="sourceLineNo">028</span><a id="line.28"></a>
-<span class="sourceLineNo">029</span><a id="line.29">/**</a>
-<span class="sourceLineNo">030</span><a id="line.30"> * Translates to wiki syntax from a plain text handling italic.</a>
-<span class="sourceLineNo">031</span><a id="line.31"> */</a>
-<span class="sourceLineNo">032</span><a id="line.32">public abstract class PlainTextItalicDecorator {</a>
-<span class="sourceLineNo">033</span><a id="line.33"></a>
-<span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
-<span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
-<span class="sourceLineNo">037</span><a id="line.37">    final protected PlainTextMonospaceDecorator ptmd;</a>
-<span class="sourceLineNo">038</span><a id="line.38"></a>
-<span class="sourceLineNo">039</span><a id="line.39">    protected PlainTextItalicDecorator( final PlainTextMonospaceDecorator ptmd, final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
-<span class="sourceLineNo">040</span><a id="line.40">        this.out = out;</a>
-<span class="sourceLineNo">041</span><a id="line.41">        this.preStack = preStack;</a>
-<span class="sourceLineNo">042</span><a id="line.42">        this.chain = chain;</a>
-<span class="sourceLineNo">043</span><a id="line.43">        this.ptmd = ptmd;</a>
-<span class="sourceLineNo">044</span><a id="line.44">    }</a>
-<span class="sourceLineNo">045</span><a id="line.45"></a>
-<span class="sourceLineNo">046</span><a id="line.46">    /**</a>
-<span class="sourceLineNo">047</span><a id="line.47">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">048</span><a id="line.48">     *</a>
-<span class="sourceLineNo">049</span><a id="line.49">     * @param dto XHTML element being translated.</a>
-<span class="sourceLineNo">050</span><a id="line.50">     */</a>
-<span class="sourceLineNo">051</span><a id="line.51">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
-<span class="sourceLineNo">052</span><a id="line.52">        if( dto.italic ) {</a>
-<span class="sourceLineNo">053</span><a id="line.53">            out.print( markupItalicOpen() );</a>
-<span class="sourceLineNo">054</span><a id="line.54">        }</a>
-<span class="sourceLineNo">055</span><a id="line.55">        ptmd.decorate( dto );</a>
-<span class="sourceLineNo">056</span><a id="line.56">        if( dto.italic ) {</a>
-<span class="sourceLineNo">057</span><a id="line.57">            out.print( markupItalicClose() );</a>
-<span class="sourceLineNo">058</span><a id="line.58">        }</a>
-<span class="sourceLineNo">059</span><a id="line.59">    }</a>
-<span class="sourceLineNo">060</span><a id="line.60"></a>
-<span class="sourceLineNo">061</span><a id="line.61">    /**</a>
-<span class="sourceLineNo">062</span><a id="line.62">     * Translates the given XHTML element into wiki markup.</a>
-<span class="sourceLineNo">063</span><a id="line.63">     *</a>
-<span class="sourceLineNo">064</span><a id="line.64">     * @param e XHTML element being translated.</a>
-<span class="sourceLineNo">065</span><a id="line.65">     */</a>
-<span class="sourceLineNo">066</span><a id="line.66">    public void decorate( final Element e ) throws JDOMException {</a>
-<span class="sourceLineNo">067</span><a id="line.67">        out.print( markupItalicOpen() );</a>
-<span class="sourceLineNo">068</span><a id="line.68">        chain.translate( e );</a>
-<span class="sourceLineNo">069</span><a id="line.69">        out.print( markupItalicClose() );</a>
-<span class="sourceLineNo">070</span><a id="line.70">    }</a>
-<span class="sourceLineNo">071</span><a id="line.71"></a>
-<span class="sourceLineNo">072</span><a id="line.72">    /**</a>
-<span class="sourceLineNo">073</span><a id="line.73">     * Opening wiki markup for an italic element.</a>
-<span class="sourceLineNo">074</span><a id="line.74">     *</a>
-<span class="sourceLineNo">075</span><a id="line.75">     * @return Opening wiki markup for an italic element.</a>
-<span class="sourceLineNo">076</span><a id="line.76">     */</a>
-<span class="sourceLineNo">077</span><a id="line.77">    protected abstract String markupItalicOpen();</a>
-<span class="sourceLineNo">078</span><a id="line.78"></a>
-<span class="sourceLineNo">079</span><a id="line.79">    /**</a>
-<span class="sourceLineNo">080</span><a id="line.80">     * Closing wiki markup for an italic element.</a>
-<span class="sourceLineNo">081</span><a id="line.81">     *</a>
-<span class="sourceLineNo">082</span><a id="line.82">     * @return Closing wiki markup for an italic element.</a>
-<span class="sourceLineNo">083</span><a id="line.83">     */</a>
-<span class="sourceLineNo">084</span><a id="line.84">    protected abstract String markupItalicClose();</a>
-<span class="sourceLineNo">085</span><a id="line.85"></a>
-<span class="sourceLineNo">086</span><a id="line.86">}</a>
+<span class="sourceLineNo">028</span><a id="line.28">/**</a>
+<span class="sourceLineNo">029</span><a id="line.29"> * Translates to wiki syntax from a plain text handling italic.</a>
+<span class="sourceLineNo">030</span><a id="line.30"> */</a>
+<span class="sourceLineNo">031</span><a id="line.31">public abstract class PlainTextItalicDecorator {</a>
+<span class="sourceLineNo">032</span><a id="line.32"></a>
+<span class="sourceLineNo">033</span><a id="line.33">    final protected PrintWriter out;</a>
+<span class="sourceLineNo">034</span><a id="line.34">    final protected XHtmlElementToWikiTranslator chain;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected PlainTextMonospaceDecorator ptmd;</a>
+<span class="sourceLineNo">036</span><a id="line.36"></a>
+<span class="sourceLineNo">037</span><a id="line.37">    protected PlainTextItalicDecorator( final PlainTextMonospaceDecorator ptmd, final PrintWriter out, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">        this.out = out;</a>
+<span class="sourceLineNo">039</span><a id="line.39">        this.chain = chain;</a>
+<span class="sourceLineNo">040</span><a id="line.40">        this.ptmd = ptmd;</a>
+<span class="sourceLineNo">041</span><a id="line.41">    }</a>
+<span class="sourceLineNo">042</span><a id="line.42"></a>
+<span class="sourceLineNo">043</span><a id="line.43">    /**</a>
+<span class="sourceLineNo">044</span><a id="line.44">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">045</span><a id="line.45">     *</a>
+<span class="sourceLineNo">046</span><a id="line.46">     * @param dto XHTML element being translated.</a>
+<span class="sourceLineNo">047</span><a id="line.47">     */</a>
+<span class="sourceLineNo">048</span><a id="line.48">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
+<span class="sourceLineNo">049</span><a id="line.49">        if( dto.italic ) {</a>
+<span class="sourceLineNo">050</span><a id="line.50">            out.print( markupItalicOpen() );</a>
+<span class="sourceLineNo">051</span><a id="line.51">        }</a>
+<span class="sourceLineNo">052</span><a id="line.52">        ptmd.decorate( dto );</a>
+<span class="sourceLineNo">053</span><a id="line.53">        if( dto.italic ) {</a>
+<span class="sourceLineNo">054</span><a id="line.54">            out.print( markupItalicClose() );</a>
+<span class="sourceLineNo">055</span><a id="line.55">        }</a>
+<span class="sourceLineNo">056</span><a id="line.56">    }</a>
+<span class="sourceLineNo">057</span><a id="line.57"></a>
+<span class="sourceLineNo">058</span><a id="line.58">    /**</a>
+<span class="sourceLineNo">059</span><a id="line.59">     * Translates the given XHTML element into wiki markup.</a>
+<span class="sourceLineNo">060</span><a id="line.60">     *</a>
+<span class="sourceLineNo">061</span><a id="line.61">     * @param e XHTML element being translated.</a>
+<span class="sourceLineNo">062</span><a id="line.62">     */</a>
+<span class="sourceLineNo">063</span><a id="line.63">    public void decorate( final Element e ) throws JDOMException {</a>
+<span class="sourceLineNo">064</span><a id="line.64">        out.print( markupItalicOpen() );</a>
+<span class="sourceLineNo">065</span><a id="line.65">        chain.translate( e );</a>
+<span class="sourceLineNo">066</span><a id="line.66">        out.print( markupItalicClose() );</a>
+<span class="sourceLineNo">067</span><a id="line.67">    }</a>
+<span class="sourceLineNo">068</span><a id="line.68"></a>
+<span class="sourceLineNo">069</span><a id="line.69">    /**</a>
+<span class="sourceLineNo">070</span><a id="line.70">     * Opening wiki markup for an italic element.</a>
+<span class="sourceLineNo">071</span><a id="line.71">     *</a>
+<span class="sourceLineNo">072</span><a id="line.72">     * @return Opening wiki markup for an italic element.</a>
+<span class="sourceLineNo">073</span><a id="line.73">     */</a>
+<span class="sourceLineNo">074</span><a id="line.74">    protected abstract String markupItalicOpen();</a>
+<span class="sourceLineNo">075</span><a id="line.75"></a>
+<span class="sourceLineNo">076</span><a id="line.76">    /**</a>
+<span class="sourceLineNo">077</span><a id="line.77">     * Closing wiki markup for an italic element.</a>
+<span class="sourceLineNo">078</span><a id="line.78">     *</a>
+<span class="sourceLineNo">079</span><a id="line.79">     * @return Closing wiki markup for an italic element.</a>
+<span class="sourceLineNo">080</span><a id="line.80">     */</a>
+<span class="sourceLineNo">081</span><a id="line.81">    protected abstract String markupItalicClose();</a>
+<span class="sourceLineNo">082</span><a id="line.82"></a>
+<span class="sourceLineNo">083</span><a id="line.83">}</a>
 
 
 
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html
index c1b8d52..3ea408d 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,11 +41,11 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class PlainTextMonospaceDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; preStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37">    final protected PlainTextCssSpecialDecorator ptcsd;</a>
 <span class="sourceLineNo">038</span><a id="line.38"></a>
-<span class="sourceLineNo">039</span><a id="line.39">    protected PlainTextMonospaceDecorator( final PlainTextCssSpecialDecorator ptcsd, final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">039</span><a id="line.39">    protected PlainTextMonospaceDecorator( final PlainTextCssSpecialDecorator ptcsd, final PrintWriter out, final Deque&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.out = out;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.preStack = preStack;</a>
 <span class="sourceLineNo">042</span><a id="line.42">        this.chain = chain;</a>
@@ -60,11 +60,11 @@
 <span class="sourceLineNo">051</span><a id="line.51">    public void decorate( final XHtmlElementToWikiTranslator.ElementDecoratorData dto ) throws JDOMException {</a>
 <span class="sourceLineNo">052</span><a id="line.52">        if( dto.monospace ) {</a>
 <span class="sourceLineNo">053</span><a id="line.53">            out.print( markupMonospaceOpen() );</a>
-<span class="sourceLineNo">054</span><a id="line.54">            preStack.push( markupMonospaceOpen() );</a>
+<span class="sourceLineNo">054</span><a id="line.54">            preStack.addFirst( markupMonospaceOpen() );</a>
 <span class="sourceLineNo">055</span><a id="line.55">        }</a>
 <span class="sourceLineNo">056</span><a id="line.56">        ptcsd.decorate( dto );</a>
 <span class="sourceLineNo">057</span><a id="line.57">        if( dto.monospace ) {</a>
-<span class="sourceLineNo">058</span><a id="line.58">            preStack.pop();</a>
+<span class="sourceLineNo">058</span><a id="line.58">            preStack.removeFirst();</a>
 <span class="sourceLineNo">059</span><a id="line.59">            out.print( markupMonospaceClose() );</a>
 <span class="sourceLineNo">060</span><a id="line.60">        }</a>
 <span class="sourceLineNo">061</span><a id="line.61">    }</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html
index 5fdb770..b6d5e41 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TdDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class TdDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; preStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected TdDecorator( final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected TdDecorator( final PrintWriter out, final Deque&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.preStack = preStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html
index a42dfcf..456efd3 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.html
@@ -30,7 +30,7 @@
 <span class="sourceLineNo">021</span><a id="line.21">import org.jdom2.Text;</a>
 <span class="sourceLineNo">022</span><a id="line.22"></a>
 <span class="sourceLineNo">023</span><a id="line.23">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">024</span><a id="line.24">import java.util.Stack;</a>
+<span class="sourceLineNo">024</span><a id="line.24">import java.util.Deque;</a>
 <span class="sourceLineNo">025</span><a id="line.25"></a>
 <span class="sourceLineNo">026</span><a id="line.26"></a>
 <span class="sourceLineNo">027</span><a id="line.27">/**</a>
@@ -39,9 +39,9 @@
 <span class="sourceLineNo">030</span><a id="line.30">public class TextElementDecorator {</a>
 <span class="sourceLineNo">031</span><a id="line.31"></a>
 <span class="sourceLineNo">032</span><a id="line.32">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">033</span><a id="line.33">    final protected Stack&lt; String &gt; preStack;</a>
+<span class="sourceLineNo">033</span><a id="line.33">    final protected Deque&lt; String &gt; preStack;</a>
 <span class="sourceLineNo">034</span><a id="line.34"></a>
-<span class="sourceLineNo">035</span><a id="line.35">    public TextElementDecorator( final PrintWriter out, final Stack&lt; String &gt; preStack ) {</a>
+<span class="sourceLineNo">035</span><a id="line.35">    public TextElementDecorator( final PrintWriter out, final Deque&lt; String &gt; preStack ) {</a>
 <span class="sourceLineNo">036</span><a id="line.36">        this.out = out;</a>
 <span class="sourceLineNo">037</span><a id="line.37">        this.preStack = preStack;</a>
 <span class="sourceLineNo">038</span><a id="line.38">    }</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html
index e3785f8..832e44e 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/ThDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class ThDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; preStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; preStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected ThDecorator( final PrintWriter out, final Stack&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected ThDecorator( final PrintWriter out, final Deque&lt; String &gt; preStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.preStack = preStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html
index 2eff0a4..892fbca 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/UlDecorator.html
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">023</span><a id="line.23">import org.jdom2.JDOMException;</a>
 <span class="sourceLineNo">024</span><a id="line.24"></a>
 <span class="sourceLineNo">025</span><a id="line.25">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">026</span><a id="line.26">import java.util.Stack;</a>
+<span class="sourceLineNo">026</span><a id="line.26">import java.util.Deque;</a>
 <span class="sourceLineNo">027</span><a id="line.27"></a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">/**</a>
@@ -41,10 +41,10 @@
 <span class="sourceLineNo">032</span><a id="line.32">public abstract class UlDecorator {</a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">    final protected PrintWriter out;</a>
-<span class="sourceLineNo">035</span><a id="line.35">    final protected Stack&lt; String &gt; liStack;</a>
+<span class="sourceLineNo">035</span><a id="line.35">    final protected Deque&lt; String &gt; liStack;</a>
 <span class="sourceLineNo">036</span><a id="line.36">    final protected XHtmlElementToWikiTranslator chain;</a>
 <span class="sourceLineNo">037</span><a id="line.37"></a>
-<span class="sourceLineNo">038</span><a id="line.38">    protected UlDecorator( final PrintWriter out, final Stack&lt; String &gt; liStack, final XHtmlElementToWikiTranslator chain ) {</a>
+<span class="sourceLineNo">038</span><a id="line.38">    protected UlDecorator( final PrintWriter out, final Deque&lt; String &gt; liStack, final XHtmlElementToWikiTranslator chain ) {</a>
 <span class="sourceLineNo">039</span><a id="line.39">        this.out = out;</a>
 <span class="sourceLineNo">040</span><a id="line.40">        this.liStack = liStack;</a>
 <span class="sourceLineNo">041</span><a id="line.41">        this.chain = chain;</a>
@@ -57,9 +57,9 @@
 <span class="sourceLineNo">048</span><a id="line.48">     */</a>
 <span class="sourceLineNo">049</span><a id="line.49">    public void decorate( final Element e ) throws JDOMException {</a>
 <span class="sourceLineNo">050</span><a id="line.50">        out.println();</a>
-<span class="sourceLineNo">051</span><a id="line.51">        liStack.push( markupUl() );</a>
+<span class="sourceLineNo">051</span><a id="line.51">        liStack.addFirst( markupUl() );</a>
 <span class="sourceLineNo">052</span><a id="line.52">        chain.translate( e );</a>
-<span class="sourceLineNo">053</span><a id="line.53">        liStack.pop();</a>
+<span class="sourceLineNo">053</span><a id="line.53">        liStack.removeFirst();</a>
 <span class="sourceLineNo">054</span><a id="line.54">    }</a>
 <span class="sourceLineNo">055</span><a id="line.55"></a>
 <span class="sourceLineNo">056</span><a id="line.56">    /**</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html
index 951d136..5484032 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.html
@@ -36,15 +36,15 @@
 <span class="sourceLineNo">027</span><a id="line.27">import org.jdom2.Text;</a>
 <span class="sourceLineNo">028</span><a id="line.28"></a>
 <span class="sourceLineNo">029</span><a id="line.29">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">030</span><a id="line.30">import java.util.Map;</a>
-<span class="sourceLineNo">031</span><a id="line.31">import java.util.Stack;</a>
+<span class="sourceLineNo">030</span><a id="line.30">import java.util.Deque;</a>
+<span class="sourceLineNo">031</span><a id="line.31">import java.util.Map;</a>
 <span class="sourceLineNo">032</span><a id="line.32"></a>
 <span class="sourceLineNo">033</span><a id="line.33"></a>
 <span class="sourceLineNo">034</span><a id="line.34">/**</a>
 <span class="sourceLineNo">035</span><a id="line.35"> * &lt;p&gt;Base Syntax decorator which translates to JSPWiki syntax. Delegates each kind of XHTML element to its specific</a>
 <span class="sourceLineNo">036</span><a id="line.36"> * decorator.&lt;/p&gt;</a>
 <span class="sourceLineNo">037</span><a id="line.37"> * &lt;p&gt;This class is useful when developing a new wiki syntax decorator - just extend from it and provide the implementations of all</a>
-<span class="sourceLineNo">038</span><a id="line.38"> * the needed Decorators on the {@link SyntaxDecorator#init(PrintWriter, Stack, Stack, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)} method&lt;/p&gt;</a>
+<span class="sourceLineNo">038</span><a id="line.38"> * the needed Decorators on the {@link SyntaxDecorator#init(PrintWriter, Deque, Deque, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)} method&lt;/p&gt;</a>
 <span class="sourceLineNo">039</span><a id="line.39"> */</a>
 <span class="sourceLineNo">040</span><a id="line.40">public abstract class WikiSyntaxDecorator implements SyntaxDecorator {</a>
 <span class="sourceLineNo">041</span><a id="line.41"></a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html
index 377abc1..dd2db52 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.html
@@ -40,7 +40,7 @@
 <span class="sourceLineNo">031</span><a id="line.31">import org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator;</a>
 <span class="sourceLineNo">032</span><a id="line.32"></a>
 <span class="sourceLineNo">033</span><a id="line.33">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">034</span><a id="line.34">import java.util.Stack;</a>
+<span class="sourceLineNo">034</span><a id="line.34">import java.util.Deque;</a>
 <span class="sourceLineNo">035</span><a id="line.35"></a>
 <span class="sourceLineNo">036</span><a id="line.36"></a>
 <span class="sourceLineNo">037</span><a id="line.37">/**</a>
@@ -51,8 +51,8 @@
 <span class="sourceLineNo">042</span><a id="line.42">    /** {@inheritDoc} */</a>
 <span class="sourceLineNo">043</span><a id="line.43">    @Override</a>
 <span class="sourceLineNo">044</span><a id="line.44">    public void init( final PrintWriter out,</a>
-<span class="sourceLineNo">045</span><a id="line.45">                      final Stack&lt; String &gt; liStack,</a>
-<span class="sourceLineNo">046</span><a id="line.46">                      final Stack&lt; String &gt; preStack,</a>
+<span class="sourceLineNo">045</span><a id="line.45">                      final Deque&lt; String &gt; liStack,</a>
+<span class="sourceLineNo">046</span><a id="line.46">                      final Deque&lt; String &gt; preStack,</a>
 <span class="sourceLineNo">047</span><a id="line.47">                      final WhitespaceTrimWriter outTrimmer,</a>
 <span class="sourceLineNo">048</span><a id="line.48">                      final XHtmlToWikiConfig config,</a>
 <span class="sourceLineNo">049</span><a id="line.49">                      final XHtmlElementToWikiTranslator chain ) {</a>
@@ -60,12 +60,12 @@
 <span class="sourceLineNo">051</span><a id="line.51">        this.outTrimmer = outTrimmer;</a>
 <span class="sourceLineNo">052</span><a id="line.52">        this.chain = chain;</a>
 <span class="sourceLineNo">053</span><a id="line.53"></a>
-<span class="sourceLineNo">054</span><a id="line.54">        this.cssStyle = new JSPWikiPlainTextCssSpecialDecorator( out, preStack, chain );</a>
+<span class="sourceLineNo">054</span><a id="line.54">        this.cssStyle = new JSPWikiPlainTextCssSpecialDecorator( out, chain );</a>
 <span class="sourceLineNo">055</span><a id="line.55">        this.pre = new JSPWikiPlainTextMonospaceDecorator( cssStyle, out, preStack, chain );</a>
-<span class="sourceLineNo">056</span><a id="line.56">        this.em = new JSPWikiPlainTextItalicDecorator( pre, out, preStack, chain );</a>
-<span class="sourceLineNo">057</span><a id="line.57">        this.strong = new JSPWikiPlainTextBoldDecorator( em, out, preStack, chain );</a>
-<span class="sourceLineNo">058</span><a id="line.58">        this.css = new JSPWikiPlainTextCssDecorator( strong, out, preStack, chain );</a>
-<span class="sourceLineNo">059</span><a id="line.59">        this.plainText = new PlainTextDecorator( css, out, preStack, chain );</a>
+<span class="sourceLineNo">056</span><a id="line.56">        this.em = new JSPWikiPlainTextItalicDecorator( pre, out, chain );</a>
+<span class="sourceLineNo">057</span><a id="line.57">        this.strong = new JSPWikiPlainTextBoldDecorator( em, out, chain );</a>
+<span class="sourceLineNo">058</span><a id="line.58">        this.css = new JSPWikiPlainTextCssDecorator( strong, out, chain );</a>
+<span class="sourceLineNo">059</span><a id="line.59">        this.plainText = new PlainTextDecorator( css, out, chain );</a>
 <span class="sourceLineNo">060</span><a id="line.60"></a>
 <span class="sourceLineNo">061</span><a id="line.61">        this.a = new JSPWikiADecorator( out, config, chain );</a>
 <span class="sourceLineNo">062</span><a id="line.62">        this.br = new JSPWikiBrDecorator( out, preStack, chain );</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html
index 4b6a45d..18d0ad5 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.html
@@ -39,7 +39,7 @@
 <span class="sourceLineNo">030</span><a id="line.30">import org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator;</a>
 <span class="sourceLineNo">031</span><a id="line.31"></a>
 <span class="sourceLineNo">032</span><a id="line.32">import java.io.PrintWriter;</a>
-<span class="sourceLineNo">033</span><a id="line.33">import java.util.Stack;</a>
+<span class="sourceLineNo">033</span><a id="line.33">import java.util.Deque;</a>
 <span class="sourceLineNo">034</span><a id="line.34"></a>
 <span class="sourceLineNo">035</span><a id="line.35"></a>
 <span class="sourceLineNo">036</span><a id="line.36">/**</a>
@@ -50,8 +50,8 @@
 <span class="sourceLineNo">041</span><a id="line.41">    /** {@inheritDoc} */</a>
 <span class="sourceLineNo">042</span><a id="line.42">    @Override</a>
 <span class="sourceLineNo">043</span><a id="line.43">    public void init( final PrintWriter out,</a>
-<span class="sourceLineNo">044</span><a id="line.44">                      final Stack&lt; String &gt; liStack,</a>
-<span class="sourceLineNo">045</span><a id="line.45">                      final Stack&lt; String &gt; preStack,</a>
+<span class="sourceLineNo">044</span><a id="line.44">                      final Deque&lt; String &gt; liStack,</a>
+<span class="sourceLineNo">045</span><a id="line.45">                      final Deque&lt; String &gt; preStack,</a>
 <span class="sourceLineNo">046</span><a id="line.46">                      final WhitespaceTrimWriter outTrimmer,</a>
 <span class="sourceLineNo">047</span><a id="line.47">                      final XHtmlToWikiConfig config,</a>
 <span class="sourceLineNo">048</span><a id="line.48">                      final XHtmlElementToWikiTranslator chain ) {</a>
@@ -59,12 +59,12 @@
 <span class="sourceLineNo">050</span><a id="line.50">        this.outTrimmer = outTrimmer;</a>
 <span class="sourceLineNo">051</span><a id="line.51">        this.chain = chain;</a>
 <span class="sourceLineNo">052</span><a id="line.52"></a>
-<span class="sourceLineNo">053</span><a id="line.53">        this.cssStyle = new MarkdownPlainTextCssSpecialDecorator( out, preStack, chain );</a>
+<span class="sourceLineNo">053</span><a id="line.53">        this.cssStyle = new MarkdownPlainTextCssSpecialDecorator( out, chain );</a>
 <span class="sourceLineNo">054</span><a id="line.54">        this.pre = new MarkdownPlainTextMonospaceDecorator( cssStyle, out, preStack, chain );</a>
-<span class="sourceLineNo">055</span><a id="line.55">        this.em = new MarkdownPlainTextItalicDecorator( pre, out, preStack, chain );</a>
-<span class="sourceLineNo">056</span><a id="line.56">        this.strong = new MarkdownPlainTextBoldDecorator( em, out, preStack, chain );</a>
-<span class="sourceLineNo">057</span><a id="line.57">        this.css = new MarkdownPlainTextCssDecorator( strong, out, preStack, chain );</a>
-<span class="sourceLineNo">058</span><a id="line.58">        this.plainText = new PlainTextDecorator( css, out, preStack, chain );</a>
+<span class="sourceLineNo">055</span><a id="line.55">        this.em = new MarkdownPlainTextItalicDecorator( pre, out, chain );</a>
+<span class="sourceLineNo">056</span><a id="line.56">        this.strong = new MarkdownPlainTextBoldDecorator( em, out, chain );</a>
+<span class="sourceLineNo">057</span><a id="line.57">        this.css = new MarkdownPlainTextCssDecorator( strong, out, chain );</a>
+<span class="sourceLineNo">058</span><a id="line.58">        this.plainText = new PlainTextDecorator( css, out, chain );</a>
 <span class="sourceLineNo">059</span><a id="line.59"></a>
 <span class="sourceLineNo">060</span><a id="line.60">        this.a = new MarkdownADecorator( out, config, chain );</a>
 <span class="sourceLineNo">061</span><a id="line.61">        this.br = new MarkdownBrDecorator( out, preStack, chain );</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/ui/AbstractCommand.html b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/ui/AbstractCommand.html
index 081d348..e61f6b3 100644
--- a/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/ui/AbstractCommand.html
+++ b/apidocs/2.11.2-SNAPSHOT/src-html/org/apache/wiki/ui/AbstractCommand.html
@@ -51,7 +51,7 @@
 <span class="sourceLineNo">042</span><a id="line.42">    /**</a>
 <span class="sourceLineNo">043</span><a id="line.43">     * Constructs a new Command with a specified wiki context, URL pattern, content template and target. The URL pattern is used to derive</a>
 <span class="sourceLineNo">044</span><a id="line.44">     * the JSP; if it is a "local" JSP (that is, it does not contain the &lt;code&gt;http://&lt;/code&gt; or &lt;code&gt;https://&lt;/code&gt; prefixes),</a>
-<span class="sourceLineNo">045</span><a id="line.45">     * then the JSP will be a cleansed version of the URL pattern; symbols (such as &lt;code&gt;%u&lt;/code&gt;) will removed. If it the supplied</a>
+<span class="sourceLineNo">045</span><a id="line.45">     * then the JSP will be a cleansed version of the URL pattern; symbols (such as &lt;code&gt;%u&lt;/code&gt;) will be removed. If the supplied</a>
 <span class="sourceLineNo">046</span><a id="line.46">     * URL pattern points to a non-local destination, the JSP will be set to the value supplied, unmodified.</a>
 <span class="sourceLineNo">047</span><a id="line.47">     *</a>
 <span class="sourceLineNo">048</span><a id="line.48">     * @param requestContext the request context</a>
diff --git a/apidocs/2.11.2-SNAPSHOT/type-search-index.zip b/apidocs/2.11.2-SNAPSHOT/type-search-index.zip
index a2555ad..8738d5e 100644
Binary files a/apidocs/2.11.2-SNAPSHOT/type-search-index.zip and b/apidocs/2.11.2-SNAPSHOT/type-search-index.zip differ
diff --git a/development/changelog.html b/development/changelog.html
index 4b623c5..a6e05ac 100644
--- a/development/changelog.html
+++ b/development/changelog.html
@@ -186,6 +186,29 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
+<p><strong>2022-02-20  Juan Pablo Santos (juanpablo AT apache DOT org)</strong></p>
+<ul>
+<li>
+<p><em>2.11.2-git-04</em></p>
+</li>
+<li>
+<p><a href="https://issues.apache.org/jira/browse/JSPWIKI-79">JSPWIKI-79</a> - Ounce Labs Security Finding: Authentication - Change Password</p>
+</li>
+<li>
+<p>Refactored the <code>org.apache.wiki.htmltowiki</code> package, so it doesn't use <code>Stack</code> but instead a <code>Deque</code>. May split the package on the main module to its own module later on.</p>
+</li>
+<li>
+<p>Dependency updates</p>
+<ul>
+<li>Mockito 4.3.1</li>
+<li>Selenide to 6.3.3 - closes <a href="https://github.com/apache/jspwiki/pull/168">#168</a></li>
+<li>SLF4J to 1.7.36</li>
+<li>Tika to 2.3.0 - closes <a href="https://github.com/apache/jspwiki/pull/170">#170</a></li>
+<li>Tomcat to 9.0.58</li>
+<li>Maven compiler (3.10.0), project info reports (3.2.1 - closes <a href="https://github.com/apache/jspwiki/pull/169">#169</a>), javadocs (3.3.2) and cargo-maven3 (1.9.10) plugins</li>
+</ul>
+</li>
+</ul>
 <p><strong>2022-01-13  Juan Pablo Santos (juanpablo AT apache DOT org)</strong></p>
 <ul>
 <li>
diff --git a/development/i18n.html b/development/i18n.html
index d642e6b..ea46709 100644
--- a/development/i18n.html
+++ b/development/i18n.html
@@ -189,8 +189,8 @@
     </tr>
 <tr class="odd">
   <td title="Available sets of core WikiPages for de"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-de">de</a></td>
-  <td>100%</td>
-  <td>0</td>
+  <td>99%</td>
+  <td>2</td>
   <td>0</td>
 </tr>
 <tr>
@@ -208,7 +208,7 @@
 <tr>
   <td title="Available sets of core WikiPages for fi"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-fi">fi</a></td>
   <td>87%</td>
-  <td>79</td>
+  <td>81</td>
   <td>2</td>
 </tr>
 <tr class="odd">
@@ -220,31 +220,31 @@
 <tr>
   <td title="Available sets of core WikiPages for it"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-it">it</a></td>
   <td>88%</td>
-  <td>73</td>
+  <td>75</td>
   <td>2</td>
 </tr>
 <tr class="odd">
   <td title="Available sets of core WikiPages for nl"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-nl">nl</a></td>
-  <td>97%</td>
-  <td>18</td>
+  <td>96%</td>
+  <td>20</td>
   <td>0</td>
 </tr>
 <tr>
   <td title="Available sets of core WikiPages for pt_BR"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-pt_BR">pt_BR</a></td>
   <td>64%</td>
-  <td>235</td>
+  <td>237</td>
   <td>1</td>
 </tr>
 <tr class="odd">
   <td title="Available sets of core WikiPages for ru"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-ru">ru</a></td>
   <td>88%</td>
-  <td>75</td>
+  <td>77</td>
   <td>2</td>
 </tr>
 <tr>
   <td title="Available sets of core WikiPages for zh_CN"><a class="external" href="https://search.maven.org/artifact/org.apache.jspwiki.wikipages/jspwiki-wikipages-zh_CN">zh_CN</a></td>
   <td>88%</td>
-  <td>75</td>
+  <td>77</td>
   <td>2</td>
 </tr>
 </table>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-adapters.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-adapters.html
index 814737a..23e2c14 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-adapters.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-adapters.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-210-adapters/2.11.2-SNAPSHOT/jspwiki-210-adapters-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:52.576+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:29.288+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-test-adaptees.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-test-adaptees.html
index 2438089..c78a114 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-test-adaptees.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-210-test-adaptees.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-210-test-adaptees/2.11.2-SNAPSHOT/jspwiki-210-test-adaptees-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:53.569+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:30.475+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-api.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-api.html
index 16093eb..5461355 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-api.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-api.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-api/2.11.2-SNAPSHOT/jspwiki-api-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:54.351+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:31.299+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-bootstrap.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-bootstrap.html
index b0f6c55..c97d50b 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-bootstrap.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-bootstrap.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-bootstrap/2.11.2-SNAPSHOT/jspwiki-bootstrap-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:55.030+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:32.008+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-cache.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-cache.html
index 9c5a82e..f391ec6 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-cache.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-cache.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-cache/2.11.2-SNAPSHOT/jspwiki-cache-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:55.897+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:36.384+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-event.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-event.html
index f19da1e..4136831 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-event.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-event.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-event/2.11.2-SNAPSHOT/jspwiki-event-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:56.395+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:37.173+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-kendra-searchprovider.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-kendra-searchprovider.html
index 322370f..1b80102 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-kendra-searchprovider.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-kendra-searchprovider.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-kendra-searchprovider/2.11.2-SNAPSHOT/jspwiki-kendra-searchprovider-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:57.051+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:37.902+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.diff b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.diff
index 3a84d2b..25a3203 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.diff
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.diff
@@ -1412,9 +1412,9 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) BrDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) BrDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element, org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupBr()
@@ -1422,9 +1422,9 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) CodeDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) CodeDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupCodeClose()
@@ -1539,17 +1539,17 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  NEW INTERFACE: org.apache.wiki.htmltowiki.SyntaxDecorator
 	+++  NEW SUPERCLASS: org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator
 	+++  NEW CONSTRUCTOR: PUBLIC(+) JSPWikiSyntaxDecorator()
-	+++  NEW METHOD: PUBLIC(+) void init(java.io.PrintWriter, java.util.Stack, java.util.Stack, org.apache.wiki.htmltowiki.WhitespaceTrimWriter, org.apache.wiki.htmltowiki.XHtmlToWikiConfig, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW METHOD: PUBLIC(+) void init(java.io.PrintWriter, java.util.Deque, java.util.Deque, org.apache.wiki.htmltowiki.WhitespaceTrimWriter, org.apache.wiki.htmltowiki.XHtmlToWikiConfig, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 +++  NEW CLASS: PUBLIC(+) ABSTRACT(+) org.apache.wiki.htmltowiki.syntax.LiDecorator  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack liStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque liStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) LiDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) LiDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element, org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
-	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupLi(java.util.Stack)
+	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupLi(java.util.Deque)
 +++  NEW CLASS: PUBLIC(+) org.apache.wiki.htmltowiki.syntax.MarkupHelper  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
@@ -1566,9 +1566,9 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack liStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque liStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) OlDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) OlDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupOl()
@@ -1595,9 +1595,8 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator ptid
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextBoldDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator, java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextBoldDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator, java.io.PrintWriter, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator$ElementDecoratorData)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
@@ -1609,9 +1608,8 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator ptbd
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextCssDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator, java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextCssDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator, java.io.PrintWriter, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator$ElementDecoratorData)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupCssDivClose(java.lang.String)
@@ -1622,9 +1620,8 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextCssSpecialDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextCssSpecialDecorator(java.io.PrintWriter, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator$ElementDecoratorData)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupCssSpecialClose(java.lang.String)
@@ -1636,19 +1633,17 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator ptcd
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PUBLIC(+) PlainTextDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator, java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PlainTextDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator, java.io.PrintWriter, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator$ElementDecoratorData)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 +++  NEW CLASS: PUBLIC(+) ABSTRACT(+) org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator ptmd
-	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextItalicDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator, java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextItalicDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator, java.io.PrintWriter, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator$ElementDecoratorData)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
@@ -1660,9 +1655,9 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator ptcsd
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextMonospaceDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator, java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) PlainTextMonospaceDecorator(org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator, java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator$ElementDecoratorData)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
@@ -1732,9 +1727,9 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) TdDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) TdDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupTd()
@@ -1752,17 +1747,17 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 +++  NEW CLASS: PUBLIC(+) org.apache.wiki.htmltowiki.syntax.TextElementDecorator  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PUBLIC(+) TextElementDecorator(java.io.PrintWriter, java.util.Stack)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) TextElementDecorator(java.io.PrintWriter, java.util.Deque)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Text)
 +++  NEW CLASS: PUBLIC(+) ABSTRACT(+) org.apache.wiki.htmltowiki.syntax.ThDecorator  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack preStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque preStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) ThDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) ThDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupTh()
@@ -1786,9 +1781,9 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator chain
-	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Stack liStack
+	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.util.Deque liStack
 	+++  NEW FIELD: PROTECTED(+) FINAL(+) java.io.PrintWriter out
-	+++  NEW CONSTRUCTOR: PROTECTED(+) UlDecorator(java.io.PrintWriter, java.util.Stack, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW CONSTRUCTOR: PROTECTED(+) UlDecorator(java.io.PrintWriter, java.util.Deque, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) void decorate(org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PROTECTED(+) ABSTRACT(+) java.lang.String markupUl()
@@ -1956,7 +1951,7 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void image(java.lang.String, java.util.Map)
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void img(org.jdom2.Element)
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void init(java.io.PrintWriter, java.util.Stack, java.util.Stack, org.apache.wiki.htmltowiki.WhitespaceTrimWriter, org.apache.wiki.htmltowiki.XHtmlToWikiConfig, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void init(java.io.PrintWriter, java.util.Deque, java.util.Deque, org.apache.wiki.htmltowiki.WhitespaceTrimWriter, org.apache.wiki.htmltowiki.XHtmlToWikiConfig, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void input(org.jdom2.Element)
 		+++  NEW EXCEPTION: org.jdom2.JDOMException
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void li(org.jdom2.Element, org.jdom2.Element)
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.html
index 1126d0d..216ecec 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-main.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-main/2.11.2-SNAPSHOT/jspwiki-main-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:00:58.910+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:39.806+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
@@ -8543,7 +8543,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>414</td><td>409</td>
+                                                    <td>414</td><td>412</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -8622,7 +8622,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>403</td><td>398</td>
+                                                    <td>403</td><td>401</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -8654,7 +8654,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>423</td><td>418</td>
+                                                    <td>423</td><td>421</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -8803,7 +8803,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>441</td><td>436</td>
+                                                    <td>441</td><td>439</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -8831,7 +8831,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>447</td><td>442</td>
+                                                    <td>447</td><td>445</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -8860,7 +8860,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>475</td><td>470</td>
+                                                    <td>475</td><td>473</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -8898,7 +8898,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>453</td><td>448</td>
+                                                    <td>453</td><td>451</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -12859,7 +12859,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>260</td><td>260</td>
+                                                    <td>260</td><td>259</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -12954,7 +12954,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>294</td><td>294</td>
+                                                    <td>294</td><td>293</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -20555,7 +20555,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>preStack</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -20572,7 +20572,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>BrDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -20703,7 +20703,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>preStack</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -20720,7 +20720,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>CodeDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -22588,9 +22588,9 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">public&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td><span class="new method_return_type">void</span></td><td>init(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.WhitespaceTrimWriter,
                                         <wbr></wbr>
@@ -22663,7 +22663,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator</span></td><td>n.a.</td><td>chain</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>liStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>liStack</td>
                                 </tr>
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
@@ -22683,7 +22683,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>LiDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -22757,7 +22757,7 @@ ul {
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier">abstract&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span></td><td><span class="new method_return_type">java.lang.String</span></td><td>markupLi(java.util.Stack)</td><td>n.a.</td><td>n.a.</td><td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier">abstract&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span></td><td><span class="new method_return_type">java.lang.String</span></td><td>markupLi(java.util.Deque)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
                                                 <tr>
@@ -23109,7 +23109,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator</span></td><td>n.a.</td><td>chain</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>liStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>liStack</td>
                                 </tr>
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
@@ -23129,7 +23129,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>OlDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -23542,9 +23542,6 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
-                                </tr>
-                                <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator</span></td><td>n.a.</td><td>ptid</td>
                                 </tr>
                             </tbody>
@@ -23564,8 +23561,6 @@ ul {
                                         <wbr></wbr>
                                         java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
-                                        <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
@@ -23575,7 +23570,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>39</td>
+                                                    <td>n.a.</td><td>37</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -23629,7 +23624,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>52</td>
+                                                    <td>n.a.</td><td>49</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -23671,7 +23666,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>67</td>
+                                                    <td>n.a.</td><td>64</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -23751,9 +23746,6 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
-                                </tr>
-                                <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator</span></td><td>n.a.</td><td>ptbd</td>
                                 </tr>
                             </tbody>
@@ -23773,8 +23765,6 @@ ul {
                                         <wbr></wbr>
                                         java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
-                                        <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
@@ -23784,7 +23774,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>38</td>
+                                                    <td>n.a.</td><td>36</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -23838,7 +23828,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>51</td>
+                                                    <td>n.a.</td><td>48</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -23949,9 +23939,6 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
-                                <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
-                                </tr>
                             </tbody>
                         </table>
                     </div>
@@ -23967,8 +23954,6 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>PlainTextCssSpecialDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
-                                        <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
@@ -23978,7 +23963,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>37</td>
+                                                    <td>n.a.</td><td>35</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24032,7 +24017,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>49</td>
+                                                    <td>n.a.</td><td>46</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24144,9 +24129,6 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
-                                </tr>
-                                <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator</span></td><td>n.a.</td><td>ptcd</td>
                                 </tr>
                             </tbody>
@@ -24166,8 +24148,6 @@ ul {
                                         <wbr></wbr>
                                         java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
-                                        <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
@@ -24177,7 +24157,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>45</td>
+                                                    <td>n.a.</td><td>43</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24231,7 +24211,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>58</td>
+                                                    <td>n.a.</td><td>55</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24279,9 +24259,6 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
-                                </tr>
-                                <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator</span></td><td>n.a.</td><td>ptmd</td>
                                 </tr>
                             </tbody>
@@ -24301,8 +24278,6 @@ ul {
                                         <wbr></wbr>
                                         java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
-                                        <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
@@ -24312,7 +24287,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>39</td>
+                                                    <td>n.a.</td><td>37</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24366,7 +24341,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>52</td>
+                                                    <td>n.a.</td><td>49</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24408,7 +24383,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>67</td>
+                                                    <td>n.a.</td><td>64</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -24488,7 +24463,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>preStack</td>
                                 </tr>
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator</span></td><td>n.a.</td><td>ptcsd</td>
@@ -24510,7 +24485,7 @@ ul {
                                         <wbr></wbr>
                                         java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -25612,7 +25587,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>preStack</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -25629,7 +25604,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>TdDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -25930,7 +25905,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>preStack</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -25947,7 +25922,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">public&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>TextElementDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack)</td><td>n.a.</td><td>n.a.</td><td>
+                                        java.util.Deque)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
                                             <thead>
                                                 <tr>
@@ -26045,7 +26020,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>preStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>preStack</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -26062,7 +26037,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>ThDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -26438,7 +26413,7 @@ ul {
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator</span></td><td>n.a.</td><td>chain</td>
                                 </tr>
                                 <tr>
-                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Stack</span></td><td>n.a.</td><td>liStack</td>
+                                    <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.util.Deque</span></td><td>n.a.</td><td>liStack</td>
                                 </tr>
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier">final&nbsp;</span><span class="new modifier"></span></td><td><span class="new modifier">java.io.PrintWriter</span></td><td>n.a.</td><td>out</td>
@@ -26458,7 +26433,7 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">protected&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td>UlDecorator(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)</td><td>n.a.</td><td>n.a.</td><td>
                                         <table>
@@ -29029,9 +29004,9 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">public&nbsp;</span><span class="new modifier">abstract&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span></td><td><span class="new method_return_type">void</span></td><td>init(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.WhitespaceTrimWriter,
                                         <wbr></wbr>
@@ -30076,7 +30051,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>71</td>
+                                                    <td>n.a.</td><td>72</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30110,7 +30085,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>61</td>
+                                                    <td>n.a.</td><td>62</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30138,7 +30113,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>85</td><td>99</td>
+                                                    <td>85</td><td>100</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30171,7 +30146,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>89</td><td>103</td>
+                                                    <td>89</td><td>104</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30204,7 +30179,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>302</td><td>232</td>
+                                                    <td>302</td><td>233</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30224,7 +30199,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>782</td><td>123</td>
+                                                    <td>782</td><td>124</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30266,7 +30241,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>307</td>
+                                                    <td>n.a.</td><td>308</td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -30295,7 +30270,7 @@ ul {
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td>n.a.</td><td>119</td>
+                                                    <td>n.a.</td><td>120</td>
                                                 </tr>
                                             </tbody>
                                         </table>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.diff b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.diff
index 6a9127e..ab5fc5d 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.diff
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.diff
@@ -4,7 +4,7 @@ WARNING: You are using the option '--ignore-missing-classes', i.e. superclasses
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	===  UNCHANGED SUPERCLASS: n.a.
 	+++  NEW CONSTRUCTOR: PUBLIC(+) MarkdownSyntaxDecorator()
-	+++  NEW METHOD: PUBLIC(+) void init(java.io.PrintWriter, java.util.Stack, java.util.Stack, org.apache.wiki.htmltowiki.WhitespaceTrimWriter, org.apache.wiki.htmltowiki.XHtmlToWikiConfig, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
+	+++  NEW METHOD: PUBLIC(+) void init(java.io.PrintWriter, java.util.Deque, java.util.Deque, org.apache.wiki.htmltowiki.WhitespaceTrimWriter, org.apache.wiki.htmltowiki.XHtmlToWikiConfig, org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator)
 ===  UNCHANGED CLASS: PUBLIC org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ExternalLinkAttributeProviderState  (not serializable)
 	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
 	===  UNCHANGED INTERFACE: org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.html
index c8057ca..b110024 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-markdown.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-markdown/2.11.2-SNAPSHOT/jspwiki-markdown-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:01:00.171+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:41.223+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
@@ -332,9 +332,9 @@ ul {
                                 <tr>
                                     <td><span class="new">NEW</span></td><td><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier">public&nbsp;</span><span class="new modifier"></span><span class="new modifier"></span><span class="new modifier"></span></td><td><span class="new method_return_type">void</span></td><td>init(java.io.PrintWriter,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
-                                        java.util.Stack,
+                                        java.util.Deque,
                                         <wbr></wbr>
                                         org.apache.wiki.htmltowiki.WhitespaceTrimWriter,
                                         <wbr></wbr>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-tika-searchprovider.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-tika-searchprovider.html
index a4b947b..391f43f 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-tika-searchprovider.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-tika-searchprovider.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-tika-searchprovider/2.11.2-SNAPSHOT/jspwiki-tika-searchprovider-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:01:01.162+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:42.239+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>
diff --git a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-util.html b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-util.html
index 1b673a4..5ee437d 100644
--- a/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-util.html
+++ b/japicmp/2.11.2-SNAPSHOT/cmp-jspwiki-util.html
@@ -131,7 +131,7 @@ ul {
                     <td>New:</td><td>/home/jenkins/.m2/repository/org/apache/jspwiki/jspwiki-util/2.11.2-SNAPSHOT/jspwiki-util-2.11.2-SNAPSHOT.jar</td>
                 </tr>
                 <tr>
-                    <td>Created:</td><td>2022-01-13T13:01:01.806+0000</td>
+                    <td>Created:</td><td>2022-02-21T20:47:42.945+0000</td>
                 </tr>
                 <tr>
                     <td>Access modifier filter:</td><td>PROTECTED</td>