From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Charles C. Berry" Subject: [PATCH] Re: HTML export with ":export" parameter with Orgmode 9.0 Date: Sat, 12 Nov 2016 19:09:28 -0800 Message-ID: References: <74a9bf69-d19e-1528-22ce-f9833d8dd0ed@fgiasson.com> <87mvh6fjiv.fsf@nicolasgoaziou.fr> <9157621c-3c48-8661-9bfb-0f8dadd99357@fgiasson.com> <98645dec-97ad-3d3f-3b1a-291c0dce122d@fgiasson.com> <87wpg9c69m.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="0-1765508873-1479006569=:3656" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5lAm-0001ew-VY for emacs-orgmode@gnu.org; Sat, 12 Nov 2016 22:09:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5lAj-00051d-Ml for emacs-orgmode@gnu.org; Sat, 12 Nov 2016 22:09:36 -0500 Received: from iport-acv2-out.ucsd.edu ([132.239.0.174]:53173) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1c5lAj-00050A-4C for emacs-orgmode@gnu.org; Sat, 12 Nov 2016 22:09:33 -0500 In-Reply-To: <87wpg9c69m.fsf@nicolasgoaziou.fr> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Nicolas Goaziou Cc: Org-Mode mailing list This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-1765508873-1479006569=:3656 Content-Type: text/plain; charset=US-ASCII; format=flowed On Sat, 12 Nov 2016, Nicolas Goaziou wrote: [discussion of problems interpreting the variable `org-export-babel-evaluate' deleted] >> >> It is tempting to `make-obsolete-variable' this variable and change >> its name to something that more completely describes what does not >> happen when set to nil. > > It can be done for Org 9.1. > OK. I changed the name to `org-export-process-with-babel', which I hope suggests more profound actions than `org-export-babel-evaluate'. I think the attached patch does this properly, but this is my first use of `define-obsolete-function-alias', so it might be best to check what I have done. Chuck --0-1765508873-1479006569=:3656 Content-Type: text/plain; charset=US-ASCII; name=0001-make-obsolete-variable-org-export-babel-evaluate.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: patch file Content-Disposition: attachment; filename=0001-make-obsolete-variable-org-export-babel-evaluate.patch RnJvbSAzODg1MTI5OTgwYTAyZWIwZDQ2OTRlOWUxNTg4OGRlYTZlZTk1YzYw IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogQ2hhcmxlcyBCZXJy eSA8Y2NiZXJyeUB1Y3NkLmVkdT4NCkRhdGU6IFNhdCwgMTIgTm92IDIwMTYg MTg6NTQ6MjAgLTA4MDANClN1YmplY3Q6IFtQQVRDSF0gbWFrZS1vYnNvbGV0 ZS12YXJpYWJsZSBgb3JnLWV4cG9ydC1iYWJlbC1ldmFsdWF0ZScNCg0KKiBk b2Mvb3JnLnRleGk6IEJldHRlciBleHBsYWluIHdoYXQgdGhlIHZhcmlhYmxl DQogIGBvcmctZXhwb3J0LXByb2Nlc3Mtd2l0aC1iYWJlbCcgZG9lcy4NCg0K KiBsaXNwL29iLWV4cC5lbDogU21hbGwgZG9jc3RyaW5nIGNoYW5nZS4NCg0K KiBsaXNwL29yZy1jb21wYXQuZWw6IERlZmluZSBgb3JnLWV4cG9ydC1iYWJl bC1ldmFsdWF0ZScgYXMgdGhlDQogIG9ic29sZXRlIGFsaWFzIGZvciBgb3Jn LWV4cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwnLg0KDQoqIGxpc3Avb3gtaWNh bGVuZGFyLmVsLCBsaXNwL294LmVsLCB0ZXN0aW5nL2xpc3AvdGVzdC1vYi1l eHAuZWwsDQogIHRlc3RpbmcvbGlzcC90ZXN0LW9iLWxvYi5lbCwgdGVzdGlu Zy9saXNwL3Rlc3Qtb3guZWw6IENoYW5nZSB0aGUNCiAgb2Jzb2xldGUgdmFy aWFibGUgbmFtZSBpbiBtYW55IHBsYWNlcy4NCg0KVXNlcnMgd2VyZSBvZnRl biBjb25mdXNlZCB0aGF0IHNldHRpbmcgdGhpcyB2YXJpYWJsZSB0byBuaWwg d2lsbCBjYXVzZQ0KaGVhZGVyIGFyZ3VtZW50cyB0byBiZSBpZ25vcmVkIGlu IGFkZGl0aW9uIHRvIHByZXZlbnRpbmcgY29kZSBmcm9tDQpiZWluZyBldmFs dWF0ZWQuICBJdCBpcyBob3BlZCB0aGF0IHRoZSBkb2N1bWVudGF0aW9uIGNo YW5nZXMgYW5kIHRoZQ0KbmFtZSBgb3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgt YmFiZWwnIHdpbGwgYmV0dGVyIGNvbnZleSB0aGF0IGV2ZXJ5dGhpbmcNCmJh YmVsIGRvZXMgY2FuIGJlIHN3aXRjaGVkIG9mZiB3aXRoIHRoaXMgdmFyaWFi bGUuDQotLS0NCiBkb2Mvb3JnLnRleGkgICAgICAgICAgICAgICAgfCAyNCAr KysrKysrKysrKysrLS0tLS0tLS0tLS0NCiBsaXNwL29iLWV4cC5lbCAgICAg ICAgICAgICAgfCAxMiArKysrKystLS0tLS0NCiBsaXNwL29yZy1jb21wYXQu ZWwgICAgICAgICAgfCAgMiArKw0KIGxpc3Avb3gtaWNhbGVuZGFyLmVsICAg ICAgICB8ICAyICstDQogbGlzcC9veC5lbCAgICAgICAgICAgICAgICAgIHwg IDIgKy0NCiB0ZXN0aW5nL2xpc3AvdGVzdC1vYi1leHAuZWwgfCAzNiArKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0NCiB0ZXN0aW5nL2xp c3AvdGVzdC1vYi1sb2IuZWwgfCAgMiArLQ0KIHRlc3RpbmcvbGlzcC90ZXN0 LW94LmVsICAgICB8ICAyICstDQogOCBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNl cnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2Rv Yy9vcmcudGV4aSBiL2RvYy9vcmcudGV4aQ0KaW5kZXggZWRlMjM1Mi4uODEz NjRkMiAxMDA2NDQNCi0tLSBhL2RvYy9vcmcudGV4aQ0KKysrIGIvZG9jL29y Zy50ZXhpDQpAQCAtMTQ5MzgsMTcgKzE0OTM4LDE5IEBAIEJvdGggdGhlIGNv ZGUgYmxvY2sgYW5kIGl0cyByZXN1bHRzIHdpbGwgYmUgZXhwb3J0ZWQuDQog TmVpdGhlciB0aGUgY29kZSBibG9jayBub3IgaXRzIHJlc3VsdHMgd2lsbCBi ZSBleHBvcnRlZC4NCiBAZW5kIHRhYmxlDQogDQotSXQgaXMgcG9zc2libGUg dG8gaW5oaWJpdCB0aGUgZXZhbHVhdGlvbiBvZiBjb2RlIGJsb2NrcyBkdXJp bmcgZXhwb3J0Lg0KLVNldHRpbmcgdGhlIEBjb2Rle29yZy1leHBvcnQtYmFi ZWwtZXZhbHVhdGV9IHZhcmlhYmxlIHRvIEBjb2Rle25pbH0gd2lsbA0KLWVu c3VyZSB0aGF0IG5vIGNvZGUgYmxvY2tzIGFyZSBldmFsdWF0ZWQgYXMgcGFy dCBvZiB0aGUgZXhwb3J0IHByb2Nlc3MuICBUaGlzDQotY2FuIGJlIHVzZWZ1 bCBpbiBzaXR1YXRpb25zIHdoZXJlIHBvdGVudGlhbGx5IHVudHJ1c3RlZCBP cmcgbW9kZSBmaWxlcyBhcmUNCi1leHBvcnRlZCBpbiBhbiBhdXRvbWF0ZWQg ZmFzaGlvbiwgZm9yIGV4YW1wbGUgd2hlbiBPcmcgbW9kZSBpcyB1c2VkIGFz IHRoZQ0KLW1hcmt1cCBsYW5ndWFnZSBmb3IgYSB3aWtpLiAgSXQgaXMgYWxz byBwb3NzaWJsZSB0byBzZXQgdGhpcyB2YXJpYWJsZSB0bw0KLUBjb2Rle2lu bGluZS1vbmx5fS4gIEluIHRoYXQgY2FzZSwgb25seSBpbmxpbmUgY29kZSBi bG9ja3Mgd2lsbCBiZQ0KLWV2YWx1YXRlZCwgaW4gb3JkZXIgdG8gaW5zZXJ0 IHRoZWlyIHJlc3VsdHMuICBOb24taW5saW5lIGNvZGUgYmxvY2tzIGFyZQ0K LWFzc3VtZWQgdG8gaGF2ZSB0aGVpciByZXN1bHRzIGFscmVhZHkgaW5zZXJ0 ZWQgaW4gdGhlIGJ1ZmZlciBieSBtYW51YWwNCi1ldmFsdWF0aW9uLiAgVGhp cyBzZXR0aW5nIGlzIHVzZWZ1bCB0byBhdm9pZCBleHBlbnNpdmUgcmVjYWxj dWxhdGlvbnMgZHVyaW5nDQotZXhwb3J0LCBub3QgdG8gcHJvdmlkZSBzZWN1 cml0eS4NCitJdCBpcyBwb3NzaWJsZSB0byBpbmhpYml0IHRoZSBldmFsdWF0 aW9uIG9mIGNvZGUgYmxvY2tzIGFuZCBpZ25vcmUgaGVhZGVyDQorYXJndW1l bnRzIGR1cmluZyBleHBvcnQuICBTZXR0aW5nIHRoZSBAY29kZXtvcmctZXhw b3J0LXByb2Nlc3Mtd2l0aC1iYWJlbH0NCit2YXJpYWJsZSB0byBAY29kZXtu aWx9IHdpbGwgZW5zdXJlIHRoYXQgbm8gY29kZSBibG9ja3MgYXJlIGV2YWx1 YXRlZCBhcyBwYXJ0DQorb2YgdGhlIGV4cG9ydCBwcm9jZXNzLiAgVGhpcyBj YW4gYmUgdXNlZnVsIGluIHNpdHVhdGlvbnMgd2hlcmUgcG90ZW50aWFsbHkN Cit1bnRydXN0ZWQgT3JnIG1vZGUgZmlsZXMgYXJlIGV4cG9ydGVkIGluIGFu IGF1dG9tYXRlZCBmYXNoaW9uLCBmb3IgZXhhbXBsZQ0KK3doZW4gT3JnIG1v ZGUgaXMgdXNlZCBhcyB0aGUgbWFya3VwIGxhbmd1YWdlIGZvciBhIHdpa2ku ICBObyBoZWFkZXIgYXJndW1lbnRzDQord2lsbCBiZSBwcm9jZXNzZWQuICBG b3IgdGhpcyByZWFzb24gaXQgaXMgb2Z0ZW4gYmV0dGVyIHRvIHNldCBgOmV2 YWwNCituZXZlci1leHBvcnQnIHRvIHByZXZlbnQgY29kZSBldmFsdWF0aW9u IGJ1dCBzdGlsbCBhbGxvdyBoZWFkZXJzIHRvIGJlDQoraG9ub3JlZC4gIEl0 IGlzIGFsc28gcG9zc2libGUgdG8gc2V0IHRoaXMgdmFyaWFibGUgdG8gQGNv ZGV7aW5saW5lLW9ubHl9LiAgSW4NCit0aGF0IGNhc2UsIG9ubHkgaW5saW5l IGNvZGUgYmxvY2tzIHdpbGwgYmUgZXZhbHVhdGVkLCBpbiBvcmRlciB0byBp bnNlcnQNCit0aGVpciByZXN1bHRzLiAgTm9uLWlubGluZSBjb2RlIGJsb2Nr cyBhcmUgYXNzdW1lZCB0byBoYXZlIHRoZWlyIHJlc3VsdHMNCithbHJlYWR5 IGluc2VydGVkIGluIHRoZSBidWZmZXIgYnkgbWFudWFsIGV2YWx1YXRpb24u ICBUaGlzIHNldHRpbmcgaXMgdXNlZnVsDQordG8gYXZvaWQgZXhwZW5zaXZl IHJlY2FsY3VsYXRpb25zIGR1cmluZyBleHBvcnQsIG5vdCB0byBwcm92aWRl IHNlY3VyaXR5Lg0KIA0KIENvZGUgYmxvY2tzIGluIGNvbW1lbnRlZCBzdWJ0 cmVlcyAoQHB4cmVme0NvbW1lbnQgbGluZXN9KSBhcmUgbmV2ZXIgZXZhbHVh dGVkDQogb24gZXhwb3J0LiAgSG93ZXZlciwgY29kZSBibG9ja3MgaW4gc3Vi dHJlZXMgZXhjbHVkZWQgZnJvbSBleHBvcnQNCmRpZmYgLS1naXQgYS9saXNw L29iLWV4cC5lbCBiL2xpc3Avb2ItZXhwLmVsDQppbmRleCA2YWViY2Q1Li4x ZDc3ZTZhIDEwMDY0NA0KLS0tIGEvbGlzcC9vYi1leHAuZWwNCisrKyBiL2xp c3Avb2ItZXhwLmVsDQpAQCAtMzgsMTAgKzM4LDEwIEBADQogDQogKGRlZnZh ciBvcmctc3JjLXByZXNlcnZlLWluZGVudGF0aW9uKQ0KIA0KLShkZWZjdXN0 b20gb3JnLWV4cG9ydC1iYWJlbC1ldmFsdWF0ZSB0DQotICAiU3dpdGNoIGNv bnRyb2xsaW5nIGNvZGUgZXZhbHVhdGlvbiBkdXJpbmcgZXhwb3J0Lg0KKyhk ZWZjdXN0b20gb3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwgdA0KKyAg IlN3aXRjaCBjb250cm9sbGluZyBjb2RlIGV2YWx1YXRpb24gYW5kIGhlYWRl ciBwcm9jZXNzaW5nIGR1cmluZyBleHBvcnQuDQogV2hlbiBzZXQgdG8gbmls IG5vIGNvZGUgd2lsbCBiZSBldmFsdWF0ZWQgYXMgcGFydCBvZiB0aGUgZXhw b3J0DQotcHJvY2VzcyBhbmQgbm8gaGVhZGVyIGFyZ3VtZW50c3Mgd2lsbCBi ZSBvYmV5ZWQuICBXaGVuIHNldCB0bw0KK3Byb2Nlc3MgYW5kIG5vIGhlYWRl ciBhcmd1bWVudHMgd2lsbCBiZSBvYmV5ZWQuICBXaGVuIHNldCB0bw0KIGBp bmxpbmUtb25seScsIG9ubHkgaW5saW5lIGNvZGUgYmxvY2tzIHdpbGwgYmUg ZXhlY3V0ZWQuICBVc2Vycw0KIHdobyB3aXNoIHRvIGF2b2lkIGV2YWx1YXRp bmcgY29kZSBvbiBleHBvcnQgc2hvdWxkIHVzZSB0aGUgaGVhZGVyDQogYXJn dW1lbnQgYDpldmFsIG5ldmVyLWV4cG9ydCcuIg0KQEAgLTUwLDcgKzUwLDcg QEAgYXJndW1lbnQgYDpldmFsIG5ldmVyLWV4cG9ydCcuIg0KICAgOnR5cGUg JyhjaG9pY2UgKGNvbnN0IDp0YWcgIk5ldmVyIiBuaWwpDQogCQkgKGNvbnN0 IDp0YWcgIk9ubHkgaW5saW5lIGNvZGUiIGlubGluZS1vbmx5KQ0KIAkJIChj b25zdCA6dGFnICJBbHdheXMiIHQpKSkNCi0ocHV0ICdvcmctZXhwb3J0LWJh YmVsLWV2YWx1YXRlICdzYWZlLWxvY2FsLXZhcmlhYmxlICMnbnVsbCkNCiso cHV0ICdvcmctZXhwb3J0LXByb2Nlc3Mtd2l0aC1iYWJlbCAnc2FmZS1sb2Nh bC12YXJpYWJsZSAjJ251bGwpDQogDQogKGRlZm1hY3JvIG9yZy1iYWJlbC1l eHAtLWF0LXNvdXJjZSAoJnJlc3QgYm9keSkNCiAgICJFdmFsdWF0ZSBCT0RZ IGF0IHRoZSBzb3VyY2Ugb2YgdGhlIEJhYmVsIGJsb2NrIGF0IHBvaW50Lg0K QEAgLTEyOCwxMCArMTI4LDEwIEBAIHRoaXMgdGVtcGxhdGUuIg0KIChkZWZ1 biBvcmctYmFiZWwtZXhwLXByb2Nlc3MtYnVmZmVyICgpDQogICAiRXhlY3V0 ZSBhbGwgQmFiZWwgYmxvY2tzIGluIGN1cnJlbnQgYnVmZmVyLiINCiAgIChp bnRlcmFjdGl2ZSkNCi0gICh3aGVuIG9yZy1leHBvcnQtYmFiZWwtZXZhbHVh dGUNCisgICh3aGVuIG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsDQog ICAgIChzYXZlLXdpbmRvdy1leGN1cnNpb24NCiAgICAgICAobGV0ICgoY2Fz ZS1mb2xkLXNlYXJjaCB0KQ0KLQkgICAgKHJlZ2V4cCAoaWYgKGVxIG9yZy1l eHBvcnQtYmFiZWwtZXZhbHVhdGUgJ2lubGluZS1vbmx5KQ0KKwkgICAgKHJl Z2V4cCAoaWYgKGVxIG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsICdp bmxpbmUtb25seSkNCiAJCQkiXFwoY2FsbFxcfHNyY1xcKV8iDQogCQkgICAg ICAiXFwoY2FsbFxcfHNyY1xcKV9cXHxeWyBcdF0qI1xcK1xcKEJFR0lOX1NS Q1xcfENBTEw6XFwpIikpDQogCSAgICA7OyBHZXQgYSBwcmlzdGluZSBjb3B5 IG9mIGN1cnJlbnQgYnVmZmVyIHNvIEJhYmVsDQpkaWZmIC0tZ2l0IGEvbGlz cC9vcmctY29tcGF0LmVsIGIvbGlzcC9vcmctY29tcGF0LmVsDQppbmRleCAy MDJiNzI4Li5kYzAxYTQ4IDEwMDY0NA0KLS0tIGEvbGlzcC9vcmctY29tcGF0 LmVsDQorKysgYi9saXNwL29yZy1jb21wYXQuZWwNCkBAIC0xOTEsNiArMTkx LDggQEAgQ291bnRpbmcgc3RhcnRzIGF0IDEuIg0KIChkZWZpbmUtb2Jzb2xl dGUtdmFyaWFibGUtYWxpYXMgJ29yZy1odG1sLXN0eWxlICdvcmctaHRtbC1o ZWFkICIyNC40IikNCiAoZGVmaW5lLW9ic29sZXRlLWZ1bmN0aW9uLWFsaWFz ICdvcmctaW5zZXJ0LWNvbHVtbnMtZGJsb2NrDQogICAnb3JnLWNvbHVtbnMt aW5zZXJ0LWRibG9jayAiT3JnIDkuMCIpDQorKGRlZmluZS1vYnNvbGV0ZS1m dW5jdGlvbi1hbGlhcyAnb3JnLWV4cG9ydC1iYWJlbC1ldmFsdWF0ZQ0KKyAg J29yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsICJPcmcgOS4xIikNCiAN CiAoZGVmdW4gb3JnLWluLWZpeGVkLXdpZHRoLXJlZ2lvbi1wICgpDQogICAi Tm9uLW5pbCBpZiBwb2ludCBpbiBhIGZpeGVkLXdpZHRoIHJlZ2lvbi4iDQpk aWZmIC0tZ2l0IGEvbGlzcC9veC1pY2FsZW5kYXIuZWwgYi9saXNwL294LWlj YWxlbmRhci5lbA0KaW5kZXggYzIyODY2YS4uNmE0ODBmNCAxMDA2NDQNCi0t LSBhL2xpc3Avb3gtaWNhbGVuZGFyLmVsDQorKysgYi9saXNwL294LWljYWxl bmRhci5lbA0KQEAgLTg3OSw3ICs4NzksNyBAQCBUaGUgZmlsZSBpcyBzdG9y ZWQgdW5kZXIgdGhlIG5hbWUgY2hvc2VuIGluDQogICAiRXhwb3J0IGN1cnJl bnQgYWdlbmRhIHZpZXcgdG8gYW4gaUNhbGVuZGFyIEZJTEUuDQogVGhpcyBm dW5jdGlvbiBhc3N1bWVzIG1ham9yIG1vZGUgZm9yIGN1cnJlbnQgYnVmZmVy IGlzDQogYG9yZy1hZ2VuZGEtbW9kZScuIg0KLSAgKGxldCogKChvcmctZXhw b3J0LWJhYmVsLWV2YWx1YXRlKQk7IERvbid0IGV2YWx1YXRlIEJhYmVsIGJs b2NrLg0KKyAgKGxldCogKChvcmctZXhwb3J0LXByb2Nlc3Mtd2l0aC1iYWJl bCkJOyBEb24ndCBldmFsdWF0ZSBCYWJlbCBibG9jay4NCiAJIChjb250ZW50 cw0KIAkgIChvcmctZXhwb3J0LXN0cmluZy1hcw0KIAkgICAod2l0aC1vdXRw dXQtdG8tc3RyaW5nDQpkaWZmIC0tZ2l0IGEvbGlzcC9veC5lbCBiL2xpc3Av b3guZWwNCmluZGV4IGNhMTE0M2MuLmQ2N2M1NmEgMTAwNjQ0DQotLS0gYS9s aXNwL294LmVsDQorKysgYi9saXNwL294LmVsDQpAQCAtMzA0Miw3ICszMDQy LDcgQEAgUmV0dXJuIGNvZGUgYXMgYSBzdHJpbmcuIg0KIAkgOzsgYWdhaW4g YWZ0ZXIgZXhlY3V0aW5nIEJhYmVsIGNvZGUuDQogCSAob3JnLXNldC1yZWdl eHBzLWFuZC1vcHRpb25zKQ0KIAkgKG9yZy11cGRhdGUtcmFkaW8tdGFyZ2V0 LXJlZ2V4cCkNCi0JICh3aGVuIG9yZy1leHBvcnQtYmFiZWwtZXZhbHVhdGUN CisJICh3aGVuIG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsDQogCSAg IChvcmctYmFiZWwtZXhwLXByb2Nlc3MtYnVmZmVyKQ0KIAkgICAob3JnLXNl dC1yZWdleHBzLWFuZC1vcHRpb25zKQ0KIAkgICAob3JnLXVwZGF0ZS1yYWRp by10YXJnZXQtcmVnZXhwKSkNCmRpZmYgLS1naXQgYS90ZXN0aW5nL2xpc3Av dGVzdC1vYi1leHAuZWwgYi90ZXN0aW5nL2xpc3AvdGVzdC1vYi1leHAuZWwN CmluZGV4IDc0NDIzNGMuLmUzMmEwM2MgMTAwNjQ0DQotLS0gYS90ZXN0aW5n L2xpc3AvdGVzdC1vYi1leHAuZWwNCisrKyBiL3Rlc3RpbmcvbGlzcC90ZXN0 LW9iLWV4cC5lbA0KQEAgLTI5LDcgKzI5LDcgQEANCiBDdXJyZW50IGJ1ZmZl ciBpcyBhIGNvcHkgb2YgdGhlIG9yaWdpbmFsIGJ1ZmZlci4iDQogICBgKGxl dCAoKHN0cmluZyAob3JnLXdpdGgtd2lkZS1idWZmZXIgKGJ1ZmZlci1zdHJp bmcpKSkNCiAJIChuYXJyb3dpbmcgKGxpc3QgKHBvaW50LW1pbikgKHBvaW50 LW1heCkpKQ0KLQkgKG9yZy1leHBvcnQtYmFiZWwtZXZhbHVhdGUgdCkpDQor CSAob3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwgdCkpDQogICAgICAo d2l0aC10ZW1wLWJ1ZmZlcg0KICAgICAgICAob3JnLW1vZGUpDQogICAgICAg IChpbnNlcnQgc3RyaW5nKQ0KQEAgLTE4Myw3ICsxODMsNyBAQCBhIHRhYmxl LiINCiAoZXJ0LWRlZnRlc3Qgb2ItZXhwL2V2YWx1YXRlLWFsbC1leGVjdXRh Ymxlcy1pbi1vcmRlciAoKQ0KICAgKHNob3VsZA0KICAgIChlcXVhbCAnKDUg NCAzIDIgMSkNCi0JICAobGV0ICgob3JnLWV4cG9ydC1iYWJlbC1ldmFsdWF0 ZSB0KSAqZXZhbHVhdGlvbi1jb2xsZWN0b3IqKQ0KKwkgIChsZXQgKChvcmct ZXhwb3J0LXByb2Nlc3Mtd2l0aC1iYWJlbCB0KSAqZXZhbHVhdGlvbi1jb2xs ZWN0b3IqKQ0KIAkgICAgKG9yZy10ZXN0LWF0LWlkICI5NmNjNzA3My05N2Vj LTQ1NTYtODdjZi0xZjliZmZhZmQzMTciDQogCSAgICAgIChvcmctbmFycm93 LXRvLXN1YnRyZWUpDQogCSAgICAgIChidWZmZXItc3RyaW5nKQ0KQEAgLTIw Miw3ICsyMDIsNyBAQCBIZXJlIGlzIG9uZSBhdCB0aGUgZW5kIG9mIGEgbGlu ZS4ge3t7cmVzdWx0cyg9Mj0pfX19DQogDQogKGVydC1kZWZ0ZXN0IG9iLWV4 cC9leHBvcnRzLWlubGluZS1jb2RlICgpDQogICAobGV0ICgob3JnLWJhYmVs LWlubGluZS1yZXN1bHQtd3JhcCAiPSVzPSIpDQotCShvcmctZXhwb3J0LWJh YmVsLWV2YWx1YXRlIHQpKQ0KKwkob3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgt YmFiZWwgdCkpDQogICAgIChzaG91bGQNCiAgICAgIChzdHJpbmctbWF0Y2gg IlxcYHNyY19lbWFjcy1saXNwXFwoPzpcXFtdXFwpP3soXFwrIDEgMSl9JCIN CiAJCSAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dA0KQEAgLTI1OSw3ICsy NTksNyBAQCBIZXJlIGlzIG9uZSB0aGF0IGlzIGFsc28gZXZhbHVhdGVkOiBz cmNfc2hbXXtlY2hvIDR9IHt7e3Jlc3VsdHMoPTQ9KX19fSIpDQogcmVzdWx0 cyksIHRoZSByZXN1bHRpbmcgY29kZSBibG9jayBgc3JjX2VtYWNzLWxpc3B7 Mn0nIHNob3VsZCBhbHNvIGJlDQogZXZhbHVhdGVkLiINCiAgIChsZXQgKChv cmctYmFiZWwtaW5saW5lLXJlc3VsdC13cmFwICI9JXM9IikNCi0JKG9yZy1l eHBvcnQtYmFiZWwtZXZhbHVhdGUgdCkpDQorCShvcmctZXhwb3J0LXByb2Nl c3Mtd2l0aC1iYWJlbCB0KSkNCiAgICAgKHNob3VsZA0KICAgICAgKHN0cmlu Zy1tYXRjaCAiXFxge3t7cmVzdWx0cyhzcmNfZW1hY3MtbGlzcFxcW1xcXXsy fSl9fX0kIg0KIAkJICAgKG9yZy10ZXN0LXdpdGgtdGVtcC10ZXh0DQpAQCAt MjcwLDcgKzI3MCw3IEBAIGV2YWx1YXRlZC4iDQogKGVydC1kZWZ0ZXN0IG9i LWV4cC9leHBvcnRzLWlubGluZS1jb2RlLWV2YWwtY29kZS1vbmNlICgpDQog ICAiSWJpZCBhYm92ZSwgZXhjZXB0IHRoYXQgdGhlIHJlc3VsdGluZyBpbmxp bmUgY29kZSBibG9jayBzaG91bGQgbm90DQogYmUgZXZhbHVhdGVkLiINCi0g IChsZXQgKChvcmctZXhwb3J0LWJhYmVsLWV2YWx1YXRlIHQpKQ0KKyAgKGxl dCAoKG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsIHQpKQ0KICAgICAo c2hvdWxkDQogICAgICAoc3RyaW5nLW1hdGNoICJ7e3tyZXN1bHRzKHNyY19l bWFjcy1saXNwXFwoPzpcXFtbOiBhLXpBLVpdK11cXCk/ezJ9KX19fSQiDQog CQkgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQNCkBAIC0yODAsNyArMjgw LDcgQEAgYmUgZXZhbHVhdGVkLiINCiAJCSAgICAgKGJ1ZmZlci1zdHJpbmcp KSkpKSkNCiANCiAoZXJ0LWRlZnRlc3Qgb2ItZXhwL2V4cG9ydHMtaW5saW5l LWNvZGUtZG91YmxlLWV2YWwtZXhwb3J0cy1ib3RoICgpDQotICAobGV0ICgo b3JnLWV4cG9ydC1iYWJlbC1ldmFsdWF0ZSB0KSkNCisgIChsZXQgKChvcmct ZXhwb3J0LXByb2Nlc3Mtd2l0aC1iYWJlbCB0KSkNCiAgICAgKHNob3VsZA0K ICAgICAgKHN0cmluZy1tYXRjaCAoY29uY2F0ICJcXGBzcmNfZW1hY3MtbGlz cFxcKD86XFxbXVxcKT97KFxcKyAxIDEpfSAiDQogCQkJICAgInt7e3Jlc3Vs dHMoc3JjX2VtYWNzLWxpc3BcXFsgOmV4cG9ydHMgY29kZVxcXXsyfSl9fX0k IikNCkBAIC0zNTEsNyArMzUxLDcgQEAgYmUgZXZhbHVhdGVkLiINCiAJCQkg ICAgcmVzdWx0KSkpKSkNCiANCiAoZXJ0LWRlZnRlc3Qgb2ItZXhwL2V4cG9y dC1mcm9tLWEtdGVtcC1idWZmZXIgKCkNCi0gIChsZXQgKChvcmctZXhwb3J0 LWJhYmVsLWV2YWx1YXRlIHQpKQ0KKyAgKGxldCAoKG9yZy1leHBvcnQtcHJv Y2Vzcy13aXRoLWJhYmVsIHQpKQ0KICAgICAob3JnLXRlc3Qtd2l0aC10ZW1w LXRleHQNCiAJIg0KICMrVGl0bGU6IGV4cG9ydGluZyBmcm9tIGEgdGVtcG9y YXJ5IGJ1ZmZlcg0KQEAgLTM3Nyw3ICszNzcsNyBAQCBiZSBldmFsdWF0ZWQu Ig0KIA0KIChlcnQtZGVmdGVzdCBvYi1leHBvcnQvZXhwb3J0LXdpdGgtcmVz dWx0cy1iZWZvcmUtYmxvY2sgKCkNCiAgICJUZXN0IGV4cG9ydCB3aGVuIHJl c3VsdHMgYXJlIGluc2VydGVkIGJlZm9yZSBzb3VyY2UgYmxvY2suIg0KLSAg KGxldCAoKG9yZy1leHBvcnQtYmFiZWwtZXZhbHVhdGUgdCkpDQorICAobGV0 ICgob3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwgdCkpDQogICAgIChz aG91bGQNCiAgICAgIChlcXVhbA0KICAgICAgICIjK1JFU1VMVFM6IHNyYzEN CkBAIC00NTIsNyArNDUyLDcgQEAgYmUgZXZhbHVhdGVkLiINCiANCiAoZXJ0 LWRlZnRlc3Qgb2ItZXhwb3J0L2V4cG9ydC11bmRlci1jb21tZW50ZWQtaGVh ZGxpbmUgKCkNCiAgICJUZXN0IGV2YWx1YXRpb24gb2YgY29kZSBibG9ja3Mg dW5kZXIgQ09NTUVOVCBoZWFkaW5ncy4iDQotICAobGV0ICgob3JnLWV4cG9y dC1iYWJlbC1ldmFsdWF0ZSB0KQ0KKyAgKGxldCAoKG9yZy1leHBvcnQtcHJv Y2Vzcy13aXRoLWJhYmVsIHQpDQogCShvcmctYmFiZWwtaW5saW5lLXJlc3Vs dC13cmFwICI9JXM9IikpDQogICAgIDs7IERvIG5vdCBldmFsIGJsb2NrIGlu IGEgY29tbWVudGVkIGhlYWRsaW5lLg0KICAgICAoc2hvdWxkDQpAQCAtNTE2 LDIxICs1MTYsMjEgQEAgc3JjX2VtYWNzLWxpc3B7KCsgMSAxKX0iDQogICAg ICAob3JnLWJhYmVsLWV4cC1wcm9jZXNzLWJ1ZmZlcikgdCkpKQ0KIA0KIChl cnQtZGVmdGVzdCBvYi1leHBvcnQvYmFiZWwtZXZhbHVhdGUgKCkNCi0gICJU ZXN0IGBvcmctZXhwb3J0LWJhYmVsLWV2YWx1YXRlJyBlZmZlY3QuIg0KKyAg IlRlc3QgYG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsJyBlZmZlY3Qu Ig0KICAgOzsgV2hlbiBuaWwsIG5vIEJhYmVsIGNvZGUgaXMgZXhlY3V0ZWQu DQogICAoc2hvdWxkLW5vdA0KICAgIChzdHJpbmctbWF0Y2gtcA0KICAgICAi MiINCiAgICAgKG9yZy10ZXN0LXdpdGgtdGVtcC10ZXh0DQogCSIjK0JFR0lO X1NSQyBlbWFjcy1saXNwIDpleHBvcnRzIHJlc3VsdHNcbigrIDEgMSlcbiMr RU5EX1NSQyINCi0gICAgICAobGV0ICgob3JnLWV4cG9ydC1iYWJlbC1ldmFs dWF0ZSBuaWwpKSAob3JnLWJhYmVsLWV4cC1wcm9jZXNzLWJ1ZmZlcikpDQor ICAgICAgKGxldCAoKG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsIG5p bCkpIChvcmctYmFiZWwtZXhwLXByb2Nlc3MtYnVmZmVyKSkNCiAgICAgICAo YnVmZmVyLXN0cmluZykpKSkNCiAgIChzaG91bGQtbm90DQogICAgKHN0cmlu Zy1tYXRjaC1wDQogICAgICIyIg0KICAgICAob3JnLXRlc3Qtd2l0aC10ZW1w LXRleHQNCiAJInNyY19lbWFjcy1saXNweygrIDEgMSl9Ig0KLSAgICAgIChs ZXQgKChvcmctZXhwb3J0LWJhYmVsLWV2YWx1YXRlIG5pbCkpIChvcmctYmFi ZWwtZXhwLXByb2Nlc3MtYnVmZmVyKSkNCisgICAgICAobGV0ICgob3JnLWV4 cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwgbmlsKSkgKG9yZy1iYWJlbC1leHAt cHJvY2Vzcy1idWZmZXIpKQ0KICAgICAgIChidWZmZXItc3RyaW5nKSkpKQ0K ICAgOzsgV2hlbiBub24tbmlsLCBhbGwgQmFiZWwgY29kZSB0eXBlcyBhcmUg ZXhlY3V0ZWQuDQogICAoc2hvdWxkDQpAQCAtNTM4LDE0ICs1MzgsMTQgQEAg c3JjX2VtYWNzLWxpc3B7KCsgMSAxKX0iDQogICAgICIyIg0KICAgICAob3Jn LXRlc3Qtd2l0aC10ZW1wLXRleHQNCiAJIiMrQkVHSU5fU1JDIGVtYWNzLWxp c3AgOmV4cG9ydHMgcmVzdWx0c1xuKCsgMSAxKVxuIytFTkRfU1JDIg0KLSAg ICAgIChsZXQgKChvcmctZXhwb3J0LWJhYmVsLWV2YWx1YXRlIHQpKSAob3Jn LWJhYmVsLWV4cC1wcm9jZXNzLWJ1ZmZlcikpDQorICAgICAgKGxldCAoKG9y Zy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsIHQpKSAob3JnLWJhYmVsLWV4 cC1wcm9jZXNzLWJ1ZmZlcikpDQogICAgICAgKGJ1ZmZlci1zdHJpbmcpKSkp DQogICAoc2hvdWxkDQogICAgKHN0cmluZy1tYXRjaC1wDQogICAgICIyIg0K ICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQNCiAJInNyY19lbWFjcy1s aXNweygrIDEgMSl9Ig0KLSAgICAgIChsZXQgKChvcmctZXhwb3J0LWJhYmVs LWV2YWx1YXRlIHQpKSAob3JnLWJhYmVsLWV4cC1wcm9jZXNzLWJ1ZmZlcikp DQorICAgICAgKGxldCAoKG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVs IHQpKSAob3JnLWJhYmVsLWV4cC1wcm9jZXNzLWJ1ZmZlcikpDQogICAgICAg KGJ1ZmZlci1zdHJpbmcpKSkpDQogICA7OyBXaGVuIHNldCB0byBgaW5saW5l LW9ubHknIGxpbWl0IGV2YWx1YXRpb24gdG8gaW5saW5lIGNvZGUuDQogICAo c2hvdWxkLW5vdA0KQEAgLTU1Myw3ICs1NTMsNyBAQCBzcmNfZW1hY3MtbGlz cHsoKyAxIDEpfSINCiAgICAgIjIiDQogICAgIChvcmctdGVzdC13aXRoLXRl bXAtdGV4dA0KIAkiIytCRUdJTl9TUkMgZW1hY3MtbGlzcCA6ZXhwb3J0cyBy ZXN1bHRzXG4oKyAxIDEpXG4jK0VORF9TUkMiDQotICAgICAgKGxldCAoKG9y Zy1leHBvcnQtYmFiZWwtZXZhbHVhdGUgJ2lubGluZS1vbmx5KSkNCisgICAg ICAobGV0ICgob3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwgJ2lubGlu ZS1vbmx5KSkNCiAJKG9yZy1iYWJlbC1leHAtcHJvY2Vzcy1idWZmZXIpKQ0K ICAgICAgIChidWZmZXItc3RyaW5nKSkpKQ0KICAgKHNob3VsZA0KQEAgLTU2 MSw3ICs1NjEsNyBAQCBzcmNfZW1hY3MtbGlzcHsoKyAxIDEpfSINCiAgICAg IjIiDQogICAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dA0KIAkic3JjX2Vt YWNzLWxpc3B7KCsgMSAxKX0iDQotICAgICAgKGxldCAoKG9yZy1leHBvcnQt YmFiZWwtZXZhbHVhdGUgJ2lubGluZS1vbmx5KSkNCisgICAgICAobGV0ICgo b3JnLWV4cG9ydC1wcm9jZXNzLXdpdGgtYmFiZWwgJ2lubGluZS1vbmx5KSkN CiAJKG9yZy1iYWJlbC1leHAtcHJvY2Vzcy1idWZmZXIpKQ0KICAgICAgIChi dWZmZXItc3RyaW5nKSkpKSkNCiANCkBAIC01NzEsNyArNTcxLDcgQEAgc3Jj X2VtYWNzLWxpc3B7KCsgMSAxKX0iDQogICAgKGVxdWFsICIjK0JFR0lOX1NS QyBlbWFjcy1saXNwXG4wIChyZWY6Zm9vKVxuIytFTkRfU1JDIg0KIAkgIChv cmctdGVzdC13aXRoLXRlbXAtdGV4dA0KIAkgICAgICAiIytCRUdJTl9TUkMg ZW1hY3MtbGlzcCA6ZXhwb3J0cyBjb2RlXG4wIChyZWY6Zm9vKVxuIytFTkRf U1JDIg0KLQkgICAgKGxldCAoKG9yZy1leHBvcnQtYmFiZWwtZXZhbHVhdGUg dCkNCisJICAgIChsZXQgKChvcmctZXhwb3J0LXByb2Nlc3Mtd2l0aC1iYWJl bCB0KQ0KIAkJICAob3JnLWNvZGVyZWYtbGFiZWwtZm9ybWF0ICIocmVmOmZv bykiKSkNCiAJICAgICAgKG9yZy1iYWJlbC1leHAtcHJvY2Vzcy1idWZmZXIp KQ0KIAkgICAgKGJ1ZmZlci1zdHJpbmcpKSkpDQpAQCAtNTgwLDcgKzU4MCw3 IEBAIHNyY19lbWFjcy1saXNweygrIDEgMSl9Ig0KICAgICAiIytCRUdJTl9T UkMgZW1hY3MtbGlzcCAtbCBcInI6JXNcIlxuMSByOmZvb1xuIytFTkRfU1JD Ig0KICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQNCiAJIiMrQkVHSU5f U1JDIGVtYWNzLWxpc3AgLWwgXCJyOiVzXCIgLWxpc3AgOmV4cG9ydHMgY29k ZVxuMSByOmZvb1xuIytFTkRfU1JDIg0KLSAgICAgIChsZXQgKChvcmctZXhw b3J0LWJhYmVsLWV2YWx1YXRlIHQpKQ0KKyAgICAgIChsZXQgKChvcmctZXhw b3J0LXByb2Nlc3Mtd2l0aC1iYWJlbCB0KSkNCiAJKG9yZy1iYWJlbC1leHAt cHJvY2Vzcy1idWZmZXIpKQ0KICAgICAgIChidWZmZXItc3RyaW5nKSkpKSkN CiANCmRpZmYgLS1naXQgYS90ZXN0aW5nL2xpc3AvdGVzdC1vYi1sb2IuZWwg Yi90ZXN0aW5nL2xpc3AvdGVzdC1vYi1sb2IuZWwNCmluZGV4IDU1YTAxZWYu LjI0NmNkYjcgMTAwNjQ0DQotLS0gYS90ZXN0aW5nL2xpc3AvdGVzdC1vYi1s b2IuZWwNCisrKyBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9iLWxvYi5lbA0KQEAg LTgwLDcgKzgwLDcgQEANCiAoZXJ0LWRlZnRlc3QgdGVzdC1vYi1sb2IvZXhw b3J0LWxvYi1saW5lcyAoKQ0KICAgIlRlc3QgdGhlIGV4cG9ydCBvZiBhIHZh cmlldHkgb2YgbGlicmFyeSBiYWJlbCBjYWxsIGxpbmVzLiINCiAgIChsZXQg KChvcmctYmFiZWwtaW5saW5lLXJlc3VsdC13cmFwICI9JXM9IikNCi0JKG9y Zy1leHBvcnQtYmFiZWwtZXZhbHVhdGUgdCkpDQorCShvcmctZXhwb3J0LXBy b2Nlc3Mtd2l0aC1iYWJlbCB0KSkNCiAgICAgKG9yZy10ZXN0LWF0LWlkICI3 MmRkZWVkMy0yZDE3LTRjN2YtODE5Mi1hNTc1ZDUzNWQzZmMiDQogICAgICAg KG9yZy1uYXJyb3ctdG8tc3VidHJlZSkNCiAgICAgICAobGV0ICgoc3RyaW5n IChvcmctd2l0aC13aWRlLWJ1ZmZlciAoYnVmZmVyLXN0cmluZykpKQ0KZGlm ZiAtLWdpdCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW94LmVsIGIvdGVzdGluZy9s aXNwL3Rlc3Qtb3guZWwNCmluZGV4IDUzMDBmNTIuLjc3MDUyOTggMTAwNjQ0 DQotLS0gYS90ZXN0aW5nL2xpc3AvdGVzdC1veC5lbA0KKysrIGIvdGVzdGlu Zy9saXNwL3Rlc3Qtb3guZWwNCkBAIC05MDAsNyArOTAwLDcgQEAgUGFyYWdy YXBoIDwyMDEyLTAzLTI5IFRodT5bMjAxMi0wMy0yOSBUaHVdIg0KICMrQkVH SU5fU1JDIGVtYWNzLWxpc3ANCiBcKCsgMSAyKQ0KICMrRU5EX1NSQyINCi0J ICAgIChsZXQgKChvcmctZXhwb3J0LWJhYmVsLWV2YWx1YXRlIHQpKQ0KKwkg ICAgKGxldCAoKG9yZy1leHBvcnQtcHJvY2Vzcy13aXRoLWJhYmVsIHQpKQ0K IAkgICAgICAob3JnLWV4cG9ydC1hcyAob3JnLXRlc3QtZGVmYXVsdC1iYWNr ZW5kKSAnc3VidHJlZSkpKSkpDQogICA7OyBTdWJ0cmVlIGV4cG9ydCBzaG91 bGQgaWdub3JlIGxlYWRpbmcgcGxhbm5pbmcgbGluZSBhbmQgcHJvcGVydHkN CiAgIDs7IGRyYXdlci4NCi0tIA0KMi42LjQgKEFwcGxlIEdpdC02MykNCg0K --0-1765508873-1479006569=:3656--