From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lungang Fang Subject: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Thu, 8 Dec 2016 16:26:01 +1100 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1143c4d48d3b3305431edf5a Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cErEZ-0002bS-UY for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 00:27:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cErEV-0001kJ-27 for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 00:27:07 -0500 Received: from mail-qt0-f182.google.com ([209.85.216.182]:35887) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cErEU-0001k3-Sg for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 00:27:02 -0500 Received: by mail-qt0-f182.google.com with SMTP id w33so402266882qtc.3 for ; Wed, 07 Dec 2016 21:27:02 -0800 (PST) In-Reply-To: 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: emacs-orgmode@gnu.org --001a1143c4d48d3b3305431edf5a Content-Type: multipart/alternative; boundary=001a1143c4d48d3b2f05431edf58 --001a1143c4d48d3b2f05431edf58 Content-Type: text/plain; charset=UTF-8 Resend since the previous one seems lost. Hi there, Attached is a patch for contrib/lisp/ox-confluence.el generated following instructions on http://orgmode.org/worg/org-contribute.html#patches . It adds support for ordered list. I didn't find where I should send this patch. Hopefully, this is the correct email list for patch request. If it is not, could anyone please tell me the correct way to submit a patch request to org-mode? Regards, -- Lungang Fang -- Lungang Fang Sydney, NSW 2153, Australia M: +61 431 208 979 | E: lungang.fang@gmail.com --001a1143c4d48d3b2f05431edf58 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Resend since the previous one seems lost.


Hi there,

Attache= d is a patch for=C2=A0contrib/lisp/ox-confluence.el generated followin= g instructions on=C2=A0http://orgmode.org/worg/org-contribute.h= tml#patches=C2=A0.=C2=A0It adds support for ordered list.

I didn't find where I should send this patch. Hopefull= y, this is the correct email list for patch request. If it is not, could an= yone please tell me the correct way to submit a patch request to org-mode?<= /div>

Regards,
--
Lungang Fang




