From: Nicolas Girard <girard.nicolas@gmail.com>
To: emacs-orgmode@gnu.org
Cc: Nicolas Girard <girard.nicolas@gmail.com>
Subject: [PATCH 2/2] Allow org-collector to display heading indentation by passing ':indent t' to the propview block.
Date: Sun, 1 Apr 2012 01:59:27 +0200 [thread overview]
Message-ID: <1333238367-27755-2-git-send-email-girard.nicolas@gmail.com> (raw)
In-Reply-To: <1333238367-27755-1-git-send-email-girard.nicolas@gmail.com>
---
contrib/lisp/org-collector.el | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el
index da612e9..2f5e598 100644
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
@@ -91,6 +91,7 @@
;;; Code:
(require 'org)
+(require 'org-clock)
(require 'org-table)
(defvar org-propview-default-value 0
@@ -98,6 +99,11 @@
value is calculated either through lack of required variables for
a column, or through the generation of an error.")
+(defvar org-propview-indent-function 'org-clocktable-indent-string
+ "A function called with the heading level. Should return a
+string which will be concatenated to the ITEM property when
+':indent t' is passed to the propview block.")
+
(defun and-rest (list)
(if (listp list)
(if (> (length list) 1)
@@ -121,6 +127,7 @@ preceeding the dblock, then update the contents of the dblock."
(scope (plist-get params :scope))
(noquote (plist-get params :noquote))
(colnames (plist-get params :colnames))
+ (indent (plist-get params :indent))
(content-lines (org-split-string (plist-get params :content) "\n"))
id table line pos)
(save-excursion
@@ -134,8 +141,8 @@ preceeding the dblock, then update the contents of the dblock."
(org-narrow-to-subtree)
(setq stringformat (if noquote "%s" "%S"))
(setq table (org-propview-to-table
- (org-propview-collect cols stringformat conds match scope inherit
- (if colnames colnames cols)) stringformat))
+ (org-propview-collect cols stringformat conds match scope inherit
+ (if colnames colnames cols) indent) stringformat))
(widen))
(setq pos (point))
(when content-lines
@@ -171,14 +178,19 @@ variables and values specified in props"
(when p (cons n p))))
inherit))))
-(defun org-propview-collect (cols stringformat &optional conds match scope inherit colnames)
+(defun org-propview-collect (cols stringformat &optional conds match scope inherit colnames indent)
(interactive)
;; collect the properties from every header
(let* ((header-props
(let ((org-trust-scanner-tags t) alst)
(org-map-entries
- (quote (cons (cons "ITEM" (org-get-heading t))
- (org-propview-get-with-inherited inherit)))
+ (quote
+ (cons (cons "ITEM"
+ (let ((item (org-get-heading t))
+ (level (org-current-level)))
+ (concat
+ (funcall org-propview-indent-function level) item)))
+ (org-propview-get-with-inherited inherit)))
match scope)))
;; read property values
(header-props
--
1.7.8.rc1
next prev parent reply other threads:[~2012-04-01 0:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <girard.nicolas@gmail.com>
2012-03-30 19:43 ` [PATCH] Allow org-collector to display heading indentation Nicolas Girard
2012-03-30 19:52 ` Achim Gratz
2012-03-30 19:52 ` Nick Dokos
2012-03-30 20:55 ` Nicolas Girard
2012-03-31 6:57 ` Sebastien Vauban
2012-03-31 23:58 ` Nicolas Girard
2012-03-31 23:59 ` [PATCH 1/2] Simplify org-clocktable-indent-string Nicolas Girard
2012-03-31 23:59 ` Nicolas Girard [this message]
2012-04-02 16:56 ` [PATCH 2/2] Allow org-collector to display heading indentation by passing ':indent t' to the propview block Bastien
2012-04-20 11:12 ` Bastien
2012-04-20 11:12 ` [PATCH 1/2] Simplify org-clocktable-indent-string Bastien
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=1333238367-27755-2-git-send-email-girard.nicolas@gmail.com \
--to=girard.nicolas@gmail.com \
--cc=emacs-orgmode@gnu.org \
--subject='Re: [PATCH 2/2] Allow org-collector to display heading indentation by passing '\'':indent t'\'' to the propview block.' \
/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
Code repositories for project(s) associated with this 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).