瀏覽代碼

ox-latex: Use "ulem" package for both underline and strike through

* lisp/org.el (org-latex-default-packages-alist): Load "ulem" package
  by default.  Use "[normalem]" option to preserve \emph definition.
* lisp/ox-latex.el (org-latex-text-markup-alist): Use "\uline" and
  "\sout" commands from "ulem" package.
Nicolas Goaziou 13 年之前
父節點
當前提交
4fc03ec1fe
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      lisp/org.el
  2. 2 2
      lisp/ox-latex.el

+ 2 - 2
lisp/org.el

@@ -3805,7 +3805,7 @@ header, or they will be appended."
     (""     "longtable" nil)
     (""     "longtable" nil)
     (""     "float"     nil)
     (""     "float"     nil)
     (""     "wrapfig"   nil)
     (""     "wrapfig"   nil)
-    (""     "soul"      t)
+    ("normalem" "ulem"  t)
     (""     "textcomp"  t)
     (""     "textcomp"  t)
     (""     "marvosym"  t)
     (""     "marvosym"  t)
     (""     "wasysym"   t)
     (""     "wasysym"   t)
@@ -3828,7 +3828,7 @@ Org mode to function properly:
   symbols used for interpreting the entities in `org-entities'.
   symbols used for interpreting the entities in `org-entities'.
   You can skip some of these packages if you don't use any of the
   You can skip some of these packages if you don't use any of the
   symbols in it.
   symbols in it.
-- soul: for underline and strike-through
+- ulem: for underline and strike-through
 - graphicx: for including images
 - graphicx: for including images
 - float, wrapfig: for figure placement
 - float, wrapfig: for figure placement
 - longtable: for long tables
 - longtable: for long tables

+ 2 - 2
lisp/ox-latex.el

@@ -524,8 +524,8 @@ When nil, no transformation is made."
 (defcustom org-latex-text-markup-alist '((bold . "\\textbf{%s}")
 (defcustom org-latex-text-markup-alist '((bold . "\\textbf{%s}")
 					 (code . verb)
 					 (code . verb)
 					 (italic . "\\emph{%s}")
 					 (italic . "\\emph{%s}")
-					 (strike-through . "\\st{%s}")
-					 (underline . "\\ul{%s}")
+					 (strike-through . "\\sout{%s}")
+					 (underline . "\\uline{%s}")
 					 (verbatim . protectedtexttt))
 					 (verbatim . protectedtexttt))
   "Alist of LaTeX expressions to convert text markup.
   "Alist of LaTeX expressions to convert text markup.