--
Lu= ngang Fang
Sydney, NSW 2153, Australia
M: +61 431 208 979 |=C2=A0E:=C2=A0lungang.fang@gmail.com
--001a1143c4d48d3b2f05431edf58-- --001a1143c4d48d3b3305431edf5a Content-Type: application/octet-stream; name="0001-ox-confluence.el-Add-support-for-ordered-list.patch" Content-Disposition: attachment; filename="0001-ox-confluence.el-Add-support-for-ordered-list.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iwekaz830 RnJvbSAxY2VmMGNkYThmOTc1ZWRhM2FkYzRjNDY2MTRhYWQyMDk3YmEyYmFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdW5nYW5nIEZhbmcgPGx1bmdhbmcuZmFuZ0BnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNyBEZWMgMjAxNiAxNzoyNjowNCArMTEwMApTdWJqZWN0OiBbUEFUQ0hdIG94 LWNvbmZsdWVuY2UuZWw6IEFkZCBzdXBwb3J0IGZvciBvcmRlcmVkIGxpc3QKCiogY29udHJpYi9s aXNwL294LWNvbmZsdWVuY2UuZWwgKG9yZy1jb25mbHVlbmNlLWl0ZW0pOiBTdXBwb3J0IG9yZGVy ZWQKbGlzdAoKV2hlbiBjb252ZXJ0aW5nIGEgYnVsbGV0IGl0ZW0sIGV4YW1pbmUgdGhlIHR5cGUg b2YgaXQgYW5kIGNvbnZlcnQKYWNjb3JkaW5nbHkuCgpUSU5ZQ0hBTkdFCi0tLQogY29udHJpYi9s aXNwL294LWNvbmZsdWVuY2UuZWwgfCA5ICsrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5z ZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9jb250cmliL2xpc3Avb3gt Y29uZmx1ZW5jZS5lbCBiL2NvbnRyaWIvbGlzcC9veC1jb25mbHVlbmNlLmVsCmluZGV4IDVkZTll MGYuLmRlOGIwMGUgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvbGlzcC9veC1jb25mbHVlbmNlLmVsCisr KyBiL2NvbnRyaWIvbGlzcC9veC1jb25mbHVlbmNlLmVsCkBAIC04MSw5ICs4MSwxMiBAQAogICAo Zm9ybWF0ICJfJXNfIiBjb250ZW50cykpCiAKIChkZWZ1biBvcmctY29uZmx1ZW5jZS1pdGVtIChp dGVtIGNvbnRlbnRzIGluZm8pCi0gIChjb25jYXQgKG1ha2Utc3RyaW5nICgxKyAob3JnLWNvbmZs dWVuY2UtLWxpLWRlcHRoIGl0ZW0pKSA/XC0pCi0gICAgICAgICAgIiAiCi0gICAgICAgICAgKG9y Zy10cmltIGNvbnRlbnRzKSkpCisgIChsZXQqICgocGxhaW4tbGlzdCAob3JnLWV4cG9ydC1nZXQt cGFyZW50IGl0ZW0pKQorICAgICAgICAgKHR5cGUgKG9yZy1lbGVtZW50LXByb3BlcnR5IDp0eXBl IHBsYWluLWxpc3QpKQorICAgICAgICAgKGJ1bGxldCAoaWYgKGVxIHR5cGUgYG9yZGVyZWQpID9c IyA/XC0pKSkKKyAgICAoY29uY2F0IChtYWtlLXN0cmluZyAoMSsgKG9yZy1jb25mbHVlbmNlLS1s aS1kZXB0aCBpdGVtKSkgYnVsbGV0KQorICAgICAgICAgICAgIiAiCisgICAgICAgICAgICAob3Jn LXRyaW0gY29udGVudHMpKSkpCiAKIChkZWZ1biBvcmctY29uZmx1ZW5jZS1maXhlZC13aWR0aCAo Zml4ZWQtd2lkdGggY29udGVudHMgaW5mbykKICAgKGZvcm1hdCAiXHtceyVzXH1cfSIgY29udGVu dHMpKQotLSAKMi45LjMgKEFwcGxlIEdpdC03NSkKCg== --001a1143c4d48d3b3305431edf5a-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Thu, 08 Dec 2016 23:49:21 +0100 Message-ID: <87pol2f34e.fsf@nicolasgoaziou.fr> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF7VC-0001Ev-5W for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 17:49:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cF7VB-00010T-BK for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 17:49:22 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:54803) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cF7VB-0000zb-4j for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 17:49:21 -0500 In-Reply-To: (Lungang Fang's message of "Thu, 8 Dec 2016 16:26:01 +1100") 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: Lungang Fang Cc: emacs-orgmode@gnu.org, Charles Durst Hello, Lungang Fang writes: > Attached is a patch for contrib/lisp/ox-confluence.el generated following > instructions on http://orgmode.org/worg/org-contribute.html#patches . It > adds support for ordered list. Thank you. However, this somewhat conflicts with a patch recently sent on the ML, but not yet applied, by Charles Durst (Cc'ed). Could one double-check if one doesn't supersede the other, or if they could be merged (although I suspect the former) and report back so I know what patch to apply? Regards, -- Nicolas Goaziou From mboxrd@z Thu Jan 1 00:00:00 1970 From: Charles Durst Subject: Re: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Thu, 8 Dec 2016 18:37:53 -0500 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> Reply-To: cwdurst+orgmode@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF8HY-0000zi-VF for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:39:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cF8HT-0000HK-4m for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:39:20 -0500 Received: from mail-vk0-f42.google.com ([209.85.213.42]:35195) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cF8HT-0000HF-0g for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:39:15 -0500 Received: by mail-vk0-f42.google.com with SMTP id w194so841534vkw.2 for ; Thu, 08 Dec 2016 15:39:14 -0800 (PST) In-Reply-To: <87pol2f34e.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: Lungang Fang , emacs-orgmode@gnu.org, Charles Durst They do conflict. My version is slightly more complicated since it also supports nested mixed lists. For example: 1. Here * is * an 2. example * of * a 3. mixed 4. list Which translates to: # Here #- is #- an # example #- of #- a # mixed # list Which is effectively the same as the example in the Confluence documentation: https://confluence.atlassian.com/confcloud/confluence-wiki-markup-724765099.html#ConfluenceWikiMarkup-Mixedlists -- Charles Durst cwdurst+orgmode@gmail.com On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou wrote: > Hello, > > Lungang Fang writes: > >> Attached is a patch for contrib/lisp/ox-confluence.el generated following >> instructions on http://orgmode.org/worg/org-contribute.html#patches . It >> adds support for ordered list. > > Thank you. > > However, this somewhat conflicts with a patch recently sent on the ML, > but not yet applied, by Charles Durst (Cc'ed). > > Could one double-check if one doesn't supersede the other, or if they > could be merged (although I suspect the former) and report back so > I know what patch to apply? > > Regards, > > -- > Nicolas Goaziou From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lungang Fang Subject: Re: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Fri, 9 Dec 2016 13:32:58 +1100 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a114016f881f29105433092a7 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFB0e-0007mt-4M for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 21:34:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFB0a-0003AH-2i for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 21:34:04 -0500 Received: from mail-qk0-f178.google.com ([209.85.220.178]:33878) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cFB0Z-0003A6-SD for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 21:34:00 -0500 Received: by mail-qk0-f178.google.com with SMTP id q130so4953189qke.1 for ; Thu, 08 Dec 2016 18:33:59 -0800 (PST) In-Reply-To: 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: cwdurst+orgmode@gmail.com Cc: emacs-orgmode@gnu.org --001a114016f881f29105433092a7 Content-Type: text/plain; charset=UTF-8 Hi Charles and Nicholas, My code also supports nested mixed lists but is simpler. I mean, my code will convert the list given by Charles to # Here -- is -- an # example -- of -- a # mixed # list Although this format is not mentioned in confluence wiki, it is supported by conflucence according to my test (in Jira). So, in my opinion, it is a matter of personal preference: more complicated code complies with documented interface, or simpler code that exploits undocumented feature. I prefer my code. But you guys feel free to make decision. I am OK with whatever you choose. Cheers, Lungang On Fri, Dec 9, 2016 at 10:37 AM, Charles Durst wrote: > They do conflict. My version is slightly more complicated since it > also supports nested mixed lists. > > For example: > > 1. Here > * is > * an > 2. example > * of > * a > 3. mixed > 4. list > > Which translates to: > > # Here > #- is > #- an > # example > #- of > #- a > # mixed > # list > > Which is effectively the same as the example in the Confluence > documentation: > https://confluence.atlassian.com/confcloud/confluence-wiki- > markup-724765099.html#ConfluenceWikiMarkup-Mixedlists > > -- > Charles Durst > cwdurst+orgmode@gmail.com > > > On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou > wrote: > > Hello, > > > > Lungang Fang writes: > > > >> Attached is a patch for contrib/lisp/ox-confluence.el generated > following > >> instructions on http://orgmode.org/worg/org-contribute.html#patches . > It > >> adds support for ordered list. > > > > Thank you. > > > > However, this somewhat conflicts with a patch recently sent on the ML, > > but not yet applied, by Charles Durst (Cc'ed). > > > > Could one double-check if one doesn't supersede the other, or if they > > could be merged (although I suspect the former) and report back so > > I know what patch to apply? > > > > Regards, > > > > -- > > Nicolas Goaziou > --001a114016f881f29105433092a7 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Charles and Nicholas,

