diff --git a/contrib/lisp/org-lparse.el b/contrib/lisp/org-lparse.el index 6e391c88f..39d94036e 100755 --- a/contrib/lisp/org-lparse.el +++ b/contrib/lisp/org-lparse.el @@ -1367,7 +1367,7 @@ form (FIELD1 FIELD2 FIELD3 ...) as appropriate." (push (org-split-string line "[ \t]*|[ \t]*") lines-1)))))) (nreverse lines-1))) -(defun org-lparse-do-format-org-table (lines &optional splice) +(defun org-lparse-insert-org-table (lines &optional splice) "Format a org-type table into backend-specific code. LINES is a list of lines. Optional argument SPLICE means, do not insert header and surrounding tags, just format the lines. @@ -1394,10 +1394,10 @@ for formatting. This is required for the DocBook exporter." (lambda (x) (string-match "^[ \t]*|-" x)) (cdr lines)))))) (setq lines (org-lparse-org-table-to-list-table lines splice)) - (org-lparse-do-format-list-table + (org-lparse-insert-list-table lines splice caption label attributes head org-lparse-table-colalign-info))) -(defun org-lparse-do-format-list-table (lines &optional splice +(defun org-lparse-insert-list-table (lines &optional splice caption label attributes head org-lparse-table-colalign-info) (or (featurep 'org-table) ; required for @@ -1433,15 +1433,15 @@ for formatting. This is required for the DocBook exporter." (defun org-lparse-format-org-table (lines &optional splice) (with-temp-buffer - (org-lparse-do-format-org-table lines splice) + (org-lparse-insert-org-table lines splice) (buffer-substring-no-properties (point-min) (point-max)))) (defun org-lparse-format-list-table (lines &optional splice) (with-temp-buffer - (org-lparse-do-format-list-table lines splice) + (org-lparse-insert-list-table lines splice) (buffer-substring-no-properties (point-min) (point-max)))) -(defun org-lparse-do-format-table-table (lines) +(defun org-lparse-insert-table-table (lines) "Format a table generated by table.el into backend-specific code. This conversion does *not* use `table-generate-source' from table.el. This has the advantage that Org-mode's HTML conversions can be used. @@ -1481,7 +1481,7 @@ But it has the disadvantage, that no cell- or row-spanning is allowed." (defun org-lparse-format-table-table (lines) (with-temp-buffer - (org-lparse-do-format-table-table lines) + (org-lparse-insert-table-table lines) (buffer-substring-no-properties (point-min) (point-max)))) (defvar table-source-languages) ; defined in table.el diff --git a/contrib/lisp/org-odt.el b/contrib/lisp/org-odt.el index e7cf978ae..53bd99372 100644 --- a/contrib/lisp/org-odt.el +++ b/contrib/lisp/org-odt.el @@ -1059,7 +1059,7 @@ value of `org-export-odt-use-htmlfontify." width height href) (with-temp-buffer (let ((org-lparse-table-colalign-info '((0 "c" "8") (0 "c" "1")))) - (org-lparse-do-format-list-table + (org-lparse-insert-list-table `((,(org-export-odt-do-format-formula ; caption and label ; should be nil embed-as nil attr nil width height href)