Commit Graph

10362 Commits

Author SHA1 Message Date
Achim Gratz 687766c922 Introduce compatibility and convenience targets, local.mk template, add "helpall"
* Makefile: new target "helpall" to document all targets, while "help"
  continues to show a brief subset.

* default.mk: add cutlines for sed to produce local.mk with.

* targets.mk: add target "local.mk" to produce an (empty) local.mk
  configuration template when it isn't already present.  Ignore any
  error when making this target since sed might not be present on all
  systems.  Redefine target "update" to not include testing, similarly
  add target "update2" to additionally install without test.  Add
  targets "up0" to stop after git pull and "up1" to stop after test,
  while "up2" continues to do everything and then installs.  Complete
  .PHONY target list.  Add "refcard" target for compatibility with old
  make.  Clean contrib in "cleanall", too.
2012-04-23 21:42:08 +02:00
Eric Schulte b47bccf81c Merge branch 'origin-maint' 2012-04-23 11:39:50 -04:00
Bastien Guerry e9d34dcd72 org.texi: Fix insertion of {} chars.
Thanks to Richard Stanton for spotting this.
2012-04-23 19:24:04 +02:00
Bastien Guerry 374d1b93c3 org.el (org-goto): Fix docstring and document what C-u does.
* org.el (org-goto): Fix docstring and document what C-u does.

Thanks to John Hendy for pointing this.
2012-04-23 19:08:15 +02:00
Eric Schulte cd080b025a ensure newline precedes automatically-added returns for Python code blocks
* lisp/ob-python.el (org-babel-execute:python): Ensure newline
  precedes automatically-added returns.
2012-04-23 11:39:28 -04:00
Toby S. Cubitt b7982a0024 org-capture.el: Fixed bug in org-capture-templates %<n> expandos
* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
  %<n> expandos to match any positive integer.
  (org-capture-templates): Updated docstring accordingly.

* doc/org.texi: Updated documentation accordingly.
2012-04-23 17:34:15 +02:00
Daniel Dehennin 077af66a6f org-exp.el: Handle new parameter :addlevel when including a file.
* org-exp.el (org-export-handle-include-files)
(org-get-file-contents): Handle new parameter :addlevel.

TINYCHANGE
2012-04-23 14:46:24 +02:00
Bastien Guerry d592b07d51 org-publish.el: Use (case-fold-search t) when looking for #+INCLUDE:.
* org-publish.el (org-publish-cache-file-needs-publishing):
Use (case-fold-search t) when looking for #+INCLUDE:.
2012-04-23 14:19:21 +02:00
Christophe Rhodes c627a22e29 org-latex.el: Support setting the :hfmt parameter from #+ATTR_LaTeX.
* org-latex.el (org-export-latex-tables): Support setting
the :hfmt parameter from #+ATTR_LaTeX.

TINYCHANGE
2012-04-23 13:41:27 +02:00
niels giesen 549c498bb6 org-table.el: Add defcustoms for LaTeX export of table rules :tstart, :hline and :tend
* org-table.el (orgtbl-to-generic): Add check for :skipheadrule.
When present, the :hline following the head will be skipped.  This is
necessary to avoid doubling of horizontal rules in LaTeX longtable
environments and consequent width problems.

* org-latex.el (org-export-latex-tables-tstart)
(org-export-latex-tables-hline)
(org-export-latex-tables-tend): New options.
(org-export-latex-tables): Use the new options.
2012-04-23 13:23:36 +02:00
Bastien Guerry b1618e2d69 Fix missing } in org.texi. 2012-04-23 12:59:32 +02:00
Toby S. Cubitt 9432a9f1a0 Agenda: Add org-agenda-skip-timestamp-if-deadline-is-shown
* lisp/org-agenda.el (org-agenda-skip-timestamp-if-deadline-is-shown):
Skip timestamp items in agenda view if item is already shown as a
deadline item.
(org-agenda-skip-dealine-if-done): Pass deadline results to
org-agenda-get-timestamps.
(org-agenda-get-timestamps): Optionally take list of deadline results,
so that timestamp results can be skipped if already included in
deadline results.
2012-04-23 12:50:43 +02:00
Toby S. Cubitt 987b185e90 Agenda: Add org-agenda-diary-sexp-prefix customization option
* lisp/org-agenda.el (org-agenda-diary-sexp-prefix): Regexp matching
deadline/scheduling information to be displayed in diary sexp agenda
items.
(org-agenda-get-sexps): Extract deadline/scheduling information from
diary sexp entries.
2012-04-23 12:48:43 +02:00
Toby Cubitt e13d182ce8 Allow %<num> escapes to capture templates, expanded to text entered in <num>'th prompt
* org-capture.el (org-capture-fill-template): Expand %<num>
escape sequences into text entered for <num>'th %^{PROMPT} escape.
2012-04-23 12:48:40 +02:00
Bastien Guerry 1c203d8d19 Match #+name/#+tblname/#+tblfm along with uppercase twins.
* org.el: Use (case-fold-search t).
(org-edit-special, org-ctrl-c-ctrl-c): Ditto.

