50684 2010-12-08 06:34:51 -0800 Default styling rules for the figure and figcaption elements 2010-12-09 08:41:13 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://www.whatwg.org/specs/web-apps/current-work/multipage/grouping-content.html#the-figure-element P2 Normal --- 0 peter webkit-unassigned commit-queue darin mathias oldest_to_newest 318750 0 peter 2010-12-08 06:34:51 -0800 This patch adds default styling rules for the <figure> and <figcaption> elements to html.css. The elements themselfes were added by Adam Barth during work on the tree-builder. 318751 1 75896 peter 2010-12-08 06:35:38 -0800 Created attachment 75896 Patch 319319 2 75896 abarth 2010-12-09 01:09:06 -0800 Comment on attachment 75896 Patch Looks reasonable to me. 319332 3 75896 mjs 2010-12-09 01:47:46 -0800 Comment on attachment 75896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75896&action=review Also it looks like the test cases don't test the styles. > WebCore/css/html.css:90 > margin: 1__qem 40px 1em 40px I don't think this rule is right for figure. The 1__qem invokes a quirk in quirks mode that is needed for historical reasons for blockquote, but there is no need to have the same quirk for figure. 319367 4 76035 peter 2010-12-09 03:04:53 -0800 Created attachment 76035 Revised patch Thank you for the review. I have addressed your points, figure now has its own definition in html.css and I've added testing of the default styles. I'd appreciate it if you could check whether my approach with the "emSize" variable in the tests is correct. 319467 5 76035 mjs 2010-12-09 08:15:36 -0800 Comment on attachment 76035 Revised patch r=me 319481 6 76035 commit-queue 2010-12-09 08:41:07 -0800 Comment on attachment 76035 Revised patch Clearing flags on attachment: 76035 Committed r73613: <http://trac.webkit.org/changeset/73613> 319482 7 commit-queue 2010-12-09 08:41:13 -0800 All reviewed patches have been landed. Closing bug. 75896 2010-12-08 06:35:38 -0800 2010-12-09 03:04:53 -0800 Patch figure.patch text/plain 9133 peter SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzUxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTItMDggIFBldGVyIEJldmVybG9vICA8cGV0ZXJAbHZwLW1l ZGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEZWZhdWx0IENTUyBkZWZpbml0aW9ucyBmb3IgdGhlIGZpZ3VyZSBhbmQgZmlnY2FwdGlvbiBl bGVtZW50cy4KKworICAgICAgICBUZXN0czogZmFzdC9odG1sL2ZpZ2NhcHRpb24tZWxlbWVudC5o dG1sCisgICAgICAgICAgICAgICBmYXN0L2h0bWwvZmlndXJlLWVsZW1lbnQuaHRtbAorCisgICAg ICAgICogY3NzL2h0bWwuY3NzOgorICAgICAgICAoYmxvY2txdW90ZSwgZmlndXJlKTogVGhlIGRl ZmF1bHQgZmlndXJlLXN0eWxlIGVxdWFscyBhIGJsb2NrcXVvdGUKKyAgICAgICAgKGZpZ2NhcHRp b24pOiBBIG5vbi1zZWN0aW9uaW5nIGJsb2NrLWxldmVsIGVsZW1lbnQKKwogMjAxMC0xMi0wNyAg SWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYkNvcmUvY3NzL2h0bWwuY3NzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvY3NzL2h0bWwuY3NzCShyZXZpc2lvbiA3MzQ5OSkKKysrIFdlYkNvcmUv Y3NzL2h0bWwuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC04NSwxMSArODUsMTUgQEAgYWRkcmVzcyB7 CiAgICAgZGlzcGxheTogYmxvY2sKIH0KIAotYmxvY2txdW90ZSB7CitibG9ja3F1b3RlLCBmaWd1 cmUgewogICAgIGRpc3BsYXk6IGJsb2NrOwogICAgIG1hcmdpbjogMV9fcWVtIDQwcHggMWVtIDQw cHgKIH0KIAorZmlnY2FwdGlvbiB7CisgICAgZGlzcGxheTogYmxvY2sKK30KKwogcSB7CiAgICAg ZGlzcGxheTogaW5saW5lCiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA3MzUxMikKKysrIExheW91dFRl c3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTEyLTA4 ICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGx2cC1tZWRpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVmYXVsdCBDU1MgZGVmaW5pdGlvbnMg Zm9yIHRoZSBmaWd1cmUgYW5kIGZpZ2NhcHRpb24gZWxlbWVudHMuCisgICAgICAgIAorICAgICAg ICAqIGZhc3QvaHRtbC9maWdjYXB0aW9uLWVsZW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2h0bWwvZmlnY2FwdGlvbi1lbGVtZW50Lmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvaHRtbC9maWd1cmUtZWxlbWVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvaHRtbC9maWd1cmUtZWxlbWVudC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2h0bWwvc2NyaXB0LXRlc3RzL2ZpZ2NhcHRpb24tZWxlbWVudC5qczogQWRkZWQuCisgICAgICAg ICogZmFzdC9odG1sL3NjcmlwdC10ZXN0cy9maWd1cmUtZWxlbWVudC5qczogQWRkZWQuCisKIDIw MTAtMTItMDggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHVuc2tpcHBlZCBzb21lIG1vcmUgbWVkaWEgdGVzdHMuCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L2h0bWwvZmlnY2FwdGlvbi1lbGVtZW50LWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvZmlnY2FwdGlvbi1lbGVtZW50LWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvaHRtbC9maWdjYXB0aW9u LWVsZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE5IEBACitWYXJp b3VzIHRlc3RzIGZvciB0aGUgZmlnY2FwdGlvbiBlbGVtZW50LgorCitPbiBzdWNjZXNzLCB5b3Ug d2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBD T01QTEVURSIuCisKKworPGZpZ2NhcHRpb24+IGNsb3NlcyA8cD46CitQQVNTIGZpZ2NhcHRpb24x LnBhcmVudE5vZGUubm9kZU5hbWUgPT0gInAiIGlzIGZhbHNlCis8cD4gZG9lcyBub3QgY2xvc2Ug PGZpZ2NhcHRpb24+OgorUEFTUyBwMS5wYXJlbnROb2RlLm5vZGVOYW1lIGlzICJGSUdDQVBUSU9O IgorPGZpZ2NhcHRpb24+IGNhbiBiZSBuZXN0ZWQgaW5zaWRlIDxmaWdjYXB0aW9uPiBvciA8Zm9v dGVyPjoKK1BBU1MgZmlnY2FwdGlvbjMucGFyZW50Tm9kZS5pZCBpcyAiZmlnY2FwdGlvbjIiCitQ QVNTIGZpZ2NhcHRpb241LnBhcmVudE5vZGUuaWQgaXMgImZvb3RlcjEiCitSZXNpZHVhbCBzdHls ZToKK1BBU1MgZ2V0V2VpZ2h0KCJmaWdjYXB0aW9uNCIpIGlzICJib2xkIgorUEFTUyBnZXRXZWln aHQoInNwYW4xIikgaXMgImJvbGQiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisK K1RFU1QgQ09NUExFVEUKKwoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaHRtbC9maWdjYXB0aW9u LWVsZW1lbnQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvZmlnY2Fw dGlvbi1lbGVtZW50Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2h0bWwv ZmlnY2FwdGlvbi1lbGVtZW50Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTMgQEAKKzwh RE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhl YWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2Vz L2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNl cy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNj cmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2Ny aXB0LXRlc3RzL2ZpZ2NhcHRpb24tZWxlbWVudC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i Li4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4KCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvZmlndXJlLWVsZW1lbnQt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvaHRtbC9maWd1cmUt ZWxlbWVudC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2h0 bWwvZmlndXJlLWVsZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE5 IEBACitWYXJpb3VzIHRlc3RzIGZvciB0aGUgZmlndXJlIGVsZW1lbnQuCisKK09uIHN1Y2Nlc3Ms IHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJU RVNUIENPTVBMRVRFIi4KKworCis8ZmlndXJlPiBjbG9zZXMgPHA+OgorUEFTUyBmaWd1cmUxLnBh cmVudE5vZGUubm9kZU5hbWUgPT0gInAiIGlzIGZhbHNlCis8cD4gZG9lcyBub3QgY2xvc2UgPGZp Z3VyZT46CitQQVNTIHAxLnBhcmVudE5vZGUubm9kZU5hbWUgaXMgIkZJR1VSRSIKKzxmaWd1cmU+ IGNhbiBiZSBuZXN0ZWQgaW5zaWRlIDxmaWd1cmU+IG9yIDxmb290ZXI+OgorUEFTUyBmaWd1cmUz LnBhcmVudE5vZGUuaWQgaXMgImZpZ3VyZTIiCitQQVNTIGZpZ3VyZTUucGFyZW50Tm9kZS5pZCBp cyAiZm9vdGVyMSIKK1Jlc2lkdWFsIHN0eWxlOgorUEFTUyBnZXRXZWlnaHQoImZpZ3VyZTQiKSBp cyAiYm9sZCIKK1BBU1MgZ2V0V2VpZ2h0KCJzcGFuMSIpIGlzICJib2xkIgorUEFTUyBzdWNjZXNz ZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKCkluZGV4OiBMYXlvdXRUZXN0 cy9mYXN0L2h0bWwvZmlndXJlLWVsZW1lbnQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L2h0bWwvZmlndXJlLWVsZW1lbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL2Zhc3QvaHRtbC9maWd1cmUtZWxlbWVudC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDEzIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8 aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi8uLi9mYXN0L2pz L3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9q cy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8 cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlw dCBzcmM9InNjcmlwdC10ZXN0cy9maWd1cmUtZWxlbWVudC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0 IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K KzwvYm9keT4KKzwvaHRtbD4KCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvc2NyaXB0LXRl c3RzL2ZpZ2NhcHRpb24tZWxlbWVudC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2h0bWwvc2NyaXB0LXRlc3RzL2ZpZ2NhcHRpb24tZWxlbWVudC5qcwkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvaHRtbC9zY3JpcHQtdGVzdHMvZmlnY2FwdGlvbi1lbGVtZW50Lmpz CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM0IEBACitkZXNjcmlwdGlvbignVmFyaW91cyB0ZXN0 cyBmb3IgdGhlIGZpZ2NhcHRpb24gZWxlbWVudC4nKTsKKwordmFyIHRlc3RQYXJlbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodGVz dFBhcmVudCk7CisKK2RlYnVnKCcmbHQ7ZmlnY2FwdGlvbj4gY2xvc2VzICZsdDtwPjonKTsKK3Rl c3RQYXJlbnQuaW5uZXJIVE1MID0gJzxwPlRlc3QgdGhhdCA8ZmlnY2FwdGlvbiBpZD0iZmlnY2Fw dGlvbjEiPmEgZmlnY2FwdGlvbiBlbGVtZW50PC9maWdjYXB0aW9uPiBjbG9zZXMgJmx0O3A+Ljwv cD4nOwordmFyIGZpZ2NhcHRpb24xID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2ZpZ2NhcHRp b24xJyk7CitzaG91bGRCZUZhbHNlKCdmaWdjYXB0aW9uMS5wYXJlbnROb2RlLm5vZGVOYW1lID09 ICJwIicpOworCitkZWJ1ZygnJmx0O3A+IGRvZXMgbm90IGNsb3NlICZsdDtmaWdjYXB0aW9uPjon KTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxmaWdjYXB0aW9uPlRlc3QgdGhhdCA8cCBpZD0i cDEiPmEgcCBlbGVtZW50PC9wPiBkb2VzIG5vdCBjbG9zZSBhIGZpZ2NhcHRpb24gZWxlbWVudC48 L2ZpZ2NhcHRpb24+JzsKK3ZhciBwMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdwMScpOwor c2hvdWxkQmUoJ3AxLnBhcmVudE5vZGUubm9kZU5hbWUnLCAnIkZJR0NBUFRJT04iJyk7CisKK2Rl YnVnKCcmbHQ7ZmlnY2FwdGlvbj4gY2FuIGJlIG5lc3RlZCBpbnNpZGUgJmx0O2ZpZ2NhcHRpb24+ IG9yICZsdDtmb290ZXI+OicpOwordGVzdFBhcmVudC5pbm5lckhUTUwgPSAnPGZpZ2NhcHRpb24g aWQ9ImZpZ2NhcHRpb24yIj5UZXN0IHRoYXQgPGZpZ2NhcHRpb24gaWQ9ImZpZ2NhcHRpb24zIj5h IGZpZ2NhcHRpb24gZWxlbWVudDwvZmlnY2FwdGlvbj4gY2FuIGJlIG5lc3RlZCBpbnNpZGUgYW5v dGhlciBmaWdjYXB0aW9uIGVsZW1lbnQuPC9maWdjYXB0aW9uPic7Cit2YXIgZmlnY2FwdGlvbjMg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZmlnY2FwdGlvbjMnKTsKK3Nob3VsZEJlKCdmaWdj YXB0aW9uMy5wYXJlbnROb2RlLmlkJywgJyJmaWdjYXB0aW9uMiInKTsKK3Rlc3RQYXJlbnQuaW5u ZXJIVE1MID0gJzxmb290ZXIgaWQ9ImZvb3RlcjEiPlRlc3QgdGhhdCA8ZmlnY2FwdGlvbiBpZD0i ZmlnY2FwdGlvbjUiPmEgZmlnY2FwdGlvbiBlbGVtZW50PC9maWdjYXB0aW9uPiBjYW4gYmUgbmVz dGVkIGluc2lkZSBhIGZvb3RlciBlbGVtZW50LjwvZm9vdGVyPic7Cit2YXIgZmlnY2FwdGlvbjUg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZmlnY2FwdGlvbjUnKTsKK3Nob3VsZEJlKCdmaWdj YXB0aW9uNS5wYXJlbnROb2RlLmlkJywgJyJmb290ZXIxIicpOworCitkZWJ1ZygnUmVzaWR1YWwg c3R5bGU6Jyk7Cit0ZXN0UGFyZW50LmlubmVySFRNTCA9ICc8Yj48ZmlnY2FwdGlvbiBpZD0iZmln Y2FwdGlvbjQiPlRoaXMgdGV4dCBzaG91bGQgYmUgYm9sZC48L2ZpZ2NhcHRpb24+IDxzcGFuIGlk PSJzcGFuMSI+VGhpcyBpcyBhbHNvIGJvbGQuPC9zcGFuPjwvYj4nOworZnVuY3Rpb24gZ2V0V2Vp Z2h0KGlkKSB7CisgICAgcmV0dXJuIGRvY3VtZW50LmRlZmF1bHRWaWV3LmdldENvbXB1dGVkU3R5 bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpLCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVlKCdm b250LXdlaWdodCcpOworfQorc2hvdWxkQmUoJ2dldFdlaWdodCgiZmlnY2FwdGlvbjQiKScsICci Ym9sZCInKTsKK3Nob3VsZEJlKCdnZXRXZWlnaHQoInNwYW4xIiknLCAnImJvbGQiJyk7Citkb2N1 bWVudC5ib2R5LnJlbW92ZUNoaWxkKHRlc3RQYXJlbnQpOworCit2YXIgc3VjY2Vzc2Z1bGx5UGFy c2VkID0gdHJ1ZTsKKwoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaHRtbC9zY3JpcHQtdGVzdHMv ZmlndXJlLWVsZW1lbnQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9odG1sL3Nj cmlwdC10ZXN0cy9maWd1cmUtZWxlbWVudC5qcwkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L2Zhc3QvaHRtbC9zY3JpcHQtdGVzdHMvZmlndXJlLWVsZW1lbnQuanMJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsMzQgQEAKK2Rlc2NyaXB0aW9uKCdWYXJpb3VzIHRlc3RzIGZvciB0aGUgZmlndXJl IGVsZW1lbnQuJyk7CisKK3ZhciB0ZXN0UGFyZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgn ZGl2Jyk7Citkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHRlc3RQYXJlbnQpOworCitkZWJ1Zygn Jmx0O2ZpZ3VyZT4gY2xvc2VzICZsdDtwPjonKTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxw PlRlc3QgdGhhdCA8ZmlndXJlIGlkPSJmaWd1cmUxIj5hIGZpZ3VyZSBlbGVtZW50PC9maWd1cmU+ IGNsb3NlcyAmbHQ7cD4uPC9wPic7Cit2YXIgZmlndXJlMSA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdmaWd1cmUxJyk7CitzaG91bGRCZUZhbHNlKCdmaWd1cmUxLnBhcmVudE5vZGUubm9kZU5h bWUgPT0gInAiJyk7CisKK2RlYnVnKCcmbHQ7cD4gZG9lcyBub3QgY2xvc2UgJmx0O2ZpZ3VyZT46 Jyk7Cit0ZXN0UGFyZW50LmlubmVySFRNTCA9ICc8ZmlndXJlPlRlc3QgdGhhdCA8cCBpZD0icDEi PmEgcCBlbGVtZW50PC9wPiBkb2VzIG5vdCBjbG9zZSBhIGZpZ3VyZSBlbGVtZW50LjwvZmlndXJl Pic7Cit2YXIgcDEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncDEnKTsKK3Nob3VsZEJlKCdw MS5wYXJlbnROb2RlLm5vZGVOYW1lJywgJyJGSUdVUkUiJyk7CisKK2RlYnVnKCcmbHQ7ZmlndXJl PiBjYW4gYmUgbmVzdGVkIGluc2lkZSAmbHQ7ZmlndXJlPiBvciAmbHQ7Zm9vdGVyPjonKTsKK3Rl c3RQYXJlbnQuaW5uZXJIVE1MID0gJzxmaWd1cmUgaWQ9ImZpZ3VyZTIiPlRlc3QgdGhhdCA8Zmln dXJlIGlkPSJmaWd1cmUzIj5hIGZpZ3VyZSBlbGVtZW50PC9maWd1cmU+IGNhbiBiZSBuZXN0ZWQg aW5zaWRlIGFub3RoZXIgZmlndXJlIGVsZW1lbnQuPC9maWd1cmU+JzsKK3ZhciBmaWd1cmUzID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2ZpZ3VyZTMnKTsKK3Nob3VsZEJlKCdmaWd1cmUzLnBh cmVudE5vZGUuaWQnLCAnImZpZ3VyZTIiJyk7Cit0ZXN0UGFyZW50LmlubmVySFRNTCA9ICc8Zm9v dGVyIGlkPSJmb290ZXIxIj5UZXN0IHRoYXQgPGZpZ3VyZSBpZD0iZmlndXJlNSI+YSBmaWd1cmUg ZWxlbWVudDwvZmlndXJlPiBjYW4gYmUgbmVzdGVkIGluc2lkZSBhIGZvb3RlciBlbGVtZW50Ljwv Zm9vdGVyPic7Cit2YXIgZmlndXJlNSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmaWd1cmU1 Jyk7CitzaG91bGRCZSgnZmlndXJlNS5wYXJlbnROb2RlLmlkJywgJyJmb290ZXIxIicpOworCitk ZWJ1ZygnUmVzaWR1YWwgc3R5bGU6Jyk7Cit0ZXN0UGFyZW50LmlubmVySFRNTCA9ICc8Yj48Zmln dXJlIGlkPSJmaWd1cmU0Ij5UaGlzIHRleHQgc2hvdWxkIGJlIGJvbGQuPC9maWd1cmU+IDxzcGFu IGlkPSJzcGFuMSI+VGhpcyBpcyBhbHNvIGJvbGQuPC9zcGFuPjwvYj4nOworZnVuY3Rpb24gZ2V0 V2VpZ2h0KGlkKSB7CisgICAgcmV0dXJuIGRvY3VtZW50LmRlZmF1bHRWaWV3LmdldENvbXB1dGVk U3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpLCBudWxsKS5nZXRQcm9wZXJ0eVZhbHVl KCdmb250LXdlaWdodCcpOworfQorc2hvdWxkQmUoJ2dldFdlaWdodCgiZmlndXJlNCIpJywgJyJi b2xkIicpOworc2hvdWxkQmUoJ2dldFdlaWdodCgic3BhbjEiKScsICciYm9sZCInKTsKK2RvY3Vt ZW50LmJvZHkucmVtb3ZlQ2hpbGQodGVzdFBhcmVudCk7CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJz ZWQgPSB0cnVlOworCg== 76035 2010-12-09 03:04:53 -0800 2010-12-09 08:41:07 -0800 Revised patch figure2.patch text/plain 10406 peter SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzU5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTItMDkgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAbHZwLW1l ZGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEZWZhdWx0IENTUyBkZWZpbml0aW9ucyBmb3IgdGhlIGZpZ3VyZSBhbmQgZmlnY2FwdGlvbiBl bGVtZW50cy4KKworICAgICAgICBUZXN0czogZmFzdC9odG1sL2ZpZ2NhcHRpb24tZWxlbWVudC5o dG1sCisgICAgICAgICAgICAgICBmYXN0L2h0bWwvZmlndXJlLWVsZW1lbnQuaHRtbAorCisgICAg ICAgICogY3NzL2h0bWwuY3NzOgorICAgICAgICAoZmlndXJlKTogVGhlIGRlZmF1bHQgZmlndXJl LXN0eWxlIGVxdWFscyBhIGJsb2NrcXVvdGUKKyAgICAgICAgKGZpZ2NhcHRpb24pOiBBIG5vbi1z ZWN0aW9uaW5nIGJsb2NrLWxldmVsIGVsZW1lbnQKKwogMjAxMC0xMi0wOCAgRXJpayBBcnZpZHNz b24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgpJbmRleDogV2ViQ29yZS9jc3MvaHRtbC5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3Mv aHRtbC5jc3MJKHJldmlzaW9uIDczNDk5KQorKysgV2ViQ29yZS9jc3MvaHRtbC5jc3MJKHdvcmtp bmcgY29weSkKQEAgLTkwLDYgKzkwLDE1IEBAIGJsb2NrcXVvdGUgewogICAgIG1hcmdpbjogMV9f cWVtIDQwcHggMWVtIDQwcHgKIH0KIAorZmlnY2FwdGlvbiB7CisgICAgZGlzcGxheTogYmxvY2sK K30KKworZmlndXJlIHsKKyAgICBkaXNwbGF5OiBibG9jazsKKyAgICBtYXJnaW46IDFlbSA0MHB4 IDFlbSA0MHB4Cit9CisKIHEgewogICAgIGRpc3BsYXk6IGlubGluZQogfQpJbmRleDogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2 aXNpb24gNzM1OTkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNiBAQAorMjAxMC0xMi0wOSAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBsdnAtbWVk aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IERlZmF1bHQgQ1NTIGRlZmluaXRpb25zIGZvciB0aGUgZmlndXJlIGFuZCBmaWdjYXB0aW9uIGVs ZW1lbnRzLgorCisgICAgICAgICogZmFzdC9odG1sL2ZpZ2NhcHRpb24tZWxlbWVudC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvaHRtbC9maWdjYXB0aW9uLWVsZW1lbnQuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9odG1sL2ZpZ3VyZS1lbGVtZW50LWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogZmFzdC9odG1sL2ZpZ3VyZS1lbGVtZW50Lmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvaHRtbC9zY3JpcHQtdGVzdHMvZmlnY2FwdGlvbi1lbGVtZW50Lmpz OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2h0bWwvc2NyaXB0LXRlc3RzL2ZpZ3VyZS1lbGVtZW50 LmpzOiBBZGRlZC4KKwogMjAxMC0xMi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEFkZCBRdCBzcGVjaWZpYyBleHBlY3RlZCBy ZXN1bHRzIGZvciB0ZXN0cyBpbnRyb2R1Y2VkIGluIHI3MzUyOS4KSW5kZXg6IExheW91dFRlc3Rz L2Zhc3QvaHRtbC9maWdjYXB0aW9uLWVsZW1lbnQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvaHRtbC9maWdjYXB0aW9uLWVsZW1lbnQtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9odG1sL2ZpZ2NhcHRpb24tZWxlbWVudC1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjEgQEAKK1ZhcmlvdXMgdGVzdHMg Zm9yIHRoZSBmaWdjYXB0aW9uIGVsZW1lbnQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCis8ZmlnY2FwdGlvbj4gZGVmYXVsdCBzdHlsaW5nOgorUEFTUyBnZXRTdHlsZVZhbHVlKCJm aWdjYXB0aW9uMCIsImRpc3BsYXkiKSBpcyAiYmxvY2siCis8ZmlnY2FwdGlvbj4gY2xvc2VzIDxw PjoKK1BBU1MgZmlnY2FwdGlvbjEucGFyZW50Tm9kZS5ub2RlTmFtZSA9PSAicCIgaXMgZmFsc2UK KzxwPiBkb2VzIG5vdCBjbG9zZSA8ZmlnY2FwdGlvbj46CitQQVNTIHAxLnBhcmVudE5vZGUubm9k ZU5hbWUgaXMgIkZJR0NBUFRJT04iCis8ZmlnY2FwdGlvbj4gY2FuIGJlIG5lc3RlZCBpbnNpZGUg PGZpZ2NhcHRpb24+IG9yIDxmb290ZXI+OgorUEFTUyBmaWdjYXB0aW9uMy5wYXJlbnROb2RlLmlk IGlzICJmaWdjYXB0aW9uMiIKK1BBU1MgZmlnY2FwdGlvbjUucGFyZW50Tm9kZS5pZCBpcyAiZm9v dGVyMSIKK1Jlc2lkdWFsIHN0eWxlOgorUEFTUyBnZXRTdHlsZVZhbHVlKCJmaWdjYXB0aW9uNCIs ImZvbnQtd2VpZ2h0IikgaXMgImJvbGQiCitQQVNTIGdldFN0eWxlVmFsdWUoInNwYW4xIiwiZm9u dC13ZWlnaHQiKSBpcyAiYm9sZCIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKwor VEVTVCBDT01QTEVURQorCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9odG1sL2ZpZ2NhcHRpb24t ZWxlbWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvaHRtbC9maWdjYXB0 aW9uLWVsZW1lbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvaHRtbC9m aWdjYXB0aW9uLWVsZW1lbnQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMyBAQAorPCFE T0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVh ZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMv anMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2Ny aXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJzY3Jp cHQtdGVzdHMvZmlnY2FwdGlvbi1lbGVtZW50LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIu Li8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaHRtbC9maWd1cmUtZWxlbWVudC1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9odG1sL2ZpZ3VyZS1l bGVtZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvaHRt bC9maWd1cmUtZWxlbWVudC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjUg QEAKK1ZhcmlvdXMgdGVzdHMgZm9yIHRoZSBmaWd1cmUgZWxlbWVudC4KKworT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUiLgorCisKKzxmaWd1cmU+IGRlZmF1bHQgc3R5bGluZzoKK1BBU1MgZ2V0U3R5 bGVWYWx1ZSgiZmlndXJlMCIsImRpc3BsYXkiKSBpcyAiYmxvY2siCitQQVNTIGdldFN0eWxlVmFs dWUoImZpZ3VyZTAiLCJtYXJnaW4tdG9wIikgaXMgZW1TaXplCitQQVNTIGdldFN0eWxlVmFsdWUo ImZpZ3VyZTAiLCJtYXJnaW4tcmlnaHQiKSBpcyAiNDBweCIKK1BBU1MgZ2V0U3R5bGVWYWx1ZSgi ZmlndXJlMCIsIm1hcmdpbi1ib3R0b20iKSBpcyBlbVNpemUKK1BBU1MgZ2V0U3R5bGVWYWx1ZSgi ZmlndXJlMCIsIm1hcmdpbi1sZWZ0IikgaXMgIjQwcHgiCis8ZmlndXJlPiBjbG9zZXMgPHA+Ogor UEFTUyBmaWd1cmUxLnBhcmVudE5vZGUubm9kZU5hbWUgPT0gInAiIGlzIGZhbHNlCis8cD4gZG9l cyBub3QgY2xvc2UgPGZpZ3VyZT46CitQQVNTIHAxLnBhcmVudE5vZGUubm9kZU5hbWUgaXMgIkZJ R1VSRSIKKzxmaWd1cmU+IGNhbiBiZSBuZXN0ZWQgaW5zaWRlIDxmaWd1cmU+IG9yIDxmb290ZXI+ OgorUEFTUyBmaWd1cmUzLnBhcmVudE5vZGUuaWQgaXMgImZpZ3VyZTIiCitQQVNTIGZpZ3VyZTUu cGFyZW50Tm9kZS5pZCBpcyAiZm9vdGVyMSIKK1Jlc2lkdWFsIHN0eWxlOgorUEFTUyBnZXRTdHls ZVZhbHVlKCJmaWd1cmU0IiwiZm9udC13ZWlnaHQiKSBpcyAiYm9sZCIKK1BBU1MgZ2V0U3R5bGVW YWx1ZSgic3BhbjEiLCJmb250LXdlaWdodCIpIGlzICJib2xkIgorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L2h0bWwvZmlndXJlLWVsZW1lbnQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2h0bWwvZmlndXJlLWVsZW1lbnQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zh c3QvaHRtbC9maWd1cmUtZWxlbWVudC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEzIEBA Cis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4K KzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi8uLi9mYXN0L2pzL3Jlc291 cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0i ZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdCBzcmM9 InNjcmlwdC10ZXN0cy9maWd1cmUtZWxlbWVudC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i Li4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4KCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvc2NyaXB0LXRlc3RzL2Zp Z2NhcHRpb24tZWxlbWVudC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2h0bWwv c2NyaXB0LXRlc3RzL2ZpZ2NhcHRpb24tZWxlbWVudC5qcwkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL2Zhc3QvaHRtbC9zY3JpcHQtdGVzdHMvZmlnY2FwdGlvbi1lbGVtZW50LmpzCShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDQwIEBACitkZXNjcmlwdGlvbignVmFyaW91cyB0ZXN0cyBmb3Ig dGhlIGZpZ2NhcHRpb24gZWxlbWVudC4nKTsKKworZnVuY3Rpb24gZ2V0U3R5bGVWYWx1ZShpZCwg cHJvcGVydHlOYW1lKSB7CisgICAgcmV0dXJuIGRvY3VtZW50LmRlZmF1bHRWaWV3LmdldENvbXB1 dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpLCBudWxsKS5nZXRQcm9wZXJ0eVZh bHVlKHByb3BlcnR5TmFtZSk7Cit9CisKK3ZhciB0ZXN0UGFyZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgnZGl2Jyk7Citkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHRlc3RQYXJlbnQpOwor CitkZWJ1ZygnJmx0O2ZpZ2NhcHRpb24+IGRlZmF1bHQgc3R5bGluZzonKTsKK3Rlc3RQYXJlbnQu aW5uZXJIVE1MID0gJzxmaWdjYXB0aW9uIGlkPSJmaWdjYXB0aW9uMCI+ZWxlbWVudDwvZmlndXJl Pic7Cit2YXIgZW1TaXplID0gZ2V0U3R5bGVWYWx1ZSgiZmlnY2FwdGlvbjAiLCJmb250LXNpemUi KTsKK3Nob3VsZEJlKCdnZXRTdHlsZVZhbHVlKCJmaWdjYXB0aW9uMCIsImRpc3BsYXkiKScsICci YmxvY2siJyk7CisKK2RlYnVnKCcmbHQ7ZmlnY2FwdGlvbj4gY2xvc2VzICZsdDtwPjonKTsKK3Rl c3RQYXJlbnQuaW5uZXJIVE1MID0gJzxwPlRlc3QgdGhhdCA8ZmlnY2FwdGlvbiBpZD0iZmlnY2Fw dGlvbjEiPmEgZmlnY2FwdGlvbiBlbGVtZW50PC9maWdjYXB0aW9uPiBjbG9zZXMgJmx0O3A+Ljwv cD4nOwordmFyIGZpZ2NhcHRpb24xID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2ZpZ2NhcHRp b24xJyk7CitzaG91bGRCZUZhbHNlKCdmaWdjYXB0aW9uMS5wYXJlbnROb2RlLm5vZGVOYW1lID09 ICJwIicpOworCitkZWJ1ZygnJmx0O3A+IGRvZXMgbm90IGNsb3NlICZsdDtmaWdjYXB0aW9uPjon KTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxmaWdjYXB0aW9uPlRlc3QgdGhhdCA8cCBpZD0i cDEiPmEgcCBlbGVtZW50PC9wPiBkb2VzIG5vdCBjbG9zZSBhIGZpZ2NhcHRpb24gZWxlbWVudC48 L2ZpZ2NhcHRpb24+JzsKK3ZhciBwMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdwMScpOwor c2hvdWxkQmUoJ3AxLnBhcmVudE5vZGUubm9kZU5hbWUnLCAnIkZJR0NBUFRJT04iJyk7CisKK2Rl YnVnKCcmbHQ7ZmlnY2FwdGlvbj4gY2FuIGJlIG5lc3RlZCBpbnNpZGUgJmx0O2ZpZ2NhcHRpb24+ IG9yICZsdDtmb290ZXI+OicpOwordGVzdFBhcmVudC5pbm5lckhUTUwgPSAnPGZpZ2NhcHRpb24g aWQ9ImZpZ2NhcHRpb24yIj5UZXN0IHRoYXQgPGZpZ2NhcHRpb24gaWQ9ImZpZ2NhcHRpb24zIj5h IGZpZ2NhcHRpb24gZWxlbWVudDwvZmlnY2FwdGlvbj4gY2FuIGJlIG5lc3RlZCBpbnNpZGUgYW5v dGhlciBmaWdjYXB0aW9uIGVsZW1lbnQuPC9maWdjYXB0aW9uPic7Cit2YXIgZmlnY2FwdGlvbjMg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZmlnY2FwdGlvbjMnKTsKK3Nob3VsZEJlKCdmaWdj YXB0aW9uMy5wYXJlbnROb2RlLmlkJywgJyJmaWdjYXB0aW9uMiInKTsKK3Rlc3RQYXJlbnQuaW5u ZXJIVE1MID0gJzxmb290ZXIgaWQ9ImZvb3RlcjEiPlRlc3QgdGhhdCA8ZmlnY2FwdGlvbiBpZD0i ZmlnY2FwdGlvbjUiPmEgZmlnY2FwdGlvbiBlbGVtZW50PC9maWdjYXB0aW9uPiBjYW4gYmUgbmVz dGVkIGluc2lkZSBhIGZvb3RlciBlbGVtZW50LjwvZm9vdGVyPic7Cit2YXIgZmlnY2FwdGlvbjUg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZmlnY2FwdGlvbjUnKTsKK3Nob3VsZEJlKCdmaWdj YXB0aW9uNS5wYXJlbnROb2RlLmlkJywgJyJmb290ZXIxIicpOworCitkZWJ1ZygnUmVzaWR1YWwg c3R5bGU6Jyk7Cit0ZXN0UGFyZW50LmlubmVySFRNTCA9ICc8Yj48ZmlnY2FwdGlvbiBpZD0iZmln Y2FwdGlvbjQiPlRoaXMgdGV4dCBzaG91bGQgYmUgYm9sZC48L2ZpZ2NhcHRpb24+IDxzcGFuIGlk PSJzcGFuMSI+VGhpcyBpcyBhbHNvIGJvbGQuPC9zcGFuPjwvYj4nOworc2hvdWxkQmUoJ2dldFN0 eWxlVmFsdWUoImZpZ2NhcHRpb240IiwiZm9udC13ZWlnaHQiKScsICciYm9sZCInKTsKK3Nob3Vs ZEJlKCdnZXRTdHlsZVZhbHVlKCJzcGFuMSIsImZvbnQtd2VpZ2h0IiknLCAnImJvbGQiJyk7Citk b2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHRlc3RQYXJlbnQpOworCit2YXIgc3VjY2Vzc2Z1bGx5 UGFyc2VkID0gdHJ1ZTsKKwoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaHRtbC9zY3JpcHQtdGVz dHMvZmlndXJlLWVsZW1lbnQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9odG1s L3NjcmlwdC10ZXN0cy9maWd1cmUtZWxlbWVudC5qcwkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL2Zhc3QvaHRtbC9zY3JpcHQtdGVzdHMvZmlndXJlLWVsZW1lbnQuanMJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsNDQgQEAKK2Rlc2NyaXB0aW9uKCdWYXJpb3VzIHRlc3RzIGZvciB0aGUgZmln dXJlIGVsZW1lbnQuJyk7CisKK2Z1bmN0aW9uIGdldFN0eWxlVmFsdWUoaWQsIHByb3BlcnR5TmFt ZSkgeworICAgIHJldHVybiBkb2N1bWVudC5kZWZhdWx0Vmlldy5nZXRDb21wdXRlZFN0eWxlKGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKGlkKSwgbnVsbCkuZ2V0UHJvcGVydHlWYWx1ZShwcm9wZXJ0 eU5hbWUpOworfQorCit2YXIgdGVzdFBhcmVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2Rp dicpOworZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0ZXN0UGFyZW50KTsKKworZGVidWcoJyZs dDtmaWd1cmU+IGRlZmF1bHQgc3R5bGluZzonKTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxm aWd1cmUgaWQ9ImZpZ3VyZTAiPmVsZW1lbnQ8L2ZpZ3VyZT4nOwordmFyIGVtU2l6ZSA9IGdldFN0 eWxlVmFsdWUoImZpZ3VyZTAiLCJmb250LXNpemUiKTsKK3Nob3VsZEJlKCdnZXRTdHlsZVZhbHVl KCJmaWd1cmUwIiwiZGlzcGxheSIpJywgJyJibG9jayInKTsKK3Nob3VsZEJlKCdnZXRTdHlsZVZh bHVlKCJmaWd1cmUwIiwibWFyZ2luLXRvcCIpJywgJ2VtU2l6ZScpOworc2hvdWxkQmUoJ2dldFN0 eWxlVmFsdWUoImZpZ3VyZTAiLCJtYXJnaW4tcmlnaHQiKScsICciNDBweCInKTsKK3Nob3VsZEJl KCdnZXRTdHlsZVZhbHVlKCJmaWd1cmUwIiwibWFyZ2luLWJvdHRvbSIpJywgJ2VtU2l6ZScpOwor c2hvdWxkQmUoJ2dldFN0eWxlVmFsdWUoImZpZ3VyZTAiLCJtYXJnaW4tbGVmdCIpJywgJyI0MHB4 IicpOworCitkZWJ1ZygnJmx0O2ZpZ3VyZT4gY2xvc2VzICZsdDtwPjonKTsKK3Rlc3RQYXJlbnQu aW5uZXJIVE1MID0gJzxwPlRlc3QgdGhhdCA8ZmlndXJlIGlkPSJmaWd1cmUxIj5hIGZpZ3VyZSBl bGVtZW50PC9maWd1cmU+IGNsb3NlcyAmbHQ7cD4uPC9wPic7Cit2YXIgZmlndXJlMSA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCdmaWd1cmUxJyk7CitzaG91bGRCZUZhbHNlKCdmaWd1cmUxLnBh cmVudE5vZGUubm9kZU5hbWUgPT0gInAiJyk7CisKK2RlYnVnKCcmbHQ7cD4gZG9lcyBub3QgY2xv c2UgJmx0O2ZpZ3VyZT46Jyk7Cit0ZXN0UGFyZW50LmlubmVySFRNTCA9ICc8ZmlndXJlPlRlc3Qg dGhhdCA8cCBpZD0icDEiPmEgcCBlbGVtZW50PC9wPiBkb2VzIG5vdCBjbG9zZSBhIGZpZ3VyZSBl bGVtZW50LjwvZmlndXJlPic7Cit2YXIgcDEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncDEn KTsKK3Nob3VsZEJlKCdwMS5wYXJlbnROb2RlLm5vZGVOYW1lJywgJyJGSUdVUkUiJyk7CisKK2Rl YnVnKCcmbHQ7ZmlndXJlPiBjYW4gYmUgbmVzdGVkIGluc2lkZSAmbHQ7ZmlndXJlPiBvciAmbHQ7 Zm9vdGVyPjonKTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxmaWd1cmUgaWQ9ImZpZ3VyZTIi PlRlc3QgdGhhdCA8ZmlndXJlIGlkPSJmaWd1cmUzIj5hIGZpZ3VyZSBlbGVtZW50PC9maWd1cmU+ IGNhbiBiZSBuZXN0ZWQgaW5zaWRlIGFub3RoZXIgZmlndXJlIGVsZW1lbnQuPC9maWd1cmU+JzsK K3ZhciBmaWd1cmUzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2ZpZ3VyZTMnKTsKK3Nob3Vs ZEJlKCdmaWd1cmUzLnBhcmVudE5vZGUuaWQnLCAnImZpZ3VyZTIiJyk7Cit0ZXN0UGFyZW50Lmlu bmVySFRNTCA9ICc8Zm9vdGVyIGlkPSJmb290ZXIxIj5UZXN0IHRoYXQgPGZpZ3VyZSBpZD0iZmln dXJlNSI+YSBmaWd1cmUgZWxlbWVudDwvZmlndXJlPiBjYW4gYmUgbmVzdGVkIGluc2lkZSBhIGZv b3RlciBlbGVtZW50LjwvZm9vdGVyPic7Cit2YXIgZmlndXJlNSA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdmaWd1cmU1Jyk7CitzaG91bGRCZSgnZmlndXJlNS5wYXJlbnROb2RlLmlkJywgJyJm b290ZXIxIicpOworCitkZWJ1ZygnUmVzaWR1YWwgc3R5bGU6Jyk7Cit0ZXN0UGFyZW50LmlubmVy SFRNTCA9ICc8Yj48ZmlndXJlIGlkPSJmaWd1cmU0Ij5UaGlzIHRleHQgc2hvdWxkIGJlIGJvbGQu PC9maWd1cmU+IDxzcGFuIGlkPSJzcGFuMSI+VGhpcyBpcyBhbHNvIGJvbGQuPC9zcGFuPjwvYj4n Oworc2hvdWxkQmUoJ2dldFN0eWxlVmFsdWUoImZpZ3VyZTQiLCJmb250LXdlaWdodCIpJywgJyJi b2xkIicpOworc2hvdWxkQmUoJ2dldFN0eWxlVmFsdWUoInNwYW4xIiwiZm9udC13ZWlnaHQiKScs ICciYm9sZCInKTsKK2RvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGVzdFBhcmVudCk7CisKK3Zh ciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworCgo=