diff options
| author | Karl Berry <karl@freefriends.org> | 2012-07-23 21:54:54 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-07-23 21:54:54 +0000 |
| commit | 44928b3e4ed601cdf5afd19c5abb613fe3e8b4a0 (patch) | |
| tree | 4c15be6fa15d2ae5a18217fbdb63c543f428f6b6 | |
| parent | 9ac64d0dc268cfdbd79ccb2a49b3d8ffca523d00 (diff) | |
amiri 0.104 (23jul12)
git-svn-id: svn://tug.org/texlive/trunk@27114 c570f23f-e606-0410-a88d-b1316a301751
28 files changed, 1564 insertions, 481 deletions
diff --git a/Master/texmf-dist/doc/fonts/amiri/Makefile b/Master/texmf-dist/doc/fonts/amiri/Makefile index 8a4fa882f39..31d0b635c10 100644 --- a/Master/texmf-dist/doc/fonts/amiri/Makefile +++ b/Master/texmf-dist/doc/fonts/amiri/Makefile @@ -1,7 +1,7 @@ .PHONY: all clean ttf web pack check NAME=amiri -VERSION=0.103 +VERSION=0.104 TOOLS=tools SRC=sources @@ -23,6 +23,7 @@ WTTF=$(FONTS:%=$(WEB)/%.ttf) WOFF=$(FONTS:%=$(WEB)/%.woff) EOTS=$(FONTS:%=$(WEB)/%.eot) PDFS=$(DOC)/$(NAME)-table.pdf +HTML=$(DOC)/documentation-arabic.html CSSS=$(WEB)/$(NAME).css FEAT=$(wildcard $(SRC)/*.fea) TEST=$(wildcard $(TESTS)/*.test) @@ -35,23 +36,23 @@ all: ttf web ttf: $(DTTF) web: $(WTTF) $(WOFF) $(EOTS) $(CSSS) -doc: $(PDFS) +doc: $(PDFS) $(HTML) $(NAME)-regular.ttf: $(SRC)/$(NAME)-regular.sfd $(SRC)/$(NAME)-regular.fea $(FEAT) $(BUILD) @echo " FF\t$@" - @$(FF) --input $< --output $@ --version $(VERSION) + @$(FF) --input $< --output $@ --features=$(SRC)/$(NAME)-regular.fea --version $(VERSION) -$(NAME)-slanted.ttf: $(SRC)/$(NAME)-regular.sfd $(SRC)/$(NAME)-regular.fea $(FEAT) $(BUILD) +$(NAME)-slanted.ttf: $(SRC)/$(NAME)-regular.sfd $(SRC)/$(NAME)-slanted.fea $(FEAT) $(BUILD) @echo " FF\t$@" - @$(FF) --input $< --output $@ --version $(VERSION) --slant=7 + @$(FF) --input $< --output $@ --features=$(SRC)/$(NAME)-slanted.fea --version $(VERSION) --slant=7 -$(NAME)-bold.ttf: $(SRC)/$(NAME)-bold.sfd $(SRC)/$(NAME)-bold.fea $(FEAT) $(BUILD) +$(NAME)-bold.ttf: $(SRC)/$(NAME)-bold.sfd $(SRC)/$(NAME)-regular.fea $(FEAT) $(BUILD) @echo " FF\t$@" - @$(FF) --input $< --output $@ --version $(VERSION) + @$(FF) --input $< --output $@ --features=$(SRC)/$(NAME)-regular.fea --version $(VERSION) -$(NAME)-boldslanted.ttf: $(SRC)/$(NAME)-bold.sfd $(SRC)/$(NAME)-bold.fea $(FEAT) $(BUILD) +$(NAME)-boldslanted.ttf: $(SRC)/$(NAME)-bold.sfd $(SRC)/$(NAME)-slanted.fea $(FEAT) $(BUILD) @echo " FF\t$@" - @$(FF) --input $< --output $@ --version $(VERSION) --slant=7 + @$(FF) --input $< --output $@ --features=$(SRC)/$(NAME)-slanted.fea --version $(VERSION) --slant=7 $(WEB)/%.ttf: %.ttf $(BUILD) @echo " FF\t$@" @@ -80,6 +81,10 @@ $(DOC)/$(NAME)-table.pdf: $(NAME)-regular.ttf @pdfoutline $@.tmp $@.txt $@ @rm -f $@.tmp $@.txt +$(DOC)/documentation-arabic.html: $(DOC)/documentation-sources/documentation-arabic.md + @echo " GEN\t$@" + @pandoc $< -o $@ -f markdown -t html -s -c documentation-arabic.css --toc + check: $(TEST) $(DTTF) ifeq ($(shell which hb-shape),) @echo "hb-shape not found, skipping tests" diff --git a/Master/texmf-dist/doc/fonts/amiri/README.txt b/Master/texmf-dist/doc/fonts/amiri/README index 41dbde9efed..41dbde9efed 100644 --- a/Master/texmf-dist/doc/fonts/amiri/README.txt +++ b/Master/texmf-dist/doc/fonts/amiri/README diff --git a/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS-Arabic.txt b/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS-Arabic.txt index 4206207c872..1d96de56585 100644 --- a/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS-Arabic.txt +++ b/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS-Arabic.txt @@ -1,7 +1,30 @@ أميري 0٫103 (2012-05-31) ------------------------ +* المحارف الجديدة: + - شرطة مائلة خاصة لتناسب الأرقام العربية. + - شكل جديد أكثر تناسقا لعلامة @ العربية. + - إضافة أرقام متناسبة العرض (خاصية ’pnum‘). + +* تحسينات: + - توسيع المسافة حول الواو الصغيرة المنخفضة. + - إصلاح سنة السين عند تفعيل خاصية ’ss02‘. + - إصلاح الراء ذات علامة ٨ فوقها. + - تحسين الكاف المتوسطة في كما. + - جعل العلامات الضامة للأرقام تعمل مع فيرفكس (وغيره من التطبيقات المبنية على + حرفباز). + - علامة العدد العربية (U+0600) تقبل الآن رقما رابعا، كما أصبحت أوسع قليلا لتفادي + التلامس مع الأرقام الواسعة. + - إصلاح ارتباط علامة المد اللازم مع الضمة المقلوبة. + - إزالة ارتباط Th. + - إصلاحات متنوعة أخرى. + +* التآلف. + - تأليف اللام ألف النهائية مع الكاف. + +أميري 0٫103 (2012-05-31) +------------------------ * هذه إصدارة صغيرة لإصلاح بعض العلات: - - إصلاح اتآلف السيء بين الأرقام مع علامة نهاية الآية وغيرها من العلامات الضامة. + - إصلاح التآلف السيئ بين الأرقام مع علامة نهاية الآية وغيرها من العلامات الضامة. - إضافة رموز ظاهرة لمحارف التحكم في ثنائية الاتجاه. - تأليف المزيد من الكافات عبر الفاصلة المجازية. - إصلاح معالجة ميلان المحارف المشتركة إلى اليمين أو إلى اليسار في الخط المائل @@ -12,7 +35,7 @@ * المحارف الجديدة: - أكبر تغيير في هذه الإصدارة هو إضافة دعم نظام الكتابة اللاتيني مبنيًا على خط Crimson يغطي خرائط محارف لاتيني-0 إلى 9 بالإضافة إلى الحروف المستعملة في - أنظامة رومنة العربية الشائعة (باستثناء الأبجدية الصوتية الصوتية) و العديد من + أنظمة رومنة العربية الشائعة (باستثناء الأبجدية الصوتية الصوتية) و العديد من علامات الترقيم الشائعة الأخرى. - باء مع ٧ صغيرة سفلية (U+08A0). - علامة البسملة (U+FDFD). diff --git a/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS.txt b/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS.txt index 2bbfab0fd74..c8a68cf02da 100644 --- a/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS.txt +++ b/Master/texmf-dist/doc/fonts/amiri/documentation/NEWS.txt @@ -1,3 +1,26 @@ +Amiri 0.104 (2012-07-19) +------------------------ +* New glyphs: + - New localised slash glyph, to align better with Arabic digits. + - New, less bulky Arabic @ sign. + - Proportional digits (‘pnum’ feature). + +* Fixes: + - Give some room to the low small waw. + - Fix seen tooth with ‘ss02’. + - Fix raa with inverted v above. + - Improve medial kaf of kaf-mem-alef + - Make subtending marks work with Firefox (and other HarfBuzz based + applications). + - Arabic number sign (U+0600) now accepts a 4th digits, and is made a bit + wider, to avoid collision with wide digits. + - Fix combining Qur’anic madda with inverted damma. + - Drop the Th ligature. + - Other miscellaneous fixes. + +* Kerning: + - Kern final lam-alef with kaf. + Amiri 0.103 (2012-05-31) ------------------------ * This is a bug fix release: diff --git a/Master/texmf-dist/doc/fonts/amiri/documentation/amiri-table.pdf b/Master/texmf-dist/doc/fonts/amiri/documentation/amiri-table.pdf Binary files differindex 4f09ca062ef..9fdd44b4e79 100644 --- a/Master/texmf-dist/doc/fonts/amiri/documentation/amiri-table.pdf +++ b/Master/texmf-dist/doc/fonts/amiri/documentation/amiri-table.pdf diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.fea b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.fea deleted file mode 100644 index 85e78320737..00000000000 --- a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.fea +++ /dev/null @@ -1 +0,0 @@ -include(amiri-regular.fea) diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.sfd b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.sfd index 7283fdf2a3e..080e771638d 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.sfd +++ b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-bold.sfd @@ -20,7 +20,7 @@ OS2Version: 4 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1273266481 -ModificationTime: 1338475036 +ModificationTime: 1342689125 PfmFamily: 17 TTFWeight: 700 TTFWidth: 5 @@ -119,7 +119,7 @@ Grid Named: "Digits base" EndSplineSet AnchorClass2: "MarkAbove" "'mark' Generic Mark Anchor-1" "MarkBelow" "'mark' Generic Mark Anchor-2" "TashkilAbove" "'mark' Tashkil Above Base-1" "TashkilBelow" "'mark' Tashkil Below Base-1" "TashkilTashkilAbove" "'mkmk' Tashkil to Tashkil Above-1" "TashkilTashkilBelow" "'mkmk' Tashkil to Tashkil Below-1" "TashkilTashkilAbove2" "'mkmk' Tashkil to Tashkil Above 2-1" "TashkilAboveDot" "Tashkil Above Dot-1" "TashkilBelowDot" "Tashkil Below Dot-1" "HamzaAbove" "'mark' Hamza Above-1" "HamzaBelow" "'mark' Hamza Below-1" "HighHamza" "'mark' High Hamza-1" "DotAbove" "'mark' Dot Above-1" "DotBelow" "'mark' Dot Below-1" "DotBelowAlt" "'mark' Dot Below Alt-1" "TwoDotsAbove" "'mark' Two Dots Above-1" "TwoDotsBelow" "'mark' Two Dots Below-1" "TwoDotsBelowAlt" "'mark' Two Dots Below Alt-1" "DigitAbove" "'mark' Digit Above-1" "DigitBelow" "'mark' Digit Below-1" "MarkDotAbove" "'mkmk' Mark to Dot Above-1" "MarkDotBelow" "'mkmk' Mark to Dot Below-1" "TaaAbove" "'mark' Small Taa Above-1" "TaaBelow" "'mark' Small Taa Below-1" "AlefAbove" "'mark' Small Alef Above-1" "SeenAbove" "'mark' Seen Above-1" "SeenBelow" "'mark' Seen Below-1" "NoonAbove" "'mark' Noon Above-1" "VAbove" "'mark' V Mark Above-1" "RingDash" "'mkmk' Ring to Dash-1" "RingBelow" "'mark' Ring Below-1" "DotAlt" "'mark' Dot Alt-1" "DotHmaza" "'mkmk' Dot above Hamza-1" "Tail" "'mark' Yaa Tail-1" "Dash" "'mark' Dash-1" "Stroke" "'mark' Stroke-1" "cursive" "'curs' Cursive Attachment-1" -BeginChars: 70141 5684 +BeginChars: 70166 5709 StartChar: aAlf.fina.alt Encoding: 65536 -1 0 @@ -20192,7 +20192,7 @@ EndChar StartChar: aKaf.medi_KafMemAlf Encoding: 65817 -1 367 -Width: 1075 +Width: 1125 Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 @@ -20207,61 +20207,57 @@ Fore SplineSet -43 893 m 1,0,1 354 818 354 818 585 629 c 0,2,3 - 738 504 738 504 784 457 c 0,4,5 - 997 234 997 234 1081 214 c 0,6,7 - 1219 184 1219 184 1137 19 c 1,8,9 - 1112 -29 1112 -29 1075 -30 c 0,10,11 - 995 -30 995 -30 824 137 c 0,12,13 - 753 206 753 206 665 301.5 c 128,-1,14 - 577 397 577 397 501 455 c 1,15,16 - 516 247 516 247 397 156 c 0,17,18 - 339 112 339 112 193 113 c 0,19,20 - 86 114 86 114 45 84 c 1,21,22 - 58 -7 58 -7 6 -17 c 0,23,24 - -6 -19 -6 -19 -16 -18 c 0,25,26 - -67 -10 -67 -10 -56 55.5 c 128,-1,27 - -45 121 -45 121 -21 169 c 0,28,29 - 53 309 53 309 416 316 c 0,30,31 - 421 316 421 316 425 317 c 1,32,33 - 401 553 401 553 -129 680 c 0,34,35 - -185 693 -185 693 -201 775 c 0,36,37 - -239 969 -239 969 23 1143 c 0,38,39 - 389 1374 389 1374 1022 1636 c 0,40,41 - 1132 1682 1132 1682 1105 1575 c 2,42,-1 - 1073 1448 l 2,43,44 - 1059 1391 1059 1391 1008 1372 c 0,45,46 + 743 500 743 500 784 457 c 0,4,5 + 1016 217 1016 217 1131 214 c 0,6,7 + 1282 211 1282 211 1187 19 c 1,8,9 + 1162 -29 1162 -29 1125 -30 c 0,10,11 + 950 -30 950 -30 665 302 c 0,12,13 + 592 386 592 386 501 455 c 1,14,15 + 526 111 526 111 193 113 c 0,16,17 + 86 114 86 114 45 84 c 1,18,19 + 58 -8 58 -8 6 -17 c 0,20,21 + -6 -19 -6 -19 -16 -18 c 0,22,23 + -67 -10 -67 -10 -56 56 c 0,24,25 + -9 336 -9 336 416 336 c 0,26,27 + 421 336 421 336 425 337 c 1,28,29 + 405 556 405 556 -129 680 c 0,30,31 + -185 693 -185 693 -201 775 c 0,32,33 + -240 973 -240 973 23 1143 c 0,34,35 + 355 1357 355 1357 1022 1636 c 0,36,37 + 1132 1682 1132 1682 1105 1575 c 2,38,-1 + 1073 1448 l 2,39,40 + 1059 1391 1059 1391 1008 1372 c 0,41,42 352 1128 352 1128 -43 893 c 1,0,1 EndSplineSet Layer: 2 SplineSet -91 888 m 1,0,1 309 816 309 816 566 606 c 0,2,3 - 718 482 718 482 762 436 c 0,4,5 - 983 205 983 205 1075 185 c 0,6,7 - 1176 164 1176 164 1110 32 c 0,8,9 - 1094 0 1094 0 1075 0 c 0,10,11 - 983 0 983 0 674 337 c 0,12,13 - 586 433 586 433 474 508 c 1,14,15 - 495 359 495 359 465.5 287.5 c 128,-1,16 - 436 216 436 216 389 180 c 0,17,18 - 340 142 340 142 177 144 c 0,19,20 - 69 145 69 145 21 103 c 0,21,22 - 13 96 13 96 15 82 c 0,23,24 - 25 18 25 18 -1 12 c 0,25,26 - -35 4 -35 4 -25 61 c 0,27,28 - -17 111 -17 111 6 155 c 0,29,30 - 74 286 74 286 396 286 c 0,31,32 - 435 286 435 286 435 314 c 1,33,34 - 438 403 438 403 368 480 c 0,35,36 - 228 631 228 631 -153 709 c 0,37,38 - -192 717 -192 717 -191 818 c 0,39,40 - -190 885 -190 885 -170 934 c 16,41,42 - -144 996 -144 996 44 1124 c 0,43,44 - 210 1237 210 1237 1064 1609 c 0,45,46 - 1119 1633 1119 1633 1106 1582 c 2,47,-1 - 1074 1455 l 2,48,49 - 1063 1413 1063 1413 1028 1400 c 0,50,51 - 627 1251 627 1251 280 1087 c 0,52,53 + 706 492 706 492 762 436 c 0,4,5 + 1010 186 1010 186 1123 185 c 128,-1,6 + 1236 184 1236 184 1160 32 c 0,7,8 + 1144 0 1144 0 1125 0 c 0,9,10 + 976 0 976 0 787 203 c 0,11,12 + 549 458 549 458 474 508 c 1,13,14 + 496 358 496 358 466 282 c 0,15,16 + 408 131 408 131 177 134 c 0,17,18 + 68 135 68 135 31 103 c 0,19,20 + 23 96 23 96 25 82 c 0,21,22 + 34 20 34 20 -1 12 c 0,23,24 + -35 4 -35 4 -25 61 c 0,25,26 + -18 108 -18 108 6 155 c 0,27,28 + 89 316 89 316 396 316 c 0,29,30 + 435 316 435 316 435 344 c 1,31,32 + 436 406 436 406 368 480 c 0,33,34 + 228 631 228 631 -153 709 c 0,35,36 + -192 717 -192 717 -191 818 c 0,37,38 + -190 885 -190 885 -170 934 c 16,39,40 + -144 996 -144 996 44 1124 c 0,41,42 + 210 1237 210 1237 1064 1609 c 0,43,44 + 1119 1633 1119 1633 1106 1582 c 2,45,-1 + 1074 1455 l 2,46,47 + 1063 1413 1063 1413 1028 1400 c 0,48,49 + 627 1251 627 1251 280 1087 c 0,50,51 0 955 0 955 -91 888 c 1,0,1 EndSplineSet EndChar @@ -20479,107 +20475,162 @@ EndChar StartChar: at.ara Encoding: 65822 -1 372 -Width: 1796 -Flags: W +Width: 1534 +Flags: MW LayerCount: 3 Back SplineSet -1179 280 m 0,54,55 - 992 180 992 180 831 128 c 0,56,57 - 686 81 686 81 573 80 c 0,58,59 - 428 80 428 80 321 148 c 1,60,61 - 215 218 215 218 168 337 c 0,62,63 - 124 450 124 450 144 580 c 0,64,65 - 175 780 175 780 334 941 c 0,66,67 - 371 978 371 978 411 1009 c 0,68,69 - 596 1152 596 1152 828 1172 c 0,70,71 - 860 1174 860 1174 891 1174 c 0,72,73 - 1101 1173 1101 1173 1280 1067 c 1,74,75 - 1459 960 1459 960 1557 776 c 0,76,77 - 1666 573 1666 573 1644 337 c 0,78,79 - 1633 228 1633 228 1593 128 c 0,80,81 - 1513 -68 1513 -68 1347 -195 c 0,82,83 - 1178 -322 1178 -322 969 -344 c 0,84,85 - 759 -365 759 -365 569 -276 c 0,86,87 - 378 -184 378 -184 261 -10 c 0,88,-1 -EndSplineSet -Fore -SplineSet -272 48 m 1,0,1 - 159 121 159 121 102 261 c 1,2,3 - 24 468 24 468 157 780 c 0,4,5 - 374 1288 374 1288 903 1280 c 1,6,7 - 1399 1271 1399 1271 1623 855 c 1,8,9 - 1785 540 1785 540 1650 140 c 0,10,11 - 1560 -128 1560 -128 1357 -291 c 1,12,13 - 1180 -423 1180 -423 979 -447 c 0,14,15 - 508 -501 508 -501 236 -147 c 1,16,17 - 212 -114 212 -114 224 -78 c 2,18,-1 - 262 28 l 2,19,20 - 266 39 266 39 272 48 c 1,0,1 -381 -2 m 1,21,22 - 608 -269 608 -269 1000 -236 c 1,23,24 - 1173 -220 1173 -220 1343.5 -95.5 c 128,-1,25 - 1514 29 1514 29 1559 177 c 0,26,27 - 1630 409 1630 409 1493 690 c 0,28,29 - 1307 1071 1307 1071 880 1069 c 0,30,31 - 406 1066 406 1066 209 673 c 1,32,33 - 169 577 169 577 209 414 c 1,34,35 - 244 266 244 266 438 197 c 1,36,37 - 522 169 522 169 610 181 c 1,38,39 - 401 405 401 405 650 685 c 1,40,41 - 873 941 873 941 1173 681 c 1,42,43 - 1216 642 1216 642 1186 596.5 c 128,-1,44 - 1156 551 1156 551 1107 570 c 0,45,46 - 833 676 833 676 691 546 c 1,47,48 - 686 346 686 346 864 294 c 0,49,50 - 970 263 970 263 1099 347 c 2,51,-1 - 1160 387 l 2,52,53 - 1215 423 1215 423 1239 427 c 128,-1,54 - 1263 431 1263 431 1286.5 407 c 128,-1,55 - 1310 383 1310 383 1295 352 c 2,56,-1 - 1238 229 l 2,57,58 - 1222 196 1222 196 1202 182 c 1,59,60 - 861 -27 861 -27 561 -26 c 0,61,62 - 461 -26 461 -26 381 -2 c 1,21,22 +664 1156 m 0,0,1 + 521 1156 521 1156 410 1110.5 c 128,-1,2 + 299 1065 299 1065 230.5 985 c 128,-1,3 + 162 905 162 905 127 802 c 128,-1,4 + 92 699 92 699 92 580 c 0,5,6 + 92 430 92 430 153 292 c 128,-1,7 + 214 154 214 154 317 70 c 128,-1,8 + 420 -14 420 -14 534 -14 c 0,9,10 + 615 -14 615 -14 672.5 29 c 128,-1,11 + 730 72 730 72 730 158 c 0,12,13 + 730 195 730 195 722 216 c 1,14,15 + 760 143 760 143 842.5 66.5 c 128,-1,16 + 925 -10 925 -10 1006 -10 c 0,17,18 + 1048 -10 1048 -10 1080 0.5 c 128,-1,19 + 1112 11 1112 11 1140.5 36.5 c 128,-1,20 + 1169 62 1169 62 1184.5 113.5 c 128,-1,21 + 1200 165 1200 165 1200 240 c 0,22,23 + 1200 382 1200 382 1106.5 534 c 128,-1,24 + 1013 686 1013 686 868.5 786 c 128,-1,25 + 724 886 724 886 586 886 c 0,26,27 + 532 886 532 886 464 878 c 128,-1,28 + 396 870 396 870 368 860 c 1,29,-1 + 480 254 l 1,30,31 + 486 230 486 230 486 204 c 0,32,33 + 486 202 486 202 486.5 190 c 128,-1,34 + 487 178 487 178 486.5 172.5 c 128,-1,35 + 486 167 486 167 485 155.5 c 128,-1,36 + 484 144 484 144 481 137.5 c 128,-1,37 + 478 131 478 131 473 124 c 128,-1,38 + 468 117 468 117 459.5 113.5 c 128,-1,39 + 451 110 451 110 440 110 c 0,40,41 + 402 110 402 110 357 147 c 128,-1,42 + 312 184 312 184 272.5 243.5 c 128,-1,43 + 233 303 233 303 206.5 390 c 128,-1,44 + 180 477 180 477 180 566 c 0,45,46 + 180 671 180 671 207.5 760.5 c 128,-1,47 + 235 850 235 850 291 922 c 128,-1,48 + 347 994 347 994 442.5 1035 c 128,-1,49 + 538 1076 538 1076 664 1076 c 0,50,51 + 763 1076 763 1076 857.5 1045.5 c 128,-1,52 + 952 1015 952 1015 1028 962.5 c 128,-1,53 + 1104 910 1104 910 1168.5 838.5 c 128,-1,54 + 1233 767 1233 767 1276.5 685.5 c 128,-1,55 + 1320 604 1320 604 1344 515 c 128,-1,56 + 1368 426 1368 426 1368 340 c 0,57,58 + 1368 174 1368 174 1291 44 c 128,-1,59 + 1214 -86 1214 -86 1098 -154 c 0,60,61 + 1028 -195 1028 -195 944 -208 c 1,62,63 + 944 -220 944 -220 972 -234 c 128,-1,64 + 1000 -248 1000 -248 1024 -248 c 0,65,66 + 1067 -248 1067 -248 1114 -230 c 0,67,68 + 1260 -176 1260 -176 1362 -24 c 128,-1,69 + 1464 128 1464 128 1464 330 c 0,70,71 + 1464 447 1464 447 1426 566 c 128,-1,72 + 1388 685 1388 685 1315.5 790.5 c 128,-1,73 + 1243 896 1243 896 1146.5 978 c 128,-1,74 + 1050 1060 1050 1060 924.5 1108 c 128,-1,75 + 799 1156 799 1156 664 1156 c 0,0,1 +670 778 m 3,76,77 + 750 778 750 778 816.5 705 c 128,-1,78 + 883 632 883 632 918.5 522 c 128,-1,79 + 954 412 954 412 954 296 c 0,80,81 + 954 243 954 243 932 215.5 c 128,-1,82 + 910 188 910 188 874 188 c 0,83,84 + 810 188 810 188 750.5 286.5 c 128,-1,85 + 691 385 691 385 658 548 c 1,86,-1 + 618 752 l 1,87,88 + 632 768 632 768 641.5 773 c 128,-1,89 + 651 778 651 778 670 778 c 3,76,77 +EndSplineSet +Fore +SplineSet +277 238 m 24,0,1 + 180 379 180 379 180 579 c 128,-1,2 + 180 779 180 779 295.5 927.5 c 128,-1,3 + 411 1076 411 1076 664 1076 c 0,4,5 + 954 1076 954 1076 1168 838 c 0,6,7 + 1294 698 1294 698 1344 515 c 0,8,9 + 1368 426 1368 426 1368 340 c 0,10,11 + 1368 174 1368 174 1291 44 c 0,12,13 + 1162 -174 1162 -174 944 -208 c 1,14,15 + 944 -220 944 -220 972 -234 c 128,-1,16 + 1000 -248 1000 -248 1033.5 -248 c 128,-1,17 + 1067 -248 1067 -248 1114 -230 c 0,18,19 + 1262 -173 1262 -173 1363 -22.5 c 128,-1,20 + 1464 128 1464 128 1464 351 c 128,-1,21 + 1464 574 1464 574 1312 796 c 0,22,23 + 1158 1018 1158 1018 924 1108 c 0,24,25 + 798 1156 798 1156 659.5 1156 c 128,-1,26 + 521 1156 521 1156 409.5 1110.5 c 128,-1,27 + 298 1065 298 1065 230 985 c 0,28,29 + 92 823 92 823 92 580 c 0,30,31 + 92 430 92 430 153 292 c 128,-1,32 + 214 154 214 154 317 70 c 128,-1,33 + 420 -14 420 -14 534 -14 c 24,34,35 + 731 -14 731 -14 862 49.5 c 128,-1,36 + 993 113 993 113 1104 205 c 0,37,38 + 1115 215 1115 215 1119 223 c 2,39,-1 + 1176 347 l 2,40,41 + 1187 371 1187 371 1171 389 c 1,42,43 + 1143 416 1143 416 1108 396 c 2,44,-1 + 994 329 l 2,45,46 + 822 227 822 227 755 253 c 1,47,48 + 584 349 584 349 556 560 c 1,49,50 + 698 674 698 674 992 593 c 0,51,52 + 1040 580 1040 580 1058.5 611 c 128,-1,53 + 1077 642 1077 642 1036 676 c 0,54,55 + 756 912 756 912 535 685.5 c 128,-1,56 + 314 459 314 459 531 163 c 1,57,58 + 354 126 354 126 277 238 c 24,0,1 EndSplineSet Layer: 2 SplineSet -674 163 m 1,0,1 - 409 381 409 381 663 675 c 0,2,3 - 866 909 866 909 1153 658 c 0,4,5 - 1177 637 1177 637 1161 612 c 128,-1,6 - 1145 587 1145 587 1118 598 c 24,7,8 - 916 680 916 680 771 622 c 0,9,10 - 672 582 672 582 671 547 c 0,11,12 - 665 322 665 322 855 265 c 0,13,14 - 973 229 973 229 1115 322 c 2,15,-1 - 1176 362 l 2,16,17 - 1245 407 1245 407 1259.5 392.5 c 152,-1,18 - 1274 378 1274 378 1268 365 c 2,19,-1 - 1211 242 l 2,20,21 - 1199 216 1199 216 1186 208 c 0,22,23 - 855 4 855 4 561 4 c 0,24,25 - 239 4 239 4 130 272 c 0,26,27 - 49 472 49 472 175 768 c 0,28,29 - 384 1258 384 1258 903 1250 c 0,30,31 - 1381 1242 1381 1242 1597 841 c 0,32,33 - 1708 634 1708 634 1684 402 c 0,34,35 - 1638 -42 1638 -42 1339 -267 c 0,36,37 - 1169 -394 1169 -394 975 -417 c 0,38,39 - 521 -470 521 -470 260 -129 c 0,40,41 - 245 -109 245 -109 252 -88 c 2,42,-1 - 290 18 l 2,43,44 - 302 52 302 52 324 23 c 0,45,46 - 563 -303 563 -303 1003 -266 c 0,47,48 - 1184 -250 1184 -250 1353 -122.5 c 128,-1,49 - 1522 5 1522 5 1574 157 c 0,50,51 - 1661 414 1661 414 1520 703 c 0,52,53 - 1326 1101 1326 1101 880 1099 c 0,54,55 - 397 1097 397 1097 192 686 c 0,56,57 - 140 582 140 582 180 407 c 0,58,59 - 217 243 217 243 428 169 c 0,60,61 - 546 129 546 129 674 163 c 1,0,1 +150 265 m 0,0,1 + 283 -32 283 -32 581 -16 c 0,2,3 + 858 -1 858 -1 1076 188 c 0,4,5 + 1099 208 1099 208 1101 212 c 2,6,-1 + 1158 335 l 2,7,8 + 1164 348 1164 348 1149.5 362.5 c 152,-1,9 + 1135 377 1135 377 1066 332 c 2,10,-1 + 1005 292 l 2,11,12 + 824 173 824 173 745 215 c 0,13,14 + 582 308 582 308 555 538 c 1,15,16 + 701 665 701 665 1008 578 c 24,17,18 + 1036 569 1036 569 1051 592 c 0,19,20 + 1067 617 1067 617 1043 638 c 0,21,22 + 769 877 769 877 553 655 c 0,23,24 + 332 428 332 428 564 133 c 1,25,26 + 503 106 503 106 408 129 c 0,27,28 + 351 142 351 142 291 203 c 0,29,30 + 227 269 227 269 202 356 c 0,31,32 + 178 442 178 442 178 530 c 0,33,34 + 178 804 178 804 360 966 c 0,35,36 + 483 1076 483 1076 686 1076 c 0,37,38 + 805 1076 805 1076 911 1033 c 0,39,40 + 1105 954 1105 954 1224.5 757.5 c 128,-1,41 + 1344 561 1344 561 1344 340 c 0,42,43 + 1344 173 1344 173 1268.5 42 c 128,-1,44 + 1193 -89 1193 -89 1078 -156 c 0,45,46 + 1002 -200 1002 -200 928 -212 c 1,47,48 + 928 -223 928 -223 954.5 -235.5 c 128,-1,49 + 981 -248 981 -248 1014 -248 c 128,-1,50 + 1047 -248 1047 -248 1078 -236 c 0,51,52 + 1224 -179 1224 -179 1324 -21.5 c 128,-1,53 + 1424 136 1424 136 1424 362 c 128,-1,54 + 1424 588 1424 588 1292 805.5 c 128,-1,55 + 1160 1023 1160 1023 940 1109 c 0,56,57 + 820 1156 820 1156 696 1156 c 0,58,59 + 355 1156 355 1156 197 899 c 0,60,61 + 98 738 98 738 98 564 c 0,62,63 + 98 382 98 382 150 265 c 0,0,1 EndSplineSet EndChar @@ -29929,15 +29980,14 @@ EndChar StartChar: uni06EF Encoding: 1775 1775 917 -Width: 1119 +Width: 819 VWidth: 0 -Flags: W -AnchorPoint: "TashkilAbove" 700 1640 basechar 0 -AnchorPoint: "TashkilBelow" 808 -670 basechar 0 +AnchorPoint: "TashkilAbove" 400 1640 basechar 0 +AnchorPoint: "TashkilBelow" 508 -670 basechar 0 LayerCount: 3 Fore -Refer: 244 1627 N 1 0 0 1 628 138 2 -Refer: 47 -1 N 1 0 0 1 0 0 2 +Refer: 5685 -1 N 1 0 0 1 378 -12 2 +Refer: 47 -1 N 1 0 0 1 0 0 3 EndChar StartChar: uni0632 @@ -60620,7 +60670,8 @@ EndChar StartChar: uni063B.medi_KafMemAlf Encoding: 68655 -1 3395 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60631,7 +60682,8 @@ EndChar StartChar: uni063C.medi_KafMemAlf Encoding: 68656 -1 3396 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60642,7 +60694,8 @@ EndChar StartChar: uni077F.medi_KafMemAlf Encoding: 68657 -1 3397 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60653,7 +60706,8 @@ EndChar StartChar: uni0764.medi_KafMemAlf Encoding: 68658 -1 3398 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60664,7 +60718,8 @@ EndChar StartChar: uni0643.medi_KafMemAlf Encoding: 68659 -1 3399 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60674,7 +60729,8 @@ EndChar StartChar: uni06B0.medi_KafMemAlf Encoding: 68660 -1 3400 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60686,7 +60742,8 @@ EndChar StartChar: uni06B3.medi_KafMemAlf Encoding: 68661 -1 3401 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60698,7 +60755,8 @@ EndChar StartChar: uni06B2.medi_KafMemAlf Encoding: 68662 -1 3402 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60710,7 +60768,8 @@ EndChar StartChar: uni06AB.medi_KafMemAlf Encoding: 68663 -1 3403 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60721,7 +60780,8 @@ EndChar StartChar: uni06AC.medi_KafMemAlf Encoding: 68664 -1 3404 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60732,7 +60792,8 @@ EndChar StartChar: uni06AD.medi_KafMemAlf Encoding: 68665 -1 3405 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" -106 1808 basechar 0 LayerCount: 3 @@ -60743,7 +60804,8 @@ EndChar StartChar: uni06AE.medi_KafMemAlf Encoding: 68666 -1 3406 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60754,7 +60816,8 @@ EndChar StartChar: uni06AF.medi_KafMemAlf Encoding: 68667 -1 3407 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60765,7 +60828,8 @@ EndChar StartChar: uni06A9.medi_KafMemAlf Encoding: 68668 -1 3408 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60775,7 +60839,8 @@ EndChar StartChar: uni06B4.medi_KafMemAlf Encoding: 68669 -1 3409 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" -106 1808 basechar 0 LayerCount: 3 @@ -60787,7 +60852,8 @@ EndChar StartChar: uni0763.medi_KafMemAlf Encoding: 68670 -1 3410 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" -106 1808 basechar 0 LayerCount: 3 @@ -60798,7 +60864,8 @@ EndChar StartChar: uni0762.medi_KafMemAlf Encoding: 68671 -1 3411 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -60809,7 +60876,8 @@ EndChar StartChar: uni06B1.medi_KafMemAlf Encoding: 68672 -1 3412 -Width: 1075 +Width: 1125 +Flags: W AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 3 @@ -76206,23 +76274,23 @@ Width: 0 VWidth: 2738 GlyphClass: 4 Flags: W -AnchorPoint: "MarkAbove" -2 1600 mark 0 +AnchorPoint: "TashkilTashkilAbove" 0 1658 mark 0 +AnchorPoint: "MarkAbove" 0 1600 mark 0 AnchorPoint: "TashkilTashkilAbove2" 0 1658 mark 0 AnchorPoint: "TashkilAbove" 0 1658 mark 0 LayerCount: 3 Fore SplineSet -313.496567977 1870.04743419 m 0,0,1 - 369.970745229 1883.50361323 369.970745229 1883.50361323 387.648867965 1835.19290238 c 0,2,3 - 405.326990702 1786.88219153 405.326990702 1786.88219153 363.823309419 1757.15814814 c 1,4,5 - 183.3206269 1639.10968353 183.3206269 1639.10968353 -206.058941702 1647.4883082 c 1,6,7 - -231.720085129 1598.15286405 -231.720085129 1598.15286405 -260.748811426 1590.32838094 c 1,8,9 - -283.35079078 1585.79243814 -283.35079078 1585.79243814 -300.350945702 1601.92453883 c 2,10,-1 - -375.88939924 1679.45084641 l 2,11,12 - -413.766113602 1717.65957966 -413.766113602 1717.65957966 -356.295765252 1789.8010025 c 0,13,14 - -346.333789308 1802.20338233 -346.333789308 1802.20338233 -322.793617156 1827.44495348 c 128,-1,15 - -299.253445004 1852.68652462 -299.253445004 1852.68652462 -253.216627372 1845.61620074 c 0,16,17 - 32.1959730398 1799.92821243 32.1959730398 1799.92821243 313.496567977 1870.04743419 c 0,0,1 +317 1856 m 0,0,1 + 360 1867 360 1867 374 1829.5 c 128,-1,2 + 388 1792 388 1792 355 1770 c 0,3,4 + 177 1653 177 1653 -215 1663 c 1,5,6 + -252 1584 -252 1584 -290 1612 c 1,7,-1 + -365 1690 l 2,8,9 + -386 1711 -386 1711 -369 1742.5 c 128,-1,10 + -352 1774 -352 1774 -314 1816 c 0,11,12 + -294 1837 -294 1837 -256 1831 c 0,13,14 + 32 1785 32 1785 317 1856 c 0,0,1 EndSplineSet Layer: 2 SplineSet @@ -78184,6 +78252,8 @@ Encoding: 1623 1623 4624 Width: 0 GlyphClass: 4 Flags: W +AnchorPoint: "TashkilTashkilAbove" 556 1640 mark 0 +AnchorPoint: "TashkilTashkilAbove" 615 2464 basemark 0 AnchorPoint: "MarkAbove" 549 1640 mark 0 AnchorPoint: "TashkilAboveDot" 556 1640 mark 0 AnchorPoint: "TashkilAbove" 556 1640 mark 0 @@ -80160,7 +80230,7 @@ EndChar StartChar: uni06E5.low Encoding: 69903 -1 4685 -Width: 391 +Width: 515 Flags: W AnchorPoint: "TashkilAbove" 308 325 basechar 0 LayerCount: 3 @@ -82737,7 +82807,7 @@ SplineSet 50 1676 l 1,28,29 41 1650 41 1650 16 1647 c 1,0,1 EndSplineSet -Refer: 47 -1 N 0.5 0 0 0.5 271 1873 2 +Refer: 47 -1 N 0.5 0 0 0.5 451 1873 2 Layer: 2 SplineSet 0 1679 m 0,0,1 @@ -82767,7 +82837,7 @@ LayerCount: 3 Fore Refer: 191 -1 N 0.5 0 0 0.5 421 2278 2 Refer: 4818 1552 N 1 0 0 1 0 0 2 -Refer: 47 -1 N 0.5 0 0 0.5 356 1873 2 +Refer: 47 -1 N 0.5 0 0 0.5 526 1873 2 EndChar StartChar: uni0614 @@ -83041,68 +83111,55 @@ EndChar StartChar: uni0600 Encoding: 1536 1536 4827 -Width: 2168 -VWidth: 0 -Flags: W -LayerCount: 3 -Fore -SplineSet -1854.13713704 -129.273808533 m 1,0,1 - 1775.92695224 -95.5203897099 1775.92695224 -95.5203897099 1775 -29 c 1,2,3 - 1775.85516408 107.962975726 1775.85516408 107.962975726 1891.69872989 237.066231638 c 0,4,5 - 1972.1304754 325.39799617 1972.1304754 325.39799617 2045 326 c 0,6,7 - 2083.56941597 326 2083.56941597 326 2082.40048219 282.038720503 c 0,8,9 - 2081.84302452 270.083273753 2081.84302452 270.083273753 2078.86137052 261.874019985 c 2,10,-1 - 2034.70713142 153.495433094 l 2,11,12 - 2019.48469942 117.515139272 2019.48469942 117.515139272 1998.99206586 109.125809306 c 0,13,14 - 1995.46351586 107.813592364 1995.46351586 107.813592364 1992.81176318 107.034787456 c 0,15,16 - 1963.52561928 99.0154990564 1963.52561928 99.0154990564 1945.2809195 88.7970937665 c 1,17,18 - 1985.31021574 73.0643200724 1985.31021574 73.0643200724 2046.27413191 64.193969025 c 0,19,20 - 2115.94409607 54.1657166077 2115.94409607 54.1657166077 2133.48330264 -0.0554720405213 c 0,21,22 - 2137.85073932 -14.6247352392 2137.85073932 -14.6247352392 2138 -30 c 0,23,24 - 2137.19276046 -95.6799828564 2137.19276046 -95.6799828564 2073.02665972 -181.964406225 c 0,25,26 - 1968.32211692 -321.843131376 1968.32211692 -321.843131376 1488.65123928 -354.006674579 c 0,27,28 - 1324.0006173 -364.972237037 1324.0006173 -364.972237037 1107 -365 c 0,29,30 - 366.67303461 -365 366.67303461 -365 230.953236399 -336.763395441 c 0,31,32 - 210.861690754 -332.425332101 210.861690754 -332.425332101 199.431369884 -327.680644927 c 0,33,34 - 148.959465305 -306.458191891 148.959465305 -306.458191891 115.611820753 -268.97044976 c 2,35,-1 - 48.8230018034 -195.203694502 l 2,36,37 - 30.5113798152 -173.896414057 30.5113798152 -173.896414057 30 -154.5 c 0,38,39 - 30 -145.919827811 30 -145.919827811 32.2078635762 -139.323270446 c 128,-1,40 - 34.4157271524 -132.726713081 34.4157271524 -132.726713081 38.3461450169 -128.832645895 c 128,-1,41 - 42.2765628813 -124.938578709 42.2765628813 -124.938578709 47.0700692852 -122.319476754 c 128,-1,42 - 51.8635756891 -119.700374799 51.8635756891 -119.700374799 57.6729417978 -118.933166669 c 128,-1,43 - 63.4823079064 -118.16595854 63.4823079064 -118.16595854 68.767448821 -117.974529165 c 128,-1,44 - 74.0525897355 -117.78309979 74.0525897355 -117.78309979 79.6468957712 -118.592967887 c 128,-1,45 - 85.241201807 -119.402835983 85.241201807 -119.402835983 88.923968915 -120.089296359 c 128,-1,46 - 92.606736023 -120.775756735 92.606736023 -120.775756735 95.8919736687 -121.612918228 c 128,-1,47 - 99.1772113144 -122.450079721 99.1772113144 -122.450079721 99.2061349957 -122.4551839 c 0,48,49 - 324.941852172 -161.958893002 324.941852172 -161.958893002 1097 -162 c 0,50,51 - 1652.29516628 -161.915841612 1652.29516628 -161.915841612 1854.13713704 -129.273808533 c 1,0,1 +Width: 2268 +VWidth: 0 +Flags: W +LayerCount: 3 +Fore +SplineSet +2010 -128 m 1,0,1 + 1901 -101 1901 -101 1902 -29 c 0,2,3 + 1904 117 1904 117 2012 237 c 0,4,5 + 2090 322 2090 322 2135 326 c 0,6,7 + 2200 332 2200 332 2169 262 c 2,8,-1 + 2125 163 l 2,9,10 + 2108 124 2108 124 2066 114 c 0,11,12 + 2025 104 2025 104 2005 89 c 1,13,14 + 2064 60 2064 60 2143.5 53.5 c 128,-1,15 + 2223 47 2223 47 2222 -30 c 0,16,17 + 2221 -83 2221 -83 2147 -182 c 0,18,19 + 2009 -365 2009 -365 1047 -365 c 0,20,21 + 324 -365 324 -365 234 -328 c 0,22,23 + 184 -307 184 -307 151 -269 c 1,24,-1 + 84 -195 l 2,25,26 + 47 -155 47 -155 64 -132 c 128,-1,28 + 81 -109 81 -109 116 -118 c 0,29,30 + 288 -162 288 -162 1048 -162 c 128,-1,31 + 1808 -162 1808 -162 2010 -128 c 1,0,1 EndSplineSet Layer: 2 SplineSet -1964 -128 m 17,0,1 - 1873 -192 1873 -192 1097 -192 c 128,-1,2 - 321 -192 321 -192 94 -152 c 0,3,4 - 60 -146 60 -146 60 -154.5 c 128,-1,5 - 60 -163 60 -163 71 -175 c 2,6,-1 - 138 -249 l 2,7,8 - 167 -282 167 -282 211 -300 c 0,9,10 - 293 -335 293 -335 1107 -335 c 128,-1,11 - 1921 -335 1921 -335 2049 -164 c 0,12,13 - 2108 -85 2108 -85 2108 -30 c 128,-1,14 - 2108 25 2108 25 2042 34.5 c 128,-1,15 - 1976 44 1976 44 1934 61 c 128,-1,16 - 1892 78 1892 78 1904 93 c 0,17,18 - 1925 120 1925 120 1985 136 c 0,19,20 - 1996 139 1996 139 2007 165 c 2,21,-1 - 2051 273 l 2,22,23 - 2060 296 2060 296 2045 296 c 0,24,25 - 1985 296 1985 296 1914 217 c 0,26,27 - 1805 96 1805 96 1805 -29 c 0,28,29 - 1805 -90 1805 -90 1905 -114 c 2,30,-1 - 1964 -128 l 17,0,1 +2064 -128 m 9,0,1 + 2005 -114 l 2,2,3 + 1905 -90 1905 -90 1905 -29 c 0,4,5 + 1905 96 1905 96 2014 217 c 0,6,7 + 2085 296 2085 296 2145 296 c 0,8,9 + 2160 296 2160 296 2151 273 c 2,10,-1 + 2107 165 l 2,11,12 + 2096 139 2096 139 2085 136 c 0,13,14 + 2025 120 2025 120 2004 93 c 0,15,16 + 1992 78 1992 78 2034 61 c 128,-1,17 + 2076 44 2076 44 2142 34.5 c 128,-1,18 + 2208 25 2208 25 2208 -30 c 128,-1,19 + 2208 -85 2208 -85 2149 -164 c 0,20,21 + 2021 -335 2021 -335 1157 -335 c 0,22,23 + 297 -335 297 -335 211 -300 c 0,24,25 + 168 -283 168 -283 138 -249 c 2,26,-1 + 71 -175 l 2,27,28 + 60 -163 60 -163 60 -154.5 c 128,-1,29 + 60 -146 60 -146 94 -152 c 0,30,31 + 321 -192 321 -192 1147 -192 c 128,-1,32 + 1973 -192 1973 -192 2064 -128 c 9,0,1 EndSplineSet EndChar @@ -93365,7 +93422,7 @@ Refer: 344 -1 N 1 0 0 1 187 1040 2 Refer: 5608 -1 N 1 0 0 1 211 0 2 EndChar -StartChar: aPercent.slash +StartChar: slash.ara Encoding: 70077 -1 5619 Width: 706 Flags: W @@ -94217,5 +94274,278 @@ SplineSet 255 -757 l 2,0,1 EndSplineSet EndChar + +StartChar: uni0600.alt +Encoding: 70141 -1 5684 +Width: 2868 +VWidth: 0 +Flags: W +LayerCount: 3 +Fore +SplineSet +2610 -128 m 1,0,1 + 2501 -101 2501 -101 2502 -29 c 0,2,3 + 2504 117 2504 117 2612 237 c 0,4,5 + 2690 322 2690 322 2735 326 c 0,6,7 + 2800 332 2800 332 2769 262 c 2,8,-1 + 2725 163 l 2,9,10 + 2708 124 2708 124 2666 114 c 128,-1,12 + 2624 104 2624 104 2605 89 c 1,13,14 + 2664 60 2664 60 2743.5 53.5 c 128,-1,15 + 2823 47 2823 47 2822 -30 c 0,16,17 + 2821 -83 2821 -83 2747 -182 c 0,18,19 + 2609 -365 2609 -365 1347 -365 c 0,20,21 + 324 -365 324 -365 234 -328 c 0,22,23 + 184 -307 184 -307 151 -269 c 1,24,-1 + 84 -195 l 2,25,26 + 47 -155 47 -155 64 -132 c 128,-1,28 + 81 -109 81 -109 116 -118 c 0,29,30 + 290 -162 290 -162 1349.5 -161.5 c 128,-1,31 + 2409 -161 2409 -161 2610 -128 c 1,0,1 +EndSplineSet +Layer: 2 +SplineSet +2664 -128 m 9,0,1 + 2605 -114 l 2,2,3 + 2505 -90 2505 -90 2505 -29 c 0,4,5 + 2505 96 2505 96 2614 217 c 0,6,7 + 2685 296 2685 296 2745 296 c 0,8,9 + 2760 296 2760 296 2751 273 c 2,10,-1 + 2707 165 l 2,11,12 + 2696 139 2696 139 2685 136 c 0,13,14 + 2625 120 2625 120 2604 93 c 0,15,16 + 2592 78 2592 78 2634 61 c 128,-1,17 + 2676 44 2676 44 2742 34.5 c 128,-1,18 + 2808 25 2808 25 2808 -30 c 0,19,20 + 2808 -78 2808 -78 2749 -164 c 0,21,22 + 2631 -336 2631 -336 1457 -335 c 0,23,24 + 269 -334 269 -334 221 -300 c 0,25,26 + 149 -251 149 -251 148 -249 c 2,27,-1 + 81 -175 l 2,28,29 + 70 -163 70 -163 70 -154.5 c 128,-1,30 + 70 -146 70 -146 104 -152 c 0,31,32 + 331 -192 331 -192 1452 -192 c 128,-1,33 + 2573 -192 2573 -192 2664 -128 c 9,0,1 +EndSplineSet +EndChar + +StartChar: smallv.above.inverted +Encoding: 70142 -1 5685 +Width: 0 +GlyphClass: 4 +Flags: W +AnchorPoint: "TashkilTashkilAbove" 0 1500 basemark 0 +AnchorPoint: "VAbove" 0 950 mark 0 +LayerCount: 3 +Fore +Refer: 244 1627 N 1 0 0 1 0 0 2 +EndChar + +StartChar: uni0660.prop +Encoding: 70143 -1 5686 +Width: 800 +Flags: W +LayerCount: 3 +Fore +Refer: 263 1632 N 1 0 0 1 -200 0 2 +EndChar + +StartChar: uni0661.prop +Encoding: 70144 -1 5687 +Width: 892 +Flags: W +LayerCount: 3 +Fore +Refer: 258 1633 N 1 0 0 1 -199 0 2 +EndChar + +StartChar: uni0662.prop +Encoding: 70145 -1 5688 +Width: 987 +Flags: W +LayerCount: 3 +Fore +Refer: 259 1634 N 1 0 0 1 -98 0 2 +EndChar + +StartChar: uni0663.prop +Encoding: 70146 -1 5689 +Width: 1172 +Flags: W +LayerCount: 3 +Fore +Refer: 260 1635 N 1 0 0 1 -8 0 2 +EndChar + +StartChar: uni0664.prop +Encoding: 70147 -1 5690 +Width: 900 +Flags: W +LayerCount: 3 +Fore +Refer: 261 1636 N 1 0 0 1 -125 0 2 +EndChar + +StartChar: uni0665.prop +Encoding: 70148 -1 5691 +Width: 1075 +Flags: W +LayerCount: 3 +Fore +Refer: 262 1637 N 1 0 0 1 -74 0 2 +EndChar + +StartChar: uni0666.prop +Encoding: 70149 -1 5692 +Width: 1070 +Flags: W +LayerCount: 3 +Fore +Refer: 265 1638 N 1 0 0 1 -65 0 2 +EndChar + +StartChar: uni0667.prop +Encoding: 70150 -1 5693 +Width: 1141 +Flags: W +LayerCount: 3 +Fore +Refer: 266 1639 N 1 0 0 1 -30 0 2 +EndChar + +StartChar: uni0668.prop +Encoding: 70151 -1 5694 +Width: 1141 +Flags: W +LayerCount: 3 +Fore +Refer: 267 1640 N 1 0 0 1 -29 0 2 +EndChar + +StartChar: uni0669.prop +Encoding: 70152 -1 5695 +Width: 958 +Flags: W +LayerCount: 3 +Fore +Refer: 268 1641 N 1 0 0 1 -121 0 2 +EndChar + +StartChar: uni06F0.prop +Encoding: 70153 -1 5696 +Width: 800 +Flags: W +LayerCount: 3 +Fore +Refer: 5686 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F1.prop +Encoding: 70154 -1 5697 +Width: 892 +Flags: W +LayerCount: 3 +Fore +Refer: 5687 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F2.prop +Encoding: 70155 -1 5698 +Width: 987 +Flags: W +LayerCount: 3 +Fore +Refer: 5688 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F3.prop +Encoding: 70156 -1 5699 +Width: 1172 +Flags: W +LayerCount: 3 +Fore +Refer: 5689 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F4.prop +Encoding: 70157 -1 5700 +Width: 996 +Flags: W +LayerCount: 3 +Fore +Refer: 285 1780 N 1 0 0 1 -95 0 2 +EndChar + +StartChar: uni06F5.prop +Encoding: 70158 -1 5701 +Width: 1000 +Flags: W +LayerCount: 3 +Fore +Refer: 286 1781 N 1 0 0 1 -99 0 2 +EndChar + +StartChar: uni06F6.prop +Encoding: 70159 -1 5702 +Width: 1068 +Flags: W +LayerCount: 3 +Fore +Refer: 287 1782 N 1 0 0 1 -73 0 2 +EndChar + +StartChar: uni06F7.prop +Encoding: 70160 -1 5703 +Width: 1141 +Flags: W +LayerCount: 3 +Fore +Refer: 5693 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F8.prop +Encoding: 70161 -1 5704 +Width: 1141 +Flags: W +LayerCount: 3 +Fore +Refer: 5694 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F9.prop +Encoding: 70162 -1 5705 +Width: 958 +Flags: W +LayerCount: 3 +Fore +Refer: 5695 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F4.urd.prop +Encoding: 70163 -1 5706 +Width: 1040 +Flags: W +LayerCount: 3 +Fore +Refer: 347 -1 N 1 0 0 1 -84 0 2 +EndChar + +StartChar: uni06F6.urd.prop +Encoding: 70164 -1 5707 +Width: 1070 +Flags: W +LayerCount: 3 +Fore +Refer: 5692 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F7.urd.prop +Encoding: 70165 -1 5708 +Width: 1045 +Flags: W +LayerCount: 3 +Fore +Refer: 349 -1 N 1 0 0 1 -90 0 2 +EndChar EndChars EndSplineFont diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.fea b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.fea index ab86980af50..349cb3cf0c7 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.fea @@ -1,6 +1,7 @@ include(lang.fea) include(classes.fea) include(local.fea) +include(proportional.fea) include(basic.fea) include(kashida.fea) include(quran.fea) diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.sfd b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.sfd index a9710804ed3..a0f4becd0dc 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.sfd +++ b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-regular.sfd @@ -19,7 +19,7 @@ OS2Version: 4 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1273266481 -ModificationTime: 1338475028 +ModificationTime: 1342689122 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -118,7 +118,7 @@ Grid Named: "Digits base" EndSplineSet AnchorClass2: "MarkAbove" "'mark' Generic Mark Anchor-1" "MarkBelow" "'mark' Generic Mark Anchor-2" "TashkilAbove" "'mark' Tashkil Above Base-1" "TashkilBelow" "'mark' Tashkil Below Base-1" "TashkilTashkilAbove" "'mkmk' Tashkil to Tashkil Above-1" "TashkilTashkilBelow" "'mkmk' Tashkil to Tashkil Below-1" "TashkilTashkilAbove2" "'mkmk' Tashkil to Tashkil Above 2-1" "TashkilAboveDot" "Tashkil Above Dot-1" "TashkilBelowDot" "Tashkil Below Dot-1" "HamzaAbove" "'mark' Hamza Above-1" "HamzaBelow" "'mark' Hamza Below-1" "HighHamza" "'mark' High Hamza-1" "DotAbove" "'mark' Dot Above-1" "DotBelow" "'mark' Dot Below-1" "DotBelowAlt" "'mark' Dot Below Alt-1" "TwoDotsAbove" "'mark' Two Dots Above-1" "TwoDotsBelow" "'mark' Two Dots Below-1" "TwoDotsBelowAlt" "'mark' Two Dots Below Alt-1" "DigitAbove" "'mark' Digit Above-1" "DigitBelow" "'mark' Digit Below-1" "MarkDotAbove" "'mkmk' Mark to Dot Above-1" "MarkDotBelow" "'mkmk' Mark to Dot Below-1" "TaaAbove" "'mark' Small Taa Above-1" "TaaBelow" "'mark' Small Taa Below-1" "AlefAbove" "'mark' Small Alef Above-1" "SeenAbove" "'mark' Seen Above-1" "SeenBelow" "'mark' Seen Below-1" "NoonAbove" "'mark' Noon Above-1" "VAbove" "'mark' V Mark Above-1" "RingDash" "'mkmk' Ring to Dash-1" "RingBelow" "'mark' Ring Below-1" "DotAlt" "'mark' Dot Alt-1" "DotHmaza" "'mkmk' Dot above Hamza-1" "Tail" "'mark' Yaa Tail-1" "Dash" "'mark' Dash-1" "Stroke" "'mark' Stroke-1" "cursive" "'curs' Cursive Attachment-1" -BeginChars: 70141 5684 +BeginChars: 70166 5709 StartChar: aAlf.fina.alt Encoding: 65536 -1 0 @@ -14634,7 +14634,7 @@ EndChar StartChar: aKaf.medi_KafMemAlf Encoding: 65817 -1 367 -Width: 1075 +Width: 1125 Flags: MW AnchorPoint: "Dash" 506 1520 basechar 0 AnchorPoint: "TwoDotsAbove" -98 1391 basechar 0 @@ -14645,36 +14645,40 @@ AnchorPoint: "DotBelow" 655 0 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 AnchorPoint: "TashkilAbove" 640 1640 basechar 0 LayerCount: 2 +Back +SplineSet +295 325 m 0,0,1 + 295 140 l 0,2,3 +EndSplineSet Fore SplineSet -91 888 m 1,0,1 309 816 309 816 566 606 c 0,2,3 - 718 482 718 482 762 436 c 0,4,5 - 983 205 983 205 1075 185 c 0,6,7 - 1176 164 1176 164 1110 32 c 0,8,9 - 1094 0 1094 0 1075 0 c 0,10,11 - 983 0 983 0 674 337 c 0,12,13 - 586 433 586 433 474 508 c 1,14,15 - 495 359 495 359 465.5 287.5 c 128,-1,16 - 436 216 436 216 389 180 c 0,17,18 - 340 142 340 142 177 144 c 0,19,20 - 69 145 69 145 21 103 c 0,21,22 - 13 96 13 96 15 82 c 0,23,24 - 25 18 25 18 -1 12 c 0,25,26 - -35 4 -35 4 -25 61 c 0,27,28 - -17 111 -17 111 6 155 c 0,29,30 - 74 286 74 286 396 286 c 0,31,32 - 435 286 435 286 435 314 c 1,33,34 - 438 403 438 403 368 480 c 0,35,36 - 228 631 228 631 -153 709 c 0,37,38 - -192 717 -192 717 -191 818 c 0,39,40 - -190 885 -190 885 -170 934 c 16,41,42 - -144 996 -144 996 44 1124 c 0,43,44 - 210 1237 210 1237 1064 1609 c 0,45,46 - 1119 1633 1119 1633 1106 1582 c 2,47,-1 - 1074 1455 l 2,48,49 - 1063 1413 1063 1413 1028 1400 c 0,50,51 - 627 1251 627 1251 280 1087 c 0,52,53 + 706 492 706 492 762 436 c 0,4,5 + 1010 186 1010 186 1123 185 c 128,-1,6 + 1236 184 1236 184 1160 32 c 0,7,8 + 1144 0 1144 0 1125 0 c 0,9,10 + 976 0 976 0 787 203 c 0,11,12 + 549 458 549 458 474 508 c 1,13,14 + 496 358 496 358 466 282 c 0,15,16 + 408 131 408 131 177 134 c 0,17,18 + 68 135 68 135 31 103 c 0,19,20 + 23 96 23 96 25 82 c 0,21,22 + 34 20 34 20 -1 12 c 0,23,24 + -35 4 -35 4 -25 61 c 0,25,26 + -18 108 -18 108 6 155 c 0,27,28 + 89 316 89 316 396 316 c 0,29,30 + 435 316 435 316 435 344 c 1,31,32 + 436 406 436 406 368 480 c 0,33,34 + 228 631 228 631 -153 709 c 0,35,36 + -192 717 -192 717 -191 818 c 0,37,38 + -190 885 -190 885 -170 934 c 16,39,40 + -144 996 -144 996 44 1124 c 0,41,42 + 210 1237 210 1237 1064 1609 c 0,43,44 + 1119 1633 1119 1633 1106 1582 c 2,45,-1 + 1074 1455 l 2,46,47 + 1063 1413 1063 1413 1028 1400 c 0,48,49 + 627 1251 627 1251 280 1087 c 0,50,51 0 955 0 955 -91 888 c 1,0,1 EndSplineSet EndChar @@ -14807,67 +14811,117 @@ EndChar StartChar: at.ara Encoding: 65822 -1 372 -Width: 1796 -Flags: W +Width: 1496 +Flags: MW LayerCount: 2 Back SplineSet -1179 280 m 0,54,55 - 992 180 992 180 831 128 c 0,56,57 - 686 81 686 81 573 80 c 0,58,59 - 428 80 428 80 321 148 c 1,60,61 - 215 218 215 218 168 337 c 0,62,63 - 124 450 124 450 144 580 c 0,64,65 - 175 780 175 780 334 941 c 0,66,67 - 371 978 371 978 411 1009 c 0,68,69 - 596 1152 596 1152 828 1172 c 0,70,71 - 860 1174 860 1174 891 1174 c 0,72,73 - 1101 1173 1101 1173 1280 1067 c 1,74,75 - 1459 960 1459 960 1557 776 c 0,76,77 - 1666 573 1666 573 1644 337 c 0,78,79 - 1633 228 1633 228 1593 128 c 0,80,81 - 1513 -68 1513 -68 1347 -195 c 0,82,83 - 1178 -322 1178 -322 969 -344 c 0,84,85 - 759 -365 759 -365 569 -276 c 0,86,87 - 378 -184 378 -184 261 -10 c 0,88,-1 -EndSplineSet -Fore -SplineSet -674 163 m 1,0,1 - 409 381 409 381 663 675 c 0,2,3 - 866 909 866 909 1153 658 c 0,4,5 - 1177 637 1177 637 1161 612 c 128,-1,6 - 1145 587 1145 587 1118 598 c 24,7,8 - 916 680 916 680 771 622 c 0,9,10 - 672 582 672 582 671 547 c 0,11,12 - 665 322 665 322 855 265 c 0,13,14 - 973 229 973 229 1115 322 c 2,15,-1 - 1176 362 l 2,16,17 - 1245 407 1245 407 1259.5 392.5 c 152,-1,18 - 1274 378 1274 378 1268 365 c 2,19,-1 - 1211 242 l 2,20,21 - 1199 216 1199 216 1186 208 c 0,22,23 - 855 4 855 4 561 4 c 0,24,25 - 239 4 239 4 130 272 c 0,26,27 - 49 472 49 472 175 768 c 0,28,29 - 384 1258 384 1258 903 1250 c 0,30,31 - 1381 1242 1381 1242 1597 841 c 0,32,33 - 1708 634 1708 634 1684 402 c 0,34,35 - 1638 -42 1638 -42 1339 -267 c 0,36,37 - 1169 -394 1169 -394 975 -417 c 0,38,39 - 521 -470 521 -470 260 -129 c 0,40,41 - 245 -109 245 -109 252 -88 c 2,42,-1 - 290 18 l 2,43,44 - 302 52 302 52 324 23 c 0,45,46 - 563 -303 563 -303 1003 -266 c 0,47,48 - 1184 -250 1184 -250 1353 -122.5 c 128,-1,49 - 1522 5 1522 5 1574 157 c 0,50,51 - 1661 414 1661 414 1520 703 c 0,52,53 - 1326 1101 1326 1101 880 1099 c 0,54,55 - 397 1097 397 1097 192 686 c 0,56,57 - 140 582 140 582 180 407 c 0,58,59 - 217 243 217 243 428 169 c 0,60,61 - 546 129 546 129 674 163 c 1,0,1 +686 1156 m 0,0,1 + 572 1156 572 1156 475 1122 c 128,-1,2 + 378 1088 378 1088 309.5 1029 c 128,-1,3 + 241 970 241 970 192.5 891.5 c 128,-1,4 + 144 813 144 813 121 724 c 128,-1,5 + 98 635 98 635 98 540 c 0,6,7 + 98 389 98 389 151.5 262 c 128,-1,8 + 205 135 205 135 300 60.5 c 128,-1,9 + 395 -14 395 -14 510 -14 c 0,10,11 + 587 -14 587 -14 631.5 28 c 128,-1,12 + 676 70 676 70 676 158 c 0,13,14 + 676 213 676 213 662 250 c 1,15,16 + 679 218 679 218 707 177.5 c 128,-1,17 + 735 137 735 137 773 93 c 128,-1,18 + 811 49 811 49 857 19.5 c 128,-1,19 + 903 -10 903 -10 944 -10 c 0,20,21 + 1033 -10 1033 -10 1083.5 69 c 128,-1,22 + 1134 148 1134 148 1134 260 c 0,23,24 + 1134 367 1134 367 1082.5 478 c 128,-1,25 + 1031 589 1031 589 951 675 c 128,-1,26 + 871 761 871 761 766.5 815.5 c 128,-1,27 + 662 870 662 870 562 870 c 0,28,29 + 487 870 487 870 416 844 c 1,30,-1 + 538 212 l 1,31,32 + 544 188 544 188 544 162 c 0,33,34 + 544 116 544 116 517.5 94 c 128,-1,35 + 491 72 491 72 448 72 c 0,36,37 + 401 72 401 72 352.5 109.5 c 128,-1,38 + 304 147 304 147 265.5 208.5 c 128,-1,39 + 227 270 227 270 202.5 356.5 c 128,-1,40 + 178 443 178 443 178 534 c 0,41,42 + 178 617 178 617 197 694.5 c 128,-1,43 + 216 772 216 772 257 841.5 c 128,-1,44 + 298 911 298 911 356.5 963 c 128,-1,45 + 415 1015 415 1015 500 1045.5 c 128,-1,46 + 585 1076 585 1076 686 1076 c 0,47,48 + 805 1076 805 1076 911 1033 c 128,-1,49 + 1017 990 1017 990 1094.5 917 c 128,-1,50 + 1172 844 1172 844 1229.5 749.5 c 128,-1,51 + 1287 655 1287 655 1315.5 550 c 128,-1,52 + 1344 445 1344 445 1344 340 c 0,53,54 + 1344 173 1344 173 1268.5 42 c 128,-1,55 + 1193 -89 1193 -89 1078 -156 c 0,56,57 + 1002 -200 1002 -200 928 -212 c 1,58,59 + 928 -223 928 -223 954.5 -235.5 c 128,-1,60 + 981 -248 981 -248 1000 -248 c 0,61,62 + 1047 -248 1047 -248 1078 -236 c 0,63,64 + 1222 -183 1222 -183 1323 -23.5 c 128,-1,65 + 1424 136 1424 136 1424 340 c 0,66,67 + 1424 458 1424 458 1392.5 575 c 128,-1,68 + 1361 692 1361 692 1297.5 796.5 c 128,-1,69 + 1234 901 1234 901 1147 981.5 c 128,-1,70 + 1060 1062 1060 1062 940.5 1109 c 128,-1,71 + 821 1156 821 1156 686 1156 c 0,0,1 +646 778 m 3,72,73 + 702 778 702 778 763.5 735.5 c 128,-1,74 + 825 693 825 693 874 626.5 c 128,-1,75 + 923 560 923 560 954.5 473 c 128,-1,76 + 986 386 986 386 986 302 c 0,77,78 + 986 106 986 106 884 106 c 0,79,80 + 836 106 836 106 776.5 176.5 c 128,-1,81 + 717 247 717 247 670 349.5 c 128,-1,82 + 623 452 623 452 604 548 c 2,83,-1 + 564 752 l 1,84,85 + 587 778 587 778 646 778 c 3,72,73 +EndSplineSet +Fore +SplineSet +150 265 m 0,0,1 + 283 -32 283 -32 581 -16 c 0,2,3 + 858 -1 858 -1 1076 188 c 0,4,5 + 1099 208 1099 208 1101 212 c 2,6,-1 + 1158 335 l 2,7,8 + 1164 348 1164 348 1149.5 362.5 c 152,-1,9 + 1135 377 1135 377 1066 332 c 2,10,-1 + 1005 292 l 2,11,12 + 824 173 824 173 745 215 c 0,13,14 + 582 308 582 308 555 538 c 1,15,16 + 701 665 701 665 1008 578 c 24,17,18 + 1036 569 1036 569 1051 592 c 0,19,20 + 1067 617 1067 617 1043 638 c 0,21,22 + 769 877 769 877 553 655 c 0,23,24 + 332 428 332 428 564 133 c 1,25,26 + 503 106 503 106 408 129 c 0,27,28 + 351 142 351 142 291 203 c 0,29,30 + 227 269 227 269 202 356 c 0,31,32 + 178 442 178 442 178 530 c 0,33,34 + 178 804 178 804 360 966 c 0,35,36 + 483 1076 483 1076 686 1076 c 0,37,38 + 805 1076 805 1076 911 1033 c 0,39,40 + 1105 954 1105 954 1224.5 757.5 c 128,-1,41 + 1344 561 1344 561 1344 340 c 0,42,43 + 1344 173 1344 173 1268.5 42 c 128,-1,44 + 1193 -89 1193 -89 1078 -156 c 0,45,46 + 1002 -200 1002 -200 928 -212 c 1,47,48 + 928 -223 928 -223 954.5 -235.5 c 128,-1,49 + 981 -248 981 -248 1014 -248 c 128,-1,50 + 1047 -248 1047 -248 1078 -236 c 0,51,52 + 1224 -179 1224 -179 1324 -21.5 c 128,-1,53 + 1424 136 1424 136 1424 362 c 128,-1,54 + 1424 588 1424 588 1292 805.5 c 128,-1,55 + 1160 1023 1160 1023 940 1109 c 0,56,57 + 820 1156 820 1156 696 1156 c 0,58,59 + 355 1156 355 1156 197 899 c 0,60,61 + 98 738 98 738 98 564 c 0,62,63 + 98 382 98 382 150 265 c 0,0,1 EndSplineSet EndChar @@ -22965,14 +23019,14 @@ EndChar StartChar: uni06EF Encoding: 1775 1775 917 -Width: 1119 +Width: 819 VWidth: 0 -AnchorPoint: "TashkilAbove" 700 1640 basechar 0 -AnchorPoint: "TashkilBelow" 808 -670 basechar 0 +AnchorPoint: "TashkilAbove" 400 1640 basechar 0 +AnchorPoint: "TashkilBelow" 508 -670 basechar 0 LayerCount: 2 Fore -Refer: 244 1627 N 1 0 0 1 628 138 2 -Refer: 47 -1 N 1 0 0 1 0 0 2 +Refer: 5685 -1 N 1 0 0 1 378 -12 2 +Refer: 47 -1 N 1 0 0 1 0 0 3 EndChar StartChar: uni0632 @@ -53629,8 +53683,9 @@ EndChar StartChar: uni063B.medi_KafMemAlf Encoding: 68655 -1 3395 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53641,8 +53696,9 @@ EndChar StartChar: uni063C.medi_KafMemAlf Encoding: 68656 -1 3396 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53653,8 +53709,9 @@ EndChar StartChar: uni077F.medi_KafMemAlf Encoding: 68657 -1 3397 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53665,8 +53722,9 @@ EndChar StartChar: uni0764.medi_KafMemAlf Encoding: 68658 -1 3398 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53677,8 +53735,9 @@ EndChar StartChar: uni0643.medi_KafMemAlf Encoding: 68659 -1 3399 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53688,8 +53747,9 @@ EndChar StartChar: uni06B0.medi_KafMemAlf Encoding: 68660 -1 3400 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53701,8 +53761,9 @@ EndChar StartChar: uni06B3.medi_KafMemAlf Encoding: 68661 -1 3401 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53714,8 +53775,9 @@ EndChar StartChar: uni06B2.medi_KafMemAlf Encoding: 68662 -1 3402 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53727,8 +53789,9 @@ EndChar StartChar: uni06AB.medi_KafMemAlf Encoding: 68663 -1 3403 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53739,8 +53802,9 @@ EndChar StartChar: uni06AC.medi_KafMemAlf Encoding: 68664 -1 3404 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53751,8 +53815,9 @@ EndChar StartChar: uni06AD.medi_KafMemAlf Encoding: 68665 -1 3405 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" -106 1808 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53763,8 +53828,9 @@ EndChar StartChar: uni06AE.medi_KafMemAlf Encoding: 68666 -1 3406 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53775,8 +53841,9 @@ EndChar StartChar: uni06AF.medi_KafMemAlf Encoding: 68667 -1 3407 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53787,8 +53854,9 @@ EndChar StartChar: uni06A9.medi_KafMemAlf Encoding: 68668 -1 3408 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53798,8 +53866,9 @@ EndChar StartChar: uni06B4.medi_KafMemAlf Encoding: 68669 -1 3409 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" -106 1808 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53811,8 +53880,9 @@ EndChar StartChar: uni0763.medi_KafMemAlf Encoding: 68670 -1 3410 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" -106 1808 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53823,8 +53893,9 @@ EndChar StartChar: uni0762.medi_KafMemAlf Encoding: 68671 -1 3411 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -53835,8 +53906,9 @@ EndChar StartChar: uni06B1.medi_KafMemAlf Encoding: 68672 -1 3412 -Width: 1075 +Width: 1125 VWidth: 0 +Flags: W AnchorPoint: "TashkilAbove" 640 1640 basechar 0 AnchorPoint: "TashkilBelow" 700 -670 basechar 0 LayerCount: 2 @@ -68644,7 +68716,8 @@ Width: 0 VWidth: 2738 GlyphClass: 4 Flags: W -AnchorPoint: "MarkAbove" -2 1600 mark 0 +AnchorPoint: "TashkilTashkilAbove" 0 1658 mark 0 +AnchorPoint: "MarkAbove" 0 1600 mark 0 AnchorPoint: "TashkilTashkilAbove2" 0 1658 mark 0 AnchorPoint: "TashkilAbove" 0 1658 mark 0 LayerCount: 2 @@ -69800,6 +69873,8 @@ Encoding: 1623 1623 4624 Width: 0 GlyphClass: 4 Flags: W +AnchorPoint: "TashkilTashkilAbove" 556 1640 mark 0 +AnchorPoint: "TashkilTashkilAbove" 615 2464 basemark 0 AnchorPoint: "MarkAbove" 549 1640 mark 0 AnchorPoint: "TashkilAboveDot" 556 1640 mark 0 AnchorPoint: "TashkilAbove" 556 1640 mark 0 @@ -71290,7 +71365,7 @@ EndChar StartChar: uni06E5.low Encoding: 69903 -1 4685 -Width: 391 +Width: 500 Flags: W AnchorPoint: "TashkilAbove" 308 325 basechar 0 LayerCount: 2 @@ -73442,7 +73517,7 @@ SplineSet 32 1662 32 1662 16 1662 c 24,25,26 4 1662 4 1662 0 1679 c 0,0,1 EndSplineSet -Refer: 47 -1 N 0.5 0 0 0.5 271 1873 2 +Refer: 47 -1 N 0.5 0 0 0.5 451 1873 2 EndChar StartChar: uni0613 @@ -73454,7 +73529,7 @@ LayerCount: 2 Fore Refer: 191 -1 N 0.5 0 0 0.5 421 2278 2 Refer: 4818 1552 N 1 0 0 1 0 0 2 -Refer: 47 -1 N 0.5 0 0 0.5 356 1873 2 +Refer: 47 -1 N 0.5 0 0 0.5 526 1873 2 EndChar StartChar: uni0614 @@ -73612,33 +73687,33 @@ EndChar StartChar: uni0600 Encoding: 1536 1536 4827 -Width: 2168 +Width: 2268 VWidth: 0 Flags: W LayerCount: 2 Fore SplineSet -1964 -128 m 9,0,1 - 1905 -114 l 2,2,3 - 1805 -90 1805 -90 1805 -29 c 0,4,5 - 1805 96 1805 96 1914 217 c 0,6,7 - 1985 296 1985 296 2045 296 c 0,8,9 - 2060 296 2060 296 2051 273 c 2,10,-1 - 2007 165 l 2,11,12 - 1996 139 1996 139 1985 136 c 0,13,14 - 1925 120 1925 120 1904 93 c 0,15,16 - 1892 78 1892 78 1934 61 c 128,-1,17 - 1976 44 1976 44 2042 34.5 c 128,-1,18 - 2108 25 2108 25 2108 -30 c 128,-1,19 - 2108 -85 2108 -85 2049 -164 c 0,20,21 - 1921 -335 1921 -335 1107 -335 c 128,-1,22 - 293 -335 293 -335 211 -300 c 0,23,24 - 167 -282 167 -282 138 -249 c 2,25,-1 - 71 -175 l 2,26,27 - 60 -163 60 -163 60 -154.5 c 128,-1,28 - 60 -146 60 -146 94 -152 c 0,29,30 - 321 -192 321 -192 1097 -192 c 128,-1,31 - 1873 -192 1873 -192 1964 -128 c 9,0,1 +2064 -128 m 9,0,1 + 2005 -114 l 2,2,3 + 1905 -90 1905 -90 1905 -29 c 0,4,5 + 1905 96 1905 96 2014 217 c 0,6,7 + 2085 296 2085 296 2145 296 c 0,8,9 + 2160 296 2160 296 2151 273 c 2,10,-1 + 2107 165 l 2,11,12 + 2096 139 2096 139 2085 136 c 0,13,14 + 2025 120 2025 120 2004 93 c 0,15,16 + 1992 78 1992 78 2034 61 c 128,-1,17 + 2076 44 2076 44 2142 34.5 c 128,-1,18 + 2208 25 2208 25 2208 -30 c 128,-1,19 + 2208 -85 2208 -85 2149 -164 c 0,20,21 + 2021 -335 2021 -335 1157 -335 c 0,22,23 + 297 -335 297 -335 211 -300 c 0,24,25 + 168 -283 168 -283 138 -249 c 2,26,-1 + 71 -175 l 2,27,28 + 60 -163 60 -163 60 -154.5 c 128,-1,29 + 60 -146 60 -146 94 -152 c 0,30,31 + 321 -192 321 -192 1147 -192 c 128,-1,32 + 1973 -192 1973 -192 2064 -128 c 9,0,1 EndSplineSet EndChar @@ -83815,7 +83890,7 @@ Refer: 344 -1 N 1 0 0 1 187 1040 2 Refer: 5608 -1 N 1 0 0 1 211 0 2 EndChar -StartChar: aPercent.slash +StartChar: slash.ara Encoding: 70077 -1 5619 Width: 706 Flags: W @@ -84665,5 +84740,280 @@ SplineSet 257 -755 l 2,0,1 EndSplineSet EndChar + +StartChar: uni0600.alt +Encoding: 70141 -1 5684 +Width: 2868 +VWidth: 0 +Flags: W +LayerCount: 2 +Back +SplineSet +2664 -128 m 9,0,1 + 2605 -114 l 2,2,3 + 2505 -90 2505 -90 2505 -29 c 0,4,5 + 2505 96 2505 96 2614 217 c 0,6,7 + 2685 296 2685 296 2745 296 c 0,8,9 + 2760 296 2760 296 2751 273 c 2,10,-1 + 2707 165 l 2,11,12 + 2696 139 2696 139 2685 136 c 0,13,14 + 2625 120 2625 120 2604 93 c 0,15,16 + 2592 78 2592 78 2634 61 c 128,-1,17 + 2676 44 2676 44 2742 34.5 c 128,-1,18 + 2808 25 2808 25 2808 -30 c 128,-1,19 + 2808 -85 2808 -85 2749 -164 c 0,20,21 + 2621 -335 2621 -335 1757 -335 c 0,22,23 + 897 -335 897 -335 811 -300 c 0,24,25 + 768 -283 768 -283 738 -249 c 2,26,-1 + 671 -175 l 2,27,28 + 660 -163 660 -163 660 -154.5 c 128,-1,29 + 660 -146 660 -146 694 -152 c 0,30,31 + 921 -192 921 -192 1747 -192 c 128,-1,32 + 2573 -192 2573 -192 2664 -128 c 9,0,1 +EndSplineSet +Fore +SplineSet +2664 -128 m 9,0,1 + 2605 -114 l 2,2,3 + 2505 -90 2505 -90 2505 -29 c 0,4,5 + 2505 96 2505 96 2614 217 c 0,6,7 + 2685 296 2685 296 2745 296 c 0,8,9 + 2760 296 2760 296 2751 273 c 2,10,-1 + 2707 165 l 2,11,12 + 2696 139 2696 139 2685 136 c 0,13,14 + 2625 120 2625 120 2604 93 c 0,15,16 + 2592 78 2592 78 2634 61 c 128,-1,17 + 2676 44 2676 44 2742 34.5 c 128,-1,18 + 2808 25 2808 25 2808 -30 c 0,19,20 + 2808 -78 2808 -78 2749 -164 c 0,21,22 + 2631 -336 2631 -336 1457 -335 c 0,23,24 + 269 -334 269 -334 221 -300 c 0,25,26 + 149 -251 149 -251 148 -249 c 2,27,-1 + 81 -175 l 2,28,29 + 70 -163 70 -163 70 -154.5 c 128,-1,30 + 70 -146 70 -146 104 -152 c 0,31,32 + 331 -192 331 -192 1452 -192 c 128,-1,33 + 2573 -192 2573 -192 2664 -128 c 9,0,1 +EndSplineSet +EndChar + +StartChar: smallv.above.inverted +Encoding: 70142 -1 5685 +Width: 0 +GlyphClass: 4 +Flags: W +AnchorPoint: "TashkilTashkilAbove" 0 1500 basemark 0 +AnchorPoint: "VAbove" 0 950 mark 0 +LayerCount: 2 +Fore +Refer: 244 1627 N 1 0 0 1 0 0 2 +EndChar + +StartChar: uni0660.prop +Encoding: 70143 -1 5686 +Width: 741 +Flags: W +LayerCount: 2 +Fore +Refer: 263 1632 N 1 0 0 1 -230 0 2 +EndChar + +StartChar: uni0661.prop +Encoding: 70144 -1 5687 +Width: 841 +Flags: W +LayerCount: 2 +Fore +Refer: 258 1633 N 1 0 0 1 -229 0 2 +EndChar + +StartChar: uni0662.prop +Encoding: 70145 -1 5688 +Width: 944 +Flags: W +LayerCount: 2 +Fore +Refer: 259 1634 N 1 0 0 1 -128 0 2 +EndChar + +StartChar: uni0663.prop +Encoding: 70146 -1 5689 +Width: 1123 +Flags: W +LayerCount: 2 +Fore +Refer: 260 1635 N 1 0 0 1 -38 0 2 +EndChar + +StartChar: uni0664.prop +Encoding: 70147 -1 5690 +Width: 851 +Flags: W +LayerCount: 2 +Fore +Refer: 261 1636 N 1 0 0 1 -139 0 2 +EndChar + +StartChar: uni0665.prop +Encoding: 70148 -1 5691 +Width: 1012 +Flags: W +LayerCount: 2 +Fore +Refer: 262 1637 N 1 0 0 1 -104 0 2 +EndChar + +StartChar: uni0666.prop +Encoding: 70149 -1 5692 +Width: 1010 +Flags: W +LayerCount: 2 +Fore +Refer: 265 1638 N 1 0 0 1 -94 0 2 +EndChar + +StartChar: uni0667.prop +Encoding: 70150 -1 5693 +Width: 1081 +Flags: W +LayerCount: 2 +Fore +Refer: 266 1639 N 1 0 0 1 -60 0 2 +EndChar + +StartChar: uni0668.prop +Encoding: 70151 -1 5694 +Width: 1081 +Flags: W +LayerCount: 2 +Fore +Refer: 267 1640 N 1 0 0 1 -59 0 2 +EndChar + +StartChar: uni0669.prop +Encoding: 70152 -1 5695 +Width: 897 +Flags: W +LayerCount: 2 +Fore +Refer: 268 1641 N 1 0 0 1 -151 0 2 +EndChar + +StartChar: uni06F0.prop +Encoding: 70153 -1 5696 +Width: 741 +Flags: W +LayerCount: 2 +Fore +Refer: 5686 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F1.prop +Encoding: 70154 -1 5697 +Width: 841 +Flags: W +LayerCount: 2 +Fore +Refer: 5687 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F2.prop +Encoding: 70155 -1 5698 +Width: 944 +Flags: W +LayerCount: 2 +Fore +Refer: 5688 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F3.prop +Encoding: 70156 -1 5699 +Width: 1123 +Flags: W +LayerCount: 2 +Fore +Refer: 5689 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F4.prop +Encoding: 70157 -1 5700 +Width: 950 +Flags: W +LayerCount: 2 +Fore +Refer: 285 1780 N 1 0 0 1 -125 0 2 +EndChar + +StartChar: uni06F5.prop +Encoding: 70158 -1 5701 +Width: 970 +Flags: W +LayerCount: 2 +Fore +Refer: 286 1781 N 1 0 0 1 -114 0 2 +EndChar + +StartChar: uni06F6.prop +Encoding: 70159 -1 5702 +Width: 1019 +Flags: W +LayerCount: 2 +Fore +Refer: 287 1782 N 1 0 0 1 -91 0 2 +EndChar + +StartChar: uni06F7.prop +Encoding: 70160 -1 5703 +Width: 1081 +Flags: W +LayerCount: 2 +Fore +Refer: 5693 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F8.prop +Encoding: 70161 -1 5704 +Width: 1081 +Flags: W +LayerCount: 2 +Fore +Refer: 5694 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F9.prop +Encoding: 70162 -1 5705 +Width: 897 +Flags: W +LayerCount: 2 +Fore +Refer: 5695 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F4.urd.prop +Encoding: 70163 -1 5706 +Width: 990 +Flags: W +LayerCount: 2 +Fore +Refer: 347 -1 N 1 0 0 1 -105 0 2 +EndChar + +StartChar: uni06F6.urd.prop +Encoding: 70164 -1 5707 +Width: 1010 +Flags: W +LayerCount: 2 +Fore +Refer: 5692 -1 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni06F7.urd.prop +Encoding: 70165 -1 5708 +Width: 985 +Flags: W +LayerCount: 2 +Fore +Refer: 349 -1 N 1 0 0 1 -107 0 2 +EndChar EndChars EndSplineFont diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/amiri-slanted.fea b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-slanted.fea new file mode 100644 index 00000000000..d01cb7c86dd --- /dev/null +++ b/Master/texmf-dist/doc/fonts/amiri/sources/amiri-slanted.fea @@ -0,0 +1,14 @@ +include(lang.fea) +include(classes.fea) +include(italic_classes.fea) +include(local.fea) +include(italic_proportional.fea) +include(basic.fea) +include(kashida.fea) +include(quran.fea) +include(enclosing.fea) +include(rtlm.fea) +include(lellah.fea) +include(contextuals.fea) +include(stylisticsets.fea) +include(kerning.fea) diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/contextuals.fea b/Master/texmf-dist/doc/fonts/amiri/sources/contextuals.fea index 548c3d62b16..224c1301062 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/contextuals.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/contextuals.fea @@ -114,6 +114,12 @@ feature calt { [@aAlf.fina @aLam.medi @aLam.fina]; } calt; +lookup BaaBaa { + sub @aBaa.medi by @aBaa.medi_BaaBaaInit; + sub @aBaa.fina by @aBaa.fina_BaaBaaIsol; + sub @aBaa.init by @aBaa.init_BaaBaaIsol; +} BaaBaa; + lookup HighBaa { sub @aBaa.init by @aBaa.init_High; sub @aBaa.medi by @aBaa.medi_High; @@ -127,11 +133,19 @@ feature calt { [@aBaa.medi]' lookup HighBaa [@aSen.medi @aSen.fina]'; + # جرينتش + sub [@aBaa.init]' lookup BaaBaa + [@aBaa.medi]' lookup BaaBaa + [@aBaa.medi]' lookup HighBaa + [@aSen.fina @aSen.medi @aSen.medi_PreYaa]; + sub [@aBaa.medi @aSad.init @aSad.medi @aSen.init @aSen.medi @aBaa.medi_BaaBaaInit] [@aBaa.medi]' lookup HighBaa [@aBaa.fina @aBaa.medi @aSen.fina @aBaa.medi_BaaHehMedi @aSen.medi @aSen.medi_PreYaa]; + sub [@aBaa.medi]' lookup HighBaa [@aSen.fina @aSen.medi @aSen.medi_PreYaa]; + sub [@aBaa.init]' lookup HighBaa [@aBaa.medi]' lookup HighBaa [@aBaa.medi @aBaa.fina @aSen.medi @aSen.fina]; @@ -439,12 +453,6 @@ lookup SenBaaMemInit { sub @aMem.medi by @aMem.medi_SenBaaMemInit; } SenBaaMemInit; -lookup BaaBaa { - sub @aBaa.medi by @aBaa.medi_BaaBaaInit; - sub @aBaa.fina by @aBaa.fina_BaaBaaIsol; - sub @aBaa.init by @aBaa.init_BaaBaaIsol; -} BaaBaa; - lookup HaaRaaIsol { sub @aHaa.init by @aHaa.init_HaaRaaIsol; sub @aRaa.fina by @aRaa.fina_HaaRaaIsol; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/enclosing.fea b/Master/texmf-dist/doc/fonts/amiri/sources/enclosing.fea index d653f66130d..37e7facd5f7 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/enclosing.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/enclosing.fea @@ -11,14 +11,25 @@ @FootNote = [uni0602]; @SafhaSign = [uni0603]; +@NumSignW = [uni0600.alt]; + lookup digit2small { sub @Digits by @Digits.small; } digit2small; +lookup NumSignW { + sub @NumSign by @NumSignW; +} NumSignW; + +feature calt { + sub [@EndOfAyah @NumSign @SafhaSign @FootNote] @Digits' lookup digit2small; + sub [@EndOfAyah @NumSign @SafhaSign @FootNote] @Digits.small @Digits' lookup digit2small; + sub [@EndOfAyah @NumSign @SafhaSign ] @Digits.small @Digits.small @Digits' lookup digit2small; + sub @NumSign @Digits.small @Digits.small @Digits.small @Digits' lookup digit2small; +} calt; + feature calt { - sub [@EndOfAyah @NumSign @FootNote @SafhaSign] @Digits' lookup digit2small; - sub @Digits.small [@EndOfAyah @NumSign @FootNote @SafhaSign] @Digits' lookup digit2small; - sub @Digits.small @Digits.small [@EndOfAyah @NumSign @SafhaSign] @Digits' lookup digit2small; + sub @NumSign' lookup NumSignW @Digits.small @Digits.small @Digits.small @Digits.small; } calt; lookup digit2medium { @@ -26,10 +37,10 @@ lookup digit2medium { } digit2medium; feature calt { - sub @YearSign @Digits' lookup digit2medium; - sub @Digits.medium @YearSign @Digits' lookup digit2medium; - sub @Digits.medium @Digits.medium @YearSign @Digits' lookup digit2medium; - sub @Digits.medium @Digits.medium @Digits.medium @YearSign @Digits' lookup digit2medium; + sub @YearSign @Digits' lookup digit2medium; + sub @YearSign @Digits.medium @Digits' lookup digit2medium; + sub @YearSign @Digits.medium @Digits.medium @Digits' lookup digit2medium; + sub @YearSign @Digits.medium @Digits.medium @Digits.medium @Digits' lookup digit2medium; } calt; # now we contextually kern the sign with the digits: @@ -42,62 +53,185 @@ feature calt { # dw = digit width, sw = sign width feature kern { - pos @EndOfAyah @Digits.small' <-1610 0 -600 0>; - pos @NumSign @Digits.small' <-1522 0 -600 0>; + pos @EndOfAyah @Digits.small' <-1610 0 -600 0>; + pos @NumSign @Digits.small' <-1622 0 -600 0>; + pos @NumSignW @Digits.small' <-1922 0 -600 0>; pos @YearSign @Digits.medium' <-2275 0 -900 0>; - pos @FootNote @Digits.small' <-1090 0 -600 0>; - pos @SafhaSign @Digits.small' <-1722 0 -600 0>; + pos @FootNote @Digits.small' <-1090 0 -600 0>; + pos @SafhaSign @Digits.small' <-1722 0 -600 0>; } kern; feature kern { - pos @EndOfAyah @Digits.small' <-300 0 0 0> @Digits.small; - pos @NumSign @Digits.small' <-300 0 0 0> @Digits.small; + pos @EndOfAyah @Digits.small' <-300 0 0 0> @Digits.small; + pos @NumSign @Digits.small' <-300 0 0 0> @Digits.small; + pos @NumSignW @Digits.small' <-300 0 0 0> @Digits.small; pos @YearSign @Digits.medium' <-450 0 0 0> @Digits.medium; - pos @FootNote @Digits.small' <-300 0 0 0> @Digits.small; - pos @SafhaSign @Digits.small' <-300 0 0 0> @Digits.small; + pos @FootNote @Digits.small' <-300 0 0 0> @Digits.small; + pos @SafhaSign @Digits.small' <-300 0 0 0> @Digits.small; } kern; feature kern { - pos @Digits.small @EndOfAyah @Digits.small' <-1310 0 -600 0>; - pos @Digits.small @NumSign @Digits.small' <-1222 0 -600 0>; - pos @Digits.medium @YearSign @Digits.medium' <-1825 0 -900 0>; - pos @Digits.small @FootNote @Digits.small' <-790 0 -600 0>; - pos @Digits.small @SafhaSign @Digits.small' <-1422 0 -600 0>; + pos @EndOfAyah @Digits.small @Digits.small' <-1310 0 -600 0>; + pos @NumSign @Digits.small @Digits.small' <-1322 0 -600 0>; + pos @NumSignW @Digits.small @Digits.small' <-1622 0 -600 0>; + pos @YearSign @Digits.medium @Digits.medium' <-1825 0 -900 0>; + pos @FootNote @Digits.small @Digits.small' <-790 0 -600 0>; + pos @SafhaSign @Digits.small @Digits.small' <-1422 0 -600 0>; } kern; feature kern { - pos @EndOfAyah @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; - pos @NumSign @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; + pos @EndOfAyah @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; + pos @NumSign @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; + pos @NumSignW @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; pos @YearSign @Digits.medium' <-450 0 0 0> @Digits.medium @Digits.medium; - pos @SafhaSign @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; + pos @SafhaSign @Digits.small' <-300 0 0 0> @Digits.small @Digits.small; } kern; feature kern { - pos @Digits.small @EndOfAyah @Digits.small' <-300 0 0 0> @Digits.small; - pos @Digits.small @NumSign @Digits.small' <-300 0 0 0> @Digits.small; - pos @Digits.medium @YearSign @Digits.medium' <-450 0 0 0> @Digits.medium; - pos @Digits.small @SafhaSign @Digits.small' <-300 0 0 0> @Digits.small; + pos @EndOfAyah @Digits.small @Digits.small' <-300 0 0 0> @Digits.small; + pos @NumSign @Digits.small @Digits.small' <-300 0 0 0> @Digits.small; + pos @NumSignW @Digits.small @Digits.small' <-300 0 0 0> @Digits.small; + pos @YearSign @Digits.medium @Digits.medium' <-450 0 0 0> @Digits.medium; + pos @SafhaSign @Digits.small @Digits.small' <-300 0 0 0> @Digits.small; } kern; feature kern { - pos @Digits.small @Digits.small @EndOfAyah @Digits.small' <-1010 0 -600 0>; - pos @Digits.small @Digits.small @NumSign @Digits.small' <-922 0 -600 0>; - pos @Digits.medium @Digits.medium @YearSign @Digits.medium' <-1375 0 -900 0>; - pos @Digits.small @Digits.small @SafhaSign @Digits.small' <-1122 0 -600 0>; + pos @EndOfAyah @Digits.small @Digits.small @Digits.small' <-1010 0 -600 0>; + pos @NumSign @Digits.small @Digits.small @Digits.small' <-1022 0 -600 0>; + pos @NumSignW @Digits.small @Digits.small @Digits.small' <-1322 0 -600 0>; + pos @YearSign @Digits.medium @Digits.medium @Digits.medium' <-1375 0 -900 0>; + pos @SafhaSign @Digits.small @Digits.small @Digits.small' <-1122 0 -600 0>; } kern; feature kern { pos @YearSign @Digits.medium' <-450 0 0 0> @Digits.medium @Digits.medium @Digits.medium; + pos @NumSignW @Digits.small' <-300 0 0 0> @Digits.small @Digits.small @Digits.small ; +} kern; + +feature kern { + pos @YearSign @Digits.medium @Digits.medium' <-450 0 0 0> @Digits.medium @Digits.medium; + pos @NumSignW @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @Digits.small ; +} kern; + +feature kern { + pos @YearSign @Digits.medium @Digits.medium @Digits.medium' <-450 0 0 0> @Digits.medium; + pos @NumSignW @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @Digits.small ; +} kern; + +feature kern { + pos @YearSign @Digits.medium @Digits.medium @Digits.medium @Digits.medium' <-925 0 -900 0>; + pos @NumSignW @Digits.small @Digits.small @Digits.small @Digits.small' <-1022 0 -600 0>; +} kern; + +############## +# HarfBuzz flips LTR Arabic runs before applying OpenType, but this is not what +# other engines does, so the above code does not work as it expects the digits +# and the sign in LTR order, so we do it for RTL order below until this is +# changed in HarfBuzz. +feature calt { + sub @Digits' lookup digit2small [@EndOfAyah @NumSign @SafhaSign @FootNote]; +} calt; + +feature calt { + sub @Digits' lookup digit2small @Digits.small [@EndOfAyah @NumSign @SafhaSign @FootNote]; +} calt; + +feature calt { + sub @Digits' lookup digit2small @Digits.small @Digits.small [@EndOfAyah @NumSign @SafhaSign ]; +} calt; + +feature calt { + sub @Digits' lookup digit2small @Digits.small @Digits.small @Digits.small @NumSign; +} calt; + +feature calt { + sub @Digits.small @Digits.small @Digits.small @Digits.small @NumSign' lookup NumSignW; +} calt; + +feature calt { + sub @Digits' lookup digit2medium @YearSign; +} calt; + +feature calt { + sub @Digits' lookup digit2medium @Digits.medium @YearSign; +} calt; + +feature calt { + sub @Digits' lookup digit2medium @Digits.medium @Digits.medium @YearSign; +} calt; + +feature calt { + sub @Digits' lookup digit2medium @Digits.medium @Digits.medium @Digits.medium @YearSign; +} calt; + +feature kern { + pos @Digits.small' <-1610 0 -600 0> @EndOfAyah; + pos @Digits.small' <-1622 0 -600 0> @NumSign ; + pos @Digits.small' <-1922 0 -600 0> @NumSignW ; + pos @Digits.medium' <-2275 0 -900 0> @YearSign ; + pos @Digits.small' <-1090 0 -600 0> @FootNote ; + pos @Digits.small' <-1722 0 -600 0> @SafhaSign; +} kern; + +feature kern { + pos @Digits.small @Digits.small' <-300 0 0 0> @EndOfAyah; + pos @Digits.small @Digits.small' <-300 0 0 0> @NumSign ; + pos @Digits.small @Digits.small' <-300 0 0 0> @NumSignW ; + pos @Digits.medium @Digits.medium' <-450 0 0 0> @YearSign ; + pos @Digits.small @Digits.small' <-300 0 0 0> @FootNote ; + pos @Digits.small @Digits.small' <-300 0 0 0> @SafhaSign; +} kern; + +feature kern { + pos @Digits.small' <-1310 0 -600 0> @Digits.small @EndOfAyah; + pos @Digits.small' <-1322 0 -600 0> @Digits.small @NumSign ; + pos @Digits.small' <-1622 0 -600 0> @Digits.small @NumSignW ; + pos @Digits.medium' <-1825 0 -900 0> @Digits.medium @YearSign ; + pos @Digits.small' <-790 0 -600 0> @Digits.small @FootNote ; + pos @Digits.small' <-1422 0 -600 0> @Digits.small @SafhaSign; +} kern; + +feature kern { + pos @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @EndOfAyah; + pos @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @NumSign ; + pos @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @NumSignW ; + pos @Digits.medium @Digits.medium @Digits.medium' <-450 0 0 0> @YearSign ; + pos @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @SafhaSign; +} kern; + +feature kern { + pos @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @EndOfAyah; + pos @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @NumSign ; + pos @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @NumSignW ; + pos @Digits.medium @Digits.medium' <-450 0 0 0> @Digits.medium @YearSign ; + pos @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @SafhaSign; +} kern; + +feature kern { + pos @Digits.small' <-1010 0 -600 0> @Digits.small @Digits.small @EndOfAyah; + pos @Digits.small' <-1022 0 -600 0> @Digits.small @Digits.small @NumSign ; + pos @Digits.small' <-1322 0 -600 0> @Digits.small @Digits.small @NumSignW ; + pos @Digits.medium' <-1375 0 -900 0> @Digits.medium @Digits.medium @YearSign ; + pos @Digits.small' <-1122 0 -600 0> @Digits.small @Digits.small @SafhaSign; +} kern; + +feature kern { + pos @Digits.medium @Digits.medium @Digits.medium @Digits.medium' <-450 0 0 0> @YearSign; + pos @Digits.small @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @NumSignW; } kern; feature kern { - pos @Digits.medium @Digits.medium @YearSign @Digits.medium' <-450 0 0 0> @Digits.medium; + pos @Digits.medium @Digits.medium @Digits.medium' <-450 0 0 0> @Digits.medium @YearSign; + pos @Digits.small @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @NumSignW; } kern; feature kern { - pos @Digits.medium @YearSign @Digits.medium' <-450 0 0 0> @Digits.medium @Digits.medium; + pos @Digits.medium @Digits.medium' <-450 0 0 0> @Digits.medium @Digits.medium @YearSign; + pos @Digits.small @Digits.small' <-300 0 0 0> @Digits.small @Digits.small @NumSignW; } kern; feature kern { - pos @Digits.medium @Digits.medium @Digits.medium @YearSign @Digits.medium' <-925 0 -900 0>; + pos @Digits.medium' <-925 0 -900 0> @Digits.medium @Digits.medium @Digits.medium @YearSign; + pos @Digits.small' <-1022 0 -600 0> @Digits.small @Digits.small @Digits.small @NumSignW; } kern; +############## diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/italic_classes.fea b/Master/texmf-dist/doc/fonts/amiri/sources/italic_classes.fea new file mode 100644 index 00000000000..ab95195fb2b --- /dev/null +++ b/Master/texmf-dist/doc/fonts/amiri/sources/italic_classes.fea @@ -0,0 +1,3 @@ +@Digits = [ zero one two three four five six seven eight nine uni0660 uni0661 uni0662 uni0663 uni0664 uni0665 uni0666 uni0667 uni0668 uni0669 uni06F0 uni06F1 uni06F2 uni06F3 uni06F4 uni06F5 uni06F6 uni06F7 uni06F8 uni06F9 uni06F4.urd uni06F6.urd uni06F7.urd zero.ltr one.ltr two.ltr three.ltr four.ltr five.ltr six.ltr seven.ltr eight.ltr nine.ltr zero.rtl one.rtl two.rtl three.rtl four.rtl five.rtl six.rtl seven.rtl eight.rtl nine.rtl ]; +@Digits.small = [ zero.small one.small two.small three.small four.small five.small six.small seven.small eight.small nine.small uni0660.small uni0661.small uni0662.small uni0663.small uni0664.small uni0665.small uni0666.small uni0667.small uni0668.small uni0669.small uni06F0.small uni06F1.small uni06F2.small uni06F3.small uni06F4.small uni06F5.small uni06F6.small uni06F7.small uni06F8.small uni06F9.small uni06F4.urd.small uni06F6.urd.small uni06F7.urd.small zero.small one.small two.small three.small four.small five.small six.small seven.small eight.small nine.small zero.small one.small two.small three.small four.small five.small six.small seven.small eight.small nine.small ]; +@Digits.medium = [ zero.medium one.medium two.medium three.medium four.medium five.medium six.medium seven.medium eight.medium nine.medium uni0660.medium uni0661.medium uni0662.medium uni0663.medium uni0664.medium uni0665.medium uni0666.medium uni0667.medium uni0668.medium uni0669.medium uni06F0.medium uni06F1.medium uni06F2.medium uni06F3.medium uni06F4.medium uni06F5.medium uni06F6.medium uni06F7.medium uni06F8.medium uni06F9.medium uni06F4.urd.medium uni06F6.urd.medium uni06F7.urd.medium zero.medium one.medium two.medium three.medium four.medium five.medium six.medium seven.medium eight.medium nine.medium zero.medium one.medium two.medium three.medium four.medium five.medium six.medium seven.medium eight.medium nine.medium ]; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/italic_proportional.fea b/Master/texmf-dist/doc/fonts/amiri/sources/italic_proportional.fea new file mode 100644 index 00000000000..d27109c3b2c --- /dev/null +++ b/Master/texmf-dist/doc/fonts/amiri/sources/italic_proportional.fea @@ -0,0 +1,55 @@ +feature pnum { + sub zero by zero.prop; + sub one by one.prop; + sub two by two.prop; + sub three by three.prop; + sub four by four.prop; + sub five by five.prop; + sub six by six.prop; + sub seven by seven.prop; + sub eight by eight.prop; + sub nine by nine.prop; + sub zero.rtl by zero.rtl.prop; + sub one.rtl by one.rtl.prop; + sub two.rtl by two.rtl.prop; + sub three.rtl by three.rtl.prop; + sub four.rtl by four.rtl.prop; + sub five.rtl by five.rtl.prop; + sub six.rtl by six.rtl.prop; + sub seven.rtl by seven.rtl.prop; + sub eight.rtl by eight.rtl.prop; + sub nine.rtl by nine.rtl.prop; + sub zero.ltr by zero.ltr.prop; + sub one.ltr by one.ltr.prop; + sub two.ltr by two.ltr.prop; + sub three.ltr by three.ltr.prop; + sub four.ltr by four.ltr.prop; + sub five.ltr by five.ltr.prop; + sub six.ltr by six.ltr.prop; + sub seven.ltr by seven.ltr.prop; + sub eight.ltr by eight.ltr.prop; + sub nine.ltr by nine.ltr.prop; + sub uni0660 by uni0660.prop; + sub uni0661 by uni0661.prop; + sub uni0662 by uni0662.prop; + sub uni0663 by uni0663.prop; + sub uni0664 by uni0664.prop; + sub uni0665 by uni0665.prop; + sub uni0666 by uni0666.prop; + sub uni0667 by uni0667.prop; + sub uni0668 by uni0668.prop; + sub uni0669 by uni0669.prop; + sub uni06F0 by uni06F0.prop; + sub uni06F1 by uni06F1.prop; + sub uni06F2 by uni06F2.prop; + sub uni06F3 by uni06F3.prop; + sub uni06F4 by uni06F4.prop; + sub uni06F5 by uni06F5.prop; + sub uni06F6 by uni06F6.prop; + sub uni06F7 by uni06F7.prop; + sub uni06F8 by uni06F8.prop; + sub uni06F9 by uni06F9.prop; + sub uni06F4.urd by uni06F4.urd.prop; + sub uni06F6.urd by uni06F6.urd.prop; + sub uni06F7.urd by uni06F7.urd.prop; +} pnum; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/italic_rtla.fea b/Master/texmf-dist/doc/fonts/amiri/sources/italic_rtla.fea index eb878b7c056..20f9c8a6cd5 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/italic_rtla.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/italic_rtla.fea @@ -26,7 +26,6 @@ feature locl { sub equal by equal.rtl; sub greater by greater.rtl; sub question by question.rtl; - sub at by at.rtl; sub backslash by backslash.rtl; sub asciicircum by asciicircum.rtl; sub brokenbar by brokenbar.rtl; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/kerning.fea b/Master/texmf-dist/doc/fonts/amiri/sources/kerning.fea index c55b1c3913b..7afabad8c68 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/kerning.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/kerning.fea @@ -4,6 +4,9 @@ @1st_3 = [@aRaa.fina_MemRaaIsol]; @1st_4 = [@aHeh.isol @aHeh.fina @aHeh.fina_KafHeh @aHeh.fina_LamHeh]; +# final alef with no hamza above +@Alf_1 = [uni0627.fina_LamAlfFina uni0625.fina_LamAlfFina]; + @Kaf_1 = [@aKaf.init_KafHeh @aKaf.init_KafMemInit @aKaf.init_KafYaaIsol @aKaf.init_KafMemIsol @@ -33,6 +36,13 @@ feature kern { pos @RaaWaw' <170 0 170 0> @aBaaDotBelow; } kern; +# we don't want to ignore marks here +feature kern { + pos @Alf_1' <-500 0 -500 0> @Kaf_1; + pos @Alf_1' <-200 0 -200 0> @Kaf_2; + pos @Alf_1' <-250 0 -250 0> @Kaf_3; +} kern; + feature kern { lookupflag IgnoreMarks; pos @RaaWaw' <80 0 80 0> @aYaa.init; @@ -42,7 +52,40 @@ feature kern { lookupflag IgnoreMarks; # kern heh isol/final followed by kaf, does not happen in Arabic but can be # seen in Kurdish or Persian using ZWNJ between them. - pos uni200C @1st_4 [@Kaf_1 @Kaf_2 @Kaf_3]' -500; - pos space @1st_4 [@Kaf_1 @Kaf_2 @Kaf_3]' -500; # Uniscribe replace ZWNJ with space - pos @1st_4 [@Kaf_1 @Kaf_2 @Kaf_3]' -500; # some applications might just remove it + pos @1st_4 uni200C [@Kaf_1 @Kaf_2 @Kaf_3]' -500; + pos @1st_4 space [@Kaf_1 @Kaf_2 @Kaf_3]' -500; # Uniscribe replace ZWNJ with space + pos @1st_4 [@Kaf_1 @Kaf_2 @Kaf_3]' -500; # some applications might just remove it +} kern; + +# proportional digits +feature kern { + pos uni0661.prop uni0662.prop -100; + pos uni0661.prop uni0663.prop -100; + pos uni0661.prop uni0666.prop -200; + pos uni0661.prop uni0669.prop -100; + + pos uni0662.prop uni0667.prop 100; + pos uni0662.prop uni0668.prop -50; + + pos uni0663.prop uni0667.prop 100; + + pos uni0664.prop uni0661.prop -50; + pos uni0664.prop uni0668.prop 50; + + pos uni0666.prop uni0661.prop -50; + + pos uni0667.prop uni0661.prop -50; + pos uni0667.prop uni0668.prop -50; + + pos uni0668.prop uni0661.prop -100; + pos uni0668.prop uni0662.prop -100; + pos uni0668.prop uni0663.prop -100; + pos uni0668.prop uni0666.prop -100; + pos uni0668.prop uni0667.prop -100; + + pos uni0669.prop uni0668.prop 50; + pos uni0669.prop uni0660.prop 50; + + pos uni0660.prop uni0667.prop 50; + pos uni0660.prop uni0668.prop 50; } kern; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/latin_gsub.fea b/Master/texmf-dist/doc/fonts/amiri/sources/latin_gsub.fea index 10c46ce66f0..5ad742487f4 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/latin_gsub.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/latin_gsub.fea @@ -21,5 +21,4 @@ feature liga { sub f f h by f_f_h; sub f j by f_j; sub f f j by f_f_j; - sub T h by T_h; } liga; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/local.fea b/Master/texmf-dist/doc/fonts/amiri/sources/local.fea index a317739cd01..c1f63929cc2 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/local.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/local.fea @@ -9,6 +9,7 @@ lookup loclPunct { sub bracketright by bracketright.ara; sub parenleft by parenleft.ara; sub parenright by parenright.ara; + sub slash by slash.ara; } loclPunct; lookup loclUrduDigits { diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/proportional.fea b/Master/texmf-dist/doc/fonts/amiri/sources/proportional.fea new file mode 100644 index 00000000000..940374f283b --- /dev/null +++ b/Master/texmf-dist/doc/fonts/amiri/sources/proportional.fea @@ -0,0 +1,35 @@ +feature pnum { + sub zero by zero.prop; + sub one by one.prop; + sub two by two.prop; + sub three by three.prop; + sub four by four.prop; + sub five by five.prop; + sub six by six.prop; + sub seven by seven.prop; + sub eight by eight.prop; + sub nine by nine.prop; + sub uni0660 by uni0660.prop; + sub uni0661 by uni0661.prop; + sub uni0662 by uni0662.prop; + sub uni0663 by uni0663.prop; + sub uni0664 by uni0664.prop; + sub uni0665 by uni0665.prop; + sub uni0666 by uni0666.prop; + sub uni0667 by uni0667.prop; + sub uni0668 by uni0668.prop; + sub uni0669 by uni0669.prop; + sub uni06F0 by uni06F0.prop; + sub uni06F1 by uni06F1.prop; + sub uni06F2 by uni06F2.prop; + sub uni06F3 by uni06F3.prop; + sub uni06F4 by uni06F4.prop; + sub uni06F5 by uni06F5.prop; + sub uni06F6 by uni06F6.prop; + sub uni06F7 by uni06F7.prop; + sub uni06F8 by uni06F8.prop; + sub uni06F9 by uni06F9.prop; + sub uni06F4.urd by uni06F4.urd.prop; + sub uni06F6.urd by uni06F6.urd.prop; + sub uni06F7.urd by uni06F7.urd.prop; +} pnum; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/quran.fea b/Master/texmf-dist/doc/fonts/amiri/sources/quran.fea index 1a105c6d69c..7281d4d18b9 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/quran.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/quran.fea @@ -186,7 +186,7 @@ feature calt { # width on fly. feature mark { # small waw - pos [uni06E5.low]' <50 0 350 0> [uni06E4]; + pos [uni06E5.low]' <50 0 250 0> [uni06E4]; # alef pos [uni0627.fina uni0627.fina_Wide uni0627.fina_KafMemAlf uni0627.fina_MemAlfFina]' <250 0 250 0> [uni06E4]; diff --git a/Master/texmf-dist/doc/fonts/amiri/sources/stylisticsets.fea b/Master/texmf-dist/doc/fonts/amiri/sources/stylisticsets.fea index 77daf9ab4b3..2c8451ed6a2 100644 --- a/Master/texmf-dist/doc/fonts/amiri/sources/stylisticsets.fea +++ b/Master/texmf-dist/doc/fonts/amiri/sources/stylisticsets.fea @@ -11,6 +11,7 @@ lookup MemAlfFina { sub @aMem.medi by @aMem.medi_MemAlfFina; sub @aSad.medi by @aSad.medi_PreYaa; + sub @aSen.medi by @aSen.medi_PreYaa; sub @aBaa.init_BaaSenInit by @aBaa.init_BaaSenAltInit; sub @aSen.medi_BaaSenInit by @aSen.medi_BaaSenAltInit; @@ -40,7 +41,7 @@ feature ss02 { @aMem.medi' lookup BaaMemAlfFina @aAlf.fina' lookup MemAlfFina; - sub @aSad.medi' lookup MemAlfFina + sub [@aSad.medi @aSen.medi]' lookup MemAlfFina @aMem.medi' lookup MemAlfFinaPostTooth @aAlf.fina' lookup MemAlfFina; diff --git a/Master/texmf-dist/doc/fonts/amiri/test-suite/enclosing.ptest b/Master/texmf-dist/doc/fonts/amiri/test-suite/enclosing.ptest index 5735695bce5..fbdcf6525f0 100644 --- a/Master/texmf-dist/doc/fonts/amiri/test-suite/enclosing.ptest +++ b/Master/texmf-dist/doc/fonts/amiri/test-suite/enclosing.ptest @@ -1,3 +1,15 @@ +ltr;arab;;;\u06DD\u0661;[uni06DD+2620|uni0661.small@-1610] +ltr;arab;;;\u06DD\u0661\u0661;[uni06DD+2620|uni0661.small@-1910|uni0661.small@-1310] +ltr;arab;;;\u06DD\u0661\u0661\u0661;[uni06DD+2620|uni0661.small@-2210|uni0661.small@-1610|uni0661.small@-1010] +ltr;arab;;;\u06DD\u0031;[uni06DD+2620|one.small@-1610] +ltr;arab;;;\u06DD\u0031\u0031;[uni06DD+2620|one.small@-1910|one.small@-1310] +ltr;arab;;;\u06DD\u0031\u0031\u0031;[uni06DD+2620|one.small@-2210|one.small@-1610|one.small@-1010] +ltr;latn;;;\u06DD\u0661;[uni06DD+2620|uni0661.small@-1610] +ltr;latn;;;\u06DD\u0661\u0661;[uni06DD+2620|uni0661.small@-1910|uni0661.small@-1310] +ltr;latn;;;\u06DD\u0661\u0661\u0661;[uni06DD+2620|uni0661.small@-2210|uni0661.small@-1610|uni0661.small@-1010] +ltr;latn;;;\u06DD\u0031;[uni06DD+2620|one.small@-1610] +ltr;latn;;;\u06DD\u0031\u0031;[uni06DD+2620|one.small@-1910|one.small@-1310] +ltr;latn;;;\u06DD\u0031\u0031\u0031;[uni06DD+2620|one.small@-2210|one.small@-1610|one.small@-1010] ltr;;;;\u06DD\u0661;[uni06DD+2620|uni0661.small@-1610] ltr;;;;\u06DD\u0661\u0661;[uni06DD+2620|uni0661.small@-1910|uni0661.small@-1310] ltr;;;;\u06DD\u0661\u0661\u0661;[uni06DD+2620|uni0661.small@-2210|uni0661.small@-1610|uni0661.small@-1010] diff --git a/Master/texmf-dist/doc/fonts/amiri/test-suite/extendedmeem.test b/Master/texmf-dist/doc/fonts/amiri/test-suite/extendedmeem.test index eee1593abe9..a65c63a62ad 100644 --- a/Master/texmf-dist/doc/fonts/amiri/test-suite/extendedmeem.test +++ b/Master/texmf-dist/doc/fonts/amiri/test-suite/extendedmeem.test @@ -2,27 +2,27 @@ rtl;arab;ar;;فما;[uni0627.fina|uni0645.medi_KafMemMedi|uni0641.init_FaaMemIni rtl;arab;ar;;فَما;[uni0627.fina|uni0645.medi_KafMemMedi|uni064E|uni0641.init_FaaMemInit] rtl;arab;ar;;فمَا;[uni0627.fina|uni064E|uni0645.medi_KafMemMedi|uni0641.init_FaaMemInit] rtl;arab;ar;;فِمَا;[uni0627.fina|uni064E|uni0645.medi_KafMemMedi|uni0650|uni0641.init_FaaMemInit] -rtl;arab;ar;;فَمَا;[uni0627.fina|uni064E|uni0645.medi_KafMemMediTatwee|uni064E|uni0641.init_FaaMemInit] -rtl;arab;ar;;فَمَّا;[uni0627.fina|uni064E.small|uni0651|uni0645.medi_KafMemMediTatwee|uni064E|uni0641.init_FaaMemInit] -rtl;arab;ar;;فَمِّا;[uni0627.fina|uni0650|uni0651|uni0645.medi_KafMemMediTatwee|uni064E|uni0641.init_FaaMemInit] +rtl;arab;ar;;فَمَا;[uni0627.fina|uni064E|uni0645.medi_KafMemMediTatweel|uni064E|uni0641.init_FaaMemInit] +rtl;arab;ar;;فَمَّا;[uni0627.fina|uni064E.small|uni0651|uni0645.medi_KafMemMediTatweel|uni064E|uni0641.init_FaaMemInit] +rtl;arab;ar;;فَمِّا;[uni0627.fina|uni0650|uni0651|uni0645.medi_KafMemMediTatweel|uni064E|uni0641.init_FaaMemInit] rtl;arab;ar;;لم;[uni0645.fina_KafMemIsol|uni0644.init_LamMemIsol] rtl;arab;ar;;لِم;[uni0645.fina_KafMemIsol|uni0650|uni0644.init_LamMemIsol] rtl;arab;ar;;لِمَ;[uni064E|uni0645.fina_KafMemIsol|uni0650|uni0644.init_LamMemIsol] -rtl;arab;ar;;لَمَ;[uni064E|uni0645.fina_KafMemIsolExtend|uni064E|uni0644.init_LamMemIsol] +rtl;arab;ar;;لَمَ;[uni064E|uni0645.fina_KafMemIsolExtended|uni064E|uni0644.init_LamMemIsol] rtl;arab;ar;;كم;[uni0645.fina_KafMemIsol|uni0643.init_KafMemIsol] rtl;arab;ar;;كَم;[uni0645.fina_KafMemIsol|uni064E|uni0643.init_KafMemIsol] rtl;arab;ar;;كِمَ;[uni064E|uni0645.fina_KafMemIsol|uni0650|uni0643.init_KafMemIsol] -rtl;arab;ar;;كَمْ;[uni0652|uni0645.fina_KafMemIsolExtend|uni064E|uni0643.init_KafMemIsol] +rtl;arab;ar;;كَمْ;[uni0652|uni0645.fina_KafMemIsolExtended|uni064E|uni0643.init_KafMemIsol] rtl;arab;ar;;بلم;[uni0645.fina_LamMemFina|uni0644.medi_LamMemFina|uni0628.init] rtl;arab;ar;;بلَم;[uni0645.fina_LamMemFina|uni064E|uni0644.medi_LamMemFina|uni0628.init] rtl;arab;ar;;بلِمَ;[uni064E|uni0645.fina_LamMemFina|uni0650|uni0644.medi_LamMemFina|uni0628.init] -rtl;arab;ar;;بلَمَ;[uni064E|uni0645.fina_LamMemFinaExtend|uni064E|uni0644.medi_LamMemFina|uni0628.init] +rtl;arab;ar;;بلَمَ;[uni064E|uni0645.fina_LamMemFinaExtended|uni064E|uni0644.medi_LamMemFina|uni0628.init] rtl;arab;ar;;بكم;[uni0645.fina_KafMemFina|uni0643.medi_KafMemFina|uni0628.init] rtl;arab;ar;;بكِم;[uni0645.fina_KafMemFina|uni0650|uni0643.medi_KafMemFina|uni0628.init] rtl;arab;ar;;بكِمْ;[uni0652|uni0645.fina_KafMemFina|uni0650|uni0643.medi_KafMemFina|uni0628.init] -rtl;arab;ar;;بكَمَ;[uni064E|uni0645.fina_KafMemFinaExtend|uni064E|uni0643.medi_KafMemFina|uni0628.init] +rtl;arab;ar;;بكَمَ;[uni064E|uni0645.fina_KafMemFinaExtended|uni064E|uni0643.medi_KafMemFina|uni0628.init] rtl;arab;ar;;لما;[uni0627.fina|uni0645.medi_LamMemInit|uni0644.init_LamMemInit] rtl;arab;ar;;لمَا;[uni0627.fina|uni064E|uni0645.medi_LamMemInit|uni0644.init_LamMemInit] rtl;arab;ar;;لَما;[uni0627.fina|uni0645.medi_LamMemInit|uni064E|uni0644.init_LamMemInit] rtl;arab;ar;;لِمَا;[uni0627.fina|uni064E|uni0645.medi_LamMemInit|uni0650|uni0644.init_LamMemInit] -rtl;arab;ar;;لَمَا;[uni0627.fina|uni064E|uni0645.medi_LamMemInitTatwee|uni064E|uni0644.init_LamMemInit] +rtl;arab;ar;;لَمَا;[uni0627.fina|uni064E|uni0645.medi_LamMemInitTatweel|uni064E|uni0644.init_LamMemInit] diff --git a/Master/texmf-dist/doc/fonts/amiri/tools/build.py b/Master/texmf-dist/doc/fonts/amiri/tools/build.py index 72e9993d768..a2573752d8c 100755 --- a/Master/texmf-dist/doc/fonts/amiri/tools/build.py +++ b/Master/texmf-dist/doc/fonts/amiri/tools/build.py @@ -13,6 +13,9 @@ # with this software. If not, see # <http://creativecommons.org/publicdomain/zero/1.0/>. +# minimum required FontForge version +min_ff_version = "20120702" + import fontforge import psMat import sys @@ -300,7 +303,7 @@ def buildLatinExtras(font, italic): medium.width = 900 centerGlyph(medium) -def mergeLatin(font, italic=False): +def mergeLatin(font, feafile, italic=False): styles = {"Regular": "Roman", "Slanted": "Italic", "Bold": "Bold", @@ -335,10 +338,18 @@ def mergeLatin(font, italic=False): # keep also Unicode Latin Extended-A block if glyph.glyphname not in latinglyphs: latinglyphs.append(glyph.glyphname) + elif glyph.unicode == -1 and '.prop' in glyph.glyphname: + # proportional digits + latinglyphs.append(glyph.glyphname) # keep ligatures too - ligatures = ("f_f", "f_i", "f_f_i", "f_l", "f_f_l", "f_b", "f_f_b", "f_k", - "f_f_k", "f_h", "f_f_h", "f_j", "f_f_j", "T_h") + ligatures = ("f_b", "f_f_b", + "f_h", "f_f_h", + "f_i", "f_f_i", + "f_j", "f_f_j", + "f_k", "f_f_k", + "f_l", "f_f_l", + "f_f") # and Arabic romanisation characters romanisation = ("afii57929", "uni02BE", "uni02BE", "amacron", "uni02BE", @@ -400,19 +411,20 @@ def mergeLatin(font, italic=False): shared = ("exclam", "quotedbl", "numbersign", "dollar", "percent", "quotesingle", "parenleft", "parenright", "asterisk", "plus", - "slash", "zero", "one", "two", "three", "four", "five", - "six", "seven", "eight", "nine", "colon", "semicolon", - "less", "equal", "greater", "question", "at", "bracketleft", - "backslash", "bracketright", "asciicircum", "braceleft", - "bar", "braceright", "brokenbar", "section", "copyright", - "guillemotleft", "logicalnot", "registered", "plusminus", - "uni00B2", "uni00B3", "paragraph", "uni00B9", "ordmasculine", - "guillemotright", "onequarter", "onehalf", "threequarters", - "questiondown", "quoteleft", "quoteright", "quotesinglbase", - "quotereversed", "quotedblleft", "quotedblright", - "quotedblbase", "uni201F", "dagger", "daggerdbl", - "perthousand", "minute", "second", "guilsinglleft", - "guilsinglright", "fraction", "uni2213") + "slash", "colon", "semicolon", "less", "equal", "greater", + "question", "at", "bracketleft", "backslash", "bracketright", + "asciicircum", "braceleft", "bar", "braceright", "brokenbar", + "section", "copyright", "guillemotleft", "logicalnot", + "registered", "plusminus", "uni00B2", "uni00B3", "paragraph", + "uni00B9", "ordmasculine", "guillemotright", "onequarter", + "onehalf", "threequarters", "questiondown", "quoteleft", + "quoteright", "quotesinglbase", "quotereversed", + "quotedblleft", "quotedblright", "quotedblbase", "uni201F", + "dagger", "daggerdbl", "perthousand", "minute", "second", + "guilsinglleft", "guilsinglright", "fraction", "uni2213") + + digits = ("zero", "one", "two", "three", "four", "five", "six", + "seven", "eight", "nine") for name in shared: glyph = latinfont[name] @@ -429,6 +441,34 @@ def mergeLatin(font, italic=False): rtl.addReference(name, italic) rtl.useRefsMetrics(name) + for name in digits: + glyph = latinfont[name] + glyph.glyphname += '.ltr' + glyph.unicode = -1 + upright.selection.select(name) + upright.copy() + latinfont.createChar(upright[name].encoding, name) + latinfont.selection.select(name) + latinfont.paste() + + rtl = latinfont.createChar(-1, name + ".rtl") + rtl.addReference(name, italic) + rtl.useRefsMetrics(name) + + for name in digits: + pname = name + ".prop" + upright.selection.select(pname) + upright.copy() + latinfont.createChar(-1, pname) + latinfont.selection.select(pname) + latinfont.paste() + + for name in digits: + pname = name + ".prop" + rtl = latinfont.createChar(-1, name + ".rtl" + ".prop") + rtl.addReference(pname, italic) + rtl.useRefsMetrics(pname) + # copy kerning classes kern_lookups = {} for lookup in latinfont.gpos_lookups: @@ -455,16 +495,15 @@ def mergeLatin(font, italic=False): # we want to merge features after merging the latin font because many # referenced glyphs are in the latin font - if font.sfd_path: - feafile = os.path.splitext(font.sfd_path)[0] + '.fea' - mergeFeatures(font, feafile) - - font.mergeFeature("sources/latin_gsub.fea") if italic: font.mergeFeature("sources/italic_ltra.fea") font.mergeFeature("sources/italic_rtla.fea") + mergeFeatures(font, feafile) + + font.mergeFeature("sources/latin_gsub.fea") + for lookup in kern_lookups: font.addLookup(lookup, kern_lookups[lookup]["type"], @@ -554,9 +593,9 @@ def makeWeb(infile, outfile): os.remove(tmpfont) -def makeSlanted(infile, outfile, version, slant): +def makeSlanted(infile, outfile, feafile, version, slant): - font = makeDesktop(infile, outfile, version, False, False) + font = makeDesktop(infile, outfile, feafile, version, False, False) # compute amout of skew, magic formula copied from fontforge sources skew = psMat.skew(-slant * math.pi/180.0) @@ -575,11 +614,11 @@ def makeSlanted(infile, outfile, version, slant): font.fontname = font.fontname.replace("Regular", "Slanted") font.appendSFNTName("Arabic (Egypt)", "SubFamily", "مائل") - mergeLatin(font, skew) + mergeLatin(font, feafile, skew) generateFont(font, outfile) -def makeDesktop(infile, outfile, version, latin=True, generate=True): +def makeDesktop(infile, outfile, feafile, version, latin=True, generate=True): font = fontforge.open(infile) if version: @@ -597,7 +636,7 @@ def makeDesktop(infile, outfile, version, latin=True, generate=True): font.appendSFNTName(lang, 'Sample Text', sample) if latin: - mergeLatin(font) + mergeLatin(font, feafile) if generate: generateFont(font, outfile, True) @@ -613,6 +652,7 @@ def usage(extramessage, code): Options: --input=FILE file name of input font --output=FILE file name of output font + --features=FILE file name of features file --version=VALUE set font version to VALUE --slant=VALUE autoslant --css output is a CSS file @@ -625,15 +665,20 @@ Options: sys.exit(code) if __name__ == "__main__": + if fontforge.version() < min_ff_version: + print "You need FontForge %s or newer to build Amiri fonts" %min_ff_version + sys.exit(-1) + try: opts, args = getopt.gnu_getopt(sys.argv[1:], "h", - ["help","input=","output=", "version=", "slant=", "css", "web"]) + ["help", "input=", "output=", "features=", "version=", "slant=", "css", "web"]) except getopt.GetoptError, err: usage(str(err), -1) infile = None outfile = None + feafile = None version = None slant = False css = False @@ -644,15 +689,16 @@ if __name__ == "__main__": usage("", 0) elif opt == "--input": infile = arg elif opt == "--output": outfile = arg + elif opt == "--features": feafile = arg elif opt == "--version": version = arg elif opt == "--slant": slant = float(arg) elif opt == "--css": css = True elif opt == "--web": web = True if not infile: - usage("No input file", -1) + usage("No input file specified", -1) if not outfile: - usage("No output file", -1) + usage("No output file specified", -1) if css: makeCss(infile, outfile) @@ -661,8 +707,10 @@ if __name__ == "__main__": else: if not version: usage("No version specified", -1) + if not feafile: + usage("No features file specified", -1) if slant: - makeSlanted(infile, outfile, version, slant) + makeSlanted(infile, outfile, feafile, version, slant) else: - makeDesktop(infile, outfile, version) + makeDesktop(infile, outfile, feafile, version) diff --git a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-bold.ttf b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-bold.ttf Binary files differindex 8a8751c1ad3..9d6b98fae63 100644 --- a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-bold.ttf +++ b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-bold.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-boldslanted.ttf b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-boldslanted.ttf Binary files differindex 846d02856e6..79ea126b6d3 100644 --- a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-boldslanted.ttf +++ b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-boldslanted.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-regular.ttf b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-regular.ttf Binary files differindex fd38428d5c2..0fa885b4889 100644 --- a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-regular.ttf +++ b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-regular.ttf diff --git a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf Binary files differindex b10638f18e0..a2f2c0ca252 100644 --- a/Master/texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf +++ b/Master/texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf |