21492 2008-10-08 18:01:52 -0700 [Cairo] Synthetic Bold/Oblique not working with cairo 2009-07-16 09:07:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Major --- 1 alexmac webkit-unassigned alexmac alp bfulgham emacemac7 oldest_to_newest 94658 0 alexmac 2008-10-08 18:01:52 -0700 The cairo port of webkit renders synthetic bold/oblique fonts as normal. This is not a bug, just a lack of implementation caused when the font handling code was reorganised sometime back in June. The attached patch contains the cairo implementation for this feature 94659 1 24211 alexmac 2008-10-08 18:02:58 -0700 Created attachment 24211 patch for synthetic font support in cairo 94661 2 alexmac 2008-10-08 18:12:01 -0700 Simple testcase: <html> 赤と黒、4つのマーク、13の数字 赤と黒、4つのマーク、13の数字 赤と黒、4つのマーク、13の数字 </html> 94843 3 alp 2008-10-09 20:40:13 -0700 (In reply to comment #1) > Created an attachment (id=24211) [edit] > patch for synthetic font support in cairo > Hi Alex, Please mark your patch r? if you want review. You should fix up coding style (spaces, not tabs) and include a ChangeLog entry too (exact procedure is described on webkit.org). Thanks 95220 4 24329 alexmac 2008-10-13 15:42:52 -0700 Created attachment 24329 patch for synthetic font support with cairo 95221 5 alexmac 2008-10-13 15:44:41 -0700 Oops, sorry about that, I've attached a better patch that conforms to the webkit guidelines. 96105 6 24329 eric 2008-10-21 14:39:04 -0700 Comment on attachment 24329 patch for synthetic font support with cairo Style error: else { 63 cairo_translate(cr, point.x(), point.y()); 64 } But mitz should probably review this. 122662 7 24329 eric 2009-05-22 07:40:55 -0700 Comment on attachment 24329 patch for synthetic font support with cairo WebKit prefers const values to #defines: +#define SYNTHETIC_OBLIQUE_ANGLE 14 This is what pixel tests were made for. It saddens me that gtk still doesn't have pixel tests. 122883 8 24329 darin 2009-05-23 13:17:51 -0700 Comment on attachment 24329 patch for synthetic font support with cairo > + if(font->platformData().syntheticOblique()) { Need a space after the "if" here. Everything else looks OK, although the technique of drawing the text twice isn't the best known synthetic bold technique. r=me 123594 9 bfulgham 2009-05-29 12:54:05 -0700 A really great change -- works wonderfully under Windows! Landed in @r44268. 132273 10 bfulgham 2009-07-16 09:07:58 -0700 *** Bug 26120 has been marked as a duplicate of this bug. *** 24211 2008-10-08 18:02:58 -0700 2008-10-13 15:42:52 -0700 patch for synthetic font support in cairo synthetic-fonts.patch text/plain 2702 alexmac ZGlmZiAtTmF1ciBXZWJLaXQtcjM3MzgxL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v Rm9udENhaXJvLmNwcCBXZWJLaXQtcjM3MzgxLW5ldy9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhaXJvL0ZvbnRDYWlyby5jcHAKLS0tIFdlYktpdC1yMzczODEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwCTIwMDgtMDktMTIgMTQ6MjA6NDUuMDAwMDAwMDAw IC0wNzAwCisrKyBXZWJLaXQtcjM3MzgxLW5ldy9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0ZvbnRDYWlyby5jcHAJMjAwOC0xMC0wOCAxNzo1MDo0NS4wMDAwMDAwMDAgLTA3MDAKQEAg LTMyLDYgKzMyLDggQEAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJT aW1wbGVGb250RGF0YS5oIgogCisjZGVmaW5lIFNZTlRIRVRJQ19PQkxJUVVFX0FOR0xFIDE0CisK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29u dGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnQsIGNvbnN0IEdseXBoQnVm ZmVyJiBnbHlwaEJ1ZmZlciwKQEAgLTQ0LDE1ICs0NiwyMyBAQAogCiAgICAgR2x5cGhCdWZmZXJH bHlwaCogZ2x5cGhzID0gKEdseXBoQnVmZmVyR2x5cGgqKWdseXBoQnVmZmVyLmdseXBocyhmcm9t KTsKIAotICAgIGZsb2F0IG9mZnNldCA9IHBvaW50LngoKTsKKyAgICBmbG9hdCBvZmZzZXQgPSAw LjBmOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVtR2x5cGhzOyBpKyspIHsKICAgICAgICAg Z2x5cGhzW2ldLnggPSBvZmZzZXQ7Ci0gICAgICAgIGdseXBoc1tpXS55ID0gcG9pbnQueSgpOwor ICAgICAgICBnbHlwaHNbaV0ueSA9IDAuMGY7CiAgICAgICAgIG9mZnNldCArPSBnbHlwaEJ1ZmZl ci5hZHZhbmNlQXQoZnJvbSArIGkpOwogICAgIH0KIAogICAgIENvbG9yIGZpbGxDb2xvciA9IGNv bnRleHQtPmZpbGxDb2xvcigpOwotCisJCisJLy8gU3ludGhldGljIE9ibGlxdWUKKwlpZihmb250 LT5wbGF0Zm9ybURhdGEoKS5zeW50aGV0aWNPYmxpcXVlKCkpIHsKKwkJY2Fpcm9fbWF0cml4X3Qg bWF0ID0gezEsIDAsIC10YW5mKFNZTlRIRVRJQ19PQkxJUVVFX0FOR0xFICogYWNvc2YoMCkgLyA5 MCksIDEsIHBvaW50LngoKSwgcG9pbnQueSgpfTsKKwkJY2Fpcm9fdHJhbnNmb3JtKGNyLCAmbWF0 KTsKKwl9IGVsc2UgeworCQljYWlyb190cmFuc2xhdGUoY3IsIHBvaW50LngoKSwgcG9pbnQueSgp KTsKKwl9CisJCiAgICAgLy8gVGV4dCBzaGFkb3csIGluc3BpcmVkIGJ5IEZvbnRNYWMKICAgICBJ bnRTaXplIHNoYWRvd1NpemU7CiAgICAgaW50IHNoYWRvd0JsdXIgPSAwOwpAQCAtNzMsNyArODMs MTMgQEAKIAogICAgICAgICBjYWlyb190cmFuc2xhdGUoY3IsIHNoYWRvd1NpemUud2lkdGgoKSwg c2hhZG93U2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIGNhaXJvX3Nob3dfZ2x5cGhzKGNyLCBnbHlw aHMsIG51bUdseXBocyk7Ci0KKwkJaWYgKGZvbnQtPm1fc3ludGhldGljQm9sZE9mZnNldCkgewor CQkJY2Fpcm9fc2F2ZShjcik7CisJCQljYWlyb190cmFuc2xhdGUoY3IsIGZvbnQtPm1fc3ludGhl dGljQm9sZE9mZnNldCwgMCk7CisJCQljYWlyb19zaG93X2dseXBocyhjciwgZ2x5cGhzLCBudW1H bHlwaHMpOworCQkJY2Fpcm9fcmVzdG9yZShjcik7CisJCX0KKwkJCiAgICAgICAgIGNhaXJvX3Jl c3RvcmUoY3IpOwogICAgIH0KIApAQCAtODMsNiArOTksMTIgQEAKICAgICAgICAgY2Fpcm9fc2V0 X3NvdXJjZV9yZ2JhKGNyLCByZWQsIGdyZWVuLCBibHVlLCBhbHBoYSk7CiAKICAgICAgICAgY2Fp cm9fc2hvd19nbHlwaHMoY3IsIGdseXBocywgbnVtR2x5cGhzKTsKKwkJaWYgKGZvbnQtPm1fc3lu dGhldGljQm9sZE9mZnNldCkgeworCQkJY2Fpcm9fc2F2ZShjcik7CisJCQljYWlyb190cmFuc2xh dGUoY3IsIGZvbnQtPm1fc3ludGhldGljQm9sZE9mZnNldCwgMCk7CisJCQljYWlyb19zaG93X2ds eXBocyhjciwgZ2x5cGhzLCBudW1HbHlwaHMpOworCQkJY2Fpcm9fcmVzdG9yZShjcik7CisJCX0K ICAgICB9CiAKICAgICBpZiAoY29udGV4dC0+dGV4dERyYXdpbmdNb2RlKCkgJiBjVGV4dFN0cm9r ZSkgewpkaWZmIC1OYXVyIFdlYktpdC1yMzczODEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vU2ltcGxlRm9udERhdGFDYWlyb1dpbi5jcHAgV2ViS2l0LXIzNzM4MS1uZXcvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFDYWlyb1dpbi5jcHAKLS0tIFdlYktp dC1yMzczODEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFDYWly b1dpbi5jcHAJMjAwOC0wNi0wMiAxNjozMjoyOS4wMDAwMDAwMDAgLTA3MDAKKysrIFdlYktpdC1y MzczODEtbmV3L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fp cm9XaW4uY3BwCTIwMDgtMTAtMDggMTc6NTI6NDMuMDAwMDAwMDAwIC0wNzAwCkBAIC01MCw2ICs1 MCw4IEBACiAgICAgbV9pc1N5c3RlbUZvbnQgPSBmYWxzZTsKICAgICBtX3N5bnRoZXRpY0JvbGRP ZmZzZXQgPSAwOwogCisJbV9zeW50aGV0aWNCb2xkT2Zmc2V0ID0gbV9mb250LnN5bnRoZXRpY0Jv bGQoKSA/IDEuMGYgOiAwLmY7CisJCiAgICAgaWYgKG1fZm9udC51c2VHREkoKSkKICAgICAgICBy ZXR1cm4gaW5pdEdESUZvbnQoKTsKIAo= 24329 2008-10-13 15:42:52 -0700 2009-05-23 13:17:51 -0700 patch for synthetic font support with cairo synthetic-fonts.patch text/plain 5477 alexmac SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNzU2NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDgtMTAtMTMgIEFsZXhhbmRlciBNYWNkb25hbGQgIDxhbGV4bWFj QGFkb2JlLmNvbT4KKworICAgICAgICBBZGRlZCBzdXBwb3J0IGZvciBzeW50aGV0aWMgYm9sZC9v YmxpcXVlIGZvbnQgcmVuZGVyaW5nCisgICAgICAgIG9uIHBsYXRmb3JtcyB0aGF0IHVzZSBjYWly by4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmg6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnQ6OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0 ay9TaW1wbGVGb250RGF0YUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0 YTo6cGxhdGZvcm1Jbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvU2ltcGxl Rm9udERhdGFQYW5nby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxh dGZvcm1Jbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERh dGFDYWlyb1dpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZv cm1Jbml0KToKKwogMjAwOC0xMC0xMyAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAK ICAgICAgICAgSW4gb3JkZXIgdG8gYWx3YXlzIG1hdGNoIHRoZSA6Y29ybmVyLXByZXNlbnQgcHNl dWRvLWNsYXNzIHByb3Blcmx5LCBkZWxheSBpbml0aWFsIHVwZGF0aW5nIG9mCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oCShyZXZpc2lvbiAzNzU2NSkK KysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAkod29ya2luZyBj b3B5KQpAQCAtMTY3LDcgKzE2Nyw3IEBAIHB1YmxpYzoKIAogICAgIG11dGFibGUgU2ltcGxlRm9u dERhdGEqIG1fc21hbGxDYXBzRm9udERhdGE7CiAKLSNpZiBQTEFURk9STShDRykgfHwgUExBVEZP Uk0oV0lOKQorI2lmIFBMQVRGT1JNKENHKSB8fCBQTEFURk9STShDQUlSTykKICAgICBmbG9hdCBt X3N5bnRoZXRpY0JvbGRPZmZzZXQ7CiAjZW5kaWYKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcAkocmV2aXNpb24gMzc1NjUpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMyLDYgKzMyLDggQEAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRl ICJTaW1wbGVGb250RGF0YS5oIgogCisjZGVmaW5lIFNZTlRIRVRJQ19PQkxJUVVFX0FOR0xFIDE0 CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnQsIGNvbnN0IEdseXBo QnVmZmVyJiBnbHlwaEJ1ZmZlciwKQEAgLTQ0LDE1ICs0NiwyMyBAQCB2b2lkIEZvbnQ6OmRyYXdH bHlwaHMoR3JhcGhpY3NDb250ZXh0KiBjCiAKICAgICBHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMg PSAoR2x5cGhCdWZmZXJHbHlwaCopZ2x5cGhCdWZmZXIuZ2x5cGhzKGZyb20pOwogCi0gICAgZmxv YXQgb2Zmc2V0ID0gcG9pbnQueCgpOworICAgIGZsb2F0IG9mZnNldCA9IDAuMGY7CiAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBudW1HbHlwaHM7IGkrKykgewogICAgICAgICBnbHlwaHNbaV0ueCA9 IG9mZnNldDsKLSAgICAgICAgZ2x5cGhzW2ldLnkgPSBwb2ludC55KCk7CisgICAgICAgIGdseXBo c1tpXS55ID0gMC4wZjsKICAgICAgICAgb2Zmc2V0ICs9IGdseXBoQnVmZmVyLmFkdmFuY2VBdChm cm9tICsgaSk7CiAgICAgfQogCiAgICAgQ29sb3IgZmlsbENvbG9yID0gY29udGV4dC0+ZmlsbENv bG9yKCk7Ci0KKwkKKyAgICAvLyBTeW50aGV0aWMgT2JsaXF1ZQorICAgIGlmKGZvbnQtPnBsYXRm b3JtRGF0YSgpLnN5bnRoZXRpY09ibGlxdWUoKSkgeworICAgICAgICBjYWlyb19tYXRyaXhfdCBt YXQgPSB7MSwgMCwgLXRhbmYoU1lOVEhFVElDX09CTElRVUVfQU5HTEUgKiBhY29zZigwKSAvIDkw KSwgMSwgcG9pbnQueCgpLCBwb2ludC55KCl9OworICAgICAgICBjYWlyb190cmFuc2Zvcm0oY3Is ICZtYXQpOworICAgIH0gZWxzZSB7CisgICAgICAgIGNhaXJvX3RyYW5zbGF0ZShjciwgcG9pbnQu eCgpLCBwb2ludC55KCkpOworICAgIH0KKwkKICAgICAvLyBUZXh0IHNoYWRvdywgaW5zcGlyZWQg YnkgRm9udE1hYwogICAgIEludFNpemUgc2hhZG93U2l6ZTsKICAgICBpbnQgc2hhZG93Qmx1ciA9 IDA7CkBAIC03Myw3ICs4MywxMyBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250 ZXh0KiBjCiAKICAgICAgICAgY2Fpcm9fdHJhbnNsYXRlKGNyLCBzaGFkb3dTaXplLndpZHRoKCks IHNoYWRvd1NpemUuaGVpZ2h0KCkpOwogICAgICAgICBjYWlyb19zaG93X2dseXBocyhjciwgZ2x5 cGhzLCBudW1HbHlwaHMpOwotCisgICAgICAgIGlmIChmb250LT5tX3N5bnRoZXRpY0JvbGRPZmZz ZXQpIHsKKyAgICAgICAgICAgIGNhaXJvX3NhdmUoY3IpOworICAgICAgICAgICAgY2Fpcm9fdHJh bnNsYXRlKGNyLCBmb250LT5tX3N5bnRoZXRpY0JvbGRPZmZzZXQsIDApOworICAgICAgICAgICAg Y2Fpcm9fc2hvd19nbHlwaHMoY3IsIGdseXBocywgbnVtR2x5cGhzKTsKKyAgICAgICAgICAgIGNh aXJvX3Jlc3RvcmUoY3IpOworICAgICAgICB9CisJCQogICAgICAgICBjYWlyb19yZXN0b3JlKGNy KTsKICAgICB9CiAKQEAgLTgzLDYgKzk5LDEyIEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFw aGljc0NvbnRleHQqIGMKICAgICAgICAgY2Fpcm9fc2V0X3NvdXJjZV9yZ2JhKGNyLCByZWQsIGdy ZWVuLCBibHVlLCBhbHBoYSk7CiAKICAgICAgICAgY2Fpcm9fc2hvd19nbHlwaHMoY3IsIGdseXBo cywgbnVtR2x5cGhzKTsKKyAgICAgICAgaWYgKGZvbnQtPm1fc3ludGhldGljQm9sZE9mZnNldCkg eworICAgICAgICAgICAgY2Fpcm9fc2F2ZShjcik7CisgICAgICAgICAgICBjYWlyb190cmFuc2xh dGUoY3IsIGZvbnQtPm1fc3ludGhldGljQm9sZE9mZnNldCwgMCk7CisgICAgICAgICAgICBjYWly b19zaG93X2dseXBocyhjciwgZ2x5cGhzLCBudW1HbHlwaHMpOworICAgICAgICAgICAgY2Fpcm9f cmVzdG9yZShjcik7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoY29udGV4dC0+dGV4dERy YXdpbmdNb2RlKCkgJiBjVGV4dFN0cm9rZSkgewpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ndGsvU2ltcGxlRm9udERhdGFHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3RrL1NpbXBsZUZvbnREYXRhR3RrLmNwcAkocmV2aXNpb24gMzc1NjUp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YUd0ay5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxh dGZvcm1Jbml0KCkKICAgICBjYWlyb19zY2FsZWRfZm9udF90ZXh0X2V4dGVudHMobV9mb250Lm1f c2NhbGVkRm9udCwgIiAiLCAmdGV4dF9leHRlbnRzKTsKICAgICBtX3NwYWNlV2lkdGggPSAgc3Rh dGljX2Nhc3Q8aW50Pih0ZXh0X2V4dGVudHMueF9hZHZhbmNlKTsKICAgICBtX2xpbmVHYXAgPSBt X2xpbmVTcGFjaW5nIC0gbV9hc2NlbnQgLSBtX2Rlc2NlbnQ7CisgICAgbV9zeW50aGV0aWNCb2xk T2Zmc2V0ID0gbV9mb250LnN5bnRoZXRpY0JvbGQoKSA/IDEuMGYgOiAwLmY7CiB9CiAKIHZvaWQg U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSgpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YVBhbmdvLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YVBhbmdvLmNwcAkocmV2aXNp b24gMzc1NjUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0 YVBhbmdvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksNyBAQCB2b2lkIFNpbXBsZUZv bnREYXRhOjpwbGF0Zm9ybUluaXQoKQogICAgIGNhaXJvX3NjYWxlZF9mb250X3RleHRfZXh0ZW50 cyhtX2ZvbnQubV9zY2FsZWRGb250LCAiICIsICZ0ZXh0X2V4dGVudHMpOwogICAgIG1fc3BhY2VX aWR0aCA9ICBzdGF0aWNfY2FzdDxpbnQ+KHRleHRfZXh0ZW50cy54X2FkdmFuY2UpOwogICAgIG1f bGluZUdhcCA9IG1fbGluZVNwYWNpbmcgLSBtX2FzY2VudCAtIG1fZGVzY2VudDsKKyAgICBtX3N5 bnRoZXRpY0JvbGRPZmZzZXQgPSBtX2ZvbnQuc3ludGhldGljQm9sZCgpID8gMS4wZiA6IDAuZjsK IH0KIAogdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1EZXN0cm95KCkKSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fp cm9XaW4uY3BwCShyZXZpc2lvbiAzNzU2NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1 MCw4IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgbV9pc1N5c3Rl bUZvbnQgPSBmYWxzZTsKICAgICBtX3N5bnRoZXRpY0JvbGRPZmZzZXQgPSAwOwogCisgICAgbV9z eW50aGV0aWNCb2xkT2Zmc2V0ID0gbV9mb250LnN5bnRoZXRpY0JvbGQoKSA/IDEuMGYgOiAwLmY7 CisJCiAgICAgaWYgKG1fZm9udC51c2VHREkoKSkKICAgICAgICByZXR1cm4gaW5pdEdESUZvbnQo KTsKIAo=