mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-27 20:22:00 +00:00
Code

LaTeX export: Make sure \nbsp{} does not create additional space

Browse Source 
* lisp/org-latex.el (org-export-latex-preprocess): Make a special case for \nbsp.
(org-latex-entities): Remove the entry for \nbsp.
(org-latex-entities-exceptions): Variable removed.
This commit is contained in:
Carsten Dominik 2010-07-14 10:54:39 +02:00
parent cb1ab577a2
commit 065468451e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lisp/org-latex.el
View File

@ -1994,7 +1994,6 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
s))
(defvar org-latex-entities) ; defined below
(defvar org-latex-entities-regexp) ; defined below
(defvar org-latex-entities-exceptions) ; defined below
(defun org-export-latex-preprocess (parameters)
"Clean stuff in the LaTeX export."
@ -2108,15 +2107,18 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(add-text-properties (match-beginning 0) (match-end 0)
'(org-protected t)))))
;; Special case for \nbsp
(goto-char (point-min))
(while (re-search-forward "\\\\nbsp\\({}\\|\\>\\)" nil t)
(org-if-unprotected
(replace-match (org-export-latex-protect-string "~"))))
;; Protect LaTeX entities
(goto-char (point-min))
(let (a)
(while (re-search-forward org-latex-entities-regexp nil t)
(if (setq a (assoc (match-string 0) org-latex-entities-exceptions))
(replace-match (org-add-props (nth 1 a) nil 'org-protected t)
t t)
(add-text-properties (match-beginning 0) (match-end 0)
'(org-protected t)))))
(while (re-search-forward org-latex-entities-regexp nil t)
(org-if-unprotected
(add-text-properties (match-beginning 0) (match-end 0)
'(org-protected t))))
;; Replace radio links
(goto-char (point-min))
@ -2331,7 +2333,6 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
"\\medskip"
"\\multicolumn"
"\\multiput"
("\\nbsp" "~")
"\\newcommand"
"\\newcounter"
"\\newenvironment"
@ -2403,14 +2404,9 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
"\\vspace")
"A list of LaTeX commands to be protected when performing conversion.")
(defvar org-latex-entities-exceptions nil)
(defconst org-latex-entities-regexp
(let (names rest)
(dolist (x org-latex-entities)
(when (consp x)
(add-to-list 'org-latex-entities-exceptions x)
(setq x (car x)))
(if (string-match "[a-zA-Z]$" x)
(push x names)
(push x rest)))