159513 2016-07-07 09:07:19 -0700 MathOperator: Add a mapping from combining to non-combining equivalents 2016-08-25 06:59:00 -0700 1 1 1 Unclassified WebKit MathML WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 161189 1 fred.wang fred.wang alex bfulgham commit-queue dbarton distler esprehn+autocc glenn kondapallykalyan rego oldest_to_newest 1208641 0 fred.wang 2016-07-07 09:07:19 -0700 Many math fonts provide stretch variants and assemblies for combining characters instead of their non-combining equivalent contrary to what MathML says (https://www.w3.org/TR/MathML3/chapter7.html#chars.comb-chars). For example ̲ U+0332 COMBINING LOW LINE instead of _ U+005F LOW LINE. We should have mapping from combining to non-combining forms in order to be able to use the corresponding variant and assemblies from these math fonts. 1213506 1 fred.wang 2016-07-22 00:01:09 -0700 Jacques Distler reported the same issue for ¯ U+00AF MACRON which does not have stretchy variants/assembly in Latin Modern Math. That's also true for U+203E OVERLINE or U+0304 COMBINING MACRON. However, COMBINING OVERLINE U+0305 has the desired strechy data. I think all these overbars should try and find an equivalent constructions in the similar characters. Probably the issue does not happen with Gecko because it relies on its Unicode fallback. 1213562 2 284331 fred.wang 2016-07-22 07:53:00 -0700 Created attachment 284331 Patch (WIP) Here is a WIP patch (missing a test). 1214160 3 284480 fred.wang 2016-07-25 06:32:13 -0700 Created attachment 284480 Patch 1214216 4 284480 darin 2016-07-25 09:44:12 -0700 Comment on attachment 284480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284480&action=review > Source/WebCore/rendering/mathml/MathOperator.h:79 > + bool getBaseGlyph(const RenderStyle& style, GlyphData& baseGlyph) const > + { > + return getGlyph(style, m_baseCharacter, baseGlyph); > + } Including function bodies that make the function declaration take multiple lines in the class definition typically ends up messing it up over time. I prefer the idiom where we put the inline function body outside the class definition once it’s going to take multiple lines like this. 1214218 5 284480 darin 2016-07-25 09:44:36 -0700 Comment on attachment 284480 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284480&action=review > Source/WebCore/rendering/mathml/MathOperator.cpp:180 > + { 0x005E, 0x0302, 0 }, // CIRCUMFLEX ACCENT > + { 0x005F, 0x0332, 0 }, // LOW LINE > + { 0x007E, 0x0303, 0 }, // TILDE > + { 0x00AF, 0x0304, 0x0305 }, // MACRON > + { 0x02C6, 0x0302, 0 }, // MODIFIER LETTER CIRCUMFLEX ACCENT > + { 0x02C7, 0x030C, 0 } // CARON test should cover all 7 characters, but seems to only cover one of them 1214224 6 fred.wang 2016-07-25 09:59:25 -0700 (In reply to comment #5) > Comment on attachment 284480 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=284480&action=review > > > Source/WebCore/rendering/mathml/MathOperator.cpp:180 > > + { 0x005E, 0x0302, 0 }, // CIRCUMFLEX ACCENT > > + { 0x005F, 0x0332, 0 }, // LOW LINE > > + { 0x007E, 0x0303, 0 }, // TILDE > > + { 0x00AF, 0x0304, 0x0305 }, // MACRON > > + { 0x02C6, 0x0302, 0 }, // MODIFIER LETTER CIRCUMFLEX ACCENT > > + { 0x02C7, 0x030C, 0 } // CARON > > test should cover all 7 characters, but seems to only cover one of them There seems to be a bug with the width of horizontal stretchy operators that made writing tests based on box measuring or on dumping the render tree difficult and I did not want to have such mismatch test for each of the character. (additionally, I also currently have issues getting screenshots with the test runner). 1214477 7 fred.wang 2016-07-26 00:48:10 -0700 Committed r203714: <http://trac.webkit.org/changeset/203714> 1214478 8 fred.wang 2016-07-26 00:49:18 -0700 (In reply to comment #5) > test should cover all 7 characters, but seems to only cover one of them I converted the mismatch test to a pixel test, but the PNG expectations will have to be regenerated later as I can't do it myself at the moment. 284331 2016-07-22 07:53:00 -0700 2016-07-25 06:32:02 -0700 Patch (WIP) 0001-Bug-159513-MathOperator-Add-a-mapping-from-combining.patch text/plain 5507 fred.wang RnJvbSBjYjkzOTdkMWExMjI2ODNiMjkyMTQ0NjA2ZjZmY2U0MzNjNjBiNjM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmcmVkLndhbmdAZnJlZS5mcj4KRGF0 ZTogRnJpLCAyMiBKdWwgMjAxNiAxNjo1MDo1MCArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEJ1ZyAx NTk1MTMgLSBNYXRoT3BlcmF0b3I6IEFkZCBhIG1hcHBpbmcgZnJvbSBjb21iaW5pbmcgdG8KIG5v bi1jb21iaW5pbmcgZXF1aXZhbGVudHMKCi0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9NYXRoT3BlcmF0b3IuY3BwIHwgNTAgKysrKysrKysrKysrKysrKysrKysrKy0tCiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL01hdGhPcGVyYXRvci5oICAgfCAgNyArKystCiAy IGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3IuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3IuY3BwCmluZGV4IDU3 ZGZjMWYuLjQ1ODk0YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRo bWwvTWF0aE9wZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1s L01hdGhPcGVyYXRvci5jcHAKQEAgLTEyMSwxMCArMTIxLDEwIEBAIExheW91dFVuaXQgTWF0aE9w ZXJhdG9yOjpzdHJldGNoU2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fb3BlcmF0b3JUeXBlID09 IFR5cGU6OlZlcnRpY2FsT3BlcmF0b3IgPyBtX2FzY2VudCArIG1fZGVzY2VudCA6IG1fd2lkdGg7 CiB9CiAKLWJvb2wgTWF0aE9wZXJhdG9yOjpnZXRCYXNlR2x5cGgoY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlLCBHbHlwaERhdGEmIGJhc2VHbHlwaCkgY29uc3QKK2Jvb2wgTWF0aE9wZXJhdG9yOjpn ZXRHbHlwaChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFVDaGFyIGNoYXJhY3RlciwgR2x5cGhE YXRhJiBnbHlwaCkgY29uc3QKIHsKLSAgICBiYXNlR2x5cGggPSBzdHlsZS5mb250Q2FzY2FkZSgp LmdseXBoRGF0YUZvckNoYXJhY3RlcihtX2Jhc2VDaGFyYWN0ZXIsICFzdHlsZS5pc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKCkpOwotICAgIHJldHVybiBiYXNlR2x5cGguZm9udCAmJiBiYXNlR2x5cGgu Zm9udCA9PSAmc3R5bGUuZm9udENhc2NhZGUoKS5wcmltYXJ5Rm9udCgpOworICAgIGdseXBoID0g c3R5bGUuZm9udENhc2NhZGUoKS5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCAhc3R5 bGUuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKTsKKyAgICByZXR1cm4gZ2x5cGguZm9udCAmJiBn bHlwaC5mb250ID09ICZzdHlsZS5mb250Q2FzY2FkZSgpLnByaW1hcnlGb250KCk7CiB9CiAKIHZv aWQgTWF0aE9wZXJhdG9yOjpzZXRTaXplVmFyaWFudChjb25zdCBHbHlwaERhdGEmIHNpemVWYXJp YW50KQpAQCAtMTY3LDYgKzE2Nyw0OCBAQCB2b2lkIE1hdGhPcGVyYXRvcjo6c2V0R2x5cGhBc3Nl bWJseShjb25zdCBHbHlwaEFzc2VtYmx5RGF0YSYgYXNzZW1ibHlEYXRhKQogICAgIH0KIH0KIAor Ly8gVGhlIE1hdGhNTCBzcGVjaWZpY2F0aW9uIHJlY29tbWVuZHMgYXZvaWRpbmcgY29tYmluaW5n IGNoYXJhY3RlcnMuCisvLyBTZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL01hdGhNTC9jaGFwdGVy Ny5odG1sI2NoYXJzLmNvbWItY2hhcnMKKy8vIEhvd2V2ZXIsIG1hbnkgbWF0aCBmb250cyBkbyBu b3QgcHJvdmlkZSBjb25zdHJ1Y3Rpb25zIGZvciB0aGUgbm9uLWNvbWJpbmluZyBlcXVpdmFsZW50 LgorY29uc3QgdW5zaWduZWQgbWF4RmFsbGJhY2tQZXJDaGFyYWN0ZXIgPSAzOworc3RhdGljIGNv bnN0IFVDaGFyIGNoYXJhY3RlckZhbGxiYWNrW11bbWF4RmFsbGJhY2tQZXJDaGFyYWN0ZXJdID0g eworICAgIHsgMHgwMDVFLCAweDAzMDIgfSwgLy8gQ0lSQ1VNRkxFWCBBQ0NFTlQKKyAgICB7IDB4 MDA1RiwgMHgwMzMyIH0sIC8vIExPVyBMSU5FCisgICAgeyAweDAwN0UsIDB4MDMwMyB9LCAvLyBU SUxERQorICAgIHsgMHgwMEFGLCAweDAzMDQsIDB4MDMwNSB9LCAvLyBNQUNST04KKyAgICB7IDB4 MDJDNiwgMHgwMzAyIH0sIC8vIE1PRElGSUVSIExFVFRFUiBDSVJDVU1GTEVYIEFDQ0VOVAorICAg IHsgMHgwMkM3LCAweDAzMEMgfSwgLy8gQ0FST04KKyAgICB7IDB4MDJEOCwgMHgwMzA2IH0sIC8v IEJSRVZFCisgICAgeyAweDIwM0UsIDB4MDMwNSwgMHgwMzA0IH0gLy8gT1ZFUkxJTkUKK307Citj b25zdCB1bnNpZ25lZCBjaGFyYWN0ZXJGYWxsYmFja1NpemUgPSBXVEZfQVJSQVlfTEVOR1RIKGNo YXJhY3RlckZhbGxiYWNrKTsKKwordm9pZCBNYXRoT3BlcmF0b3I6OmdldE1hdGhWYXJpYW50c1dp dGhGYWxsYmFjayhjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGJvb2wgaXNWZXJ0aWNhbCwgVmVj dG9yPEdseXBoPiYgc2l6ZVZhcmlhbnRzLCBWZWN0b3I8T3BlblR5cGVNYXRoRGF0YTo6QXNzZW1i bHlQYXJ0PiYgYXNzZW1ibHlQYXJ0cykKK3sKKyAgICAvLyBJbiBnZW5lcmFsLCB3ZSBmaXJzdCB0 cnkgYW5kIGZpbmQgY29udHJ1Y3Rpb24gZm9yIHRoZSBiYXNlIGdseXBoLgorICAgIEdseXBoRGF0 YSBiYXNlR2x5cGg7CisgICAgaWYgKCFnZXRCYXNlR2x5cGgoc3R5bGUsIGJhc2VHbHlwaCkgfHwg IWJhc2VHbHlwaC5mb250LT5tYXRoRGF0YSgpKQorICAgICAgICByZXR1cm47CisgICAgYmFzZUds eXBoLmZvbnQtPm1hdGhEYXRhKCktPmdldE1hdGhWYXJpYW50cyhiYXNlR2x5cGguZ2x5cGgsIGlz VmVydGljYWwsIHNpemVWYXJpYW50cywgYXNzZW1ibHlQYXJ0cyk7CisgICAgaWYgKCFzaXplVmFy aWFudHMuaXNFbXB0eSgpIHx8ICFhc3NlbWJseVBhcnRzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgLy8gT3RoZXJ3aXNlLCB3ZSB0cnkgYW5kIGZpbmQgZmFsbGJhY2sgY29uc3Ry dWN0aW9ucyB1c2luZyBzaW1pbGFyIGNoYXJhY3RlcnMuCisgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IGNoYXJhY3RlckZhbGxiYWNrU2l6ZTsgaSsrKSB7CisgICAgICAgIGlmIChjaGFyYWN0 ZXJGYWxsYmFja1tpXVswXSA9PSBtX2Jhc2VDaGFyYWN0ZXIpIHsKKyAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaiA9IDE7IGogPCBtYXhGYWxsYmFja1BlckNoYXJhY3RlcjsgaisrKSB7CisgICAg ICAgICAgICAgICAgR2x5cGhEYXRhIGdseXBoRGF0YTsKKyAgICAgICAgICAgICAgICBpZiAoIWdl dEdseXBoKHN0eWxlLCBjaGFyYWN0ZXJGYWxsYmFja1tpXVtqXSwgZ2x5cGhEYXRhKSkKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgZ2x5cGhEYXRhLmZvbnQt Pm1hdGhEYXRhKCktPmdldE1hdGhWYXJpYW50cyhnbHlwaERhdGEuZ2x5cGgsIGlzVmVydGljYWws IHNpemVWYXJpYW50cywgYXNzZW1ibHlQYXJ0cyk7CisgICAgICAgICAgICAgICAgaWYgKCFzaXpl VmFyaWFudHMuaXNFbXB0eSgpIHx8ICFhc3NlbWJseVBhcnRzLmlzRW1wdHkoKSkKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIH0KKyAgICB9Cit9CisKIHZvaWQgTWF0aE9wZXJhdG9yOjpjYWxjdWxhdGVEaXNwbGF5 U3R5bGVMYXJnZU9wZXJhdG9yKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKIHsKICAgICBBU1NF UlQobV9vcGVyYXRvclR5cGUgPT0gVHlwZTo6RGlzcGxheU9wZXJhdG9yKTsKQEAgLTMxNiw3ICsz NTgsNyBAQCB2b2lkIE1hdGhPcGVyYXRvcjo6Y2FsY3VsYXRlU3RyZXRjaHlEYXRhKGNvbnN0IFJl bmRlclN0eWxlJiBzdHlsZSwgYm9vbCBjYWxjdWxhdAogICAgIGlmIChiYXNlR2x5cGguZm9udC0+ bWF0aERhdGEoKSkgewogICAgICAgICBWZWN0b3I8R2x5cGg+IHNpemVWYXJpYW50czsKICAgICAg ICAgVmVjdG9yPE9wZW5UeXBlTWF0aERhdGE6OkFzc2VtYmx5UGFydD4gYXNzZW1ibHlQYXJ0czsK LSAgICAgICAgYmFzZUdseXBoLmZvbnQtPm1hdGhEYXRhKCktPmdldE1hdGhWYXJpYW50cyhiYXNl R2x5cGguZ2x5cGgsIGlzVmVydGljYWwsIHNpemVWYXJpYW50cywgYXNzZW1ibHlQYXJ0cyk7Cisg ICAgICAgIGdldE1hdGhWYXJpYW50c1dpdGhGYWxsYmFjayhzdHlsZSwgaXNWZXJ0aWNhbCwgc2l6 ZVZhcmlhbnRzLCBhc3NlbWJseVBhcnRzKTsKICAgICAgICAgLy8gV2UgdmVyaWZ5IHRoZSBzaXpl IHZhcmlhbnRzLgogICAgICAgICBmb3IgKGF1dG8mIHNpemVWYXJpYW50IDogc2l6ZVZhcmlhbnRz KSB7CiAgICAgICAgICAgICBHbHlwaERhdGEgZ2x5cGhEYXRhKHNpemVWYXJpYW50LCBiYXNlR2x5 cGguZm9udCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL01h dGhPcGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0 b3IuaAppbmRleCBkZTJkMDNmLi5lY2JkNWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvbWF0aG1sL01hdGhPcGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9tYXRobWwvTWF0aE9wZXJhdG9yLmgKQEAgLTcyLDkgKzcyLDE0IEBAIHByaXZhdGU6CiAg ICAgfTsKIAogICAgIExheW91dFVuaXQgc3RyZXRjaFNpemUoKSBjb25zdDsKLSAgICBib29sIGdl dEJhc2VHbHlwaChjb25zdCBSZW5kZXJTdHlsZSYsIEdseXBoRGF0YSYpIGNvbnN0OworICAgIGJv b2wgZ2V0R2x5cGgoY29uc3QgUmVuZGVyU3R5bGUmLCBVQ2hhciBjaGFyYWN0ZXIsIEdseXBoRGF0 YSYpIGNvbnN0OworICAgIGJvb2wgZ2V0QmFzZUdseXBoKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSwgR2x5cGhEYXRhJiBiYXNlR2x5cGgpIGNvbnN0CisgICAgeworICAgICAgICByZXR1cm4gZ2V0 R2x5cGgoc3R5bGUsIG1fYmFzZUNoYXJhY3RlciwgYmFzZUdseXBoKTsKKyAgICB9CiAgICAgdm9p ZCBzZXRTaXplVmFyaWFudChjb25zdCBHbHlwaERhdGEmKTsKICAgICB2b2lkIHNldEdseXBoQXNz ZW1ibHkoY29uc3QgR2x5cGhBc3NlbWJseURhdGEmKTsKKyAgICB2b2lkIGdldE1hdGhWYXJpYW50 c1dpdGhGYWxsYmFjayhjb25zdCBSZW5kZXJTdHlsZSYsIGJvb2wgaXNWZXJ0aWNhbCwgVmVjdG9y PEdseXBoPiYsIFZlY3RvcjxPcGVuVHlwZU1hdGhEYXRhOjpBc3NlbWJseVBhcnQ+Jik7CiAgICAg dm9pZCBjYWxjdWxhdGVEaXNwbGF5U3R5bGVMYXJnZU9wZXJhdG9yKGNvbnN0IFJlbmRlclN0eWxl Jik7CiAgICAgdm9pZCBjYWxjdWxhdGVTdHJldGNoeURhdGEoY29uc3QgUmVuZGVyU3R5bGUmLCBi b29sIGNhbGN1bGF0ZU1heFByZWZlcnJlZFdpZHRoLCBMYXlvdXRVbml0IHRhcmdldFNpemUgPSAw KTsKICAgICBib29sIGNhbGN1bGF0ZUdseXBoQXNzZW1ibHlGYWxsYmFjayhjb25zdCBSZW5kZXJT dHlsZSYsIGNvbnN0IFZlY3RvcjxPcGVuVHlwZU1hdGhEYXRhOjpBc3NlbWJseVBhcnQ+JiwgR2x5 cGhBc3NlbWJseURhdGEmKSBjb25zdDsKLS0gCjIuOC4xCgo= 284480 2016-07-25 06:32:13 -0700 2016-07-25 09:44:12 -0700 Patch bug-159513-20160725153105.patch text/plain 11199 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzNjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmEwMzNjYTVkMzU1Yzcz YWIzMzhiYmNlM2NkYmFjZjJjNWIwNTAxOS4uMWUwM2Y2NGY3ZWMxMTk1YjRjMzU0MDg0ZjFiMmFi YzkzYmRmMmU2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA3LTI1ICBGcmVk ZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAgICAgICBNYXRoT3BlcmF0b3I6IEFk ZCBhIG1hcHBpbmcgZnJvbSBjb21iaW5pbmcgdG8gbm9uLWNvbWJpbmluZyBlcXVpdmFsZW50cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5NTEzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFueSBtYXRo IGZvbnRzIHByb3ZpZGUgc3RyZXRjaCB2YXJpYW50cyBhbmQgYXNzZW1ibGllcyBmb3IgY29tYmlu aW5nIGNoYXJhY3RlcnMgYnV0IG5vdCBmb3IKKyAgICAgICAgdGhlaXIgbm9uLWNvbWJpbmluZyBl cXVpdmFsZW50LiBJbiB0aGUgTWF0aE1MIHJlY29tbWVuZGF0aW9uLCBpdCBpcyBzdWdnZXN0ZWQg dG8gdXNlCisgICAgICAgIG5vbi1jb21iaW5pbmcgY2hhcmF0ZXJzLCBzbyB3ZSBhbGxvdyB0aGUg b3BlcmF0b3Igc3RyZXRjaGluZyBjb2RlIHRvIGxvb2sgZm9yIGNvbnN0cnVjdGlvbnMKKyAgICAg ICAgYXNzb2NpYXRlZCB0byB0aGVzZSBub24tY29tYmluaW5nIGNoYXJhY3RlcnMgaW4gb3JkZXIg dG8gc3RpbGwgYmUgYWJsZSB0byBzdHJldGNoIHRoZQorICAgICAgICBjb21iaW5pbmcgb25lcy4K KworICAgICAgICBUZXN0OiBtYXRobWwvcHJlc2VudGF0aW9uL2J1ZzE1OTUxMy5odG1sCisKKyAg ICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL01hdGhPcGVyYXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNYXRoT3BlcmF0b3I6OmdldEdseXBoKTogTmV3IGZ1bmN0aW9uIGV4dGVuZGluZyBnZXRC YXNlR2x5cGggdG8gcmV0cmlldmUgdGhlIGdseXBoCisgICAgICAgIGRhdGEgZm9yIGFuIGFyYml0 cmFyeSBjaGFyYWN0ZXIuCisgICAgICAgIChXZWJDb3JlOjpNYXRoT3BlcmF0b3I6OmdldE1hdGhW YXJpYW50c1dpdGhGYWxsYmFjayk6IFRoaXMgaGVscGVyIGZ1bmN0aW9uIGNhbGxzCisgICAgICAg IGdldE1hdGhWYXJpYW50cyBmb3IgdGhlIGJhc2UgZ2x5cGguIElmIG5vIGNvbnN0cnVjdGlvbnMg YXJlIGF2YWlsYWJsZSwgaXQgY2FsbHMKKyAgICAgICAgZ2V0TWF0aFZhcmlhbnRzIGZvciB0aGUg Z2x5cGggYXNzb2NpYXRlZCB0byBlcXVpdmFsZW50IGZhbGxiYWNrIGNoYXJhY3RlcnMgYXMgbGlz dGVkIGluIHRoZQorICAgICAgICBzbWFsbCBjaGFyYWN0ZXJGYWxsYmFjayB0YWJsZS4KKyAgICAg ICAgKFdlYkNvcmU6Ok1hdGhPcGVyYXRvcjo6Y2FsY3VsYXRlU3RyZXRjaHlEYXRhKTogQ2FsbCBn ZXRNYXRoVmFyaWFudHNXaXRoRmFsbGJhY2sgaW5zdGVhZCBvZgorICAgICAgICBnZXRNYXRoVmFy aWFudHMuIE5vdGUgdGhhdCB3ZSBkbyBub3QgbmVlZCB0byBkbyB0aGF0IGZvciBjYWxjdWxhdGVE aXNwbGF5U3R5bGVMYXJnZU9wZXJhdG9yCisgICAgICAgIGFzIHdlIGRvIG5vdCB1c2UgZmFsbGJh Y2sgZm9yIGxhcmdlIG9wZXJhdG9ycy4KKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL01hdGhP cGVyYXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6TWF0aE9wZXJhdG9yOjpnZXRCYXNlR2x5cGgp OiBVc2UgZ2V0R2x5cGggdG8gaW1wbGVtZW50IHRoaXMgZnVuY3Rpb24uCisKIDIwMTYtMDctMjUg IFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nz cy1ncmlkXSBJbXBsZW1lbnQgcmVwZWF0KGF1dG8tZml0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3IuY3BwCmluZGV4IGQ5M2IyZmFjY2FlNjlkYTMx NzFhZWM2OTBjZTI5MGEwZDk0ODg3N2MuLjRmYjhmNmFhOGIyMWI3NzRlYmY5MzM0ZjVkMDE5NTk3 YmU2NWRmYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvTWF0 aE9wZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL01hdGhP cGVyYXRvci5jcHAKQEAgLTEyMSwxMCArMTIxLDEwIEBAIExheW91dFVuaXQgTWF0aE9wZXJhdG9y OjpzdHJldGNoU2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fb3BlcmF0b3JUeXBlID09IFR5cGU6 OlZlcnRpY2FsT3BlcmF0b3IgPyBtX2FzY2VudCArIG1fZGVzY2VudCA6IG1fd2lkdGg7CiB9CiAK LWJvb2wgTWF0aE9wZXJhdG9yOjpnZXRCYXNlR2x5cGgoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl LCBHbHlwaERhdGEmIGJhc2VHbHlwaCkgY29uc3QKK2Jvb2wgTWF0aE9wZXJhdG9yOjpnZXRHbHlw aChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFVDaGFyIGNoYXJhY3RlciwgR2x5cGhEYXRhJiBn bHlwaCkgY29uc3QKIHsKLSAgICBiYXNlR2x5cGggPSBzdHlsZS5mb250Q2FzY2FkZSgpLmdseXBo RGF0YUZvckNoYXJhY3RlcihtX2Jhc2VDaGFyYWN0ZXIsICFzdHlsZS5pc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKCkpOwotICAgIHJldHVybiBiYXNlR2x5cGguZm9udCAmJiBiYXNlR2x5cGguZm9udCA9 PSAmc3R5bGUuZm9udENhc2NhZGUoKS5wcmltYXJ5Rm9udCgpOworICAgIGdseXBoID0gc3R5bGUu Zm9udENhc2NhZGUoKS5nbHlwaERhdGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyLCAhc3R5bGUuaXNM ZWZ0VG9SaWdodERpcmVjdGlvbigpKTsKKyAgICByZXR1cm4gZ2x5cGguZm9udCAmJiBnbHlwaC5m b250ID09ICZzdHlsZS5mb250Q2FzY2FkZSgpLnByaW1hcnlGb250KCk7CiB9CiAKIHZvaWQgTWF0 aE9wZXJhdG9yOjpzZXRTaXplVmFyaWFudChjb25zdCBHbHlwaERhdGEmIHNpemVWYXJpYW50KQpA QCAtMTY3LDYgKzE2Nyw0NyBAQCB2b2lkIE1hdGhPcGVyYXRvcjo6c2V0R2x5cGhBc3NlbWJseShj b25zdCBHbHlwaEFzc2VtYmx5RGF0YSYgYXNzZW1ibHlEYXRhKQogICAgIH0KIH0KIAorLy8gVGhl IE1hdGhNTCBzcGVjaWZpY2F0aW9uIHJlY29tbWVuZHMgYXZvaWRpbmcgY29tYmluaW5nIGNoYXJh Y3RlcnMuCisvLyBTZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL01hdGhNTC9jaGFwdGVyNy5odG1s I2NoYXJzLmNvbWItY2hhcnMKKy8vIEhvd2V2ZXIsIG1hbnkgbWF0aCBmb250cyBkbyBub3QgcHJv dmlkZSBjb25zdHJ1Y3Rpb25zIGZvciB0aGUgbm9uLWNvbWJpbmluZyBlcXVpdmFsZW50LgorY29u c3QgdW5zaWduZWQgbWF4RmFsbGJhY2tQZXJDaGFyYWN0ZXIgPSAzOworc3RhdGljIGNvbnN0IFVD aGFyIGNoYXJhY3RlckZhbGxiYWNrW11bbWF4RmFsbGJhY2tQZXJDaGFyYWN0ZXJdID0geworICAg IHsgMHgwMDVFLCAweDAzMDIsIDAgfSwgLy8gQ0lSQ1VNRkxFWCBBQ0NFTlQKKyAgICB7IDB4MDA1 RiwgMHgwMzMyLCAwIH0sIC8vIExPVyBMSU5FCisgICAgeyAweDAwN0UsIDB4MDMwMywgMCB9LCAv LyBUSUxERQorICAgIHsgMHgwMEFGLCAweDAzMDQsIDB4MDMwNSB9LCAvLyBNQUNST04KKyAgICB7 IDB4MDJDNiwgMHgwMzAyLCAwIH0sIC8vIE1PRElGSUVSIExFVFRFUiBDSVJDVU1GTEVYIEFDQ0VO VAorICAgIHsgMHgwMkM3LCAweDAzMEMsIDAgfSAvLyBDQVJPTgorfTsKK2NvbnN0IHVuc2lnbmVk IGNoYXJhY3RlckZhbGxiYWNrU2l6ZSA9IFdURl9BUlJBWV9MRU5HVEgoY2hhcmFjdGVyRmFsbGJh Y2spOworCit2b2lkIE1hdGhPcGVyYXRvcjo6Z2V0TWF0aFZhcmlhbnRzV2l0aEZhbGxiYWNrKGNv bnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgYm9vbCBpc1ZlcnRpY2FsLCBWZWN0b3I8R2x5cGg+JiBz aXplVmFyaWFudHMsIFZlY3RvcjxPcGVuVHlwZU1hdGhEYXRhOjpBc3NlbWJseVBhcnQ+JiBhc3Nl bWJseVBhcnRzKQoreworICAgIC8vIEluIGdlbmVyYWwsIHdlIGZpcnN0IHRyeSBhbmQgZmluZCBj b250cnVjdGlvbiBmb3IgdGhlIGJhc2UgZ2x5cGguCisgICAgR2x5cGhEYXRhIGJhc2VHbHlwaDsK KyAgICBpZiAoIWdldEJhc2VHbHlwaChzdHlsZSwgYmFzZUdseXBoKSB8fCAhYmFzZUdseXBoLmZv bnQtPm1hdGhEYXRhKCkpCisgICAgICAgIHJldHVybjsKKyAgICBiYXNlR2x5cGguZm9udC0+bWF0 aERhdGEoKS0+Z2V0TWF0aFZhcmlhbnRzKGJhc2VHbHlwaC5nbHlwaCwgaXNWZXJ0aWNhbCwgc2l6 ZVZhcmlhbnRzLCBhc3NlbWJseVBhcnRzKTsKKyAgICBpZiAoIXNpemVWYXJpYW50cy5pc0VtcHR5 KCkgfHwgIWFzc2VtYmx5UGFydHMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICAv LyBPdGhlcndpc2UsIHdlIHRyeSBhbmQgZmluZCBmYWxsYmFjayBjb25zdHJ1Y3Rpb25zIHVzaW5n IHNpbWlsYXIgY2hhcmFjdGVycy4KKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hhcmFj dGVyRmFsbGJhY2tTaXplOyBpKyspIHsKKyAgICAgICAgdW5zaWduZWQgaiA9IDA7CisgICAgICAg IGlmIChjaGFyYWN0ZXJGYWxsYmFja1tpXVtqXSA9PSBtX2Jhc2VDaGFyYWN0ZXIpIHsKKyAgICAg ICAgICAgIGZvciAoaisrOyBqIDwgbWF4RmFsbGJhY2tQZXJDaGFyYWN0ZXIgJiYgY2hhcmFjdGVy RmFsbGJhY2tbaV1bal07IGorKykgeworICAgICAgICAgICAgICAgIEdseXBoRGF0YSBnbHlwaERh dGE7CisgICAgICAgICAgICAgICAgaWYgKCFnZXRHbHlwaChzdHlsZSwgY2hhcmFjdGVyRmFsbGJh Y2tbaV1bal0sIGdseXBoRGF0YSkpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICAgICAgICAgIGdseXBoRGF0YS5mb250LT5tYXRoRGF0YSgpLT5nZXRNYXRoVmFyaWFudHMo Z2x5cGhEYXRhLmdseXBoLCBpc1ZlcnRpY2FsLCBzaXplVmFyaWFudHMsIGFzc2VtYmx5UGFydHMp OworICAgICAgICAgICAgICAgIGlmICghc2l6ZVZhcmlhbnRzLmlzRW1wdHkoKSB8fCAhYXNzZW1i bHlQYXJ0cy5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorfQorCiB2b2lkIE1h dGhPcGVyYXRvcjo6Y2FsY3VsYXRlRGlzcGxheVN0eWxlTGFyZ2VPcGVyYXRvcihjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiB7CiAgICAgQVNTRVJUKG1fb3BlcmF0b3JUeXBlID09IFR5cGU6OkRp c3BsYXlPcGVyYXRvcik7CkBAIC0zMTYsNyArMzU3LDcgQEAgdm9pZCBNYXRoT3BlcmF0b3I6OmNh bGN1bGF0ZVN0cmV0Y2h5RGF0YShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGJvb2wgY2FsY3Vs YXQKICAgICBpZiAoYmFzZUdseXBoLmZvbnQtPm1hdGhEYXRhKCkpIHsKICAgICAgICAgVmVjdG9y PEdseXBoPiBzaXplVmFyaWFudHM7CiAgICAgICAgIFZlY3RvcjxPcGVuVHlwZU1hdGhEYXRhOjpB c3NlbWJseVBhcnQ+IGFzc2VtYmx5UGFydHM7Ci0gICAgICAgIGJhc2VHbHlwaC5mb250LT5tYXRo RGF0YSgpLT5nZXRNYXRoVmFyaWFudHMoYmFzZUdseXBoLmdseXBoLCBpc1ZlcnRpY2FsLCBzaXpl VmFyaWFudHMsIGFzc2VtYmx5UGFydHMpOworICAgICAgICBnZXRNYXRoVmFyaWFudHNXaXRoRmFs bGJhY2soc3R5bGUsIGlzVmVydGljYWwsIHNpemVWYXJpYW50cywgYXNzZW1ibHlQYXJ0cyk7CiAg ICAgICAgIC8vIFdlIHZlcmlmeSB0aGUgc2l6ZSB2YXJpYW50cy4KICAgICAgICAgZm9yIChhdXRv JiBzaXplVmFyaWFudCA6IHNpemVWYXJpYW50cykgewogICAgICAgICAgICAgR2x5cGhEYXRhIGds eXBoRGF0YShzaXplVmFyaWFudCwgYmFzZUdseXBoLmZvbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvTWF0aE9wZXJhdG9yLmgKaW5kZXggZGUyZDAzZjlkMWU0ODllOWJl ZGEyMTZhZDM1ZTI1ZDhiZTJkZjNiYS4uZWNiZDVhOGQxZDQ3NDNhOTIxNDBiNDRhYzg1ODE3MDg3 NzNlM2Y4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRo T3BlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL01hdGhPcGVy YXRvci5oCkBAIC03Miw5ICs3MiwxNCBAQCBwcml2YXRlOgogICAgIH07CiAKICAgICBMYXlvdXRV bml0IHN0cmV0Y2hTaXplKCkgY29uc3Q7Ci0gICAgYm9vbCBnZXRCYXNlR2x5cGgoY29uc3QgUmVu ZGVyU3R5bGUmLCBHbHlwaERhdGEmKSBjb25zdDsKKyAgICBib29sIGdldEdseXBoKGNvbnN0IFJl bmRlclN0eWxlJiwgVUNoYXIgY2hhcmFjdGVyLCBHbHlwaERhdGEmKSBjb25zdDsKKyAgICBib29s IGdldEJhc2VHbHlwaChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIEdseXBoRGF0YSYgYmFzZUds eXBoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIGdldEdseXBoKHN0eWxlLCBtX2Jhc2VD aGFyYWN0ZXIsIGJhc2VHbHlwaCk7CisgICAgfQogICAgIHZvaWQgc2V0U2l6ZVZhcmlhbnQoY29u c3QgR2x5cGhEYXRhJik7CiAgICAgdm9pZCBzZXRHbHlwaEFzc2VtYmx5KGNvbnN0IEdseXBoQXNz ZW1ibHlEYXRhJik7CisgICAgdm9pZCBnZXRNYXRoVmFyaWFudHNXaXRoRmFsbGJhY2soY29uc3Qg UmVuZGVyU3R5bGUmLCBib29sIGlzVmVydGljYWwsIFZlY3RvcjxHbHlwaD4mLCBWZWN0b3I8T3Bl blR5cGVNYXRoRGF0YTo6QXNzZW1ibHlQYXJ0PiYpOwogICAgIHZvaWQgY2FsY3VsYXRlRGlzcGxh eVN0eWxlTGFyZ2VPcGVyYXRvcihjb25zdCBSZW5kZXJTdHlsZSYpOwogICAgIHZvaWQgY2FsY3Vs YXRlU3RyZXRjaHlEYXRhKGNvbnN0IFJlbmRlclN0eWxlJiwgYm9vbCBjYWxjdWxhdGVNYXhQcmVm ZXJyZWRXaWR0aCwgTGF5b3V0VW5pdCB0YXJnZXRTaXplID0gMCk7CiAgICAgYm9vbCBjYWxjdWxh dGVHbHlwaEFzc2VtYmx5RmFsbGJhY2soY29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBWZWN0b3I8 T3BlblR5cGVNYXRoRGF0YTo6QXNzZW1ibHlQYXJ0PiYsIEdseXBoQXNzZW1ibHlEYXRhJikgY29u c3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZjY4ZGVmNDNiMWI2Yjc3YmNjODlkYWNkMWMxZTI2NzNiYTkzZGUxNC4uODk1 ODdlMzdlYzNjNjA5YzgxOTQxNzliMTg0NzA4YTczYTQ0NzgwOSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE2LTA3LTI1ICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAg ICAgICBNYXRoT3BlcmF0b3I6IEFkZCBhIG1hcHBpbmcgZnJvbSBjb21iaW5pbmcgdG8gbm9uLWNv bWJpbmluZyBlcXVpdmFsZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTU5NTEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBtYXRobWwvcHJlc2VudGF0aW9uL2J1ZzE1OTUxMy1leHBlY3RlZC1taXNt YXRjaC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBtYXRobWwvcHJlc2VudGF0aW9uL2J1ZzE1OTUx My5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBl Y3RhdGlvbnM6IFNraXAgdGhpcyB0ZXN0IG9uIGlPUy4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv VGVzdEV4cGVjdGF0aW9uczogU2tpcCB0aGlzIHRlc3Qgb24gTWFjLgorCiAyMDE2LTA3LTI1ICBT ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3Mt Z3JpZF0gSW1wbGVtZW50IHJlcGVhdChhdXRvLWZpdCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L21hdGhtbC9wcmVzZW50YXRpb24vYnVnMTU5NTEzLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwgYi9M YXlvdXRUZXN0cy9tYXRobWwvcHJlc2VudGF0aW9uL2J1ZzE1OTUxMy1leHBlY3RlZC1taXNtYXRj aC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjU2YTRiNmUxNjU5MjViOWZmZDdjOGVhYTVlNWZhZTEzYWFkZDk4 YjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tYXRobWwvcHJlc2VudGF0aW9uL2J1 ZzE1OTUxMy1leHBlY3RlZC1taXNtYXRjaC5odG1sCkBAIC0wLDAgKzEsMjMgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+CisgIDxoZWFkPgorICAgIDx0aXRsZT5idWcgMTU5NTEzPC90aXRsZT4K KyAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCIvPgorICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+ CisgICAgICAvKiBUaGlzIHRlc3QgcmVxdWlyZXMgdGhlIExhdGluIE1vZGVybiBNYXRoIGZvbnQu ICovCisgICAgICBtYXRoIHsKKyAgICAgICAgZm9udC1mYW1pbHk6IExhdGluIE1vZGVybiBNYXRo OworICAgICAgICBmb250LXNpemU6IDIwMCU7CisgICAgICB9CisgICAgPC9zdHlsZT4KKyAgPC9o ZWFkPgorICA8Ym9keT4KKyAgICA8cD5UZXN0IHBhc3NlcyBpZiB0aGUgbG93IGxpbmUgc3RyZXRj aGVzLjwvcD4KKyAgICA8bWF0aD4KKyAgICAgIDxtdW5kZXI+CisgICAgICAgIDxtc3BhY2Ugd2lk dGg9IjYwcHgiIGhlaWdodD0iMzBweCIgbWF0aGJhY2tncm91bmQ9ImdyZWVuIi8+CisgICAgICAg IDxtbyBzdHJldGNoeT0iZmFsc2UiPiYjeDAwNUY7PC9tbz4KKyAgICAgIDwvbXVuZGVyPgorICAg IDwvbWF0aD4KKyAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWF0 aG1sL3ByZXNlbnRhdGlvbi9idWcxNTk1MTMuaHRtbCBiL0xheW91dFRlc3RzL21hdGhtbC9wcmVz ZW50YXRpb24vYnVnMTU5NTEzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDYzOTE4OWIzY2YxOGYwMjUzZWVj MWI3OWZiYWJlNWU1ODYyOWM2ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21hdGht bC9wcmVzZW50YXRpb24vYnVnMTU5NTEzLmh0bWwKQEAgLTAsMCArMSwyMyBAQAorPCFET0NUWVBF IGh0bWw+Cis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHRpdGxlPmJ1ZyAxNTk1MTM8L3RpdGxlPgor ICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ii8+CisgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4K KyAgICAgIC8qIFRoaXMgdGVzdCByZXF1aXJlcyB0aGUgTGF0aW4gTW9kZXJuIE1hdGggZm9udC4g Ki8KKyAgICAgIG1hdGggeworICAgICAgICBmb250LWZhbWlseTogTGF0aW4gTW9kZXJuIE1hdGg7 CisgICAgICAgIGZvbnQtc2l6ZTogMjAwJTsKKyAgICAgIH0KKyAgICA8L3N0eWxlPgorICA8L2hl YWQ+CisgIDxib2R5PgorICAgIDxwPlRlc3QgcGFzc2VzIGlmIHRoZSBsb3cgbGluZSBzdHJldGNo ZXMuPC9wPgorICAgIDxtYXRoPgorICAgICAgPG11bmRlcj4KKyAgICAgICAgPG1zcGFjZSB3aWR0 aD0iNjBweCIgaGVpZ2h0PSIzMHB4IiBtYXRoYmFja2dyb3VuZD0iZ3JlZW4iLz4KKyAgICAgICAg PG1vIHN0cmV0Y2h5PSJ0cnVlIj4mI3gwMDVGOzwvbW8+CisgICAgICA8L211bmRlcj4KKyAgICA8 L21hdGg+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2lvcy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxZGI4YzY0ZGZjZGRjMWE0YjZm NTIxYTIxMDZjYTAzMzNiYzA5ZGM3Li42NTk2YjEyNDE2OTFhMmUwZGIxZTA2NjEzZmM2ODZjM2Ni MTFhZWY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rl c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9U ZXN0RXhwZWN0YXRpb25zCkBAIC02NzEsNiArNjcxLDcgQEAgbWF0aG1sL29wZW50eXBlL2hvcml6 b250YWwtbXVuZGVyb3Zlci5odG1sIFsgU2tpcCBdCiBtYXRobWwvb3BlbnR5cGUvZnJhY3Rpb24t bGluZS5odG1sIFsgU2tpcCBdCiBtYXRobWwvcHJlc2VudGF0aW9uL2ZyYWN0aW9ucy1saW5ldGhp Y2tuZXNzLmh0bWwgWyBTa2lwIF0KIG1hdGhtbC9vcGVudHlwZS9sYXJnZS1vcGVyYXRvcnMtaXRh bGljLWNvcnJlY3Rpb24uaHRtbCBbIFNraXAgXQorbWF0aG1sL3ByZXNlbnRhdGlvbi9idWcxNTk1 MTMuaHRtbCBbIFNraXAgXQogCiAjIFRoZXNlIHJlZnRlc3RzIHJlcXVpcmUgYSBmb250IHdpdGgg TWF0aGVtYXRpY2FsIEFscGhhbnVtZXJpYyBTeW1ib2xzLgogbWF0aG1sL3ByZXNlbnRhdGlvbi9h dHRyaWJ1dGVzLW1hdGh2YXJpYW50Lmh0bWwgWyBTa2lwIF0KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzZiMGNlYjJmNWU0MjlhOWQzZDI3Y2QzOTQ5Yjg3 MzA5N2RmZTQ1Zi4uODI4YzE1MGIyMDk5MGExMzg1ZjNmN2I0NzIyYmQyOTk4YzYwMDAyMyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTgwNCw2ICs4MDQs NyBAQCBtYXRobWwvb3BlbnR5cGUvaG9yaXpvbnRhbC1tdW5kZXJvdmVyLmh0bWwgWyBTa2lwIF0K IG1hdGhtbC9vcGVudHlwZS9mcmFjdGlvbi1saW5lLmh0bWwgWyBTa2lwIF0KIG1hdGhtbC9wcmVz ZW50YXRpb24vZnJhY3Rpb25zLWxpbmV0aGlja25lc3MuaHRtbCBbIFNraXAgXQogbWF0aG1sL29w ZW50eXBlL2xhcmdlLW9wZXJhdG9ycy1pdGFsaWMtY29ycmVjdGlvbi5odG1sIFsgU2tpcCBdCitt YXRobWwvcHJlc2VudGF0aW9uL2J1ZzE1OTUxMy5odG1sIFsgU2tpcCBdCiAKICMgVGhlc2UgdGVz dHMgdXNlIGtleSBuYXZpZ2F0aW9uIHRvIHRlc3QgTWF0aE1MIGxpbmtzIGJ1dCBkbyBub3Qgc2Vl bSB0byB3b3JrIG9uIE1hYy4KIHdlYmtpdC5vcmcvYi8xNTk2NjIgbWF0aG1sL3ByZXNlbnRhdGlv bi9ocmVmLWVudGVyLmh0bWwgWyBTa2lwIF0K