Index: src/main/java/org/xwiki/rendering/listener/Format.java
===================================================================
--- src/main/java/org/xwiki/rendering/listener/Format.java (revision 11896)
+++ src/main/java/org/xwiki/rendering/listener/Format.java (working copy)
@@ -30,5 +30,8 @@
BOLD,
ITALIC,
UNDERLINED,
- STRIKEDOUT
+ STRIKEDOUT,
+ SUP,
+ SUB,
+ MONO
}
Index: src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java
===================================================================
--- src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java (revision 11896)
+++ src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java (working copy)
@@ -109,6 +109,15 @@
case UNDERLINED:
print("__");
break;
+ case SUP:
+ print("^^");
+ break;
+ case SUB:
+ print(",,");
+ break;
+ case MONO:
+ print("##");
+ break;
}
}
@@ -133,6 +142,15 @@
case UNDERLINED:
print("__");
break;
+ case SUP:
+ print("^^");
+ break;
+ case SUB:
+ print(",,");
+ break;
+ case MONO:
+ print("##");
+ break;
}
}
Index: src/main/java/org/xwiki/rendering/internal/wikimodel/XDOMGeneratorListener.java
===================================================================
--- src/main/java/org/xwiki/rendering/internal/wikimodel/XDOMGeneratorListener.java (revision 11896)
+++ src/main/java/org/xwiki/rendering/internal/wikimodel/XDOMGeneratorListener.java (working copy)
@@ -186,7 +186,15 @@
this.stack.push(new FormatBlock(generateListFromStack(), Format.ITALIC));
} else if (format.hasStyle(IWemConstants.STRIKE)) {
this.stack.push(new FormatBlock(generateListFromStack(), Format.STRIKEDOUT));
- } else {
+ } else if (format.hasStyle(IWemConstants.INS)) {
+ this.stack.push(new FormatBlock(generateListFromStack(), Format.UNDERLINED));
+ } else if (format.hasStyle(IWemConstants.SUP)) {
+ this.stack.push(new FormatBlock(generateListFromStack(), Format.SUP));
+ } else if (format.hasStyle(IWemConstants.SUB)) {
+ this.stack.push(new FormatBlock(generateListFromStack(), Format.SUB));
+ } else if (format.hasStyle(IWemConstants.MONO)) {
+ this.stack.push(new FormatBlock(generateListFromStack(), Format.MONO));
+ } else {
// WikiModel generate begin/endFormat events even for simple text with no style
// so we need to remove our marker
for (Block block: generateListFromStack()) {
Index: pom.xml
===================================================================
--- pom.xml (revision 11896)
+++ pom.xml (working copy)
@@ -68,7 +68,7 @@
org.wikimodel
org.wikimodel.wem
- 2.0.7-20080727
+ 2.0.7-SNAPSHOT
org.apache.maven.doxia