added API in the C runtime and the Java binding for checking whether a given function is linearizable in a given language. This is used in the Android UI for better vizualizations

2 files changed, 7 insertions, 4 deletions

diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
index 5267cfde0..8fa41dfd0 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
@@ -211,8 +211,7 @@ public class LexicalEntryActivity extends ListActivity {
 	        TextView descView =
 	        		(TextView) convertView.findViewById(R.id.lexical_desc);
 
-	    	Expr e = Expr.readExpr(lemma);
-	    	String phrase = mTranslator.generateTranslationEntry(e);
+	    	String phrase = mTranslator.generateTranslationEntry(lemma);
 	        descView.setText(phrase);
 
 	        convertView.setOnClickListener(new OnClickListener() {
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index df042d1f1..60221d9b3 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -131,10 +131,14 @@ public class Translator {
         }
     }
 
-    public String generateTranslationEntry(Expr e) {
+    public String generateTranslationEntry(String lemma) {
+    	Expr e = Expr.readExpr(lemma);
         Concr sourceLang = getConcr(getSourceLanguage().getConcrete());
         Concr targetLang = getConcr(getTargetLanguage().getConcrete());
-        return sourceLang.linearize(e) + " - " + targetLang.linearize(e);
+        if (targetLang.hasLinearization(lemma))
+        	return sourceLang.linearize(e) + " - " + targetLang.linearize(e);
+        else
+        	return sourceLang.linearize(e);
     }
 
     public Map<String,String> tabularLinearize(Expr e) {