18311 2008-04-04 05:30:48 -0700 REGRESSION (r31620): Font variants (e.g. Helvetica Neue *Light*) don't render correctly 2008-04-07 13:10:19 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED http://guillermoesteves.com/test.html HasReduction, InRadar, Regression P1 Normal --- 1 gfesteves webkit-unassigned mitz phiw2 oldest_to_newest 76310 0 gfesteves 2008-04-04 05:30:48 -0700 As of WebKit nightly r31623 on Mac OS 10.5, specifying, say, font-family: "HelveticaNeue-Light" or font-family: "HelveticaNeue-UltraLight" no longer renders the appropriate Helvetica Neue variant. They simply render as regular Helvetica Neue. Screenshot available at http://img.skitch.com/20080404-1wh55gxup23k9q1p95spxbr4gj.jpg. On the left, you can see how it looks in nightly r31623, and on the right, how it looks in Safari 3.1 76311 1 20332 gfesteves 2008-04-04 05:33:15 -0700 Created attachment 20332 Test document with paragraphs styled in a Helvetica Neue regular, light and ultra light. The paragraphs in the document render correctly in Safari 3.1, but not in WebKit nightly r31623. 76312 2 20333 gfesteves 2008-04-04 05:34:22 -0700 Created attachment 20333 Screenshot showing the difference between WebKit nightly r31623 (left) and Safari 3.1 (right). 76318 3 dev+webkit 2008-04-04 06:50:58 -0700 Confirmed with the r31623 nightly and Safari 3.1 (5525.13). While the previous nightly is 3 days old, my build from yesterday morning works fine, r31620 is really the only thing that is likely to have caused this. 76322 4 mitz 2008-04-04 08:33:51 -0700 <rdar://problem/5842980> 76329 5 20335 mitz 2008-04-04 12:06:36 -0700 Created attachment 20335 Revert old behavior for full-name based matches Not asking for a review yet because I think this may be problematic for families that 1. Have a regular weight whose full name is the family name and 2. Have more than one weight heavier than regular. I really don't know how full name matches should behave and how they can be distinguished from family name matches when a family member's full name is the same as the family name. 76342 6 mitz 2008-04-04 15:37:10 -0700 Actually, the case that's broken by the proposed patch is the opposite, but I guess it was broken before r31620, so it will just be a reversion: you will not be able to get any lighter member of a family. One example is Copperplate, whose regular weight goes by the full name "Copperplate". 76399 7 phiw2 2008-04-05 18:24:33 -0700 I believe the current (@ r31623) is correct. Per CSS 2.1:15 Fonts [1], the author specifies a font 'family' (e.g. Helvetica Neue). If you then want a specific face (e.g 'Helvetica Neue&#12288;Ultra-Light') within that family you use the font-weight property, in this case font-weight: 100. [1] http://www.w3.org/TR/CSS21/fonts.html#font-family-prop 76404 8 mitz 2008-04-05 19:16:33 -0700 (In reply to comment #7) > I believe the current (@ r31623) is correct. Per CSS 2.1:15 Fonts [1], the > author specifies a font 'family' (e.g. Helvetica Neue). If you then want a > specific face (e.g 'Helvetica Neue&#12288;Ultra-Light') within that family you > use the font-weight property, in this case font-weight: 100. > > > [1] http://www.w3.org/TR/CSS21/fonts.html#font-family-prop It's true that letting fonts be selected by full name is non-standard behavior. My concern is that, like the reporter of this bug, there are authors and WebKit clients that expect this behavior. It might be good to maintain it, as long as it does not conflict with adhering to CSS2.1. As stated in comment #6, such conflicts can occur. 76535 9 20385 mitz 2008-04-07 13:04:31 -0700 Created attachment 20385 Revert old behavior for full-name based matches but prefer match by family name 76536 10 20385 hyatt 2008-04-07 13:08:07 -0700 Comment on attachment 20385 Revert old behavior for full-name based matches but prefer match by family name r=me 76537 11 mitz 2008-04-07 13:10:19 -0700 Fixed in <http://trac.webkit.org/projects/webkit/changeset/31689>. 20332 2008-04-04 05:33:15 -0700 2008-04-04 05:33:15 -0700 Test document with paragraphs styled in a Helvetica Neue regular, light and ultra light. test.html text/html 610 gfesteves PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjEvL0VOIgoJImh0dHA6 Ly93d3cudzMub3JnL1RSL3hodG1sMTEvRFREL3hodG1sMTEuZHRkIj4KPGh0bWwgeG1sbnM9Imh0 dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiIHhtbDpsYW5nPSJlbiI+CjxoZWFkPgoJPHRpdGxl PlRlc3Qgb2YgSGVsdmV0aWNhIE5ldWUgdmFyaWFudHMuPC90aXRsZT4KCTxzdHlsZSB0eXBlPSJ0 ZXh0L2NzcyI+CgkJLmhuIHsKCQkJZm9udC1mYW1pbHk6IkhlbHZldGljYSBOZXVlIjsKCQl9CgkJ LmhubCB7CgkJCWZvbnQtZmFtaWx5OiJIZWx2ZXRpY2EgTmV1ZSBMaWdodCIsICJIZWx2ZXRpY2FO ZXVlLUxpZ2h0IjsKCQl9CgkJLmhudWwgewoJCQlmb250LWZhbWlseToiSGVsdmV0aWNhIE5ldWUg VWx0cmFMaWdodCIsICJIZWx2ZXRpY2FOZXVlLVVsdHJhTGlnaHQiOwoJCX0KCTwvc3R5bGU+Cjwv aGVhZD4KPGJvZHk+Cgk8cCBjbGFzcz0iaG4iPkhlbHZldGljYSBOZXVlLjwvcD4KCTxwIGNsYXNz PSJobmwiPkhlbHZldGljYSBOZXVlIExpZ2h0LjwvcD4KCTxwIGNsYXNzPSJobnVsIj5IZWx2ZXRp Y2EgTmV1ZSBVbHRyYSBMaWdodC48L3A+CjwvYm9keT4KPC9odG1sPg== 20333 2008-04-04 05:34:22 -0700 2008-04-04 05:34:22 -0700 Screenshot showing the difference between WebKit nightly r31623 (left) and Safari 3.1 (right). helveticaneue.png image/png 19430 gfesteves iVBORw0KGgoAAAANSUhEUgAAAeEAAADMCAIAAADLbYwFAAALamlDQ1BJQ0MgUHJvZmlsZQAAeJyV l3dUU+cbx783BBBBREQQQQyICLK3iOy9IQRkqiEJEIQkJiFMQdwVq2Dr1jqoCELrQhHUOqkTse5d cSJFEFHhh9r8/rhhiEfb3pyT8+bJ++a+uZ/P97nnAqN0mQJBOgVABk8spPt50mJi42iKt0FAB4ow gBmTJRJ4hIcH46vH+5sgAOCaOVMgSC8q23Y6+EXjo8iVCoxQjws7v74OAKAqjImNAwgzABop5Ngd gEYSOWYA0MgSC8QAkQpAg5XKZANEPgAzIYPuBRAVAFRTyPFhAKpJ5PgcAFUJK0UMELcBBXUem8sD FNsABVc2R8QCVM0AsNkiVgagWgJQXDMy+GxA7QoAY5ZAKAbUegAYxsTG0cgts6YAjsoA9cNALUMH 2Psa0Ps0UDMqBcbSgD1mA7UuOggAhGaTKNnWBgBAqHgC8g+l0i4jQHE18KlUKv2wQyr9VAbI3QdO pLMyhRLZ9SKIRuCfPpP/WXbIEQAFUNVVf6o1bpyOrvEEbX1DA31DEyPa5EkmZlNMzMzMTS3MLc2t LK0tba3t7O0dHOwcahydnBymOTtPd3F1dXFzd3f38PDy9vby8fH19fP19wvwDwwMCgoOCQkJDQsL DY+IiKBHREYyGFHR0dEzZsTExsbGxcbHx99LSEhMnJk4a9bs2UxmUlLSYxabzeawk5NTUlJepHK5 3LS0OXPm/JWenpHB4/H5/A6BYO5coVAkEnWJxZmZEonkfVZWdlZOTm5ubm9efn7+vIKCgoK/Cwvn FxYVLViwkLJw4aJFixcvWbJ06TLFZcu++2758uLiFcXfq3z//cqVq1aVlJSWrh61evUPP/z445o1 a9eu01y3bv36DRs2btw0btOmzZu3bPnpp616W7du27Z9+44dZQZlZT//vHNn+aTy8l27KioqK3eb 7N5dVVVd/YvZL7/8+uuePXst9+7dt2///gM2Bw7U1Bw8eMj+0KHa2sOH66bW1dXXHzly1Pno0WPH fvvtuOvx4ydOnDx5yuPUqdOnz5xp8G5o+P33s75nz547d/78hYALFy5evHSpMbix8fLlpqYrYVeu /PHH1avX6NeuXb9+48bNqJs3b926fftOzJ07d+/eu3f//oOEBw8ePvzzz0ePmmc3Nz9+/OTJ06fP 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 20335 2008-04-04 12:06:36 -0700 2008-04-07 13:04:31 -0700 Revert old behavior for full-name based matches 18311_r1.diff text/plain 2618 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTYzNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMDQtMDQgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGZp eCBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMxMQorICAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81ODQyOTgwPiBSRUdSRVNTSU9OIChyMzE2MjApOiBGb250IHZhcmlh bnRzIChlLmcuIEhlbHZldGljYSBOZXVlICpMaWdodCopIGRvbid0IHJlbmRlciBjb3JyZWN0bHkK KworICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJGb250Q2FjaGUubW06CisgICAgICAgICgrW1dl YkZvbnRDYWNoZSBpbnRlcm5hbEZvbnRXaXRoRmFtaWx5OnRyYWl0czp3ZWlnaHQ6c2l6ZTpdKTog UmV2ZXJ0ZWQKKyAgICAgICAgdGhlIGZ1bGwgbmFtZS1iYXNlZCBtYXRjaCBsb2dpYyB0byBvbmx5 IGRpc3Rpbmd1aXNoIGJldHdlZW4gdGhlIGJyb2FkCisgICAgICAgIGNhdGVnb3JpZXMgb2YgImJv bGQiIGFuZCAibm90IGJvbGQiLgorCiAyMDA4LTA0LTA0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBDb3B5IGljdS8gdG8gUHJpdmF0ZUhlYWRlcnMgZm9yIFdlYktp dCdzIGJlbmVmaXQKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkZvbnRDYWNoZS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJGb250Q2FjaGUubW0JKHJldmlz aW9uIDMxNjM0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViRm9udENhY2hlLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTgsMjEgKzExOCwxOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZml4VXBX ZWlnaHQoTlNJbnRlZ2VyCiAgICAgTlNFbnVtZXJhdG9yICphdmFpbGFibGVGb250cyA9IFtbZm9u dE1hbmFnZXIgYXZhaWxhYmxlRm9udHNdIG9iamVjdEVudW1lcmF0b3JdOwogICAgIE5TU3RyaW5n ICphdmFpbGFibGVGb250OwogICAgIE5TRm9udCAqbmFtZU1hdGNoZWRGb250ID0gbmlsOworICAg IE5TRm9udFRyYWl0TWFzayBkZXNpcmVkVHJhaXRzRm9yTmFtZU1hdGNoID0gZGVzaXJlZFRyYWl0 cyB8IChkZXNpcmVkV2VpZ2h0ID49IDcgPyBOU0JvbGRGb250TWFzayA6IDApOwogICAgIHdoaWxl ICgoYXZhaWxhYmxlRm9udCA9IFthdmFpbGFibGVGb250cyBuZXh0T2JqZWN0XSkpIHsKICAgICAg ICAgaWYgKFtkZXNpcmVkRmFtaWx5IGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6YXZhaWxhYmxlRm9u dF0gPT0gTlNPcmRlcmVkU2FtZSkgewogICAgICAgICAgICAgbmFtZU1hdGNoZWRGb250ID0gW05T Rm9udCBmb250V2l0aE5hbWU6YXZhaWxhYmxlRm9udCBzaXplOnNpemVdOwogCiAgICAgICAgICAg ICAvLyBTcGVjaWFsIGNhc2UgT3Nha2EtTW9uby4gIEFjY29yZGluZyB0byA8cmRhcjovL3Byb2Js ZW0vMzk5OTQ2Nz4sIHdlIG5lZWQgdG8gCiAgICAgICAgICAgICAvLyB0cmVhdCBPc2FrYS1Nb25v IGFzIGZpeGVkIHBpdGNoLgotICAgICAgICAgICAgaWYgKFtkZXNpcmVkRmFtaWx5IGNhc2VJbnNl bnNpdGl2ZUNvbXBhcmU6QCJPc2FrYS1Nb25vIl0gPT0gTlNPcmRlcmVkU2FtZSAmJiBkZXNpcmVk VHJhaXRzID09IDApCisgICAgICAgICAgICBpZiAoW2Rlc2lyZWRGYW1pbHkgY2FzZUluc2Vuc2l0 aXZlQ29tcGFyZTpAIk9zYWthLU1vbm8iXSA9PSBOU09yZGVyZWRTYW1lICYmIGRlc2lyZWRUcmFp dHNGb3JOYW1lTWF0Y2ggPT0gMCkKICAgICAgICAgICAgICAgICByZXR1cm4gbmFtZU1hdGNoZWRG b250OwogCiAgICAgICAgICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gW2ZvbnRNYW5hZ2Vy IHRyYWl0c09mRm9udDpuYW1lTWF0Y2hlZEZvbnRdOwotICAgICAgICAgICAgTlNJbnRlZ2VyIHdl aWdodCA9IFtmb250TWFuYWdlciB3ZWlnaHRPZkZvbnQ6bmFtZU1hdGNoZWRGb250XTsKLSAgICAg ICAgICAgIGZpeFVwV2VpZ2h0KHdlaWdodCwgYXZhaWxhYmxlRm9udCk7Ci0KLSAgICAgICAgICAg IGlmICgodHJhaXRzICYgZGVzaXJlZFRyYWl0cykgPT0gZGVzaXJlZFRyYWl0cyAmJiB3ZWlnaHQg PT0gZGVzaXJlZFdlaWdodCkKLSAgICAgICAgICAgICAgICByZXR1cm4gW2ZvbnRNYW5hZ2VyIGNv bnZlcnRGb250Om5hbWVNYXRjaGVkRm9udCB0b0hhdmVUcmFpdDpkZXNpcmVkVHJhaXRzXTsKKyAg ICAgICAgICAgIGlmICgodHJhaXRzICYgZGVzaXJlZFRyYWl0c0Zvck5hbWVNYXRjaCkgPT0gZGVz aXJlZFRyYWl0c0Zvck5hbWVNYXRjaCkKKyAgICAgICAgICAgICAgICByZXR1cm4gW2ZvbnRNYW5h Z2VyIGNvbnZlcnRGb250Om5hbWVNYXRjaGVkRm9udCB0b0hhdmVUcmFpdDpkZXNpcmVkVHJhaXRz Rm9yTmFtZU1hdGNoXTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQo= 20385 2008-04-07 13:04:31 -0700 2008-04-07 13:08:07 -0700 Revert old behavior for full-name based matches but prefer match by family name 18311_r2.diff text/plain 4261 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTY4NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDQtMDcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGZp eCBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMxMQorICAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81ODQyOTgwPiBSRUdSRVNTSU9OIChyMzE2MjApOiBGb250IHZhcmlh bnRzIChlLmcuIEhlbHZldGljYSBOZXVlICpMaWdodCopIGRvbid0IHJlbmRlciBjb3JyZWN0bHkK KworICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJGb250Q2FjaGUubW06CisgICAgICAgICgrW1dl YkZvbnRDYWNoZSBpbnRlcm5hbEZvbnRXaXRoRmFtaWx5OnRyYWl0czp3ZWlnaHQ6c2l6ZTpdKTog Q2hhbmdlZCB0bworICAgICAgICBtYXRjaCBieSBmYW1pbHkgbmFtZSBmaXJzdCwgYW5kIG9ubHkg aWYgdGhhdCBmYWlscywgbG9vayBmb3IgYSBtYXRjaCBieQorICAgICAgICBmdWxsIChQb3N0U2Ny aXB0KSBuYW1lLiBSZXZlcnRlZCB0aGUgZnVsbCBuYW1lLWJhc2VkIG1hdGNoIGxvZ2ljIHRvIG9u bHkKKyAgICAgICAgZGlzdGluZ3Vpc2ggYmV0d2VlbiB0aGUgYnJvYWQgY2F0ZWdvcmllcyBvZiAi Ym9sZCIgYW5kICJub3QgYm9sZCIuCisKIDIwMDgtMDQtMDcgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBzb21lIEluc3BlY3RvciBwYW5lbCBv YmplY3RzIHRvIGZhY2lsaXRhdGUgdGhlIHVwLWNvbWluZwpJbmRleDogV2ViQ29yZS9wbGF0Zm9y bS9tYWMvV2ViRm9udENhY2hlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFj L1dlYkZvbnRDYWNoZS5tbQkocmV2aXNpb24gMzE2ODUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL21h Yy9XZWJGb250Q2FjaGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTExNCwyOSArMTE0LDYgQEAgc3Rh dGljIGlubGluZSB2b2lkIGZpeFVwV2VpZ2h0KE5TSW50ZWdlcgogewogICAgIE5TRm9udE1hbmFn ZXIgKmZvbnRNYW5hZ2VyID0gW05TRm9udE1hbmFnZXIgc2hhcmVkRm9udE1hbmFnZXJdOwogCi0g ICAgLy8gTG9vayBmb3IgYW4gZXhhY3QgbWF0Y2ggZmlyc3QuCi0gICAgTlNFbnVtZXJhdG9yICph dmFpbGFibGVGb250cyA9IFtbZm9udE1hbmFnZXIgYXZhaWxhYmxlRm9udHNdIG9iamVjdEVudW1l cmF0b3JdOwotICAgIE5TU3RyaW5nICphdmFpbGFibGVGb250OwotICAgIE5TRm9udCAqbmFtZU1h dGNoZWRGb250ID0gbmlsOwotICAgIHdoaWxlICgoYXZhaWxhYmxlRm9udCA9IFthdmFpbGFibGVG b250cyBuZXh0T2JqZWN0XSkpIHsKLSAgICAgICAgaWYgKFtkZXNpcmVkRmFtaWx5IGNhc2VJbnNl bnNpdGl2ZUNvbXBhcmU6YXZhaWxhYmxlRm9udF0gPT0gTlNPcmRlcmVkU2FtZSkgewotICAgICAg ICAgICAgbmFtZU1hdGNoZWRGb250ID0gW05TRm9udCBmb250V2l0aE5hbWU6YXZhaWxhYmxlRm9u dCBzaXplOnNpemVdOwotCi0gICAgICAgICAgICAvLyBTcGVjaWFsIGNhc2UgT3Nha2EtTW9uby4g IEFjY29yZGluZyB0byA8cmRhcjovL3Byb2JsZW0vMzk5OTQ2Nz4sIHdlIG5lZWQgdG8gCi0gICAg ICAgICAgICAvLyB0cmVhdCBPc2FrYS1Nb25vIGFzIGZpeGVkIHBpdGNoLgotICAgICAgICAgICAg aWYgKFtkZXNpcmVkRmFtaWx5IGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJPc2FrYS1Nb25vIl0g PT0gTlNPcmRlcmVkU2FtZSAmJiBkZXNpcmVkVHJhaXRzID09IDApCi0gICAgICAgICAgICAgICAg cmV0dXJuIG5hbWVNYXRjaGVkRm9udDsKLQotICAgICAgICAgICAgTlNGb250VHJhaXRNYXNrIHRy YWl0cyA9IFtmb250TWFuYWdlciB0cmFpdHNPZkZvbnQ6bmFtZU1hdGNoZWRGb250XTsKLSAgICAg ICAgICAgIE5TSW50ZWdlciB3ZWlnaHQgPSBbZm9udE1hbmFnZXIgd2VpZ2h0T2ZGb250Om5hbWVN YXRjaGVkRm9udF07Ci0gICAgICAgICAgICBmaXhVcFdlaWdodCh3ZWlnaHQsIGF2YWlsYWJsZUZv bnQpOwotCi0gICAgICAgICAgICBpZiAoKHRyYWl0cyAmIGRlc2lyZWRUcmFpdHMpID09IGRlc2ly ZWRUcmFpdHMgJiYgd2VpZ2h0ID09IGRlc2lyZWRXZWlnaHQpCi0gICAgICAgICAgICAgICAgcmV0 dXJuIFtmb250TWFuYWdlciBjb252ZXJ0Rm9udDpuYW1lTWF0Y2hlZEZvbnQgdG9IYXZlVHJhaXQ6 ZGVzaXJlZFRyYWl0c107Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLQog ICAgIC8vIERvIGEgc2ltcGxlIGNhc2UgaW5zZW5zaXRpdmUgc2VhcmNoIGZvciBhIG1hdGNoaW5n IGZvbnQgZmFtaWx5LgogICAgIC8vIE5TRm9udE1hbmFnZXIgcmVxdWlyZXMgZXhhY3QgbmFtZSBt YXRjaGVzLgogICAgIC8vIFRoaXMgYWRkcmVzc2VzIHRoZSBwcm9ibGVtIG9mIG1hdGNoaW5nIGFy aWFsIHRvIEFyaWFsLCBldGMuLCBidXQgcGVyaGFwcyBub3QgYWxsIHRoZSBpc3N1ZXMuCkBAIC0x NDcsOCArMTI0LDMwIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBmaXhVcFdlaWdodChOU0ludGVnZXIK ICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGlmICghYXZhaWxhYmxlRmFtaWx5KQot ICAgICAgICBhdmFpbGFibGVGYW1pbHkgPSBbbmFtZU1hdGNoZWRGb250IGZhbWlseU5hbWVdOwor ICAgIGlmICghYXZhaWxhYmxlRmFtaWx5KSB7CisgICAgICAgIC8vIE1hdGNoIGJ5IFBvc3RTY3Jp cHQgbmFtZS4KKyAgICAgICAgTlNFbnVtZXJhdG9yICphdmFpbGFibGVGb250cyA9IFtbZm9udE1h bmFnZXIgYXZhaWxhYmxlRm9udHNdIG9iamVjdEVudW1lcmF0b3JdOworICAgICAgICBOU1N0cmlu ZyAqYXZhaWxhYmxlRm9udDsKKyAgICAgICAgTlNGb250ICpuYW1lTWF0Y2hlZEZvbnQgPSBuaWw7 CisgICAgICAgIE5TRm9udFRyYWl0TWFzayBkZXNpcmVkVHJhaXRzRm9yTmFtZU1hdGNoID0gZGVz aXJlZFRyYWl0cyB8IChkZXNpcmVkV2VpZ2h0ID49IDcgPyBOU0JvbGRGb250TWFzayA6IDApOwor ICAgICAgICB3aGlsZSAoKGF2YWlsYWJsZUZvbnQgPSBbYXZhaWxhYmxlRm9udHMgbmV4dE9iamVj dF0pKSB7CisgICAgICAgICAgICBpZiAoW2Rlc2lyZWRGYW1pbHkgY2FzZUluc2Vuc2l0aXZlQ29t cGFyZTphdmFpbGFibGVGb250XSA9PSBOU09yZGVyZWRTYW1lKSB7CisgICAgICAgICAgICAgICAg bmFtZU1hdGNoZWRGb250ID0gW05TRm9udCBmb250V2l0aE5hbWU6YXZhaWxhYmxlRm9udCBzaXpl OnNpemVdOworCisgICAgICAgICAgICAgICAgLy8gU3BlY2lhbCBjYXNlIE9zYWthLU1vbm8uICBB Y2NvcmRpbmcgdG8gPHJkYXI6Ly9wcm9ibGVtLzM5OTk0Njc+LCB3ZSBuZWVkIHRvIAorICAgICAg ICAgICAgICAgIC8vIHRyZWF0IE9zYWthLU1vbm8gYXMgZml4ZWQgcGl0Y2guCisgICAgICAgICAg ICAgICAgaWYgKFtkZXNpcmVkRmFtaWx5IGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJPc2FrYS1N b25vIl0gPT0gTlNPcmRlcmVkU2FtZSAmJiBkZXNpcmVkVHJhaXRzRm9yTmFtZU1hdGNoID09IDAp CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBuYW1lTWF0Y2hlZEZvbnQ7CisKKyAgICAgICAg ICAgICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gW2ZvbnRNYW5hZ2VyIHRyYWl0c09mRm9u dDpuYW1lTWF0Y2hlZEZvbnRdOworICAgICAgICAgICAgICAgIGlmICgodHJhaXRzICYgZGVzaXJl ZFRyYWl0c0Zvck5hbWVNYXRjaCkgPT0gZGVzaXJlZFRyYWl0c0Zvck5hbWVNYXRjaCkKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIFtmb250TWFuYWdlciBjb252ZXJ0Rm9udDpuYW1lTWF0Y2hl ZEZvbnQgdG9IYXZlVHJhaXQ6ZGVzaXJlZFRyYWl0c0Zvck5hbWVNYXRjaF07CisKKyAgICAgICAg ICAgICAgICBhdmFpbGFibGVGYW1pbHkgPSBbbmFtZU1hdGNoZWRGb250IGZhbWlseU5hbWVdOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQog CiAgICAgLy8gRm91bmQgYSBmYW1pbHksIG5vdyBmaWd1cmUgb3V0IHdoYXQgd2VpZ2h0IGFuZCB0 cmFpdHMgdG8gdXNlLgogICAgIEJPT0wgY2hvc2VGb250ID0gZmFsc2U7Cg==