Mercurial > emacs
view lisp/org/org-datetree.el @ 107596:866e76f8ad75
Retrospective commit from 2009-10-08.
Finish up working on paragraph's base direction.
Start working on display of right-to-left glyph rows.
Rewrite set_cursor_from_row to support bidi.
xdisp.c (string_buffer_position_lim): New function.
(string_buffer_position): Most of code moved to
string_buffer_position_lim. Last argument and return value are
now EMACS_INT; all callers changed.
(set_cursor_from_row): Rewritten to support bidirectional text and
reversed glyph rows.
dispextern.h <string_buffer_position>: Update prototype.
bidi.c (bidi_paragraph_init): Fix initialization of POS.
dispextern.h (struct glyph_row): New member reversed_p.
buffer.c (syms_of_buffer): Remove DEFVAR_LISP_NOPRO for
default-direction-reversed, default-bidi-display-reordering, and
default-paragraph-direction.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 01 Jan 2010 06:27:51 -0500 |
parents | 83924fb4f59c |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; org-datetree.el --- Create date entries in a tree ;; Copyright (C) 2009 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org ;; Version: 6.33x ;; ;; This file is part of GNU Emacs. ;; ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;; Commentary: ;; This file contains code to create entries in a tree where the top-level ;; nodes represent years, the level 2 nodes represent the months, and the ;; level 1 entries days. ;;; Code: (require 'org) (defvar org-datetree-base-level 1 "The level at which years should be placed in the date tree. This is normally one, but if the buffer has an entry with a DATE_TREE property, the date tree will become a subtree under that entry, so the base level will be properly adjusted.") (defun org-datetree-find-date-create (date &optional keep-restriction) "Find or create an entry for DATE. If KEEP-RESTRICTION is non-nil, do not widen the buffer. When it is nit, the buffer will be widened to make sure an existing date tree can be found." (let ((year (nth 2 date)) (month (car date)) (day (nth 1 date))) (org-set-local 'org-datetree-base-level 1) (or keep-restriction (widen)) (goto-char (point-min)) (save-restriction (when (re-search-forward "^[ \t]*:DATE_TREE:[ \t]+\\S-" nil t) (org-back-to-heading t) (org-set-local 'org-datetree-base-level (org-get-valid-level (funcall outline-level) 1)) (org-narrow-to-subtree)) (goto-char (point-min)) (org-datetree-find-year-create year) (org-datetree-find-month-create year month) (org-datetree-find-day-create year month day) (goto-char (prog1 (point) (widen)))))) (defun org-datetree-find-year-create (year) (let ((re "^\\*+[ \t]+\\([12][0-9][0-9][0-9]\\)[ \t\n]") match) (goto-char (point-min)) (while (and (setq match (re-search-forward re nil t)) (goto-char (match-beginning 1)) (< (string-to-number (match-string 1)) year))) (cond ((not match) (goto-char (point-max)) (or (bolp) (newline)) (org-datetree-insert-line year)) ((= (string-to-number (match-string 1)) year) (goto-char (point-at-bol))) (t (beginning-of-line 1) (org-datetree-insert-line year))))) (defun org-datetree-find-month-create (year month) (org-narrow-to-subtree) (let ((re (format "^\\*+[ \t]+%d-\\([01][0-9]\\)[ \t\n]" year)) match) (goto-char (point-min)) (while (and (setq match (re-search-forward re nil t)) (goto-char (match-beginning 1)) (< (string-to-number (match-string 1)) month))) (cond ((not match) (goto-char (point-max)) (or (bolp) (newline)) (org-datetree-insert-line year month)) ((= (string-to-number (match-string 1)) month) (goto-char (point-at-bol))) (t (beginning-of-line 1) (org-datetree-insert-line year month))))) (defun org-datetree-find-day-create (year month day) (org-narrow-to-subtree) (let ((re (format "^\\*+[ \t]+%d-%02d-\\([0123][0-9]\\)[ \t\n]" year month)) match) (goto-char (point-min)) (while (and (setq match (re-search-forward re nil t)) (goto-char (match-beginning 1)) (< (string-to-number (match-string 1)) day))) (cond ((not match) (goto-char (point-max)) (or (bolp) (newline)) (org-datetree-insert-line year month day)) ((= (string-to-number (match-string 1)) day) (goto-char (point-at-bol))) (t (beginning-of-line 1) (org-datetree-insert-line year month day))))) (defun org-datetree-insert-line (year &optional month day) (let ((pos (point))) (skip-chars-backward " \t\n") (delete-region (point) pos) (insert "\n" (make-string org-datetree-base-level ?*) " \n") (backward-char 1) (if month (org-do-demote)) (if day (org-do-demote)) (insert (format "%d" year)) (when month (insert (format "-%02d" month)) (if day (insert (format "-%02d %s" day (format-time-string "%A" (encode-time 0 0 0 day month year)))) (insert (format " %s" (format-time-string "%B" (encode-time 0 0 0 1 month year)))))) (beginning-of-line 1))) (defun org-datetree-file-entry-under (txt date) "Insert a node TXT into the date tree under DATE." (org-datetree-find-date-create date) (let ((level (org-get-valid-level (funcall outline-level) 1))) (org-end-of-subtree t t) (org-back-over-empty-lines) (org-paste-subtree level txt))) (defun org-datetree-cleanup () "Make sure all entries in the current tree are under the correct date. It may be useful to restrict the buffer to the applicable portion before running this command, even though the command tries to be smart." (interactive) (goto-char (point-min)) (let ((dre (concat "\\<" org-deadline-string "\\>[ \t]*\\'")) (sre (concat "\\<" org-scheduled-string "\\>[ \t]*\\'")) dct ts tmp date year month day pos hdl-pos) (while (re-search-forward org-ts-regexp nil t) (catch 'next (setq ts (match-string 0)) (setq tmp (buffer-substring (max (point-at-bol) (- (match-beginning 0) org-ds-keyword-length)) (match-beginning 0))) (if (or (string-match "-\\'" tmp) (string-match dre tmp) (string-match sre tmp)) (throw 'next nil)) (setq dct (decode-time (org-time-string-to-time (match-string 0))) date (list (nth 4 dct) (nth 3 dct) (nth 5 dct)) year (nth 2 date) month (car date) day (nth 1 date) pos (point)) (org-back-to-heading t) (setq hdl-pos (point)) (unless (org-up-heading-safe) ;; No parent, we are not in a date tree (goto-char pos) (throw 'next nil)) (unless (looking-at "\\*+[ \t]+[0-9]+-[0-1][0-9]-[0-3][0-9]") ;; Parent looks wrong, we are not in a date tree (goto-char pos) (throw 'next nil)) (when (looking-at (format "\\*+[ \t]+%d-%02d-%02d" year month day)) ;; At correct date already, do nothing (progn (goto-char pos) (throw 'next nil))) ;; OK, we need to refile this entry (goto-char hdl-pos) (org-cut-subtree) (save-excursion (save-restriction (org-datetree-file-entry-under (current-kill 0) date))))))) (provide 'org-datetree) ;; arch-tag: 1daea962-fd08-448b-9f98-6e8b511b3601 ;;; org-datetree.el ends here