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

2892 lines
105 KiB
EmacsLisp
Raw Normal View History

Rename org-export-latex.el to org-latex.el For consistency, this file gets a new name.
2009-04-09 11:25:44 -04:00
;;; org-latex.el --- LaTeX exporter for org-mode
Release 5.11
2008-01-31 05:36:29 -05:00
;;
Fix copyright years in maint.
2012-03-17 11:31:04 -04:00
;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
Release 5.06d
2008-01-31 05:35:58 -05:00
;;
Release 5.11
2008-01-31 05:36:29 -05:00
;; Emacs Lisp Archive Entry
Rename org-export-latex.el to org-latex.el For consistency, this file gets a new name.
2009-04-09 11:25:44 -04:00
;; Filename: org-latex.el
Fix bzg email address (s/altern/gnu).
2011-08-15 15:22:30 -04:00
;; Author: Bastien Guerry <bzg AT gnu DOT org>
LaTeX Export: Define TeX macros for in-buffer settings This commit implements the possibility to import the in-buffer export options as TeX macros, like \orgTITLE, \orgAUTHOR etc. Requested by Russel Adams.
2009-02-20 01:55:05 -05:00
;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
Release 5.11
2008-01-31 05:36:29 -05:00
;; Keywords: org, wp, tex
;; Description: Converts an org-mode buffer into LaTeX
Sync copyright fixes from downstream Emacs
2008-05-06 08:45:52 -04:00
Release 5.06d
2008-01-31 05:35:58 -05:00
;; This file is part of GNU Emacs.
Sync copyright fixes from downstream Emacs
2008-05-06 08:45:52 -04:00
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
Release 5.14
2008-01-31 05:37:51 -05:00
;; You should have received a copy of the GNU General Public License
Sync copyright fixes from downstream Emacs
2008-05-06 08:45:52 -04:00
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
Release 5.06d
2008-01-31 05:35:58 -05:00
;;; Commentary:
Release 5.07
2008-01-31 05:36:08 -05:00
;;
;; This library implements a LaTeX exporter for org-mode.
Release 5.14
2008-01-31 05:37:51 -05:00
;;
Rename org-export-latex.el to org-latex.el For consistency, this file gets a new name.
2009-04-09 11:25:44 -04:00
;; It is part of Org and will be autoloaded
Release 5.14
2008-01-31 05:37:51 -05:00
;;
Release 5.06d
2008-01-31 05:35:58 -05:00
;; The interactive functions are similar to those of the HTML exporter:
Release 5.14
2008-01-31 05:37:51 -05:00
;;
Release 5.06d
2008-01-31 05:35:58 -05:00
;; M-x `org-export-as-latex'
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
;; M-x `org-export-as-pdf'
;; M-x `org-export-as-pdf-and-open'
Release 5.06d
2008-01-31 05:35:58 -05:00
;; M-x `org-export-as-latex-batch'
;; M-x `org-export-as-latex-to-buffer'
;; M-x `org-export-region-as-latex'
;; M-x `org-replace-region-by-latex'
Kill buffers after publication. Whether a buffer is created or not depends on publishing functions such as `org-export-as-html' and the like. But not all such functions create a new buffer (e.g. `org-publish-attachment'), so we need to delete the buffer if it differs from the last buffer we we're in before export.
2008-03-07 06:57:14 -05:00
;;
Release 5.06d
2008-01-31 05:35:58 -05:00
;;; Code:
Release 5.07
2008-01-31 05:36:08 -05:00
(eval-when-compile
Release 5.10a
2008-01-31 05:36:18 -05:00
(require 'cl))
Release 5.07
2008-01-31 05:36:08 -05:00
Release 5.10a
2008-01-31 05:36:18 -05:00
(require 'footnote)
Release 5.06d
2008-01-31 05:35:58 -05:00
(require 'org)
Split out a number of files from org.el, and reorganize the structure of the git repository, using new subdirectories for Lisp and Documentation files.
2008-03-22 11:52:18 -04:00
(require 'org-exp)
LaTeX export: Add (require 'org-macs)
2009-09-29 05:53:03 -04:00
(require 'org-macs)
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(require 'org-beamer)
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.10a
2008-01-31 05:36:18 -05:00
;;; Variables:
Release 5.14
2008-01-31 05:37:51 -05:00
(defvar org-export-latex-class nil)
Allow LaTeX_CLASS_OPTIONS to set options, also from a property
2009-11-27 08:48:03 -05:00
(defvar org-export-latex-class-options nil)
Release 5.14
2008-01-31 05:37:51 -05:00
(defvar org-export-latex-header nil)
(defvar org-export-latex-append-header nil)
(defvar org-export-latex-options-plist nil)
(defvar org-export-latex-todo-keywords-1 nil)
LaTeX export: Fix bug in removal of TODO keywords There was a problem that not in all cases the correct regexp was used to find TODO keywords.
2009-05-14 04:20:04 -04:00
(defvar org-export-latex-complex-heading-re nil)
LaTeX export: Make TODO keyword markup configurable
2009-05-12 06:27:56 -04:00
(defvar org-export-latex-not-done-keywords nil)
(defvar org-export-latex-done-keywords nil)
LaTeX export: Format time stamps Time stamps in LaTeX export now also honor custom time stamp formats. Furthermore, the new option `org-export-latex-timestamp-markup' can specify special markup for time stamps.
2009-04-13 02:52:11 -04:00
(defvar org-export-latex-display-custom-times nil)
Release 5.14
2008-01-31 05:37:51 -05:00
(defvar org-export-latex-all-targets-re nil)
(defvar org-export-latex-add-level 0)
Improve footnotes handling in exporters * lisp/org-exp.el (org-export-footnotes-markers, org-export-footnotes-data): new variables. (org-export-preprocess-string): use a more explicit argument. * lisp/org-html.el (org-export-as-html): initialize new variables. * lisp/org-docbook.el (org-export-as-docbook): initialize new variables. * lisp/org-latex.el (org-export-latex-footmark-seen): new variable. (org-export-as-latex): initialize new variables. (org-export-latex-preprocess): allow to export two or more footnotes in a row. Also permit to have footnotes refering to previously defined footnotes. * lisp/org-ascii.el (org-export-as-ascii): feed org-footnote-normalize with data so it can normalize footnotes before first headline, or footnotes with their definition outside exported region.
2011-05-11 12:02:15 -04:00
(defvar org-export-latex-footmark-seen nil
"List of footnotes markers seen so far by exporter.")
Release 5.14
2008-01-31 05:37:51 -05:00
(defvar org-export-latex-sectioning "")
(defvar org-export-latex-sectioning-depth 0)
Export: Fix bugs with LaTeX export. 1. Export hangs during LaTeX export. That was a bug using an empty regular expression that was defined only locally in Org files, but not in the buffer used by the LaTeX exporter. 2. Underscores in links can get special treatment by the LaTeX exporter. Now the link is protected from this.
2009-01-08 08:25:26 -05:00
(defvar org-export-latex-special-keyword-regexp
(concat "\\<\\(" org-scheduled-string "\\|"
org-deadline-string "\\|"
org-closed-string"\\)")
"Regexp matching special time planning keywords plus the time after it.")
Fix (a lot of) compiler warnings. Also introduce `org-pop-to-buffer-same-window' as a compatibility function for Emacs =>24.1.
2011-07-18 13:25:10 -04:00
(defvar org-re-quote) ; dynamically scoped from org.el
(defvar org-commentsp) ; dynamically scoped from org.el
Release 5.10a
2008-01-31 05:36:18 -05:00
Release 5.14
2008-01-31 05:37:51 -05:00
;;; User variables:
Release 5.06d
2008-01-31 05:35:58 -05:00
Minor fixes.
2008-09-03 03:10:17 -04:00
(defgroup org-export-latex nil
"Options for exporting Org-mode files to LaTeX."
:tag "Org Export LaTeX"
:group 'org-export)
Release 5.14
2008-01-31 05:37:51 -05:00
(defcustom org-export-latex-default-class "article"
"The default LaTeX class."
:group 'org-export-latex
:type '(string :tag "LaTeX class"))
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.14
2008-01-31 05:37:51 -05:00
(defcustom org-export-latex-classes
'(("article"
Collect packages to a variable
2010-03-30 12:06:55 -04:00
"\\documentclass[11pt]{article}"
Release 5.14
2008-01-31 05:37:51 -05:00
("\\section{%s}" . "\\section*{%s}")
("\\subsection{%s}" . "\\subsection*{%s}")
("\\subsubsection{%s}" . "\\subsubsection*{%s}")
("\\paragraph{%s}" . "\\paragraph*{%s}")
("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
("report"
Collect packages to a variable
2010-03-30 12:06:55 -04:00
"\\documentclass[11pt]{report}"
Release 5.14
2008-01-31 05:37:51 -05:00
("\\part{%s}" . "\\part*{%s}")
("\\chapter{%s}" . "\\chapter*{%s}")
("\\section{%s}" . "\\section*{%s}")
("\\subsection{%s}" . "\\subsection*{%s}")
("\\subsubsection{%s}" . "\\subsubsection*{%s}"))
("book"
Collect packages to a variable
2010-03-30 12:06:55 -04:00
"\\documentclass[11pt]{book}"
Release 5.14
2008-01-31 05:37:51 -05:00
("\\part{%s}" . "\\part*{%s}")
("\\chapter{%s}" . "\\chapter*{%s}")
("\\section{%s}" . "\\section*{%s}")
("\\subsection{%s}" . "\\subsection*{%s}")
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
("\\subsubsection{%s}" . "\\subsubsection*{%s}"))
("beamer"
Collect packages to a variable
2010-03-30 12:06:55 -04:00
"\\documentclass{beamer}"
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
org-beamer-sectioning
Collect packages to a variable
2010-03-30 12:06:55 -04:00
))
Release 5.14
2008-01-31 05:37:51 -05:00
"Alist of LaTeX classes and associated header and structure.
If #+LaTeX_CLASS is set in the buffer, use its value and the
associated information. Here is the structure of each cell:
\(class-name
header-string
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
(numbered-section . unnumbered-section\)
Release 5.14
2008-01-31 05:37:51 -05:00
...\)
LaTeX export: Set coding system only if the class specifies AUTO for it The coding system of the LaTeX class will now only be set to the value corresponding to the buffer's file coding system if the class specifies \usepackage[AUTO]{inputenc}. Any other value for the coding system will not be modified.
2010-01-24 05:21:34 -05:00
The header string
-----------------
The HEADER-STRING is the header that will be inserted into the LaTeX file.
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
It should contain the \\documentclass macro, and anything else that is needed
for this setup. To this header, the following commands will be added:
- Calls to \\usepackage for all packages mentioned in the variables
`org-export-latex-default-packages-alist' and
`org-export-latex-packages-alist'. Thus, your header definitions should
avoid to also request these packages.
- Lines specified via \"#+LaTeX_HEADER:\"
If you need more control about the sequence in which the header is built
up, or if you want to exclude one of these building blocks for a particular
class, you can use the following macro-like placeholders.
Fix typo
2010-04-06 03:15:16 -04:00
[DEFAULT-PACKAGES] \\usepackage statements for default packages
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
[NO-DEFAULT-PACKAGES] do not include any of the default packages
Fix whitespace problems
2010-06-07 02:35:10 -04:00
[PACKAGES] \\usepackage statements for packages
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
[NO-PACKAGES] do not include the packages
[EXTRA] the stuff from #+LaTeX_HEADER
[NO-EXTRA] do not include #+LaTeX_HEADER stuff
BEAMER: Standardize the header cookie for the beamer extra stuff * lisp/org-beamer.el (org-beamer-amend-header): Standardize the header cookie for the beamer extra stuff.
2010-07-06 09:01:18 -04:00
[BEAMER-HEADER-EXTRA] the beamer extra headers
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
So a header like
\\documentclass{article}
[NO-DEFAULT-PACKAGES]
[EXTRA]
\\providecommand{\\alert}[1]{\\textbf{#1}}
[PACKAGES]
will omit the default packages, and will include the #+LaTeX_HEADER lines,
then have a call to \\providecommand, and then place \\usepackage commands
based on the content of `org-export-latex-packages-alist'.
If your header or `org-export-latex-default-packages-alist' inserts
Collect packages to a variable
2010-03-30 12:06:55 -04:00
\"\\usepackage[AUTO]{inputenc}\", AUTO will automatically be replaced with
a coding system derived from `buffer-file-coding-system'. See also the
variable `org-export-latex-inputenc-alist' for a way to influence this
mechanism.
LaTeX export: Set coding system only if the class specifies AUTO for it The coding system of the LaTeX class will now only be set to the value corresponding to the buffer's file coding system if the class specifies \usepackage[AUTO]{inputenc}. Any other value for the coding system will not be modified.
2010-01-24 05:21:34 -05:00
The sectioning structure
------------------------
The sectioning structure of the class is given by the elements following
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
the header string. For each sectioning level, a number of strings is
LaTeX export: Set coding system only if the class specifies AUTO for it The coding system of the LaTeX class will now only be set to the value corresponding to the buffer's file coding system if the class specifies \usepackage[AUTO]{inputenc}. Any other value for the coding system will not be modified.
2010-01-24 05:21:34 -05:00
specified. A %s formatter is mandatory in each section string and will
be replaced by the title of the section.
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
Instead of a cons cell (numbered . unnumbered), you can also provide a list
LaTeX export: Set coding system only if the class specifies AUTO for it The coding system of the LaTeX class will now only be set to the value corresponding to the buffer's file coding system if the class specifies \usepackage[AUTO]{inputenc}. Any other value for the coding system will not be modified.
2010-01-24 05:21:34 -05:00
of 2 or 4 elements,
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
(numbered-open numbered-close)
or
(numbered-open numbered-close unnumbered-open unnumbered-close)
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
providing opening and closing strings for a LaTeX environment that should
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
represent the document section. The opening clause should have a %s
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
to represent the section title.
Instead of a list of sectioning commands, you can also specify a
LaTeX export: Set coding system only if the class specifies AUTO for it The coding system of the LaTeX class will now only be set to the value corresponding to the buffer's file coding system if the class specifies \usepackage[AUTO]{inputenc}. Any other value for the coding system will not be modified.
2010-01-24 05:21:34 -05:00
function name. That function will be called with two parameters,
More details about LaTeX setup
2010-04-05 09:10:22 -04:00
the (reduced) level of the headline, and the headline text. The function
must return a cons cell with the (possibly modified) headline text, and the
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
sectioning list in the cdr."
Release 5.06d
2008-01-31 05:35:58 -05:00
:group 'org-export-latex
Remove unnecessary whitespace.
2008-12-04 09:33:43 -05:00
:type '(repeat
Release 5.14
2008-01-31 05:37:51 -05:00
(list (string :tag "LaTeX class")
(string :tag "LaTeX header")
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
(repeat :tag "Levels" :inline t
(choice
(cons :tag "Heading"
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(string :tag " numbered")
(string :tag "unnumbered"))
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
(list :tag "Environment"
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(string :tag "Opening (numbered)")
(string :tag "Closing (numbered)")
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
(string :tag "Opening (unnumbered)")
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(string :tag "Closing (unnumbered)"))
(function :tag "Hook computing sectioning"))))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
(defcustom org-export-latex-inputenc-alist nil
"Alist of inputenc coding system names, and what should really be used.
For example, adding an entry
(\"utf8\" . \"utf8x\")
will cause \\usepackage[utf8x]{inputenc} to be used for buffers that
are written as utf8 files."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
:type '(repeat
(cons
(string :tag "Derived from buffer")
(string :tag "Use this instead"))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defcustom org-export-latex-emphasis-alist
Release 5.10a
2008-01-31 05:36:18 -05:00
'(("*" "\\textbf{%s}" nil)
("/" "\\emph{%s}" nil)
("_" "\\underline{%s}" nil)
LaTeX export: Add support for +strike-through+ emphasis
2009-08-18 02:28:03 -04:00
("+" "\\st{%s}" nil)
* org-latex.el (org-export-latex-emphasis-alist): use \protectedtexttt for the =...= emphasis and \verb for the ~...~ emphasis. (org-export-latex-use-verb): now defaults to t. (org-export-latex-emph-format): distinguish between =...= and ~...~ emphasis. --- This patch was submitted by Carsten as a variation on Thomas Dye's original patch.
2011-02-01 05:21:34 -05:00
("=" "\\protectedtexttt" t)
LaTeX export: Automatically choose \verb delimiter
2009-03-14 03:36:48 -04:00
("~" "\\verb" t))
Release 5.10a
2008-01-31 05:36:18 -05:00
"Alist of LaTeX expressions to convert emphasis fontifiers.
Each element of the list is a list of three elements.
The first element is the character used as a marker for fontification.
The second element is a formatting string to wrap fontified text with.
Fix spelling and grammar
2009-11-12 07:39:29 -05:00
If it is \"\\verb\", Org will automatically select a delimiter
* org-latex.el (org-export-latex-emphasis-alist): use \protectedtexttt for the =...= emphasis and \verb for the ~...~ emphasis. (org-export-latex-use-verb): now defaults to t. (org-export-latex-emph-format): distinguish between =...= and ~...~ emphasis. --- This patch was submitted by Carsten as a variation on Thomas Dye's original patch.
2011-02-01 05:21:34 -05:00
character that is not in the string. \"\\protectedtexttt\" will use \\texttt
to typeset and try to protect special characters.
Release 5.11
2008-01-31 05:36:29 -05:00
The third element decides whether to protect converted text from other
Release 5.10a
2008-01-31 05:36:18 -05:00
conversions."
Release 5.06d
2008-01-31 05:35:58 -05:00
:group 'org-export-latex
:type 'alist)
Release 5.11
2008-01-31 05:36:29 -05:00
(defcustom org-export-latex-title-command "\\maketitle"
"The command used to insert the title just after \\begin{document}.
If this string contains the formatting specification \"%s\" then
it will be used as a formatting string, passing the title as an
argument."
:group 'org-export-latex
:type 'string)
LaTeX Export: Define TeX macros for in-buffer settings This commit implements the possibility to import the in-buffer export options as TeX macros, like \orgTITLE, \orgAUTHOR etc. Requested by Russel Adams.
2009-02-20 01:55:05 -05:00
(defcustom org-export-latex-import-inbuffer-stuff nil
"Non-nil means define TeX macros for Org's inbuffer definitions.
For example \orgTITLE for #+TITLE."
:group 'org-export-latex
:type 'boolean)
Release 5.14
2008-01-31 05:37:51 -05:00
(defcustom org-export-latex-date-format
org-latex: change default date format * lisp/org-latex.el (org-export-latex-date-format): Change default date format to \today. This has the same result but respects the language set in the document by default. Signed-off-by: Julien Danjou <julien@danjou.info>
2011-03-23 13:26:32 -04:00
"\\today"
Release 5.06d
2008-01-31 05:35:58 -05:00
"Format string for \\date{...}."
:group 'org-export-latex
:type 'string)
LaTeX export: Make TODO keyword markup configurable
2009-05-12 06:27:56 -04:00
(defcustom org-export-latex-todo-keyword-markup "\\textbf{%s}"
"Markup for TODO keywords, as a printf format.
This can be a single format for all keywords, a cons cell with separate
formats for not-done and done states, or an association list with setup
for individual keywords. If a keyword shows up for which there is no
markup defined, the first one in the association list will be used."
:group 'org-export-latex
Fix whitespace issues
2009-06-08 02:00:46 -04:00
:type '(choice
LaTeX export: Make TODO keyword markup configurable
2009-05-12 06:27:56 -04:00
(string :tag "Default")
(cons :tag "Distinguish undone and done"
(string :tag "Not-DONE states")
(string :tag "DONE states"))
(repeat :tag "Per keyword markup"
(cons
(string :tag "Keyword")
(string :tag "Markup")))))
Fix whitespace issues
2009-06-08 02:00:46 -04:00
LaTeX export: Configurable format for tags * lisp/org-latex.el (org-export-latex-tag-markup): New option. (org-export-latex-keywords-maybe): Use `org-export-latex-tag-markup'.
2010-09-14 08:42:37 -04:00
(defcustom org-export-latex-tag-markup "\\textbf{%s}"
"Markup for tags, as a printf format."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
LaTeX export: Configurable format for tags * lisp/org-latex.el (org-export-latex-tag-markup): New option. (org-export-latex-keywords-maybe): Use `org-export-latex-tag-markup'.
2010-09-14 08:42:37 -04:00
:type 'string)
LaTeX export: Format time stamps Time stamps in LaTeX export now also honor custom time stamp formats. Furthermore, the new option `org-export-latex-timestamp-markup' can specify special markup for time stamps.
2009-04-13 02:52:11 -04:00
(defcustom org-export-latex-timestamp-markup "\\textit{%s}"
"A printf format string to be applied to time stamps."
:group 'org-export-latex
:type 'string)
* Allow for a different markup for inactive time stamps on latex export
2011-06-30 22:38:48 -04:00
(defcustom org-export-latex-timestamp-inactive-markup "\\textit{%s}"
"A printf format string to be applied to inactive time stamps."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
* Allow for a different markup for inactive time stamps on latex export
2011-06-30 22:38:48 -04:00
:type 'string)
LaTeX export: Fix bugs with timestamp export. The formatting of timestamp keywords was wrong.
2009-04-19 01:46:54 -04:00
(defcustom org-export-latex-timestamp-keyword-markup "\\texttt{%s}"
"A printf format string to be applied to time stamps."
:group 'org-export-latex
:type 'string)
Internal links in LaTeX export Carsten Dominik <carsten.dominik@gmail.com> writes: > On Oct 29, 2010, at 5:22 AM, Jambunathan K wrote: > >> "Thomas S. Dye" <tsd@tsdye.com> writes: >> >>> Aloha Jambunathan K., >>> >>> Yes, thanks for that suggestion. It should work on your example, but >>> it breaks external links, like this: >>> >>> \hyperref[http://www.ctan.org/tex-archive/macros/latex/contrib/koma-script/ >>> ]{KOMA-script} >>> >>> External links require the \href{}{} command. It appears the LaTeX >>> export process no longer distinguishes internal and external links, >>> as >>> I believe it used to do. >>> >> >> This is the problematic commit: >> >> commit f5918bdcc05d7924dc204b57307023eb1ef011f0 >> parent df5894cdcb10819560f003c5b94b8f5f2b7d33cf >> Date: Sun Oct 17 08:29:51 2010 +0000 >> >> LaTeX export: use org-export-latex-hyperref-format > > I have just reverted this commit. > > - Carsten > Looks like time to change the variable name which is actually confusing. Since href and hyperref are two different things, I renamed the existing `org-export-latex-hyperref-format' variable as `org-export-latex-href-format' and introduced a new one `org-export-latex-hyperref-format'. * org-latex.el (org-export-latex-hyperref-format): New option. (org-export-latex-href-format): Renamed the existing variable `org-export-latex-hyperref-format' as `org-export-latex-href-format' (org-export-latex-links): Use `org-export-latex-hyperref-format' and `org-export-latex-href-format' Thanks and Regards Noorul >> >> * lisp/org-latex.el (org-export-latex-links) : Replaced hard coded >> hyperref format with custom >> variable `org-export-latex-hyperref-format' >> >> Note that href is not same as hyperref. >> >> Jambunthan K. >> >> >>> All the best, >>> Tom >>> >>> On Oct 28, 2010, at 3:30 PM, Jambunathan K wrote: >>> >>>> >>>> Thomas >>>> >>>> There was a hint at possible solution (or atleast a partial >>>> solution) in >>>> my original post. Did you try it before jumping in to rough waters >>>> or >>>> digging deeper? >>>> >>>> Do >>>> >>>> ,---- >>>> | M-x customize-variable RET org-export-latex-hyperref-format' >>>> `---- >>>> >>>> so that your .emacs has an entry like this >>>> >>>> ,---- [.emacs] >>>> | >>>> | (custom-set-variables >>>> | '(org-export-latex-hyperref-format "\\hyperref[%s]{%s}")) >>>> | >>>> `---- >>>> >>>> The above setting solves the problem for me with the following >>>> simple >>>> Org file. >>>> >>>> * Heading1 >>>> Make this section as large as possible so that it fills atleast a >>>> page. >>>> >>>> * Heading2 >>>> Links to [[Heading1]] >>>> >>>> Jambunathan K. >>>> >>>> "Thomas S. Dye" <tsd@tsdye.com> writes: >>>> >>>>> On Oct 28, 2010, at 12:35 PM, Nick Dokos wrote: >>>>> >>>>>> Thomas S. Dye <tsd@tsdye.com> wrote: >>>>>> >>>>>>> On Oct 28, 2010, at 11:01 AM, Jambunathan K wrote: >>>>>>> >>>>>>> >>>>>>> This is a regression. release-7.01h is good. HEAD is bad. I get >>>>>>> the >>>>>>> following line with release-7.01h.< >>>>>>> >>>>>>> Links to \hyperref[sec-1]{Heading1} >>>>>>> >>>>>>> Jambunathan K. >>>>>>> >>>>>>> Aloha Jambunathan K., >>>>>>> >>>>>>> Very many thanks for this information. I have Org-mode version >>>>>>> 7.01trans >>>>>>> (release_7.01h.880.g7531f). I take it the problem I'm having is >>>>>>> due to a relatively recent change >>>>>>> to Org-mode. If there is anything I can do to help isolate the >>>>>>> problem, please let me know. >>>>>>> >>>>>> >>>>>> Tom, >>>>>> >>>>>> If you have the time and the inclination, you might try bisecting >>>>>> your >>>>>> way through. Bisecting org-mode problems is actually a very good >>>>>> way >>>>>> to >>>>>> practice because the turnaround time is very small. >>>>>> >>>>>> Prerequisites: >>>>>> >>>>>> * you have a clone of the org-mode git repository. >>>>>> >>>>>> * you have an org test file. >>>>>> >>>>>> >>>>>> Steps: >>>>>> >>>>>> * [optional, but it makes me feel a little safer] create a test >>>>>> branch >>>>>> and switch to it: >>>>>> >>>>>> git checkout -b test-branch master >>>>>> >>>>>> * I clean out all the compiled files while doing a bisection: it's >>>>>> quicker >>>>>> than regenerating them every time and I don't have to worry (much) >>>>>> about >>>>>> emacs loading a wayward .elc file: >>>>>> >>>>>> make clean >>>>>> >>>>>> * start the bisection and tell git which commit is known good and >>>>>> which is known bad: >>>>>> >>>>>> git bisect start >>>>>> >>>>>> # current version is bad >>>>>> git bisect bad >>>>>> >>>>>> # release_7.01h was good - I got the name with ``git tag'' >>>>>> git bisect good release_7.01h >>>>>> >>>>>> That checks out a revision half-way in between the bad and good >>>>>> commits: since >>>>>> there are about 900 commits in between, you'll be at approx the >>>>>> 450- >>>>>> mark and it >>>>>> should take about 10 bisections to get it down to a single commit. >>>>>> >>>>>> * LOOP Now all you have to do is repeat the following steps: >>>>>> >>>>>> # since you did ``make clean'' you don't have to worry about .elc >>>>>> files >>>>>> # just reload all the .el files. >>>>>> M-x org-reload >>>>>> >>>>>> visit your org test file, export to LaTeX, check for \href/ >>>>>> \hyperref (or >>>>>> whatever other telltale sign shows badness/goodness). >>>>>> >>>>>> # tell git about it >>>>>> git bisect good *OR* git bisect bad >>>>>> >>>>>> This last step will check out another revision and in about 10 >>>>>> repetitions >>>>>> of the loop, you are done. >>>>>> >>>>>> * Tell git you are done, so it can clean up: >>>>>> >>>>>> git bisect reset >>>>>> >>>>>> Theoretically, you could do all of this in your master branch >>>>>> without >>>>>> creating a test-branch and this last step will reset everything to >>>>>> the >>>>>> way it was before ``git start''. >>>>>> >>>>>> * Post the offending commit to the list. >>>>>> >>>>>> * Get back to your master branch: >>>>>> >>>>>> git checkout master >>>>>> >>>>>> * If you created a test-branch, clean it out: >>>>>> >>>>>> git branch -d test-branch >>>>>> >>>>>> * [Optional] Recreate your .elc files and reload them: >>>>>> >>>>>> make >>>>>> M-x org-reload >>>>>> >>>>>> >>>>>> And that's it: a half-hour of fun and games. Unless of course, you >>>>>> hit upon a revision that is neither good nor bad (in the above >>>>>> restricted >>>>>> sense): you might get some other problem that prevents you from >>>>>> being >>>>>> able to answer. That might or might not be easy to resolve, so >>>>>> I'll >>>>>> leave that as an advanced topic (truth be told, I came up against >>>>>> this >>>>>> situation a couple of days ago and I didn't know how to proceed: >>>>>> so >>>>>> it's ignorance more than anything else that prevents me from >>>>>> saying >>>>>> anything more). >>>>>> >>>>>> If you want to try, I'd be happy to answer questions - I might try >>>>>> the >>>>>> bisection later on tonight myself in any case. And btw, this is of >>>>>> course archeology of a different (and much easier) kind, so I >>>>>> imagine >>>>>> you'll take to it like a fish in water :-) >>>>>> >>>>>> HTH, >>>>>> Nick >>>>> >>>>> Hi Nick, >>>>> >>>>> Irresistible hook at the end there. I wish this stuff were as easy >>>>> as >>>>> archaeology is for me. Your instructions are terrific, though. >>>>> >>>>> I did hit on a revision that was neither good nor bad: >>>>> >>>>> commit 8562273b272024a630a582b0e1b94c481d8abeec >>>>> Author: Eric Schulte <schulte.eric@gmail.com> >>>>> Date: Sat Oct 16 13:21:47 2010 -0600 >>>>> >>>>> ob-ref: don't forget arguments to referenced code blocks >>>>> >>>>> * lisp/ob-ref.el (org-babel-ref-resolve): bringing the referent >>>>> arguments back to their params before evaluation >>>>> >>>>> This one puts these lines in *Messages* when I export to LaTeX >>>>> >>>>> executing Org code block... >>>>> if: Symbol's value as variable is void: result-type >>>>> >>>>> I tried using different commits for the initial git bisect good, >>>>> hoping that would skip by the problem, but this one appears to have >>>>> stuck around a while. My other two tries both ended with this same >>>>> error, but with different commits. >>>>> >>>>> I'm not sure what to do next. This problem isn't yielding to my >>>>> archaeo-logic. :) >>>>> >>>>> All the best, >>>>> Tom >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode
2010-10-29 06:01:12 -04:00
(defcustom org-export-latex-href-format "\\href{%s}{%s}"
"A printf format string to be applied to href links.
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
The format must contain either two %s instances or just one.
If it contains two %s instances, the first will be filled with
org-latex: allow `org-export-latex-href-format' to have only one "%s" This is useful when you want to use \url{link} instead of the default \href{link}{path}. Thanks to Henri-Paul Indiogine for bringing this up. * org-latex.el (org-export-latex-href-format): docstring fix to reflect the fact that you can use only one "%s". (org-export-latex-links): allow `org-export-latex-href-format' to have only one "%s".
2011-07-26 07:22:38 -04:00
the link, the second with the link description. If it contains
only one, the %s will be filled with the link."
Internal links in LaTeX export Carsten Dominik <carsten.dominik@gmail.com> writes: > On Oct 29, 2010, at 5:22 AM, Jambunathan K wrote: > >> "Thomas S. Dye" <tsd@tsdye.com> writes: >> >>> Aloha Jambunathan K., >>> >>> Yes, thanks for that suggestion. It should work on your example, but >>> it breaks external links, like this: >>> >>> \hyperref[http://www.ctan.org/tex-archive/macros/latex/contrib/koma-script/ >>> ]{KOMA-script} >>> >>> External links require the \href{}{} command. It appears the LaTeX >>> export process no longer distinguishes internal and external links, >>> as >>> I believe it used to do. >>> >> >> This is the problematic commit: >> >> commit f5918bdcc05d7924dc204b57307023eb1ef011f0 >> parent df5894cdcb10819560f003c5b94b8f5f2b7d33cf >> Date: Sun Oct 17 08:29:51 2010 +0000 >> >> LaTeX export: use org-export-latex-hyperref-format > > I have just reverted this commit. > > - Carsten > Looks like time to change the variable name which is actually confusing. Since href and hyperref are two different things, I renamed the existing `org-export-latex-hyperref-format' variable as `org-export-latex-href-format' and introduced a new one `org-export-latex-hyperref-format'. * org-latex.el (org-export-latex-hyperref-format): New option. (org-export-latex-href-format): Renamed the existing variable `org-export-latex-hyperref-format' as `org-export-latex-href-format' (org-export-latex-links): Use `org-export-latex-hyperref-format' and `org-export-latex-href-format' Thanks and Regards Noorul >> >> * lisp/org-latex.el (org-export-latex-links) : Replaced hard coded >> hyperref format with custom >> variable `org-export-latex-hyperref-format' >> >> Note that href is not same as hyperref. >> >> Jambunthan K. >> >> >>> All the best, >>> Tom >>> >>> On Oct 28, 2010, at 3:30 PM, Jambunathan K wrote: >>> >>>> >>>> Thomas >>>> >>>> There was a hint at possible solution (or atleast a partial >>>> solution) in >>>> my original post. Did you try it before jumping in to rough waters >>>> or >>>> digging deeper? >>>> >>>> Do >>>> >>>> ,---- >>>> | M-x customize-variable RET org-export-latex-hyperref-format' >>>> `---- >>>> >>>> so that your .emacs has an entry like this >>>> >>>> ,---- [.emacs] >>>> | >>>> | (custom-set-variables >>>> | '(org-export-latex-hyperref-format "\\hyperref[%s]{%s}")) >>>> | >>>> `---- >>>> >>>> The above setting solves the problem for me with the following >>>> simple >>>> Org file. >>>> >>>> * Heading1 >>>> Make this section as large as possible so that it fills atleast a >>>> page. >>>> >>>> * Heading2 >>>> Links to [[Heading1]] >>>> >>>> Jambunathan K. >>>> >>>> "Thomas S. Dye" <tsd@tsdye.com> writes: >>>> >>>>> On Oct 28, 2010, at 12:35 PM, Nick Dokos wrote: >>>>> >>>>>> Thomas S. Dye <tsd@tsdye.com> wrote: >>>>>> >>>>>>> On Oct 28, 2010, at 11:01 AM, Jambunathan K wrote: >>>>>>> >>>>>>> >>>>>>> This is a regression. release-7.01h is good. HEAD is bad. I get >>>>>>> the >>>>>>> following line with release-7.01h.< >>>>>>> >>>>>>> Links to \hyperref[sec-1]{Heading1} >>>>>>> >>>>>>> Jambunathan K. >>>>>>> >>>>>>> Aloha Jambunathan K., >>>>>>> >>>>>>> Very many thanks for this information. I have Org-mode version >>>>>>> 7.01trans >>>>>>> (release_7.01h.880.g7531f). I take it the problem I'm having is >>>>>>> due to a relatively recent change >>>>>>> to Org-mode. If there is anything I can do to help isolate the >>>>>>> problem, please let me know. >>>>>>> >>>>>> >>>>>> Tom, >>>>>> >>>>>> If you have the time and the inclination, you might try bisecting >>>>>> your >>>>>> way through. Bisecting org-mode problems is actually a very good >>>>>> way >>>>>> to >>>>>> practice because the turnaround time is very small. >>>>>> >>>>>> Prerequisites: >>>>>> >>>>>> * you have a clone of the org-mode git repository. >>>>>> >>>>>> * you have an org test file. >>>>>> >>>>>> >>>>>> Steps: >>>>>> >>>>>> * [optional, but it makes me feel a little safer] create a test >>>>>> branch >>>>>> and switch to it: >>>>>> >>>>>> git checkout -b test-branch master >>>>>> >>>>>> * I clean out all the compiled files while doing a bisection: it's >>>>>> quicker >>>>>> than regenerating them every time and I don't have to worry (much) >>>>>> about >>>>>> emacs loading a wayward .elc file: >>>>>> >>>>>> make clean >>>>>> >>>>>> * start the bisection and tell git which commit is known good and >>>>>> which is known bad: >>>>>> >>>>>> git bisect start >>>>>> >>>>>> # current version is bad >>>>>> git bisect bad >>>>>> >>>>>> # release_7.01h was good - I got the name with ``git tag'' >>>>>> git bisect good release_7.01h >>>>>> >>>>>> That checks out a revision half-way in between the bad and good >>>>>> commits: since >>>>>> there are about 900 commits in between, you'll be at approx the >>>>>> 450- >>>>>> mark and it >>>>>> should take about 10 bisections to get it down to a single commit. >>>>>> >>>>>> * LOOP Now all you have to do is repeat the following steps: >>>>>> >>>>>> # since you did ``make clean'' you don't have to worry about .elc >>>>>> files >>>>>> # just reload all the .el files. >>>>>> M-x org-reload >>>>>> >>>>>> visit your org test file, export to LaTeX, check for \href/ >>>>>> \hyperref (or >>>>>> whatever other telltale sign shows badness/goodness). >>>>>> >>>>>> # tell git about it >>>>>> git bisect good *OR* git bisect bad >>>>>> >>>>>> This last step will check out another revision and in about 10 >>>>>> repetitions >>>>>> of the loop, you are done. >>>>>> >>>>>> * Tell git you are done, so it can clean up: >>>>>> >>>>>> git bisect reset >>>>>> >>>>>> Theoretically, you could do all of this in your master branch >>>>>> without >>>>>> creating a test-branch and this last step will reset everything to >>>>>> the >>>>>> way it was before ``git start''. >>>>>> >>>>>> * Post the offending commit to the list. >>>>>> >>>>>> * Get back to your master branch: >>>>>> >>>>>> git checkout master >>>>>> >>>>>> * If you created a test-branch, clean it out: >>>>>> >>>>>> git branch -d test-branch >>>>>> >>>>>> * [Optional] Recreate your .elc files and reload them: >>>>>> >>>>>> make >>>>>> M-x org-reload >>>>>> >>>>>> >>>>>> And that's it: a half-hour of fun and games. Unless of course, you >>>>>> hit upon a revision that is neither good nor bad (in the above >>>>>> restricted >>>>>> sense): you might get some other problem that prevents you from >>>>>> being >>>>>> able to answer. That might or might not be easy to resolve, so >>>>>> I'll >>>>>> leave that as an advanced topic (truth be told, I came up against >>>>>> this >>>>>> situation a couple of days ago and I didn't know how to proceed: >>>>>> so >>>>>> it's ignorance more than anything else that prevents me from >>>>>> saying >>>>>> anything more). >>>>>> >>>>>> If you want to try, I'd be happy to answer questions - I might try >>>>>> the >>>>>> bisection later on tonight myself in any case. And btw, this is of >>>>>> course archeology of a different (and much easier) kind, so I >>>>>> imagine >>>>>> you'll take to it like a fish in water :-) >>>>>> >>>>>> HTH, >>>>>> Nick >>>>> >>>>> Hi Nick, >>>>> >>>>> Irresistible hook at the end there. I wish this stuff were as easy >>>>> as >>>>> archaeology is for me. Your instructions are terrific, though. >>>>> >>>>> I did hit on a revision that was neither good nor bad: >>>>> >>>>> commit 8562273b272024a630a582b0e1b94c481d8abeec >>>>> Author: Eric Schulte <schulte.eric@gmail.com> >>>>> Date: Sat Oct 16 13:21:47 2010 -0600 >>>>> >>>>> ob-ref: don't forget arguments to referenced code blocks >>>>> >>>>> * lisp/ob-ref.el (org-babel-ref-resolve): bringing the referent >>>>> arguments back to their params before evaluation >>>>> >>>>> This one puts these lines in *Messages* when I export to LaTeX >>>>> >>>>> executing Org code block... >>>>> if: Symbol's value as variable is void: result-type >>>>> >>>>> I tried using different commits for the initial git bisect good, >>>>> hoping that would skip by the problem, but this one appears to have >>>>> stuck around a while. My other two tries both ended with this same >>>>> error, but with different commits. >>>>> >>>>> I'm not sure what to do next. This problem isn't yielding to my >>>>> archaeo-logic. :) >>>>> >>>>> All the best, >>>>> Tom >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode
2010-10-29 06:01:12 -04:00
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
Internal links in LaTeX export Carsten Dominik <carsten.dominik@gmail.com> writes: > On Oct 29, 2010, at 5:22 AM, Jambunathan K wrote: > >> "Thomas S. Dye" <tsd@tsdye.com> writes: >> >>> Aloha Jambunathan K., >>> >>> Yes, thanks for that suggestion. It should work on your example, but >>> it breaks external links, like this: >>> >>> \hyperref[http://www.ctan.org/tex-archive/macros/latex/contrib/koma-script/ >>> ]{KOMA-script} >>> >>> External links require the \href{}{} command. It appears the LaTeX >>> export process no longer distinguishes internal and external links, >>> as >>> I believe it used to do. >>> >> >> This is the problematic commit: >> >> commit f5918bdcc05d7924dc204b57307023eb1ef011f0 >> parent df5894cdcb10819560f003c5b94b8f5f2b7d33cf >> Date: Sun Oct 17 08:29:51 2010 +0000 >> >> LaTeX export: use org-export-latex-hyperref-format > > I have just reverted this commit. > > - Carsten > Looks like time to change the variable name which is actually confusing. Since href and hyperref are two different things, I renamed the existing `org-export-latex-hyperref-format' variable as `org-export-latex-href-format' and introduced a new one `org-export-latex-hyperref-format'. * org-latex.el (org-export-latex-hyperref-format): New option. (org-export-latex-href-format): Renamed the existing variable `org-export-latex-hyperref-format' as `org-export-latex-href-format' (org-export-latex-links): Use `org-export-latex-hyperref-format' and `org-export-latex-href-format' Thanks and Regards Noorul >> >> * lisp/org-latex.el (org-export-latex-links) : Replaced hard coded >> hyperref format with custom >> variable `org-export-latex-hyperref-format' >> >> Note that href is not same as hyperref. >> >> Jambunthan K. >> >> >>> All the best, >>> Tom >>> >>> On Oct 28, 2010, at 3:30 PM, Jambunathan K wrote: >>> >>>> >>>> Thomas >>>> >>>> There was a hint at possible solution (or atleast a partial >>>> solution) in >>>> my original post. Did you try it before jumping in to rough waters >>>> or >>>> digging deeper? >>>> >>>> Do >>>> >>>> ,---- >>>> | M-x customize-variable RET org-export-latex-hyperref-format' >>>> `---- >>>> >>>> so that your .emacs has an entry like this >>>> >>>> ,---- [.emacs] >>>> | >>>> | (custom-set-variables >>>> | '(org-export-latex-hyperref-format "\\hyperref[%s]{%s}")) >>>> | >>>> `---- >>>> >>>> The above setting solves the problem for me with the following >>>> simple >>>> Org file. >>>> >>>> * Heading1 >>>> Make this section as large as possible so that it fills atleast a >>>> page. >>>> >>>> * Heading2 >>>> Links to [[Heading1]] >>>> >>>> Jambunathan K. >>>> >>>> "Thomas S. Dye" <tsd@tsdye.com> writes: >>>> >>>>> On Oct 28, 2010, at 12:35 PM, Nick Dokos wrote: >>>>> >>>>>> Thomas S. Dye <tsd@tsdye.com> wrote: >>>>>> >>>>>>> On Oct 28, 2010, at 11:01 AM, Jambunathan K wrote: >>>>>>> >>>>>>> >>>>>>> This is a regression. release-7.01h is good. HEAD is bad. I get >>>>>>> the >>>>>>> following line with release-7.01h.< >>>>>>> >>>>>>> Links to \hyperref[sec-1]{Heading1} >>>>>>> >>>>>>> Jambunathan K. >>>>>>> >>>>>>> Aloha Jambunathan K., >>>>>>> >>>>>>> Very many thanks for this information. I have Org-mode version >>>>>>> 7.01trans >>>>>>> (release_7.01h.880.g7531f). I take it the problem I'm having is >>>>>>> due to a relatively recent change >>>>>>> to Org-mode. If there is anything I can do to help isolate the >>>>>>> problem, please let me know. >>>>>>> >>>>>> >>>>>> Tom, >>>>>> >>>>>> If you have the time and the inclination, you might try bisecting >>>>>> your >>>>>> way through. Bisecting org-mode problems is actually a very good >>>>>> way >>>>>> to >>>>>> practice because the turnaround time is very small. >>>>>> >>>>>> Prerequisites: >>>>>> >>>>>> * you have a clone of the org-mode git repository. >>>>>> >>>>>> * you have an org test file. >>>>>> >>>>>> >>>>>> Steps: >>>>>> >>>>>> * [optional, but it makes me feel a little safer] create a test >>>>>> branch >>>>>> and switch to it: >>>>>> >>>>>> git checkout -b test-branch master >>>>>> >>>>>> * I clean out all the compiled files while doing a bisection: it's >>>>>> quicker >>>>>> than regenerating them every time and I don't have to worry (much) >>>>>> about >>>>>> emacs loading a wayward .elc file: >>>>>> >>>>>> make clean >>>>>> >>>>>> * start the bisection and tell git which commit is known good and >>>>>> which is known bad: >>>>>> >>>>>> git bisect start >>>>>> >>>>>> # current version is bad >>>>>> git bisect bad >>>>>> >>>>>> # release_7.01h was good - I got the name with ``git tag'' >>>>>> git bisect good release_7.01h >>>>>> >>>>>> That checks out a revision half-way in between the bad and good >>>>>> commits: since >>>>>> there are about 900 commits in between, you'll be at approx the >>>>>> 450- >>>>>> mark and it >>>>>> should take about 10 bisections to get it down to a single commit. >>>>>> >>>>>> * LOOP Now all you have to do is repeat the following steps: >>>>>> >>>>>> # since you did ``make clean'' you don't have to worry about .elc >>>>>> files >>>>>> # just reload all the .el files. >>>>>> M-x org-reload >>>>>> >>>>>> visit your org test file, export to LaTeX, check for \href/ >>>>>> \hyperref (or >>>>>> whatever other telltale sign shows badness/goodness). >>>>>> >>>>>> # tell git about it >>>>>> git bisect good *OR* git bisect bad >>>>>> >>>>>> This last step will check out another revision and in about 10 >>>>>> repetitions >>>>>> of the loop, you are done. >>>>>> >>>>>> * Tell git you are done, so it can clean up: >>>>>> >>>>>> git bisect reset >>>>>> >>>>>> Theoretically, you could do all of this in your master branch >>>>>> without >>>>>> creating a test-branch and this last step will reset everything to >>>>>> the >>>>>> way it was before ``git start''. >>>>>> >>>>>> * Post the offending commit to the list. >>>>>> >>>>>> * Get back to your master branch: >>>>>> >>>>>> git checkout master >>>>>> >>>>>> * If you created a test-branch, clean it out: >>>>>> >>>>>> git branch -d test-branch >>>>>> >>>>>> * [Optional] Recreate your .elc files and reload them: >>>>>> >>>>>> make >>>>>> M-x org-reload >>>>>> >>>>>> >>>>>> And that's it: a half-hour of fun and games. Unless of course, you >>>>>> hit upon a revision that is neither good nor bad (in the above >>>>>> restricted >>>>>> sense): you might get some other problem that prevents you from >>>>>> being >>>>>> able to answer. That might or might not be easy to resolve, so >>>>>> I'll >>>>>> leave that as an advanced topic (truth be told, I came up against >>>>>> this >>>>>> situation a couple of days ago and I didn't know how to proceed: >>>>>> so >>>>>> it's ignorance more than anything else that prevents me from >>>>>> saying >>>>>> anything more). >>>>>> >>>>>> If you want to try, I'd be happy to answer questions - I might try >>>>>> the >>>>>> bisection later on tonight myself in any case. And btw, this is of >>>>>> course archeology of a different (and much easier) kind, so I >>>>>> imagine >>>>>> you'll take to it like a fish in water :-) >>>>>> >>>>>> HTH, >>>>>> Nick >>>>> >>>>> Hi Nick, >>>>> >>>>> Irresistible hook at the end there. I wish this stuff were as easy >>>>> as >>>>> archaeology is for me. Your instructions are terrific, though. >>>>> >>>>> I did hit on a revision that was neither good nor bad: >>>>> >>>>> commit 8562273b272024a630a582b0e1b94c481d8abeec >>>>> Author: Eric Schulte <schulte.eric@gmail.com> >>>>> Date: Sat Oct 16 13:21:47 2010 -0600 >>>>> >>>>> ob-ref: don't forget arguments to referenced code blocks >>>>> >>>>> * lisp/ob-ref.el (org-babel-ref-resolve): bringing the referent >>>>> arguments back to their params before evaluation >>>>> >>>>> This one puts these lines in *Messages* when I export to LaTeX >>>>> >>>>> executing Org code block... >>>>> if: Symbol's value as variable is void: result-type >>>>> >>>>> I tried using different commits for the initial git bisect good, >>>>> hoping that would skip by the problem, but this one appears to have >>>>> stuck around a while. My other two tries both ended with this same >>>>> error, but with different commits. >>>>> >>>>> I'm not sure what to do next. This problem isn't yielding to my >>>>> archaeo-logic. :) >>>>> >>>>> All the best, >>>>> Tom >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode
2010-10-29 06:01:12 -04:00
:type 'string)
(defcustom org-export-latex-hyperref-format "\\hyperref[%s]{%s}"
Make hyperref macro customizable This was a request by Martin G. Skjaeveland
2010-01-20 04:27:45 -05:00
"A printf format string to be applied to hyperref links.
* org-latex.el (org-export-latex-hyperref-format): Update docstring.
2011-02-12 18:43:46 -05:00
The format must contain one or two %s instances. The first one
will be filled with the link, the second with its description."
Make hyperref macro customizable This was a request by Martin G. Skjaeveland
2010-01-20 04:27:45 -05:00
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
Make hyperref macro customizable This was a request by Martin G. Skjaeveland
2010-01-20 04:27:45 -05:00
:type 'string)
Insert a customizable separator between footnotes * lisp/org-docbook.el (org-export-docbook-footnote-separator): new variable (org-export-as-docbook): add a separator between footnotes. * lisp/org-html.el (org-export-html-footnote-separator): new variable. (org-export-as-html): add a separator between footnotes. * lisp/org-latex.el (org-export-latex-footnote-separator): new variable. (org-export-latex-preprocess): add a separator between footnotes.
2011-05-14 04:26:40 -04:00
(defcustom org-export-latex-footnote-separator "\\textsuperscript{,}\\,"
"Text used to separate footnotes."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
Insert a customizable separator between footnotes * lisp/org-docbook.el (org-export-docbook-footnote-separator): new variable (org-export-as-docbook): add a separator between footnotes. * lisp/org-html.el (org-export-html-footnote-separator): new variable. (org-export-as-html): add a separator between footnotes. * lisp/org-latex.el (org-export-latex-footnote-separator): new variable. (org-export-latex-preprocess): add a separator between footnotes.
2011-05-14 04:26:40 -04:00
:type 'string)
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
(defcustom org-export-latex-quotes
'(("fr" ("\\(\\s-\\|[[(]\\)\"" . "«~") ("\\(\\S-\\)\"" . "~»") ("\\(\\s-\\|(\\)'" . "'"))
("en" ("\\(\\s-\\|[[(]\\)\"" . "``") ("\\(\\S-\\)\"" . "''") ("\\(\\s-\\|(\\)'" . "`")))
"Alist for quotes to use when converting english double-quotes.
The CAR of each item in this alist is the language code.
The CDR of each item in this alist is a list of three CONS:
- the first CONS defines the opening quote;
- the second CONS defines the closing quote;
- the last CONS defines single quotes.
For each item in a CONS, the first string is a regexp
for allowed characters before/after the quote, the second
string defines the replacement string for this quote."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
:type '(list
(cons :tag "Opening quote"
org-latex.el: Delete trailing whitespaces.
2011-07-12 02:31:07 -04:00
(string :tag "Regexp for char before")
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
(string :tag "Replacement quote "))
(cons :tag "Closing quote"
org-latex.el: Delete trailing whitespaces.
2011-07-12 02:31:07 -04:00
(string :tag "Regexp for char after ")
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
(string :tag "Replacement quote "))
(cons :tag "Single quote"
org-latex.el: Delete trailing whitespaces.
2011-07-12 02:31:07 -04:00
(string :tag "Regexp for char before")
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
(string :tag "Replacement quote "))))
Release 5.10a
2008-01-31 05:36:18 -05:00
(defcustom org-export-latex-tables-verbatim nil
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"When non-nil, tables are exported verbatim."
Release 5.10a
2008-01-31 05:36:18 -05:00
:group 'org-export-latex
:type 'boolean)
LaTeX export: Allow uncentered tables
2009-05-13 08:42:21 -04:00
(defcustom org-export-latex-tables-centered t
"When non-nil, tables are exported in a center environment."
:group 'org-export-latex
:type 'boolean)
Make it possible to place table captions below the table * lisp/org-latex.el (org-export-latex-tables): Honor `org-export-latex-table-caption-above' (org-export-latex-table-caption-above): New option. Patch by Thomas Dye.
2011-10-10 15:05:03 -04:00
(defcustom org-export-latex-table-caption-above t
"When non-nil, the caption is set above the table. When nil,
the caption is set below the table."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
Make it possible to place table captions below the table * lisp/org-latex.el (org-export-latex-tables): Honor `org-export-latex-table-caption-above' (org-export-latex-table-caption-above): New option. Patch by Thomas Dye.
2011-10-10 15:05:03 -04:00
:type 'boolean)
Release 5.14
2008-01-31 05:37:51 -05:00
(defcustom org-export-latex-tables-column-borders nil
LaTeX Export: Fix vertical lines in tables
2009-03-16 16:43:20 -04:00
"When non-nil, grouping columns can cause outer vertical lines in tables.
When nil, grouping causes only separation lines between groups."
Release 5.14
2008-01-31 05:37:51 -05:00
:group 'org-export-latex
:type 'boolean)
Release 5.06d
2008-01-31 05:35:58 -05:00
org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend * org-table.el (orgtbl-to-generic): Add check for :skipheadrule. When present, the :hline following the head will be skipped. This is necessary to avoid doubling of horizontal rules in LaTeX longtable environments and consequent width problems. * org-latex.el (org-export-latex-tables-tstart) (org-export-latex-tables-hline) (org-export-latex-tables-tend): New options. (org-export-latex-tables): Use the new options.
2011-10-28 18:09:46 -04:00
(defcustom org-export-latex-tables-tstart nil
"LaTeX command for top rule for tables."
:group 'org-export-latex
:version "24.1"
:type '(choice
(const :tag "Nothing" nil)
(string :tag "String")
(const :tag "Booktabs default: \\toprule" "\\toprule")))
(defcustom org-export-latex-tables-hline "\\hline"
"LaTeX command to use for a rule somewhere in the middle of a table."
:group 'org-export-latex
:version "24.1"
:type '(choice
(string :tag "String")
(const :tag "Standard: \\hline" "\\hline")
(const :tag "Booktabs default: \\midrule" "\\midrule")))
(defcustom org-export-latex-tables-tend nil
"LaTeX command for bottom rule for tables."
:group 'org-export-latex
:version "24.1"
:type '(choice
(const :tag "Nothing" nil)
(string :tag "String")
(const :tag "Booktabs default: \\bottomrule" "\\bottomrule")))
LaTeX export: Better handling of levels below the headline boundary Outline levels below the headline boundary are now treated better, as proper list. The variable `org-export-latex-low-levels' can now also be `itemize' or `enumerate', to get the corresponding list structure. The new default is `itemize', to make it parallel with the behavior in HTML.
2009-03-21 08:12:07 -04:00
(defcustom org-export-latex-low-levels 'itemize
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"How to convert sections below the current level of sectioning.
This is specified by the `org-export-headline-levels' option or the
value of \"H:\" in Org's #+OPTION line.
Release 5.11
2008-01-31 05:36:29 -05:00
LaTeX export: Better handling of levels below the headline boundary Outline levels below the headline boundary are now treated better, as proper list. The variable `org-export-latex-low-levels' can now also be `itemize' or `enumerate', to get the corresponding list structure. The new default is `itemize', to make it parallel with the behavior in HTML.
2009-03-21 08:12:07 -04:00
This can be either nil (skip the sections), `description', `itemize',
or `enumerate' (convert the sections as the corresponding list type), or
a string to be used instead of \\section{%s}. In this latter case,
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
the %s stands here for the inserted headline and is mandatory.
It may also be a list of three string to define a user-defined environment
that should be used. The first string should be the like
\"\\begin{itemize}\", the second should be like \"\\item %s %s\" with up
Fix spelling and grammar
2009-11-12 07:39:29 -05:00
to two occurrences of %s for the title and a label, respectively. The third
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
string should be like \"\\end{itemize\"."
Release 5.06d
2008-01-31 05:35:58 -05:00
:group 'org-export-latex
:type '(choice (const :tag "Ignore" nil)
LaTeX export: Fix a variable definition
2009-05-21 11:59:58 -04:00
(const :tag "Convert as descriptive list" description)
(const :tag "Convert as itemized list" itemize)
(const :tag "Convert as enumerated list" enumerate)
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
(list :tag "User-defined environment"
:value ("\\begin{itemize}" "\\end{itemize}" "\\item %s")
(string :tag "Start")
(string :tag "End")
(string :tag "item"))
Release 5.06d
2008-01-31 05:35:58 -05:00
(string :tag "Use a section string" :value "\\subparagraph{%s}")))
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
(defcustom org-export-latex-list-parameters
Complete default values for check-boxes in LaTeX exporter * lisp/org-latex.el (org-export-latex-list-parameters): complete default value with cbtrans option. * lisp/org-list.el (org-list-to-latex): set a more consistent default value.
2011-07-11 11:31:07 -04:00
'(:cbon "$\\boxtimes$" :cboff "$\\Box$" :cbtrans "$\\boxminus$")
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
"Parameters for the LaTeX list exporter.
These parameters will be passed on to `org-list-to-latex', which in turn
will pass them (combined with the LaTeX default list parameters) to
`org-list-to-generic'."
:group 'org-export-latex
:type 'plist)
LaTeX export: Make the verbatim environment configurable
2009-06-18 03:30:00 -04:00
(defcustom org-export-latex-verbatim-wrap
Eliminate extra newline(s) after example or src block. Signed-off-by: Nick Dokos <nick@dokosmarshall.org>
2011-08-19 05:02:57 -04:00
'("\\begin{verbatim}\n" . "\\end{verbatim}")
LaTeX export: Make the verbatim environment configurable
2009-06-18 03:30:00 -04:00
"Environment to be wrapped around a fixed-width section in LaTeX export.
This is a cons with two strings, to be added before and after the
fixed-with text.
Defaults to \\begin{verbatim} and \\end{verbatim}."
Fix problems with sub and superscript in LaTeX export
2009-07-09 00:29:51 -04:00
:group 'org-export-translation
LaTeX export: Make the verbatim environment configurable
2009-06-18 03:30:00 -04:00
:group 'org-export-latex
:type '(cons (string :tag "Open")
(string :tag "Close")))
LaTeX export: Allow export using the listings package Patch by Eric Schulte, see http://thread.gmane.org/gmane.emacs.orgmode/16269
2009-08-09 08:49:52 -04:00
(defcustom org-export-latex-listings nil
Remove comma after means in many docstrings Stephen Eglen says these commas should not be there.
2010-01-21 10:15:40 -05:00
"Non-nil means export source code using the listings package.
LaTeX export: Allow export using the listings package Patch by Eric Schulte, see http://thread.gmane.org/gmane.emacs.orgmode/16269
2009-08-09 08:49:52 -04:00
This package will fontify source code, possibly even with color.
If you want to use this, you also need to make LaTeX use the
listings package, and if you want to have color, the color
package. Just add these to `org-export-latex-packages-alist',
for example using customize, or with something like
(require 'org-latex)
(add-to-list 'org-export-latex-packages-alist '(\"\" \"listings\"))
Alter way in which user chooses minted for latex source code export * lisp/org-exp.el (org-export-format-source-code-or-example): Use minted for latex source code export if `org-export-latex-listings' has the value 'minted * lisp/org-latex.el (org-export-latex-listings): Document special value 'minted * lisp/org-latex.el (org-export-latex-minted): Delete variable
2010-10-28 16:55:40 -04:00
(add-to-list 'org-export-latex-packages-alist '(\"\" \"color\"))
Alternatively,
(setq org-export-latex-listings 'minted)
causes source code to be exported using the minted package as
org-latex.el: minor docstring clean up.
2011-02-15 09:46:23 -05:00
opposed to listings. If you want to use minted, you need to add
Alter way in which user chooses minted for latex source code export * lisp/org-exp.el (org-export-format-source-code-or-example): Use minted for latex source code export if `org-export-latex-listings' has the value 'minted * lisp/org-latex.el (org-export-latex-listings): Document special value 'minted * lisp/org-latex.el (org-export-latex-minted): Delete variable
2010-10-28 16:55:40 -04:00
the minted package to `org-export-latex-packages-alist', for
example using customize, or with
(require 'org-latex)
(add-to-list 'org-export-latex-packages-alist '(\"\" \"minted\"))
Minor comments rearrangment.
2011-03-04 14:20:12 -05:00
In addition, it is necessary to install
org-latex.el: minor docstring clean up.
2011-02-15 09:46:23 -05:00
pygments (http://pygments.org), and to configure the variable
Alter way in which user chooses minted for latex source code export * lisp/org-exp.el (org-export-format-source-code-or-example): Use minted for latex source code export if `org-export-latex-listings' has the value 'minted * lisp/org-latex.el (org-export-latex-listings): Document special value 'minted * lisp/org-latex.el (org-export-latex-minted): Delete variable
2010-10-28 16:55:40 -04:00
`org-latex-to-pdf-process' so that the -shell-escape option is
passed to pdflatex.
"
LaTeX export: Allow export using the listings package Patch by Eric Schulte, see http://thread.gmane.org/gmane.emacs.orgmode/16269
2009-08-09 08:49:52 -04:00
:group 'org-export-latex
:type 'boolean)
(defcustom org-export-latex-listings-langs
recognize clojure as a lisp in `org-export-latex-listings-langs' * lisp/org-latex.el (org-export-latex-listings-langs): clojure is now recognized as a lisp
2010-10-14 09:13:42 -04:00
'((emacs-lisp "Lisp") (lisp "Lisp") (clojure "Lisp")
LaTeX export: Modify the structure of the listings name option. The variable `org-export-latex-listings-langs' is now an alist.
2009-08-23 13:11:12 -04:00
(c "C") (cc "C++")
(fortran "fortran")
(perl "Perl") (cperl "Perl") (python "Python") (ruby "Ruby")
(html "HTML") (xml "XML")
(tex "TeX") (latex "TeX")
(shell-script "bash")
(gnuplot "Gnuplot")
(ocaml "Caml") (caml "Caml")
added (sqlite "SQL") to org-export-latex-listings-langs * lisp/org-latex.el (org-export-latex-listings-langs): added (sqlite "SQL")
2010-07-09 20:40:58 -04:00
(sql "SQL") (sqlite "sql"))
LaTeX export: Modify the structure of the listings name option. The variable `org-export-latex-listings-langs' is now an alist.
2009-08-23 13:11:12 -04:00
"Alist mapping languages to their listing language counterpart.
The key is a symbol, the major mode symbol without the \"-mode\".
The value is the string that should be inserted as the language parameter
for the listings package. If the mode name and the listings name are
the same, the language does not need an entry in this list - but it does not
hurt if it is present."
LaTeX export: Allow export using the listings package Patch by Eric Schulte, see http://thread.gmane.org/gmane.emacs.orgmode/16269
2009-08-09 08:49:52 -04:00
:group 'org-export-latex
LaTeX export: Modify the structure of the listings name option. The variable `org-export-latex-listings-langs' is now an alist.
2009-08-23 13:11:12 -04:00
:type '(repeat
(list
(symbol :tag "Major mode ")
(string :tag "Listings language"))))
LaTeX export: Allow export using the listings package Patch by Eric Schulte, see http://thread.gmane.org/gmane.emacs.orgmode/16269
2009-08-09 08:49:52 -04:00
improve latex listings code block name export * lisp/org-exp.el (org-export-format-source-code-or-example): escape underscores in code block names on latex listings export * lisp/org-latex.el (org-export-latex-listings-w-names): make export of code block names to latex optional
2010-07-21 13:39:53 -04:00
(defcustom org-export-latex-listings-w-names t
"Non-nil means export names of named code blocks.
Code blocks exported with the listings package (controlled by the
`org-export-latex-listings' variable) can be named in the style
of noweb."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
improve latex listings code block name export * lisp/org-exp.el (org-export-format-source-code-or-example): escape underscores in code block names on latex listings export * lisp/org-latex.el (org-export-latex-listings-w-names): make export of code block names to latex optional
2010-07-21 13:39:53 -04:00
:type 'boolean)
LaTeX minted package for fontified source code export * org-exp.el (org-export-format-source-code-or-example): latex formatting of source code blocks using the minted package (org-export-plist-vars): Add :latex-minted property (org-export-latex-minted): Ensure variable is defined (org-export-latex-minted-langs): Ensure variable is defined * org-latex.el (org-export-latex-minted): new variable (org-export-latex-minted-langs): new variable (org-export-latex-minted-with-line-numbers): new variable (org-export-latex-minted):
2010-10-12 18:20:28 -04:00
(defcustom org-export-latex-minted-langs
'((emacs-lisp "common-lisp")
(cc "c++")
(cperl "perl")
(shell-script "bash")
(caml "ocaml"))
"Alist mapping languages to their minted language counterpart.
The key is a symbol, the major mode symbol without the \"-mode\".
The value is the string that should be inserted as the language parameter
for the minted package. If the mode name and the listings name are
the same, the language does not need an entry in this list - but it does not
hurt if it is present.
Note that minted uses all lower case for language identifiers,
and that the full list of language identifiers can be obtained
with:
pygmentize -L lexers
"
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
LaTeX minted package for fontified source code export * org-exp.el (org-export-format-source-code-or-example): latex formatting of source code blocks using the minted package (org-export-plist-vars): Add :latex-minted property (org-export-latex-minted): Ensure variable is defined (org-export-latex-minted-langs): Ensure variable is defined * org-latex.el (org-export-latex-minted): new variable (org-export-latex-minted-langs): new variable (org-export-latex-minted-with-line-numbers): new variable (org-export-latex-minted):
2010-10-12 18:20:28 -04:00
:type '(repeat
(list
(symbol :tag "Major mode ")
(string :tag "Listings language"))))
New UI for configuring latex src code export. Three new user-customizable variables: org-export-latex-listings-options (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list of options for the latex listings package. These options are supplied as a comma-separated list to the \\lstset command. Each element of the association list should be a list containing two strings: the name of the option, and the value. For example, (setq org-export-latex-listings-options '((\"basicstyle\" \"\\small\") (\"keywordstyle\" \"\\color{black}\\bfseries\\underbar\"))) will typeset the code in a small size font with underlined, bold black keywords. Note that the same options will be applied to blocks of all languages. See ftp://ftp.tex.ac.uk/tex-archive/macros/latex/contrib/listings/listings.pdf customization group: org-export-latex org-export-latex-minted-options (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list of options for the latex minted package. These options are supplied within square brackets in \\begin{minted} environments. Each element of the alist should be a list containing two strings: the name of the option, and the value. For example, (setq org-export-latex-minted-options '((\"bgcolor\" \"bg\") (\"frame\" \"lines\"))) will result in src blocks being exported with \\begin{minted}[bgcolor=bg,frame=lines]{<LANG>} as the start of the minted environment. Note that the same options will be applied to blocks of all languages." customization group: org-export-latex See minted.googlecode.com/files/minted.pdf org-export-latex-custom-lang-environments (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list mapping languages to language-specific latex environments used during export of src blocks by the listings and minted latex packages. For example, (setq org-export-latex-custom-lang-environments '((python \"pythoncode\"))) * lisp/org-exp.el (org-export-format-source-code-or-example): Support new user-customizable options (org-export-latex-custom-lang-environments): Ensure new variable is defined (org-export-latex-listings-options): Ensure new variable is defined (org-export-latex-minted-options): Ensure new variable is defined * lisp/org-latex.el (org-export-latex-listings-options): New variable (org-export-latex-minted-options): New variable (org-export-latex-custom-lang-environments): New variable
2010-11-17 04:50:50 -05:00
(defcustom org-export-latex-listings-options nil
"Association list of options for the latex listings package.
These options are supplied as a comma-separated list to the
\\lstset command. Each element of the association list should be
a list containing two strings: the name of the option, and the
value. For example,
(setq org-export-latex-listings-options
'((\"basicstyle\" \"\\small\")
(\"keywordstyle\" \"\\color{black}\\bfseries\\underbar\")))
will typeset the code in a small size font with underlined, bold
black keywords.
Note that the same options will be applied to blocks of all
languages."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
New UI for configuring latex src code export. Three new user-customizable variables: org-export-latex-listings-options (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list of options for the latex listings package. These options are supplied as a comma-separated list to the \\lstset command. Each element of the association list should be a list containing two strings: the name of the option, and the value. For example, (setq org-export-latex-listings-options '((\"basicstyle\" \"\\small\") (\"keywordstyle\" \"\\color{black}\\bfseries\\underbar\"))) will typeset the code in a small size font with underlined, bold black keywords. Note that the same options will be applied to blocks of all languages. See ftp://ftp.tex.ac.uk/tex-archive/macros/latex/contrib/listings/listings.pdf customization group: org-export-latex org-export-latex-minted-options (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list of options for the latex minted package. These options are supplied within square brackets in \\begin{minted} environments. Each element of the alist should be a list containing two strings: the name of the option, and the value. For example, (setq org-export-latex-minted-options '((\"bgcolor\" \"bg\") (\"frame\" \"lines\"))) will result in src blocks being exported with \\begin{minted}[bgcolor=bg,frame=lines]{<LANG>} as the start of the minted environment. Note that the same options will be applied to blocks of all languages." customization group: org-export-latex See minted.googlecode.com/files/minted.pdf org-export-latex-custom-lang-environments (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list mapping languages to language-specific latex environments used during export of src blocks by the listings and minted latex packages. For example, (setq org-export-latex-custom-lang-environments '((python \"pythoncode\"))) * lisp/org-exp.el (org-export-format-source-code-or-example): Support new user-customizable options (org-export-latex-custom-lang-environments): Ensure new variable is defined (org-export-latex-listings-options): Ensure new variable is defined (org-export-latex-minted-options): Ensure new variable is defined * lisp/org-latex.el (org-export-latex-listings-options): New variable (org-export-latex-minted-options): New variable (org-export-latex-custom-lang-environments): New variable
2010-11-17 04:50:50 -05:00
:type '(repeat
(list
(string :tag "Listings option name ")
(string :tag "Listings option value"))))
(defcustom org-export-latex-minted-options nil
"Association list of options for the latex minted package.
These options are supplied within square brackets in
\\begin{minted} environments. Each element of the alist should be
a list containing two strings: the name of the option, and the
value. For example,
(setq org-export-latex-minted-options
'((\"bgcolor\" \"bg\") (\"frame\" \"lines\")))
will result in src blocks being exported with
\\begin{minted}[bgcolor=bg,frame=lines]{<LANG>}
as the start of the minted environment. Note that the same
options will be applied to blocks of all languages."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
New UI for configuring latex src code export. Three new user-customizable variables: org-export-latex-listings-options (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list of options for the latex listings package. These options are supplied as a comma-separated list to the \\lstset command. Each element of the association list should be a list containing two strings: the name of the option, and the value. For example, (setq org-export-latex-listings-options '((\"basicstyle\" \"\\small\") (\"keywordstyle\" \"\\color{black}\\bfseries\\underbar\"))) will typeset the code in a small size font with underlined, bold black keywords. Note that the same options will be applied to blocks of all languages. See ftp://ftp.tex.ac.uk/tex-archive/macros/latex/contrib/listings/listings.pdf customization group: org-export-latex org-export-latex-minted-options (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list of options for the latex minted package. These options are supplied within square brackets in \\begin{minted} environments. Each element of the alist should be a list containing two strings: the name of the option, and the value. For example, (setq org-export-latex-minted-options '((\"bgcolor\" \"bg\") (\"frame\" \"lines\"))) will result in src blocks being exported with \\begin{minted}[bgcolor=bg,frame=lines]{<LANG>} as the start of the minted environment. Note that the same options will be applied to blocks of all languages." customization group: org-export-latex See minted.googlecode.com/files/minted.pdf org-export-latex-custom-lang-environments (default nil) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Association list mapping languages to language-specific latex environments used during export of src blocks by the listings and minted latex packages. For example, (setq org-export-latex-custom-lang-environments '((python \"pythoncode\"))) * lisp/org-exp.el (org-export-format-source-code-or-example): Support new user-customizable options (org-export-latex-custom-lang-environments): Ensure new variable is defined (org-export-latex-listings-options): Ensure new variable is defined (org-export-latex-minted-options): Ensure new variable is defined * lisp/org-latex.el (org-export-latex-listings-options): New variable (org-export-latex-minted-options): New variable (org-export-latex-custom-lang-environments): New variable
2010-11-17 04:50:50 -05:00
:type '(repeat
(list
(string :tag "Minted option name ")
(string :tag "Minted option value"))))
(defvar org-export-latex-custom-lang-environments nil
"Association list mapping languages to language-specific latex
environments used during export of src blocks by the listings
and minted latex packages. For example,
(setq org-export-latex-custom-lang-environments
'((python \"pythoncode\")))
would have the effect that if org encounters begin_src python
during latex export it will output
\\begin{pythoncode}
<src block body>
\\end{pythoncode}")
Release 5.10a
2008-01-31 05:36:18 -05:00
(defcustom org-export-latex-remove-from-headlines
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
'(:todo nil :priority nil :tags nil)
Correct some docstrings [part 3] This is the third patch in a series that makes some straightforward corrections to a number of docstrings. Each change is normally to: - correct a typo, or - fix up hyperlinks to function or variable names, or - ensure slightly better conformance with the documentation guidelines and tips given in the Elisp manual No attempt is made to provide missing docstrings or document arguments. Cheers, Phil
2010-07-16 17:22:01 -04:00
"A plist of keywords to remove from headlines. OBSOLETE.
Release 5.06d
2008-01-31 05:35:58 -05:00
Non-nil means remove this keyword type from the headline.
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
Don't remove the keys, just change their values.
Obsolete, this variable is no longer used. Use the separate
variables `org-export-with-todo-keywords', `org-export-with-priority',
and `org-export-with-tags' instead."
Release 5.06d
2008-01-31 05:35:58 -05:00
:type 'plist
:group 'org-export-latex)
org-latex.el: change image default option to .9\linewidth. * org-latex.el (org-export-latex-image-default-option): Change default value. Thanks to Sebastien Vauban for this suggestion.
2011-07-17 02:32:20 -04:00
(defcustom org-export-latex-image-default-option "width=.9\\linewidth"
Release 5.06d
2008-01-31 05:35:58 -05:00
"Default option for images."
:group 'org-export-latex
Release 5.14
2008-01-31 05:37:51 -05:00
:type 'string)
Release 5.06d
2008-01-31 05:35:58 -05:00
org-latex: `org-latex-default-figure-position' for default figure position * lisp/org-latex.el (org-latex-default-figure-position): New defcustom for default placement of latex figures. (org-export-latex-tables): Positioning tables using the new defcustom variable. (org-export-latex-format-image): Positioning images using the new defcustom variable.
2011-01-28 10:59:47 -05:00
(defcustom org-latex-default-figure-position "htb"
"Default position for latex figures."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
org-latex: `org-latex-default-figure-position' for default figure position * lisp/org-latex.el (org-latex-default-figure-position): New defcustom for default placement of latex figures. (org-export-latex-tables): Positioning tables using the new defcustom variable. (org-export-latex-format-image): Positioning images using the new defcustom variable.
2011-01-28 10:59:47 -05:00
:type 'string)
LaTeX export: Allow to customize the tabular environment * lisp/org-latex.el (org-export-latex-tabular-environment): New option. (org-export-latex-tables): Use `org-export-latex-tabular-environment'.
2010-07-06 04:39:35 -04:00
(defcustom org-export-latex-tabular-environment "tabular"
"Default environment used to build tables."
:group 'org-export-latex
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
LaTeX export: Allow to customize the tabular environment * lisp/org-latex.el (org-export-latex-tabular-environment): New option. (org-export-latex-tables): Use `org-export-latex-tabular-environment'.
2010-07-06 04:39:35 -04:00
:type 'string)
New option `org-export-latex-link-with-unknown-path-format'. * org-latex.el (org-export-latex-link-with-unknown-path-format): New option. (org-export-latex-links): Use it. Thanks to Sébastien Vauban for a preliminary patch for this.
2012-05-17 02:06:58 -04:00
(defcustom org-export-latex-link-with-unknown-path-format "\\texttt{%s}"
"Format string for links with unknown path type."
:group 'org-export-latex
:version "24.2"
:type 'string)
Export: Better detection of images that can be inlined. Two new variables, `org-export-html-inline-image-extensions' and `org-export-latex-inline-image-extensions' now define the file extensions that will be considered for inlining images. The default for HTML is png, jpg, jpeg, and gif files. The default for LaTeX is png, jpg, jpeg, and pdf, assuming processing with `pdflatex'. For LaTeX export, this can lead to conflicts for links that point to non-image PDF files. To avoid that such a link will be inlined by accident, always give a description text for such a link, one that is not equal to the path.
2009-01-18 03:11:24 -05:00
(defcustom org-export-latex-inline-image-extensions
LaTeX export: Allow postscript extensions for images Some propel process LaTeX filed not directly to pdf, but go through dvi and then to ps or pdf. In that case, allowed images are ps and eps files, not pdf and jpg. This commit adds the two extensions, so that export using that alternative path can be supported better. However, it is up to the user to make sure that the images are actually compatible with the backend.
2009-06-28 07:00:37 -04:00
'("pdf" "jpeg" "jpg" "png" "ps" "eps")
Export: Better detection of images that can be inlined. Two new variables, `org-export-html-inline-image-extensions' and `org-export-latex-inline-image-extensions' now define the file extensions that will be considered for inlining images. The default for HTML is png, jpg, jpeg, and gif files. The default for LaTeX is png, jpg, jpeg, and pdf, assuming processing with `pdflatex'. For LaTeX export, this can lead to conflicts for links that point to non-image PDF files. To avoid that such a link will be inlined by accident, always give a description text for such a link, one that is not equal to the path.
2009-01-18 03:11:24 -05:00
"Extensions of image files that can be inlined into LaTeX.
LaTeX export: Allow postscript extensions for images Some propel process LaTeX filed not directly to pdf, but go through dvi and then to ps or pdf. In that case, allowed images are ps and eps files, not pdf and jpg. This commit adds the two extensions, so that export using that alternative path can be supported better. However, it is up to the user to make sure that the images are actually compatible with the backend.
2009-06-28 07:00:37 -04:00
Note that the image extension *actually* allowed depend on the way the
LaTeX file is processed. When used with pdflatex, pdf, jpg and png images
are OK. When processing through dvi to Postscript, only ps and eps are
allowed. The default we use here encompasses both."
Fix typo
2009-05-03 14:47:04 -04:00
:group 'org-export-latex
Export: Better detection of images that can be inlined. Two new variables, `org-export-html-inline-image-extensions' and `org-export-latex-inline-image-extensions' now define the file extensions that will be considered for inlining images. The default for HTML is png, jpg, jpeg, and gif files. The default for LaTeX is png, jpg, jpeg, and pdf, assuming processing with `pdflatex'. For LaTeX export, this can lead to conflicts for links that point to non-image PDF files. To avoid that such a link will be inlined by accident, always give a description text for such a link, one that is not equal to the path.
2009-01-18 03:11:24 -05:00
:type '(repeat (string :tag "Extension")))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defcustom org-export-latex-coding-system nil
Correct some docstrings [part 3] This is the third patch in a series that makes some straightforward corrections to a number of docstrings. Each change is normally to: - correct a typo, or - fix up hyperlinks to function or variable names, or - ensure slightly better conformance with the documentation guidelines and tips given in the Elisp manual No attempt is made to provide missing docstrings or document arguments. Cheers, Phil
2010-07-16 17:22:01 -04:00
"Coding system for the exported LaTeX file."
Release 5.06d
2008-01-31 05:35:58 -05:00
:group 'org-export-latex
:type 'coding-system)
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(defgroup org-export-pdf nil
"Options for exporting Org-mode files to PDF, via LaTeX."
Fix typo
2009-11-26 01:27:55 -05:00
:tag "Org Export PDF"
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
:group 'org-export-latex
:group 'org-export)
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
(defcustom org-latex-to-pdf-process
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
'("pdflatex -interaction nonstopmode -output-directory %o %f"
"pdflatex -interaction nonstopmode -output-directory %o %f"
"pdflatex -interaction nonstopmode -output-directory %o %f")
Allow to use imagemagick for previewing LaTeX fragements. * org.el (org-latex-create-formula-image-program): New option to use either dvipng or imagemagick to convert and preview LaTeX fragments. (org-preview-latex-fragment, org-format-latex): Handle the new option. (org-create-formula-image-with-dvipng): Rename from `org-create-formula-image'. (org-create-formula-image-with-imagemagick): New defun to handle LaTeX preview with imagemagick. (org-latex-color, org-latex-color-format): New defuns to handle color conversions. * org-latex.el (org-latex-to-pdf-process, org-export-as-pdf): Allow to use imagemagick to convert LaTeX fragments. * org-html.el (org-export-html-preprocess): Ditto. * org-exp.el (org-export-with-LaTeX-fragments): Ditto. * org.texi (@LaTeX{} fragments): Document imagemagick as an alternative to dvipng.
2012-04-20 13:21:43 -04:00
"Commands to process a LaTeX file to a PDF file and process latex
fragments to pdf files.By default,this is a list of strings,and each of
strings will be given to the shell as a command. %f in the command will
be replaced by the full file name, %b by the file base name (i.e. without
extension) and %o by the base directory of the file.
If you set `org-create-formula-image-program'
`org-export-with-LaTeX-fragments' to 'imagemagick, you can add a
sublist which contains your own command(s) for LaTeX fragments
previewing, like this:
'(\"xelatex -interaction nonstopmode -output-directory %o %f\"
\"xelatex -interaction nonstopmode -output-directory %o %f\"
;; use below command(s) to convert latex fragments
(\"xelatex %f\"))
With no such sublist, the default command used to convert LaTeX
fragments will be the first string in the list.
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
The reason why this is a list is that it usually takes several runs of
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
`pdflatex', maybe mixed with a call to `bibtex'. Org does not have a clever
Fix spelling and grammar
2009-11-12 07:39:29 -05:00
mechanism to detect which of these commands have to be run to get to a stable
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
result, and it also does not do any error checking.
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
By default, Org uses 3 runs of `pdflatex' to do the processing. If you
have texi2dvi on your system and if that does not cause the infamous
egrep/locale bug:
http://lists.gnu.org/archive/html/bug-texinfo/2010-03/msg00031.html
then `texi2dvi' is the superior choice. Org does offer it as one
of the customize options.
Use texi2dvi for processing LaTeX to pdf * lisp/org-latex.el (org-latex-to-pdf-process): Use texi2dvi if available. (org-export-latex-get-error): New function. (org-export-as-pdf): Give an indication of the errors that happened during processing.
2010-10-05 12:22:31 -04:00
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
Alternatively, this may be a Lisp function that does the processing, so you
could use this to apply the machinery of AUCTeX or the Emacs LaTeX mode.
Fix spelling and grammar
2009-11-12 07:39:29 -05:00
This function should accept the file name as its single argument."
Fix minor issue with customization group
2009-11-26 04:13:47 -05:00
:group 'org-export-pdf
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
:type '(choice
(repeat :tag "Shell command sequence"
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
(string :tag "Shell command"))
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
(const :tag "2 runs of pdflatex"
Fix typos
2010-10-20 01:36:48 -04:00
("pdflatex -interaction nonstopmode -output-directory %o %f"
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
"pdflatex -interaction nonstopmode -output-directory %o %f"))
(const :tag "3 runs of pdflatex"
Fix typos
2010-10-20 01:36:48 -04:00
("pdflatex -interaction nonstopmode -output-directory %o %f"
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
"pdflatex -interaction nonstopmode -output-directory %o %f"
"pdflatex -interaction nonstopmode -output-directory %o %f"))
(const :tag "pdflatex,bibtex,pdflatex,pdflatex"
Fix typos
2010-10-20 01:36:48 -04:00
("pdflatex -interaction nonstopmode -output-directory %o %f"
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
"bibtex %b"
"pdflatex -interaction nonstopmode -output-directory %o %f"
"pdflatex -interaction nonstopmode -output-directory %o %f"))
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
(const :tag "2 runs of xelatex"
("xelatex -interaction nonstopmode -output-directory %o %f"
"xelatex -interaction nonstopmode -output-directory %o %f"))
(const :tag "3 runs of xelatex"
("xelatex -interaction nonstopmode -output-directory %o %f"
"xelatex -interaction nonstopmode -output-directory %o %f"
"xelatex -interaction nonstopmode -output-directory %o %f"))
(const :tag "xelatex,bibtex,xelatex,xelatex"
("xelatex -interaction nonstopmode -output-directory %o %f"
"bibtex %b"
"xelatex -interaction nonstopmode -output-directory %o %f"
"xelatex -interaction nonstopmode -output-directory %o %f"))
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
(const :tag "texi2dvi"
Fix typos
2010-10-20 01:36:48 -04:00
("texi2dvi -p -b -c -V %f"))
Add rubber as a way to process LaTeX to pdf * lisp/org-latex.el (org-latex-to-pdf-process): Add rubber as another default option.
2010-10-13 08:33:48 -04:00
(const :tag "rubber"
Fix typos
2010-10-20 01:36:48 -04:00
("rubber -d --into %o %f"))
Go back to pdflatex processing because of texi2dvi/egrep bug
2010-10-10 03:03:57 -04:00
(function)))
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
Make the LaTeX/PDF logfiles to be removed a configurable list Patch by Lukasz Stelmach
2009-11-26 01:33:06 -05:00
(defcustom org-export-pdf-logfiles
'("aux" "idx" "log" "out" "toc" "nav" "snm" "vrb")
"The list of file extensions to consider as LaTeX logfiles."
:group 'org-export-pdf
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
:version "24.1"
Fix customization type of new variable
2009-11-26 01:34:56 -05:00
:type '(repeat (string :tag "Extension")))
Make the LaTeX/PDF logfiles to be removed a configurable list Patch by Lukasz Stelmach
2009-11-26 01:33:06 -05:00
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(defcustom org-export-pdf-remove-logfiles t
Remove comma after means in many docstrings Stephen Eglen says these commas should not be there.
2010-01-21 10:15:40 -05:00
"Non-nil means remove the logfiles produced by PDF production.
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
These are the .aux, .log, .out, and .toc files."
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
:group 'org-export-pdf
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
:type 'boolean)
Export: New hooks for Chris Gray's LaTeX/HTML blocks Chris Gray had the idea to have arbitrary blocks turned in LaTeX environments and HTML divs. These three new hooks allow implementation has an add-on rather than a patch.
2009-05-02 02:02:17 -04:00
;;; Hooks
New hook
2009-12-11 02:50:51 -05:00
(defvar org-export-latex-after-initial-vars-hook nil
"Hook run before LaTeX export.
The exact moment is after the initial variables like org-export-latex-class
have been determined from the environment.")
Export: New hooks for Chris Gray's LaTeX/HTML blocks Chris Gray had the idea to have arbitrary blocks turned in LaTeX environments and HTML divs. These three new hooks allow implementation has an add-on rather than a patch.
2009-05-02 02:02:17 -04:00
(defvar org-export-latex-after-blockquotes-hook nil
"Hook run during LaTeX export, after blockquote, verse, center are done.")
New hook `org-export-latex-final-hook'.
2009-09-28 23:01:56 -04:00
(defvar org-export-latex-final-hook nil
"Hook run in the finalized LaTeX buffer.")
LaTeX export: New hook that runs after saving the buffer
2010-01-06 02:50:47 -05:00
(defvar org-export-latex-after-save-hook nil
"Hook run in the finalized LaTeX buffer, after it has been saved.")
Release 5.10a
2008-01-31 05:36:18 -05:00
;;; Autoload functions:
Release 5.14
2008-01-31 05:37:51 -05:00
Release 5.06d
2008-01-31 05:35:58 -05:00
;;;###autoload
(defun org-export-as-latex-batch ()
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"Call `org-export-as-latex', may be used in batch processing.
For example:
Fix some additional typos.
2008-12-17 03:08:06 -05:00
emacs --batch
--load=$HOME/lib/emacs/org.el
--eval \"(setq org-export-headline-levels 2)\"
--visit=MyFile --funcall org-export-as-latex-batch"
Release 5.06d
2008-01-31 05:35:58 -05:00
(org-export-as-latex org-export-headline-levels 'hidden))
;;;###autoload
(defun org-export-as-latex-to-buffer (arg)
Fix typos in org-export-latex.el and whitespace
2008-12-16 10:34:50 -05:00
"Call `org-export-as-latex` with output to a temporary buffer.
Release 5.06d
2008-01-31 05:35:58 -05:00
No file is created. The prefix ARG is passed through to `org-export-as-latex'."
(interactive "P")
(org-export-as-latex arg nil nil "*Org LaTeX Export*")
Export: Make all export commands push the result to the kill ring All export commands now push the result to the kill ring by default. This is subject to the variable `org-export-push-to-kill-ring'. Also, this commit adds a new variable `org-export-show-temporary-export-buffer' which can be used to turn off the display of the temporary buffer containing the exported text. Since this stuff is now automatically pushed onto the kill ring, some people might prefer not to see this buffer.
2009-05-21 03:14:33 -04:00
(when org-export-show-temporary-export-buffer
(switch-to-buffer-other-window "*Org LaTeX Export*")))
Release 5.06d
2008-01-31 05:35:58 -05:00
;;;###autoload
(defun org-replace-region-by-latex (beg end)
"Replace the region from BEG to END with its LaTeX export.
It assumes the region has `org-mode' syntax, and then convert it to
Release 5.14
2008-01-31 05:37:51 -05:00
LaTeX. This can be used in any buffer. For example, you could
Release 5.06d
2008-01-31 05:35:58 -05:00
write an itemized list in `org-mode' syntax in an LaTeX buffer and
then use this command to convert it."
(interactive "r")
(let (reg latex buf)
(save-window-excursion
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode). * org.el (org-show-hierarchy-above, org-cycle) (org-global-cycle, org-files-list, org-store-link) (org-link-search, org-open-file, org-display-outline-path) (org-refile-get-location, org-update-all-dblocks) (org-change-tag-in-region, org-entry-properties) (org-save-all-org-buffers, org-revert-all-org-buffers) (org-buffer-list, org-cdlatex-mode) (org-install-agenda-files-menu, org-end-of-subtree) (org-speedbar-set-agenda-restriction): Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode). * org-timer.el (org-timer-set-timer): Ditto. * org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto. * org-src.el (org-edit-src-exit, org-edit-src-code) (org-edit-fixed-width-region, org-edit-src-exit): Ditto. * org-remember.el (org-remember-handler): Ditto. * org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto. * org-macs.el (org-get-limited-outline-regexp): Ditto. * org-lparse.el (org-replace-region-by): Ditto. * org-latex.el (org-latex-to-pdf-process) (org-replace-region-by-latex): Ditto. * org-indent.el (org-indent-indent-buffer): Ditto. * org-id.el (org-id-store-link, org-id-update-id-locations) (org-id-store-link): Ditto. * org-html.el (org-export-html-preprocess) (org-replace-region-by-html): Ditto. * org-footnote.el (org-footnote-normalize) (org-footnote-goto-definition) (org-footnote-create-definition, org-footnote-normalize): Ditto. * org-docbook.el (org-replace-region-by-docbook): Ditto. * org-ctags.el (find-tag): Ditto. * org-colview.el (org-columns-redo) (org-columns-display-here, org-columns-edit-value) (org-columns-redo): Ditto. * org-colview-xemacs.el (org-columns-redo) (org-columns-display-here, org-columns-edit-value) (org-columns-redo): Ditto. * org-capture.el (org-capture-insert-template-here) (org-capture, org-capture-finalize) (org-capture-set-target-location) (org-capture-insert-template-here): Ditto. * org-ascii.el (org-replace-region-by-ascii): Ditto. * org-archive.el (org-archive-subtree): Ditto. * org-agenda.el (org-agenda) (org-agenda-get-restriction-and-command) (org-agenda-get-some-entry-text, org-search-view) (org-tags-view, org-agenda-get-day-entries) (org-agenda-format-item, org-agenda-goto, org-agenda-kill) (org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 14:03:45 -04:00
(if (derived-mode-p 'org-mode)
Release 5.06d
2008-01-31 05:35:58 -05:00
(setq latex (org-export-region-as-latex
beg end t 'string))
(setq reg (buffer-substring beg end)
buf (get-buffer-create "*Org tmp*"))
Use with-current-buffer instead of save-excursion set-buffer where possible Patch by Stefan Monnier
2009-11-05 16:51:50 -05:00
(with-current-buffer buf
Release 5.06d
2008-01-31 05:35:58 -05:00
(erase-buffer)
(insert reg)
(org-mode)
(setq latex (org-export-region-as-latex
(point-min) (point-max) t 'string)))
(kill-buffer buf)))
(delete-region beg end)
(insert latex)))
;;;###autoload
(defun org-export-region-as-latex (beg end &optional body-only buffer)
"Convert region from BEG to END in `org-mode' buffer to LaTeX.
If prefix arg BODY-ONLY is set, omit file header, footer, and table of
contents, and only produce the region of converted text, useful for
cut-and-paste operations.
If BUFFER is a buffer or a string, use/create that buffer as a target
of the converted LaTeX. If BUFFER is the symbol `string', return the
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
produced LaTeX as a string and leave no buffer behind. For example,
Release 5.06d
2008-01-31 05:35:58 -05:00
a Lisp program could call this function in the following way:
(setq latex (org-export-region-as-latex beg end t 'string))
When called interactively, the output buffer is selected, and shown
Fix typos
2009-05-04 16:26:41 -04:00
in a window. A non-interactive call will only return the buffer."
Release 5.06d
2008-01-31 05:35:58 -05:00
(interactive "r\nP")
adding optional argument KIND to all org-called-interactively-p function invocations * lisp/ob.el (org-babel-sha1-hash): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-agenda.el (org-agenda-redo): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-agenda-show-1): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-agenda-set-tags): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-ascii.el (org-export-as-latin1): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-export-as-latin1-to-buffer): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-export-as-utf8-to-buffer): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-export-region-as-ascii): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-docbook.el (org-export-region-as-docbook): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-html.el (org-export-region-as-html): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-latex.el (org-export-region-as-latex): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-table.el (org-table-blank-field): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-current-column): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-current-dline): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-sort-lines): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-sum): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-rotate-recalc-marks): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-eval-formula): Adding optional argument KIND to all org-called-interactively-p function invocations. (orgtbl-send-table): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org.el (org-mode): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-copy-subtree): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-paste-subtree): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-store-link): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-todo): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-occur): Adding optional argument KIND to all org-called-interactively-p function invocations.
2011-06-29 18:25:09 -04:00
(when (org-called-interactively-p 'any)
Release 5.06d
2008-01-31 05:35:58 -05:00
(setq buffer "*Org LaTeX Export*"))
(let ((transient-mark-mode t) (zmacs-regions t)
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
ext-plist rtn)
Fix typos
2009-11-12 11:50:31 -05:00
(setq ext-plist (plist-put ext-plist :ignore-subtree-p t))
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char end)
(set-mark (point)) ;; to activate the region
(goto-char beg)
(setq rtn (org-export-as-latex
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
nil nil ext-plist
Release 5.06d
2008-01-31 05:35:58 -05:00
buffer body-only))
(if (fboundp 'deactivate-mark) (deactivate-mark))
adding optional argument KIND to all org-called-interactively-p function invocations * lisp/ob.el (org-babel-sha1-hash): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-agenda.el (org-agenda-redo): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-agenda-show-1): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-agenda-set-tags): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-ascii.el (org-export-as-latin1): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-export-as-latin1-to-buffer): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-export-as-utf8-to-buffer): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-export-region-as-ascii): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-docbook.el (org-export-region-as-docbook): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-html.el (org-export-region-as-html): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-latex.el (org-export-region-as-latex): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org-table.el (org-table-blank-field): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-current-column): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-current-dline): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-sort-lines): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-sum): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-rotate-recalc-marks): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-table-eval-formula): Adding optional argument KIND to all org-called-interactively-p function invocations. (orgtbl-send-table): Adding optional argument KIND to all org-called-interactively-p function invocations. * lisp/org.el (org-mode): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-copy-subtree): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-paste-subtree): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-store-link): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-todo): Adding optional argument KIND to all org-called-interactively-p function invocations. (org-occur): Adding optional argument KIND to all org-called-interactively-p function invocations.
2011-06-29 18:25:09 -04:00
(if (and (org-called-interactively-p 'any) (bufferp rtn))
Release 5.06d
2008-01-31 05:35:58 -05:00
(switch-to-buffer-other-window rtn)
rtn)))
;;;###autoload
(defun org-export-as-latex (arg &optional hidden ext-plist
Added support for recursive publication of files.
2008-02-29 21:42:28 -05:00
to-buffer body-only pub-dir)
Release 5.14
2008-01-31 05:37:51 -05:00
"Export current buffer to a LaTeX file.
If there is an active region, export only the region. The prefix
ARG specifies how many levels of the outline should become
headlines. The default is 3. Lower levels will be exported
depending on `org-export-latex-low-levels'. The default is to
Fix docstring of export functions: HIDDEN parameter is obsolete
2009-05-19 02:09:30 -04:00
convert them as description lists.
HIDDEN is obsolete and does nothing.
EXT-PLIST is a property list with
Release 5.14
2008-01-31 05:37:51 -05:00
external parameters overriding org-mode's default settings, but
still inferior to file-local settings. When TO-BUFFER is
non-nil, create a buffer with that name and export to that
buffer. If TO-BUFFER is the symbol `string', don't leave any
buffer behind but just return the resulting LaTeX as a string.
When BODY-ONLY is set, don't produce the file header and footer,
Fix typo
2010-05-09 17:01:56 -04:00
simply return the content of \\begin{document}...\\end{document},
without even the \\begin{document} and \\end{document} commands.
Added support for recursive publication of files.
2008-02-29 21:42:28 -05:00
when PUB-DIR is set, use this as the publishing directory."
Release 5.06d
2008-01-31 05:35:58 -05:00
(interactive "P")
fixes BUG in `org-export-as-latex' -- was only exporting the body This bug was introduced in commit 1b40601ebd5de3746ab72d19d3258f815a402066 which sets the body-only option to true when called with a simple prefix argument, however it does not check that the prefix argument is non-null. Thanks to Valentin Wüstholz for reporting this bug
2010-04-11 12:14:21 -04:00
(when (and (not body-only) arg (listp arg)) (setq body-only t))
New hook org-export-first-hook
2009-12-11 02:40:19 -05:00
(run-hooks 'org-export-first-hook)
Release 5.06d
2008-01-31 05:35:58 -05:00
;; Make sure we have a file name when we need it.
(when (and (not (or to-buffer body-only))
(not buffer-file-name))
(if (buffer-base-buffer)
(org-set-local 'buffer-file-name
(with-current-buffer (buffer-base-buffer)
buffer-file-name))
(error "Need a file name to be able to export")))
(message "Exporting to LaTeX...")
Bugfix: Avoid raising buffer-modified flag during LaTeX export This had, as usually, to do with changing text properties. Report by Russel Adams.
2009-02-22 14:50:12 -05:00
(org-unmodified
Allow to export to LaTeX while in column view
2009-12-16 05:12:05 -05:00
(let ((inhibit-read-only t))
(remove-text-properties (point-min) (point-max)
'(:org-license-to-kill nil))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(org-update-radio-target-regexp)
Release 5.14
2008-01-31 05:37:51 -05:00
(org-export-latex-set-initial-vars ext-plist arg)
Improve footnotes handling in exporters * lisp/org-exp.el (org-export-footnotes-markers, org-export-footnotes-data): new variables. (org-export-preprocess-string): use a more explicit argument. * lisp/org-html.el (org-export-as-html): initialize new variables. * lisp/org-docbook.el (org-export-as-docbook): initialize new variables. * lisp/org-latex.el (org-export-latex-footmark-seen): new variable. (org-export-as-latex): initialize new variables. (org-export-latex-preprocess): allow to export two or more footnotes in a row. Also permit to have footnotes refering to previously defined footnotes. * lisp/org-ascii.el (org-export-as-ascii): feed org-footnote-normalize with data so it can normalize footnotes before first headline, or footnotes with their definition outside exported region.
2011-05-11 12:02:15 -04:00
(setq org-export-opt-plist org-export-latex-options-plist
org-export-footnotes-data (org-footnote-all-labels 'with-defs)
Rename org-export-footnotes-markers to org-export-footnotes-seen * lisp/org-exp.el (org-export-footnotes-data): change docstring. (org-export-footnotes-seen): renamed from org-export-footnotes-markers. * lisp/org-ascii.el (org-export-as-ascii): apply change. * lisp/org-docbook.el (org-export-as-docbook): apply change. * lisp/org-footnote.el (org-footnote-normalize): apply change. * lisp/org-html.el (org-export-as-html): apply change. * lisp/org-latex.el (org-export-as-latex): apply change.
2011-06-26 12:51:28 -04:00
org-export-footnotes-seen nil
Improve footnotes handling in exporters * lisp/org-exp.el (org-export-footnotes-markers, org-export-footnotes-data): new variables. (org-export-preprocess-string): use a more explicit argument. * lisp/org-html.el (org-export-as-html): initialize new variables. * lisp/org-docbook.el (org-export-as-docbook): initialize new variables. * lisp/org-latex.el (org-export-latex-footmark-seen): new variable. (org-export-as-latex): initialize new variables. (org-export-latex-preprocess): allow to export two or more footnotes in a row. Also permit to have footnotes refering to previously defined footnotes. * lisp/org-ascii.el (org-export-as-ascii): feed org-footnote-normalize with data so it can normalize footnotes before first headline, or footnotes with their definition outside exported region.
2011-05-11 12:02:15 -04:00
org-export-latex-footmark-seen nil)
Fix bug with #+BIND during LaTeX export Christopher Suckling writes: > Thank you, but not quite working yet: > > ,---- > | #+BIND: org-export-latex-title-command "" > `---- > > now appears to be having the *effect* of setting a global variable. > > I load Emacs then visit the below test org file. I then export the file. > > I get a \maketitle line. > > I then C-c C-c on the #+BIND: line and re-export. > > \maketitle is removed. > > I then export another org file without the #+BIND: line. > > There is no \maketitle, even though there should be. > > I add > > ,---- > | #+BIND: org-export-latex-title-command "\foobar" > `---- > > to the new org file, C-c C-c and export: > > \foobar is added to the exported file. > > Finally, I re-export the original test org file (without C-c C-c on the > #+BIND: line): > > \foobar is added to the exported file. > > However, > > ,---- > | C-h v org-export-latex-title-command > `---- > > always returns the value "\\maketitle", no matter what the value of the > #+BIND: line. > > Best, Christopher
2010-01-04 11:48:47 -05:00
(org-install-letbind)
New hook
2009-12-11 02:50:51 -05:00
(run-hooks 'org-export-latex-after-initial-vars-hook)
Release 5.11
2008-01-31 05:36:29 -05:00
(let* ((wcf (current-window-configuration))
PATCH: Support `org-export-process-option-filters' in latex export `org-export-process-option-filters' is supported for HTML export but not for latex export. The patch at the bottom fixes that. I note that there is one other location in the same function where it seems the same change could be made. I suspect this is not necessary, but if someone is familiar with the org-latex code they might like to have a look. (I didn't manage to understand the roles of the several variables with names like *-opt-plist *-options-plist in that function.) I'm protecting this patch from patchwork with ^$; it's the patch at the bottom that I propose. $ diff --git a/lisp/org-latex.el b/lisp/org-latex.el $ index 51ee6d2..53d6b40 100644 $ --- a/lisp/org-latex.el $ +++ b/lisp/org-latex.el $ @@ -700,7 +700,8 @@ when PUB-DIR is set, use this as the publishing directory." $ '(:org-license-to-kill nil)))) $ (org-update-radio-target-regexp) $ (org-export-latex-set-initial-vars ext-plist arg) $ - (setq org-export-opt-plist org-export-latex-options-plist) $ + (setq org-export-opt-plist $ + (org-export-process-option-filters org-export-latex-options-plist)) $ (org-install-letbind) $ (run-hooks 'org-export-latex-after-initial-vars-hook) $ (let* ((wcf (current-window-configuration)) $ Support `org-export-process-option-filters' in latex export * lisp/org-latex.el (org-export-as-latex): Process export property list with `org-export-process-option-filters' early in latex export Modified lisp/org-latex.el
2011-01-21 14:58:04 -05:00
(opt-plist
(org-export-process-option-filters org-export-latex-options-plist))
Release 5.14
2008-01-31 05:37:51 -05:00
(region-p (org-region-active-p))
Properties can be used to confiugre subtree export.
2008-05-21 03:49:04 -04:00
(rbeg (and region-p (region-beginning)))
(rend (and region-p (region-end)))
Release 5.14
2008-01-31 05:37:51 -05:00
(subtree-p
Fix typos
2009-11-12 11:50:31 -05:00
(if (plist-get opt-plist :ignore-subtree-p)
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
nil
(when region-p
(save-excursion
(goto-char rbeg)
(and (org-at-heading-p)
(>= (org-end-of-subtree t t) rend))))))
Export: Implement macro replacement during export A line: #+MARCO: name replacement text can be referenced by {{{name}}}. As special cases, {{{title}}} will reference #+TITLE, and similar with similar lines.
2009-02-23 08:15:52 -05:00
(opt-plist (setq org-export-opt-plist
(if subtree-p
(org-export-add-subtree-options opt-plist rbeg)
opt-plist)))
Properties can be used to confiugre subtree export.
2008-05-21 03:49:04 -04:00
;; Make sure the variable contains the updated values.
Fix bug with #+BIND during LaTeX export Christopher Suckling writes: > Thank you, but not quite working yet: > > ,---- > | #+BIND: org-export-latex-title-command "" > `---- > > now appears to be having the *effect* of setting a global variable. > > I load Emacs then visit the below test org file. I then export the file. > > I get a \maketitle line. > > I then C-c C-c on the #+BIND: line and re-export. > > \maketitle is removed. > > I then export another org file without the #+BIND: line. > > There is no \maketitle, even though there should be. > > I add > > ,---- > | #+BIND: org-export-latex-title-command "\foobar" > `---- > > to the new org file, C-c C-c and export: > > \foobar is added to the exported file. > > Finally, I re-export the original test org file (without C-c C-c on the > #+BIND: line): > > \foobar is added to the exported file. > > However, > > ,---- > | C-h v org-export-latex-title-command > `---- > > always returns the value "\\maketitle", no matter what the value of the > #+BIND: line. > > Best, Christopher
2010-01-04 11:48:47 -05:00
(org-export-latex-options-plist (setq org-export-opt-plist opt-plist))
Implement index generation during export This new code will search #+INDEX lines in the buffer. For LaTeX, it will simple convert these into LaTeX \index{} commands. For other backends, it will copy thee entries to a new file, with extension orgx. These files can then later be post-processed to create the index.
2010-02-25 01:31:29 -05:00
;; The following two are dynamically scoped into other
;; routines below.
(org-current-export-dir
(or pub-dir (org-export-directory :html opt-plist)))
(org-current-export-file buffer-file-name)
Release 5.14
2008-01-31 05:37:51 -05:00
(title (or (and subtree-p (org-export-get-title-from-subtree))
(plist-get opt-plist :title)
Revert "Preserve math environments in title when exporting to LaTeX" This reverts commit c579f08eeee1cd92b53fdb92925a7d3035012816.
2010-11-21 04:03:07 -05:00
(and (not
(plist-get opt-plist :skip-before-1st-heading))
(org-export-grab-title-from-buffer))
LaTeX export: When exporting to a buffer only, do not require a file name
2010-02-12 02:34:00 -05:00
(and buffer-file-name
(file-name-sans-extension
(file-name-nondirectory buffer-file-name)))
"No Title"))
Fix whitespace and compiler wanings
2010-04-01 07:11:54 -04:00
(filename
LaTeX export: When exporting to a buffer only, do not require a file name
2010-02-12 02:34:00 -05:00
(and (not to-buffer)
(concat
(file-name-as-directory
(or pub-dir
org-latex.el: Fix bug in setting the export directory according to the LaTeX options. * org-latex.el (org-export-as-latex): Fix bug in setting the export directory according to the LaTeX options. Thanks to A. Major for reporting this and to Christian Moe for suggesting a fix.
2012-03-23 08:55:50 -04:00
(org-export-directory :LaTeX org-export-latex-options-plist)))
LaTeX export: When exporting to a buffer only, do not require a file name
2010-02-12 02:34:00 -05:00
(file-name-sans-extension
(or (and subtree-p
(org-entry-get rbeg "EXPORT_FILE_NAME" t))
(file-name-nondirectory ;sans-extension
(or buffer-file-name
Correct some docstrings [part 3] This is the third patch in a series that makes some straightforward corrections to a number of docstrings. Each change is normally to: - correct a typo, or - fix up hyperlinks to function or variable names, or - ensure slightly better conformance with the documentation guidelines and tips given in the Elisp manual No attempt is made to provide missing docstrings or document arguments. Cheers, Phil
2010-07-16 17:22:01 -04:00
(error "Don't know which export file to use")))))
LaTeX export: When exporting to a buffer only, do not require a file name
2010-02-12 02:34:00 -05:00
".tex")))
(filename
(and filename
(if (equal (file-truename filename)
(file-truename (or buffer-file-name "dummy.org")))
(concat filename ".tex")
filename)))
Turn off auto insert and TeX master query for export * lisp/org-latex.el (org-export-as-latex): Turn off auto-insert and set TeX-master to t when creating new TeX buffers. * lisp/org-docbook.el (org-export-as-docbook): * lisp/org-html.el (org-export-as-html): Turn off auto-insert when creating new buffers.
2011-10-28 04:03:33 -04:00
(auto-insert nil); Avoid any auto-insert stuff for the new file
org-latex.el (org-export-as-latex): Check TeX-master correctly. * org-latex.el (org-export-as-latex): Check TeX-master correctly. TINYCHANGE
2012-03-20 12:21:42 -04:00
(TeX-master (boundp 'TeX-master))
Release 5.06d
2008-01-31 05:35:58 -05:00
(buffer (if to-buffer
(cond
((eq to-buffer 'string) (get-buffer-create
"*Org LaTeX Export*"))
(t (get-buffer-create to-buffer)))
(find-file-noselect filename)))
(odd org-odd-levels-only)
Export: Implement macro replacement during export A line: #+MARCO: name replacement text can be referenced by {{{name}}}. As special cases, {{{title}}} will reference #+TITLE, and similar with similar lines.
2009-02-23 08:15:52 -05:00
(header (org-export-latex-make-header title opt-plist))
Fixed bug in `org-export-region-as-latex'. Always ignore the value of the skip parameter when exporting a region.
2008-02-08 10:09:11 -05:00
(skip (cond (subtree-p nil)
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
(region-p nil)
Fixed bug in `org-export-region-as-latex'. Always ignore the value of the skip parameter when exporting a region.
2008-02-08 10:09:11 -05:00
(t (plist-get opt-plist :skip-before-1st-heading))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(text (plist-get opt-plist :text))
LaTeX export: Fix bug in removal of TODO keywords There was a problem that not in all cases the correct regexp was used to find TODO keywords.
2009-05-14 04:20:04 -04:00
(org-export-preprocess-hook
(cons
`(lambda () (org-set-local 'org-complex-heading-regexp
,org-export-latex-complex-heading-re))
org-export-preprocess-hook))
Maintenance: Remove unused variables.
2009-01-26 03:42:33 -05:00
(first-lines (if skip "" (org-export-latex-first-lines
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
opt-plist
(if subtree-p
(save-excursion
(goto-char rbeg)
(point-at-bol 2))
rbeg)
(if region-p rend))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(coding-system (and (boundp 'buffer-file-coding-system)
buffer-file-coding-system))
(coding-system-for-write (or org-export-latex-coding-system
coding-system))
(save-buffer-coding-system (or org-export-latex-coding-system
coding-system))
Whitespace
2008-12-16 11:58:02 -05:00
(region (buffer-substring
Release 5.06d
2008-01-31 05:35:58 -05:00
(if region-p (region-beginning) (point-min))
(if region-p (region-end) (point-max))))
LaTeX export: Preprocess TEXT properly
2009-12-18 03:06:34 -05:00
(text
Fix LaTeX export when there is no #+TEXT stuff
2009-12-18 10:00:46 -05:00
(and text (string-match "\\S-" text)
(org-export-preprocess-string
text
:emph-multiline t
Code cleanup: use a generic :for-backend parameter.
2011-02-15 05:07:46 -05:00
:for-backend 'latex
Fix LaTeX export when there is no #+TEXT stuff
2009-12-18 10:00:46 -05:00
:comments nil
:tags (plist-get opt-plist :tags)
:priority (plist-get opt-plist :priority)
:footnotes (plist-get opt-plist :footnotes)
:drawers (plist-get opt-plist :drawers)
:timestamps (plist-get opt-plist :timestamps)
:todo-keywords (plist-get opt-plist :todo-keywords)
Allow to exclude tasks from being exported * doc/org.texi (Selective export): Document exclusion of any tasks from export. * lisp/org-exp.el (org-export-with-tasks): New option. (org-export-plist-vars): Add :tasks property.
2011-03-29 18:48:29 -04:00
:tasks (plist-get opt-plist :tasks)
Fix LaTeX export when there is no #+TEXT stuff
2009-12-18 10:00:46 -05:00
:add-text nil
:skip-before-1st-heading skip
:select-tags nil
:exclude-tags nil
:LaTeX-fragments nil)))
Release 5.06d
2008-01-31 05:35:58 -05:00
(string-for-export
Improved the treatment of internal links during export. So far only internal links that lead to a dedicated target where converted correctly during HTML export. Now, also heuristic links create a working jump in a file.
2008-04-13 13:26:31 -04:00
(org-export-preprocess-string
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
region
:emph-multiline t
Code cleanup: use a generic :for-backend parameter.
2011-02-15 05:07:46 -05:00
:for-backend 'latex
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
:comments nil
:tags (plist-get opt-plist :tags)
:priority (plist-get opt-plist :priority)
Footnotes: Introduce STARTUP options for footnotes New STARTUP options fninline and nofninline can be used to configure the option `org-footnote-define-inline'.
2008-12-30 17:58:12 -05:00
:footnotes (plist-get opt-plist :footnotes)
Fix drawer export to LaTeX
2009-11-15 01:54:34 -05:00
:drawers (plist-get opt-plist :drawers)
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
:timestamps (plist-get opt-plist :timestamps)
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
:todo-keywords (plist-get opt-plist :todo-keywords)
Allow to exclude tasks from being exported * doc/org.texi (Selective export): Document exclusion of any tasks from export. * lisp/org-exp.el (org-export-with-tasks): New option. (org-export-plist-vars): Add :tasks property.
2011-03-29 18:48:29 -04:00
:tasks (plist-get opt-plist :tasks)
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
:add-text (if (eq to-buffer 'string) nil text)
:skip-before-1st-heading skip
:select-tags (plist-get opt-plist :select-tags)
:exclude-tags (plist-get opt-plist :exclude-tags)
:LaTeX-fragments nil)))
Release 5.11
2008-01-31 05:36:29 -05:00
Release 5.14
2008-01-31 05:37:51 -05:00
(set-buffer buffer)
Release 5.06d
2008-01-31 05:35:58 -05:00
(erase-buffer)
Export: General mechanism for local settings Many different people want to set many different variables in a buffer-local way for export. This cannot be done with file variables, because the Org buffer is not current while the exporter is running. Lots of variables can be set with the #+OPTIONS lines, but finding abbreviations goes only so far. Therefore we have now a general mechanism that can be used to bind variables during export operations. a line like: #+BIND: variable value will bind the variable to value. For example, the line >> #+OPTIONS: toc:nil can now equivalently be written as >> #+BIND: org-export-with-toc nil
2009-07-06 11:00:03 -04:00
(org-install-letbind)
Release 5.10a
2008-01-31 05:36:18 -05:00
Release 5.11
2008-01-31 05:36:29 -05:00
(and (fboundp 'set-buffer-file-coding-system)
(set-buffer-file-coding-system coding-system-for-write))
Release 5.14
2008-01-31 05:37:51 -05:00
;; insert the header and initial document commands
Release 5.11
2008-01-31 05:36:29 -05:00
(unless (or (eq to-buffer 'string) body-only)
Release 5.14
2008-01-31 05:37:51 -05:00
(insert header))
Release 5.11
2008-01-31 05:36:29 -05:00
;; insert text found in #+TEXT
(when (and text (not (eq to-buffer 'string)))
Release 5.14
2008-01-31 05:37:51 -05:00
(insert (org-export-latex-content
text '(lists tables fixed-width keywords))
"\n\n"))
Release 5.11
2008-01-31 05:36:29 -05:00
;; insert lines before the first headline
org-latex.el: fix bug when using #+INCLUDE before the first heading. The LaTeX looks for strings to export before the first headline. Such strings are defined as "before the first heading", so they normally never match a heading regexp. However, #+INCLUDE can insert lines before the first heading matching a heading regexp, causing these lines to appear twice: as first lines and as normal headings. The fix is to never include first lines when they match a heading regexp. This was reported by Rasmus <rasmus.pank@gmail.com>.
2011-02-12 10:01:40 -05:00
(unless (or skip (string-match "^\\*" first-lines))
Release 5.11
2008-01-31 05:36:29 -05:00
(insert first-lines))
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.11
2008-01-31 05:36:29 -05:00
;; export the content of headlines
Release 5.06d
2008-01-31 05:35:58 -05:00
(org-export-latex-global
(with-temp-buffer
(insert string-for-export)
(goto-char (point-min))
Release 5.11
2008-01-31 05:36:29 -05:00
(when (re-search-forward "^\\(\\*+\\) " nil t)
(let* ((asters (length (match-string 1)))
(level (if odd (- asters 2) (- asters 1))))
Release 5.14
2008-01-31 05:37:51 -05:00
(setq org-export-latex-add-level
Release 5.11
2008-01-31 05:36:29 -05:00
(if odd (1- (/ (1+ asters) 2)) (1- asters)))
(org-export-latex-parse-global level odd)))))
;; finalization
Release 5.06d
2008-01-31 05:35:58 -05:00
(unless body-only (insert "\n\\end{document}"))
Respect [TABLE-OF-CONTENTS] also for LaTeX export Reported by Yuva.
2009-06-04 10:52:02 -04:00
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
;; Attach description terms to the \item macro
(goto-char (point-min))
(while (re-search-forward "^[ \t]*\\\\item\\([ \t]+\\)\\[" nil t)
(delete-region (match-beginning 1) (match-end 1)))
Respect [TABLE-OF-CONTENTS] also for LaTeX export Reported by Yuva.
2009-06-04 10:52:02 -04:00
;; Relocate the table of contents
(goto-char (point-min))
(when (re-search-forward "\\[TABLE-OF-CONTENTS\\]" nil t)
(goto-char (point-min))
(while (re-search-forward "\\\\tableofcontents\\>[ \t]*\n?" nil t)
(replace-match ""))
(goto-char (point-min))
(and (re-search-forward "\\[TABLE-OF-CONTENTS\\]" nil t)
(replace-match "\\tableofcontents" t t)))
Cleanup empty lines in itemize environments
2009-12-16 05:47:51 -05:00
;; Cleanup forced line ends in items where they are not needed
LaTeX export: Remove unnecessary newlines Patches by Nicolas Girard.
2009-12-10 03:10:43 -05:00
(goto-char (point-min))
(while (re-search-forward
Cleanup empty lines in itemize environments
2009-12-16 05:47:51 -05:00
"^[ \t]*\\\\item\\>.*\\(\\\\\\\\\\)[ \t]*\\(\n\\\\label.*\\)*\n\\\\begin"
LaTeX export: Remove unnecessary newlines Patches by Nicolas Girard.
2009-12-10 03:10:43 -05:00
nil t)
(delete-region (match-beginning 1) (match-end 1)))
Cleanup empty lines in itemize environments
2009-12-16 05:47:51 -05:00
(goto-char (point-min))
(while (re-search-forward
"^[ \t]*\\\\item\\>.*\\(\\\\\\\\\\)[ \t]*\\(\n\\\\label.*\\)*"
nil t)
(if (looking-at "[\n \t]+")
(replace-match "\n")))
LaTeX export: Remove unnecessary newlines Patches by Nicolas Girard.
2009-12-10 03:10:43 -05:00
org-latex.el: Append final newline to export buffer. * lisp/org-latex.el: Ensure a final newline is appended to the export buffer. TINYCHANGE
2012-04-11 14:36:10 -04:00
;; Ensure we have a final newline
(goto-char (point-max))
(or (eq (char-before) ?\n)
(insert ?\n))
New hook `org-export-latex-final-hook'.
2009-09-28 23:01:56 -04:00
(run-hooks 'org-export-latex-final-hook)
Make sure result buffer of LaTeX export is in LaTeX mode Report and patch from Dan Davison
2010-04-25 03:13:42 -04:00
(if to-buffer
(unless (eq major-mode 'latex-mode) (latex-mode))
(save-buffer))
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
(org-export-latex-fix-inputenc)
LaTeX export: New hook that runs after saving the buffer
2010-01-06 02:50:47 -05:00
(run-hooks 'org-export-latex-after-save-hook)
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (point-min))
Export: Make all export commands push the result to the kill ring All export commands now push the result to the kill ring by default. This is subject to the variable `org-export-push-to-kill-ring'. Also, this commit adds a new variable `org-export-show-temporary-export-buffer' which can be used to turn off the display of the temporary buffer containing the exported text. Since this stuff is now automatically pushed onto the kill ring, some people might prefer not to see this buffer.
2009-05-21 03:14:33 -04:00
(or (org-export-push-to-kill-ring "LaTeX")
(message "Exporting to LaTeX...done"))
Release 5.11
2008-01-31 05:36:29 -05:00
(prog1
(if (eq to-buffer 'string)
(prog1 (buffer-substring (point-min) (point-max))
(kill-buffer (current-buffer)))
(current-buffer))
(set-window-configuration wcf))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Autoload the new export commands.
2008-10-17 02:36:46 -04:00
;;;###autoload
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(defun org-export-as-pdf (arg &optional hidden ext-plist
to-buffer body-only pub-dir)
"Export as LaTeX, then process through to PDF."
(interactive "P")
(message "Exporting to PDF...")
(let* ((wconfig (current-window-configuration))
(lbuf (org-export-as-latex arg hidden ext-plist
to-buffer body-only pub-dir))
(file (buffer-file-name lbuf))
(base (file-name-sans-extension (buffer-file-name lbuf)))
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
(pdffile (concat base ".pdf"))
Automatically use pdflatex -shell-escape for minted export Patch by Bastien * lisp/org-latex.el: Add -shell-escape to pdflatex commands
2011-06-11 16:40:14 -04:00
(cmds (if (eq org-export-latex-listings 'minted)
;; automatically add -shell-escape when needed
(mapcar (lambda (cmd)
(replace-regexp-in-string
"pdflatex " "pdflatex -shell-escape " cmd))
org-latex-to-pdf-process)
org-latex-to-pdf-process))
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
(outbuf (get-buffer-create "*Org PDF LaTeX Output*"))
(bibtex-p (with-current-buffer lbuf
(save-excursion
(goto-char (point-min))
(re-search-forward "\\\\bibliography{" nil t))))
Bind variable to keep compiler happy
2010-10-05 17:12:34 -04:00
cmd output-dir errors)
PDF export: Make processing commands configurable
2009-04-23 00:39:59 -04:00
(with-current-buffer outbuf (erase-buffer))
Fix problem when exporting to PDF to a different directory * lisp/org-latex.el (org-latex-to-pdf-process): Add output-directory option for the command pdflatex. (org-export-as-pdf): Respect directory in path of EXPORT_FILE_NAME. On Wed, Aug 4, 2010 at 1:26 AM, Manuel Amador <amador.manuel@gmail.com>wrote: > Hi everybody, > > I am running into the following issue. > > I would like to export certain subtrees of an org file to a particular > directory. I set the export property as follows: > > * Test 1 > :PROPERTIES: > :EXPORT_FILE_NAME: some_directory/some_name > :END: > > > When I try exporting the above subtree as a pdf (say for example, by > running > C-c C-e 1 d), the .tex file is created in the appropriate target directory, > but > the .pdf file is created in the current directory (while emacs mistakenly > reports that the pdf was not created). Is there a way to get this to work > correctly? > > Thanks and Regards Noorul
2010-08-07 10:00:49 -04:00
(message (concat "Processing LaTeX file " file "..."))
(setq output-dir (file-name-directory file))
org-latex.el: Bugfix: run export commands from the right buffer.
2011-07-16 13:08:40 -04:00
(with-current-buffer lbuf
(save-excursion
(if (and cmds (symbolp cmds))
(funcall cmds (shell-quote-argument file))
(while cmds
(setq cmd (pop cmds))
Allow to use imagemagick for previewing LaTeX fragements. * org.el (org-latex-create-formula-image-program): New option to use either dvipng or imagemagick to convert and preview LaTeX fragments. (org-preview-latex-fragment, org-format-latex): Handle the new option. (org-create-formula-image-with-dvipng): Rename from `org-create-formula-image'. (org-create-formula-image-with-imagemagick): New defun to handle LaTeX preview with imagemagick. (org-latex-color, org-latex-color-format): New defuns to handle color conversions. * org-latex.el (org-latex-to-pdf-process, org-export-as-pdf): Allow to use imagemagick to convert LaTeX fragments. * org-html.el (org-export-html-preprocess): Ditto. * org-exp.el (org-export-with-LaTeX-fragments): Ditto. * org.texi (@LaTeX{} fragments): Document imagemagick as an alternative to dvipng.
2012-04-20 13:21:43 -04:00
(cond
((not (listp cmd))
(while (string-match "%b" cmd)
(setq cmd (replace-match
(save-match-data
(shell-quote-argument base))
t t cmd)))
(while (string-match "%f" cmd)
(setq cmd (replace-match
(save-match-data
(shell-quote-argument file))
t t cmd)))
(while (string-match "%o" cmd)
(setq cmd (replace-match
(save-match-data
(shell-quote-argument output-dir))
t t cmd)))
(shell-command cmd outbuf)))))))
Fix problem when exporting to PDF to a different directory * lisp/org-latex.el (org-latex-to-pdf-process): Add output-directory option for the command pdflatex. (org-export-as-pdf): Respect directory in path of EXPORT_FILE_NAME. On Wed, Aug 4, 2010 at 1:26 AM, Manuel Amador <amador.manuel@gmail.com>wrote: > Hi everybody, > > I am running into the following issue. > > I would like to export certain subtrees of an org file to a particular > directory. I set the export property as follows: > > * Test 1 > :PROPERTIES: > :EXPORT_FILE_NAME: some_directory/some_name > :END: > > > When I try exporting the above subtree as a pdf (say for example, by > running > C-c C-e 1 d), the .tex file is created in the appropriate target directory, > but > the .pdf file is created in the current directory (while emacs mistakenly > reports that the pdf was not created). Is there a way to get this to work > correctly? > > Thanks and Regards Noorul
2010-08-07 10:00:49 -04:00
(message (concat "Processing LaTeX file " file "...done"))
Use texi2dvi for processing LaTeX to pdf * lisp/org-latex.el (org-latex-to-pdf-process): Use texi2dvi if available. (org-export-latex-get-error): New function. (org-export-as-pdf): Give an indication of the errors that happened during processing.
2010-10-05 12:22:31 -04:00
(setq errors (org-export-latex-get-error outbuf))
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(if (not (file-exists-p pdffile))
Use texi2dvi for processing LaTeX to pdf * lisp/org-latex.el (org-latex-to-pdf-process): Use texi2dvi if available. (org-export-latex-get-error): New function. (org-export-as-pdf): Give an indication of the errors that happened during processing.
2010-10-05 12:22:31 -04:00
(error (concat "PDF file " pdffile " was not produced"
(if errors (concat ":" errors "") "")))
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(set-window-configuration wconfig)
(when org-export-pdf-remove-logfiles
Make the LaTeX/PDF logfiles to be removed a configurable list Patch by Lukasz Stelmach
2009-11-26 01:33:06 -05:00
(dolist (ext org-export-pdf-logfiles)
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(setq file (concat base "." ext))
(and (file-exists-p file) (delete-file file))))
Use texi2dvi for processing LaTeX to pdf * lisp/org-latex.el (org-latex-to-pdf-process): Use texi2dvi if available. (org-export-latex-get-error): New function. (org-export-as-pdf): Give an indication of the errors that happened during processing.
2010-10-05 12:22:31 -04:00
(message (concat
"Exporting to PDF...done"
(if errors
(concat ", with some errors:" errors)
"")))
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
pdffile)))
Use texi2dvi for processing LaTeX to pdf * lisp/org-latex.el (org-latex-to-pdf-process): Use texi2dvi if available. (org-export-latex-get-error): New function. (org-export-as-pdf): Give an indication of the errors that happened during processing.
2010-10-05 12:22:31 -04:00
(defun org-export-latex-get-error (buf)
"Collect the kinds of errors that remain in pdflatex processing."
(with-current-buffer buf
(save-excursion
(goto-char (point-max))
(when (re-search-backward "^[ \t]*This is pdf.*?TeX.*?Version" nil t)
;; OK, we are at the location of the final run
(let ((pos (point)) (errors "") (case-fold-search t))
(if (re-search-forward "Reference.*?undefined" nil t)
(setq errors (concat errors " [undefined reference]")))
(goto-char pos)
(if (re-search-forward "Citation.*?undefined" nil t)
(setq errors (concat errors " [undefined citation]")))
(goto-char pos)
(if (re-search-forward "Undefined control sequence" nil t)
(setq errors (concat errors " [undefined control sequence]")))
(and (org-string-nw-p errors) errors))))))
Autoload the new export commands.
2008-10-17 02:36:46 -04:00
;;;###autoload
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(defun org-export-as-pdf-and-open (arg)
"Export as LaTeX, then process through to PDF, and open."
(interactive "P")
(let ((pdffile (org-export-as-pdf arg)))
(if pdffile
Export: Kill product buffer if it has been displayed directly Request by Livin Stephen Sharma
2010-02-21 03:19:21 -05:00
(progn
(org-open-file pdffile)
(when org-export-kill-product-buffer-when-displayed
(kill-buffer (find-buffer-visiting
(concat (file-name-sans-extension (buffer-file-name))
".tex")))))
Add commands to export to PDF. This works by creating LaTeX first, and then processing it.
2008-10-15 11:21:52 -04:00
(error "PDF file was not produced"))))
Release 5.10a
2008-01-31 05:36:18 -05:00
;;; Parsing functions:
Release 5.14
2008-01-31 05:37:51 -05:00
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-parse-global (level odd)
"Parse the current buffer recursively, starting at LEVEL.
If ODD is non-nil, assume the buffer only contains odd sections.
Release 5.14
2008-01-31 05:37:51 -05:00
Return a list reflecting the document structure."
Release 5.06d
2008-01-31 05:35:58 -05:00
(save-excursion
(goto-char (point-min))
(let* ((cnt 0) output
Release 5.14
2008-01-31 05:37:51 -05:00
(depth org-export-latex-sectioning-depth))
Allow Org-mode source code examples in LaTeX export This did not work because the parser would still match headlines that are really part of the examples.
2009-11-25 05:15:19 -05:00
(while (org-re-search-forward-unprotected
Release 5.06d
2008-01-31 05:35:58 -05:00
(concat "^\\(\\(?:\\*\\)\\{"
(number-to-string (+ (if odd 2 1) level))
"\\}\\) \\(.*\\)$")
;; make sure that there is no upper heading
(when (> level 0)
(save-excursion
(save-match-data
Allow Org-mode source code examples in LaTeX export This did not work because the parser would still match headlines that are really part of the examples.
2009-11-25 05:15:19 -05:00
(org-re-search-forward-unprotected
Release 5.06d
2008-01-31 05:35:58 -05:00
(concat "^\\(\\(?:\\*\\)\\{"
(number-to-string level)
"\\}\\) \\(.*\\)$") nil t)))) t)
(setq cnt (1+ cnt))
(let* ((pos (match-beginning 0))
(heading (match-string 2))
(nlevel (if odd (/ (+ 3 level) 2) (1+ level))))
(save-excursion
(narrow-to-region
(point)
(save-match-data
Allow Org-mode source code examples in LaTeX export This did not work because the parser would still match headlines that are really part of the examples.
2009-11-25 05:15:19 -05:00
(if (org-re-search-forward-unprotected
Release 5.06d
2008-01-31 05:35:58 -05:00
(concat "^\\(\\(?:\\*\\)\\{"
(number-to-string (+ (if odd 2 1) level))
"\\}\\) \\(.*\\)$") nil t)
(match-beginning 0)
(point-max))))
(goto-char (point-min))
(setq output
(append output
(list
(list
`(pos . ,pos)
`(level . ,nlevel)
`(occur . ,cnt)
`(heading . ,heading)
`(content . ,(org-export-latex-parse-content))
Release 5.14
2008-01-31 05:37:51 -05:00
`(subcontent . ,(org-export-latex-parse-subcontent
Release 5.06d
2008-01-31 05:35:58 -05:00
level odd)))))))
(widen)))
(list output))))
(defun org-export-latex-parse-content ()
"Extract the content of a section."
(let ((beg (point))
Allow Org-mode source code examples in LaTeX export This did not work because the parser would still match headlines that are really part of the examples.
2009-11-25 05:15:19 -05:00
(end (if (org-re-search-forward-unprotected "^\\(\\*\\)+ .*$" nil t)
Release 5.06d
2008-01-31 05:35:58 -05:00
(progn (beginning-of-line) (point))
(point-max))))
(buffer-substring beg end)))
(defun org-export-latex-parse-subcontent (level odd)
"Extract the subcontent of a section at LEVEL.
If ODD Is non-nil, assume subcontent only contains odd sections."
Revert "Bug: possible bug in latex export [7.01trans (release_6.36.735.g15ca.dirty)]" This reverts commit bb0a1f190be361ce1d717d79d411b88406d74c33.
2010-08-27 03:29:25 -04:00
(if (not (org-re-search-forward-unprotected
(concat "^\\(\\(?:\\*\\)\\{"
(number-to-string (+ (if odd 4 2) level))
"\\}\\) \\(.*\\)$")
nil t))
nil ; subcontent is nil
(org-export-latex-parse-global (+ (if odd 2 1) level) odd)))
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.10a
2008-01-31 05:36:18 -05:00
;;; Rendering functions:
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-global (content)
"Export CONTENT to LaTeX.
CONTENT is an element of the list produced by
`org-export-latex-parse-global'."
(if (eq (car content) 'subcontent)
(mapc 'org-export-latex-sub (cdr content))
(org-export-latex-sub (car content))))
(defun org-export-latex-sub (subcontent)
"Export the list SUBCONTENT to LaTeX.
SUBCONTENT is an alist containing information about the headline
and its content."
Release 5.14
2008-01-31 05:37:51 -05:00
(let ((num (plist-get org-export-latex-options-plist :section-numbers)))
Release 5.10a
2008-01-31 05:36:18 -05:00
(mapc (lambda(x) (org-export-latex-subcontent x num)) subcontent)))
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.10a
2008-01-31 05:36:18 -05:00
(defun org-export-latex-subcontent (subcontent num)
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"Export each cell of SUBCONTENT to LaTeX.
Allow mixed export of numbered and unnumbered sections in LaTeX * lisp/org-latex.el (org-export-latex-subcontent): Deal specially with the case that NUM is an integer. We would sometimes like to have numbered \sections in LaTeX export but unnumbered \subsections and so forth. That is, use the starred equivalents for all sectioning commands below a certain level. Previously, the num: option specification could only specify whether sections should be numbered or unnumbered at all levels. We now treat an integer value specially, if num:N is supplied then the highest N levels are numbered, and lower levels are exported without numbering.
2011-03-22 15:26:14 -04:00
If NUM is non-nil export numbered sections, otherwise use unnumbered
sections. If NUM is an integer, export the highest NUM levels as
numbered sections and lower levels as unnumbered sections."
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(let* ((heading (cdr (assoc 'heading subcontent)))
Fix problems with internal links for LateX export.
2008-10-10 05:42:01 -04:00
(level (- (cdr (assoc 'level subcontent))
org-export-latex-add-level))
(occur (number-to-string (cdr (assoc 'occur subcontent))))
(content (cdr (assoc 'content subcontent)))
(subcontent (cadr (assoc 'subcontent subcontent)))
Make invisible targets anchors in the headlines or items. Org allows to define invisible anchors in a document in comment lines like If such a line is directly before or after a headline, previously this anchor was removed, and all references to it were replaced with references to the anchor that the headline had anyway. Matthew Lundin pointed out that this makes it impossible to have permanent links to headlines that can also be used from outside the current page. This patch changes his situation by adding the additional targets as empty anchors to the section heading. If works by creating, during preprocessing, an alist with targets that do have aliases. During publishing, these aliases are looked up and converted into anchors. In LaTeX export, these additional targets become additional labels.
2008-11-16 16:12:57 -05:00
(label (org-get-text-property-any 0 'target heading))
(label-list (cons label (cdr (assoc label
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
org-export-target-aliases))))
(sectioning org-export-latex-sectioning)
(depth org-export-latex-sectioning-depth)
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
main-heading sub-heading ctnt)
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(when (symbolp (car sectioning))
(setq sectioning (funcall (car sectioning) level heading))
(when sectioning
(setq heading (car sectioning)
Add support for BEAMER notes.
2010-01-05 08:53:14 -05:00
sectioning (cdr sectioning)
;; target property migh have changed...
label (org-get-text-property-any 0 'target heading)
label-list (cons label (cdr (assoc label
org-export-target-aliases)))))
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(if sectioning (setq sectioning (make-list 10 sectioning)))
(setq depth (if sectioning 10000 0)))
(if (string-match "[ \t]*\\\\\\\\[ \t]*" heading)
(setq main-heading (substring heading 0 (match-beginning 0))
sub-heading (substring heading (match-end 0))))
(setq heading (org-export-latex-fontify-headline heading)
sub-heading (and sub-heading
(org-export-latex-fontify-headline sub-heading))
main-heading (and main-heading
(org-export-latex-fontify-headline main-heading)))
Release 5.14
2008-01-31 05:37:51 -05:00
(cond
Release 5.06d
2008-01-31 05:35:58 -05:00
;; Normal conversion
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
((<= level depth)
(let* ((sec (nth (1- level) sectioning))
Allow mixed export of numbered and unnumbered sections in LaTeX * lisp/org-latex.el (org-export-latex-subcontent): Deal specially with the case that NUM is an integer. We would sometimes like to have numbered \sections in LaTeX export but unnumbered \subsections and so forth. That is, use the starred equivalents for all sectioning commands below a certain level. Previously, the num: option specification could only specify whether sections should be numbered or unnumbered at all levels. We now treat an integer value specially, if num:N is supplied then the highest N levels are numbered, and lower levels are exported without numbering.
2011-03-22 15:26:14 -04:00
(num (if (integerp num)
(>= num level)
num))
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
start end)
(if (consp (cdr sec))
(setq start (nth (if num 0 2) sec)
end (nth (if num 1 3) sec))
(setq start (if num (car sec) (cdr sec))))
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(insert (format start (if main-heading main-heading heading)
(or sub-heading "")))
(insert "\n")
Make invisible targets anchors in the headlines or items. Org allows to define invisible anchors in a document in comment lines like If such a line is directly before or after a headline, previously this anchor was removed, and all references to it were replaced with references to the anchor that the headline had anyway. Matthew Lundin pointed out that this makes it impossible to have permanent links to headlines that can also be used from outside the current page. This patch changes his situation by adding the additional targets as empty anchors to the section heading. If works by creating, during preprocessing, an alist with targets that do have aliases. During publishing, these aliases are looked up and converted into anchors. In LaTeX export, these additional targets become additional labels.
2008-11-16 16:12:57 -05:00
(when label
(insert (mapconcat (lambda (l) (format "\\label{%s}" l))
label-list "\n") "\n"))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
(insert (org-export-latex-content content))
Allow sections to be represented as environments in LaTeX export.
2008-10-13 01:26:05 -04:00
(cond ((stringp subcontent) (insert subcontent))
LaTeX export: Remove unnecessary newlines Patches by Nicolas Girard.
2009-12-10 03:10:43 -05:00
((listp subcontent)
(while (org-looking-back "\n\n") (backward-delete-char 1))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
(org-export-latex-sub subcontent)))
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
(when (and end (string-match "[^ \t]" end))
(let ((hook (org-get-text-property-any 0 'org-insert-hook end)))
(and (functionp hook) (funcall hook)))
(insert end "\n"))))
Release 5.06d
2008-01-31 05:35:58 -05:00
;; At a level under the hl option: we can drop this subsection
Add special code for beamer hooks in org-latex.el
2009-12-11 02:56:14 -05:00
((> level depth)
Release 5.06d
2008-01-31 05:35:58 -05:00
(cond ((eq org-export-latex-low-levels 'description)
LaTeX export: Better handling of levels below the headline boundary Outline levels below the headline boundary are now treated better, as proper list. The variable `org-export-latex-low-levels' can now also be `itemize' or `enumerate', to get the corresponding list structure. The new default is `itemize', to make it parallel with the behavior in HTML.
2009-03-21 08:12:07 -04:00
(if (string-match "% ends low level$"
(buffer-substring (point-at-bol 0) (point)))
(delete-region (point-at-bol 0) (point))
(insert "\\begin{description}\n"))
LaTeX export: Remove unnecessary newlines Patches by Nicolas Girard.
2009-12-10 03:10:43 -05:00
(insert (format "\n\\item[%s]%s~\n"
Fix problems with internal links for LateX export.
2008-10-10 05:42:01 -04:00
heading
(if label (format "\\label{%s}" label) "")))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
(insert (org-export-latex-content content))
Release 5.06d
2008-01-31 05:35:58 -05:00
(cond ((stringp subcontent) (insert subcontent))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
((listp subcontent) (org-export-latex-sub subcontent)))
LaTeX export: Better handling of levels below the headline boundary Outline levels below the headline boundary are now treated better, as proper list. The variable `org-export-latex-low-levels' can now also be `itemize' or `enumerate', to get the corresponding list structure. The new default is `itemize', to make it parallel with the behavior in HTML.
2009-03-21 08:12:07 -04:00
(insert "\\end{description} % ends low level\n"))
((memq org-export-latex-low-levels '(itemize enumerate))
(if (string-match "% ends low level$"
(buffer-substring (point-at-bol 0) (point)))
(delete-region (point-at-bol 0) (point))
(insert (format "\\begin{%s}\n"
(symbol-name org-export-latex-low-levels))))
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
(let ((ctnt (org-export-latex-content content)))
(insert (format (if (not (equal (replace-regexp-in-string "\n" "" ctnt) ""))
"\n\\item %s\\\\\n%s%%"
"\n\\item %s\n%s%%")
heading
(if label (format "\\label{%s}" label) "")))
(insert ctnt))
LaTeX export: Better handling of levels below the headline boundary Outline levels below the headline boundary are now treated better, as proper list. The variable `org-export-latex-low-levels' can now also be `itemize' or `enumerate', to get the corresponding list structure. The new default is `itemize', to make it parallel with the behavior in HTML.
2009-03-21 08:12:07 -04:00
(cond ((stringp subcontent) (insert subcontent))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
((listp subcontent) (org-export-latex-sub subcontent)))
LaTeX export: Better handling of levels below the headline boundary Outline levels below the headline boundary are now treated better, as proper list. The variable `org-export-latex-low-levels' can now also be `itemize' or `enumerate', to get the corresponding list structure. The new default is `itemize', to make it parallel with the behavior in HTML.
2009-03-21 08:12:07 -04:00
(insert (format "\\end{%s} %% ends low level\n"
(symbol-name org-export-latex-low-levels))))
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
org-latex.el: Bugfix: when `org-export-latex-low-levels' is nil, do not export low levels. * org-latex.el (org-export-latex-subcontent): Bugfix: when `org-export-latex-low-levels' is nil, do not export low levels. Thanks to Nick Dokos for spotting this.
2012-03-27 17:08:41 -04:00
((and (listp org-export-latex-low-levels)
org-export-latex-low-levels)
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
(if (string-match "% ends low level$"
(buffer-substring (point-at-bol 0) (point)))
(delete-region (point-at-bol 0) (point))
(insert (car org-export-latex-low-levels) "\n"))
(insert (format (nth 2 org-export-latex-low-levels)
heading
(if label (format "\\label{%s}" label) "")))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
(insert (org-export-latex-content content))
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
(cond ((stringp subcontent) (insert subcontent))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
((listp subcontent) (org-export-latex-sub subcontent)))
LaTeX export: Allow a user-defined environment for low-level headings See the variable `org-export-latex-low-levels'.
2009-06-26 11:13:42 -04:00
(insert (nth 1 org-export-latex-low-levels)
" %% ends low level\n"))
Release 5.06d
2008-01-31 05:35:58 -05:00
((stringp org-export-latex-low-levels)
(insert (format org-export-latex-low-levels heading) "\n")
Fix problems with internal links for LateX export.
2008-10-10 05:42:01 -04:00
(when label (insert (format "\\label{%s}\n" label)))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
(insert (org-export-latex-content content))
Release 5.06d
2008-01-31 05:35:58 -05:00
(cond ((stringp subcontent) (insert subcontent))
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline." This reverts commit 6632ea95d3c73c77d90dadfd5dcc01037a999f8a.
2012-03-26 16:56:02 -04:00
((listp subcontent) (org-export-latex-sub subcontent)))))))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.10a
2008-01-31 05:36:18 -05:00
;;; Exporting internals:
Release 5.14
2008-01-31 05:37:51 -05:00
(defun org-export-latex-set-initial-vars (ext-plist level)
Release 5.10a
2008-01-31 05:36:18 -05:00
"Store org local variables required for LaTeX export.
Release 5.14
2008-01-31 05:37:51 -05:00
EXT-PLIST is an optional additional plist.
LEVEL indicates the default depth for export."
(setq org-export-latex-todo-keywords-1 org-todo-keywords-1
LaTeX export: Make TODO keyword markup configurable
2009-05-12 06:27:56 -04:00
org-export-latex-done-keywords org-done-keywords
org-export-latex-not-done-keywords org-not-done-keywords
LaTeX export: Fix bug in removal of TODO keywords There was a problem that not in all cases the correct regexp was used to find TODO keywords.
2009-05-14 04:20:04 -04:00
org-export-latex-complex-heading-re org-complex-heading-regexp
LaTeX export: Format time stamps Time stamps in LaTeX export now also honor custom time stamp formats. Furthermore, the new option `org-export-latex-timestamp-markup' can specify special markup for time stamps.
2009-04-13 02:52:11 -04:00
org-export-latex-display-custom-times org-display-custom-times
Release 5.14
2008-01-31 05:37:51 -05:00
org-export-latex-all-targets-re
Release 5.10a
2008-01-31 05:36:18 -05:00
(org-make-target-link-regexp (org-all-targets))
Release 5.14
2008-01-31 05:37:51 -05:00
org-export-latex-options-plist
Release 5.10a
2008-01-31 05:36:18 -05:00
(org-combine-plists (org-default-export-plist) ext-plist
(org-infile-export-plist))
Release 5.14
2008-01-31 05:37:51 -05:00
org-export-latex-class
LaTeX Export: Allow class definition in property When exporting a region starting with a headline, a LaTeX_CLASS property in that entry will be honored. Requested by Robert Goldman.
2009-01-20 03:07:35 -05:00
(or (and (org-region-active-p)
(save-excursion
(goto-char (region-beginning))
(and (looking-at org-complex-heading-regexp)
(org-entry-get nil "LaTeX_CLASS" 'selective))))
(save-excursion
(save-restriction
(widen)
(goto-char (point-min))
org-latex.el: Allow "/" character in the #+LaTeX_CLASS option. * org-latex.el (org-export-latex-set-initial-vars): Allow "/" character in the #+LaTeX_CLASS option. Thanks to Richard Lewis for a request about this.
2011-10-29 08:43:52 -04:00
(and (re-search-forward "^#\\+LaTeX_CLASS:[ \t]*\\([-/a-zA-Z]+\\)" nil t)
LaTeX Export: Allow class definition in property When exporting a region starting with a headline, a LaTeX_CLASS property in that entry will be honored. Requested by Robert Goldman.
2009-01-20 03:07:35 -05:00
(match-string 1))))
Make LaTeX_CLASS also work in a setup file
2009-09-30 04:08:25 -04:00
(plist-get org-export-latex-options-plist :latex-class)
LaTeX Export: Allow class definition in property When exporting a region starting with a headline, a LaTeX_CLASS property in that entry will be honored. Requested by Robert Goldman.
2009-01-20 03:07:35 -05:00
org-export-latex-default-class)
Allow LaTeX_CLASS_OPTIONS to set options, also from a property
2009-11-27 08:48:03 -05:00
org-export-latex-class-options
(or (and (org-region-active-p)
(save-excursion
(goto-char (region-beginning))
(and (looking-at org-complex-heading-regexp)
(org-entry-get nil "LaTeX_CLASS_OPTIONS" 'selective))))
(save-excursion
(save-restriction
(widen)
(goto-char (point-min))
Revert "Search for LaTeX setup case-insensitively" This reverts commit 034dbac3eecdd67c83407f55cd920d3720400055.
2010-08-20 12:24:09 -04:00
(and (re-search-forward "^#\\+LaTeX_CLASS_OPTIONS:[ \t]*\\(.*?\\)[ \t]*$" nil t)
(match-string 1))))
Allow LaTeX_CLASS_OPTIONS to set options, also from a property
2009-11-27 08:48:03 -05:00
(plist-get org-export-latex-options-plist :latex-class-options))
LaTeX Export: Allow class definition in property When exporting a region starting with a headline, a LaTeX_CLASS property in that entry will be honored. Requested by Robert Goldman.
2009-01-20 03:07:35 -05:00
org-export-latex-class
(or (car (assoc org-export-latex-class org-export-latex-classes))
(error "No definition for class `%s' in `org-export-latex-classes'"
org-export-latex-class))
Release 5.14
2008-01-31 05:37:51 -05:00
org-export-latex-header
(cadr (assoc org-export-latex-class org-export-latex-classes))
org-export-latex-sectioning
(cddr (assoc org-export-latex-class org-export-latex-classes))
org-export-latex-sectioning-depth
(or level
(let ((hl-levels
(plist-get org-export-latex-options-plist :headline-levels))
(sec-depth (length org-export-latex-sectioning)))
Allow LaTeX_CLASS_OPTIONS to set options, also from a property
2009-11-27 08:48:03 -05:00
(if (> hl-levels sec-depth) sec-depth hl-levels))))
(when (and org-export-latex-class-options
(string-match "\\S-" org-export-latex-class-options)
New hook
2009-12-11 02:52:26 -05:00
(string-match "^[ \t]*\\(\\\\documentclass\\)\\(\\[.*?\\]\\)?"
org-export-latex-header))
Allow LaTeX_CLASS_OPTIONS to set options, also from a property
2009-11-27 08:48:03 -05:00
(setq org-export-latex-header
(concat (substring org-export-latex-header 0 (match-end 1))
org-export-latex-class-options
(substring org-export-latex-header (match-end 0))))))
Release 5.14
2008-01-31 05:37:51 -05:00
New hook
2009-12-11 02:52:26 -05:00
(defvar org-export-latex-format-toc-function
'org-export-latex-format-toc-default
Correct some docstrings [part 3] This is the third patch in a series that makes some straightforward corrections to a number of docstrings. Each change is normally to: - correct a typo, or - fix up hyperlinks to function or variable names, or - ensure slightly better conformance with the documentation guidelines and tips given in the Elisp manual No attempt is made to provide missing docstrings or document arguments. Cheers, Phil
2010-07-16 17:22:01 -04:00
"The function formatting returning the string to create the table of contents.
New hook
2009-12-11 02:52:26 -05:00
The function mus take one parameter, the depth of the table of contents.")
Export: Implement macro replacement during export A line: #+MARCO: name replacement text can be referenced by {{{name}}}. As special cases, {{{title}}} will reference #+TITLE, and similar with similar lines.
2009-02-23 08:15:52 -05:00
(defun org-export-latex-make-header (title opt-plist)
Release 5.14
2008-01-31 05:37:51 -05:00
"Make the LaTeX header and return it as a string.
TITLE is the current title from the buffer or region.
OPT-PLIST is the options plist for current buffer."
(let ((toc (plist-get opt-plist :table-of-contents))
LaTeX export: Macro processing also in author field
2010-03-09 11:24:31 -05:00
(author (org-export-apply-macros-in-string
Allow inclusion of author's email in LaTeX export * org-latex.el (org-export-latex-make-header): Export email in author line if `org-export-email-info' is non-nil. Previously exporting to LaTeX would not include the document author's email address when org-export-email-info was set. This patch corrects this oversight using the \thanks command to add a footnote to the author line.
2011-01-13 14:29:39 -05:00
(plist-get opt-plist :author)))
Minor comments rearrangment.
2011-03-04 14:20:12 -05:00
(email (replace-regexp-in-string
"_" "\\\\_"
Convert underscore in email addresses.
2011-03-01 12:35:47 -05:00
(org-export-apply-macros-in-string
org-latex.el (org-export-latex-make-header): Add some hyperref options. * org-latex.el (org-export-latex-make-header): Add some hyperref options. Thanks to Mikhail Titov for a preliminary version of this patch.
2011-10-22 05:05:28 -04:00
(plist-get opt-plist :email))))
(description (org-export-apply-macros-in-string
(plist-get opt-plist :description)))
(keywords (org-export-apply-macros-in-string
(plist-get opt-plist :keywords))))
Release 5.14
2008-01-31 05:37:51 -05:00
(concat
Release 5.11
2008-01-31 05:36:29 -05:00
(if (plist-get opt-plist :time-stamp-file)
LaTeX export: Fix two bugs. 1. When LaTeX export was done with a time-stamped file, a format error in the timestamp format caused the output file to not have the % comment in front of the time string. As this line is early in the file, a LaTeX error would result. 2. Replacement of some special characters could fail. Strangely this shows up only in XEmacs, but it still is a bug. Both bugs were reported by Hugh Daschbach.
2008-12-21 05:00:05 -05:00
(format-time-string "%% Created %Y-%m-%d %a %H:%M\n"))
Specify the position where the packages are inserted in the LaTeX header.
2010-04-04 02:32:55 -04:00
;; insert LaTeX custom header and packages from the list
(org-splice-latex-header
(org-export-apply-macros-in-string org-export-latex-header)
org-export-latex-default-packages-alist
Make the inclusion of packages for snippet creation optional
2010-04-26 12:53:39 -04:00
org-export-latex-packages-alist nil
Specify the position where the packages are inserted in the LaTeX header.
2010-04-04 02:32:55 -04:00
(org-export-apply-macros-in-string
(plist-get opt-plist :latex-header-extra)))
;; append another special variable
LaTeX export: Apply macros also in header
2009-03-21 08:39:37 -04:00
(org-export-apply-macros-in-string org-export-latex-append-header)
HTML export: Improved support for field alignment, including centering * doc/org.texi: Document the <c> cookie. * lisp/org-exp.el (org-store-forced-table-alignment): (org-export-remove-special-table-lines): Allow the "c" cookie for table alignment. * lisp/org-html.el (org-export-table-header-tags): (org-export-table-data-tags): Add another %s format for the alignment. (org-export-html-table-align-individual-fields): New option. (org-format-org-table-html): Implement field-by-field alignment and support centering. (org-format-table-table-html): Make sure the new table tag formats don't break this function. * lisp/org-table.el (org-table-cookie-line-p): (org-table-align): Allow for the <c> cookie. * lisp/org.el (org-set-font-lock-defaults): Allow for the <c> cookie.
2010-10-22 03:19:04 -04:00
;; define alert if not yet defined
Specify the position where the packages are inserted in the LaTeX header.
2010-04-04 02:32:55 -04:00
"\n\\providecommand{\\alert}[1]{\\textbf{#1}}"
Minor comments rearrangment.
2011-03-04 14:20:12 -05:00
;; insert the title
Release 5.14
2008-01-31 05:37:51 -05:00
(format
"\n\n\\title{%s}\n"
Better processing of headlines and the title in LaTeX export * lisp/org-latex.el (org-export-latex-make-header): Run the title through `org-export-latex-fontify-headline'. (org-export-latex-fontify-headline): Do the protection of math snippets also here
2010-11-21 04:22:09 -05:00
(org-export-latex-fontify-headline title))
Release 5.11
2008-01-31 05:36:29 -05:00
;; insert author info
(if (plist-get opt-plist :author-info)
Allow inclusion of author's email in LaTeX export * org-latex.el (org-export-latex-make-header): Export email in author line if `org-export-email-info' is non-nil. Previously exporting to LaTeX would not include the document author's email address when org-export-email-info was set. This patch corrects this oversight using the \thanks command to add a footnote to the author line.
2011-01-13 14:29:39 -05:00
(format "\\author{%s%s}\n"
(org-export-latex-fontify-headline (or author user-full-name))
Convert underscore in email addresses.
2011-03-01 12:35:47 -05:00
(if (and (plist-get opt-plist :email-info) email
Minor comments rearrangment.
2011-03-04 14:20:12 -05:00
(string-match "\\S-" email))
(format "\\thanks{%s}" email)
Convert underscore in email addresses.
2011-03-01 12:35:47 -05:00
""))
Release 5.11
2008-01-31 05:36:29 -05:00
(format "%%\\author{%s}\n"
LaTeX export: Fix another problem with #+AUTHOR export Jambunathan K. writes: > I would like to add the following observation as well - > > ---> org input <--- > #+AUTHOR: Jambunathan K\cr\href{mailto:{{{EMAIL}}}}{{{{EMAIL}}}} > > ---> actual tex output <--- > \author{Jambunathan K\cr\href{mailto:kjambunathan@gmail.com}\{kjambunathan@gmail.com\}} > > The above tex snippet has the effect of getting the "Url Box" wrong. > > I was hoping to produce the following line - > \author{Jambunathan K\cr\href{mailto:kjambunathan@gmail.com}{kjambunathan@gmail.com}} > > Generally speaking, macro expansion in author string behaves strangely.
2010-03-12 09:21:41 -05:00
(org-export-latex-fontify-headline (or author user-full-name))))
Release 5.11
2008-01-31 05:36:29 -05:00
;; insert the date
(format "\\date{%s}\n"
Release 5.14
2008-01-31 05:37:51 -05:00
(format-time-string
Release 5.11
2008-01-31 05:36:29 -05:00
(or (plist-get opt-plist :date)
org-export-latex-date-format)))
org-latex.el (org-export-latex-make-header): Add some hyperref options. * org-latex.el (org-export-latex-make-header): Add some hyperref options. Thanks to Mikhail Titov for a preliminary version of this patch.
2011-10-22 05:05:28 -04:00
;; add some hyperref options
;; FIXME: let's have a defcustom for this?
(format "\\hypersetup{\n pdfkeywords={%s},\n pdfsubject={%s},\n pdfcreator={%s}}\n"
(org-export-latex-fontify-headline keywords)
(org-export-latex-fontify-headline description)
Make (org-version) always returns a string, use it in exporters. * org.el (org-version): When called non-interactively, insert the short version string, otherwise send a message with the complete version string. * org-odt.el (org-odt-update-meta-file): Use (org-version) and delegate checking whether `org-version' is known as a variable there. * org-html.el (org-export-as-html): Use (org-version). * org-docbook.el (org-export-as-docbook): Ditto. * org-latex.el (org-export-latex-make-header): Ditto.
2012-04-29 06:17:00 -04:00
(concat "Emacs Org-mode version " (org-version)))
* org-latex.el: place \title \author \date before \begin{document}. * org-latex.el (org-export-latex-make-header): place \title \author \date before \begin{document}.
2011-03-04 11:38:08 -05:00
;; beginning of the document
"\n\\begin{document}\n\n"
Release 5.11
2008-01-31 05:36:29 -05:00
;; insert the title command
LaTeX export: Skip title command when there is no title Using "#+TITLE:" without a value make the LaTeX export ignore the value of org-export-latex-title-command.
2009-07-27 02:45:02 -04:00
(when (string-match "\\S-" title)
(if (string-match "%s" org-export-latex-title-command)
(format org-export-latex-title-command title)
org-export-latex-title-command))
Release 5.11
2008-01-31 05:36:29 -05:00
"\n\n"
;; table of contents
Release 5.14
2008-01-31 05:37:51 -05:00
(when (and org-export-with-toc
Release 5.11
2008-01-31 05:36:29 -05:00
(plist-get opt-plist :section-numbers))
New hook
2009-12-11 02:52:26 -05:00
(funcall org-export-latex-format-toc-function
(cond ((numberp toc)
(min toc (plist-get opt-plist :headline-levels)))
(toc (plist-get opt-plist :headline-levels))))))))
(defun org-export-latex-format-toc-default (depth)
(when depth
(format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n"
depth)))
Release 5.10a
2008-01-31 05:36:18 -05:00
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
(defun org-export-latex-first-lines (opt-plist &optional beg end)
Release 5.10a
2008-01-31 05:36:18 -05:00
"Export the first lines before first headline.
LaTeX export: Fix bugs with exporting the region Matt Lundin writes: > When I select a region and invoke > org-replace-region-by-latex, the region is removed, but no > latex output is put in its place. In other words, the region > is simply deleted. > > Strangely, if I select multiple headlines, they are > converted to latex. But if I select only text underneath a > headline, it is not replaced. This is hopefully fixed now.
2009-05-04 01:32:23 -04:00
If BEG is non-nil, it is the beginning of the region.
If END is non-nil, it is the end of the region."
Release 5.10a
2008-01-31 05:36:18 -05:00
(save-excursion
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
(goto-char (or beg (point-min)))
Amend Bastiens fix in 3bc997fe8f4c8c57deaa451947a733a28500fb8e This fix did create a new problem with exporting selected subtrees. I hope it works now.
2009-09-10 16:37:49 -04:00
(let* ((pt (point))
Anchor outline regexp during LaTeX tree export * lisp/org-latex.el (org-export-latex-first-lines): Anchor outline regexp during LaTeX tree export Jrg Hagmann writes: > - If you export the (new) minimal example below to latex (C-cC-e l), it works. > - If you only export a tree (Subtree in the example; C-cC-e 1 l), the first table ends at the horizontal line and everything between it and the next node (Subsubtree) is eliminated. The second (identical) table is exported correctly. > - If you remove the asterisk(s) in the first table, it works. > > This problem crept in in the last days or weeks before 7.4. > > It may not be a problem for most of you, but I happen to have a number of files where columns are automatically displayed as tables preceding the first subnode (#+BEGIN: columnview ...). An alternative would be to display %ITEM in column-view without the asterisks. > > Emacs 23.2.1 on OS X 10.6.5 > Org-mode version 7.4 (release_7.4.24.g48b11.dirty) > > Thanks, Jrg > > -------New minimal example------------ > * Subtree > > > | One | Two | Three | > |--------+------+-------| > | * Test | text | text | > | ** One | text | text | > > > Some text > > ** Subsubtree > > | One | Two | Three | > |--------+------+-------| > | * Test | text | text | > | ** One | text | text |
2010-12-15 06:37:45 -05:00
(end (if (re-search-forward
(concat "^" (org-get-limited-outline-regexp)) end t)
Amend Bastiens fix in 3bc997fe8f4c8c57deaa451947a733a28500fb8e This fix did create a new problem with exporting selected subtrees. I hope it works now.
2009-09-10 16:37:49 -04:00
(goto-char (match-beginning 0))
(goto-char (or end (point-max))))))
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
(prog1
(org-export-latex-content
(org-export-preprocess-string
(buffer-substring pt end)
Code cleanup: use a generic :for-backend parameter.
2011-02-15 05:07:46 -05:00
:for-backend 'latex
Fix LaTeX export bug with regions and initial content. This re-implements and fixes the commit b786f4da9330f1f5593e09f191fc1e9218a9e218, which we had reverted earlier today. The new version seems to work OK.
2008-12-15 07:24:12 -05:00
:emph-multiline t
:add-text nil
:comments nil
:skip-before-1st-heading nil
Export: Fix timestamp processing There were two bugs: 1. Timestamp processing did not honor the setting of `org-export-with-timestamps' in the text before the first headline. 2. When `org-export-with-timestamps' was nil, time stamps were removed even in tables. I think this is incorrect, so in tables, time stamps are now never removed.
2009-01-26 01:36:01 -05:00
:LaTeX-fragments nil
:timestamps (plist-get opt-plist :timestamps)
:footnotes (plist-get opt-plist :footnotes)))
Bugfix: Avoid raising buffer-modified flag during LaTeX export This had, as usually, to do with changing text properties. Report by Russel Adams.
2009-02-22 14:50:12 -05:00
(org-unmodified
Keep BABEL meta lines in tact * lisp/org-latex.el (org-export-latex-first-lines): Do not mark meta lines for removal. Do not remove BABEL config lines during export
2010-07-09 04:06:17 -04:00
(let ((inhibit-read-only t)
(limit (max pt (1- end))))
(add-text-properties pt limit
'(:org-license-to-kill t))
(save-excursion
(goto-char pt)
Fix Table attribute issue during PDF export * lisp/org-latex.el (org-export-latex-first-lines): Do not protect meta lines that have nothing to do with babel.
2010-08-16 08:28:29 -04:00
(while (re-search-forward "^[ \t]*#\\+.*\n?" limit t)
(let ((case-fold-search t))
(unless (org-string-match-p
"^[ \t]*#\\+\\(attr_\\|caption\\>\\|label\\>\\)"
(match-string 0))
(remove-text-properties (match-beginning 0) (match-end 0)
'(:org-license-to-kill t))))))))))))
org-latex.el: Fontify timestamps in headlines. (org-export-latex-fontify-headline): Fontify timestamps in headlines.
2011-02-13 06:15:08 -05:00
Release 5.10a
2008-01-31 05:36:18 -05:00
Export: Implement macro replacement during export A line: #+MARCO: name replacement text can be referenced by {{{name}}}. As special cases, {{{title}}} will reference #+TITLE, and similar with similar lines.
2009-02-23 08:15:52 -05:00
(defvar org-export-latex-header-defs nil
"The header definitions that might be used in the LaTeX body.")
LaTeX Export: Define TeX macros for in-buffer settings This commit implements the possibility to import the in-buffer export options as TeX macros, like \orgTITLE, \orgAUTHOR etc. Requested by Russel Adams.
2009-02-20 01:55:05 -05:00
Release 5.14
2008-01-31 05:37:51 -05:00
(defun org-export-latex-content (content &optional exclude-list)
"Convert CONTENT string to LaTeX.
Don't perform conversions that are in EXCLUDE-LIST. Recognized
conversion types are: quotation-marks, emphasis, sub-superscript,
links, keywords, lists, tables, fixed-width"
(with-temp-buffer
org-latex.el: fix bug about #+BIND directive not followed. * org-latex.el (org-export-latex-content): bind local variables for export in the temporary export buffer. Thanks to Andreas Leha for reporting this.
2011-02-18 05:25:11 -05:00
(org-install-letbind)
(insert content)
(unless (memq 'timestamps exclude-list)
(org-export-latex-time-stamps))
(unless (memq 'quotation-marks exclude-list)
(org-export-latex-quotation-marks))
(unless (memq 'emphasis exclude-list)
(when (plist-get org-export-latex-options-plist :emphasize)
(org-export-latex-fontify)))
(unless (memq 'sub-superscript exclude-list)
(org-export-latex-special-chars
(plist-get org-export-latex-options-plist :sub-superscript)))
(unless (memq 'links exclude-list)
(org-export-latex-links))
(unless (memq 'keywords exclude-list)
(org-export-latex-keywords))
(unless (memq 'lists exclude-list)
(org-export-latex-lists))
(unless (memq 'tables exclude-list)
(org-export-latex-tables
(plist-get org-export-latex-options-plist :tables)))
(unless (memq 'fixed-width exclude-list)
(org-export-latex-fixed-width
(plist-get org-export-latex-options-plist :fixed-width)))
Release 5.14
2008-01-31 05:37:51 -05:00
;; return string
org-latex.el: fix bug about #+BIND directive not followed. * org-latex.el (org-export-latex-content): bind local variables for export in the temporary export buffer. Thanks to Andreas Leha for reporting this.
2011-02-18 05:25:11 -05:00
(buffer-substring (point-min) (point-max))))
Release 5.14
2008-01-31 05:37:51 -05:00
(defun org-export-latex-protect-string (s)
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"Add the org-protected property to string S."
Release 5.14
2008-01-31 05:37:51 -05:00
(add-text-properties 0 (length s) '(org-protected t) s) s)
(defun org-export-latex-protect-char-in-string (char-list string)
"Add org-protected text-property to char from CHAR-LIST in STRING."
(with-temp-buffer
(save-match-data
(insert string)
(goto-char (point-min))
(while (re-search-forward (regexp-opt char-list) nil t)
(add-text-properties (match-beginning 0)
(match-end 0) '(org-protected t)))
(buffer-string))))
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
(defun org-export-latex-keywords-maybe (&optional remove-list)
Release 5.06d
2008-01-31 05:35:58 -05:00
"Maybe remove keywords depending on rules in REMOVE-LIST."
(goto-char (point-min))
Release 5.14
2008-01-31 05:37:51 -05:00
(let ((re-todo (mapconcat 'identity org-export-latex-todo-keywords-1 "\\|"))
LaTeX export: Make TODO keyword markup configurable
2009-05-12 06:27:56 -04:00
(case-fold-search nil)
(todo-markup org-export-latex-todo-keyword-markup)
fmt)
Release 5.06d
2008-01-31 05:35:58 -05:00
;; convert TODO keywords
(when (re-search-forward (concat "^\\(" re-todo "\\)") nil t)
(if (plist-get remove-list :todo)
(replace-match "")
LaTeX export: Make TODO keyword markup configurable
2009-05-12 06:27:56 -04:00
(setq fmt (cond
((stringp todo-markup) todo-markup)
((and (consp todo-markup) (stringp (car todo-markup)))
(if (member (match-string 1) org-export-latex-done-keywords)
(cdr todo-markup) (car todo-markup)))
(t (cdr (or (assoc (match-string 1) todo-markup)
(car todo-markup))))))
LaTeX export: Fix TODO keyword export
2010-05-13 02:47:26 -04:00
(replace-match (org-export-latex-protect-string
(format fmt (match-string 1))) t t)))
Release 5.06d
2008-01-31 05:35:58 -05:00
;; convert priority string
(when (re-search-forward "\\[\\\\#.\\]" nil t)
(if (plist-get remove-list :priority)
(replace-match "")
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
(replace-match (format "\\textbf{%s}" (match-string 0)) t t)))
Release 5.06d
2008-01-31 05:35:58 -05:00
;; convert tags
Allow "#" and "%" in tags Patch largely from Manish, missing points added by Carsten
2010-08-20 20:30:31 -04:00
(when (re-search-forward "\\(:[a-zA-Z0-9_@#%]+\\)+:" nil t)
Release 5.07
2008-01-31 05:36:08 -05:00
(if (or (not org-export-with-tags)
(plist-get remove-list :tags))
Release 5.06d
2008-01-31 05:35:58 -05:00
(replace-match "")
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
(replace-match
Fix bug with export of tags in headlines.
2008-07-03 13:36:32 -04:00
(org-export-latex-protect-string
LaTeX export: Configurable format for tags * lisp/org-latex.el (org-export-latex-tag-markup): New option. (org-export-latex-keywords-maybe): Use `org-export-latex-tag-markup'.
2010-09-14 08:42:37 -04:00
(format org-export-latex-tag-markup
Whitespace
2008-12-16 11:58:02 -05:00
(save-match-data
(replace-regexp-in-string
Fix LaTeX export of tags containing the character `#' * lisp/org-latex.el (org-export-latex-keywords-maybe): Protect # in tags. The `#' is a special LaTeX character and needs to be protected.
2011-03-27 03:04:09 -04:00
"\\([_#]\\)" "\\\\\\1" (match-string 0)))))
Whitespace
2008-12-16 11:58:02 -05:00
t t)))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Release 5.14
2008-01-31 05:37:51 -05:00
(defun org-export-latex-fontify-headline (string)
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"Fontify special words in STRING."
Release 5.06d
2008-01-31 05:35:58 -05:00
(with-temp-buffer
;; FIXME: org-inside-LaTeX-fragment-p doesn't work when the $...$ is at
;; the beginning of the buffer - inserting "\n" is safe here though.
Release 5.14
2008-01-31 05:37:51 -05:00
(insert "\n" string)
Better processing of headlines and the title in LaTeX export * lisp/org-latex.el (org-export-latex-make-header): Run the title through `org-export-latex-fontify-headline'. (org-export-latex-fontify-headline): Do the protection of math snippets also here
2010-11-21 04:22:09 -05:00
;; Preserve math snippets
org-latex.el: Fontify timestamps in headlines. (org-export-latex-fontify-headline): Fontify timestamps in headlines.
2011-02-13 06:15:08 -05:00
Better processing of headlines and the title in LaTeX export * lisp/org-latex.el (org-export-latex-make-header): Run the title through `org-export-latex-fontify-headline'. (org-export-latex-fontify-headline): Do the protection of math snippets also here
2010-11-21 04:22:09 -05:00
(let* ((matchers (plist-get org-format-latex-options :matchers))
(re-list org-latex-regexps)
beg end re e m n block off)
;; Check the different regular expressions
(while (setq e (pop re-list))
(setq m (car e) re (nth 1 e) n (nth 2 e)
block (if (nth 3 e) "\n\n" ""))
(setq off (if (member m '("$" "$1")) 1 0))
(when (and (member m matchers) (not (equal m "begin")))
(goto-char (point-min))
(while (re-search-forward re nil t)
(setq beg (+ (match-beginning 0) off) end (- (match-end 0) 0))
(add-text-properties beg end
'(org-protected t org-latex-math t))))))
;; Convert LaTeX to \LaTeX{} and TeX to \TeX{}
(goto-char (point-min))
(let ((case-fold-search nil))
(while (re-search-forward "\\<\\(\\(La\\)?TeX\\)\\>" nil t)
(unless (eq (char-before (match-beginning 1)) ?\\)
(org-if-unprotected-1
(replace-match (org-export-latex-protect-string
(concat "\\" (match-string 1)
"{}")) t t)))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (point-min))
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
(let ((re (concat "\\\\\\([a-zA-Z]+\\)"
LaTeX export: Protect <...> arguments for BEAMER export Bill Jackson writes: > When exporting to LaTeX, curly brackets in a command will be escaped > if that command also contains angle brackets. This can be a problem > when using beamer. An example input file: > > ------------------------------------------------------------------------ > > #+LaTeX_CLASS: beamer > > * The One and Only Frame > When LaTeX \alert<2>{commands} contain angle brackets, the curly > brackets are erroneously escaped in the output. \alert{Commands} > that do not contain angle brackets work properly. > > ------------------------------------------------------------------------ > > Typing C-c C-e l will generate the output file: > > ------------------------------------------------------------------------ > > % Created 2010-01-15 Fri 13:57 > \documentclass{beamer} > \usepackage[latin1]{inputenc} > \usepackage[T1]{fontenc} > \usepackage{graphicx} > \usepackage{longtable} > \usepackage{float} > \usepackage{wrapfig} > \usepackage{soul} > \usepackage{amssymb} > \usepackage{hyperref} > > > \title{escCurly} > \author{} > \date{15 January 2010} > > \begin{document} > > \maketitle > > \begin{frame} > \frametitle{Outline} > \setcounter{tocdepth}{3} > \tableofcontents > \end{frame} > > \begin{frame} > \frametitle{The One and Only Frame} > \label{sec-1} > > When \LaTeX{} \alert<2>\{commands\} contain angle brackets, the curly > brackets are erroneously escaped in the output. \alert{Commands} > that do not contain angle brackets work properly. > \end{frame} > > \end{document}
2010-01-28 09:50:20 -05:00
"\\(?:<[^<>\n]*>\\)*"
"\\(?:\\[[^][\n]*?\\]\\)*"
"\\(?:<[^<>\n]*>\\)*"
LaTeX export: Fix another problem with #+AUTHOR export Jambunathan K. writes: > I would like to add the following observation as well - > > ---> org input <--- > #+AUTHOR: Jambunathan K\cr\href{mailto:{{{EMAIL}}}}{{{{EMAIL}}}} > > ---> actual tex output <--- > \author{Jambunathan K\cr\href{mailto:kjambunathan@gmail.com}\{kjambunathan@gmail.com\}} > > The above tex snippet has the effect of getting the "Url Box" wrong. > > I was hoping to produce the following line - > \author{Jambunathan K\cr\href{mailto:kjambunathan@gmail.com}{kjambunathan@gmail.com}} > > Generally speaking, macro expansion in author string behaves strangely.
2010-03-12 09:21:41 -05:00
"\\("
(org-create-multibrace-regexp "{" "}" 3)
"\\)\\{1,3\\}")))
Protect LaTeX macros in AUTHOR lines
2009-10-20 08:06:23 -04:00
(while (re-search-forward re nil t)
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
(unless (or
;; check for comment line
(save-excursion (goto-char (match-beginning 0))
LaTeX Export: Fix problem with alignment specs that contain a comma
2010-05-14 08:27:35 -04:00
(org-in-indented-comment-line))
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
;; Check if this is a defined entity, so that is may need conversion
(org-entity-get (match-string 1)))
Protect LaTeX macros in AUTHOR lines
2009-10-20 08:06:23 -04:00
(add-text-properties (match-beginning 0) (match-end 0)
'(org-protected t)))))
Release 5.14
2008-01-31 05:37:51 -05:00
(when (plist-get org-export-latex-options-plist :emphasize)
Release 5.06d
2008-01-31 05:35:58 -05:00
(org-export-latex-fontify))
org-latex.el: Fontify timestamps in headlines. (org-export-latex-fontify-headline): Fontify timestamps in headlines.
2011-02-13 06:15:08 -05:00
(org-export-latex-time-stamps)
lisp/org-latex.el: Convert quotes to their LaTeX equivalents Convert quotes to their LaTeX equivalents using org-export-latex-quotation-marks.
2011-06-28 13:18:02 -04:00
(org-export-latex-quotation-marks)
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
(org-export-latex-keywords-maybe)
Fix bug with export of tags in headlines.
2008-07-03 13:36:32 -04:00
(org-export-latex-special-chars
(plist-get org-export-latex-options-plist :sub-superscript))
Release 5.06d
2008-01-31 05:35:58 -05:00
(org-export-latex-links)
Fix problems with internal links for LateX export.
2008-10-10 05:42:01 -04:00
(org-trim (buffer-string))))
Release 5.06d
2008-01-31 05:35:58 -05:00
LaTeX export: Format time stamps Time stamps in LaTeX export now also honor custom time stamp formats. Furthermore, the new option `org-export-latex-timestamp-markup' can specify special markup for time stamps.
2009-04-13 02:52:11 -04:00
(defun org-export-latex-time-stamps ()
"Format time stamps."
(goto-char (point-min))
(let ((org-display-custom-times org-export-latex-display-custom-times))
(while (re-search-forward org-ts-regexp-both nil t)
(org-if-unprotected-at (1- (point))
(replace-match
(org-export-latex-protect-string
* Allow for a different markup for inactive time stamps on latex export
2011-06-30 22:38:48 -04:00
(format (if (string= "<" (substring (match-string 0) 0 1))
org-export-latex-timestamp-markup
org-export-latex-timestamp-inactive-markup)
LaTeX export: Format time stamps Time stamps in LaTeX export now also honor custom time stamp formats. Furthermore, the new option `org-export-latex-timestamp-markup' can specify special markup for time stamps.
2009-04-13 02:52:11 -04:00
(substring (org-translate-time (match-string 0)) 1 -1)))
t t)))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-quotation-marks ()
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
"Export quotation marks depending on language conventions."
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
(mapc (lambda(l)
(goto-char (point-min))
(while (re-search-forward (car l) nil t)
(let ((rpl (concat (match-string 1)
(org-export-latex-protect-string
(copy-sequence (cdr l))))))
(org-if-unprotected-1
org-latex.el: Delete trailing whitespaces.
2011-07-12 02:31:07 -04:00
(replace-match rpl t t)))))
org-latex.el: New defcustom `org-export-latex-quotes' to control quotes. * org-latex.el (org-export-latex-quotes): New defcustom. (org-export-latex-quotation-marks): Use it. This allows users to define what quotes they want to use as a replacement of english double-quotes while exporting to LaTeX. In particular, if you use the csquote package, you can configure Org to output something like \endquote{some quoted text} instead of "some quoted text". Thanks to Frederik for bringing this issue up, and to Thomas S. Dye, Nick Dokos and Stefan Nobis for elaborating this solution.
2011-07-11 09:10:00 -04:00
(cdr (or (assoc (plist-get org-export-latex-options-plist :language)
org-export-latex-quotes)
;; falls back on english
(assoc "en" org-export-latex-quotes)))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-special-chars (sub-superscript)
"Export special characters to LaTeX.
If SUB-SUPERSCRIPT is non-nil, convert \\ and ^.
See the `org-export-latex.el' code for a complete conversion table."
(goto-char (point-min))
(mapc (lambda(c)
(goto-char (point-min))
(while (re-search-forward c nil t)
;; Put the point where to check for org-protected
org-latex.el: Fix bug when escaping special characters in a table. * org-latex.el (org-export-latex-special-chars): Fix bug when escaping special characters in a table. Thanks to Alexander Willand for reporting this.
2012-04-22 02:42:35 -04:00
(unless (get-text-property (match-beginning 2) 'org-protected)
Release 5.06d
2008-01-31 05:35:58 -05:00
(cond ((member (match-string 2) '("\\$" "$"))
Release 5.11
2008-01-31 05:36:29 -05:00
(if (equal (match-string 2) "\\$")
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
nil
(replace-match "\\$" t t)))
Release 5.11
2008-01-31 05:36:29 -05:00
((member (match-string 2) '("&" "%" "#"))
(if (equal (match-string 1) "\\")
(replace-match (match-string 2) t t)
(replace-match (concat (match-string 1) "\\"
LaTeX export: Fix export of && Lukasz Stelman writes: I've create some presentation on programming (some more to do) and to my surprise I've discovered that if org-mode escapes one "&" properly it doesn't do its job in case of "&&" (and a single "^" too). I get "\&&" in latex file which of course is wrong.
2010-03-03 06:59:26 -05:00
(match-string 2)) t t)
(backward-char 1)))
Release 5.14
2008-01-31 05:37:51 -05:00
((equal (match-string 2) "...")
(replace-match
(concat (match-string 1)
(org-export-latex-protect-string "\\ldots{}")) t t))
Release 5.11
2008-01-31 05:36:29 -05:00
((equal (match-string 2) "~")
(cond ((equal (match-string 1) "\\") nil)
((eq 'org-link (get-text-property 0 'face (match-string 2)))
(replace-match (concat (match-string 1) "\\~") t t))
Release 5.14
2008-01-31 05:37:51 -05:00
(t (replace-match
Release 5.11
2008-01-31 05:36:29 -05:00
(org-export-latex-protect-string
(concat (match-string 1) "\\~{}")) t t))))
((member (match-string 2) '("{" "}"))
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
(unless (save-match-data (org-inside-latex-math-p))
Release 5.11
2008-01-31 05:36:29 -05:00
(if (equal (match-string 1) "\\")
(replace-match (match-string 2) t t)
(replace-match (concat (match-string 1) "\\"
(match-string 2)) t t)))))
org-latex.el: Fix bug when escaping special characters in a table. * org-latex.el (org-export-latex-special-chars): Fix bug when escaping special characters in a table. Thanks to Alexander Willand for reporting this.
2012-04-22 02:42:35 -04:00
(unless (save-match-data (or (org-inside-latex-math-p) (org-at-table-p)))
Release 5.11
2008-01-31 05:36:29 -05:00
(cond ((equal (match-string 2) "\\")
(replace-match (or (save-match-data
(org-export-latex-treat-backslash-char
(match-string 1)
LaTeX export: Fix two bugs. 1. When LaTeX export was done with a time-stamped file, a format error in the timestamp format caused the output file to not have the % comment in front of the time string. As this line is early in the file, a LaTeX error would result. 2. Replacement of some special characters could fail. Strangely this shows up only in XEmacs, but it still is a bug. Both bugs were reported by Hugh Daschbach.
2008-12-21 05:00:05 -05:00
(or (match-string 3) "")))
More fixes
2010-03-29 08:05:56 -04:00
"") t t)
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
(when (and (get-text-property (1- (point)) 'org-entity)
(looking-at "{}"))
;; OK, this was an entity replacement, and the user
;; had terminated the entity with {}. Make sure
;; {} is protected as well, and remove the extra {}
;; inserted by the conversion.
(put-text-property (point) (+ 2 (point)) 'org-protected t)
(if (save-excursion (goto-char (max (- (point) 2) (point-min)))
(looking-at "{}"))
(replace-match ""))
(forward-char 2))
More fixes
2010-03-29 08:05:56 -04:00
(backward-char 1))
Release 5.11
2008-01-31 05:36:29 -05:00
((member (match-string 2) '("_" "^"))
(replace-match (or (save-match-data
(org-export-latex-treat-sub-super-char
sub-superscript
(match-string 2)
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
(match-string 1)
Fix problems with sub and superscript in LaTeX export
2009-07-09 00:29:51 -04:00
(match-string 3))) "") t t)
(backward-char 1)))))))
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
'(;"^\\([^\n$]*?\\|^\\)\\(\\\\?\\$\\)\\([^\n$]*\\)$"
"\\(\\(\\\\?\\$\\)\\)"
More bug fixes
2010-03-30 04:36:02 -04:00
"\\([a-zA-Z0-9()]+\\|[ \t\n]\\|\\b\\|\\\\\\)\\(_\\|\\^\\)\\({[^{}]+}\\|[a-zA-Z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-zA-Z0-9]+}\\|([a-zA-Z0-9]+)\\)"
"\\(.\\|^\\)\\(\\\\\\)\\([ \t\n]\\|\\([&#%{}\"]\\|[a-zA-Z][a-zA-Z0-9]*\\)\\)"
Prefer matching line beginnings in org-export-latex-special-chars * lisp/org-latex.el (org-export-latex-special-chars): Fix regexp for `single' special characters and ellipsis. Repeated special characters are exported differently depending on their position in the buffer. A "&&" string at the start of a line is exported as "&\&" whereas in the middle of a line you get "\&\&". The former is incorrect. Fix this by matching the beginning of a line before a character. While we're at it, amalgamate the regexps for the different special characters.
2011-03-28 16:17:32 -04:00
"\\(^\\|.\\)\\([&#%{}~]\\|\\.\\.\\.\\)"
Release 5.11
2008-01-31 05:36:29 -05:00
;; (?\< . "\\textless{}")
;; (?\> . "\\textgreater{}")
)))
Release 5.06d
2008-01-31 05:35:58 -05:00
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
(defun org-inside-latex-math-p ()
(get-text-property (point) 'org-latex-math))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-treat-sub-super-char
Fix bug about list delimitation. A list now ends when a line contains an indentation that is shorter than the expected indentation of an item for this list. `org-export-latex-list-beginning-re' renamed to `org-list-beginning-re' and `org-list-item-begin' renamed to `org-list-item-beginning'. Some code clean up: silent checkdoc, fix typos.
2008-09-20 08:45:11 -04:00
(subsup char string-before string-after)
Release 5.06d
2008-01-31 05:35:58 -05:00
"Convert the \"_\" and \"^\" characters to LaTeX.
SUBSUP corresponds to the ^: option in the #+OPTIONS line.
Convert CHAR depending on STRING-BEFORE and STRING-AFTER."
(cond ((equal string-before "\\")
(concat string-before char string-after))
LaTeX export: Fix superscript bug Thomas S. Dye writes: > I'm trying to generate $^{14}$C, or an equivalent, from org-mode > to represent the isotope of carbon important in archaeological > dating. > > Reading the manual, I tried this: > > ** A Brief History of Attempts to Interpret the ^{14}C Dates > *** The ^{14}C Dates > > Which, in my #+LaTeX_CLASS: beamer export, yields > > \subsection{A Brief History of Attempts to Interpret the \^{}{14}C Dates} > ... > \begin{frame}\frametitle{The \^{}{14}C Dates} > > The problem seems to be the space before the ^. > > This input: > > ** A Brief History of Attempts to Interpret the x^{14}C Dates > *** The x^{14}C Dates > > yields the correct LaTeX: > > \subsection{A Brief History of Attempts to Interpret the x$^{\mathrm{14}}$C Dates} > ... > \begin{frame}\frametitle{The x$^{\mathrm{14}}$C Dates} > > Am I missing something? Or, is the LaTeX export thrown off by > the space before ^? Indeed, a space before the caret was not allowed in LaTeX export
2009-09-28 22:40:01 -04:00
((and (string-match "\\S-+" string-after))
;; this is part of a math formula
Release 5.06d
2008-01-31 05:35:58 -05:00
(cond ((eq 'org-link (get-text-property 0 'face char))
(concat string-before "\\" char string-after))
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
((save-match-data (org-inside-latex-math-p))
Release 5.06d
2008-01-31 05:35:58 -05:00
(if subsup
(cond ((eq 1 (length string-after))
(concat string-before char string-after))
((string-match "[({]?\\([^)}]+\\)[)}]?" string-after)
Release 5.14
2008-01-31 05:37:51 -05:00
(format "%s%s{%s}" string-before char
Release 5.06d
2008-01-31 05:35:58 -05:00
(match-string 1 string-after))))))
Fix sub/superscript issues in LaTeX export.
2008-10-17 13:32:30 -04:00
((and (> (length string-after) 1)
(or (eq subsup t)
(and (equal subsup '{}) (eq (string-to-char string-after) ?\{)))
LaTeX export: Fix bug with export of x^{(0)} Report by Dan Davison
2010-04-28 11:21:41 -04:00
(or (string-match "[{]?\\([^}]+\\)[}]?" string-after)
(string-match "[(]?\\([^)]+\\)[)]?" string-after)))
LaTeX export: Fix subscript export here as well.
2009-03-11 05:32:54 -04:00
(org-export-latex-protect-string
(format "%s$%s{%s}$" string-before char
(if (and (> (match-end 1) (1+ (match-beginning 1)))
(not (equal (substring string-after 0 2) "{\\")))
(concat "\\mathrm{" (match-string 1 string-after) "}")
(match-string 1 string-after)))))
Fix sub/superscript issues in LaTeX export.
2008-10-17 13:32:30 -04:00
((eq subsup t) (concat string-before "$" char string-after "$"))
Release 5.11
2008-01-31 05:36:29 -05:00
(t (org-export-latex-protect-string
Release 5.10a
2008-01-31 05:36:18 -05:00
(concat string-before "\\" char "{}" string-after)))))
Release 5.11
2008-01-31 05:36:29 -05:00
(t (org-export-latex-protect-string
Release 5.10a
2008-01-31 05:36:18 -05:00
(concat string-before "\\" char "{}" string-after)))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-treat-backslash-char (string-before string-after)
"Convert the \"$\" special character to LaTeX.
The conversion is made depending of STRING-BEFORE and STRING-AFTER."
Implement new and better support for entities
2010-03-28 03:48:03 -04:00
(let ((ass (org-entity-get string-after)))
(cond
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
(ass (org-add-props
(if (nth 2 ass)
(concat string-before
(org-export-latex-protect-string
(concat "$" (nth 1 ass) "$")))
(concat string-before (org-export-latex-protect-string
(nth 1 ass))))
nil 'org-entity t))
Implement new and better support for entities
2010-03-28 03:48:03 -04:00
((and (not (string-match "^[ \n\t]" string-after))
(not (string-match "[ \t]\\'\\|^" string-before)))
;; backslash is inside a word
(concat string-before
(org-export-latex-protect-string
(concat "\\textbackslash{}" string-after))))
((not (or (equal string-after "")
(string-match "^[ \t\n]" string-after)))
;; backslash might escape a character (like \#) or a user TeX
;; macro (like \setcounter)
(concat string-before
(org-export-latex-protect-string (concat "\\" string-after))))
((and (string-match "^[ \t\n]" string-after)
(string-match "[ \t\n]\\'" string-before))
;; backslash is alone, convert it to $\backslash$
(org-export-latex-protect-string
(concat string-before "\\textbackslash{}" string-after)))
(t (org-export-latex-protect-string
(concat string-before "\\textbackslash{}" string-after))))))
Fix whitespace and compiler wanings
2010-04-01 07:11:54 -04:00
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
(defun org-export-latex-keywords ()
Export: Fix bugs with LaTeX export. 1. Export hangs during LaTeX export. That was a bug using an empty regular expression that was defined only locally in Org files, but not in the buffer used by the LaTeX exporter. 2. Underscores in links can get special treatment by the LaTeX exporter. Now the link is protected from this.
2009-01-08 08:25:26 -05:00
"Convert special keywords to LaTeX."
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
(goto-char (point-min))
LaTeX export: Fix bugs with timestamp export. The formatting of timestamp keywords was wrong.
2009-04-19 01:46:54 -04:00
(while (re-search-forward org-export-latex-special-keyword-regexp nil t)
(replace-match (format org-export-latex-timestamp-keyword-markup
(match-string 0)) t t)
(save-excursion
(beginning-of-line 1)
No extra newline after time planning line
2010-03-19 14:51:58 -04:00
(unless (looking-at ".*\n[ \t]*\n")
LaTeX export: Fix bugs with timestamp export. The formatting of timestamp keywords was wrong.
2009-04-19 01:46:54 -04:00
(end-of-line 1)
No extra newline after time planning line
2010-03-19 14:51:58 -04:00
(insert "\n")))))
Release 5.14
2008-01-31 05:37:51 -05:00
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-fixed-width (opt)
"When OPT is non-nil convert fixed-width sections to LaTeX."
(goto-char (point-min))
Export: Better handling of colon examples. Lines preceded by a colon are treated as fixed-width examples. This commit improves the moment when the protection of these lines happens during preprocessing. And it enforces that a space must follow the colon for the line to be treated in this way.
2009-01-09 02:28:43 -05:00
(while (re-search-forward "^[ \t]*:\\([ \t]\\|$\\)" nil t)
org-latex: now checking org-example rather than org-protected on verbatim export * lisp/org-latex.el (org-export-latex-fixed-width): now checking org-example rather than org-protected on verbatim export, because by default all ": " prefixed lines are marked protected
2010-06-28 17:15:23 -04:00
(unless (get-text-property (point) 'org-example)
org-latex: check for protection before wrapping ": " lines as verbatim * lisp/org-latex.el (org-export-latex-fixed-width): check for protection before wrapping ": " lines as verbatim
2010-06-27 22:36:14 -04:00
(if opt
(progn (goto-char (match-beginning 0))
(insert "\\begin{verbatim}\n")
(while (looking-at "^\\([ \t]*\\):\\(\\([ \t]\\|$\\).*\\)$")
(replace-match (concat (match-string 1)
(match-string 2)) t t)
(forward-line))
org-latex.el: Only add one line break after exporting verbatim environments. * org-latex.el (org-export-latex-fixed-width): Only add one line break after exporting verbatim environments. Thanks to Maik Beckmann for reporting this.
2011-08-14 10:40:45 -04:00
(insert "\\end{verbatim}\n"))
org-latex: check for protection before wrapping ": " lines as verbatim * lisp/org-latex.el (org-export-latex-fixed-width): check for protection before wrapping ": " lines as verbatim
2010-06-27 22:36:14 -04:00
(progn (goto-char (match-beginning 0))
(while (looking-at "^\\([ \t]*\\):\\(\\([ \t]\\|$\\).*\\)$")
(replace-match (concat "%" (match-string 1)
(match-string 2)) t t)
(forward-line)))))))
Split out a number of files from org.el, and reorganize the structure of the git repository, using new subdirectories for Lisp and Documentation files.
2008-03-22 11:52:18 -04:00
(defvar org-table-last-alignment) ; defined in org-table.el
Keep byte compiler happy
2009-08-31 06:19:56 -04:00
(defvar org-table-last-column-widths) ; defined in org-table.el
Split out a number of files from org.el, and reorganize the structure of the git repository, using new subdirectories for Lisp and Documentation files.
2008-03-22 11:52:18 -04:00
(declare-function orgtbl-to-latex "org-table" (table params) t)
Release 5.11
2008-01-31 05:36:29 -05:00
(defun org-export-latex-tables (insert)
"Convert tables to LaTeX and INSERT it."
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
;; First, get the table.el tables
(goto-char (point-min))
(while (re-search-forward "^[ \t]*\\(\\+-[-+]*\\+\\)[ \t]*\n[ \t]*|" nil t)
LaTeX export: Protect examples, even if they look like table.el tables The recent patch to introduce table.el export in LaTeX forgot to check protectedness.
2010-03-03 07:26:24 -05:00
(org-if-unprotected
(require 'table)
(org-export-latex-convert-table.el-table)))
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
;; And now the Org-mode tables
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (point-min))
(while (re-search-forward "^\\([ \t]*\\)|" nil t)
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(org-if-unprotected-at (1- (point))
(org-table-align)
(let* ((beg (org-table-begin))
(end (org-table-end))
(raw-table (buffer-substring beg end))
(org-table-last-alignment (copy-sequence org-table-last-alignment))
(org-table-last-column-widths (copy-sequence
org-table-last-column-widths))
fnum fields line lines olines gr colgropen line-fmt align
org-latex.el (org-export-latex-tables): Let-bind `hfmt'. * org-latex.el (org-export-latex-tables): Let-bind `hfmt'. Silent byte-compiler.
2012-04-28 12:48:02 -04:00
caption width shortn label attr hfmt floatp placement
allow specification of table*, tabularx and tabulary table environments e.g. #+CAPTION: A wide table with tabulary #+LABEL: tbl:wide #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | #+CAPTION: A normal table with tabularx #+LABEL: tbl:wide #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | Thanks to Tom Dye for suggestions and LaTeX background knowledge. * lisp/org-latex.el (org-export-latex-tables): Allowing specification of tabular[xy] inner environments through the ATTR_LaTeX line.
2010-12-17 15:31:09 -05:00
longtblp tblenv tabular-env)
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(if org-export-latex-tables-verbatim
(let* ((tbl (concat "\\begin{verbatim}\n" raw-table
"\\end{verbatim}\n")))
(apply 'delete-region (list beg end))
(insert (org-export-latex-protect-string tbl)))
(progn
(setq caption (org-find-text-property-in-string
'org-caption raw-table)
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
shortn (org-find-text-property-in-string
'org-caption-shortn raw-table)
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
attr (org-find-text-property-in-string
'org-attributes raw-table)
label (org-find-text-property-in-string
'org-label raw-table)
longtblp (and attr (stringp attr)
(string-match "\\<longtable\\>" attr))
org-latex.el: Allow to use sidewaystable. * org-latex.el (org-export-latex-tables): Allow to use sidewaystable. TINYCHANGE
2012-03-19 21:57:02 -04:00
tblenv (if (and attr (stringp attr))
(cond ((string-match "\\<sidewaystable\\>" attr)
"sidewaystable")
((or (string-match (regexp-quote "table*") attr)
(string-match "\\<multicolumn\\>" attr))
"table*")
(t "table"))
"table")
allow specification of table*, tabularx and tabulary table environments e.g. #+CAPTION: A wide table with tabulary #+LABEL: tbl:wide #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | #+CAPTION: A normal table with tabularx #+LABEL: tbl:wide #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | Thanks to Tom Dye for suggestions and LaTeX background knowledge. * lisp/org-latex.el (org-export-latex-tables): Allowing specification of tabular[xy] inner environments through the ATTR_LaTeX line.
2010-12-17 15:31:09 -05:00
tabular-env
(if (and attr (stringp attr)
(string-match "\\(tabular.\\)" attr))
(match-string 1 attr)
org-export-latex-tabular-environment)
width (and attr (stringp attr)
(string-match "\\<width=\\([^ \t\n\r]+\\)" attr)
(match-string 1 attr))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
align (and attr (stringp attr)
LaTeX Export: Fix problem with alignment specs that contain a comma
2010-05-14 08:27:35 -04:00
(string-match "\\<align=\\([^ \t\n\r]+\\)" attr)
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(match-string 1 attr))
org-latex.el: Support setting the :hfmt parameter from #+ATTR_LaTeX. * org-latex.el (org-export-latex-tables): Support setting the :hfmt parameter from #+ATTR_LaTeX. TINYCHANGE
2012-04-23 07:38:48 -04:00
hfmt (and attr (stringp attr)
(string-match "\\<hfmt=\\(\\S-+\\)" attr)
(match-string 1 attr))
replacing the "multicolumn" option for latex tables This brings the behavior inline with the documentation. * lisp/org-latex.el (org-export-latex-tables): Check for the "multiline" option and set the `floatp' option to true when multicolumn tables are requested.
2011-06-01 12:18:34 -04:00
floatp (or caption label (string= "table*" tblenv))
org-latex.el: Fontify timestamps in headlines. (org-export-latex-fontify-headline): Fontify timestamps in headlines.
2011-02-13 06:15:08 -05:00
placement (if (and attr
Placement=[H] not exporting to LaTeX anymore? Nick Dokos <nicholas.dokos@hp.com> wrote: > John Hendy <jw.hendy@gmail.com> wrote: > > > Just to be sure I created an blank org file with only this: > > > > * test > > > > #+CAPTION: test table > > #+ATTR_LaTeX: placement=[H] > > | 1    | 2    | 3    | 4    | > > |------+------+------+------| > > | test | test | test | test | > > | test | test | test | test | > > > > It gets exported to this: > > > > \begin{table}[htb] > > \caption{test table} > > \begin{center} > > \begin{tabular}{llll} > > > > Did something change between 6.35 and 7.01 or in the LaTeX table options? > > > > I think that placement works fine for figures, but not for tables. In > fact, I cannot find the code that's supposed to do this for tables: I > suspect that it never existed. So unless I'm mistaken, it seems that > tables never got the placement treatment that figures did. > Try the following patch (might be wrong in detail, and its scope might be too limited, but I hope it's not too far off: at least it seems to work on your simple table.) It may also be white-space damaged, so some reformatting may be needed after applying it. Nick >From 4c8cdde9f3d80edc882efe83562a934fd9a6a8c8 Mon Sep 17 00:00:00 2001 From: Nick Dokos <nicholas.dokos@hp.com> Date: Fri, 23 Jul 2010 17:54:06 -0400 Subject: [PATCH] Process latex placement attribute for tables. Figures got placement attributes previously, but tables never did.
2010-07-23 23:16:44 -04:00
(stringp attr)
(string-match "[ \t]*\\<placement=\\(\\S-+\\)" attr))
(match-string 1 attr)
org-latex: `org-latex-default-figure-position' for default figure position * lisp/org-latex.el (org-latex-default-figure-position): New defcustom for default placement of latex figures. (org-export-latex-tables): Positioning tables using the new defcustom variable. (org-export-latex-format-image): Positioning images using the new defcustom variable.
2011-01-28 10:59:47 -05:00
(concat
"[" org-latex-default-figure-position "]")))
Fix caption processing in LaTeX export
2010-04-07 10:10:28 -04:00
(setq caption (and caption (org-export-latex-fontify-headline caption)))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(setq lines (org-split-string raw-table "\n"))
(apply 'delete-region (list beg end))
(when org-export-table-remove-special-lines
(setq lines (org-table-clean-before-export lines 'maybe-quoted)))
(when org-table-clean-did-remove-column
LaTeX export: Fix bug with longtable export. Karl Stump writes: > When exporting a table with a horizontal line the column count is wrong. > > Output from pdflatex run: > > ! Extra alignment tab has been changed to \cr. > <template> \endtemplate > > l.32 ....\multicolumn{4}{r}{Continued on next page} > \ > ? > > Here's the table in the tex file: > > \begin{longtable}{||lll||} > \caption{This is a long table with lines around and between cells}\\ > Heading1 & Heading2 & Heading3 \\ > \hline > \endhead > \hline\multicolumn{4}{r}{Continued on next page}\ > \endfoot > \endlastfoot > \hline > alpha & beta & gamma \\ > & & \\ > \end{longtable} > > Here's the org file: > > ** table export test > > #+CAPTION: This is a long table with lines around and between cells > #+LATEX_HEADER: \usepackage[landscape]{geometry} > #+LATEX_HEADER: \geometry{left=0.12in,right=0.12in,top=0.25in,bottom=0.25in} > #+ATTR_LaTeX: longtable align=||lll|| > > | / | <30> | <10> | <10> | > | | Heading1 | Heading2 | Heading3 | > |---+----------+----------+----------| > | | alpha | beta | gamma | > | | | | | Nick Dokos replies: > I believe it's because of the dummy "calculation-mark" column, > which is not exported. However, the variable org-table-last-alignment > (a list, whose length becomes the value of the \multicolumn argument) > ends up having the value (nil nil nil nil), i.e. it counts the dummy > column as well. What the proper place to adjust the value is, I don't > know, but it should be easy for Carsten to fix it. For the time being, > you can either get rid of the dummy row and column (e.g. if you don't > need the widths) or fix it by hand in the LaTeX file. Indeed, and this commit pops `org-table-last-alignment' if the first column has been removed by `org-table-clean-before-export'. The same problem must have caused a one-off error when setting the alignment in LaTeX tables, bu it seems nobody has noticed this so far. Anyway, also this is fixed now.
2009-08-29 01:22:33 -04:00
(pop org-table-last-alignment)
(pop org-table-last-column-widths))
Fix spelling and grammar
2009-11-12 07:39:29 -05:00
;; make a formatting string to reflect alignment
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(setq olines lines)
(while (and (not line-fmt) (setq line (pop olines)))
(unless (string-match "^[ \t]*|-" line)
(setq fields (org-split-string line "[ \t]*|[ \t]*"))
(setq fnum (make-vector (length fields) 0))
(setq line-fmt
(mapconcat
(lambda (x)
(setq gr (pop org-table-colgroup-info))
(format "%s%%s%s"
(cond ((eq gr :start)
(prog1 (if colgropen "|" "|")
(setq colgropen t)))
((eq gr :startend)
(prog1 (if colgropen "|" "|")
(setq colgropen nil)))
(t ""))
(if (memq gr '(:end :startend))
(progn (setq colgropen nil) "|")
"")))
fnum ""))))
;; fix double || in line-fmt
(setq line-fmt (replace-regexp-in-string "||" "|" line-fmt))
;; maybe remove the first and last "|"
(when (and (not org-export-latex-tables-column-borders)
(string-match "^\\(|\\)?\\(.+\\)|$" line-fmt))
(setq line-fmt (match-string 2 line-fmt)))
;; format alignment
(unless align
(setq align (apply 'format
(cons line-fmt
(mapcar (lambda (x) (if x "r" "l"))
org-table-last-alignment)))))
;; prepare the table to send to orgtbl-to-latex
(setq lines
(mapcar
(lambda(elem)
(or (and (string-match "[ \t]*|-+" elem) 'hline)
org-latex.el: Delete trailing whitespaces.
2011-07-12 02:31:07 -04:00
(org-split-string
org-latex.el: bugfix about exporting narrowed tables. * org-latex.el (org-export-latex-tables): Bugfix: remove properties from fields. Thanks to Frederik for reporting this.
2011-07-09 18:28:33 -04:00
(progn (set-text-properties 0 (length elem) nil elem)
(org-trim elem)) "|")))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
lines))
(when insert
(insert (org-export-latex-protect-string
(concat
(if longtblp
(concat "\\begin{longtable}{" align "}\n")
allow specification of table*, tabularx and tabulary table environments e.g. #+CAPTION: A wide table with tabulary #+LABEL: tbl:wide #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | #+CAPTION: A normal table with tabularx #+LABEL: tbl:wide #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | Thanks to Tom Dye for suggestions and LaTeX background knowledge. * lisp/org-latex.el (org-export-latex-tables): Allowing specification of tabular[xy] inner environments through the ATTR_LaTeX line.
2010-12-17 15:31:09 -05:00
(if floatp
(format "\\begin{%s}%s\n" tblenv placement)))
Make it possible to place table captions below the table * lisp/org-latex.el (org-export-latex-tables): Honor `org-export-latex-table-caption-above' (org-export-latex-table-caption-above): New option. Patch by Thomas Dye.
2011-10-10 15:05:03 -04:00
(if (and floatp org-export-latex-table-caption-above)
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(format
bug in org-mode-export-as-latex Hello, >>>>> Neil Hepburn writes: > The latest version (7.01g) seems to have a bug when exporting to PDF > (and LaTeX) with tables with labels. The export does not label the > table in the LaTeX file although it is labeled in the .org file. Curiously, it looks like \label code was removed at some time. This quick fix should put labels back. Regards, -- Nicolas >From 64855c52b20766db9898ce82316fac11d51de72d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou <n.goaziou@gmail.com> Date: Wed, 28 Jul 2010 20:54:40 +0200 Subject: [PATCH] Add labels to tables. * org-latex.el (org-export-latex-tables): add label if any * org-latex.el (org-export-latex-convert-table.el-table): fix little mistake when inserting label
2010-07-28 19:59:42 -04:00
"\\caption%s{%s} %s"
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
(if shortn (concat "[" shortn "]") "")
bug in org-mode-export-as-latex Hello, >>>>> Neil Hepburn writes: > The latest version (7.01g) seems to have a bug when exporting to PDF > (and LaTeX) with tables with labels. The export does not label the > table in the LaTeX file although it is labeled in the .org file. Curiously, it looks like \label code was removed at some time. This quick fix should put labels back. Regards, -- Nicolas >From 64855c52b20766db9898ce82316fac11d51de72d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou <n.goaziou@gmail.com> Date: Wed, 28 Jul 2010 20:54:40 +0200 Subject: [PATCH] Add labels to tables. * org-latex.el (org-export-latex-tables): add label if any * org-latex.el (org-export-latex-convert-table.el-table): fix little mistake when inserting label
2010-07-28 19:59:42 -04:00
(or caption "")
Table caption produces trailing "nil" in pdf export Hello, >>>>> John Hendy writes: > Suddenly I'm getting a line with nothing but "nil" between the caption and > the table when exporting from org-mode to LaTeX. I swear this not happening. > I believe I did a git pull on Friday or some time last week. The only reason > I noticed is that I just set up emacs, org, and LaTeX on a new computer and > tested an old file to make sure the export was working. I then checked my > other computer with what I thought was a fine install and it's doing it now, > too. I originally thought I missed something on the new computer, but now > I'm wondering if it's from the fresh pull. This patch (needed by my own mistake) should correct the problem. Regards, -- Nicolas >From 38a3ae8cf8716af0db87a47a421b6d5af654d045 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou <n.goaziou@gmail.com> Date: Tue, 10 Aug 2010 22:43:35 +0200 Subject: [PATCH] Fix empty label bug * org-latex.el (org-export-latex-tables): Return "" instead of nil when no label is attached.
2010-08-10 21:48:52 -04:00
(if label (format "\\label{%s}" label) "")))
Don't add spurious preceding newline if caption is not above a longtable * lisp/org-latex.el (org-export-latex-tables): Don't add spurious preceding newline if caption is not above a longtable.
2012-02-26 12:09:23 -05:00
(if (and longtblp caption org-export-latex-table-caption-above)
"\\\\\n" "\n")
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(if (and org-export-latex-tables-centered (not longtblp))
"\\begin{center}\n")
LaTeX export: Allow to customize the tabular environment * lisp/org-latex.el (org-export-latex-tabular-environment): New option. (org-export-latex-tables): Use `org-export-latex-tabular-environment'.
2010-07-06 04:39:35 -04:00
(if (not longtblp)
allow specification of table*, tabularx and tabulary table environments e.g. #+CAPTION: A wide table with tabulary #+LABEL: tbl:wide #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | #+CAPTION: A normal table with tabularx #+LABEL: tbl:wide #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | Thanks to Tom Dye for suggestions and LaTeX background knowledge. * lisp/org-latex.el (org-export-latex-tables): Allowing specification of tabular[xy] inner environments through the ATTR_LaTeX line.
2010-12-17 15:31:09 -05:00
(format "\\begin{%s}%s{%s}\n"
tabular-env
(if width (format "{%s}" width) "")
align))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(orgtbl-to-latex
lines
org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend * org-table.el (orgtbl-to-generic): Add check for :skipheadrule. When present, the :hline following the head will be skipped. This is necessary to avoid doubling of horizontal rules in LaTeX longtable environments and consequent width problems. * org-latex.el (org-export-latex-tables-tstart) (org-export-latex-tables-hline) (org-export-latex-tables-tend): New options. (org-export-latex-tables): Use the new options.
2011-10-28 18:09:46 -04:00
`(:tstart ,org-export-latex-tables-tstart
:tend ,org-export-latex-tables-tend
:hline ,org-export-latex-tables-hline
:skipheadrule ,longtblp
org-latex.el: Support setting the :hfmt parameter from #+ATTR_LaTeX. * org-latex.el (org-export-latex-tables): Support setting the :hfmt parameter from #+ATTR_LaTeX. TINYCHANGE
2012-04-23 07:38:48 -04:00
:hfmt ,hfmt
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
:hlend ,(if longtblp
(format "\\\\
org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend * org-table.el (orgtbl-to-generic): Add check for :skipheadrule. When present, the :hline following the head will be skipped. This is necessary to avoid doubling of horizontal rules in LaTeX longtable environments and consequent width problems. * org-latex.el (org-export-latex-tables-tstart) (org-export-latex-tables-hline) (org-export-latex-tables-tend): New options. (org-export-latex-tables): Use the new options.
2011-10-28 18:09:46 -04:00
%s
Implement longtable support for LaTeX export. Exporting tables to LaTeX suffered from the problem that Org tables are often long, but that the tabular environment in LaTeX cannot handle long tables. This patch fixes this issue. LaTeX export can now deal with very long tables, by setting an option in the "ATTR_LaTeX:" line. Also, you can specify the alignment by hand. Here is an example: Also, table export now correctly deals with tables that start with a hline. In such a case, also the LaTeX version will have this extra hline before the first line.
2008-12-15 15:28:02 -05:00
\\endhead
org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend * org-table.el (orgtbl-to-generic): Add check for :skipheadrule. When present, the :hline following the head will be skipped. This is necessary to avoid doubling of horizontal rules in LaTeX longtable environments and consequent width problems. * org-latex.el (org-export-latex-tables-tstart) (org-export-latex-tables-hline) (org-export-latex-tables-tend): New options. (org-export-latex-tables): Use the new options.
2011-10-28 18:09:46 -04:00
%s\\multicolumn{%d}{r}{Continued on next page}\\
Implement longtable support for LaTeX export. Exporting tables to LaTeX suffered from the problem that Org tables are often long, but that the tabular environment in LaTeX cannot handle long tables. This patch fixes this issue. LaTeX export can now deal with very long tables, by setting an option in the "ATTR_LaTeX:" line. Also, you can specify the alignment by hand. Here is an example: Also, table export now correctly deals with tables that start with a hline. In such a case, also the LaTeX version will have this extra hline before the first line.
2008-12-15 15:28:02 -05:00
\\endfoot
org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend * org-table.el (orgtbl-to-generic): Add check for :skipheadrule. When present, the :hline following the head will be skipped. This is necessary to avoid doubling of horizontal rules in LaTeX longtable environments and consequent width problems. * org-latex.el (org-export-latex-tables-tstart) (org-export-latex-tables-hline) (org-export-latex-tables-tend): New options. (org-export-latex-tables): Use the new options.
2011-10-28 18:09:46 -04:00
\\endlastfoot"
org-export-latex-tables-hline
org-export-latex-tables-hline
(length org-table-last-alignment))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
nil)))
allow specification of table*, tabularx and tabulary table environments e.g. #+CAPTION: A wide table with tabulary #+LABEL: tbl:wide #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | #+CAPTION: A normal table with tabularx #+LABEL: tbl:wide #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | Thanks to Tom Dye for suggestions and LaTeX background knowledge. * lisp/org-latex.el (org-export-latex-tables): Allowing specification of tabular[xy] inner environments through the ATTR_LaTeX line.
2010-12-17 15:31:09 -05:00
(if (not longtblp) (format "\n\\end{%s}" tabular-env))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(if longtblp "\n" (if org-export-latex-tables-centered
"\n\\end{center}\n" "\n"))
Make it possible to place table captions below the table * lisp/org-latex.el (org-export-latex-tables): Honor `org-export-latex-table-caption-above' (org-export-latex-table-caption-above): New option. Patch by Thomas Dye.
2011-10-10 15:05:03 -04:00
(if (and floatp (not org-export-latex-table-caption-above))
(format
"\\caption%s{%s} %s"
(if shortn (concat "[" shortn "]") "")
(or caption "")
(if label (format "\\label{%s}" label) "")))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
(if longtblp
"\\end{longtable}"
allow specification of table*, tabularx and tabulary table environments e.g. #+CAPTION: A wide table with tabulary #+LABEL: tbl:wide #+ATTR_LaTeX: table* tabulary width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | #+CAPTION: A normal table with tabularx #+LABEL: tbl:wide #+ATTR_LaTeX: table tabularx width=\textwidth align=l|lp{3cm}r|l | 1 | 2 | 3 | | 4 | 5 | 6 | Thanks to Tom Dye for suggestions and LaTeX background knowledge. * lisp/org-latex.el (org-export-latex-tables): Allowing specification of tabular[xy] inner environments through the ATTR_LaTeX line.
2010-12-17 15:31:09 -05:00
(if floatp (format "\\end{%s}" tblenv)))))
LaTeX export: Don't format tables in protected regions
2009-10-07 02:10:05 -04:00
"\n\n"))))))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
(defun org-export-latex-convert-table.el-table ()
"Replace table.el table at point with LaTeX code."
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
(let (tbl caption shortn label line floatp attr align rmlines)
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
(setq line (buffer-substring (point-at-bol) (point-at-eol))
label (org-get-text-property-any 0 'org-label line)
caption (org-get-text-property-any 0 'org-caption line)
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
shortn (org-get-text-property-any 0 'org-caption-shortn line)
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
attr (org-get-text-property-any 0 'org-attributes line)
align (and attr (stringp attr)
(string-match "\\<align=\\([^ \t\n\r,]+\\)" attr)
(match-string 1 attr))
rmlines (and attr (stringp attr)
(string-match "\\<rmlines\\>" attr))
floatp (or label caption))
(and (get-buffer "*org-export-table*")
(kill-buffer (get-buffer "*org-export-table*")))
(table-generate-source 'latex "*org-export-table*" "caption")
(setq tbl (with-current-buffer "*org-export-table*"
(buffer-string)))
(while (string-match "^%.*\n" tbl)
(setq tbl (replace-match "" t t tbl)))
;; fix the hlines
(when rmlines
(let ((n 0) lines)
(setq lines (mapcar (lambda (x)
(if (string-match "^\\\\hline$" x)
(progn
(setq n (1+ n))
(if (= n 2) x nil))
x))
(org-split-string tbl "\n")))
(setq tbl (mapconcat 'identity (delq nil lines) "\n"))))
(when (and align (string-match "\\\\begin{tabular}{.*}" tbl))
(setq tbl (replace-match (concat "\\begin{tabular}{" align "}")
Fix whitespace and compiler wanings
2010-04-01 07:11:54 -04:00
t t tbl)))
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
(and (get-buffer "*org-export-table*")
(kill-buffer (get-buffer "*org-export-table*")))
(beginning-of-line 0)
(while (looking-at "[ \t]*\\(|\\|\\+-\\)")
(delete-region (point) (1+ (point-at-eol))))
(when org-export-latex-tables-centered
(setq tbl (concat "\\begin{center}\n" tbl "\\end{center}")))
(when floatp
(setq tbl (concat "\\begin{table}\n"
Make it possible to place table captions below the table * lisp/org-latex.el (org-export-latex-tables): Honor `org-export-latex-table-caption-above' (org-export-latex-table-caption-above): New option. Patch by Thomas Dye.
2011-10-10 15:05:03 -04:00
(if (not org-export-latex-table-caption-above) tbl)
org-latex: Fix export of table.el tables with captions * lisp/org-latex.el (org-export-latex-convert-table.el-table): Fix format-string for insertion of captions. This fixes a bug introduced in caa5da1 since when the caption itself is not placed inside the caption command.
2011-04-06 10:18:58 -04:00
(format "\\caption%s{%s%s}\n"
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
(if shortn (format "[%s]" shortn) "")
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
(if label (format "\\label{%s}" label) "")
(or caption ""))
Make it possible to place table captions below the table * lisp/org-latex.el (org-export-latex-tables): Honor `org-export-latex-table-caption-above' (org-export-latex-table-caption-above): New option. Patch by Thomas Dye.
2011-10-10 15:05:03 -04:00
(if org-export-latex-table-caption-above tbl)
Re-install the support for table.el tables again. This support was totally broken. It works now again. Unfortunately it is not possible to edit the table directly in the org-mode buffer anymore - to edit such a table, you have to use C-c '
2010-02-26 04:08:27 -05:00
"\n\\end{table}\n")))
(insert (org-export-latex-protect-string tbl))))
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-fontify ()
"Convert fontification to LaTeX."
(goto-char (point-min))
(while (re-search-forward org-emph-re nil t)
Fix emphasis bug at the end of a line
2009-11-18 05:33:39 -05:00
;; The match goes one char after the *string*, except at the end of a line
Release 5.14
2008-01-31 05:37:51 -05:00
(let ((emph (assoc (match-string 3)
org-export-latex-emphasis-alist))
Bugfix: Avoid emphasis processing across lines and fields in tables. Emphasis processing could cause problems in tables, with spurious matches for the emphasis regexp across field boundaries and even lines. Fixed now.
2009-01-09 03:53:17 -05:00
(beg (match-beginning 0))
(end (match-end 0))
LaTeX export: Fix problem with subscripts in emphasis Eric Fraga sent this test file: > * Problem with underscore (subscript) in emphasised text. > 1. Design for CO_2 capture. > 2. The paper /Design for CO_2 capture/ is very interesting. > 3. This item is combined with the previous and the previous is > actually formatted wrongly. > 4. This item seems to come out just fine.
2009-11-09 14:51:28 -05:00
rpl s)
LaTeX Export: Better error message for emphasis alist conflicts
2009-02-22 14:51:19 -05:00
(unless emph
(message "`org-export-latex-emphasis-alist' has no entry for formatting triggered by \"%s\""
(match-string 3)))
Allow footnote markers like [1] to occur in verbatim emphasis
2009-10-28 19:17:32 -04:00
(unless (or (and (get-text-property (- (point) 2) 'org-protected)
(not (get-text-property
(- (point) 2) 'org-verbatim-emph)))
Minor fixes * lisp/org-latex.el (org-export-latex-fontify): Avoid fontifying several stars in a row. * lisp/org.el (org-emphasis-alist): Mention `org-export-docbook-emphasis-alist' in the docstring.
2010-06-01 03:43:03 -04:00
(equal (char-after (match-beginning 3))
(char-after (1+ (match-beginning 3))))
Bugfix: Avoid emphasis processing across lines and fields in tables. Emphasis processing could cause problems in tables, with spurious matches for the emphasis regexp across field boundaries and even lines. Fixed now.
2009-01-09 03:53:17 -05:00
(save-excursion
(goto-char (match-beginning 1))
(save-match-data
(and (org-at-table-p)
(string-match
LaTeX export: Do not mistake table.el borders for strike-through emphasis.
2010-03-24 13:27:33 -04:00
"[|\n]" (buffer-substring beg end)))))
(and (equal (match-string 3) "+")
(save-match-data
(string-match "\\`-+\\'" (match-string 4)))))
LaTeX export: Fix problem with subscripts in emphasis Eric Fraga sent this test file: > * Problem with underscore (subscript) in emphasised text. > 1. Design for CO_2 capture. > 2. The paper /Design for CO_2 capture/ is very interesting. > 3. This item is combined with the previous and the previous is > actually formatted wrongly. > 4. This item seems to come out just fine.
2009-11-09 14:51:28 -05:00
(setq s (match-string 4))
Release 5.10a
2008-01-31 05:36:18 -05:00
(setq rpl (concat (match-string 1)
LaTeX export: Automatically choose \verb delimiter
2009-03-14 03:36:48 -04:00
(org-export-latex-emph-format (cadr emph)
(match-string 4))
Release 5.10a
2008-01-31 05:36:18 -05:00
(match-string 5)))
Release 5.14
2008-01-31 05:37:51 -05:00
(if (caddr emph)
LaTeX export: Fix problem with subscripts in emphasis Eric Fraga sent this test file: > * Problem with underscore (subscript) in emphasised text. > 1. Design for CO_2 capture. > 2. The paper /Design for CO_2 capture/ is very interesting. > 3. This item is combined with the previous and the previous is > actually formatted wrongly. > 4. This item seems to come out just fine.
2009-11-09 14:51:28 -05:00
(setq rpl (org-export-latex-protect-string rpl))
(save-match-data
Fix broken regexp. Julien Barnier writes: > I recntly noticed that in some specific cases, the final '}' was > esacped when exproting an emphasis element to LaTeX. > > For example, the following element : > > /aa/ > > Is exported to : > > \emph{aa\} > > This does not append if the string begins with a space or if it > is ASCII-only. For example, the followig strings are exported > correctly : > > /aaa/ > // > > I don't understand why the problem only occurs with non-ASCII chars, > but I think that the regexp to protect added special chars in the > org-export-latex-fontify function is missing a '?' in the > beginning. Tha attached patch corrects it.
2009-12-09 16:34:18 -05:00
(if (string-match "\\`.?\\(\\\\[a-z]+{\\)\\(.*\\)\\(}\\).?\\'" rpl)
LaTeX export: Fix problem with subscripts in emphasis Eric Fraga sent this test file: > * Problem with underscore (subscript) in emphasised text. > 1. Design for CO_2 capture. > 2. The paper /Design for CO_2 capture/ is very interesting. > 3. This item is combined with the previous and the previous is > actually formatted wrongly. > 4. This item seems to come out just fine.
2009-11-09 14:51:28 -05:00
(progn
(add-text-properties (match-beginning 1) (match-end 1)
'(org-protected t) rpl)
(add-text-properties (match-beginning 3) (match-end 3)
'(org-protected t) rpl)))))
Release 5.10a
2008-01-31 05:36:18 -05:00
(replace-match rpl t t)))
(backward-char)))
Release 5.06d
2008-01-31 05:35:58 -05:00
LaTeX export: Automatically choose \verb delimiter
2009-03-14 03:36:48 -04:00
(defun org-export-latex-emph-format (format string)
"Format an emphasis string and handle the \\verb special case."
* org-latex.el (org-export-latex-emphasis-alist): use \protectedtexttt for the =...= emphasis and \verb for the ~...~ emphasis. (org-export-latex-use-verb): now defaults to t. (org-export-latex-emph-format): distinguish between =...= and ~...~ emphasis. --- This patch was submitted by Carsten as a variation on Thomas Dye's original patch.
2011-02-01 05:21:34 -05:00
(when (member format '("\\verb" "\\protectedtexttt"))
LaTeX export: Automatically choose \verb delimiter
2009-03-14 03:36:48 -04:00
(save-match-data
Remove org-export-latex-use-verb. * org-latex.el (org-export-latex-emph-format): Don't use `org-export-latex-use-verb'. Remove this variable. This variable was introduced by Carsten for testing purpose, it was not meant to be a user variable.
2011-02-01 12:03:57 -05:00
(if (equal format "\\verb")
LaTeX export: Fix problems with use of \verb in headlines See http://article.gmane.org/gmane.emacs.orgmode/14257
2009-06-09 00:26:59 -04:00
(let ((ll "~,./?;':\"|!@#%^&-_=+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>()[]{}"))
(catch 'exit
(loop for i from 0 to (1- (length ll)) do
(if (not (string-match (regexp-quote (substring ll i (1+ i)))
string))
(progn
(setq format (concat "\\verb" (substring ll i (1+ i))
"%s" (substring ll i (1+ i))))
(throw 'exit nil))))))
(let ((start 0)
Fix backslash and other special characters in verbatim snippets Jeff Kowalczyk writes: > Is there a way to escape backslashes (\) in code and verbatim that > will export to LaTeX correctly? > > When writing =\\host\share= or =C:\path\to=, pdftolatex output is > incorrect.
2009-09-24 05:02:00 -04:00
(trans '(("\\" . "\\textbackslash{}")
("~" . "\\textasciitilde{}")
("^" . "\\textasciicircum{}")))
Keep byte compiler happy
2009-06-11 16:18:47 -04:00
(rtn "") char)
Minor fixes
2009-06-09 06:10:27 -04:00
(while (string-match "[\\{}$%&_#~^]" string)
LaTeX export: Fix problems with use of \verb in headlines See http://article.gmane.org/gmane.emacs.orgmode/14257
2009-06-09 00:26:59 -04:00
(setq char (match-string 0 string))
(if (> (match-beginning 0) 0)
(setq rtn (concat rtn (substring string
0 (match-beginning 0)))))
(setq string (substring string (1+ (match-beginning 0))))
(setq char (or (cdr (assoc char trans)) (concat "\\" char))
rtn (concat rtn char)))
* org-latex.el (org-export-latex-emphasis-alist): use \protectedtexttt for the =...= emphasis and \verb for the ~...~ emphasis. (org-export-latex-use-verb): now defaults to t. (org-export-latex-emph-format): distinguish between =...= and ~...~ emphasis. --- This patch was submitted by Carsten as a variation on Thomas Dye's original patch.
2011-02-01 05:21:34 -05:00
(setq string (concat rtn string) format "\\texttt{%s}")
(while (string-match "--" string)
(setq string (replace-match "-{}-" t t string)))))))
LaTeX export: Fix problem with subscripts in emphasis Eric Fraga sent this test file: > * Problem with underscore (subscript) in emphasised text. > 1. Design for CO_2 capture. > 2. The paper /Design for CO_2 capture/ is very interesting. > 3. This item is combined with the previous and the previous is > actually formatted wrongly. > 4. This item seems to come out just fine.
2009-11-09 14:51:28 -05:00
(format format string))
LaTeX export: Automatically choose \verb delimiter
2009-03-14 03:36:48 -04:00
Release 5.06d
2008-01-31 05:35:58 -05:00
(defun org-export-latex-links ()
;; Make sure to use the LaTeX hyperref and graphicx package
;; or send some warnings.
"Convert links to LaTeX."
(goto-char (point-min))
Coderefs: Insert links in export backends This patch covers the three main backends, html, latex, and ascii. It adds the code to make sure the coderef links identified by the preprocessing will be implemented correctly when a backend does its work.
2008-12-26 11:37:53 -05:00
(while (re-search-forward org-bracket-link-analytic-regexp++ nil t)
LaTeX export: Fix protection bug Sebastian Rose writes: > The following code does not work as expected, when exported to PDF: > > => --->8----------------------------->8----------------------------->8--- > * Image basics > > Images are inserted into an Org file in a fashion similar to links: > : [[file:///home/sebastian/develop/org/org-mode-unicorn.png]] > > <= ---8<-----------------------------8<-----------------------------8<--- > > Result: > > The last line is exported as: > > \href{file:///home/sebastian/develop/org/org-mode-unicorn.png}{nil} > > > Expected result: > > I expect the last line to be exported as fixed width text. >
2009-11-10 02:48:40 -05:00
(org-if-unprotected-1
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (match-beginning 0))
Release 5.14
2008-01-31 05:37:51 -05:00
(let* ((re-radio org-export-latex-all-targets-re)
Release 5.06d
2008-01-31 05:35:58 -05:00
(remove (list (match-beginning 0) (match-end 0)))
Make sure LaTeX export works in the presence of link attributes.
2008-07-17 18:07:14 -04:00
(raw-path (org-extract-attributes (match-string 3)))
Release 5.06d
2008-01-31 05:35:58 -05:00
(full-raw-path (concat (match-string 1) raw-path))
(desc (match-string 5))
Captions and attributes for images and tables during export Tables, and Hyperlinks that represent inlined images, can now be equipped with additional information that will be used during export. The information will be taken from the following special lines in the buffer and apply to the first following table or link. - #+CAPTION: :: The caption of the image or table. This string should be processed according to the export backend, but this is not yet done. - #+LABEL: :: A label to identify the figure/table for cross references. For HTML export, this string will become the ID for the `<div class="figure">' element that encapsulates the image tag and the caption. For LaTeX export, this string will be used as the argument of a `\label{...}' macro. These lables will be available for internal links like `[[label][Table] ]'. - #+ATTR_HTML: :: Attributes for HTML export of image, to be added as attributes into the `<img...>' tag. This string will not be processed, so it should have immediately the right format. - #+ATTR_LaTeX: :: Attributes for LaTeX export of images, to be inserted into the optional argument of the `\includegraphics[...]{file}' command, to specify scaling, clipping and other options. This string will not be processed, so it should have immediately the right format, like `width=5cm,angle=90' For LaTeX export, if either a caption or a label is given, the element will be exported as a float, i.e. wrapped into a figure or table environment.
2008-12-10 06:50:07 -05:00
(type (or (match-string 2)
(if (or (file-name-absolute-p raw-path)
(string-match "^\\.\\.?/" raw-path))
"file")))
Coderefs: Insert links in export backends This patch covers the three main backends, html, latex, and ascii. It adds the code to make sure the coderef links identified by the preprocessing will be implemented correctly when a backend does its work.
2008-12-26 11:37:53 -05:00
(coderefp (equal type "coderef"))
Captions and attributes for images and tables during export Tables, and Hyperlinks that represent inlined images, can now be equipped with additional information that will be used during export. The information will be taken from the following special lines in the buffer and apply to the first following table or link. - #+CAPTION: :: The caption of the image or table. This string should be processed according to the export backend, but this is not yet done. - #+LABEL: :: A label to identify the figure/table for cross references. For HTML export, this string will become the ID for the `<div class="figure">' element that encapsulates the image tag and the caption. For LaTeX export, this string will be used as the argument of a `\label{...}' macro. These lables will be available for internal links like `[[label][Table] ]'. - #+ATTR_HTML: :: Attributes for HTML export of image, to be added as attributes into the `<img...>' tag. This string will not be processed, so it should have immediately the right format. - #+ATTR_LaTeX: :: Attributes for LaTeX export of images, to be inserted into the optional argument of the `\includegraphics[...]{file}' command, to specify scaling, clipping and other options. This string will not be processed, so it should have immediately the right format, like `width=5cm,angle=90' For LaTeX export, if either a caption or a label is given, the element will be exported as a float, i.e. wrapped into a figure or table environment.
2008-12-10 06:50:07 -05:00
(caption (org-find-text-property-in-string 'org-caption raw-path))
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
(shortn (org-find-text-property-in-string 'org-caption-shortn raw-path))
Export: org-export-latex-image-default-option can be buffer-local Jason Riedy writes: > I'm trying to change org-export-latex-image-default-option > to "width=.7\\linewidth" in a file local variable. It's set > correctly as a buffer local variable, and it's having no > effect on the export. My guess is that the buffer-local > property is stopping it as soon as org-export-as-latex runs > set-buffer. > > I can smuggle the value in by adding an entry to org-export-plist-vars > referring to org-export-latex-image-default-option and pulling the value > from the plist, but that feels incorrect. It is actually the correct way to do this, and I have implemented this change.
2009-05-05 03:41:00 -04:00
(attr (or (org-find-text-property-in-string 'org-attributes raw-path)
(plist-get org-export-latex-options-plist :latex-image-options)))
Captions and attributes for images and tables during export Tables, and Hyperlinks that represent inlined images, can now be equipped with additional information that will be used during export. The information will be taken from the following special lines in the buffer and apply to the first following table or link. - #+CAPTION: :: The caption of the image or table. This string should be processed according to the export backend, but this is not yet done. - #+LABEL: :: A label to identify the figure/table for cross references. For HTML export, this string will become the ID for the `<div class="figure">' element that encapsulates the image tag and the caption. For LaTeX export, this string will be used as the argument of a `\label{...}' macro. These lables will be available for internal links like `[[label][Table] ]'. - #+ATTR_HTML: :: Attributes for HTML export of image, to be added as attributes into the `<img...>' tag. This string will not be processed, so it should have immediately the right format. - #+ATTR_LaTeX: :: Attributes for LaTeX export of images, to be inserted into the optional argument of the `\includegraphics[...]{file}' command, to specify scaling, clipping and other options. This string will not be processed, so it should have immediately the right format, like `width=5cm,angle=90' For LaTeX export, if either a caption or a label is given, the element will be exported as a float, i.e. wrapped into a figure or table environment.
2008-12-10 06:50:07 -05:00
(label (org-find-text-property-in-string 'org-label raw-path))
LaTeX export: Use special formatting by link type interface Patch by Christian Moe, who writes: > It looks like support for formatting custom link types in LaTeX export > is broken? > > I was trying to implement a custom link type with its own formatting > function for HTML and LaTeX export, following the steps in > org-bbdb.el. > > I've found that org-bbdb-export does not italicize bbdb links in > LaTeX, nor does my own org-cite-export turn my custom =cite:= links > into LaTeX =\cite{}= citations. Everything works fine in HTML export, > but in LaTeX all custom link types get formatted as =\texttt{descr}=. > > I see that org-export-as-html and org-export-as-docbook look up > org-link-protocols to get the function for formatting the link, but it > seems that org-export-as-latex doesn't. > >
2010-05-12 09:14:17 -04:00
imgp radiop fnc
Release 5.06d
2008-01-31 05:35:58 -05:00
;; define the path of the link
(path (cond
Coderefs: Insert links in export backends This patch covers the three main backends, html, latex, and ascii. It adds the code to make sure the coderef links identified by the preprocessing will be implemented correctly when a backend does its work.
2008-12-26 11:37:53 -05:00
((member type '("coderef"))
raw-path)
Release 5.06d
2008-01-31 05:35:58 -05:00
((member type '("http" "https" "ftp"))
(concat type ":" raw-path))
((and re-radio (string-match re-radio raw-path))
Whitespace
2008-12-16 11:58:02 -05:00
(setq radiop t))
Release 5.06d
2008-01-31 05:35:58 -05:00
((equal type "mailto")
(concat type ":" raw-path))
((equal type "file")
Export: Better detection of images that can be inlined. Two new variables, `org-export-html-inline-image-extensions' and `org-export-latex-inline-image-extensions' now define the file extensions that will be considered for inlining images. The default for HTML is png, jpg, jpeg, and gif files. The default for LaTeX is png, jpg, jpeg, and pdf, assuming processing with `pdflatex'. For LaTeX export, this can lead to conflicts for links that point to non-image PDF files. To avoid that such a link will be inlined by accident, always give a description text for such a link, one that is not equal to the path.
2009-01-18 03:11:24 -05:00
(if (and (org-file-image-p
(expand-file-name
raw-path)
org-export-latex-inline-image-extensions)
LaTeX export: Fix problem with image names containing underscore Reported by Arne Freyberger.
2009-06-23 00:15:01 -04:00
(or (get-text-property 0 'org-no-description
raw-path)
(equal desc full-raw-path)))
Release 5.06d
2008-01-31 05:35:58 -05:00
(setq imgp t)
(progn (when (string-match "\\(.+\\)::.+" raw-path)
(setq raw-path (match-string 1 raw-path)))
(if (file-exists-p raw-path)
(concat type "://" (expand-file-name raw-path))
(concat type "://" (org-export-directory
Release 5.14
2008-01-31 05:37:51 -05:00
:LaTeX org-export-latex-options-plist)
Release 5.06d
2008-01-31 05:35:58 -05:00
raw-path))))))))
;; process with link inserting
(apply 'delete-region remove)
Fix caption processing in LaTeX export
2010-04-07 10:10:28 -04:00
(setq caption (and caption (org-export-latex-fontify-headline caption)))
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(cond ((and imgp
(plist-get org-export-latex-options-plist :inline-images))
;; OK, we need to inline an image
Captions and attributes for images and tables during export Tables, and Hyperlinks that represent inlined images, can now be equipped with additional information that will be used during export. The information will be taken from the following special lines in the buffer and apply to the first following table or link. - #+CAPTION: :: The caption of the image or table. This string should be processed according to the export backend, but this is not yet done. - #+LABEL: :: A label to identify the figure/table for cross references. For HTML export, this string will become the ID for the `<div class="figure">' element that encapsulates the image tag and the caption. For LaTeX export, this string will be used as the argument of a `\label{...}' macro. These lables will be available for internal links like `[[label][Table] ]'. - #+ATTR_HTML: :: Attributes for HTML export of image, to be added as attributes into the `<img...>' tag. This string will not be processed, so it should have immediately the right format. - #+ATTR_LaTeX: :: Attributes for LaTeX export of images, to be inserted into the optional argument of the `\includegraphics[...]{file}' command, to specify scaling, clipping and other options. This string will not be processed, so it should have immediately the right format, like `width=5cm,angle=90' For LaTeX export, if either a caption or a label is given, the element will be exported as a float, i.e. wrapped into a figure or table environment.
2008-12-10 06:50:07 -05:00
(insert
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
(org-export-latex-format-image raw-path caption label attr shortn)))
Coderefs: Insert links in export backends This patch covers the three main backends, html, latex, and ascii. It adds the code to make sure the coderef links identified by the preprocessing will be implemented correctly when a backend does its work.
2008-12-26 11:37:53 -05:00
(coderefp
(insert (format
(org-export-get-coderef-format path desc)
(cdr (assoc path org-export-code-refs)))))
Internal links in LaTeX export Carsten Dominik <carsten.dominik@gmail.com> writes: > On Oct 29, 2010, at 5:22 AM, Jambunathan K wrote: > >> "Thomas S. Dye" <tsd@tsdye.com> writes: >> >>> Aloha Jambunathan K., >>> >>> Yes, thanks for that suggestion. It should work on your example, but >>> it breaks external links, like this: >>> >>> \hyperref[http://www.ctan.org/tex-archive/macros/latex/contrib/koma-script/ >>> ]{KOMA-script} >>> >>> External links require the \href{}{} command. It appears the LaTeX >>> export process no longer distinguishes internal and external links, >>> as >>> I believe it used to do. >>> >> >> This is the problematic commit: >> >> commit f5918bdcc05d7924dc204b57307023eb1ef011f0 >> parent df5894cdcb10819560f003c5b94b8f5f2b7d33cf >> Date: Sun Oct 17 08:29:51 2010 +0000 >> >> LaTeX export: use org-export-latex-hyperref-format > > I have just reverted this commit. > > - Carsten > Looks like time to change the variable name which is actually confusing. Since href and hyperref are two different things, I renamed the existing `org-export-latex-hyperref-format' variable as `org-export-latex-href-format' and introduced a new one `org-export-latex-hyperref-format'. * org-latex.el (org-export-latex-hyperref-format): New option. (org-export-latex-href-format): Renamed the existing variable `org-export-latex-hyperref-format' as `org-export-latex-href-format' (org-export-latex-links): Use `org-export-latex-hyperref-format' and `org-export-latex-href-format' Thanks and Regards Noorul >> >> * lisp/org-latex.el (org-export-latex-links) : Replaced hard coded >> hyperref format with custom >> variable `org-export-latex-hyperref-format' >> >> Note that href is not same as hyperref. >> >> Jambunthan K. >> >> >>> All the best, >>> Tom >>> >>> On Oct 28, 2010, at 3:30 PM, Jambunathan K wrote: >>> >>>> >>>> Thomas >>>> >>>> There was a hint at possible solution (or atleast a partial >>>> solution) in >>>> my original post. Did you try it before jumping in to rough waters >>>> or >>>> digging deeper? >>>> >>>> Do >>>> >>>> ,---- >>>> | M-x customize-variable RET org-export-latex-hyperref-format' >>>> `---- >>>> >>>> so that your .emacs has an entry like this >>>> >>>> ,---- [.emacs] >>>> | >>>> | (custom-set-variables >>>> | '(org-export-latex-hyperref-format "\\hyperref[%s]{%s}")) >>>> | >>>> `---- >>>> >>>> The above setting solves the problem for me with the following >>>> simple >>>> Org file. >>>> >>>> * Heading1 >>>> Make this section as large as possible so that it fills atleast a >>>> page. >>>> >>>> * Heading2 >>>> Links to [[Heading1]] >>>> >>>> Jambunathan K. >>>> >>>> "Thomas S. Dye" <tsd@tsdye.com> writes: >>>> >>>>> On Oct 28, 2010, at 12:35 PM, Nick Dokos wrote: >>>>> >>>>>> Thomas S. Dye <tsd@tsdye.com> wrote: >>>>>> >>>>>>> On Oct 28, 2010, at 11:01 AM, Jambunathan K wrote: >>>>>>> >>>>>>> >>>>>>> This is a regression. release-7.01h is good. HEAD is bad. I get >>>>>>> the >>>>>>> following line with release-7.01h.< >>>>>>> >>>>>>> Links to \hyperref[sec-1]{Heading1} >>>>>>> >>>>>>> Jambunathan K. >>>>>>> >>>>>>> Aloha Jambunathan K., >>>>>>> >>>>>>> Very many thanks for this information. I have Org-mode version >>>>>>> 7.01trans >>>>>>> (release_7.01h.880.g7531f). I take it the problem I'm having is >>>>>>> due to a relatively recent change >>>>>>> to Org-mode. If there is anything I can do to help isolate the >>>>>>> problem, please let me know. >>>>>>> >>>>>> >>>>>> Tom, >>>>>> >>>>>> If you have the time and the inclination, you might try bisecting >>>>>> your >>>>>> way through. Bisecting org-mode problems is actually a very good >>>>>> way >>>>>> to >>>>>> practice because the turnaround time is very small. >>>>>> >>>>>> Prerequisites: >>>>>> >>>>>> * you have a clone of the org-mode git repository. >>>>>> >>>>>> * you have an org test file. >>>>>> >>>>>> >>>>>> Steps: >>>>>> >>>>>> * [optional, but it makes me feel a little safer] create a test >>>>>> branch >>>>>> and switch to it: >>>>>> >>>>>> git checkout -b test-branch master >>>>>> >>>>>> * I clean out all the compiled files while doing a bisection: it's >>>>>> quicker >>>>>> than regenerating them every time and I don't have to worry (much) >>>>>> about >>>>>> emacs loading a wayward .elc file: >>>>>> >>>>>> make clean >>>>>> >>>>>> * start the bisection and tell git which commit is known good and >>>>>> which is known bad: >>>>>> >>>>>> git bisect start >>>>>> >>>>>> # current version is bad >>>>>> git bisect bad >>>>>> >>>>>> # release_7.01h was good - I got the name with ``git tag'' >>>>>> git bisect good release_7.01h >>>>>> >>>>>> That checks out a revision half-way in between the bad and good >>>>>> commits: since >>>>>> there are about 900 commits in between, you'll be at approx the >>>>>> 450- >>>>>> mark and it >>>>>> should take about 10 bisections to get it down to a single commit. >>>>>> >>>>>> * LOOP Now all you have to do is repeat the following steps: >>>>>> >>>>>> # since you did ``make clean'' you don't have to worry about .elc >>>>>> files >>>>>> # just reload all the .el files. >>>>>> M-x org-reload >>>>>> >>>>>> visit your org test file, export to LaTeX, check for \href/ >>>>>> \hyperref (or >>>>>> whatever other telltale sign shows badness/goodness). >>>>>> >>>>>> # tell git about it >>>>>> git bisect good *OR* git bisect bad >>>>>> >>>>>> This last step will check out another revision and in about 10 >>>>>> repetitions >>>>>> of the loop, you are done. >>>>>> >>>>>> * Tell git you are done, so it can clean up: >>>>>> >>>>>> git bisect reset >>>>>> >>>>>> Theoretically, you could do all of this in your master branch >>>>>> without >>>>>> creating a test-branch and this last step will reset everything to >>>>>> the >>>>>> way it was before ``git start''. >>>>>> >>>>>> * Post the offending commit to the list. >>>>>> >>>>>> * Get back to your master branch: >>>>>> >>>>>> git checkout master >>>>>> >>>>>> * If you created a test-branch, clean it out: >>>>>> >>>>>> git branch -d test-branch >>>>>> >>>>>> * [Optional] Recreate your .elc files and reload them: >>>>>> >>>>>> make >>>>>> M-x org-reload >>>>>> >>>>>> >>>>>> And that's it: a half-hour of fun and games. Unless of course, you >>>>>> hit upon a revision that is neither good nor bad (in the above >>>>>> restricted >>>>>> sense): you might get some other problem that prevents you from >>>>>> being >>>>>> able to answer. That might or might not be easy to resolve, so >>>>>> I'll >>>>>> leave that as an advanced topic (truth be told, I came up against >>>>>> this >>>>>> situation a couple of days ago and I didn't know how to proceed: >>>>>> so >>>>>> it's ignorance more than anything else that prevents me from >>>>>> saying >>>>>> anything more). >>>>>> >>>>>> If you want to try, I'd be happy to answer questions - I might try >>>>>> the >>>>>> bisection later on tonight myself in any case. And btw, this is of >>>>>> course archeology of a different (and much easier) kind, so I >>>>>> imagine >>>>>> you'll take to it like a fish in water :-) >>>>>> >>>>>> HTH, >>>>>> Nick >>>>> >>>>> Hi Nick, >>>>> >>>>> Irresistible hook at the end there. I wish this stuff were as easy >>>>> as >>>>> archaeology is for me. Your instructions are terrific, though. >>>>> >>>>> I did hit on a revision that was neither good nor bad: >>>>> >>>>> commit 8562273b272024a630a582b0e1b94c481d8abeec >>>>> Author: Eric Schulte <schulte.eric@gmail.com> >>>>> Date: Sat Oct 16 13:21:47 2010 -0600 >>>>> >>>>> ob-ref: don't forget arguments to referenced code blocks >>>>> >>>>> * lisp/ob-ref.el (org-babel-ref-resolve): bringing the referent >>>>> arguments back to their params before evaluation >>>>> >>>>> This one puts these lines in *Messages* when I export to LaTeX >>>>> >>>>> executing Org code block... >>>>> if: Symbol's value as variable is void: result-type >>>>> >>>>> I tried using different commits for the initial git bisect good, >>>>> hoping that would skip by the problem, but this one appears to have >>>>> stuck around a while. My other two tries both ended with this same >>>>> error, but with different commits. >>>>> >>>>> I'm not sure what to do next. This problem isn't yielding to my >>>>> archaeo-logic. :) >>>>> >>>>> All the best, >>>>> Tom >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode
2010-10-29 06:01:12 -04:00
(radiop (insert (format org-export-latex-hyperref-format
intermediate
2008-10-10 02:46:05 -04:00
(org-solidify-link-text raw-path) desc)))
Fix problems with internal links for LateX export.
2008-10-10 05:42:01 -04:00
((not type)
Internal links in LaTeX export Carsten Dominik <carsten.dominik@gmail.com> writes: > On Oct 29, 2010, at 5:22 AM, Jambunathan K wrote: > >> "Thomas S. Dye" <tsd@tsdye.com> writes: >> >>> Aloha Jambunathan K., >>> >>> Yes, thanks for that suggestion. It should work on your example, but >>> it breaks external links, like this: >>> >>> \hyperref[http://www.ctan.org/tex-archive/macros/latex/contrib/koma-script/ >>> ]{KOMA-script} >>> >>> External links require the \href{}{} command. It appears the LaTeX >>> export process no longer distinguishes internal and external links, >>> as >>> I believe it used to do. >>> >> >> This is the problematic commit: >> >> commit f5918bdcc05d7924dc204b57307023eb1ef011f0 >> parent df5894cdcb10819560f003c5b94b8f5f2b7d33cf >> Date: Sun Oct 17 08:29:51 2010 +0000 >> >> LaTeX export: use org-export-latex-hyperref-format > > I have just reverted this commit. > > - Carsten > Looks like time to change the variable name which is actually confusing. Since href and hyperref are two different things, I renamed the existing `org-export-latex-hyperref-format' variable as `org-export-latex-href-format' and introduced a new one `org-export-latex-hyperref-format'. * org-latex.el (org-export-latex-hyperref-format): New option. (org-export-latex-href-format): Renamed the existing variable `org-export-latex-hyperref-format' as `org-export-latex-href-format' (org-export-latex-links): Use `org-export-latex-hyperref-format' and `org-export-latex-href-format' Thanks and Regards Noorul >> >> * lisp/org-latex.el (org-export-latex-links) : Replaced hard coded >> hyperref format with custom >> variable `org-export-latex-hyperref-format' >> >> Note that href is not same as hyperref. >> >> Jambunthan K. >> >> >>> All the best, >>> Tom >>> >>> On Oct 28, 2010, at 3:30 PM, Jambunathan K wrote: >>> >>>> >>>> Thomas >>>> >>>> There was a hint at possible solution (or atleast a partial >>>> solution) in >>>> my original post. Did you try it before jumping in to rough waters >>>> or >>>> digging deeper? >>>> >>>> Do >>>> >>>> ,---- >>>> | M-x customize-variable RET org-export-latex-hyperref-format' >>>> `---- >>>> >>>> so that your .emacs has an entry like this >>>> >>>> ,---- [.emacs] >>>> | >>>> | (custom-set-variables >>>> | '(org-export-latex-hyperref-format "\\hyperref[%s]{%s}")) >>>> | >>>> `---- >>>> >>>> The above setting solves the problem for me with the following >>>> simple >>>> Org file. >>>> >>>> * Heading1 >>>> Make this section as large as possible so that it fills atleast a >>>> page. >>>> >>>> * Heading2 >>>> Links to [[Heading1]] >>>> >>>> Jambunathan K. >>>> >>>> "Thomas S. Dye" <tsd@tsdye.com> writes: >>>> >>>>> On Oct 28, 2010, at 12:35 PM, Nick Dokos wrote: >>>>> >>>>>> Thomas S. Dye <tsd@tsdye.com> wrote: >>>>>> >>>>>>> On Oct 28, 2010, at 11:01 AM, Jambunathan K wrote: >>>>>>> >>>>>>> >>>>>>> This is a regression. release-7.01h is good. HEAD is bad. I get >>>>>>> the >>>>>>> following line with release-7.01h.< >>>>>>> >>>>>>> Links to \hyperref[sec-1]{Heading1} >>>>>>> >>>>>>> Jambunathan K. >>>>>>> >>>>>>> Aloha Jambunathan K., >>>>>>> >>>>>>> Very many thanks for this information. I have Org-mode version >>>>>>> 7.01trans >>>>>>> (release_7.01h.880.g7531f). I take it the problem I'm having is >>>>>>> due to a relatively recent change >>>>>>> to Org-mode. If there is anything I can do to help isolate the >>>>>>> problem, please let me know. >>>>>>> >>>>>> >>>>>> Tom, >>>>>> >>>>>> If you have the time and the inclination, you might try bisecting >>>>>> your >>>>>> way through. Bisecting org-mode problems is actually a very good >>>>>> way >>>>>> to >>>>>> practice because the turnaround time is very small. >>>>>> >>>>>> Prerequisites: >>>>>> >>>>>> * you have a clone of the org-mode git repository. >>>>>> >>>>>> * you have an org test file. >>>>>> >>>>>> >>>>>> Steps: >>>>>> >>>>>> * [optional, but it makes me feel a little safer] create a test >>>>>> branch >>>>>> and switch to it: >>>>>> >>>>>> git checkout -b test-branch master >>>>>> >>>>>> * I clean out all the compiled files while doing a bisection: it's >>>>>> quicker >>>>>> than regenerating them every time and I don't have to worry (much) >>>>>> about >>>>>> emacs loading a wayward .elc file: >>>>>> >>>>>> make clean >>>>>> >>>>>> * start the bisection and tell git which commit is known good and >>>>>> which is known bad: >>>>>> >>>>>> git bisect start >>>>>> >>>>>> # current version is bad >>>>>> git bisect bad >>>>>> >>>>>> # release_7.01h was good - I got the name with ``git tag'' >>>>>> git bisect good release_7.01h >>>>>> >>>>>> That checks out a revision half-way in between the bad and good >>>>>> commits: since >>>>>> there are about 900 commits in between, you'll be at approx the >>>>>> 450- >>>>>> mark and it >>>>>> should take about 10 bisections to get it down to a single commit. >>>>>> >>>>>> * LOOP Now all you have to do is repeat the following steps: >>>>>> >>>>>> # since you did ``make clean'' you don't have to worry about .elc >>>>>> files >>>>>> # just reload all the .el files. >>>>>> M-x org-reload >>>>>> >>>>>> visit your org test file, export to LaTeX, check for \href/ >>>>>> \hyperref (or >>>>>> whatever other telltale sign shows badness/goodness). >>>>>> >>>>>> # tell git about it >>>>>> git bisect good *OR* git bisect bad >>>>>> >>>>>> This last step will check out another revision and in about 10 >>>>>> repetitions >>>>>> of the loop, you are done. >>>>>> >>>>>> * Tell git you are done, so it can clean up: >>>>>> >>>>>> git bisect reset >>>>>> >>>>>> Theoretically, you could do all of this in your master branch >>>>>> without >>>>>> creating a test-branch and this last step will reset everything to >>>>>> the >>>>>> way it was before ``git start''. >>>>>> >>>>>> * Post the offending commit to the list. >>>>>> >>>>>> * Get back to your master branch: >>>>>> >>>>>> git checkout master >>>>>> >>>>>> * If you created a test-branch, clean it out: >>>>>> >>>>>> git branch -d test-branch >>>>>> >>>>>> * [Optional] Recreate your .elc files and reload them: >>>>>> >>>>>> make >>>>>> M-x org-reload >>>>>> >>>>>> >>>>>> And that's it: a half-hour of fun and games. Unless of course, you >>>>>> hit upon a revision that is neither good nor bad (in the above >>>>>> restricted >>>>>> sense): you might get some other problem that prevents you from >>>>>> being >>>>>> able to answer. That might or might not be easy to resolve, so >>>>>> I'll >>>>>> leave that as an advanced topic (truth be told, I came up against >>>>>> this >>>>>> situation a couple of days ago and I didn't know how to proceed: >>>>>> so >>>>>> it's ignorance more than anything else that prevents me from >>>>>> saying >>>>>> anything more). >>>>>> >>>>>> If you want to try, I'd be happy to answer questions - I might try >>>>>> the >>>>>> bisection later on tonight myself in any case. And btw, this is of >>>>>> course archeology of a different (and much easier) kind, so I >>>>>> imagine >>>>>> you'll take to it like a fish in water :-) >>>>>> >>>>>> HTH, >>>>>> Nick >>>>> >>>>> Hi Nick, >>>>> >>>>> Irresistible hook at the end there. I wish this stuff were as easy >>>>> as >>>>> archaeology is for me. Your instructions are terrific, though. >>>>> >>>>> I did hit on a revision that was neither good nor bad: >>>>> >>>>> commit 8562273b272024a630a582b0e1b94c481d8abeec >>>>> Author: Eric Schulte <schulte.eric@gmail.com> >>>>> Date: Sat Oct 16 13:21:47 2010 -0600 >>>>> >>>>> ob-ref: don't forget arguments to referenced code blocks >>>>> >>>>> * lisp/ob-ref.el (org-babel-ref-resolve): bringing the referent >>>>> arguments back to their params before evaluation >>>>> >>>>> This one puts these lines in *Messages* when I export to LaTeX >>>>> >>>>> executing Org code block... >>>>> if: Symbol's value as variable is void: result-type >>>>> >>>>> I tried using different commits for the initial git bisect good, >>>>> hoping that would skip by the problem, but this one appears to have >>>>> stuck around a while. My other two tries both ended with this same >>>>> error, but with different commits. >>>>> >>>>> I'm not sure what to do next. This problem isn't yielding to my >>>>> archaeo-logic. :) >>>>> >>>>> All the best, >>>>> Tom >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode
2010-10-29 06:01:12 -04:00
(insert (format org-export-latex-hyperref-format
LaTeX export: Fix problem with internal links
2009-07-02 03:54:33 -04:00
(org-remove-initial-hash
LaTeX export: Protect ampersands in tables
2009-08-31 08:27:28 -04:00
(org-solidify-link-text raw-path))
Cleanup after buggy commit aedef8c804c715b13793685f8ae2e66e77eaa546
2009-08-31 15:21:03 -04:00
desc)))
Fix whitespace and compiler wanings
2010-04-01 07:11:54 -04:00
(path
LaTeX export: Protect ampersands in tables
2009-08-31 08:27:28 -04:00
(when (org-at-table-p)
;; There is a strange problem when we have a link in a table,
;; ampersands then cause a problem. I think this must be
;; a LaTeX issue, but we here implement a work-around anyway.
(setq path (org-export-latex-protect-amp path)
desc (org-export-latex-protect-amp desc)))
Fix commit 6632ea.
2012-03-26 17:02:28 -04:00
(insert
org-latex: allow `org-export-latex-href-format' to have only one "%s" This is useful when you want to use \url{link} instead of the default \href{link}{path}. Thanks to Henri-Paul Indiogine for bringing this up. * org-latex.el (org-export-latex-href-format): docstring fix to reflect the fact that you can use only one "%s". (org-export-latex-links): allow `org-export-latex-href-format' to have only one "%s".
2011-07-26 07:22:38 -04:00
(if (string-match "%s.*%s" org-export-latex-href-format)
(format org-export-latex-href-format path desc)
(format org-export-latex-href-format path))))
LaTeX export: Use special formatting by link type interface Patch by Christian Moe, who writes: > It looks like support for formatting custom link types in LaTeX export > is broken? > > I was trying to implement a custom link type with its own formatting > function for HTML and LaTeX export, following the steps in > org-bbdb.el. > > I've found that org-bbdb-export does not italicize bbdb links in > LaTeX, nor does my own org-cite-export turn my custom =cite:= links > into LaTeX =\cite{}= citations. Everything works fine in HTML export, > but in LaTeX all custom link types get formatted as =\texttt{descr}=. > > I see that org-export-as-html and org-export-as-docbook look up > org-link-protocols to get the function for formatting the link, but it > seems that org-export-as-latex doesn't. > >
2010-05-12 09:14:17 -04:00
((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
;; The link protocol has a function for formatting the link
(insert
(save-match-data
(funcall fnc (org-link-unescape raw-path) desc 'latex))))
New option `org-export-latex-link-with-unknown-path-format'. * org-latex.el (org-export-latex-link-with-unknown-path-format): New option. (org-export-latex-links): Use it. Thanks to Sébastien Vauban for a preliminary patch for this.
2012-05-17 02:06:58 -04:00
;; Unrecognized path type
(t (insert (format org-export-latex-link-with-unknown-path-format desc))))))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
org-latex: org-export-latex-format-image now accepts optional shortname * lisp/org-latex.el (org-export-latex-format-image): updated number of arguments to allow for an optional short-name
2010-07-05 12:56:20 -04:00
(defun org-export-latex-format-image (path caption label attr &optional shortn)
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
"Format the image element, depending on user settings."
LaTeX export: Implement table* environment for wide tables Patch by Chris Gray.
2010-05-15 08:26:38 -04:00
(let (ind floatp wrapp multicolumnp placement figenv)
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(setq floatp (or caption label))
LaTeX export: Allow centered images in plain lists
2009-11-24 14:41:53 -05:00
(setq ind (org-get-text-property-any 0 'original-indentation path))
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(when (and attr (stringp attr))
(if (string-match "[ \t]*\\<wrap\\>" attr)
(setq wrapp t floatp nil attr (replace-match "" t t attr)))
(if (string-match "[ \t]*\\<float\\>" attr)
LaTeX export: Implement table* environment for wide tables Patch by Chris Gray.
2010-05-15 08:26:38 -04:00
(setq wrapp nil floatp t attr (replace-match "" t t attr)))
(if (string-match "[ \t]*\\<multicolumn\\>" attr)
(setq multicolumnp t attr (replace-match "" t t attr))))
Fix whitespace problems
2010-06-07 02:35:10 -04:00
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(setq placement
(cond
(wrapp "{l}{0.5\\textwidth}")
org-latex: `org-latex-default-figure-position' for default figure position * lisp/org-latex.el (org-latex-default-figure-position): New defcustom for default placement of latex figures. (org-export-latex-tables): Positioning tables using the new defcustom variable. (org-export-latex-format-image): Positioning images using the new defcustom variable.
2011-01-28 10:59:47 -05:00
(floatp (concat "[" org-latex-default-figure-position "]"))
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(t "")))
(when (and attr (stringp attr)
(string-match "[ \t]*\\<placement=\\(\\S-+\\)" attr))
(setq placement (match-string 1 attr)
attr (replace-match "" t t attr)))
(setq attr (and attr (org-trim attr)))
(when (or (not attr) (= (length attr) 0))
(setq attr (cond (floatp "width=0.7\\textwidth")
(wrapp "width=0.48\\textwidth")
(t attr))))
(setq figenv
(cond
(wrapp "\\begin{wrapfigure}%placement
\\centering
\\includegraphics[%attr]{%path}
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
\\caption%shortn{%labelcmd%caption}
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
\\end{wrapfigure}")
LaTeX export: Implement table* environment for wide tables Patch by Chris Gray.
2010-05-15 08:26:38 -04:00
(multicolumnp "\\begin{figure*}%placement
\\centering
\\includegraphics[%attr]{%path}
Optional \caption argument for LaTeX export Aloha all, The attached patch initializes the existing variable shortn, adds it to two caption situations in addition to the one already coded, and adds some description to the manual. With this patch, #+CAPTION: [Short caption]{Long caption.} in the Org-mode source exports to \caption[Short caption]{Long caption.} in the LaTeX export, which is, I think, as it should be. Many thanks to Nick Dokos who made me understand why earlier patches hadn't shown up on the patchwork server (wrong mime type, evil mail client). This one sent with gnus and fingers crossed. All the best, Tom >From 9dc65f7e598dd171ebce9448cd39c4062f7cafff Mon Sep 17 00:00:00 2001 From: Tom Dye <tsd@tsdye.com> Date: Sun, 8 May 2011 06:56:25 -1000 Subject: [PATCH] optional caption arguments in LaTeX export
2011-05-08 21:11:39 -04:00
\\caption%shortn{%labelcmd%caption}
LaTeX export: Implement table* environment for wide tables Patch by Chris Gray.
2010-05-15 08:26:38 -04:00
\\end{figure*}")
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(floatp "\\begin{figure}%placement
\\centering
\\includegraphics[%attr]{%path}
Optional \caption argument for LaTeX export Aloha all, The attached patch initializes the existing variable shortn, adds it to two caption situations in addition to the one already coded, and adds some description to the manual. With this patch, #+CAPTION: [Short caption]{Long caption.} in the Org-mode source exports to \caption[Short caption]{Long caption.} in the LaTeX export, which is, I think, as it should be. Many thanks to Nick Dokos who made me understand why earlier patches hadn't shown up on the patchwork server (wrong mime type, evil mail client). This one sent with gnus and fingers crossed. All the best, Tom >From 9dc65f7e598dd171ebce9448cd39c4062f7cafff Mon Sep 17 00:00:00 2001 From: Tom Dye <tsd@tsdye.com> Date: Sun, 8 May 2011 06:56:25 -1000 Subject: [PATCH] optional caption arguments in LaTeX export
2011-05-08 21:11:39 -04:00
\\caption%shortn{%labelcmd%caption}
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
\\end{figure}")
(t "\\includegraphics[%attr]{%path}")))
LaTeX export: Allow figure placement in plain lists
2009-11-22 17:51:45 -05:00
(setq figenv (mapconcat 'identity (split-string figenv "\n")
(save-excursion (beginning-of-line 1)
(looking-at "[ \t]*")
(concat "\n" (match-string 0)))))
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
(if (and (not label) (not caption)
(string-match "^\\\\caption{.*\n" figenv))
(setq figenv (replace-match "" t t figenv)))
LaTeX export: Allow centered images in plain lists
2009-11-24 14:41:53 -05:00
(org-add-props
(org-fill-template
figenv
(list (cons "path"
(if (file-name-absolute-p path)
(expand-file-name path)
path))
(cons "attr" attr)
a better way with babel Of course, an updated patch is attached. Best -- Eric Carsten Dominik <carsten.dominik@gmail.com> writes: > Hi Eric, > > I tried to apply the patch, but it does not apply cleanly, maybe due > to other changes. Can I ask you to update and resubmit? > > Thanks! > > - Carsten > > On Jun 21, 2010, at 6:37 PM, Eric Schulte wrote: > >> Hi Robert, >> >> Thanks for the thoughtful message. >> >> I present a couple of solutions below. >> >> Robert Cunningham <robut@iinet.net.au> writes: >> >>> G'day All, >>> >>> I wonder if I've missed something and there is a better way. >>> >>> Essentially I'm trying to use org babel with R and LaTeX to create >>> figures >>> with both long and short captions (for contents) >>> >>> I'd started with: >>> >>> #+CAPTION: Nice data (filled points indicate less nice data) >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> which pointed to the need for long/short captions... >>> >>> feeling hopeful I tried: >>> >>> #+CAPTION: Nice data [Nice data (filled points indicate less nice >>> data)] >>> #+LABEL: fig:nicedata >>> #+ATTR_LaTeX: width=0.98\textwidth >>> #+begin_src R :file ndata.pdf :width 1000 :height 617 :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >> >> I'm attaching a patch [1] which adds shortname support for captions. >> Once >> applied, the following syntax will result in a caption with a >> shortname >> and a longname. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :exports results >> plot sin(x) >> #+end_src >> >> #+Caption: [nice data]{a longer description of the niceness of the >> data} >> #+results: g-nicedata >> [[file:graph.png]] >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> however, while this patch is still pending there is an Org-babel >> solution below which should work immediately. >> >>> >>> >>> but no luck there. >>> >>> Next effort was to try to use R and LaTex more directly with >>> noweb. I tried >>> this: >>> >>> >>> >>> #+srcname: r-nicedata >>> #+begin_src R :session :file ndata.pdf :results output :exports >>> results >>> dotchart(data$ndata) >>> #+end_src >>> >>> >>> #+begin_src latex :noweb yes >>> \begin{figure}[htb!] >>> \centering >>> \includegraphics[width=0.98\textwidth]{<<r-nicedata()>>} >>> \caption[Nice data]{Nice data (filled points indicate less nice >>> data)} >>> \label{fig:nicedata} >>> \end{figure} >>> #+end_src >>> >>> >>> >>> This does produce the figure and long/short contents BUT ALSO >>> produces this: >>> >>> #+results: r-nicedata >>> [[file:ndata.pdf]] >>> >>> which upon export results in a link and consequently the plot >>> appearing both >>> in the figure and elsewhere. This second plot is unwelcome. >>> >>> I've tried assorted :results and :output options but have not found >>> how to >>> suppress the #+results: but still obtain the figure. I've always used >>> the :session option. >>> >>> I've also tried twigging an org-export option to suppress pdf >>> export but the >>> link is still exported so that is not a solution. >>> >>> The current "working" solution is to use the noweb approach and >>> then use sed >>> to clean out the links to the second image-ugly to say the least! >>> >> >> You were very close with the noweb approach. The following >> combination >> should work -- notice the ":results silent" header argument to the >> source block. >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> #+source: g-nicedata >> #+begin_src gnuplot :file graph.png :results silent :exports none >> plot sin(x) >> #+end_src >> >> #+begin_src latex :noweb yes >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{<<g-nicedata()>>} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> #+end_src >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> is exported to the following latex, >> >> --8<---------------cut here---------------start------------->8--- >> some pre-table text >> >> >> >> \begin{figure}[htb!] >> \centering >> \includegraphics[width=0.98\textwidth]{graph.png} >> \caption[Nice data]{some nice data -- filled points indicate less >> nice data} >> \label{fig:nicedata} >> \end{figure} >> >> some post-table text >> --8<---------------cut here---------------end--------------->8--- >> >> Hope this helps, >> >> Best -- Eric >> >>> >>> >>> >>> All this with org version 6.36c >>> >>> >>> What have I missed? What is the best way to do this? >>> >>> >>> Cheers, >>> >>> Robert Cunningham >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> Footnotes: >> [1] From 6a55dcab99bbd7840117b8390ab5db347d2573ef Mon Sep 17 >> 00:00:00 2001 >> From: Eric Schulte <schulte.eric@gmail.com> >> Date: Mon, 21 Jun 2010 09:02:37 -0700 >> Subject: [PATCH] add short-names to #+captions with support for >> latex export >> >> captions specified with the following syntax >> #+CAPTION: [shortname]{longname} >> will have their short and longnames handled appropriately. >> >> Thanks to Robert Cunningham for suggesting this feature. >> >> * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding >> a shortname attribute to caption strings under the symbol name >> org-caption-shortn. >> >> * lisp/org-latex.el (org-export-latex-tables): handling caption short >> names on table export >> >> (org-export-latex-convert-table.el-table): handling caption short >> names on table.el type table export >> >> (org-export-latex-links): handling caption short names on link/image >> export >> >> (org-export-latex-format-image): now takes an optional argument >> specifying a caption short name >> --- >> lisp/org-exp.el | 14 +++++++++----- >> lisp/org-latex.el | 21 ++++++++++++++------- >> 2 files changed, 23 insertions(+), 12 deletions(-) >> >> diff --git a/lisp/org-exp.el b/lisp/org-exp.el >> index 029e4d7..466d7da 100644 >> --- a/lisp/org-exp.el >> +++ b/lisp/org-exp.el >> @@ -1256,7 +1256,7 @@ the current file." >> (goto-char (point-min)) >> (while (re-search-forward org-bracket-link-regexp nil t) >> (org-if-unprotected-at (1+ (match-beginning 0)) >> - (let* ((md (match-data)) >> + (let* ((md (match-data)) >> (desc (match-end 2)) >> (link (org-link-unescape (match-string 1))) >> (slink (org-solidify-link-text link)) >> @@ -1381,8 +1381,8 @@ removed as well." >> select-tags "\\|") >> "\\):")) >> (re-excl (concat ":\\(" (mapconcat 'regexp-quote >> - exclude-tags "\\|") >> - "\\):")) >> + exclude-tags "\\|") >> + "\\):")) >> beg end cont) >> (goto-char (point-min)) >> (when (and select-tags >> @@ -1593,11 +1593,14 @@ table line. If it is a link, add it to the >> line containing the link." >> "^[ \t]*\\(|[^-]\\)" >> "\\|" >> "^[ \t]*\\[\\[.*\\]\\][ \t]*$")) >> - cap attr label end) >> + cap shortn attr label end) >> (while (re-search-forward re nil t) >> (cond >> ((match-end 1) >> - (setq cap (concat cap (if cap " " "") (org-trim (match-string 1))))) >> + (setq cap (concat cap (if cap " " "") (org-trim (match-string 1)))) >> + (when (string-match "\\[\\(.*\\)\\]{\\(.*\\)}" cap) >> + (setq shortn (match-string 1 cap) >> + cap (match-string 2 cap)))) >> ((match-end 2) >> (setq attr (concat attr (if attr " " "") (org-trim >> (match-string 2))))) >> ((match-end 3) >> @@ -1609,6 +1612,7 @@ table line. If it is a link, add it to the >> line containing the link." >> (point-at-eol))) >> (add-text-properties (point-at-bol) end >> (list 'org-caption cap >> + 'org-caption-shortn shortn >> 'org-attributes attr >> 'org-label label)) >> (if label (push (cons label label) target-alist)) >> diff --git a/lisp/org-latex.el b/lisp/org-latex.el >> index 01a4b05..6c2aab2 100644 >> --- a/lisp/org-latex.el >> +++ b/lisp/org-latex.el >> @@ -1576,7 +1576,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (org-table-last-column-widths (copy-sequence >> org-table-last-column- >> widths)) >> fnum fields line lines olines gr colgropen line-fmt align >> - caption label attr floatp longtblp) >> + caption shortn label attr floatp longtblp) >> (if org-export-latex-tables-verbatim >> (let* ((tbl (concat "\\begin{verbatim}\n" raw-table >> "\\end{verbatim}\n"))) >> @@ -1585,6 +1585,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (progn >> (setq caption (org-find-text-property-in-string >> 'org-caption raw-table) >> + shortn (org-find-text-property-in-string >> + 'org-caption-shortn raw-table) >> attr (org-find-text-property-in-string >> 'org-attributes raw-table) >> label (org-find-text-property-in-string >> @@ -1652,7 +1654,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (if floatp "\\begin{table}[htb]\n")) >> (if floatp >> (format >> - "\\caption{%s%s}" >> + "\\caption%s{%s%s}" >> + (if shortn (concat "[" shortn "]") "") >> (if label (concat "\\\label{" label >> "}") "") >> (or caption ""))) >> (if (and longtblp caption) "\\\\\n" "\n") >> @@ -1680,10 +1683,11 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> >> (defun org-export-latex-convert-table.el-table () >> "Replace table.el table at point with LaTeX code." >> - (let (tbl caption label line floatp attr align rmlines) >> + (let (tbl caption shortn label line floatp attr align rmlines) >> (setq line (buffer-substring (point-at-bol) (point-at-eol)) >> label (org-get-text-property-any 0 'org-label line) >> caption (org-get-text-property-any 0 'org-caption line) >> + shortn (org-get-text-property-any 0 'org-caption-shortn line) >> attr (org-get-text-property-any 0 'org-attributes line) >> align (and attr (stringp attr) >> (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr) >> @@ -1721,7 +1725,8 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) >> (when floatp >> (setq tbl (concat "\\begin{table}\n" >> - (format "\\caption{%s%s}\n" >> + (format "\\caption%s{%s%s}\n" >> + (if shortn (format "[%s]" shortn) "") >> (if label (format "\\label{%s}" label) "") >> (or caption "")) >> tbl >> @@ -1822,6 +1827,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> "file"))) >> (coderefp (equal type "coderef")) >> (caption (org-find-text-property-in-string 'org-caption >> raw- >> path)) >> + (shortn (org-find-text-property-in-string >> org-caption-shortn raw-path)) >> (attr (or (org-find-text-property-in-string >> org-attributes raw- >> path) >> (plist-get org-export-latex-options-plist >> :latex-image- >> options))) >> (label (org-find-text-property-in-string 'org-label raw-path)) >> @@ -1859,7 +1865,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (plist-get org-export-latex-options-plist :inline-images)) >> ;; OK, we need to inline an image >> (insert >> - (org-export-latex-format-image raw-path caption label attr))) >> + (org-export-latex-format-image raw-path caption label >> attr shortn))) >> (coderefp >> (insert (format >> (org-export-get-coderef-format path desc) >> @@ -1889,7 +1895,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (t (insert "\\texttt{" desc "}"))))))) >> >> >> -(defun org-export-latex-format-image (path caption label attr) >> +(defun org-export-latex-format-image (path caption label attr >> &optional shortn) >> "Format the image element, depending on user settings." >> (let (ind floatp wrapp multicolumnp placement figenv) >> (setq floatp (or caption label)) >> @@ -1932,7 +1938,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (floatp "\\begin{figure}%placement >> \\centering >> \\includegraphics[%attr]{%path} >> -\\caption{%labelcmd%caption} >> +\\caption%shortn{%labelcmd%caption} >> \\end{figure}") >> (t "\\includegraphics[%attr]{%path}"))) >> >> @@ -1953,6 +1959,7 @@ The conversion is made depending of STRING- >> BEFORE and STRING-AFTER." >> (expand-file-name path) >> path)) >> (cons "attr" attr) >> + (cons "shortn" (if shortn (format "[%s]" shortn) "")) >> (cons "labelcmd" (if label (format "\\label{%s}" >> label)"")) >> (cons "caption" (or caption "")) >> -- >> 1.7.0.4 >> >> _______________________________________________ >> Emacs-orgmode mailing list >> Please use `Reply All' to send replies to the list. >> Emacs-orgmode@gnu.org >> http://lists.gnu.org/mailman/listinfo/emacs-orgmode > > - Carsten >From 5cbb38e25a2d2eae7c3c688d347f80619ecb8463 Mon Sep 17 00:00:00 2001 From: Eric Schulte <schulte.eric@gmail.com> Date: Thu, 1 Jul 2010 08:07:17 -0700 Subject: [PATCH] add short-names to #+captions with support for latex export captions specified with the following syntax #+CAPTION: [shortname]{longname} will have their short and longnames handled appropriately. Thanks to Robert Cunningham for suggesting this feature. * lisp/org-exp.el (org-export-attach-captions-and-attributes): adding a shortname attribute to caption strings under the symbol name org-caption-shortn. * lisp/org-latex.el (org-export-latex-tables): handling caption short names on table export (org-export-latex-convert-table.el-table): handling caption short names on table.el type table export (org-export-latex-links): handling caption short names on link/image export (org-export-latex-format-image): now takes an optional argument specifying a caption short name
2010-07-01 16:19:14 -04:00
(cons "shortn" (if shortn (format "[%s]" shortn) ""))
LaTeX export: Allow centered images in plain lists
2009-11-24 14:41:53 -05:00
(cons "labelcmd" (if label (format "\\label{%s}"
label)""))
(cons "caption" (or caption ""))
(cons "placement" (or placement ""))))
nil 'original-indentation ind)))
Improve figure placement in LaTeX export. Text can now be wrapped around figures. See the manual for details.
2009-10-02 04:28:56 -04:00
LaTeX export: Protect ampersands in tables
2009-08-31 08:27:28 -04:00
(defun org-export-latex-protect-amp (s)
(while (string-match "\\([^\\\\]\\)\\(&\\)" s)
(setq s (replace-match (concat (match-string 1 s) "\\" (match-string 2 s))
t t s)))
s)
LaTeX export: Fix problem with internal links
2009-07-02 03:54:33 -04:00
(defun org-remove-initial-hash (s)
(if (string-match "\\`#" s)
(substring s 1)
s))
Release 5.14
2008-01-31 05:37:51 -05:00
(defvar org-latex-entities) ; defined below
Minor changes, to keep the compiler happy.
2008-10-21 11:54:04 -04:00
(defvar org-latex-entities-regexp) ; defined below
Release 5.14
2008-01-31 05:37:51 -05:00
Docbook export: More fixes.
2009-03-08 01:55:17 -05:00
(defun org-export-latex-preprocess (parameters)
Release 5.06d
2008-01-31 05:35:58 -05:00
"Clean stuff in the LaTeX export."
org-latex: fix interpreted latex commands and snippets in footnotes * lisp/org-latex.el (org-export-latex-preprocess): first insert footnotes in the temporary buffer so their contents can properly be protected from further transformations if required.
2011-07-12 05:54:32 -04:00
;; Replace footnotes.
(when (plist-get parameters :footnotes)
(goto-char (point-min))
(let (ref)
(while (setq ref (org-footnote-get-next-reference))
(let* ((beg (nth 1 ref))
(lbl (car ref))
(def (nth 1 (assoc (string-to-number lbl)
(mapcar (lambda (e) (cdr e))
org-export-footnotes-seen)))))
;; Fix body for footnotes ending on a link or a list and
;; remove definition from buffer.
(setq def
(concat def
(if (string-match "ORG-LIST-END-MARKER\\'" def)
"\n" " ")))
(org-footnote-delete-definitions lbl)
;; Compute string to insert (FNOTE), and protect the outside
;; macro from further transformation. When footnote at
;; point is referring to a previously defined footnote, use
;; \footnotemark. Otherwise, use \footnote.
(let ((fnote (if (member lbl org-export-latex-footmark-seen)
(org-export-latex-protect-string
(format "\\footnotemark[%s]" lbl))
(push lbl org-export-latex-footmark-seen)
(concat (org-export-latex-protect-string "\\footnote{")
def
(org-export-latex-protect-string "}"))))
;; Check if another footnote is immediately following.
;; If so, add a separator in-between.
(sep (org-export-latex-protect-string
(if (save-excursion (goto-char (1- (nth 2 ref)))
(let ((next (org-footnote-get-next-reference)))
(and next (= (nth 1 next) (nth 2 ref)))))
org-export-latex-footnote-separator ""))))
Code cleanup up: rename org-on-*-p to org-at-*-p. Rename `org-on-heading-p' and `org-on-target-p' to `org-at-heading-p' and `org-at-target-p' to be more consistent with the org-at-*-p family. Also define two aliases.
2012-01-02 13:52:35 -05:00
(when (org-at-heading-p)
org-latex: fix interpreted latex commands and snippets in footnotes * lisp/org-latex.el (org-export-latex-preprocess): first insert footnotes in the temporary buffer so their contents can properly be protected from further transformations if required.
2011-07-12 05:54:32 -04:00
(setq fnote (concat (org-export-latex-protect-string "\\protect")
fnote)))
;; Ensure a footnote at column 0 cannot end a list
;; containing it.
(put-text-property 0 (length fnote) 'original-indentation 1000 fnote)
;; Replace footnote reference with FNOTE and, maybe, SEP.
;; `save-excursion' is required if there are two footnotes
;; in a row. In that case, point would be left at the
;; beginning of the second one, and
;; `org-footnote-get-next-reference' would then skip it.
(goto-char beg)
(delete-region beg (nth 2 ref))
(save-excursion (insert fnote sep)))))))
;; Remove footnote section tag for LaTeX
(goto-char (point-min))
(while (re-search-forward
(concat "^" footnote-section-tag-regexp) nil t)
(org-if-unprotected
(replace-match "")))
;; Remove any left-over footnote definition.
(mapc (lambda (fn) (org-footnote-delete-definitions (car fn)))
org-export-footnotes-data)
(mapc (lambda (fn) (org-footnote-delete-definitions fn))
org-export-latex-footmark-seen)
Release 5.07
2008-01-31 05:36:08 -05:00
;; Preserve line breaks
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (point-min))
(while (re-search-forward "\\\\\\\\" nil t)
(add-text-properties (match-beginning 0) (match-end 0)
'(org-protected t)))
Implement export of descriptive lists. Prevent special chars from being converted when in a LaTeX environment. Fix a bug about conversion of "&" conversion in tables.
2008-09-19 15:48:47 -04:00
;; Preserve latex environments
(goto-char (point-min))
LaTeX export: Protect eqnarray* and similar environments. Environment names ending in a star were not properly protected. Now they are.
2009-04-29 15:36:28 -04:00
(while (re-search-forward "^[ \t]*\\\\begin{\\([a-zA-Z]+\\*?\\)}" nil t)
org-latex.el : do not protect environments already protected. Environments coming from latex backend specific instructions (#+LaTeX) are already protected and won't be treated as normal environments. * lisp/org-latex.el (org-export-latex-preprocess): Environments coming from latex backend specific instructions (#+LaTeX) are already protected and won't be treated as normal environments.
2010-06-13 11:21:59 -04:00
(org-if-unprotected
(let* ((start (progn (beginning-of-line) (point)))
Don't convert link description parts that look like numeric footnote * lisp/org-latex.el (org-export-latex-preprocess): Don't convert link description parts that look like numeric footnote. Fixes a problem reported by Thomas S. Dye.
2010-12-19 08:54:16 -05:00
(end (and (re-search-forward
(concat "^[ \t]*\\\\end{"
(regexp-quote (match-string 1))
"}") nil t)
(point-at-eol))))
(if end
(add-text-properties start end '(org-protected t))
(goto-char (point-at-eol))))))
Implement export of descriptive lists. Prevent special chars from being converted when in a LaTeX environment. Fix a bug about conversion of "&" conversion in tables.
2008-09-19 15:48:47 -04:00
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
;; Preserve math snippets
(let* ((matchers (plist-get org-format-latex-options :matchers))
(re-list org-latex-regexps)
beg end re e m n block off)
;; Check the different regular expressions
(while (setq e (pop re-list))
(setq m (car e) re (nth 1 e) n (nth 2 e)
block (if (nth 3 e) "\n\n" ""))
Export: Try to do a better job with LaTeX math. Fixes some issues reported by Rasmus Pank Roulund.
2009-01-08 15:36:01 -05:00
(setq off (if (member m '("$" "$1")) 1 0))
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
(when (and (member m matchers) (not (equal m "begin")))
(goto-char (point-min))
(while (re-search-forward re nil t)
Export: Try to do a better job with LaTeX math. Fixes some issues reported by Rasmus Pank Roulund.
2009-01-08 15:36:01 -05:00
(setq beg (+ (match-beginning 0) off) end (- (match-end 0) 0))
LaTeX export: Better analysis of math environments We now use the export preprocessor to identify all math snippets in advance, this is superior to calling org-inside-LaTeX-fragment-p from the inside.
2009-01-06 06:56:30 -05:00
(add-text-properties beg end '(org-protected t org-latex-math t))))))
Improve LaTeX export of the words LaTeX and TeX Bill Jackson writes: > When exporting to LaTeX, the commands \LaTeX and \TeX are not > processed consistently. In particular, the backslash for \LaTeX is > escaped. This might not be a bug, but it is a bit confusing. An > example input file: > > ------------------------------------------------------------------------ > > * The One and Only Header > The command \LaTeX generates an escaped backslash, while \TeX and > \alpha do not. Note that LaTeX is converted to a command, while TeX > is not. > > ------------------------------------------------------------------------ > > Typing C-c C-e l will generate the output file: > > ------------------------------------------------------------------------ > > % Created 2010-01-15 Fri 13:47 > \documentclass[11pt]{article} > \usepackage[latin1]{inputenc} > \usepackage[T1]{fontenc} > \usepackage{graphicx} > \usepackage{longtable} > \usepackage{float} > \usepackage{wrapfig} > \usepackage{soul} > \usepackage{amssymb} > \usepackage{hyperref} > > > \title{escLaTeX} > \author{} > \date{15 January 2010} > > \begin{document} > > \maketitle > > \setcounter{tocdepth}{3} > \tableofcontents > \vspace*{1cm} > \section{The One and Only Header} > \label{sec-1} > > The command \\LaTeX{} generates an escaped backslash, while \TeX and > $\alpha$ do not. Note that \LaTeX{} is converted to a command, while TeX > is not. > > \end{document}
2010-01-28 09:29:35 -05:00
;; Convert LaTeX to \LaTeX{} and TeX to \TeX{}
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (point-min))
Maintenance: Remove unused variables.
2009-01-26 03:42:33 -05:00
(let ((case-fold-search nil))
Improve LaTeX export of the words LaTeX and TeX Bill Jackson writes: > When exporting to LaTeX, the commands \LaTeX and \TeX are not > processed consistently. In particular, the backslash for \LaTeX is > escaped. This might not be a bug, but it is a bit confusing. An > example input file: > > ------------------------------------------------------------------------ > > * The One and Only Header > The command \LaTeX generates an escaped backslash, while \TeX and > \alpha do not. Note that LaTeX is converted to a command, while TeX > is not. > > ------------------------------------------------------------------------ > > Typing C-c C-e l will generate the output file: > > ------------------------------------------------------------------------ > > % Created 2010-01-15 Fri 13:47 > \documentclass[11pt]{article} > \usepackage[latin1]{inputenc} > \usepackage[T1]{fontenc} > \usepackage{graphicx} > \usepackage{longtable} > \usepackage{float} > \usepackage{wrapfig} > \usepackage{soul} > \usepackage{amssymb} > \usepackage{hyperref} > > > \title{escLaTeX} > \author{} > \date{15 January 2010} > > \begin{document} > > \maketitle > > \setcounter{tocdepth}{3} > \tableofcontents > \vspace*{1cm} > \section{The One and Only Header} > \label{sec-1} > > The command \\LaTeX{} generates an escaped backslash, while \TeX and > $\alpha$ do not. Note that \LaTeX{} is converted to a command, while TeX > is not. > > \end{document}
2010-01-28 09:29:35 -05:00
(while (re-search-forward "\\<\\(\\(La\\)?TeX\\)\\>" nil t)
(unless (eq (char-before (match-beginning 1)) ?\\)
(org-if-unprotected-1
(replace-match (org-export-latex-protect-string
(concat "\\" (match-string 1)
"{}")) t t)))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Added support for blockquote conversion in org-export-latex.el. Also added *.elc to .gitignore.
2008-05-05 20:06:09 -04:00
;; Convert blockquotes
(goto-char (point-min))
Fix bug about LaTeX export of QUOTE and VERSE environments. Also allow completion for *_QUOTE *_VERSE and *_SRC keywords.
2008-09-05 10:36:07 -04:00
(while (search-forward "ORG-BLOCKQUOTE-START" nil t)
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties "\\begin{quote}" t t))
Added support for blockquote conversion in org-export-latex.el. Also added *.elc to .gitignore.
2008-05-05 20:06:09 -04:00
(goto-char (point-min))
Fix bug about LaTeX export of QUOTE and VERSE environments. Also allow completion for *_QUOTE *_VERSE and *_SRC keywords.
2008-09-05 10:36:07 -04:00
(while (search-forward "ORG-BLOCKQUOTE-END" nil t)
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties "\\end{quote}" t t))
Added support for blockquote conversion in org-export-latex.el. Also added *.elc to .gitignore.
2008-05-05 20:06:09 -04:00
Implement the verse environment.
2008-05-13 09:57:23 -04:00
;; Convert verse
(goto-char (point-min))
Fix bug about LaTeX export of QUOTE and VERSE environments. Also allow completion for *_QUOTE *_VERSE and *_SRC keywords.
2008-09-05 10:36:07 -04:00
(while (search-forward "ORG-VERSE-START" nil t)
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties "\\begin{verse}" t t)
Export: Improve centering, verse, and blockquote export In verse environments, line breaks are now enforced both in LaTeX and in HTML. Centering is now implemented using a div rather than a paragraph, so that there may be several paragraphs in the centering environment. Blockquotes now also may have several paragraphs.
2009-03-19 04:29:58 -04:00
(beginning-of-line 2)
(while (and (not (looking-at "[ \t]*ORG-VERSE-END.*")) (not (eobp)))
(when (looking-at "\\([ \t]+\\)\\([^ \t\n]\\)")
(goto-char (match-end 1))
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties
Export: Improve centering, verse, and blockquote export In verse environments, line breaks are now enforced both in LaTeX and in HTML. Centering is now implemented using a div rather than a paragraph, so that there may be several paragraphs in the centering environment. Blockquotes now also may have several paragraphs.
2009-03-19 04:29:58 -04:00
(org-export-latex-protect-string
(concat "\\hspace*{1cm}" (match-string 2))) t t)
(beginning-of-line 1))
LaTeX export: Fix bug with empty lines in VERSE environment
2009-09-28 15:08:34 -04:00
(if (looking-at "[ \t]*$")
LaTeX export: Protect \vspace macro in verse environment
2009-10-21 04:36:42 -04:00
(insert (org-export-latex-protect-string "\\vspace*{1em}"))
LaTeX export: Fix bug with empty lines in VERSE environment
2009-09-28 15:08:34 -04:00
(unless (looking-at ".*?[^ \t\n].*?\\\\\\\\[ \t]*$")
(end-of-line 1)
(insert "\\\\")))
Export: Improve centering, verse, and blockquote export In verse environments, line breaks are now enforced both in LaTeX and in HTML. Centering is now implemented using a div rather than a paragraph, so that there may be several paragraphs in the centering environment. Blockquotes now also may have several paragraphs.
2009-03-19 04:29:58 -04:00
(beginning-of-line 2))
(and (looking-at "[ \t]*ORG-VERSE-END.*")
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties "\\end{verse}" t t)))
Implement the verse environment.
2008-05-13 09:57:23 -04:00
Make the latex export preprocessor rewrite #+INDEX to \index. * lisp/org-latex.el (org-export-latex-preprocess): Replace index entries.
2011-04-28 12:47:23 -04:00
;; Convert #+INDEX to LaTeX \\index.
(goto-char (point-min))
Process index entries * lisp/org-latex.el (org-export-latex-preprocess): Pipe index entries through org-export-latex-fontify-headline.
2011-05-05 04:23:32 -04:00
(let ((case-fold-search t) entry)
Make the latex export preprocessor rewrite #+INDEX to \index. * lisp/org-latex.el (org-export-latex-preprocess): Replace index entries.
2011-04-28 12:47:23 -04:00
(while (re-search-forward
"^[ \t]*#\\+index:[ \t]*\\([^ \t\r\n].*?\\)[ \t]*$"
nil t)
org-latex.el: Delete trailing whitespaces.
2011-07-12 02:31:07 -04:00
(setq entry
Process index entries * lisp/org-latex.el (org-export-latex-preprocess): Pipe index entries through org-export-latex-fontify-headline.
2011-05-05 04:23:32 -04:00
(save-match-data
Protect index string * lisp/org-latex.el (org-export-latex-preprocess): Protect index string
2011-05-05 04:29:22 -04:00
(org-export-latex-protect-string
(org-export-latex-fontify-headline (match-string 1)))))
Process index entries * lisp/org-latex.el (org-export-latex-preprocess): Pipe index entries through org-export-latex-fontify-headline.
2011-05-05 04:23:32 -04:00
(replace-match (format "\\index{%s}" entry) t t)))
Make the latex export preprocessor rewrite #+INDEX to \index. * lisp/org-latex.el (org-export-latex-preprocess): Replace index entries.
2011-04-28 12:47:23 -04:00
Centering: Implement markup for centered text.
2009-03-16 17:14:15 -04:00
;; Convert center
(goto-char (point-min))
(while (search-forward "ORG-CENTER-START" nil t)
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties "\\begin{center}" t t))
Centering: Implement markup for centered text.
2009-03-16 17:14:15 -04:00
(goto-char (point-min))
(while (search-forward "ORG-CENTER-END" nil t)
New indentation treatment for blocks during export Now we also deal with center, quote, and verse blocks.
2009-06-07 10:11:14 -04:00
(org-replace-match-keep-properties "\\end{center}" t t))
Centering: Implement markup for centered text.
2009-03-16 17:14:15 -04:00
Export: New hooks for Chris Gray's LaTeX/HTML blocks Chris Gray had the idea to have arbitrary blocks turned in LaTeX environments and HTML divs. These three new hooks allow implementation has an add-on rather than a patch.
2009-05-02 02:02:17 -04:00
(run-hooks 'org-export-latex-after-blockquotes-hook)
Release 5.07
2008-01-31 05:36:08 -05:00
;; Convert horizontal rules
Release 5.06d
2008-01-31 05:35:58 -05:00
(goto-char (point-min))
org-latex.el: match horizontal rules with HTML regexp Also a slight update of the manual about horizontal rules.
2011-02-10 11:03:31 -05:00
(while (re-search-forward "^[ \t]*-\\{5,\\}[ \t]*$" nil t)
LaTeX export: Properly protect entire LaTeX environments LaTeX environments should be left as they are, fully protected. There was a regular expression error in the code doing this.
2009-01-21 04:23:49 -05:00
(org-if-unprotected
(replace-match (org-export-latex-protect-string "\\hrule") t t)))
Release 5.06d
2008-01-31 05:35:58 -05:00
Fix typos in org-export-latex.el and whitespace
2008-12-16 10:34:50 -05:00
;; Protect LaTeX commands like \command[...]{...} or \command{...}
Fix bug with protecting LaTeX macros The regular expression was not optimal, and if there was a horizontal rule, search would not start from the beginning of the buffer but from after the rule!
2009-12-16 13:45:05 -05:00
(goto-char (point-min))
(let ((re (concat
Protect starred commands in LaTeX export correctly * lisp/org-latex.el (org-export-latex-preprocess): Correctly match starred command names. Many LaTeX commands exist in both normal and starred forms. Adjust the regexp in `org-export-latex-preprocess' to match the starred form as well.
2011-03-23 11:28:04 -04:00
"\\\\\\([a-zA-Z]+\\*?\\)"
LaTeX export: Protect <...> arguments for BEAMER export Bill Jackson writes: > When exporting to LaTeX, curly brackets in a command will be escaped > if that command also contains angle brackets. This can be a problem > when using beamer. An example input file: > > ------------------------------------------------------------------------ > > #+LaTeX_CLASS: beamer > > * The One and Only Frame > When LaTeX \alert<2>{commands} contain angle brackets, the curly > brackets are erroneously escaped in the output. \alert{Commands} > that do not contain angle brackets work properly. > > ------------------------------------------------------------------------ > > Typing C-c C-e l will generate the output file: > > ------------------------------------------------------------------------ > > % Created 2010-01-15 Fri 13:57 > \documentclass{beamer} > \usepackage[latin1]{inputenc} > \usepackage[T1]{fontenc} > \usepackage{graphicx} > \usepackage{longtable} > \usepackage{float} > \usepackage{wrapfig} > \usepackage{soul} > \usepackage{amssymb} > \usepackage{hyperref} > > > \title{escCurly} > \author{} > \date{15 January 2010} > > \begin{document} > > \maketitle > > \begin{frame} > \frametitle{Outline} > \setcounter{tocdepth}{3} > \tableofcontents > \end{frame} > > \begin{frame} > \frametitle{The One and Only Frame} > \label{sec-1} > > When \LaTeX{} \alert<2>\{commands\} contain angle brackets, the curly > brackets are erroneously escaped in the output. \alert{Commands} > that do not contain angle brackets work properly. > \end{frame} > > \end{document}
2010-01-28 09:50:20 -05:00
"\\(?:<[^<>\n]*>\\)*"
Fix bug with protecting LaTeX macros The regular expression was not optimal, and if there was a horizontal rule, search would not start from the beginning of the buffer but from after the rule!
2009-12-16 13:45:05 -05:00
"\\(?:\\[[^][\n]*?\\]\\)*"
LaTeX export: Protect <...> arguments for BEAMER export Bill Jackson writes: > When exporting to LaTeX, curly brackets in a command will be escaped > if that command also contains angle brackets. This can be a problem > when using beamer. An example input file: > > ------------------------------------------------------------------------ > > #+LaTeX_CLASS: beamer > > * The One and Only Frame > When LaTeX \alert<2>{commands} contain angle brackets, the curly > brackets are erroneously escaped in the output. \alert{Commands} > that do not contain angle brackets work properly. > > ------------------------------------------------------------------------ > > Typing C-c C-e l will generate the output file: > > ------------------------------------------------------------------------ > > % Created 2010-01-15 Fri 13:57 > \documentclass{beamer} > \usepackage[latin1]{inputenc} > \usepackage[T1]{fontenc} > \usepackage{graphicx} > \usepackage{longtable} > \usepackage{float} > \usepackage{wrapfig} > \usepackage{soul} > \usepackage{amssymb} > \usepackage{hyperref} > > > \title{escCurly} > \author{} > \date{15 January 2010} > > \begin{document} > > \maketitle > > \begin{frame} > \frametitle{Outline} > \setcounter{tocdepth}{3} > \tableofcontents > \end{frame} > > \begin{frame} > \frametitle{The One and Only Frame} > \label{sec-1} > > When \LaTeX{} \alert<2>\{commands\} contain angle brackets, the curly > brackets are erroneously escaped in the output. \alert{Commands} > that do not contain angle brackets work properly. > \end{frame} > > \end{document}
2010-01-28 09:50:20 -05:00
"\\(?:<[^<>\n]*>\\)*"
Fix bug with protecting LaTeX macros The regular expression was not optimal, and if there was a horizontal rule, search would not start from the beginning of the buffer but from after the rule!
2009-12-16 13:45:05 -05:00
"\\(" (org-create-multibrace-regexp "{" "}" 3) "\\)\\{1,3\\}")))
LaTeX export: Fix some problems with protection of inline latex commands Scot Becker writes: > Prompted by Chris Gray's request for org markup in Latex > environment, I thought I'd submit a note (for his sake and > others') about a few quirks of org-latex-export's handling > of embedded Latex markup in org documents. I have been > puzzling with these for a while but only discovered the > problem triggers (and workarounds) this morning just before > Chris' mail arrived. These are both about inline Latex > commands: > > I use a few custom commands \mycommand{like this}, and > occasionally have to invoke the odd bit of standard LaTeX > markup, for example /when \textbf{embedding bold text} > inside italics/. For the most part, these work fine, but > I've discovered the following two 'gotchas' that happen when > exporting to LaTeX. > > 1. Inline Latex commands get their final curly brace > escaped with a slash (and therefore don't work) if they > spill over into another line, i.e. if they contain one or > more newlines. This is true also for standard LaTeX > commands like \textbf{} and \emph{}. > > ----------------SAMPLE------------------------ > \mycommand{So, for example this > wrapped setence gets a slash added just after the > final period and before the curly brace.} Org is quite > helpfully escaping the slash for LaTeX, apparently. > > \mycommand{no trouble if it's all on one line} > ------------------END------------------------- > > The workaround of putting all such commands on one line is > no hardship for me, since I use visual-line-mode in Emacs 23 > and keep my paragraphs as single logical lines. It might be > harder for those accustomed to hard-wrapping their > paragraphs. > > > 2. If you have two inline Latex commands on the same > logical line, org's latex export doesn't treat the text > between them in its usual manner. Italics get processed, > but not the latexification of quotes. ("this" --> ``this'') > For example: > > ----------------SAMPLE------------------------ > I have a short custom command to tell Latex to invoke a > Hebrew-language right-to-left environment when I want to refer to a > Hebrew phrase like this: \heb{phrase here}. But then if I "quote > something," and follow that by another \heb{phrase}, the inner > quotation marks don't get processed. Oddly enough, this problem is > only triggered when there is an inline Latex command both before and > after the quoted material on the same logical line. > > Now if you put a footnote in between those two inline Latex commands, > the output is really nutty: > > And \heb{phrase here} with a footnote[fn:: Footnote here.] I'm not > sure what funky org commands get invoked, but again, only when > bookended by an inline Latex command like \heb{phrase here}. > ------------------END------------------------- > > The nutty output is a number in square brackets like > this[1], with the following at the bottom of the document: > > \$\^{}{1}\$ Footnote here. > > This has a the opposite work-around: break the lines so > those elements are not all on the same logical line. Put in > a few newlines. Latex, of course doesn't care. Do take > care not to start a newline with the org-footnote, like this > [fn:: Org doesn't parse a footnote command which starts on > its own line.] > > This is just "for what it's worth" to those who use org-mode > as a front-end to writing for LaTeX. These problems were caused by a regular expression for matching latex macros with arguments, that did not allow any newlines. Now we have a much better regexp, that even allows for three levels of nested braces.
2009-04-16 08:17:51 -04:00
(while (re-search-forward re nil t)
Fix whitespace problems
2010-06-07 02:35:10 -04:00
(unless (or
org-latex: fix interpreted latex commands and snippets in footnotes * lisp/org-latex.el (org-export-latex-preprocess): first insert footnotes in the temporary buffer so their contents can properly be protected from further transformations if required.
2011-07-12 05:54:32 -04:00
;; Check for comment line.
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
(save-excursion (goto-char (match-beginning 0))
LaTeX Export: Fix problem with alignment specs that contain a comma
2010-05-14 08:27:35 -04:00
(org-in-indented-comment-line))
org-latex: fix interpreted latex commands and snippets in footnotes * lisp/org-latex.el (org-export-latex-preprocess): first insert footnotes in the temporary buffer so their contents can properly be protected from further transformations if required.
2011-07-12 05:54:32 -04:00
;; Check if this is a defined entity, so that is may
;; need conversion.
Allow entities to be terminated by {}
2010-04-07 09:32:31 -04:00
(org-entity-get (match-string 1))
org-latex: fix interpreted latex commands and snippets in footnotes * lisp/org-latex.el (org-export-latex-preprocess): first insert footnotes in the temporary buffer so their contents can properly be protected from further transformations if required.
2011-07-12 05:54:32 -04:00
;; Do not protect interior of footnotes. Those have
;; already been taken care of earlier in the function.
;; Yet, keep looking inside them for more commands.
(and (equal (match-string 1) "footnote")
(goto-char (match-end 1))))
LaTeX export: Fix bug with accidental multiline protection in comments
2009-09-06 01:54:31 -04:00
(add-text-properties (match-beginning 0) (match-end 0)
'(org-protected t)))))
Release 5.10a
2008-01-31 05:36:18 -05:00
LaTeX export: Make sure \nbsp{} does not create additional space * 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.
2010-07-14 04:54:39 -04:00
;; 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 "~"))))
Release 5.14
2008-01-31 05:37:51 -05:00
;; Protect LaTeX entities
(goto-char (point-min))
LaTeX export: Make sure \nbsp{} does not create additional space * 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.
2010-07-14 04:54:39 -04:00
(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))))
Release 5.14
2008-01-31 05:37:51 -05:00
Release 5.06d
2008-01-31 05:35:58 -05:00
;; Replace radio links
(goto-char (point-min))
Release 5.10a
2008-01-31 05:36:18 -05:00
(while (re-search-forward
Release 5.14
2008-01-31 05:37:51 -05:00
(concat "<<<?" org-export-latex-all-targets-re
Release 5.10a
2008-01-31 05:36:18 -05:00
">>>?\\((INVISIBLE)\\)?") nil t)
Protect target-like strings in verbatim emphasis Martin G. Skjaeveland writes: > Then I write > > some text some text ~<<some_scr_block_name>>~. > > because I want "<<some_scr_block_name>>" written as verbatim in my latex > export, I get, in latex, > > \texttt{\textbackslash{}label\{some\_src\_block\_name\}some\_src\_block\_name}. > > which gives me the text > > \label{some_src_block_name}some_src_block_name > > in verbatim.
2009-11-08 05:24:01 -05:00
(org-if-unprotected-at (+ (match-beginning 0) 2)
Don't convert link description parts that look like numeric footnote * lisp/org-latex.el (org-export-latex-preprocess): Don't convert link description parts that look like numeric footnote. Fixes a problem reported by Thomas S. Dye.
2010-12-19 08:54:16 -05:00
(replace-match
(concat
(org-export-latex-protect-string
(format "\\label{%s}" (save-match-data (org-solidify-link-text
(match-string 1)))))
(if (match-string 2) "" (match-string 1)))
t t)))
Release 5.10a
2008-01-31 05:36:18 -05:00
Release 5.07
2008-01-31 05:36:08 -05:00
;; Delete @<...> constructs
;; Thanks to Daniel Clemente for this regexp
org-export-latex.el: fake change (test)
2008-02-07 05:24:54 -05:00
(goto-char (point-min))
Release 5.07
2008-01-31 05:36:08 -05:00
(while (re-search-forward "@<\\(?:[^\"\n]\\|\".*\"\\)*?>" nil t)
LaTeX export: Properly protect entire LaTeX environments LaTeX environments should be left as they are, fully protected. There was a regular expression error in the code doing this.
2009-01-21 04:23:49 -05:00
(org-if-unprotected
org-latex: fix interpreted latex commands and snippets in footnotes * lisp/org-latex.el (org-export-latex-preprocess): first insert footnotes in the temporary buffer so their contents can properly be protected from further transformations if required.
2011-07-12 05:54:32 -04:00
(replace-match ""))))
Release 5.06d
2008-01-31 05:35:58 -05:00
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
(defun org-export-latex-fix-inputenc ()
Correct some docstrings [part 3] This is the third patch in a series that makes some straightforward corrections to a number of docstrings. Each change is normally to: - correct a typo, or - fix up hyperlinks to function or variable names, or - ensure slightly better conformance with the documentation guidelines and tips given in the Elisp manual No attempt is made to provide missing docstrings or document arguments. Cheers, Phil
2010-07-16 17:22:01 -04:00
"Set the coding system in inputenc to what the buffer is."
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
(let* ((cs buffer-file-coding-system)
Fix problem with a missing function in XEmacs `latexenc-coding-system-to-inputenc' does not seem to be available in XEmacs.
2010-03-12 11:29:41 -05:00
(opt (or (ignore-errors (latexenc-coding-system-to-inputenc cs))
"utf8")))
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
(when opt
;; Translate if that is requested
(setq opt (or (cdr (assoc opt org-export-latex-inputenc-alist)) opt))
;; find the \usepackage statement and replace the option
(goto-char (point-min))
LaTeX export: Set coding system only if the class specifies AUTO for it The coding system of the LaTeX class will now only be set to the value corresponding to the buffer's file coding system if the class specifies \usepackage[AUTO]{inputenc}. Any other value for the coding system will not be modified.
2010-01-24 05:21:34 -05:00
(while (re-search-forward "\\\\usepackage\\[\\(AUTO\\)\\]{inputenc}"
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
nil t)
(goto-char (match-beginning 1))
(delete-region (match-beginning 1) (match-end 1))
(insert opt))
LaTeX export: When exporting to a buffer only, do not require a file name
2010-02-12 02:34:00 -05:00
(and buffer-file-name
(save-buffer)))))
Fix \usepackage{inputenc} in LaTeX export The option will now reflect the coding system of the file that was created by exporting the buffer.
2010-01-10 04:18:27 -05:00
Release 5.14
2008-01-31 05:37:51 -05:00
;;; List handling:
(defun org-export-latex-lists ()
LaTeX Export: More standardization This commit removes some of the stuff that was specific for the LaTeX exporter, and falls back to the default configuration that works for all backends. Here is what the commit does: - The variable `org-export-latex-remove-from-headlines' is now obsolete. Instead, also LaTeX export now responds to the settings in the variables org-export-with-todo-keywords', `org-export-with-priority', and `org-export-with-tags' and in the corresponding OPTION settings. - Removal of time stamps and related keywords now already happens in the preprocessor, so that it will be perfectly the same for all backends. - The list functions have been extended to accept an additional parameter list, to overrule the default setting for a particular list function. This is used to make the checkbox appearance in LaTeX configurable, through the new variable `org-export-latex-list-parameters'.
2009-01-06 11:23:36 -05:00
"Convert plain text lists in current buffer into LaTeX lists."
org-latex: fix export with various values for `org-list-ending-method' * lisp/org-latex.el (org-export-latex-lists): make sure markers used for export are taken into account by temporarily setting an appropriate value for `org-list-ending-method'.
2011-02-28 05:04:46 -05:00
;; `org-list-end-re' output has changed since preprocess from
;; org-exp.el. Make sure it is taken into account.
org-list: Remove two defcustoms * lisp/org-list.el (org-list-ending-method, org-list-end-regexp): Removed variables. (org-in-item-p, org-list-separating-blank-lines-number, org-list-parse-list, org-list-struct): Apply changes. * lisp/org-exp.el (org-export-mark-list-end, org-export-mark-list-properties): Apply changes. * lisp/org-latex.el (org-export-latex-lists): Apply changes. * doc/org.texi (Plain lists): Document removal.
2012-02-16 17:47:43 -05:00
(let ((org-list-end-re "^ORG-LIST-END-MARKER\n"))
org-latex: fix export with various values for `org-list-ending-method' * lisp/org-latex.el (org-export-latex-lists): make sure markers used for export are taken into account by temporarily setting an appropriate value for `org-list-ending-method'.
2011-02-28 05:04:46 -05:00
(mapc
(lambda (e)
;; For each type of context allowed for list export (E), find
;; every list, parse it, delete it and insert resulting
;; conversion to latex (RES), while keeping the same
;; `original-indentation' property.
(let (res)
(goto-char (point-min))
(while (re-search-forward (org-item-beginning-re) nil t)
(when (and (eq (get-text-property (point) 'list-context) e)
(not (get-text-property (point) 'org-example)))
(beginning-of-line)
(setq res
(org-list-to-latex
;; Narrowing is needed because we're converting
;; from inner functions to outer ones.
(save-restriction
(narrow-to-region (point) (point-max))
(org-list-parse-list t))
org-export-latex-list-parameters))
;; Extend previous value of original-indentation to the
;; whole string
(insert (org-add-props res nil 'original-indentation
(org-find-text-property-in-string
'original-indentation res)))))))
;; List of allowed contexts for export, and the default one.
(append org-list-export-context '(nil)))))
Release 5.14
2008-01-31 05:37:51 -05:00
(defconst org-latex-entities
'("\\!"
"\\'"
"\\+"
"\\,"
"\\-"
"\\:"
"\\;"
"\\<"
"\\="
"\\>"
"\\Huge"
"\\LARGE"
"\\Large"
"\\Styles"
"\\\\"
"\\`"
How to write special LaTeX symbols Xin Shi <shixin111@gmail.com> wrote: > > Shr\"odinger   will give the o with two dots on top. Notice that the " is a double quotation mark.  > > However, when org translate that into LaTeX, it will become two single quotation mark! \'' (it's very hard to see the difference, but the pdf version will > see the wrong result). > > Could someone tell me how to do that? > It works correctly in headlines, but not in running text. I think [fn:1] that it is a bug and that the following patch fixes it: --8<---------------cut here---------------start------------->8--- --8<---------------cut here---------------end--------------->8--- but I have not tested it extensively and it may do more harm than good: I'd wait for a more definitive opinion. Alternatively, you can use UTF-8 in your org file and write Schrödinger explicitly. This will survive the LaTeX export intact and the \usepackage[utf8]{inputenc} in the LaTeX file will do the right thing with it.[fn:2] Nick Footnotes: [fn:1] but I'm really not sure: I've lost track of how things work in LaTeX export - sigh... [fn:2] I'm not sure whether it will survive the email trip though. Here's hoping that it will.
2011-01-16 03:53:28 -05:00
"\\\""
Release 5.14
2008-01-31 05:37:51 -05:00
"\\addcontentsline"
"\\address"
"\\addtocontents"
"\\addtocounter"
"\\addtolength"
"\\addvspace"
"\\alph"
"\\appendix"
"\\arabic"
"\\author"
"\\begin{array}"
"\\begin{center}"
"\\begin{description}"
"\\begin{enumerate}"
"\\begin{eqnarray}"
"\\begin{equation}"
"\\begin{figure}"
"\\begin{flushleft}"
"\\begin{flushright}"
"\\begin{itemize}"
"\\begin{list}"
"\\begin{minipage}"
"\\begin{picture}"
"\\begin{quotation}"
"\\begin{quote}"
"\\begin{tabbing}"
"\\begin{table}"
"\\begin{tabular}"
"\\begin{thebibliography}"
"\\begin{theorem}"
"\\begin{titlepage}"
"\\begin{verbatim}"
"\\begin{verse}"
"\\bf"
"\\bf"
"\\bibitem"
"\\bigskip"
"\\cdots"
"\\centering"
"\\circle"
"\\cite"
"\\cleardoublepage"
"\\clearpage"
"\\cline"
"\\closing"
"\\dashbox"
"\\date"
"\\ddots"
"\\dotfill"
"\\em"
"\\fbox"
"\\flushbottom"
"\\fnsymbol"
"\\footnote"
"\\footnotemark"
"\\footnotesize"
"\\footnotetext"
"\\frac"
"\\frame"
"\\framebox"
"\\hfill"
"\\hline"
"\\hrulespace"
"\\hspace"
"\\huge"
"\\hyphenation"
"\\include"
"\\includeonly"
"\\indent"
"\\input"
"\\it"
"\\kill"
"\\label"
"\\large"
"\\ldots"
"\\line"
"\\linebreak"
"\\linethickness"
"\\listoffigures"
"\\listoftables"
"\\location"
"\\makebox"
"\\maketitle"
"\\mark"
"\\mbox"
"\\medskip"
"\\multicolumn"
"\\multiput"
"\\newcommand"
"\\newcounter"
"\\newenvironment"
"\\newfont"
"\\newlength"
"\\newline"
"\\newpage"
"\\newsavebox"
"\\newtheorem"
"\\nocite"
"\\nofiles"
"\\noindent"
"\\nolinebreak"
"\\nopagebreak"
"\\normalsize"
"\\onecolumn"
"\\opening"
"\\oval"
"\\overbrace"
"\\overline"
"\\pagebreak"
"\\pagenumbering"
"\\pageref"
"\\pagestyle"
"\\par"
"\\parbox"
"\\put"
"\\raggedbottom"
"\\raggedleft"
"\\raggedright"
"\\raisebox"
"\\ref"
"\\rm"
"\\roman"
"\\rule"
"\\savebox"
"\\sc"
"\\scriptsize"
"\\setcounter"
"\\setlength"
"\\settowidth"
"\\sf"
"\\shortstack"
"\\signature"
"\\sl"
"\\small"
"\\smallskip"
"\\sqrt"
"\\tableofcontents"
"\\telephone"
"\\thanks"
"\\thispagestyle"
"\\tiny"
"\\title"
"\\tt"
"\\twocolumn"
"\\typein"
"\\typeout"
"\\underbrace"
"\\underline"
"\\usebox"
"\\usecounter"
"\\value"
"\\vdots"
"\\vector"
"\\verb"
"\\vfill"
"\\vline"
"\\vspace")
"A list of LaTeX commands to be protected when performing conversion.")
The the problem of partial name matches with LaTeX entities.
2008-10-18 04:44:41 -04:00
(defconst org-latex-entities-regexp
(let (names rest)
(dolist (x org-latex-entities)
LaTeX export: Fix regular expression error, problem with case-fold-search
2009-11-12 03:38:39 -05:00
(if (string-match "[a-zA-Z]$" x)
The the problem of partial name matches with LaTeX entities.
2008-10-18 04:44:41 -04:00
(push x names)
(push x rest)))
(concat "\\(" (regexp-opt (nreverse names)) "\\>\\)"
"\\|\\(" (regexp-opt (nreverse rest)) "\\)")))
Release 5.06d
2008-01-31 05:35:58 -05:00
(provide 'org-export-latex)
Rename org-export-latex.el to org-latex.el For consistency, this file gets a new name.
2009-04-09 11:25:44 -04:00
(provide 'org-latex)
Release 5.06d
2008-01-31 05:35:58 -05:00
Rename org-export-latex.el to org-latex.el For consistency, this file gets a new name.
2009-04-09 11:25:44 -04:00
;;; org-latex.el ends here