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

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2012-03-20 16:29:31 +01:00
parent c6442dac9c b137bc4eae
commit d22ffc23d0
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
doc/org.texi
View File

@ -11250,30 +11250,21 @@ or
@subsection Literal examples in ODT export @subsection Literal examples in ODT export
Export of literal examples (@pxref{Literal examples}) with full fontification Export of literal examples (@pxref{Literal examples}) with full fontification
is supported. This feature is enabled by default and is activated is supported. Internally, the exporter relies on @file{htmlfontify.el} to
automatically if an enhanced version of @file{htmlfontify.el} is available in generate all style definitions needed for a fancy listing.@footnote{Your
the @code{load-path}.@footnote{The @file{htmlfontify.el} that ships with @file{htmlfontify.el} library must atleast be at Emacs 24.1 levels for
standard Emacs <= 24.1 has no support for ODT fontification. A fontification to be turned on.} The auto-generated styles have @samp{OrgSrc}
copy of the proposed version is available as an attachment to as prefix and inherit their color from the faces used by Emacs
@url{http://debbugs.gnu.org/cgi/bugreport.cgi?msg=5;filename=htmlfontify.el;att=9;bug=9914, @code{font-lock} library for the source language.
Emacs Bug #9914}.}
@vindex org-export-odt-fontify-srcblocks @vindex org-export-odt-fontify-srcblocks
If you prefer to use your own custom styles for fontification, you can do so
The character styles used for fontification of the literal blocks are by customizing the variable
auto-generated by the exporter in conjunction with @file{htmlfontify.el}
library and need not be included in the default @file{styles.xml} file.
These auto-generated styles have the @samp{OrgSrc} prefix and inherit their color
based on the face used by Emacs @code{font-lock} library.
@vindex org-export-odt-create-custom-styles-for-srcblocks
If you prefer to use your own custom styles for fontification and disable
their auto-generation altogether, you can do so by customizing the variable
@code{org-export-odt-create-custom-styles-for-srcblocks}. @code{org-export-odt-create-custom-styles-for-srcblocks}.
You can turn off fontification support for literal examples by customizing @vindex org-export-odt-create-custom-styles-for-srcblocks
the variable @code{org-export-odt-fontify-srcblocks}. You can turn off fontification of literal examples by customizing the
variable @code{org-export-odt-fontify-srcblocks}.
@node Advanced topics in ODT export, , Literal examples in ODT export, OpenDocument Text export @node Advanced topics in ODT export, , Literal examples in ODT export, OpenDocument Text export
@subsection Advanced topics in ODT export @subsection Advanced topics in ODT export

1
lisp/org-odt.el
View File

@ -1669,6 +1669,7 @@ ATTR is a string of other attributes of the a element."
;; links to headlines ;; links to headlines
((and (string= type "") ((and (string= type "")
(or (not thefile) (string= thefile "")) (or (not thefile) (string= thefile ""))
(plist-get org-lparse-opt-plist :section-numbers)
(setq sec-frag fragment) (setq sec-frag fragment)
(org-find-text-property-in-string 'org-no-description fragment) (org-find-text-property-in-string 'org-no-description fragment)
(or (string-match "\\`sec\\(\\(-[0-9]+\\)+\\)" sec-frag) (or (string-match "\\`sec\\(\\(-[0-9]+\\)+\\)" sec-frag)