My code also s= upports nested mixed lists but is simpler. I mean, my code will convert the= list given by Charles to

# Here
-- is
-- an
# example
-- of
-- a<= /div>
# mixed
# list

Although = this format is not mentioned in confluence wiki, it is supported by confluc= ence according to my test (in Jira).

So, in my opi= nion, it is a matter of personal preference: more complicated code complies= with documented interface, or simpler code that exploits undocumented feat= ure.

I prefer my code. But you guys feel free to m= ake decision. I am OK with whatever you choose.

Ch= eers,
Lungang

On Fri, Dec 9, 2016 at 10:37 AM, Charles Durst <cwdurst+orgmode@gmail.com> wrote:
= They do conflict.=C2=A0 My version is slightly more = complicated since it
also supports nested mixed lists.

For example:

1. Here
=C2=A0 =C2=A0* is
=C2=A0 =C2=A0* an
2. example
=C2=A0 =C2=A0* of
=C2=A0 =C2=A0* a
3. mixed
4. list

Which translates to:

# Here
#- is
#- an
# example
#- of
#- a
# mixed
# list

Which is effectively the same as the example in the Confluence documentatio= n:
https://confluence.atlassian.com/confcloud/confluence-wiki= -markup-724765099.html#ConfluenceWikiMarkup-Mixedlists
--
Charles Durst
cwdurst+orgmode@gmail= .com


