From 9159426ee11be9d363955b15e4d91f13e2595431 Mon Sep 17 00:00:00 2001 From: "David A. Madore" Date: Tue, 1 Dec 2020 19:27:25 +0100 Subject: Update handling of "despammed" email addresses. Support a new element, support a "nolink" attribute on the element, interchange and elements on output. --- org/madore/damlengine/TodoEmailAtOrDotElement.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'org/madore/damlengine/TodoEmailAtOrDotElement.java') diff --git a/org/madore/damlengine/TodoEmailAtOrDotElement.java b/org/madore/damlengine/TodoEmailAtOrDotElement.java index 6597291..e970264 100644 --- a/org/madore/damlengine/TodoEmailAtOrDotElement.java +++ b/org/madore/damlengine/TodoEmailAtOrDotElement.java @@ -6,7 +6,12 @@ public final class TodoEmailAtOrDotElement extends TodoDefaultElement { public enum Type { AT("commercial-at", "commercial_at.png", "at sign", "arobase"), - DOT("full-stop", "full_stop.png", "dot", "point"); + DOT("full-stop", "full_stop.png", "dot", "point"), + PLUS("plus-sign", "plus_sign.png", "plus", "plus"); + // Images generated with: + // convert -size 16x20 'xc:transparent' -font 'Source-Code-Pro' -pointsize 20 -gravity South -annotate 0 '@' ~/public_html/images/commercial_at.png + // convert -size 16x20 'xc:transparent' -font 'Source-Code-Pro' -pointsize 20 -gravity South -annotate 0 '.' ~/public_html/images/full_stop.png + // convert -size 16x20 'xc:transparent' -font 'Source-Code-Pro' -pointsize 20 -gravity South -annotate 0 '+' ~/public_html/images/plus_sign.png final String charName; final String imgName; final String enName; @@ -59,16 +64,13 @@ public final class TodoEmailAtOrDotElement extends TodoDefaultElement { LangHelper.setLangNorec(span0, expLang); span0.setAttributeNS(null, "class", "replace-"+t.charName); node.getParentNode().replaceChild(span0, node); - Element span1 = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "span"); - span1.setAttributeNS(null, "class", "subreplace-"+t.charName); - span0.appendChild(span1); Element img = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "img"); img.setAttributeNS(null, "src", (ctx.gc.uriToTop==null?"":ctx.gc.uriToTop)+"images/"+t.imgName); img.setAttributeNS(null, "alt", "["+(lang.equals("fr")?t.frName:t.enName)+"]"); - img.setAttributeNS(null, "height", "15"); + img.setAttributeNS(null, "height", "20"); img.setAttributeNS(null, "width", "16"); - span1.appendChild(img); + span0.appendChild(img); } } -- cgit v1.2.3