137919 2014-10-21 06:21:06 -0700 Match spec for font-weight: bolder|lighter 2014-10-22 04:16:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 mtiborinf webkit-unassigned commit-queue darin ossy rniwa syoichi oldest_to_newest 1043163 0 mtiborinf 2014-10-21 06:21:06 -0700 Consider merging https://chromiumcodereview.appspot.com/15994009 and https://codereview.chromium.org/137813004 from blink to make font-weight: bolder/lighter work correctly. Match spec for font-weight: bolder|lighter https://chromiumcodereview.appspot.com/15994009 Currently, bolder and lighter change font-weight in a non-compliant way. The spec (http://www.w3.org/TR/css3-fonts/#bolderlighter) defines exactly what the computed values should be given the inherited weight values, so we should match those. The removed FIXME's for selecting the next lightest/heaviest weight from the used font family seems to refer to behaviour from CSS1 (http://www.w3.org/TR/CSS1/#font-weight), while this is replaced with a simpler procedure for resolving bolder and lighter in font weights in CSS2 (http://www.w3.org/TR/CSS2/fonts.html#propdef-font-weight) and CSS3 (link above). Multiple selectors setting relative font-weight names to an element result in a cumulative result https://codereview.chromium.org/137813004 According to http://dev.w3.org/csswg/css-fonts/#font-weight-prop, the computed weight of 'lighter' and 'bolder' are based on the inherited 'font-weight', so set that inherited weight before calculating 'lighter' and 'bolder'. 1043166 1 240199 mtiborinf 2014-10-21 06:50:28 -0700 Created attachment 240199 Patch This patch will merge https://chromiumcodereview.appspot.com/15994009 and https://codereview.chromium.org/137813004 from blink. 1043274 2 240199 kling 2014-10-21 14:00:17 -0700 Comment on attachment 240199 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240199&action=review Looks nice. r=me > Source/WebCore/ChangeLog:29 > + css3/font-wight.html font-wight -> font-weight 1043399 3 240260 mtiborinf 2014-10-22 03:31:16 -0700 Created attachment 240260 patch for landing patch for landing 1043406 4 240260 commit-queue 2014-10-22 04:16:38 -0700 Comment on attachment 240260 patch for landing Clearing flags on attachment: 240260 Committed r175043: <http://trac.webkit.org/changeset/175043> 1043407 5 commit-queue 2014-10-22 04:16:42 -0700 All reviewed patches have been landed. Closing bug. 240199 2014-10-21 06:50:28 -0700 2014-10-22 03:31:16 -0700 Patch patch.patch text/plain 13289 mtiborinf ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2MTI2NDg1Li5jYjlkZGJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTQtMTAt MjEgIFRpYm9yIE1lc3phcm9zICA8dG1lc3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5j b20+CisKKyAgICAgICAgTWF0Y2ggc3BlYyBmb3IgZm9udC13ZWlnaHQ6IGJvbGRlcnxsaWdodGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBh dGNoIGlzIGEgbWVyZ2Ugb2YgQmxpbmsncworICAgICAgICBodHRwczovL2Nocm9taXVtY29kZXJl dmlldy5hcHBzcG90LmNvbS8xNTk5NDAwOSBhbmQKKyAgICAgICAgaHR0cHM6Ly9jb2RlcmV2aWV3 LmNocm9taXVtLm9yZy8xMzc4MTMwMDQKKworICAgICAgICAqIGNzczMvZm9udC13ZWlnaHQtbXVs dGlwbGUtc2VsZWN0b3JzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY3NzMy9mb250 LXdlaWdodC1tdWx0aXBsZS1zZWxlY3RvcnMuaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9m b250LXdpZ2h0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY3NzMy9mb250LXdpZ2h0 Lmh0bWw6IEFkZGVkLgorCiAyMDE0LTEwLTE3ICBKZWZmcmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5j b20+CiAKICAgICAgICAgRW5zdXJlIGF0dGFjaGVkIGZyYW1lIGNvdW50IGRvZXNuJ3QgZXhjZWVk IHRoZSBtYXhpbXVtIGFsbG93ZWQgZnJhbWVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz L2ZvbnQtd2VpZ2h0LW11bHRpcGxlLXNlbGVjdG9ycy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9jc3MzL2ZvbnQtd2VpZ2h0LW11bHRpcGxlLXNlbGVjdG9ycy1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWFmY2U3ZQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2NzczMvZm9udC13ZWlnaHQtbXVsdGlwbGUtc2VsZWN0b3JzLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDQyIEBACitUZXN0IHRoYXQgZm9udC13ZWlnaHQ6IGJvbGRlciBhbmQg Zm9udC13ZWlnaHQ6IGxpZ2h0ZXIgYXJlIG5vdCBjdW11bGF0aXZlIHdoZW4gbXVsdGlwbGUgc2Vs ZWN0b3JzIGFwcGx5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBB U1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBnZXRD b21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1dGVk U3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5 bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAiMTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91 dGVyKS5mb250V2VpZ2h0IGlzICIyMDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5m b250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9u dFdlaWdodCBpcyAiMTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0 IGlzICIzMDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICJu b3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAiMTAw IgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICJub3JtYWwiCitQ QVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICJib2xkIgorUEFTUyBn ZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29t cHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAibm9ybWFsIgorUEFTUyBnZXRDb21wdXRl ZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiYm9sZCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHls ZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0 ZXIpLmZvbnRXZWlnaHQgaXMgIjUwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZv bnRXZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdl aWdodCBpcyAiMTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlz ICI2MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICI5MDAi CitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAibm9ybWFsIgor UEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICJib2xkIgorUEFTUyBn ZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiOTAwIgorUEFTUyBnZXRDb21w dXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0 ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAiYm9sZCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHls ZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdo dGVyKS5mb250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIp LmZvbnRXZWlnaHQgaXMgIjgwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRX ZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0 IGlzICJib2xkIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICI5 MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICI5MDAiCitQ QVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAiYm9sZCIKK1BBU1Mg c3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtd2VpZ2h0LW11bHRpcGxlLXNlbGVjdG9ycy5odG1sIGIv TGF5b3V0VGVzdHMvY3NzMy9mb250LXdlaWdodC1tdWx0aXBsZS1zZWxlY3RvcnMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mOGUxM2FkCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvY3NzMy9mb250LXdlaWdodC1tdWx0aXBsZS1zZWxlY3RvcnMuaHRtbApA QCAtMCwwICsxLDQ0IEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorI291dGVyID4gZGl2IHsg Zm9udC13ZWlnaHQ6IGJvbGRlcjsgfQorI291dGVyID4gZGl2I2JvbGRlciB7IGZvbnQtd2VpZ2h0 OiBib2xkZXI7IH0KKyNvdXRlciA+IGRpdiNsaWdodGVyIHsgZm9udC13ZWlnaHQ6IGxpZ2h0ZXI7 IH0KKzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2Ny aXB0PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGlkPSJvdXRlciI+CisgICAgPGRpdiBpZD0iYm9s ZGVyIj48L2Rpdj4KKyAgICA8ZGl2IGlkPSJsaWdodGVyIj48L2Rpdj4KKzwvZGl2PgorPGRpdiBp ZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oJ1Rlc3QgdGhhdCBmb250 LXdlaWdodDogYm9sZGVyIGFuZCBmb250LXdlaWdodDogbGlnaHRlciBhcmUgbm90IGN1bXVsYXRp dmUgd2hlbiBtdWx0aXBsZSBzZWxlY3RvcnMgYXBwbHkuJyk7CisKK3RhYmxlID0gWworWyIxMDAi ICAgLCAiMTAwIiAgICwgIm5vcm1hbCIsICIxMDAiXSwKK1siMjAwIiAgICwgIjIwMCIgICAsICJu b3JtYWwiLCAiMTAwIl0sCitbIjMwMCIgICAsICIzMDAiICAgLCAibm9ybWFsIiwgIjEwMCJdLAor WyI0MDAiICAgLCAibm9ybWFsIiwgImJvbGQiICAsICIxMDAiXSwKK1sibm9ybWFsIiwgIm5vcm1h bCIsICJib2xkIiAgLCAiMTAwIl0sCitbIjUwMCIgICAsICI1MDAiICAgLCAiYm9sZCIgICwgIjEw MCJdLAorWyI2MDAiICAgLCAiNjAwIiAgICwgIjkwMCIgICAsICJub3JtYWwiXSwKK1siNzAwIiAg ICwgImJvbGQiICAsICI5MDAiICAgLCAibm9ybWFsIl0sCitbImJvbGQiICAsICJib2xkIiAgLCAi OTAwIiAgICwgIm5vcm1hbCJdLAorWyI4MDAiICAgLCAiODAwIiAgICwgIjkwMCIgICAsICJib2xk Il0sCitbIjkwMCIgICAsICI5MDAiICAgLCAiOTAwIiAgICwgImJvbGQiXSwKK107CisKK3ZhciBv dXRlciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdXRlciIpOwordmFyIGJvbGRlciA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2xkZXIiKTsKK3ZhciBsaWdodGVyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImxpZ2h0ZXIiKTsKK2Zvcih2YXIgaT0wOyBpPHRhYmxlLmxlbmd0aDsg aSsrKSB7CisgICAgb3V0ZXIuc3R5bGUuZm9udFdlaWdodCA9IHRhYmxlW2ldWzBdOworICAgIHNo b3VsZEJlRXF1YWxUb1N0cmluZygnZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCcs IHRhYmxlW2ldWzFdKTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2dldENvbXB1dGVkU3R5 bGUoYm9sZGVyKS5mb250V2VpZ2h0JywgdGFibGVbaV1bMl0pOworICAgIHNob3VsZEJlRXF1YWxU b1N0cmluZygnZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0JywgdGFibGVbaV1b M10pOworfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mb250LXdpZ2h0LWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2NzczMvZm9udC13aWdodC1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2M4NGZiOQotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2NzczMvZm9udC13aWdodC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0MiBAQAor VGVzdCB0aGF0IGZvbnQtd2VpZ2h0OiBib2xkZXIgYW5kIGZvbnQtd2VpZ2h0OiBsaWdodGVyIGJl aGF2ZSBhY2NvcmRpbmcgdG8gc3BlYy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisK K1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAiMTAwIgorUEFTUyBn ZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAibm9ybWFsIgorUEFTUyBnZXRD b21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29tcHV0 ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAiMjAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxl KGJvbGRlcikuZm9udFdlaWdodCBpcyAibm9ybWFsIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxp Z2h0ZXIpLmZvbnRXZWlnaHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlciku Zm9udFdlaWdodCBpcyAiMzAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdl aWdodCBpcyAibm9ybWFsIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWln aHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAi bm9ybWFsIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiYm9s ZCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQ QVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1Mg Z2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENv bXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAiMTAwIgorUEFTUyBnZXRDb21wdXRl ZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICI1MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUo Ym9sZGVyKS5mb250V2VpZ2h0IGlzICJib2xkIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0 ZXIpLmZvbnRXZWlnaHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9u dFdlaWdodCBpcyAiNjAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdo dCBpcyAiOTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMg Im5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAiYm9s ZCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BB U1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNT IGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENv bXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICI5MDAiCitQQVNTIGdldENvbXB1dGVk U3R5bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAibm9ybWFsIgorUEFTUyBnZXRDb21wdXRlZFN0 eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICI4MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9s ZGVyKS5mb250V2VpZ2h0IGlzICI5MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlciku Zm9udFdlaWdodCBpcyAiYm9sZCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdl aWdodCBpcyAiOTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBp cyAiOTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgImJv bGQiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mb250LXdpZ2h0Lmh0bWwgYi9MYXlvdXRUZXN0 cy9jc3MzL2ZvbnQtd2lnaHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li40NDg1YzQ3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mb250LXdpZ2h0 Lmh0bWwKQEAgLTAsMCArMSw0NCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKyNib2xkZXIg eyBmb250LXdlaWdodDogYm9sZGVyOyB9CisjbGlnaHRlciB7IGZvbnQtd2VpZ2h0OiBsaWdodGVy OyB9Cis8L3N0eWxlPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+ PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgaWQ9Im91dGVyIj4KKyAgICA8ZGl2IGlk PSJib2xkZXIiPjwvZGl2PgorICAgIDxkaXYgaWQ9ImxpZ2h0ZXIiPjwvZGl2PgorPC9kaXY+Cis8 ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbignVGVzdCB0aGF0 IGZvbnQtd2VpZ2h0OiBib2xkZXIgYW5kIGZvbnQtd2VpZ2h0OiBsaWdodGVyIGJlaGF2ZSBhY2Nv cmRpbmcgdG8gc3BlYy4nKTsKKwordGFibGUgPSBbCitbIjEwMCIgICAsICIxMDAiICAgLCAibm9y bWFsIiwgIjEwMCJdLAorWyIyMDAiICAgLCAiMjAwIiAgICwgIm5vcm1hbCIsICIxMDAiXSwKK1si MzAwIiAgICwgIjMwMCIgICAsICJub3JtYWwiLCAiMTAwIl0sCitbIjQwMCIgICAsICJub3JtYWwi LCAiYm9sZCIgICwgIjEwMCJdLAorWyJub3JtYWwiLCAibm9ybWFsIiwgImJvbGQiICAsICIxMDAi XSwKK1siNTAwIiAgICwgIjUwMCIgICAsICJib2xkIiAgLCAiMTAwIl0sCitbIjYwMCIgICAsICI2 MDAiICAgLCAiOTAwIiAgICwgIm5vcm1hbCJdLAorWyI3MDAiICAgLCAiYm9sZCIgICwgIjkwMCIg ICAsICJub3JtYWwiXSwKK1siYm9sZCIgICwgImJvbGQiICAsICI5MDAiICAgLCAibm9ybWFsIl0s CitbIjgwMCIgICAsICI4MDAiICAgLCAiOTAwIiAgICwgImJvbGQiXSwKK1siOTAwIiAgICwgIjkw MCIgICAsICI5MDAiICAgLCAiYm9sZCJdLAorXTsKKwordmFyIG91dGVyID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoIm91dGVyIik7Cit2YXIgYm9sZGVyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImJvbGRlciIpOwordmFyIGxpZ2h0ZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGln aHRlciIpOworZm9yKHZhciBpPTA7IGk8dGFibGUubGVuZ3RoOyBpKyspIHsKKyAgICBvdXRlci5z dHlsZS5mb250V2VpZ2h0ID0gdGFibGVbaV1bMF07CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5n KCdnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0JywgdGFibGVbaV1bMV0pOworICAg IHNob3VsZEJlRXF1YWxUb1N0cmluZygnZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWln aHQnLCB0YWJsZVtpXVsyXSk7CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdnZXRDb21wdXRl ZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQnLCB0YWJsZVtpXVszXSk7Cit9Cis8L3NjcmlwdD4K KzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTE2NTQ4ZS4uY2ZkM2I2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTEwLTIx ICBUaWJvciBNZXN6YXJvcyAgPHRtZXN6YXJvcy51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29t PgorCisgICAgICAgIE1hdGNoIHNwZWMgZm9yIGZvbnQtd2VpZ2h0OiBib2xkZXJ8bGlnaHRlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3OTE5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBpcyBhIG1lcmdlIG9mIEJsaW5rJ3MKKyAgICAgICAgaHR0cHM6Ly9jaHJvbWl1bWNvZGVyZXZp ZXcuYXBwc3BvdC5jb20vMTU5OTQwMDkKKyAgICAgICAgCisgICAgICAgIEN1cnJlbnRseSwgYm9s ZGVyIGFuZCBsaWdodGVyIGNoYW5nZSBmb250LXdlaWdodCBpbiBhIG5vbi1jb21wbGlhbnQgd2F5 LgorICAgICAgICBUaGUgc3BlYyAoaHR0cDovL3d3dy53My5vcmcvVFIvY3NzMy1mb250cy8jYm9s ZGVybGlnaHRlcikgZGVmaW5lcworICAgICAgICBleGFjdGx5IHdoYXQgdGhlIGNvbXB1dGVkIHZh bHVlcyBzaG91bGQgYmUgZ2l2ZW4gdGhlIGluaGVyaXRlZCB3ZWlnaHQgdmFsdWVzLAorICAgICAg ICBzbyB3ZSBzaG91bGQgbWF0Y2ggdGhvc2UuCisgICAgICAgIAorICAgICAgICBUaGUgcmVtb3Zl ZCBGSVhNRSdzIGZvciBzZWxlY3RpbmcgdGhlIG5leHQgbGlnaHRlc3QvaGVhdmllc3Qgd2VpZ2h0 IGZyb20KKyAgICAgICAgdGhlIHVzZWQgZm9udCBmYW1pbHkgc2VlbXMgdG8gcmVmZXIgdG8gYmVo YXZpb3VyIGZyb20KKyAgICAgICAgQ1NTMSAoaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMS8jZm9u dC13ZWlnaHQpLCB3aGlsZSB0aGlzIGlzIHJlcGxhY2VkCisgICAgICAgIHdpdGggYSBzaW1wbGVy IHByb2NlZHVyZSBmb3IgcmVzb2x2aW5nIGJvbGRlciBhbmQgbGlnaHRlciBpbiBmb250IHdlaWdo dHMKKyAgICAgICAgaW4gQ1NTMiAoaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMi9mb250cy5odG1s I3Byb3BkZWYtZm9udC13ZWlnaHQpIGFuZCBDU1MzIChsaW5rIGFib3ZlKS4KKyAgICAgICAgCisg ICAgICAgIGFuZCBodHRwczovL2NvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzEzNzgxMzAwNAorICAg ICAgICAKKyAgICAgICAgQWNjb3JkaW5nIHRvIGh0dHA6Ly9kZXYudzMub3JnL2Nzc3dnL2Nzcy1m b250cy8jZm9udC13ZWlnaHQtcHJvcCwgdGhlIGNvbXB1dGVkCisgICAgICAgIHdlaWdodCBvZiAn bGlnaHRlcicgYW5kICdib2xkZXInIGFyZSBiYXNlZCBvbiB0aGUgaW5oZXJpdGVkICdmb250LXdl aWdodCcsIHNvIHNldAorICAgICAgICB0aGF0IGluaGVyaXRlZCB3ZWlnaHQgYmVmb3JlIGNhbGN1 bGF0aW5nICdsaWdodGVyJyBhbmQgJ2JvbGRlcicuCisKKyAgICAgICAgVGVzdHM6IGNzczMvZm9u dC13ZWlnaHQtbXVsdGlwbGUtc2VsZWN0b3JzLmh0bWwKKyAgICAgICAgICAgICAgIGNzczMvZm9u dC13aWdodC5odG1sCisKKyAgICAgICAgKiBjc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Rm9udFdlaWdodDo6YXBwbHlWYWx1ZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZvbnREZXNjcmlwdGlvbjo6bGlnaHRlcldlaWdodCk6CisgICAgICAgIChX ZWJDb3JlOjpGb250RGVzY3JpcHRpb246OmJvbGRlcldlaWdodCk6CisKIDIwMTQtMTAtMjEgIFph biBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDYWlyb10gTWFr ZSBkYXNoUGF0dGVybiwgZG90UGF0dGVybiBpbiBHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3Jt U3Ryb2tlU3R5bGUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJl Y2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHls ZUJ1aWxkZXIuY3BwCmluZGV4IGNiODI5ZWUuLjljNTU1NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKQEAgLTkyOCw5ICs5MjgsMTEgQEAgcHVi bGljOgogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUJvbGRlcjoKKyAgICAgICAgICAgIGZvbnREZXNjcmlw dGlvbi5zZXRXZWlnaHQoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+Zm9udERlc2NyaXB0 aW9uKCkud2VpZ2h0KCkpOwogICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChm b250RGVzY3JpcHRpb24uYm9sZGVyV2VpZ2h0KCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgQ1NTVmFsdWVMaWdodGVyOgorICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNl dFdlaWdodChzdHlsZVJlc29sdmVyLT5wYXJlbnRTdHlsZSgpLT5mb250RGVzY3JpcHRpb24oKS53 ZWlnaHQoKSk7CiAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KGZvbnREZXNj cmlwdGlvbi5saWdodGVyV2VpZ2h0KCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRl ZmF1bHQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 RGVzY3JpcHRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERl c2NyaXB0aW9uLmNwcAppbmRleCA5NDRmZWY1Li4zMWVlOWQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250RGVzY3JpcHRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5jcHAKQEAgLTQ0LDI3 ICs0NCwxOSBAQCBDT01QSUxFX0FTU0VSVChzaXplb2YoRm9udERlc2NyaXB0aW9uKSA9PSBzaXpl b2YoU2FtZVNpemVBc0ZvbnREZXNjcmlwdGlvbiksIEZvbgogCiBGb250V2VpZ2h0IEZvbnREZXNj cmlwdGlvbjo6bGlnaHRlcldlaWdodCh2b2lkKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBTaG91 bGQgYWN0dWFsbHkgcmV0dXJuIHRoZSBDU1Mgd2VpZ2h0IGNvcnJlc3BvbmRpbmcgdG8gbmV4dCBs aWdodGVzdAotICAgIC8vIHdlaWdodCBvZiB0aGUgY3VycmVudGx5IHVzZWQgZm9udCBmYW1pbHku CiAgICAgc3dpdGNoIChtX3dlaWdodCkgewogICAgICAgICBjYXNlIEZvbnRXZWlnaHQxMDA6CiAg ICAgICAgIGNhc2UgRm9udFdlaWdodDIwMDoKLSAgICAgICAgICAgIHJldHVybiBGb250V2VpZ2h0 MTAwOwotCiAgICAgICAgIGNhc2UgRm9udFdlaWdodDMwMDoKLSAgICAgICAgICAgIHJldHVybiBG b250V2VpZ2h0MjAwOwotCiAgICAgICAgIGNhc2UgRm9udFdlaWdodDQwMDoKICAgICAgICAgY2Fz ZSBGb250V2VpZ2h0NTAwOgotICAgICAgICAgICAgcmV0dXJuIEZvbnRXZWlnaHQzMDA7CisgICAg ICAgICAgICByZXR1cm4gRm9udFdlaWdodDEwMDsKIAogICAgICAgICBjYXNlIEZvbnRXZWlnaHQ2 MDA6CiAgICAgICAgIGNhc2UgRm9udFdlaWdodDcwMDoKICAgICAgICAgICAgIHJldHVybiBGb250 V2VpZ2h0NDAwOwogCiAgICAgICAgIGNhc2UgRm9udFdlaWdodDgwMDoKLSAgICAgICAgICAgIHJl dHVybiBGb250V2VpZ2h0NTAwOwotCiAgICAgICAgIGNhc2UgRm9udFdlaWdodDkwMDoKICAgICAg ICAgICAgIHJldHVybiBGb250V2VpZ2h0NzAwOwogICAgIH0KQEAgLTc0LDEzICs2Niw5IEBAIEZv bnRXZWlnaHQgRm9udERlc2NyaXB0aW9uOjpsaWdodGVyV2VpZ2h0KHZvaWQpIGNvbnN0CiAKIEZv bnRXZWlnaHQgRm9udERlc2NyaXB0aW9uOjpib2xkZXJXZWlnaHQodm9pZCkgY29uc3QKIHsKLSAg ICAvLyBGSVhNRTogU2hvdWxkIGFjdHVhbGx5IHJldHVybiB0aGUgQ1NTIHdlaWdodCBjb3JyZXNw b25kaW5nIHRvIG5leHQgaGVhdmllc3QKLSAgICAvLyB3ZWlnaHQgb2YgdGhlIGN1cnJlbnRseSB1 c2VkIGZvbnQgZmFtaWx5LgogICAgIHN3aXRjaCAobV93ZWlnaHQpIHsKICAgICAgICAgY2FzZSBG b250V2VpZ2h0MTAwOgogICAgICAgICBjYXNlIEZvbnRXZWlnaHQyMDA6Ci0gICAgICAgICAgICBy ZXR1cm4gRm9udFdlaWdodDMwMDsKLQogICAgICAgICBjYXNlIEZvbnRXZWlnaHQzMDA6CiAgICAg ICAgICAgICByZXR1cm4gRm9udFdlaWdodDQwMDsKIApAQCAtOTAsOCArNzgsNiBAQCBGb250V2Vp Z2h0IEZvbnREZXNjcmlwdGlvbjo6Ym9sZGVyV2VpZ2h0KHZvaWQpIGNvbnN0CiAKICAgICAgICAg Y2FzZSBGb250V2VpZ2h0NjAwOgogICAgICAgICBjYXNlIEZvbnRXZWlnaHQ3MDA6Ci0gICAgICAg ICAgICByZXR1cm4gRm9udFdlaWdodDgwMDsKLQogICAgICAgICBjYXNlIEZvbnRXZWlnaHQ4MDA6 CiAgICAgICAgIGNhc2UgRm9udFdlaWdodDkwMDoKICAgICAgICAgICAgIHJldHVybiBGb250V2Vp Z2h0OTAwOwo= 240260 2014-10-22 03:31:16 -0700 2014-10-22 04:16:38 -0700 patch for landing patch_updated.patch text/plain 13269 mtiborinf ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0OTMyNzQwLi44YWY0MjliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTQtMTAt MjIgIFRpYm9yIE1lc3phcm9zICA8dG1lc3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5j b20+CisKKyAgICAgICAgTWF0Y2ggc3BlYyBmb3IgZm9udC13ZWlnaHQ6IGJvbGRlcnxsaWdodGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MTkK KworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggaXMgYSBtZXJnZSBvZiBCbGluaydzCisgICAgICAgIGh0dHBzOi8vY2hyb21pdW1jb2RlcmV2 aWV3LmFwcHNwb3QuY29tLzE1OTk0MDA5IGFuZAorICAgICAgICBodHRwczovL2NvZGVyZXZpZXcu Y2hyb21pdW0ub3JnLzEzNzgxMzAwNAorCisgICAgICAgICogY3NzMy9mb250LXdlaWdodC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvZm9udC13ZWlnaHQtbXVsdGlwbGUtc2Vs ZWN0b3JzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY3NzMy9mb250LXdlaWdodC1t dWx0aXBsZS1zZWxlY3RvcnMuaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9mb250LXdlaWdo dC5odG1sOiBBZGRlZC4KKwogMjAxNC0xMC0yMiAgRGhpIEF1cnJhaG1hbiAgPGRpb3JhaG1hbkBy b2NreWJhcnMuY29tPgogCiAgICAgICAgIEFkZCByZWxMaXN0IHRvIHRoZSBhbmNob3IsIGFyZWEg YW5kIGxpbmsgZWxlbWVudHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZm9udC13ZWln aHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9mb250LXdlaWdodC1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2M4NGZiOQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZm9udC13ZWlnaHQtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsNDIgQEAKK1Rlc3QgdGhhdCBmb250LXdlaWdodDogYm9sZGVyIGFuZCBmb250LXdlaWdo dDogbGlnaHRlciBiZWhhdmUgYWNjb3JkaW5nIHRvIHNwZWMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KKworCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMg IjEwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1h bCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQ QVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjIwMCIKK1BBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29t cHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1dGVk U3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjMwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShi b2xkZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdo dGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZv bnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRX ZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdlaWdo dCBpcyAiMTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICJu b3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0IGlzICJib2xk IgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgIjEwMCIKK1BB U1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAiNTAwIgorUEFTUyBnZXRD b21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiYm9sZCIKK1BBU1MgZ2V0Q29tcHV0 ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1dGVkU3R5 bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjYwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xk ZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5m b250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRX ZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5mb250V2VpZ2h0 IGlzICI5MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRlcikuZm9udFdlaWdodCBpcyAi bm9ybWFsIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0IGlzICJib2xk IgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiOTAwIgorUEFT UyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1Mg Z2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAiODAwIgorUEFTUyBnZXRDb21w dXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiOTAwIgorUEFTUyBnZXRDb21wdXRlZFN0 eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENvbXB1dGVkU3R5bGUo b3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIp LmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250 V2VpZ2h0IGlzICJib2xkIgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNU IENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZm9udC13ZWlnaHQtbXVs dGlwbGUtc2VsZWN0b3JzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvZm9udC13ZWln aHQtbXVsdGlwbGUtc2VsZWN0b3JzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwLi41YWZjZTdlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3Nz My9mb250LXdlaWdodC1tdWx0aXBsZS1zZWxlY3RvcnMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs NDIgQEAKK1Rlc3QgdGhhdCBmb250LXdlaWdodDogYm9sZGVyIGFuZCBmb250LXdlaWdodDogbGln aHRlciBhcmUgbm90IGN1bXVsYXRpdmUgd2hlbiBtdWx0aXBsZSBzZWxlY3RvcnMgYXBwbHkuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0 ZXIpLmZvbnRXZWlnaHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZv bnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250 V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQg aXMgIjIwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIm5v cm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAi CitQQVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjMwMCIKK1BBU1Mg Z2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQQVNTIGdldENvbXB1 dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRT dHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENvbXB1dGVkU3R5bGUo bGlnaHRlcikuZm9udFdlaWdodCBpcyAiMTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVy KS5mb250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNTIGdldENvbXB1dGVkU3R5bGUoYm9sZGVyKS5m b250V2VpZ2h0IGlzICJib2xkIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRX ZWlnaHQgaXMgIjEwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBp cyAiNTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiYm9s ZCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICIxMDAiCitQ QVNTIGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjYwMCIKK1BBU1MgZ2V0 Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0 ZWRTdHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICJub3JtYWwiCitQQVNTIGdldENvbXB1dGVk U3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgImJvbGQiCitQQVNTIGdldENvbXB1dGVkU3R5bGUo Ym9sZGVyKS5mb250V2VpZ2h0IGlzICI5MDAiCitQQVNTIGdldENvbXB1dGVkU3R5bGUobGlnaHRl cikuZm9udFdlaWdodCBpcyAibm9ybWFsIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5m b250V2VpZ2h0IGlzICJib2xkIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdl aWdodCBpcyAiOTAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQg aXMgIm5vcm1hbCIKK1BBU1MgZ2V0Q29tcHV0ZWRTdHlsZShvdXRlcikuZm9udFdlaWdodCBpcyAi ODAwIgorUEFTUyBnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCBpcyAiOTAwIgor UEFTUyBnZXRDb21wdXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQgaXMgImJvbGQiCitQQVNT IGdldENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29t cHV0ZWRTdHlsZShib2xkZXIpLmZvbnRXZWlnaHQgaXMgIjkwMCIKK1BBU1MgZ2V0Q29tcHV0ZWRT dHlsZShsaWdodGVyKS5mb250V2VpZ2h0IGlzICJib2xkIgorUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nz czMvZm9udC13ZWlnaHQtbXVsdGlwbGUtc2VsZWN0b3JzLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZvbnQtd2VpZ2h0LW11bHRpcGxlLXNlbGVjdG9ycy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLmY4ZTEzYWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9j c3MzL2ZvbnQtd2VpZ2h0LW11bHRpcGxlLXNlbGVjdG9ycy5odG1sCkBAIC0wLDAgKzEsNDQgQEAK KzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+Cisjb3V0ZXIgPiBkaXYgeyBmb250LXdlaWdodDogYm9s ZGVyOyB9Cisjb3V0ZXIgPiBkaXYjYm9sZGVyIHsgZm9udC13ZWlnaHQ6IGJvbGRlcjsgfQorI291 dGVyID4gZGl2I2xpZ2h0ZXIgeyBmb250LXdlaWdodDogbGlnaHRlcjsgfQorPC9zdHlsZT4KKzxz Y3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keT4KKzxkaXYgaWQ9Im91dGVyIj4KKyAgICA8ZGl2IGlkPSJib2xkZXIiPjwvZGl2PgorICAg IDxkaXYgaWQ9ImxpZ2h0ZXIiPjwvZGl2PgorPC9kaXY+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rp dj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbignVGVzdCB0aGF0IGZvbnQtd2VpZ2h0OiBib2xkZXIg YW5kIGZvbnQtd2VpZ2h0OiBsaWdodGVyIGFyZSBub3QgY3VtdWxhdGl2ZSB3aGVuIG11bHRpcGxl IHNlbGVjdG9ycyBhcHBseS4nKTsKKwordGFibGUgPSBbCitbIjEwMCIgICAsICIxMDAiICAgLCAi bm9ybWFsIiwgIjEwMCJdLAorWyIyMDAiICAgLCAiMjAwIiAgICwgIm5vcm1hbCIsICIxMDAiXSwK K1siMzAwIiAgICwgIjMwMCIgICAsICJub3JtYWwiLCAiMTAwIl0sCitbIjQwMCIgICAsICJub3Jt YWwiLCAiYm9sZCIgICwgIjEwMCJdLAorWyJub3JtYWwiLCAibm9ybWFsIiwgImJvbGQiICAsICIx MDAiXSwKK1siNTAwIiAgICwgIjUwMCIgICAsICJib2xkIiAgLCAiMTAwIl0sCitbIjYwMCIgICAs ICI2MDAiICAgLCAiOTAwIiAgICwgIm5vcm1hbCJdLAorWyI3MDAiICAgLCAiYm9sZCIgICwgIjkw MCIgICAsICJub3JtYWwiXSwKK1siYm9sZCIgICwgImJvbGQiICAsICI5MDAiICAgLCAibm9ybWFs Il0sCitbIjgwMCIgICAsICI4MDAiICAgLCAiOTAwIiAgICwgImJvbGQiXSwKK1siOTAwIiAgICwg IjkwMCIgICAsICI5MDAiICAgLCAiYm9sZCJdLAorXTsKKwordmFyIG91dGVyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm91dGVyIik7Cit2YXIgYm9sZGVyID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImJvbGRlciIpOwordmFyIGxpZ2h0ZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi bGlnaHRlciIpOworZm9yKHZhciBpPTA7IGk8dGFibGUubGVuZ3RoOyBpKyspIHsKKyAgICBvdXRl ci5zdHlsZS5mb250V2VpZ2h0ID0gdGFibGVbaV1bMF07CisgICAgc2hvdWxkQmVFcXVhbFRvU3Ry aW5nKCdnZXRDb21wdXRlZFN0eWxlKG91dGVyKS5mb250V2VpZ2h0JywgdGFibGVbaV1bMV0pOwor ICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygnZ2V0Q29tcHV0ZWRTdHlsZShib2xkZXIpLmZvbnRX ZWlnaHQnLCB0YWJsZVtpXVsyXSk7CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdnZXRDb21w dXRlZFN0eWxlKGxpZ2h0ZXIpLmZvbnRXZWlnaHQnLCB0YWJsZVtpXVszXSk7Cit9Cis8L3Njcmlw dD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtd2VpZ2h0Lmh0bWwgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZvbnQtd2VpZ2h0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDQ4 NWM0NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZm9udC13ZWlnaHQuaHRt bApAQCAtMCwwICsxLDQ0IEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorI2JvbGRlciB7IGZv bnQtd2VpZ2h0OiBib2xkZXI7IH0KKyNsaWdodGVyIHsgZm9udC13ZWlnaHQ6IGxpZ2h0ZXI7IH0K Kzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Nj cmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPGRpdiBpZD0ib3V0ZXIiPgorICAgIDxkaXYgaWQ9ImJv bGRlciI+PC9kaXY+CisgICAgPGRpdiBpZD0ibGlnaHRlciI+PC9kaXY+Cis8L2Rpdj4KKzxkaXYg aWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCdUZXN0IHRoYXQgZm9u dC13ZWlnaHQ6IGJvbGRlciBhbmQgZm9udC13ZWlnaHQ6IGxpZ2h0ZXIgYmVoYXZlIGFjY29yZGlu ZyB0byBzcGVjLicpOworCit0YWJsZSA9IFsKK1siMTAwIiAgICwgIjEwMCIgICAsICJub3JtYWwi LCAiMTAwIl0sCitbIjIwMCIgICAsICIyMDAiICAgLCAibm9ybWFsIiwgIjEwMCJdLAorWyIzMDAi ICAgLCAiMzAwIiAgICwgIm5vcm1hbCIsICIxMDAiXSwKK1siNDAwIiAgICwgIm5vcm1hbCIsICJi b2xkIiAgLCAiMTAwIl0sCitbIm5vcm1hbCIsICJub3JtYWwiLCAiYm9sZCIgICwgIjEwMCJdLAor WyI1MDAiICAgLCAiNTAwIiAgICwgImJvbGQiICAsICIxMDAiXSwKK1siNjAwIiAgICwgIjYwMCIg ICAsICI5MDAiICAgLCAibm9ybWFsIl0sCitbIjcwMCIgICAsICJib2xkIiAgLCAiOTAwIiAgICwg Im5vcm1hbCJdLAorWyJib2xkIiAgLCAiYm9sZCIgICwgIjkwMCIgICAsICJub3JtYWwiXSwKK1si ODAwIiAgICwgIjgwMCIgICAsICI5MDAiICAgLCAiYm9sZCJdLAorWyI5MDAiICAgLCAiOTAwIiAg ICwgIjkwMCIgICAsICJib2xkIl0sCitdOworCit2YXIgb3V0ZXIgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgib3V0ZXIiKTsKK3ZhciBib2xkZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi Ym9sZGVyIik7Cit2YXIgbGlnaHRlciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsaWdodGVy Iik7Citmb3IodmFyIGk9MDsgaTx0YWJsZS5sZW5ndGg7IGkrKykgeworICAgIG91dGVyLnN0eWxl LmZvbnRXZWlnaHQgPSB0YWJsZVtpXVswXTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2dl dENvbXB1dGVkU3R5bGUob3V0ZXIpLmZvbnRXZWlnaHQnLCB0YWJsZVtpXVsxXSk7CisgICAgc2hv dWxkQmVFcXVhbFRvU3RyaW5nKCdnZXRDb21wdXRlZFN0eWxlKGJvbGRlcikuZm9udFdlaWdodCcs IHRhYmxlW2ldWzJdKTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2dldENvbXB1dGVkU3R5 bGUobGlnaHRlcikuZm9udFdlaWdodCcsIHRhYmxlW2ldWzNdKTsKK30KKzwvc2NyaXB0PgorPHNj cmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNGY4 MjUxLi5jNzkzMDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTQtMTAtMjIgIFRp Ym9yIE1lc3phcm9zICA8dG1lc3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisK KyAgICAgICAgTWF0Y2ggc3BlYyBmb3IgZm9udC13ZWlnaHQ6IGJvbGRlcnxsaWdodGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MTkKKworICAg ICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMg YSBtZXJnZSBvZiBCbGluaydzCisgICAgICAgIGh0dHBzOi8vY2hyb21pdW1jb2RlcmV2aWV3LmFw cHNwb3QuY29tLzE1OTk0MDA5CisgICAgICAgIAorICAgICAgICBDdXJyZW50bHksIGJvbGRlciBh bmQgbGlnaHRlciBjaGFuZ2UgZm9udC13ZWlnaHQgaW4gYSBub24tY29tcGxpYW50IHdheS4KKyAg ICAgICAgVGhlIHNwZWMgKGh0dHA6Ly93d3cudzMub3JnL1RSL2NzczMtZm9udHMvI2JvbGRlcmxp Z2h0ZXIpIGRlZmluZXMKKyAgICAgICAgZXhhY3RseSB3aGF0IHRoZSBjb21wdXRlZCB2YWx1ZXMg c2hvdWxkIGJlIGdpdmVuIHRoZSBpbmhlcml0ZWQgd2VpZ2h0IHZhbHVlcywKKyAgICAgICAgc28g d2Ugc2hvdWxkIG1hdGNoIHRob3NlLgorICAgICAgICAKKyAgICAgICAgVGhlIHJlbW92ZWQgRklY TUUncyBmb3Igc2VsZWN0aW5nIHRoZSBuZXh0IGxpZ2h0ZXN0L2hlYXZpZXN0IHdlaWdodCBmcm9t CisgICAgICAgIHRoZSB1c2VkIGZvbnQgZmFtaWx5IHNlZW1zIHRvIHJlZmVyIHRvIGJlaGF2aW91 ciBmcm9tCisgICAgICAgIENTUzEgKGh0dHA6Ly93d3cudzMub3JnL1RSL0NTUzEvI2ZvbnQtd2Vp Z2h0KSwgd2hpbGUgdGhpcyBpcyByZXBsYWNlZAorICAgICAgICB3aXRoIGEgc2ltcGxlciBwcm9j ZWR1cmUgZm9yIHJlc29sdmluZyBib2xkZXIgYW5kIGxpZ2h0ZXIgaW4gZm9udCB3ZWlnaHRzCisg ICAgICAgIGluIENTUzIgKGh0dHA6Ly93d3cudzMub3JnL1RSL0NTUzIvZm9udHMuaHRtbCNwcm9w ZGVmLWZvbnQtd2VpZ2h0KSBhbmQgQ1NTMyAobGluayBhYm92ZSkuCisgICAgICAgIAorICAgICAg ICBhbmQgaHR0cHM6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy8xMzc4MTMwMDQKKyAgICAgICAg CisgICAgICAgIEFjY29yZGluZyB0byBodHRwOi8vZGV2LnczLm9yZy9jc3N3Zy9jc3MtZm9udHMv I2ZvbnQtd2VpZ2h0LXByb3AsIHRoZSBjb21wdXRlZAorICAgICAgICB3ZWlnaHQgb2YgJ2xpZ2h0 ZXInIGFuZCAnYm9sZGVyJyBhcmUgYmFzZWQgb24gdGhlIGluaGVyaXRlZCAnZm9udC13ZWlnaHQn LCBzbyBzZXQKKyAgICAgICAgdGhhdCBpbmhlcml0ZWQgd2VpZ2h0IGJlZm9yZSBjYWxjdWxhdGlu ZyAnbGlnaHRlcicgYW5kICdib2xkZXInLgorCisgICAgICAgIFRlc3RzOiBjc3MzL2ZvbnQtd2Vp Z2h0LW11bHRpcGxlLXNlbGVjdG9ycy5odG1sCisgICAgICAgICAgICAgICBjc3MzL2ZvbnQtd2Vp Z2h0Lmh0bWwKKworICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlGb250V2VpZ2h0OjphcHBseVZhbHVlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250RGVzY3JpcHRpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Rm9udERlc2NyaXB0aW9uOjpsaWdodGVyV2VpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnREZXNjcmlwdGlvbjo6Ym9sZGVyV2VpZ2h0KToKKwogMjAxNC0xMC0yMiAgUm9oaXQg S3VtYXIgIDxrdW1hci5yb2hpdEBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXTogRml4IHVu dXNlZCBwYXJhbWV0ZXIgYnVpbGQgd2FybmluZ3MgaW4gV2ViQ29yZS9wbGF0Zm9ybSBtb2R1bGUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAppbmRleCBj YjgyOWVlLi45YzU1NTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRl ZFN0eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHls ZUJ1aWxkZXIuY3BwCkBAIC05MjgsOSArOTI4LDExIEBAIHB1YmxpYzoKICAgICAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NT VmFsdWVCb2xkZXI6CisgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KHN0eWxl UmVzb2x2ZXItPnBhcmVudFN0eWxlKCktPmZvbnREZXNjcmlwdGlvbigpLndlaWdodCgpKTsKICAg ICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoZm9udERlc2NyaXB0aW9uLmJvbGRl cldlaWdodCgpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlTGln aHRlcjoKKyAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoc3R5bGVSZXNvbHZl ci0+cGFyZW50U3R5bGUoKS0+Zm9udERlc2NyaXB0aW9uKCkud2VpZ2h0KCkpOwogICAgICAgICAg ICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24ubGlnaHRlcldlaWdo dCgpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5jcHAKaW5kZXgg OTQ0ZmVmNS4uMzFlZTlkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udERlc2NyaXB0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250RGVzY3JpcHRpb24uY3BwCkBAIC00NCwyNyArNDQsMTkgQEAgQ09NUElMRV9B U1NFUlQoc2l6ZW9mKEZvbnREZXNjcmlwdGlvbikgPT0gc2l6ZW9mKFNhbWVTaXplQXNGb250RGVz Y3JpcHRpb24pLCBGb24KIAogRm9udFdlaWdodCBGb250RGVzY3JpcHRpb246OmxpZ2h0ZXJXZWln aHQodm9pZCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogU2hvdWxkIGFjdHVhbGx5IHJldHVybiB0 aGUgQ1NTIHdlaWdodCBjb3JyZXNwb25kaW5nIHRvIG5leHQgbGlnaHRlc3QKLSAgICAvLyB3ZWln aHQgb2YgdGhlIGN1cnJlbnRseSB1c2VkIGZvbnQgZmFtaWx5LgogICAgIHN3aXRjaCAobV93ZWln aHQpIHsKICAgICAgICAgY2FzZSBGb250V2VpZ2h0MTAwOgogICAgICAgICBjYXNlIEZvbnRXZWln aHQyMDA6Ci0gICAgICAgICAgICByZXR1cm4gRm9udFdlaWdodDEwMDsKLQogICAgICAgICBjYXNl IEZvbnRXZWlnaHQzMDA6Ci0gICAgICAgICAgICByZXR1cm4gRm9udFdlaWdodDIwMDsKLQogICAg ICAgICBjYXNlIEZvbnRXZWlnaHQ0MDA6CiAgICAgICAgIGNhc2UgRm9udFdlaWdodDUwMDoKLSAg ICAgICAgICAgIHJldHVybiBGb250V2VpZ2h0MzAwOworICAgICAgICAgICAgcmV0dXJuIEZvbnRX ZWlnaHQxMDA7CiAKICAgICAgICAgY2FzZSBGb250V2VpZ2h0NjAwOgogICAgICAgICBjYXNlIEZv bnRXZWlnaHQ3MDA6CiAgICAgICAgICAgICByZXR1cm4gRm9udFdlaWdodDQwMDsKIAogICAgICAg ICBjYXNlIEZvbnRXZWlnaHQ4MDA6Ci0gICAgICAgICAgICByZXR1cm4gRm9udFdlaWdodDUwMDsK LQogICAgICAgICBjYXNlIEZvbnRXZWlnaHQ5MDA6CiAgICAgICAgICAgICByZXR1cm4gRm9udFdl aWdodDcwMDsKICAgICB9CkBAIC03NCwxMyArNjYsOSBAQCBGb250V2VpZ2h0IEZvbnREZXNjcmlw dGlvbjo6bGlnaHRlcldlaWdodCh2b2lkKSBjb25zdAogCiBGb250V2VpZ2h0IEZvbnREZXNjcmlw dGlvbjo6Ym9sZGVyV2VpZ2h0KHZvaWQpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFNob3VsZCBh Y3R1YWxseSByZXR1cm4gdGhlIENTUyB3ZWlnaHQgY29ycmVzcG9uZGluZyB0byBuZXh0IGhlYXZp ZXN0Ci0gICAgLy8gd2VpZ2h0IG9mIHRoZSBjdXJyZW50bHkgdXNlZCBmb250IGZhbWlseS4KICAg ICBzd2l0Y2ggKG1fd2VpZ2h0KSB7CiAgICAgICAgIGNhc2UgRm9udFdlaWdodDEwMDoKICAgICAg ICAgY2FzZSBGb250V2VpZ2h0MjAwOgotICAgICAgICAgICAgcmV0dXJuIEZvbnRXZWlnaHQzMDA7 Ci0KICAgICAgICAgY2FzZSBGb250V2VpZ2h0MzAwOgogICAgICAgICAgICAgcmV0dXJuIEZvbnRX ZWlnaHQ0MDA7CiAKQEAgLTkwLDggKzc4LDYgQEAgRm9udFdlaWdodCBGb250RGVzY3JpcHRpb246 OmJvbGRlcldlaWdodCh2b2lkKSBjb25zdAogCiAgICAgICAgIGNhc2UgRm9udFdlaWdodDYwMDoK ICAgICAgICAgY2FzZSBGb250V2VpZ2h0NzAwOgotICAgICAgICAgICAgcmV0dXJuIEZvbnRXZWln aHQ4MDA7Ci0KICAgICAgICAgY2FzZSBGb250V2VpZ2h0ODAwOgogICAgICAgICBjYXNlIEZvbnRX ZWlnaHQ5MDA6CiAgICAgICAgICAgICByZXR1cm4gRm9udFdlaWdodDkwMDsK