On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
> Hello,
>
> Lungang Fang <lungang.fan= g@gmail.com> writes:
>
>> Attached is a patch for contrib/lisp/ox-confluence.el generated fo= llowing
>> instructions on http://orgmode.org/worg/= org-contribute.html#patches . It
>> adds support for ordered list.
>
> Thank you.
>
> However, this somewhat conflicts with a patch recently sent on the ML,=
> but not yet applied, by Charles Durst (Cc'ed).
>
> Could one double-check if one doesn't supersede the other, or if t= hey
> could be merged (although I suspect the former) and report back so
> I know what patch to apply?
>
> Regards,
>
> --
> Nicolas Goaziou

--001a114016f881f29105433092a7-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Charles Durst Subject: Re: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Thu, 8 Dec 2016 22:39:16 -0500 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> Reply-To: cwdurst+orgmode@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFC37-0006VT-1I for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 22:40:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFC33-00061h-NO for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 22:40:40 -0500 Received: from mail-qt0-f194.google.com ([209.85.216.194]:36733) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cFC33-00061c-Hk for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 22:40:37 -0500 Received: by mail-qt0-f194.google.com with SMTP id n34so663178qtb.3 for ; Thu, 08 Dec 2016 19:40:37 -0800 (PST) In-Reply-To: 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: Lungang Fang Cc: emacs-orgmode@gnu.org I have tried the results of both versions and loaded them into the Confluence Wiki, and Lungang is correct, from what I can tell, they both will work. So I don't really care which one you choose either. I just needed the functionality. -- Charles Durst cwdurst+orgmode@gmail.com On Thu, Dec 8, 2016 at 9:32 PM, Lungang Fang wrote: > Hi Charles and Nicholas, > > My code also supports nested mixed lists but is simpler. I mean, my code > will convert the list given by Charles to > > # Here > -- is > -- an > # example > -- of > -- a > # mixed > # list > > Although this format is not mentioned in confluence wiki, it is supported by > conflucence according to my test (in Jira). > > So, in my opinion, it is a matter of personal preference: more complicated > code complies with documented interface, or simpler code that exploits > undocumented feature. > > I prefer my code. But you guys feel free to make decision. I am OK with > whatever you choose. > > Cheers, > Lungang > > On Fri, Dec 9, 2016 at 10:37 AM, Charles Durst > wrote: >> >> They do conflict. My version is slightly more complicated since it >> also supports nested mixed lists. >> >> For example: >> >> 1. Here >> * is >> * an >> 2. example >> * of >> * a >> 3. mixed >> 4. list >> >> Which translates to: >> >> # Here >> #- is >> #- an >> # example >> #- of >> #- a >> # mixed >> # list >> >> Which is effectively the same as the example in the Confluence >> documentation: >> >> https://confluence.atlassian.com/confcloud/confluence-wiki-markup-724765099.html#ConfluenceWikiMarkup-Mixedlists >> >> -- >> Charles Durst >> cwdurst+orgmode@gmail.com >> >> >> On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou >> wrote: >> > Hello, >> > >> > Lungang Fang writes: >> > >> >> Attached is a patch for contrib/lisp/ox-confluence.el generated >> >> following >> >> instructions on http://orgmode.org/worg/org-contribute.html#patches . >> >> It >> >> adds support for ordered list. >> > >> > Thank you. >> > >> > However, this somewhat conflicts with a patch recently sent on the ML, >> > but not yet applied, by Charles Durst (Cc'ed). >> > >> > Could one double-check if one doesn't supersede the other, or if they >> > could be merged (although I suspect the former) and report back so >> > I know what patch to apply? >> > >> > Regards, >> > >> > -- >> > Nicolas Goaziou > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Charles Durst Subject: Re: Fwd: [PATCH] Add support for ordered list to ox-confluence.el Date: Thu, 8 Dec 2016 18:35:13 -0500 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cF8FH-0004ML-Mu for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:37:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cF8FE-0008Hs-JH for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:36:59 -0500 Received: from mail-ua0-f172.google.com ([209.85.217.172]:33687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cF8FE-0008E6-Cy for emacs-orgmode@gnu.org; Thu, 08 Dec 2016 18:36:56 -0500 Received: by mail-ua0-f172.google.com with SMTP id 20so1742357uak.0 for ; Thu, 08 Dec 2016 15:36:35 -0800 (PST) In-Reply-To: <87pol2f34e.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: Lungang Fang , emacs-orgmode@gnu.org, Charles Durst They do conflict. My version is slightly more complicated since it also supports nested mixed lists. For example: 1. Here * is * an 2. example * of * a 3. mixed 4. list Which translates to: # Here #- is #- an # example #- of #- a # mixed # list Which is effectively the same as the example in the Confluence documentation: https://confluence.atlassian.com/confcloud/confluence-wiki-markup-724765099.html#ConfluenceWikiMarkup-Mixedlists -- Charles Durst cdurst@alum.rpi.edu On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou wrote: > Hello, > > Lungang Fang writes: > >> Attached is a patch for contrib/lisp/ox-confluence.el generated following >> instructions on http://orgmode.org/worg/org-contribute.html#patches . It >> adds support for ordered list. > > Thank you. > > However, this somewhat conflicts with a patch recently sent on the ML, > but not yet applied, by Charles Durst (Cc'ed). > > Could one double-check if one doesn't supersede the other, or if they > could be merged (although I suspect the former) and report back so > I know what patch to apply? > > Regards, > > -- > Nicolas Goaziou From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lungang Fang Subject: [PATCH] Add support for ordered list to ox-confluence.el Date: Wed, 7 Dec 2016 17:47:21 +1100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=94eb2c1927da90e1a805430be4e8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cEW24-0008RH-Dr for emacs-orgmode@gnu.org; Wed, 07 Dec 2016 01:48:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cEW20-00075W-Gk for emacs-orgmode@gnu.org; Wed, 07 Dec 2016 01:48:48 -0500 Received: from mail-qt0-f176.google.com ([209.85.216.176]:33485) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cEW20-00071d-7p for emacs-orgmode@gnu.org; Wed, 07 Dec 2016 01:48:44 -0500 Received: by mail-qt0-f176.google.com with SMTP id p16so368721953qta.0 for ; Tue, 06 Dec 2016 22:48:22 -0800 (PST) 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: emacs-orgmode@gnu.org --94eb2c1927da90e1a805430be4e8 Content-Type: multipart/alternative; boundary=94eb2c1927da90e1a205430be4e6 --94eb2c1927da90e1a205430be4e6 Content-Type: text/plain; charset=UTF-8 Hi there, Attached is a patch for contrib/lisp/ox-confluence.el generated following instructions on http://orgmode.org/worg/org-contribute.html#patches . It adds support for ordered list. I didn't find where I should send this patch. Hopefully, this is the correct email list for patch request. If it is not, could anyone please tell me the correct way to submit a patch request to org-mode? Regards, -- Lungang Fang --94eb2c1927da90e1a205430be4e6 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi there,

