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

pushed the parsing of org tables fully into litorgy-reference.el 

This had the benefit of removing the wrapping list which was
previously erroneously added.
This commit is contained in:
Eric Schulte 2009-03-25 15:24:00 -07:00
parent c294d0119d
commit 01c958f167
2 changed files with 42 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
litorgy/litorgy-lisp.el
View File

@ -39,48 +39,10 @@ function is called by `litorgy-execute-src-block'."
(save-window-excursion
(let ((vars (litorgy-reference-variables params))
(print-level nil) (print-length nil) results)
(message "prefix")
(message (format "-%S-" body))
(message (format "%S" (stringp body)))
(message (format "vars = %S" vars))
(setq vars (mapcar (lambda (pair)
(list (intern (car pair))
(mapcar (lambda (row)
(mapcar #'litorgy-read-cell row))
(cdr pair))))
vars))
(message (format "let = %S" vars))
;; need to find a way of assigning the variables in vars for the
;; context in which body is executed
(message "executing emacs-lisp code block...")
(format "%S"
(eval `(let ,(mapcar (lambda (var)
`(,(car var) ',(cdr var)))
vars)
(message "inside")
(message (format "- %S -" table))
(message (format "- %S -" body))
(eval `(let ,(mapcar (lambda (var) `(,(car var) ',(cdr var))) vars)
,(read body)))))))
(defun litorgy-read-cell (cell)
"Convert the string value of CELL to a number if appropriate.
Otherwise if cell looks like a list (meaning it starts with a
'(') then read it as lisp, otherwise return it unmodified as a
string.
This is taken almost directly from `org-read-prop'."
(if (and (stringp cell) (not (equal cell "")))
(let ((out (string-to-number cell)))
(if (equal out 0)
(if (or (equal "(" (substring cell 0 1))
(equal "'" (substring cell 0 1)))
(read cell)
(if (string-match "^\\(+0\\|-0\\|0\\)$" cell)
0
(progn (set-text-properties 0 (length cell) nil cell)
cell)))
out))
cell))
(provide 'litorgy-lisp)
;;; litorgy-lisp.el ends here

59
litorgy/litorgy-reference.el
View File

@ -53,6 +53,26 @@
;;; Code:
(require 'litorgy)
(defun litorgy-read-cell (cell)
"Convert the string value of CELL to a number if appropriate.
Otherwise if cell looks like a list (meaning it starts with a
'(') then read it as lisp, otherwise return it unmodified as a
string.
This is taken almost directly from `org-read-prop'."
(if (and (stringp cell) (not (equal cell "")))
(let ((out (string-to-number cell)))
(if (equal out 0)
(if (or (equal "(" (substring cell 0 1))
(equal "'" (substring cell 0 1)))
(read cell)
(if (string-match "^\\(+0\\|-0\\|0\\)$" cell)
0
(progn (set-text-properties 0 (length cell) nil cell)
cell)))
out))
cell))
(defun litorgy-reference-variables (params)
"Takes a parameter alist, and return an alist of variable
names, and the string representation of the related value."
@ -72,24 +92,27 @@ representation of the value of the variable."
(when (string-match "\\(.+\\):\\(.+\\)" reference)
(find-file (match-string 1 reference))
(setf ref (match-string 2 reference)))
(cons var (progn
(cond ;; follow the reference in the current file
((string= ref "previous") (setq direction -1))
((string= ref "next") (setq direction 1))
(t
(goto-char (point-min))
(setq direction 1)
(unless (re-search-forward
(concat "^#\\+TBLNAME:[ \t]*" (regexp-quote ref) "[ \t]*$") nil t)
(setq id-loc (org-id-find name-or-id 'marker)
buffer (marker-buffer id-loc)
loc (marker-position id-loc))
(move-marker id-loc nil))))
(while (not (org-at-table-p))
(forward-line direction)
(if (or (= (point) (point-min)) (= (point) (point-max)))
(error "no table found")))
(org-table-to-lisp)))))))
(cons (intern var)
(progn
(cond ;; follow the reference in the current file
((string= ref "previous") (setq direction -1))
((string= ref "next") (setq direction 1))
(t
(goto-char (point-min))
(setq direction 1)
(unless (re-search-forward
(concat "^#\\+TBLNAME:[ \t]*" (regexp-quote ref) "[ \t]*$") nil t)
(setq id-loc (org-id-find name-or-id 'marker)
buffer (marker-buffer id-loc)
loc (marker-position id-loc))
(move-marker id-loc nil))))
(while (not (org-at-table-p))
(forward-line direction)
(if (or (= (point) (point-min)) (= (point) (point-max)))
(error "no table found")))
(mapcar (lambda (row)
(mapcar #'litorgy-read-cell row))
(org-table-to-lisp))))))))
(provide 'litorgy-reference)
;;; litorgy-reference.el ends here