thdltools/Jskad
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

David Chapman's latest fix to tibwn.ini (clearing up an issue that Than or I

Browse source 
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.
This commit is contained in:
dchandler 2004-04-24 13:23:56 +00:00
parent 9e071ea178
commit cc5d096918
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultACIP.expected
View file

@ -205,7 +205,7 @@
\f1\fs144 >\'ee>\f2\fs28\i0\b0\ul0 m\i0\b0\ul0\cf0 font 1; ord 238\par \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 >\'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 >\'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 <glyph font=TibetanMachineWeb7 charNum=95 character=_/> 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 >\'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 >\'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 \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 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 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 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 \\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 \\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 \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

4
source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest2ResultConversion.expected
View file

@ -205,7 +205,7 @@
\f1\fs144 >\'ee>\f2\fs28\i0\b0\ul0 M\i0\b0\ul0\cf0 font 1; ord 238\par \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 >\'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 >\'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 <glyph font=TibetanMachineWeb7 charNum=95 character=_/> 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 >\'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 >\'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 \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 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 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 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\\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\\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 \f1\fs144 >\f6 ^\f1 >\f2\fs28\i0\b0\ul0\\u0F13\i0\b0\ul0\cf0 font 5; ord 94\par

2
source/org/thdl/tib/input/TMW_RTF_TO_THDL_WYLIETest3ResultTMW.expected
View file

@ -247,7 +247,7 @@
\par \par
[# \\u0F40\\u0F81: ]\f2\fs72\\\f8 j\f3 W\f1\fs36\par [# \\u0F40\\u0F81: ]\f2\fs72\\\f8 j\f3 W\f1\fs36\par
\par \par
[# \\u0F40\\u0F82: ]\f2\fs72\\\f4 Y\f1\fs36\par [# \\u0F40\\u0F82: ]\f2\fs72\\\f3 _\f1\fs36\par
\par \par
[# \\u0F40\\u0F83: ]\f2\fs72\\\f3 ^\f1\fs36\par [# \\u0F40\\u0F83: ]\f2\fs72\\\f3 ^\f1\fs36\par
\par \par

4
source/org/thdl/tib/text/TibetanMachineWeb.java
View file

@ -603,6 +603,10 @@ public class TibetanMachineWeb implements THDLWylieConstants {
// here for either the TMW or the // here for either the TMW or the
// TM glyph (though the TM glyph // TM glyph (though the TM glyph
// could well be null): // 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] TMWtoTM[duffCodes[TMW].getFontNum()-1][duffCodes[TMW].getCharNum()-32]
= duffCodes[TM]; // TMW->TM mapping = duffCodes[TM]; // TMW->TM mapping

15
source/org/thdl/tib/text/tibwn.ini
View file

@ -20,8 +20,9 @@
// output codes in the PUA without explicit user authorization. // output codes in the PUA without explicit user authorization.
// //
// Note that 0F00, 0F02, 0F03, and 0F0E are made by using multiple // 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?), // glyphs from TMW. 0F6A is not listed here (DLC FIXME: should it be?
// but the glyph for it is the glyph for 0F62. // 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. // The EWTS is not a unique key -- see "r", for example.
// //
@ -76,8 +77,10 @@ __TILDE__X~102,5~~9,102~~~~~~~0F35
// FIXME). // FIXME).
M~~~8,91~~~~~~~0F7E M~~~8,91~~~~~~~0F7E
__TILDE__M~241,1~~8,94~~~~~~~0F83 __TILDE__M~241,1~~8,94~~~~~~~0F83
// bindu + datse + thigle: U+0F82
__TILDE__M`~242,1~~8,95~~~~~~~0F82 __TILDE__M`~242,1~~8,95~~~~~~~0F82
// plutao: // plutao:
&~177,4~~8,93~~~~~~~0F85 &~177,4~~8,93~~~~~~~0F85
// zla tse gnyis: // zla tse gnyis:
@ -932,8 +935,8 @@ M~238,1~~8,90~~~~~~~0F7E
o'i~156,5~~10,61~~~~~~~f7c,f60,f72 o'i~156,5~~10,61~~~~~~~f7c,f60,f72
// /* /** unconfuse emacs fontification in java-mode... */ */ ' // /* /** unconfuse emacs fontification in java-mode... */ */ '
//punctuation //punctuation
_~32,1~~1,32~~~~~~~0020 // See above: _~32,1~~1,32~~~~~~~0020
~45,1~~1,45~~~~~~~0F0B // See above: ~45,1~~1,45~~~~~~~0F0B
_~32,1~~2,32~~~~~~~0020 _~32,1~~2,32~~~~~~~0020
~45,1~~2,45~~~~~~~0F0B ~45,1~~2,45~~~~~~~0F0B
_~32,2~~3,32~~~~~~~0020 _~32,2~~3,32~~~~~~~0020
@ -1140,10 +1143,6 @@ r~176,4~~8,71~~~~~~~0FB2
// mappings for all these. // mappings for all these.
<?Ignore?> <?Ignore?>
// 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: // DLC see chinese unicode:
// Chinese letter: // Chinese letter:
\tmw9060~155,5~~10,60~~~~~~~none \tmw9060~155,5~~10,60~~~~~~~none