Attached is a patch for=C2=A0= contrib/lisp/ox-confluence.el generated following instructions on=C2=A0http://orgmode.= org/worg/org-contribute.html#patches=C2=A0.=C2=A0It adds support for or= dered list.

I didn't find where I should send = this patch. Hopefully, this is the correct email list for patch request. If= it is not, could anyone please tell me the correct way to submit a patch r= equest to org-mode?

Regards,
--
Lungang Fang

--94eb2c1927da90e1a205430be4e6-- --94eb2c1927da90e1a805430be4e8 Content-Type: application/octet-stream; name="0001-ox-confluence.el-Add-support-for-ordered-list.patch" Content-Disposition: attachment; filename="0001-ox-confluence.el-Add-support-for-ordered-list.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iwekaz830 RnJvbSAxY2VmMGNkYThmOTc1ZWRhM2FkYzRjNDY2MTRhYWQyMDk3YmEyYmFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdW5nYW5nIEZhbmcgPGx1bmdhbmcuZmFuZ0BnbWFpbC5jb20+ CkRhdGU6IFdlZCwgNyBEZWMgMjAxNiAxNzoyNjowNCArMTEwMApTdWJqZWN0OiBbUEFUQ0hdIG94 LWNvbmZsdWVuY2UuZWw6IEFkZCBzdXBwb3J0IGZvciBvcmRlcmVkIGxpc3QKCiogY29udHJpYi9s aXNwL294LWNvbmZsdWVuY2UuZWwgKG9yZy1jb25mbHVlbmNlLWl0ZW0pOiBTdXBwb3J0IG9yZGVy ZWQKbGlzdAoKV2hlbiBjb252ZXJ0aW5nIGEgYnVsbGV0IGl0ZW0sIGV4YW1pbmUgdGhlIHR5cGUg b2YgaXQgYW5kIGNvbnZlcnQKYWNjb3JkaW5nbHkuCgpUSU5ZQ0hBTkdFCi0tLQogY29udHJpYi9s aXNwL294LWNvbmZsdWVuY2UuZWwgfCA5ICsrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5z ZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9jb250cmliL2xpc3Avb3gt Y29uZmx1ZW5jZS5lbCBiL2NvbnRyaWIvbGlzcC9veC1jb25mbHVlbmNlLmVsCmluZGV4IDVkZTll MGYuLmRlOGIwMGUgMTAwNjQ0Ci0tLSBhL2NvbnRyaWIvbGlzcC9veC1jb25mbHVlbmNlLmVsCisr KyBiL2NvbnRyaWIvbGlzcC9veC1jb25mbHVlbmNlLmVsCkBAIC04MSw5ICs4MSwxMiBAQAogICAo Zm9ybWF0ICJfJXNfIiBjb250ZW50cykpCiAKIChkZWZ1biBvcmctY29uZmx1ZW5jZS1pdGVtIChp dGVtIGNvbnRlbnRzIGluZm8pCi0gIChjb25jYXQgKG1ha2Utc3RyaW5nICgxKyAob3JnLWNvbmZs dWVuY2UtLWxpLWRlcHRoIGl0ZW0pKSA/XC0pCi0gICAgICAgICAgIiAiCi0gICAgICAgICAgKG9y Zy10cmltIGNvbnRlbnRzKSkpCisgIChsZXQqICgocGxhaW4tbGlzdCAob3JnLWV4cG9ydC1nZXQt cGFyZW50IGl0ZW0pKQorICAgICAgICAgKHR5cGUgKG9yZy1lbGVtZW50LXByb3BlcnR5IDp0eXBl IHBsYWluLWxpc3QpKQorICAgICAgICAgKGJ1bGxldCAoaWYgKGVxIHR5cGUgYG9yZGVyZWQpID9c IyA/XC0pKSkKKyAgICAoY29uY2F0IChtYWtlLXN0cmluZyAoMSsgKG9yZy1jb25mbHVlbmNlLS1s aS1kZXB0aCBpdGVtKSkgYnVsbGV0KQorICAgICAgICAgICAgIiAiCisgICAgICAgICAgICAob3Jn LXRyaW0gY29udGVudHMpKSkpCiAKIChkZWZ1biBvcmctY29uZmx1ZW5jZS1maXhlZC13aWR0aCAo Zml4ZWQtd2lkdGggY29udGVudHMgaW5mbykKICAgKGZvcm1hdCAiXHtceyVzXH1cfSIgY29udGVu dHMpKQotLSAKMi45LjMgKEFwcGxlIEdpdC03NSkKCg== --94eb2c1927da90e1a805430be4e8-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lungang Fang Subject: Re: [PATCH] Add support for ordered list to ox-confluence.el Date: Fri, 9 Dec 2016 19:34:32 +1100 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1143b2a68d80d00543359fed Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFGea-0004Dj-8k for emacs-orgmode@gnu.org; Fri, 09 Dec 2016 03:35:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFGeT-0007Hf-Hx for emacs-orgmode@gnu.org; Fri, 09 Dec 2016 03:35:40 -0500 Received: from mail-qt0-f178.google.com ([209.85.216.178]:36629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cFGeT-0007HV-DG for emacs-orgmode@gnu.org; Fri, 09 Dec 2016 03:35:33 -0500 Received: by mail-qt0-f178.google.com with SMTP id w33so9922333qtc.3 for ; Fri, 09 Dec 2016 00:35:33 -0800 (PST) In-Reply-To: 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: "cwdurst+orgmode@gmail.com" , emacs-orgmode@gnu.org --001a1143b2a68d80d00543359fed Content-Type: text/plain; charset=UTF-8 Great! Then, what about using my patch ? It would be my first patch adopted by any open source project, a real milestone :) On Friday, December 9, 2016, Charles Durst wrote: > I have tried the results of both versions and loaded them into the > Confluence Wiki, and Lungang is correct, from what I can tell, they > both will work. > > So I don't really care which one you choose either. I just needed the > functionality. > -- > Charles Durst > cwdurst+orgmode@gmail.com > > On Thu, Dec 8, 2016 at 9:32 PM, Lungang Fang > wrote: > > Hi Charles and Nicholas, > > > > My code also supports nested mixed lists but is simpler. I mean, my code > > will convert the list given by Charles to > > > > # Here > > -- is > > -- an > > # example > > -- of > > -- a > > # mixed > > # list > > > > Although this format is not mentioned in confluence wiki, it is > supported by > > conflucence according to my test (in Jira). > > > > So, in my opinion, it is a matter of personal preference: more > complicated > > code complies with documented interface, or simpler code that exploits > > undocumented feature. > > > > I prefer my code. But you guys feel free to make decision. I am OK with > > whatever you choose. > > > > Cheers, > > Lungang > > > > On Fri, Dec 9, 2016 at 10:37 AM, Charles Durst < > cwdurst+orgmode@gmail.com > > > wrote: > >> > >> They do conflict. My version is slightly more complicated since it > >> also supports nested mixed lists. > >> > >> For example: > >> > >> 1. Here > >> * is > >> * an > >> 2. example > >> * of > >> * a > >> 3. mixed > >> 4. list > >> > >> Which translates to: > >> > >> # Here > >> #- is > >> #- an > >> # example > >> #- of > >> #- a > >> # mixed > >> # list > >> > >> Which is effectively the same as the example in the Confluence > >> documentation: > >> > >> https://confluence.atlassian.com/confcloud/confluence-wiki- > markup-724765099.html#ConfluenceWikiMarkup-Mixedlists > >> > >> -- > >> Charles Durst > >> cwdurst+orgmode@gmail.com > >> > >> > >> On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou > > >> wrote: > >> > Hello, > >> > > >> > Lungang Fang > writes: > >> > > >> >> Attached is a patch for contrib/lisp/ox-confluence.el generated > >> >> following > >> >> instructions on http://orgmode.org/worg/org-contribute.html#patches > . > >> >> It > >> >> adds support for ordered list. > >> > > >> > Thank you. > >> > > >> > However, this somewhat conflicts with a patch recently sent on the ML, > >> > but not yet applied, by Charles Durst (Cc'ed). > >> > > >> > Could one double-check if one doesn't supersede the other, or if they > >> > could be merged (although I suspect the former) and report back so > >> > I know what patch to apply? > >> > > >> > Regards, > >> > > >> > -- > >> > Nicolas Goaziou > > > > > --001a1143b2a68d80d00543359fed Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Great! Then,=C2=A0what about using my patch ? It would be my first patch ad= opted by any open source project, a real milestone=C2=A0 :)

