From d836b850e81ff187a2eeefec128a22c0c17aa019 Mon Sep 17 00:00:00 2001
From: dchandler <dchandler>
Date: Mon, 31 Mar 2003 01:38:27 +0000
Subject: [PATCH] "sgom pa'm ", not "sgom pa'am", is now used.  "pe'm " was
 being produced already, so the code was inconsistent.  If it turns out that
 "pe'am " is preferred, I'll fix it later.  Consistency is very appealing.

---
 source/org/thdl/tib/text/TibTextUtils.java               | 1 -
 source/org/thdl/tib/text/tshegbar/LegalTshegBar.java     | 6 ++----
 source/org/thdl/tib/text/tshegbar/LegalTshegBarTest.java | 8 ++++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/source/org/thdl/tib/text/TibTextUtils.java b/source/org/thdl/tib/text/TibTextUtils.java
index f3dfd0c..c778a0d 100644
--- a/source/org/thdl/tib/text/TibTextUtils.java
+++ b/source/org/thdl/tib/text/TibTextUtils.java
@@ -867,7 +867,6 @@ public class TibTextUtils implements THDLWylieConstants {
                     // prepend:
                     tailEndWylie.insert(0,
                                         ACHUNG
-                                        + aVowelToUseAfter(ACHUNG)
                                         + TibetanMachineWeb.getWylieForGlyph((DuffCode)glyphList.get(effectiveSize + 1)));
                     effectiveSize -= 2;
                 }
diff --git a/source/org/thdl/tib/text/tshegbar/LegalTshegBar.java b/source/org/thdl/tib/text/tshegbar/LegalTshegBar.java
index e119b7d..dec193d 100644
--- a/source/org/thdl/tib/text/tshegbar/LegalTshegBar.java
+++ b/source/org/thdl/tib/text/tshegbar/LegalTshegBar.java
@@ -443,16 +443,14 @@ public final class LegalTshegBar
             new String( new char[] {
                 EWC_achung, EWC_ma
             }),
-            THDLWylieConstants.ACHUNG + THDLWylieConstants.WYLIE_aVOWEL
-            + THDLWylieConstants.MA
+            THDLWylieConstants.ACHUNG + THDLWylieConstants.MA
         },
         {
             // meaning or, as opposed to and:
             new String( new char[] {
                 EWC_achung, EWC_nga
             }),
-            THDLWylieConstants.ACHUNG + THDLWylieConstants.WYLIE_aVOWEL
-            + THDLWylieConstants.NGA
+            THDLWylieConstants.ACHUNG + THDLWylieConstants.NGA
         }
     };
 
diff --git a/source/org/thdl/tib/text/tshegbar/LegalTshegBarTest.java b/source/org/thdl/tib/text/tshegbar/LegalTshegBarTest.java
index c747304..b80ea54 100644
--- a/source/org/thdl/tib/text/tshegbar/LegalTshegBarTest.java
+++ b/source/org/thdl/tib/text/tshegbar/LegalTshegBarTest.java
@@ -39,7 +39,7 @@ public class LegalTshegBarTest extends TestCase implements UnicodeConstants {
 	}
 
     /** Tests the getThdlWylie() method to see if we 
-        handle "le'u'i'o", "sgom pa'am", "sgom pa'ang", etc.
+        handle "le'u'i'o", "sgom pa'm", "sgom pa'ng", etc.
     */
     public void testGetThdlWylieForLongSuffixLikeThings() {
         assertTrue(new LegalTshegBar(EW_ABSENT, EW_ABSENT, EWC_la,
@@ -61,15 +61,15 @@ public class LegalTshegBarTest extends TestCase implements UnicodeConstants {
                                              EWC_achung, EWV_o,
                                              EWC_achung, EWC_ma
                                              }),
-                                     EW_ABSENT, EW_ABSENT).getThdlWylie().toString().equals("la'u'i'o'am'ang'o'am"));
+                                     EW_ABSENT, EW_ABSENT).getThdlWylie().toString().equals("la'u'i'o'm'ng'o'm"));
         assertTrue(new LegalTshegBar(EW_ABSENT, EW_ABSENT, EWC_pa,
                                      EW_ABSENT, false, false,
                                      new String(new char[] { EWC_achung, EWC_ma }),
-                                     EW_ABSENT, EW_ABSENT).getThdlWylie().toString().equals("pa'am"));
+                                     EW_ABSENT, EW_ABSENT).getThdlWylie().toString().equals("pa'm"));
         assertTrue(new LegalTshegBar(EW_ABSENT, EW_ABSENT, EWC_pa,
                                      EW_ABSENT, false, false,
                                      new String(new char[] { EWC_achung, EWC_nga }),
-                                     EW_ABSENT, EW_ABSENT).getThdlWylie().toString().equals("pa'ang"));
+                                     EW_ABSENT, EW_ABSENT).getThdlWylie().toString().equals("pa'ng"));
     }
 
     /** Tests the getThdlWylie() method and one of the constructors. */