Skip to content

Commit

Permalink
Remove ligatures info for cyrillic
Browse files Browse the repository at this point in the history
  • Loading branch information
calixteman authored and davidmoten committed May 13, 2017
1 parent da01512 commit 22fcf69
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 571 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
jlatexmath (1.0.6)
* Remove ligatures info for cyrillic

* Add italic correction only in math mode.

* Add a command \mathnormal.
Expand Down
87 changes: 17 additions & 70 deletions src/org/scilab/forge/jlatexmath/cyrillic/fonts/jlm_wnbx10.xml
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,9 @@
<Kern code="1095" val="-0.095833"/>
</Char>
<Char code="1041" width="0.818051" height="0.686111" />
<Char code="1062" width="0.901384" height="0.686111" depth="0.194445" >
<Lig code="1061" ligCode="1063"/>
<Lig code="1093" ligCode="1063"/>
</Char>
<Char code="1044" width="0.901384" height="0.686111" depth="0.194445" >
<Lig code="1032" ligCode="1026"/>
<Lig code="1112" ligCode="1026"/>
</Char>
<Char code="1045" width="0.755551" height="0.686111" >
</Char>
<Char code="1062" width="0.901384" height="0.686111" depth="0.194445" />
<Char code="1044" width="0.901384" height="0.686111" depth="0.194445" />
<Char code="1045" width="0.755551" height="0.686111" />
<Char code="1060" width="0.958328" height="0.686111" >
<Kern code="1040" val="-0.031944"/>
<Kern code="1044" val="-0.031944"/>
Expand Down Expand Up @@ -313,8 +306,6 @@
<Char code="1032" width="0.594441" height="0.686111" >
</Char>
<Char code="1050" width="0.901384" height="0.686111" >
<Lig code="1061" ligCode="1061"/>
<Lig code="1093" ligCode="1061"/>
<Kern code="1054" val="-0.031944"/>
<Kern code="1060" val="-0.031944"/>
<Kern code="1138" val="-0.031944"/>
Expand All @@ -325,15 +316,9 @@
<Kern code="1098" val="-0.031944"/>
<Kern code="1123" val="-0.031944"/>
</Char>
<Char code="1051" width="0.901384" height="0.686111" >
<Lig code="1032" ligCode="1033"/>
<Lig code="1112" ligCode="1033"/>
</Char>
<Char code="1051" width="0.901384" height="0.686111" />
<Char code="1052" width="1.091661" height="0.686111" />
<Char code="1053" width="0.901384" height="0.686111" >
<Lig code="1032" ligCode="1034"/>
<Lig code="1112" ligCode="1034"/>
</Char>
<Char code="1053" width="0.901384" height="0.686111" />
<Char code="1054" width="0.863884" height="0.686111" >
<Kern code="1040" val="-0.031944"/>
<Kern code="1044" val="-0.031944"/>
Expand Down Expand Up @@ -361,13 +346,8 @@
<Kern code="1083" val="-0.095833"/>
<Kern code="1113" val="-0.095833"/>
</Char>
<Char code="1057" width="0.830551" height="0.686111" >
<Lig code="1061" ligCode="1064"/>
<Lig code="1093" ligCode="1064"/>
</Char>
<Char code="1057" width="0.830551" height="0.686111" />
<Char code="1058" width="0.799995" height="0.686111" >
<Lig code="1057" ligCode="1062"/>
<Lig code="1089" ligCode="1062"/>
<Kern code="1040" val="-0.095833"/>
<Kern code="1044" val="-0.095833"/>
<Kern code="1071" val="-0.095833"/>
Expand Down Expand Up @@ -411,22 +391,9 @@
</Char>
<Char code="1042" width="0.818051" height="0.686111" />
<Char code="1065" width="1.3312435" height="0.686111" depth="0.194445" />
<Char code="1064" width="1.3312435" height="0.686111" >
<Lig code="1063" ligCode="1065"/>
<Lig code="1095" ligCode="1065"/>
<Lig code="1062" ligCode="0"/>
<Lig code="1094" ligCode="0"/>
</Char>
<Char code="1067" width="1.124994" height="0.686111" >
<Lig code="1040" ligCode="1071"/>
<Lig code="1072" ligCode="1071"/>
<Lig code="1059" ligCode="1070"/>
<Lig code="1091" ligCode="1070"/>
</Char>
<Char code="1047" width="0.702774" height="0.686111" >
<Lig code="1061" ligCode="1046"/>
<Lig code="1093" ligCode="1046"/>
</Char>
<Char code="1064" width="1.3312435" height="0.686111" />
<Char code="1067" width="1.124994" height="0.686111" />
<Char code="1047" width="0.702774" height="0.686111" />
<Char code="1068" width="0.818051" height="0.686111" >
<Kern code="1046" val="-0.031944"/>
<Kern code="1061" val="-0.031944"/>
Expand Down Expand Up @@ -480,14 +447,9 @@
<Kern code="1093" val="-0.031944"/>
<Kern code="1103" val="-0.031944"/>
</Char>
<Char code="1094" width="0.6388855" height="0.444445" depth="0.162038" >
<Lig code="1093" ligCode="1095"/>
</Char>
<Char code="1076" width="0.6388855" height="0.444445" depth="0.162038" >
<Lig code="1112" ligCode="1106"/>
</Char>
<Char code="1077" width="0.5270815" height="0.444445" >
</Char>
<Char code="1094" width="0.6388855" height="0.444445" depth="0.162038" />
<Char code="1076" width="0.6388855" height="0.444445" depth="0.162038" />
<Char code="1077" width="0.5270815" height="0.444445" />
<Char code="1092" width="0.89444" height="0.694445" depth="0.194445" >
<Kern code="1076" val="-0.031944"/>
<Kern code="1078" val="-0.031944"/>
Expand Down Expand Up @@ -515,7 +477,6 @@
<Char code="1112" width="0.351387" height="0.694445" depth="0.194445" >
</Char>
<Char code="1082" width="0.6388855" height="0.444445" >
<Lig code="1093" ligCode="1093"/>
<Kern code="1072" val="-0.031944"/>
<Kern code="1086" val="-0.031944"/>
<Kern code="1139" val="-0.031944"/>
Expand All @@ -524,13 +485,9 @@
<Kern code="1077" val="-0.031944"/>
<Kern code="1105" val="-0.031944"/>
</Char>
<Char code="1083" width="0.6388855" height="0.444445" >
<Lig code="1112" ligCode="1113"/>
</Char>
<Char code="1083" width="0.6388855" height="0.444445" />
<Char code="1084" width="0.766663" height="0.444445" />
<Char code="1085" width="0.6388855" height="0.444445" >
<Lig code="1112" ligCode="1114"/>
</Char>
<Char code="1085" width="0.6388855" height="0.444445" />
<Char code="1086" width="0.574997" height="0.444445" >
<Kern code="1076" val="-0.031944"/>
<Kern code="1078" val="-0.031944"/>
Expand All @@ -547,14 +504,12 @@
<Kern code="1103" val="-0.031944"/>
</Char>
<Char code="1089" width="0.511108" height="0.444445" >
<Lig code="1093" ligCode="1096"/>
<Kern code="1076" val="-0.031944"/>
<Kern code="1078" val="-0.031944"/>
<Kern code="1093" val="-0.031944"/>
<Kern code="1103" val="-0.031944"/>
</Char>
<Char code="1090" width="0.544441" height="0.444445" >
<Lig code="1089" ligCode="1094"/>
<Kern code="1072" val="-0.031944"/>
<Kern code="1076" val="-0.031944"/>
<Kern code="1083" val="-0.031944"/>
Expand All @@ -576,17 +531,9 @@
</Char>
<Char code="1074" width="0.574997" height="0.444445" />
<Char code="1097" width="0.941663" height="0.444445" depth="0.162038" />
<Char code="1096" width="0.941663" height="0.444445" >
<Lig code="1095" ligCode="1097"/>
<Lig code="1094" ligCode="0"/>
</Char>
<Char code="1099" width="0.830551" height="0.444445" >
<Lig code="1072" ligCode="1103"/>
<Lig code="1091" ligCode="1102"/>
</Char>
<Char code="1079" width="0.511108" height="0.444445" italic="0.006389" >
<Lig code="1093" ligCode="1078"/>
</Char>
<Char code="1096" width="0.941663" height="0.444445" />
<Char code="1099" width="0.830551" height="0.444445" />
<Char code="1079" width="0.511108" height="0.444445" italic="0.006389" />
<Char code="1100" width="0.574997" height="0.444445" >
<Kern code="1091" val="-0.063889"/>
<Kern code="1141" val="-0.063889"/>
Expand Down
87 changes: 17 additions & 70 deletions src/org/scilab/forge/jlatexmath/cyrillic/fonts/jlm_wnbxti10.xml
Original file line number Diff line number Diff line change
Expand Up @@ -328,16 +328,9 @@
<Kern code="1091" val="-0.029445"/>
</Char>
<Char code="1041" width="0.81666" height="0.686111" italic="0.055418" />
<Char code="1062" width="0.894992" height="0.686111" depth="0.194445" italic="0.172084" >
<Lig code="1061" ligCode="1063"/>
<Lig code="1093" ligCode="1063"/>
</Char>
<Char code="1044" width="0.894992" height="0.686111" depth="0.194445" italic="0.172084" >
<Lig code="1032" ligCode="1026"/>
<Lig code="1112" ligCode="1026"/>
</Char>
<Char code="1045" width="0.756659" height="0.686111" italic="0.114306" >
</Char>
<Char code="1062" width="0.894992" height="0.686111" depth="0.194445" italic="0.172084" />
<Char code="1044" width="0.894992" height="0.686111" depth="0.194445" italic="0.172084" />
<Char code="1045" width="0.756659" height="0.686111" italic="0.114306" />
<Char code="1060" width="0.944435" height="0.686111" italic="0.090625" >
<Kern code="1040" val="-0.029445"/>
<Kern code="1044" val="-0.029445"/>
Expand Down Expand Up @@ -388,24 +381,16 @@
<Char code="1032" width="0.61055" height="0.686111" italic="0.145001" >
</Char>
<Char code="1050" width="0.894992" height="0.686111" italic="0.142084" >
<Lig code="1061" ligCode="1061"/>
<Lig code="1093" ligCode="1061"/>
<Kern code="1054" val="-0.029445"/>
<Kern code="1060" val="-0.029445"/>
<Kern code="1138" val="-0.029445"/>
<Kern code="1057" val="-0.029445"/>
<Kern code="1028" val="-0.029445"/>
<Kern code="1095" val="-0.029445"/>
</Char>
<Char code="1051" width="0.894992" height="0.686111" italic="0.172084" >
<Lig code="1032" ligCode="1033"/>
<Lig code="1112" ligCode="1033"/>
</Char>
<Char code="1051" width="0.894992" height="0.686111" italic="0.172084" />
<Char code="1052" width="1.072767" height="0.686111" italic="0.172084" />
<Char code="1053" width="0.894992" height="0.686111" italic="0.172084" >
<Lig code="1032" ligCode="1034"/>
<Lig code="1112" ligCode="1034"/>
</Char>
<Char code="1053" width="0.894992" height="0.686111" italic="0.172084" />
<Char code="1054" width="0.854991" height="0.686111" italic="0.090625" >
<Kern code="1040" val="-0.029445"/>
<Kern code="1044" val="-0.029445"/>
Expand Down Expand Up @@ -433,13 +418,8 @@
<Kern code="1083" val="-0.088333"/>
<Kern code="1113" val="-0.088333"/>
</Char>
<Char code="1057" width="0.826658" height="0.686111" italic="0.142084" >
<Lig code="1061" ligCode="1064"/>
<Lig code="1093" ligCode="1064"/>
</Char>
<Char code="1057" width="0.826658" height="0.686111" italic="0.142084" />
<Char code="1058" width="0.796103" height="0.686111" italic="0.12903" >
<Lig code="1057" ligCode="1062"/>
<Lig code="1089" ligCode="1062"/>
<Kern code="1040" val="-0.088333"/>
<Kern code="1044" val="-0.088333"/>
<Kern code="1071" val="-0.088333"/>
Expand Down Expand Up @@ -501,22 +481,9 @@
</Char>
<Char code="1042" width="0.81666" height="0.686111" italic="0.069758" />
<Char code="1065" width="1.293599" height="0.686111" depth="0.194445" italic="0.172084" />
<Char code="1064" width="1.293599" height="0.686111" italic="0.172084" >
<Lig code="1063" ligCode="1065"/>
<Lig code="1095" ligCode="1065"/>
<Lig code="1062" ligCode="0"/>
<Lig code="1094" ligCode="0"/>
</Char>
<Char code="1067" width="1.101102" height="0.686111" italic="0.172084" >
<Lig code="1040" ligCode="1071"/>
<Lig code="1072" ligCode="1071"/>
<Lig code="1059" ligCode="1070"/>
<Lig code="1091" ligCode="1070"/>
</Char>
<Char code="1047" width="0.708882" height="0.686111" italic="0.099202" >
<Lig code="1061" ligCode="1046"/>
<Lig code="1093" ligCode="1046"/>
</Char>
<Char code="1064" width="1.293599" height="0.686111" italic="0.172084" />
<Char code="1067" width="1.101102" height="0.686111" italic="0.172084" />
<Char code="1047" width="0.708882" height="0.686111" italic="0.099202" />
<Char code="1068" width="0.81666" height="0.686111" italic="0.032991" >
<Kern code="1046" val="-0.029445"/>
<Kern code="1061" val="-0.029445"/>
Expand Down Expand Up @@ -595,12 +562,8 @@
<Kern code="1084" val="-0.029445"/>
<Kern code="1113" val="-0.029445"/>
</Char>
<Char code="1094" width="0.655884" height="0.444445" depth="0.194445" italic="0.094261" >
<Lig code="1093" ligCode="1095"/>
</Char>
<Char code="1076" width="0.549883" height="0.694445" italic="0.112694" >
<Lig code="1112" ligCode="1106"/>
</Char>
<Char code="1094" width="0.655884" height="0.444445" depth="0.194445" italic="0.094261" />
<Char code="1076" width="0.549883" height="0.694445" italic="0.112694" />
<Char code="1077" width="0.511606" height="0.444445" italic="0.085002" >
<Kern code="1092" val="-0.058888"/>
<Kern code="1072" val="-0.058888"/>
Expand All @@ -621,11 +584,8 @@
</Char>
<Char code="1112" width="0.355553" height="0.693255" depth="0.194445" italic="0.167204" >
</Char>
<Char code="1082" width="0.591105" height="0.444445" italic="0.111112" >
<Lig code="1093" ligCode="1093"/>
</Char>
<Char code="1082" width="0.591105" height="0.444445" italic="0.111112" />
<Char code="1083" width="0.62055" height="0.444445" italic="0.094261" >
<Lig code="1112" ligCode="1113"/>
<Kern code="1083" val="-0.029445"/>
<Kern code="1084" val="-0.029445"/>
<Kern code="1113" val="-0.029445"/>
Expand All @@ -634,9 +594,7 @@
<Kern code="1095" val="-0.088333"/>
</Char>
<Char code="1084" width="0.856104" height="0.444445" italic="0.094261" />
<Char code="1085" width="0.649994" height="0.444445" italic="0.094261" >
<Lig code="1112" ligCode="1114"/>
</Char>
<Char code="1085" width="0.649994" height="0.444445" italic="0.094261" />
<Char code="1086" width="0.549883" height="0.444445" italic="0.078611" >
<Kern code="1092" val="-0.058888"/>
<Kern code="1072" val="-0.058888"/>
Expand All @@ -655,30 +613,19 @@
<Kern code="1113" val="-0.029445"/>
</Char>
<Char code="1089" width="0.511606" height="0.444445" italic="0.052223" >
<Lig code="1093" ligCode="1096"/>
<Kern code="1092" val="-0.058888"/>
<Kern code="1072" val="-0.058888"/>
<Kern code="1083" val="-0.029445"/>
<Kern code="1084" val="-0.029445"/>
<Kern code="1113" val="-0.029445"/>
</Char>
<Char code="1090" width="0.944435" height="0.444445" italic="0.094261" >
<Lig code="1089" ligCode="1094"/>
</Char>
<Char code="1090" width="0.944435" height="0.444445" italic="0.094261" />
<Char code="1091" width="0.591105" height="0.444445" depth="0.194445" italic="0.105001" />
<Char code="1074" width="0.570494" height="0.444445" italic="0.085002" />
<Char code="1097" width="0.950325" height="0.444445" depth="0.194445" italic="0.094261" />
<Char code="1096" width="0.944435" height="0.444445" italic="0.094261" >
<Lig code="1095" ligCode="1097"/>
<Lig code="1094" ligCode="0"/>
</Char>
<Char code="1099" width="0.767771" height="0.444445" italic="0.094261" >
<Lig code="1072" ligCode="1103"/>
<Lig code="1091" ligCode="1102"/>
</Char>
<Char code="1079" width="0.532217" height="0.444445" italic="0.052223" >
<Lig code="1093" ligCode="1078"/>
</Char>
<Char code="1096" width="0.944435" height="0.444445" italic="0.094261" />
<Char code="1099" width="0.767771" height="0.444445" italic="0.094261" />
<Char code="1079" width="0.532217" height="0.444445" italic="0.052223" />
<Char code="1100" width="0.591105" height="0.444445" italic="0.078611" >
<Kern code="1083" val="-0.029445"/>
<Kern code="1084" val="-0.029445"/>
Expand Down
Loading

0 comments on commit 22fcf69

Please sign in to comment.