156840 2016-04-21 02:22:20 -0700 More improvements and explanations regarding resetting CSS properties on the <math> element 2016-04-24 07:34:33 -0700 1 1 1 Unclassified WebKit MathML WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 133603 156837 156839 1 fred.wang fred.wang alex darin oldest_to_newest 1185722 0 fred.wang 2016-04-21 02:22:20 -0700 See bug comment 18. This will address: (In reply to comment #18) > 1) Indenting. Will be done here. > > 2) Continuing to use a different list on iOS than on every other platform ifdef will be removed. > 3) Removal of many of the font names that were already listed > 4) Is it really OK to set the font-family without taking font size into > consideration. > I don’t think the comment about the wish to have more built-in fonts on OS X > and iOS adds much here.> > Is the change in behavior on OS X really carefully considered? Seems that it > will now use "serif" and before would have used "Lucida Grande" or maybe > "Arial Unicode MS"? I already explained these in bug 133603 comment 19, but I'll update the comment in the CSS refer to http://trac.webkit.org/wiki/MathML/Fonts explaining why fonts are necessary, problems with obsolete fonts and importance of customization for consistent rendering (not just the font-size). > 5) Overriding the font-family but still inheriting the many other > font-related properties. I'll add a link to bug 156839. Additionally, I think I can use @font-face and Ahem to provide a pixel tests checking math font selection. 1185740 1 276907 fred.wang 2016-04-21 04:17:34 -0700 Created attachment 276907 WIP Patch (for EWS testing) 1185747 2 276910 fred.wang 2016-04-21 05:07:00 -0700 Created attachment 276910 Patch 1186081 3 276910 darin 2016-04-21 18:52:26 -0700 Comment on attachment 276910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276910&action=review Seems OK. It seems really peculiar to list fonts that are almost all available together. Given the discussion here there is clearly a call, longer term, for some clever system to choose which font to use based on which non-math font is being used in the surrounding content. > Source/WebCore/css/mathml.css:73 > + We put Cambria Math first since it is pre-installed on Windows 7 and higher. Not sure I understand the logic here. No reason I can think of to put more-often-installed fonts first. 1186123 4 fred.wang 2016-04-21 22:48:54 -0700 (In reply to comment #3) > It seems really peculiar to list fonts that are almost all available > together. Given the discussion here there is clearly a call, longer term, > for some clever system to choose which font to use based on which non-math > font is being used in the surrounding content. Definitely. For now, the idea is to not miss any math font that can be installed on the system. > > Source/WebCore/css/mathml.css:73 > > + We put Cambria Math first since it is pre-installed on Windows 7 and higher. > > Not sure I understand the logic here. No reason I can think of to put > more-often-installed fonts first. As I said on bug 133603, this is a bit arbitrary... Maybe a better reason is because Cambria Math is pre-installed it has been more tested than the two others. 1186128 5 fred.wang 2016-04-21 22:56:28 -0700 Committed r199869: <http://trac.webkit.org/changeset/199869> 1186741 6 fred.wang 2016-04-24 07:34:33 -0700 (In reply to comment #3) > It seems really peculiar to list fonts that are almost all available > together. Given the discussion here there is clearly a call, longer term, > for some clever system to choose which font to use based on which non-math > font is being used in the surrounding content. For the record and future discussions, I've opened an issue in the MathML in HTML5 implementation note: https://github.com/MathML/MathMLinHTML5/issues/26 Ideally, I'd like CSS properties/keywords that could just be used in the default user agent stylesheet to tell the web engine to perform such clever trick. That way users won't be surprised by a non-CSS compatible behavior or can at least override that behavior if they don't like it. 276907 2016-04-21 04:17:34 -0700 2016-04-21 05:06:55 -0700 WIP Patch (for EWS testing) mathml-css.patch text/plain 5927 fred.wang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYXRobWwuY3NzIGIvU291cmNlL1dlYkNv cmUvY3NzL21hdGhtbC5jc3MKaW5kZXggMzBlNjg0Mi4uMmVhNjYzMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL21hdGhtbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL21hdGht bC5jc3MKQEAgLTEsNDMgKzEsMTA1IEBACiBAbmFtZXNwYWNlICJodHRwOi8vd3d3LnczLm9yZy8x OTk4L01hdGgvTWF0aE1MIjsKIAogbWF0aCB7CisgICAgLyoKKyAgICBXZSB1c2UgdGhlIGV4YWN0 IGJvdW5kaW5nIGJveGVzIG9mIGdseXBocyB0byBhdm9pZCBleGNlc3NpdmUgZ2FwcyBpbiBtYXRo ZW1hdGljYWwgZm9ybXVsYXMuCisgICAgRklYTUU6IFNob3VsZCB3ZSByZXBsYWNlIHRoaXMgd2l0 aCBhIG1vcmUgZ2VuZXJhbCBoYW5kbGluZyBvZiBpbmsvbG9naWNhbCBhc2NlbnQvZGVzY2VudD8K KyAgICBTZWUgaHR0cDovL3dlYmtpdC5vcmcvYi8xMzAzMjYsIGh0dHA6Ly93ZWJraXQub3JnL2Iv MTU2ODQxIGFuZAorICAgIGh0dHA6Ly93d3cubWF0aG1sLWFzc29jaWF0aW9uLm9yZy9NYXRoTUxp bkhUTUw1L1MzLmh0bWwjU1MxLlNTUzEKKyAgICAqLwogICAgIC13ZWJraXQtbGluZS1ib3gtY29u dGFpbjogZ2x5cGhzIHJlcGxhY2VkOworCisgICAgLyoKKyAgICBJbmhlcml0aW5nIHRoZSBmb2xs b3dpbmcgcHJvcGVydGllcyBjYW4gY2F1c2UgZXhjZXNzaXZlIHNwYWNpbmcgb2YgbWF0aGVtYXRp Y2FsIGZvcm11bGFzIHNvIHdlCisgICAganVzdCByZXNldCB0aGVtIHRvIHRoZWlyIGRlZmF1bHQg dmFsdWVzLgorICAgICovCiAgICAgdGV4dC1pbmRlbnQ6IDA7CiAgICAgbGluZS1oZWlnaHQ6IG5v cm1hbDsKICAgICB3b3JkLXNwYWNpbmc6IG5vcm1hbDsKICAgICBsZXR0ZXItc3BhY2luZzogbm9y bWFsOworCisgICAgLyoKKyAgICBJbiBzb21lIGNvdW50cmllcyBhbmQgbGFuZ3VhZ2VzLCB0ZXh0 IGlzIHdyaXR0ZW4gZnJvbSByaWdodC10by1sZWZ0IHdoaWxlIG1hdGhlbWF0aWNhbCBmb3JtdWxh cworICAgIGFyZSB3cml0dGVuIGZyb20gbGVmdC10by13cml0ZS4gSGVuY2UgaXQgaXMgd3Jvbmcg dG8gaW5oZXJpdCB0aGUgZGlyZWN0aW9uIGFuZCB3ZSByZXNldCB0aGF0CisgICAgcHJvcGVydHkg dG8gbGVmdC10by13cml0ZS4gUGVyIHRoZSBNYXRoTUwgc3BlY2lmaWNhdGlvbiwgYXV0aG9ycyBz aG91bGQgZXhwbGljaXRseSB1c2UgdGhlICJkaXIiCisgICAgYXR0cmlidXRlIG9uIHRoZSA8bWF0 aD4gZWxlbWVudCBpZiB0aGV5IHdhbnQgdG8gZm9yY2UgdGhlIG92ZXJhbGwgZGlyZWN0aW9uIG9m IHRoZSBtYXRoZW1hdGljYWwKKyAgICBmb3JtdWxhcy4KKyAgICAqLwogICAgIGRpcmVjdGlvbjog bHRyOwotfQotbXRleHQgewotICAgIGxpbmUtaGVpZ2h0OiAxLjA7Ci19CiAKLS8qIEZvbnRzIHdp dGggYXBwcm9wcmlhdGUgVW5pY29kZSBjb3ZlcmFnZSBhbmQgT3BlblR5cGUgZmVhdHVyZXMgYXJl IHJlcXVpcmVkIGZvciBnb29kIG1hdGggcmVuZGVyaW5nLgotICAgQ29uc2VxdWVudGx5IHRoZSBk ZWZhdWx0IGZvbnQtZmFtaWx5IG9uIHRoZSA8bWF0aD4gdGFnIGlzIG5vdCBpbmhlcml0ZWQgYnV0 IHNldCB0byBhIGxpc3Qgb2Yga25vd24gbWF0aCBmb250cy4KLSAgIFNlZSBodHRwOi8vdHJhYy53 ZWJraXQub3JnL3dpa2kvTWF0aE1ML0ZvbnRzLgotICAgRklYTUU6IE9TIFggYW5kIGlPUyBkbyBu b3QgaGF2ZSBzdWNoIGZvbnRzIHByZS1pbnN0YWxsZWQgKGJ1Z3MgMTcwMjExNDUsIDE2ODQxMDIz IGFuZCAxNjg0MzA0MSBmcm9tIEFwcGxlIGJ1ZyB0cmFja2VyKS4KLSAgIEhlbmNlIHdlIGFsc28g YXBwZW5kIHNvbWUgc3lzdGVtIGZvbnRzIHRvIHByb3ZpZGUgbWluaW1hbCBVbmljb2RlIGNvdmVy YWdlIGFuZCBsaW1pdGVkIG9wZXJhdG9yIHN0cmV0Y2hpbmcuCisgICAgLyogRm9udHMgd2l0aCBh cHByb3ByaWF0ZSBVbmljb2RlIGNvdmVyYWdlIGFuZCBPcGVuVHlwZSBmZWF0dXJlcyBhcmUgcmVx dWlyZWQgZm9yIGdvb2QgbWF0aAorICAgIHJlbmRlcmluZy4gVGhlc2UgcmVxdWlyZW1lbnRzIGFz IHdlbGwgYXMgdGhlIHVwLXRvLWRhdGUgbGlzdCBvZiBrbm93biBtYXRoIGZvbnRzIHRvIGZ1bGZp bGwKKyAgICB0aGVzZSByZXF1aXJlbWVudHMgYXJlIGxpc3RlZCBvbiBodHRwOi8vdHJhYy53ZWJr aXQub3JnL3dpa2kvTWF0aE1ML0ZvbnRzLgorICAgIEluaGVyaXRpbmcgdGhlIGZvbnQtZmFtaWx5 IGlzIGxpa2VseSB0byBtYWtlIE1hdGhNTCB1c2UgdGV4dCBmb250cyB0aGF0IGFyZSBub3QgZGVz aWduZWQgZm9yCisgICAgbWF0aCBsYXlvdXQgYW5kIHRodXMgd291bGQgY2F1c2UgdmVyeSBwb29y IG1hdGhlbWF0aWNhbCByZW5kZXJpbmcuIENvbnNlcXVlbnRseSwgdGhlIGRlZmF1bHQKKyAgICBm b250LWZhbWlseSBvbiB0aGUgPG1hdGg+IHRhZyBpcyBzZXQgdG8gYSBsaXN0IG9mIHJlY29tbWVu ZGVkIG1hdGggZm9udHMuCisgICAgRm9yIGJlc3QgcmVuZGVyaW5nLCBhdXRob3JzIGFuZCByZWFk ZXJzIGFyZSBlbmNvdXJhZ2VkIHRvIHVzZSB0ZXh0IGFuZCBtYXRoIGZvbnRzIHdpdGggY29uc2lz dGVudAorICAgIHN0eWxlIChhcHBlYXJhbmNlLCBzaXplLi4uKSwgc2VlIGh0dHA6Ly90cmFjLndl YmtpdC5vcmcvd2lraS9NYXRoTUwvRm9udHMjQ3VzdG9taXppbmdNYXRoRm9udAorICAgIEZJWE1F OiBTaG91bGQgd2UgbWFrZSBtYXRoIGZvbnQgcHJvcGVydGllcyBjb25maWd1cmFibGUgKGh0dHA6 Ly93ZWJraXQub3JnL2IvMTU2ODQzKT8KKyAgICAqLworICAgIGZvbnQtZmFtaWx5OgorICAgICAg IC8qCisgICAgICAgVGhpcyBmb250IGhhcyBDb21wdXRlciBNb2Rlcm4gc3R5bGUgYW5kIGlzIHBy b3ZpZGVkIHdpdGggbW9zdCBUZVggJiBMaW51eCBkaXN0cmlidXRpb25zLgorICAgICAgIFdlIHB1 dCBpdCBhcyB0aGUgZGVmYXVsdCBiZWNhdXNlIGl0cyBzdHlsZSBpcyBmYW1pbGlhciB0byBUZVgs IFdpa2lwZWRpYSBhbmQgbWF0aCBwZW9wbGUuCisgICAgICAgKi8KKyAgICAgICAiTGF0aW4gTW9k ZXJuIE1hdGgiLAorCisgICAgICAgLyoKKyAgICAgICBUaGUgZm9sbG93aW5nIGZvbnRzIGhhdmUg VGltZXMgc3R5bGUgYW5kIGFyZSBwcm92aWRlZCB3aXRoIG1vc3QgVGVYICYgTGludXggZGlzdHJp YnV0aW9ucy4KKyAgICAgICBXZSBwdXQgWElUUyAmIFNUSVggYXMgYSBzZWNvbmQgb3B0aW9uIGJl Y2F1c2UgdGhleSBoYXZlIHZlcnkgZ29vZCB1bmljb2RlIGNvdmVyYWdlLgorICAgICAgIFhJVFMg aXMgYSBmb3JrIG9mIFNUSVggd2l0aCBidWcgZml4ZXMgYW5kIG1vcmUgQXJhYmljL1JUTCBmZWF0 dXJlcyBzbyB3ZSBwdXQgaXQgZmlyc3QuCisgICAgICAgKi8KKyAgICAgICAiWElUUyBNYXRoIiwK KyAgICAgICAiU1RJWCBNYXRoIiwKKyAgICAgICAiTGliZXJ0aW51cyBNYXRoIiwKKyAgICAgICAi VGVYIEd5cmUgVGVybWVzIE1hdGgiLAorCisgICAgICAgLyoKKyAgICAgICBUaGVzZSBmb250cyBy ZXNwZWN0aXZlbHkgaGF2ZSBzdHlsZSBjb21wYXRpYmxlIHdpdGggQm9va21hbiBPbGQgYW5kIENl bnR1cnkgU2Nob29sYm9vay4KKyAgICAgICBUaGV5IGFyZSBwcm92aWRlZCB3aXRoIG1vc3QgVGVY ICYgTGludXggZGlzdHJpYnV0aW9ucy4KKyAgICAgICAqLworICAgICAgICJUZVggR3lyZSBCb251 bSBNYXRoIiwKKyAgICAgICAiVGVYIEd5cmUgU2Nob2xhIiwKKworICAgICAgIC8qCisgICAgICAg VGhlIGZvbGxvd2luZyBmb250cyBoYXZlIFBhbGF0aW5vIHN0eWxlIGFuZCBhcmUgcHJvdmlkZWQg d2l0aCBtb3N0IFRlWCAmIExpbnV4IGRpc3RyaWJ1dGlvbnMuCisgICAgICAgQXNhbmEgTWF0aCBo YXMgc29tZSByZW5kZXJpbmcgaXNzdWVzIChlLmcuIG1pc3NpbmcgaXRhbGljIGNvcnJlY3Rpb24p IHNvIHdlIHB1dCBpdCBhZnRlci4KKyAgICAgICAqLworICAgICAgICJUZVggR3lyZSBQYWdlbGxh IE1hdGgiLAorICAgICAgICJBc2FuYSBNYXRoIiwKKworICAgICAgIC8qCisgICAgICAgVGhlIGZv bGxvd2luZyBmb250cyBhcmUgcHJvcHJpZXRhcnkgYW5kIGhhdmUgbm90IG11Y2ggYmVlbiB0ZXN0 ZWQgc28gd2UgcHV0IHRoZW0gYXQgdGhlIGVuZC4KKyAgICAgICBXZSBwdXQgQ2FtYnJpYSBNYXRo IGZpcnN0IHNpbmNlIGl0IGlzIHByZS1pbnN0YWxsZWQgb24gV2luZG93cyA3IGFuZCBoaWdoZXIu CisgICAgICAgKi8KKyAgICAgICAiQ2FtYnJpYSBNYXRoIiwKKyAgICAgICAiTHVjaWRhIEJyaWdo dCBNYXRoIiwKKyAgICAgICAiTWluaW9uIE1hdGgiLAorCisgICAgICAgLyoKKyAgICAgICBUaGUg Zm9sbG93aW5nIGZvbnRzIGRvIG5vdCBzYXRpc2Z5IHRoZSByZXF1aXJlbWVudHMgZm9yIGdvb2Qg bWF0aGVtYXRpY2FsIHJlbmRlcmluZy4KKyAgICAgICBUaGVzZSBhcmUgcHJlLWluc3RhbGxlZCBv biBNYWMgYW5kIGlPUyBzbyB3ZSBsaXN0IHRoZW0gdG8gcHJvdmlkZSBtaW5pbWFsIHVuaWNvZGUt YmFzZWQKKyAgICAgICBtYXRoZW1hdGljYWwgcmVuZGVyaW5nLiBGb3IgbW9yZSBleHBsYW5hdGlv biBvZiBmYWxsYmFjayBtZWNoYW5pc21zIGFuZCBtaXNzaW5nIGZlYXR1cmVzIHNlZQorICAgICAg IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvd2lraS9NYXRoTUwvRm9udHMjT2Jzb2xldGVGb250c2Fu ZEZhbGxiYWNrTWVjaGFuaXNtcy4KKyAgICAgICBTVElYIGZvbnRzIGhhdmUgYmVzdCB1bmljb2Rl IGNvdmVyYWdlIHNvIHdlIHB1dCB0aGVtIGZpcnN0LiAqLworICAgICAgIFNUSVhHZW5lcmFsLAor ICAgICAgIFNUSVhTaXplT25lU3ltLAorICAgICAgIFN5bWJvbCwKKyAgICAgICAiVGltZXMgTmV3 IFJvbWFuIiwKKworICAgICAgIC8qIE1hdGhlbWF0aWNhbCBmb250cyBnZW5lcmFsbHkgdXNlICJz ZXJpZiIgc3R5bGUuIEhlbmNlIHdlIGFwcGVuZCB0aGUgZ2VuZXJpYyAic2VyaWYiIGZhbWlseQor ICAgICAgIGFzIGEgZmFsbGJhY2sgaW4gb3JkZXIgdG8gaW5jcmVhc2Ugb3VyIGNoYW5jZSB0byBm aW5kIGEgbWF0aGVtYXRpY2FsIGZvbnQuICovCisgICAgICAgc2VyaWY7CisKKyAgICAvKiBGSVhN RTogU2hvdWxkIHdlIHJlc2V0IG1vcmUgQ1NTIHByb3BlcnRpZXMgKGh0dHA6Ly93ZWJraXQub3Jn L2IvMTU2ODM5KT8gKi8KK30KKworLyoKK0ZJWE1FOiBTaG91bGQgd2UgcmVtb3ZlIHRoaXMgcnVs ZSAoaHR0cDovL3dlYmtpdC5vcmcvYi8xNTUwMTgpPworSXQgaXMgbm90IHRlc3RlZCBhbmQgaXQg aXMgbm90IGNsZWFyIHdoeSBpdCBpcyBuZWVkZWQuCiAqLwotbWF0aCB7Ci0gICAgZm9udC1mYW1p bHk6ICJMYXRpbiBNb2Rlcm4gTWF0aCIsCi0gICAgICAgICAgICAgICAgICJYSVRTIE1hdGgiLAot ICAgICAgICAgICAgICAgICAiU1RJWCBNYXRoIiwKLSAgICAgICAgICAgICAgICAgIkxpYmVydGlu dXMgTWF0aCIsCi0gICAgICAgICAgICAgICAgICJUZVggR3lyZSBCb251bSBNYXRoIiwKLSAgICAg ICAgICAgICAgICAgIlRlWCBHeXJlIFBhZ2VsbGEgTWF0aCIsCi0gICAgICAgICAgICAgICAgICJU ZVggR3lyZSBTY2hvbGEiLAotICAgICAgICAgICAgICAgICAiVGVYIEd5cmUgVGVybWVzIE1hdGgi LAotICAgICAgICAgICAgICAgICAiQ2FtYnJpYSBNYXRoIiwKLSAgICAgICAgICAgICAgICAgIkFz YW5hIE1hdGgiLAotICAgICAgICAgICAgICAgICAiTHVjaWRhIEJyaWdodCBNYXRoIiwKLSAgICAg ICAgICAgICAgICAgIk1pbmlvbiBNYXRoIiwKLSAgICAgICAgICAgICAgICAgU1RJWEdlbmVyYWws Ci0gICAgICAgICAgICAgICAgIFNUSVhTaXplT25lU3ltLAotI2lmIGRlZmluZWQoV1RGX1BMQVRG T1JNX0lPUykgJiYgV1RGX1BMQVRGT1JNX0lPUwotICAgICAgICAgICAgICAgICBTeW1ib2wsCi0g ICAgICAgICAgICAgICAgICJUaW1lcyBOZXcgUm9tYW4iLAotI2VuZGlmCi0gICAgICAgICAgICAg ICAgIHNlcmlmOworbXRleHQgeworICAgIGxpbmUtaGVpZ2h0OiAxLjA7CiB9CiAKIG1hdGggewo= 276910 2016-04-21 05:07:00 -0700 2016-04-21 18:52:26 -0700 Patch bug-156840-20160421140721.patch text/plain 8194 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5ODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDMwNWM2ZjY4ZGEzMDhk ZDJkZjk0OWMyYzg3NWQ0OTY3YmNkNzgyYS4uZDY4M2FiNTRhZWMwYTIwZmY3YWJiZTIwNDIyNGMz MzRlMjA4YTA4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE2LTA0LTIxICBGcmVk ZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3JlIGltcHJvdmVtZW50 cyBhbmQgZXhwbGFuYXRpb25zIHJlZ2FyZGluZyByZXNldHRpbmcgQ1NTIHByb3BlcnRpZXMgb24g dGhlIDxtYXRoPiBlbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTY4NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXZSBzb21lIGZvbGxvdy11cCBpbXByb3ZlbWVudHMgcmVnYXJkaW5nIENTUyBy dWxlcyBvbiB0aGUgPG1hdGg+IGVsZW1lbnQsIGFmdGVyIGJ1ZyAxMzM2MDM6CisgICAgICAgIC0g V2UgZml4IGluZGVudGluZyB0byB1c2UgNCBzcGFjZXMuCisgICAgICAgIC0gV2UgZXhwbGFpbiB3 aHkgd2Ugc2V0IC13ZWJraXQtbGluZS1ib3gtY29udGFpbiBhbmQgYWRkIHJlZmVyZW5jZXMgdG8g cmVsYXRlZCBidWdzLgorICAgICAgICAtIFdlIGV4cGxhaW4gd2h5IHdlIHJlc2V0IHNvbWUgQ1NT IHNwYWNpbmcgcnVsZXMuCisgICAgICAgIC0gV2UgZXhwbGFpbiB3aHkgdGhlIGRpcmVjdGlvbiBp cyBzZXQgdG8gbHRyLgorICAgICAgICAtIFdlIGV4cGxhaW4gd2h5IGZvbnQtZmFtaWx5IGlzIHNl dCB0byBhIGxpc3Qgb2Yga25vd24gbWF0aCBmb250cyBhbmQgYWRkIHJlZmVyZW5jZQorICAgICAg ICAgIHRvIHRoZSB3aWtpLgorICAgICAgICAtIFdlIG1lbnRpb24gdGhlIG5lZWQgdG8gY3VzdG9t aXplIG1hdGggZm9udHMgdG8gZ2V0IGNvbnNpc3RlbnQgc3R5bGUgYW5kIGFkZCByZWZlcmVuY2Vz IHRvCisgICAgICAgICAgYSBidWcgcmVwb3J0IGFuZCB0byB0aGUgd2lraS4KKyAgICAgICAgLSBX ZSBkZXNjcmliZWQgZWFjaCBvZiB0aGUgbWF0aCBmb250IGxpc3RlZCBhbmQgYWRkIHNvbWUganVz dGlmaWNhdGlvbiBhYm91dCB0aGVpciBvcmRlcnMuCisgICAgICAgIC0gV2UgYmV0dGVyIGV4cGxh aW4gdGhlIHNlY3Rpb24gYWJvdXQgZm9udHMgdGhhdCBkbyBub3Qgc2F0aXNmeSB0aGUgcmVxdWly ZW1lbnRzIGZvciBnb29kCisgICAgICAgICAgbWF0aGVtYXRpY2FsIHJlbmRlcmluZywgcmVmb3Jt dWxhdGUgd2h5IHdlIHN0aWxsIG5lZWQgdGhlbSBmb3IgaU9TL01hYyBhbmQgd2UgYWRkIHNvbWUK KyAgICAgICAgICByZWZlcmVuY2VzIHRvIGEgYnVnIHJlcG9ydCBhbmQgdG8gdGhlIHdpa2kuIFNv bWUgZm9udHMgdGhhdCBub3QgcHJlLWluc3RhbGxlZCB3ZXJlIHJlbW92ZWQKKyAgICAgICAgICBp biByMTk5NzczLgorICAgICAgICAtIFdlIGFkZCBhIEZJWE1FIGNvbW1lbnRzIGZvciBwb3RlbnRp YWwgY2hhbmdlcyBvZiBDU1MgcHJvcGVydGllcyBvbiB0aGUgPG1hdGg+IHRhZy4KKworICAgICAg ICBXZSBtYWtlIHRoZSBmb2xsb3dpbmcgY2hhbmdlcyB0byB0aGUgbGlzdHMgb2YgZm9udC1mYW1p bHk6CisgICAgICAgIC0gV2UgbW92ZSAiVGVYIEd5cmUgVGVybWVzIE1hdGgiIGludG8gdGhlIFRp bWVzIGdyb3VwLgorICAgICAgICAtIFdlIG1vdmUgIkFzYW5hIE1hdGgiIGludG8gdGhlIFBhbGF0 aW5vIGdyb3VwLgorICAgICAgICAtIFdlIHJlbW92ZSBpT1MgY29uZGl0aW9uYWxzIG9uICJTeW1i b2wiIGFuZCAiVGltZXMgTmV3IFJvbWFuIi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG9ubHkg b3JkZXIgb2YgbWF0aCBmb250cyB0aGF0IGFyZSBub3QgdXNlZCBieSB0ZXN0IGZyYW1ld29yayBp cyBjaGFuZ2VkLgorCisgICAgICAgICogY3NzL21hdGhtbC5jc3M6CisgICAgICAgIChtYXRoKTog V2UgbWVyZ2UgdGhlIHR3byBtYXRoIHNlbGVjdG9ycywgcmVvcmRlciBzb21lIGZvbnQtZmFtaWxp ZXMsIHJlbW92ZSBpT1MgaWZkZWYgYW5kCisgICAgICAgIGFkZCBtb3JlIGRlc2NyaXB0aW9uLgor CiAyMDE2LTA0LTIxICBOYW4gV2FuZyAgPG5fd2FuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQVg6 IHN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSByZXR1cm5pbmcgZW1wdHkgc3RyaW5nIGZvciBkb2N1 bWVudCByYW5nZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL21hdGhtbC5jc3MgYi9T b3VyY2UvV2ViQ29yZS9jc3MvbWF0aG1sLmNzcwppbmRleCAzMGU2ODQyOTJlNGNjZTE0MjY0M2E0 ZDBhOGYwOTc0ZDIxYmRlOTZiLi5lMzI3YTY0ZjBjOTczNTkyMDBhOGYxYmM3NzViNmQzNjBjYjRm ZjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWF0aG1sLmNzcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvbWF0aG1sLmNzcwpAQCAtMSw0NSArMSwxMDIgQEAKIEBuYW1lc3BhY2Ug Imh0dHA6Ly93d3cudzMub3JnLzE5OTgvTWF0aC9NYXRoTUwiOwogCiBtYXRoIHsKKyAgICAvKgor ICAgIFdlIHVzZSB0aGUgZXhhY3QgYm91bmRpbmcgYm94ZXMgb2YgZ2x5cGhzIHRvIGF2b2lkIGV4 Y2Vzc2l2ZSBnYXBzIGluIG1hdGhlbWF0aWNhbCBmb3JtdWxhcy4KKyAgICBGSVhNRTogU2hvdWxk IHdlIHJlcGxhY2UgdGhpcyB3aXRoIGEgbW9yZSBnZW5lcmFsIGhhbmRsaW5nIG9mIGluay9sb2dp Y2FsIGFzY2VudC9kZXNjZW50PworICAgIFNlZSBodHRwOi8vd2Via2l0Lm9yZy9iLzEzMDMyNiwg aHR0cDovL3dlYmtpdC5vcmcvYi8xNTY4NDEgYW5kCisgICAgaHR0cDovL3d3dy5tYXRobWwtYXNz b2NpYXRpb24ub3JnL01hdGhNTGluSFRNTDUvUzMuaHRtbCNTUzEuU1NTMQorICAgICovCiAgICAg LXdlYmtpdC1saW5lLWJveC1jb250YWluOiBnbHlwaHMgcmVwbGFjZWQ7CisKKyAgICAvKgorICAg IEluaGVyaXRpbmcgdGhlIGZvbGxvd2luZyBwcm9wZXJ0aWVzIGNhbiBjYXVzZSBleGNlc3NpdmUg c3BhY2luZyBvZiBtYXRoZW1hdGljYWwgZm9ybXVsYXMgc28gd2UKKyAgICBqdXN0IHJlc2V0IHRo ZW0gdG8gdGhlaXIgZGVmYXVsdCB2YWx1ZXMuCisgICAgKi8KICAgICB0ZXh0LWluZGVudDogMDsK ICAgICBsaW5lLWhlaWdodDogbm9ybWFsOwogICAgIHdvcmQtc3BhY2luZzogbm9ybWFsOwogICAg IGxldHRlci1zcGFjaW5nOiBub3JtYWw7CisKKyAgICAvKgorICAgIEluIHNvbWUgY291bnRyaWVz IGFuZCBsYW5ndWFnZXMsIHRleHQgaXMgd3JpdHRlbiBmcm9tIHJpZ2h0LXRvLWxlZnQgd2hpbGUg bWF0aGVtYXRpY2FsIGZvcm11bGFzCisgICAgYXJlIHdyaXR0ZW4gZnJvbSBsZWZ0LXRvLXdyaXRl LiBIZW5jZSBpdCBpcyB3cm9uZyB0byBpbmhlcml0IHRoZSBkaXJlY3Rpb24gYW5kIHdlIHJlc2V0 IHRoYXQKKyAgICBwcm9wZXJ0eSB0byBsZWZ0LXRvLXdyaXRlLiBQZXIgdGhlIE1hdGhNTCBzcGVj aWZpY2F0aW9uLCBhdXRob3JzIHNob3VsZCBleHBsaWNpdGx5IHVzZSB0aGUgImRpciIKKyAgICBh dHRyaWJ1dGUgb24gdGhlIDxtYXRoPiBlbGVtZW50IGlmIHRoZXkgd2FudCB0byBmb3JjZSB0aGUg b3ZlcmFsbCBkaXJlY3Rpb24gb2YgdGhlIG1hdGhlbWF0aWNhbAorICAgIGZvcm11bGFzLgorICAg ICovCiAgICAgZGlyZWN0aW9uOiBsdHI7CisKKyAgICAvKiBGb250cyB3aXRoIGFwcHJvcHJpYXRl IFVuaWNvZGUgY292ZXJhZ2UgYW5kIE9wZW5UeXBlIGZlYXR1cmVzIGFyZSByZXF1aXJlZCBmb3Ig Z29vZCBtYXRoCisgICAgcmVuZGVyaW5nLiBUaGVzZSByZXF1aXJlbWVudHMgYXMgd2VsbCBhcyB0 aGUgdXAtdG8tZGF0ZSBsaXN0IG9mIGtub3duIG1hdGggZm9udHMgdG8gZnVsZmlsbAorICAgIHRo ZXNlIHJlcXVpcmVtZW50cyBhcmUgbGlzdGVkIG9uIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvd2lr aS9NYXRoTUwvRm9udHMuCisgICAgSW5oZXJpdGluZyB0aGUgZm9udC1mYW1pbHkgaXMgbGlrZWx5 IHRvIG1ha2UgTWF0aE1MIHVzZSB0ZXh0IGZvbnRzIHRoYXQgYXJlIG5vdCBkZXNpZ25lZCBmb3IK KyAgICBtYXRoIGxheW91dCBhbmQgdGh1cyB3b3VsZCBjYXVzZSB2ZXJ5IHBvb3IgbWF0aGVtYXRp Y2FsIHJlbmRlcmluZy4gQ29uc2VxdWVudGx5LCB0aGUgZGVmYXVsdAorICAgIGZvbnQtZmFtaWx5 IG9uIHRoZSA8bWF0aD4gdGFnIGlzIHNldCB0byBhIGxpc3Qgb2YgcmVjb21tZW5kZWQgbWF0aCBm b250cy4KKyAgICBGb3IgYmVzdCByZW5kZXJpbmcsIGF1dGhvcnMgYW5kIHJlYWRlcnMgYXJlIGVu Y291cmFnZWQgdG8gdXNlIHRleHQgYW5kIG1hdGggZm9udHMgd2l0aCBjb25zaXN0ZW50CisgICAg c3R5bGUgKGFwcGVhcmFuY2UsIHNpemUuLi4pLCBzZWUgaHR0cDovL3RyYWMud2Via2l0Lm9yZy93 aWtpL01hdGhNTC9Gb250cyNDdXN0b21pemluZ01hdGhGb250CisgICAgRklYTUU6IFNob3VsZCB3 ZSBtYWtlIG1hdGggZm9udCBwcm9wZXJ0aWVzIGNvbmZpZ3VyYWJsZSAoaHR0cDovL3dlYmtpdC5v cmcvYi8xNTY4NDMpPworICAgICovCisgICAgZm9udC1mYW1pbHk6CisgICAgICAgLyoKKyAgICAg ICBUaGlzIGZvbnQgaGFzIENvbXB1dGVyIE1vZGVybiBzdHlsZSBhbmQgaXMgcHJvdmlkZWQgd2l0 aCBtb3N0IFRlWCAmIExpbnV4IGRpc3RyaWJ1dGlvbnMuCisgICAgICAgV2UgcHV0IGl0IGFzIHRo ZSBkZWZhdWx0IGJlY2F1c2UgaXRzIHN0eWxlIGlzIGZhbWlsaWFyIHRvIFRlWCwgV2lraXBlZGlh IGFuZCBtYXRoIHBlb3BsZS4KKyAgICAgICAqLworICAgICAgICJMYXRpbiBNb2Rlcm4gTWF0aCIs CisKKyAgICAgICAvKgorICAgICAgIFRoZSBmb2xsb3dpbmcgZm9udHMgaGF2ZSBUaW1lcyBzdHls ZSBhbmQgYXJlIHByb3ZpZGVkIHdpdGggbW9zdCBUZVggJiBMaW51eCBkaXN0cmlidXRpb25zLgor ICAgICAgIFdlIHB1dCBYSVRTICYgU1RJWCBhcyBhIHNlY29uZCBvcHRpb24gYmVjYXVzZSB0aGV5 IGhhdmUgdmVyeSBnb29kIHVuaWNvZGUgY292ZXJhZ2UuCisgICAgICAgWElUUyBpcyBhIGZvcmsg b2YgU1RJWCB3aXRoIGJ1ZyBmaXhlcyBhbmQgbW9yZSBBcmFiaWMvUlRMIGZlYXR1cmVzIHNvIHdl IHB1dCBpdCBmaXJzdC4KKyAgICAgICAqLworICAgICAgICJYSVRTIE1hdGgiLAorICAgICAgICJT VElYIE1hdGgiLAorICAgICAgICJMaWJlcnRpbnVzIE1hdGgiLAorICAgICAgICJUZVggR3lyZSBU ZXJtZXMgTWF0aCIsCisKKyAgICAgICAvKgorICAgICAgIFRoZXNlIGZvbnRzIHJlc3BlY3RpdmVs eSBoYXZlIHN0eWxlIGNvbXBhdGlibGUgd2l0aCBCb29rbWFuIE9sZCBhbmQgQ2VudHVyeSBTY2hv b2xib29rLgorICAgICAgIFRoZXkgYXJlIHByb3ZpZGVkIHdpdGggbW9zdCBUZVggJiBMaW51eCBk aXN0cmlidXRpb25zLgorICAgICAgICovCisgICAgICAgIlRlWCBHeXJlIEJvbnVtIE1hdGgiLAor ICAgICAgICJUZVggR3lyZSBTY2hvbGEiLAorCisgICAgICAgLyoKKyAgICAgICBUaGUgZm9sbG93 aW5nIGZvbnRzIGhhdmUgUGFsYXRpbm8gc3R5bGUgYW5kIGFyZSBwcm92aWRlZCB3aXRoIG1vc3Qg VGVYICYgTGludXggZGlzdHJpYnV0aW9ucy4KKyAgICAgICBBc2FuYSBNYXRoIGhhcyBzb21lIHJl bmRlcmluZyBpc3N1ZXMgKGUuZy4gbWlzc2luZyBpdGFsaWMgY29ycmVjdGlvbikgc28gd2UgcHV0 IGl0IGFmdGVyLgorICAgICAgICovCisgICAgICAgIlRlWCBHeXJlIFBhZ2VsbGEgTWF0aCIsCisg ICAgICAgIkFzYW5hIE1hdGgiLAorCisgICAgICAgLyoKKyAgICAgICBUaGUgZm9sbG93aW5nIGZv bnRzIGFyZSBwcm9wcmlldGFyeSBhbmQgaGF2ZSBub3QgbXVjaCBiZWVuIHRlc3RlZCBzbyB3ZSBw dXQgdGhlbSBhdCB0aGUgZW5kLgorICAgICAgIFdlIHB1dCBDYW1icmlhIE1hdGggZmlyc3Qgc2lu Y2UgaXQgaXMgcHJlLWluc3RhbGxlZCBvbiBXaW5kb3dzIDcgYW5kIGhpZ2hlci4KKyAgICAgICAq LworICAgICAgICJDYW1icmlhIE1hdGgiLAorICAgICAgICJMdWNpZGEgQnJpZ2h0IE1hdGgiLAor ICAgICAgICJNaW5pb24gTWF0aCIsCisKKyAgICAgICAvKgorICAgICAgIFRoZSBmb2xsb3dpbmcg Zm9udHMgZG8gbm90IHNhdGlzZnkgdGhlIHJlcXVpcmVtZW50cyBmb3IgZ29vZCBtYXRoZW1hdGlj YWwgcmVuZGVyaW5nLgorICAgICAgIFRoZXNlIGFyZSBwcmUtaW5zdGFsbGVkIG9uIE1hYyBhbmQg aU9TIHNvIHdlIGxpc3QgdGhlbSB0byBwcm92aWRlIG1pbmltYWwgdW5pY29kZS1iYXNlZAorICAg ICAgIG1hdGhlbWF0aWNhbCByZW5kZXJpbmcuIEZvciBtb3JlIGV4cGxhbmF0aW9uIG9mIGZhbGxi YWNrIG1lY2hhbmlzbXMgYW5kIG1pc3NpbmcgZmVhdHVyZXMgc2VlCisgICAgICAgaHR0cDovL3Ry YWMud2Via2l0Lm9yZy93aWtpL01hdGhNTC9Gb250cyNPYnNvbGV0ZUZvbnRzYW5kRmFsbGJhY2tN ZWNoYW5pc21zLgorICAgICAgIFNUSVggZm9udHMgaGF2ZSBiZXN0IHVuaWNvZGUgY292ZXJhZ2Ug c28gd2UgcHV0IHRoZW0gZmlyc3QuICovCisgICAgICAgU1RJWEdlbmVyYWwsCisgICAgICAgU1RJ WFNpemVPbmVTeW0sCisgICAgICAgU3ltYm9sLAorICAgICAgICJUaW1lcyBOZXcgUm9tYW4iLAor CisgICAgICAgLyogTWF0aGVtYXRpY2FsIGZvbnRzIGdlbmVyYWxseSB1c2UgInNlcmlmIiBzdHls ZS4gSGVuY2Ugd2UgYXBwZW5kIHRoZSBnZW5lcmljICJzZXJpZiIgZmFtaWx5CisgICAgICAgYXMg YSBmYWxsYmFjayBpbiBvcmRlciB0byBpbmNyZWFzZSBvdXIgY2hhbmNlIHRvIGZpbmQgYSBtYXRo ZW1hdGljYWwgZm9udC4gKi8KKyAgICAgICBzZXJpZjsKKworICAgIC8qIEZJWE1FOiBTaG91bGQg d2UgcmVzZXQgbW9yZSBDU1MgcHJvcGVydGllcyAoaHR0cDovL3dlYmtpdC5vcmcvYi8xNTY4Mzkp PyAqLwogfQogbXRleHQgewogICAgIGxpbmUtaGVpZ2h0OiAxLjA7CiB9CiAKLS8qIEZvbnRzIHdp dGggYXBwcm9wcmlhdGUgVW5pY29kZSBjb3ZlcmFnZSBhbmQgT3BlblR5cGUgZmVhdHVyZXMgYXJl IHJlcXVpcmVkIGZvciBnb29kIG1hdGggcmVuZGVyaW5nLgotICAgQ29uc2VxdWVudGx5IHRoZSBk ZWZhdWx0IGZvbnQtZmFtaWx5IG9uIHRoZSA8bWF0aD4gdGFnIGlzIG5vdCBpbmhlcml0ZWQgYnV0 IHNldCB0byBhIGxpc3Qgb2Yga25vd24gbWF0aCBmb250cy4KLSAgIFNlZSBodHRwOi8vdHJhYy53 ZWJraXQub3JnL3dpa2kvTWF0aE1ML0ZvbnRzLgotICAgRklYTUU6IE9TIFggYW5kIGlPUyBkbyBu b3QgaGF2ZSBzdWNoIGZvbnRzIHByZS1pbnN0YWxsZWQgKGJ1Z3MgMTcwMjExNDUsIDE2ODQxMDIz IGFuZCAxNjg0MzA0MSBmcm9tIEFwcGxlIGJ1ZyB0cmFja2VyKS4KLSAgIEhlbmNlIHdlIGFsc28g YXBwZW5kIHNvbWUgc3lzdGVtIGZvbnRzIHRvIHByb3ZpZGUgbWluaW1hbCBVbmljb2RlIGNvdmVy YWdlIGFuZCBsaW1pdGVkIG9wZXJhdG9yIHN0cmV0Y2hpbmcuCi0qLwotbWF0aCB7Ci0gICAgZm9u dC1mYW1pbHk6ICJMYXRpbiBNb2Rlcm4gTWF0aCIsCi0gICAgICAgICAgICAgICAgICJYSVRTIE1h dGgiLAotICAgICAgICAgICAgICAgICAiU1RJWCBNYXRoIiwKLSAgICAgICAgICAgICAgICAgIkxp YmVydGludXMgTWF0aCIsCi0gICAgICAgICAgICAgICAgICJUZVggR3lyZSBCb251bSBNYXRoIiwK LSAgICAgICAgICAgICAgICAgIlRlWCBHeXJlIFBhZ2VsbGEgTWF0aCIsCi0gICAgICAgICAgICAg ICAgICJUZVggR3lyZSBTY2hvbGEiLAotICAgICAgICAgICAgICAgICAiVGVYIEd5cmUgVGVybWVz IE1hdGgiLAotICAgICAgICAgICAgICAgICAiQ2FtYnJpYSBNYXRoIiwKLSAgICAgICAgICAgICAg ICAgIkFzYW5hIE1hdGgiLAotICAgICAgICAgICAgICAgICAiTHVjaWRhIEJyaWdodCBNYXRoIiwK LSAgICAgICAgICAgICAgICAgIk1pbmlvbiBNYXRoIiwKLSAgICAgICAgICAgICAgICAgU1RJWEdl bmVyYWwsCi0gICAgICAgICAgICAgICAgIFNUSVhTaXplT25lU3ltLAotI2lmIGRlZmluZWQoV1RG X1BMQVRGT1JNX0lPUykgJiYgV1RGX1BMQVRGT1JNX0lPUwotICAgICAgICAgICAgICAgICBTeW1i b2wsCi0gICAgICAgICAgICAgICAgICJUaW1lcyBOZXcgUm9tYW4iLAotI2VuZGlmCi0gICAgICAg ICAgICAgICAgIHNlcmlmOwotfQotCiBtYXRoIHsKICAgICBkaXNwbGF5OiAtd2Via2l0LWlubGlu ZS1mbGV4ICFpbXBvcnRhbnQ7CiAgICAgcGFkZGluZy1sZWZ0OiAxcHg7Cg==