[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] [PATCH v3 11/11] org-taskjuggler.el: Make taskjuggler compatible wit
From: |
Yann Hodique |
Subject: |
[O] [PATCH v3 11/11] org-taskjuggler.el: Make taskjuggler compatible with org-publish |
Date: |
Thu, 16 Aug 2012 21:02:09 +0200 |
* lisp/org-publish.el (org-publish-org-to-taskjuggler): New function to
publish taskjuggler projects.
* lisp/org-taskjuggler.el (org-export-as-taskjuggler): Adapt signature
to reflect standard interface, in particular allow export to buffer.
---
lisp/org-publish.el | 6 ++++++
lisp/org-taskjuggler.el | 33 +++++++++++++++++++++++----------
2 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index ed2db3a..e78e2d4 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -649,6 +649,12 @@ See `org-publish-org-to' to the list of arguments."
(org-publish-with-aux-preprocess-maybe
(org-publish-org-to "utf8" plist filename pub-dir)))
+(defun org-publish-org-to-taskjuggler (plist filename pub-dir)
+ "Publish an org file to TaskJuggler.
+See `org-publish-org-to' to the list of arguments."
+ (org-publish-with-aux-preprocess-maybe
+ (org-publish-org-to "taskjuggler" plist filename pub-dir)))
+
(defun org-publish-attachment (plist filename pub-dir)
"Publish a file with no transformation of any kind.
See `org-publish-org-to' to the list of arguments."
diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el
index 49c24ff..1733fe8 100644
--- a/lisp/org-taskjuggler.el
+++ b/lisp/org-taskjuggler.el
@@ -298,7 +298,8 @@ but before any resource and task declarations."
(defvar org-export-taskjuggler-old-level)
;;;###autoload
-(defun org-export-as-taskjuggler ()
+(defun org-export-as-taskjuggler (&optional arg hidden ext-plist
+ to-buffer body-only pub-dir)
"Export parts of the current buffer as a TaskJuggler file.
The exporter looks for a tree with tag, property or todo that
matches `org-export-taskjuggler-project-tag' and takes this as
@@ -310,11 +311,12 @@ resources for the project. If no resources are
specified, a
default resource is created and allocated to the project. Also
the taskjuggler project will be created with default reports as
defined in `org-export-taskjuggler-default-reports'."
- (interactive)
+ (interactive "P")
(message "Exporting...")
(setq-default org-done-keywords org-done-keywords)
(let* ((opt-plist (org-combine-plists (org-default-export-plist)
+ ext-plist
(org-infile-export-plist)))
(org-export-opt-plist opt-plist)
(tasks
@@ -333,12 +335,20 @@ defined in `org-export-taskjuggler-default-reports'."
(org-map-entries
'org-taskjuggler-components
org-export-taskjuggler-report-tag nil 'archive 'comment))
- (filename (expand-file-name
- (concat
- (file-name-sans-extension
- (file-name-nondirectory buffer-file-name))
- org-export-taskjuggler-extension)))
- (buffer (find-file-noselect filename))
+ (filename (if to-buffer
+ nil
+ (concat (file-name-as-directory
+ (or pub-dir
+ (org-export-directory :tj opt-plist)))
+ (file-name-sans-extension
+ (file-name-nondirectory buffer-file-name))
+ org-export-taskjuggler-extension)))
+ (buffer (if to-buffer
+ (cond
+ ((eq to-buffer 'string)
+ (get-buffer-create "*Org Taskjuggler Export*"))
+ (t (get-buffer-create to-buffer)))
+ (find-file-noselect filename)))
(old-buffer (current-buffer))
(org-export-taskjuggler-old-level 0)
task resource)
@@ -399,10 +409,13 @@ defined in `org-export-taskjuggler-default-reports'."
(if org-export-taskjuggler-keep-project-as-task
1 2))
(org-taskjuggler-insert-reports reports)
- (save-buffer)
+ (or to-buffer (save-buffer))
(or (org-export-push-to-kill-ring "TaskJuggler")
(message "Exporting... done"))
- (current-buffer))))
+ (if (eq to-buffer 'string)
+ (prog1 (buffer-substring (point-min) (point-max))
+ (kill-buffer (current-buffer)))
+ (current-buffer)))))
;;;###autoload
(defun org-export-as-taskjuggler-and-open ()
--
1.7.11.4
- [O] [PATCH v3 01/11] org-taskjuggler.el: Make task and resource properties customizable, (continued)
- [O] [PATCH v3 01/11] org-taskjuggler.el: Make task and resource properties customizable, Yann Hodique, 2012/08/16
- [O] [PATCH v3 03/11] org-taskjuggler.el: Make use of org properties, Yann Hodique, 2012/08/16
- [O] [PATCH v3 02/11] org-taskjuggler.el: Properly install local variables at export time, Yann Hodique, 2012/08/16
- [O] [PATCH v3 05/11] org-taskjuggler.el: Introduce a global header, for early macros, Yann Hodique, 2012/08/16
- [O] [PATCH v3 06/11] org-taskjuggler.el: Use project end date, if specified, Yann Hodique, 2012/08/16
- [O] [PATCH v3 04/11] org-taskjuggler.el: Fix milestone definition, Yann Hodique, 2012/08/16
- [O] [PATCH v3 07/11] org-taskjuggler.el: Make project umbrella task optional, Yann Hodique, 2012/08/16
- [O] [PATCH v3 08/11] org-taskjuggler.el: Disambiguate "headline", as it's a valid attribute, Yann Hodique, 2012/08/16
- [O] [PATCH v3 09/11] org-taskjuggler.el: Allow reports definition from within the org file, Yann Hodique, 2012/08/16
- [O] [PATCH v3 10/11] org-taskjuggler.el: Update doc to reflect latest changes, Yann Hodique, 2012/08/16
- [O] [PATCH v3 11/11] org-taskjuggler.el: Make taskjuggler compatible with org-publish,
Yann Hodique <=
- Re: [O] [PATCH v3 00/11] Taskjuggler exporter improvements, Bastien, 2012/08/26
- [O] [PATCH v2 01/11] org-taskjuggler: make task and resource properties customizable, Yann Hodique, 2012/08/15
- [O] [PATCH v2 02/11] org-taskjuggler: properly install local variables at export time, Yann Hodique, 2012/08/15
- [O] [PATCH v2 03/11] org-taskjuggler: make use of org properties, Yann Hodique, 2012/08/15
- [O] [PATCH v2 04/11] org-taskjuggler: fix milestone definition, Yann Hodique, 2012/08/15
- [O] [PATCH v2 05/11] org-taskjuggler: introduce a global header, for early macros, Yann Hodique, 2012/08/15
- [O] [PATCH v2 06/11] org-taskjuggler: use project end date, if specified, Yann Hodique, 2012/08/15
- [O] [PATCH v2 07/11] org-taskjuggler: make project umbrella task optional, Yann Hodique, 2012/08/15
- [O] [PATCH v2 08/11] org-taskjuggler: disambiguate "headline", as it's also a valid property, Yann Hodique, 2012/08/15
- [O] [PATCH v2 09/11] org-taskjuggler: allow reports definition from within the org file, Yann Hodique, 2012/08/15