ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stuff for org-exp-blocks.el

This commit is contained in:
Carsten Dominik 2009-06-17 18:16:26 +02:00
parent cdb13c76e4
commit 0cd85674a5
4 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-06-17 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (LISPF): Add org-exp-blocks.el.
(lisp/org-exp-blocks.elc): Add dependencies for
org-exp-blocks.el.
2009-03-31 Carsten Dominik <carsten.dominik@gmail.com>
* Makefile (LISPF): Add org-inlinetask.el

2
Makefile
View File

@ -70,6 +70,7 @@ LISPF = org.el \
org-colview-xemacs.el \
org-compat.el \
org-exp.el \
org-exp-blocks.el \
org-docbook.el \
org-faces.el \
org-feed.el \
@ -338,6 +339,7 @@ lisp/org-colview.elc: lisp/org.el
lisp/org-colview-xemacs.elc: lisp/org.el
lisp/org-compat.elc: lisp/org-macs.el
lisp/org-exp.elc: lisp/org.el lisp/org-agenda.el
lisp/org-exp-blocks.elc: lisp/org.el
lisp/org-latex.elc: lisp/org.el lisp/org-exp.el
lisp/org-docbook.elc: lisp/org.el lisp/org-exp.el
lisp/org-faces.elc: lisp/org-macs.el lisp/org-compat.el

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2009-06-17 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp-blocks.el: Declare functions and variables.
* org-remember.el (org-remember-templates): Allow the headline
element to be a function.
(org-remember-apply-template): If the headline is a function, call

46
lisp/org-exp-blocks.el
View File

@ -74,7 +74,18 @@
(require 'org)
(defun org-exp-blocks-set (var value)
(defvar comint-last-input-end)
(defvar comint-prompt-regexp)
(defvar comint-last-input-end)
(defvar htmlp)
(defvar latexp)
(defvar docbookp)
(defvar asciip)
(declare-function comint-send-input "comint" (&optional no-newline artificial))
(declare-function R "ess" nil)
(defun org-export-blocks-set (var value)
"Set the value of `org-export-blocks' and install fontification."
(set var value)
(mapc (lambda (spec)
@ -86,21 +97,6 @@
(symbol-name (car spec)))))
value))
(defun org-export-blocks-add-block (block-spec)
"Add a new block type to `org-export-blocks'. BLOCK-SPEC
should be a three element list the first element of which should
indicate the name of the block, the second element should be the
formatting function called by `org-export-blocks-preprocess' and
the third element a flag indicating whether these types of blocks
should be fontified in org-mode buffers (see
`org-protecting-blocks'). For example the BLOCK-SPEC for ditaa
blocks is as follows...
(ditaa org-export-blocks-format-ditaa nil)"
(unless (member block-spec org-export-blocks)
(setq org-export-blocks (cons block-spec org-export-blocks))
(org-export-blocks-set 'org-export-blocks)))
(defcustom org-export-blocks
'((comment org-export-blocks-format-comment t)
(ditaa org-export-blocks-format-ditaa nil)
@ -117,7 +113,22 @@ Each block export function should accept three argumets..."
(symbol :tag "Block name")
(function :tag "Block formatter")
(boolean :tag "Fontify content as Org syntax")))
:set 'org-exp-blocks-set)
:set 'org-export-blocks-set)
(defun org-export-blocks-add-block (block-spec)
"Add a new block type to `org-export-blocks'. BLOCK-SPEC
should be a three element list the first element of which should
indicate the name of the block, the second element should be the
formatting function called by `org-export-blocks-preprocess' and
the third element a flag indicating whether these types of blocks
should be fontified in org-mode buffers (see
`org-protecting-blocks'). For example the BLOCK-SPEC for ditaa
blocks is as follows...
(ditaa org-export-blocks-format-ditaa nil)"
(unless (member block-spec org-export-blocks)
(setq org-export-blocks (cons block-spec org-export-blocks))
(org-export-blocks-set 'org-export-blocks org-export-blocks)))
(defcustom org-export-interblocks
'((r org-export-interblocks-format-R)
@ -308,6 +319,7 @@ other backends, it converts the comment into an EXAMPLE segment."
(defvar interblock-R-buffer nil
"Holds the buffer for the current R process")
(defvar count) ; dynamicaly scoped from `org-export-blocks-preprocess'?
(defun org-export-blocks-format-R (body &rest headers)
"Process R blocks and replace \R{} forms outside the blocks
with their values as determined by R."