18307 2008-04-03 22:59:56 -0700 REGRESSION (r31620): Incorrect Hiragino Kaku Gothic, font-weight:500 2008-04-14 19:58:30 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Mac OS X 10.5 VERIFIED FIXED InRadar, Regression P2 Normal --- 1 phiw2 webkit-unassigned mitz nickshanks oldest_to_newest 76290 0 phiw2 2008-04-03 22:59:56 -0700 Hiragino Kaku Gothic, with font-weight 500 is displayed as bold; I expect it to display is as 'normal', same as font-weight: 400 - that is: use W3 instead of W6. Testing with r31623 (after bug 6484 landed). (Gecko 1.9 had the same problem not so long ago, but that has been fixed, at least as of gecko 1.9beta5). 76291 1 20326 phiw2 2008-04-03 23:01:20 -0700 Created attachment 20326 test case Hiragino Kaku Gothic Pro, various font-weights 76292 2 mitz 2008-04-03 23:30:03 -0700 <rdar://problem/5842546> 76298 3 mitz 2008-04-04 00:03:53 -0700 Indeed, CSS2.1 suggests using the '400' weight for '500' if a '500' weight is unmapped. (Hiragino Kaku Gothic Pro has two weights: W3, which AppKit maps to 4, which is between '300' and '400'; and W6, which AppKit maps to 8, which is between '600' and '700'. Since the desired weight of '500' corrresponds to 6, the two candidates are equidistant from the desired weight, and the current heuristic is to go for the stronger effect, i.e. further away from '400'). 76299 4 mitz 2008-04-04 00:11:45 -0700 As a first approximation, moving the "midpoint" from 5 to 6 here will better match the spec: if (chosenWeightDeltaMagnitude == candidateWeightDeltaMagnitude) return abs(candidateWeight - 5) > abs(chosenWeight - 5); 76302 5 20329 jdaggett 2008-04-04 01:58:35 -0700 Created attachment 20329 testcase, hiragino with different weights This might be useful. You can edit the Javascript to add/delete fonts. The Hiragino fonts have some funky name table entries so you may run into problems when the name is only in Japanese (e.g. ƒqƒ‰ƒMƒmŠÛƒS Pro). 76664 6 20416 mitz 2008-04-08 17:12:08 -0700 Created attachment 20416 Patch 77376 7 20416 darin 2008-04-12 23:22:11 -0700 Comment on attachment 20416 Patch r=me 77393 8 mitz 2008-04-13 08:59:29 -0700 Fixed in <http://trac.webkit.org/projects/webkit/changeset/31850>. 77638 9 phiw2 2008-04-14 19:58:30 -0700 works fine, thanks 20326 2008-04-03 23:01:20 -0700 2008-04-03 23:01:20 -0700 test case hiragino500.html text/html 1479 phiw2 PCFET0NUWVBFIEhUTUw+CjxodG1sPgo8aGVhZD4KPG1ldGEgY2hhcnNldD0idXRmLTgiPgoJPHN0 eWxlIHR5cGU9InRleHQvY3NzIj4KCWJvZHkge2ZvbnQtZmFtaWx5OiAnSGlyYWdpbm8gS2FrdSBH b3RoaWMgUHJvJywgJ+ODkuODqeOCruODjuinkuOCtCBQcm8gVzMnLCBzYW5zLXNlcmlmOyBmb250 LXNpemU6MjRweDt9CglsaSB7dGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTt9CgoueDEge2ZvbnQt d2VpZ2h0OiAxMDA7fQoueDIge2ZvbnQtd2VpZ2h0OiAyMDA7fQoueDMge2ZvbnQtd2VpZ2h0OiAz MDA7fQoueDQge2ZvbnQtd2VpZ2h0OiA0MDA7fQoueDUge2ZvbnQtd2VpZ2h0OiA1MDA7fQoueDYg e2ZvbnQtd2VpZ2h0OiA2MDA7fQoueDcge2ZvbnQtd2VpZ2h0OiA3MDA7fQoueDgge2ZvbnQtd2Vp Z2h0OiA4MDA7fQoueDkge2ZvbnQtd2VpZ2h0OiA5MDA7fQoKCTwvc3R5bGU+Cgk8dGl0bGU+dGVz dDogaGlyYWdpbm8gZm9udC13ZWlnaHQ6NTAwPC90aXRsZT4KPC9oZWFkPgo8Ym9keT4KPHVsPgoJ PGxpIGNsYXNzPSJ4MSI+Zm9udC13ZWlnaHQ6IDEwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3UgR290 aGljIFBybyAmIzgyMTE7IOODkuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xpPgoJPGxpIGNsYXNz PSJ4MiI+Zm9udC13ZWlnaHQ6IDIwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3UgR290aGljIFBybyAm IzgyMTE7IOODkuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xpPgoJPGxpIGNsYXNzPSJ4MyI+Zm9u dC13ZWlnaHQ6IDMwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3UgR290aGljIFBybyAmIzgyMTE7IOOD kuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xpPgoJPGxpIGNsYXNzPSJ4NCI+Zm9udC13ZWlnaHQ6 IDQwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3UgR290aGljIFBybyAmIzgyMTE7IOODkuODqeOCruOD juinkuOCtCBQcm8gVzM8L2xpPgoJPGxpIGNsYXNzPSJ4NSI+Zm9udC13ZWlnaHQ6IDUwMCAmIzgy MTE7IEhpcmFnaW5vIEtha3UgR290aGljIFBybyAmIzgyMTE7IOODkuODqeOCruODjuinkuOCtCBQ cm8gVzM8L2xpPgoJPGxpIGNsYXNzPSJ4NiI+Zm9udC13ZWlnaHQ6IDYwMCAmIzgyMTE7IEhpcmFn aW5vIEtha3UgR290aGljIFBybyAmIzgyMTE7IOODkuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xp PgoJPGxpIGNsYXNzPSJ4NyI+Zm9udC13ZWlnaHQ6IDcwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3Ug R290aGljIFBybyAmIzgyMTE7IOODkuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xpPgoJPGxpIGNs YXNzPSJ4OCI+Zm9udC13ZWlnaHQ6IDgwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3UgR290aGljIFBy byAmIzgyMTE7IOODkuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xpPgoJPGxpIGNsYXNzPSJ4OSI+ Zm9udC13ZWlnaHQ6IDkwMCAmIzgyMTE7IEhpcmFnaW5vIEtha3UgR290aGljIFBybyAmIzgyMTE7 IOODkuODqeOCruODjuinkuOCtCBQcm8gVzM8L2xpPgo8L3VsPgoKPC9ib2R5Pgo8L2h0bWw+ 20329 2008-04-04 01:58:35 -0700 2008-04-04 01:58:35 -0700 testcase, hiragino with different weights hiraginoproblem.html text/html 4727 jdaggett PCFET0NUWVBFIEhUTUw+CjxodG1sPgo8aGVhZD4KPHRpdGxlPkhpcmFnaW5vIEJvbGRlciAvIExp Z2h0ZXIgUHJvYmxlbXM8L3RpdGxlPgo8bWV0YSBodHRwLWVxdWl2PSJjb250ZW50LXR5cGUiIGNv bnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCI+Cgo8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCI+CgpnRm9udEZhbWlsaWVzID0gWwogICAgIltqYV1IaXJhZ2lubyBNYXJ1IEdvdGhp YyBQcm8sSGlyYWdpbm8gTWFydSBHb3RoaWMgUHJvIFc0LOODkuODqeOCruODjuS4uOOCtCBQcm8g VzQiLAogICAgIltqYV3vvK3vvLMg44K044K344OD44KvLE1TIEdvdGhpYyIsCiAgICAiVGltZXMg TmV3IFJvbWFuIgpdOwoKZ0ZvbnRTaXplcyA9IFs2LCA4LCAxMCwgMTIsIDE0LCAxNiwgMTgsIDI0 LCAzNiwgNDgsIDcyXTsKCmdXYXRlcmZhbGxTdHJpbmcgPSAiVGhlIHF1aWNrIGJyb3duIGZveCBq dW1wZWQgb3ZlciB0aGUgbGF6eSBkb2cuIjsKZ1dhdGVyZmFsbFN0cmluZ19qYSA9ICLpmqPjga7l rqLjga/jgojjgY/mn7/po5/jgYblrqLjgaAiOwoKZnVuY3Rpb24gZmlyc3RGYW1pbHlOYW1lKGZv bnRGYW1pbHkpIHsKICAgIHZhciBuYW1lcyA9IGZvbnRGYW1pbHkuc3BsaXQoJywnKTsKICAgIHJl dHVybiBuYW1lc1swXTsKfQoKZnVuY3Rpb24gZ2VuZXJhdGVXYXRlcmZhbGwoZm9udEZhbWlseSwg ZXh0cmFTdHlsZSwgamFwYW5lc2UpIHsKICAgIHZhciBvdXRTdHIgPSBuZXcgQXJyYXkoKTsKICAg IHZhciBzdHI7CiAgICAKICAgIGlmICh0eXBlb2YoZXh0cmFTdHlsZSkgPT0gInVuZGVmaW5lZCIp IGV4dHJhU3R5bGUgPSAiIjsKICAgIGlmIChqYXBhbmVzZSkgewogICAgICAgIHN0ciA9IGdXYXRl cmZhbGxTdHJpbmdfamE7CiAgICB9IGVsc2UgewogICAgICAgIHN0ciA9IGdXYXRlcmZhbGxTdHJp bmc7CiAgICB9CiAgICAKICAgIG91dFN0ci5wdXNoKCI8ZGl2IGNsYXNzPVwidGVzdGJsb2NrXCIg c3R5bGU9XCJmb250LWZhbWlseTogIiArIGZvbnRGYW1pbHkgKyAiO1wiPiIpOwogICAgdmFyIGks IGxlbiA9IGdGb250U2l6ZXMubGVuZ3RoOwogICAgCiAgICBvdXRTdHIucHVzaCgiPGRpdj4iICsg Zmlyc3RGYW1pbHlOYW1lKGZvbnRGYW1pbHkpICsgIjwvZGl2PiIpOwogICAgZm9yIChpID0gMDsg aSA8IGxlbjsgaSsrKSB7CiAgICAgICAgdmFyIHNpemUgPSBnRm9udFNpemVzW2ldOwogICAgICAg IHZhciBjb2xvcjsKICAgICAgICAKICAgICAgICBpZiAoaSUyID09IDApIHsKICAgICAgICAgICAg Y29sb3IgPSAiYmFja2dyb3VuZC1jb2xvcjojZmVlOyI7CiAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgY29sb3IgPSAiIjsKICAgICAgICB9CiAgICAgICAgb3V0U3RyLnB1c2goIjxkaXYgc3R5 bGU9XCJmb250LXNpemU6ICIgKyBzaXplICsicHQ7IiArIGNvbG9yICsgIlwiPiIpOwogICAgICAg IG91dFN0ci5wdXNoKHN0cik7CiAgICAgICAgb3V0U3RyLnB1c2goIjwvZGl2PiIpOwogICAgICAg IG91dFN0ci5wdXNoKCI8ZGl2IHN0eWxlPVwiZm9udC1zaXplOiAiICsgc2l6ZSArInB0OyIgKyBl eHRyYVN0eWxlICsgY29sb3IgKyJcIj4iKTsKICAgICAgICBvdXRTdHIucHVzaChzdHIpOwogICAg ICAgIG91dFN0ci5wdXNoKCI8L2Rpdj4iKTsKICAgIH0KICAgIG91dFN0ci5wdXNoKCI8L2Rpdj4i KTsKICAgIHJldHVybiBvdXRTdHIuam9pbigiIik7Cn0KCmZ1bmN0aW9uIGdlbmVyYXRlV2VpZ2h0 VGFibGUoZm9udEZhbWlseSwgd2l0aEl0YWxpYykgewogICAgdmFyIG91dFN0ciA9IG5ldyBBcnJh eSgpOwogICAgCiAgICBpZiAodHlwZW9mKHdpdGhJdGFsaWMpID09ICJ1bmRlZmluZWQiKSB3aXRo SXRhbGljID0gZmFsc2U7CiAgICBvdXRTdHIucHVzaCgiPGRpdiBjbGFzcz1cInRlc3RibG9ja1wi IHN0eWxlPVwiZm9udC1mYW1pbHk6ICIgKyBmb250RmFtaWx5ICsgIjsiICsgKHdpdGhJdGFsaWMg PyAiZm9udC1zdHlsZTogaXRhbGljOyIgOiAiICIgKSArICJcIj4iKTsKICAgIHZhciB3ZWlnaHQ7 CiAgICBmb3IgKHdlaWdodCA9IDEwMDsgd2VpZ2h0IDw9IDkwMDsgd2VpZ2h0ICs9IDEwMCkgewog ICAgICAgIG91dFN0ci5wdXNoKCI8ZGl2IHN0eWxlPVwiZm9udC13ZWlnaHQ6ICIgKyB3ZWlnaHQg KyI7XCI+Iik7CiAgICAgICAgb3V0U3RyLnB1c2goIGZpcnN0RmFtaWx5TmFtZShmb250RmFtaWx5 KSArICIsIHdlaWdodCAiICsgd2VpZ2h0ICk7CiAgICAgICAgb3V0U3RyLnB1c2goIjwvZGl2PiIp OwogICAgfQogICAgb3V0U3RyLnB1c2goIjwvZGl2PiIpOwogICAgcmV0dXJuIG91dFN0ci5qb2lu KCIiKTsKfQoKZnVuY3Rpb24gZ2VuZXJhdGVCb2xkZXIoZm9udEZhbWlseSwgd2l0aEl0YWxpYykg ewogICAgdmFyIG91dFN0ciA9IG5ldyBBcnJheSgpOwogICAgCiAgICBpZiAodHlwZW9mKHdpdGhJ dGFsaWMpID09ICJ1bmRlZmluZWQiKSB3aXRoSXRhbGljID0gZmFsc2U7CiAgICBvdXRTdHIucHVz aCgiPGRpdiBjbGFzcz1cInRlc3RibG9ja1wiIHN0eWxlPVwiZm9udC1mYW1pbHk6ICIgKyBmb250 RmFtaWx5ICsgIjsiICsgKHdpdGhJdGFsaWMgPyAiZm9udC1zdHlsZTogaXRhbGljOyIgOiAiICIg KSArICJcIj4iKTsKICAgIG91dFN0ci5wdXNoKCI8ZGl2IHN0eWxlPVwiZm9udC13ZWlnaHQ6IDEw MFwiPiIgKyBmaXJzdEZhbWlseU5hbWUoZm9udEZhbWlseSkgKyAiLCB3ZWlnaHQgMTAwIik7CiAg ICAKICAgIHZhciBzdGVwczsKICAgIAogICAgZm9yIChzdGVwcyA9IDA7IHN0ZXBzIDwgNTsgc3Rl cHMrKykgewogICAgICAgIG91dFN0ci5wdXNoKCI8ZGl2IGNsYXNzPVwiYm9sZGVyXCIgc3R5bGU9 XCJmb250LXdlaWdodDogYm9sZGVyO1wiPiIpOwogICAgICAgIG91dFN0ci5wdXNoKCBmaXJzdEZh bWlseU5hbWUoZm9udEZhbWlseSkgKyAiIGJvbGRlciAiICsgKHN0ZXBzKzEpICk7CiAgICB9CiAg ICBvdXRTdHIucHVzaCgiPC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+ Iik7CiAgICByZXR1cm4gb3V0U3RyLmpvaW4oIiIpOwp9CgpmdW5jdGlvbiBnZW5lcmF0ZUxpZ2h0 ZXIoZm9udEZhbWlseSwgd2l0aEl0YWxpYykgewogICAgdmFyIG91dFN0ciA9IG5ldyBBcnJheSgp OwogICAgCiAgICBpZiAodHlwZW9mKHdpdGhJdGFsaWMpID09ICJ1bmRlZmluZWQiKSB3aXRoSXRh bGljID0gZmFsc2U7CiAgICBvdXRTdHIucHVzaCgiPGRpdiBjbGFzcz1cInRlc3RibG9ja1wiIHN0 eWxlPVwiZm9udC1mYW1pbHk6ICIgKyBmb250RmFtaWx5ICsgIjsiICsgKHdpdGhJdGFsaWMgPyAi Zm9udC1zdHlsZTogaXRhbGljOyIgOiAiICIgKSArICJcIj4iKTsKICAgIG91dFN0ci5wdXNoKCI8 ZGl2IHN0eWxlPVwiZm9udC13ZWlnaHQ6IDkwMFwiPiIgKyBmaXJzdEZhbWlseU5hbWUoZm9udEZh bWlseSkgKyAiLCB3ZWlnaHQgOTAwIik7CiAgICAKICAgIHZhciBzdGVwczsKICAgIAogICAgZm9y IChzdGVwcyA9IDA7IHN0ZXBzIDwgNTsgc3RlcHMrKykgewogICAgICAgIG91dFN0ci5wdXNoKCI8 ZGl2IGNsYXNzPVwiYm9sZGVyXCIgc3R5bGU9XCJmb250LXdlaWdodDogbGlnaHRlcjtcIj4iKTsK ICAgICAgICBvdXRTdHIucHVzaCggZmlyc3RGYW1pbHlOYW1lKGZvbnRGYW1pbHkpICsgIiBsaWdo dGVyICIgKyAoc3RlcHMrMSkgKTsKICAgIH0KICAgIG91dFN0ci5wdXNoKCI8L2Rpdj48L2Rpdj48 L2Rpdj48L2Rpdj48L2Rpdj48L2Rpdj48L2Rpdj4iKTsKICAgIHJldHVybiBvdXRTdHIuam9pbigi Iik7Cn0KCmZ1bmN0aW9uIHdyaXRlQWxsKCkgewogICAgdmFyIGksIGxlbiA9IGdGb250RmFtaWxp ZXMubGVuZ3RoOwogICAgCiAgICBmb3IgKGkgPSAwOyBpIDwgbGVuOyBpKyspIHsKICAgICAgICB2 YXIgZm9udCA9IGdGb250RmFtaWxpZXNbaV07CiAgICAgICAgdmFyIGphcGFuZXNlID0gKGZvbnQu aW5kZXhPZigiW2phXSIpID09IDApOwogICAgICAgIGlmIChqYXBhbmVzZSkgewogICAgICAgICAg ICBmb250ID0gZm9udC5zdWJzdHIoNCk7CiAgICAgICAgfQogICAgICAgIAogICAgICAgIC8vZG9j dW1lbnQud3JpdGUoZ2VuZXJhdGVXYXRlcmZhbGwoZm9udCwgImZvbnQtd2VpZ2h0OiBib2xkOyIs IGphcGFuZXNlKSk7CiAgICAgICAgZG9jdW1lbnQud3JpdGUoZ2VuZXJhdGVXZWlnaHRUYWJsZShm b250KSk7CiAgICAgICAgZG9jdW1lbnQud3JpdGUoZ2VuZXJhdGVCb2xkZXIoZm9udCkpOwogICAg ICAgIGRvY3VtZW50LndyaXRlKGdlbmVyYXRlTGlnaHRlcihmb250KSk7CiAgICAgICAgZG9jdW1l bnQud3JpdGUoZ2VuZXJhdGVXZWlnaHRUYWJsZShmb250LCB0cnVlKSk7CiAgICAgICAgZG9jdW1l bnQud3JpdGUoZ2VuZXJhdGVCb2xkZXIoZm9udCwgdHJ1ZSkpOwogICAgICAgIGRvY3VtZW50Lndy aXRlKGdlbmVyYXRlTGlnaHRlcihmb250LCB0cnVlKSk7CiAgICB9Cn0KCjwvc2NyaXB0PgoKPHN0 eWxlIHR5cGU9InRleHQvY3NzIj4KCmJvZHkgewogICAgbWFyZ2luOiAxMHB4OwogICAgZm9udC1z aXplOiAzNnB0Owp9CgouYm9sZGVyIHsKICAgIGZvbnQtd2VpZ2h0OiBib2xkZXI7CiAgICBtYXJn aW4tbGVmdDogMWVtOwp9CgoubGlnaHRlciB7CiAgICBmb250LXdlaWdodDogbGlnaHRlcjsKICAg IG1hcmdpbi1sZWZ0OiAxZW07Cn0KCi50ZXN0YmxvY2sgewogICAgbWFyZ2luLXRvcDogMmVtOwp9 Cgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5IGxhbmc9ImphX0pQIj4KCjxzY3JpcHQgdHlwZT0idGV4 dC9qYXZhc2NyaXB0Ij4Kd3JpdGVBbGwoKTsKPC9zY3JpcHQ+Cgo8L2JvZHk+CjwvaHRtbD4= 20416 2008-04-08 17:12:08 -0700 2008-04-12 23:22:11 -0700 Patch 18307_r1.diff text/plain 2823 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTc0MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMDQtMDggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGZp eCBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMwNworICAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81ODQyNTQ2PiBSRUdSRVNTSU9OIChyMzE2MjApOiBJbmNvcnJlY3Qg SGlyYWdpbm8gS2FrdSBHb3RoaWMsIGZvbnQtd2VpZ2h0OjUwMAorCisgICAgICAgIFRlc3Q6IGZh c3QvY3NzL2ZvbnQtd2VpZ2h0LTEuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL0ZvbnRDYWNoZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnRvQXBwS2l0Rm9udFdlaWdo dCk6IEFkanVzdGVkIHRoZSBtYXBwaW5nIHRvIGNvdmVyIHRoZSBBcHBLaXQKKyAgICAgICAgd2Vp Z2h0IHJhbmdlIGZyb20gMiB0byAxMiwgYmVjYXVzZSBBcHBLaXQgd2VpZ2h0IDEgbmV2ZXIgb2Nj dXJzLiBUaGUKKyAgICAgICAgbmV3IG1hcHBpbmcgbWF0Y2hlcyBmb250LXdlaWdodDogbjAwIHRv IElTTyB3ZWlnaHQgV24uCisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYkZvbnRDYWNoZS5tbToK KyAgICAgICAgKGJldHRlckNob2ljZSk6IENoYW5nZWQgdGhlIG1pZHBvaW50IHVzZWQgd2hlbiBk ZWNpZGluZyBiZXR3ZWVuIHR3bworICAgICAgICBjYW5kaWRhdGVzIHRoYXQgZGV2aWF0ZSBmcm9t IHRoZSBkZXNpcmVkIHdlaWdodCBieSB0aGUgc2FtZSBhbW91bnQuCisKIDIwMDgtMDQtMDggIEFk YW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFd4IGJ1aWxkIGZpeApJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQkocmV2 aXNpb24gMzE3MzgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVN YWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNSwxMiArMTI1LDEyIEBAIHZvaWQgRm9udENhY2hl OjpwbGF0Zm9ybUluaXQoKQogc3RhdGljIGludCB0b0FwcEtpdEZvbnRXZWlnaHQoRm9udFdlaWdo dCBmb250V2VpZ2h0KQogewogICAgIHN0YXRpYyBpbnQgYXBwS2l0Rm9udFdlaWdodHNbXSA9IHsK LSAgICAgICAgMSwgIC8vIEZvbnRXZWlnaHQxMDAKLSAgICAgICAgMiwgIC8vIEZvbnRXZWlnaHQy MDAKLSAgICAgICAgMywgIC8vIEZvbnRXZWlnaHQzMDAKKyAgICAgICAgMiwgIC8vIEZvbnRXZWln aHQxMDAKKyAgICAgICAgMywgIC8vIEZvbnRXZWlnaHQyMDAKKyAgICAgICAgNCwgIC8vIEZvbnRX ZWlnaHQzMDAKICAgICAgICAgNSwgIC8vIEZvbnRXZWlnaHQ0MDAKICAgICAgICAgNiwgIC8vIEZv bnRXZWlnaHQ1MDAKLSAgICAgICAgNywgIC8vIEZvbnRXZWlnaHQ2MDAKKyAgICAgICAgOCwgIC8v IEZvbnRXZWlnaHQ2MDAKICAgICAgICAgOSwgIC8vIEZvbnRXZWlnaHQ3MDAKICAgICAgICAgMTAs IC8vIEZvbnRXZWlnaHQ4MDAKICAgICAgICAgMTIsIC8vIEZvbnRXZWlnaHQ5MDAKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vbWFjL1dlYkZvbnRDYWNoZS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJGb250Q2FjaGUubW0JKHJldmlzaW9uIDMxNzM4KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViRm9udENhY2hlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05MCw5ICs5 MCw5IEBAIHN0YXRpYyBCT09MIGJldHRlckNob2ljZShOU0ZvbnRUcmFpdE1hc2sKICAgICBpbnQg Y2hvc2VuV2VpZ2h0RGVsdGFNYWduaXR1ZGUgPSBhYnMoY2hvc2VuV2VpZ2h0IC0gZGVzaXJlZFdl aWdodCk7CiAgICAgaW50IGNhbmRpZGF0ZVdlaWdodERlbHRhTWFnbml0dWRlID0gYWJzKGNhbmRp ZGF0ZVdlaWdodCAtIGRlc2lyZWRXZWlnaHQpOwogCi0gICAgLy8gSWYgYm90aCBhcmUgdGhlIHNh bWUgZGlzdGFuY2UgZnJvbSB0aGUgZGVzaXJlZCB3ZWlnaHQsIHByZWZlciB0aGUgY2FuZGlkYXRl IGlmIGl0IGlzIGZ1cnRoZXIgZnJvbSByZWd1bGFyLgorICAgIC8vIElmIGJvdGggYXJlIHRoZSBz YW1lIGRpc3RhbmNlIGZyb20gdGhlIGRlc2lyZWQgd2VpZ2h0LCBwcmVmZXIgdGhlIGNhbmRpZGF0 ZSBpZiBpdCBpcyBmdXJ0aGVyIGZyb20gbWVkaXVtLgogICAgIGlmIChjaG9zZW5XZWlnaHREZWx0 YU1hZ25pdHVkZSA9PSBjYW5kaWRhdGVXZWlnaHREZWx0YU1hZ25pdHVkZSkKLSAgICAgICAgcmV0 dXJuIGFicyhjYW5kaWRhdGVXZWlnaHQgLSA1KSA+IGFicyhjaG9zZW5XZWlnaHQgLSA1KTsKKyAg ICAgICAgcmV0dXJuIGFicyhjYW5kaWRhdGVXZWlnaHQgLSA2KSA+IGFicyhjaG9zZW5XZWlnaHQg LSA2KTsKIAogICAgIC8vIE90aGVyd2lzZSwgcHJlZmVyIHRoZSBvbmUgY2xvc2VyIHRvIHRoZSBk ZXNpcmVkIHdlaWdodC4KICAgICByZXR1cm4gY2FuZGlkYXRlV2VpZ2h0RGVsdGFNYWduaXR1ZGUg PCBjaG9zZW5XZWlnaHREZWx0YU1hZ25pdHVkZTsK