From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id sAamORwplmMqKwAAbAwnHQ (envelope-from ) for ; Sun, 11 Dec 2022 20:01:49 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UAWUORwplmP+BQAAauVa8A (envelope-from ) for ; Sun, 11 Dec 2022 20:01:48 +0100 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 E2A5A3552F for ; Sun, 11 Dec 2022 20:01:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4RZH-0000xa-QY; Sun, 11 Dec 2022 14:00:56 -0500 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 1p4RZA-0000x5-5I for emacs-orgmode@gnu.org; Sun, 11 Dec 2022 14:00:49 -0500 Received: from mail-ua1-x929.google.com ([2607:f8b0:4864:20::929]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4RZ7-0004Fp-LT for emacs-orgmode@gnu.org; Sun, 11 Dec 2022 14:00:47 -0500 Received: by mail-ua1-x929.google.com with SMTP id q6so2629790uao.9 for ; Sun, 11 Dec 2022 11:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=htHmLiM/GA9F5uFHTkRMiFpaYiUaHQdW2WAO8Se8poU=; b=LoqeLvtDZpt/xNIPZqoQ+fgx8tnE2K7GIl9gBwFaNfPPz0p0ndlWWUDojBxoq2bwLq TPsdwbWxnOtxeKw4uzFlRcdSXnTPRL3DpG45PerVIcgyngcB7MNP3e0xIKeBcWBps+Xj YTO57UxhxK4Y8teElCoIvu8BsPaSJvRFSYy81MGP6TZ7Sqspdxl5Oay4xpe5epBkJAXv X72slBXFPCBAzv6u0tVFOrLub2JU1eiQ4LKgW3TL4NWHjOP5WZ0loNmpXnG/EaFv9GOP 4AdEc4UOUArSZNSzDbBs/4Rnc/I234Qm+QqL/XGsc8GUFQOt2TgpTOvnhxh78mGc9Z/o 9J9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=htHmLiM/GA9F5uFHTkRMiFpaYiUaHQdW2WAO8Se8poU=; b=jrAi4i5/VQqSxXE+TsLXUSqmN/qE9qc6qjKgVrAxhRFxJy1dDR6YiBDtJoiu5SNRfo TGVgLyKgGAbvOyrHn9YLYL5JAL2jhIQ01hHT8f8gF644wHueGX5V8+AukoRnl5mnA/fc sPHHURL6fwBDebqiK97qiyu196GQIp4eJTqtXswzdMogoXayctYw7o010wA0Sw8/YCYb G+M8BzV7XrgfE/ZTra73Hgf0lvHTXPMYb7CO/0k/hotpMocZRdbkJUeSMuxq0TQqmkNy ReAlULvN6LKFWF2GKfjV1L0vynbxRIOg+1VoExMtZyuwW3UE1CB4fScNiJMO+JS1CMOz OrBg== X-Gm-Message-State: ANoB5pmAp3zJTRW/J6vu9RsC/PlVMDmwRA/IG6VW3JEhPVz6CamEVX6N koCcHvfEdIBA/HjhZwqAoiCy4k86sAgb5UD7Rcg= X-Google-Smtp-Source: AA0mqf6wF0atzkGaqtWzZsm9mTkXh7J5m/q2jHvXH7g7qRG9iyuUH7trAiCeNo+QNnxO4yEtqrSmNw+mgRYjbISKhVo= X-Received: by 2002:ab0:6202:0:b0:419:9192:c55b with SMTP id m2-20020ab06202000000b004199192c55bmr16688544uao.117.1670785243902; Sun, 11 Dec 2022 11:00:43 -0800 (PST) MIME-Version: 1.0 References: <87o7tja3ag.fsf@localhost> <87sfiu10fd.fsf@localhost> In-Reply-To: <87sfiu10fd.fsf@localhost> From: =?UTF-8?Q?Andr=C3=A1s_Simonyi?= Date: Sun, 11 Dec 2022 20:00:32 +0100 Message-ID: Subject: Re: [PATCH] oc-csl: Improve LaTeX bibliography formatting To: Ihor Radchenko Cc: emacs-orgmode list Content-Type: multipart/mixed; boundary="000000000000f5d08d05ef920009" Received-SPF: pass client-ip=2607:f8b0:4864:20::929; envelope-from=andras.simonyi@gmail.com; helo=mail-ua1-x929.google.com 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, FREEMAIL_FROM=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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670785308; 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=htHmLiM/GA9F5uFHTkRMiFpaYiUaHQdW2WAO8Se8poU=; b=VNf7q1fdrYKTyGoIYDJN9jVbKvTYWZ6HGJEOGJjFu3Qo3JMhvhV9SY4fgOKxR+r/2HhYAT Z+LcP21Gkpjs8H4ZYTSwgalk4uy15xHj6Ljevq3oEbcndo5LBy0EmKb/XuQQNo32U9QonA ZepaErHogriESsSfqCyLgGfRTFvO3kPIUcm/PAVzGJ8HrvH6D2es6je6Ein0QKs7bim4Yy 3JCkcysYhkS/6kEd7/xf9EZyLPeH7PIA2fy3fGRWJvuyRyfQSZ0LZ5E1zWGPmXcwBB2WJh cUHN/yb2Vui/1VPfY5CS5rUijnO3hiuooWowOI/y2/bz/Gg9Grgx+N7nTnZo7g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=LoqeLvtD; 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"; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670785308; a=rsa-sha256; cv=none; b=oIvCPEju9isYBXGWWijUGKsocHwV/IjNW8PCL7fMaZGT3qmIyBChVgzQwf8k7ggz3iml4K 02KboSicHuwMx7QH/KXnLRg71m3feB0IvhDARsfW6GRNC9xCcP5UAFDE8tk8K0bewBZnWN swWdpjjsQ+iRbrZr4Tr3XGiz7xQo3q8GqTSXNRF2G6UuskkAI6cIwv5rh9KD0WfhuzPHsI rjl6vKRzWQglxrHlW/1QPPG0PKNlsr15OgdRiFrVC4X52yt5gR+Z0/RGm2mIjPokYQGBzh KcSTLAdBVAYs8Pl6N/Z8SJYfOkzRljw8aOth7tu8j5USLTyg0uHZ5op5iaLuJg== X-Migadu-Spam-Score: -4.69 X-Spam-Score: -4.69 X-Migadu-Queue-Id: E2A5A3552F X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=LoqeLvtD; 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"; dmarc=pass (policy=none) header.from=gmail.com X-TUID: SoQ1gwu/yIK1 --000000000000f5d08d05ef920009 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Dear All, first of all, apologies for the delay, unfortunately, I haven't been able to work on my WIP patches for a while. Now I've attached a new version of the patch, which hopefully addresses all issues discussed earlier. best wishes, Andr=C3=A1s On Tue, 8 Nov 2022 at 06:26, Ihor Radchenko wrote: > > Andr=C3=A1s Simonyi writes: > > >> Also, it would be nice to describe CSL usage and tweaks in the manual. > > > > Time permitting I may try to add something, but wouldn't it be a > > problem if the CSL export processor was discussed in much more detail > > than the others? > > I was also thinking about providing a list of available citation > > substyles but I do not want to make the manual very unbalanced. > > Maybe not in the release, but otherwise we need to finish the citation > section of the manual one way or another. May as well start from CSL > part. > > >> I have two comments here: > >> 1. Where are all these new commands coming from? They are not used > >> directly in the code. Are you tweaking citeproc.el output this way?= May > >> it be better to use customizations provided by citeproc.el itself? > > > > Yes, the citeproc org-latex formatter, which I added specifically for > > Org, uses these commands in the LaTeX code produced for the > > bibliography. As citeproc doesn't have customizable variables by > > design (if I recall correctly, the only exception is 2 hooks), and > > oc-csl already had some variables concerned with very similar > > formatting settings (org-cite-csl-latex-hanging-indent, > > org-cite-csl-html-hanging-indent, > > org-cite-csl-html-label-width-per-char) I think it is more consistent > > to have the new ones also in Org. > > Thanks for the clarification. I'd prefer to see a similar explanation > and the details about what the LaTeX variables/commands do in the > docstring. > > >> 2. You are declaring this variable as defcustom, but it is not clear > >> what is going to happen if the user changes it. It is not how to > >> change this template in meaningful ways either. > > > > Right, I can try to detail a bit in the docstring what type of > > commands and environments have to be provided by the preamble (are > > expected by citeproc). I tried to follow Timothy's handling of the > > ox-latex engraved preamble, but a simpler alternative would be to > > treat it simply as a constant template, at least for the time being -- > > WDYT? > > Note that `org-latex-engraved-preamble' explains which packages need to > be loaded and which commands need to be defined in the preamble. This at > least make it more clear what the users may change and not break the > export. > > I see not problem keeping this a defcustom, but we definitely need to > explain the default value and what is required to be in there. At least, > to make the code readable for future contributors. > > -- > Ihor Radchenko // yantar92, > Org mode contributor, > Learn more about Org mode at . > Support Org development at , > or support my work at --000000000000f5d08d05ef920009 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-oc-csl-Improve-LaTeX-bibliography-formatting.patch" Content-Disposition: attachment; filename="0001-oc-csl-Improve-LaTeX-bibliography-formatting.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lbjq7xzn0 RnJvbSA3ZjAyODgxZmYxZWY5YzNkZDNlY2EwY2Q2M2E5MTkzNmRjYjkwYTQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/QW5kcj1DMz1BMXM9MjBTaW1vbnlpPz0gPGFu ZHJhcy5zaW1vbnlpQGdtYWlsLmNvbT4KRGF0ZTogU3VuLCAxMSBEZWMgMjAyMiAxODowMzozOSAr MDEwMApTdWJqZWN0OiBbUEFUQ0hdIG9jLWNzbDogSW1wcm92ZSBMYVRlWCBiaWJsaW9ncmFwaHkg Zm9ybWF0dGluZwoKKiBsaXNwL29jLWNzbC5lbCAob3JnLWNpdGUtY3NsLS1vdXRwdXQtZm9ybWF0 KTogVXNlIHRoZSBkZWRpY2F0ZWQKJ29yZy1sYXRleCcgY2l0ZXByb2MgZm9ybWF0dGVyIHRvIGV4 cG9ydCByZWZlcmVuY2VzIGluIExhVGVYLgoob3JnLWNpdGUtY3NsLWxhdGV4LXByZWFtYmxlLCBv cmctY2l0ZS1jc2wtLWdlbmVyYXRlLWxhdGV4LXByZWFtYmxlLApvcmctY2l0ZS1jc2wtZmluYWxp emVyKTogSW5zZXJ0IGEgcHJlYW1ibGUgZnJhZ21lbnQgY29tcGF0aWJsZSB3aXRoCnRoZSAnb3Jn LWxhdGV4JyBjaXRlcHJvYyBmb3JtYXR0ZXIuCihvcmctY2l0ZS1jc2wtbGF0ZXgtbGFiZWwtc2Vw YXJhdG9yLApvcmctY2l0ZS1jc2wtbGF0ZXgtbGFiZWwtd2lkdGgtcGVyLWNoYXIpOiBJbnRyb2R1 Y2UgYWRkaXRpb25hbAp2YXJpYWJsZXMgdG8gY29udHJvbCBiaWJsaW9ncmFwaHkgZm9ybWF0dGlu Zy4KCiogZXRjL09SRy1ORVdTOiBEZXNjcmliZSB0aGUgaW50cm9kdWNlZCBuZXcgb3B0aW9ucy4K LS0tCiBldGMvT1JHLU5FV1MgICB8ICAxMSArKysrKwogbGlzcC9vYy1jc2wuZWwgfCAxMjYgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAxMjAgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZXRjL09SRy1ORVdTIGIvZXRjL09SRy1ORVdTCmluZGV4IDVkNWU3MjZlMC4uNjQ0MWNkYzFmIDEw MDY0NAotLS0gYS9ldGMvT1JHLU5FV1MKKysrIGIvZXRjL09SRy1ORVdTCkBAIC0xMiw2ICsxMiwx NyBAQCBTZWUgdGhlIGVuZCBvZiB0aGUgZmlsZSBmb3IgbGljZW5zZSBjb25kaXRpb25zLgogUGxl YXNlIHNlbmQgT3JnIGJ1ZyByZXBvcnRzIHRvIG1haWx0bzplbWFjcy1vcmdtb2RlQGdudS5vcmcu CiAKICogVmVyc2lvbiA5LjcgKG5vdCByZWxlYXNlZCB5ZXQpCisKKyoqIE5ldyBvcHRpb25zCisq KiogTmV3IGN1c3RvbSBzZXR0aW5ncyBmb3IgdGhlICJjc2wiIGNpdGF0aW9uIGV4cG9ydCBwcm9j ZXNzb3IncyBMYVRlWCBvdXRwdXQKKworVGhlIHNldHRpbmdzIH5vcmctY2l0ZS1jc2wtbGF0ZXgt bGFiZWwtc2VwYXJhdG9yfiBhbmQKK35vcmctY2l0ZS1jc2wtbGF0ZXgtbGFiZWwtd2lkdGgtcGVy LWNoYXJ+IGFsbG93IHRoZSB1c2VyIHRvIGNvbnRyb2wKK3RoZSBob3Jpem9udGFsIHBvc2l0aW9u aW5nIG9mIGVudHJ5IGxhYmVscyBmb3IgbGFiZWxlZCBiaWJsaW9ncmFwaHkKK3N0eWxlcywgYW5k IHRoZSBzZXR0aW5nIH5vcmctY2l0ZS1jc2wtbGF0ZXgtcHJlYW1ibGV+IG1ha2VzIGl0Citwb3Nz aWJsZSB0byBjdXN0b21pemUgdGhlIGVudGlyZSBmcmFnbWVudCB0aGF0IGlzIGluamVjdGVkIGlu dG8gdGhlCitwcmVhbWJsZSB3aGVuIHRoZSAiY3NsIiBjaXRhdGlvbiBwcm9jZXNzb3IgaXMgdXNl ZCBmb3IgTGFUZVggZXhwb3J0LgorCiAqIFZlcnNpb24gOS42CiAKICoqIEltcG9ydGFudCBhbm5v dW5jZW1lbnRzIGFuZCBicmVha2luZyBjaGFuZ2VzCmRpZmYgLS1naXQgYS9saXNwL29jLWNzbC5l bCBiL2xpc3Avb2MtY3NsLmVsCmluZGV4IDFjY2I3NGU5Mi4uZTNmNTc5MThjIDEwMDY0NAotLS0g YS9saXNwL29jLWNzbC5lbAorKysgYi9saXNwL29jLWNzbC5lbApAQCAtMjE0LDYgKzIxNCw5MiBA QCBVc2VkIG9ubHkgd2hlbiBgc2Vjb25kLWZpZWxkLWFsaWduJyBpcyBhY3RpdmF0ZWQgYnkgdGhl IHVzZWQgQ1NMIHN0eWxlLiIKICAgOnR5cGUgJ3N0cmluZwogICA6c2FmZSAjJ3N0cmluZ3ApCiAK KyhkZWZjdXN0b20gb3JnLWNpdGUtY3NsLWxhdGV4LWxhYmVsLXNlcGFyYXRvciAiMC42ZW0iCisg ICJEaXN0YW5jZSBiZXR3ZWVuIGNpdGF0aW9uIGxhYmVsIGFuZCBiaWJsaW9ncmFwaHkgaXRlbSBm b3IgTGFUZVgKK291dHB1dCBpbiB2YWxpZCBMYVRlWCB1bml0cy4gIFVzZWQgb25seSB3aGVuIGBz ZWNvbmQtZmllbGQtYWxpZ24nCitpcyBhY3RpdmF0ZWQgYnkgdGhlIHVzZWQgQ1NMIHN0eWxlLiIK KyAgOmdyb3VwICdvcmctY2l0ZQorICA6cGFja2FnZS12ZXJzaW9uICcoT3JnIC4gIjkuNyIpCisg IDp0eXBlICdzdHJpbmcKKyAgOnNhZmUgIydzdHJpbmdwKQorCisoZGVmY3VzdG9tIG9yZy1jaXRl LWNzbC1sYXRleC1sYWJlbC13aWR0aC1wZXItY2hhciAiMC40NWVtIgorICAiQ2hhcmFjdGVyIHdp ZHRoIGluIExhVGVYIHVuaXRzIGZvciBjYWxjdWxhdGluZyBlbnRyeSBsYWJlbCB3aWR0aHMuCitV c2VkIG9ubHkgd2hlbiBgc2Vjb25kLWZpZWxkLWFsaWduJyBpcyBhY3RpdmF0ZWQgYnkgdGhlIHVz ZWQgQ1NMCitzdHlsZS4iCisgIDpncm91cCAnb3JnLWNpdGUKKyAgOnBhY2thZ2UtdmVyc2lvbiAn KE9yZyAuICI5LjciKQorICA6dHlwZSAnc3RyaW5nCisgIDpzYWZlICMnc3RyaW5ncCkKKworOzsg VGhlIGZvbGxvd2luZyB3YXMgaW5zcGlyZWQgYnkgYW5kIGluIG1hbnkgZGV0YWlscyBmb2xsb3dz IGhvdworOzsgUGFuZG9jJ3MgKDxodHRwczovL2dpdGh1Yi5jb20vamdtL3BhbmRvYz4pIGRlZmF1 bHQgTGFUZVggdGVtcGxhdGUKKzs7IGhhbmRsZXMgQ1NMIG91dHB1dC4gIE1hbnkgdGhhbmtzIHRv IHRoZSBhdXRob3IsIEpvaG4gTWFjRmFybGFuZSEKKyhkZWZjdXN0b20gb3JnLWNpdGUtY3NsLWxh dGV4LXByZWFtYmxlCisgICJcXHVzZXBhY2thZ2V7Y2FsY30KK1xcbmV3bGVuZ3Roe1xcY3NsaGFu Z2luZGVudH0KK1xcc2V0bGVuZ3Roe1xcY3NsaGFuZ2luZGVudH17W0NTTC1IQU5HSU5ERU5UXX0K K1xcbmV3bGVuZ3Roe1xcY3NsbGFiZWxzZXB9CitcXHNldGxlbmd0aHtcXGNzbGxhYmVsc2VwfXtb Q1NMLUxBQkVMU0VQXX0KK1xcbmV3bGVuZ3Roe1xcY3NsbGFiZWx3aWR0aH0KK1xcc2V0bGVuZ3Ro e1xcY3NsbGFiZWx3aWR0aH17W0NTTC1MQUJFTFdJRFRILVBFUi1DSEFSXSAqIFtDU0wtTUFYTEFC RUwtQ0hBUlNdfQorXFxuZXdlbnZpcm9ubWVudHtjc2xiaWJsaW9ncmFwaHl9WzJdICUgMXN0IGFy Zy4gaXMgaGFuZ2luZy1pbmRlbnQsIDJuZCBlbnRyeSBzcGFjaW5nLgorIHslIEJ5IGRlZmF1bHQs IHBhcmFncmFwaHMgYXJlIG5vdCBpbmRlbnRlZC4KKyAgXFxzZXRsZW5ndGh7XFxwYXJpbmRlbnR9 ezBwdH0KKyAgJSBIYW5naW5nIGluZGVudCBpcyB0dXJuZWQgb24gd2hlbiBmaXJzdCBhcmd1bWVu dCBpcyAxLgorICBcXGlmb2RkICMxCisgIFxcbGV0XFxvbGRwYXJcXHBhcgorICBcXGRlZlxccGFy e1xcaGFuZ2luZGVudD1cXGNzbGhhbmdpbmRlbnRcXG9sZHBhcn0KKyAgXFxmaQorICAlIFNldCBl bnRyeSBzcGFjaW5nIGJhc2VkIG9uIHRoZSBzZWNvbmQgYXJndW1lbnQuCisgIFxcc2V0bGVuZ3Ro e1xccGFyc2tpcH17XFxwYXJza2lwICsgICMyXFxiYXNlbGluZXNraXB9CisgfSUKKyB7fQorXFxu ZXdjb21tYW5ke1xcY3NsYmxvY2t9WzFdeyMxXFxoZmlsbFxcYnJlYWt9CitcXG5ld2NvbW1hbmR7 XFxjc2xsZWZ0bWFyZ2lufVsxXXtcXHBhcmJveFt0XXtcXGNzbGxhYmVsc2VwICsgXFxjc2xsYWJl bHdpZHRofXsjMX19CitcXG5ld2NvbW1hbmR7XFxjc2xyaWdodGlubGluZX1bMV0KKyAge1xccGFy Ym94W3Rde1xcbGluZXdpZHRoIC0gXFxjc2xsYWJlbHNlcCAtIFxcY3NsbGFiZWx3aWR0aH17IzF9 XFxicmVha30KK1xcbmV3Y29tbWFuZHtcXGNzbGluZGVudH1bMV17XFxoc3BhY2V7XFxjc2xoYW5n aW5kZW50fSMxfQorXFxuZXdjb21tYW5ke1xcY3NsYmliaXRlbX1bMl0KKyAge1xcbGVhdmV2bW9k ZVxcdmFkanVzdCBwcmV7XFxoeXBlcnRhcmdldHtjaXRlcHJvY19iaWJfaXRlbV8jMX17fX0jMn0K K1xcbWFrZWF0bGV0dGVyCitcXG5ld2NvbW1hbmR7XFxjc2xjaXRhdGlvbn1bMl0KKyB7XFxwcm90 ZWN0XFxoeXBlckBsaW5rc3RhcnR7Y2l0ZX17Y2l0ZXByb2NfYmliX2l0ZW1fIzF9IzJcXGh5cGVy QGxpbmtlbmR9CitcXG1ha2VhdG90aGVyIgorICAiTGFUZVggcHJlYW1ibGUgY29udGVudCBpbnNl cnRlZCBieSB0aGUgYGNzbCcgY2l0YXRpb24gcHJvY2Vzc29yLgorCitUaGlzIHByZWFtYmxlIGNh biBiZSBhbnl0aGluZyBhcyBsb25nIGFzIGl0IHByb3ZpZGVzIGRlZmluaXRpb25zCitmb3IgdGhl IGVudmlyb25tZW50IGFuZCBjb21tYW5kcyB0aGF0IENpdGVwcm9jJ3MgYG9yZy1sYXRleCcKK2Zv cm1hdHRlciB1c2VzIGZvciBmb3JtYXR0aW5nIGNpdGF0aW9ucyBhbmQgYmlibGlvZ3JhcGhpZXMu ICBJbgorcGFydGljdWxhciwgaXQgaGFzIHRvIGRlZmluZQorLSB0aGUgY29tbWFuZHMgXFxjc2xi bG9ja3s8dGV4dD59LCBcXGNzbGxlZnRtYXJnaW57PHRleHQ+fSwKKyAgXFxjc2xyaWdodGlubGlu ZXs8dGV4dD59IGFuZCBcXGNzbGluZGVudHs8dGV4dD59IGZvciBmb3JtYXR0aW5nCisgIHRleHQg dGhhdCBoYXZlLCByZXNwZWN0aXZlbHksIHRoZSBDU0wgZGlzcGxheSBhdHRyaWJ1dGVzCisgIGBi bG9jaycsIGBsZWZ0LW1hcmdpbicsIGByaWdodC1pbmxpbmUnIGFuZCBgaW5kZW50JzsKKy0gdGhl IGNvbW1hbmRzIFxcY3NsY2l0YXRpb257PGl0ZW1fbm8+fXs8aXRlbV90ZXh0Pn0gYW5kCisgIFxc Y3NsYmliaXRlbXs8aXRlbV9ubz59ezxpdGVtX3RleHQ+fSwgd2hpY2ggYXJlIHVzZWQgdG8KKyAg Zm9ybWF0IGluZGl2aWR1YWwgY2l0YXRpb25zIGFuZCBiaWJsaW9ncmFwaHkgaXRlbXMsIGluY2x1 ZGluZworICBoeXBlcmxpbmtpbmcgY2l0YXRpb25zIHRvIHRoZSBjb3JyZXNwb25kaW5nIGJpYmxp b2dyYXBoeSBlbnRyeQorICB1c2luZyB0aGVpciBudW1lcmljYWwgaWQsIHdoaWNoIGlzIHBhc3Nl ZCBhcyB0aGUgZmlyc3QsCisgIDxpdGVtX25vPiBhcmd1bWVudDsKKy0gYW5kIHRoZSBlbnZpcm9u bWVudCBcXGNzbGJpYmxpb2dyYXBoeXs8aGFuZ2luZy1pbmRlbnQ+fXs8ZW50cnktc3BhY2luZz59 LAorICBpbiB3aGljaCBiaWJsaW9ncmFwaGllcyBhcmUgd3JhcHBlZDsgdGhlIHZhbHVlIG9mIHRo ZQorICA8aGFuZ2luZy1pbmRlbnQ+IGFyZ3VtZW50IGlzIDEgaWYgaGFuZ2luZyBpbmRlbnQgc2hv dWxkIGJlCisgIGFwcGxpZWQgYW5kIDAgaWYgbm90LCB3aGlsZSB0aGUgPGVudHJ5LXNwYWNpbmc+ IGFyZ3VtZW50IGlzIGFuCisgIGludGVnZXIgc3BlY2lmeWluZyB0aGUgbnVtYmVyIG9mIGV4dHJh IGxpbmUtaGVpZ2h0cworICByZXF1aXJlZCBiZXR3ZWVuIGJpYmxpb2dyYXBoeSBlbnRyaWVzIGlu IGFkZGl0aW9uIHRvIG5vcm1hbAorICBsaW5lIHNwYWNpbmcuCisKK1doZW4gcHJlc2VudCwgdGhl IHBsYWNlaG9sZGVycyBbQ1NMLUhBTkdJTkRFTlRdLCBbQ1NMLUxBQkVMU0VQXSwKK1tDU0wtTEFC RUxXSURUSC1QRVItQ0hBUl0gYW5kIFtDU0wtTUFYTEFCRUwtQ0hBUlNdIGFyZSByZXBsYWNlZCwK K3Jlc3BlY3RpdmVseSwgYnkgdGhlIGNvbnRlbnRzIG9mIHRoZSBjdXN0b21pemFibGUgdmFyaWFi bGVzCitgb3JnLWNpdGUtY3NsLWxhdGV4LWhhbmdpbmctaW5kZW50JywgYG9yZy1jaXRlLWNzbC1s YXRleC1sYWJlbC1zZXBhcmF0b3InLAorYG9yZy1jaXRlLWNzbC1sYXRleC1sYWJlbC13aWR0aC1w ZXItY2hhcicsIGFuZCB0aGUgbWF4aW1hbCBsYWJlbCBsZW5ndGgKK2luIHRoZSBiaWJsaW9ncmFw aHkgbWVhc3VyZWQgaW4gY2hhcmFjdGVycy4iCisgIDpncm91cCAnb3JnLWNpdGUKKyAgOnR5cGUg J3N0cmluZworICA6cGFja2FnZS12ZXJzaW9uICcoT3JnIC4gIjkuNyIpKQorCiAMCiA7OzsgSW50 ZXJuYWwgdmFyaWFibGVzCiAoZGVmY29uc3Qgb3JnLWNpdGUtY3NsLS1ldGMtZGlyCkBAIC00MTMs NyArNDk5LDcgQEAgY29ycmVzcG9uZGluZyB0byBvbmUgb2YgdGhlIG91dHB1dCBmb3JtYXRzIHN1 cHBvcnRlZCBieSBDaXRlcHJvYzogYGh0bWwnLAogICAobGV0ICgoYmFja2VuZCAocGxpc3QtZ2V0 IGluZm8gOmJhY2stZW5kKSkpCiAgICAgKGNvbmQKICAgICAgKChvcmctZXhwb3J0LWRlcml2ZWQt YmFja2VuZC1wIGJhY2tlbmQgJ2h0bWwpICdodG1sKQotICAgICAoKG9yZy1leHBvcnQtZGVyaXZl ZC1iYWNrZW5kLXAgYmFja2VuZCAnbGF0ZXgpICdsYXRleCkKKyAgICAgKChvcmctZXhwb3J0LWRl cml2ZWQtYmFja2VuZC1wIGJhY2tlbmQgJ2xhdGV4KSAnb3JnLWxhdGV4KQogICAgICAodCAnb3Jn KSkpKQogCiAoZGVmdW4gb3JnLWNpdGUtY3NsLS1zdHlsZS1maWxlIChpbmZvKQpAQCAtNjcwLDYg Kzc1NiwyMSBAQCB2YWx1ZSBpcyB0aGUgYmlibGlvZ3JhcGh5IGFzIHJlbmRlcmVkIGJ5IENpdGVw cm9jLiIKICAgICAgICAgICAgIChwbGlzdC1wdXQgaW5mbyA6Y2l0ZS1jaXRlcHJvYy1yZW5kZXJl ZC1iaWJsaW9ncmFwaGllcyByZXN1bHQpCiAgICAgICAgICAgICByZXN1bHQpKSkpKQogCisoZGVm dW4gb3JnLWNpdGUtY3NsLS1nZW5lcmF0ZS1sYXRleC1wcmVhbWJsZSAoaW5mbykKKyAgIkdlbmVy YXRlIHRoZSBDU0wtcmVsYXRlZCBwYXJ0IG9mIHRoZSBMYVRlWCBwcmVhbWJsZS4KK0lORk8gaXMg dGhlIGV4cG9ydCBzdGF0ZSwgYXMgYSBwcm9wZXJ0eSBsaXN0LiIKKyAgKGxldCogKChwYXJhbWV0 ZXJzIChjYWRyIChvcmctY2l0ZS1jc2wtLXJlbmRlcmVkLWJpYmxpb2dyYXBoaWVzIGluZm8pKSkK KyAgICAgICAgIChtYXgtb2Zmc2V0IChjZHIgKGFzc3EgJ21heC1vZmZzZXQgcGFyYW1ldGVycykp KQorICAgICAgICAgKHJlc3VsdCBvcmctY2l0ZS1jc2wtbGF0ZXgtcHJlYW1ibGUpKQorICAgICht YXAtZG8gKGxhbWJkYSAocGxhY2Vob2xkZXIgcmVwbGFjZW1lbnQpCisgICAgICAgICAgICAgICh3 aGVuIChzdHJpbmctbWF0Y2ggcGxhY2Vob2xkZXIgcmVzdWx0KQorICAgICAgICAgICAgICAgIChz ZXRxIHJlc3VsdCAocmVwbGFjZS1tYXRjaCByZXBsYWNlbWVudCB0IHQgcmVzdWx0KSkpKQorICAg ICAgICAgICAgYCgiXFxbQ1NMLUhBTkdJTkRFTlRcXF0iICxvcmctY2l0ZS1jc2wtbGF0ZXgtaGFu Z2luZy1pbmRlbnQKKyAgICAgICAgICAgICAgIlxcW0NTTC1MQUJFTFNFUFxcXSIgLG9yZy1jaXRl LWNzbC1sYXRleC1sYWJlbC1zZXBhcmF0b3IKKyAgICAgICAgICAgICAgIlxcW0NTTC1MQUJFTFdJ RFRILVBFUi1DSEFSXFxdIiAsb3JnLWNpdGUtY3NsLWxhdGV4LWxhYmVsLXdpZHRoLXBlci1jaGFy CisgICAgICAgICAgICAgICJcXFtDU0wtTUFYTEFCRUwtQ0hBUlNcXF0iICwobnVtYmVyLXRvLXN0 cmluZyBtYXgtb2Zmc2V0KSkpCisgICAgcmVzdWx0KSkKKwogDAogOzs7IEV4cG9ydCBjYXBhYmls aXR5CiAoZGVmdW4gb3JnLWNpdGUtY3NsLXJlbmRlci1jaXRhdGlvbiAoY2l0YXRpb24gX3N0eWxl IF9iYWNrZW5kIGluZm8pCkBAIC02ODgsOCArNzg5LDggQEAgSU5GTyBpcyB0aGUgZXhwb3J0IHN0 YXRlLCBhcyBhIHByb3BlcnR5IGxpc3QuIgogSU5GTyBpcyB0aGUgZXhwb3J0IHN0YXRlLCBhcyBh IHByb3BlcnR5IGxpc3QuIgogICAob3JnLWNpdGUtY3NsLS1iYXJmLXdpdGhvdXQtY2l0ZXByb2Mp CiAgIChwY2FzZS1sZXQqICAoKGZvcm1hdCAob3JnLWNpdGUtY3NsLS1vdXRwdXQtZm9ybWF0IGlu Zm8pKQotCQkoYCgsb3V0cHV0cyAscGFyYW1ldGVycykgKG9yZy1jaXRlLWNzbC0tcmVuZGVyZWQt YmlibGlvZ3JhcGhpZXMgaW5mbykpCi0JCShvdXRwdXQgKGNkciAoYXNzb2MgcHJvcHMgb3V0cHV0 cykpKSkKKyAgICAgICAgICAgICAgICAoYCgsb3V0cHV0cyAscGFyYW1ldGVycykgKG9yZy1jaXRl LWNzbC0tcmVuZGVyZWQtYmlibGlvZ3JhcGhpZXMgaW5mbykpCisgICAgICAgICAgICAgICAgKG91 dHB1dCAoY2RyIChhc3NvYyBwcm9wcyBvdXRwdXRzKSkpKQogICAgIChwY2FzZSBmb3JtYXQKICAg ICAgICgnaHRtbAogICAgICAgIChjb25jYXQKQEAgLTcxNCwxMiArODE1LDcgQEAgSU5GTyBpcyB0 aGUgZXhwb3J0IHN0YXRlLCBhcyBhIHByb3BlcnR5IGxpc3QuIgogICAgICAgICAgICAgICBvcmct Y2l0ZS1jc2wtaHRtbC1oYW5naW5nLWluZGVudAogICAgICAgICAgICAgICBvcmctY2l0ZS1jc2wt aHRtbC1oYW5naW5nLWluZGVudCkpCiAgICAgICAgIG91dHB1dCkpCi0gICAgICAoJ2xhdGV4Ci0g ICAgICAgKGlmIChjZHIgKGFzc3EgJ2hhbmdpbmctaW5kZW50IHBhcmFtZXRlcnMpKQotICAgICAg ICAgICAoZm9ybWF0ICJcXGJlZ2lue2hhbmdwYXJhc317JXN9ezF9XG4lc1xuXFxlbmR7aGFuZ3Bh cmFzfSIKLSAgICAgICAgICAgICAgICAgICBvcmctY2l0ZS1jc2wtbGF0ZXgtaGFuZ2luZy1pbmRl bnQKLSAgICAgICAgICAgICAgICAgICBvdXRwdXQpCi0gICAgICAgICBvdXRwdXQpKQorICAgICAg KCdvcmctbGF0ZXggb3V0cHV0KQogICAgICAgKF8KICAgICAgICA7OyBQYXJzZSBPcmcgb3V0cHV0 IHRvIHJlLWV4cG9ydCBpdCBkdXJpbmcgdGhlIHJlZ3VsYXIgZXhwb3J0CiAgICAgICAgOzsgcHJv Y2Vzcy4KQEAgLTczMCwxOCArODI2LDE0IEBAIElORk8gaXMgdGhlIGV4cG9ydCBzdGF0ZSwgYXMg YSBwcm9wZXJ0eSBsaXN0LiIKIE9VVFBVVCBpcyB0aGUgZXhwb3J0IGRvY3VtZW50LCBhcyBhIHN0 cmluZy4gIElORk8gaXMgdGhlIGV4cG9ydCBzdGF0ZSwgYXMgYQogcHJvcGVydHkgbGlzdC4iCiAg IChvcmctY2l0ZS1jc2wtLWJhcmYtd2l0aG91dC1jaXRlcHJvYykKLSAgKGlmIChub3QgKGVxICds YXRleCAob3JnLWNpdGUtY3NsLS1vdXRwdXQtZm9ybWF0IGluZm8pKSkKKyAgKGlmIChub3QgKGVx ICdvcmctbGF0ZXggKG9yZy1jaXRlLWNzbC0tb3V0cHV0LWZvcm1hdCBpbmZvKSkpCiAgICAgICBv dXRwdXQKICAgICAod2l0aC10ZW1wLWJ1ZmZlcgogICAgICAgKHNhdmUtZXhjdXJzaW9uIChpbnNl cnQgb3V0cHV0KSkKICAgICAgICh3aGVuIChzZWFyY2gtZm9yd2FyZCAiXFxiZWdpbntkb2N1bWVu dH0iIG5pbCB0KQotICAgICAgICAoZ290by1jaGFyIChtYXRjaC1iZWdpbm5pbmcgMCkpCi0gICAg ICAgIDs7IEVuc3VyZSB0aGF0IFxjaXRlcHJvY2l0ZW0gaXMgZGVmaW5lZCBmb3IgY2l0ZXByb2Mt ZWwuCi0gICAgICAgIChpbnNlcnQgIlxcbWFrZWF0bGV0dGVyXG5cXG5ld2NvbW1hbmR7XFxjaXRl cHJvY2l0ZW19WzJde1xcaHlwZXJAbGlua3N0YXJ0e2NpdGV9e2NpdGVwcm9jX2JpYl9pdGVtXyMx fSMyXFxoeXBlckBsaW5rZW5kfVxuXFxtYWtlYXRvdGhlclxuXG4iKQotICAgICAgICA7OyBFbnN1 cmUgdGhlcmUgaXMgYSBcdXNlcGFja2FnZXtoYW5naW5nfSBzb21ld2hlcmUgb3IgYWRkIG9uZS4K LSAgICAgICAgKGxldCAoKHJlIChyeCAiXFx1c2VwYWNrYWdlIiAob3B0ICJbIiAoKj8gbm9ubCkg Il0iKSAie2hhbmdpbmd9IikpKQotICAgICAgICAgICh1bmxlc3MgKHJlLXNlYXJjaC1iYWNrd2Fy ZCByZSBuaWwgdCkKLSAgICAgICAgICAgIChpbnNlcnQgIlxcdXNlcGFja2FnZVtub3RxdW90ZV17 aGFuZ2luZ31cbiIpKSkpCisJKGdvdG8tY2hhciAobWF0Y2gtYmVnaW5uaW5nIDApKQorCTs7IElu c2VydCB0aGUgQ1NMLXNwZWNpZmljIHBhcnRzIG9mIHRoZSBMYVRlWCBwcmVhbWJsZS4KKwkoaW5z ZXJ0IChvcmctY2l0ZS1jc2wtLWdlbmVyYXRlLWxhdGV4LXByZWFtYmxlIGluZm8pKSkKICAgICAg IChidWZmZXItc3RyaW5nKSkpKQogCiAMCi0tIAoyLjI1LjEKCg== --000000000000f5d08d05ef920009--