Commit Graph

103 Commits

Author SHA1 Message Date
Rasmus 519f78d1a3 ox-koma-letter: Changes to LOCATION handling
* ox-koma-letter.el (options): Parse LOCATION and remove
  :with-location and :inbuffer-with-location.
  (org-koma-letter--get-tagged-contents): Change string handling.
  (org-koma-letter--get-value): Simplify function.
  (org-koma-letter-use-location): remove
2016-04-07 10:03:03 +02:00
Myles English a0e942544c ox-koma-letter: Fixed bug in filling 'location' field
* contrib/lisp/ox-koma-letter.el: Fix code apparently introduced
  in 3ee3663
2016-04-07 10:03:03 +02:00
Myles English 3ee36639f0 ox-koma-letter: Add support for LOCATION
* contrib/lisp/ox-koma-letter.el (koma-letter): Duplicated code
  used for 'place' variable, renamed as 'location'

Whenever OPTION keyword contains a 'location' item or LOCATION
keyword is used in the buffer, set KOMA option 'location' after
LCO inclusion.
2016-03-31 21:50:11 +02:00
Rasmus 600c5c1b4b ox-koma-letter: Small change
ox-koma-letter.el (org-koma-letter--build-settings): Simplify code.
	(org-koma-letter--get-tagged-contents): Treat strings before
	return.
2016-03-31 21:49:45 +02:00
Rasmus 012346f564 ox-koma-letter: Allow buffer FROM keyword
* ox-koma-letter.el (koma-letter backend): Add :inbuffer-from.
  (org-koma-letter--get-tagged-contents): Check that value is not empty.
  (org-koma-letter-template): Remove from address block from
  template and find to address directly.
  (org-koma-letter--build-settings): Determine from address.
  (org-koma-letter--special-contents-inline): Remove function.
2016-03-31 21:43:52 +02:00
Rasmus 8eadcd3c31 ox-koma-letter: Add after_closing and cleanup
* ox-koma-letter.el
  (org-koma-letter-special-tags-after-closing): Add after_closing.
  (org-koma-letter-special-tags-as-macro): New defvar.
  (koma-letter backend): Revamp special tags options.
  (org-koma-letter--get-value): Rewrite function.
  (org-koma-letter--keyword-or-headline): Get special tags dynamically
  (org-koma-letter-template): Use new specifications.
2016-03-31 21:31:21 +02:00
Rasmus 8ba48e47d5 ox-koma-letter: Fix docstring
* ox-koma-letter.el (org-koma-letter-special-tags-as-macro): Fix docstring.
2016-03-31 21:31:21 +02:00
Kyle Meyer 6345de2d05 Merge branch 'maint' 2016-01-09 17:43:27 -05:00
Kyle Meyer 6bc48c5f41 Update copyright years 2016-01-09 17:12:03 -05:00
Daniele Pizzolli 4a6d195dea Fix typo 2016-01-03 20:56:35 +01:00
Rasmus d2ac254529 ox-koma-letter: Support #+LATEX_COMPILER
* ox-koma-letter.el (org-koma-letter-template): Insert compiler.
2015-10-04 15:54:28 +02:00
Rasmus 002499b26b ox-latex: Small refactor
* ox-latex.el (org-latex--make-preamble): Renamed
org-latex--make-header.
(org-latex--insert-compiler): New function.
(org-latex-template):
* ox-koma-letter.el: Use new function.
2015-10-04 15:54:28 +02:00
Nicolas Goaziou f91968bc38 Merge branch 'maint' 2015-09-10 14:29:19 +02:00
Nicolas Goaziou bde1ebc20a ox-koma-letter: Allow to disable place locally
* contrib/lisp/ox-koma-letter.el (koma-letter):
(org-koma-letter--build-settings): Allow to disable place locally.

Whenever OPTION keyword contains a "place" item or PLACE keyword is used
in the buffer, set KOMA option place after LCO inclusion.

Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/101010>
2015-09-10 14:21:49 +02:00
Rasmus a2d064a8b5 ox-koma-letter: Sometimes prefer special heading
* ox-koma-letter.el (org-koma-letter--keyword-or-headline):
  New function.
  (org-koma-letter-template): Use new function.
  (org-koma-letter-opening, org-koma-letter-closing)
  (org-koma-letter-signature)
  (org-koma-letter-headline-is-opening-maybe): Update docstring.

If both org-koma-letter-headline-is-opening-maybe and
org-koma-letter-prefer-special-headings is non-nil, always prefer
special headline title for opening and closing.
2015-08-29 14:06:59 +02:00
Rasmus 8d3bc7875f ox-latex: New function to generate header
* ox-latex.el (org-latex--make-header): New function.
  (org-latex-template): Use new function.
