Index: xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/DoxiaGeneratorListener.java =================================================================== --- xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/DoxiaGeneratorListener.java (revision 32813) +++ xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/DoxiaGeneratorListener.java (working copy) @@ -150,7 +150,7 @@ } } - public void beginListItem() + public void beginListItem(Map parameters) { this.sink.listItem(); } Index: xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/XWikiGeneratorSink.java =================================================================== --- xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/XWikiGeneratorSink.java (revision 32813) +++ xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/XWikiGeneratorSink.java (working copy) @@ -701,7 +701,7 @@ public void listItem(SinkEventAttributes attributes) { // TODO: Handle parameters - getListener().beginListItem(); + getListener().beginListItem(Listener.EMPTY_PARAMETERS); ++this.inlineDepth; } @@ -805,7 +805,7 @@ */ public void numberedListItem(SinkEventAttributes attributes) { - getListener().beginListItem(); + getListener().beginListItem(Listener.EMPTY_PARAMETERS); ++this.inlineDepth; } Index: xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/renderer/wikimodel/WikiModelGeneratorListener.java =================================================================== --- xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/renderer/wikimodel/WikiModelGeneratorListener.java (revision 32813) +++ xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/renderer/wikimodel/WikiModelGeneratorListener.java (working copy) @@ -190,7 +190,7 @@ this.wikimodelListener.beginList(createWikiParameters(parameters), false); } - public void beginListItem() + public void beginListItem(Map parameters) { this.wikimodelListener.beginListItem(); } Index: xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/parser/wikimodel/XWikiGeneratorListener.java =================================================================== --- xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/parser/wikimodel/XWikiGeneratorListener.java (revision 32813) +++ xwiki-rendering-syntaxes/xwiki-rendering-syntax-wikimodel/src/main/java/org/xwiki/rendering/internal/parser/wikimodel/XWikiGeneratorListener.java (working copy) @@ -445,7 +445,7 @@ */ public void beginListItem() { - getListener().beginListItem(); + getListener().beginListItem(Listener.EMPTY_PARAMETERS); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EmptyBlockChainingListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EmptyBlockChainingListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EmptyBlockChainingListener.java (working copy) @@ -163,11 +163,11 @@ * @see org.xwiki.rendering.listener.chaining.AbstractChainingListener#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { markNotEmpty(); startContainerBlock(); - super.beginListItem(); + super.beginListItem(parameters); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/BlockStateChainingListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/BlockStateChainingListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/BlockStateChainingListener.java (working copy) @@ -325,12 +325,12 @@ * @see org.xwiki.rendering.listener.chaining.AbstractChainingListener#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { ++this.inlineDepth; ++this.listDepth.peek().listItemIndex; - super.beginListItem(); + super.beginListItem(parameters); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EventType.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EventType.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/EventType.java (working copy) @@ -203,7 +203,7 @@ BEGIN_LIST_ITEM { public void fireEvent(Listener listener, Object[] eventParameters) { - listener.beginListItem(); + listener.beginListItem((Map) eventParameters[0]); } }, END_LIST_ITEM { Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/AbstractChainingListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/AbstractChainingListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/AbstractChainingListener.java (working copy) @@ -182,11 +182,11 @@ * * @see ChainingListener#beginListItem() */ - public void beginListItem() + public void beginListItem(Map parameters) { ChainingListener next = getListenerChain().getNextListener(getClass()); if (next != null) { - next.beginListItem(); + next.beginListItem(parameters); } } Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/TextOnNewLineStateChainingListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/TextOnNewLineStateChainingListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/TextOnNewLineStateChainingListener.java (working copy) @@ -171,10 +171,10 @@ * @see org.xwiki.rendering.listener.chaining.AbstractChainingListener#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { this.isTextOnNewLine = false; - super.beginListItem(); + super.beginListItem(parameters); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/LookaheadChainingListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/LookaheadChainingListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/chaining/LookaheadChainingListener.java (working copy) @@ -178,9 +178,9 @@ * @see org.xwiki.rendering.listener.chaining.AbstractChainingListener#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { - this.previousEvents.beginListItem(); + this.previousEvents.beginListItem(parameters); firePreviousEvent(); } Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/CompositeListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/CompositeListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/CompositeListener.java (working copy) @@ -161,10 +161,10 @@ * * @see org.xwiki.rendering.listener.Listener#beginListItem() */ - public void beginListItem() + public void beginListItem(Map parameters) { for (Listener listener : listeners) { - listener.beginListItem(); + listener.beginListItem(parameters); } } Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java (working copy) @@ -153,8 +153,9 @@ /** * Start of a list item. + * @param parameters a generic list of parameters for the list. Example: "style"/"background-color: blue" */ - void beginListItem(); + void beginListItem(Map parameters); /** * Start of a definition list term. For example in HTML this is the equivalent of <dt>. Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/QueueListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/QueueListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/QueueListener.java (working copy) @@ -204,7 +204,7 @@ * * @see org.xwiki.rendering.listener.Listener#beginListItem() */ - public void beginListItem() + public void beginListItem(Map parameters) { saveEvent(EventType.BEGIN_LIST_ITEM); } Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/WrappingListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/WrappingListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/WrappingListener.java (working copy) @@ -116,9 +116,9 @@ * * @see org.xwiki.rendering.listener.Listener#beginListItem() */ - public void beginListItem() + public void beginListItem(Map parameters) { - this.listener.beginListItem(); + this.listener.beginListItem(parameters); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/ListItemBlock.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/ListItemBlock.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/ListItemBlock.java (working copy) @@ -47,7 +47,7 @@ */ public void before(Listener listener) { - listener.beginListItem(); + listener.beginListItem(getParameters()); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java (working copy) @@ -262,7 +262,7 @@ * @see org.xwiki.rendering.renderer.AbstractChainingPrintRenderer#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { getPrinter().println("beginListItem"); } Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/plain/PlainTextChainingRenderer.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/plain/PlainTextChainingRenderer.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/plain/PlainTextChainingRenderer.java (working copy) @@ -170,7 +170,7 @@ * @see org.xwiki.rendering.renderer.AbstractChainingPrintRenderer#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { if (getBlockState().getListItemIndex() > 0) { getPrinter().print(NL); Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xwiki/XWikiSyntaxChainingRenderer.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xwiki/XWikiSyntaxChainingRenderer.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xwiki/XWikiSyntaxChainingRenderer.java (working copy) @@ -484,7 +484,7 @@ * @see org.xwiki.rendering.renderer.PrintRenderer#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { if (getBlockState().getListItemIndex() > 0) { getPrinter().print("\n"); Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLChainingRenderer.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLChainingRenderer.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml/XHTMLChainingRenderer.java (working copy) @@ -379,9 +379,9 @@ * @see AbstractChainingPrintRenderer#beginListItem() */ @Override - public void beginListItem() + public void beginListItem(Map parameters) { - getXHTMLWikiPrinter().printXMLStartElement("li"); + getXHTMLWikiPrinter().printXMLStartElement("li", parameters); } /** Index: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser/XDOMGeneratorListener.java =================================================================== --- xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser/XDOMGeneratorListener.java (revision 32813) +++ xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/parser/XDOMGeneratorListener.java (working copy) @@ -197,7 +197,7 @@ * * @see org.xwiki.rendering.listener.Listener#beginListItem() */ - public void beginListItem() + public void beginListItem(Map parameters) { this.stack.push(this.marker); } Index: xwiki-rendering-api/pom.xml =================================================================== --- xwiki-rendering-api/pom.xml (revision 32813) +++ xwiki-rendering-api/pom.xml (working copy) @@ -181,6 +181,7 @@ org.xwiki.platform:xwiki-core-bridge org.xwiki.platform:xwiki-core-configuration-default + org.xwiki.platform:xwiki-rendering-api