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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-06-09 11:14:28 +02:00
parent 374a08b950 84de2396c3
commit efccedbf65
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org.el
View File

@ -3837,6 +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
- 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
lisp/ox-latex.el
View File

@ -525,7 +525,7 @@ When nil, no transformation is made."
(code . verb) (code . verb)
(italic . "\\emph{%s}") (italic . "\\emph{%s}")
(strike-through . "\\st{%s}") (strike-through . "\\st{%s}")
(underline . "\\underline{%s}") (underline . "\\ul{%s}")
(verbatim . protectedtexttt)) (verbatim . protectedtexttt))
"Alist of LaTeX expressions to convert text markup. "Alist of LaTeX expressions to convert text markup.