Commit Graph

72 Commits

Author SHA1 Message Date
Nicolas Goaziou 0d24086657 Update some copyright years 2015-02-16 01:40:07 +01:00
Rasmus e6fcc853c5 ox: Optional export of title
* ox.el (org-export-with-title): New variable.
* ox (org-export-options-alist),
  ox-ascii.el (org-ascii-template--document-title),
  ox-beamer.el (org-beamer-template), ox-html.el (org-html-template),
  ox-latex.el (org-latex-template), ox-man.el (org-man-template),
  ox-odt.el (org-odt-template), ox-org.el (org-org-template),
  ox-publish.el (org-publish-project-alist),
  ox-texinfo.el (org-texinfo-template),
  ox-groff.el (org-groff--mt-head): Use new variable.
* ox-koma-letter.el (org-koma-letter-use-title): Mark obsolete.
* test-ox.el (test-org-export/parse-option-keyword): Add :with-title.
* ORG-NEWS, org.texi: Mention org-export-with-title.

This is useful in e.g. ox-html where title can be set via
`org-html-preamble-template' or when using the {{{title}}}-macro.
2015-02-12 01:45:39 +01:00
Bastien Guerry c4fd9e415a ox-koma-letter.el (org-koma-letter-subject-format): Enhance docstring
* ox-koma-letter.el (org-koma-letter-subject-format): Enhance
docstring.
2014-12-01 16:50:12 +01:00
Rasmus 1f8d4a06b7 Merge remote-tracking branch 'origin/master' 2014-09-23 00:56:37 +02:00
Nicolas Goaziou 8771dafd7c ox-koma-letter: Fix "to" and "from"
* contrib/lisp/ox-koma-letter.el (koma-letter): Properly display
  default "from" address from template.
(org-koma-letter--determine-to-and-from): Do not provide a default
"to" value as it might be set through a LCO file.
(org-koma-letter-template): Remove trailing whitespace.
2014-09-20 21:32:52 +02:00
Rasmus 23e7278416 ox-koma-letter.el: update docstring
* ox-koma-letter.el (org-koma-letter-prefer-special-headings): change
docstring.
2014-09-20 13:14:07 +02:00
Nicolas Goaziou e3369c07f0 Revert "Merge export and special blocks within back-ends"
This reverts commit fbc7097ffa.

Conflicts:
	lisp/ox-texinfo.el
2014-09-08 11:57:27 +02:00
Nicolas Goaziou fbc7097ffa Merge export and special blocks within back-ends
* lisp/ox-ascii.el (org-ascii-export-block): Remove function.
(org-ascii-special-block): Handle raw special blocks.

* lisp/ox-beamer.el (org-beamer-export-block): Remove function.

* lisp/ox-html.el (org-html-export-block): Remove function.
(org-html-special-block): Handle raw special blocks.

* lisp/ox-latex.el (org-latex-export-block): Remove function.
(org-latex-special-block): Handle raw special blocks.

* lisp/ox-man.el (org-man-export-block): Remove function.
(org-man-special-block): Handle raw special blocks.

* lisp/ox-md.el (org-md-export-block): Remove function.

* lisp/ox-odt.el (org-odt-export-block): Remove function.
(org-odt-special-block): Handle raw special blocks.

* lisp/ox-texinfo.el (org-texinfo-export-block): Remove function.
(org-texinfo-special-block): Handle raw special blocks.

* contrib/lisp/ox-groff.el (org-groff-export-block): Remove function.
(org-groff-special-block): Handle raw special blocks.

* contrib/lisp/ox-koma-letter.el (org-koma-letter-export-block):
  Remove function.
2014-07-27 14:29:24 +02:00
Nicolas Goaziou c6cc27c5ec ox-koma-letter: Small fix
* contrib/lisp/ox-koma-letter.el (koma-letter): Do not set a default
  value for "from address".

That address is computed later (see special headlines).
2014-06-19 22:31:01 +02:00
Bastien Guerry a77118b3ca Merge branch 'maint'
Conflicts:
	contrib/lisp/ox-koma-letter.el
2014-06-19 00:49:20 +02:00
IOhannes m zmoelnig 08a9587e01 ox-koma-letter.el (koma-letter): Use `org-koma-letter-from-address'
* ox-koma-letter.el (koma-letter): Use
`org-koma-letter-from-address'.

TINYCHANGE
2014-06-19 00:47:42 +02:00
Alan Schmitt 9d39aaeac3 Koma export: Tweak the logic to output fromaddress
* ox-koma-letter.el (org-koma-letter-template): Do not output
`fromaddress' when it is a string of white spaces.
(org-koma-letter-use-title): Fix typo in the documentation string.
2014-03-10 15:14:11 +01:00
Nicolas Goaziou 059f87f448 ox-koma-letter: Reorder "SUBJECT" in template 2014-02-05 17:06:19 +01:00
Nicolas Goaziou 63d788653e ox-koma-letter: Use `org-koma-letter-use-title'
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Use
  `org-koma-letter-use-title'.  Small refactoring.
