emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Carsten Dominik <carsten.dominik@gmail.com>
To: David Maus <dmaus@ictsoc.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Remove text properties of body before calculating cache hash.
Date: Tue, 6 Jul 2010 12:52:28 +0200	[thread overview]
Message-ID: <56991DC8-1D0C-4A30-94B6-841DA282C64A@gmail.com> (raw)
In-Reply-To: <1278405171-5093-1-git-send-email-dmaus@ictsoc.de>

Applied, thanks.

- Carsten

On Jul 6, 2010, at 10:32 AM, David Maus wrote:

> * org-exp-blocks.el (org-export-blocks-format-ditaa)
> (org-export-blocks-format-dot): Remove text properties of body before
> calculating cache hash.
>
> Otherwise one and the same ditta/graphviz image has a different hash
> depending on the text properties of the body.
> E.g. `org-export-region-as-html' with target buffer 'string passed the
> body of the block without possible indentation property `wrap-prefix'
> while `org-export-as-html' does.
> ---
> lisp/org-exp-blocks.el |   32 ++++++++++++++++++--------------
> 1 files changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
> index 4ff6c5c..4bf5db6 100644
> --- a/lisp/org-exp-blocks.el
> +++ b/lisp/org-exp-blocks.el
> @@ -227,13 +227,15 @@ passed to the ditaa utility as command line  
> arguments."
>   (message "ditaa-formatting...")
>   (let* ((args (if (cdr headers) (mapconcat 'identity (cdr headers)  
> " ")))
>          (data-file (make-temp-file "org-ditaa"))
> -         (hash (sha1 (prin1-to-string (list body args))))
> -         (raw-out-file (if headers (car headers)))
> -         (out-file-parts (if (string-match "\\(.+\\)\\.\\([^\\.]+\\) 
> $" raw-out-file)
> -                             (cons (match-string 1 raw-out-file)
> -                                   (match-string 2 raw-out-file))
> -                           (cons raw-out-file "png")))
> -         (out-file (concat (car out-file-parts) "_" hash "." (cdr  
> out-file-parts))))
> +	 (hash (progn
> +		 (set-text-properties 0 (length body) nil body)
> +		 (sha1 (prin1-to-string (list body args)))))
> +	 (raw-out-file (if headers (car headers)))
> +	 (out-file-parts (if (string-match "\\(.+\\)\\.\\([^\\.]+\\)$" raw- 
> out-file)
> +			     (cons (match-string 1 raw-out-file)
> +				   (match-string 2 raw-out-file))
> +			   (cons raw-out-file "png")))
> +	 (out-file (concat (car out-file-parts) "_" hash "." (cdr out-file- 
> parts))))
>     (unless (file-exists-p org-ditaa-jar-path)
>       (error (format "Could not find ditaa.jar at %s" org-ditaa-jar- 
> path)))
>     (setq body (if (string-match "^\\([^:\\|:[^ ]\\)" body)
> @@ -287,13 +289,15 @@ digraph data_relationships {
>   (message "dot-formatting...")
>   (let* ((args (if (cdr headers) (mapconcat 'identity (cdr headers)  
> " ")))
>          (data-file (make-temp-file "org-ditaa"))
> -         (hash (sha1 (prin1-to-string (list body args))))
> -         (raw-out-file (if headers (car headers)))
> -         (out-file-parts (if (string-match "\\(.+\\)\\.\\([^\\.]+\\) 
> $" raw-out-file)
> -                             (cons (match-string 1 raw-out-file)
> -                                   (match-string 2 raw-out-file))
> -                           (cons raw-out-file "png")))
> -         (out-file (concat (car out-file-parts) "_" hash "." (cdr  
> out-file-parts))))
> +	 (hash (progn
> +		 (set-text-properties 0 (length body) nil body)
> +		 (sha1 (prin1-to-string (list body args)))))
> +	 (raw-out-file (if headers (car headers)))
> +	 (out-file-parts (if (string-match "\\(.+\\)\\.\\([^\\.]+\\)$" raw- 
> out-file)
> +			     (cons (match-string 1 raw-out-file)
> +				   (match-string 2 raw-out-file))
> +			   (cons raw-out-file "png")))
> +	 (out-file (concat (car out-file-parts) "_" hash "." (cdr out-file- 
> parts))))
>     (cond
>      ((or htmlp latexp docbookp)
>       (unless (file-exists-p out-file)
> -- 
> 1.7.1
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

- Carsten

      parent reply	other threads:[~2010-07-06 10:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-06  8:32 [PATCH] Remove text properties of body before calculating cache hash David Maus
2010-07-06  8:43 ` Patchwork: Patch 119 Accepted Carsten Dominik
2010-07-06 10:52 ` Carsten Dominik [this message]

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=56991DC8-1D0C-4A30-94B6-841DA282C64A@gmail.com \
    --to=carsten.dominik@gmail.com \
    --cc=dmaus@ictsoc.de \
    --cc=emacs-orgmode@gnu.org \
    /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).