summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-06-19 00:41:52 +0000
committerCarsten Dominik <carsten.dominik@gmail.com>2010-06-30 15:34:04 +0200
commit23b13749f667402a821b0fef05adbce8e48c9ce1 (patch)
treedc38d6e55c82fba06e080cc341614b3be5232329
parent798ebf518baefa538e0a645cb12c9f994e6beb88 (diff)
downloadorg-mode-23b13749f667402a821b0fef05adbce8e48c9ce1.tar.gz
remove newline characters from the contents of table cells
This patch changes the functionality of orgtbl-to-orgtbl so that it will remove newline characters from the text of table cells and replace them with "\n". This protects the final table from such newlines. This patch will probably only have any noticeable effect for tables imported form external files, or from the results of code blocks. Best -- Eric >From 34aacc9aa037e8f17c8d32ed61a25f0a350713a0 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Fri, 18 Jun 2010 12:38:26 -0700 Subject: [PATCH] org-table: will now strip newlines from the text of table cells * lisp/org-table.el (orgtbl-to-generic): added the :remove-newlines option which will strip newline characters from the text of table cells and replace then with "\n" (orgtbl-to-orgtbl): now using the new :remove-newlines option to orgtbl-to-generic
-rw-r--r--lisp/org-table.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el
index f6b77aa..cd7642e 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4119,6 +4119,7 @@ directly by `orgtbl-send-table'. See manual."
(let* ((splicep (plist-get params :splice))
(hline (plist-get params :hline))
(remove-nil-linesp (plist-get params :remove-nil-lines))
+ (remove-newlines (plist-get params :remove-newlines))
(*orgtbl-hline* hline)
(*orgtbl-table* table)
(*orgtbl-sep* (plist-get params :sep))
@@ -4173,9 +4174,13 @@ directly by `orgtbl-send-table'. See manual."
(let ((tend (orgtbl-eval-str (plist-get params :tend))))
(if tend (push tend *orgtbl-rtn*)))))
- (mapconcat 'identity (nreverse (if remove-nil-linesp
- (remq nil *orgtbl-rtn*)
- *orgtbl-rtn*)) "\n")))
+ (mapconcat (if remove-newlines
+ (lambda (tend)
+ (replace-regexp-in-string "[\n\r\t\f]" "\\\\n" tend))
+ 'identity)
+ (nreverse (if remove-nil-linesp
+ (remq nil *orgtbl-rtn*)
+ *orgtbl-rtn*)) "\n")))
(defun orgtbl-to-tsv (table params)
"Convert the orgtbl-mode table to TAB separated material."
@@ -4301,6 +4306,7 @@ and :tend suppress strings without splicing; they can be set to
provide ORGTBL directives for the generated table."
(let* ((params2
(list
+ :remove-newlines t
:tstart nil :tend nil
:hline "|---"
:sep " | "