From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SOLiLhq/vF/rOwAA0tVLHw (envelope-from ) for ; Tue, 24 Nov 2020 08:06:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oCS2Khq/vF/mJgAAbx9fmQ (envelope-from ) for ; Tue, 24 Nov 2020 08:06:50 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7CE38940357 for ; Tue, 24 Nov 2020 08:06:49 +0000 (UTC) Received: from localhost ([::1]:44712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khTLb-0006cx-UN for larch@yhetil.org; Tue, 24 Nov 2020 03:06:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khTKJ-0006a8-EI for emacs-orgmode@gnu.org; Tue, 24 Nov 2020 03:05:27 -0500 Received: from grinta.net ([109.74.203.128]:54576) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khTKF-0002LT-J0 for emacs-orgmode@gnu.org; Tue, 24 Nov 2020 03:05:27 -0500 Received: from black.local (p5dd0dc2f.dip0.t-ipconnect.de [93.208.220.47]) (Authenticated sender: daniele) by grinta.net (Postfix) with ESMTPSA id F0440EC68A; Tue, 24 Nov 2020 08:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=grinta.net; s=2020; t=1606205122; bh=v4TGhRZM7hATkS6Ydibxf5Xw2KXIGPQlFz8oaZkZ9o0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=YBC6YkVTWkKyk6Og0t1yosvdWtbbeCKASq0AsqIOopArdC3LBTJXxium8dz+NGJ8Y q1DH9w5yTQokLaRng7kNO1QZnX93OMz0xfBKPO/gVqgO3ISf1KmHVLPXxEJC1wwDVV wOII5ZNV+5Skn8pzFq3uBfLhGiHxwAa4X1t+vz0xt+JerQSOc021GEwHeS4lSKRqBw DpTCD/YrsJC01uuyZAwJjORY/VXZLLotKLZI+3MvyB4DyfDRCPdz7GAh2UA8GbPqmm Nkzf4IKSlEC762gIrNziVp0x3SkFuFZ1m7hdKYWVJ8GSGC6eGLKLxqLpcUBRRJ2gE3 FGsOt2+ghvEwA== Subject: Re: [PATCH] org-table: Add mode flag to enable Calc units simplification mode To: Kyle Meyer References: <48c15b01-341d-f4c6-7086-1a39e4977868@grinta.net> <87h7pgvk6b.fsf@kyleam.com> <938fa4a5-f162-6c03-072b-4f11546a95c8@grinta.net> <87blfnso8w.fsf@kyleam.com> <87sg8z8ggc.fsf@kyleam.com> From: Daniele Nicolodi Message-ID: <47de3641-501b-5d47-5aa9-a28ddc25e037@grinta.net> Date: Tue, 24 Nov 2020 09:05:21 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <87sg8z8ggc.fsf@kyleam.com> Content-Type: multipart/mixed; boundary="------------5BAB07DBC055D9E33DAADD3C" Content-Language: en-US Received-SPF: pass client-ip=109.74.203.128; envelope-from=daniele@grinta.net; helo=grinta.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Org Mode List Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=grinta.net header.s=2020 header.b=YBC6YkVT; dmarc=none; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Spam-Score: 2.09 X-TUID: TkyvRF9j9n/f This is a multi-part message in MIME format. --------------5BAB07DBC055D9E33DAADD3C Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Thank you for the review, Kyle. Another updated patch set is attached. Cheers, Dan On 24/11/2020 06:35, Kyle Meyer wrote: > Daniele Nicolodi writes: > >> Subject: [PATCH 1/3] org-table: Remove unused org-tbl-calc-modes variable >> declaration > > Looks good. > >> Subject: [PATCH 2/3] org-table: Simplify mode string parsing >> and reduce scope of local variables. > [...] >> - (if (string-match ";" formula) >> - (let ((tmp (org-split-string formula ";"))) >> - (setq formula (car tmp) >> - fmt (concat (cdr (assoc "%" org-table-local-parameters)) >> - (nth 1 tmp))) >> + (if (string-match "\\(.*\\);\\(.*\\)" formula) >> + (progn >> + (setq fmt (concat (match-string-no-properties 2 formula) >> + (cdr (assoc "%" org-table-local-parameters)))) > > Hmm, the concat arguments are getting swapped. Intentional? > > The rest looks good. > >> Subject: [PATCH 3/3] org-table: Add mode flag to enable Calc units >> simplification mode >> >> * org-table.el (org-table-eval-formula): Add the `u` mode flag to >> enable Calc's units simplification mode. >> >> * test-org-table.el (test-org-table/mode-string-u): Add Unit test for >> the new mode flag. >> >> * org-manual.org: Document new mode flag. >> --- >> doc/org-manual.org | 8 ++++++++ >> etc/ORG-NEWS | 7 ++++++- >> lisp/org-table.el | 5 +++-- >> testing/lisp/test-org-table.el | 12 ++++++++++++ >> 4 files changed, 29 insertions(+), 3 deletions(-) > > Thanks for the additions. > >> diff --git a/doc/org-manual.org b/doc/org-manual.org >> index be69996d5..70b748fc7 100644 >> --- a/doc/org-manual.org >> +++ b/doc/org-manual.org >> @@ -2075,6 +2075,14 @@ variable ~org-calc-default-modes~. >> >> Fraction and symbolic modes of Calc. >> >> +- =u= :: >> + >> + Units simplification mode of Calc. Calc is also a symbolic > > convention nit: two spaces after a period > >> + calculator and is capable of working with values having an unit >> + (numerals followed by an unit string in Org table cells). This mode >> + instructs Calc to simplify the units in the computed expression >> + before returning the result. >> + >> - =T=, =t=, =U= :: >> >> Duration computations in Calc or Lisp, [[*Durations and time values]]. >> diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS >> index 889eb4aab..6f6db8e43 100644 >> --- a/etc/ORG-NEWS >> +++ b/etc/ORG-NEWS >> @@ -60,7 +60,7 @@ relative links within a project as follows: >> #+end_src >> >> ** New features >> -*** =ob-python= improvements to =:return= header argument >> +*** =ob-python= improvements to =:return= header argument > > unrelated space change > >> The =:return= header argument in =ob-python= now works for session >> blocks as well as non-session blocks. Also, it now works with the >> @@ -112,6 +112,11 @@ package, to convert pandas Dataframes into orgmode tables: >> | 2 | 3 | 6 | >> #+end_src >> >> +*** New =u= table formula flag to enable Calc units simplification mode >> + >> +A new =u= mode flat for Calc formulas in Org tables has been added to >> +enable Calc units simplification mode. > > s/flat/flag/ > --------------5BAB07DBC055D9E33DAADD3C Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-org-table-Remove-unused-org-tbl-calc-modes-variable-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-org-table-Remove-unused-org-tbl-calc-modes-variable-.pa"; filename*1="tch" RnJvbSBkMmFiNGQwNmUxOTYyMGMwMzQ3NDI1ODYxZTQ1MzRjZGU4NjU2NTQzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWxlIE5pY29sb2RpIDxkYW5pZWxlQGdyaW50 YS5uZXQ+CkRhdGU6IE1vbiwgMjMgTm92IDIwMjAgMjM6NDQ6NTEgKzAxMDAKU3ViamVjdDog W1BBVENIIDEvM10gb3JnLXRhYmxlOiBSZW1vdmUgdW51c2VkIG9yZy10YmwtY2FsYy1tb2Rl cyB2YXJpYWJsZQogZGVjbGFyYXRpb24KCiogb3JnLXRhYmxlLmVsIChvcmctdGJsLWNhbGMt bW9kZXMpOiBSZW1vdmUgdmFyaWFibGUgZGVjbGFyYXRpb24gYXMKdGhlIHZhcmlhbGJsZSBp cyB1c2VkIG9ubHkgd2l0aGluIGBvcmctdGFibGUtZXZhbC1mb3JtdWxhJy4KCiogb3JnLXRh YmxlLmVsIChvcmctdGFibGUtZXZhbC1mb3JtdWxhKTogUmVuYW1lIGBvcmctdGJsLWNhbGMt bW9kZXNgCmxvY2FsIHZhcmlhYmxlIHdpdGhvdXQgdGhlIGBvcmctdGJsLWAgcHJlZml4IGFu ZCB1c2UgdGhlIGdhaW5lZCBzY3JlZW4KcmVhbCBlc3RhdGUgdG8gYXZvaWQgaW5kaXJlY3Rp b24gdGhyb3VnaCBjb3ZlbmllbmNlIG1hY3JvLiBUaGlzCnJlcXVpcmVzIG1vdmluZyB0aGUg bW9kZSBsb29rdXAgdGFibGUgZnJvbSBgb3JnLXRhYmxlLS1zZXQtY2FsYy1tb2RlYAp0byBo ZXJlLgoKKiBvcmctdGFibGUuZWwgKG9yZy10YWJsZS0tc2V0LWNhbGMtbW9kZSk6IERyb3Ag Y29udmVuaWVuY2UgbWFjcm8uCk5vdGUgdGhhdCB0aGUgbWFjcm8gd2FzIG5vdCB3b3JraW5n IGFzIGludGVuZGVkIHdoZW4gdGhlIGNhbGxlciB0cmllZAp0byBhZGQgYSBuZXcgZW50cnkg aW4gdGhlIHBsaXN0IGFzIGluIHRoaXMgY2FzZSB0aGUgbWFjcm8gd291bGQgY3JlYXRlCmEg bmV3IHBsaXN0IHdpdGggdGhlIGFkZGVkIGVudHJ5IGJ1dCByZXR1cm4gdGhlIG9sZCBvbmUu Ci0tLQogbGlzcC9vcmctdGFibGUuZWwgfCA0MiArKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAy NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy10YWJsZS5lbCBiL2xpc3Av b3JnLXRhYmxlLmVsCmluZGV4IDExMmIxZTE3MS4uYTNiNzNhODI4IDEwMDY0NAotLS0gYS9s aXNwL29yZy10YWJsZS5lbAorKysgYi9saXNwL29yZy10YWJsZS5lbApAQCAtNjc2LDggKzY3 Niw2IEBAIFdpbGwgYmUgZmlsbGVkIGF1dG9tYXRpY2FsbHkgZHVyaW5nIHVzZS4iKQogICAg ICgiXyIgLiAiTmFtZXMgZm9yIHZhbHVlcyBpbiByb3cgYmVsb3cgdGhpcyBvbmUuIikKICAg ICAoIl4iIC4gIk5hbWVzIGZvciB2YWx1ZXMgaW4gcm93IGFib3ZlIHRoaXMgb25lLiIpKSkK IAotKGRlZnZhciBvcmctdGJsLWNhbGMtbW9kZXMgbmlsKQotCiAoZGVmdmFyIG9yZy1wb3Mg bmlsKQogCiAMCkBAIC03MjEsMTggKzcxOSw2IEBAIEZpZWxkIGlzIHJlc3RvcmVkIGV2ZW4g aW4gY2FzZSBvZiBhYm5vcm1hbCBleGl0LiIKIAkgKG9yZy10YWJsZS1nb3RvLWNvbHVtbiAs Y29sdW1uKQogCSAoc2V0LW1hcmtlciAsbGluZSBuaWwpKSkpKQogCi0oZGVmc3Vic3Qgb3Jn LXRhYmxlLS1zZXQtY2FsYy1tb2RlICh2YXIgJm9wdGlvbmFsIHZhbHVlKQotICAoaWYgKHN0 cmluZ3AgdmFyKQotICAgICAgKHNldHEgdmFyIChhc3NvYyB2YXIgJygoIkQiIGNhbGMtYW5n bGUtbW9kZSBkZWcpCi0JCQkgICAgICgiUiIgY2FsYy1hbmdsZS1tb2RlIHJhZCkKLQkJCSAg ICAgKCJGIiBjYWxjLXByZWZlci1mcmFjIHQpCi0JCQkgICAgICgiUyIgY2FsYy1zeW1ib2xp Yy1tb2RlIHQpKSkKLQkgICAgdmFsdWUgKG50aCAyIHZhcikgdmFyIChudGggMSB2YXIpKSkK LSAgKGlmIChtZW1xIHZhciBvcmctdGJsLWNhbGMtbW9kZXMpCi0gICAgICAoc2V0Y2FyIChj ZHIgKG1lbXEgdmFyIG9yZy10YmwtY2FsYy1tb2RlcykpIHZhbHVlKQotICAgIChjb25zIHZh ciAoY29ucyB2YWx1ZSBvcmctdGJsLWNhbGMtbW9kZXMpKSkKLSAgb3JnLXRibC1jYWxjLW1v ZGVzKQotCiAMCiA7OzsgUHJlZGljYXRlcwogCkBAIC0yNDMzLDcgKzI0MTksNyBAQCBsb2Nh dGlvbiBvZiBwb2ludC4iCiAJCQllcXVhdGlvbgogCQkgICAgICAob3JnLXRhYmxlLWdldC1m b3JtdWxhIGVxdWF0aW9uIChlcXVhbCBhcmcgJyg0KSkpKSkKIAkgICAobjAgKG9yZy10YWJs ZS1jdXJyZW50LWNvbHVtbikpCi0JICAgKG9yZy10YmwtY2FsYy1tb2RlcyAoY29weS1zZXF1 ZW5jZSBvcmctY2FsYy1kZWZhdWx0LW1vZGVzKSkKKwkgICAoY2FsYy1tb2RlcyAoY29weS1z ZXF1ZW5jZSBvcmctY2FsYy1kZWZhdWx0LW1vZGVzKSkKIAkgICAobnVtYmVycyBuaWwpCSAg IDsgd2FzIGEgdmFyaWFibGUsIG5vdyBmaXhlZCBkZWZhdWx0CiAJICAgKGtlZXAtZW1wdHkg bmlsKQogCSAgIG4gZm9ybSBmb3JtMCBmb3JtcnBsIGZvcm1yZyBidyBmbXQgeCBldiBvcmln IGMgbGlzcHAgbGl0ZXJhbApAQCAtMjQ0OSwxNCArMjQzNSwxMiBAQCBsb2NhdGlvbiBvZiBw b2ludC4iCiAJICAgICAgKHNldHEgYyAoc3RyaW5nLXRvLWNoYXIgKG1hdGNoLXN0cmluZyAx IGZtdCkpCiAJCSAgICBuIChzdHJpbmctdG8tbnVtYmVyIChtYXRjaC1zdHJpbmcgMiBmbXQp KSkKIAkgICAgICAoaWYgKD0gYyA/cCkKLQkJICAoc2V0cSBvcmctdGJsLWNhbGMtbW9kZXMK LQkJCShvcmctdGFibGUtLXNldC1jYWxjLW1vZGUgJ2NhbGMtaW50ZXJuYWwtcHJlYyBuKSkK LQkJKHNldHEgb3JnLXRibC1jYWxjLW1vZGVzCi0JCSAgICAgIChvcmctdGFibGUtLXNldC1j YWxjLW1vZGUKLQkJICAgICAgICdjYWxjLWZsb2F0LWZvcm1hdAotCQkgICAgICAgKGxpc3Qg KGNkciAoYXNzb2MgYyAnKCg/biAuIGZsb2F0KSAoP2YgLiBmaXgpCi0JCQkJCSAgICAgKD9z IC4gc2NpKSAoP2UgLiBlbmcpKSkpCi0JCQkgICAgIG4pKSkpCisJCSAgKHNldGYgKGNsLWdl dGYgY2FsYy1tb2RlcyAnY2FsYy1pbnRlcm5hbC1wcmVjKSBuKQorCQkoc2V0ZiAoY2wtZ2V0 ZiBjYWxjLW1vZGVzCisJCQkgICAgICAgJ2NhbGMtZmxvYXQtZm9ybWF0KQorCQkJICAgICAg IChsaXN0IChjZHIgKGFzc29jIGMgJygoP24gLiBmbG9hdCkgKD9mIC4gZml4KQorCQkJCQkJ ICAgICAoP3MgLiBzY2kpICg/ZSAuIGVuZykpKSkKKwkJCQkgICAgIG4pKSkKIAkgICAgICAo c2V0cSBmbXQgKHJlcGxhY2UtbWF0Y2ggIiIgdCB0IGZtdCkpKQogCSAgICAoaWYgKHN0cmlu Zy1tYXRjaCAiW3RUVV0iIGZtdCkKIAkJKGxldCAoKGZmIChtYXRjaC1zdHJpbmcgMCBmbXQp KSkKQEAgLTI0NzYsOSArMjQ2MCwxMyBAQCBsb2NhdGlvbiBvZiBwb2ludC4iCiAJCShzZXRx IGtlZXAtZW1wdHkgdAogCQkgICAgICBmbXQgKHJlcGxhY2UtbWF0Y2ggIiIgdCB0IGZtdCkp KQogCSAgICAod2hpbGUgKHN0cmluZy1tYXRjaCAiW0RSRlNdIiBmbXQpCi0JICAgICAgKHNl dHEgb3JnLXRibC1jYWxjLW1vZGVzCi0JCSAgICAob3JnLXRhYmxlLS1zZXQtY2FsYy1tb2Rl IChtYXRjaC1zdHJpbmcgMCBmbXQpKSkKLQkgICAgICAoc2V0cSBmbXQgKHJlcGxhY2UtbWF0 Y2ggIiIgdCB0IGZtdCkpKQorCSAgICAgIChsZXQqICgoYyAoc3RyaW5nLXRvLWNoYXIgKG1h dGNoLXN0cmluZyAwIGZtdCkpKQorCQkgICAgIChtb2RlIChjZHIgKGFzc29jIGMgJygoP0Qg Y2FsYy1hbmdsZS1tb2RlIGRlZykKKwkJCQkJICAgKD9SIGNhbGMtYW5nbGUtbW9kZSByYWQp CisJCQkJCSAgICg/RiBjYWxjLXByZWZlci1mcmFjIHQpCisJCQkJCSAgICg/UyBjYWxjLXN5 bWJvbGljLW1vZGUgdCkpKSkpKQorCQkoc2V0ZiAoY2wtZ2V0ZiBjYWxjLW1vZGVzIChjYXIg bW9kZSkpIChjYWRyIG1vZGUpKQorCQkoc2V0cSBmbXQgKHJlcGxhY2UtbWF0Y2ggIiIgdCB0 IGZtdCkpKSkKIAkgICAgKHVubGVzcyAoc3RyaW5nLW1hdGNoICJcXFMtIiBmbXQpCiAJICAg ICAgKHNldHEgZm10IG5pbCkpKSkKICAgICAgICh3aGVuIChhbmQgKG5vdCBzdXBwcmVzcy1j b25zdCkgb3JnLXRhYmxlLWZvcm11bGEtdXNlLWNvbnN0YW50cykKQEAgLTI2MjEsNyArMjYw OSw3IEBAIGxvY2F0aW9uIG9mIHBvaW50LiIKIAogCSAgKHNldHEgZXYgKGlmIChhbmQgZHVy YXRpb24gKHN0cmluZy1tYXRjaCAiXlswLTldKzpbMC05XStcXCg/OjpbMC05XStcXCk/JCIg Zm9ybSkpCiAJCSAgICAgICBmb3JtCi0JCSAgICAgKGNhbGMtZXZhbCAoY29ucyBmb3JtIG9y Zy10YmwtY2FsYy1tb2RlcykKKwkJICAgICAoY2FsYy1ldmFsIChjb25zIGZvcm0gY2FsYy1t b2RlcykKIAkJCQkod2hlbiAoYW5kIChub3Qga2VlcC1lbXB0eSkgbnVtYmVycykgJ251bSkp KQogCQlldiAoaWYgZHVyYXRpb24gKG9yZy10YWJsZS10aW1lLXNlY29uZHMtdG8tc3RyaW5n CiAJCQkJIChpZiAoc3RyaW5nLW1hdGNoICJeWzAtOV0rOlswLTldK1xcKD86OlswLTldK1xc KT8kIiBldikKLS0gCjIuMjkuMgoK --------------5BAB07DBC055D9E33DAADD3C Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0002-org-table-Simplify-mode-string-parsing.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0002-org-table-Simplify-mode-string-parsing.patch" RnJvbSAxYzJmMjQ2ZTQzODQ4MzgyNjkwNmU2MmUxN2Q0MzEyNzI0ZDExOTBkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWxlIE5pY29sb2RpIDxkYW5pZWxlQGdyaW50 YS5uZXQ+CkRhdGU6IFR1ZSwgMjQgTm92IDIwMjAgMDA6MTk6MDkgKzAxMDAKU3ViamVjdDog W1BBVENIIDIvM10gb3JnLXRhYmxlOiBTaW1wbGlmeSBtb2RlIHN0cmluZyBwYXJzaW5nCgoq IG9yZy10YWJsZS5lbCAob3JnLXRhYmxlLWV2YWwtZm9ybXVsYSk6IFNpbXBsaWZ5IG1vZGUg c3RyaW5nIHBhcnNpbmcKYW5kIHJlZHVjZSBzY29wZSBvZiBsb2NhbCB2YXJpYWJsZXMuCi0t LQogbGlzcC9vcmctdGFibGUuZWwgfCA5MyArKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyks IDUxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLXRhYmxlLmVsIGIvbGlz cC9vcmctdGFibGUuZWwKaW5kZXggYTNiNzNhODI4Li5jZjFiZmEzMWMgMTAwNjQ0Ci0tLSBh L2xpc3Avb3JnLXRhYmxlLmVsCisrKyBiL2xpc3Avb3JnLXRhYmxlLmVsCkBAIC0yNDIyLDUx ICsyNDIyLDQyIEBAIGxvY2F0aW9uIG9mIHBvaW50LiIKIAkgICAoY2FsYy1tb2RlcyAoY29w eS1zZXF1ZW5jZSBvcmctY2FsYy1kZWZhdWx0LW1vZGVzKSkKIAkgICAobnVtYmVycyBuaWwp CSAgIDsgd2FzIGEgdmFyaWFibGUsIG5vdyBmaXhlZCBkZWZhdWx0CiAJICAgKGtlZXAtZW1w dHkgbmlsKQotCSAgIG4gZm9ybSBmb3JtMCBmb3JtcnBsIGZvcm1yZyBidyBmbXQgeCBldiBv cmlnIGMgbGlzcHAgbGl0ZXJhbAorCSAgIGZvcm0gZm9ybTAgZm9ybXJwbCBmb3JtcmcgYncg Zm10IGV2IG9yaWcgbGlzcHAgbGl0ZXJhbAogCSAgIGR1cmF0aW9uIGR1cmF0aW9uLW91dHB1 dC1mb3JtYXQpCiAgICAgICA7OyBQYXJzZSB0aGUgZm9ybWF0IHN0cmluZy4gIFNpbmNlIHdl IGhhdmUgYSBsb3Qgb2YgbW9kZXMsIHRoaXMgaXMKICAgICAgIDs7IGEgbG90IG9mIHdvcmsu ICBIb3dldmVyLCBJIHRoaW5rIGNhbGMgc3RpbGwgdXNlcyBtb3N0IG9mIHRoZSB0aW1lLgot ICAgICAgKGlmIChzdHJpbmctbWF0Y2ggIjsiIGZvcm11bGEpCi0JICAobGV0ICgodG1wIChv cmctc3BsaXQtc3RyaW5nIGZvcm11bGEgIjsiKSkpCi0JICAgIChzZXRxIGZvcm11bGEgKGNh ciB0bXApCi0JCSAgZm10IChjb25jYXQgKGNkciAoYXNzb2MgIiUiIG9yZy10YWJsZS1sb2Nh bC1wYXJhbWV0ZXJzKSkKLQkJCSAgICAgIChudGggMSB0bXApKSkKKyAgICAgIChpZiAoc3Ry aW5nLW1hdGNoICJcXCguKlxcKTtcXCguKlxcKSIgZm9ybXVsYSkKKwkgIChwcm9nbgorCSAg ICAoc2V0cSBmbXQgKGNvbmNhdCAoY2RyIChhc3NvYyAiJSIgb3JnLXRhYmxlLWxvY2FsLXBh cmFtZXRlcnMpKQorCQkJICAgICAgKG1hdGNoLXN0cmluZy1uby1wcm9wZXJ0aWVzIDIgZm9y bXVsYSkpKQorCSAgICAoc2V0cSBmb3JtdWxhIChtYXRjaC1zdHJpbmctbm8tcHJvcGVydGll cyAxIGZvcm11bGEpKQogCSAgICAod2hpbGUgKHN0cmluZy1tYXRjaCAiXFwoW3BuZnNlXVxc KVxcKC0/WzAtOV0rXFwpIiBmbXQpCi0JICAgICAgKHNldHEgYyAoc3RyaW5nLXRvLWNoYXIg KG1hdGNoLXN0cmluZyAxIGZtdCkpCi0JCSAgICBuIChzdHJpbmctdG8tbnVtYmVyIChtYXRj aC1zdHJpbmcgMiBmbXQpKSkKLQkgICAgICAoaWYgKD0gYyA/cCkKLQkJICAoc2V0ZiAoY2wt Z2V0ZiBjYWxjLW1vZGVzICdjYWxjLWludGVybmFsLXByZWMpIG4pCi0JCShzZXRmIChjbC1n ZXRmIGNhbGMtbW9kZXMKLQkJCSAgICAgICAnY2FsYy1mbG9hdC1mb3JtYXQpCi0JCQkgICAg ICAgKGxpc3QgKGNkciAoYXNzb2MgYyAnKCg/biAuIGZsb2F0KSAoP2YgLiBmaXgpCi0JCQkJ CQkgICAgICg/cyAuIHNjaSkgKD9lIC4gZW5nKSkpKQotCQkJCSAgICAgbikpKQorCSAgICAg IChsZXQgKChjIChzdHJpbmctdG8tY2hhciAobWF0Y2gtc3RyaW5nIDEgZm10KSkpCisJCSAg ICAobiAoc3RyaW5nLXRvLW51bWJlciAobWF0Y2gtc3RyaW5nIDIgZm10KSkpKQorCQkoY2wt Y2FzZSBjCisJCSAgKD9wIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMgJ2NhbGMtaW50ZXJu YWwtcHJlYykgbikpCisJCSAgKD9uIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMgJ2NhbGMt ZmxvYXQtZm9ybWF0KSAobGlzdCAnZmxvYXQgbikpKQorCQkgICg/ZiAoc2V0ZiAoY2wtZ2V0 ZiBjYWxjLW1vZGVzICdjYWxjLWZsb2F0LWZvcm1hdCkgKGxpc3QgJ2ZpeCBuKSkpCisJCSAg KD9zIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMgJ2NhbGMtZmxvYXQtZm9ybWF0KSAobGlz dCAnc2NpIG4pKSkKKwkJICAoP2UgKHNldGYgKGNsLWdldGYgY2FsYy1tb2RlcyAnY2FsYy1m bG9hdC1mb3JtYXQpIChsaXN0ICdlbmcgbikpKSkpCisJICAgICAgOzsgUmVtb3ZlIG1hdGNo ZWQgZmxhZ3MgZnJvbSB0aGUgbW9kZSBzdHJpbmcuCisJICAgICAgKHNldHEgZm10IChyZXBs YWNlLW1hdGNoICIiIHQgdCBmbXQpKSkKKwkgICAgKHdoaWxlIChzdHJpbmctbWF0Y2ggIlxc KFt0VFVOTEVEUkZTXVxcKSIgZm10KQorCSAgICAgIChsZXQgKChjIChzdHJpbmctdG8tY2hh ciAobWF0Y2gtc3RyaW5nIDEgZm10KSkpKQorCQkoY2wtY2FzZSBjCisJCSAgKD90IChzZXRx IGR1cmF0aW9uIHQgbnVtYmVycyB0CisJCSAgICAgIAkgICAgZHVyYXRpb24tb3V0cHV0LWZv cm1hdCBvcmctdGFibGUtZHVyYXRpb24tY3VzdG9tLWZvcm1hdCkpCisJCSAgKD9UIChzZXRx IGR1cmF0aW9uIHQgbnVtYmVycyB0IGR1cmF0aW9uLW91dHB1dC1mb3JtYXQgbmlsKSkKKwkJ ICAoP1UgKHNldHEgZHVyYXRpb24gdCBudW1iZXJzIHQgZHVyYXRpb24tb3V0cHV0LWZvcm1h dCAnaGg6bW0pKQorCQkgICg/TiAoc2V0cSBudW1iZXJzIHQpKQorCQkgICg/TCAoc2V0cSBs aXRlcmFsIHQpKQorCQkgICg/RSAoc2V0cSBrZWVwLWVtcHR5IHQpKQorCQkgICg/RCAoc2V0 ZiAoY2wtZ2V0ZiBjYWxjLW1vZGVzICdjYWxjLWFuZ2xlLW1vZGUpICdkZWcpKQorCQkgICg/ UiAoc2V0ZiAoY2wtZ2V0ZiBjYWxjLW1vZGVzICdjYWxjLWFuZ2xlLW1vZGUpICdyYWQpKQor CQkgICg/RiAoc2V0ZiAoY2wtZ2V0ZiBjYWxjLW1vZGVzICdjYWxjLXByZWZlci1mcmFjKSB0 KSkKKwkJICAoP1MgKHNldGYgKGNsLWdldGYgY2FsYy1tb2RlcyAnY2FsYy1zeW1ib2xpYy1t b2RlKSB0KSkpKQorCSAgICAgIDs7IFJlbW92ZSBtYXRjaGVkIGZsYWdzIGZyb20gdGhlIG1v ZGUgc3RyaW5nLgogCSAgICAgIChzZXRxIGZtdCAocmVwbGFjZS1tYXRjaCAiIiB0IHQgZm10 KSkpCi0JICAgIChpZiAoc3RyaW5nLW1hdGNoICJbdFRVXSIgZm10KQotCQkobGV0ICgoZmYg KG1hdGNoLXN0cmluZyAwIGZtdCkpKQotCQkgIChzZXRxIGR1cmF0aW9uIHQgbnVtYmVycyB0 Ci0JCQlkdXJhdGlvbi1vdXRwdXQtZm9ybWF0Ci0JCQkoY29uZCAoKGVxdWFsIGZmICJUIikg bmlsKQotCQkJICAgICAgKChlcXVhbCBmZiAidCIpIG9yZy10YWJsZS1kdXJhdGlvbi1jdXN0 b20tZm9ybWF0KQotCQkJICAgICAgKChlcXVhbCBmZiAiVSIpICdoaDptbSkpCi0JCQlmbXQg KHJlcGxhY2UtbWF0Y2ggIiIgdCB0IGZtdCkpKSkKLQkgICAgKGlmIChzdHJpbmctbWF0Y2gg Ik4iIGZtdCkKLQkJKHNldHEgbnVtYmVycyB0Ci0JCSAgICAgIGZtdCAocmVwbGFjZS1tYXRj aCAiIiB0IHQgZm10KSkpCi0JICAgIChpZiAoc3RyaW5nLW1hdGNoICJMIiBmbXQpCi0JCShz ZXRxIGxpdGVyYWwgdAotCQkgICAgICBmbXQgKHJlcGxhY2UtbWF0Y2ggIiIgdCB0IGZtdCkp KQotCSAgICAoaWYgKHN0cmluZy1tYXRjaCAiRSIgZm10KQotCQkoc2V0cSBrZWVwLWVtcHR5 IHQKLQkJICAgICAgZm10IChyZXBsYWNlLW1hdGNoICIiIHQgdCBmbXQpKSkKLQkgICAgKHdo aWxlIChzdHJpbmctbWF0Y2ggIltEUkZTXSIgZm10KQotCSAgICAgIChsZXQqICgoYyAoc3Ry aW5nLXRvLWNoYXIgKG1hdGNoLXN0cmluZyAwIGZtdCkpKQotCQkgICAgIChtb2RlIChjZHIg KGFzc29jIGMgJygoP0QgY2FsYy1hbmdsZS1tb2RlIGRlZykKLQkJCQkJICAgKD9SIGNhbGMt YW5nbGUtbW9kZSByYWQpCi0JCQkJCSAgICg/RiBjYWxjLXByZWZlci1mcmFjIHQpCi0JCQkJ CSAgICg/UyBjYWxjLXN5bWJvbGljLW1vZGUgdCkpKSkpKQotCQkoc2V0ZiAoY2wtZ2V0ZiBj YWxjLW1vZGVzIChjYXIgbW9kZSkpIChjYWRyIG1vZGUpKQotCQkoc2V0cSBmbXQgKHJlcGxh Y2UtbWF0Y2ggIiIgdCB0IGZtdCkpKSkKIAkgICAgKHVubGVzcyAoc3RyaW5nLW1hdGNoICJc XFMtIiBmbXQpCiAJICAgICAgKHNldHEgZm10IG5pbCkpKSkKICAgICAgICh3aGVuIChhbmQg KG5vdCBzdXBwcmVzcy1jb25zdCkgb3JnLXRhYmxlLWZvcm11bGEtdXNlLWNvbnN0YW50cykK QEAgLTI1NjcsMTcgKzI1NTgsMTcgQEAgbG9jYXRpb24gb2YgcG9pbnQuIgogCShzZXRxIGZv cm0wIGZvcm0pCiAJOzsgSW5zZXJ0IHRoZSByZWZlcmVuY2VzIHRvIGZpZWxkcyBpbiBzYW1l IHJvdwogCSh3aGlsZSAoc3RyaW5nLW1hdGNoICJcXCRcXChcXChbLStdXFwpP1swLTldK1xc KSIgZm9ybSkKLQkgIChzZXRxIG4gKCsgKHN0cmluZy10by1udW1iZXIgKG1hdGNoLXN0cmlu ZyAxIGZvcm0pKQotCQkgICAgIChpZiAobWF0Y2gtZW5kIDIpIG4wIDApKQotCQl4IChudGgg KDEtIChpZiAoPSBuIDApIG4wIChtYXggbiAxKSkpIGZpZWxkcykKLQkJZm9ybXJwbCAoc2F2 ZS1tYXRjaC1kYXRhCi0JCQkgIChvcmctdGFibGUtbWFrZS1yZWZlcmVuY2UKLQkJCSAgIHgg a2VlcC1lbXB0eSBudW1iZXJzIGxpc3BwKSkpCi0JICAod2hlbiAob3IgKG5vdCB4KQotCQkg ICAgKHNhdmUtbWF0Y2gtZGF0YQotCQkgICAgICAoc3RyaW5nLW1hdGNoIChyZWdleHAtcXVv dGUgZm9ybXVsYSkgZm9ybXJwbCkpKQotCSAgICAodXNlci1lcnJvciAiSW52YWxpZCBmaWVs ZCBzcGVjaWZpZXIgXCIlc1wiIgotCQkJKG1hdGNoLXN0cmluZyAwIGZvcm0pKSkKKwkgIChs ZXQqICgobiAoKyAoc3RyaW5nLXRvLW51bWJlciAobWF0Y2gtc3RyaW5nIDEgZm9ybSkpCisJ CSAgICAgICAoaWYgKG1hdGNoLWVuZCAyKSBuMCAwKSkpCisJCSAoeCAobnRoICgxLSAoaWYg KD0gbiAwKSBuMCAobWF4IG4gMSkpKSBmaWVsZHMpKSkKKwkgICAgKHNldHEgZm9ybXJwbCAo c2F2ZS1tYXRjaC1kYXRhCisJCQkgICAgKG9yZy10YWJsZS1tYWtlLXJlZmVyZW5jZQorCQkJ ICAgICB4IGtlZXAtZW1wdHkgbnVtYmVycyBsaXNwcCkpKQorCSAgICAod2hlbiAob3IgKG5v dCB4KQorCQkgICAgICAoc2F2ZS1tYXRjaC1kYXRhCisJCQkoc3RyaW5nLW1hdGNoIChyZWdl eHAtcXVvdGUgZm9ybXVsYSkgZm9ybXJwbCkpKQorCSAgICAgICh1c2VyLWVycm9yICJJbnZh bGlkIGZpZWxkIHNwZWNpZmllciBcIiVzXCIiCisJCQkgIChtYXRjaC1zdHJpbmcgMCBmb3Jt KSkpKQogCSAgKHNldHEgZm9ybSAocmVwbGFjZS1tYXRjaCBmb3JtcnBsIHQgdCBmb3JtKSkp CiAKIAkoaWYgbGlzcHAKLS0gCjIuMjkuMgoK --------------5BAB07DBC055D9E33DAADD3C Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0003-org-table-Add-mode-flag-to-enable-Calc-units-simplif.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0003-org-table-Add-mode-flag-to-enable-Calc-units-simplif.pa"; filename*1="tch" RnJvbSAyODQyZDZmMGExMGVlODNkOGQ1MDBjZDNlNGMzODI3YTMyNDE4ZWVmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWxlIE5pY29sb2RpIDxkYW5pZWxlQGdyaW50 YS5uZXQ+CkRhdGU6IFR1ZSwgMjQgTm92IDIwMjAgMDA6NDk6MTYgKzAxMDAKU3ViamVjdDog W1BBVENIIDMvM10gb3JnLXRhYmxlOiBBZGQgbW9kZSBmbGFnIHRvIGVuYWJsZSBDYWxjIHVu aXRzCiBzaW1wbGlmaWNhdGlvbiBtb2RlCgoqIG9yZy10YWJsZS5lbCAob3JnLXRhYmxlLWV2 YWwtZm9ybXVsYSk6IEFkZCB0aGUgYHVgIG1vZGUgZmxhZyB0bwplbmFibGUgQ2FsYydzIHVu aXRzIHNpbXBsaWZpY2F0aW9uIG1vZGUuCgoqIHRlc3Qtb3JnLXRhYmxlLmVsICh0ZXN0LW9y Zy10YWJsZS9tb2RlLXN0cmluZy11KTogQWRkIFVuaXQgdGVzdCBmb3IKdGhlIG5ldyBtb2Rl IGZsYWcuCgoqIG9yZy1tYW51YWwub3JnOiBEb2N1bWVudCBuZXcgbW9kZSBmbGFnLgotLS0K IGRvYy9vcmctbWFudWFsLm9yZyAgICAgICAgICAgICB8ICA4ICsrKysrKysrCiBldGMvT1JH LU5FV1MgICAgICAgICAgICAgICAgICAgfCAgNSArKysrKwogbGlzcC9vcmctdGFibGUuZWwg ICAgICAgICAgICAgIHwgIDUgKysrLS0KIHRlc3RpbmcvbGlzcC90ZXN0LW9yZy10YWJsZS5l bCB8IDEyICsrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCsp LCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9vcmctbWFudWFsLm9yZyBiL2Rv Yy9vcmctbWFudWFsLm9yZwppbmRleCBiZTY5OTk2ZDUuLmQ5ZGU1ZTYzMyAxMDA2NDQKLS0t IGEvZG9jL29yZy1tYW51YWwub3JnCisrKyBiL2RvYy9vcmctbWFudWFsLm9yZwpAQCAtMjA3 NSw2ICsyMDc1LDE0IEBAIHZhcmlhYmxlIH5vcmctY2FsYy1kZWZhdWx0LW1vZGVzfi4KIAog ICBGcmFjdGlvbiBhbmQgc3ltYm9saWMgbW9kZXMgb2YgQ2FsYy4KIAorLSA9dT0gOjoKKwor ICBVbml0cyBzaW1wbGlmaWNhdGlvbiBtb2RlIG9mIENhbGMuICBDYWxjIGlzIGFsc28gYSBz eW1ib2xpYworICBjYWxjdWxhdG9yIGFuZCBpcyBjYXBhYmxlIG9mIHdvcmtpbmcgd2l0aCB2 YWx1ZXMgaGF2aW5nIGFuIHVuaXQsCisgIHJlcHJlc2VudGVkIHdpdGggbnVtZXJhbHMgZm9s bG93ZWQgYnkgYW4gdW5pdCBzdHJpbmcgaW4gT3JnIHRhYmxlCisgIGNlbGxzLiAgVGhpcyBt b2RlIGluc3RydWN0cyBDYWxjIHRvIHNpbXBsaWZ5IHRoZSB1bml0cyBpbiB0aGUKKyAgY29t cHV0ZWQgZXhwcmVzc2lvbiBiZWZvcmUgcmV0dXJuaW5nIHRoZSByZXN1bHQuCisKIC0gPVQ9 LCA9dD0sID1VPSA6OgogCiAgIER1cmF0aW9uIGNvbXB1dGF0aW9ucyBpbiBDYWxjIG9yIExp c3AsIFtbKkR1cmF0aW9ucyBhbmQgdGltZSB2YWx1ZXNdXS4KZGlmZiAtLWdpdCBhL2V0Yy9P UkctTkVXUyBiL2V0Yy9PUkctTkVXUwppbmRleCA4ODllYjRhYWIuLjBkMDhhOTM5YyAxMDA2 NDQKLS0tIGEvZXRjL09SRy1ORVdTCisrKyBiL2V0Yy9PUkctTkVXUwpAQCAtMTEyLDYgKzEx MiwxMSBAQCBwYWNrYWdlLCB0byBjb252ZXJ0IHBhbmRhcyBEYXRhZnJhbWVzIGludG8gb3Jn bW9kZSB0YWJsZXM6CiB8IDIgfCAzIHwgNiB8CiAjK2VuZF9zcmMKIAorKioqIE5ldyA9dT0g dGFibGUgZm9ybXVsYSBmbGFnIHRvIGVuYWJsZSBDYWxjIHVuaXRzIHNpbXBsaWZpY2F0aW9u IG1vZGUKKworQSBuZXcgPXU9IG1vZGUgZmxhZyBmb3IgQ2FsYyBmb3JtdWxhcyBpbiBPcmcg dGFibGVzIGhhcyBiZWVuIGFkZGVkIHRvCitlbmFibGUgQ2FsYyB1bml0cyBzaW1wbGlmaWNh dGlvbiBtb2RlLgorCiAqKiBNaXNjZWxsYW5lb3VzCiAqKiogPW9yZy1nb3RvLWZpcnN0LWNo aWxkPSBub3cgd29ya3MgYmVmb3JlIGZpcnN0IGhlYWRpbmcKIApkaWZmIC0tZ2l0IGEvbGlz cC9vcmctdGFibGUuZWwgYi9saXNwL29yZy10YWJsZS5lbAppbmRleCBjZjFiZmEzMWMuLmMx MzgxOTBlZiAxMDA2NDQKLS0tIGEvbGlzcC9vcmctdGFibGUuZWwKKysrIGIvbGlzcC9vcmct dGFibGUuZWwKQEAgLTI0NDIsNyArMjQ0Miw3IEBAIGxvY2F0aW9uIG9mIHBvaW50LiIKIAkJ ICAoP2UgKHNldGYgKGNsLWdldGYgY2FsYy1tb2RlcyAnY2FsYy1mbG9hdC1mb3JtYXQpIChs aXN0ICdlbmcgbikpKSkpCiAJICAgICAgOzsgUmVtb3ZlIG1hdGNoZWQgZmxhZ3MgZnJvbSB0 aGUgbW9kZSBzdHJpbmcuCiAJICAgICAgKHNldHEgZm10IChyZXBsYWNlLW1hdGNoICIiIHQg dCBmbXQpKSkKLQkgICAgKHdoaWxlIChzdHJpbmctbWF0Y2ggIlxcKFt0VFVOTEVEUkZTXVxc KSIgZm10KQorCSAgICAod2hpbGUgKHN0cmluZy1tYXRjaCAiXFwoW3RUVU5MRURSRlN1XVxc KSIgZm10KQogCSAgICAgIChsZXQgKChjIChzdHJpbmctdG8tY2hhciAobWF0Y2gtc3RyaW5n IDEgZm10KSkpKQogCQkoY2wtY2FzZSBjCiAJCSAgKD90IChzZXRxIGR1cmF0aW9uIHQgbnVt YmVycyB0CkBAIC0yNDU1LDcgKzI0NTUsOCBAQCBsb2NhdGlvbiBvZiBwb2ludC4iCiAJCSAg KD9EIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMgJ2NhbGMtYW5nbGUtbW9kZSkgJ2RlZykp CiAJCSAgKD9SIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMgJ2NhbGMtYW5nbGUtbW9kZSkg J3JhZCkpCiAJCSAgKD9GIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMgJ2NhbGMtcHJlZmVy LWZyYWMpIHQpKQotCQkgICg/UyAoc2V0ZiAoY2wtZ2V0ZiBjYWxjLW1vZGVzICdjYWxjLXN5 bWJvbGljLW1vZGUpIHQpKSkpCisJCSAgKD9TIChzZXRmIChjbC1nZXRmIGNhbGMtbW9kZXMg J2NhbGMtc3ltYm9saWMtbW9kZSkgdCkpCisJCSAgKD91IChzZXRmIChjbC1nZXRmIGNhbGMt bW9kZXMgJ2NhbGMtc2ltcGxpZnktbW9kZSkgJ3VuaXRzKSkpKQogCSAgICAgIDs7IFJlbW92 ZSBtYXRjaGVkIGZsYWdzIGZyb20gdGhlIG1vZGUgc3RyaW5nLgogCSAgICAgIChzZXRxIGZt dCAocmVwbGFjZS1tYXRjaCAiIiB0IHQgZm10KSkpCiAJICAgICh1bmxlc3MgKHN0cmluZy1t YXRjaCAiXFxTLSIgZm10KQpkaWZmIC0tZ2l0IGEvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXRh YmxlLmVsIGIvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXRhYmxlLmVsCmluZGV4IGZiOWQ4M2Y5 NS4uMWM5MzBjOGQwIDEwMDY0NAotLS0gYS90ZXN0aW5nL2xpc3AvdGVzdC1vcmctdGFibGUu ZWwKKysrIGIvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXRhYmxlLmVsCkBAIC0zODAsNiArMzgw LDE4IEBAIHJlZmVyZW5jZSAod2l0aCByb3cpLiAgTW9kZSBzdHJpbmcgTi4iCiAiCiAgICAg IDEgY2FsYykpKQogCisoZXJ0LWRlZnRlc3QgdGVzdC1vcmctdGFibGUvbW9kZS1zdHJpbmct dSAoKQorICAiQmFzaWM6IHZlcmlmeSB0aGF0IG1vZGUgc3RyaW5nIHUgcmVzdWx0cyBpbiB1 bml0cworc2ltcGxpZmljYXRpb24gbW9kZSBhcHBsaWVkIHRvIENhbGMgZm9ybXVsYXMuIgor ICAob3JnLXRlc3QtdGFibGUtdGFyZ2V0LWV4cGVjdAorICAgIgorfCAxLjUgQS9CIHwgMi4w IEIgfCB8CisiCisgICAiCit8IDEuNSBBL0IgfCAyLjAgQiB8IDMuIEEgfAorIgorICAgMSAi IytUQkxGTTogJDM9JDEqJDI7dSIpKQorCiAoZXJ0LWRlZnRlc3QgdGVzdC1vcmctdGFibGUv bGlzcC1yZXR1cm4tdmFsdWUgKCkKICAgIkJhc2ljOiBSZXR1cm4gdmFsdWUgb2YgTGlzcCBm b3JtdWxhcy4iCiAgIChvcmctdGVzdC10YWJsZS10YXJnZXQtZXhwZWN0Ci0tIAoyLjI5LjIK Cg== --------------5BAB07DBC055D9E33DAADD3C--