From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YDRlEFW5imYoXwAAe85BDQ:P1 (envelope-from ) for ; Sun, 07 Jul 2024 15:50:45 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id YDRlEFW5imYoXwAAe85BDQ (envelope-from ) for ; Sun, 07 Jul 2024 17:50:45 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=CNMlFSIJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720362962; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PeOcVkecy7dU4E303mwBRrBqJ40a/FbF0nr663r/GzI=; b=r5PxBI+DVJ/VoZob900xDeZseDQvPF9o8cSwKR42D2FF7YWkSGcxAiTK1is8SEKDSqaeYd cbI3o256RQ6lpqLBA7iPWtiNvzPqDUBYLtopLES6wtjzdX5PaD4vZXebYraZ+gfhlwkAcR ZF8SBJ8k8OADbdfIuJ/nDw/t/h+5Tco0unG4HQtU4HLkbkWF/Im3iVqQZ98tAh4+IauyFa Q41Vl0c7iso0rXuu+0ixFsUoINsYVItVmMC9k+JvXcPZ2KRcLf+hYDxU3uMrjBMNRbc53Y Dc0ca9pquVRYoQO1fK9MuuoaQGrC1RUlLPwPJhHsosoQ5fx3psvUKUx/Rxu+2A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720362962; a=rsa-sha256; cv=none; b=u6L+dJR1rbpDV/iwOkdj6dbZG92dsIBwV9mnfIPxO2jfzNWKXBh/NfnPhWjP2JJVdI+0Gv AmdI01Roipd4Hgnxl1rcJst9JPVxmVuHAacErluOc0TQKVJO5HRA4poM1aLSCYfBnBA8Oc R1j4so5GZYbJz3IFmVRr7SoW683L8AaxJUtjCauta63KAo1fv+0zHBGuVpSb4tyZD3BriH haY8ZpVCnOTbwRjn2x5KSikJ7WkJTVhvcRcNSP2loIf7UInUnEf3uigOydJ05KauDzRsTa icZSWhTs5LlWaWOcGRUV/lHUsqCrGwzTeELFWCga7g5PK7I8ubLAAyd9UyaYEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=CNMlFSIJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" 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 24C28668C6 for ; Sun, 7 Jul 2024 16:36:01 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQSye-0004h5-Ff; Sun, 07 Jul 2024 10:34:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQSyd-0004gi-Mf for emacs-orgmode@gnu.org; Sun, 07 Jul 2024 10:34:55 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQSyb-0004zt-7u for emacs-orgmode@gnu.org; Sun, 07 Jul 2024 10:34:55 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-70b0e7f6f8bso1880427b3a.3 for ; Sun, 07 Jul 2024 07:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720362891; x=1720967691; darn=gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6N+LaDQnbf1S1eqxiSnC6GBKtGF2Taqfa2UB4X4W9og=; b=CNMlFSIJ7S7ruRtbFh47eK1BdnZG8CeamtsJjTYAFJdgbWpNoEwtkP9MxTnFjHPYkH kianwO+PiTyShWzDsyxRJPCcQxFlXO3LQuTAz7+Y8tYYqARVIXl8aYhqFHi8AQg2e2cn xmsOgAWo6dO+ZajHkZWPVyLK2yVoJ5ArEPPuezhlF851qHbLiy3rpsjob6u3Vfhm0qLi eQFJtpJJITpQwHnsFnnJPHnlHZkfTnAkiyHZ8mwRXMz/qF4zDhOFFJPHhQ/tnDf79k0u 7uQFSFkB2gP0p/btSr0f4v+muFKMP2mGvSxBdH8l1GHLTPxvQcLdmHmdgGMcvc08el2G rEcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720362891; x=1720967691; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6N+LaDQnbf1S1eqxiSnC6GBKtGF2Taqfa2UB4X4W9og=; b=CHf9bzkxTr3lexQ3Ni0ppvXNID8vrxXlJXM4XCAE6KflhwLwZfqwUPoCb3NAUx+5J+ ABzDvOqoltHOTYU2YA8Di0PSrMarAMGqz0978BmjW4/6zHaG6ZRGM0RU6+ziAJtiv6me E3JdT5r9Ull1ofFtFjQpHddMpr3paJuv5NT+nU31UwpqxlWtFLMa+1DekOIJrPFFBD9s MXw9JBXdu6zVCxZv2yifpqwUHBgsa5RyNwV2S8VyO96ljdF/Plq6QtND3j1gQcMfdeOa QcSF2LW9tluEZRMWqrH8LNVkHJD8Uo/jUcdaJiEUYNTkl7lzTnRadECtaX2KlJPIYMlo N9PA== X-Forwarded-Encrypted: i=1; AJvYcCVs1/73yB3D5hikm66HLrDJFdX6QiyplTMfiJ9EyYJn/P/CHcBvqxIe5xWDlk31tBqnAetLs21der7+lQaK1bYbLHkqwCY= X-Gm-Message-State: AOJu0YxoDPUAX4J3kJu1Q1rSuk7u8DcGDQsm3e69LKRtk2exhPLcFjgn HT6s0zi5uJ5yQUeDcYy5SzdYQH3yBS7KEi9LBFei4Tgr2zfy3d3U33GJfRoBGBxygH1QxMGMe/n 016zuGQyxEh9A0u6jt1hQfpT0rhw= X-Google-Smtp-Source: AGHT+IF1A974aitUClWfcAi4a1nrvw/2lvvzOCO/RSVmnE6dLBbCWAmuSpm2ypeIfPS785Z8DOXQCeXM/ldlMW8Z/s4= X-Received: by 2002:a05:6a20:244a:b0:1c0:ee1a:da3f with SMTP id adf61e73a8af0-1c0ee1adb5amr4016474637.23.1720362891130; Sun, 07 Jul 2024 07:34:51 -0700 (PDT) MIME-Version: 1.0 References: <87zfstenxc.fsf@localhost> <87zfriscml.fsf@localhost> <87v824904a.fsf@localhost> <87bk3v78zq.fsf@localhost> <87jziiptoh.fsf@localhost> <87a5jdi29k.fsf@localhost> <87v81ohumi.fsf@localhost> In-Reply-To: <87v81ohumi.fsf@localhost> From: Nathan Nichols Date: Sun, 7 Jul 2024 10:34:39 -0400 Message-ID: Subject: Re: [PATCH] Ability to specify :html-head as a function To: Ihor Radchenko Cc: =?UTF-8?Q?Rudolf_Adamkovi=C4=8D?= , emacs-orgmode@gnu.org Content-Type: multipart/mixed; boundary="000000000000034e10061ca9331c" Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=nathannichols454@gmail.com; helo=mail-pf1-x433.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 24C28668C6 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.19 X-Spam-Score: -4.19 X-TUID: 7LyjrCWFkgyo --000000000000034e10061ca9331c Content-Type: multipart/alternative; boundary="000000000000034e0f061ca9331a" --000000000000034e0f061ca9331a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable OK, I fixed the commit message and other issues that you mentioned. Please let me know if theres anything else. On Tue, Jul 2, 2024 at 7:58=E2=80=AFAM Ihor Radchenko = wrote: > Nathan Nichols writes: > > > Ok here's an updated patch. Please let me know if there's anything else= . > > Thanks! > > > Subject: [PATCH] Added ability to specify :html-head as a string or > function > > Please add changelog to the commit message. > See https://orgmode.org/worg/org-contribute.html#commit-messages > > > --- a/lisp/ox-html.el > > +++ b/lisp/ox-html.el > > @@ -1531,7 +1531,8 @@ style information." > > This variable can contain the full HTML structure to provide a > > style, including the surrounding HTML tags. You can consider > > including definitions for the following classes: title, todo, > > -done, timestamp, timestamp-kwd, tag, target. > > +done, timestamp, timestamp-kwd, tag, target. Can be a string, or > > +a function that accepts the project p-list and returns a string. > > ... > > (defcustom org-html-head-extra "" > > "More head information to add in the HTML output. > > > > -You can set this on a per-file basis using #+HTML_HEAD_EXTRA:, > > -or for publication projects using the :html-head-extra property." > > +You can set this on a per-file basis using #+HTML_HEAD_EXTRA:, or > > +for publication projects using the :html-head-extra property. > > +Can be a string, or a function that accepts the project p-list > > +and returns a string." > > We usually say INFO plist or INFO channel. "Project p-list" is not a > term we use. > > > :group 'org-export-html > > :version "24.4" > > :package-version '(Org . "8.0") > > Please change :package-version to 9.8. This slot indicates the most > recent version when the meaning of default value of the option has been > changed. > > > +(defun org-html-normalize-string-or-function (input &rest args) > > + "Normalize INPUT function or string. Return a string or nil. > > "String or nil" is not accurate, actually. Because > `org-element-normalize-stirng' either returns the argument unchanged or > returns a string. Maybe better just drop "Return a string or nil" > completely. > > -- > Ihor Radchenko // yantar92, > Org mode contributor, > Learn more about Org mode at . > Support Org development at , > or support my work at > --000000000000034e0f061ca9331a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
OK, I fixed the commit message and other issues that you m= entioned. Please let me know if theres anything else.

On Tue, Jul 2, 2024 = at 7:58=E2=80=AFAM Ihor Radchenko <yantar92@posteo.net> wrote:
Nathan Nichols <nathannichols454@gmail.com> writes:

> Ok here's an updated patch. Please let me know if there's anyt= hing else.

Thanks!

> Subject: [PATCH] Added ability to specify :html-head as a string or fu= nction

Please add changelog to the commit message.
See https://orgmode.org/worg/org-contrib= ute.html#commit-messages

> --- a/lisp/ox-html.el
> +++ b/lisp/ox-html.el
> @@ -1531,7 +1531,8 @@ style information."
>=C2=A0 This variable can contain the full HTML structure to provide a >=C2=A0 style, including the surrounding HTML tags.=C2=A0 You can consid= er
>=C2=A0 including definitions for the following classes: title, todo, > -done, timestamp, timestamp-kwd, tag, target.
> +done, timestamp, timestamp-kwd, tag, target.=C2=A0 Can be a string, o= r
> +a function that accepts the project p-list and returns a string.
> ...
>=C2=A0 (defcustom org-html-head-extra ""
>=C2=A0 =C2=A0 "More head information to add in the HTML output. >=C2=A0
> -You can set this on a per-file basis using #+HTML_HEAD_EXTRA:,
> -or for publication projects using the :html-head-extra property."= ;
> +You can set this on a per-file basis using #+HTML_HEAD_EXTRA:, or
> +for publication projects using the :html-head-extra property.
> +Can be a string, or a function that accepts the project p-list
> +and returns a string."

We usually say INFO plist or INFO channel. "Project p-list" is no= t a
term we use.

>=C2=A0 =C2=A0 :group 'org-export-html
>=C2=A0 =C2=A0 :version "24.4"
>=C2=A0 =C2=A0 :package-version '(Org . "8.0")

Please change :package-version to 9.8. This slot indicates the most
recent version when the meaning of default value of the option has been
changed.

> +(defun org-html-normalize-string-or-function (input &rest args) > +=C2=A0 "Normalize INPUT function or string.=C2=A0 Return a strin= g or nil.

"String or nil" is not accurate, actually. Because
`org-element-normalize-stirng' either returns the argument unchanged or=
returns a string. Maybe better just drop "Return a string or nil"=
completely.

--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,=
or support my work at <https://liberapay.com/yantar92>
--000000000000034e0f061ca9331a-- --000000000000034e10061ca9331c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Added-ability-to-specify-html-head-as-a-string-or-fu.patch" Content-Disposition: attachment; filename="0001-Added-ability-to-specify-html-head-as-a-string-or-fu.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lybnmfvz0 RnJvbSA3ZWY2N2RmNDUzNTdkYWMxNzU4ZDY4YzYxMDZhMGUwYWRkN2JjMDA1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOYXRlIE5pY2hvbHMgPG5hdGhhbm5pY2hvbHM0NTRAZ21haWwu Y29tPgpEYXRlOiBUaHUsIDIwIEp1biAyMDI0IDE0OjI1OjM1IC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gQWRkZWQgYWJpbGl0eSB0byBzcGVjaWZ5IDpodG1sLWhlYWQgYXMgYSBzdHJpbmcgb3IgZnVu Y3Rpb24KCiogbGlzcC9veC1odG1sLmVsOiBDaGFuZ2VkIDpodG1sLWhlYWQgb3B0aW9uIHRvIGFj Y2VwdCBhIHN0cmluZyBvciBhCmZ1bmN0aW9uLgoqIGV0Yy9PUkctTkVXUzogQWRkZWQgbmV3cyBp dGVtIGZvciBjaGFuZ2VzIHRvIDpodG1sLWhlYWQgb3B0aW9uLgoqIHRlc3RpbmcvbGlzcC90ZXN0 LW94LWh0bWwuZWw6IEFkZGVkIHRlc3RzIGZvcgpgb3JnLWh0bWwtbm9ybWFsaXplLXN0cmluZy1v ci1mdW5jdGlvbmAKLS0tCiBldGMvT1JHLU5FV1MgICAgICAgICAgICAgICAgIHwgIDYgKysrKysr CiBsaXNwL294LWh0bWwuZWwgICAgICAgICAgICAgIHwgMzEgKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLQogdGVzdGluZy9saXNwL3Rlc3Qtb3gtaHRtbC5lbCB8ICA4ICsrKysrKysrCiAz IGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZXRjL09SRy1ORVdTIGIvZXRjL09SRy1ORVdTCmluZGV4IGI5ZjUxNjY3ZC4uNTlhY2Vl YTAyIDEwMDY0NAotLS0gYS9ldGMvT1JHLU5FV1MKKysrIGIvZXRjL09SRy1ORVdTCkBAIC05Miw3 ICs5MiwxMyBAQCBUaGlzIHJlc3VsdHMgaW4gYW4gZXJyb3Igc3VjaCBhczoKIFJ1bnRpbWUgZXJy b3IgbmVhciBsaW5lIDI6IGF0dGVtcHQgdG8gd3JpdGUgYSByZWFkb25seSBkYXRhYmFzZSAoOCkK IFsgQmFiZWwgZXZhbHVhdGlvbiBleGl0ZWQgd2l0aCBjb2RlIDEgXQogIytlbmRfZXhhbXBsZQor KioqIH5vcmctaHRtbC1oZWFkfiBhbmQgfm9yZy1odG1sLWhlYWQtZXh0cmF+IGNhbiBub3cgYmUg c3BlY2lmaWVkIGFzIGZ1bmN0aW9ucwogCitQcmV2aW91c2x5LCB+b3JnLWh0bWwtaGVhZH4gYW5k IH5vcmctaHRtbC1oZWFkLWV4dHJhfiBjb3VsZCBvbmx5IGJlCitzcGVjaWZpZWQgZGlyZWN0bHkg YXMgc3RyaW5ncy4gIE5vdywgdGhleSBjYW4gYmUgc2V0IHRvIGZ1bmN0aW9ucyB0aGF0CithY2Nl cHQgdGhlIHByb2plY3QgcC1saXN0IGFuZCByZXR1cm4gYSBzdHJpbmcuICBUaGlzIG1ha2VzIGl0 IHBvc3NpYmxlCit0byBkeW5hbWljYWxseSBnZW5lcmF0ZSB0aGUgY29udGVudCBvZiB0aGUgcmVz dWx0aW5nIH48aGVhZD5+IHRhZyBpbgordGhlIHJlc3VsdGluZyBIVE1MIGRvY3VtZW50LgogCiAq KiBNaXNjZWxsYW5lb3VzCiAqKiogVHJhaWxpbmcgPS09IGlzIG5vdyBhbGxvd2VkIGluIHBsYWlu IGxpbmtzCmRpZmYgLS1naXQgYS9saXNwL294LWh0bWwuZWwgYi9saXNwL294LWh0bWwuZWwKaW5k ZXggZDE2ODdjZjVhLi5lZDM5YTg4MzQgMTAwNjQ0Ci0tLSBhL2xpc3Avb3gtaHRtbC5lbAorKysg Yi9saXNwL294LWh0bWwuZWwKQEAgLTE1MjAsNyArMTUyMCw3IEBAIHNob3VsZCBub3QgYmUgbW9k aWZpZWQuICBVc2UgYG9yZy1odG1sLWhlYWQnIHRvIHVzZSB5b3VyIG93bgogc3R5bGUgaW5mb3Jt YXRpb24uIgogICA6Z3JvdXAgJ29yZy1leHBvcnQtaHRtbAogICA6dmVyc2lvbiAiMjQuNCIKLSAg OnBhY2thZ2UtdmVyc2lvbiAnKE9yZyAuICI4LjAiKQorICA6cGFja2FnZS12ZXJzaW9uICcoT3Jn IC4gIjkuOCIpCiAgIDp0eXBlICdib29sZWFuKQogOzs7IyMjYXV0b2xvYWQKIChwdXQgJ29yZy1o dG1sLWhlYWQtaW5jbHVkZS1kZWZhdWx0LXN0eWxlICdzYWZlLWxvY2FsLXZhcmlhYmxlICdib29s ZWFucCkKQEAgLTE1MzEsNyArMTUzMSw4IEBAIHN0eWxlIGluZm9ybWF0aW9uLiIKIFRoaXMgdmFy aWFibGUgY2FuIGNvbnRhaW4gdGhlIGZ1bGwgSFRNTCBzdHJ1Y3R1cmUgdG8gcHJvdmlkZSBhCiBz dHlsZSwgaW5jbHVkaW5nIHRoZSBzdXJyb3VuZGluZyBIVE1MIHRhZ3MuICBZb3UgY2FuIGNvbnNp ZGVyCiBpbmNsdWRpbmcgZGVmaW5pdGlvbnMgZm9yIHRoZSBmb2xsb3dpbmcgY2xhc3NlczogdGl0 bGUsIHRvZG8sCi1kb25lLCB0aW1lc3RhbXAsIHRpbWVzdGFtcC1rd2QsIHRhZywgdGFyZ2V0Lgor ZG9uZSwgdGltZXN0YW1wLCB0aW1lc3RhbXAta3dkLCB0YWcsIHRhcmdldC4gIENhbiBiZSBhIHN0 cmluZywgb3IKK2EgZnVuY3Rpb24gdGhhdCBhY2NlcHRzIHRoZSBJTkZPIHAtbGlzdCBhbmQgcmV0 dXJucyBhIHN0cmluZy4KIAogRm9yIGV4YW1wbGUsIGEgdmFsaWQgdmFsdWUgd291bGQgYmU6CiAK QEAgLTE1NTYsMTkgKzE1NTcsMjMgQEAgb3IgZm9yIHB1YmxpY2F0aW9uIHByb2plY3RzIHVzaW5n IHRoZSA6aHRtbC1oZWFkIHByb3BlcnR5LiIKICAgOmdyb3VwICdvcmctZXhwb3J0LWh0bWwKICAg OnZlcnNpb24gIjI0LjQiCiAgIDpwYWNrYWdlLXZlcnNpb24gJyhPcmcgLiAiOC4wIikKLSAgOnR5 cGUgJ3N0cmluZykKKyAgOnR5cGUgJyhjaG9pY2UgKHN0cmluZyA6dGFnICJMaXRlcmFsIHRleHQg dG8gaW5zZXJ0IikKKyAgICAgICAgICAgICAgICAgKGZ1bmN0aW9uIDp0YWcgIkZ1bmN0aW9uIGV2 YWx1YXRpbmcgdG8gYSBzdHJpbmciKSkpCiA7OzsjIyNhdXRvbG9hZAogKHB1dCAnb3JnLWh0bWwt aGVhZCAnc2FmZS1sb2NhbC12YXJpYWJsZSAnc3RyaW5ncCkKIAogKGRlZmN1c3RvbSBvcmctaHRt bC1oZWFkLWV4dHJhICIiCiAgICJNb3JlIGhlYWQgaW5mb3JtYXRpb24gdG8gYWRkIGluIHRoZSBI VE1MIG91dHB1dC4KIAotWW91IGNhbiBzZXQgdGhpcyBvbiBhIHBlci1maWxlIGJhc2lzIHVzaW5n ICMrSFRNTF9IRUFEX0VYVFJBOiwKLW9yIGZvciBwdWJsaWNhdGlvbiBwcm9qZWN0cyB1c2luZyB0 aGUgOmh0bWwtaGVhZC1leHRyYSBwcm9wZXJ0eS4iCitZb3UgY2FuIHNldCB0aGlzIG9uIGEgcGVy LWZpbGUgYmFzaXMgdXNpbmcgIytIVE1MX0hFQURfRVhUUkE6LCBvcgorZm9yIHB1YmxpY2F0aW9u IHByb2plY3RzIHVzaW5nIHRoZSA6aHRtbC1oZWFkLWV4dHJhIHByb3BlcnR5LgorQ2FuIGJlIGEg c3RyaW5nLCBvciBhIGZ1bmN0aW9uIHRoYXQgYWNjZXB0cyB0aGUgcHJvamVjdCBwLWxpc3QKK2Fu ZCByZXR1cm5zIGEgc3RyaW5nLiIKICAgOmdyb3VwICdvcmctZXhwb3J0LWh0bWwKICAgOnZlcnNp b24gIjI0LjQiCiAgIDpwYWNrYWdlLXZlcnNpb24gJyhPcmcgLiAiOC4wIikKLSAgOnR5cGUgJ3N0 cmluZykKKyAgOnR5cGUgJyhjaG9pY2UgKHN0cmluZyA6dGFnICJMaXRlcmFsIHRleHQgdG8gaW5z ZXJ0IikKKyAgICAgICAgICAgICAgICAgKGZ1bmN0aW9uIDp0YWcgIkZ1bmN0aW9uIGV2YWx1YXRp bmcgdG8gYSBzdHJpbmciKSkpCiA7OzsjIyNhdXRvbG9hZAogKHB1dCAnb3JnLWh0bWwtaGVhZC1l eHRyYSAnc2FmZS1sb2NhbC12YXJpYWJsZSAnc3RyaW5ncCkKIApAQCAtMjAwMSw2ICsyMDA2LDE1 IEBAIElORk8gaXMgYSBwbGlzdCB1c2VkIGFzIGEgY29tbXVuaWNhdGlvbiBjaGFubmVsLiIKIAkJ ICBvcmctaHRtbC1tZXRhLXRhZ3MpKQogICAgICAgIiIpKSkpCiAKKyhkZWZ1biBvcmctaHRtbC1u b3JtYWxpemUtc3RyaW5nLW9yLWZ1bmN0aW9uIChpbnB1dCAmcmVzdCBhcmdzKQorICAiTm9ybWFs aXplIElOUFVUIGZ1bmN0aW9uIG9yIHN0cmluZy4KK0lmIElOUFVUIGlzIGEgc3RyaW5nLCBpdCBp cyBwYXNzZWQgdG8KK2BvcmctZWxlbWVudC1ub3JtYWxpemUtc3RyaW5nJy4gIElmIElOUFVUIGlz IGEgZnVuY3Rpb24sIGl0IGlzCithcHBsaWVkIHRvIGFyZ3VtZW50cyBBUkdTLCBhbmQgdGhlIHJl c3VsdCBpcyBwYXNzZWQgdG8KK2BvcmctZWxlbWVudC1ub3JtYWxpemUtc3RyaW5nJy4iCisgIChs ZXQgKChzIChpZiAoZnVuY3Rpb25wIGlucHV0KSAoZm9ybWF0ICIlcyIgKGFwcGx5IGlucHV0IGFy Z3MpKSBpbnB1dCkpKQorICAgIChvcmctZWxlbWVudC1ub3JtYWxpemUtc3RyaW5nIHMpKSkKKwog KGRlZnVuIG9yZy1odG1sLS1idWlsZC1oZWFkIChpbmZvKQogICAiUmV0dXJuIGluZm9ybWF0aW9u IGZvciB0aGUgPGhlYWQ+Li48L2hlYWQ+IG9mIHRoZSBIVE1MIG91dHB1dC4KIElORk8gaXMgYSBw bGlzdCB1c2VkIGFzIGEgY29tbXVuaWNhdGlvbiBjaGFubmVsLiIKQEAgLTIwMDgsOCArMjAyMiw5 IEBAIElORk8gaXMgYSBwbGlzdCB1c2VkIGFzIGEgY29tbXVuaWNhdGlvbiBjaGFubmVsLiIKICAg IChjb25jYXQKICAgICAod2hlbiAocGxpc3QtZ2V0IGluZm8gOmh0bWwtaGVhZC1pbmNsdWRlLWRl ZmF1bHQtc3R5bGUpCiAgICAgICAob3JnLWVsZW1lbnQtbm9ybWFsaXplLXN0cmluZyBvcmctaHRt bC1zdHlsZS1kZWZhdWx0KSkKLSAgICAob3JnLWVsZW1lbnQtbm9ybWFsaXplLXN0cmluZyAocGxp c3QtZ2V0IGluZm8gOmh0bWwtaGVhZCkpCi0gICAgKG9yZy1lbGVtZW50LW5vcm1hbGl6ZS1zdHJp bmcgKHBsaXN0LWdldCBpbmZvIDpodG1sLWhlYWQtZXh0cmEpKQorICAgIChvcmctaHRtbC1ub3Jt YWxpemUtc3RyaW5nLW9yLWZ1bmN0aW9uIChwbGlzdC1nZXQgaW5mbyA6aHRtbC1oZWFkKSBpbmZv KQorICAgIChvcmctaHRtbC1ub3JtYWxpemUtc3RyaW5nLW9yLWZ1bmN0aW9uIChwbGlzdC1nZXQg aW5mbyA6aHRtbC1oZWFkLWV4dHJhKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGluZm8pCiAgICAgKHdoZW4gKGFuZCAocGxpc3QtZ2V0IGluZm8gOmh0bWwtaHRt bGl6ZWQtY3NzLXVybCkKIAkgICAgICAgKGVxIG9yZy1odG1sLWh0bWxpemUtb3V0cHV0LXR5cGUg J2NzcykpCiAgICAgICAob3JnLWh0bWwtY2xvc2UtdGFnICJsaW5rIgpkaWZmIC0tZ2l0IGEvdGVz dGluZy9saXNwL3Rlc3Qtb3gtaHRtbC5lbCBiL3Rlc3RpbmcvbGlzcC90ZXN0LW94LWh0bWwuZWwK aW5kZXggMDk1OWQxNDQxLi5hZjMwMDczOTIgMTAwNjQ0Ci0tLSBhL3Rlc3RpbmcvbGlzcC90ZXN0 LW94LWh0bWwuZWwKKysrIGIvdGVzdGluZy9saXNwL3Rlc3Qtb3gtaHRtbC5lbApAQCAtOTk2LDUg Kzk5NiwxMyBAQCBlbnRpcmVseS4iCiAgICAgICAgIChzaG91bGQgKD0gMCAoaG93LW1hbnkgIkNy ZWF0ZWQ6ICIpKSkKICAgICAgICAgKHNob3VsZCAoPSAxIChob3ctbWFueSAiQXV0aG9yPU1vbnNp ZXVyIE9ldWYiKSkpKSkpKQogCisoZXJ0LWRlZnRlc3Qgb3gtaHRtbC90ZXN0LW5vcm1hbGl6ZS1z dHJpbmctb3ItZnVuY3Rpb24gKCkKKyAgOzsgVGVzdCBjYXNlcyBmb3IgYG9yZy1lbGVtZW50LW5v cm1hbGl6ZS1zdHJpbmctb3ItZnVuY3Rpb24nCisgIChzaG91bGQgKHN0cmluZz0gKG9yZy1odG1s LW5vcm1hbGl6ZS1zdHJpbmctb3ItZnVuY3Rpb24KKyAgICAgICAgICAgICAgICAgICAgKGxhbWJk YSAoX3JlcykgImFiY2RlZmciKSBuaWwpICJhYmNkZWZnXG4iKSkKKyAgKHNob3VsZCAoc3RyaW5n PSAob3JnLWh0bWwtbm9ybWFsaXplLXN0cmluZy1vci1mdW5jdGlvbiAiYWJjZGVmZyIpCisgICAg ICAgICAgICAgICAgICAgImFiY2RlZmdcbiIpKQorICAoc2hvdWxkICg9IChvcmctZWxlbWVudC1u b3JtYWxpemUtc3RyaW5nLW9yLWZ1bmN0aW9uIDEyMyBuaWwpIDEyMykpKQorCiAocHJvdmlkZSAn dGVzdC1veC1odG1sKQogOzs7IHRlc3Qtb3gtaHRtbC5lbCBlbmRzIGhlcmUKLS0gCjIuMzQuMQoK --000000000000034e10061ca9331c--