Update handling of "despammed" email addresses.

Support a new <d:email-plus /> element, support a "nolink" attribute
on the <d:email-despammed /> element, interchange <a> and <code>
elements on output.

1 files changed, 18 insertions, 6 deletions

diff --git a/org/madore/damlengine/TodoEmailDespammedElement.java b/org/madore/damlengine/TodoEmailDespammedElement.java
index 9d393ed..fdeb0d5 100644
--- a/org/madore/damlengine/TodoEmailDespammedElement.java
+++ b/org/madore/damlengine/TodoEmailDespammedElement.java
@@ -23,24 +23,36 @@ public final class TodoEmailDespammedElement extends TodoDefaultElement {
     @Override
     public void handleNodeOnly() {
 	Element out0 = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "code");
+	Element out;
+	if ( node.getAttributeNS(null, "nolink").equals("") ) {
+	    out = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
+	    out.appendChild(out0);
+	    out.setAttributeNS(null, "class", "despammed-address");
+	} else
+	    out = out0;
 	String lang = LangHelper.getLangNorec(node);
 	if ( lang != null )
-	    LangHelper.setLangNorec(out0, lang);
-	Element out1 = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
-	out0.appendChild(out1);
-	out1.setAttributeNS(null, "class", "despammed-address");
+	    LangHelper.setLangNorec(out, lang);
+	{
+	    String classAtt = node.getAttributeNS(null, "class");
+	    if ( ! classAtt.equals("") )
+		out0.setAttributeNS(null, "class",
+				    "despammed-email "+classAtt);
+	    else
+		out0.setAttributeNS(null, "class", "despammed-email");
+	}
 	ArrayList<Node> childList = getChildList(node);
 	ArrayList<TodoElement> toProcess
 	    = new ArrayList<TodoElement>(childList.size()+8);
 	for ( Node child : childList ) {
-	    out1.appendChild(child);
+	    out.appendChild(child);
 	    if ( child.getNodeType() == Node.ELEMENT_NODE ) {
 		TodoElement it
 		    = TodoElement.getTodoElement((Element)child, this.ctx, this);
 		toProcess.add(it);
 	    }
 	}
-	node.getParentNode().replaceChild(out0, node);
+	node.getParentNode().replaceChild(out, node);
 	this.ownerDeque.registerAtStart(toProcess);
     }