The ~M and ~M` EWTS change had not fully been made. Someone submitted a bug report 911472 that alerted me to this.
This commit is contained in:
parent
db2ef438d4
commit
542fb50bf1
5 changed files with 121 additions and 119 deletions
|
@ -1122,7 +1122,8 @@ public static boolean isWylieVowel(String s) {
|
||||||
public static boolean isWylieAdornment(String wylie) {
|
public static boolean isWylieAdornment(String wylie) {
|
||||||
return (vowelSet.contains(wylie)
|
return (vowelSet.contains(wylie)
|
||||||
|| (wylie.equals("M") /* U+0F7E */
|
|| (wylie.equals("M") /* U+0F7E */
|
||||||
|| wylie.equals("M^") /* U+0F83 */
|
|| wylie.equals("~M") /* U+0F83 */
|
||||||
|
|| wylie.equals("~M`") /* U+0F82 */
|
||||||
|| wylie.equals("iM")
|
|| wylie.equals("iM")
|
||||||
|| wylie.equals("-iM")
|
|| wylie.equals("-iM")
|
||||||
|| wylie.equals("eM")
|
|| wylie.equals("eM")
|
||||||
|
@ -1137,7 +1138,8 @@ public static boolean isWylieAdornment(String wylie) {
|
||||||
public static boolean isWylieAdornmentAndContainsVowel(String wylie) {
|
public static boolean isWylieAdornmentAndContainsVowel(String wylie) {
|
||||||
return (isWylieAdornment(wylie) &&
|
return (isWylieAdornment(wylie) &&
|
||||||
!wylie.equals("M") /* U+0F7E */
|
!wylie.equals("M") /* U+0F7E */
|
||||||
&& !wylie.equals("M^") /* U+0F83 */);
|
&& !wylie.equals("~M") /* U+0F83 */
|
||||||
|
&& !wylie.equals("~M`") /* U+0F82 */);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -113,6 +113,6 @@ $=
|
||||||
)=)
|
)=)
|
||||||
H=:
|
H=:
|
||||||
M=*
|
M=*
|
||||||
^M=`
|
~M=`
|
||||||
// DLC FIXME: \tmw7095=__TILDE__
|
// DLC FIXME: \tmw7095=__TILDE__
|
||||||
&=$
|
&=$
|
||||||
|
|
|
@ -1,112 +1,112 @@
|
||||||
Tibetan Computer Company Keyboard #2
|
Tibetan Computer Company Keyboard #2
|
||||||
|
|
||||||
<?parameters?>
|
<?parameters?>
|
||||||
has sanskrit stacking=true
|
has sanskrit stacking=true
|
||||||
has tibetan stacking=true
|
has tibetan stacking=true
|
||||||
is stacking medial=false
|
is stacking medial=false
|
||||||
stack key=a
|
stack key=a
|
||||||
has disambiguating key=false
|
has disambiguating key=false
|
||||||
disambiguating key=
|
disambiguating key=
|
||||||
needs achen before vowels=true
|
needs achen before vowels=true
|
||||||
has 'a' vowel=false
|
has 'a' vowel=false
|
||||||
is achung consonant=true
|
is achung consonant=true
|
||||||
|
|
||||||
<?characters?>
|
<?characters?>
|
||||||
k=q
|
k=q
|
||||||
kh=w
|
kh=w
|
||||||
g=s
|
g=s
|
||||||
ng=e
|
ng=e
|
||||||
c=b
|
c=b
|
||||||
ch=n
|
ch=n
|
||||||
j=m
|
j=m
|
||||||
ny=,
|
ny=,
|
||||||
t=o
|
t=o
|
||||||
th=p
|
th=p
|
||||||
d=j
|
d=j
|
||||||
n=k
|
n=k
|
||||||
p=r
|
p=r
|
||||||
ph=/
|
ph=/
|
||||||
b=d
|
b=d
|
||||||
m=f
|
m=f
|
||||||
ts=;
|
ts=;
|
||||||
tsh='
|
tsh='
|
||||||
dz=[
|
dz=[
|
||||||
w=]
|
w=]
|
||||||
zh=z
|
zh=z
|
||||||
z=x
|
z=x
|
||||||
'=c
|
'=c
|
||||||
y=g
|
y=g
|
||||||
r=h
|
r=h
|
||||||
l=v
|
l=v
|
||||||
sh=.
|
sh=.
|
||||||
s=l
|
s=l
|
||||||
h=G
|
h=G
|
||||||
a=H
|
a=H
|
||||||
T=O
|
T=O
|
||||||
Th=P
|
Th=P
|
||||||
D=J
|
D=J
|
||||||
N=K
|
N=K
|
||||||
Sh=>
|
Sh=>
|
||||||
0=0
|
0=0
|
||||||
1=1
|
1=1
|
||||||
2=2
|
2=2
|
||||||
3=3
|
3=3
|
||||||
4=4
|
4=4
|
||||||
5=5
|
5=5
|
||||||
6=6
|
6=6
|
||||||
7=7
|
7=7
|
||||||
8=8
|
8=8
|
||||||
9=9
|
9=9
|
||||||
<0=
|
<0=
|
||||||
<1=
|
<1=
|
||||||
<2=
|
<2=
|
||||||
<3=
|
<3=
|
||||||
<4=
|
<4=
|
||||||
<5=
|
<5=
|
||||||
<6=
|
<6=
|
||||||
<7=
|
<7=
|
||||||
<8=
|
<8=
|
||||||
<9=
|
<9=
|
||||||
>0=
|
>0=
|
||||||
>1=
|
>1=
|
||||||
>2=
|
>2=
|
||||||
>3=
|
>3=
|
||||||
>4=
|
>4=
|
||||||
>5=
|
>5=
|
||||||
>6=
|
>6=
|
||||||
>7=
|
>7=
|
||||||
>8=
|
>8=
|
||||||
>9=
|
>9=
|
||||||
|
|
||||||
<?vowels?>
|
<?vowels?>
|
||||||
a=
|
a=
|
||||||
i=t
|
i=t
|
||||||
u=u
|
u=u
|
||||||
e=y
|
e=y
|
||||||
o=i
|
o=i
|
||||||
I=
|
I=
|
||||||
U=
|
U=
|
||||||
ai=Y
|
ai=Y
|
||||||
au=I
|
au=I
|
||||||
A=
|
A=
|
||||||
-i=T
|
-i=T
|
||||||
-I=
|
-I=
|
||||||
|
|
||||||
<?punctuation?>
|
<?punctuation?>
|
||||||
_=
|
_=
|
||||||
=
|
=
|
||||||
/=\
|
/=\
|
||||||
|=+
|
|=+
|
||||||
!=|
|
!=|
|
||||||
:=%
|
:=%
|
||||||
;=
|
;=
|
||||||
@=!
|
@=!
|
||||||
#=@
|
#=@
|
||||||
$=
|
$=
|
||||||
%=
|
%=
|
||||||
(=(
|
(=(
|
||||||
)=)
|
)=)
|
||||||
H=:
|
H=:
|
||||||
M=*
|
M=*
|
||||||
`=`
|
\u0F13=`
|
||||||
&=$
|
&=$
|
||||||
|
|
|
@ -218,8 +218,8 @@ public class UnicodeCodepointToThdlWylie {
|
||||||
|
|
||||||
case '\u0F80': return "-i";
|
case '\u0F80': return "-i";
|
||||||
case '\u0F81': return "-I";
|
case '\u0F81': return "-I";
|
||||||
case '\u0F82': return "\\u0F82";
|
case '\u0F82': return "~M`";
|
||||||
case '\u0F83': return "^M"; // DLC unsupported in Jskad
|
case '\u0F83': return "~M"; // DLC unsupported in Jskad, and 0F82 too probably
|
||||||
case '\u0F84': return "?";
|
case '\u0F84': return "?";
|
||||||
case '\u0F85': return "&";
|
case '\u0F85': return "&";
|
||||||
case '\u0F86': return "\\u0F86";
|
case '\u0F86': return "\\u0F86";
|
||||||
|
|
|
@ -41,7 +41,7 @@ interface UnicodeReadingStateMachineConstants {
|
||||||
static final int CC_MCWD = 1;
|
static final int CC_MCWD = 1;
|
||||||
|
|
||||||
/** for combining marks in the Tibetan range of Unicode, minus
|
/** for combining marks in the Tibetan range of Unicode, minus
|
||||||
* CC_MCWD, U+0F82, and U+0F39 */
|
* CC_MCWD, U+0F82, (DLC U+0F83???) and U+0F39 */
|
||||||
static final int CC_CM = 2;
|
static final int CC_CM = 2;
|
||||||
|
|
||||||
/** for combining consonants, that is to say U+0F90-U+0FBC minus
|
/** for combining consonants, that is to say U+0F90-U+0FBC minus
|
||||||
|
@ -62,7 +62,7 @@ interface UnicodeReadingStateMachineConstants {
|
||||||
static final int CC_0F8A = 6;
|
static final int CC_0F8A = 6;
|
||||||
|
|
||||||
/** for U+0F82, which is treated like {@link #CC_CM} except after
|
/** for U+0F82, which is treated like {@link #CC_CM} except after
|
||||||
* U+0F8A */
|
* U+0F8A (DLC FIXME -- do we need similar treatment for 0F83???) */
|
||||||
static final int CC_0F82 = 7;
|
static final int CC_0F82 = 7;
|
||||||
|
|
||||||
/** for U+0F39, an integral part of a consonant when it directly
|
/** for U+0F39, an integral part of a consonant when it directly
|
||||||
|
|
Loading…
Reference in a new issue