From f5d87ab2261bb34ed873289ea16f0eae809b9dfc Mon Sep 17 00:00:00 2001 From: dchandler Date: Wed, 6 Jul 2005 18:37:22 +0000 Subject: [PATCH] Fixed EWTS->Tibetan [g.yogs] bug. --- source/org/thdl/tib/text/ttt/EWTSTest.java | 2 +- source/org/thdl/tib/text/ttt/TPairList.java | 6 ++++-- source/org/thdl/tib/text/ttt/TTGCList.java | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/source/org/thdl/tib/text/ttt/EWTSTest.java b/source/org/thdl/tib/text/ttt/EWTSTest.java index cc3d412..4f9b870 100644 --- a/source/org/thdl/tib/text/ttt/EWTSTest.java +++ b/source/org/thdl/tib/text/ttt/EWTSTest.java @@ -151,7 +151,7 @@ public class EWTSTest extends TestCase { /** Tests that the EWTS->unicode converter isn't completely braindead. */ public void testEwtsBasics() { - if (RUN_FAILING_TESTS) ewts2uni_test("g.yogs", "\u0f42\u0f61\u0f7c\u0f42\u0f66"); // TODO(DLC)[EWTS->Tibetan]: DLC NOW! + ewts2uni_test("g.yogs", "\u0f42\u0f61\u0f7c\u0f42\u0f66"); if (RUN_FAILING_TESTS) ewts2uni_test("hUM^", "TODO(DLC)[EWTS->Tibetan]: DLC NOW"); ewts2uni_test("brgyad", "\u0f56\u0f62\u0f92\u0fb1\u0f51"); ewts2uni_test("brjod", "\u0f56\u0f62\u0f97\u0f7c\u0f51"); diff --git a/source/org/thdl/tib/text/ttt/TPairList.java b/source/org/thdl/tib/text/ttt/TPairList.java index 00fa151..f785254 100644 --- a/source/org/thdl/tib/text/ttt/TPairList.java +++ b/source/org/thdl/tib/text/ttt/TPairList.java @@ -571,8 +571,10 @@ class TPairList { } } } - boolean hasNonAVowel = (!traits.aVowel().equals(p.getRight()) - && null != p.getRight()); + boolean hasNonAVowel + = (!traits.aVowel().equals(p.getRight()) + && null != p.getRight() + && !traits.disambiguator().equals(p.getRight())); // [g.yogs] needs this, e.g. String thislWylie = traits.getEwtsForConsonant(p.getLeft()); if (thislWylie == null) { char ch; diff --git a/source/org/thdl/tib/text/ttt/TTGCList.java b/source/org/thdl/tib/text/ttt/TTGCList.java index bef01bb..1ed072c 100644 --- a/source/org/thdl/tib/text/ttt/TTGCList.java +++ b/source/org/thdl/tib/text/ttt/TTGCList.java @@ -65,4 +65,9 @@ class TTGCList implements TGCList { public int getTPairListIndex(int tgcPairIndex) { return ((Integer)stackIndices.get(tgcPairIndex)).intValue(); } + + public String toString() { + return (""); + } }