* org-table.el:
(org-table-store-formulas, org-table-get-stored-formulas)
(org-table-fix-formulas, org-table-edit-formulas)
(org-old-auto-fill-inhibit-regexp, orgtbl-ctrl-c-ctrl-c)
(orgtbl-toggle-comment, org-table-get-remote-range): Ditto.

* org-footnote.el:
(org-footnote-goto-local-insertion-point): Ditto.

* org-exp.el: Ditto.

* org-colview.el:
(org-dblock-write:columnview, org-dblock-write:columnview):
Ditto.

* org-colview-xemacs.el:
(org-dblock-write:columnview): Ditto.

* org-clock.el (org-clocktable-write-default): Ditto.

* org-capture.el (org-capture-place-table-line): Ditto.

* ob.el (org-babel-data-names, org-babel-goto-named-src-block)
(org-babel-src-block-names)
(org-babel-where-is-src-block-result, org-babel-result-end)
(org-babel-where-is-src-block-head)
(org-babel-find-named-result, org-babel-result-names): Ditto.
2012-04-23 12:48:33 +02:00
Matt Lundin e5101717fa Following gnus links: Don't mark unrelated articles read
* lisp/org-gnus.el: (org-gnus-follow-link): Fix argument to
  gnus-group-read-group so that following a link does not result in
  unread article being selected.

The NO-ARTICLE argument to gnus-group-read-group should be t.
Otherwise org-gnus-follow-link selects the most unread article in a
group before selecting the linked article. This results in unread
articles being unread (which can cause one to miss important mail).
2012-04-23 09:18:52 +02:00
Bastien Guerry e9dec29bb1 org-table.el: Escape some special characters when sending radio tables.
* org-table.el (orgtbl-send-table): Escape special characters.
Introduce a new parameter :no-escape to prevent escaping.

* org.texi (Radio tables): Document the :no-escape parameter.

Thanks to Alexander Willand for raising this issue.
2012-04-23 00:09:35 +02:00
Bastien Guerry 94bc01e77e org-agenda.el: Small fix. Use `org-called-interactively-p' instead of `called-interactively-p'. 2012-04-22 23:15:04 +02:00
Jambunathan K ac5d8c92a5 org-e-odt.el: Adjust search paths for schema and styles files 2012-04-22 23:49:18 +05:30
Jambunathan K eef6444ac0 org-odt.el (org-odt-schema-dir-list): Adjust search path
* lisp/org-odt.el (org-odt-schema-dir-list): OD Schema files
have been moved away from $(git-root)/contrib/odt/etc/schema/
to $(git-root)/etc/schema/.
2012-04-22 23:48:36 +05:30
Jambunathan K 43ee3a441a rm -rf contrib/odt 2012-04-22 23:05:26 +05:30
Nicolas Goaziou 54e34cca0d Merge branch 'maint' 2012-04-22 18:44:45 +02:00
Nicolas Goaziou 805f3fd92d org-mouse: Do not move point when clicking on a footnote reference
* lisp/org-mouse.el (org-mode-hook): Do not move point when clicking
  on a footnote reference.
2012-04-22 18:43:55 +02:00
Nicolas Goaziou 052247ce81 org-e-ascii: Correctly indent table.el tables
* contrib/lisp/org-e-ascii.el (org-e-ascii-table): Remove indentation
  from table.el tables.
