Commit Graph

15281 Commits

Author SHA1 Message Date
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 a3fab8d899 Merge branch 'maint' 2014-01-17 22:17:39 +01:00
Nicolas Goaziou b0ac2f6ac0 ox: Remove clutter from export templates
* lisp/ox.el (org-export-insert-default-template): Only insert
  keywords and options relatives to the selected back-end.  Ignore
  those relatives to its parent in the case of a derived back-end.
2014-01-17 22:16:41 +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 bf304c3485 Merge branch 'maint' 2014-01-17 12:45:21 +01:00
Nicolas Goaziou 1e25d087dd ox-beamer: Small clean-up
* lisp/ox-beamer.el: Remove unnecessary package definitions in default
  class.
2014-01-17 12:44:05 +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
Rick Frankel 4e1d72360f Fix title page template.
* contrib/lisp/ox-s5.el (org-s5-title-slide-template): Per Arne
  Babenhauserheide, the heading levels on the default title slide
  template were wrong per the S5 spec.
2014-01-16 17:48:10 -05:00
Rick Frankel e955be903a Add better svg support to html exporter.
* lisp/ox-html.el (org-html--format-image): If image is an svg file,
  format as "object" using new function `org-html--svg-image' instead
  of "img".
2014-01-16 17:35:55 -05:00
Rick Frankel 1376df2648 Use an overridable list of available doctypes for customization.
* lisp/ox-html.el (org-html-doctype): Use choice of available
  doctypes (from `org-html-doctype-alist) plus user-entered string.
2014-01-16 17:35:39 -05:00
Rick Frankel 480c47fa09 Fix missing export option in override. 2014-01-16 17:31:29 -05: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
Nicolas Goaziou 6ef2bd0ef0 Merge branch 'maint' 2014-01-16 16:24:15 +01:00
Yasushi SHOJI b7c1014353 ox-ascii: Convert `length' to `string-width'
* lisp/ox-ascii.el (org-ascii--current-text-width): Convert `length'
  to `string-width'.
  (org-ascii--build-title, org-ascii--build-toc)
  (org-ascii--list-listings, org-ascii--list-tables)
  (org-ascii-template--document-title)
  (org-ascii-inner-template, org-ascii-format-inlinetask-default)
  (org-ascii-format-inlinetask-default, org-ascii-item
  (org-ascii--table-cell-width, org-ascii-table-cell)
  (org-ascii--current-text-width): Likewise.

I've checked all occurrences of the function `length' in ox-ascii.el.
It turns out that the most of them are calculating the width of given
string.  To support fullwidth characters, we better use `string-width'
instead of `length'.

Some characters in UCS are categorized as "East Asian Ambiguous"[1].
The return value of `string-width' with those characters depends on
how Emacs is setup.  We leave those ambiguous character handling to
Emacs.

Two usages of `length' in `ox-ascii.el' were left as-is, because those
were used for:

 - bullet depth calculation in `org-ascii-headline', and
 - cell position calculation in `org-ascii--table-cell-width'.

[1]: http://www.unicode.org/reports/tr11/#Ambiguous
2014-01-16 16:17:48 +01:00
Nicolas Goaziou d99ffcf954 Merge branch 'maint' 2014-01-16 15:52:12 +01:00
Nicolas Goaziou 7d3205a20f ox-latex: Fix items starting with a square bracket
* lisp/ox-latex.el (org-latex-headline, org-latex-item): Fix items
  starting with a square bracket.

Thanks to Jon Degenhardt, Vladimir Lomov and Eric S Fraga for
contributing to the discussion.
2014-01-16 15:49:34 +01:00
Bastien Guerry 81dad90342 Merge branch 'maint' 2014-01-16 12:07:37 +01:00
Bastien Guerry d16477913d Fix ff902c 2014-01-16 12:07:27 +01:00
Bastien Guerry 3fafad7eec Merge branch 'maint' 2014-01-16 11:57:55 +01:00
Bastien Guerry be54f049dd Backport Emacs trunk revno r116039 2014-01-16 11:57:45 +01:00
Bastien Guerry c7408a2bd7 Merge branch 'maint' 2014-01-16 01:19:49 +01:00
Nicolas Goaziou d4b653656e org.el (org-mode-restart): Fix turning off `org-indent-mode' when necessary
* org.el (org-mode-restart): Fix turning off `org-indent-mode'
when necessary.
2014-01-16 01:18:30 +01:00
Bastien Guerry 05dfe2aa9d Merge branch 'maint' 2014-01-16 01:13:37 +01:00
Bastien Guerry a4a2935c3f org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4
* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
2014-01-16 01:13:15 +01:00
Bastien Guerry 73a6aba4b7 org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4
* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
2014-01-16 01:12:51 +01:00
Bastien Guerry c31782d903 org.el (org-src-fontify-natively): Default to `t'
* org.el (org-src-fontify-natively): Default to `t'.

Thanks to Sébastien Vauban for pushing this.
2014-01-16 01:11:33 +01:00
Bastien Guerry a5a7231304 Merge branch 'maint' 2014-01-16 00:55:46 +01:00
Bastien Guerry e7ebe4163a Fix bf0649 2014-01-16 00:53:28 +01:00
Bastien Guerry ff902c4429 Remove spurious defvar
Thanks to Nicolas Goaziou for reporting this.
2014-01-16 00:52:46 +01:00
Bastien Guerry 27ab61acd0 Fix 4a9820 2014-01-16 00:35:12 +01:00
Bastien Guerry 60fad005a3 Merge branch 'master' of orgmode.org:org-mode 2014-01-15 09:23:06 +01:00
Bastien Guerry 8898c380ab Merge branch 'maint'
Conflicts:
	lisp/org.el
2014-01-15 09:22:59 +01:00
Bastien Guerry 0a8fe04a9d Merge branch 'maint' of orgmode.org:org-mode into maint 2014-01-15 09:21:59 +01:00
Bastien Guerry 947c3f5c2a Fix 035087777 2014-01-15 09:21:44 +01:00
Bastien Guerry d9797ca17e Revert "org.el (org-store-link): When a link has been stored, always returns it"
This reverts commit 035087777d.
2014-01-15 09:19:30 +01:00
Carsten Dominik da6e2289cc Merge branch 'maint'
Conflicts:
	lisp/org.el
2014-01-14 20:47:27 +01:00
Carsten Dominik 723306d6e7 Fix mode reset 2014-01-14 20:45:54 +01:00
Bastien Guerry 8694aa9352 Merge branch 'master' of orgmode.org:org-mode 2014-01-14 15:49:03 +01:00
Bastien Guerry 5cd6b30182 Merge branch 'maint' 2014-01-14 12:39:01 +01:00