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

LaTeX Export: Fix problem with alignment specs that contain a comma

This commit is contained in:
Carsten Dominik 2010-05-14 14:27:35 +02:00
parent 9a72345b0f
commit 9a1612410f
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2010-05-14 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables): Accept comma in
align string.
* org-docbook.el (org-export-docbook-xslt-stylesheet): New option.
(org-export-docbook-xslt-proc-command): Fix docstring.
(org-export-docbook-xsl-fo-proc-command): Fix docstring.

6
lisp/org-latex.el
View File

@ -1327,7 +1327,7 @@ links, keywords, lists, tables, fixed-width"
(unless (or
;; check for comment line
(save-excursion (goto-char (match-beginning 0))
(equal (char-after (point-at-bol)) ?#))
(org-in-indented-comment-line))
;; Check if this is a defined entity, so that is may need conversion
(org-entity-get (match-string 1)))
(add-text-properties (match-beginning 0) (match-end 0)
@ -1592,7 +1592,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
longtblp (and attr (stringp attr)
(string-match "\\<longtable\\>" attr))
align (and attr (stringp attr)
(string-match "\\<align=\\([^ \t\n\r,]+\\)" attr)
(string-match "\\<align=\\([^ \t\n\r]+\\)" attr)
(match-string 1 attr))
floatp (or caption label))
(setq caption (and caption (org-export-latex-fontify-headline caption)))
@ -2068,7 +2068,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(unless (or
;; check for comment line
(save-excursion (goto-char (match-beginning 0))
(equal (char-after (point-at-bol)) ?#))
(org-in-indented-comment-line))
;; Check if this is a defined entity, so that is may need conversion
(org-entity-get (match-string 1))
)

7
lisp/org.el
View File

@ -17234,6 +17234,13 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
"Is point in a line starting with `#'?"
(equal (char-after (point-at-bol)) ?#))
(defun org-in-indented-comment-line ()
"Is point in a line starting with `#' after some white space?"
(save-excursion
(save-match-data
(goto-char (point-at-bol))
(looking-at "[ \t]*#"))))
(defun org-in-verbatim-emphasis ()
(save-match-data
(and (org-in-regexp org-emph-re 2) (member (match-string 3) '("=" "~")))))