Commit Graph

1418 Commits

Author SHA1 Message Date
Bastien Guerry 08bd0b8892 Merge branch 'local-Makefile' into test-makefile-merge 2012-04-21 10:02:28 +02:00
Brian van den Broek 8f3dc945b2 Change example timestamps to not occur in headlines.
* org.texi: Alter several examples of headings with timestamps
in them to include the timestamps in the body instead of the heading.

* orgguide.texi: Alter the same examples in the same way as for
org.texi.

The Org-mode manual explicitly discourages the inclusion of timestamps
in headlines, yet examples do just that. These changes make the manual
consistent with its own advice.

TINYCHANGE
2012-04-21 00:43:24 +02:00
Feng Shu a9d3ce0bcd Allow to use imagemagick for previewing LaTeX fragements.
* org.el (org-latex-create-formula-image-program): New option
to use either dvipng or imagemagick to convert and preview
LaTeX fragments.
(org-preview-latex-fragment, org-format-latex): Handle the new
option.
(org-create-formula-image-with-dvipng): Rename from
`org-create-formula-image'.
(org-create-formula-image-with-imagemagick): New defun to
handle LaTeX preview with imagemagick.
(org-latex-color, org-latex-color-format): New defuns to
handle color conversions.

* org-latex.el (org-latex-to-pdf-process, org-export-as-pdf):
Allow to use imagemagick to convert LaTeX fragments.

* org-html.el (org-export-html-preprocess): Ditto.

* org-exp.el (org-export-with-LaTeX-fragments): Ditto.

* org.texi (@LaTeX{} fragments): Document imagemagick as an
alternative to dvipng.
2012-04-21 00:42:59 +02:00
Bastien Guerry ec921a2a68 Support hourly repeat cookies.
* org.el (org-repeat-re)
(org-clone-subtree-with-time-shift, org-auto-repeat-maybe)
(org-deadline, org-schedule, org-matcher-time)
(org-time-stamp, org-read-date, org-read-date-get-relative)
(org-display-custom-time, org-get-wdays)
(org-time-string-to-absolute, org-closest-date)
(org-timestamp-change): Allow to set hourly repeat cookie.
Send an error when an hourly repeat cookie is set and no hour
is specified in the timestamp.

* org.texi (Repeated tasks): Document repeat cookies for
years, months, weeks, days and hours.

* org-agenda.el (org-agenda-get-timestamps): Match hourly
repeat cookies.

* org-icalendar.el (org-print-icalendar-entries): Handle
hourly repeat cookies.

Thanks a lot to Takafumi Arakaki for this idea and for a preliminary
version of this patch.
2012-04-21 00:42:56 +02:00
Achim Gratz e102e411e4 doc/Makefile: rename/add auto-generated files to be compatible with Emacs
* doc/Makefile: rename auto-generated file "git-describe.texi" to
  "org-version.inc" to allow for easier inclusion into Emacs.

* doc/org.texi: include "org-version.inc" instead of
  "git-describe.texi".

* lisp/Makefile: new auto-generated file org-version.el with autoload
  cookies.  The version strings will be pulled during autoload
  extraction into org-install.el (standalone org-mode) or
  ../loaddefs.el (Emacs).
2012-04-20 21:04:14 +02:00
Achim Gratz 6a3ec67abd Introduce $(datadir), prefix all installation paths with $(DESTDIR)
Makefile: remove includes for maintainer targets, these will go
	into local.mk on the server

	default.mk: introduce $(datadir) to replace $(etcdir) in etc/Makefile

	doc/Makefile: replace $etcdir) with $(datadir)

	lisp/Makefile: record ODT styles location as defconst in org-install

	{doc,etc,lisp}/Makefile: prefix all installation targets with $(DESTDIR)
2012-04-20 21:04:11 +02:00
Achim Gratz 6da2d089b0 move all version strings into org-install.el
* targets.mk: check for release and git version and record this
	into environment variables for use in sub-make invocations; add
	new target "compile-dirty" that does not invoke "make clean" first
	* doc/Makefile, lisp/Makefile: remove git version check, since
	they are now provided by first-level make
	* lisp/Makefile: add insertion of version information into
	org-install.el, have org-install.el depend on LISPF rather than
	LISPC so that autoloads can be produced without compiling
	everything and remove insertion into org.el and re-compilation
	during install; add new target "compile-dirty" to support
	invocation from first-level make
	* lisp/org.el (org-version): remove determination of version
	information, show "N/A" if the information is not provided via
	org-install.el
2012-04-20 21:04:10 +02:00
Achim Gratz 306c748f63 inject git-describe version and date into org manual
* doc/Makefile: introduce target for git-describe.texi, which is an
	  automatically generated file that records the output of git-describe
	  and date; remove this file during make clean
	* doc/org.texi: remove @set for VERSION and DATE and do an @include
	  git-describe.texi instead
2012-04-20 21:04:09 +02:00
Achim Gratz 8bbf77a748 finish cleanup on infodir, some refinements on rules
* doc/Makefile: cleanall additionally removes the directories for
	manual and guide; fix the dir file in infodir after removal of org
	documentation

	* lisp/Makefile: remove debug statement
2012-04-20 21:04:08 +02:00
Achim Gratz 501f9b1741 use sed instead of perl, add target clean-install
* Makefile, lisp/Makefile, doc/Makefile: add target clean-install
	to remove files in install-directories

	* default.mk: add customization variable $(SED)

	* doc/Makefile: do not remove dir while cleaning

	* lisp/Makefile: use sed instead of perl to weave git-status into
	org.el and ignore any errors while doing it.  Keep git status in
	$(GITSTATUS) to make it more clear what happens in the check.
2012-04-20 21:04:08 +02:00
Achim Gratz a5cb04dcd8 hand off ./doc to sub-make
* Makefile: use info function for output and call shell only once
* default.mk: add PDFTEX and RMR variables for customization
* lisp/Makefile: add target 'all' and create $(lispdir) if necessary
* maint-targets.mk: invoke sub-make for HTML manuals
* maint.mk: remove unsused VARIABLES
* targets.mk: invoke sub-make for ./doc and clean up some targets
2012-04-20 21:04:07 +02:00
Bastien Guerry d1f1c586d5 Fix merge conflict. 2012-04-20 11:43:27 +02:00
Ippei FURUHASHI ec7052d1c7 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-20 11:30:13 +02:00
Max Mikhanosha 7212801808 Merged origin/master into max-sticky-agenda 2012-04-13 18:15:18 -04:00
Bastien Guerry ac2cb80ec0 orgcard.tex: Fix copyright year. 2012-04-11 13:01:23 +02:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry 49645b6014 org.texi: State that you can use the d: option by specifying a list of drawers.
* org.texi (Export options): State that you can use the d:
option by specifying a list of drawers.

Thanks to François Pinard for requesting this.
2012-04-11 08:17:53 +02:00
Jambunathan K d6773457a2 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-04-10 22:30:11 +05:30
Jambunathan K e1c83760bc doc/org.texi: Fix compilation error 2012-04-10 22:24:54 +05:30
Bastien Guerry e8912e1bd8 Merge branch 'hotfix' 2012-04-10 14:33:01 +02:00
Jérémie Courrèges-Anglas 1e12cbdeda Deadlines and scheduling: Fix order in DEADLINE example
* doc/org.texi (Deadlines and scheduling): Fix the example: the DEADLINE
item should come right after the headline.

TINYCHANGE
2012-04-10 14:32:52 +02:00
Bastien Guerry 00f59ff30b Merge branch 'hotfix' 2012-04-09 12:35:15 +02:00
Julian Gehring 2d8913f1fc org.texi: Fix missing links and formatting in 'Exporting' section 2012-04-09 12:35:06 +02:00
Bastien Guerry 4899b81483 Merge branch 'hotfix' 2012-04-05 08:51:51 +02:00
Ippei FURUHASHI 4e35c21c09 doc/org.texi: Fix two typos in Agenda commands
doc/org.texi: Fix two typos in Agenda commands

* doc/org.texi (Agenda commands): Fix typos by swapping
the equivalent keybindings to `org-agenda-next-line'
with the ones to `org-agenda-previous-line'.

TINYCHANGE
2012-04-05 08:51:41 +02:00
Bastien Guerry 3b04635542 Small doc improvement about HTML pre/postamble.
* org-html.el (org-export-html-preamble-format)
(org-export-html-postamble-format): Improve the docstring.

* org.texi (HTML preamble and postamble): Small doc improvement.

Thanks to Zachary Jones who asked for this.
2012-04-02 23:28:52 +02:00
Bastien Guerry c187c512af Merge branch 'hotfix-7.8.06' 2012-04-02 17:58:01 +02:00
Bastien Guerry 60b6f60dfe Bump to version number 7.8.08. 2012-04-02 17:57:49 +02:00
Bastien Guerry 5651adb133 Merge branch 'hotfix-7.8.06' 2012-04-02 07:52:09 +02:00
Bastien Guerry ccd84a9f63 Fix spelling mistakes.
Thanks to Paul Eggert for spotting these.
2012-04-02 07:51:52 +02:00
Bastien Guerry 33e5cdd358 org.texi: Fix copyright year. 2012-04-01 22:05:49 +02:00
Eric Schulte 1193844018 documentation for the new file-desc header argument 2012-03-31 14:49:21 -04:00
Bastien Guerry 61106491b3 Merge branch 'hotfix-7.8.06' 2012-03-31 11:25:28 +02:00
Bastien Guerry a3ca0e43e5 Update version to 7.8.07 from hotfix. 2012-03-31 11:24:57 +02:00
Bastien Guerry 3c57eb297b doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:59 +02:00
Bastien Guerry d1ed590320 doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:29 +02:00
Jambunathan K e2f490826c Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:51:09 +05:30
Jambunathan K aa20053803 org.texi (Customizing tables in ODT export): Fix errors
* doc/org.texi (Customizing tables in ODT export): Correct few
errors.
2012-03-21 02:47:55 +05:30
Jambunathan K acec9db838 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:15:24 +05:30
Jambunathan K 1cc2af2f25 org.texi: Udpate ODT section
* doc/org.texi (Links in ODT export): Update.
(Labels and captions in ODT export): New node.
2012-03-21 02:13:55 +05:30
Jambunathan K b137bc4eae Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-20 20:31:04 +05:30
Jambunathan K f2fc168a73 org.texi (Literal examples in ODT export): Update
* doc/org.texi (Literal examples in ODT export):
htmlfontify.el in Emacs-24.1 now supports fontification.  So
ODT source blocks will be fontified by default.

(Evaluating code blocks, Evaluating code blocks):
Whitespace-only change.
2012-03-20 20:23:47 +05:30
Bastien Guerry 05ca3731f2 Merge branch 'hotfix-7.8.06' 2012-03-20 12:37:37 +01:00
Rustom Mody 4ef3304ac2 doc/org.texi: Small doc fix.
TINYCHANGE
2012-03-20 12:31:26 +01:00
Bastien Guerry cc46c9627b Merge branch 'hotfix-7.8.06' 2012-03-20 12:26:16 +01:00
Julian Gehring 04c9e0e64c doc/org.texi: Remove duplicated keybinding for 'org-refile-cache-clear'.
* org.texi (Refiling notes): Remove duplicated keybinding.

TINYCHANGE
2012-03-20 12:25:51 +01:00
Julian Gehring e2444eab93 doc/org.texi: Tiny stylistic improvements.
TINYCHANGE
2012-03-20 12:23:05 +01:00
Bastien Guerry 00365ede15 Bump to version 7.8.06. 2012-03-19 22:23:16 +01:00
Bastien Guerry ecd0562c5f Fix the master branch.
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.

This commit also bumps the version number to 7.8.06.

The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
2012-03-19 22:01:29 +01:00