2012-02-22 09:44:21 -05:00
|
|
|
|
;;; org-e-odt.el --- OpenDocument Text exporter for Org-mode
|
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
;; Author: Jambunathan K <kjambunathan at gmail dot com>
|
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
|
2012-08-15 18:01:59 -04:00
|
|
|
|
;; This file is not part of GNU Emacs.
|
2012-02-22 09:44:21 -05: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.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
2012-05-18 04:18:42 -04:00
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(eval-when-compile
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(require 'cl)
|
|
|
|
|
(require 'table))
|
|
|
|
|
(require 'format-spec)
|
2012-06-01 15:42:24 -04:00
|
|
|
|
(require 'org-export)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-05-18 04:18:42 -04:00
|
|
|
|
;;; Define Back-End
|
|
|
|
|
|
2012-07-23 08:06:13 -04:00
|
|
|
|
(org-export-define-backend e-odt
|
2012-07-23 11:51:36 -04:00
|
|
|
|
((bold . org-e-odt-bold)
|
2012-07-23 08:06:13 -04:00
|
|
|
|
(center-block . org-e-odt-center-block)
|
|
|
|
|
(clock . org-e-odt-clock)
|
|
|
|
|
(code . org-e-odt-code)
|
|
|
|
|
(drawer . org-e-odt-drawer)
|
|
|
|
|
(dynamic-block . org-e-odt-dynamic-block)
|
|
|
|
|
(entity . org-e-odt-entity)
|
|
|
|
|
(example-block . org-e-odt-example-block)
|
|
|
|
|
(export-block . org-e-odt-export-block)
|
|
|
|
|
(export-snippet . org-e-odt-export-snippet)
|
|
|
|
|
(fixed-width . org-e-odt-fixed-width)
|
|
|
|
|
(footnote-definition . org-e-odt-footnote-definition)
|
|
|
|
|
(footnote-reference . org-e-odt-footnote-reference)
|
|
|
|
|
(headline . org-e-odt-headline)
|
|
|
|
|
(horizontal-rule . org-e-odt-horizontal-rule)
|
|
|
|
|
(inline-src-block . org-e-odt-inline-src-block)
|
|
|
|
|
(inlinetask . org-e-odt-inlinetask)
|
|
|
|
|
(italic . org-e-odt-italic)
|
|
|
|
|
(item . org-e-odt-item)
|
|
|
|
|
(keyword . org-e-odt-keyword)
|
|
|
|
|
(latex-environment . org-e-odt-latex-environment)
|
|
|
|
|
(latex-fragment . org-e-odt-latex-fragment)
|
|
|
|
|
(line-break . org-e-odt-line-break)
|
|
|
|
|
(link . org-e-odt-link)
|
|
|
|
|
(paragraph . org-e-odt-paragraph)
|
|
|
|
|
(plain-list . org-e-odt-plain-list)
|
|
|
|
|
(plain-text . org-e-odt-plain-text)
|
|
|
|
|
(planning . org-e-odt-planning)
|
|
|
|
|
(property-drawer . org-e-odt-property-drawer)
|
|
|
|
|
(quote-block . org-e-odt-quote-block)
|
|
|
|
|
(quote-section . org-e-odt-quote-section)
|
|
|
|
|
(radio-target . org-e-odt-radio-target)
|
|
|
|
|
(section . org-e-odt-section)
|
|
|
|
|
(special-block . org-e-odt-special-block)
|
|
|
|
|
(src-block . org-e-odt-src-block)
|
|
|
|
|
(statistics-cookie . org-e-odt-statistics-cookie)
|
|
|
|
|
(strike-through . org-e-odt-strike-through)
|
|
|
|
|
(subscript . org-e-odt-subscript)
|
|
|
|
|
(superscript . org-e-odt-superscript)
|
|
|
|
|
(table . org-e-odt-table)
|
|
|
|
|
(table-cell . org-e-odt-table-cell)
|
|
|
|
|
(table-row . org-e-odt-table-row)
|
|
|
|
|
(target . org-e-odt-target)
|
|
|
|
|
(template . org-e-odt-template)
|
|
|
|
|
(timestamp . org-e-odt-timestamp)
|
|
|
|
|
(underline . org-e-odt-underline)
|
|
|
|
|
(verbatim . org-e-odt-verbatim)
|
|
|
|
|
(verse-block . org-e-odt-verse-block))
|
|
|
|
|
:export-block "ODT"
|
2012-09-04 15:38:30 -04:00
|
|
|
|
:filters-alist ((:filter-parse-tree
|
2012-09-13 16:41:03 -04:00
|
|
|
|
. (org-e-odt--translate-latex-fragments
|
|
|
|
|
org-e-odt--translate-description-lists
|
2012-09-04 15:38:30 -04:00
|
|
|
|
org-e-odt--translate-list-tables)))
|
2012-09-09 07:08:52 -04:00
|
|
|
|
:menu-entry
|
|
|
|
|
(?o "Export to ODT"
|
|
|
|
|
((?o "As ODT file" org-e-odt-export-to-odt)
|
|
|
|
|
(?O "As ODT file and open"
|
|
|
|
|
(lambda (s v b)
|
|
|
|
|
(org-open-file (org-e-odt-export-to-odt s v b) 'system)))))
|
2012-07-23 08:06:13 -04:00
|
|
|
|
:options-alist
|
|
|
|
|
((:odt-styles-file "ODT_STYLES_FILE" nil nil t)
|
|
|
|
|
(:LaTeX-fragments nil "LaTeX" org-export-with-LaTeX-fragments)))
|
|
|
|
|
|
2012-05-18 04:18:42 -04:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;;; Dependencies
|
2012-05-18 04:18:42 -04:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;;; Hooks
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;;; Function Declarations
|
2012-06-03 18:29:49 -04:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(declare-function org-id-find-id-file "org-id" (id))
|
|
|
|
|
(declare-function hfy-face-to-style "htmlfontify" (fn))
|
|
|
|
|
(declare-function hfy-face-or-def-to-name "htmlfontify" (fn))
|
|
|
|
|
(declare-function archive-zip-extract "arc-mode.el" (archive name))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(declare-function org-create-math-formula "org" (latex-frag &optional
|
|
|
|
|
mathml-file))
|
2012-07-19 13:45:44 -04:00
|
|
|
|
(declare-function browse-url-file-url "browse-url" (file))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
;;; Internal Variables
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-lib-dir
|
|
|
|
|
(file-name-directory load-file-name)
|
|
|
|
|
"Location of ODT exporter.
|
|
|
|
|
Use this to infer values of `org-e-odt-styles-dir' and
|
|
|
|
|
`org-e-odt-schema-dir'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defvar org-e-odt-data-dir
|
|
|
|
|
(expand-file-name "../../etc/" org-e-odt-lib-dir)
|
|
|
|
|
"Data directory for ODT exporter.
|
|
|
|
|
Use this to infer values of `org-e-odt-styles-dir' and
|
|
|
|
|
`org-e-odt-schema-dir'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-special-string-regexps
|
|
|
|
|
'(("\\\\-" . "­\\1") ; shy
|
|
|
|
|
("---\\([^-]\\)" . "—\\1") ; mdash
|
|
|
|
|
("--\\([^-]\\)" . "–\\1") ; ndash
|
|
|
|
|
("\\.\\.\\." . "…")) ; hellip
|
|
|
|
|
"Regular expressions for special string conversion.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-schema-dir-list
|
|
|
|
|
(list
|
|
|
|
|
(and org-e-odt-data-dir
|
|
|
|
|
(expand-file-name "./schema/" org-e-odt-data-dir)) ; bail out
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(and (boundp 'org-e-odt-data-dir) org-e-odt-data-dir ; see make install
|
|
|
|
|
(expand-file-name "./schema/" org-e-odt-data-dir))))
|
|
|
|
|
"List of directories to search for OpenDocument schema files.
|
|
|
|
|
Use this list to set the default value of
|
|
|
|
|
`org-e-odt-schema-dir'. The entries in this list are
|
|
|
|
|
populated heuristically based on the values of `org-e-odt-lib-dir'
|
|
|
|
|
and `org-e-odt-data-dir'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-styles-dir-list
|
|
|
|
|
(list
|
|
|
|
|
(and org-e-odt-data-dir
|
|
|
|
|
(expand-file-name "./styles/" org-e-odt-data-dir)) ; bail out
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
(and (boundp 'org-e-odt-data-dir) org-e-odt-data-dir ; see make install
|
|
|
|
|
(expand-file-name "./styles/" org-e-odt-data-dir)))
|
|
|
|
|
(expand-file-name "../../etc/styles/" org-e-odt-lib-dir) ; git
|
|
|
|
|
(expand-file-name "./etc/styles/" org-e-odt-lib-dir) ; elpa
|
|
|
|
|
(expand-file-name "./org/" data-directory) ; system
|
|
|
|
|
)
|
|
|
|
|
"List of directories to search for OpenDocument styles files.
|
|
|
|
|
See `org-e-odt-styles-dir'. The entries in this list are populated
|
|
|
|
|
heuristically based on the values of `org-e-odt-lib-dir' and
|
|
|
|
|
`org-e-odt-data-dir'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-styles-dir
|
|
|
|
|
(let* ((styles-dir
|
|
|
|
|
(catch 'styles-dir
|
|
|
|
|
(message "Debug (org-e-odt): Searching for OpenDocument styles files...")
|
|
|
|
|
(mapc (lambda (styles-dir)
|
|
|
|
|
(when styles-dir
|
|
|
|
|
(message "Debug (org-e-odt): Trying %s..." styles-dir)
|
|
|
|
|
(when (and (file-readable-p
|
|
|
|
|
(expand-file-name
|
|
|
|
|
"OrgOdtContentTemplate.xml" styles-dir))
|
|
|
|
|
(file-readable-p
|
|
|
|
|
(expand-file-name
|
|
|
|
|
"OrgOdtStyles.xml" styles-dir)))
|
|
|
|
|
(message "Debug (org-e-odt): Using styles under %s"
|
|
|
|
|
styles-dir)
|
|
|
|
|
(throw 'styles-dir styles-dir))))
|
|
|
|
|
org-e-odt-styles-dir-list)
|
|
|
|
|
nil)))
|
|
|
|
|
(unless styles-dir
|
|
|
|
|
(error "Error (org-e-odt): Cannot find factory styles files. Aborting."))
|
|
|
|
|
styles-dir)
|
|
|
|
|
"Directory that holds auxiliary XML files used by the ODT exporter.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
This directory contains the following XML files -
|
|
|
|
|
\"OrgOdtStyles.xml\" and \"OrgOdtContentTemplate.xml\". These
|
|
|
|
|
XML files are used as the default values of
|
|
|
|
|
`org-e-odt-styles-file' and
|
|
|
|
|
`org-e-odt-content-template-file'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
The default value of this variable varies depending on the
|
|
|
|
|
version of org in use and is initialized from
|
|
|
|
|
`org-e-odt-styles-dir-list'. Note that the user could be using org
|
|
|
|
|
from one of: org's own private git repository, GNU ELPA tar or
|
|
|
|
|
standard Emacs.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-bookmark-prefix "OrgXref.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-manifest-file-entry-tag
|
|
|
|
|
"\n<manifest:file-entry manifest:media-type=\"%s\" manifest:full-path=\"%s\"%s/>")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defconst org-e-odt-file-extensions
|
|
|
|
|
'(("odt" . "OpenDocument Text")
|
|
|
|
|
("ott" . "OpenDocument Text Template")
|
|
|
|
|
("odm" . "OpenDocument Master Document")
|
|
|
|
|
("ods" . "OpenDocument Spreadsheet")
|
|
|
|
|
("ots" . "OpenDocument Spreadsheet Template")
|
|
|
|
|
("odg" . "OpenDocument Drawing (Graphics)")
|
|
|
|
|
("otg" . "OpenDocument Drawing Template")
|
|
|
|
|
("odp" . "OpenDocument Presentation")
|
|
|
|
|
("otp" . "OpenDocument Presentation Template")
|
|
|
|
|
("odi" . "OpenDocument Image")
|
|
|
|
|
("odf" . "OpenDocument Formula")
|
|
|
|
|
("odc" . "OpenDocument Chart")))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defconst org-e-odt-table-style-format
|
2012-07-19 12:45:23 -04:00
|
|
|
|
"
|
|
|
|
|
<style:style style:name=\"%s\" style:family=\"table\">
|
|
|
|
|
<style:table-properties style:rel-width=\"%d%%\" fo:margin-top=\"0cm\" fo:margin-bottom=\"0.20cm\" table:align=\"center\"/>
|
|
|
|
|
</style:style>
|
|
|
|
|
"
|
|
|
|
|
"Template for auto-generated Table styles.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defvar org-e-odt-automatic-styles '()
|
|
|
|
|
"Registry of automatic styles for various OBJECT-TYPEs.
|
|
|
|
|
The variable has the following form:
|
|
|
|
|
\(\(OBJECT-TYPE-A
|
|
|
|
|
\(\(OBJECT-NAME-A.1 OBJECT-PROPS-A.1\)
|
|
|
|
|
\(OBJECT-NAME-A.2 OBJECT-PROPS-A.2\) ...\)\)
|
|
|
|
|
\(OBJECT-TYPE-B
|
|
|
|
|
\(\(OBJECT-NAME-B.1 OBJECT-PROPS-B.1\)
|
|
|
|
|
\(OBJECT-NAME-B.2 OBJECT-PROPS-B.2\) ...\)\)
|
|
|
|
|
...\).
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
OBJECT-TYPEs could be \"Section\", \"Table\", \"Figure\" etc.
|
|
|
|
|
OBJECT-PROPS is (typically) a plist created by passing
|
|
|
|
|
\"#+ATTR_ODT: \" option to `org-e-odt-parse-block-attributes'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
Use `org-e-odt-add-automatic-style' to add update this variable.'")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defvar org-e-odt-object-counters nil
|
|
|
|
|
"Running counters for various OBJECT-TYPEs.
|
|
|
|
|
Use this to generate automatic names and style-names. See
|
|
|
|
|
`org-e-odt-add-automatic-style'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defvar org-e-odt-src-block-paragraph-format
|
|
|
|
|
"<style:style style:name=\"OrgSrcBlock\" style:family=\"paragraph\" style:parent-style-name=\"Preformatted_20_Text\">
|
|
|
|
|
<style:paragraph-properties fo:background-color=\"%s\" fo:padding=\"0.049cm\" fo:border=\"0.51pt solid #000000\" style:shadow=\"none\">
|
|
|
|
|
<style:background-image/>
|
|
|
|
|
</style:paragraph-properties>
|
|
|
|
|
<style:text-properties fo:color=\"%s\"/>
|
|
|
|
|
</style:style>"
|
|
|
|
|
"Custom paragraph style for colorized source and example blocks.
|
|
|
|
|
This style is much the same as that of \"OrgFixedWidthBlock\"
|
|
|
|
|
except that the foreground and background colors are set
|
|
|
|
|
according to the default face identified by the `htmlfontify'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
(defvar hfy-optimisations)
|
|
|
|
|
(defvar org-e-odt-embedded-formulas-count 0)
|
|
|
|
|
(defvar org-e-odt-embedded-images-count 0)
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defvar org-e-odt-image-size-probe-method
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(append (and (executable-find "identify") '(imagemagick)) ; See Bug#10675
|
|
|
|
|
'(emacs fixed))
|
|
|
|
|
"Ordered list of methods for determining image sizes.")
|
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defvar org-e-odt-default-image-sizes-alist
|
2012-02-22 09:44:21 -05:00
|
|
|
|
'(("as-char" . (5 . 0.4))
|
|
|
|
|
("paragraph" . (5 . 5)))
|
|
|
|
|
"Hardcoded image dimensions one for each of the anchor
|
|
|
|
|
methods.")
|
|
|
|
|
|
|
|
|
|
;; A4 page size is 21.0 by 29.7 cms
|
|
|
|
|
;; The default page settings has 2cm margin on each of the sides. So
|
|
|
|
|
;; the effective text area is 17.0 by 25.7 cm
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defvar org-e-odt-max-image-size '(17.0 . 20.0)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
"Limiting dimensions for an embedded image.")
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defconst org-e-odt-label-styles
|
2012-04-06 05:00:39 -04:00
|
|
|
|
'(("math-formula" "%c" "text" "(%n)")
|
|
|
|
|
("math-label" "(%n)" "text" "(%n)")
|
|
|
|
|
("category-and-value" "%e %n: %c" "category-and-value" "%e %n")
|
|
|
|
|
("value" "%e %n: %c" "value" "%n"))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
"Specify how labels are applied and referenced.
|
|
|
|
|
This is an alist where each element is of the
|
|
|
|
|
form (LABEL-STYLE-NAME LABEL-ATTACH-FMT LABEL-REF-MODE
|
|
|
|
|
LABEL-REF-FMT).
|
|
|
|
|
|
|
|
|
|
LABEL-ATTACH-FMT controls how labels and captions are attached to
|
|
|
|
|
an entity. It may contain following specifiers - %e, %n and %c.
|
|
|
|
|
%e is replaced with the CATEGORY-NAME. %n is replaced with
|
|
|
|
|
\"<text:sequence ...> SEQNO </text:sequence>\". %c is replaced
|
|
|
|
|
with CAPTION. See `org-e-odt-format-label-definition'.
|
|
|
|
|
|
|
|
|
|
LABEL-REF-MODE and LABEL-REF-FMT controls how label references
|
|
|
|
|
are generated. The following XML is generated for a label
|
|
|
|
|
reference - \"<text:sequence-ref
|
|
|
|
|
text:reference-format=\"LABEL-REF-MODE\" ...> LABEL-REF-FMT
|
|
|
|
|
</text:sequence-ref>\". LABEL-REF-FMT may contain following
|
|
|
|
|
specifiers - %e and %n. %e is replaced with the CATEGORY-NAME.
|
|
|
|
|
%n is replaced with SEQNO. See
|
|
|
|
|
`org-e-odt-format-label-reference'.")
|
|
|
|
|
|
|
|
|
|
(defvar org-e-odt-category-map-alist
|
2012-09-13 16:41:03 -04:00
|
|
|
|
'(("__Table__" "Table" "value" "Table" org-e-odt--enumerable-p)
|
|
|
|
|
("__Figure__" "Illustration" "value" "Figure" org-e-odt--enumerable-image-p)
|
|
|
|
|
("__MathFormula__" "Text" "math-formula" "Equation" org-e-odt--enumerable-formula-p)
|
|
|
|
|
("__DvipngImage__" "Equation" "value" "Equation" org-e-odt--enumerable-latex-image-p)
|
|
|
|
|
("__Listing__" "Listing" "value" "Listing" org-e-odt--enumerable-p)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; ("__Table__" "Table" "category-and-value")
|
|
|
|
|
;; ("__Figure__" "Figure" "category-and-value")
|
|
|
|
|
;; ("__DvipngImage__" "Equation" "category-and-value")
|
|
|
|
|
)
|
2012-04-06 05:00:39 -04:00
|
|
|
|
"Map a CATEGORY-HANDLE to OD-VARIABLE and LABEL-STYLE.
|
|
|
|
|
This is a list where each entry is of the form \\(CATEGORY-HANDLE
|
2012-09-13 16:41:03 -04:00
|
|
|
|
OD-VARIABLE LABEL-STYLE CATEGORY-NAME ENUMERATOR-PREDICATE\\).
|
|
|
|
|
|
|
|
|
|
CATEGORY_HANDLE identifies the captionable entity in question.
|
|
|
|
|
|
|
|
|
|
OD-VARIABLE is the OpenDocument sequence counter associated with
|
|
|
|
|
the entity. These counters are declared within
|
2012-04-06 05:00:39 -04:00
|
|
|
|
\"<text:sequence-decls>...</text:sequence-decls>\" block of
|
2012-09-13 16:41:03 -04:00
|
|
|
|
`org-e-odt-content-template-file'.
|
|
|
|
|
|
|
|
|
|
LABEL-STYLE is a key into `org-e-odt-label-styles' and specifies
|
|
|
|
|
how a given entity should be captioned and referenced.
|
|
|
|
|
|
|
|
|
|
CATEGORY-NAME is used for qualifying captions on export. You can
|
|
|
|
|
modify the CATEGORY-NAME used in the exported document by
|
|
|
|
|
modifying `org-export-dictionary'. For example, an embedded
|
|
|
|
|
image in an English document is captioned as \"Figure 1: Orgmode
|
|
|
|
|
Logo\", by default. If you want the image to be captioned as
|
|
|
|
|
\"Illustration 1: Orgmode Logo\" instead, install an entry in
|
2012-07-15 18:08:07 -04:00
|
|
|
|
`org-export-dictionary' which translates \"Figure\" to
|
|
|
|
|
\"Illustration\" when the language is \"en\" and encoding is
|
2012-09-13 16:41:03 -04:00
|
|
|
|
`:utf-8'.
|
|
|
|
|
|
|
|
|
|
ENUMERATOR-PREDICATE is used for assigning a sequence number to
|
|
|
|
|
the entity. See `org-e-odt--enumerate'.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
(defvar org-e-odt-manifest-file-entries nil)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defvar hfy-user-sheet-assoc)
|
|
|
|
|
|
|
|
|
|
(defvar org-e-odt-zip-dir nil
|
|
|
|
|
"Temporary work directory for OpenDocument exporter.")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; User Configuration Variables
|
|
|
|
|
|
|
|
|
|
(defgroup org-export-e-odt nil
|
2012-04-06 05:00:39 -04:00
|
|
|
|
"Options for exporting Org mode files to ODT."
|
|
|
|
|
:tag "Org Export ODT"
|
2012-02-22 09:44:21 -05:00
|
|
|
|
:group 'org-export)
|
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
|
|
|
|
|
;;;; Debugging
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-prettify-xml nil
|
|
|
|
|
"Specify whether or not the xml output should be prettified.
|
|
|
|
|
When this option is turned on, `indent-region' is run on all
|
|
|
|
|
component xml buffers before they are saved. Turn this off for
|
|
|
|
|
regular use. Turn this on if you need to examine the xml
|
|
|
|
|
visually."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Document schema
|
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defcustom org-e-odt-schema-dir
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(let* ((schema-dir
|
|
|
|
|
(catch 'schema-dir
|
|
|
|
|
(message "Debug (org-e-odt): Searching for OpenDocument schema files...")
|
|
|
|
|
(mapc
|
|
|
|
|
(lambda (schema-dir)
|
|
|
|
|
(when schema-dir
|
|
|
|
|
(message "Debug (org-e-odt): Trying %s..." schema-dir)
|
|
|
|
|
(when (and (file-readable-p
|
|
|
|
|
(expand-file-name "od-manifest-schema-v1.2-cs01.rnc"
|
|
|
|
|
schema-dir))
|
|
|
|
|
(file-readable-p
|
|
|
|
|
(expand-file-name "od-schema-v1.2-cs01.rnc"
|
|
|
|
|
schema-dir))
|
|
|
|
|
(file-readable-p
|
|
|
|
|
(expand-file-name "schemas.xml" schema-dir)))
|
|
|
|
|
(message "Debug (org-e-odt): Using schema files under %s"
|
|
|
|
|
schema-dir)
|
|
|
|
|
(throw 'schema-dir schema-dir))))
|
|
|
|
|
org-e-odt-schema-dir-list)
|
|
|
|
|
(message "Debug (org-e-odt): No OpenDocument schema files installed")
|
|
|
|
|
nil)))
|
|
|
|
|
schema-dir)
|
|
|
|
|
"Directory that contains OpenDocument schema files.
|
|
|
|
|
|
|
|
|
|
This directory contains:
|
|
|
|
|
1. rnc files for OpenDocument schema
|
|
|
|
|
2. a \"schemas.xml\" file that specifies locating rules needed
|
|
|
|
|
for auto validation of OpenDocument XML files.
|
|
|
|
|
|
|
|
|
|
Use the customize interface to set this variable. This ensures
|
|
|
|
|
that `rng-schema-locating-files' is updated and auto-validation
|
|
|
|
|
of OpenDocument XML takes place based on the value
|
|
|
|
|
`rng-nxml-auto-validate-flag'.
|
|
|
|
|
|
|
|
|
|
The default value of this variable varies depending on the
|
|
|
|
|
version of org in use and is initialized from
|
|
|
|
|
`org-e-odt-schema-dir-list'. The OASIS schema files are available
|
|
|
|
|
only in the org's private git repository. It is *not* bundled
|
|
|
|
|
with GNU ELPA tar or standard Emacs distribution."
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "Not set" nil)
|
|
|
|
|
(directory :tag "Schema directory"))
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:set
|
|
|
|
|
(lambda (var value)
|
2012-04-04 12:59:04 -04:00
|
|
|
|
"Set `org-e-odt-schema-dir'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
Also add it to `rng-schema-locating-files'."
|
|
|
|
|
(let ((schema-dir value))
|
|
|
|
|
(set var
|
|
|
|
|
(if (and
|
|
|
|
|
(file-readable-p
|
|
|
|
|
(expand-file-name "od-manifest-schema-v1.2-cs01.rnc" schema-dir))
|
|
|
|
|
(file-readable-p
|
|
|
|
|
(expand-file-name "od-schema-v1.2-cs01.rnc" schema-dir))
|
|
|
|
|
(file-readable-p
|
|
|
|
|
(expand-file-name "schemas.xml" schema-dir)))
|
|
|
|
|
schema-dir
|
|
|
|
|
(when value
|
|
|
|
|
(message "Error (org-e-odt): %s has no OpenDocument schema files"
|
|
|
|
|
value))
|
|
|
|
|
nil)))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(when org-e-odt-schema-dir
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(eval-after-load 'rng-loc
|
|
|
|
|
'(add-to-list 'rng-schema-locating-files
|
|
|
|
|
(expand-file-name "schemas.xml"
|
2012-04-04 12:59:04 -04:00
|
|
|
|
org-e-odt-schema-dir))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
|
|
|
|
|
;;;; Document styles
|
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defcustom org-e-odt-content-template-file nil
|
2012-02-22 09:44:21 -05:00
|
|
|
|
"Template file for \"content.xml\".
|
|
|
|
|
The exporter embeds the exported content just before
|
|
|
|
|
\"</office:text>\" element.
|
|
|
|
|
|
|
|
|
|
If unspecified, the file named \"OrgOdtContentTemplate.xml\"
|
|
|
|
|
under `org-e-odt-styles-dir' is used."
|
|
|
|
|
:type 'file
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1")
|
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defcustom org-e-odt-styles-file nil
|
2012-02-22 09:44:21 -05:00
|
|
|
|
"Default styles file for use with ODT export.
|
|
|
|
|
Valid values are one of:
|
|
|
|
|
1. nil
|
|
|
|
|
2. path to a styles.xml file
|
|
|
|
|
3. path to a *.odt or a *.ott file
|
|
|
|
|
4. list of the form (ODT-OR-OTT-FILE (FILE-MEMBER-1 FILE-MEMBER-2
|
|
|
|
|
...))
|
|
|
|
|
|
|
|
|
|
In case of option 1, an in-built styles.xml is used. See
|
|
|
|
|
`org-e-odt-styles-dir' for more information.
|
|
|
|
|
|
|
|
|
|
In case of option 3, the specified file is unzipped and the
|
|
|
|
|
styles.xml embedded therein is used.
|
|
|
|
|
|
|
|
|
|
In case of option 4, the specified ODT-OR-OTT-FILE is unzipped
|
|
|
|
|
and FILE-MEMBER-1, FILE-MEMBER-2 etc are copied in to the
|
|
|
|
|
generated odt file. Use relative path for specifying the
|
|
|
|
|
FILE-MEMBERS. styles.xml must be specified as one of the
|
|
|
|
|
FILE-MEMBERS.
|
|
|
|
|
|
|
|
|
|
Use options 1, 2 or 3 only if styles.xml alone suffices for
|
|
|
|
|
achieving the desired formatting. Use option 4, if the styles.xml
|
|
|
|
|
references additional files like header and footer images for
|
|
|
|
|
achieving the desired formatting.
|
|
|
|
|
|
|
|
|
|
Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on
|
|
|
|
|
a per-file basis. For example,
|
|
|
|
|
|
|
|
|
|
#+ODT_STYLES_FILE: \"/path/to/styles.xml\" or
|
|
|
|
|
#+ODT_STYLES_FILE: (\"/path/to/file.ott\" (\"styles.xml\" \"image/hdr.png\"))."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type
|
|
|
|
|
'(choice
|
|
|
|
|
(const :tag "Factory settings" nil)
|
|
|
|
|
(file :must-match t :tag "styles.xml")
|
|
|
|
|
(file :must-match t :tag "ODT or OTT file")
|
|
|
|
|
(list :tag "ODT or OTT file + Members"
|
|
|
|
|
(file :must-match t :tag "ODF Text or Text Template file")
|
|
|
|
|
(cons :tag "Members"
|
|
|
|
|
(file :tag " Member" "styles.xml")
|
|
|
|
|
(repeat (file :tag "Member"))))))
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defcustom org-e-odt-display-outline-level 2
|
|
|
|
|
"Outline levels considered for enumerating captioned entities."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.2"
|
|
|
|
|
:type 'integer)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
;;;; Document conversion
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defcustom org-e-odt-convert-processes
|
2012-02-22 09:44:21 -05:00
|
|
|
|
'(("LibreOffice"
|
|
|
|
|
"soffice --headless --convert-to %f%x --outdir %d %i")
|
|
|
|
|
("unoconv"
|
|
|
|
|
"unoconv -f %f -o %d %i"))
|
|
|
|
|
"Specify a list of document converters and their usage.
|
|
|
|
|
The converters in this list are offered as choices while
|
2012-04-04 12:59:04 -04:00
|
|
|
|
customizing `org-e-odt-convert-process'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
This variable is a list where each element is of the
|
|
|
|
|
form (CONVERTER-NAME CONVERTER-CMD). CONVERTER-NAME is the name
|
|
|
|
|
of the converter. CONVERTER-CMD is the shell command for the
|
|
|
|
|
converter and can contain format specifiers. These format
|
|
|
|
|
specifiers are interpreted as below:
|
|
|
|
|
|
|
|
|
|
%i input file name in full
|
|
|
|
|
%I input file name as a URL
|
|
|
|
|
%f format of the output file
|
|
|
|
|
%o output file name in full
|
|
|
|
|
%O output file name as a URL
|
|
|
|
|
%d output dir in full
|
|
|
|
|
%D output dir as a URL.
|
2012-04-04 12:59:04 -04:00
|
|
|
|
%x extra options as set in `org-e-odt-convert-capabilities'."
|
2012-02-22 09:44:21 -05:00
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type
|
|
|
|
|
'(choice
|
|
|
|
|
(const :tag "None" nil)
|
|
|
|
|
(alist :tag "Converters"
|
|
|
|
|
:key-type (string :tag "Converter Name")
|
|
|
|
|
:value-type (group (string :tag "Command line")))))
|
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defcustom org-e-odt-convert-process "LibreOffice"
|
2012-02-22 09:44:21 -05:00
|
|
|
|
"Use this converter to convert from \"odt\" format to other formats.
|
|
|
|
|
During customization, the list of converter names are populated
|
2012-04-04 12:59:04 -04:00
|
|
|
|
from `org-e-odt-convert-processes'."
|
2012-02-22 09:44:21 -05:00
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type '(choice :convert-widget
|
|
|
|
|
(lambda (w)
|
|
|
|
|
(apply 'widget-convert (widget-type w)
|
|
|
|
|
(eval (car (widget-get w :args)))))
|
|
|
|
|
`((const :tag "None" nil)
|
|
|
|
|
,@(mapcar (lambda (c)
|
|
|
|
|
`(const :tag ,(car c) ,(car c)))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
org-e-odt-convert-processes))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defcustom org-e-odt-convert-capabilities
|
2012-02-22 09:44:21 -05:00
|
|
|
|
'(("Text"
|
|
|
|
|
("odt" "ott" "doc" "rtf" "docx")
|
|
|
|
|
(("pdf" "pdf") ("odt" "odt") ("rtf" "rtf") ("ott" "ott")
|
|
|
|
|
("doc" "doc" ":\"MS Word 97\"") ("docx" "docx") ("html" "html")))
|
|
|
|
|
("Web"
|
|
|
|
|
("html")
|
|
|
|
|
(("pdf" "pdf") ("odt" "odt") ("html" "html")))
|
|
|
|
|
("Spreadsheet"
|
|
|
|
|
("ods" "ots" "xls" "csv" "xlsx")
|
|
|
|
|
(("pdf" "pdf") ("ots" "ots") ("html" "html") ("csv" "csv") ("ods" "ods")
|
|
|
|
|
("xls" "xls") ("xlsx" "xlsx")))
|
|
|
|
|
("Presentation"
|
|
|
|
|
("odp" "otp" "ppt" "pptx")
|
|
|
|
|
(("pdf" "pdf") ("swf" "swf") ("odp" "odp") ("otp" "otp") ("ppt" "ppt")
|
|
|
|
|
("pptx" "pptx") ("odg" "odg"))))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
"Specify input and output formats of `org-e-odt-convert-process'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
More correctly, specify the set of input and output formats that
|
|
|
|
|
the user is actually interested in.
|
|
|
|
|
|
|
|
|
|
This variable is an alist where each element is of the
|
|
|
|
|
form (DOCUMENT-CLASS INPUT-FMT-LIST OUTPUT-FMT-ALIST).
|
|
|
|
|
INPUT-FMT-LIST is a list of INPUT-FMTs. OUTPUT-FMT-ALIST is an
|
|
|
|
|
alist where each element is of the form (OUTPUT-FMT
|
|
|
|
|
OUTPUT-FILE-EXTENSION EXTRA-OPTIONS).
|
|
|
|
|
|
|
|
|
|
The variable is interpreted as follows:
|
2012-04-04 12:59:04 -04:00
|
|
|
|
`org-e-odt-convert-process' can take any document that is in
|
2012-02-22 09:44:21 -05:00
|
|
|
|
INPUT-FMT-LIST and produce any document that is in the
|
|
|
|
|
OUTPUT-FMT-LIST. A document converted to OUTPUT-FMT will have
|
|
|
|
|
OUTPUT-FILE-EXTENSION as the file name extension. OUTPUT-FMT
|
|
|
|
|
serves dual purposes:
|
|
|
|
|
- It is used for populating completion candidates during
|
2012-04-04 12:59:04 -04:00
|
|
|
|
`org-e-odt-convert' commands.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
- It is used as the value of \"%f\" specifier in
|
2012-04-04 12:59:04 -04:00
|
|
|
|
`org-e-odt-convert-process'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
EXTRA-OPTIONS is used as the value of \"%x\" specifier in
|
2012-04-04 12:59:04 -04:00
|
|
|
|
`org-e-odt-convert-process'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
DOCUMENT-CLASS is used to group a set of file formats in
|
|
|
|
|
INPUT-FMT-LIST in to a single class.
|
|
|
|
|
|
|
|
|
|
Note that this variable inherently captures how LibreOffice based
|
|
|
|
|
converters work. LibreOffice maps documents of various formats
|
|
|
|
|
to classes like Text, Web, Spreadsheet, Presentation etc and
|
|
|
|
|
allow document of a given class (irrespective of it's source
|
|
|
|
|
format) to be converted to any of the export formats associated
|
|
|
|
|
with that class.
|
|
|
|
|
|
|
|
|
|
See default setting of this variable for an typical
|
|
|
|
|
configuration."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type
|
|
|
|
|
'(choice
|
|
|
|
|
(const :tag "None" nil)
|
|
|
|
|
(alist :tag "Capabilities"
|
|
|
|
|
:key-type (string :tag "Document Class")
|
|
|
|
|
:value-type
|
|
|
|
|
(group (repeat :tag "Input formats" (string :tag "Input format"))
|
|
|
|
|
(alist :tag "Output formats"
|
|
|
|
|
:key-type (string :tag "Output format")
|
|
|
|
|
:value-type
|
|
|
|
|
(group (string :tag "Output file extension")
|
|
|
|
|
(choice
|
|
|
|
|
(const :tag "None" nil)
|
|
|
|
|
(string :tag "Extra options"))))))))
|
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
(defcustom org-e-odt-preferred-output-format nil
|
|
|
|
|
"Automatically post-process to this format after exporting to \"odt\".
|
2012-09-01 17:31:56 -04:00
|
|
|
|
Command `org-e-odt-export-to-odt' exports first to \"odt\" format
|
|
|
|
|
and then uses `org-e-odt-convert-process' to convert the
|
2012-07-15 18:08:07 -04:00
|
|
|
|
resulting document to this format. During customization of this
|
|
|
|
|
variable, the list of valid values are populated based on
|
2012-09-01 17:31:56 -04:00
|
|
|
|
`org-e-odt-convert-capabilities'.
|
|
|
|
|
|
|
|
|
|
You can set this option on per-file basis using file local
|
|
|
|
|
values. See Info node `(emacs) File Variables'."
|
2012-07-15 18:08:07 -04:00
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type '(choice :convert-widget
|
|
|
|
|
(lambda (w)
|
|
|
|
|
(apply 'widget-convert (widget-type w)
|
|
|
|
|
(eval (car (widget-get w :args)))))
|
|
|
|
|
`((const :tag "None" nil)
|
|
|
|
|
,@(mapcar (lambda (c)
|
|
|
|
|
`(const :tag ,c ,c))
|
|
|
|
|
(org-e-odt-reachable-formats "odt")))))
|
2012-09-01 17:31:56 -04:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(put 'org-e-odt-preferred-output-format 'safe-local-variable 'stringp)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
;;;; Drawers
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
(defcustom org-e-odt-format-drawer-function nil
|
|
|
|
|
"Function called to format a drawer in HTML code.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
The function must accept two parameters:
|
|
|
|
|
NAME the drawer name, like \"LOGBOOK\"
|
|
|
|
|
CONTENTS the contents of the drawer.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
The function should return the string to be exported.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
For example, the variable could be set to the following function
|
|
|
|
|
in order to mimic default behaviour:
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
\(defun org-e-odt-format-drawer-default \(name contents\)
|
|
|
|
|
\"Format a drawer element for HTML export.\"
|
|
|
|
|
contents\)"
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:type 'function)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Headline
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-format-headline-function nil
|
|
|
|
|
"Function to format headline text.
|
|
|
|
|
|
|
|
|
|
This function will be called with 5 arguments:
|
|
|
|
|
TODO the todo keyword \(string or nil\).
|
|
|
|
|
TODO-TYPE the type of todo \(symbol: `todo', `done', nil\)
|
|
|
|
|
PRIORITY the priority of the headline \(integer or nil\)
|
|
|
|
|
TEXT the main headline text \(string\).
|
|
|
|
|
TAGS the tags string, separated with colons \(string or nil\).
|
|
|
|
|
|
|
|
|
|
The function result will be used in the section format string.
|
|
|
|
|
|
|
|
|
|
As an example, one could set the variable to the following, in
|
|
|
|
|
order to reproduce the default set-up:
|
|
|
|
|
|
|
|
|
|
\(defun org-e-odt-format-headline \(todo todo-type priority text tags\)
|
|
|
|
|
\"Default format function for an headline.\"
|
|
|
|
|
\(concat \(when todo
|
|
|
|
|
\(format \"\\\\textbf{\\\\textsc{\\\\textsf{%s}}} \" todo\)\)
|
|
|
|
|
\(when priority
|
|
|
|
|
\(format \"\\\\framebox{\\\\#%c} \" priority\)\)
|
|
|
|
|
text
|
|
|
|
|
\(when tags \(format \"\\\\hfill{}\\\\textsc{%s}\" tags\)\)\)\)"
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:type 'function)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Inlinetasks
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-format-inlinetask-function nil
|
|
|
|
|
"Function called to format an inlinetask in HTML code.
|
|
|
|
|
|
|
|
|
|
The function must accept six parameters:
|
|
|
|
|
TODO the todo keyword, as a string
|
|
|
|
|
TODO-TYPE the todo type, a symbol among `todo', `done' and nil.
|
|
|
|
|
PRIORITY the inlinetask priority, as a string
|
|
|
|
|
NAME the inlinetask name, as a string.
|
|
|
|
|
TAGS the inlinetask tags, as a string.
|
|
|
|
|
CONTENTS the contents of the inlinetask, as a string.
|
|
|
|
|
|
|
|
|
|
The function should return the string to be exported.
|
|
|
|
|
|
|
|
|
|
For example, the variable could be set to the following function
|
|
|
|
|
in order to mimic default behaviour:
|
|
|
|
|
|
|
|
|
|
\(defun org-e-odt-format-inlinetask \(todo type priority name tags contents\)
|
|
|
|
|
\"Format an inline task element for HTML export.\"
|
|
|
|
|
\(let \(\(full-title
|
|
|
|
|
\(concat
|
|
|
|
|
\(when todo
|
|
|
|
|
\(format \"\\\\textbf{\\\\textsf{\\\\textsc{%s}}} \" todo\)\)
|
|
|
|
|
\(when priority \(format \"\\\\framebox{\\\\#%c} \" priority\)\)
|
|
|
|
|
title
|
|
|
|
|
\(when tags \(format \"\\\\hfill{}\\\\textsc{%s}\" tags\)\)\)\)\)
|
|
|
|
|
\(format \(concat \"\\\\begin{center}\\n\"
|
|
|
|
|
\"\\\\fbox{\\n\"
|
|
|
|
|
\"\\\\begin{minipage}[c]{.6\\\\textwidth}\\n\"
|
|
|
|
|
\"%s\\n\\n\"
|
|
|
|
|
\"\\\\rule[.8em]{\\\\textwidth}{2pt}\\n\\n\"
|
|
|
|
|
\"%s\"
|
|
|
|
|
\"\\\\end{minipage}}\"
|
|
|
|
|
\"\\\\end{center}\"\)
|
|
|
|
|
full-title contents\)\)"
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:type 'function)
|
|
|
|
|
|
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
;;;; Links
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defcustom org-e-odt-inline-formula-rules
|
|
|
|
|
'(("file" . "\\.\\(mathml\\|mml\\)\\'"))
|
|
|
|
|
"Rules characterizing formula files that can be inlined into HTML.
|
|
|
|
|
|
|
|
|
|
A rule consists in an association whose key is the type of link
|
|
|
|
|
to consider, and value is a regexp that will be matched against
|
|
|
|
|
link's path."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:type '(alist :key-type (string :tag "Type")
|
|
|
|
|
:value-type (regexp :tag "Path")))
|
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
(defcustom org-e-odt-inline-image-rules
|
|
|
|
|
'(("file" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\)\\'"))
|
|
|
|
|
"Rules characterizing image files that can be inlined into HTML.
|
|
|
|
|
|
|
|
|
|
A rule consists in an association whose key is the type of link
|
|
|
|
|
to consider, and value is a regexp that will be matched against
|
2012-09-13 16:41:03 -04:00
|
|
|
|
link's path."
|
2012-07-15 18:08:07 -04:00
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:type '(alist :key-type (string :tag "Type")
|
|
|
|
|
:value-type (regexp :tag "Path")))
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-pixels-per-inch display-pixels-per-inch
|
|
|
|
|
"Scaling factor for converting images pixels to inches.
|
|
|
|
|
Use this for sizing of embedded images. See Info node `(org)
|
|
|
|
|
Images in ODT export' for more information."
|
|
|
|
|
:type 'float
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1")
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
;;;; Plain text
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-quotes
|
2012-05-24 23:56:38 -04:00
|
|
|
|
'(("fr"
|
|
|
|
|
("\\(\\s-\\|[[(]\\|^\\)\"" . "« ")
|
|
|
|
|
("\\(\\S-\\)\"" . "» ")
|
|
|
|
|
("\\(\\s-\\|(\\|^\\)'" . "'"))
|
|
|
|
|
("en"
|
|
|
|
|
("\\(\\s-\\|[[(]\\|^\\)\"" . "“")
|
|
|
|
|
("\\(\\S-\\)\"" . "”")
|
|
|
|
|
("\\(\\s-\\|(\\|^\\)'" . "‘")
|
|
|
|
|
("\\(\\S-\\)'" . "’")))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
"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-e-odt
|
|
|
|
|
:type '(list
|
|
|
|
|
(cons :tag "Opening quote"
|
|
|
|
|
(string :tag "Regexp for char before")
|
|
|
|
|
(string :tag "Replacement quote "))
|
|
|
|
|
(cons :tag "Closing quote"
|
|
|
|
|
(string :tag "Regexp for char after ")
|
|
|
|
|
(string :tag "Replacement quote "))
|
|
|
|
|
(cons :tag "Single quote"
|
|
|
|
|
(string :tag "Regexp for char before")
|
|
|
|
|
(string :tag "Replacement quote "))))
|
|
|
|
|
|
|
|
|
|
|
2012-07-15 18:08:07 -04:00
|
|
|
|
;;;; Src Block
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-create-custom-styles-for-srcblocks t
|
|
|
|
|
"Whether custom styles for colorized source blocks be automatically created.
|
|
|
|
|
When this option is turned on, the exporter creates custom styles
|
|
|
|
|
for source blocks based on the advice of `htmlfontify'. Creation
|
|
|
|
|
of custom styles happen as part of `org-e-odt-hfy-face-to-css'.
|
|
|
|
|
|
|
|
|
|
When this option is turned off exporter does not create such
|
|
|
|
|
styles.
|
|
|
|
|
|
|
|
|
|
Use the latter option if you do not want the custom styles to be
|
|
|
|
|
based on your current display settings. It is necessary that the
|
|
|
|
|
styles.xml already contains needed styles for colorizing to work.
|
|
|
|
|
|
|
|
|
|
This variable is effective only if
|
|
|
|
|
`org-e-odt-fontify-srcblocks' is turned on."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-fontify-srcblocks t
|
|
|
|
|
"Specify whether or not source blocks need to be fontified.
|
|
|
|
|
Turn this option on if you want to colorize the source code
|
|
|
|
|
blocks in the exported file. For colorization to work, you need
|
|
|
|
|
to make available an enhanced version of `htmlfontify' library."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Table
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-table-caption-above t
|
|
|
|
|
"When non-nil, place caption string at the beginning of the table.
|
|
|
|
|
Otherwise, place it near the end."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
|
|
(defcustom org-e-odt-table-styles
|
|
|
|
|
'(("OrgEquation" "OrgEquation"
|
|
|
|
|
((use-first-column-styles . t)
|
2012-09-04 17:40:43 -04:00
|
|
|
|
(use-last-column-styles . t)))
|
|
|
|
|
("TableWithHeaderRowAndColumn" "Custom"
|
|
|
|
|
((use-first-row-styles . t)
|
|
|
|
|
(use-first-column-styles . t)))
|
|
|
|
|
("TableWithFirstRowandLastRow" "Custom"
|
|
|
|
|
((use-first-row-styles . t)
|
|
|
|
|
(use-last-row-styles . t)))
|
|
|
|
|
("GriddedTable" "Custom" nil))
|
2012-07-15 18:08:07 -04:00
|
|
|
|
"Specify how Table Styles should be derived from a Table Template.
|
|
|
|
|
This is a list where each element is of the
|
|
|
|
|
form (TABLE-STYLE-NAME TABLE-TEMPLATE-NAME TABLE-CELL-OPTIONS).
|
|
|
|
|
|
|
|
|
|
TABLE-STYLE-NAME is the style associated with the table through
|
|
|
|
|
\"#+ATTR_ODT: :style TABLE-STYLE-NAME\" line.
|
|
|
|
|
|
|
|
|
|
TABLE-TEMPLATE-NAME is a set of - upto 9 - automatic
|
|
|
|
|
TABLE-CELL-STYLE-NAMEs and PARAGRAPH-STYLE-NAMEs (as defined
|
|
|
|
|
below) that is included in
|
|
|
|
|
`org-e-odt-content-template-file'.
|
|
|
|
|
|
|
|
|
|
TABLE-CELL-STYLE-NAME := TABLE-TEMPLATE-NAME + TABLE-CELL-TYPE +
|
|
|
|
|
\"TableCell\"
|
|
|
|
|
PARAGRAPH-STYLE-NAME := TABLE-TEMPLATE-NAME + TABLE-CELL-TYPE +
|
|
|
|
|
\"TableParagraph\"
|
|
|
|
|
TABLE-CELL-TYPE := \"FirstRow\" | \"LastColumn\" |
|
|
|
|
|
\"FirstRow\" | \"LastRow\" |
|
|
|
|
|
\"EvenRow\" | \"OddRow\" |
|
|
|
|
|
\"EvenColumn\" | \"OddColumn\" | \"\"
|
|
|
|
|
where \"+\" above denotes string concatenation.
|
|
|
|
|
|
|
|
|
|
TABLE-CELL-OPTIONS is an alist where each element is of the
|
|
|
|
|
form (TABLE-CELL-STYLE-SELECTOR . ON-OR-OFF).
|
|
|
|
|
TABLE-CELL-STYLE-SELECTOR := `use-first-row-styles' |
|
|
|
|
|
`use-last-row-styles' |
|
|
|
|
|
`use-first-column-styles' |
|
|
|
|
|
`use-last-column-styles' |
|
|
|
|
|
`use-banding-rows-styles' |
|
|
|
|
|
`use-banding-columns-styles' |
|
|
|
|
|
`use-first-row-styles'
|
|
|
|
|
ON-OR-OFF := `t' | `nil'
|
|
|
|
|
|
|
|
|
|
For example, with the following configuration
|
|
|
|
|
|
|
|
|
|
\(setq org-e-odt-table-styles
|
|
|
|
|
'\(\(\"TableWithHeaderRowsAndColumns\" \"Custom\"
|
|
|
|
|
\(\(use-first-row-styles . t\)
|
|
|
|
|
\(use-first-column-styles . t\)\)\)
|
|
|
|
|
\(\"TableWithHeaderColumns\" \"Custom\"
|
|
|
|
|
\(\(use-first-column-styles . t\)\)\)\)\)
|
|
|
|
|
|
|
|
|
|
1. A table associated with \"TableWithHeaderRowsAndColumns\"
|
|
|
|
|
style will use the following table-cell styles -
|
|
|
|
|
\"CustomFirstRowTableCell\", \"CustomFirstColumnTableCell\",
|
|
|
|
|
\"CustomTableCell\" and the following paragraph styles
|
|
|
|
|
\"CustomFirstRowTableParagraph\",
|
|
|
|
|
\"CustomFirstColumnTableParagraph\", \"CustomTableParagraph\"
|
|
|
|
|
as appropriate.
|
|
|
|
|
|
|
|
|
|
2. A table associated with \"TableWithHeaderColumns\" style will
|
|
|
|
|
use the following table-cell styles -
|
|
|
|
|
\"CustomFirstColumnTableCell\", \"CustomTableCell\" and the
|
|
|
|
|
following paragraph styles
|
|
|
|
|
\"CustomFirstColumnTableParagraph\", \"CustomTableParagraph\"
|
|
|
|
|
as appropriate..
|
|
|
|
|
|
|
|
|
|
Note that TABLE-TEMPLATE-NAME corresponds to the
|
|
|
|
|
\"<table:table-template>\" elements contained within
|
|
|
|
|
\"<office:styles>\". The entries (TABLE-STYLE-NAME
|
|
|
|
|
TABLE-TEMPLATE-NAME TABLE-CELL-OPTIONS) correspond to
|
|
|
|
|
\"table:template-name\" and \"table:use-first-row-styles\" etc
|
|
|
|
|
attributes of \"<table:table>\" element. Refer ODF-1.2
|
|
|
|
|
specification for more information. Also consult the
|
|
|
|
|
implementation filed under `org-e-odt-get-table-cell-styles'.
|
|
|
|
|
|
|
|
|
|
The TABLE-STYLE-NAME \"OrgEquation\" is used internally for
|
|
|
|
|
formatting of numbered display equations. Do not delete this
|
|
|
|
|
style from the list."
|
|
|
|
|
:group 'org-export-e-odt
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:type '(choice
|
|
|
|
|
(const :tag "None" nil)
|
|
|
|
|
(repeat :tag "Table Styles"
|
|
|
|
|
(list :tag "Table Style Specification"
|
|
|
|
|
(string :tag "Table Style Name")
|
|
|
|
|
(string :tag "Table Template Name")
|
|
|
|
|
(alist :options (use-first-row-styles
|
|
|
|
|
use-last-row-styles
|
|
|
|
|
use-first-column-styles
|
|
|
|
|
use-last-column-styles
|
|
|
|
|
use-banding-rows-styles
|
|
|
|
|
use-banding-columns-styles)
|
|
|
|
|
:key-type symbol
|
|
|
|
|
:value-type (const :tag "True" t))))))
|
|
|
|
|
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
;;; Internal functions
|
|
|
|
|
|
|
|
|
|
;;;; Date
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--date (&optional org-ts fmt)
|
|
|
|
|
(save-match-data
|
|
|
|
|
(let* ((time
|
|
|
|
|
(and (stringp org-ts)
|
|
|
|
|
(string-match org-ts-regexp0 org-ts)
|
|
|
|
|
(apply 'encode-time
|
|
|
|
|
(org-fix-decoded-time
|
|
|
|
|
(org-parse-time-string (match-string 0 org-ts) t)))))
|
|
|
|
|
date)
|
|
|
|
|
(cond
|
|
|
|
|
(fmt (format-time-string fmt time))
|
|
|
|
|
(t (setq date (format-time-string "%Y-%m-%dT%H:%M:%S%z" time))
|
|
|
|
|
(format "%s:%s" (substring date 0 -2) (substring date -2)))))))
|
|
|
|
|
|
|
|
|
|
;;;; Frame
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--frame (text width height style &optional extra
|
|
|
|
|
anchor-type)
|
|
|
|
|
(let ((frame-attrs
|
|
|
|
|
(concat
|
|
|
|
|
(if width (format " svg:width=\"%0.2fcm\"" width) "")
|
|
|
|
|
(if height (format " svg:height=\"%0.2fcm\"" height) "")
|
|
|
|
|
extra
|
|
|
|
|
(format " text:anchor-type=\"%s\"" (or anchor-type "paragraph")))))
|
|
|
|
|
(format
|
|
|
|
|
"\n<draw:frame draw:style-name=\"%s\"%s>\n%s\n</draw:frame>"
|
|
|
|
|
style frame-attrs
|
|
|
|
|
(concat text
|
|
|
|
|
(let ((title (get-text-property 0 :title text))
|
|
|
|
|
(desc (get-text-property 0 :description text)))
|
|
|
|
|
(concat (and title
|
|
|
|
|
(format "<svg:title>%s</svg:title>"
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(org-e-odt--encode-plain-text title t)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(and desc
|
|
|
|
|
(format "<svg:desc>%s</svg:desc>"
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(org-e-odt--encode-plain-text desc t)))))))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;;;; Library wrappers
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
(defun org-e-odt--zip-extract (archive members target)
|
|
|
|
|
(when (atom members) (setq members (list members)))
|
|
|
|
|
(mapc (lambda (archive member target)
|
|
|
|
|
(require 'arc-mode)
|
|
|
|
|
(let* ((--quote-file-name
|
|
|
|
|
;; This is shamelessly stolen from `archive-zip-extract'.
|
|
|
|
|
(lambda (name)
|
|
|
|
|
(if (or (not (memq system-type '(windows-nt ms-dos)))
|
|
|
|
|
(and (boundp 'w32-quote-process-args)
|
|
|
|
|
(null w32-quote-process-args)))
|
|
|
|
|
(shell-quote-argument name)
|
|
|
|
|
name)))
|
|
|
|
|
(target (funcall --quote-file-name target))
|
|
|
|
|
(archive (expand-file-name archive))
|
|
|
|
|
(archive-zip-extract
|
|
|
|
|
(list "unzip" "-qq" "-o" "-d" target))
|
|
|
|
|
exit-code command-output)
|
|
|
|
|
(setq command-output
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(setq exit-code (archive-zip-extract archive member))
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
(unless (zerop exit-code)
|
|
|
|
|
(message command-output)
|
|
|
|
|
(error "Extraction failed"))))
|
|
|
|
|
members))
|
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
|
|
|
|
|
;;;; Target
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--target (text id)
|
|
|
|
|
(if (not id) text
|
|
|
|
|
(concat
|
|
|
|
|
(format "\n<text:bookmark-start text:name=\"OrgXref.%s\"/>" id)
|
|
|
|
|
(format "\n<text:bookmark text:name=\"%s\"/>" id) text
|
|
|
|
|
(format "\n<text:bookmark-end text:name=\"OrgXref.%s\"/>" id))))
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;;;; Textbox
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--textbox (text width height style &optional
|
|
|
|
|
extra anchor-type)
|
|
|
|
|
(org-e-odt--frame
|
|
|
|
|
(format "\n<draw:text-box %s>%s\n</draw:text-box>"
|
|
|
|
|
(concat (format " fo:min-height=\"%0.2fcm\"" (or height .2))
|
|
|
|
|
(and (not width)
|
|
|
|
|
(format " fo:min-width=\"%0.2fcm\"" (or width .2))))
|
|
|
|
|
text)
|
|
|
|
|
width nil style extra anchor-type))
|
2012-07-15 18:08:07 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;;;; Table of Contents
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defun org-e-odt-begin-toc (index-title depth)
|
|
|
|
|
(concat
|
|
|
|
|
(format "
|
|
|
|
|
<text:table-of-content text:style-name=\"Sect2\" text:protected=\"true\" text:name=\"Table of Contents1\">
|
|
|
|
|
<text:table-of-content-source text:outline-level=\"%d\">
|
|
|
|
|
<text:index-title-template text:style-name=\"Contents_20_Heading\">%s</text:index-title-template>
|
|
|
|
|
" depth index-title)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let ((levels (number-sequence 1 10)))
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (level)
|
|
|
|
|
(format
|
|
|
|
|
"
|
|
|
|
|
<text:table-of-content-entry-template text:outline-level=\"%d\" text:style-name=\"Contents_20_%d\">
|
|
|
|
|
<text:index-entry-link-start text:style-name=\"Internet_20_link\"/>
|
|
|
|
|
<text:index-entry-chapter/>
|
|
|
|
|
<text:index-entry-text/>
|
|
|
|
|
<text:index-entry-link-end/>
|
|
|
|
|
</text:table-of-content-entry-template>
|
|
|
|
|
" level level)) levels ""))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "
|
|
|
|
|
</text:table-of-content-source>
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
<text:index-body>
|
|
|
|
|
<text:index-title text:style-name=\"Sect1\" text:name=\"Table of Contents1_Head\">
|
|
|
|
|
<text:p text:style-name=\"Contents_20_Heading\">%s</text:p>
|
|
|
|
|
</text:index-title>
|
|
|
|
|
" index-title)))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-end-toc ()
|
|
|
|
|
(format "
|
|
|
|
|
</text:index-body>
|
|
|
|
|
</text:table-of-content>
|
|
|
|
|
"))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defun* org-e-odt-format-toc-headline
|
|
|
|
|
(todo todo-type priority text tags
|
|
|
|
|
&key level section-number headline-label &allow-other-keys)
|
|
|
|
|
(setq text (concat
|
|
|
|
|
(and org-export-with-section-numbers
|
|
|
|
|
(concat section-number ". "))
|
|
|
|
|
text
|
|
|
|
|
(and tags
|
|
|
|
|
(concat
|
2012-07-19 12:45:23 -04:00
|
|
|
|
"<text:tab/>"
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTag" tags)))))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(when todo
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(setq text (format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTodo" text)))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(format "<text:a xlink:type=\"simple\" xlink:href=\"#%s\">%s</text:a>"
|
|
|
|
|
headline-label text))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-toc (depth info)
|
|
|
|
|
(assert (wholenump depth))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let* ((title (org-export-translate "Table of Contents" :utf-8 info))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(headlines (org-export-collect-headlines
|
|
|
|
|
info (and (wholenump depth) depth))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(when headlines
|
|
|
|
|
(concat
|
|
|
|
|
(org-e-odt-begin-toc title depth)
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (headline)
|
|
|
|
|
(let* ((entry (org-e-odt-format-headline--wrap
|
|
|
|
|
headline info 'org-e-odt-format-toc-headline))
|
|
|
|
|
(level (org-export-get-relative-level headline info))
|
|
|
|
|
(style (format "Contents_20_%d" level)))
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
style entry)))
|
|
|
|
|
headlines "\n")
|
|
|
|
|
(org-e-odt-end-toc)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Document styles
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-add-automatic-style (object-type &optional object-props)
|
|
|
|
|
"Create an automatic style of type OBJECT-TYPE with param OBJECT-PROPS.
|
|
|
|
|
OBJECT-PROPS is (typically) a plist created by passing
|
|
|
|
|
\"#+ATTR_ODT: \" option of the object in question to
|
|
|
|
|
`org-e-odt-parse-block-attributes'.
|
|
|
|
|
|
|
|
|
|
Use `org-e-odt-object-counters' to generate an automatic
|
|
|
|
|
OBJECT-NAME and STYLE-NAME. If OBJECT-PROPS is non-nil, add a
|
|
|
|
|
new entry in `org-e-odt-automatic-styles'. Return (OBJECT-NAME
|
|
|
|
|
. STYLE-NAME)."
|
|
|
|
|
(assert (stringp object-type))
|
|
|
|
|
(let* ((object (intern object-type))
|
|
|
|
|
(seqvar object)
|
|
|
|
|
(seqno (1+ (or (plist-get org-e-odt-object-counters seqvar) 0)))
|
|
|
|
|
(object-name (format "%s%d" object-type seqno)) style-name)
|
|
|
|
|
(setq org-e-odt-object-counters
|
|
|
|
|
(plist-put org-e-odt-object-counters seqvar seqno))
|
|
|
|
|
(when object-props
|
|
|
|
|
(setq style-name (format "Org%s" object-name))
|
|
|
|
|
(setq org-e-odt-automatic-styles
|
|
|
|
|
(plist-put org-e-odt-automatic-styles object
|
|
|
|
|
(append (list (list style-name object-props))
|
|
|
|
|
(plist-get org-e-odt-automatic-styles object)))))
|
|
|
|
|
(cons object-name style-name)))
|
|
|
|
|
|
|
|
|
|
;;;; Checkbox
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-06-09 09:34:27 -04:00
|
|
|
|
(defun org-e-odt--checkbox (item)
|
|
|
|
|
"Return check-box string associated to ITEM."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let ((checkbox (org-element-property :checkbox item)))
|
|
|
|
|
(if (not checkbox) ""
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgCode" (case checkbox
|
|
|
|
|
(on "[✓] ") ; CHECK MARK
|
|
|
|
|
(off "[ ] ")
|
|
|
|
|
(trans "[-] "))))))
|
2012-03-14 14:28:43 -04:00
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;; Template
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-template (contents info)
|
|
|
|
|
"Return complete document string after HTML conversion.
|
|
|
|
|
CONTENTS is the transcoded contents string. RAW-DATA is the
|
|
|
|
|
original parsed data. INFO is a plist holding export options."
|
2012-07-15 18:08:07 -04:00
|
|
|
|
;; Write meta file.
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let ((title (org-export-data (plist-get info :title) info))
|
|
|
|
|
(author (let ((author (plist-get info :author)))
|
|
|
|
|
(if (not author) "" (org-export-data author info))))
|
|
|
|
|
(date (org-e-odt--date
|
|
|
|
|
(org-export-data (plist-get info :date) info)))
|
|
|
|
|
(email (plist-get info :email))
|
|
|
|
|
(keywords (plist-get info :keywords))
|
|
|
|
|
(description (plist-get info :description)))
|
|
|
|
|
(write-region
|
|
|
|
|
(concat
|
|
|
|
|
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
|
|
|
|
<office:document-meta
|
|
|
|
|
xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"
|
|
|
|
|
xmlns:xlink=\"http://www.w3.org/1999/xlink\"
|
|
|
|
|
xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
|
|
|
|
|
xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"
|
|
|
|
|
xmlns:ooo=\"http://openoffice.org/2004/office\"
|
|
|
|
|
office:version=\"1.2\">
|
|
|
|
|
<office:meta>\n"
|
|
|
|
|
(format "<dc:creator>%s</dc:creator>\n" author)
|
|
|
|
|
(format "<meta:initial-creator>%s</meta:initial-creator>\n" author)
|
|
|
|
|
(format "<dc:date>%s</dc:date>\n" date)
|
|
|
|
|
(format "<meta:creation-date>%s</meta:creation-date>\n" date)
|
|
|
|
|
(format "<meta:generator>%s</meta:generator>\n"
|
2012-07-19 13:45:44 -04:00
|
|
|
|
(let ((creator-info (plist-get info :with-creator)))
|
|
|
|
|
(if (or (not creator-info) (eq creator-info 'comment)) ""
|
|
|
|
|
(plist-get info :creator))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<meta:keyword>%s</meta:keyword>\n" keywords)
|
|
|
|
|
(format "<dc:subject>%s</dc:subject>\n" description)
|
|
|
|
|
(format "<dc:title>%s</dc:title>\n" title)
|
|
|
|
|
"\n"
|
|
|
|
|
" </office:meta>\n" "</office:document-meta>")
|
|
|
|
|
nil (concat org-e-odt-zip-dir "meta.xml"))
|
|
|
|
|
;; Add meta.xml in to manifest.
|
|
|
|
|
(org-e-odt-create-manifest-file-entry "text/xml" "meta.xml"))
|
2012-07-15 18:08:07 -04:00
|
|
|
|
|
|
|
|
|
;; Update styles file.
|
|
|
|
|
;; Copy styles.xml. Also dump htmlfontify styles, if there is any.
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;; Write styles file.
|
|
|
|
|
(let* ((styles-file (plist-get info :odt-styles-file))
|
|
|
|
|
(styles-file (and styles-file (read (org-trim styles-file))))
|
|
|
|
|
;; Non-availability of styles.xml is not a critical
|
|
|
|
|
;; error. For now throw an error purely for aesthetic
|
|
|
|
|
;; reasons.
|
|
|
|
|
(styles-file (or styles-file
|
|
|
|
|
org-e-odt-styles-file
|
|
|
|
|
(expand-file-name "OrgOdtStyles.xml"
|
|
|
|
|
org-e-odt-styles-dir)
|
|
|
|
|
(error "org-e-odt: Missing styles file?"))))
|
|
|
|
|
(cond
|
|
|
|
|
((listp styles-file)
|
|
|
|
|
(let ((archive (nth 0 styles-file))
|
|
|
|
|
(members (nth 1 styles-file)))
|
|
|
|
|
(org-e-odt--zip-extract archive members org-e-odt-zip-dir)
|
|
|
|
|
(mapc
|
|
|
|
|
(lambda (member)
|
|
|
|
|
(when (org-file-image-p member)
|
|
|
|
|
(let* ((image-type (file-name-extension member))
|
|
|
|
|
(media-type (format "image/%s" image-type)))
|
|
|
|
|
(org-e-odt-create-manifest-file-entry media-type member))))
|
|
|
|
|
members)))
|
|
|
|
|
((and (stringp styles-file) (file-exists-p styles-file))
|
|
|
|
|
(let ((styles-file-type (file-name-extension styles-file)))
|
|
|
|
|
(cond
|
|
|
|
|
((string= styles-file-type "xml")
|
|
|
|
|
(copy-file styles-file (concat org-e-odt-zip-dir "styles.xml") t))
|
|
|
|
|
((member styles-file-type '("odt" "ott"))
|
|
|
|
|
(org-e-odt--zip-extract styles-file "styles.xml" org-e-odt-zip-dir)))))
|
|
|
|
|
(t
|
|
|
|
|
(error (format "Invalid specification of styles.xml file: %S"
|
|
|
|
|
org-e-odt-styles-file))))
|
|
|
|
|
|
|
|
|
|
;; create a manifest entry for styles.xml
|
|
|
|
|
(org-e-odt-create-manifest-file-entry "text/xml" "styles.xml")
|
|
|
|
|
|
|
|
|
|
;; FIXME: Who is opening an empty styles.xml before this point?
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
(find-file-noselect (concat org-e-odt-zip-dir "styles.xml") t)
|
|
|
|
|
(revert-buffer t t)
|
|
|
|
|
|
|
|
|
|
;; Write custom styles for source blocks
|
|
|
|
|
;; Save STYLES used for colorizing of source blocks.
|
|
|
|
|
;; Update styles.xml with styles that were collected as part of
|
|
|
|
|
;; `org-e-odt-hfy-face-to-css' callbacks.
|
|
|
|
|
(let ((styles (mapconcat (lambda (style) (format " %s\n" (cddr style)))
|
|
|
|
|
hfy-user-sheet-assoc "")))
|
|
|
|
|
(when styles
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when (re-search-forward "</office:styles>" nil t)
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(insert "\n<!-- Org Htmlfontify Styles -->\n" styles "\n"))))
|
|
|
|
|
|
|
|
|
|
;; Update styles.xml - take care of outline numbering
|
|
|
|
|
|
|
|
|
|
;; Don't make automatic backup of styles.xml file. This setting
|
|
|
|
|
;; prevents the backed-up styles.xml file from being zipped in to
|
|
|
|
|
;; odt file. This is more of a hackish fix. Better alternative
|
|
|
|
|
;; would be to fix the zip command so that the output odt file
|
|
|
|
|
;; includes only the needed files and excludes any auto-generated
|
|
|
|
|
;; extra files like backups and auto-saves etc etc. Note that
|
|
|
|
|
;; currently the zip command zips up the entire temp directory so
|
|
|
|
|
;; that any auto-generated files created under the hood ends up in
|
|
|
|
|
;; the resulting odt file.
|
|
|
|
|
(set (make-local-variable 'backup-inhibited) t)
|
|
|
|
|
|
|
|
|
|
;; Outline numbering is retained only upto LEVEL.
|
|
|
|
|
;; To disable outline numbering pass a LEVEL of 0.
|
|
|
|
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let ((regex
|
|
|
|
|
"<text:outline-level-style\\([^>]*\\)text:level=\"\\([^\"]*\\)\"\\([^>]*\\)>")
|
|
|
|
|
(replacement
|
|
|
|
|
"<text:outline-level-style\\1text:level=\"\\2\" style:num-format=\"\">"))
|
|
|
|
|
(while (re-search-forward regex nil t)
|
|
|
|
|
(unless (let ((sec-num (plist-get info :section-numbers))
|
|
|
|
|
(level (string-to-number (match-string 2))))
|
|
|
|
|
(if (wholenump sec-num) (<= level sec-num) sec-num))
|
|
|
|
|
(replace-match replacement t nil))))
|
|
|
|
|
(save-buffer 0)))
|
|
|
|
|
;; Update content.xml.
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert-file-contents
|
|
|
|
|
(or org-e-odt-content-template-file
|
|
|
|
|
(expand-file-name "OrgOdtContentTemplate.xml"
|
|
|
|
|
org-e-odt-styles-dir)))
|
|
|
|
|
;; Write automatic styles.
|
|
|
|
|
;; - Position the cursor.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(re-search-forward " </office:automatic-styles>" nil t)
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
;; - Dump automatic table styles
|
|
|
|
|
(loop for (style-name props) in
|
|
|
|
|
(plist-get org-e-odt-automatic-styles 'Table) do
|
|
|
|
|
(when (setq props (or (plist-get props :rel-width) 96))
|
|
|
|
|
(insert (format org-e-odt-table-style-format style-name props))))
|
|
|
|
|
;; Update display level.
|
|
|
|
|
;; - Remove existing sequence decls. Also position the cursor.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when (re-search-forward "<text:sequence-decls" nil t)
|
|
|
|
|
(delete-region (match-beginning 0)
|
|
|
|
|
(re-search-forward "</text:sequence-decls>" nil nil)))
|
|
|
|
|
;; Update sequence decls according to user preference.
|
|
|
|
|
(insert
|
|
|
|
|
(format
|
|
|
|
|
"\n<text:sequence-decls>\n%s\n</text:sequence-decls>"
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (x)
|
|
|
|
|
(format
|
|
|
|
|
"<text:sequence-decl text:display-outline-level=\"%d\" text:name=\"%s\"/>"
|
|
|
|
|
org-e-odt-display-outline-level (nth 1 x)))
|
|
|
|
|
org-e-odt-category-map-alist "\n")))
|
|
|
|
|
;; Position the cursor to document body.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(re-search-forward "</office:text>" nil nil)
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
|
|
|
|
|
;; Preamble - Title, Author, Date etc.
|
|
|
|
|
(insert
|
|
|
|
|
(let* ((title (org-export-data (plist-get info :title) info))
|
|
|
|
|
(author (and (plist-get info :with-author)
|
|
|
|
|
(let ((auth (plist-get info :author)))
|
|
|
|
|
(and auth (org-export-data auth info)))))
|
|
|
|
|
(date (org-export-data (plist-get info :date) info))
|
|
|
|
|
(iso-date (org-e-odt--date date))
|
|
|
|
|
(date (org-e-odt--date date "%d %b %Y"))
|
|
|
|
|
(email (plist-get info :email))
|
|
|
|
|
;; switch on or off above vars based on user settings
|
|
|
|
|
(author (and (plist-get info :with-author) (or author email)))
|
|
|
|
|
;; (date (and (plist-get info :time-stamp-file) date))
|
|
|
|
|
(email (and (plist-get info :with-email) email)))
|
|
|
|
|
(concat
|
|
|
|
|
;; title
|
|
|
|
|
(when title
|
|
|
|
|
(concat
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"OrgTitle" (format "\n<text:title>%s</text:title>" title))
|
|
|
|
|
;; separator
|
|
|
|
|
"\n<text:p text:style-name=\"OrgTitle\"/>"))
|
|
|
|
|
(cond
|
|
|
|
|
((and author (not email))
|
|
|
|
|
;; author only
|
|
|
|
|
(concat
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"OrgSubtitle"
|
|
|
|
|
(format "<text:initial-creator>%s</text:initial-creator>" author))
|
|
|
|
|
;; separator
|
|
|
|
|
"\n<text:p text:style-name=\"OrgSubtitle\"/>"))
|
|
|
|
|
((and author email)
|
|
|
|
|
;; author and email
|
|
|
|
|
(concat
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(format
|
|
|
|
|
"\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"OrgSubtitle"
|
|
|
|
|
(format
|
|
|
|
|
"<text:a xlink:type=\"simple\" xlink:href=\"%s\">%s</text:a>"
|
|
|
|
|
(concat "mailto:" email)
|
|
|
|
|
(format "<text:initial-creator>%s</text:initial-creator>" author)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;; separator
|
|
|
|
|
"\n<text:p text:style-name=\"OrgSubtitle\"/>")))
|
|
|
|
|
;; date
|
|
|
|
|
(when date
|
|
|
|
|
(concat
|
|
|
|
|
(format
|
|
|
|
|
"\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"OrgSubtitle"
|
|
|
|
|
(format
|
|
|
|
|
"\n<text:date style:data-style-name=\"%s\" text:date-value=\"%s\">%s</text:date>"
|
2012-07-15 18:08:07 -04:00
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
"OrgDate" iso-date date))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;; separator
|
|
|
|
|
"<text:p text:style-name=\"OrgSubtitle\"/>")))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Table of Contents
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(let* ((with-toc (plist-get info :with-toc))
|
|
|
|
|
(depth (and with-toc (if (wholenump with-toc)
|
|
|
|
|
with-toc
|
|
|
|
|
(plist-get info :headline-levels)))))
|
|
|
|
|
(when depth (insert (or (org-e-odt-toc depth info) ""))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;; Contents.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(insert contents)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;; Return contents.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(buffer-substring-no-properties (point-min) (point-max))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Transcode Functions
|
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
;;;; Bold
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-bold (bold contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode BOLD from Org to ODT.
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
CONTENTS is the text with bold markup. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"Bold" contents))
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Center Block
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
(defun org-e-odt-center-block (center-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a CENTER-BLOCK element from Org to ODT.
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
CONTENTS holds the contents of the center block. INFO is a plist
|
2012-02-22 09:44:21 -05:00
|
|
|
|
holding contextual information."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
contents)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-04-28 20:11:22 -04:00
|
|
|
|
;;;; Clock
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-clock (clock contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a CLOCK element from Org to ODT.
|
2012-04-28 20:11:22 -04:00
|
|
|
|
CONTENTS is nil. INFO is a plist used as a communication
|
|
|
|
|
channel."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampWrapper"
|
|
|
|
|
(concat
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampKeyword" org-clock-string)
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestamp"
|
|
|
|
|
(concat (org-translate-time
|
|
|
|
|
(org-element-property :value clock))
|
|
|
|
|
(let ((time (org-element-property :time clock)))
|
|
|
|
|
(and time (format " (%s)" time))))))))
|
2012-04-28 20:11:22 -04:00
|
|
|
|
|
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
;;;; Code
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-code (code contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a CODE object from Org to ODT.
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
CONTENTS is nil. INFO is a plist used as a communication
|
|
|
|
|
channel."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgCode" (org-element-property :value code)))
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;;; Comment
|
|
|
|
|
|
|
|
|
|
;; Comments are ignored.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Comment Block
|
|
|
|
|
|
|
|
|
|
;; Comment Blocks are ignored.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Drawer
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-drawer (drawer contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a DRAWER element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the block. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(let* ((name (org-element-property :drawer-name drawer))
|
|
|
|
|
(output (if (functionp org-e-odt-format-drawer-function)
|
|
|
|
|
(funcall org-e-odt-format-drawer-function
|
|
|
|
|
name contents)
|
|
|
|
|
;; If there's no user defined function: simply
|
|
|
|
|
;; display contents of the drawer.
|
|
|
|
|
contents)))
|
|
|
|
|
output))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Dynamic Block
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-dynamic-block (dynamic-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a DYNAMIC-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the block. INFO is a plist
|
org-export: Remove unnecessary back-end arguments
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 05:33:16 -04:00
|
|
|
|
holding contextual information. See `org-export-data'."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
contents)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Entity
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-entity (entity contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode an ENTITY object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS are the definition itself. INFO is a plist holding
|
|
|
|
|
contextual information."
|
|
|
|
|
;; (let ((ent (org-element-property :latex entity)))
|
|
|
|
|
;; (if (org-element-property :latex-math-p entity)
|
|
|
|
|
;; (format "$%s$" ent)
|
|
|
|
|
;; ent))
|
|
|
|
|
(org-element-property :utf-8 entity))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Example Block
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-example-block (example-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a EXAMPLE-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(org-e-odt-format-code example-block info))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Export Snippet
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-export-snippet (export-snippet contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a EXPORT-SNIPPET object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-02-23 12:10:14 -05:00
|
|
|
|
(when (eq (org-export-snippet-backend export-snippet) 'e-odt)
|
|
|
|
|
(org-element-property :value export-snippet)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Export Block
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-export-block (export-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a EXPORT-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-05-05 16:47:00 -04:00
|
|
|
|
(when (string= (org-element-property :type export-block) "ODT")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(org-remove-indentation (org-element-property :value export-block))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Fixed Width
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-fixed-width (fixed-width contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a FIXED-WIDTH element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(org-e-odt-do-format-code (org-element-property :value fixed-width)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Footnote Definition
|
|
|
|
|
|
|
|
|
|
;; Footnote Definitions are ignored.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Footnote Reference
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-footnote-reference (footnote-reference contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a FOOTNOTE-REFERENCE element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let ((--format-footnote-definition
|
|
|
|
|
(function
|
|
|
|
|
(lambda (n def)
|
|
|
|
|
(setq n (format "%d" n))
|
|
|
|
|
(let ((id (concat "fn" n))
|
|
|
|
|
(note-class "footnote")
|
|
|
|
|
(par-style "Footnote"))
|
|
|
|
|
(format
|
|
|
|
|
"<text:note text:id=\"%s\" text:note-class=\"%s\">%s</text:note>"
|
|
|
|
|
id note-class
|
|
|
|
|
(concat
|
|
|
|
|
(format "<text:note-citation>%s</text:note-citation>" n)
|
|
|
|
|
(format "<text:note-body>%s</text:note-body>" def)))))))
|
|
|
|
|
(--format-footnote-reference
|
|
|
|
|
(function
|
|
|
|
|
(lambda (n)
|
|
|
|
|
(setq n (format "%d" n))
|
|
|
|
|
(let ((note-class "footnote")
|
|
|
|
|
(ref-format "text")
|
|
|
|
|
(ref-name (concat "fn" n)))
|
|
|
|
|
(format
|
|
|
|
|
"<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgSuperscript"
|
|
|
|
|
(format "<text:note-ref text:note-class=\"%s\" text:reference-format=\"%s\" text:ref-name=\"%s\">%s</text:note-ref>"
|
|
|
|
|
note-class ref-format ref-name n)))))))
|
|
|
|
|
(concat
|
|
|
|
|
;; Insert separator between two footnotes in a row.
|
2012-07-27 10:13:57 -04:00
|
|
|
|
(let ((prev (org-export-get-previous-element footnote-reference info)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(and (eq (org-element-type prev) 'footnote-reference)
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgSuperscript" ",")))
|
|
|
|
|
;; Trancode footnote reference.
|
|
|
|
|
(let ((n (org-export-get-footnote-number footnote-reference info)))
|
|
|
|
|
(cond
|
|
|
|
|
((not (org-export-footnote-first-reference-p footnote-reference info))
|
|
|
|
|
(funcall --format-footnote-reference n))
|
|
|
|
|
;; Inline definitions are secondary strings.
|
|
|
|
|
;; Non-inline footnotes definitions are full Org data.
|
|
|
|
|
(t
|
|
|
|
|
(let* ((raw (org-export-get-footnote-definition footnote-reference
|
|
|
|
|
info))
|
|
|
|
|
(def (let ((def (org-trim (org-export-data raw info))))
|
|
|
|
|
(if (eq (org-element-type raw) 'org-data) def
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Footnote" def)))))
|
|
|
|
|
(funcall --format-footnote-definition n def))))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Headline
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defun* org-e-odt-format-headline
|
|
|
|
|
(todo todo-type priority text tags
|
|
|
|
|
&key level section-number headline-label &allow-other-keys)
|
|
|
|
|
(concat
|
|
|
|
|
;; Todo.
|
|
|
|
|
(and todo
|
|
|
|
|
(concat
|
|
|
|
|
(let ((style (if (member todo org-done-keywords) "OrgDone" "OrgTodo")))
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
style todo)) " "))
|
|
|
|
|
;; Title.
|
|
|
|
|
text
|
|
|
|
|
;; Tags.
|
|
|
|
|
(and tags
|
|
|
|
|
(concat "<text:tab/>"
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTag" (mapconcat 'org-trim tags " : "))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(defun org-e-odt-format-headline--wrap (headline info
|
2012-07-19 12:45:23 -04:00
|
|
|
|
&optional format-function
|
|
|
|
|
&rest extra-keys)
|
2012-04-04 12:59:04 -04:00
|
|
|
|
"Transcode an HEADLINE element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the headline. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(let* ((level (+ (org-export-get-relative-level headline info)))
|
|
|
|
|
(headline-number (org-export-get-headline-number headline info))
|
|
|
|
|
(section-number (and (org-export-numbered-headline-p headline info)
|
|
|
|
|
(mapconcat 'number-to-string
|
|
|
|
|
headline-number ".")))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(todo (and (plist-get info :with-todo-keywords)
|
org-export: Secondary strings are transcoded with `org-export-data'
* contrib/lisp/org-export.el (org-export-transcoder): New function.
(org-export-data): Also export secondary strings. Refactored.
(org-export-secondary-string): Remove function.
(org-export-expand): Fix code indentation.
(org-export-expand-macro): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-link, org-e-ascii-quote-section,
org-e-ascii--table-cell-width): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-html.el (org-e-html-footnote-section,
org-e-html--caption/label-string, org-e-html-meta-info,
org-e-html-preamble, org-e-html-template,
org-e-html-format-headline--wrap, org-e-html-headline,
org-e-html-item, org-e-html-link): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-footnote-reference,
org-e-latex-headline, org-e-latex-inlinetask, org-e-latex-item,
org-e-latex-link, org-e-latex-src-block): Use `org-export-data'
instead of `org-export-secondary-string'.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-update-meta-file,
org-e-odt--caption/label-string, org-e-odt-footnote-def,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block):
Use `org-export-data' instead of `org-export-secondary-string'.
2012-04-29 20:04:03 -04:00
|
|
|
|
(let ((todo (org-element-property :todo-keyword headline)))
|
|
|
|
|
(and todo (org-export-data todo info)))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(todo-type (and todo (org-element-property :todo-type headline)))
|
|
|
|
|
(priority (and (plist-get info :with-priority)
|
|
|
|
|
(org-element-property :priority headline)))
|
org-export: Secondary strings are transcoded with `org-export-data'
* contrib/lisp/org-export.el (org-export-transcoder): New function.
(org-export-data): Also export secondary strings. Refactored.
(org-export-secondary-string): Remove function.
(org-export-expand): Fix code indentation.
(org-export-expand-macro): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-link, org-e-ascii-quote-section,
org-e-ascii--table-cell-width): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-html.el (org-e-html-footnote-section,
org-e-html--caption/label-string, org-e-html-meta-info,
org-e-html-preamble, org-e-html-template,
org-e-html-format-headline--wrap, org-e-html-headline,
org-e-html-item, org-e-html-link): Use `org-export-data' instead of
`org-export-secondary-string'.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-footnote-reference,
org-e-latex-headline, org-e-latex-inlinetask, org-e-latex-item,
org-e-latex-link, org-e-latex-src-block): Use `org-export-data'
instead of `org-export-secondary-string'.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-update-meta-file,
org-e-odt--caption/label-string, org-e-odt-footnote-def,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block):
Use `org-export-data' instead of `org-export-secondary-string'.
2012-04-29 20:04:03 -04:00
|
|
|
|
(text (org-export-data (org-element-property :title headline) info))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(tags (and (plist-get info :with-tags)
|
2012-05-26 07:44:13 -04:00
|
|
|
|
(org-export-get-tags headline info)))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(headline-label (concat "sec-" (mapconcat 'number-to-string
|
|
|
|
|
headline-number "-")))
|
|
|
|
|
(format-function (cond
|
|
|
|
|
((functionp format-function) format-function)
|
|
|
|
|
((functionp org-e-odt-format-headline-function)
|
|
|
|
|
(function*
|
|
|
|
|
(lambda (todo todo-type priority text tags
|
|
|
|
|
&allow-other-keys)
|
|
|
|
|
(funcall org-e-odt-format-headline-function
|
|
|
|
|
todo todo-type priority text tags))))
|
|
|
|
|
(t 'org-e-odt-format-headline))))
|
|
|
|
|
(apply format-function
|
|
|
|
|
todo todo-type priority text tags
|
|
|
|
|
:headline-label headline-label :level level
|
|
|
|
|
:section-number section-number extra-keys)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
(defun org-e-odt-headline (headline contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode an HEADLINE element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the headline. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;; Case 1: This is a footnote section: ignore it.
|
|
|
|
|
(unless (org-element-property :footnote-section-p headline)
|
|
|
|
|
(let* ((text (org-export-data (org-element-property :title headline) info))
|
|
|
|
|
;; Create the headline text.
|
|
|
|
|
(full-text (org-e-odt-format-headline--wrap headline info))
|
|
|
|
|
;; Get level relative to current parsed data.
|
|
|
|
|
(level (org-export-get-relative-level headline info))
|
|
|
|
|
;; Get canonical label for the headline.
|
|
|
|
|
(id (concat "sec-" (mapconcat 'number-to-string
|
|
|
|
|
(org-export-get-headline-number
|
|
|
|
|
headline info) "-")))
|
|
|
|
|
;; Get user-specified labels for the headline.
|
|
|
|
|
(extra-ids (list (org-element-property :custom-id headline)
|
|
|
|
|
(org-element-property :id headline)))
|
|
|
|
|
;; Extra targets.
|
|
|
|
|
(extra-targets
|
|
|
|
|
(mapconcat (lambda (x)
|
|
|
|
|
(when x
|
|
|
|
|
(let ((x (if (org-uuidgen-p x) (concat "ID-" x) x)))
|
|
|
|
|
(org-e-odt--target
|
|
|
|
|
"" (org-export-solidify-link-text x)))))
|
|
|
|
|
extra-ids ""))
|
|
|
|
|
;; Title.
|
|
|
|
|
(anchored-title (org-e-odt--target full-text id)))
|
|
|
|
|
(cond
|
|
|
|
|
;; Case 2. This is a deep sub-tree: export it as a list item.
|
|
|
|
|
;; Also export as items headlines for which no section
|
|
|
|
|
;; format has been found.
|
|
|
|
|
((org-export-low-level-p headline info)
|
|
|
|
|
;; Build the real contents of the sub-tree.
|
|
|
|
|
(concat
|
|
|
|
|
(and (org-export-first-sibling-p headline info)
|
|
|
|
|
(format "\n<text:list text:style-name=\"%s\" %s>"
|
|
|
|
|
;; Choose style based on list type.
|
|
|
|
|
(if (org-export-numbered-headline-p headline info)
|
|
|
|
|
"OrgNumberedList" "OrgBulletedList")
|
|
|
|
|
;; If top-level list, re-start numbering. Otherwise,
|
|
|
|
|
;; continue numbering.
|
|
|
|
|
(format "text:continue-numbering=\"%s\""
|
|
|
|
|
(let* ((parent (org-export-get-parent-headline
|
|
|
|
|
headline)))
|
|
|
|
|
(if (and parent
|
|
|
|
|
(org-export-low-level-p parent info))
|
|
|
|
|
"true" "false")))))
|
2012-09-04 04:45:14 -04:00
|
|
|
|
(let ((headline-has-table-p
|
|
|
|
|
(let ((section (assq 'section (org-element-contents headline))))
|
|
|
|
|
(assq 'table (and section (org-element-contents section))))))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(format "\n<text:list-item>\n%s\n%s"
|
|
|
|
|
(concat
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Text_20_body"
|
|
|
|
|
(concat extra-targets anchored-title))
|
|
|
|
|
contents)
|
|
|
|
|
(if headline-has-table-p
|
|
|
|
|
"</text:list-header>"
|
|
|
|
|
"</text:list-item>")))
|
|
|
|
|
(and (org-export-last-sibling-p headline info)
|
|
|
|
|
"</text:list>")))
|
|
|
|
|
;; Case 3. Standard headline. Export it as a section.
|
|
|
|
|
(t
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(concat
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format
|
2012-08-25 16:35:24 -04:00
|
|
|
|
"\n<text:h text:style-name=\"%s\" text:outline-level=\"%s\">%s</text:h>"
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "Heading_20_%s" level)
|
|
|
|
|
level
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(concat extra-targets anchored-title))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
contents))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Horizontal Rule
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-horizontal-rule (horizontal-rule contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode an HORIZONTAL-RULE object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Horizontal_20_Line" ""))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Inline Babel Call
|
|
|
|
|
|
|
|
|
|
;; Inline Babel Calls are ignored.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Inline Src Block
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defun org-e-odt--find-verb-separator (s)
|
|
|
|
|
"Return a character not used in string S.
|
|
|
|
|
This is used to choose a separator for constructs like \\verb."
|
|
|
|
|
(let ((ll "~,./?;':\"|!@#%^&-_=+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>()[]{}"))
|
|
|
|
|
(loop for c across ll
|
|
|
|
|
when (not (string-match (regexp-quote (char-to-string c)) s))
|
|
|
|
|
return (char-to-string c))))
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-inline-src-block (inline-src-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode an INLINE-SRC-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the item. INFO is a plist holding
|
|
|
|
|
contextual information."
|
|
|
|
|
(let* ((org-lang (org-element-property :language inline-src-block))
|
|
|
|
|
(code (org-element-property :value inline-src-block))
|
|
|
|
|
(separator (org-e-odt--find-verb-separator code)))
|
|
|
|
|
(error "FIXME")))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Inlinetask
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-inlinetask (inlinetask contents info)
|
2012-04-04 12:59:04 -04:00
|
|
|
|
"Transcode an INLINETASK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the block. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(cond
|
|
|
|
|
;; If `org-e-odt-format-inlinetask-function' is provided, call it
|
|
|
|
|
;; with appropriate arguments.
|
|
|
|
|
((functionp org-e-odt-format-inlinetask-function)
|
|
|
|
|
(let ((format-function
|
|
|
|
|
(function*
|
|
|
|
|
(lambda (todo todo-type priority text tags
|
|
|
|
|
&key contents &allow-other-keys)
|
|
|
|
|
(funcall org-e-odt-format-inlinetask-function
|
|
|
|
|
todo todo-type priority text tags contents)))))
|
|
|
|
|
(org-e-odt-format-headline--wrap
|
|
|
|
|
inlinetask info format-function :contents contents)))
|
|
|
|
|
;; Otherwise, use a default template.
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(t
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Text_20_body"
|
|
|
|
|
(org-e-odt--textbox
|
|
|
|
|
(concat
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"OrgInlineTaskHeading"
|
|
|
|
|
(org-e-odt-format-headline--wrap
|
|
|
|
|
inlinetask info))
|
|
|
|
|
contents)
|
|
|
|
|
nil nil "OrgInlineTaskFrame" " style:rel-width=\"100%\"")))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
;;;; Italic
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-italic (italic contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode ITALIC from Org to ODT.
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
CONTENTS is the text with italic markup. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"Emphasis" contents))
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;;; Item
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-item (item contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode an ITEM element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the item. INFO is a plist holding
|
|
|
|
|
contextual information."
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(let* ((plain-list (org-export-get-parent item))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(type (org-element-property :type plain-list))
|
|
|
|
|
(counter (org-element-property :counter item))
|
|
|
|
|
(tag (let ((tag (org-element-property :tag item)))
|
2012-06-09 09:34:27 -04:00
|
|
|
|
(and tag
|
|
|
|
|
(concat (org-e-odt--checkbox item)
|
|
|
|
|
(org-export-data tag info))))))
|
2012-06-03 18:29:49 -04:00
|
|
|
|
(case type
|
2012-08-25 16:35:24 -04:00
|
|
|
|
((ordered unordered descriptive-1 descriptive-2)
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(format "\n<text:list-item>\n%s\n%s"
|
|
|
|
|
contents
|
|
|
|
|
(let* ((--element-has-a-table-p
|
|
|
|
|
(function
|
|
|
|
|
(lambda (element info)
|
|
|
|
|
(loop for el in (org-element-contents element)
|
org-export: Use `eq' instead of `equal' when possible
* contrib/lisp/org-export.el (org-export-data,
org-export-footnote-first-reference-p,
org-export-get-footnote-number, org-export-get-ordinal,
org-export-get-loc, org-export-table-row-group,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-cell-address): Use `eq' instead of `equal' when
possible.
* contrib/lisp/org-e-ascii.el (org-e-ascii-table-row):
* contrib/lisp/org-e-beamer.el (org-e-beamer-select-environment):
* contrib/lisp/org-e-html.el (org-e-html-footnote-section,
org-e-html-latex-environment, org-e-html-paragraph): Use `eq'
instead of `equal' when possible.
* contrib/lisp/org-e-latex.el (org-e-latex--get-footnote-counter):
* contrib/lisp/org-e-odt.el (org-e-odt-do-format-code,
org-e-odt-footnote-def, org-e-odt-item, org-e-odt-latex-environment,
org-e-odt-latex-fragment, org-e-odt-plain-list, org-e-odt-table,
org-e-odt-enumerate-element): Use `eq' instead of `equal' when
possible.
In particular, comparing elements shouldn't be done with `equal' since
they are circular lists. On the other hand, using `eq' is fine if
they belong to the same tree.
2012-07-16 10:19:56 -04:00
|
|
|
|
thereis (eq (org-element-type el) 'table))))))
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(cond
|
|
|
|
|
((funcall --element-has-a-table-p item info)
|
|
|
|
|
"</text:list-header>")
|
|
|
|
|
(t "</text:list-item>")))))
|
|
|
|
|
(t (error "Unknown list type: %S" type)))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
;;;; Keyword
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-keyword (keyword contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a KEYWORD element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-03-28 08:04:26 -04:00
|
|
|
|
(let ((key (org-element-property :key keyword))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(value (org-element-property :value keyword)))
|
|
|
|
|
(cond
|
2012-08-25 16:35:24 -04:00
|
|
|
|
((string= key "ODT") value)
|
2012-03-28 08:04:26 -04:00
|
|
|
|
((string= key "INDEX") (format "\\index{%s}" value))
|
|
|
|
|
((string= key "TARGET") nil ; FIXME
|
2012-03-04 14:52:20 -05:00
|
|
|
|
;; (format "\\label{%s}" (org-export-solidify-link-text value))
|
|
|
|
|
)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
((string= key "toc")
|
|
|
|
|
(let ((value (downcase value)))
|
|
|
|
|
(cond
|
|
|
|
|
((string-match "\\<headlines\\>" value)
|
|
|
|
|
(let ((depth (or (and (string-match "[0-9]+" value)
|
|
|
|
|
(string-to-number (match-string 0 value)))
|
|
|
|
|
(plist-get info :with-toc))))
|
|
|
|
|
(when (wholenump depth) (org-e-odt-toc depth info))))
|
2012-02-28 02:39:10 -05:00
|
|
|
|
((string= "tables" value) "FIXME")
|
|
|
|
|
((string= "figures" value) "FIXME")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
((string= "listings" value)
|
|
|
|
|
(cond
|
|
|
|
|
;; At the moment, src blocks with a caption are wrapped
|
|
|
|
|
;; into a figure environment.
|
2012-02-28 02:39:10 -05:00
|
|
|
|
(t "FIXME")))))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Latex Environment
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
(eval-after-load 'org-odt
|
|
|
|
|
'(ad-deactivate 'org-format-latex-as-mathml))
|
|
|
|
|
|
|
|
|
|
;; (defadvice org-format-latex-as-mathml ; FIXME
|
|
|
|
|
;; (after org-e-odt-protect-latex-fragment activate)
|
|
|
|
|
;; "Encode LaTeX fragment as XML.
|
|
|
|
|
;; Do this when translation to MathML fails."
|
|
|
|
|
;; (when (or (not (> (length ad-return-value) 0))
|
|
|
|
|
;; (get-text-property 0 'org-protected ad-return-value))
|
|
|
|
|
;; (setq ad-return-value
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; (org-propertize (org-e-odt--encode-plain-text (ad-get-arg 0))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;; 'org-protected t))))
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-latex-environment (latex-environment contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a LATEX-ENVIRONMENT element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(let* ((latex-frag (org-remove-indentation
|
|
|
|
|
(org-element-property :value latex-environment))))
|
|
|
|
|
(org-e-odt-do-format-code latex-frag)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Latex Fragment
|
|
|
|
|
|
2012-04-14 16:14:19 -04:00
|
|
|
|
;; (when latex-frag ; FIXME
|
|
|
|
|
;; (setq href (org-propertize href :title "LaTeX Fragment"
|
|
|
|
|
;; :description latex-frag)))
|
|
|
|
|
;; handle verbatim
|
|
|
|
|
;; provide descriptions
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-latex-fragment (latex-fragment contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a LATEX-FRAGMENT object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(let* ((latex-frag (org-element-property :value latex-fragment))
|
|
|
|
|
(processing-type (plist-get info :LaTeX-fragments)))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgCode" (org-e-odt--encode-plain-text latex-frag t))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Line Break
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-line-break (line-break contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a LINE-BREAK object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
2012-02-28 02:39:10 -05:00
|
|
|
|
"<text:line-break/>\n")
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
;;;; Link
|
|
|
|
|
|
|
|
|
|
;;;; Links :: Label references
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defun org-e-odt--enumerate (element info &optional predicate n)
|
|
|
|
|
(when predicate (assert (funcall predicate element info)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let* ((--numbered-parent-headline-at-<=-n
|
|
|
|
|
(function
|
|
|
|
|
(lambda (element n info)
|
|
|
|
|
(loop for x in (org-export-get-genealogy element)
|
|
|
|
|
thereis (and (eq (org-element-type x) 'headline)
|
|
|
|
|
(<= (org-export-get-relative-level x info) n)
|
|
|
|
|
(org-export-numbered-headline-p x info)
|
|
|
|
|
x)))))
|
|
|
|
|
(--enumerate
|
|
|
|
|
(function
|
|
|
|
|
(lambda (element scope info &optional predicate)
|
|
|
|
|
(let ((counter 0))
|
|
|
|
|
(org-element-map
|
|
|
|
|
(or scope (plist-get info :parse-tree))
|
|
|
|
|
(org-element-type element)
|
|
|
|
|
(lambda (el)
|
|
|
|
|
(and (or (not predicate) (funcall predicate el info))
|
|
|
|
|
(incf counter)
|
|
|
|
|
(eq element el)
|
|
|
|
|
counter))
|
|
|
|
|
info 'first-match)))))
|
|
|
|
|
(scope (funcall --numbered-parent-headline-at-<=-n
|
|
|
|
|
element (or n org-e-odt-display-outline-level) info))
|
|
|
|
|
(ordinal (funcall --enumerate element scope info predicate))
|
|
|
|
|
(tag
|
|
|
|
|
(concat
|
|
|
|
|
;; Section number.
|
|
|
|
|
(and scope
|
|
|
|
|
(mapconcat 'number-to-string
|
|
|
|
|
(org-export-get-headline-number scope info) "."))
|
|
|
|
|
;; Separator.
|
|
|
|
|
(and scope ".")
|
|
|
|
|
;; Ordinal.
|
|
|
|
|
(number-to-string ordinal))))
|
|
|
|
|
tag))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-format-label (element info op)
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(assert (memq (org-element-type element) '(link table src-block paragraph)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let* ((caption-from
|
|
|
|
|
(case (org-element-type element)
|
|
|
|
|
(link (org-export-get-parent-element element))
|
|
|
|
|
(t element)))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; Get label and caption.
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(label (org-element-property :name caption-from))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(caption (org-export-get-caption caption-from))
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(short-caption (org-export-get-caption caption-from t))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; Transcode captions.
|
|
|
|
|
(caption (and caption (org-export-data caption info)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(short-caption (and short-caption
|
|
|
|
|
(org-export-data short-caption info))))
|
|
|
|
|
(when (or label caption)
|
|
|
|
|
(let* ((default-category
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(case (org-element-type element)
|
|
|
|
|
(table "__Table__")
|
|
|
|
|
(src-block "__Listing__")
|
|
|
|
|
((link paragraph)
|
|
|
|
|
(cond
|
|
|
|
|
((org-e-odt--enumerable-latex-image-p element info)
|
|
|
|
|
"__DvipngImage__")
|
|
|
|
|
((org-e-odt--enumerable-image-p element info)
|
|
|
|
|
"__Figure__")
|
|
|
|
|
((org-e-odt--enumerable-formula-p element info)
|
|
|
|
|
"__MathFormula__")
|
|
|
|
|
(t (error "Don't know how to format label for link: %S"
|
|
|
|
|
element))))
|
|
|
|
|
(t (error "Don't know how to format label for element type: %s"
|
|
|
|
|
(org-element-type element)))))
|
|
|
|
|
seqno)
|
|
|
|
|
(assert default-category)
|
|
|
|
|
(destructuring-bind (counter label-style category predicate)
|
|
|
|
|
(assoc-default default-category org-e-odt-category-map-alist)
|
|
|
|
|
;; Compute sequence number of the element.
|
|
|
|
|
(setq seqno (org-e-odt--enumerate element info predicate))
|
|
|
|
|
;; Localize category string.
|
|
|
|
|
(setq category (org-export-translate category :utf-8 info))
|
|
|
|
|
(case op
|
|
|
|
|
;; Case 1: Handle Label definition.
|
|
|
|
|
(definition
|
|
|
|
|
;; Assign an internal label, if user has not provided one
|
|
|
|
|
(setq label (or label (format "%s-%s" default-category seqno)))
|
|
|
|
|
(setq label (org-export-solidify-link-text label))
|
|
|
|
|
(cons
|
|
|
|
|
(format-spec
|
|
|
|
|
(cadr (assoc-string label-style org-e-odt-label-styles t))
|
|
|
|
|
`((?e . ,category)
|
|
|
|
|
(?n . ,(format
|
|
|
|
|
"<text:sequence text:ref-name=\"%s\" text:name=\"%s\" text:formula=\"ooow:%s+1\" style:num-format=\"1\">%s</text:sequence>"
|
|
|
|
|
label counter counter seqno))
|
|
|
|
|
(?c . ,(or caption ""))))
|
|
|
|
|
short-caption))
|
|
|
|
|
;; Case 2: Handle Label reference.
|
|
|
|
|
(reference
|
|
|
|
|
(assert label)
|
|
|
|
|
(setq label (org-export-solidify-link-text label))
|
|
|
|
|
(let* ((fmt (cddr (assoc-string label-style org-e-odt-label-styles t)))
|
|
|
|
|
(fmt1 (car fmt))
|
|
|
|
|
(fmt2 (cadr fmt)))
|
|
|
|
|
(format "<text:sequence-ref text:reference-format=\"%s\" text:ref-name=\"%s\">%s</text:sequence-ref>"
|
|
|
|
|
fmt1 label (format-spec fmt2 `((?e . ,category)
|
|
|
|
|
(?n . ,seqno))))))
|
|
|
|
|
(t (error "Unknow %S on label" op))))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Links :: Inline Images
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--copy-image-file (path)
|
|
|
|
|
"Returns the internal name of the file"
|
|
|
|
|
(let* ((image-type (file-name-extension path))
|
|
|
|
|
(media-type (format "image/%s" image-type))
|
|
|
|
|
(target-dir "Images/")
|
|
|
|
|
(target-file
|
|
|
|
|
(format "%s%04d.%s" target-dir
|
|
|
|
|
(incf org-e-odt-embedded-images-count) image-type)))
|
|
|
|
|
(message "Embedding %s as %s ..."
|
|
|
|
|
(substring-no-properties path) target-file)
|
|
|
|
|
|
|
|
|
|
(when (= 1 org-e-odt-embedded-images-count)
|
|
|
|
|
(make-directory (concat org-e-odt-zip-dir target-dir))
|
|
|
|
|
(org-e-odt-create-manifest-file-entry "" target-dir))
|
|
|
|
|
|
|
|
|
|
(copy-file path (concat org-e-odt-zip-dir target-file) 'overwrite)
|
|
|
|
|
(org-e-odt-create-manifest-file-entry media-type target-file)
|
|
|
|
|
target-file))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--image-size (file &optional user-width
|
|
|
|
|
user-height scale dpi embed-as)
|
|
|
|
|
(let* ((--pixels-to-cms
|
|
|
|
|
(function (lambda (pixels dpi)
|
|
|
|
|
(let ((cms-per-inch 2.54)
|
|
|
|
|
(inches (/ pixels dpi)))
|
|
|
|
|
(* cms-per-inch inches)))))
|
|
|
|
|
(--size-in-cms
|
|
|
|
|
(function
|
|
|
|
|
(lambda (size-in-pixels dpi)
|
|
|
|
|
(and size-in-pixels
|
|
|
|
|
(cons (funcall --pixels-to-cms (car size-in-pixels) dpi)
|
|
|
|
|
(funcall --pixels-to-cms (cdr size-in-pixels) dpi))))))
|
|
|
|
|
(dpi (or dpi org-e-odt-pixels-per-inch))
|
|
|
|
|
(anchor-type (or embed-as "paragraph"))
|
|
|
|
|
(user-width (and (not scale) user-width))
|
|
|
|
|
(user-height (and (not scale) user-height))
|
|
|
|
|
(size
|
|
|
|
|
(and
|
|
|
|
|
(not (and user-height user-width))
|
|
|
|
|
(or
|
|
|
|
|
;; Use Imagemagick.
|
|
|
|
|
(and (executable-find "identify")
|
|
|
|
|
(let ((size-in-pixels
|
|
|
|
|
(let ((dim (shell-command-to-string
|
|
|
|
|
(format "identify -format \"%%w:%%h\" \"%s\""
|
|
|
|
|
file))))
|
|
|
|
|
(when (string-match "\\([0-9]+\\):\\([0-9]+\\)" dim)
|
|
|
|
|
(cons (string-to-number (match-string 1 dim))
|
|
|
|
|
(string-to-number (match-string 2 dim)))))))
|
|
|
|
|
(funcall --size-in-cms size-in-pixels dpi)))
|
|
|
|
|
;; Use Emacs.
|
|
|
|
|
(let ((size-in-pixels
|
|
|
|
|
(ignore-errors ; Emacs could be in batch mode
|
|
|
|
|
(clear-image-cache)
|
|
|
|
|
(image-size (create-image file) 'pixels))))
|
|
|
|
|
(funcall --size-in-cms size-in-pixels dpi))
|
|
|
|
|
;; Use hard-coded values.
|
|
|
|
|
(cdr (assoc-string anchor-type
|
|
|
|
|
org-e-odt-default-image-sizes-alist))
|
|
|
|
|
;; Error out.
|
|
|
|
|
(error "Cannot determine Image size. Aborting ..."))))
|
|
|
|
|
(width (car size)) (height (cdr size)))
|
|
|
|
|
(cond
|
|
|
|
|
(scale
|
|
|
|
|
(setq width (* width scale) height (* height scale)))
|
|
|
|
|
((and user-height user-width)
|
|
|
|
|
(setq width user-width height user-height))
|
|
|
|
|
(user-height
|
|
|
|
|
(setq width (* user-height (/ width height)) height user-height))
|
|
|
|
|
(user-width
|
|
|
|
|
(setq height (* user-width (/ height width)) width user-width))
|
|
|
|
|
(t (ignore)))
|
|
|
|
|
;; ensure that an embedded image fits comfortably within a page
|
|
|
|
|
(let ((max-width (car org-e-odt-max-image-size))
|
|
|
|
|
(max-height (cdr org-e-odt-max-image-size)))
|
|
|
|
|
(when (or (> width max-width) (> height max-height))
|
|
|
|
|
(let* ((scale1 (/ max-width width))
|
|
|
|
|
(scale2 (/ max-height height))
|
|
|
|
|
(scale (min scale1 scale2)))
|
|
|
|
|
(setq width (* scale width) height (* scale height)))))
|
|
|
|
|
(cons width height)))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-link--inline-image (element info)
|
|
|
|
|
"Return HTML code for an inline image.
|
|
|
|
|
LINK is the link pointing to the inline image. INFO is a plist
|
|
|
|
|
used as a communication channel."
|
|
|
|
|
(assert (eq (org-element-type element) 'link))
|
|
|
|
|
(let* ((src (let* ((type (org-element-property :type element))
|
|
|
|
|
(raw-path (org-element-property :path element)))
|
|
|
|
|
(cond ((member type '("http" "https"))
|
|
|
|
|
(concat type ":" raw-path))
|
|
|
|
|
((file-name-absolute-p raw-path)
|
|
|
|
|
(expand-file-name raw-path))
|
|
|
|
|
(t raw-path))))
|
|
|
|
|
(src-expanded (if (file-name-absolute-p src) src
|
|
|
|
|
(expand-file-name src (file-name-directory
|
|
|
|
|
(plist-get info :input-file)))))
|
|
|
|
|
(href (format
|
|
|
|
|
"\n<draw:image xlink:href=\"%s\" xlink:type=\"simple\" xlink:show=\"embed\" xlink:actuate=\"onLoad\"/>"
|
|
|
|
|
(org-e-odt--copy-image-file src-expanded)))
|
|
|
|
|
;; Extract attributes from #+ATTR_ODT line.
|
|
|
|
|
(attr-from (case (org-element-type element)
|
|
|
|
|
(link (org-export-get-parent-element element))
|
|
|
|
|
(t element)))
|
|
|
|
|
;; Convert attributes to a plist.
|
|
|
|
|
(attr-plist (org-export-read-attribute :attr_odt attr-from))
|
|
|
|
|
;; Handle `:anchor', `:style' and `:attributes' properties.
|
|
|
|
|
(user-frame-anchor
|
|
|
|
|
(car (assoc-string (plist-get attr-plist :anchor)
|
|
|
|
|
'(("as-char") ("paragraph") ("page")) t)))
|
|
|
|
|
(user-frame-style
|
|
|
|
|
(and user-frame-anchor (plist-get attr-plist :style)))
|
|
|
|
|
(user-frame-attrs
|
|
|
|
|
(and user-frame-anchor (plist-get attr-plist :attributes)))
|
|
|
|
|
(user-frame-params
|
|
|
|
|
(list user-frame-style user-frame-attrs user-frame-anchor))
|
|
|
|
|
;; (embed-as (or embed-as user-frame-anchor "paragraph"))
|
|
|
|
|
;; extrac
|
|
|
|
|
;; handle `:width', `:height' and `:scale' properties.
|
|
|
|
|
(size (org-e-odt--image-size
|
|
|
|
|
src-expanded (plist-get attr-plist :width)
|
|
|
|
|
(plist-get attr-plist :height)
|
|
|
|
|
(plist-get attr-plist :scale) nil ;; embed-as
|
|
|
|
|
"paragraph" ; FIXME
|
|
|
|
|
))
|
|
|
|
|
(width (car size)) (height (cdr size))
|
|
|
|
|
(embed-as (if (org-e-odt--standalone-link-p element info) "paragraph"
|
|
|
|
|
"as-char"))
|
|
|
|
|
(captions (org-e-odt-format-label element info 'definition))
|
|
|
|
|
(caption (car captions)) (short-caption (cdr captions))
|
|
|
|
|
(entity (concat (and caption "Captioned") embed-as "Image")))
|
|
|
|
|
(org-e-odt--render-image/formula entity href width height
|
|
|
|
|
captions user-frame-params )))
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
;;;; Links :: Math formula
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defun org-e-odt-link--inline-formula (element info)
|
|
|
|
|
(let* ((src (let* ((type (org-element-property :type element))
|
|
|
|
|
(raw-path (org-element-property :path element)))
|
|
|
|
|
(cond
|
|
|
|
|
((file-name-absolute-p raw-path)
|
|
|
|
|
(expand-file-name raw-path))
|
|
|
|
|
(t raw-path))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(full-src (if (file-name-absolute-p src) src
|
|
|
|
|
(expand-file-name src (file-name-directory
|
|
|
|
|
(plist-get info :input-file)))))
|
|
|
|
|
(caption-from
|
|
|
|
|
(case (org-element-type element)
|
|
|
|
|
(link (org-export-get-parent-element element))
|
|
|
|
|
(t element)))
|
|
|
|
|
(captions (org-e-odt-format-label caption-from info 'definition))
|
|
|
|
|
(caption (car captions))
|
|
|
|
|
(href
|
|
|
|
|
(format "\n<draw:object %s xlink:href=\"%s\" xlink:type=\"simple\"/>"
|
|
|
|
|
" xlink:show=\"embed\" xlink:actuate=\"onLoad\""
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(file-name-directory (org-e-odt--copy-formula-file full-src))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(embed-as (if caption 'paragraph 'character))
|
|
|
|
|
width height)
|
|
|
|
|
(cond
|
|
|
|
|
((eq embed-as 'character)
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(org-e-odt--render-image/formula "InlineFormula" href width height))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(t
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(let* ((equation (org-e-odt--render-image/formula
|
2012-07-19 12:45:23 -04:00
|
|
|
|
"CaptionedDisplayFormula" href width height captions))
|
|
|
|
|
(label
|
|
|
|
|
(let* ((org-e-odt-category-map-alist
|
2012-09-13 16:41:03 -04:00
|
|
|
|
'(("__MathFormula__" "Text" "math-label" "Equation"
|
|
|
|
|
org-e-odt--enumerable-formula-p))))
|
|
|
|
|
(car (org-e-odt-format-label caption-from info 'definition)))))
|
|
|
|
|
(concat equation "<text:tab/>" label))))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--copy-formula-file (src-file)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
"Returns the internal name of the file"
|
|
|
|
|
(let* ((target-dir (format "Formula-%04d/"
|
|
|
|
|
(incf org-e-odt-embedded-formulas-count)))
|
|
|
|
|
(target-file (concat target-dir "content.xml")))
|
|
|
|
|
;; Create a directory for holding formula file. Also enter it in
|
|
|
|
|
;; to manifest.
|
|
|
|
|
(make-directory (concat org-e-odt-zip-dir target-dir))
|
|
|
|
|
(org-e-odt-create-manifest-file-entry
|
|
|
|
|
"application/vnd.oasis.opendocument.formula" target-dir "1.2")
|
|
|
|
|
;; Copy over the formula file from user directory to zip
|
|
|
|
|
;; directory.
|
|
|
|
|
(message "Embedding %s as %s ..." src-file target-file)
|
|
|
|
|
(let ((case-fold-search nil))
|
|
|
|
|
(cond
|
|
|
|
|
;; Case 1: Mathml.
|
|
|
|
|
((string-match "\\.\\(mathml\\|mml\\)\\'" src-file)
|
|
|
|
|
(copy-file src-file (concat org-e-odt-zip-dir target-file) 'overwrite))
|
|
|
|
|
;; Case 2: OpenDocument formula.
|
|
|
|
|
((string-match "\\.odf\\'" src-file)
|
|
|
|
|
(org-e-odt--zip-extract src-file "content.xml"
|
|
|
|
|
(concat org-e-odt-zip-dir target-dir)))
|
|
|
|
|
(t (error "%s is not a formula file" src-file))))
|
|
|
|
|
;; Enter the formula file in to manifest.
|
|
|
|
|
(org-e-odt-create-manifest-file-entry "text/xml" target-file)
|
|
|
|
|
target-file))
|
|
|
|
|
|
|
|
|
|
;;;; Targets
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defun org-e-odt--render-image/formula (cfg-key href width height &optional
|
|
|
|
|
captions user-frame-params)
|
|
|
|
|
(let* ((frame-cfg-alist
|
|
|
|
|
;; Each element of this alist is of the form (CFG-HANDLE
|
|
|
|
|
;; INNER-FRAME-PARAMS OUTER-FRAME-PARAMS).
|
|
|
|
|
|
|
|
|
|
;; CFG-HANDLE is the key to the alist.
|
|
|
|
|
|
|
|
|
|
;; INNER-FRAME-PARAMS and OUTER-FRAME-PARAMS specify the
|
|
|
|
|
;; frame params for INNER-FRAME and OUTER-FRAME
|
|
|
|
|
;; respectively. See below.
|
|
|
|
|
|
|
|
|
|
;; Configurations that are meant to be applied to
|
|
|
|
|
;; non-captioned image/formula specifies no
|
|
|
|
|
;; OUTER-FRAME-PARAMS.
|
|
|
|
|
|
|
|
|
|
;; TERMINOLOGY
|
|
|
|
|
;; ===========
|
|
|
|
|
;; INNER-FRAME :: Frame that directly surrounds an
|
|
|
|
|
;; image/formula.
|
|
|
|
|
|
|
|
|
|
;; OUTER-FRAME :: Frame that encloses the INNER-FRAME. This
|
|
|
|
|
;; frame also contains the caption, if any.
|
|
|
|
|
|
|
|
|
|
;; FRAME-PARAMS :: List of the form (FRAME-STYLE-NAME
|
|
|
|
|
;; FRAME-ATTRIBUTES FRAME-ANCHOR). Note
|
|
|
|
|
;; that these are the last three arguments
|
|
|
|
|
;; to `org-e-odt--frame'.
|
|
|
|
|
|
|
|
|
|
;; Note that an un-captioned image/formula requires just an
|
|
|
|
|
;; INNER-FRAME, while a captioned image/formula requires
|
|
|
|
|
;; both an INNER and an OUTER-FRAME.
|
|
|
|
|
'(("As-CharImage" ("OrgInlineImage" nil "as-char"))
|
|
|
|
|
("ParagraphImage" ("OrgDisplayImage" nil "paragraph"))
|
|
|
|
|
("PageImage" ("OrgPageImage" nil "page"))
|
|
|
|
|
("CaptionedAs-CharImage"
|
|
|
|
|
("OrgCaptionedImage"
|
|
|
|
|
" style:rel-width=\"100%\" style:rel-height=\"scale\"" "paragraph")
|
|
|
|
|
("OrgInlineImage" nil "as-char"))
|
|
|
|
|
("CaptionedParagraphImage"
|
|
|
|
|
("OrgCaptionedImage"
|
|
|
|
|
" style:rel-width=\"100%\" style:rel-height=\"scale\"" "paragraph")
|
|
|
|
|
("OrgImageCaptionFrame" nil "paragraph"))
|
|
|
|
|
("CaptionedPageImage"
|
|
|
|
|
("OrgCaptionedImage"
|
|
|
|
|
" style:rel-width=\"100%\" style:rel-height=\"scale\"" "paragraph")
|
|
|
|
|
("OrgPageImageCaptionFrame" nil "page"))
|
|
|
|
|
("InlineFormula" ("OrgInlineFormula" nil "as-char"))
|
|
|
|
|
("DisplayFormula" ("OrgDisplayFormula" nil "as-char"))
|
|
|
|
|
("CaptionedDisplayFormula"
|
|
|
|
|
("OrgCaptionedFormula" nil "paragraph")
|
|
|
|
|
("OrgFormulaCaptionFrame" nil "paragraph"))))
|
|
|
|
|
(caption (car captions)) (short-caption (cdr captions))
|
|
|
|
|
;; Retrieve inner and outer frame params, from configuration.
|
|
|
|
|
(frame-cfg (assoc-string cfg-key frame-cfg-alist t))
|
|
|
|
|
(inner (nth 1 frame-cfg))
|
|
|
|
|
(outer (nth 2 frame-cfg))
|
|
|
|
|
;; User-specified frame params (from #+ATTR_ODT spec)
|
|
|
|
|
(user user-frame-params)
|
|
|
|
|
(--merge-frame-params (function
|
|
|
|
|
(lambda (default user)
|
|
|
|
|
"Merge default and user frame params."
|
|
|
|
|
(if (not user) default
|
|
|
|
|
(assert (= (length default) 3))
|
|
|
|
|
(assert (= (length user) 3))
|
|
|
|
|
(loop for u in user
|
|
|
|
|
for d in default
|
|
|
|
|
collect (or u d)))))))
|
2012-04-14 16:14:19 -04:00
|
|
|
|
(cond
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; Case 1: Image/Formula has no caption.
|
|
|
|
|
;; There is only one frame, one that surrounds the image
|
|
|
|
|
;; or formula.
|
2012-04-14 16:14:19 -04:00
|
|
|
|
((not caption)
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; Merge user frame params with that from configuration.
|
|
|
|
|
(setq inner (funcall --merge-frame-params inner user))
|
|
|
|
|
(apply 'org-e-odt--frame href width height inner))
|
|
|
|
|
;; Case 2: Image/Formula is captioned or labeled.
|
|
|
|
|
;; There are two frames: The inner one surrounds the
|
|
|
|
|
;; image or formula. The outer one contains the
|
|
|
|
|
;; caption/sequence number.
|
2012-04-14 16:14:19 -04:00
|
|
|
|
(t
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; Merge user frame params with outer frame params.
|
|
|
|
|
(setq outer (funcall --merge-frame-params outer user))
|
|
|
|
|
;; Short caption, if specified, goes as part of inner frame.
|
|
|
|
|
(setq inner (let ((frame-params (copy-sequence inner)))
|
|
|
|
|
(setcar (cdr frame-params)
|
|
|
|
|
(concat
|
|
|
|
|
(cadr frame-params)
|
|
|
|
|
(when short-caption
|
|
|
|
|
(format " draw:name=\"%s\" " short-caption))))
|
|
|
|
|
frame-params))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(apply 'org-e-odt--textbox
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Illustration"
|
|
|
|
|
(concat
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(apply 'org-e-odt--frame href width height inner)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
caption))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
width height outer)))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--enumerable-p (element info)
|
|
|
|
|
;; Element should have a caption or label.
|
|
|
|
|
(or (org-element-property :caption element)
|
|
|
|
|
(org-element-property :name element)))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--enumerable-image-p (element info)
|
|
|
|
|
(org-e-odt--standalone-link-p
|
|
|
|
|
element info
|
|
|
|
|
;; Paragraph should have a caption or label. It SHOULD NOT be a
|
|
|
|
|
;; replacement element. (i.e., It SHOULD NOT be a result of LaTeX
|
|
|
|
|
;; processing.)
|
|
|
|
|
(lambda (p)
|
|
|
|
|
(and (not (org-element-property :replaces p))
|
|
|
|
|
(or (org-element-property :caption p)
|
|
|
|
|
(org-element-property :name p))))
|
|
|
|
|
;; Link should point to an image file.
|
|
|
|
|
(lambda (l)
|
|
|
|
|
(assert (eq (org-element-type l) 'link))
|
|
|
|
|
(org-export-inline-image-p l org-e-odt-inline-image-rules))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--enumerable-latex-image-p (element info)
|
|
|
|
|
(org-e-odt--standalone-link-p
|
|
|
|
|
element info
|
|
|
|
|
;; Paragraph should have a caption or label. It SHOULD also be a
|
|
|
|
|
;; replacement element. (i.e., It SHOULD be a result of LaTeX
|
|
|
|
|
;; processing.)
|
|
|
|
|
(lambda (p)
|
|
|
|
|
(and (org-element-property :replaces p)
|
|
|
|
|
(or (org-element-property :caption p)
|
|
|
|
|
(org-element-property :name p))))
|
|
|
|
|
;; Link should point to an image file.
|
|
|
|
|
(lambda (l)
|
|
|
|
|
(assert (eq (org-element-type l) 'link))
|
|
|
|
|
(org-export-inline-image-p l org-e-odt-inline-image-rules))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--enumerable-formula-p (element info)
|
|
|
|
|
(org-e-odt--standalone-link-p
|
|
|
|
|
element info
|
|
|
|
|
;; Paragraph should have a caption or label.
|
|
|
|
|
(lambda (p)
|
|
|
|
|
(or (org-element-property :caption p)
|
|
|
|
|
(org-element-property :name p)))
|
|
|
|
|
;; Link should point to a MathML or ODF file.
|
|
|
|
|
(lambda (l)
|
|
|
|
|
(assert (eq (org-element-type l) 'link))
|
|
|
|
|
(org-export-inline-image-p l org-e-odt-inline-formula-rules))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--standalone-link-p (element info &optional
|
|
|
|
|
paragraph-predicate
|
|
|
|
|
link-predicate)
|
|
|
|
|
"Test if ELEMENT is a standalone link for the purpose ODT export.
|
2012-04-04 12:59:04 -04:00
|
|
|
|
INFO is a plist holding contextual information.
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
Return non-nil, if ELEMENT is of type paragraph satisfying
|
|
|
|
|
PARAGRAPH-PREDICATE and it's sole content, save for whitespaces,
|
|
|
|
|
is a link that satisfies LINK-PREDICATE.
|
|
|
|
|
|
|
|
|
|
Return non-nil, if ELEMENT is of type link satisfying
|
|
|
|
|
LINK-PREDICATE and it's containing paragraph satisfies
|
|
|
|
|
PARAGRAPH-PREDICATE inaddtion to having no other content save for
|
|
|
|
|
leading and trailing whitespaces.
|
|
|
|
|
|
|
|
|
|
Return nil, otherwise."
|
|
|
|
|
(let ((p (case (org-element-type element)
|
|
|
|
|
(paragraph element)
|
|
|
|
|
(link (and (or (not link-predicate)
|
|
|
|
|
(funcall link-predicate element))
|
|
|
|
|
(org-export-get-parent element)))
|
|
|
|
|
(t nil))))
|
|
|
|
|
(when p
|
|
|
|
|
(assert (eq (org-element-type p) 'paragraph))
|
|
|
|
|
(when (or (not paragraph-predicate)
|
|
|
|
|
(funcall paragraph-predicate p))
|
|
|
|
|
(let ((contents (org-element-contents p)))
|
2012-04-04 12:59:04 -04:00
|
|
|
|
(loop for x in contents
|
|
|
|
|
with inline-image-count = 0
|
2012-09-13 16:41:03 -04:00
|
|
|
|
always (case (org-element-type x)
|
|
|
|
|
(plain-text
|
|
|
|
|
(not (org-string-nw-p x)))
|
|
|
|
|
(link
|
|
|
|
|
(and (or (not link-predicate)
|
|
|
|
|
(funcall link-predicate x))
|
|
|
|
|
(= (incf inline-image-count) 1)))
|
|
|
|
|
(t nil))))))))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
|
|
|
|
|
(defun org-e-odt-get-previous-elements (blob info)
|
|
|
|
|
(let ((parent (org-export-get-parent blob)))
|
|
|
|
|
(cdr (memq blob (reverse (org-element-contents parent))))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-resolve-numbered-paragraph (element info)
|
|
|
|
|
(when (eq (org-element-type element) 'item)
|
|
|
|
|
(let ((el element) ordinal)
|
|
|
|
|
(while (eq (org-element-type el) 'item)
|
|
|
|
|
(push (1+ (length (org-e-odt-get-previous-elements el info))) ordinal)
|
|
|
|
|
(setq el (org-export-get-parent (org-export-get-parent el))))
|
|
|
|
|
ordinal)))
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-link (link desc info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a LINK object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
DESC is the description part of the link, or the empty string.
|
|
|
|
|
INFO is a plist holding contextual information. See
|
|
|
|
|
`org-export-data'."
|
|
|
|
|
(let* ((type (org-element-property :type link))
|
|
|
|
|
(raw-path (org-element-property :path link))
|
|
|
|
|
;; Ensure DESC really exists, or set it to nil.
|
|
|
|
|
(desc (and (not (string= desc "")) desc))
|
|
|
|
|
(imagep (org-export-inline-image-p
|
|
|
|
|
link org-e-odt-inline-image-rules))
|
|
|
|
|
(path (cond
|
|
|
|
|
((member type '("http" "https" "ftp" "mailto"))
|
|
|
|
|
(concat type ":" raw-path))
|
|
|
|
|
((string= type "file")
|
|
|
|
|
(if (file-name-absolute-p raw-path)
|
|
|
|
|
(concat "file://" (expand-file-name raw-path))
|
|
|
|
|
(concat "file://" raw-path)))
|
|
|
|
|
(t raw-path)))
|
|
|
|
|
protocol)
|
|
|
|
|
(cond
|
|
|
|
|
;; Image file.
|
2012-04-04 12:59:04 -04:00
|
|
|
|
((and (not desc) (org-export-inline-image-p
|
|
|
|
|
link org-e-odt-inline-image-rules))
|
2012-04-14 16:14:19 -04:00
|
|
|
|
(org-e-odt-link--inline-image link info))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; Formula file.
|
|
|
|
|
((and (not desc) (org-export-inline-image-p
|
|
|
|
|
link org-e-odt-inline-formula-rules))
|
|
|
|
|
(org-e-odt-link--inline-formula link info))
|
2012-05-18 15:06:12 -04:00
|
|
|
|
;; Radio target: Transcode target's contents and use them as
|
|
|
|
|
;; link's description.
|
2012-03-04 14:52:20 -05:00
|
|
|
|
((string= type "radio")
|
2012-05-18 05:20:00 -04:00
|
|
|
|
(let ((destination (org-export-resolve-radio-link link info)))
|
|
|
|
|
(when destination
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(let ((desc (org-export-data (org-element-contents destination) info))
|
|
|
|
|
(href (org-export-solidify-link-text path)))
|
|
|
|
|
(format
|
|
|
|
|
"<text:bookmark-ref text:reference-format=\"text\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>"
|
|
|
|
|
href desc)))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Links pointing to an headline: Find destination and build
|
2012-03-04 14:52:20 -05:00
|
|
|
|
;; appropriate referencing command.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
((member type '("custom-id" "fuzzy" "id"))
|
|
|
|
|
(let ((destination (if (string= type "fuzzy")
|
|
|
|
|
(org-export-resolve-fuzzy-link link info)
|
|
|
|
|
(org-export-resolve-id-link link info))))
|
|
|
|
|
(case (org-element-type destination)
|
|
|
|
|
;; Fuzzy link points nowhere.
|
2012-03-04 14:52:20 -05:00
|
|
|
|
('nil
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"Emphasis" (or desc (org-export-data
|
|
|
|
|
(org-element-property
|
|
|
|
|
:raw-link link) info))))
|
2012-03-04 14:52:20 -05:00
|
|
|
|
;; Fuzzy link points to an invisible target.
|
|
|
|
|
(keyword nil)
|
2012-07-07 05:40:42 -04:00
|
|
|
|
;; LINK points to an headline. Check if LINK should display
|
|
|
|
|
;; section numbers.
|
2012-03-04 14:52:20 -05:00
|
|
|
|
(headline
|
|
|
|
|
(let* ((headline-no (org-export-get-headline-number destination info))
|
|
|
|
|
(label (format "sec-%s" (mapconcat 'number-to-string
|
2012-08-25 16:35:24 -04:00
|
|
|
|
headline-no "-"))))
|
|
|
|
|
(cond
|
|
|
|
|
;; Case 1: Headline is numbered and LINK has no
|
|
|
|
|
;; description or LINK's description matches headline's
|
|
|
|
|
;; title. Display section number.
|
|
|
|
|
((and (org-export-numbered-headline-p destination info)
|
|
|
|
|
(or (not desc) (string= desc (org-element-property
|
|
|
|
|
:raw-value destination))))
|
|
|
|
|
(format
|
|
|
|
|
"<text:bookmark-ref text:reference-format=\"chapter\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>"
|
|
|
|
|
label (mapconcat 'number-to-string headline-no ".")))
|
|
|
|
|
;; Case 2: Either the headline is un-numbered or
|
|
|
|
|
;; LINK has a custom description. Display LINK's
|
|
|
|
|
;; description or headline's title.
|
|
|
|
|
(t
|
|
|
|
|
(let ((desc (or desc (org-export-data
|
|
|
|
|
(org-element-property :title destination)
|
|
|
|
|
info))))
|
|
|
|
|
(format
|
|
|
|
|
"<text:bookmark-ref text:reference-format=\"text\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>"
|
|
|
|
|
label desc))))))
|
2012-03-04 14:52:20 -05:00
|
|
|
|
;; Fuzzy link points to a target. Do as above.
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(target
|
|
|
|
|
;; Identify nearest meaningful container
|
|
|
|
|
(let ((container
|
|
|
|
|
(loop for parent in (org-export-get-genealogy destination)
|
|
|
|
|
when
|
|
|
|
|
(memq
|
|
|
|
|
(org-element-type parent)
|
|
|
|
|
'(footnote-definition footnote-reference headline item
|
|
|
|
|
table))
|
|
|
|
|
return parent)))
|
|
|
|
|
;; There is a meaningful container
|
|
|
|
|
(when container
|
|
|
|
|
(case (org-element-type container)
|
|
|
|
|
;; Container is item
|
|
|
|
|
(item
|
|
|
|
|
(format
|
|
|
|
|
"<text:bookmark-ref text:reference-format=\"number-all-superior\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>"
|
|
|
|
|
(org-solidify-link-text path)
|
|
|
|
|
|
|
|
|
|
(mapconcat 'number-to-string
|
|
|
|
|
(org-e-odt-resolve-numbered-paragraph
|
|
|
|
|
container info) ".")))))))
|
2012-03-04 14:52:20 -05:00
|
|
|
|
(otherwise
|
2012-04-14 16:14:19 -04:00
|
|
|
|
;; (unless desc
|
|
|
|
|
;; (setq number (cond
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; ((org-e-odt--standalone-link-p destination info)
|
2012-04-14 16:14:19 -04:00
|
|
|
|
;; (org-export-get-ordinal
|
|
|
|
|
;; (assoc 'link (org-element-contents destination))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;; info 'link 'org-e-odt--standalone-link-p))
|
2012-04-14 16:14:19 -04:00
|
|
|
|
;; (t (org-export-get-ordinal destination info))))
|
|
|
|
|
;; (setq desc (when number
|
|
|
|
|
;; (if (atom number) (number-to-string number)
|
|
|
|
|
;; (mapconcat 'number-to-string number ".")))))
|
|
|
|
|
|
|
|
|
|
(let ((label-reference
|
|
|
|
|
(org-e-odt-format-label destination info 'reference)))
|
|
|
|
|
(assert label-reference)
|
|
|
|
|
label-reference)))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Coderef: replace link with the reference name or the
|
|
|
|
|
;; equivalent line number.
|
|
|
|
|
((string= type "coderef")
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(let* ((line-no (format "%d" (org-export-resolve-coderef path info)))
|
|
|
|
|
(href (concat "coderef-" path)))
|
|
|
|
|
(format
|
|
|
|
|
(org-export-get-coderef-format path desc)
|
|
|
|
|
(format
|
|
|
|
|
"<text:bookmark-ref text:reference-format=\"number\" text:ref-name=\"OrgXref.%s\">%s</text:bookmark-ref>"
|
|
|
|
|
href line-no))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Link type is handled by a special function.
|
|
|
|
|
((functionp (setq protocol (nth 2 (assoc type org-link-protocols))))
|
2012-06-03 07:55:37 -04:00
|
|
|
|
(funcall protocol (org-link-unescape path) desc 'odt))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; External link with a description part.
|
2012-08-25 16:35:24 -04:00
|
|
|
|
((and path desc)
|
|
|
|
|
(format "<text:a xlink:type=\"simple\" xlink:href=\"%s\">%s</text:a>"
|
|
|
|
|
path desc))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; External link without a description part.
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(path
|
|
|
|
|
(format "<text:a xlink:type=\"simple\" xlink:href=\"%s\">%s</text:a>"
|
|
|
|
|
path path))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; No path, only description. Try to do something useful.
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(t (format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"Emphasis" desc)))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Paragraph
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-paragraph (paragraph contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a PARAGRAPH element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is the contents of the paragraph, as a string. INFO is
|
|
|
|
|
the plist used as a communication channel."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let* ((parent (org-export-get-parent paragraph))
|
2012-02-28 02:39:10 -05:00
|
|
|
|
(parent-type (org-element-type parent))
|
|
|
|
|
(style (case parent-type
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(quote-block "Quotations")
|
|
|
|
|
(center-block "OrgCenter")
|
|
|
|
|
(footnote-definition "Footnote")
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(t (or (org-element-property :style paragraph)
|
|
|
|
|
"Text_20_body")))))
|
|
|
|
|
;; If this paragraph is a leading paragraph in an item and the
|
|
|
|
|
;; item has a checkbox, splice the checkbox and paragraph contents
|
|
|
|
|
;; together.
|
2012-06-09 09:34:27 -04:00
|
|
|
|
(when (and (eq (org-element-type parent) 'item)
|
2012-07-08 13:58:16 -04:00
|
|
|
|
(eq paragraph (car (org-element-contents parent))))
|
2012-06-09 09:34:27 -04:00
|
|
|
|
(setq contents (concat (org-e-odt--checkbox parent) contents)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(assert style)
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>" style contents)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Plain List
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-plain-list (plain-list contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a PLAIN-LIST element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is the contents of the list. INFO is a plist holding
|
|
|
|
|
contextual information."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(format "\n<text:list text:style-name=\"%s\" %s>\n%s</text:list>"
|
|
|
|
|
;; Choose style based on list type.
|
|
|
|
|
(case (org-element-property :type plain-list)
|
|
|
|
|
(ordered "OrgNumberedList")
|
|
|
|
|
(unordered "OrgBulletedList")
|
|
|
|
|
(descriptive-1 "OrgDescriptionList")
|
|
|
|
|
(descriptive-2 "OrgDescriptionList"))
|
|
|
|
|
;; If top-level list, re-start numbering. Otherwise,
|
|
|
|
|
;; continue numbering.
|
|
|
|
|
(format "text:continue-numbering=\"%s\""
|
|
|
|
|
(let* ((parent (org-export-get-parent plain-list)))
|
|
|
|
|
(if (and parent (eq (org-element-type parent) 'item))
|
|
|
|
|
"true" "false")))
|
|
|
|
|
contents))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
;;;; Plain Text
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defun org-e-odt--encode-tabs-and-spaces (line)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"\\([\t]\\|\\([ ]+\\)\\)"
|
|
|
|
|
(lambda (s)
|
|
|
|
|
(cond
|
|
|
|
|
((string= s "\t") "<text:tab/>")
|
|
|
|
|
(t (let ((n (length s)))
|
|
|
|
|
(cond
|
|
|
|
|
((= n 1) " ")
|
|
|
|
|
((> n 1) (concat " " (format "<text:s text:c=\"%d\"/>" (1- n))))
|
|
|
|
|
(t ""))))))
|
|
|
|
|
line))
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(defun org-e-odt--encode-plain-text (text &optional no-whitespace-filling)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(mapc
|
|
|
|
|
(lambda (pair)
|
|
|
|
|
(setq text (replace-regexp-in-string (car pair) (cdr pair) text t t)))
|
|
|
|
|
'(("&" . "&") ("<" . "<") (">" . ">")))
|
|
|
|
|
(if no-whitespace-filling text
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(org-e-odt--encode-tabs-and-spaces text)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
(defun org-e-odt--quotation-marks (text info)
|
|
|
|
|
"Export quotation marks depending on language conventions.
|
|
|
|
|
TEXT is a string containing quotation marks to be replaced. INFO
|
|
|
|
|
is a plist used as a communication channel."
|
|
|
|
|
(mapc (lambda(l)
|
|
|
|
|
(let ((start 0))
|
|
|
|
|
(while (setq start (string-match (car l) text start))
|
|
|
|
|
(let ((new-quote (concat (match-string 1 text) (cdr l))))
|
|
|
|
|
(setq text (replace-match new-quote t t text))))))
|
|
|
|
|
(cdr (or (assoc (plist-get info :language) org-e-odt-quotes)
|
|
|
|
|
;; Falls back on English.
|
|
|
|
|
(assoc "en" org-e-odt-quotes))))
|
|
|
|
|
text)
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-plain-text (text info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a TEXT string from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
TEXT is the string to transcode. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-06-03 07:55:37 -04:00
|
|
|
|
;; Protect &, < and >.
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(setq text (org-e-odt--encode-plain-text text t))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Handle quotation marks
|
2012-05-24 23:56:38 -04:00
|
|
|
|
(setq text (org-e-odt--quotation-marks text info))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Convert special strings.
|
|
|
|
|
(when (plist-get info :with-special-strings)
|
2012-05-24 23:56:38 -04:00
|
|
|
|
(mapc
|
|
|
|
|
(lambda (pair)
|
|
|
|
|
(setq text (replace-regexp-in-string (car pair) (cdr pair) text t nil)))
|
|
|
|
|
org-e-odt-special-string-regexps))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Handle break preservation if required.
|
|
|
|
|
(when (plist-get info :preserve-breaks)
|
2012-05-24 23:56:38 -04:00
|
|
|
|
(setq text (replace-regexp-in-string
|
|
|
|
|
"\\(\\\\\\\\\\)?[ \t]*\n" "<text:line-break/>\n" text t)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;; Return value.
|
|
|
|
|
text)
|
|
|
|
|
|
|
|
|
|
|
2012-04-28 20:11:22 -04:00
|
|
|
|
;;;; Planning
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-planning (planning contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a PLANNING element from Org to ODT.
|
2012-04-28 20:11:22 -04:00
|
|
|
|
CONTENTS is nil. INFO is a plist used as a communication
|
|
|
|
|
channel."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampWrapper"
|
|
|
|
|
(concat
|
|
|
|
|
(let ((closed (org-element-property :closed planning)))
|
|
|
|
|
(when closed
|
|
|
|
|
(concat
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampKeyword" org-closed-string)
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestamp" (org-translate-time closed)))))
|
|
|
|
|
(let ((deadline (org-element-property :deadline planning)))
|
|
|
|
|
(when deadline
|
|
|
|
|
(concat
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampKeyword" org-deadline-string)
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestamp" (org-translate-time deadline)))))
|
|
|
|
|
(let ((scheduled (org-element-property :scheduled planning)))
|
|
|
|
|
(when scheduled
|
|
|
|
|
(concat
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampKeyword" org-scheduled-string)
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestamp" (org-translate-time scheduled))))))))
|
2012-04-28 20:11:22 -04:00
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;;; Property Drawer
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-property-drawer (property-drawer contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a PROPERTY-DRAWER element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual
|
|
|
|
|
information."
|
|
|
|
|
;; The property drawer isn't exported but we want separating blank
|
|
|
|
|
;; lines nonetheless.
|
|
|
|
|
"")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Quote Block
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-quote-block (quote-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a QUOTE-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the block. INFO is a plist
|
|
|
|
|
holding contextual information."
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
contents)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Quote Section
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-quote-section (quote-section contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a QUOTE-SECTION element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
|
|
|
|
(let ((value (org-remove-indentation
|
|
|
|
|
(org-element-property :value quote-section))))
|
2012-05-25 17:21:35 -04:00
|
|
|
|
(when value (org-e-odt-do-format-code value))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Section
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defun org-e-odt-format-section (text style &optional name)
|
|
|
|
|
(let ((default-name (car (org-e-odt-add-automatic-style "Section"))))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(format "\n<text:section text:style-name=\"%s\" %s>\n%s\n</text:section>"
|
2012-07-19 12:45:23 -04:00
|
|
|
|
style
|
|
|
|
|
(format "text:name=\"%s\"" (or name default-name))
|
|
|
|
|
text)))
|
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-section (section contents info) ; FIXME
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a SECTION element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the section. INFO is a plist
|
|
|
|
|
holding contextual information."
|
|
|
|
|
contents)
|
|
|
|
|
|
|
|
|
|
;;;; Radio Target
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-radio-target (radio-target text info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a RADIO-TARGET object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
TEXT is the text of the target. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(org-e-odt--target
|
2012-02-22 09:44:21 -05:00
|
|
|
|
text (org-export-solidify-link-text
|
2012-03-28 08:06:39 -04:00
|
|
|
|
(org-element-property :value radio-target))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Special Block
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-special-block (special-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a SPECIAL-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the block. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-07-15 18:08:07 -04:00
|
|
|
|
(let ((type (downcase (org-element-property :type special-block)))
|
|
|
|
|
(attributes (org-export-read-attribute :attr_odt special-block)))
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(cond
|
|
|
|
|
;; Annotation.
|
|
|
|
|
((string= type "annotation")
|
|
|
|
|
(let ((author (or (plist-get attributes :author)
|
|
|
|
|
(let ((author (plist-get info :author)))
|
|
|
|
|
(and author (org-export-data author info)))))
|
|
|
|
|
(date (or (plist-get attributes :date)
|
|
|
|
|
(plist-get info :date))))
|
|
|
|
|
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Text_20_body"
|
|
|
|
|
(format "<office:annotation>\n%s\n</office:annotation>"
|
|
|
|
|
(concat
|
|
|
|
|
(and author
|
|
|
|
|
(format "<dc:creator>%s</dc:creator>" author))
|
|
|
|
|
(and date
|
|
|
|
|
(format "<dc:date>%s</dc:date>"
|
|
|
|
|
(org-e-odt--date date)))
|
|
|
|
|
contents)))))
|
|
|
|
|
;; Textbox.
|
|
|
|
|
((string= type "textbox")
|
|
|
|
|
(let ((width (plist-get attributes :width))
|
|
|
|
|
(height (plist-get attributes :height))
|
|
|
|
|
(style (plist-get attributes :style))
|
|
|
|
|
(extra (plist-get attributes :extra))
|
|
|
|
|
(anchor (plist-get attributes :anchor)))
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Text_20_body" (org-e-odt--textbox contents width height
|
|
|
|
|
style extra anchor))))
|
|
|
|
|
(t contents))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Src Block
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defun org-e-odt-hfy-face-to-css (fn)
|
|
|
|
|
"Create custom style for face FN.
|
|
|
|
|
When FN is the default face, use it's foreground and background
|
|
|
|
|
properties to create \"OrgSrcBlock\" paragraph style. Otherwise
|
|
|
|
|
use it's color attribute to create a character style whose name
|
|
|
|
|
is obtained from FN. Currently all attributes of FN other than
|
|
|
|
|
color are ignored.
|
|
|
|
|
|
|
|
|
|
The style name for a face FN is derived using the following
|
|
|
|
|
operations on the face name in that order - de-dash, CamelCase
|
|
|
|
|
and prefix with \"OrgSrc\". For example,
|
|
|
|
|
`font-lock-function-name-face' is associated with
|
|
|
|
|
\"OrgSrcFontLockFunctionNameFace\"."
|
|
|
|
|
(let* ((css-list (hfy-face-to-style fn))
|
|
|
|
|
(style-name ((lambda (fn)
|
|
|
|
|
(concat "OrgSrc"
|
|
|
|
|
(mapconcat
|
|
|
|
|
'capitalize (split-string
|
|
|
|
|
(hfy-face-or-def-to-name fn) "-")
|
|
|
|
|
""))) fn))
|
|
|
|
|
(color-val (cdr (assoc "color" css-list)))
|
|
|
|
|
(background-color-val (cdr (assoc "background" css-list)))
|
|
|
|
|
(style (and org-e-odt-create-custom-styles-for-srcblocks
|
|
|
|
|
(cond
|
|
|
|
|
((eq fn 'default)
|
|
|
|
|
(format org-e-odt-src-block-paragraph-format
|
|
|
|
|
background-color-val color-val))
|
|
|
|
|
(t
|
|
|
|
|
(format
|
|
|
|
|
"
|
|
|
|
|
<style:style style:name=\"%s\" style:family=\"text\">
|
|
|
|
|
<style:text-properties fo:color=\"%s\"/>
|
|
|
|
|
</style:style>" style-name color-val))))))
|
|
|
|
|
(cons style-name style)))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-htmlfontify-string (line)
|
|
|
|
|
(let* ((hfy-html-quote-regex "\\([<\"&> ]\\)")
|
|
|
|
|
(hfy-html-quote-map '(("\"" """)
|
|
|
|
|
("<" "<")
|
|
|
|
|
("&" "&")
|
|
|
|
|
(">" ">")
|
|
|
|
|
(" " "<text:s/>")
|
|
|
|
|
(" " "<text:tab/>")))
|
|
|
|
|
(hfy-face-to-css 'org-e-odt-hfy-face-to-css)
|
2012-09-04 15:38:30 -04:00
|
|
|
|
(hfy-optimisations-1 (copy-sequence hfy-optimisations))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(hfy-optimisations (add-to-list 'hfy-optimisations-1
|
|
|
|
|
'body-text-only))
|
|
|
|
|
(hfy-begin-span-handler
|
|
|
|
|
(lambda (style text-block text-id text-begins-block-p)
|
|
|
|
|
(insert (format "<text:span text:style-name=\"%s\">" style))))
|
|
|
|
|
(hfy-end-span-handler (lambda nil (insert "</text:span>"))))
|
|
|
|
|
(with-no-warnings (htmlfontify-string line))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-do-format-code
|
|
|
|
|
(code &optional lang refs retain-labels num-start)
|
|
|
|
|
(let* ((lang (or (assoc-default lang org-src-lang-modes) lang))
|
|
|
|
|
(lang-mode (and lang (intern (format "%s-mode" lang))))
|
|
|
|
|
(code-lines (org-split-string code "\n"))
|
|
|
|
|
(code-length (length code-lines))
|
|
|
|
|
(use-htmlfontify-p (and (functionp lang-mode)
|
|
|
|
|
org-e-odt-fontify-srcblocks
|
|
|
|
|
(require 'htmlfontify nil t)
|
|
|
|
|
(fboundp 'htmlfontify-string)))
|
|
|
|
|
(code (if (not use-htmlfontify-p) code
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(insert code)
|
|
|
|
|
(funcall lang-mode)
|
|
|
|
|
(font-lock-fontify-buffer)
|
|
|
|
|
(buffer-string))))
|
|
|
|
|
(fontifier (if use-htmlfontify-p 'org-e-odt-htmlfontify-string
|
2012-09-13 16:41:03 -04:00
|
|
|
|
'org-e-odt--encode-plain-text))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(par-style (if use-htmlfontify-p "OrgSrcBlock"
|
|
|
|
|
"OrgFixedWidthBlock"))
|
|
|
|
|
(i 0))
|
|
|
|
|
(assert (= code-length (length (org-split-string code "\n"))))
|
|
|
|
|
(setq code
|
|
|
|
|
(org-export-format-code
|
|
|
|
|
code
|
|
|
|
|
(lambda (loc line-num ref)
|
|
|
|
|
(setq par-style
|
|
|
|
|
(concat par-style (and (= (incf i) code-length) "LastLine")))
|
|
|
|
|
|
|
|
|
|
(setq loc (concat loc (and ref retain-labels (format " (%s)" ref))))
|
|
|
|
|
(setq loc (funcall fontifier loc))
|
|
|
|
|
(when ref
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(setq loc (org-e-odt--target loc (concat "coderef-" ref))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(assert par-style)
|
|
|
|
|
(setq loc (format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
par-style loc))
|
|
|
|
|
(if (not line-num) loc
|
|
|
|
|
(format "\n<text:list-item>%s\n</text:list-item>" loc)))
|
|
|
|
|
num-start refs))
|
|
|
|
|
(cond
|
|
|
|
|
((not num-start) code)
|
|
|
|
|
((= num-start 0)
|
|
|
|
|
(format
|
|
|
|
|
"\n<text:list text:style-name=\"OrgSrcBlockNumberedLine\"%s>%s</text:list>"
|
|
|
|
|
" text:continue-numbering=\"false\"" code))
|
|
|
|
|
(t
|
|
|
|
|
(format
|
|
|
|
|
"\n<text:list text:style-name=\"OrgSrcBlockNumberedLine\"%s>%s</text:list>"
|
|
|
|
|
" text:continue-numbering=\"true\"" code)))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-format-code (element info)
|
|
|
|
|
(let* ((lang (org-element-property :language element))
|
|
|
|
|
;; Extract code and references.
|
|
|
|
|
(code-info (org-export-unravel-code element))
|
|
|
|
|
(code (car code-info))
|
|
|
|
|
(refs (cdr code-info))
|
|
|
|
|
;; Does the src block contain labels?
|
|
|
|
|
(retain-labels (org-element-property :retain-labels element))
|
|
|
|
|
;; Does it have line numbers?
|
|
|
|
|
(num-start (case (org-element-property :number-lines element)
|
|
|
|
|
(continued (org-export-get-loc element info))
|
|
|
|
|
(new 0))))
|
|
|
|
|
(org-e-odt-do-format-code code lang refs retain-labels num-start)))
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-src-block (src-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a SRC-BLOCK element from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS holds the contents of the item. INFO is a plist holding
|
|
|
|
|
contextual information."
|
|
|
|
|
(let* ((lang (org-element-property :language src-block))
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(attributes (org-export-read-attribute :attr_odt src-block))
|
|
|
|
|
(captions (org-e-odt-format-label src-block info 'definition))
|
|
|
|
|
(caption (car captions)) (short-caption (cdr captions)))
|
|
|
|
|
(concat
|
|
|
|
|
(and caption
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Listing" caption))
|
|
|
|
|
(let ((--src-block (org-e-odt-format-code src-block info)))
|
|
|
|
|
(if (not (plist-get attributes :textbox)) --src-block
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Text_20_body"
|
|
|
|
|
(org-e-odt--textbox --src-block nil nil nil)))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Statistics Cookie
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-statistics-cookie (statistics-cookie contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a STATISTICS-COOKIE object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual information."
|
|
|
|
|
(let ((cookie-value (org-element-property :value statistics-cookie)))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgCode" cookie-value)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
;;;; Strike-Through
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-strike-through (strike-through contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode STRIKE-THROUGH from Org to ODT.
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
CONTENTS is the text with strike-through markup. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"Strikethrough" contents))
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;;; Subscript
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-subscript (subscript contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a SUBSCRIPT object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is the contents of the object. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgSubscript" contents))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Superscript
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-superscript (superscript contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a SUPERSCRIPT object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is the contents of the object. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgSuperscript" contents))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
;;;; Table Cell
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(defun org-e-odt-table-style-spec (element info)
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(let* ((table (org-export-get-parent-table element))
|
2012-06-17 05:01:04 -04:00
|
|
|
|
(table-attributes (org-export-read-attribute :attr_odt table))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(table-style (plist-get table-attributes :style)))
|
|
|
|
|
(assoc table-style org-e-odt-table-styles)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(defun org-e-odt-get-table-cell-styles (table-cell info)
|
|
|
|
|
"Retrieve styles applicable to a table cell.
|
|
|
|
|
R and C are (zero-based) row and column numbers of the table
|
|
|
|
|
cell. STYLE-SPEC is an entry in `org-e-odt-table-styles'
|
|
|
|
|
applicable to the current table. It is `nil' if the table is not
|
|
|
|
|
associated with any style attributes.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
Return a cons of (TABLE-CELL-STYLE-NAME . PARAGRAPH-STYLE-NAME).
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
When STYLE-SPEC is nil, style the table cell the conventional way
|
|
|
|
|
- choose cell borders based on row and column groupings and
|
|
|
|
|
choose paragraph alignment based on `org-col-cookies' text
|
|
|
|
|
property. See also
|
|
|
|
|
`org-e-odt-get-paragraph-style-cookie-for-table-cell'.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
When STYLE-SPEC is non-nil, ignore the above cookie and return
|
|
|
|
|
styles congruent with the ODF-1.2 specification."
|
|
|
|
|
(let* ((table-cell-address (org-export-table-cell-address table-cell info))
|
|
|
|
|
(r (car table-cell-address)) (c (cdr table-cell-address))
|
|
|
|
|
(style-spec (org-e-odt-table-style-spec table-cell info))
|
|
|
|
|
(table-dimensions (org-export-table-dimensions
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(org-export-get-parent-table table-cell)
|
2012-04-22 01:09:19 -04:00
|
|
|
|
info)))
|
|
|
|
|
(when style-spec
|
|
|
|
|
;; LibreOffice - particularly the Writer - honors neither table
|
|
|
|
|
;; templates nor custom table-cell styles. Inorder to retain
|
|
|
|
|
;; inter-operability with LibreOffice, only automatic styles are
|
|
|
|
|
;; used for styling of table-cells. The current implementation is
|
|
|
|
|
;; congruent with ODF-1.2 specification and hence is
|
|
|
|
|
;; future-compatible.
|
|
|
|
|
|
|
|
|
|
;; Additional Note: LibreOffice's AutoFormat facility for tables -
|
|
|
|
|
;; which recognizes as many as 16 different cell types - is much
|
|
|
|
|
;; richer. Unfortunately it is NOT amenable to easy configuration
|
|
|
|
|
;; by hand.
|
|
|
|
|
(let* ((template-name (nth 1 style-spec))
|
|
|
|
|
(cell-style-selectors (nth 2 style-spec))
|
|
|
|
|
(cell-type
|
|
|
|
|
(cond
|
|
|
|
|
((and (cdr (assoc 'use-first-column-styles cell-style-selectors))
|
|
|
|
|
(= c 0)) "FirstColumn")
|
|
|
|
|
((and (cdr (assoc 'use-last-column-styles cell-style-selectors))
|
|
|
|
|
(= (1+ c) (cdr table-dimensions)))
|
|
|
|
|
"LastColumn")
|
|
|
|
|
((and (cdr (assoc 'use-first-row-styles cell-style-selectors))
|
|
|
|
|
(= r 0)) "FirstRow")
|
|
|
|
|
((and (cdr (assoc 'use-last-row-styles cell-style-selectors))
|
|
|
|
|
(= (1+ r) (car table-dimensions)))
|
|
|
|
|
"LastRow")
|
|
|
|
|
((and (cdr (assoc 'use-banding-rows-styles cell-style-selectors))
|
|
|
|
|
(= (% r 2) 1)) "EvenRow")
|
|
|
|
|
((and (cdr (assoc 'use-banding-rows-styles cell-style-selectors))
|
|
|
|
|
(= (% r 2) 0)) "OddRow")
|
|
|
|
|
((and (cdr (assoc 'use-banding-columns-styles cell-style-selectors))
|
|
|
|
|
(= (% c 2) 1)) "EvenColumn")
|
|
|
|
|
((and (cdr (assoc 'use-banding-columns-styles cell-style-selectors))
|
|
|
|
|
(= (% c 2) 0)) "OddColumn")
|
|
|
|
|
(t ""))))
|
|
|
|
|
(concat template-name cell-type)))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-table-cell (table-cell contents info)
|
|
|
|
|
"Transcode a TABLE-CELL element from Org to ODT.
|
|
|
|
|
CONTENTS is nil. INFO is a plist used as a communication
|
|
|
|
|
channel."
|
2012-04-22 03:58:19 -04:00
|
|
|
|
(let* ((table-cell-address (org-export-table-cell-address table-cell info))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(r (car table-cell-address))
|
|
|
|
|
(c (cdr table-cell-address))
|
|
|
|
|
(horiz-span (or (org-export-table-cell-width table-cell info) 0))
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(table-row (org-export-get-parent table-cell))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(custom-style-prefix (org-e-odt-get-table-cell-styles
|
|
|
|
|
table-cell info))
|
|
|
|
|
(paragraph-style
|
|
|
|
|
(or
|
|
|
|
|
(and custom-style-prefix
|
|
|
|
|
(format "%sTableParagraph" custom-style-prefix))
|
|
|
|
|
(concat
|
|
|
|
|
(cond
|
|
|
|
|
((and (= 1 (org-export-table-row-group table-row info))
|
|
|
|
|
(org-export-table-has-header-p
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(org-export-get-parent-table table-row) info))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
"OrgTableHeading")
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
((let* ((table (org-export-get-parent-table table-cell))
|
2012-06-17 05:01:04 -04:00
|
|
|
|
(table-attrs (org-export-read-attribute :attr_odt table))
|
2012-05-26 14:20:38 -04:00
|
|
|
|
(table-header-columns (plist-get table-attrs
|
|
|
|
|
:header-columns)))
|
|
|
|
|
(<= c (cond ((wholenump table-header-columns)
|
|
|
|
|
(- table-header-columns 1))
|
|
|
|
|
(table-header-columns 0)
|
|
|
|
|
(t -1))))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
"OrgTableHeading")
|
|
|
|
|
(t "OrgTableContents"))
|
|
|
|
|
(capitalize (symbol-name (org-export-table-cell-alignment
|
|
|
|
|
table-cell info))))))
|
|
|
|
|
(cell-style-name
|
|
|
|
|
(or
|
|
|
|
|
(and custom-style-prefix (format "%sTableCell"
|
|
|
|
|
custom-style-prefix))
|
|
|
|
|
(concat
|
|
|
|
|
"OrgTblCell"
|
|
|
|
|
(when (or (org-export-table-row-starts-rowgroup-p table-row info)
|
|
|
|
|
(zerop r)) "T")
|
|
|
|
|
(when (org-export-table-row-ends-rowgroup-p table-row info) "B")
|
|
|
|
|
(when (and (org-export-table-cell-starts-colgroup-p table-cell info)
|
|
|
|
|
(not (zerop c)) ) "L"))))
|
|
|
|
|
(cell-attributes
|
|
|
|
|
(concat
|
|
|
|
|
(format " table:style-name=\"%s\"" cell-style-name)
|
|
|
|
|
(and (> horiz-span 0)
|
|
|
|
|
(format " table:number-columns-spanned=\"%d\""
|
|
|
|
|
(1+ horiz-span))))))
|
2012-04-22 03:58:19 -04:00
|
|
|
|
(unless contents (setq contents ""))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(concat
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(assert paragraph-style)
|
|
|
|
|
(format "\n<table:table-cell%s>\n%s\n</table:table-cell>"
|
|
|
|
|
cell-attributes
|
2012-09-04 04:45:14 -04:00
|
|
|
|
(let ((table-cell-contents (org-element-contents table-cell)))
|
|
|
|
|
(if (memq (org-element-type (car table-cell-contents))
|
|
|
|
|
org-element-all-elements)
|
|
|
|
|
contents
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
paragraph-style contents))))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(let (s)
|
|
|
|
|
(dotimes (i horiz-span s)
|
|
|
|
|
(setq s (concat s "\n<table:covered-table-cell/>"))))
|
|
|
|
|
"\n")))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Table Row
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-table-row (table-row contents info)
|
|
|
|
|
"Transcode a TABLE-ROW element from Org to ODT.
|
|
|
|
|
CONTENTS is the contents of the row. INFO is a plist used as a
|
|
|
|
|
communication channel."
|
|
|
|
|
;; Rules are ignored since table separators are deduced from
|
|
|
|
|
;; borders of the current row.
|
|
|
|
|
(when (eq (org-element-property :type table-row) 'standard)
|
|
|
|
|
(let* ((rowgroup-tags
|
|
|
|
|
(if (and (= 1 (org-export-table-row-group table-row info))
|
|
|
|
|
(org-export-table-has-header-p
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(org-export-get-parent-table table-row) info))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
;; If the row belongs to the first rowgroup and the
|
|
|
|
|
;; table has more than one row groups, then this row
|
|
|
|
|
;; belongs to the header row group.
|
|
|
|
|
'("\n<table:table-header-rows>" . "\n</table:table-header-rows>")
|
|
|
|
|
;; Otherwise, it belongs to non-header row group.
|
|
|
|
|
'("\n<table:table-rows>" . "\n</table:table-rows>"))))
|
|
|
|
|
(concat
|
|
|
|
|
;; Does this row begin a rowgroup?
|
|
|
|
|
(when (org-export-table-row-starts-rowgroup-p table-row info)
|
|
|
|
|
(car rowgroup-tags))
|
|
|
|
|
;; Actual table row
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "\n<table:table-row>\n%s\n</table:table-row>" contents)
|
2012-04-22 01:09:19 -04:00
|
|
|
|
;; Does this row end a rowgroup?
|
|
|
|
|
(when (org-export-table-row-ends-rowgroup-p table-row info)
|
|
|
|
|
(cdr rowgroup-tags))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 01:09:19 -04:00
|
|
|
|
|
|
|
|
|
;;;; Table
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-22 03:58:19 -04:00
|
|
|
|
(defun org-e-odt-table-first-row-data-cells (table info)
|
|
|
|
|
(let ((table-row
|
|
|
|
|
(org-element-map
|
|
|
|
|
table 'table-row
|
|
|
|
|
(lambda (row)
|
|
|
|
|
(unless (eq (org-element-property :type row) 'rule) row))
|
|
|
|
|
info 'first-match))
|
|
|
|
|
(special-column-p (org-export-table-has-special-column-p table)))
|
|
|
|
|
(if (not special-column-p) (org-element-contents table-row)
|
|
|
|
|
(cdr (org-element-contents table-row)))))
|
|
|
|
|
|
2012-06-03 07:55:37 -04:00
|
|
|
|
(defun org-e-odt--table (table contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a TABLE element from Org to ODT.
|
2012-05-23 17:21:25 -04:00
|
|
|
|
CONTENTS is the contents of the table. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(case (org-element-property :type table)
|
2012-06-03 07:55:37 -04:00
|
|
|
|
;; Case 1: table.el doesn't support export to OD format. Strip
|
|
|
|
|
;; such tables from export.
|
|
|
|
|
(table.el
|
|
|
|
|
(prog1 nil
|
|
|
|
|
(message
|
|
|
|
|
(concat
|
|
|
|
|
"(org-e-odt): Found table.el-type table in the source Org file."
|
|
|
|
|
" table.el doesn't support export to ODT format."
|
|
|
|
|
" Stripping the table from export."))))
|
|
|
|
|
;; Case 2: Native Org tables.
|
|
|
|
|
(otherwise
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(let* ((captions (org-e-odt-format-label table info 'definition))
|
|
|
|
|
(caption (car captions)) (short-caption (cdr captions))
|
2012-06-17 05:01:04 -04:00
|
|
|
|
(attributes (org-export-read-attribute :attr_odt table))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(custom-table-style (nth 1 (org-e-odt-table-style-spec table info)))
|
|
|
|
|
(table-column-specs
|
|
|
|
|
(function
|
|
|
|
|
(lambda (table info)
|
|
|
|
|
(let* ((table-style (or custom-table-style "OrgTable"))
|
|
|
|
|
(column-style (format "%sColumn" table-style)))
|
|
|
|
|
(mapconcat
|
2012-04-22 03:58:19 -04:00
|
|
|
|
(lambda (table-cell)
|
|
|
|
|
(let ((width (1+ (or (org-export-table-cell-width
|
2012-07-19 12:45:23 -04:00
|
|
|
|
table-cell info) 0)))
|
|
|
|
|
(s (format
|
|
|
|
|
"\n<table:table-column table:style-name=\"%s\"/>"
|
|
|
|
|
column-style))
|
|
|
|
|
out)
|
|
|
|
|
(dotimes (i width out) (setq out (concat s out)))))
|
2012-04-22 03:58:19 -04:00
|
|
|
|
(org-e-odt-table-first-row-data-cells table info) "\n"))))))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(concat
|
|
|
|
|
;; caption.
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(when caption
|
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"Table" caption))
|
2012-04-22 01:09:19 -04:00
|
|
|
|
;; begin table.
|
|
|
|
|
(let* ((automatic-name
|
|
|
|
|
(org-e-odt-add-automatic-style "Table" attributes)))
|
|
|
|
|
(format
|
2012-06-05 10:01:54 -04:00
|
|
|
|
"\n<table:table table:name=\"%s\" table:style-name=\"%s\">"
|
2012-04-22 01:09:19 -04:00
|
|
|
|
(or short-caption (car automatic-name))
|
|
|
|
|
(or custom-table-style (cdr automatic-name) "OrgTable")))
|
|
|
|
|
;; column specification.
|
2012-06-03 07:55:37 -04:00
|
|
|
|
(funcall table-column-specs table info)
|
2012-04-22 01:09:19 -04:00
|
|
|
|
;; actual contents.
|
|
|
|
|
"\n" contents
|
|
|
|
|
;; end table.
|
|
|
|
|
"</table:table>")))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-06-03 07:55:37 -04:00
|
|
|
|
(defun org-e-odt-table (table contents info)
|
|
|
|
|
"Transcode a TABLE element from Org to ODT.
|
|
|
|
|
CONTENTS is the contents of the table. INFO is a plist holding
|
2012-08-25 16:35:24 -04:00
|
|
|
|
contextual information.
|
|
|
|
|
|
|
|
|
|
Use `org-e-odt--table' to typeset the table. Handle details
|
|
|
|
|
pertaining to indentation here."
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(let* ((--get-previous-elements
|
|
|
|
|
(function
|
|
|
|
|
(lambda (blob info)
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(let ((parent (org-export-get-parent blob)))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(cdr (memq blob (reverse (org-element-contents parent))))))))
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(--element-preceded-by-table-p
|
|
|
|
|
(function
|
|
|
|
|
(lambda (element info)
|
|
|
|
|
(loop for el in (funcall --get-previous-elements element info)
|
org-export: Use `eq' instead of `equal' when possible
* contrib/lisp/org-export.el (org-export-data,
org-export-footnote-first-reference-p,
org-export-get-footnote-number, org-export-get-ordinal,
org-export-get-loc, org-export-table-row-group,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-cell-address): Use `eq' instead of `equal' when
possible.
* contrib/lisp/org-e-ascii.el (org-e-ascii-table-row):
* contrib/lisp/org-e-beamer.el (org-e-beamer-select-environment):
* contrib/lisp/org-e-html.el (org-e-html-footnote-section,
org-e-html-latex-environment, org-e-html-paragraph): Use `eq'
instead of `equal' when possible.
* contrib/lisp/org-e-latex.el (org-e-latex--get-footnote-counter):
* contrib/lisp/org-e-odt.el (org-e-odt-do-format-code,
org-e-odt-footnote-def, org-e-odt-item, org-e-odt-latex-environment,
org-e-odt-latex-fragment, org-e-odt-plain-list, org-e-odt-table,
org-e-odt-enumerate-element): Use `eq' instead of `equal' when
possible.
In particular, comparing elements shouldn't be done with `equal' since
they are circular lists. On the other hand, using `eq' is fine if
they belong to the same tree.
2012-07-16 10:19:56 -04:00
|
|
|
|
thereis (eq (org-element-type el) 'table)))))
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(--walk-list-genealogy-and-collect-tags
|
|
|
|
|
(function
|
|
|
|
|
(lambda (table info)
|
org-export: Rewrite topology functions
* contrib/lisp/org-export.el (org-export-get-genealogy,
org-export-get-parent, org-export-get-parent-headline,
org-export-get-parent-table): Rewrite function to use :parent
property. Remove communication channel from signature.
(org-export-get-parent-element): Rename from
`org-export-get-parent-paragraph'.
(org-export-data, org-export-table-row-is-special-p)
org-export-table-row-group, org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-row-starts-header-p,
org-export-table-row-ends-header-p, org-export-table-cell-address,
org-export-first-sibling-p, org-export-last-sibling-p,
org-export-resolve-fuzzy-link, org-export-get-ordinal): Apply
signature change.
(org-export--skip-p, org-export-table-cell-width,
org-export-table-cell-alignment, org-export-table-cell-borders):
Refactor code. Apply signature change.
* contrib/lisp/org-e-ascii.el (org-e-ascii--current-text-width,
org-e-ascii--unique-links, org-e-ascii-inlinetask,
org-e-ascii-item, org-e-ascii-paragraph, org-e-ascii-quote-section,
org-e-ascii-section, org-e-ascii--table-cell-width): Apply signature
change.
* contrib/lisp/org-e-html.el (org-e-html-link,
org-e-html-link--inline-image): Use new function and apply signature
change.
(org-e-html-item, org-e-html-standalone-image-p, org-e-html-paragraph,
org-e-html-section, org-e-html-table-cell, org-e-html-table-row,
org-e-html-footnote-reference): Apply signature change.
* contrib/lisp/org-e-latex.el (org-e-latex-link--inline-image): Use
new function and apply signature change.
(org-e-latex-footnote-reference, org-e-latex-item,
org-e-latex-table-cell, org-e-latex-table-row): Apply signature
change.
* contrib/lisp/org-e-odt.el (org-e-odt-format-formula,
org-e-odt-format-label, org-e-odt-link--inline-image): Use new
function and apply signature change.
(org-e-odt-item, org-e-odt-standalone-image-p, org-e-odt-paragraph,
org-e-odt-plain-list, org-e-odt-table-style-spec,
org-e-odt-get-table-cell-styles, org-e-odt-table-cell,
org-e-odt-table-row, org-e-odt-table, org-e-odt-footnote-reference,
org-e-odt-enumerate-element): Apply signature change.
2012-06-08 15:00:47 -04:00
|
|
|
|
(let* ((genealogy (org-export-get-genealogy table))
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(list-genealogy
|
org-export: Use `eq' instead of `equal' when possible
* contrib/lisp/org-export.el (org-export-data,
org-export-footnote-first-reference-p,
org-export-get-footnote-number, org-export-get-ordinal,
org-export-get-loc, org-export-table-row-group,
org-export-table-cell-starts-colgroup-p,
org-export-table-cell-ends-colgroup-p,
org-export-table-cell-address): Use `eq' instead of `equal' when
possible.
* contrib/lisp/org-e-ascii.el (org-e-ascii-table-row):
* contrib/lisp/org-e-beamer.el (org-e-beamer-select-environment):
* contrib/lisp/org-e-html.el (org-e-html-footnote-section,
org-e-html-latex-environment, org-e-html-paragraph): Use `eq'
instead of `equal' when possible.
* contrib/lisp/org-e-latex.el (org-e-latex--get-footnote-counter):
* contrib/lisp/org-e-odt.el (org-e-odt-do-format-code,
org-e-odt-footnote-def, org-e-odt-item, org-e-odt-latex-environment,
org-e-odt-latex-fragment, org-e-odt-plain-list, org-e-odt-table,
org-e-odt-enumerate-element): Use `eq' instead of `equal' when
possible.
In particular, comparing elements shouldn't be done with `equal' since
they are circular lists. On the other hand, using `eq' is fine if
they belong to the same tree.
2012-07-16 10:19:56 -04:00
|
|
|
|
(when (eq (org-element-type (car genealogy)) 'item)
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(loop for el in genealogy
|
2012-08-25 16:35:24 -04:00
|
|
|
|
when (memq (org-element-type el)
|
|
|
|
|
'(item plain-list))
|
|
|
|
|
collect el)))
|
|
|
|
|
(llh-genealogy
|
|
|
|
|
(apply 'nconc
|
|
|
|
|
(loop for el in genealogy
|
|
|
|
|
when (and (eq (org-element-type el) 'headline)
|
|
|
|
|
(org-export-low-level-p el info))
|
|
|
|
|
collect
|
|
|
|
|
(list el
|
|
|
|
|
(assq 'headline
|
|
|
|
|
(org-element-contents
|
|
|
|
|
(org-export-get-parent el)))))))
|
|
|
|
|
parent-list)
|
|
|
|
|
(nconc
|
|
|
|
|
;; Handle list genealogy.
|
|
|
|
|
(loop for el in list-genealogy collect
|
|
|
|
|
(case (org-element-type el)
|
|
|
|
|
(plain-list
|
|
|
|
|
(setq parent-list el)
|
|
|
|
|
(cons "</text:list>"
|
|
|
|
|
(format "\n<text:list text:style-name=\"%s\" %s>"
|
|
|
|
|
(case (org-element-property :type el)
|
|
|
|
|
(ordered "OrgNumberedList")
|
|
|
|
|
(unordered "OrgBulletedList")
|
|
|
|
|
(descriptive-1 "OrgDescriptionList")
|
|
|
|
|
(descriptive-2 "OrgDescriptionList"))
|
|
|
|
|
"text:continue-numbering=\"true\"")))
|
|
|
|
|
(item
|
|
|
|
|
(cond
|
|
|
|
|
((not parent-list)
|
|
|
|
|
(if (funcall --element-preceded-by-table-p table info)
|
|
|
|
|
'("</text:list-header>" . "<text:list-header>")
|
|
|
|
|
'("</text:list-item>" . "<text:list-header>")))
|
|
|
|
|
((funcall --element-preceded-by-table-p
|
|
|
|
|
parent-list info)
|
|
|
|
|
'("</text:list-header>" . "<text:list-header>"))
|
|
|
|
|
(t '("</text:list-item>" . "<text:list-item>"))))))
|
|
|
|
|
;; Handle low-level headlines.
|
|
|
|
|
(loop for el in llh-genealogy
|
|
|
|
|
with step = 'item collect
|
|
|
|
|
(case step
|
|
|
|
|
(plain-list
|
|
|
|
|
(setq step 'item) ; Flip-flop
|
|
|
|
|
(setq parent-list el)
|
|
|
|
|
(cons "</text:list>"
|
|
|
|
|
(format "\n<text:list text:style-name=\"%s\" %s>"
|
|
|
|
|
(if (org-export-numbered-headline-p
|
|
|
|
|
el info)
|
|
|
|
|
"OrgNumberedList"
|
|
|
|
|
"OrgBulletedList")
|
|
|
|
|
"text:continue-numbering=\"true\"")))
|
|
|
|
|
(item
|
|
|
|
|
(setq step 'plain-list) ; Flip-flop
|
|
|
|
|
(cond
|
|
|
|
|
((not parent-list)
|
|
|
|
|
(if (funcall --element-preceded-by-table-p table info)
|
|
|
|
|
'("</text:list-header>" . "<text:list-header>")
|
|
|
|
|
'("</text:list-item>" . "<text:list-header>")))
|
2012-09-04 04:45:14 -04:00
|
|
|
|
((let ((section? (org-export-get-previous-element
|
|
|
|
|
parent-list info)))
|
|
|
|
|
(and section?
|
|
|
|
|
(eq (org-element-type section?) 'section)
|
|
|
|
|
(assq 'table (org-element-contents section?))))
|
2012-08-25 16:35:24 -04:00
|
|
|
|
'("</text:list-header>" . "<text:list-header>"))
|
|
|
|
|
(t
|
|
|
|
|
'("</text:list-item>" . "<text:list-item>")))))))))))
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(close-open-tags (funcall --walk-list-genealogy-and-collect-tags
|
|
|
|
|
table info)))
|
|
|
|
|
;; OpenDocument schema does not permit table to occur within a
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;; list item.
|
|
|
|
|
|
|
|
|
|
;; One solution - the easiest and lightweight, in terms of
|
|
|
|
|
;; implementation - is to put the table in an indented text box
|
|
|
|
|
;; and make the text box part of the list-item. Unfortunately if
|
|
|
|
|
;; the table is big and spans multiple pages, the text box could
|
|
|
|
|
;; overflow. In this case, the following attribute will come
|
|
|
|
|
;; handy.
|
|
|
|
|
|
|
|
|
|
;; ,---- From OpenDocument-v1.1.pdf
|
|
|
|
|
;; | 15.27.28 Overflow behavior
|
|
|
|
|
;; |
|
|
|
|
|
;; | For text boxes contained within text document, the
|
|
|
|
|
;; | style:overflow-behavior property specifies the behavior of text
|
|
|
|
|
;; | boxes where the containing text does not fit into the text
|
|
|
|
|
;; | box.
|
|
|
|
|
;; |
|
|
|
|
|
;; | If the attribute's value is clip, the text that does not fit
|
|
|
|
|
;; | into the text box is not displayed.
|
|
|
|
|
;; |
|
|
|
|
|
;; | If the attribute value is auto-create-new-frame, a new frame
|
|
|
|
|
;; | will be created on the next page, with the same position and
|
|
|
|
|
;; | dimensions of the original frame.
|
|
|
|
|
;; |
|
|
|
|
|
;; | If the style:overflow-behavior property's value is
|
|
|
|
|
;; | auto-create-new-frame and the text box has a minimum width or
|
|
|
|
|
;; | height specified, then the text box will grow until the page
|
|
|
|
|
;; | bounds are reached before a new frame is created.
|
|
|
|
|
;; `----
|
|
|
|
|
|
|
|
|
|
;; Unfortunately, LibreOffice-3.4.6 doesn't honor
|
|
|
|
|
;; auto-create-new-frame property and always resorts to clipping
|
|
|
|
|
;; the text box. This results in table being truncated.
|
|
|
|
|
|
|
|
|
|
;; So we solve the problem the hard (and fun) way using list
|
|
|
|
|
;; continuations.
|
|
|
|
|
|
|
|
|
|
;; The problem only becomes more interesting if you take in to
|
|
|
|
|
;; account the following facts:
|
|
|
|
|
;;
|
|
|
|
|
;; - Description lists are simulated as plain lists.
|
|
|
|
|
;; - Low-level headlines can be listified.
|
|
|
|
|
;; - In Org-mode, a table can occur not only as a regular list
|
|
|
|
|
;; item, but also within description lists and low-level
|
|
|
|
|
;; headlines.
|
|
|
|
|
|
|
|
|
|
;; See `org-e-odt-translate-description-lists' and
|
|
|
|
|
;; `org-e-odt-translate-low-level-headlines' for how this is
|
|
|
|
|
;; tackled.
|
|
|
|
|
|
2012-06-05 10:01:54 -04:00
|
|
|
|
(concat "\n"
|
|
|
|
|
;; Discontinue the list.
|
|
|
|
|
(mapconcat 'car close-open-tags "\n")
|
|
|
|
|
;; Put the table in an indented section.
|
|
|
|
|
(let* ((table (org-e-odt--table table contents info))
|
|
|
|
|
(level (/ (length (mapcar 'car close-open-tags)) 2))
|
|
|
|
|
(style (format "OrgIndentedSection-Level-%d" level)))
|
|
|
|
|
(when table (org-e-odt-format-section table style)))
|
|
|
|
|
;; Continue the list.
|
|
|
|
|
(mapconcat 'cdr (nreverse close-open-tags) "\n"))))
|
2012-06-03 07:55:37 -04:00
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;;; Target
|
|
|
|
|
|
2012-03-04 14:52:20 -05:00
|
|
|
|
(defun org-e-odt-target (target contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a TARGET object from Org to ODT.
|
2012-03-04 14:52:20 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist holding contextual
|
|
|
|
|
information."
|
2012-08-25 16:35:24 -04:00
|
|
|
|
(let ((value (org-element-property :value target)))
|
|
|
|
|
(org-e-odt--target "" (org-export-solidify-link-text value))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-04-28 20:23:09 -04:00
|
|
|
|
;;;; Timestamp
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-04-28 20:23:09 -04:00
|
|
|
|
(defun org-e-odt-timestamp (timestamp contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a TIMESTAMP object from Org to ODT.
|
2012-04-28 20:11:22 -04:00
|
|
|
|
CONTENTS is nil. INFO is a plist used as a communication
|
|
|
|
|
channel."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let ((timestamp-1 (org-element-property :value timestamp))
|
|
|
|
|
(timestamp-2 (org-element-property :range-end timestamp)))
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestampWrapper"
|
|
|
|
|
(concat
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestamp" (org-translate-time timestamp-1))
|
|
|
|
|
(and timestamp-2
|
|
|
|
|
"–"
|
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgTimestamp" (org-translate-time timestamp-2)))))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
;;;; Underline
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-underline (underline contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode UNDERLINE from Org to ODT.
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
CONTENTS is the text with underline markup. INFO is a plist
|
|
|
|
|
holding contextual information."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"Underline" contents))
|
org-element: Define new objects (bold, code, italic, ...)
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 12:00:50 -04:00
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;;; Verbatim
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-verbatim (verbatim contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a VERBATIM object from Org to ODT.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
CONTENTS is nil. INFO is a plist used as a communication
|
|
|
|
|
channel."
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(format "<text:span text:style-name=\"%s\">%s</text:span>"
|
|
|
|
|
"OrgCode" (org-element-property :value verbatim)))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;; Verse Block
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-verse-block (verse-block contents info)
|
2012-05-25 14:39:53 -04:00
|
|
|
|
"Transcode a VERSE-BLOCK element from Org to ODT.
|
2012-04-25 16:15:29 -04:00
|
|
|
|
CONTENTS is verse block contents. INFO is a plist holding
|
|
|
|
|
contextual information."
|
2012-05-25 17:21:35 -04:00
|
|
|
|
;; Add line breaks to each line of verse.
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(setq contents (replace-regexp-in-string
|
2012-07-19 12:45:23 -04:00
|
|
|
|
"\\(<text:line-break/>\\)?[ \t]*\n"
|
|
|
|
|
"<text:line-break/>" contents))
|
2012-05-25 17:21:35 -04:00
|
|
|
|
;; Replace tabs and spaces.
|
2012-09-13 16:41:03 -04:00
|
|
|
|
(setq contents (org-e-odt--encode-tabs-and-spaces contents))
|
2012-05-25 17:21:35 -04:00
|
|
|
|
;; Surround it in a verse environment.
|
org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.
In e-html export, textareas are now possible with the following
attribute:
#+ATTR_HTML: :textarea t :width 80 :height 10
:width and :height keywords are optional.
2012-09-13 11:15:07 -04:00
|
|
|
|
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
|
|
|
|
|
"OrgVerse" contents))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;;; Filters
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
;;;; LaTeX fragments
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--translate-latex-fragments (tree backend info)
|
|
|
|
|
(let ((processing-type (plist-get info :LaTeX-fragments))
|
|
|
|
|
(count 0))
|
|
|
|
|
;; Normalize processing-type to one of dvipng, mathml or verbatim.
|
|
|
|
|
;; If the desired converter is not available, force verbatim
|
|
|
|
|
;; processing.
|
|
|
|
|
(case processing-type
|
|
|
|
|
((t mathml)
|
|
|
|
|
(if (and (fboundp 'org-format-latex-mathml-available-p)
|
|
|
|
|
(org-format-latex-mathml-available-p))
|
|
|
|
|
(setq processing-type 'mathml)
|
|
|
|
|
(message "LaTeX to MathML converter not available.")
|
|
|
|
|
(setq processing-type 'verbatim)))
|
|
|
|
|
(dvipng
|
|
|
|
|
(unless (and (org-check-external-command "latex" "" t)
|
|
|
|
|
(org-check-external-command "dvipng" "" t))
|
|
|
|
|
(message "LaTeX to PNG converter not available.")
|
|
|
|
|
(setq processing-type 'verbatim)))
|
|
|
|
|
(otherwise
|
|
|
|
|
(message "Unknown LaTeX option. Forcing verbatim.")
|
|
|
|
|
(setq processing-type 'verbatim)))
|
|
|
|
|
|
|
|
|
|
;; Store normalized value for later use.
|
|
|
|
|
(when (plist-get info :LaTeX-fragments)
|
|
|
|
|
(plist-put info :LaTeX-fragments processing-type))
|
|
|
|
|
(message "Formatting LaTeX using %s" processing-type)
|
|
|
|
|
|
|
|
|
|
;; Convert `latex-fragment's and `latex-environment's.
|
|
|
|
|
(when (memq processing-type '(mathml dvipng))
|
|
|
|
|
(org-element-map
|
|
|
|
|
tree '(latex-fragment latex-environment)
|
|
|
|
|
(lambda (latex-*)
|
|
|
|
|
(incf count)
|
|
|
|
|
(let* ((latex-frag (org-element-property :value latex-*))
|
|
|
|
|
(input-file (plist-get info :input-file))
|
|
|
|
|
(cache-dir (file-name-directory input-file))
|
|
|
|
|
(cache-subdir (concat
|
|
|
|
|
(case processing-type
|
|
|
|
|
(dvipng "ltxpng/")
|
|
|
|
|
(mathml "ltxmathml/"))
|
|
|
|
|
(file-name-sans-extension
|
|
|
|
|
(file-name-nondirectory input-file))))
|
|
|
|
|
(display-msg
|
|
|
|
|
(case processing-type
|
|
|
|
|
(dvipng (format "Creating LaTeX Image %d..." count))
|
|
|
|
|
(mathml (format "Creating MathML snippet %d..." count))))
|
|
|
|
|
;; Get an Org-style link to PNG image or the MathML
|
|
|
|
|
;; file.
|
|
|
|
|
(org-link
|
|
|
|
|
(let ((link (with-temp-buffer
|
|
|
|
|
(insert latex-frag)
|
|
|
|
|
(org-format-latex cache-subdir cache-dir
|
|
|
|
|
nil display-msg
|
|
|
|
|
nil nil processing-type)
|
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
|
(point-min) (point-max)))))
|
|
|
|
|
(if (not (string-match "file:\\([^]]*\\)" link))
|
|
|
|
|
(message "LaTeX Conversion failed.")
|
|
|
|
|
link))))
|
|
|
|
|
(when org-link
|
|
|
|
|
;; Conversion succeeded. Parse above Org-style link to a
|
|
|
|
|
;; `link' object.
|
|
|
|
|
(let* ((link (car (org-element-map (with-temp-buffer
|
|
|
|
|
(org-mode)
|
|
|
|
|
(insert org-link)
|
|
|
|
|
(org-element-parse-buffer))
|
|
|
|
|
'link 'identity))))
|
|
|
|
|
;; Orphan the link.
|
|
|
|
|
(org-element-put-property link :parent nil)
|
|
|
|
|
(let* (
|
|
|
|
|
(replacement
|
|
|
|
|
(case (org-element-type latex-*)
|
|
|
|
|
;; Case 1: LaTeX environment.
|
|
|
|
|
;; Mimic a "standalone image or formula" by
|
|
|
|
|
;; enclosing the `link' in a `paragraph'.
|
|
|
|
|
;; Copy over original attributes, captions to
|
|
|
|
|
;; the enclosing paragraph.
|
|
|
|
|
(latex-environment
|
|
|
|
|
(org-element-adopt-elements
|
|
|
|
|
(list 'paragraph
|
|
|
|
|
(list :style "OrgFormula"
|
|
|
|
|
:name (org-element-property :name
|
|
|
|
|
latex-*)
|
|
|
|
|
:caption (org-element-property :caption
|
|
|
|
|
latex-*)))
|
|
|
|
|
link))
|
|
|
|
|
;; Case 2: LaTeX fragment.
|
|
|
|
|
;; No special action.
|
|
|
|
|
(latex-fragment link))))
|
|
|
|
|
;; Note down the object that link replaces.
|
|
|
|
|
(org-element-put-property replacement :replaces
|
|
|
|
|
(list (org-element-type latex-*)
|
|
|
|
|
(list :value latex-frag)))
|
|
|
|
|
;; Replace now.
|
|
|
|
|
(org-element-set-element latex-* replacement))))))
|
|
|
|
|
info)))
|
|
|
|
|
tree)
|
|
|
|
|
|
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;;;; Description lists
|
|
|
|
|
|
|
|
|
|
;; This translator is necessary to handle indented tables in a uniform
|
|
|
|
|
;; manner. See comment in `org-e-odt--table'.
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--translate-description-lists (tree backend info)
|
|
|
|
|
;; OpenDocument has no notion of a description list. So simulate it
|
|
|
|
|
;; using plain lists. Description lists in the exported document
|
|
|
|
|
;; are typeset in the same manner as they are in a typical HTML
|
|
|
|
|
;; document.
|
|
|
|
|
;;
|
|
|
|
|
;; Specifically, a description list like this:
|
|
|
|
|
;;
|
|
|
|
|
;; ,----
|
|
|
|
|
;; | - term-1 :: definition-1
|
|
|
|
|
;; | - term-2 :: definition-2
|
|
|
|
|
;; `----
|
|
|
|
|
;;
|
|
|
|
|
;; gets translated in to the following form:
|
|
|
|
|
;;
|
|
|
|
|
;; ,----
|
|
|
|
|
;; | - term-1
|
|
|
|
|
;; | - definition-1
|
|
|
|
|
;; | - term-2
|
|
|
|
|
;; | - definition-2
|
|
|
|
|
;; `----
|
|
|
|
|
;;
|
|
|
|
|
;; Further effect is achieved by fixing the OD styles as below:
|
|
|
|
|
;;
|
|
|
|
|
;; 1. Set the :type property of the simulated lists to
|
|
|
|
|
;; `descriptive-1' and `descriptive-2'. Map these to list-styles
|
|
|
|
|
;; that has *no* bullets whatsoever.
|
|
|
|
|
;;
|
|
|
|
|
;; 2. The paragraph containing the definition term is styled to be
|
|
|
|
|
;; in bold.
|
|
|
|
|
;;
|
2012-09-04 05:15:51 -04:00
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'plain-list
|
|
|
|
|
(lambda (el)
|
|
|
|
|
(when (equal (org-element-property :type el) 'descriptive)
|
|
|
|
|
(org-element-set-element
|
|
|
|
|
el
|
|
|
|
|
(apply 'org-element-adopt-elements
|
|
|
|
|
(list 'plain-list (list :type 'descriptive-1))
|
|
|
|
|
(mapcar
|
|
|
|
|
(lambda (item)
|
|
|
|
|
(org-element-adopt-elements
|
|
|
|
|
(list 'item (list :checkbox (org-element-property
|
|
|
|
|
:checkbox item)))
|
|
|
|
|
(list 'paragraph (list :style "Text_20_body_20_bold")
|
|
|
|
|
(or (org-element-property :tag item) "(no term)"))
|
|
|
|
|
(org-element-adopt-elements
|
|
|
|
|
(list 'plain-list (list :type 'descriptive-2))
|
|
|
|
|
(apply 'org-element-adopt-elements
|
|
|
|
|
(list 'item nil)
|
|
|
|
|
(org-element-contents item)))))
|
|
|
|
|
(org-element-contents el)))))
|
|
|
|
|
nil)
|
|
|
|
|
info)
|
2012-08-25 16:35:24 -04:00
|
|
|
|
tree)
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
2012-09-04 04:45:14 -04:00
|
|
|
|
;;;; List tables
|
|
|
|
|
|
|
|
|
|
;; Lists that are marked with attribute `:list-table' are called as
|
|
|
|
|
;; list tables. They will be rendered as a table within the exported
|
|
|
|
|
;; document.
|
|
|
|
|
|
|
|
|
|
;; Consider an example. The following list table
|
|
|
|
|
;;
|
|
|
|
|
;; #+attr_odt :list-table t
|
|
|
|
|
;; - Row 1
|
|
|
|
|
;; - 1.1
|
|
|
|
|
;; - 1.2
|
|
|
|
|
;; - 1.3
|
|
|
|
|
;; - Row 2
|
|
|
|
|
;; - 2.1
|
|
|
|
|
;; - 2.2
|
|
|
|
|
;; - 2.3
|
|
|
|
|
;;
|
|
|
|
|
;; will be exported as though it were an Org table like the one show
|
|
|
|
|
;; below.
|
|
|
|
|
;;
|
|
|
|
|
;; | Row 1 | 1.1 | 1.2 | 1.3 |
|
|
|
|
|
;; | Row 2 | 2.1 | 2.2 | 2.3 |
|
|
|
|
|
;;
|
|
|
|
|
;; Note that org-tables are NOT multi-line and each line is mapped to
|
|
|
|
|
;; a unique row in the exported document. So if an exported table
|
|
|
|
|
;; needs to contain a single paragraph (with copious text) it needs to
|
|
|
|
|
;; be typed up in a single line. Editing such long lines using the
|
|
|
|
|
;; table editor will be a cumbersome task. Furthermore inclusion of
|
|
|
|
|
;; multi-paragraph text in a table cell is well-nigh impossible.
|
|
|
|
|
;;
|
|
|
|
|
;; A LIST-TABLE circumvents above problems.
|
|
|
|
|
;;
|
|
|
|
|
;; Note that in the example above the list items could be paragraphs
|
|
|
|
|
;; themselves and the list can be arbitrarily deep.
|
|
|
|
|
;;
|
|
|
|
|
;; Inspired by following thread:
|
|
|
|
|
;; https://lists.gnu.org/archive/html/emacs-orgmode/2011-03/msg01101.html
|
|
|
|
|
|
|
|
|
|
;; Translate lists to tables
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt--translate-list-tables (tree backend info)
|
2012-09-04 15:38:30 -04:00
|
|
|
|
(org-element-map
|
|
|
|
|
tree 'plain-list
|
2012-09-04 17:40:43 -04:00
|
|
|
|
(lambda (l1-list)
|
|
|
|
|
(when (org-export-read-attribute :attr_odt l1-list :list-table)
|
2012-09-04 15:38:30 -04:00
|
|
|
|
;; Replace list with table.
|
|
|
|
|
(org-element-set-element
|
2012-09-04 17:40:43 -04:00
|
|
|
|
l1-list
|
2012-09-04 15:38:30 -04:00
|
|
|
|
;; Build replacement table.
|
|
|
|
|
(apply 'org-element-adopt-elements
|
2012-09-04 17:40:43 -04:00
|
|
|
|
(list 'table '(:type org :attr_odt (":style \"GriddedTable\"")))
|
2012-09-04 15:38:30 -04:00
|
|
|
|
(org-element-map
|
2012-09-04 17:40:43 -04:00
|
|
|
|
l1-list
|
2012-09-04 15:38:30 -04:00
|
|
|
|
'item
|
2012-09-04 17:40:43 -04:00
|
|
|
|
(lambda (l1-item)
|
|
|
|
|
(let* ((l1-item-contents (org-element-contents l1-item))
|
|
|
|
|
l1-item-leading-text l2-list)
|
|
|
|
|
;; Remove Level-2 list from the Level-item. It
|
|
|
|
|
;; will be subsequently attached as table-cells.
|
|
|
|
|
(let ((cur l1-item-contents) prev)
|
|
|
|
|
(while (and cur (not (eq (org-element-type (car cur))
|
|
|
|
|
'plain-list)))
|
|
|
|
|
(setq prev cur)
|
|
|
|
|
(setq cur (cdr cur)))
|
|
|
|
|
(when prev
|
|
|
|
|
(setcdr prev nil)
|
|
|
|
|
(setq l2-list (car cur)))
|
|
|
|
|
(setq l1-item-leading-text l1-item-contents))
|
|
|
|
|
;; Level-1 items start a table row.
|
|
|
|
|
(apply 'org-element-adopt-elements
|
|
|
|
|
(list 'table-row (list :type 'standard))
|
|
|
|
|
;; Leading text of level-1 item define the
|
|
|
|
|
;; first table-cell.
|
|
|
|
|
(apply 'org-element-adopt-elements
|
|
|
|
|
(list 'table-cell nil)
|
|
|
|
|
l1-item-leading-text)
|
|
|
|
|
;; Level-2 items define subsequent
|
|
|
|
|
;; table-cells of the row.
|
2012-09-04 15:38:30 -04:00
|
|
|
|
(org-element-map
|
2012-09-04 17:40:43 -04:00
|
|
|
|
l2-list
|
2012-09-04 15:38:30 -04:00
|
|
|
|
'item
|
2012-09-04 17:40:43 -04:00
|
|
|
|
(lambda (l2-item)
|
2012-09-04 15:38:30 -04:00
|
|
|
|
(apply 'org-element-adopt-elements
|
|
|
|
|
(list 'table-cell nil)
|
2012-09-04 17:40:43 -04:00
|
|
|
|
(org-element-contents l2-item)))
|
2012-09-04 15:38:30 -04:00
|
|
|
|
info nil 'item))))
|
|
|
|
|
info nil 'item))))
|
|
|
|
|
nil)
|
|
|
|
|
info)
|
2012-09-04 04:45:14 -04:00
|
|
|
|
tree)
|
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;; Interactive functions
|
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(defun org-e-odt-create-manifest-file-entry (&rest args)
|
|
|
|
|
(push args org-e-odt-manifest-file-entries))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-write-manifest-file ()
|
|
|
|
|
(make-directory (concat org-e-odt-zip-dir "META-INF"))
|
|
|
|
|
(let ((manifest-file (concat org-e-odt-zip-dir "META-INF/manifest.xml")))
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
(let ((nxml-auto-insert-xml-declaration-flag nil))
|
|
|
|
|
(find-file-noselect manifest-file t))
|
|
|
|
|
(insert
|
|
|
|
|
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
|
|
|
|
<manifest:manifest xmlns:manifest=\"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0\" manifest:version=\"1.2\">\n")
|
|
|
|
|
(mapc
|
|
|
|
|
(lambda (file-entry)
|
|
|
|
|
(let* ((version (nth 2 file-entry))
|
|
|
|
|
(extra (if (not version) ""
|
|
|
|
|
(format " manifest:version=\"%s\"" version))))
|
|
|
|
|
(insert
|
|
|
|
|
(format org-e-odt-manifest-file-entry-tag
|
|
|
|
|
(nth 0 file-entry) (nth 1 file-entry) extra))))
|
|
|
|
|
org-e-odt-manifest-file-entries)
|
|
|
|
|
(insert "\n</manifest:manifest>"))))
|
2012-07-14 08:50:52 -04:00
|
|
|
|
|
|
|
|
|
(defmacro org-e-odt--export-wrap (out-file &rest body)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
`(let* ((--out-file ,out-file)
|
|
|
|
|
(out-file-type (file-name-extension --out-file))
|
2012-07-14 08:50:52 -04:00
|
|
|
|
(org-e-odt-xml-files '("META-INF/manifest.xml" "content.xml"
|
|
|
|
|
"meta.xml" "styles.xml"))
|
|
|
|
|
;; Initialize workarea. All files that end up in the
|
|
|
|
|
;; exported get created here.
|
|
|
|
|
(org-e-odt-zip-dir (file-name-as-directory
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(make-temp-file (format "%s-" out-file-type) t)))
|
|
|
|
|
(org-e-odt-manifest-file-entries nil)
|
2012-07-14 08:50:52 -04:00
|
|
|
|
(--cleanup-xml-buffers
|
|
|
|
|
(function
|
|
|
|
|
(lambda nil
|
|
|
|
|
;; Kill all XML buffers.
|
|
|
|
|
(mapc (lambda (file)
|
|
|
|
|
(let ((buf (get-file-buffer
|
|
|
|
|
(concat org-e-odt-zip-dir file))))
|
|
|
|
|
(when buf
|
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
(kill-buffer buf))))
|
|
|
|
|
org-e-odt-xml-files)
|
|
|
|
|
;; Delete temporary directory and also other embedded
|
|
|
|
|
;; files that get copied there.
|
|
|
|
|
(delete-directory org-e-odt-zip-dir t)))))
|
2012-09-03 10:20:18 -04:00
|
|
|
|
(org-condition-case-unless-debug err
|
|
|
|
|
(progn
|
|
|
|
|
(unless (executable-find "zip")
|
|
|
|
|
;; Not at all OSes ship with zip by default
|
|
|
|
|
(error "Executable \"zip\" needed for creating OpenDocument files"))
|
|
|
|
|
;; Do export. This creates a bunch of xml files ready to be
|
|
|
|
|
;; saved and zipped.
|
|
|
|
|
(progn ,@body)
|
|
|
|
|
;; Create a manifest entry for content.xml.
|
|
|
|
|
(org-e-odt-create-manifest-file-entry "text/xml" "content.xml")
|
|
|
|
|
;; Write mimetype file
|
|
|
|
|
(let* ((mimetypes
|
|
|
|
|
'(("odt" . "application/vnd.oasis.opendocument.text")
|
|
|
|
|
("odf" . "application/vnd.oasis.opendocument.formula")))
|
|
|
|
|
(mimetype (cdr (assoc-string out-file-type mimetypes t))))
|
|
|
|
|
(unless mimetype
|
|
|
|
|
(error "Unknown OpenDocument backend %S" out-file-type))
|
|
|
|
|
(write-region mimetype nil (concat org-e-odt-zip-dir "mimetype"))
|
|
|
|
|
(org-e-odt-create-manifest-file-entry mimetype "/" "1.2"))
|
|
|
|
|
;; Write out the manifest entries before zipping
|
|
|
|
|
(org-e-odt-write-manifest-file)
|
|
|
|
|
;; Save all XML files.
|
|
|
|
|
(mapc (lambda (file)
|
|
|
|
|
(let ((buf (get-file-buffer (concat org-e-odt-zip-dir file))))
|
|
|
|
|
(when buf
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
;; Prettify output if needed.
|
|
|
|
|
(when org-e-odt-prettify-xml
|
|
|
|
|
(indent-region (point-min) (point-max)))
|
|
|
|
|
(save-buffer 0)))))
|
|
|
|
|
org-e-odt-xml-files)
|
|
|
|
|
;; Run zip.
|
|
|
|
|
(let* ((target --out-file)
|
|
|
|
|
(target-name (file-name-nondirectory target))
|
|
|
|
|
(target-dir (file-name-directory target))
|
|
|
|
|
(cmds `(("zip" "-mX0" ,target-name "mimetype")
|
|
|
|
|
("zip" "-rmTq" ,target-name "."))))
|
|
|
|
|
;; If a file with same name as the desired output file
|
|
|
|
|
;; exists, remove it.
|
|
|
|
|
(when (file-exists-p target)
|
|
|
|
|
(delete-file target))
|
|
|
|
|
;; Zip up the xml files.
|
|
|
|
|
(let ((coding-system-for-write 'no-conversion) exitcode err-string)
|
|
|
|
|
(message "Creating ODT file...")
|
|
|
|
|
;; Switch temporarily to content.xml. This way Zip
|
|
|
|
|
;; process will inherit `org-e-odt-zip-dir' as the current
|
|
|
|
|
;; directory.
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
(find-file-noselect (concat org-e-odt-zip-dir "content.xml") t)
|
|
|
|
|
(mapc
|
|
|
|
|
(lambda (cmd)
|
|
|
|
|
(message "Running %s" (mapconcat 'identity cmd " "))
|
|
|
|
|
(setq err-string
|
|
|
|
|
(with-output-to-string
|
|
|
|
|
(setq exitcode
|
|
|
|
|
(apply 'call-process (car cmd)
|
|
|
|
|
nil standard-output nil (cdr cmd)))))
|
|
|
|
|
(or (zerop exitcode)
|
|
|
|
|
(error (concat "Unable to create OpenDocument file."
|
|
|
|
|
(format " Zip failed with error (%s)"
|
|
|
|
|
err-string)))))
|
|
|
|
|
cmds)
|
|
|
|
|
;; Zip file is now in the rightful place.
|
|
|
|
|
(rename-file target-name target)))
|
|
|
|
|
(message "Created %s" target)
|
|
|
|
|
;; Cleanup work directory and work files.
|
|
|
|
|
(funcall --cleanup-xml-buffers)
|
|
|
|
|
;; Open the OpenDocument file in archive-mode for
|
|
|
|
|
;; examination.
|
|
|
|
|
(find-file-noselect target t)
|
|
|
|
|
;; Return exported file.
|
|
|
|
|
(cond
|
|
|
|
|
;; Case 1: Conversion desired on exported file. Run the
|
|
|
|
|
;; converter on the OpenDocument file. Return the
|
|
|
|
|
;; converted file.
|
|
|
|
|
(org-e-odt-preferred-output-format
|
|
|
|
|
(or (org-e-odt-convert target org-e-odt-preferred-output-format)
|
|
|
|
|
target))
|
|
|
|
|
;; Case 2: No further conversion. Return exported
|
|
|
|
|
;; OpenDocument file.
|
|
|
|
|
(t target))))
|
|
|
|
|
(error
|
|
|
|
|
;; Cleanup work directory and work files.
|
|
|
|
|
(funcall --cleanup-xml-buffers)
|
|
|
|
|
(message "OpenDocument export failed: %s"
|
|
|
|
|
(error-message-string err))))))
|
2012-07-14 08:50:52 -04:00
|
|
|
|
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;;;; Export to OpenDocument formula
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-e-odt-export-as-odf (latex-frag &optional odf-file)
|
|
|
|
|
"Export LATEX-FRAG as OpenDocument formula file ODF-FILE.
|
|
|
|
|
Use `org-create-math-formula' to convert LATEX-FRAG first to
|
|
|
|
|
MathML. When invoked as an interactive command, use
|
|
|
|
|
`org-latex-regexps' to infer LATEX-FRAG from currently active
|
|
|
|
|
region. If no LaTeX fragments are found, prompt for it. Push
|
|
|
|
|
MathML source to kill ring, if `org-export-copy-to-kill-ring' is
|
|
|
|
|
non-nil."
|
|
|
|
|
(interactive
|
|
|
|
|
`(,(let (frag)
|
|
|
|
|
(setq frag (and (setq frag (and (region-active-p)
|
|
|
|
|
(buffer-substring (region-beginning)
|
|
|
|
|
(region-end))))
|
|
|
|
|
(loop for e in org-latex-regexps
|
|
|
|
|
thereis (when (string-match (nth 1 e) frag)
|
|
|
|
|
(match-string (nth 2 e) frag)))))
|
|
|
|
|
(read-string "LaTeX Fragment: " frag nil frag))
|
|
|
|
|
,(let ((odf-filename (expand-file-name
|
|
|
|
|
(concat
|
|
|
|
|
(file-name-sans-extension
|
|
|
|
|
(or (file-name-nondirectory buffer-file-name)))
|
|
|
|
|
"." "odf")
|
|
|
|
|
(file-name-directory buffer-file-name))))
|
|
|
|
|
(read-file-name "ODF filename: " nil odf-filename nil
|
|
|
|
|
(file-name-nondirectory odf-filename)))))
|
|
|
|
|
(let ((filename (or odf-file
|
|
|
|
|
(expand-file-name
|
|
|
|
|
(concat
|
|
|
|
|
(file-name-sans-extension
|
|
|
|
|
(or (file-name-nondirectory buffer-file-name)))
|
|
|
|
|
"." "odf")
|
|
|
|
|
(file-name-directory buffer-file-name)))))
|
|
|
|
|
(org-e-odt--export-wrap
|
|
|
|
|
filename
|
|
|
|
|
(let* ((buffer (progn
|
|
|
|
|
(require 'nxml-mode)
|
|
|
|
|
(let ((nxml-auto-insert-xml-declaration-flag nil))
|
|
|
|
|
(find-file-noselect (concat org-e-odt-zip-dir
|
|
|
|
|
"content.xml") t))))
|
|
|
|
|
(coding-system-for-write 'utf-8)
|
|
|
|
|
(save-buffer-coding-system 'utf-8))
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(set-buffer-file-coding-system coding-system-for-write)
|
|
|
|
|
(let ((mathml (org-create-math-formula latex-frag)))
|
|
|
|
|
(unless mathml (error "No Math formula created"))
|
|
|
|
|
(insert mathml)
|
2012-07-19 13:45:44 -04:00
|
|
|
|
;; Add MathML to kill ring, if needed.
|
|
|
|
|
(when org-export-copy-to-kill-ring
|
|
|
|
|
(org-kill-new (buffer-string))))))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-e-odt-export-as-odf-and-open ()
|
|
|
|
|
"Export LaTeX fragment as OpenDocument formula and immediately open it.
|
|
|
|
|
Use `org-e-odt-export-as-odf' to read LaTeX fragment and OpenDocument
|
|
|
|
|
formula file."
|
|
|
|
|
(interactive)
|
2012-09-03 10:20:18 -04:00
|
|
|
|
(org-open-file (call-interactively 'org-e-odt-export-as-odf) 'system))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
|
|
|
|
|
;;;; Export to OpenDocument Text
|
|
|
|
|
|
2012-06-01 15:42:24 -04:00
|
|
|
|
;;;###autoload
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(defun org-e-odt-export-to-odt
|
|
|
|
|
(&optional subtreep visible-only body-only ext-plist pub-dir)
|
|
|
|
|
"Export current buffer to a HTML file.
|
|
|
|
|
|
|
|
|
|
If narrowing is active in the current buffer, only export its
|
|
|
|
|
narrowed part.
|
|
|
|
|
|
|
|
|
|
If a region is active, export that region.
|
|
|
|
|
|
|
|
|
|
When optional argument SUBTREEP is non-nil, export the sub-tree
|
|
|
|
|
at point, extracting information from the headline properties
|
|
|
|
|
first.
|
|
|
|
|
|
|
|
|
|
When optional argument VISIBLE-ONLY is non-nil, don't export
|
|
|
|
|
contents of hidden elements.
|
|
|
|
|
|
|
|
|
|
When optional argument BODY-ONLY is non-nil, only write code
|
|
|
|
|
between \"\\begin{document}\" and \"\\end{document}\".
|
|
|
|
|
|
|
|
|
|
EXT-PLIST, when provided, is a property list with external
|
|
|
|
|
parameters overriding Org default settings, but still inferior to
|
|
|
|
|
file-local settings.
|
|
|
|
|
|
|
|
|
|
When optional argument PUB-DIR is set, use it as the publishing
|
|
|
|
|
directory.
|
|
|
|
|
|
|
|
|
|
Return output file's name."
|
|
|
|
|
(interactive)
|
2012-07-14 08:50:52 -04:00
|
|
|
|
(org-e-odt--export-wrap
|
|
|
|
|
(org-export-output-file-name ".odt" subtreep pub-dir)
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(let* ((org-e-odt-embedded-images-count 0)
|
2012-07-14 08:50:52 -04:00
|
|
|
|
(org-e-odt-embedded-formulas-count 0)
|
|
|
|
|
(org-e-odt-automatic-styles nil)
|
|
|
|
|
(org-e-odt-object-counters nil)
|
|
|
|
|
;; Let `htmlfontify' know that we are interested in collecting
|
|
|
|
|
;; styles.
|
|
|
|
|
(hfy-user-sheet-assoc nil))
|
|
|
|
|
;; Initialize content.xml and kick-off the export process.
|
|
|
|
|
(let ((out-buf (progn
|
|
|
|
|
(require 'nxml-mode)
|
|
|
|
|
(let ((nxml-auto-insert-xml-declaration-flag nil))
|
|
|
|
|
(find-file-noselect
|
|
|
|
|
(concat org-e-odt-zip-dir "content.xml") t)))))
|
2012-07-19 12:45:23 -04:00
|
|
|
|
(org-export-to-buffer 'e-odt out-buf subtreep visible-only body-only)))))
|
2012-02-22 09:44:21 -05:00
|
|
|
|
|
|
|
|
|
|
2012-08-25 16:35:24 -04:00
|
|
|
|
;;;; Convert between OpenDocument and other formats
|
2012-04-05 07:43:14 -04:00
|
|
|
|
|
|
|
|
|
(defun org-e-odt-reachable-p (in-fmt out-fmt)
|
|
|
|
|
"Return non-nil if IN-FMT can be converted to OUT-FMT."
|
|
|
|
|
(catch 'done
|
|
|
|
|
(let ((reachable-formats (org-e-odt-do-reachable-formats in-fmt)))
|
|
|
|
|
(dolist (e reachable-formats)
|
|
|
|
|
(let ((out-fmt-spec (assoc out-fmt (cdr e))))
|
|
|
|
|
(when out-fmt-spec
|
|
|
|
|
(throw 'done (cons (car e) out-fmt-spec))))))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-do-convert (in-file out-fmt &optional prefix-arg)
|
|
|
|
|
"Workhorse routine for `org-e-odt-convert'."
|
|
|
|
|
(require 'browse-url)
|
|
|
|
|
(let* ((in-file (expand-file-name (or in-file buffer-file-name)))
|
|
|
|
|
(dummy (or (file-readable-p in-file)
|
|
|
|
|
(error "Cannot read %s" in-file)))
|
|
|
|
|
(in-fmt (file-name-extension in-file))
|
|
|
|
|
(out-fmt (or out-fmt (error "Output format unspecified")))
|
|
|
|
|
(how (or (org-e-odt-reachable-p in-fmt out-fmt)
|
|
|
|
|
(error "Cannot convert from %s format to %s format?"
|
|
|
|
|
in-fmt out-fmt)))
|
|
|
|
|
(convert-process (car how))
|
|
|
|
|
(out-file (concat (file-name-sans-extension in-file) "."
|
|
|
|
|
(nth 1 (or (cdr how) out-fmt))))
|
|
|
|
|
(extra-options (or (nth 2 (cdr how)) ""))
|
|
|
|
|
(out-dir (file-name-directory in-file))
|
|
|
|
|
(cmd (format-spec convert-process
|
|
|
|
|
`((?i . ,(shell-quote-argument in-file))
|
|
|
|
|
(?I . ,(browse-url-file-url in-file))
|
|
|
|
|
(?f . ,out-fmt)
|
|
|
|
|
(?o . ,out-file)
|
|
|
|
|
(?O . ,(browse-url-file-url out-file))
|
|
|
|
|
(?d . , (shell-quote-argument out-dir))
|
|
|
|
|
(?D . ,(browse-url-file-url out-dir))
|
|
|
|
|
(?x . ,extra-options)))))
|
|
|
|
|
(when (file-exists-p out-file)
|
|
|
|
|
(delete-file out-file))
|
|
|
|
|
|
|
|
|
|
(message "Executing %s" cmd)
|
|
|
|
|
(let ((cmd-output (shell-command-to-string cmd)))
|
|
|
|
|
(message "%s" cmd-output))
|
|
|
|
|
|
|
|
|
|
(cond
|
|
|
|
|
((file-exists-p out-file)
|
|
|
|
|
(message "Exported to %s" out-file)
|
|
|
|
|
(when prefix-arg
|
|
|
|
|
(message "Opening %s..." out-file)
|
2012-09-03 10:20:18 -04:00
|
|
|
|
(org-open-file out-file 'system))
|
2012-04-05 07:43:14 -04:00
|
|
|
|
out-file)
|
|
|
|
|
(t
|
|
|
|
|
(message "Export to %s failed" out-file)
|
|
|
|
|
nil))))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-do-reachable-formats (in-fmt)
|
|
|
|
|
"Return verbose info about formats to which IN-FMT can be converted.
|
|
|
|
|
Return a list where each element is of the
|
|
|
|
|
form (CONVERTER-PROCESS . OUTPUT-FMT-ALIST). See
|
|
|
|
|
`org-e-odt-convert-processes' for CONVERTER-PROCESS and see
|
|
|
|
|
`org-e-odt-convert-capabilities' for OUTPUT-FMT-ALIST."
|
|
|
|
|
(let* ((converter
|
|
|
|
|
(and org-e-odt-convert-process
|
|
|
|
|
(cadr (assoc-string org-e-odt-convert-process
|
|
|
|
|
org-e-odt-convert-processes t))))
|
|
|
|
|
(capabilities
|
|
|
|
|
(and org-e-odt-convert-process
|
|
|
|
|
(cadr (assoc-string org-e-odt-convert-process
|
|
|
|
|
org-e-odt-convert-processes t))
|
|
|
|
|
org-e-odt-convert-capabilities))
|
|
|
|
|
reachable-formats)
|
|
|
|
|
(when converter
|
|
|
|
|
(dolist (c capabilities)
|
|
|
|
|
(when (member in-fmt (nth 1 c))
|
|
|
|
|
(push (cons converter (nth 2 c)) reachable-formats))))
|
|
|
|
|
reachable-formats))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-reachable-formats (in-fmt)
|
|
|
|
|
"Return list of formats to which IN-FMT can be converted.
|
|
|
|
|
The list of the form (OUTPUT-FMT-1 OUTPUT-FMT-2 ...)."
|
|
|
|
|
(let (l)
|
|
|
|
|
(mapc (lambda (e) (add-to-list 'l e))
|
|
|
|
|
(apply 'append (mapcar
|
|
|
|
|
(lambda (e) (mapcar 'car (cdr e)))
|
|
|
|
|
(org-e-odt-do-reachable-formats in-fmt))))
|
|
|
|
|
l))
|
|
|
|
|
|
|
|
|
|
(defun org-e-odt-convert-read-params ()
|
|
|
|
|
"Return IN-FILE and OUT-FMT params for `org-e-odt-do-convert'.
|
|
|
|
|
This is a helper routine for interactive use."
|
|
|
|
|
(let* ((input (if (featurep 'ido) 'ido-completing-read 'completing-read))
|
|
|
|
|
(in-file (read-file-name "File to be converted: "
|
|
|
|
|
nil buffer-file-name t))
|
|
|
|
|
(in-fmt (file-name-extension in-file))
|
|
|
|
|
(out-fmt-choices (org-e-odt-reachable-formats in-fmt))
|
|
|
|
|
(out-fmt
|
|
|
|
|
(or (and out-fmt-choices
|
|
|
|
|
(funcall input "Output format: "
|
|
|
|
|
out-fmt-choices nil nil nil))
|
|
|
|
|
(error
|
|
|
|
|
"No known converter or no known output formats for %s files"
|
|
|
|
|
in-fmt))))
|
|
|
|
|
(list in-file out-fmt)))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun org-e-odt-convert (&optional in-file out-fmt prefix-arg)
|
|
|
|
|
"Convert IN-FILE to format OUT-FMT using a command line converter.
|
|
|
|
|
IN-FILE is the file to be converted. If unspecified, it defaults
|
|
|
|
|
to variable `buffer-file-name'. OUT-FMT is the desired output
|
|
|
|
|
format. Use `org-e-odt-convert-process' as the converter.
|
|
|
|
|
If PREFIX-ARG is non-nil then the newly converted file is opened
|
|
|
|
|
using `org-open-file'."
|
|
|
|
|
(interactive
|
|
|
|
|
(append (org-e-odt-convert-read-params) current-prefix-arg))
|
|
|
|
|
(org-e-odt-do-convert in-file out-fmt prefix-arg))
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
;;; Library Initializations
|
|
|
|
|
|
|
|
|
|
(mapc
|
|
|
|
|
(lambda (desc)
|
|
|
|
|
;; Let Emacs open all OpenDocument files in archive mode
|
|
|
|
|
(add-to-list 'auto-mode-alist
|
|
|
|
|
(cons (concat "\\." (car desc) "\\'") 'archive-mode)))
|
|
|
|
|
org-e-odt-file-extensions)
|
|
|
|
|
|
2012-09-13 16:41:03 -04:00
|
|
|
|
|
|
|
|
|
;;; FIXME
|
|
|
|
|
|
|
|
|
|
;;;; Links whose description is image
|
|
|
|
|
|
|
|
|
|
;; (org-lparse-link-description-is-image
|
|
|
|
|
;; (format "\n<draw:a xlink:type=\"simple\" xlink:href=\"%s\">\n%s\n</draw:a>"
|
|
|
|
|
;; href desc))
|
|
|
|
|
|
|
|
|
|
|
2012-02-22 09:44:21 -05:00
|
|
|
|
(provide 'org-e-odt)
|
|
|
|
|
|
|
|
|
|
;;; org-e-odt.el ends here
|