1 files changed, 45 insertions, 49 deletions
diff --git a/res/diacritics.txt b/res/diacritics.txt
index 9699f63..1f60d71 100644
--- a/res/diacritics.txt
+++ b/res/diacritics.txt
@@ -275,9 +275,9 @@ Z.smcp+dotaccent:top=Zdotaccent.smcp
 Z.smcp+caron:top=Zcaron.smcp
 #
 A+tonos:tonos=Alphatonos/0,0
-E+tonos:tonos=Epsilontonos/0,0
-H+tonos:tonos=Etatonos/0,0
-I+tonos:tonos=Iotatonos/0,0
+E+tonos:tonos=Epsilontonos/100,0
+H+tonos:tonos=Etatonos/100,0
+I+tonos:tonos=Iotatonos/100,0
 O+tonos:tonos=Omicrontonos/20,0
 Y+tonos:tonos=Upsilontonos/100,0
 Omega+tonos:tonos=Omegatonos/20,0
@@ -307,7 +307,7 @@ kgreenlandic=kappa
 o=omicron
 mu=uni03BC
 v=nu
-x=chi
+chi.alt=chi
 iota+dieresis:top=iotadieresis
 upsilon+dieresis:top=upsilondieresis
 o+tonos:top=omicrontonos
@@ -555,10 +555,6 @@ eight=eight.pnum/20,20
 nine=nine.pnum/0,20
 zero=zero.pnum/20,20
 #
-# old-style numbers
-six=six.onum
-eight=eight.onum
-#
 # AddGlyphs
 uni1FBE=uni037A
 #I=Iota1
@@ -832,12 +828,12 @@ epsilon+uni1FCD:top=uni1F12
 epsilon+uni1FDD:top=uni1F13
 epsilon+uni1FCE:top=uni1F14
 epsilon+uni1FDE:top=uni1F15
-E+uni1FBD:tonos=uni1F18/0,0
-E+uni1FFE:tonos=uni1F19/0,0
-E+uni1FCD:tonos=uni1F1A/0,0
-E+uni1FDD:tonos=uni1F1B/0,0
-E+uni1FCE:tonos=uni1F1C/0,0
-E+uni1FDE:tonos=uni1F1D/0,0
+E+uni1FBD:tonos=uni1F18/100,0
+E+uni1FFE:tonos=uni1F19/100,0
+E+uni1FCD:tonos=uni1F1A/150,0
+E+uni1FDD:tonos=uni1F1B/150,0
+E+uni1FCE:tonos=uni1F1C/150,0
+E+uni1FDE:tonos=uni1F1D/150,0
 eta+uni1FBD:top=uni1F20
 eta+uni1FFE:top=uni1F21
 eta+uni1FCD:top=uni1F22
@@ -846,14 +842,14 @@ eta+uni1FCE:top=uni1F24
 eta+uni1FDE:top=uni1F25
 eta+uni1FCF:top=uni1F26
 eta+uni1FDF:top=uni1F27
-H+uni1FBD:tonos=uni1F28/0,0
-H+uni1FFE:tonos=uni1F29/0,0
-H+uni1FCD:tonos=uni1F2A/0,0
-H+uni1FDD:tonos=uni1F2B/0,0
-H+uni1FCE:tonos=uni1F2C/0,0
-H+uni1FDE:tonos=uni1F2D/0,0
-H+uni1FCF:tonos=uni1F2E/0,0
-H+uni1FDF:tonos=uni1F2F/0,0
+H+uni1FBD:tonos=uni1F28/100,0
+H+uni1FFE:tonos=uni1F29/100,0
+H+uni1FCD:tonos=uni1F2A/150,0
+H+uni1FDD:tonos=uni1F2B/150,0
+H+uni1FCE:tonos=uni1F2C/150,0
+H+uni1FDE:tonos=uni1F2D/150,0
+H+uni1FCF:tonos=uni1F2E/150,0
+H+uni1FDF:tonos=uni1F2F/150,0
 iota+uni1FBD:top=uni1F30
 iota+uni1FFE:top=uni1F31
 iota+uni1FCD:top=uni1F32
@@ -862,14 +858,14 @@ iota+uni1FCE:top=uni1F34
 iota+uni1FDE:top=uni1F35
 iota+uni1FCF:top=uni1F36
 iota+uni1FDF:top=uni1F37
-I+uni1FBD:tonos=uni1F38/0,0
-I+uni1FFE:tonos=uni1F39/0,0
-I+uni1FCD:tonos=uni1F3A/0,0
-I+uni1FDD:tonos=uni1F3B/0,0
-I+uni1FCE:tonos=uni1F3C/0,0
-I+uni1FDE:tonos=uni1F3D/0,0
-I+uni1FCF:tonos=uni1F3E/0,0
-I+uni1FDF:tonos=uni1F3F/0,0
+I+uni1FBD:tonos=uni1F38/100,0
+I+uni1FFE:tonos=uni1F39/100,0
+I+uni1FCD:tonos=uni1F3A/150,0
+I+uni1FDD:tonos=uni1F3B/150,0
+I+uni1FCE:tonos=uni1F3C/150,0
+I+uni1FDE:tonos=uni1F3D/150,0
+I+uni1FCF:tonos=uni1F3E/150,0
+I+uni1FDF:tonos=uni1F3F/150,0
 o+uni1FBD:top=uni1F40
 o+uni1FFE:top=uni1F41
 o+uni1FCD:top=uni1F42
@@ -890,10 +886,10 @@ upsilon+uni1FCE:top=uni1F54
 upsilon+uni1FDE:top=uni1F55
 upsilon+uni1FCF:top=uni1F56
 upsilon+uni1FDF:top=uni1F57
-Y+uni1FFE:tonos=uni1F59/0,0
-Y+uni1FDD:tonos=uni1F5B/0,0
-Y+uni1FDE:tonos=uni1F5D/0,0
-Y+uni1FDF:tonos=uni1F5F/0,0
+Y+uni1FFE:tonos=uni1F59/100,0
+Y+uni1FDD:tonos=uni1F5B/200,0
+Y+uni1FDE:tonos=uni1F5D/200,0
+Y+uni1FDF:tonos=uni1F5F/200,0
 omega+uni1FBD:top=uni1F60
 omega+uni1FFE:top=uni1F61
 omega+uni1FCD:top=uni1F62
@@ -948,14 +944,14 @@ eta+uni1FBE:bottom+uni1FCE:top=uni1F94
 eta+uni1FBE:bottom+uni1FDE:top=uni1F95
 eta+uni1FBE:bottom+uni1FCF:top=uni1F96
 eta+uni1FBE:bottom+uni1FDF:top=uni1F97
-H+uni1FBE:bottom+uni1FBD:tonos=uni1F98/0,0
-H+uni1FBE:bottom+uni1FFE:tonos=uni1F99/0,0
-H+uni1FBE:bottom+uni1FCD:tonos=uni1F9A/0,0
-H+uni1FBE:bottom+uni1FDD:tonos=uni1F9B/0,0
-H+uni1FBE:bottom+uni1FCE:tonos=uni1F9C/0,0
-H+uni1FBE:bottom+uni1FDE:tonos=uni1F9D/0,0
-H+uni1FBE:bottom+uni1FCF:tonos=uni1F9E/0,0
-H+uni1FBE:bottom+uni1FDF:tonos=uni1F9F/0,0
+H+uni1FBE:bottom+uni1FBD:tonos=uni1F98/100,0
+H+uni1FBE:bottom+uni1FFE:tonos=uni1F99/100,0
+H+uni1FBE:bottom+uni1FCD:tonos=uni1F9A/150,0
+H+uni1FBE:bottom+uni1FDD:tonos=uni1F9B/150,0
+H+uni1FBE:bottom+uni1FCE:tonos=uni1F9C/150,0
+H+uni1FBE:bottom+uni1FDE:tonos=uni1F9D/150,0
+H+uni1FBE:bottom+uni1FCF:tonos=uni1F9E/150,0
+H+uni1FBE:bottom+uni1FDF:tonos=uni1F9F/150,0
 omega+uni1FBE:bottom+uni1FBD:top=uni1FA0
 omega+uni1FBE:bottom+uni1FFE:top=uni1FA1
 omega+uni1FBE:bottom+uni1FCD:top=uni1FA2
@@ -989,10 +985,10 @@ eta+uni1FBE:bottom=uni1FC3
 eta+uni1FBE:bottom+uni1FFD:top=uni1FC4
 eta+uni1FC0:top=uni1FC6
 eta+uni1FBE:bottom+uni1FC0:top=uni1FC7
-E+uni1FEF:tonos=uni1FC8/0,0
-E+uni1FFD:tonos=uni1FC9/0,0
-H+uni1FEF:tonos=uni1FCA/0,0
-H+uni1FFD:tonos=uni1FCB/0,0
+E+uni1FEF:tonos=uni1FC8/100,0
+E+uni1FFD:tonos=uni1FC9/100,0
+H+uni1FEF:tonos=uni1FCA/100,0
+H+uni1FFD:tonos=uni1FCB/100,0
 H+uni1FBE:bottom=uni1FCC
 iota+breve:top=uni1FD0
 iota+macron:top=uni1FD1
@@ -1014,9 +1010,9 @@ upsilon+uni1FC0:top=uni1FE6
 upsilon+uni1FC1:top=uni1FE7
 Y+breve:top=uni1FE8
 Y+macron:top=uni1FE9
-Y+uni1FEF:tonos=uni1FEA/0,0
-Y+uni1FFD:tonos=uni1FEB/0,0
-P+uni1FFE:tonos=uni1FEC/0,0
+Y+uni1FEF:tonos=uni1FEA/100,0
+Y+uni1FFD:tonos=uni1FEB/100,0
+P+uni1FFE:tonos=uni1FEC/100,0
 omega+uni1FBE:bottom+uni1FEF:top=uni1FF2
 omega+uni1FBE:bottom=uni1FF3
 omega+uni1FBE:bottom+uni1FFD:top=uni1FF4