From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Rasmus <rasmus@gmx.us>
Cc: emacs-orgmode@gnu.org
Subject: Re: [patch, ox] #+INCLUDE resolves links
Date: Tue, 30 Sep 2014 10:07:08 +0200 [thread overview]
Message-ID: <87tx3po7kj.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <87d2af1qyv.fsf@gmx.us> (rasmus@gmx.us's message of "Sun, 28 Sep 2014 21:32:08 +0200")
Hello,
Rasmus <rasmus@gmx.us> writes:
> Thanks for the comments. I hope I addressed the previous comments and
> did not introduce new reasons bugs.
> I added tests.
Great.
> Just out of curiosity, what is an example of a element that can be
> named and does not have a :contents-begin?
#+name: empty-drawer
:DRAWER:
:END:
> Okay, there's a lot of improvements in that suggestion. However, it
> misses this case which created using only "official" shortcuts
>
> * head
> SCHEDULED: <2014-09-28 sun>
> :LOGBOOK:
> - Note taken on [2014-09-28 sat 12:21] \\
> a drawer
> :END:
> :PROPERTIES:
> :CUSTOM_ID: h
> :END:
This was done on purpose, anticipating a patch I'm working on. Anyway,
it doesn't matter much. I'll revert it once my work is ready.
> +elements.}. If the @code{:only-contents} property is non-nil, only the
> +contents of the requested element will be included, omitting any
> +property-drawers, planning-lines, attributes, captions etc. The
properties (or property) drawer, planning line.
Do you think it's worth specifying that captions and attributes will be
ignored? It seems pretty obvious to me as they do not belong to contents
(unlike to planning and properties drawers).
> + (only-contents
> + (and (string-match ":only-contents +\\([^: \r\t\n]\\S-*\\)" value)
> + (prog1 (org-not-nil (match-string 1 value))
> + (setq value (replace-match "" nil nil value)))))
Why do you need to remove match from VALUE? AFAICT, the only match that
needs to be removed is the file name. Others are regular.
> + ;; skip planning line and property-drawer. If a normal drawer
> + ;; precedes a property-drawer both will be included.
> + ;; Remaining property-drawers are removed as needed in
> + ;; `org-export--prepare-file-contents'
;; Skip planning line and properties drawer.
> + ;; If only-contents is non-nil only include contents of element
> + (should
> + (equal
> + "body\n"
> + (org-test-with-temp-text
> + (format "#+INCLUDE: \"%s/examples/include.org::*Heading\" :only-contents t" org-test-dir)
> + (org-export-expand-include-keyword)
[...]
> + ;; Properties should be dropped, drawers should not be
> + (should
> + (equal
> + ":LOGBOOK:\ndrawer\n:END:\ncontent\n"
> + (org-test-with-temp-text
> + (format "#+INCLUDE: \"%s/examples/include.org::#dh\" :only-contents t" org-test-dir)
> + (org-export-expand-include-keyword)
> + (buffer-string)))))
Mind the 80th column in your tests, and full stop at end of comments.
Besides the minor issues above, it looks good. Feel free to push it
whenever you want.
Thank you for that work.
Regards,
--
Nicolas Goaziou
next prev parent reply other threads:[~2014-09-30 8:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-21 0:51 [patch, ox] #+INCLUDE resolves links Rasmus
2014-09-21 11:46 ` Rasmus
2014-09-21 13:53 ` Nicolas Goaziou
2014-09-21 14:46 ` Rasmus
2014-09-21 19:51 ` Nicolas Goaziou
2014-09-23 23:25 ` Rasmus
2014-09-24 21:22 ` Nicolas Goaziou
2014-09-28 19:32 ` Rasmus
2014-09-30 8:07 ` Nicolas Goaziou [this message]
2014-09-30 10:18 ` Rasmus
2014-09-30 14:29 ` Nicolas Goaziou
2014-09-30 21:48 ` Rasmus
2014-10-01 20:03 ` Nicolas Goaziou
2014-10-01 21:27 ` Rasmus
2014-10-02 7:29 ` Xavier Garrido
2014-10-02 8:55 ` Rasmus
2014-10-02 16:30 ` Aaron Ecay
2014-10-02 16:53 ` Nicolas Goaziou
2014-10-02 17:47 ` Rasmus
2014-10-02 19:11 ` Achim Gratz
2014-10-02 20:58 ` Rasmus
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=87tx3po7kj.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=emacs-orgmode@gnu.org \
--cc=rasmus@gmx.us \
/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).