* ox-koma-letter.el (org-koma-letter-template): Use new function.
2015-07-31 14:12:50 +02:00
Rasmus a985538093 ox-koma-letter: Add closing special heading
* ox-koma-letter.el (org-koma-letter-special-tags-in-letter):
  Add closing.
  (org-koma-letter-template): Potentially take closing value
  from closing spcical heading.
  (org-koma-letter--build-settings): Potentially take signature
  value from closing special heading.
  (org-koma-letter-closing):
  (org-koma-letter-signature): Update docstring.

Suggested-by: Suvayu Ali <fatkasuvayu+linux@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/99028>
2015-07-16 22:09:53 +02:00
Rasmus 72f10cffce ox-koma-letter: Parse more keywords
* ox-koma-letter.el (koma-letter): Parse author, phone-number,
  opening, closing and signature.
  (org-koma-letter-template): parse closing.
2015-06-23 18:06:05 +02:00
Nicolas Goaziou a0a8834f30 ox-koma-letter: Fix a docstring
* contrib/lisp/ox-koma-letter.el (org-koma-letter--special-contents-as-macro):
  Fix docstring.  Tiny refactoring.
2015-06-18 15:31:09 +02:00
Nicolas Goaziou bfe1b2fbe2 ox-koma-letter: Fix void `with-title' variable
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Let-bind
  `with-title'.

Reported-by: Thomas Holst <Thomas_Holst@gmx.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/98349>
2015-06-15 18:49:24 +02:00
Nicolas Goaziou d3196f0539 ox-koma-letter: Fix missing \begin{document}
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Insert
  "\begin{document}" even if :with-title and :with-subject are both
  nil.

Reported-by: Dieter Faulbaum <mail@faulbaum.in-berlin.de>
2015-06-11 22:44:39 +02:00
Nicolas Goaziou 6463b6c05d ox-koma-letter: Fix typo in docstring
* contrib/lisp/ox-koma-letter.el (org-koma-letter-prefer-subject): Fix
  typo.
2015-06-11 22:44:15 +02:00
Nicolas Goaziou c466a4deee ox-latex, ox-koma-letter: Use new `parse' syntax
* contrib/lisp/ox-koma-letter.el (koma-letter): Set "SUBJECT" as
  parsed.
(org-koma-letter-template): Apply.
* lisp/ox-latex.el (latex): Set "DESCRIPTION" and "KEYWORDS" as
  parsed.
(org-latex--format-spec): Apply.
2015-04-05 14:11:14 +02:00
Rasmus 510bb46b69 ox-koma-letter: Add hyperref support
* ox-koma-letter.el (org-koma-letter-template): Insert hyperref setup.
2015-03-27 13:46:08 +01:00
Rasmus 69cab81ffa ox-latex: Utilize change in bcf6970
* ox-koma-letter.el (org-koma-letter-template),
  ox-latex.el (org-latex--format-spec): Tiny refactor.
2015-03-27 13:04:13 +01:00
Rasmus 01278c1699 ox-koma-letter: Fix bug introduced in 304a5cb
* ox-koma-letter.el (org-koma-letter-template): Handle empty SUBJECT.
2015-03-20 22:14:12 +01:00
Rasmus 0f9c0e79ba Revert "ox-koma-letter: fix bug introduced in 304a5cb"
This reverts commit 1ce810f9ab.
2015-03-20 22:12:35 +01:00
Rasmus 1ce810f9ab ox-koma-letter: fix bug introduced in 304a5cb
* ox-koma-letter.el (org-koma-letter-template): Handle empty SUBJECT.
2015-03-20 22:08:29 +01:00
Rasmus 304a5cb03d ox-koma-letter: Interpret #+SUBJECT.
* ox-koma-letter.el (org-koma-letter-template): Interpret #+SUBJECT.
2015-03-20 21:21:08 +01:00
Rasmus a795d9e7e9 ox-koma-letter: Stricter subject inference
* ox-koma-letter.el (org-koma-letter--special-tag): New function.
  (org-koma-letter-headline): Use org-koma-letter--special-tag
  and do not guess opening.
  (org-koma-letter-template): Directly infer subject from first
  non-special headline.
2015-03-20 21:21:08 +01:00
Rasmus c4d4e5e618 ox-koma-letter: Tiny refactor
ox-koma-letter.el (org-koma-letter--get-tagged-contents): Use
assoc-string.
2015-03-20 21:21:08 +01:00
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