Fixes to tr= and head= make Arabic,Thai look much better.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / wiktionary / EnFunctionCallbacks.java

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
index 4d11824b1e37a6208b9bb4bf5cd323e46dc04b74..eae2a80dfac25cc152655efa31862484bec01b88 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java
@@ -483,6 +483,8 @@ class EnFunctionCallbacks {
         final EnParser parser,
         final AppendAndIndexWikiCallback<EnParser> appendAndIndexWikiCallback) {
       // See: http://en.wiktionary.org/wiki/Template:infl
+      // TODO: Actually these functions should start a new WordPOS:
+      // See: http://en.wiktionary.org/wiki/quattro
       final String langCode = ListUtil.get(args, 0);
       String head = namedArgs.remove("head");
       if (head == null) {
@@ -491,7 +493,6 @@ class EnFunctionCallbacks {
       if (head == null) {
         head = parser.title;
       }
-      parser.titleAppended = true;
       
       namedArgs.keySet().removeAll(EnParser.USELESS_WIKI_ARGS);
 
@@ -503,7 +504,11 @@ class EnFunctionCallbacks {
       final String g2 = namedArgs.remove("g2");
       final String g3 = namedArgs.remove("g3");
 
-      appendAndIndexWikiCallback.dispatch(head, EntryTypeName.WIKTIONARY_TITLE_MULTI);
+      // We might have already taken care of this in a generic way...
+      if (!parser.titleAppended) {
+        appendAndIndexWikiCallback.dispatch(head, EntryTypeName.WIKTIONARY_TITLE_MULTI);
+        parser.titleAppended = true;
+      }
 
       if (g != null) {
         appendAndIndexWikiCallback.builder.append(" {").append(g);