2014-02-05 17:05:08 +01:00
Bastien Guerry 7eb570b860 Fix left-over merge conflict 2014-02-05 16:33:24 +01:00
Bastien Guerry 13b5123da1 Merge branch 'maint'
Conflicts:
	contrib/lisp/ox-koma-letter.el
2014-02-05 16:16:36 +01:00
Rasmus 980c021609 Allow separate subject and title in ox-koma-letter
* ox-koma-letter.el (org-koma-letter-use-title): New variable.
(org-koma-letter-prefer-subject): New variable.
(org-koma-letter-template): Allow separate subject and title.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2014-02-05 13:45:58 +01:00
Rasmus 1f413ba32d Documentation fixes for ox-koma-script.el
* ox-koma-letter.el commentary (org-koma-letter-use-backaddress):
  Better documentation.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2014-02-05 13:45:41 +01:00
Rasmus 240cd3cb40 Documentation fixes for ox-koma-script.el
* ox-koma-letter.el commentary (org-koma-letter-use-backaddress):
  Better documentation.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2014-02-05 13:30:38 +01:00
Nicolas Goaziou 97b0ae8b1f ox-koma-letter: Reorder keywords in template
* contrib/lisp/ox-koma-letter.el (koma-letter): Reorder keywords in
  a more logical way when `org-export-insert-default-template' is
  called.
2014-01-22 15:50:54 +01:00
Nicolas Goaziou d74205b0f9 ox-koma-letter: Improve defcustom docstrings
* contrib/lisp/ox-koma-letter.el (org-koma-letter-class-option-file,
  org-koma-letter-author, org-koma-letter-email,
  org-koma-letter-from-address, org-koma-letter-phone-number,
  org-koma-letter-place, org-koma-letter-closing,
  org-koma-letter-signature, org-koma-letter-prefer-special-headings,
  org-koma-letter-use-backaddress, org-koma-letter-use-phone,
  org-koma-letter-use-email, org-koma-letter-use-place): Improve
  docstring.
2014-01-17 23:05:20 +01:00
Nicolas Goaziou 161eb78d06 ox-koma-letter: Fix opening setting
* contrib/lisp/ox-koma-letter.el (org-koma-letter-opening): Correctly
  report conditions to fulfill in order set opening string with
  a headline.
(org-koma-letter-headline): Opening can no longer be nil, so look out
for the empty string instead.
2014-01-17 22:55:02 +01:00
Nicolas Goaziou bec2bc6744 ox-koma-letter: Fix a comment
* contrib/lisp/ox-koma-letter.el (org-koma-letter-keyword): Fix
  a comment.
2014-01-17 22:30:39 +01:00
Nicolas Goaziou bec25b5397 ox-koma-letter: Fix cd7adb47d8
* contrib/lisp/ox-koma-letter.el (org-koma-letter--determine-to-and-from):
  Fix bug introduced in cd7adb47d8.
2014-01-17 22:30:25 +01:00
Nicolas Goaziou cd7adb47d8 ox-koma-letter: Code clean-up
* contrib/lisp/ox-koma-letter.el (org-koma-letter--normalize-string,
  org-koma-letter--format-string-as-macro): Remove functions.
(org-koma-letter--determine-to-and-from,
org-koma-letter--special-contents-as-macro): Use `org-trim' instead of
`org-koma-letter--normalize-string'.
(org-koma-letter--special-contents-as-macro,
org-koma-letter--determine-to-and-from, org-koma-letter-headline):
Rewrite functions.
2014-01-17 21:40:00 +01:00
Nicolas Goaziou bcf61041ad ox-koma-letter: Fix code type
* contrib/lisp/ox-koma-letter.el: Fix code typo.
2014-01-17 11:33:26 +01:00
Nicolas Goaziou 50c9f04e84 ox-koma-letter: Small fix
* contrib/lisp/ox-koma-letter.el (koma-letter): Use correct default
  symbols.
2014-01-17 11:30:55 +01:00
Nicolas Goaziou 6aac287b2f ox-koma-letter: Simplify initialization
* contrib/lisp/ox-koma-letter.el (org-koma-letter-plug-into-ox):
  Remove function.
(org-koma-letter-default-class): Change default value.

A default class is installed by default upon loading the library.
2014-01-17 11:24:02 +01:00
Nicolas Goaziou 86dad6edb8 ox-koma-letter: Improve a customization menu
* contrib/lisp/ox-koma-letter.el (org-koma-letter-subject-format):
  Improve customization menu.
2014-01-17 11:14:00 +01:00
Nicolas Goaziou d7aa26b04e ox-koma-letter: Change value for folding marks
* contrib/lisp/ox-koma-letter.el (org-koma-letter-use-foldmarks):
  Change value to symbols or list of symbols.
(org-koma-letter--build-settings): Use new value for folding marks.
2014-01-17 11:01:15 +01:00
Nicolas Goaziou aa1019cd9a ox-koma-letter: Small refactoring
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Add
  comments.
(org-koma-letter--build-settings): Rename internal bindings and
reorder insertion.
2014-01-17 10:39:05 +01:00
Nicolas Goaziou c174bf2a5c ox-koma-letter: Fix a variable type
* contrib/lisp/ox-koma-letter.el (org-koma-letter-subject-format):
  Make it clear that lists of symbols are allowed.
(org-koma-letter-template): Refactor subject-related part.
2014-01-17 10:09:17 +01:00
Nicolas Goaziou 7d67c448c9 ox-koma-letter: Fix customizable variable
* contrib/lisp/ox-koma-letter.el (org-koma-letter-use-foldmarks): Use
  correct type and improve docstring.
2014-01-17 01:37:25 +01:00
Nicolas Goaziou 4ca5cf35c8 ox-koma-letter: Fix global settings handling
* contrib/lisp/ox-koma-letter.el (koma-letter): Rewrite function.
  Global variables are no longer ignored.
(org-koma-letter--build-settings): New function.
2014-01-17 01:37:25 +01:00
Nicolas Goaziou 7c39f1b5bc ox-koma-letter: Fix a docstring
* contrib/lisp/ox-koma-letter.el (org-koma-letter-closing): Fix
  docstring.
2014-01-17 01:37:25 +01:00
Nicolas Goaziou d71f035462 ox-koma-letter: Fix customizable variables values
* contrib/lisp/ox-koma-letter.el (org-koma-letter-from-address):
(org-koma-letter-phone-number, org-koma-letter-place,
org-koma-letter-subject-format, org-koma-letter-opening,
org-koma-letter-closing, org-koma-letter-signature,
org-koma-letter-default-class, org-koma-letter-subject-format): Fix
value.
2014-01-17 01:37:25 +01:00
Nicolas Goaziou 454f7b3680 ox-koma-letter: Cleanup some docstrings
* contrib/lisp/ox-koma-letter.el (org-koma-letter-author,
  org-koma-letter-email, org-koma-letter-place,
  org-koma-letter-prefer-special-headings, org-koma-letter-signature,
  org-koma-letter-subject-format, org-koma-letter-use-backaddress,
  org-koma-letter-use-phone, org-koma-letter-use-email,
  org-koma-letter-use-place,
  org-koma-letter-headline-is-opening-maybe,
  org-koma-letter--get-tagged-contents,
  org-koma-letter--format-string-as-macro,
  org-koma-letter--normalize-string): Cleanup docstrings.
2014-01-16 19:00:59 +01:00
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
Alan Schmitt 32bd54d698 Koma exporter: Ensure customization to LCO files are taken into account
* contrib/lisp/ox-koma-letter.el: Change default values to match the scrlttr2
default values.  Track which options are set in the file and only output the
corresponding options when they are changed.
2013-08-31 16:33:44 +02:00
rasmus 69b20f36fe Make ox-koma-letter pass checkdoc.
* ox-koma-letter.el: Reworded parts of the head of the file.
(org-koma-letter-prefer-special-headings,
org-koma-letter-subject-format, org-koma-letter-default-class,
org-koma-letter-special-tags-in-letter,
org-koma-letter-special-tags-after-closing,
org-koma-letter-special-tags-after-letter,
org-koma-letter-plug-into-ox, org-koma-letter-email,
org-koma-letter--get-tagged-contents,
org-koma-letter-special-contents): Changed docstring to pass checkdoc.
(org-koma-letter--get-value): Renamed `org-koma-letter--get-custom'.
Docstring changed to pass checkdoc.
(org-koma-letter--special-contents-as-macro): Renamed
`org-koma-letter--prepare-special-contents-as-macro'.  Docstring
changed to pass checkdoc.
(org-koma-letter--normalize-string): Renamed
org-koma-letter--remove-offending-new-lines.  Docstring changed to
pass checkdoc.
(org-koma-letter--determine-to-and-from): Renamed
org-koma-letter--determine-special-value.  Docstring changed to pass
checkdoc.

Some functions have been renamed to make the names slightly more
informative.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2013-08-27 10:10:34 +02:00
rasmus 55d18eed95 Set opening via headline
* ox-koma-letter.el (org-koma-letter-headline-is-opening-maybe): new
variable.  If `t' let headlines set subject.
(org-koma-letter-headline): let headline set opening.
(org-koma-letter-template): let opening and closing be empty if nil.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2013-08-27 10:09:39 +02: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
rasmus 08cffc1c24 Missing backtick in =`ox-koma-letter.el'=
* ox-koma-letter.el (org-koma-letter-plug-into-ox): Add a
backtick.
2013-07-26 19:48:00 +02:00
Nicolas Goaziou 0cdf2eb7ce Merge branch 'maint'
Conflicts:
	contrib/lisp/ox-koma-letter.el
2013-07-12 09:10:26 +02:00
Nicolas Goaziou a2a5c8fd5b ox-beamer/latex/koma-letter: Fix missing newlines in header
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Fix
  missing newlines in header.
* lisp/ox-beamer.el (org-beamer-template): Fix missing newlines in
  header.
* lisp/ox-latex.el (org-latex-template): Fix missing newlines in
  header.
2013-07-12 09:07:23 +02:00
Eric Schulte d316ecab0e missing argument to error message
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Missing
  argument to error message.
2013-06-13 09:44:49 -06:00
rasmus a9c044a648 Possible to set default class for ox koma letters.
* ox-koma-letter.el (org-koma-letter-default-class): default class for
=ox-koma-letter=. Default is nil.
* ox-koma-letter.el (org-koma-letter-plug-into-ox): add a sparse
letter class to =`org-latex-class'= and set it to default.

By default it will use =`org-latex-default-class'=.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2013-06-12 13:38:48 +02:00
rasmus 878ff19f35 Added support for to and from heading.
* ox-koma-letter.el: documentation.
(org-koma-letter-special-tags-in-letter): list of tags that
are typeset as part of the letter.
(org-koma-letter--determine-special-value): determine which
value to use (for to and from currentlly) if more than
candidate is available.  Which value is selected depends on
`org-koma-letter-prefer-special-headings'.
(org-koma-letter-prefer-special-headings): a boolean stating
whether to prefer headings with to/from or the #+X_ADDRESS.

The following letter now exports "as expected".  In particular when
special-headings is t heading values have presedence so the
from address would be ="Rasmus\nEmacs\nOrg-mode"= where the
=\n=s would be escaped.  If specia-headings is nil (default)
the from would be my-adr.  The same is true for TO address.

Here's the contents

* from :from:

   Rasmus
   Emacs
   Org-mode

On a technical note, note that the default value will be used if
neither #+X_ADDRESS or a heading is given.

Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2013-06-12 13:38:31 +02:00