Commit Graph

25 Commits

Author SHA1 Message Date
Bastien Guerry 7d9a883b50 Update copyright years again.
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
Bastien Guerry 0beda99171 Revert "Update copyright years."
This reverts commit 21105594fc.
2014-01-05 06:28:07 +01:00
Bastien Guerry 21105594fc Update copyright years. 2014-01-04 18:56:11 +01:00
Nicolas Goaziou 9154c70a04 Export back-ends: Apply changes to export functions
* contrib/lisp/ox-confluence.el (org-confluence-export-as-confluence):
* contrib/lisp/ox-deck.el (org-deck-export-as-html,
  org-deck-export-to-html):
* contrib/lisp/ox-freemind.el (org-freemind-export-to-freemind):
* contrib/lisp/ox-groff.el (org-groff-export-to-groff,
  org-groff-export-to-pdf):
* contrib/lisp/ox-koma-letter.el (org-koma-letter-export-as-latex,
  org-koma-letter-export-to-latex, org-koma-letter-export-to-pdf):
* contrib/lisp/ox-rss.el (org-rss-export-as-rss,
  org-rss-export-to-rss):
* contrib/lisp/ox-s5.el (org-s5-export-as-html,
  org-s5-export-to-html):
* contrib/lisp/ox-taskjuggler.el (org-taskjuggler-export):
* lisp/ob-haskell.el:
* lisp/ox-ascii.el (org-ascii-export-as-ascii,
  org-ascii-export-to-ascii):
* lisp/ox-beamer.el (org-beamer-export-as-latex,
  org-beamer-export-to-latex, org-beamer-export-to-pdf):
* lisp/ox-html.el (org-html-export-as-html, org-html-export-to-html):
* lisp/ox-icalendar.el (org-icalendar-export-to-ics):
* lisp/ox-latex.el (org-latex-export-as-latex,
  org-latex-export-to-pdf):
* lisp/ox-man.el (org-man-export-to-man, org-man-export-to-pdf):
* lisp/ox-md.el (org-md-export-as-markdown,
  org-md-export-to-markdown):
* lisp/ox-odt.el (org-odt-export-to-odt):
* lisp/ox-org.el (org-org-export-as-org, org-org-export-to-org):
* lisp/ox-publish.el (org-publish-org-to):
* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo,
  org-texinfo-export-to-info):
* testing/lisp/test-ob-exp.el (test-ob-exp/org-babel-exp-src-blocks/w-no-file):
2013-08-07 16:11:42 +02:00
Nicolas Goaziou 6a788618e3 Merge branch 'maint'
Conflicts:
	contrib/lisp/ox-deck.el
2013-05-30 14:33:47 +02:00
Rick Frankel 9d22167c68 Refactor fetching html doctype from alist into function so it can be reused in inherited exporters.
* lisp/ox-html.el (org-html-doctype): Add new function `org-html-doctype'.
(org-html-template): Use `org-html-doctype' function instead of inline
code.

* contrib/lisp/ox-deck.el (org-deck-template): Use `org-html-doctype'
  function instead of inline code.

* contrib/lisp/ox-s5.el (org-s5-template): Use `org-html-doctype'
  function instead of inline code.
2013-05-29 15:23:04 -04:00
Rick Frankel 36812e72ac Fix issues with TOC, internal links and html-doctype.
* contrib/lisp/ox-deck.el (deck): add new deck specific link handler.
(org-deck-toc): Add "sec-" to non-custom link ids.
(org-deck-link): New function. Rename internal link to point at
container instead of heading.
(org-deck-template): Use alist doctype instead of string (per changes
to ox-html).
2013-05-28 07:41:30 -04:00
Rick Frankel 2347dcf76b Fix handling of internal links and new html doctype option.
* contrib/lisp/ox-deck.el (deck): Add deck specific link function.
(org-deck-toc): Generate correct link to slide for custom ids as well
as default section ids.
(org-deck-link): HTML custom ids link to the headline. deck.js
requires linking to the wrapper (slide) so modify the link to point at
the container instead of the headline.
(org-deck-template): Fix doctype handling to use alist option instead
of literal string.
2013-05-26 19:17:18 -04:00
Rick Frankel 85bd00bae8 Fix TOC link references.
* contrib/lisp/ox-deck.el: TOC link references were being generated as
  "outline-container-{digit}". They need to be
  "outline-container-sec-{digit}".
