From 09886e4f828ca01540c157c4b7f3ec47be21a5e5 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Thu, 25 Feb 2010 10:44:25 -0700 Subject: [PATCH 1/8] org-plot: now produces more intelligent output when empty lines look like text columns --- lisp/org-plot.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org-plot.el b/lisp/org-plot.el index 4cf89b016..6ffba99a3 100644 --- a/lisp/org-plot.el +++ b/lisp/org-plot.el @@ -250,8 +250,10 @@ manner suitable for prepending to a user-specified script." (setf plot-lines (cons (format plot-str data-file - (or (and (not text-ind) ind - (> ind 0) (format "%d:" ind)) "") + (or (and ind (> ind 0) + (not (or (equal 'histograms (plist-get params :with)) + (equal 'hist (plist-get params :with)))) + (format "%d:" ind)) "") (+ 1 col) (if text-ind (format ":xticlabel(%d)" ind) "") with @@ -320,7 +322,6 @@ line directly before or after the table." (mapcar (lambda (row) (nth ind row)) table)))) 0) (plist-put params :timeind t) ;; check for text ind column - (if (or (string= (plist-get params :with) "hist") (> (length (delq 0 (mapcar From 6f62066ac67d37d77e06f3f0a1b43a79ea8aec9c Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 25 Feb 2010 15:12:47 -0500 Subject: [PATCH 2/8] babel: Fix export bug. Introduced at 747f425f0036bb734329f6c45b8c2a71eb1ccf06 --- contrib/babel/lisp/org-babel-exp.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/babel/lisp/org-babel-exp.el b/contrib/babel/lisp/org-babel-exp.el index 0a37a6284..c7b81a61e 100644 --- a/contrib/babel/lisp/org-babel-exp.el +++ b/contrib/babel/lisp/org-babel-exp.el @@ -142,7 +142,8 @@ options are taken from `org-babel-default-header-args'." (list 'org-caption (format "%s(%s)" name (mapconcat #'identity args ", "))) - str) str))) + str)) + str)) ('lob (let ((call-line (and (string-match "results=" (car args)) (substring (car args) (match-end 0))))) From a95c05773e503cc8f420ab3ce41bc71c480c263d Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 19 Feb 2010 11:34:16 -0500 Subject: [PATCH 3/8] babel: Fix unquoting of strings Before this change we have #+begin_src ruby :results value :session ["1", "3"] #+end_src #+results: : 1", "3 After, we have #+begin_src ruby :results value :session ["1", "3"] #+end_src #+results: | 1 | 3 | --- contrib/babel/lisp/langs/org-babel-haskell.el | 2 +- contrib/babel/lisp/langs/org-babel-python.el | 4 ++-- contrib/babel/lisp/langs/org-babel-ruby.el | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/babel/lisp/langs/org-babel-haskell.el b/contrib/babel/lisp/langs/org-babel-haskell.el index 2ce98c490..88916334d 100644 --- a/contrib/babel/lisp/langs/org-babel-haskell.el +++ b/contrib/babel/lisp/langs/org-babel-haskell.el @@ -81,7 +81,7 @@ (defun org-babel-haskell-read-string (string) "Strip \\\"s from around haskell string" - (if (string-match "\"\\([^\000]+\\)\"" string) + (if (string-match "^\"\\([^\000]+\\)\"$" string) (match-string 1 string) string)) diff --git a/contrib/babel/lisp/langs/org-babel-python.el b/contrib/babel/lisp/langs/org-babel-python.el index 388fa655a..ad6859aef 100644 --- a/contrib/babel/lisp/langs/org-babel-python.el +++ b/contrib/babel/lisp/langs/org-babel-python.el @@ -208,8 +208,8 @@ last statement in BODY, as elisp." (org-babel-python-table-or-string (org-babel-trim (car results)))))))))) (defun org-babel-python-read-string (string) - "Strip 's from around ruby string" - (if (string-match "'\\([^\000]+\\)'" string) + "Strip 's from around python string" + (if (string-match "^'\\([^\000]+\\)'$" string) (match-string 1 string) string)) diff --git a/contrib/babel/lisp/langs/org-babel-ruby.el b/contrib/babel/lisp/langs/org-babel-ruby.el index 27de42f4a..1cac05cb3 100644 --- a/contrib/babel/lisp/langs/org-babel-ruby.el +++ b/contrib/babel/lisp/langs/org-babel-ruby.el @@ -202,7 +202,7 @@ last statement in BODY, as elisp." (defun org-babel-ruby-read-string (string) "Strip \\\"s from around ruby string" - (if (string-match "\"\\([^\000]+\\)\"" string) + (if (string-match "^\"\\([^\000]+\\)\"$" string) (match-string 1 string) string)) From fc693eb5e2b895c7c1582446d9b6aa39ef64b837 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 19 Feb 2010 11:46:36 -0500 Subject: [PATCH 4/8] babel: treat python tuples as lists --- contrib/babel/lisp/langs/org-babel-python.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/babel/lisp/langs/org-babel-python.el b/contrib/babel/lisp/langs/org-babel-python.el index ad6859aef..aaf58a0a1 100644 --- a/contrib/babel/lisp/langs/org-babel-python.el +++ b/contrib/babel/lisp/langs/org-babel-python.el @@ -91,10 +91,11 @@ specifying a var of the same value." (format "%S" var))) (defun org-babel-python-table-or-string (results) - "If the results look like a table, then convert them into an + "If the results look like a list or tuple, then convert them into an Emacs-lisp table, otherwise return the results as a string." (org-babel-read - (if (string-match "^\\[.+\\]$" results) + (if (or (string-match "^\\[.+\\]$" results) + (string-match "^(.+)$" results)) (org-babel-read (replace-regexp-in-string "\\[" "(" (replace-regexp-in-string From 4064c31fa7a12389a85a753066ba3c2775658926 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Wed, 24 Feb 2010 13:23:28 -0500 Subject: [PATCH 5/8] babel: get rid of unused variable --- contrib/babel/lisp/langs/org-babel-gnuplot.el | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/babel/lisp/langs/org-babel-gnuplot.el b/contrib/babel/lisp/langs/org-babel-gnuplot.el index 5af344dca..6ab753c71 100644 --- a/contrib/babel/lisp/langs/org-babel-gnuplot.el +++ b/contrib/babel/lisp/langs/org-babel-gnuplot.el @@ -79,7 +79,6 @@ called by `org-babel-execute-src-block'." (term (or (cdr (assoc :term params)) (when out-file (file-name-extension out-file)))) (cmdline (cdr (assoc :cmdline params))) - (in-file (make-temp-file "org-babel-ditaa")) (title (plist-get params :title)) (lines (plist-get params :line)) (sets (plist-get params :set)) From 5833fbd358e35ed7e29260940f811ce9c017ac79 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Wed, 24 Feb 2010 15:51:00 -0500 Subject: [PATCH 6/8] babel: Make colnames header arg expect use "yes" for true. --- contrib/babel/lisp/langs/org-babel-R.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/babel/lisp/langs/org-babel-R.el b/contrib/babel/lisp/langs/org-babel-R.el index 1fe282625..67d0f41e3 100644 --- a/contrib/babel/lisp/langs/org-babel-R.el +++ b/contrib/babel/lisp/langs/org-babel-R.el @@ -44,7 +44,8 @@ called by `org-babel-execute-src-block'." (result-type (fourth processed-params)) (session (org-babel-R-initiate-session (first processed-params))) (vars (second processed-params)) - (column-names-p (cdr (assoc :colnames params))) + (column-names-p (and (cdr (assoc :colnames params)) + (string= "yes" (cdr (assoc :colnames params))))) (out-file (cdr (assoc :file params))) (augmented-body (concat From 82d758581071702d23be710244f2708ecf7e826b Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 25 Feb 2010 17:46:55 -0500 Subject: [PATCH 7/8] babel: Tighten result and source line regexps Anchored to beginning of line, with optional whitespace indenting. --- contrib/babel/lisp/org-babel.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/babel/lisp/org-babel.el b/contrib/babel/lisp/org-babel.el index 7fe4302d9..40ab33bd1 100644 --- a/contrib/babel/lisp/org-babel.el +++ b/contrib/babel/lisp/org-babel.el @@ -94,13 +94,13 @@ then run `org-babel-pop-to-session'." "Regexp used to test when on an inline org-babel src-block") (defvar org-babel-result-regexp - "#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:" + "^[ \t]*#\\+res\\(ults\\|name\\)\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:" "Regular expression used to match result lines. If the results are associated with a hash key then the hash will be saved in the second match data.") (defvar org-babel-source-name-regexp - "#\\+\\(srcname\\|source\\|function\\):[ \t]*" + "^[ \t]*#\\+\\(srcname\\|source\\|function\\):[ \t]*" "Regular expression used to match a source name line.") (defvar org-babel-min-lines-for-block-output 10 @@ -202,6 +202,7 @@ block." (if (and (cdr (assoc :noweb params)) (string= "yes" (cdr (assoc :noweb params)))) (org-babel-expand-noweb-references info) (second info)))) + (result-params (split-string (or (cdr (assoc :results params)) ""))) (result-type (cond ((member "output" result-params) 'output) ((member "value" result-params) 'value) From 826e34d55b9140f44d1c081f377f8f4a84f71a63 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Thu, 25 Feb 2010 21:18:55 -0700 Subject: [PATCH 8/8] org-beamer-fragile-re now notices lstlisting environments as well as verbatim --- lisp/org-beamer.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el index 615018712..b196c1c3d 100644 --- a/lisp/org-beamer.el +++ b/lisp/org-beamer.el @@ -386,7 +386,7 @@ the value will be inserted right after the documentclass statement." (insert org-beamer-header-extra) (or (bolp) (insert "\n")))))) -(defcustom org-beamer-fragile-re "^[ \t]*\\\\begin{verbatim}" +(defcustom org-beamer-fragile-re "^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\)}" "If this regexp matches in a frame, the frame is marked as fragile." :group 'org-beamer :type 'regexp)