On Frida= y, December 9, 2016, Charles Durst <cwdurst+orgmode@gmail.com> wrote:
I have tried the results of both versions and loaded them into t= he
Confluence Wiki, and Lungang is correct, from what I can tell, they
both will work.

So I don't really care which one you choose either.=C2=A0 I just needed= the
functionality.
--
Charles Durst
cwdurst+orgmode@gmail.com

On Thu, Dec 8, 2016 at 9:32 PM, Lungang Fang <lung= ang.fang@gmail.com> wrote:
> Hi Charles and Nicholas,
>
> My code also supports nested mixed lists but is simpler. I mean, my co= de
> will convert the list given by Charles to
>
> # Here
> -- is
> -- an
> # example
> -- of
> -- a
> # mixed
> # list
>
> Although this format is not mentioned in confluence wiki, it is suppor= ted by
> conflucence according to my test (in Jira).
>
> So, in my opinion, it is a matter of personal preference: more complic= ated
> code complies with documented interface, or simpler code that exploits=
> undocumented feature.
>
> I prefer my code. But you guys feel free to make decision. I am OK wit= h
> whatever you choose.
>
> Cheers,
> Lungang
>
> On Fri, Dec 9, 2016 at 10:37 AM, Charles Durst <cwdurst+orgmode@gmail.com>
> wrote:
>>
>> They do conflict.=C2=A0 My version is slightly more complicated si= nce it
>> also supports nested mixed lists.
>>
>> For example:
>>
>> 1. Here
>>=C2=A0 =C2=A0 * is
>>=C2=A0 =C2=A0 * an
>> 2. example
>>=C2=A0 =C2=A0 * of
>>=C2=A0 =C2=A0 * a
>> 3. mixed
>> 4. list
>>
>> Which translates to:
>>
>> # Here
>> #- is
>> #- an
>> # example
>> #- of
>> #- a
>> # mixed
>> # list
>>
>> Which is effectively the same as the example in the Confluence
>> documentation:
>>
>> https://confluence.atlassian.com/confcloud/confluence-wiki-mark= up-724765099.html#ConfluenceWikiMarkup-Mixedlists
>>
>> --
>> Charles Durst
>> cwdurst+orgmode@gmail.com
>>
>>
>> On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou <mail@nicolasgoaziou.fr>
>> wrote:
>> > Hello,
>> >
>> > Lungang Fang <lungang.fang@gmail.com= > writes:
>> >
>> >> Attached is a patch for contrib/lisp/ox-confluence.el gen= erated
>> >> following
>> >> instructions on http://orgmode.org/worg/org-c= ontribute.html#patches .
>> >> It
>> >> adds support for ordered list.
>> >
>> > Thank you.
>> >
>> > However, this somewhat conflicts with a patch recently sent o= n the ML,
>> > but not yet applied, by Charles Durst (Cc'ed).
>> >
>> > Could one double-check if one doesn't supersede the other= , or if they
>> > could be merged (although I suspect the former) and report ba= ck so
>> > I know what patch to apply?
>> >
>> > Regards,
>> >
>> > --
>> > Nicolas Goaziou
>
>
--001a1143b2a68d80d00543359fed-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: [PATCH] Add support for ordered list to ox-confluence.el Date: Fri, 09 Dec 2016 21:34:56 +0100 Message-ID: <87wpf8et8v.fsf@nicolasgoaziou.fr> References: <87pol2f34e.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFRsg-0004M4-RC for emacs-orgmode@gnu.org; Fri, 09 Dec 2016 15:34:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFRsb-0000ta-Vz for emacs-orgmode@gnu.org; Fri, 09 Dec 2016 15:34:58 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:37353) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cFRsb-0000tD-Px for emacs-orgmode@gnu.org; Fri, 09 Dec 2016 15:34:53 -0500 In-Reply-To: (Lungang Fang's message of "Fri, 9 Dec 2016 19:34:32 +1100") 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: Lungang Fang Cc: emacs-orgmode@gnu.org, "cwdurst+orgmode@gmail.com" Hello, Lungang Fang writes: > Great! Then, what about using my patch ? It would be my first patch adopted > by any open source project, a real milestone :) Applied. Thanks to both of you. Regards, -- Nicolas Goaziou From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lungang Fang Subject: Re: [PATCH] Add support for ordered list to ox-confluence.el Date: Sat, 10 Dec 2016 18:54:26 +1100 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> <87wpf8et8v.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a114d7564ff77640543492d5c Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFcVd-0004BC-3O for emacs-orgmode@gnu.org; Sat, 10 Dec 2016 02:55:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFcVZ-0000wM-7m for emacs-orgmode@gnu.org; Sat, 10 Dec 2016 02:55:53 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36573) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cFcVZ-0000s3-3k for emacs-orgmode@gnu.org; Sat, 10 Dec 2016 02:55:49 -0500 Received: by mail-qk0-f195.google.com with SMTP id h201so4862149qke.3 for ; Fri, 09 Dec 2016 23:55:27 -0800 (PST) In-Reply-To: <87wpf8et8v.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: Lungang Fang , "cwdurst+orgmode@gmail.com" , emacs-orgmode@gnu.org --001a114d7564ff77640543492d5c Content-Type: text/plain; charset=UTF-8 Hi Nicolas and Charles, Thank you both. Lungang On Sat, Dec 10, 2016 at 7:34 AM, Nicolas Goaziou wrote: > Hello, > > Lungang Fang writes: > > > Great! Then, what about using my patch ? It would be my first patch > adopted > > by any open source project, a real milestone :) > > Applied. Thanks to both of you. > > Regards, > > -- > Nicolas Goaziou > --001a114d7564ff77640543492d5c Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Nicolas and Charles,

Thank you both.=

Lungang

On Sat, Dec 10, 2016 at 7:34 AM, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
Hello,

Lungang Fang <lungang.fang@gma= il.com> writes:

> Great! Then, what about using my patch ? It wo= uld be my first patch adopted
> by any open source project, a real milestone=C2=A0 :)