2012-04-22 17:00:32 +02:00
Carsten Dominik f1443e7a7a Merge branch 'beamer-inheritance' 2012-04-22 16:35:10 +02:00
Carsten Dominik 6fdfa1ede1 Allow beamer export to inherit some properties
* lisp/org-beamer.el (org-beamer-inherited-properties): New option.
(org-beamer-after-initial-vars): Use new option to look for inherited
properties.
2012-04-22 16:33:24 +02:00
Jambunathan K 0b97c97170 org-e-html/org-e-odt: Use new table infrastructure 2012-04-22 19:48:26 +05:30
Jambunathan K 00cc5d5cef org-export: Minor fixes
* contrib/lisp/org-export.el (org-export-creator-string):
Check for `org-version' being bound before using it.
(org-export-get-inbuffer-options): Use
`org-element-restriction'.
2012-04-22 19:47:53 +05:30
Jambunathan K d73db66a38 Move org-e-* from EXPERIMENTAL/ to contrib/lisp/ 2012-04-22 19:47:37 +05:30
Jambunathan K c009f84f99 org-e-html/org-e-odt: Use new table infrastructure. First cut and slightly broken. 2012-04-22 19:46:26 +05:30
Nicolas Goaziou 0264495f52 org-export: Fix small bug
* contrib/lisp/org-export.el (org-export-get-coderef-format): Handle
  nil descriptions.
2012-04-22 19:42:47 +05:30
Nicolas Goaziou 7ba1d26253 org-e-ascii: Fix small bug
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii--build-caption): Fix
  a "wrong number of arguments" bug.
2012-04-22 19:42:32 +05:30
Nicolas Goaziou 851fe42608 org-e-ascii: Use new table structure
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii-table): Use new table
  structure.
(org-e-ascii-table--column-width,
org-e-ascii-table--vertical-separators,
org-e-ascii-table--format-cell, org-e-ascii-table--build-hline):
Remove functions.
(org-e-ascii-table-cell, org-e-ascii-table-row,
org-e-ascii--table-cell-width): New functions.
2012-04-22 19:42:16 +05:30
Nicolas Goaziou 01d8153f72 org-e-latex: Use new table structure
* EXPERIMENTAL/org-e-latex.el (org-e-latex-table-scientific-notation):
  New variable.
(org-e-latex-table): Use new table structure.
(org-e-latex-table--format-string, org-e-latex-table--align-string):
Apply changes to tables structure.  Change signature too.
(org-e-latex-table-cell, org-e-latex-table-row): New functions.
2012-04-22 19:42:01 +05:30
Nicolas Goaziou 172ae310a8 org-export: Define tools for tables, table rows and table cells
* contrib/lisp/org-export.el (org-export-table-cell-width,
  org-export-table-cell-alignment, org-export-table-cell-borders,
  org-export-table-row-group, org-export-table-has-special-column-p,
  org-export-table-row-is-special-p, org-export-get-parent-table,
  org-export-table-dimensions, org-export-table-cell-address,
  org-export-get-table-cell-at, org-export-table-has-header-p,
  org-export-table-cell-starts-colgroup-p,
  org-export-table-cell-ends-colgroup-p,
  org-export-table-row-starts-rowgroup-p,
  org-export-table-row-ends-rowgroup-p,
  org-export-table-row-starts-header-p,
  org-export-table-row-ends-header-p): New functions.
(org-export-table-format-info, org-export-clean-table): Removed
functions.
(org-export-filter-table-cell-functions,
org-export-filter-table-row-functions): New variables.
(org-export-filters-alist): Install new filters.
(org-export-collect-tree-properties, org-export--skip-p): Mark special
rows and cells as ignored.
* testing/lisp/test-org-export.el: Add tests.
2012-04-22 19:41:45 +05:30
Nicolas Goaziou eeeee5f1da org-element: Split tables into table-row elements and table-cell objects
* contrib/lisp/org-element.el (org-element-table-parser): Split tables
  into table-row elements and table-cell objects.
(org-element-table-interpreter): Adapt interpreter to new code.
(org-element-table-row-parser, org-element-table-row-interpreter,
org-element-table-cell-parser, org-element-table-cell-interpreter,
org-element-table-cell-successor, org-element-table-row-successor,
org-element-restriction): New functions.
(org-element-headline-parser,
  org-element-inlinetask-parser, org-element-item-parser,
  org-element-verse-block-parser,
  org-element-footnote-reference-parser,
  org-element-collect-affiliated-keywords, org-element-parse-objects):
  Use new function
