Re: [patch, ox] #+INCLUDE resolves links

[Nicolas Goaziou <mail@nicolasgoaziou.fr>]

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