Applied. Thanks to both of you.

Regards,

--
Nicolas Goaziou

--001a114d7564ff77640543492d5c-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Charles Durst Subject: Re: [PATCH] Add support for ordered list to ox-confluence.el Date: Mon, 12 Dec 2016 18:07:50 -0500 Message-ID: References: <87pol2f34e.fsf@nicolasgoaziou.fr> <87wpf8et8v.fsf@nicolasgoaziou.fr> Reply-To: cwdurst+orgmode@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGZiz-0007kL-5H for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 18:09:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGZiv-00029u-W4 for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 18:09:37 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:36799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGZiv-00024L-Q5 for emacs-orgmode@gnu.org; Mon, 12 Dec 2016 18:09:33 -0500 Received: by mail-qt0-f196.google.com with SMTP id n34so11780573qtb.3 for ; Mon, 12 Dec 2016 15:09:11 -0800 (PST) In-Reply-To: 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: Lungang Fang Cc: emacs-orgmode@gnu.org Oops, I just realized an important difference. My version also supported descriptive lists. The version with only Nicholas' changes will lose the item name: * item-name :: description Will just become - description Here is a fix based on Nicholas' version: * contrib/lisp/ox-confluence.el (org-confluence-item): Support descriptive list When converting a descriptive list item, be sure to include the "item" part, not just the description. TINYCHANGE --- contrib/lisp/ox-confluence.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/lisp/ox-confluence.el b/contrib/lisp/ox-confluence.el index de8b00e..a1318f9 100644 --- a/contrib/lisp/ox-confluence.el +++ b/contrib/lisp/ox-confluence.el @@ -83,9 +83,13 @@ (defun org-confluence-item (item contents info) (let* ((plain-list (org-export-get-parent item)) (type (org-element-property :type plain-list)) - (bullet (if (eq type `ordered) ?\# ?\-))) + (bullet (if (eq type 'ordered) ?\# ?\-))) (concat (make-string (1+ (org-confluence--li-depth item)) bullet) " " + (if (eq type 'descriptive) + (concat "*" + (org-export-data (org-element-property :tag item) info) + "* - ")) (org-trim contents)))) (defun org-confluence-fixed-width (fixed-width contents info) -- 2.5.4 (Apple Git-61) On Sat, Dec 10, 2016 at 2:54 AM, Lungang Fang wrote: > Hi Nicolas and Charles, > > Thank you both. > > Lungang > > On Sat, Dec 10, 2016 at 7:34 AM, Nicolas Goaziou > wrote: >> >> Hello, >> >> Lungang Fang writes: >> >> > Great! Then, what about using my patch ? It would be my first patch >> > adopted >> > by any open source project, a real milestone :) >> >> Applied. Thanks to both of you. >> >> Regards, >> >> -- >> Nicolas Goaziou > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: [PATCH] Add support for ordered list to ox-confluence.el Date: Tue, 13 Dec 2016 13:50:27 +0100 Message-ID: <877f749eng.fsf@nicolasgoaziou.fr> References: <87pol2f34e.fsf@nicolasgoaziou.fr> <87wpf8et8v.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGmXK-000585-Ll for emacs-orgmode@gnu.org; Tue, 13 Dec 2016 07:50:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGmXK-0000Um-4c for emacs-orgmode@gnu.org; Tue, 13 Dec 2016 07:50:26 -0500 Received: from relay3-d.mail.gandi.net ([2001:4b98:c:538::195]:53072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cGmXJ-0000UN-VN for emacs-orgmode@gnu.org; Tue, 13 Dec 2016 07:50:26 -0500 In-Reply-To: (Charles Durst's message of "Mon, 12 Dec 2016 18:07:50 -0500") 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: Charles Durst Cc: emacs-orgmode@gnu.org, Lungang Fang Hello, Charles Durst writes: > Oops, I just realized an important difference. My version also > supported descriptive lists. The version with only Nicholas' changes > will lose the item name: > > * item-name :: description > > Will just become > > - description > > Here is a fix based on Nicholas' version Applied. Thank you. Regards, -- Nicolas Goaziou