0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-23 07:10:44 +00:00
Commit graph

1517 commits

Author SHA1 Message Date
Carsten Dominik 749fc76c2d No extra newline after time planning line 2010-03-19 19:51:58 +01:00
Carsten Dominik 2b14934fe8 HTML export: Fix linking to targets in external files
Dan Davison writes:

> Bug report
> ==========
> If I have this:
>
> A [[file:zz.org::#mytarget][link]] to a target with a custom ID
>
> and export it to HTML, I get
>
> A <a href="zz.html##mytarget">link</a> to a target with a custom ID
>
> which (in firefox on linux) links to the file but does not jump to the
> target. However, if I change the '##' to '#' then firefox jumps to the
> correct location. Is this an org bug?
>
> Very tentatively proposed patch
> ===============================
> I've investigated a bit (notes below), resulting in this proposed patch:
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/lisp/org-html.el b/lisp/org-html.el
> index aa70408..5ee5b19 100644
> --- a/lisp/org-html.el
> +++ b/lisp/org-html.el
> @@ -1110,7 +1110,7 @@ lang=\"%s\" xml:lang=\"%s\">
>                     (abs-p (file-name-absolute-p filename))
>                     thefile file-is-image-p search)
>                (save-match-data
> -                 (if (string-match "::\\(.*\\)" filename)
> +                 (if (string-match "::#?\\(.*\\)" filename)
>                      (setq search (match-string 1 filename)
>                            filename (replace-match "" t nil filename)))
>                  (setq valid
> --8<---------------cut here---------------end--------------->8---
>
> Doc patch
> =========
> The link above (file:zz.org::#mytarget) was created by C-c l on a
> heading with a CUSTOM_ID property. However, I couldn't see where in the
> manual links of this form are documented. Do we need to add this link
> type to section 4.7 "Search options in file links", e.g.
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/doc/org.texi b/doc/org.texi
> index f49f056..c8cc1a5 100644
> --- a/doc/org.texi
> +++ b/doc/org.texi
> @@ -3116,6 +3116,7 @@ link, together with an explanation:
> [[file:~/code/main.c::255]]
> [[file:~/xx.org::My Target]]
> [[file:~/xx.org::*My Target]]
> +[[file:~/xx.org::#my-custom-id]]
> [[file:~/xx.org::/regexp/]]
> @end example
>
> @@ -3130,6 +3131,8 @@ link will become an HTML reference to the corresponding named anchor in
> the linked file.
> @item *My Target
> In an Org file, restrict search to headlines.
> +@item #my-custom-id
> +Link to a heading with a @code{CUSTOM_ID} property
> @item /regexp/
> Do a regular expression search for @code{regexp}.  This uses the Emacs
> command @code{occur} to list all matches in a separate window.  If the
> --8<---------------cut here---------------end--------------->8---
>
> Notes
> =====
> At line 1134 of org-html.el there is
>
> 			(setq thefile (concat thefile "#"
> 					      (org-solidify-link-text
> 					       (org-link-unescape search)))))
>
> during evaluation of which 'search is bound to "#mytarget", which
> suggested that the problem might be in the regexp parsing creating
> 'search.
2010-03-19 18:04:23 +01:00
Carsten Dominik e45c431ce9 Refile: Catch invalid target specification
Patch by Jason Dunsmore.
2010-03-19 14:09:30 +01:00
Carsten Dominik b79e7790f9 Fix time extraction when inserting diary entries with `i d' 2010-03-18 06:36:49 +01:00
Carsten Dominik 72b33420b8 New variable for extracting time when adding diary entries
Patch by Stephen Eglen.
2010-03-17 16:54:58 +01:00
Carsten Dominik b2343cef32 Fix cursor position after changing bullet types 2010-03-17 16:11:13 +01:00
Carsten Dominik 855895059b Improve adaptive filling
Patch by Dan Hackney.

Dan Hackney writes:

> For paragraph text, `org-adaptive-fill-function' did not handle the
> base case of regular text which needed to be filled. This commit saves
> a buffer-local value of `adaptive-fill-regexp' and uses it if none of
> the org-specific regexps match.  This allows email-style ">" comments
> to be filled correctly.
2010-03-15 16:47:42 +01:00
John Wiegley 3a3a102348 Added agenda binding: ! shows/hides deadline tasks
org-agenda.el (org-agenda-include-deadlines): Added new
customization variable to determine whether unscheduled tasks
should appear in the agenda solely because of their deadline.
Default to true, which was the previous behavior (it just wasn't
configurable).
(org-agenda-mode-map, org-agenda-view-mode-dispatch): Bind ! in
the agenda to show/hide deadline tasks.
(org-agenda-menu): Added menu option for show/hide deadlines.
(org-agenda-list): Make the agenda list sensitive to the value of
`org-agenda-include-deadlines'.
(org-agenda-toggle-deadlines): New function to toggle the value of
`org-agenda-include-deadlines' and repaint the modeline
indicators.
(org-agenda-set-mode-name): Show "Deadlines" in the agenda
modeline if deadline tasks are being displayed.
2010-03-14 21:03:56 -04:00
Carsten Dominik 7dd154cc2a Tables: Introduce field coordinates for formulas, improve docs
Patch by Michael Brand
2010-03-14 13:11:17 +01:00
Carsten Dominik a9a8cbe39b Revert part of Mikael Fornius' patch 2010-03-12 18:02:51 +01:00
Carsten Dominik b68c61e829 Fix problem with a missing function in XEmacs
`latexenc-coding-system-to-inputenc' does not seem to be available in XEmacs.
2010-03-12 17:29:41 +01:00
Carsten Dominik 2b3cb66d54 LaTeX export: Fix another problem with #+AUTHOR export
Jambunathan K. writes:

> I would like to add the following observation as well -
>
> ---> org input <---
> #+AUTHOR: Jambunathan K\cr\href{mailto:{{{EMAIL}}}}{{{{EMAIL}}}}
>
> ---> actual tex output <---
> \author{Jambunathan K\cr\href{mailto:kjambunathan@gmail.com}\{kjambunathan@gmail.com\}}
>
> The above tex snippet has the effect of getting the "Url Box" wrong.
>
> I was hoping to produce the following line -
> \author{Jambunathan K\cr\href{mailto:kjambunathan@gmail.com}{kjambunathan@gmail.com}}
>
> Generally speaking, macro expansion in author string behaves strangely.
2010-03-12 15:21:41 +01:00
Carsten Dominik 57148dd8aa Agenda: Allow TODO conditions in the skip functions 2010-03-12 14:59:18 +01:00
Carsten Dominik 30e3503b7b Better detection of cursor position when editing properties 2010-03-11 14:10:21 +01:00
Carsten Dominik c6cfd3cfd3 HTML export: Fix problem with table attributes when first table line is special
Eric Fraga writes:

> What am I missing?  I tried exporting the following to HTML and the
> caption and HTML attributes seem to be ignored completely.  Also, the
> alignment directives are ignored as well.
>
> --8<---------------cut here---------------start------------->8---
> #+TITLE: test file for org mode
> #+DESCRIPTION: used for bug reports
> #+AUTHOR:    Eric S Fraga
> #+EMAIL:     Eric S Fraga <e.fraga@ucl.ac.uk>
> #+DATE:      2010-03-11 Thu
> #+KEYWORDS:
> #+LANGUAGE:  en
> #+OPTIONS:   H:3 num:t toc:t \n:nil @:t ::t |:t ^:t -:t f:t *:t <:t
> #+OPTIONS:   TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
> #+INFOJS_OPT: view:nil toc:nil ltoc:t mouse:underline buttons:0 path:http://orgmode.org/org-info.js
> #+EXPORT_SELECT_TAGS: export
> #+EXPORT_EXCLUDE_TAGS: noexport
> #+LINK_UP:
> #+LINK_HOME:
>
> * tables
>
> #+caption: A very interesting table
> #+attr_html: border="1" rules="all" frame="all" align="center"
> | <r> | <l>                            |
> |  Id | Description                    |
> |-----+--------------------------------|
> |  1. | The first item                 |
> |  2. | the second                     |
> |  4. | we don't have a third one      |
> | 10. | a longer id to check alignment |
> |-----+--------------------------------|
> --8<---------------cut here---------------end--------------->8---
>
> I'm using org current as of yesterday Org-mode version 6.34trans
>  (release_6.34c.186.g1902) and with GNU Emacs 23.1.1
>  (i486-pc-linux-gnu, GTK+ Version 2.18.2) of 2009-11-02 on raven,
>  modified by Debian
2010-03-11 12:27:42 +01:00
Carsten Dominik 77eda20bb6 Archiving: Allow to reverse order in target node
Tom writes:

> When archiving trees I'd like to see the archived items in
> reverse chronological order at the archive location, so if I jump
> to the header under which stuff is archived I would see the most
> recent item at the top.
>
> When searching for something in the archives it is much more
> frequent that I'm looking for something recently archived than
> something archived months ago, so the reserved order would make
> more sense to me.
>
> Is there a setting which tells the archiving command to insert
> the archived tree as first child of the archive location,
> instead of the last?
2010-03-11 07:23:03 +01:00
Carsten Dominik fb528c18f0 Agenda: Specify entry types as an option
Patch by Matt Lundin

Matt writes:

> Below is a patch I've been using to speed up the construction of
> agenda views limited to certain types of entries (e.g., timestamps and
> sexps).  Previously, I had constructed "calendar" views consisting
> only of timestamps and sexps by using the variable
> org-agenda-skip-function to exclude scheduled items and deadlines from
> the agenda. This, however, proved somewhat slow (3-4 seconds for
> weekly calendars, 10-12 seconds for monthly calendars). The patch
> below cuts the times to 1 and 3 seconds respectively. I believe it
> provides an efficient alternative to the skip function by allowing the
> user to tweak the arguments passed to org-agenda-get-day-entries.
2010-03-10 17:12:26 +01:00
Carsten Dominik 1902dfacbe LaTeX export: Macro processing also in author field 2010-03-09 17:24:31 +01:00
Carsten Dominik a5ebc8d3ae Refactor some functions in clocking
Patch by Bernt Hansen
2010-03-09 17:10:15 +01:00
Carsten Dominik 9900348e88 Docbook exporter: Fix problems with exporting footnotes and empty lines
Patch by Baoqiu Cui
2010-03-08 19:43:34 +01:00
Carsten Dominik 6518396b4e Allow rescheduling and changing deadlines on items with repeaters 2010-03-08 17:57:11 +01:00
Carsten Dominik dfc766a9c2 Implement a better way to catch function names that look like a reference 2010-03-08 08:40:06 +01:00
Carsten Dominik ac7ee0427c Respect link abbreviations when offering a list of links
John Wiegley writes:

> I have the following data in my Org-mode file:
>
>  #+LINK: cegbug https://portal/bugzilla/show_bug.cgi?id=
>
>  ** TODO [[cegbug:351][#351]] Bizcard: Fix Maven build setup
>     - State "TODO"       from "STARTED"    [2010-03-01 Mon 14:42]
>
> Now, in the Agenda and in the Org-mode buffer, everything looks fine.
> I can also use C-c C-o if my cursor is within the #<NUMBER> text.
>
> However, if I'm in the Agenda and I hit C-c C-o, it says 'No match'
> after about a second. Is there any reason I can't open these links
> from the Agenda view?
2010-03-08 08:31:31 +01:00
Carsten Dominik baa8f05baf Fix table formula editing bug
William Henney writes:

> Anyone have a clue what is going on here?
>
> Cheers
>
> Will
>
> * Arctan2 bug
> Activate the formula editor for the following table with =C-c '=, then
> exit without changing anything. Note what happens to the arctan2
> formula. For me, "arctan2" changes to "@2$20173232".
> | x | y | arctan | arctan2 |
> |---+---+--------+---------|
> | 1 | 1 |     45 |     45. |
> #+TBLFM: $3=arctan($1/$2)::$4=arctan2($1,$2)
>
> ** Versions
> Org 6.34trans, Aquamacs 2.0preview4, Emacs 23.1.92.1
2010-03-07 16:20:04 +01:00
Carsten Dominik edffca45e9 Solve issue with lower-case hex escapes 2010-03-05 13:36:44 +01:00
Carsten Dominik 48d4ebeb80 LaTeX export: Add \usepackage{latexsym} to the default packages 2010-03-04 07:36:23 +01:00
Carsten Dominik cff060f3ac HTML export: Do not allow protected lines into the TOC
Daniel Clemente writesL

> Hi, I found an HTML export bug with org-mode 6.34c-140-g44c8 and
> older. I used:
>
> --------------------------------------------------------
> * only one section
> #+BEGIN_EXAMPLE:
>
>  We need:
>  ,* pears
>  ,* lettuce
>  ,* watermelons
>
>  Very important!
> #+END_EXAMPLE:
> --------------------------------------------------------
>
>  And the outputed table of contents had this code:
>
> --------------------------------------------------------
> <div id="text-table-of-contents">
> <ul>
> <li><a href="#sec-1">1 only one section </a></li>
> <li><a href="#sec-2">2 pears</a></li>
> <li><a href="#sec-3">3 lettuce</a></li>
> <li><a href="#sec-4">4 watermelons</a></li>
> </ul>
> </div>
> --------------------------------------------------------
>
> This is wrong because the asterisks inside the example don't
> represent headers. There should be only one header.
2010-03-03 14:36:31 +01:00
Carsten Dominik 85df69a5c0 LaTeX export: Protect examples, even if they look like table.el tables
The recent patch to introduce table.el export in LaTeX forgot to check
protectedness.
2010-03-03 13:26:24 +01:00
Carsten Dominik 1c87de51fc LaTeX export: Fix export of &&
Lukasz Stelman writes:

I've create some presentation on programming (some more to do) and to my
surprise I've discovered that if org-mode escapes one "&" properly it
doesn't do its job in case of "&&" (and a single "^" too). I get "\&&"
in latex file which of course is wrong.
2010-03-03 12:59:26 +01:00
Carsten Dominik 8b7018269c Catch error when updating checkbox count with no headline in place 2010-03-01 08:36:26 +01:00
Carsten Dominik 93c721fabf Clock: Allow to add the current clock when preparing a report
This is dependent on the new variable
`org-clock-report-include-clocking-task', default nil.

Patch by Bernt Hansen.
2010-02-27 13:21:31 +01:00
Carsten Dominik 6d1e30828b Re-install the support for table.el tables again.
This support was totally broken.  It works now again.  Unfortunately
it is not possible to edit the table directly in the org-mode buffer
anymore - to edit such a table, you have to use C-c '
2010-02-26 22:33:49 +01:00
Carsten Dominik 045676bcaa LaTeX export: Protect footnotes in headings 2010-02-26 21:02:25 +01:00
Carsten Dominik 721e547cd9 Fix bug when there is no hast for id locations
Report by Gerald, fix by David Maus.
2010-02-26 19:51:15 +01:00
Carsten Dominik dd6043cb3a Reading dates: Fix a bug, and allow American-style dates
This patch implements reading American dates, like

2/5/3         --> 2003-02-05
2/5           --> ????-02-05

Is also fixes a bug that would force the current year when reading a
date like 2/5 (American) or 2-5 (ISO), and in this way would prevent
`org-read-date-prefer-future' to do its job.  This bug was reported by
Lukasz Stelmach.
2010-02-26 08:58:30 +01:00
Carsten Dominik 32da182a90 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 2010-02-25 17:48:41 +01:00
Carsten Dominik 6fbdb8074e Implement a simpler way to specify faces for tags and todo keywords
This is a patch by Ryan Thompson, extended by Carsten Dominik.
2010-02-25 16:41:28 +01:00
Bastien Guerry 355eb8f705 Merge branch 'master' of ssh://repo.or.cz/srv/git/org-mode 2010-02-25 16:06:04 +01:00
Carsten Dominik 8bb1c06a3a Agenda: Show [] in mode line when restricted 2010-02-25 16:05:00 +01:00
Bastien Guerry 1759ccd4db Update org-timer.el so that we only allow one timer.
Also get rid of a bug: as timers where not properly canceled,
`org-timer-show-remaining-time' was not giving the proper result.

Thanks to Frédéric Couchet for this catch.
2010-02-25 16:03:38 +01:00
Bastien Guerry 1b1433e079 `org-set-property': remove useless space in the prompt. 2010-02-25 15:17:48 +01:00
Carsten Dominik 1d3a4f1eb7 Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts:
	lisp/ChangeLog
2010-02-25 12:27:19 +01:00
Carsten Dominik e7f7a82a74 HTML export: Fix textareas
Textareas no longer have an empty line at the beginning, and the
overflow-x stype property has been moved to the CSS section.

Patch by Ulf Stegemann
2010-02-25 12:26:10 +01:00
Bastien Guerry 30ffaca5aa Added org-clock-current-task which stores the last clocked in entry.
The `org-clock-set-current' and `org-clock-delete-current' functions
handle this variable.  The variable only stores the last clocked in
entry, not the history of clocked in tasks.
2010-02-24 16:28:43 +01:00
Carsten Dominik a27d1c2963 Remember: Allow to file as sibling of current clock
Patch by Lukasz Stelmach.
2010-02-24 10:35:28 +01:00
Carsten Dominik 0afc4633f7 Publishing: Rebuild validation list when forcing publishing 2010-02-23 07:37:52 +01:00
Carsten Dominik 26b0824f5a LaTeX export: Protect footnotes in headlines 2010-02-23 07:32:06 +01:00
Carsten Dominik d0b0f776d2 Export: Kill product buffer if it has been displayed directly
Request by Livin Stephen Sharma
2010-02-21 09:19:21 +01:00
Carsten Dominik ec11ff6f72 Fix agenda csv export to show full time
Max Mustermann writes:

> Org-mode version 6.21b in GNU Emacs 23.1.1 (i486-pc-linux-gnu, GTK+
> Version 2.18.3) of 2009-11-10 on vernadsky, modified by Debian.
>
> The Org entry:
>
>   * Appointments 			       :work:
>   #+CATEGORY: Appt
>   ** Testing <2010-02-20 Sat 22:00-23:30>
>
> produces the following incomplete output with org-batch-agenda-csv :
>
>   emacs -batch -l ~/.emacs -eval '(org-batch-agenda-csv "a"
> org-agenda-ndays 1)'
>   Appt,Testing,timestamp,,work,2010-2-20,2200,,,1000,2010-2-20
>
> whereas the output of org-batch-agenda shows the correct time:
>
>   emacs -batch -l ~/.emacs -eval '(org-batch-agenda "a" org-agenda-ndays 1)'
>   Appt:       22:00-23:30 Testing                  :work::
2010-02-21 08:26:28 +01:00
Carsten Dominik 73f85e8b65 Add some hooks to org-timer.el
Patch by Austin Frank.
2010-02-20 16:14:32 +01:00