X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FEnFunctionCallbacks.java;h=60de2fc82c6c1c1e9ff481ae48aa1843f907d128;hb=5a73fb1ef8314eff15e55b2dc234aa2b4ff6d124;hp=dbd158b7ca68f8e54e164b0dc75eb0d90199ba37;hpb=cd86f5f7abf5e545daf89c03d9dbbfd4e5bc65a4;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
index dbd158b..60de2fc 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
@@ -64,6 +64,9 @@ class EnFunctionCallbacks {
       callbacks.put("rfquote", callback);
       callbacks.put("attention", callback);
       callbacks.put("zh-attention", callback);
+      callbacks.put("top2", callback);
+      callbacks.put("mid2", callback);
+      callbacks.put("bottom", callback);
       
       callback = new AppendName<T>();
       callbacks.put("...", callback);
@@ -624,6 +627,12 @@ class EnFunctionCallbacks {
           appendAndIndexWikiCallback.dispatch(f, null, null);
           appendAndIndexWikiCallback.builder.append(" {f}");
       }
+      final String m = namedArgs.remove("f");
+      if (m != null) {
+          appendAndIndexWikiCallback.builder.append(", ");
+          appendAndIndexWikiCallback.dispatch(m, null, null);
+          appendAndIndexWikiCallback.builder.append(" {m}");
+      }
       parser.wordForms.add(singular);
       parser.wordForms.add(plural);
       if (!namedArgs.isEmpty() || args.size() > 4) {