2013-05-26 18:31:28 -04:00
Nicolas Goaziou 6f78b660f8 export back-ends in contrib: Handle DATE keywords the same way
* contrib/lisp/ox-deck.el (org-deck--build-meta-info): Use
  `org-export-get-date'.
* contrib/lisp/ox-groff.el (org-groff--mt-head): Use
  `org-export-get-date'.
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Use
  `org-export-get-date'.
2013-04-03 00:02:15 +02:00
Bastien Guerry 5c63007721 contrib/lisp/*: Use `org-export-define-*backend' as defuns, not macros
* ox-taskjuggler.el (taskjuggler):
* ox-s5.el (s5):
* ox-rss.el (rss):
* ox-koma-letter.el (koma-letter):
* ox-groff.el (groff):
* ox-freemind.el (freemind):
* ox-deck.el (deck):
* ox-confluence.el (confluence): Use
`org-export-define-backend' or
`org-export-define-derived-backend' as defuns, not macros.
2013-03-19 19:39:34 +01:00
Rick Frankel 67a17cfe85 Update s5 and deck,js slideshow exporters to work with refactored html
backend.

* lisp/ox-html.el (org-html--build-pre/postamble): Add css class to
  wrapper div (defaults to `org-pre/postamble-class').  Move spec
  building to separate function (`org-html-format-spec').
(org-html-format-spec): New function.
(org-pre/postamble-class): New variable.

* contrib/lisp/ox-deck.el: Replace :html-{pre,post}amble export
  options with :deck versions.
(org-deck-postamble): Replaces `org-deck-postamble-template', uses
format-spec (and `org-html-format-spec') instead of custom template
option.
(org-deck-preamble): Replaces `org-deck-postamble-template', uses
format-spec (and `org-html-format-spec') instead of custom template
option.
(org-deck-title-slide-template): Use standard format specs.
(org-deck-template): Use org-html--build-pre/postamble instead of
`org-deck-fill-template'. Use fill-template for title slide (with
standard format specs) instead of custom `org-fill-template'
(org-deck-template-alist):  Delete.
(org-deck-postamble-template): Delete.
(org-deck-preamble-template): Delete.

* contrib/lisp/ox-s5.el: Same overall set of changes as ox-deck.
(org-s5-divs): New option, similar usage to `org-html-divs'.
(org-s5-footer-template): Delete.
(org-s5-header-template): Delete.
2013-03-16 15:17:44 -04:00
Rick Frankel 243c461841 whitespce cleanup 2013-03-16 15:17:44 -04:00
Rick Frankel 60830fa4d2 Apply changes to slideshow exporter to use new `org-html-divs'
specification.

* contrib/lisp/ox-deck.el:
  - Rename header/footer options and methods to preamble/postamble to
  be more consistent with underlining html exporter. Also remove
  included wrapper section to allow for using the element specified in
  `org-html-divs'.
  - add `org-deck-preamble-postamble-styles' variable
  - Rename `org-deck-title-page-styles' to `org-deck-styles'.
  - Rename `org-deck-title-page-* to `org-deck-title-slide-*'

(org-deck-template):
        - use :html-doctype instead of forcing html5.
        - use xhtml valid meta charset tag
        - Use elements specified in `org-html-divs'.
        - Cleanup embeded css (move into a single style section)

* contrib/lisp/ox-s5.el:
  - Use `org-html-div' container class for content
  - Change header/footer templates to remove wrapper from
  customization string.
(org-s5-toc): Use :html-container instead of hard-coded div.
(org-s5-template): use :html-doctype, :html-container and
`org-html-divs' container class.
2013-03-16 15:17:44 -04:00
Bastien Guerry fba6a0031f contrib/lisp/: Add footer line to ox-deck.el and ox-s5.el 2013-03-15 16:52:46 +01:00
Bastien Guerry 7513f16182 contrib/lisp/*el: Fix license information and add "This file is not part..."
Also do some aesthetic code clean-up in org-drill.el.
2013-03-10 17:57:47 +01:00
Rick Frankel 3ab73c4816 Minor cleanup of backend options.
* contrib/lisp/ox-deck.el: Remove unnecessary overrides and
  rationalize name of in-buffer option for include-default-style.
* contrib/lisp/ox-s5.el: Same as above.
(org-s5--build-head): Renamed from org-s5--build-style for consistency
with ox-html.
2013-03-04 15:01:51 -05:00
Bastien Guerry b8cc4076fe ox-s5.el (s5) and ox-deck.el (deck): Update HTML options names
* ox-s5.el (s5):
* ox-deck.el (deck): Update HTML options names.
2013-03-04 17:55:33 +01:00
Rick Frankel 8ed99fad6b Don't generate links for empty theme or transition.
* ox-deck.el (org-deck--get-packages): Check for non-blank deck-theme
  and deck-transition.
2013-03-04 07:39:16 +01:00
Bastien Guerry a3e554f4cf ox-s5.el and ox-deck.el: Use `org-html--build-head'
* ox-s5.el (org-s5-template):
* ox-deck.el (org-deck-template): Use `org-html--build-head'.

See previous commit.
2013-03-03 18:59:39 +01:00
Rick Frankel 43297f9ab7 Slideshow bugfixes and sync with ox-html function name changes.
* contrib/lisp/ox-deck.el: Default org-deck-directories to "./deck.js".
(org-deck-toc): Sync w/ ox-html name change (org-html--toc-text.)
(org-deck-inner-template): Remove duplicate toc generation code.
* contrib/lisp/ox-s5.el: Add inner template to fix duplicate content
  div error.
(org-s5-toc): Sync w/ ox-html name change (org-html--toc-text) and
make toc entries static since s5 doesn't support deep linking.
2013-02-27 00:15:37 +01:00
Rick Frankel a8f0c39e66 Whitespace cleanup 2013-02-26 09:07:38 +01:00
Rick Frankel 2e04ffe413 Update contributed slide output to use uppercase properties
* contrib/lisp/ox-deck.el: Change menu key to ?d to avoid conflict
  with ox-s5.
(org-deck-toc): Use HTML_CONTAINER_CLASS instead of html-container-class.
(org-deck-headline): Simplify code to use HTML_CONTAINER_CLASS
directly, and use org-element-get-relative-level.
(org-deck-item): Use uppercase property.

* contrib/lisp/ox-s5.el (s5): Add configuration variables for S5 meta data.
(org-s5--build-meta-info): ditto.
(org-s5-headline): Simplify code to use HTML_CONTAINER_CLASS directly,
and use org-element-get-relative-level.
(org-s5-plain-list): Use uppercase property.
(org-s5-template-alist): Fix bug. (Don't try and substring nil.)
2013-02-26 09:06:15 +01:00
Nicolas Goaziou b10e2bde13 export back-ends: Fix leftover downcase :custom-id properties
* lisp/ox-html.el (org-html-format-headline--wrap, org-html-headline):
  Use :CUSTOM_ID, not :custom-id.
* contrib/lisp/ox-deck.el (org-deck-toc): Use :CUSTOM_ID,
  not :custom-id.
2013-02-22 14:51:58 +01:00
Bastien Guerry 177fd6501a contrib/: Add ox-deck.el and ox-s5.el by Rick Frankel
Thanks to Rick Frankel for these contributions!
2013-02-20 16:32:54 +01:00