From: Nicolas Goaziou <n.goaziou@gmail.com>
To: feng shu <tumashu@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] (update) Add :caption attribute to #+ATTR_LATEX property
Date: Sun, 30 Jun 2013 13:46:26 +0200 [thread overview]
Message-ID: <878v1rstwt.fsf@gmail.com> (raw)
In-Reply-To: <CAJpRBmcSnspGJ5FyMBo32ApiGuePGATufUJCLAZLt0-pBftg2g@mail.gmail.com> (feng shu's message of "Sun, 30 Jun 2013 07:10:14 +0800")
Hello,
feng shu <tumashu@gmail.com> writes:
> This is the updated patch of "Add :caption attribute to #+ATTR_LATEX
> property"
> If possible, please include it to master
Thanks for your patch.
I agree that #+CAPTION isn't ready for complex caption commands (nor
that it should), so a :caption attribute may be useful. Though, it must
be documented in the manual (see "12.7.4 LaTeX specific attributes"). In
particular, documentation should insist on the fact that:
1. :caption attribute has precedence over #+caption keyword
2. :caption attribute is only meaningful special caption commands,
i.e., this isn't the standard way to set a caption in Org.
3. This is a raw command, nothing in it will be interpreted by Org.
Here are some comments about the code:
> + (caption-from-attr-latex (plist-get (org-export-read-attribute :attr_latex element) :caption)))
You can use the following slightly shorter sexp:
(caption-from-attr-latex (org-export-read-attribute :attr_latex element :caption))
> + (if (and caption-from-attr-latex (not (equal caption-from-attr-latex "")))
> + (concat caption-from-attr-latex "\n")
> + (cond
> + ((and (not main) (equal label-str "")))
> + ((not main) (concat label-str "\n"))
> + ;; Option caption format with short name.
> + (short (format "\\caption[%s]{%s%s}\n"
> + (org-export-data short info)
> + label-str
> + (org-export-data main info)))
> + ;; Standard caption format.
> + (t (format "\\caption{%s%s}\n" label-str (org-export-data main info)))))))
Here you can include the "then" part in the `cond', and use
`org-string-nw-p':
(cond ((org-string-nw-p caption-from-attr-latex)
(concat caption-from-attr-latex "\n"))
((and (not main) (equal label-str "")) "")
...)
> (defun org-latex-guess-inputenc (header)
> "Set the coding system in inputenc to what the buffer is.
> @@ -1655,7 +1658,7 @@ used as a communication channel."
> (cond ((and (not float) (plist-member attr :float)) nil)
> ((string= float "wrap") 'wrap)
> ((string= float "multicolumn") 'multicolumn)
> - ((or float (org-element-property :caption parent))
> + ((or float (org-element-property :caption parent) (plist-get attr :caption))
Be careful here: (plist-get attr :caption) will be non-nil if :caption
is set to the empty string. It may be bulkier to use:
(org-string-nw-p (plist-get attr :caption))
> 'figure))))
> (placement
> (let ((place (plist-get attr :placement)))
> @@ -2333,7 +2336,7 @@ This function assumes TABLE has `org' as its `:type' property and
> ((and (not float) (plist-member attr :float)) nil)
> ((string= float "sidewaystable") "sidewaystable")
> ((string= float "multicolumn") "table*")
> - ((or float (org-element-property :caption table))
> + ((or float (org-element-property :caption table) (plist-get attr :caption))
Ditto.
Regards,
--
Nicolas Goaziou
next prev parent reply other threads:[~2013-06-30 11:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-29 23:10 [PATCH] (update) Add :caption attribute to #+ATTR_LATEX property feng shu
2013-06-30 11:46 ` Nicolas Goaziou [this message]
2013-06-30 14:27 ` feng shu
2013-06-30 20:27 ` Bastien
2013-06-30 23:08 ` feng shu
2013-07-01 13:10 ` Bastien
2013-07-01 21:38 ` Nicolas Goaziou
2013-07-01 23:58 ` feng shu
2013-07-02 17:03 ` Nicolas Goaziou
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=878v1rstwt.fsf@gmail.com \
--to=n.goaziou@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=tumashu@gmail.com \
/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).