From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Marc Ihm <marc@ihm.name>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] contrib/lisp/ox-confluence.el: Export checkboxes; fix timestamps in headlines
Date: Tue, 02 May 2017 08:54:19 +0200 [thread overview]
Message-ID: <87d1brycis.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <86r3087fys.fsf@ihm.name> (Marc Ihm's message of "Mon, 01 May 2017 17:29:47 +0200")
Hello,
Marc Ihm <marc@ihm.name> writes:
> the attached patch changes ox-confluence.el:
>
> - Export checkboxes in lists to appear in the resulting
> confluence-markup (with some minor refactoring of
> org-confluence-item).
> - Fix spurious closing braces following timestamps in headlines.
>
>
> Please review and let me know, if you have any comments or questions.
Thank you.
> + (cl-case (org-element-property :checkbox item)
> + ('on "*{{(X)}}* ")
> + ('off "*{{( )}}* ")
> + ('trans "*{{(\\-)}}* "))
This is a common mistake. Symbols in `cl-case' shouldn't be quoted. 'on
is really (quote on), so you actually wrote
(cl-case (org-element-property :checkbox item)
((quote on) "*{{(X)}}* ")
((quote off) "*{{( )}}* ")
((quote trans) "*{{(\\-)}}* "))
which is not what you want:
(cl-case 'quote ('a 1) ('quote 2) (t 3)) => 1
This is why I prefer `pcase' over `cl-case'.
> + (when (eq list-type 'descriptive)
> + (concat "*" (org-export-data (org-element-property :tag item) info) "* - "))
> + (org-trim contents))))
>
> (defun org-confluence-fixed-width (fixed-width contents info)
> (org-confluence--block
> @@ -117,7 +120,7 @@
> (string= todo ""))
> ""
> (format "*{{%s}}* " todo))))
> - ;; Else: Standard headline.
> +
Mind the spurious blank lines.
> (format "h%s. %s%s\n%s" level todo-text text
> (if (org-string-nw-p contents) contents ""))))
>
> @@ -181,7 +184,7 @@ a communication channel."
> (defun org-confluence-timestamp (timestamp _contents _info)
> "Transcode a TIMESTAMP object from Org to Confluence.
> CONTENTS and INFO are ignored."
> - (let ((translated (org-timestamp-translate timestamp)))
> + (let ((translated (org-trim (org-timestamp-translate timestamp))))
I'm not sure what this is supposed to fix. Does
`org-timestamp-translate' return a string with leading or trailing
blanks?
Anyway, I applied the patch in master branch, with the fix suggested
above.
Regards,
--
Nicolas Goaziou
next prev parent reply other threads:[~2017-05-02 6:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-01 15:29 [PATCH] contrib/lisp/ox-confluence.el: Export checkboxes; fix timestamps in headlines Marc Ihm
2017-05-02 6:54 ` Nicolas Goaziou [this message]
2017-05-03 4:14 ` Marc Ihm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d1brycis.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=emacs-orgmode@gnu.org \
--cc=marc@ihm.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).