From 71326d5312262692c639b22df0e8eb156a6ed017 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Tue, 9 May 2006 00:31:08 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2006 (patch 41) Patches applied: * mwolson@gnu.org--2006/planner--main--1.0--patch-41 planner-el.texi: Update location of schedule.el. git-archimport-id: mwolson@gnu.org--2006-planner-el/planner-el--devel--0--patch-36 --- ChangeLog.2006 | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.defs | 2 +- debian/changelog | 4 +- planner-el.texi | 9 ++- 4 files changed, 202 insertions(+), 5 deletions(-) diff --git a/ChangeLog.2006 b/ChangeLog.2006 index e5da278..9a896b4 100644 --- a/ChangeLog.2006 +++ b/ChangeLog.2006 @@ -1,3 +1,195 @@ +2006-04-26 19:59:37 GMT Michael Olson patch-40 + + Summary: + planner-calendar: Default to today if not publishing a day page. + Revision: + planner--main--1.0--patch-40 + + * planner-calendar.el (planner-calendar-from-wiki): Default to current + day if we're not publishing a day page. + + modified files: + planner-calendar.el + + +2006-04-26 19:55:13 GMT Michael Olson patch-39 + + Summary: + Add default CSS elements for calendar stuff. + Revision: + planner--main--1.0--patch-39 + + * planner-publish.el (planner-html-style-sheet): Add some default CSS + elements for calendar stuff. + + modified files: + planner-publish.el + + +2006-04-26 19:35:10 GMT Michael Olson patch-38 + + Summary: + planner-calendar: Surround generated calendar with
tag. + Revision: + planner--main--1.0--patch-38 + + * planner-calendar.el: Fix example. + (planner-publish-calendar-tag): Surround in a
section for ease of + use. + + * planner-el.texi (Publishing Calendars): Make the example simpler. + + * planner-publish.el (planner-insert-markup): If we're using Muse 3.02.6, + manually make the region read-only. + + modified files: + Makefile.defs debian/changelog planner-calendar.el + planner-el.texi planner-publish.el + + +2006-04-26 18:09:14 GMT Michael Olson patch-37 + + Summary: + Minor docfix. + Revision: + planner--main--1.0--patch-37 + + * planner-publish.el (planner-publish-prepare-buffer) + (planner-publish-finalize-buffer): Docfix. + + modified files: + planner-publish.el + + +2006-04-26 18:01:36 GMT Michael Olson patch-36 + + Summary: + Make publishing of calendars work better using a new method. + Revision: + planner--main--1.0--patch-36 + + * planner-calendar.el: Docfix. Recognize tags even in the + header and footer. + (planner-calendar-insert-calendar-maybe) + (planner-calendar-move-calendar-to-top-of-page-maybe): Remove, since + they are not needed by the new method. + + * planner-el.texi (Publishing Calendars): Update. + + * planner-publish.el (planner-publish-prepare-regexps): New option that + specifies the publishing regexps to apply before doing other + publishing. + (planner-publish-finalize-regexps): New option that specifies the + publishing regexps to apply after doing other publishing. + (planner-publish-prepare-buffer): Use planner-publish-prepare-regexps. + (planner-publish-finalize-buffer): New function that finalizes Planner + buffers after publishing. + (planner-section-tagnames): Fix ordering error. + + modified files: + planner-calendar.el planner-el.texi planner-publish.el + + +2006-04-26 03:22:20 GMT Michael Olson patch-35 + + Summary: + Use h2, h3, ... for headings. + Revision: + planner--main--1.0--patch-35 + + * planner-publish.el (planner-publish-markup-tags) [title]: Accept + attributes. + (planner-html-markup-strings) [planner-begin-title, planner-end-title]: + Use normal style headings, i.e. h2. + (planner-html-style-sheet): Remove nested title hacks. + (planner-publish-markup-note): Use title level of 3. + (planner-publish-title-tag): Accept attributes. Call muse-markup-text + with a level argument. + (planner-publish-section): Store level as heading level + 1, since the + topmost level heading should be h2. + + modified files: + planner-publish.el + + +2006-04-25 22:03:34 GMT Michael Olson patch-34 + + Summary: + Fix a paragraph publishing problem near end of file. + Revision: + planner--main--1.0--patch-34 + + * planner-publish.el (planner-html-markup-strings) + [planner-end-note-categories]: Remove newline. + (planner-publish-prepare-buffer): Rework to use the Muse markup engine. + (planner-publish-markup-note): Docfix. + (planner-publish-nested-section-tag): Docfix. + (planner-publish-notes-section-tag): Insert newline. + (planner-publish-note-tag): Insert newline. + (planner-sectionalize-delimiter, planner-sectionalize-page) + (sectionalize-markup-tagname, sectionalize-markup-tagname) + (sectionalize): Remove. + (planner-publish-section-close): New function that finds where the + closing tag of DEPTH should go, and inserts TEXT. + (planner-section-tagnames): Mapping of sections to their tag name. + (planner-publish-section-tagname): New function that finds the tag name + for the given section. + (planner-publish-section): New function that publishing the current + heading as a section. This should fix a problem with sections at the + end of a file, given only one newline at end. + + modified files: + planner-publish.el + + +2006-04-09 19:29:19 GMT Michael Olson patch-33 + + Summary: + manual: Fix errors introduced in last patch. + Revision: + planner--main--1.0--patch-33 + + * planner-el.texi: Fix a couple of errors. + + modified files: + planner-el.texi + + +2006-04-09 19:27:03 GMT Michael Olson patch-32 + + Summary: + manual: Remove use of old Planner variables. + Revision: + planner--main--1.0--patch-32 + + * planner-el.texi: Remove use of old Planner variables. Thanks to + Sebastian Luque for the report. + (Creating Your Planner): Clarify comment. + (Basic Configuration): Remove node, since its content is presented + elsewhere. + (Annotations, Publishing): Don't use old Planner variables in + explanation. + (iCal Task Publication): Give a more up-to-date example. + + modified files: + planner-el.texi + + +2006-04-08 02:57:43 GMT Michael Olson patch-31 + + Summary: + Prepare new Debian package for Arch snapshot. + Revision: + planner--main--1.0--patch-31 + + * ChangeLog.2006: Update. + + * debian/changelog: Prepare new Debian package for Arch snapshot. + + modified files: + ChangeLog.2006 Makefile.defs debian/changelog + + 2006-04-08 01:34:44 GMT Michael Olson patch-30 Summary: diff --git a/Makefile.defs b/Makefile.defs index 5b80836..79c7b0e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -18,7 +18,7 @@ INSTALLINFO = install-info --info-dir=$(INFODIR) # Useful only for the maintainer PROJECT = planner DEBNAME = planner-el -VERSION = 3.40.arch.38 +VERSION = 3.40.arch.40 MANUAL = planner-el LASTUPLOAD = 3.40-3 BUILDOPTS = diff --git a/debian/changelog b/debian/changelog index ec6e7ca..36abf4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -planner-el (3.40.arch.38-1) unstable; urgency=low +planner-el (3.40.arch.40-1) unstable; urgency=low * New Arch snapshot. - -- Michael W. Olson (GNU address) Wed, 26 Apr 2006 15:29:45 -0400 + -- Michael W. Olson (GNU address) Wed, 26 Apr 2006 19:40:10 -0400 planner-el (3.40.arch.31-1) unstable; urgency=low diff --git a/planner-el.texi b/planner-el.texi index 3648019..96c1cb7 100644 --- a/planner-el.texi +++ b/planner-el.texi @@ -4447,6 +4447,10 @@ generate reports with the @code{} tag. You may want to read the @ref{Keeping Track of Time} page to see how you can use planner-timeclock to produce detailed reports. +@file{timeclock.el} is part of GNU Emacs. If you are using XEmacs, +please use the version of @file{timeclock.el} the comes with Planner in +the @file{contrib} directory. + With @file{planner-timeclock.el} loaded, @command{planner-task-in-progress} clocks in a task. To clock out, use @command{planner-task-done} or @command{timeclock-out}. @@ -4550,8 +4554,9 @@ Tasks should be of the form: s: seconds, m: minutes, h: hours, d: days, w: weeks @end example -You can get @file{schedule.el} from -@url{http:// www.newartisans.com/ johnw/ Emacs/ schedule.el} +@file{schedule.el} is included with Planner in the @file{contrib} +directory, but you can alternatively get it from +@url{http://www.newartisans.com/johnw/Emacs/schedule.el} if desired. @file{planner-schedule.el} defines the following interactive functions: -- 2.11.4.GIT