6137 2005-12-18 10:18:20 -0800 Disable kerning and some ligatures in the ATSUI code path 2005-12-21 06:38:57 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 5166 1 mitz webkit-unassigned oldest_to_newest 26119 0 mitz 2005-12-18 10:18:20 -0800 [Split off from bug 5166] The ATSUI code path supports kerning pairs and ligatures. Until the CG code path supports these features, they should be disabled in the ATSUI code path, to ensure consistency in rendering and correct text metrics (otherwise highlighting can be wrong). To see the problem, open the testcase. The fix is to disable kerning and ligatures in the ATSUI code path, until they are supported in the CG code path (bug 6135 and bug 6136). A weak heuristic allows ligatures in fonts that are never expected to be used in the CG code path. This will hopefully minimize the effect on Arabic. 26120 1 5137 mitz 2005-12-18 10:21:45 -0800 Created attachment 5137 testcase 26121 2 5138 mitz 2005-12-18 10:22:31 -0800 Created attachment 5138 testcase Oops. 26122 3 5139 mitz 2005-12-18 10:53:21 -0800 Created attachment 5139 patch (incl. layout test) Pixel mode required to detect regressions. 26142 4 5139 darin 2005-12-18 14:32:33 -0800 Comment on attachment 5139 patch (incl. layout test) typo: "to aggressive" where it should say "too aggressive" 26145 5 5142 mitz 2005-12-18 14:38:04 -0800 Created attachment 5142 revised patch Corrected typo 26167 6 5142 darin 2005-12-18 19:17:12 -0800 Comment on attachment 5142 revised patch OK, I still don't like the "if it has a, use ligatures" heuristic, but I guess it will work. r=me 5137 2005-12-18 10:21:45 -0800 2005-12-18 10:22:31 -0800 testcase 6132_testcase.html text/html 191 mitz PGh0bWw+CjxoZWFkPgo8dGl0bGU+PC90aXRsZT4KPC9oZWFkPgo8Ym9keT4KRG91YmxlLWNsaWNr IG9yIGRyYWcgdG8gc2VsZWN0ICZsZHF1bztkb2xvciZyZHF1bzsgYmVsb3cuIFRyeSBkcmFnZ2lu ZyB0aGUgc2VsZWN0ZWQgd29yZC4KPGhyPgpMbyYjeDAzMDg7cmUmI3gwMzAwO20gaXBzdW0gZG9s b3Igc2l0IGFtZXQKPC9ib2R5Pgo= 5138 2005-12-18 10:22:31 -0800 2005-12-18 10:22:31 -0800 testcase 6137_testcase.html text/html 747 mitz PGh0bWw+CjxoZWFkPgo8dGl0bGU+PC90aXRsZT4KPC9oZWFkPgo8Ym9keT4KSW4gZWFjaCBvZiB0 aGUgZm9sbG93aW5nIGxpbmVzLCBkb3VibGUtY2xpY2sgb3IgZHJhZyB0byBzZWxlY3QgJmxkcXVv O2RvbG9yJnJkcXVvOy4gVHJ5IGRyYWdnaW5nIHRoZSBzZWxlY3RlZCB3b3JkLgo8ZGl2IHN0eWxl PSJmb250LXNpemU6IDI0cHg7Ij4KPGhyPgpBVkFWQVZBVkFWQVZBVkFWIExvcmVtIGlwc3VtIGRv bG9yIHNpdCBhbWUmI3gwMzAwO3QKPGhyPgpmaWZpZmlmaWZpZmlmaWZpZmlmaWZpZmlmaWZpZmlm aSBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1lJiN4MDMwMDt0Cjxocj4KQVZBVkFWQVZBVmZpZmlm aWZpZmlmaWZpIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWUmI3gwMzAwO3QKPC9kaXY+Cjxocj4K Tm90aWNlIGhvdyB0aGUgbWV0cmljcyBhbmQgcmVuZGVyaW5nIGFyZSBkaWZmZXJlbnQgd2hlbiB0 aGUgQ0cgY29kZSBwYXRoCmlzIHVzZWQsIHNpbmNlIGl0IGRvZXMgbm90IHN1cHBvcnQKa2Vybmlu ZyBhbmQgbGlnYXR1cmVzLgo8aHI+CjxkaXYgc3R5bGU9ImZvbnQtc2l6ZTogMjRweDsiPgpBVkFW QVZBVkFWQVZBVkFWIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0Cjxocj4KZmlmaWZpZmlmaWZp ZmlmaWZpZmlmaWZpZmlmaWZpZmkgTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQKPGhyPgpBVkFW QVZBVkFWZmlmaWZpZmlmaWZpZmkgTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQKPC9kaXY+Cjwv Ym9keT4K 5139 2005-12-18 10:53:21 -0800 2005-12-18 14:39:23 -0800 patch (incl. layout test) 6137_r1.patch text/plain 8386 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE2MgpkaWZm IC1wIC11IC1yMS4xNjIgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCi0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJMTcgRGVjIDIwMDUgMTg6MTA6MzUgLTAwMDAJMS4xNjIKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkxOCBEZWMgMjAwNSAxODo1MDo1MyAtMDAwMApAQCAtMSwzICsxLDE1IEBACisyMDA1 LTEyLSMjICBNaXR6IFBldHRlbCAgPG9wZW5kYXJ3aW4ub3JnQG1pdHpwZXR0ZWwuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gdGVzdCBmb3Ig aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MTM3CisgICAg ICAgICAgRGlzYWJsZSBrZXJuaW5nIGFuZCBzb21lIGxpZ2F0dXJlcyBpbiB0aGUgQVRTVUkgY29k ZSBwYXRoCisKKyAgICAgICAgKiBmYXN0L3RleHQvYXRzdWkta2VybmluZy1hbmQtbGlnYXR1cmVz LWV4cGVjdGVkLmNoZWNrc3VtOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvYXRzdWkta2Vy bmluZy1hbmQtbGlnYXR1cmVzLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogZmFzdC90 ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdhdHVyZXMuaHRtbDogQWRkZWQu CisKIDIwMDUtMTItMTcgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0enBldHRlbC5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYW5kIGxhbmRlZCBieSBEYXJpbi4KSW5kZXg6IExheW91 dFRlc3RzL2Zhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdhdHVyZXMtZXhwZWN0ZWQuY2hl Y2tzdW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3VpLWtl cm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC5jaGVja3N1bQotLS0gTGF5b3V0VGVzdHMvZmFz dC90ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC5jaGVja3N1bQkxIEph biAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYXRzdWkta2Vy bmluZy1hbmQtbGlnYXR1cmVzLWV4cGVjdGVkLmNoZWNrc3VtCTE4IERlYyAyMDA1IDE4OjMzOjM5 IC0wMDAwCkBAIC0wLDAgKzEgQEAKKzdhZTBjZTVkMDU4N2M5M2Y0ODg3OGE2MzE3NGYzODk1Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0 c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZmIC1O cHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBl Y3RlZC50eHQKLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdh dHVyZXMtZXhwZWN0ZWQudHh0CTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIExheW91dFRl c3RzL2Zhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdhdHVyZXMtZXhwZWN0ZWQudHh0CTE4 IERlYyAyMDA1IDE4OjMzOjM5IC0wMDAwCkBAIC0wLDAgKzEsMjcgQEAKK0VESVRJTkcgREVMRUdB VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5v dGlmaWNhdGlvbgorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckNhbnZhcyBh dCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5k ZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAgUmVuZGVyQm9keSB7Qk9E WX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTg0CisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsMCkg c2l6ZSA3ODR4MzYKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA1M3gx OAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDUzOiAiVGVzdCBmb3IgIgorICAg ICAgICBSZW5kZXJJbmxpbmUge0l9IGF0ICgwLDApIHNpemUgNzUxeDM2CisgICAgICAgICAgUmVu ZGVyVGV4dCB7VEVYVH0gYXQgKDUzLDApIHNpemUgNzUxeDM2CisgICAgICAgICAgICB0ZXh0IHJ1 biBhdCAoNTMsMCkgd2lkdGggNjk4OiAiaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3No b3dfYnVnLmNnaT9pZD02MTM3IERpc2FibGUga2VybmluZyBhbmQgc29tZSBsaWdhdHVyZXMgaW4g dGhlIEFUU1VJIGNvZGUiCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxOCkgd2lkdGggMjg6 ICJwYXRoIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMjgsMTgpIHNpemUgNHgxOAor ICAgICAgICAgIHRleHQgcnVuIGF0ICgyOCwxOCkgd2lkdGggNDogIi4iCisgICAgICBSZW5kZXJC bG9jayB7UH0gYXQgKDAsNTIpIHNpemUgNzg0eDE4CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9 IGF0ICgwLDApIHNpemUgNzA5eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGgg NzA5OiAiVGhlIHdvcmQgXHh7MjAxQ31kb2xvclx4ezIwMUR9IGJlbG93IHNob3VsZCBiZSBoaWdo bGlnaHRlZCBpbiBpdHMgZW50aXJldHkuIFRoZSBoaWdobGlnaHQgc2hvdWxkIG5vdCBleHRlbmQg YmV5b25kIHRoYXQgd29yZC4iCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw4Nikgc2l6 ZSA3ODR4NDIKKyAgICAgICAgUmVuZGVyQmxvY2sge0hSfSBhdCAoMCwwKSBzaXplIDc4NHgyIFti b3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1v dXMpIGF0ICgwLDE0KSBzaXplIDc4NHgyOAorICAgICAgICAgIFJlbmRlcklubGluZSB7U1BBTn0g YXQgKDAsMCkgc2l6ZSA1NTF4MjgKKyAgICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgw LDApIHNpemUgNTUxeDI4CisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDU1 MTogIkFWQVZBVkFWQVZmaWZpZmlmaWZpZmlmaSBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1lXHh7 MzAwfXQiCisgICAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKK3Nl bGVjdGlvbiBzdGFydDogcG9zaXRpb24gMzcgb2YgY2hpbGQgMCB7VEVYVH0gb2YgY2hpbGQgMyB7 U1BBTn0gb2YgY2hpbGQgNSB7RElWfSBvZiBjaGlsZCAxIHtCT0RZfSBvZiBjaGlsZCAwIHtIVE1M fSBvZiBkb2N1bWVudAorc2VsZWN0aW9uIGVuZDogICBwb3NpdGlvbiA0MiBvZiBjaGlsZCAwIHtU RVhUfSBvZiBjaGlsZCAzIHtTUEFOfSBvZiBjaGlsZCA1IHtESVZ9IG9mIGNoaWxkIDEge0JPRFl9 IG9mIGNoaWxkIDAge0hUTUx9IG9mIGRvY3VtZW50CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3Rl eHQvYXRzdWkta2VybmluZy1hbmQtbGlnYXR1cmVzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUg TGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy5odG1sCi0t LSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYXRzdWkta2VybmluZy1hbmQtbGlnYXR1cmVzLmh0bWwJ MSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMAorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3Vp LWtlcm5pbmctYW5kLWxpZ2F0dXJlcy5odG1sCTE4IERlYyAyMDA1IDE4OjMxOjMwIC0wMDAwCkBA IC0wLDAgKzEsMjYgQEAKKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+PC90aXRsZT4KKzxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIHZhciB0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInQiKS5maXJzdENoaWxkOworICAgIHdpbmRvdy5nZXRT ZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KHQsIDM3LCB0LCA0Mik7Cit9Cis8L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKzxwPgorVGVzdCBmb3IgPGk+aHR0cDov L2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MTM3CitEaXNhYmxlIGtl cm5pbmcgYW5kIHNvbWUgbGlnYXR1cmVzIGluIHRoZSBBVFNVSSBjb2RlIHBhdGg8L2k+LgorPC9w PgorPHA+CitUaGUgd29yZCAmbGRxdW87ZG9sb3ImcmRxdW87IGJlbG93IHNob3VsZCBiZSBoaWdo bGlnaHRlZCBpbiBpdHMgZW50aXJldHkuIFRoZQoraGlnaGxpZ2h0IHNob3VsZCBub3QgZXh0ZW5k IGJleW9uZCB0aGF0IHdvcmQuCis8L3A+Cis8ZGl2IHN0eWxlPSJmb250LXNpemU6IDI0cHg7Ij4K Kzxocj4KKzxzcGFuIGlkPSJ0Ij5BVkFWQVZBVkFWZmlmaWZpZmlmaWZpZmkgTG9yZW0gaXBzdW0g ZG9sb3Igc2l0IGFtZSYjeDAzMDA7dDwvc3Bhbj4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpJ bmRleDogV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2Vi S2l0L0NoYW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNDA3CmRpZmYgLXAgLXUgLXIx LjM0MDcgV2ViS2l0L0NoYW5nZUxvZwotLS0gV2ViS2l0L0NoYW5nZUxvZwkxNyBEZWMgMjAwNSAx ODoxMDoyNyAtMDAwMAkxLjM0MDcKKysrIFdlYktpdC9DaGFuZ2VMb2cJMTggRGVjIDIwMDUgMTg6 NTM6MDEgLTAwMDAKQEAgLTEsMyArMSwxNyBAQAorMjAwNS0xMi0jIyAgTWl0eiBQZXR0ZWwgIDxv cGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9hdHN1aS1rZXJu aW5nLWFuZC1saWdhdHVyZXMuaHRtbAorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5v cGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEzNworICAgICAgICAgIERpc2FibGUga2Vy bmluZyBhbmQgc29tZSBsaWdhdHVyZXMgaW4gdGhlIEFUU1VJIGNvZGUgcGF0aAorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXIubToKKyAgICAgICAgKGlu aXRpYWxpemVBVFNVU3R5bGUpOiBEaXNhYmxlIGtlcm5pbmc7IGRpc2FibGUgbGlnYXR1cmVzIHVu bGVzcyB0aGUgZm9udAorICAgICAgICBkb2VzIG5vdCBjb250YWluICdhJywgaW4gd2hpY2ggY2Fz ZSBpdCBpcyBhc3N1bWVkIHRvIG5ldmVyIGJlIHJlbmRlcmVkCisgICAgICAgIGJ5IHRoZSBDRyBj b2RlIHBhdGguCisKIDIwMDUtMTItMTcgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0 enBldHRlbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYW5kIGxhbmRlZCBieSBEYXJpbi4KSW5k ZXg6IFdlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJwcm9qL1dlYlRleHRSZW5kZXJlci5tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9X ZWJUZXh0UmVuZGVyZXIubSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMDMKZGlmZiAtcCAtdSAt cjEuMjAzIFdlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJwcm9qL1dlYlRleHRSZW5kZXJlci5tCi0t LSBXZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXIubQkxNyBEZWMg MjAwNSAxODoxMDozNCAtMDAwMAkxLjIwMworKysgV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnBy b2ovV2ViVGV4dFJlbmRlcmVyLm0JMTggRGVjIDIwMDUgMTg6NTU6MjQgLTAwMDAKQEAgLTExNjIs MTAgKzExNjIsMTIgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUFUU1VTdHlsZShXZWJUZXh0Ugog ICAgICAgICAKICAgICAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gQ0dBZmZpbmVU cmFuc2Zvcm1NYWtlU2NhbGUoMSwgLTEpOwogICAgICAgICBGaXhlZCBmb250U2l6ZSA9IEZsb2F0 VG9GaXhlZChbcmVuZGVyZXItPmZvbnQuZm9udCBwb2ludFNpemVdKTsKLSAgICAgICAgQVRTVUF0 dHJpYnV0ZVRhZyBzdHlsZVRhZ3NbXSA9IHsga0FUU1VTaXplVGFnLCBrQVRTVUZvbnRUYWcsIGtB VFNVRm9udE1hdHJpeFRhZ307Ci0gICAgICAgIEJ5dGVDb3VudCBzdHlsZVNpemVzW10gPSB7ICBz aXplb2YoRml4ZWQpLCBzaXplb2YoQVRTVUZvbnRJRCksIHNpemVvZihDR0FmZmluZVRyYW5zZm9y bSkgfTsKLSAgICAgICAgQVRTVUF0dHJpYnV0ZVZhbHVlUHRyIHN0eWxlVmFsdWVzW10gPSB7ICZm b250U2l6ZSwgJmZvbnRJRCwgJnRyYW5zZm9ybSAgfTsKLSAgICAgICAgc3RhdHVzID0gQVRTVVNl dEF0dHJpYnV0ZXMocmVuZGVyZXItPl9BVFNVU3R5bGUsIDMsIHN0eWxlVGFncywgc3R5bGVTaXpl cywgc3R5bGVWYWx1ZXMpOworICAgICAgICAvLyBUdXJuIG9mZiBhdXRvbWF0aWMga2VybmluZyB1 bnRpbCBpdCBpcyBzdXBwb3J0ZWQgaW4gdGhlIENHIGNvZGUgcGF0aCAoNjEzNiBpbiBidWd6aWxs YSkKKyAgICAgICAgRnJhY3Qga2VybmluZ0luaGliaXRGYWN0b3IgPSBGbG9hdFRvRnJhY3QoMS4w KTsKKyAgICAgICAgQVRTVUF0dHJpYnV0ZVRhZyBzdHlsZVRhZ3NbNF0gPSB7IGtBVFNVU2l6ZVRh Zywga0FUU1VGb250VGFnLCBrQVRTVUZvbnRNYXRyaXhUYWcsIGtBVFNVS2VybmluZ0luaGliaXRG YWN0b3JUYWcgfTsKKyAgICAgICAgQnl0ZUNvdW50IHN0eWxlU2l6ZXNbNF0gPSB7IHNpemVvZihG aXhlZCksIHNpemVvZihBVFNVRm9udElEKSwgc2l6ZW9mKENHQWZmaW5lVHJhbnNmb3JtKSwgc2l6 ZW9mKEZyYWN0KSB9OworICAgICAgICBBVFNVQXR0cmlidXRlVmFsdWVQdHIgc3R5bGVWYWx1ZXNb NF0gPSB7ICZmb250U2l6ZSwgJmZvbnRJRCwgJnRyYW5zZm9ybSwgJmtlcm5pbmdJbmhpYml0RmFj dG9yIH07CisgICAgICAgIHN0YXR1cyA9IEFUU1VTZXRBdHRyaWJ1dGVzKHJlbmRlcmVyLT5fQVRT VVN0eWxlLCA0LCBzdHlsZVRhZ3MsIHN0eWxlU2l6ZXMsIHN0eWxlVmFsdWVzKTsKICAgICAgICAg aWYgKHN0YXR1cyAhPSBub0VycikKICAgICAgICAgICAgIEZBVEFMX0FMV0FZUygiQVRTVVNldEF0 dHJpYnV0ZXMgZmFpbGVkICglZCkiLCBzdGF0dXMpOwogICAgICAgICBzdGF0dXMgPSBBVFNGb250 R2V0VGFibGUoZm9udElELCAncHJvcCcsIDAsIDAsIDAsICZwcm9wVGFibGVTaXplKTsKQEAgLTEx NzYsNiArMTE3OCwxNiBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplQVRTVVN0eWxlKFdlYlRleHRS CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIEZBVEFMX0FMV0FZUygiQVRTRm9udEdldFRhYmxl IGZhaWxlZCAoJWQpIiwgc3RhdHVzKTsKIAorICAgICAgICAvLyBUdXJuIG9mZiBsaWdhdHVyZXMg c3VjaCBhcyAnZmknIHRvIG1hdGNoIHRoZSBDRyBjb2RlIHBhdGgncyBiZWhhdmlvciwgdW50aWwg YnVnemlsbGEgNjEzNSBpcyBmaXhlZC4KKyAgICAgICAgLy8gRG9uJ3QgYmUgdG8gYWdncmVzc2l2 ZTogaWYgdGhlIGZvbnQgZG9lc24ndCBjb250YWluICdhJywgdGhlbiBhc3N1bWUgdGhhdCBhbnkg bGlnYXR1cmVzIGl0IGNvbnRhaW5zIGFyZQorICAgICAgICAvLyBpbiBjaGFyYWN0ZXJzIHRoYXQg YWx3YXlzIGdvIHRocm91Z2ggQVRTVUksIGFuZCB0aGVyZWZvcmUgYWxsb3cgdGhlbS4gR2VlemEg UHJvIGlzIGFuIGV4YW1wbGUuCisgICAgICAgIC8vIFNlZSBidWd6aWxsYSA1MTY2LgorICAgICAg ICBpZiAoW1tyZW5kZXJlci0+Zm9udC5mb250IGNvdmVyZWRDaGFyYWN0ZXJTZXRdIGNoYXJhY3Rl cklzTWVtYmVyOidhJ10pIHsKKyAgICAgICAgICAgIEFUU1VGb250RmVhdHVyZVR5cGUgZmVhdHVy ZVR5cGVzW10gPSB7IGtMaWdhdHVyZXNUeXBlIH07CisgICAgICAgICAgICBBVFNVRm9udEZlYXR1 cmVTZWxlY3RvciBmZWF0dXJlU2VsZWN0b3JzW10gPSB7IGtDb21tb25MaWdhdHVyZXNPZmZTZWxl Y3RvciB9OworICAgICAgICAgICAgc3RhdHVzID0gQVRTVVNldEZvbnRGZWF0dXJlcyhyZW5kZXJl ci0+X0FUU1VTdHlsZSwgMSwgZmVhdHVyZVR5cGVzLCBmZWF0dXJlU2VsZWN0b3JzKTsKKyAgICAg ICAgfQorCiAgICAgICAgIHJlbmRlcmVyLT5BVFNVU3R5bGVJbml0aWFsaXplZCA9IFlFUzsKICAg ICB9CiB9Cg== 5142 2005-12-18 14:38:04 -0800 2005-12-18 19:17:12 -0800 revised patch 6137_r2.patch text/plain 8387 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE2MgpkaWZm IC1wIC11IC1yMS4xNjIgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCi0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJMTcgRGVjIDIwMDUgMTg6MTA6MzUgLTAwMDAJMS4xNjIKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkxOCBEZWMgMjAwNSAxODo1MDo1MyAtMDAwMApAQCAtMSwzICsxLDE1IEBACisyMDA1 LTEyLSMjICBNaXR6IFBldHRlbCAgPG9wZW5kYXJ3aW4ub3JnQG1pdHpwZXR0ZWwuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gdGVzdCBmb3Ig aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MTM3CisgICAg ICAgICAgRGlzYWJsZSBrZXJuaW5nIGFuZCBzb21lIGxpZ2F0dXJlcyBpbiB0aGUgQVRTVUkgY29k ZSBwYXRoCisKKyAgICAgICAgKiBmYXN0L3RleHQvYXRzdWkta2VybmluZy1hbmQtbGlnYXR1cmVz LWV4cGVjdGVkLmNoZWNrc3VtOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvYXRzdWkta2Vy bmluZy1hbmQtbGlnYXR1cmVzLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogZmFzdC90 ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdhdHVyZXMuaHRtbDogQWRkZWQu CisKIDIwMDUtMTItMTcgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0enBldHRlbC5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYW5kIGxhbmRlZCBieSBEYXJpbi4KSW5kZXg6IExheW91 dFRlc3RzL2Zhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdhdHVyZXMtZXhwZWN0ZWQuY2hl Y2tzdW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3VpLWtl cm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC5jaGVja3N1bQotLS0gTGF5b3V0VGVzdHMvZmFz dC90ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC5jaGVja3N1bQkxIEph biAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYXRzdWkta2Vy bmluZy1hbmQtbGlnYXR1cmVzLWV4cGVjdGVkLmNoZWNrc3VtCTE4IERlYyAyMDA1IDE4OjMzOjM5 IC0wMDAwCkBAIC0wLDAgKzEgQEAKKzdhZTBjZTVkMDU4N2M5M2Y0ODg3OGE2MzE3NGYzODk1Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0 c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZmIC1O cHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy1leHBl Y3RlZC50eHQKLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdh dHVyZXMtZXhwZWN0ZWQudHh0CTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIExheW91dFRl c3RzL2Zhc3QvdGV4dC9hdHN1aS1rZXJuaW5nLWFuZC1saWdhdHVyZXMtZXhwZWN0ZWQudHh0CTE4 IERlYyAyMDA1IDE4OjMzOjM5IC0wMDAwCkBAIC0wLDAgKzEsMjcgQEAKK0VESVRJTkcgREVMRUdB VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5v dGlmaWNhdGlvbgorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckNhbnZhcyBh dCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5k ZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgICAgUmVuZGVyQm9keSB7Qk9E WX0gYXQgKDgsOCkgc2l6ZSA3ODR4NTg0CisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsMCkg c2l6ZSA3ODR4MzYKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA1M3gx OAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDUzOiAiVGVzdCBmb3IgIgorICAg ICAgICBSZW5kZXJJbmxpbmUge0l9IGF0ICgwLDApIHNpemUgNzUxeDM2CisgICAgICAgICAgUmVu ZGVyVGV4dCB7VEVYVH0gYXQgKDUzLDApIHNpemUgNzUxeDM2CisgICAgICAgICAgICB0ZXh0IHJ1 biBhdCAoNTMsMCkgd2lkdGggNjk4OiAiaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3No b3dfYnVnLmNnaT9pZD02MTM3IERpc2FibGUga2VybmluZyBhbmQgc29tZSBsaWdhdHVyZXMgaW4g dGhlIEFUU1VJIGNvZGUiCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxOCkgd2lkdGggMjg6 ICJwYXRoIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMjgsMTgpIHNpemUgNHgxOAor ICAgICAgICAgIHRleHQgcnVuIGF0ICgyOCwxOCkgd2lkdGggNDogIi4iCisgICAgICBSZW5kZXJC bG9jayB7UH0gYXQgKDAsNTIpIHNpemUgNzg0eDE4CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9 IGF0ICgwLDApIHNpemUgNzA5eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGgg NzA5OiAiVGhlIHdvcmQgXHh7MjAxQ31kb2xvclx4ezIwMUR9IGJlbG93IHNob3VsZCBiZSBoaWdo bGlnaHRlZCBpbiBpdHMgZW50aXJldHkuIFRoZSBoaWdobGlnaHQgc2hvdWxkIG5vdCBleHRlbmQg YmV5b25kIHRoYXQgd29yZC4iCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw4Nikgc2l6 ZSA3ODR4NDIKKyAgICAgICAgUmVuZGVyQmxvY2sge0hSfSBhdCAoMCwwKSBzaXplIDc4NHgyIFti b3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1v dXMpIGF0ICgwLDE0KSBzaXplIDc4NHgyOAorICAgICAgICAgIFJlbmRlcklubGluZSB7U1BBTn0g YXQgKDAsMCkgc2l6ZSA1NTF4MjgKKyAgICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgw LDApIHNpemUgNTUxeDI4CisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDU1 MTogIkFWQVZBVkFWQVZmaWZpZmlmaWZpZmlmaSBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1lXHh7 MzAwfXQiCisgICAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKK3Nl bGVjdGlvbiBzdGFydDogcG9zaXRpb24gMzcgb2YgY2hpbGQgMCB7VEVYVH0gb2YgY2hpbGQgMyB7 U1BBTn0gb2YgY2hpbGQgNSB7RElWfSBvZiBjaGlsZCAxIHtCT0RZfSBvZiBjaGlsZCAwIHtIVE1M fSBvZiBkb2N1bWVudAorc2VsZWN0aW9uIGVuZDogICBwb3NpdGlvbiA0MiBvZiBjaGlsZCAwIHtU RVhUfSBvZiBjaGlsZCAzIHtTUEFOfSBvZiBjaGlsZCA1IHtESVZ9IG9mIGNoaWxkIDEge0JPRFl9 IG9mIGNoaWxkIDAge0hUTUx9IG9mIGRvY3VtZW50CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3Rl eHQvYXRzdWkta2VybmluZy1hbmQtbGlnYXR1cmVzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUg TGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3VpLWtlcm5pbmctYW5kLWxpZ2F0dXJlcy5odG1sCi0t LSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYXRzdWkta2VybmluZy1hbmQtbGlnYXR1cmVzLmh0bWwJ MSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMAorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2F0c3Vp LWtlcm5pbmctYW5kLWxpZ2F0dXJlcy5odG1sCTE4IERlYyAyMDA1IDE4OjMxOjMwIC0wMDAwCkBA IC0wLDAgKzEsMjYgQEAKKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+PC90aXRsZT4KKzxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIHZhciB0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInQiKS5maXJzdENoaWxkOworICAgIHdpbmRvdy5nZXRT ZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KHQsIDM3LCB0LCA0Mik7Cit9Cis8L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKzxwPgorVGVzdCBmb3IgPGk+aHR0cDov L2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MTM3CitEaXNhYmxlIGtl cm5pbmcgYW5kIHNvbWUgbGlnYXR1cmVzIGluIHRoZSBBVFNVSSBjb2RlIHBhdGg8L2k+LgorPC9w PgorPHA+CitUaGUgd29yZCAmbGRxdW87ZG9sb3ImcmRxdW87IGJlbG93IHNob3VsZCBiZSBoaWdo bGlnaHRlZCBpbiBpdHMgZW50aXJldHkuIFRoZQoraGlnaGxpZ2h0IHNob3VsZCBub3QgZXh0ZW5k IGJleW9uZCB0aGF0IHdvcmQuCis8L3A+Cis8ZGl2IHN0eWxlPSJmb250LXNpemU6IDI0cHg7Ij4K Kzxocj4KKzxzcGFuIGlkPSJ0Ij5BVkFWQVZBVkFWZmlmaWZpZmlmaWZpZmkgTG9yZW0gaXBzdW0g ZG9sb3Igc2l0IGFtZSYjeDAzMDA7dDwvc3Bhbj4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpJ bmRleDogV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2Vi S2l0L0NoYW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNDA3CmRpZmYgLXAgLXUgLXIx LjM0MDcgV2ViS2l0L0NoYW5nZUxvZwotLS0gV2ViS2l0L0NoYW5nZUxvZwkxNyBEZWMgMjAwNSAx ODoxMDoyNyAtMDAwMAkxLjM0MDcKKysrIFdlYktpdC9DaGFuZ2VMb2cJMTggRGVjIDIwMDUgMTg6 NTM6MDEgLTAwMDAKQEAgLTEsMyArMSwxNyBAQAorMjAwNS0xMi0jIyAgTWl0eiBQZXR0ZWwgIDxv cGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9hdHN1aS1rZXJu aW5nLWFuZC1saWdhdHVyZXMuaHRtbAorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5v cGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEzNworICAgICAgICAgIERpc2FibGUga2Vy bmluZyBhbmQgc29tZSBsaWdhdHVyZXMgaW4gdGhlIEFUU1VJIGNvZGUgcGF0aAorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXIubToKKyAgICAgICAgKGlu aXRpYWxpemVBVFNVU3R5bGUpOiBEaXNhYmxlIGtlcm5pbmc7IGRpc2FibGUgbGlnYXR1cmVzIHVu bGVzcyB0aGUgZm9udAorICAgICAgICBkb2VzIG5vdCBjb250YWluICdhJywgaW4gd2hpY2ggY2Fz ZSBpdCBpcyBhc3N1bWVkIHRvIG5ldmVyIGJlIHJlbmRlcmVkCisgICAgICAgIGJ5IHRoZSBDRyBj b2RlIHBhdGguCisKIDIwMDUtMTItMTcgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0 enBldHRlbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYW5kIGxhbmRlZCBieSBEYXJpbi4KSW5k ZXg6IFdlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJwcm9qL1dlYlRleHRSZW5kZXJlci5tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9X ZWJUZXh0UmVuZGVyZXIubSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMDMKZGlmZiAtcCAtdSAt cjEuMjAzIFdlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJwcm9qL1dlYlRleHRSZW5kZXJlci5tCi0t LSBXZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXIubQkxNyBEZWMg MjAwNSAxODoxMDozNCAtMDAwMAkxLjIwMworKysgV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnBy b2ovV2ViVGV4dFJlbmRlcmVyLm0JMTggRGVjIDIwMDUgMTg6NTU6MjQgLTAwMDAKQEAgLTExNjIs MTAgKzExNjIsMTIgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUFUU1VTdHlsZShXZWJUZXh0Ugog ICAgICAgICAKICAgICAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gQ0dBZmZpbmVU cmFuc2Zvcm1NYWtlU2NhbGUoMSwgLTEpOwogICAgICAgICBGaXhlZCBmb250U2l6ZSA9IEZsb2F0 VG9GaXhlZChbcmVuZGVyZXItPmZvbnQuZm9udCBwb2ludFNpemVdKTsKLSAgICAgICAgQVRTVUF0 dHJpYnV0ZVRhZyBzdHlsZVRhZ3NbXSA9IHsga0FUU1VTaXplVGFnLCBrQVRTVUZvbnRUYWcsIGtB VFNVRm9udE1hdHJpeFRhZ307Ci0gICAgICAgIEJ5dGVDb3VudCBzdHlsZVNpemVzW10gPSB7ICBz aXplb2YoRml4ZWQpLCBzaXplb2YoQVRTVUZvbnRJRCksIHNpemVvZihDR0FmZmluZVRyYW5zZm9y bSkgfTsKLSAgICAgICAgQVRTVUF0dHJpYnV0ZVZhbHVlUHRyIHN0eWxlVmFsdWVzW10gPSB7ICZm b250U2l6ZSwgJmZvbnRJRCwgJnRyYW5zZm9ybSAgfTsKLSAgICAgICAgc3RhdHVzID0gQVRTVVNl dEF0dHJpYnV0ZXMocmVuZGVyZXItPl9BVFNVU3R5bGUsIDMsIHN0eWxlVGFncywgc3R5bGVTaXpl cywgc3R5bGVWYWx1ZXMpOworICAgICAgICAvLyBUdXJuIG9mZiBhdXRvbWF0aWMga2VybmluZyB1 bnRpbCBpdCBpcyBzdXBwb3J0ZWQgaW4gdGhlIENHIGNvZGUgcGF0aCAoNjEzNiBpbiBidWd6aWxs YSkKKyAgICAgICAgRnJhY3Qga2VybmluZ0luaGliaXRGYWN0b3IgPSBGbG9hdFRvRnJhY3QoMS4w KTsKKyAgICAgICAgQVRTVUF0dHJpYnV0ZVRhZyBzdHlsZVRhZ3NbNF0gPSB7IGtBVFNVU2l6ZVRh Zywga0FUU1VGb250VGFnLCBrQVRTVUZvbnRNYXRyaXhUYWcsIGtBVFNVS2VybmluZ0luaGliaXRG YWN0b3JUYWcgfTsKKyAgICAgICAgQnl0ZUNvdW50IHN0eWxlU2l6ZXNbNF0gPSB7IHNpemVvZihG aXhlZCksIHNpemVvZihBVFNVRm9udElEKSwgc2l6ZW9mKENHQWZmaW5lVHJhbnNmb3JtKSwgc2l6 ZW9mKEZyYWN0KSB9OworICAgICAgICBBVFNVQXR0cmlidXRlVmFsdWVQdHIgc3R5bGVWYWx1ZXNb NF0gPSB7ICZmb250U2l6ZSwgJmZvbnRJRCwgJnRyYW5zZm9ybSwgJmtlcm5pbmdJbmhpYml0RmFj dG9yIH07CisgICAgICAgIHN0YXR1cyA9IEFUU1VTZXRBdHRyaWJ1dGVzKHJlbmRlcmVyLT5fQVRT VVN0eWxlLCA0LCBzdHlsZVRhZ3MsIHN0eWxlU2l6ZXMsIHN0eWxlVmFsdWVzKTsKICAgICAgICAg aWYgKHN0YXR1cyAhPSBub0VycikKICAgICAgICAgICAgIEZBVEFMX0FMV0FZUygiQVRTVVNldEF0 dHJpYnV0ZXMgZmFpbGVkICglZCkiLCBzdGF0dXMpOwogICAgICAgICBzdGF0dXMgPSBBVFNGb250 R2V0VGFibGUoZm9udElELCAncHJvcCcsIDAsIDAsIDAsICZwcm9wVGFibGVTaXplKTsKQEAgLTEx NzYsNiArMTE3OCwxNiBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplQVRTVVN0eWxlKFdlYlRleHRS CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIEZBVEFMX0FMV0FZUygiQVRTRm9udEdldFRhYmxl IGZhaWxlZCAoJWQpIiwgc3RhdHVzKTsKIAorICAgICAgICAvLyBUdXJuIG9mZiBsaWdhdHVyZXMg c3VjaCBhcyAnZmknIHRvIG1hdGNoIHRoZSBDRyBjb2RlIHBhdGgncyBiZWhhdmlvciwgdW50aWwg YnVnemlsbGEgNjEzNSBpcyBmaXhlZC4KKyAgICAgICAgLy8gRG9uJ3QgYmUgdG9vIGFnZ3Jlc3Np dmU6IGlmIHRoZSBmb250IGRvZXNuJ3QgY29udGFpbiAnYScsIHRoZW4gYXNzdW1lIHRoYXQgYW55 IGxpZ2F0dXJlcyBpdCBjb250YWlucyBhcmUKKyAgICAgICAgLy8gaW4gY2hhcmFjdGVycyB0aGF0 IGFsd2F5cyBnbyB0aHJvdWdoIEFUU1VJLCBhbmQgdGhlcmVmb3JlIGFsbG93IHRoZW0uIEdlZXph IFBybyBpcyBhbiBleGFtcGxlLgorICAgICAgICAvLyBTZWUgYnVnemlsbGEgNTE2Ni4KKyAgICAg ICAgaWYgKFtbcmVuZGVyZXItPmZvbnQuZm9udCBjb3ZlcmVkQ2hhcmFjdGVyU2V0XSBjaGFyYWN0 ZXJJc01lbWJlcjonYSddKSB7CisgICAgICAgICAgICBBVFNVRm9udEZlYXR1cmVUeXBlIGZlYXR1 cmVUeXBlc1tdID0geyBrTGlnYXR1cmVzVHlwZSB9OworICAgICAgICAgICAgQVRTVUZvbnRGZWF0 dXJlU2VsZWN0b3IgZmVhdHVyZVNlbGVjdG9yc1tdID0geyBrQ29tbW9uTGlnYXR1cmVzT2ZmU2Vs ZWN0b3IgfTsKKyAgICAgICAgICAgIHN0YXR1cyA9IEFUU1VTZXRGb250RmVhdHVyZXMocmVuZGVy ZXItPl9BVFNVU3R5bGUsIDEsIGZlYXR1cmVUeXBlcywgZmVhdHVyZVNlbGVjdG9ycyk7CisgICAg ICAgIH0KKwogICAgICAgICByZW5kZXJlci0+QVRTVVN0eWxlSW5pdGlhbGl6ZWQgPSBZRVM7CiAg ICAgfQogfQo=