From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric Schulte" Subject: [PATCH] remove newline characters from the contents of table cells Date: Fri, 18 Jun 2010 12:41:52 -0700 Message-ID: <87eig4dt6n.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from [140.186.70.92] (port=40308 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPhRw-0007Az-GP for emacs-orgmode@gnu.org; Fri, 18 Jun 2010 15:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPhRv-0006Lm-7I for emacs-orgmode@gnu.org; Fri, 18 Jun 2010 15:42:00 -0400 Received: from mail-pw0-f41.google.com ([209.85.160.41]:63607) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPhRu-0006LY-VN for emacs-orgmode@gnu.org; Fri, 18 Jun 2010 15:41:59 -0400 Received: by pwi7 with SMTP id 7so1448546pwi.0 for ; Fri, 18 Jun 2010 12:41:57 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode --=-=-= 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-org-table-will-now-strip-newlines-from-the-text-of-t.patch >From 34aacc9aa037e8f17c8d32ed61a25f0a350713a0 Mon Sep 17 00:00:00 2001 From: Eric Schulte 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 --- lisp/org-table.el | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index 46efc28..e81a855 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 " | " -- 1.7.0.4 --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --=-=-=--