(org-element-all-objects): Add new objects.
(org-element-target-parser): Small change to docstring.
(org-element-object-restrictions): Merge `org-element-string-restrictions'
into it.
(org-element-string-restrictions): Remove variable.
(org-element-parse-elements): Parse objects in non-recursive elements
with contents.
(org-element-normalize-string): Small refactoring.
(org-element-at-point): Handle table navigation.
* testing/lisp/test-org-element.el: Add tests.
2012-04-22 19:41:28 +05:30
Jambunathan K aa2e5308ee Move contrib/lisp/org-e-*.el to EXPERIMENTAL/ 2012-04-22 19:41:10 +05:30
Bastien Guerry de7c48759c Let `org-toggle-sticky-agenda' output a message only when called interactively.
* org-agenda.el (org-toggle-sticky-agenda): Only shout a
message when called interactively.
(org-agenda-get-restriction-and-command): Call
`org-toggle-sticky-agenda' interactively.
2012-04-22 15:27:21 +02:00
Achim Gratz 0a9c29d305 allow customization of the "doc" target to skip certain types of documentation
* doc/Makefile: read targets to make for "doc" from $(ORG_MAKE_DOC),
  defaults to "info html pdf"; can be overridden by the user in
  local.mk.

* targets.mk: read targets to make for "doc" and "docs" from
  $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by
  the user in local.mk.

* default.mk: document ORG_MAKE_DOC and provide a (commented) example
  of how to have make only produce info documentation.
2012-04-22 10:51:29 +02:00
Achim Gratz 7993ae4816 fix bug introduced with aliasing target "doc" to "docs"
* targets.mk: $(SUBDIRS) must not be used as a dependency since "doc"
  is both an existing directory and a phony target
2012-04-22 10:51:25 +02:00
Achim Gratz 22447fe485 fix typo
* doc/Makefile: fix typo, it is org-version.inc, not org-version.texi
2012-04-22 10:51:21 +02:00
Bastien Guerry 18cf324f07 org-agenda.el: Fix bug in top-category filtering.
* org-agenda.el (org-agenda-top-category-filter): New variable
for storing the current top-category filter.
(org-agenda-redo): Apply a top-category filter, if any.
(org-agenda-filter-by-top-category)
(org-agenda-filter-top-category-apply): Set
`org-agenda-top-category-filter' to the right value.

Thanks to John Wiegley for reporting this.
2012-04-22 09:21:42 +02:00
Bastien Guerry ef956d7181 When clocking, Don't modify `frame-title-format' if it is a string.
* org-clock.el (org-clock-out, org-clock-cancel)
(org-clock-in): Don't modify `frame-title-format' if it is a
string.

Thanks to Mike McLean for reporting this and to Matt Lundin for
pointing at the problem in the code.
2012-04-22 09:01:28 +02:00
Bastien Guerry a1fd7c4626 org-latex.el: Fix bug when escaping special characters in a table.
* org-latex.el (org-export-latex-special-chars): Fix bug when
escaping special characters in a table.

Thanks to Alexander Willand for reporting this.
2012-04-22 08:42:35 +02:00
Bastien Guerry c2a6f5de6e Use :inverse-video t for `org-date-selected'.
* org.el (org-read-date): Set cursor-type to nil in the calendar.

* org-faces.el (org-date-selected): Use inverse video.  Don't explicitely
set bold to nil as it causes `customize-face' to show the weight property
and thus encourage the user to change it.  Warn in the docstring that using
bold might cause problems when displaying the calendar.

Using inverse video for the selected date might be too much for many
people, but with cursor-type set to nil (thanks to Toby Cubitt for this)
and with a light-weight font, we need to really highlight the selected
date -- and a simple color change is not catchy enough IMO.
2012-04-22 07:54:32 +02:00
Bastien Guerry eabf8984be Merge branch 'maint' 2012-04-22 00:44:27 +02:00
Bastien Guerry 76c38183bb org-faces.el (org-date-selected): Fix docstring.
* org-faces.el (org-date-selected): Fix docstring.

Thanks to Toby Cubitt for pointing this.
2012-04-22 00:44:03 +02:00
Martyn Jago 6b6f0d625b Fix require path due to removal of EXPERIMENTAL
* contrib/lisp/org-export.el:

path relative to org-export.el has changed due
to relocation of org-e-publish.el (removal of
EXPERIMENTAL)
2012-04-21 23:51:38 +02:00
Bastien Guerry abd49c8aae Deleate trailing whitespaces. 2012-04-21 17:44:47 +02:00
François Allisson 0189c5d2d9 Update of contrib/README 2012-04-21 17:44:29 +02:00