summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org/madore/damlengine/TodoElement.java2
-rw-r--r--org/madore/damlengine/TodoFooter.java20
-rw-r--r--org/madore/damlengine/TodoImgAElement.java6
-rw-r--r--org/madore/damlengine/TodoSmileyElement.java24
-rw-r--r--org/madore/damlengine/images/smileys/evilgrin.png (renamed from org/madore/damlengine/images/smileys/twisted.png)bin267 -> 267 bytes
5 files changed, 34 insertions, 18 deletions
diff --git a/org/madore/damlengine/TodoElement.java b/org/madore/damlengine/TodoElement.java
index acccac0..0cc7880 100644
--- a/org/madore/damlengine/TodoElement.java
+++ b/org/madore/damlengine/TodoElement.java
@@ -57,7 +57,7 @@ public abstract class TodoElement extends TodoItem {
damlFactories.put("smiley-confused", new TodoSmileyElement.Factory(TodoSmileyElement.Type.CONFUSED));
damlFactories.put("smiley-crazy", new TodoSmileyElement.Factory(TodoSmileyElement.Type.CRAZY));
damlFactories.put("smiley-neutral", new TodoSmileyElement.Factory(TodoSmileyElement.Type.NEUTRAL));
- damlFactories.put("smiley-twisted", new TodoSmileyElement.Factory(TodoSmileyElement.Type.TWISTED));
+ damlFactories.put("smiley-evilgrin", new TodoSmileyElement.Factory(TodoSmileyElement.Type.EVILGRIN));
damlFactories.put("smiley-cry", new TodoSmileyElement.Factory(TodoSmileyElement.Type.CRY));
damlFactories.put("smiley-evil", new TodoSmileyElement.Factory(TodoSmileyElement.Type.EVIL));
damlFactories.put("img-a", new TodoImgAElement.Factory());
diff --git a/org/madore/damlengine/TodoFooter.java b/org/madore/damlengine/TodoFooter.java
index dffe7f6..bb5d606 100644
--- a/org/madore/damlengine/TodoFooter.java
+++ b/org/madore/damlengine/TodoFooter.java
@@ -45,10 +45,18 @@ public final class TodoFooter extends TodoElement {
email.appendChild(ctx.doc.createTextNode("org"));
addr.appendChild(ctx.doc.createTextNode("|"));
a = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
- a.setAttributeNS(null, "href", "https://plus.google.com/+davidamadore");
+ a.setAttributeNS(null, "href",
+ ((ctx.gc.uriToTop==null)?"http://www.madore.org/~david/"
+ :ctx.gc.uriToTop) + "ego.html");
a.setAttributeNS(null, "rel", "author");
addr.appendChild(a);
- a.appendChild(ctx.doc.createTextNode("Google+"));
+ a.appendChild(ctx.doc.createTextNode("\u2042"));
+ // addr.appendChild(ctx.doc.createTextNode("|"));
+ // a = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
+ // a.setAttributeNS(null, "href", "https://plus.google.com/+davidamadore");
+ // a.setAttributeNS(null, "rel", "author");
+ // addr.appendChild(a);
+ // a.appendChild(ctx.doc.createTextNode("Google+"));
addr.appendChild(ctx.doc.createTextNode("|"));
a = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
a.setAttributeNS(null, "href", "https://twitter.com/gro_tsen/");
@@ -61,14 +69,6 @@ public final class TodoFooter extends TodoElement {
a.setAttributeNS(null, "rel", "author");
addr.appendChild(a);
a.appendChild(ctx.doc.createTextNode("Facebook"));
- addr.appendChild(ctx.doc.createTextNode("|"));
- a = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
- a.setAttributeNS(null, "href",
- ((ctx.gc.uriToTop==null)?"http://www.madore.org/~david/"
- :ctx.gc.uriToTop) + "ego.html");
- a.setAttributeNS(null, "rel", "author");
- addr.appendChild(a);
- a.appendChild(ctx.doc.createTextNode("\u2042"));
addr.appendChild(ctx.doc.createTextNode(")"));
Node ws = node.getNextSibling();
if ( ws != null && ( ws.getNodeType() == Node.TEXT_NODE
diff --git a/org/madore/damlengine/TodoImgAElement.java b/org/madore/damlengine/TodoImgAElement.java
index aa545bc..0d8edf6 100644
--- a/org/madore/damlengine/TodoImgAElement.java
+++ b/org/madore/damlengine/TodoImgAElement.java
@@ -26,7 +26,11 @@ public final class TodoImgAElement extends TodoDefaultElement {
Element a = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a");
if ( explicitLang != null )
LangHelper.setLangNorec(node, explicitLang);
- node.getParentNode().replaceChild(a, node);
+ Node pnode = node.getParentNode();
+ if ( pnode == null )
+ // See "FIXME" in TodoCutHere.java (node may have moved out of DOM).
+ return;
+ pnode.replaceChild(a, node);
Element img = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "img");
a.appendChild(img);
ArrayList<Attr> attrList = getAttrList(this.node);
diff --git a/org/madore/damlengine/TodoSmileyElement.java b/org/madore/damlengine/TodoSmileyElement.java
index 8bd3031..4e79f4d 100644
--- a/org/madore/damlengine/TodoSmileyElement.java
+++ b/org/madore/damlengine/TodoSmileyElement.java
@@ -5,18 +5,30 @@ import org.w3c.dom.*;
public final class TodoSmileyElement extends TodoDefaultElement {
public enum Type {
- SMILE("smile", new String(Character.toChars(0x263A)), "Smile", "Sourire"),
+ // Originally :-)
+ SMILE("smile", "\u263A\uFE0F", "Smile", "Sourire"),
+ // Originally ;-)
WINK("wink", new String(Character.toChars(0x1F609)), "Wink", "Clin d'\u0153il"),
+ // Originally :-o
SURPRISED("surprised", new String(Character.toChars(0x1F632)), "Surprised", "Surpris"),
- SAD("sad", new String(Character.toChars(0x2639)), "Sad", "Triste"),
+ // Originally :-(
+ SAD("sad", "\u2639\uFE0F", "Sad", "Triste"),
+ // Originally 8-)
COOL("cool", new String(Character.toChars(0x1F60E)), "Cool", "Cool"),
+ // Originally :-D
BIGGRIN("biggrin", new String(Character.toChars(0x1F601)), "Big grin", "Grand sourire"),
- CONFUSED("confused", new String(Character.toChars(0x1F615)), "Confused", "Troubl\u00e9"),
- CRAZY("crazy", new String(Character.toChars(0x1F61D)), "Crazy", "Fou"),
+ // Originally :-S
+ CONFUSED("confused", new String(Character.toChars(0x1F615)), "Confused", "Embrouill\u00e9"),
+ // Originally %-)
+ CRAZY("crazy", new String(Character.toChars(0x1F92A)), "Crazy", "Fou"),
+ // Originally :-|
NEUTRAL("neutral", new String(Character.toChars(0x1F610)), "Non-grin", "Sans sourire"),
- TWISTED("twisted", new String(Character.toChars(0x1F621)), "Twisted", "Tordu"),
+ // Formerly "twisted", originally 8-> now thought of as >:-)
+ EVILGRIN("evilgrin", new String(Character.toChars(0x1F608)), "Evil grin", "Sourire mauvais"),
+ // Originally \u00A6-(
CRY("cry", new String(Character.toChars(0x1F622)), "Crying", "Pleure"),
- EVIL("evil", new String(Character.toChars(0x1F608)), "Evil", "Mauvais");
+ // Originally >:-(
+ EVIL("evil", new String(Character.toChars(0x1F47F)), "Evil", "Mauvais");
final String emotion;
final String altText;
final String enName;
diff --git a/org/madore/damlengine/images/smileys/twisted.png b/org/madore/damlengine/images/smileys/evilgrin.png
index 5f6eed1..5f6eed1 100644
--- a/org/madore/damlengine/images/smileys/twisted.png
+++ b/org/madore/damlengine/images/smileys/evilgrin.png
Binary files differ