Browse Source

Merge branch 'maint'

Nicolas Goaziou 12 years ago
parent
commit
7346dbe79b
2 changed files with 4 additions and 4 deletions
  1. 2 2
      lisp/org.el
  2. 2 2
      lisp/ox-latex.el

+ 2 - 2
lisp/org.el

@@ -3814,7 +3814,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)
@@ -3837,7 +3837,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

@@ -529,8 +529,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.