From cc5d096918e429dac071894a003e4176700f9fb5 Mon Sep 17 00:00:00 2001 From: dchandler Date: Sat, 24 Apr 2004 13:23:56 +0000 Subject: [PATCH] David Chapman's latest fix to tibwn.ini (clearing up an issue that Than or I dropped the ball on) introduced two lines for 8,95. This is a bad thing, so I've taken out the second line. I've also introduced a check in TibetanMachineWeb.java such that we'll know that tibwn.ini has no such error in the future just by running 'ant clean jskad-run' and making sure that the GUI is indeed visible. I also updated the test baselines now that F03A and 0F82 are squared away. --- .../TMW_RTF_TO_THDL_WYLIETest2ResultACIP.expected | 4 ++-- ...TF_TO_THDL_WYLIETest2ResultConversion.expected | 4 ++-- .../TMW_RTF_TO_THDL_WYLIETest3ResultTMW.expected | 2 +- source/org/thdl/tib/text/TibetanMachineWeb.java | 4 ++++ source/org/thdl/tib/text/tibwn.ini | 15 +++++++-------- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultACIP.expected b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultACIP.expected index 17303d1..9eb1d12 100644 --- a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultACIP.expected +++ b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultACIP.expected @@ -205,7 +205,7 @@ \f1\fs144 >\'ee>\f2\fs28\i0\b0\ul0 m\i0\b0\ul0\cf0 font 1; ord 238\par \f1\fs144 >\'ef>\f2\fs28\i0\b0\ul0 :\i0\b0\ul0\cf0 font 1; ord 239\par \f1\fs144 >\'f1>\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie ~M to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 1; ord 241\par -\f1\fs144 >\'f2>\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie <<[[JSKAD_TMW_TO_WYLIE_ERROR_NO_SUCH_WYLIE: Cannot convert to THDL Extended Wylie. Please see the documentation for the TM or TMW font and transcribe this yourself.]]>> to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 1; ord 242\par +\f1\fs144 >\'f2>\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie ~M` to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 1; ord 242\par \f1\fs144 >\'f3>\f2\fs28\i0\b0\ul0 Im\i0\b0\ul0\cf0 font 1; ord 243\par \f1\fs144 >\'f4>\f2\fs28\i0\b0\ul0 Im\i0\b0\ul0\cf0 font 1; ord 244\par \f1\fs144 >\'f5>\f2\fs28\i0\b0\ul0 im\i0\b0\ul0\cf0 font 1; ord 245\par @@ -806,7 +806,7 @@ \f1\fs144 >\f6 S\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\u0FC3 to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 83\par \f1\fs144 >\f6 T\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\uF03B to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 84\par \f1\fs144 >\f6 Z\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\uF039 to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 90\par -\f1\fs144 >\f6 [\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie ~M` to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 91\par +\f1\fs144 >\f6 [\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\uF03A to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 91\par \f1\fs144 >\f6\\\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\uF035 to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 92\par \f1\fs144 >\f6 ]\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\uF036 to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 93\par \f1\fs144 >\f6 ^\f1 >\f2\fs28\i0\b0\ul0 [# JSKAD_TMW_TO_ACIP_ERROR_NO_SUCH_ACIP: Cannot convert glyph with THDL Extended Wylie \\u0F13 to ACIP. Please transcribe this yourself.]\i0\b0\ul0\cf0 font 5; ord 94\par diff --git a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultConversion.expected b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultConversion.expected index 025941c..55875f0 100644 --- a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultConversion.expected +++ b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultConversion.expected @@ -205,7 +205,7 @@ \f1\fs144 >\'ee>\f2\fs28\i0\b0\ul0 M\i0\b0\ul0\cf0 font 1; ord 238\par \f1\fs144 >\'ef>\f2\fs28\i0\b0\ul0 H\i0\b0\ul0\cf0 font 1; ord 239\par \f1\fs144 >\'f1>\f2\fs28\i0\b0\ul0 ~M\i0\b0\ul0\cf0 font 1; ord 241\par -\f1\fs144 >\'f2>\f2\fs28\i0\b0\ul0 <<[[JSKAD_TMW_TO_WYLIE_ERROR_NO_SUCH_WYLIE: Cannot convert to THDL Extended Wylie. Please see the documentation for the TM or TMW font and transcribe this yourself.]]>>\i0\b0\ul0\cf0 font 1; ord 242\par +\f1\fs144 >\'f2>\f2\fs28\i0\b0\ul0 ~M`\i0\b0\ul0\cf0 font 1; ord 242\par \f1\fs144 >\'f3>\f2\fs28\i0\b0\ul0 iM\i0\b0\ul0\cf0 font 1; ord 243\par \f1\fs144 >\'f4>\f2\fs28\i0\b0\ul0 iM\i0\b0\ul0\cf0 font 1; ord 244\par \f1\fs144 >\'f5>\f2\fs28\i0\b0\ul0 -iM\i0\b0\ul0\cf0 font 1; ord 245\par @@ -806,7 +806,7 @@ \f1\fs144 >\f6 S\f1 >\f2\fs28\i0\b0\ul0\\u0FC3\i0\b0\ul0\cf0 font 5; ord 83\par \f1\fs144 >\f6 T\f1 >\f2\fs28\i0\b0\ul0\\uF03B\i0\b0\ul0\cf0 font 5; ord 84\par \f1\fs144 >\f6 Z\f1 >\f2\fs28\i0\b0\ul0\\uF039\i0\b0\ul0\cf0 font 5; ord 90\par -\f1\fs144 >\f6 [\f1 >\f2\fs28\i0\b0\ul0 ~M`\i0\b0\ul0\cf0 font 5; ord 91\par +\f1\fs144 >\f6 [\f1 >\f2\fs28\i0\b0\ul0\\uF03A\i0\b0\ul0\cf0 font 5; ord 91\par \f1\fs144 >\f6\\\f1 >\f2\fs28\i0\b0\ul0\\uF035\i0\b0\ul0\cf0 font 5; ord 92\par \f1\fs144 >\f6 ]\f1 >\f2\fs28\i0\b0\ul0\\uF036\i0\b0\ul0\cf0 font 5; ord 93\par \f1\fs144 >\f6 ^\f1 >\f2\fs28\i0\b0\ul0\\u0F13\i0\b0\ul0\cf0 font 5; ord 94\par diff --git a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest3ResultTMW.expected b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest3ResultTMW.expected index 488c6e8..8f0030d 100644 --- a/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest3ResultTMW.expected +++ b/source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest3ResultTMW.expected @@ -247,7 +247,7 @@ \par [# \\u0F40\\u0F81: ]\f2\fs72\\\f8 j\f3 W\f1\fs36\par \par -[# \\u0F40\\u0F82: ]\f2\fs72\\\f4 Y\f1\fs36\par +[# \\u0F40\\u0F82: ]\f2\fs72\\\f3 _\f1\fs36\par \par [# \\u0F40\\u0F83: ]\f2\fs72\\\f3 ^\f1\fs36\par \par diff --git a/source/org/thdl/tib/text/TibetanMachineWeb.java b/source/org/thdl/tib/text/TibetanMachineWeb.java index 2a1df2b..dc86df4 100644 --- a/source/org/thdl/tib/text/TibetanMachineWeb.java +++ b/source/org/thdl/tib/text/TibetanMachineWeb.java @@ -603,6 +603,10 @@ public class TibetanMachineWeb implements THDLWylieConstants { // here for either the TMW or the // TM glyph (though the TM glyph // could well be null): + if (null != TMWtoTM[duffCodes[TMW].getFontNum()-1][duffCodes[TMW].getCharNum()-32]) + throw new Error("tibwn.ini is supposed to use the TibetanMachineWeb glyph as the unique key, but " + + val + + " appears two or more times."); TMWtoTM[duffCodes[TMW].getFontNum()-1][duffCodes[TMW].getCharNum()-32] = duffCodes[TM]; // TMW->TM mapping diff --git a/source/org/thdl/tib/text/tibwn.ini b/source/org/thdl/tib/text/tibwn.ini index fd115be..e4e092c 100644 --- a/source/org/thdl/tib/text/tibwn.ini +++ b/source/org/thdl/tib/text/tibwn.ini @@ -20,8 +20,9 @@ // output codes in the PUA without explicit user authorization. // // Note that 0F00, 0F02, 0F03, and 0F0E are made by using multiple -// glyphs from TMW. 0F6A is not listed here (DLC FIXME: should it be?), -// but the glyph for it is the glyph for 0F62. +// glyphs from TMW. 0F6A is not listed here (DLC FIXME: should it be? +// Test that you can convert the Unicode ("" + U+0F6A) to TMW), but +// the glyph for it is the glyph for 0F62. // // The EWTS is not a unique key -- see "r", for example. // @@ -76,8 +77,10 @@ __TILDE__X~102,5~~9,102~~~~~~~0F35 // FIXME). M~~~8,91~~~~~~~0F7E __TILDE__M~241,1~~8,94~~~~~~~0F83 +// bindu + datse + thigle: U+0F82 __TILDE__M`~242,1~~8,95~~~~~~~0F82 + // plutao: &~177,4~~8,93~~~~~~~0F85 // zla tse gnyis: @@ -932,8 +935,8 @@ M~238,1~~8,90~~~~~~~0F7E o'i~156,5~~10,61~~~~~~~f7c,f60,f72 // /* /** unconfuse emacs fontification in java-mode... */ */ ' //punctuation -_~32,1~~1,32~~~~~~~0020 - ~45,1~~1,45~~~~~~~0F0B +// See above: _~32,1~~1,32~~~~~~~0020 +// See above: ~45,1~~1,45~~~~~~~0F0B _~32,1~~2,32~~~~~~~0020 ~45,1~~2,45~~~~~~~0F0B _~32,2~~3,32~~~~~~~0020 @@ -1140,10 +1143,6 @@ r~176,4~~8,71~~~~~~~0FB2 // mappings for all these. -// bindu + datse + thigle: DLC NOW 0f82 or not? 91,5 is a candidate too -// DLC NOW: \uF03A or not? Awaiting Than's reply... -\tmw7095~242,1~~8,95~~~~~~~none - // DLC see chinese unicode: // Chinese letter: \tmw9060~155,5~~10,60~~~~~~~none