From d726bc0258d414c5d9c49e08265dfd7b2807a546 Mon Sep 17 00:00:00 2001 From: dchandler Date: Wed, 9 Jul 2003 01:44:15 +0000 Subject: [PATCH] A couple of changes to TMW->Unicode thanks to Than's reply to my questions. --- .../org/thdl/tib/text/TibetanMachineWeb.java | 5 ++- source/org/thdl/tib/text/tibwn.ini | 34 +++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/source/org/thdl/tib/text/TibetanMachineWeb.java b/source/org/thdl/tib/text/TibetanMachineWeb.java index 5cbf04b..32dbcdc 100644 --- a/source/org/thdl/tib/text/TibetanMachineWeb.java +++ b/source/org/thdl/tib/text/TibetanMachineWeb.java @@ -556,7 +556,10 @@ public class TibetanMachineWeb implements THDLWylieConstants { int x; ThdlDebug.verify(((x = Integer.parseInt(subval, 16)) >= 0x0F00 && x <= 0x0FFF) - || x == 0x0020); + || x == 0x5350 + || x == 0x534D + || x == 0x0020 + || x == 0x2003); unicodeBuffer.append((char)x); } catch (NumberFormatException e) { ThdlDebug.verify(false); diff --git a/source/org/thdl/tib/text/tibwn.ini b/source/org/thdl/tib/text/tibwn.ini index 064eb9f..87147d7 100644 --- a/source/org/thdl/tib/text/tibwn.ini +++ b/source/org/thdl/tib/text/tibwn.ini @@ -32,7 +32,7 @@ _, ,/,|,!,:,;,@,#,$,%,(,),H,M,`,&,@#,?,=,[,],{,},* //_~32,1~0,32 // ~45,1~0,45~~~~~~~0F0B -// DLC 0020 or a wider space, perhaps a couple of EM spaces (2003,2003)? +// DLC 0020 or a wider space, perhaps a couple of EM spaces (2003,2003)? Than couldn't say, but he also had thought of U+2003. _~32,1~~1,32~~~~~~~0020 ~45,1~~1,45~~~~~~~0F0B /~202,1~~1,107~~~~~~~0F0D @@ -96,9 +96,11 @@ M~~~8,91~~~~~~~0F7E -// DLC FIXME: 0F5F,0F39 might work, but the OpenType font's author must've had Dza -// in mind if it does. -Dz~146,5~~10,42~~~~~~~0F5F,0F39 + +// 0F5F,0F39 might work, but the OpenType font's author must've had +// Dza in mind if it does. Note that the bottommost horizontal stroke +// goes upward on U+0F5F and downward on U+0F5B. +Dz~146,5~~10,42~~~~~~~none f~153,5~~10,58~1,110~1,118~1,124~1,126~10,114~10,123~0F55,0F39 v~154,5~~10,59~1,110~1,118~1,124~1,126~10,114~10,123~0F56,f39 k~33,1~1,92~1,33~1,109~1,111~1,123~1,125~10,118~10,120~0F40 @@ -593,11 +595,8 @@ r+b+p~48,4~~7,56~1,109~8,121~1,123~1,125~8,107~8,114~f62,fa6,fa4 r+b+b~49,4~~7,57~1,109~8,121~1,123~1,125~8,107~8,114~f62,fa6,fa6 r+b+h~50,4~~7,58~1,110~8,124~1,125~1,125~8,110~8,117~f62,fa6,fb7 r+m+m~51,4~~7,59~1,110~8,121~1,125~1,125~8,107~8,114~f62,fa8,fa8 -// DLC or 6a bb? or 62 b1? which? r+y~52,4~~7,60~1,110~8,120~1,125~1,125~8,106~8,113~f62,fbb -// DLC or f6a,fba? r+w~196,4~~7,61~1,109~8,120~1,123~1,125~8,106~8,113~f62,fba -// DLC f62 or f6a? r+sh~53,4~~7,62~1,109~8,120~1,123~1,125~8,106~8,113~f62,fb4 r+sh+y~54,4~~7,63~1,109~8,122~1,123~1,125~8,108~8,115~f62,fb4,fb1 r+Sh~55,4~~7,64~1,109~8,120~1,123~1,125~8,106~8,113~f62,fb5 @@ -733,7 +732,6 @@ a+r+y~145,4~~8,65~1,109~8,121~1,123~1,125~8,107~8,114~f68,fb2,fb1 <9~69,5~~9,72~~~~~~~none -// DLC FIXME: 0F7E? Or is there no Unicode that corresponds to this? WE GOT 2 7Es! M~238,1~~8,90~~~~~~~0F7E ~~~3,45~~~~~~~0F0B @@ -744,7 +742,6 @@ M~238,1~~8,90~~~~~~~0F7E ~~~8,45~~~~~~~0F0B ~~~9,45~~~~~~~0F0B ~~~10,45~~~~~~~0F0B -// DLC is this for (40 etc.),7c,60,72 ??? or for standalone f60,f72,f7c? // Special combination: o'i~156,5~~10,61~~~~~~~f7c,f60,f72 // DLC FIXME: make this punctuation: @@ -767,7 +764,6 @@ _~32,5~~9,32~~~~~~~0020 _~32,5~~10,32~~~~~~~0020 //bindus -// DLC FIXME: bindu is 7e or not? iM~243,1~~8,96~~~~~~~f72,f7e iM~244,1~~8,97~~~~~~~f72,f7e -iM~245,1~~8,98~~~~~~~f80,f7e @@ -994,11 +990,10 @@ r~176,4~~8,71~~~~~~~0FB2 // no name: \tmw8091~93,5~~9,91~~~~~~~none -// DLC FIXME: aren't these elsewhere in unicode, though? 534d, e.g.? use it? // yungs.drung (reversed): -\tmw8097~97,5~~9,97~~~~~~~none +\tmw8097~97,5~~9,97~~~~~~~5350 // yungs.drung (standard): -\tmw8098~98,5~~9,98~~~~~~~none +\tmw8098~98,5~~9,98~~~~~~~534D // mchan rtags trailing: \tmw8099~99,5~~9,99~~~~~~~none @@ -1068,16 +1063,19 @@ r~176,4~~8,71~~~~~~~0FB2 // tza.'phru: \tmw7067~174,4~~8,67~~~~~~~0F39 -// DLC FIXME: 0F39, yes? -// reversed tza.'phru: -\tmw7068~145,5~~8,68~~~~~~~0F39 +// reversed tza.'phru: (non-reversed is in Unicode, but not this) +\tmw7068~145,5~~8,68~~~~~~~ // damaru.rtags: \tmw7072~178,4~~8,72~~~~~~~0F88 // half a.chen: \tmw7073~179,4~~8,73~~~~~~~0F01 -// DLC f68,fa0,f80,f72 comes close, but fa0 would be larger. + +// f68,fa0,f80,f72 comes close, but fa0 might be larger. The OpenType +// font will probably have had this very glyph in mind! +// // ITHI secret sign: -\tmw7074~180,4~~8,74~~~~~~~none +\tmw7074~180,4~~8,74~~~~~~~f68,fa0,f80,f72 + // Terton's mark: \tmw7075~181,4~~8,75~~~~~~~none // Terton's mark: