1 files changed, 74 insertions, 66 deletions

diff --git a/res/diacritics.txt b/res/diacritics.txt
index 65c151d..5f0ec49 100644
--- a/res/diacritics.txt
+++ b/res/diacritics.txt
@@ -274,9 +274,9 @@ Z.smcp+dotaccent:top=Zdotaccent.smcp
 Z.smcp+caron:top=Zcaron.smcp

 #

 A+tonos:tonos=Alphatonos/0,0

-E+tonos:tonos=Epsilontonos/100,0

-H+tonos:tonos=Etatonos/100,0

-I+tonos:tonos=Iotatonos/100,0

+E+tonos:tonos=Epsilontonos/0,0

+H+tonos:tonos=Etatonos/0,0

+I+tonos:tonos=Iotatonos/0,0

 O+tonos:tonos=Omicrontonos/20,0

 Y+tonos:tonos=Upsilontonos/100,0

 Omega+tonos:tonos=Omegatonos/20,0

@@ -497,7 +497,7 @@ ohorn+tilde:top=uni1EE1
 Ohorn+dotbelow:bottom=uni1EE2

 ohorn+dotbelow:bottom=uni1EE3

 U+dotbelow:bottom=uni1EE4

-u+dotbelow:bottom=uni1EE5

+u+dotbelow:bottomu=uni1EE5

 U+hook:top=uni1EE6

 u+hook:top=uni1EE7

 Uhorn+acute:top=uni1EE8

@@ -571,18 +571,18 @@ o+caron:top=ocaron
 U+caron:top=Ucaron

 u+caron:top=ucaron

 U+dieresismacroncomb:top=uni01D5

-u+dieresismacroncomb:top=uni01D6

+u+dieresismacroncomb.lc:top=uni01D6

 U+dieresisacutecomb:top=uni01D7

-u+dieresisacutecomb:top=uni01D8

+u+dieresisacutecomb.lc:top=uni01D8

 U+dieresiscaroncomb:top=uni01D9

-u+dieresiscaroncomb:top=uni01DA

+u+dieresiscaroncomb.lc:top=uni01DA

 U+dieresisgravecomb:top=uni01DB

-u+dieresisgravecomb:top=uni01DC

+u+dieresisgravecomb.lc:top=uni01DC

 schwa=eturn

 A+dieresismacroncomb:top=uni01DE

-a+dieresismacroncomb:top=uni01DF

+a+dieresismacroncomb.lc:top=uni01DF

 A+dotmacroncomb:top=uni01E0

-a+dotmacroncomb:top=uni01E1

+a+dotmacroncomb.lc:top=uni01E1

 AE+macron:top=AEmacron

 ae+macron:top=aemacron

 G+caron:top=Gcaron

@@ -631,13 +631,13 @@ a+dotaccent:top=uni0227
 E+cedilla:bottom=uni0228

 e+cedilla:bottom=uni0229

 O+dieresismacroncomb:top=uni022A

-o+dieresismacroncomb:top=uni022B

+o+dieresismacroncomb.lc:top=uni022B

 O+tildemacroncomb:top=uni022C

-o+tildemacroncomb:top=uni022D

+o+tildemacroncomb.lc:top=uni022D

 O+dotaccent:top=uni022E

 o+dotaccent:top=uni022F

 O+dotmacroncomb:top=uni0230

-o+dotmacroncomb:top=uni0231

+o+dotmacroncomb.lc:top=uni0231

 Y+macron:top=uni0232

 y+macron:top=uni0233

 uni0473=obar

@@ -676,9 +676,9 @@ d+commaaccent:bottom=uni1E11
 D+circumflexsubnosp:bottom=uni1E12

 d+circumflexsubnosp:bottom=uni1E13

 E+macrongravecomb:top=uni1E14

-e+macrongravecomb:top=uni1E15

+e+macrongravecomb.lc:top=uni1E15

 E+macronacutecomb:top=uni1E16

-e+macronacutecomb:top=uni1E17

+e+macronacutecomb.lc:top=uni1E17

 E+circumflexsubnosp:bottom=uni1E18

 e+circumflexsubnosp:bottom=uni1E19

 E+tildesubnosp:bottom=uni1E1A

@@ -700,7 +700,7 @@ h+brevesubnosp:bottom=uni1E2B
 I+tildesubnosp:bottom=uni1E2C

 i+tildesubnosp:bottom=uni1E2D

 I+dieresisacutecomb:top=uni1E2E

-dotlessi+dieresisacutecomb:top=uni1E2F

+dotlessi+dieresisacutecomb.lc:top=uni1E2F

 K+acute:top=uni1E30

 k+acute:top=uni1E31

 K+dotbelow:bottom=uni1E32

@@ -730,13 +730,13 @@ n+macronsubnosp:bottom=uni1E49
 N+circumflexsubnosp:bottom=uni1E4A

 n+circumflexsubnosp:bottom=uni1E4B

 O+tildeacutecomb:top=uni1E4C

-o+tildeacutecomb:top=uni1E4D

+o+tildeacutecomb.lc:top=uni1E4D

 O+tildedieresiscomb:top=uni1E4E

-o+tildedieresiscomb:top=uni1E4F

+o+tildedieresiscomb.lc:top=uni1E4F

 O+macrongravecomb:top=uni1E50

-o+macrongravecomb:top=uni1E51

+o+macrongravecomb.lc:top=uni1E51

 O+macronacutecomb:top=uni1E52

-o+macronacutecomb:top=uni1E53

+o+macronacutecomb.lc:top=uni1E53

 P+acute:top=uni1E54

 p+acute:top=uni1E55

 P+dotaccent:top=uni1E56

@@ -754,9 +754,9 @@ s+dotaccent:top=uni1E61
 S+dotbelow:bottom=uni1E62

 s+dotbelow:bottom=uni1E63

 S+acutedotcomb:top=uni1E64

-s+acutedotcomb:top=uni1E65

+s+acutedotcomb.lc:top=uni1E65

 S+carondotcomb:top=uni1E66

-s+carondotcomb:top=uni1E67

+s+carondotcomb.lc:top=uni1E67

 S+dotbelow:bottom+dotaccent:top=uni1E68

 s+dotbelow:bottom+dotaccent:top=uni1E69

 T+dotaccent:top=uni1E6A

@@ -772,11 +772,11 @@ u+dotdblsubnosp:bottom=uni1E73
 U+tildesubnosp:bottom=uni1E74

 u+tildesubnosp:bottom=uni1E75

 U+circumflexsubnosp:bottom=uni1E76

-u+circumflexsubnosp:bottom=uni1E77

+u+circumflexsubnosp:bottomu=uni1E77

 U+tildeacutecomb:top=uni1E78

-u+tildeacutecomb:top=uni1E79

+u+tildeacutecomb.lc:top=uni1E79

 U+macrondieresiscomb:top=uni1E7A

-u+macrondieresiscomb:top=uni1E7B

+u+macrondieresiscomb.lc:top=uni1E7B

 V+tilde:top=uni1E7C

 v+tilde:top=uni1E7D

 V+dotbelow:bottom=uni1E7E

@@ -825,12 +825,12 @@ epsilon+uni1FCD:top=uni1F12
 epsilon+uni1FDD:top=uni1F13

 epsilon+uni1FCE:top=uni1F14

 epsilon+uni1FDE:top=uni1F15

-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

+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

 eta+uni1FBD:top=uni1F20

 eta+uni1FFE:top=uni1F21

 eta+uni1FCD:top=uni1F22

@@ -839,14 +839,14 @@ eta+uni1FCE:top=uni1F24
 eta+uni1FDE:top=uni1F25

 eta+uni1FCF:top=uni1F26

 eta+uni1FDF:top=uni1F27

-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

+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

 iota+uni1FBD:top=uni1F30

 iota+uni1FFE:top=uni1F31

 iota+uni1FCD:top=uni1F32

@@ -855,14 +855,14 @@ iota+uni1FCE:top=uni1F34
 iota+uni1FDE:top=uni1F35

 iota+uni1FCF:top=uni1F36

 iota+uni1FDF:top=uni1F37

-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

+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

 o+uni1FBD:top=uni1F40

 o+uni1FFE:top=uni1F41

 o+uni1FCD:top=uni1F42

@@ -883,10 +883,10 @@ upsilon+uni1FCE:top=uni1F54
 upsilon+uni1FDE:top=uni1F55

 upsilon+uni1FCF:top=uni1F56

 upsilon+uni1FDF:top=uni1F57

-Y+uni1FFE:tonos=uni1F59/100,0

-Y+uni1FDD:tonos=uni1F5B/200,0

-Y+uni1FDE:tonos=uni1F5D/200,0

-Y+uni1FDF:tonos=uni1F5F/200,0

+Y+uni1FFE:tonos=uni1F59/0,0

+Y+uni1FDD:tonos=uni1F5B/0,0

+Y+uni1FDE:tonos=uni1F5D/0,0

+Y+uni1FDF:tonos=uni1F5F/0,0

 omega+uni1FBD:top=uni1F60

 omega+uni1FFE:top=uni1F61

 omega+uni1FCD:top=uni1F62

@@ -941,14 +941,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/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

+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

 omega+uni1FBE:bottom+uni1FBD:top=uni1FA0

 omega+uni1FBE:bottom+uni1FFE:top=uni1FA1

 omega+uni1FBE:bottom+uni1FCD:top=uni1FA2

@@ -982,10 +982,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/100,0

-E+uni1FFD:tonos=uni1FC9/100,0

-H+uni1FEF:tonos=uni1FCA/100,0

-H+uni1FFD:tonos=uni1FCB/100,0

+E+uni1FEF:tonos=uni1FC8/0,0

+E+uni1FFD:tonos=uni1FC9/0,0

+H+uni1FEF:tonos=uni1FCA/0,0

+H+uni1FFD:tonos=uni1FCB/0,0

 H+uni1FBE:bottom=uni1FCC

 iota+breve:top=uni1FD0

 iota+macron:top=uni1FD1

@@ -1007,9 +1007,9 @@ upsilon+uni1FC0:top=uni1FE6
 upsilon+uni1FC1:top=uni1FE7

 Y+breve:top=uni1FE8

 Y+macron:top=uni1FE9

-Y+uni1FEF:tonos=uni1FEA/100,0

-Y+uni1FFD:tonos=uni1FEB/100,0

-P+uni1FFE:tonos=uni1FEC/100,0

+Y+uni1FEF:tonos=uni1FEA/0,0

+Y+uni1FFD:tonos=uni1FEB/0,0

+P+uni1FFE:tonos=uni1FEC/0,0

 omega+uni1FBE:bottom+uni1FEF:top=uni1FF2

 omega+uni1FBE:bottom=uni1FF3

 omega+uni1FBE:bottom+uni1FFD:top=uni1FF4

@@ -1083,6 +1083,14 @@ uni0418.smcp+macron:top=uni04E2.smcp
 uni0423.smcp+macron:top=uni04EE.smcp

 Phi.smcp=uni0424.smcp

 J.smcp=uni037F.smcp

+I.smcp_J.smcp=IJ.smcp

+AE.smcp+acute:top=AEacute.smcp

+Oslash.smcp+acute:top=Oslashacute.smcp

+S.smcp+commaaccent:bottom=Scommaaccent.smcp

+W.smcp+grave:top=Wgrave.smcp

+W.smcp+acute:top=Wacute.smcp

+W.smcp+dieresis:top=Wdieresis.smcp

+Y.smcp+grave:top=Ygrave.smcp

 A+ogonek:bottom=Aogonek.NAV

 a+ogonek:bottom=aogonek.NAV

 E+ogonek:bottom=Eogonek.NAV