From 94a43d3f3964367aff6b565cbcec0331b95b410a Mon Sep 17 00:00:00 2001 From: dchandler Date: Sun, 26 Oct 2003 18:56:48 +0000 Subject: [PATCH] Now anything not clearly native Tibetan is colored green when coloring is enabled. G'EEm is "native", though -- the only "vowel" that implies non-nativeness is {:}, as in {KA:}. --- source/org/thdl/tib/text/ttt/ACIPConverter.java | 12 +++++++++--- source/org/thdl/tib/text/ttt/PackageTest.java | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/source/org/thdl/tib/text/ttt/ACIPConverter.java b/source/org/thdl/tib/text/ttt/ACIPConverter.java index 6fa3375..6f2f33d 100644 --- a/source/org/thdl/tib/text/ttt/ACIPConverter.java +++ b/source/org/thdl/tib/text/ttt/ACIPConverter.java @@ -482,14 +482,20 @@ public class ACIPConverter { } if (null != tdoc) { duff = sl.getDuff(); + BoolTriple bt; if (colors && sl.isLegalTshegBar(true).isLegal && !sl.isLegalTshegBar(false).isLegal) { color = Color.YELLOW; - } else if (colors && sl.isLegalTshegBar(false).isLegal) { + } else if (colors && (bt = sl.isLegalTshegBar(false)).isLegal && !bt.isLegalButSanskrit()) { color = Color.BLACK; } else { - // Sanskrit + // Sanskrit. - // DLC FIXME: a funny vowel, the presence of a sanskrit-only stack, and a funny mark like ACIP ':' should cause green too. + // FIXME: should a funny + // vowel cause green to + // appear too? G'EEm is + // black, not green, right + // now, though GA: is + // green. color = Color.GREEN; } diff --git a/source/org/thdl/tib/text/ttt/PackageTest.java b/source/org/thdl/tib/text/ttt/PackageTest.java index 0050647..714df07 100644 --- a/source/org/thdl/tib/text/ttt/PackageTest.java +++ b/source/org/thdl/tib/text/ttt/PackageTest.java @@ -380,7 +380,6 @@ tstHelper("KA'", "[(K . A), (' . )]", new String[] { }, "{G+G+YE}{S}"); - // DLC FIXME: warn about BDE vs. B+DE. color such differently. Maybe an inputter saw B+DE and typed in BDE, not thinking. tstHelper("BDE", "{B}{DE}", new String[] { "{B+DE}", "{B}{DE}" }, new String[] { "{B}{DE}" }, @@ -391,7 +390,7 @@ tstHelper("KA'", "[(K . A), (' . )]", new String[] { "{B}{DEm}" }, "{B}{DEm}"); - /* DLC FIXME + /* DLC FIXME DOC TEST tstHelper("BDA:", "{B}{DA:}", new String[] { "{B+DA:}", "{B}{DA:}" }, new String[] { "{B}{DA:}" },