CVS update by aidan xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/08/06 18:37:36
Modified: xemacs/src ChangeLog doc.c
Log:
Add an informative assertion and comment to snarf-documentation.
Revision Changes Path
1.995 +7 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.994
retrieving revision 1.995
diff -u -p -r1.994 -r1.995
--- ChangeLog 2006/08/05 08:30:35 1.994
+++ ChangeLog 2006/08/06 16:37:31 1.995
＠＠ -1,3 +1,10 ＠＠
+2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * doc.c (Fsnarf_documentation):
+ Add an assertion and a comment, rather than crashing in the
+ 76584th call of hash_string when someone's using a DOC file that
+ doesn't match the format.
+
2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* syntax.c (complex_vars_of_syntax):
1.39 +4 -0 XEmacs/xemacs/src/doc.c
Index: doc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/doc.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- doc.c 2006/05/21 18:35:31 1.38
+++ doc.c 2006/08/06 16:37:33 1.39
＠＠ -742,6 +742,10 ＠＠ when doc strings are referred to in the
if (p != end)
{
end = qxestrchr (p, '\n');
+ /* If you trigger a failure with of this assertion, you probably
+ configured with --quick-build and need to to rebuild your DOC
+ file. */
+ assert((end - p - 2) > -1);
sym = oblookup (Vobarray, p + 2, end - p - 2);
if (SYMBOLP (sym))
{
- 1 participants
- 0 comments
CVS update by aidan packages/xemacs-packages/xemacs-devel ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/08/06 11:51:25
Modified: packages/xemacs-packages/xemacs-devel ChangeLog find-func.el
Log:
Handle DEFUN_NORETURN, etc in find-function-C-source.
Revision Changes Path
1.108 +7 -0 XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- ChangeLog 2006/07/11 04:45:42 1.107
+++ ChangeLog 2006/08/06 09:51:25 1.108
＠＠ -1,3 +1,10 ＠＠
+2006-08-06 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * find-func.el (find-function-C-source):
+ Change the regexp for a subr definition to also accept
+ DEFUN_NORETURN, DEFUN_MANY and the other alternatives available in
+ lisp.h.
+
2006-07-11 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.74 released.
1.11 +2 -1 XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el
Index: find-func.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- find-func.el 2006/07/10 21:00:17 1.10
+++ find-func.el 2006/08/06 09:51:25 1.11
＠＠ -199,7 +199,8 ＠＠ TYPE should be nil to find a function, o
(concat "DEFVAR[A-Z_]*[ \t\n]*([ \t\n]*\""
(regexp-quote (symbol-name fun-or-var))
"\"")
- (concat "DEFUN[ \t\n]*([ \t\n]*\""
+ (concat "DEFUN\\(_NORETURN\\|_MANY\\|_UNEVALLED"
+ "\\|_COMMAND_LOOP\\|\\)[ \t\n]*([ \t\n]*\""
(regexp-quote (subr-name fun-or-var))
"\""))
nil t)
- 1 participants
- 0 comments
CVS update by scop packages/unsupported/scop/vc ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: scop
Date: 06/08/05 11:16:34
Modified: packages/unsupported/scop/vc ChangeLog vc-git.el vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.67 +2 -2 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- STATUS 2006/07/06 19:07:36 1.66
+++ STATUS 2006/08/05 09:16:30 1.67
＠＠ -13,9 +13,9 ＠＠ ede: Emacs Development Environment, <htt
- Compiles, I have no idea whether it works or not.
generic-modes: generic.el and generic-x.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2006-06-28.
+- Up to date with GNU Emacs CVS HEAD as of 2006-08-05.
- Compiles, seems to work, auto-mode-alist and autoloads may need spanking.
vc: vc*.el and a few other related files from GNU Emacs, vc-git.el from git
-- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-07-06.
+- Up to date with GNU Emacs CVS HEAD, git upstream as of 2006-08-05.
- Approaching usable state.
1.59 +6 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ChangeLog 2006/07/06 19:07:40 1.58
+++ ChangeLog 2006/08/05 09:16:33 1.59
＠＠ -1,3 +1,9 ＠＠
+2006-08-05 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc.el: Sync with upstream.
+
+ * vc-git.el: Changes applied upstream.
+
2006-07-06 Ville Skyttä <scop(a)xemacs.org>
* vc.el: Sync with upstream.
1.2 +0 -2 XEmacs/packages/unsupported/scop/vc/vc-git.el
Index: vc-git.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-git.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vc-git.el 2006/07/04 21:52:23 1.1
+++ vc-git.el 2006/08/05 09:16:34 1.2
＠＠ -95,13 +95,11 ＠＠
"Register FILE into the git version-control system."
(vc-git--run-command file "update-index" "--add" "--"))
-;; XEmacs change: add optional BUFFER arg, use it
(defun vc-git-print-log (file &optional buffer)
(let ((name (file-relative-name file))
(coding-system-for-read git-commits-coding-system))
(vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--")))
-;; XEmacs change: add optional BUFFER arg, use it
(defun vc-git-diff (file &optional rev1 rev2 buffer)
(let ((name (file-relative-name file))
(buf (or buffer "*vc-diff*")))
1.34 +9 -8 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- vc.el 2006/07/06 19:07:41 1.33
+++ vc.el 2006/08/05 09:16:34 1.34
＠＠ -940,11 +940,12 ＠＠ Else, add CODE to the process' sentinel.
(let ((proc (get-buffer-process (current-buffer))))
(cond
;; If there's no background process, just execute the code.
- ((null proc) (eval code))
- ;; If the background process has exited, reap it and try again
- ((eq (process-status proc) 'exit)
- (delete-process proc)
- (vc-exec-after code))
+ ;; We used to explicitly call delete-process on exited processes,
+ ;; but this led to timing problems causing process output to be
+ ;; lost. Terminated processes get deleted automatically
+ ;; anyway. -- cyd
+ ((or (null proc) (eq (process-status proc) 'exit))
+ (eval code))
;; If a process is running, add CODE to the sentinel
((eq (process-status proc) 'run)
(let ((sentinel (process-sentinel proc)))
＠＠ -2465,10 +2466,10 ＠＠ If FOCUS-REV is non-nil, leave the point
(vc-call print-log file)
(set-buffer "*vc*"))))
(pop-to-buffer (current-buffer))
- ;; XEmacs: we don't have log-view-mode (yet?), so use ignore-errors here
- (ignore-errors (log-view-mode))
(vc-exec-after
`(let ((inhibit-read-only t))
+ ;; XEmacs: we don't have log-view-mode (yet?), so ignore-errors for now
+ (ignore-errors (log-view-mode))
(goto-char (point-max)) (forward-line -1)
(while (looking-at "=*\n")
(delete-char (- (match-end 0) (match-beginning 0)))
＠＠ -2476,7 +2477,7 ＠＠ If FOCUS-REV is non-nil, leave the point
(goto-char (point-min))
(if (looking-at "[\b\t\n\v\f\r ]+")
(delete-char (- (match-end 0) (match-beginning 0))))
- (shrink-window-if-larger-than-buffer)
+ ;; (shrink-window-if-larger-than-buffer)
;; move point to the log entry for the current version
(vc-call-backend ',(vc-backend file)
'show-log-entry
- 1 participants
- 0 comments
CVS update by scop packages ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: scop
Date: 06/08/05 11:08:53
Modified: packages ChangeLog MAINTAINERS
Log:
Jeff Miller takes care of the calendar package
Revision Changes Path
1.633 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -p -r1.632 -r1.633
--- ChangeLog 2006/07/27 14:14:40 1.632
+++ ChangeLog 2006/08/05 09:08:52 1.633
＠＠ -1,3 +1,7 ＠＠
+2006-08-03 Ville Skyttä <scop(a)xemacs.org>
+
+ * MAINTAINERS: Jeff Miller takes care of the calendar package.
+
2006-07-27 Norbert Koch <viteno(a)xemacs.org>
* Packages released: calendar edit-utils pcl-cvs.
1.22 +1 -1 XEmacs/packages/MAINTAINERS
Index: MAINTAINERS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/MAINTAINERS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- MAINTAINERS 2005/04/16 07:51:05 1.21
+++ MAINTAINERS 2006/08/05 09:08:52 1.22
＠＠ -7,7 +7,7 ＠＠ auctex Uwe Brauer <oub＠xe
bbdb Ronan Waide <waider(a)waider.ie>
build Adrian Aichner <adrian(a)xemacs.org>
calc XEmacs Development Team <xemacs-beta(a)xemacs.org>
-calendar XEmacs Development Team <xemacs-beta(a)xemacs.org>
+calendar Jeff Miller <jeff.miller(a)xemacs.org>
cc-mode Martin Stjernholm <bug-cc-mode(a)gnu.org>
clearcase Michael Diers <mdiers(a)elego.de>
cookie XEmacs Development Team <xemacs-beta(a)xemacs.org>
- 1 participants
- 0 comments
CVS update by aidan xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/08/05 10:30:40
Modified: xemacs/src ChangeLog syntax.c
Log:
Eliminate some Windows build errors that also happen with gcc -pedantic.
Revision Changes Path
1.994 +6 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -p -r1.993 -r1.994
--- ChangeLog 2006/08/04 22:55:12 1.993
+++ ChangeLog 2006/08/05 08:30:35 1.994
＠＠ -1,5 +1,11 ＠＠
2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+ * syntax.c (complex_vars_of_syntax):
+ String literals are char[], not unsigned char[]. Cast them when
+ passing to a function that takes UExtbyte *.
+
+2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
* lread.c (read_unicode_escape):
Refactor this code out from read_escape, since it's now called
from read_string as well.
1.30 +11 -9 XEmacs/xemacs/src/syntax.c
Index: syntax.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- syntax.c 2006/08/04 20:01:14 1.29
+++ syntax.c 2006/08/05 08:30:36 1.30
＠＠ -2490,18 +2490,20 ＠＠ complex_vars_of_syntax (void)
/* Control 0; treat as punctuation */
SET_RANGE_SYNTAX(0, 32, Spunct);
- /* The whitespace--overwriting some of the above changes. */
- define_standard_syntax(" \t\015\014", Swhitespace);
+ /* The whitespace--overwriting some of the above changes.
+ String literals are const char *s, not const unsigned char *s. */
+ define_standard_syntax((const UExtbyte *)" \t\015\014", Swhitespace);
+
/* DEL plus Control 1 */
SET_RANGE_SYNTAX(127, 159, Spunct);
- define_standard_syntax ("\"", Sstring);
- define_standard_syntax ("\\", Sescape);
- define_standard_syntax ("_-+*/&|<>=", Ssymbol);
- define_standard_syntax (".,;:?!#＠~^'`", Spunct);
+ define_standard_syntax ((const UExtbyte *)"\"", Sstring);
+ define_standard_syntax ((const UExtbyte *)"\\", Sescape);
+ define_standard_syntax ((const UExtbyte *)"_-+*/&|<>=", Ssymbol);
+ define_standard_syntax ((const UExtbyte *)".,;:?!#＠~^'`", Spunct);
- for (p = "()[]{}"; *p; p+=2)
+ for (p = (const UExtbyte *)"()[]{}"; *p; p+=2)
{
Fput_char_table (make_char (p[0]),
Fcons (make_int (Sopen), make_char (p[1])),
＠＠ -2517,11 +2519,11 ＠＠ complex_vars_of_syntax (void)
/* The guillemets. These are not parentheses, in contrast to what the old
code did. */
- define_standard_syntax("\253\273", Sstring);
+ define_standard_syntax((const UExtbyte *)"\253\273", Sstring);
/* The inverted exclamation mark, and the multiplication and division
signs. */
- define_standard_syntax("\241\327\367", Spunct);
+ define_standard_syntax((const UExtbyte *)"\241\327\367", Spunct);
#undef SET_RANGE_SYNTAX
}
- 1 participants
- 0 comments
CVS update by matsl packages/xemacs-packages/hyperbole ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: matsl
Date: 06/08/05 01:55:51
Modified: packages/xemacs-packages/hyperbole ChangeLog Makefile
Log:
Revert add ibuffer.
Revision Changes Path
1.17 +4 -0 XEmacs/packages/xemacs-packages/hyperbole/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/hyperbole/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ChangeLog 2006/08/01 22:42:14 1.16
+++ ChangeLog 2006/08/04 23:55:51 1.17
＠＠ -1,3 +1,7 ＠＠
+2006-08-05 Mats Lidell <matsl(a)contactor.se>
+
+ * Makefile (REQUIRES): Revert add ibuffer.
+
2006-08-02 Mats Lidell <matsl(a)xemacs.org>
* Makefile (REQUIRES): Add ibuffer.
1.11 +1 -1 XEmacs/packages/xemacs-packages/hyperbole/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/hyperbole/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- Makefile 2006/08/01 22:42:14 1.10
+++ Makefile 2006/08/04 23:55:51 1.11
＠＠ -25,7 +25,7 ＠＠ MAINTAINER = Mats Lidell <matsl(a)xemacs.o
PACKAGE = hyperbole
PKG_TYPE = regular
REQUIRES = xemacs-base mail-lib calendar vm text-modes gnus mh-e rmail apel tm \
- sh-script net-utils ecrypto ibuffer
+ sh-script net-utils ecrypto
CATEGORY = standard
EXTRA_SOURCES = hsite.el hui-em19-b.el hui-ep-but.el hui-epV4-b.el \
- 1 participants
- 0 comments
CVS update by aidan xemacs/tests/automated lisp-reader-tests.el
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/08/05 00:55:19
Added: xemacs/tests/automated lisp-reader-tests.el
Log:
Raw strings, from Python via SXEmacs
Revision Changes Path
1.756 +6 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -p -r1.755 -r1.756
--- ChangeLog 2006/08/04 20:01:05 1.755
+++ ChangeLog 2006/08/04 22:55:04 1.756
＠＠ -1,3 +1,9 ＠＠
+2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * lisp.el (forward-sexp):
+ Handle raw strings specially just as we do structures. Fixes
+ problems evaluating them in *scratch*.
+
2006-08-04 Aidan Kehoe <kehoea(a)parhasard.net>
* iso8859-1.el:
1.6 +13 -12 XEmacs/xemacs/lisp/lisp.el
Index: lisp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/lisp.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lisp.el 2001/04/12 18:21:29 1.5
+++ lisp.el 2006/08/04 22:55:05 1.6
＠＠ -60,19 +60,20 ＠＠ move backward across N balanced expressi
(interactive "_p")
(or arg (setq arg 1))
;; XEmacs: evil hack! The other half of the evil hack below.
- (if (and (> arg 0) (looking-at "#s("))
- (goto-char (+ (point) 2)))
+ (if (and (> arg 0) (looking-at "#s(\\|#r[uU]\\{0,1\\}\""))
+ (goto-char (1+ (- (point) (- (match-end 0) (match-beginning 0))))))
(goto-char (or (scan-sexps (point) arg) (buffer-end arg)))
- (if (< arg 0) (backward-prefix-chars))
- ;; XEmacs: evil hack! Skip back over #s so that structures are read
- ;; properly. the current cheesified syntax tables just aren't up to
- ;; this.
- (if (and (< arg 0)
- (eq (char-after (point)) ?\()
- (>= (- (point) (point-min)) 2)
- (eq (char-after (- (point) 1)) ?s)
- (eq (char-after (- (point) 2)) ?#))
- (goto-char (- (point) 2))))
+ (when (< arg 0)
+ (backward-prefix-chars)
+ ;; XEmacs: evil hack! Skip back over #[sr] so that structures and raw
+ ;; strings are read properly. the current cheesified syntax tables just
+ ;; aren't up to this.
+ (let* ((diff (- (point) (point-min)))
+ (subject (buffer-substring (- (point) (min diff 3))
+ (1+ (point))))
+ (matched (string-match "#s(\\|#r[uU]\\{0,1\\}\"" subject)))
+ (if matched
+ (goto-char (1+ (- (point) (- (length subject) matched))))))))
(defun backward-sexp (&optional arg)
"Move backward across one balanced expression (sexp).
1.347 +6 -0 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- ChangeLog 2006/07/19 15:04:46 1.346
+++ ChangeLog 2006/08/04 22:55:09 1.347
＠＠ -1,3 +1,9 ＠＠
+2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * lispref/objects.texi (String Type):
+ Give details of the raw string syntax, taken from SXEmacs and
+ Python.
+
2006-07-19 Stephen J. Turnbull <stephen(a)xemacs.org>
* new-users-guide/edit.texi (Insert): Document bogosity in
1.9 +10 -0 XEmacs/xemacs/man/lispref/objects.texi
Index: objects.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/objects.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- objects.texi 2006/04/29 14:36:54 1.8
+++ objects.texi 2006/08/04 22:55:10 1.9
＠＠ -1079,6 +1079,16 ＠＠ characters it contains, and another doub
escape any backslash or double-quote characters in the string with a
backslash, like this: ＠code{"this \" is an embedded quote"}.
+ An alternative syntax allows insertion of raw backslashes into a
+string, like this: ＠code{#r"this \ is an embedded backslash"}. In such
+a string, each character following a backslash is included literally in
+the string, and all backslashes are left in the string. This means that
+＠code{#r"\""} is a valid string literal with two characters, a backslash and a
+double-quote. It also means that a string with this syntax ＠emph{cannot end
+in a single backslash}. As with Python, from where this syntax was
+taken, you can specify ＠code{u} or ＠code{U} after the ＠code{#r} to
+specify that interpretation of Unicode escapes should be done.
+
The newline character is not special in the read syntax for strings;
if you write a new line between the double-quotes, it becomes a
character in the string. But an escaped newline---one that is preceded
1.993 +15 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -p -r1.992 -r1.993
--- ChangeLog 2006/08/04 20:55:02 1.992
+++ ChangeLog 2006/08/04 22:55:12 1.993
＠＠ -1,3 +1,18 ＠＠
+2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * lread.c (read_unicode_escape):
+ Refactor this code out from read_escape, since it's now called
+ from read_string as well.
+ * lread.c (read_escape):
+ Call read_unicode_escape instead of using inline code,
+ * lread.c (read_string):
+ Refactor out from read1, provide raw and honor_unicode options.
+ * lread.c (read_raw_string):
+ Added, a function that calls read_string with the correct
+ arguments for a raw string.
+ * lread.c (read1):
+ Pass raw strings to read_raw_string; pass strings to read_string.
+
2006-08-04 Aidan Kehoe <kehoea(a)parhasard.net>
* event-tty.c (emacs_tty_next_event):
1.79 +158 -87 XEmacs/xemacs/src/lread.c
Index: lread.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- lread.c 2006/06/03 17:50:54 1.78
+++ lread.c 2006/08/04 22:55:13 1.79
＠＠ -1670,15 +1670,56 ＠＠ read0 (Lisp_Object readcharfun)
return val;
}
+
+/* A Unicode escape, as in C# (though we only permit them in strings
+ and characters, not arbitrarily in the source code.) */
+static Ichar
+read_unicode_escape (Lisp_Object readcharfun, int unicode_hex_count)
+{
+ REGISTER Ichar i = 0, c;
+ REGISTER int count = 0;
+ Lisp_Object lisp_char;
+ while (++count <= unicode_hex_count)
+ {
+ c = readchar (readcharfun);
+ /* Remember, can't use isdigit(), isalpha() etc. on Ichars */
+ if (c >= '0' && c <= '9') i = (i << 4) + (c - '0');
+ else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10;
+ else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10;
+ else
+ {
+ syntax_error ("Non-hex digit used for Unicode escape",
+ make_char (c));
+ break;
+ }
+ }
+
+ lisp_char = Funicode_to_char(make_int(i), Qnil);
+
+ if (EQ(Qnil, lisp_char))
+ {
+ /* This is ugly and horrible and trashes the user's data, but
+ it's what unicode.c does. In the future, unicode-to-char
+ should not return nil. */
+#ifdef MULE
+ i = make_ichar (Vcharset_japanese_jisx0208, 34 + 128, 46 + 128);
+#else
+ i = '~';
+#endif
+ return i;
+ }
+ else
+ {
+ return XCHAR(lisp_char);
+ }
+}
+
static Ichar
read_escape (Lisp_Object readcharfun)
{
/* This function can GC */
Ichar c = readchar (readcharfun);
- /* \u allows up to four hex digits, \U up to eight. Default to the
- behaviour for \u, and change this value in the case that \U is seen. */
- int unicode_hex_count = 4;
if (c < 0)
signal_error (Qend_of_file, 0, READCHARFUN_MAYBE (readcharfun));
＠＠ -1797,50 +1838,11 ＠＠ read_escape (Lisp_Object readcharfun)
}
case 'U':
/* Post-Unicode-2.0: Up to eight hex chars */
- unicode_hex_count = 8;
+ return read_unicode_escape(readcharfun, 8);
case 'u':
+ /* Unicode-2.0 and before; four hex chars. */
+ return read_unicode_escape(readcharfun, 4);
- /* A Unicode escape, as in C# (though we only permit them in strings
- and characters, not arbitrarily in the source code.) */
- {
- REGISTER Ichar i = 0;
- REGISTER int count = 0;
- Lisp_Object lisp_char;
- while (++count <= unicode_hex_count)
- {
- c = readchar (readcharfun);
- /* Remember, can't use isdigit(), isalpha() etc. on Ichars */
- if (c >= '0' && c <= '9') i = (i << 4) + (c - '0');
- else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10;
- else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10;
- else
- {
- syntax_error ("Non-hex digit used for Unicode escape",
- make_char (c));
- break;
- }
- }
-
- lisp_char = Funicode_to_char(make_int(i), Qnil);
-
- if (EQ(Qnil, lisp_char))
- {
- /* This is ugly and horrible and trashes the user's data, but
- it's what unicode.c does. In the future, unicode-to-char
- should not return nil. */
-#ifdef MULE
- i = make_ichar (Vcharset_japanese_jisx0208, 34 + 128, 46 + 128);
-#else
- i = '~';
-#endif
- return i;
- }
- else
- {
- return XCHAR(lisp_char);
- }
- }
-
default:
return c;
}
＠＠ -2270,6 +2272,113 ＠＠ list2_pure (int pure, Lisp_Object a, Lis
}
#endif
+static Lisp_Object
+read_string (Lisp_Object readcharfun, Ichar delim, int raw,
+ int honor_unicode)
+{
+#ifdef I18N3
+ /* #### If the input stream is translating, then the string
+ should be marked as translatable by setting its
+ `string-translatable' property to t. .el and .elc files
+ normally are translating input streams. See Fgettext()
+ and print_internal(). */
+#endif
+ Ichar c;
+ int cancel = 0;
+
+ Lstream_rewind(XLSTREAM(Vread_buffer_stream));
+ while ((c = readchar(readcharfun)) >= 0 && c != delim)
+ {
+ if (c == '\\')
+ {
+ if (raw)
+ {
+ c = readchar(readcharfun);
+ if (honor_unicode && ('u' == c || 'U' == c))
+ {
+ c = read_unicode_escape(readcharfun,
+ 'U' == c ? 8 : 4);
+ }
+ else
+ {
+ /* For raw strings, insert the
+ backslash and the next char, */
+ Lstream_put_ichar(XLSTREAM
+ (Vread_buffer_stream),
+ '\\');
+ }
+ }
+ else
+ /* otherwise, backslash escapes the next char. */
+ c = read_escape(readcharfun);
+ }
+ /* c is -1 if \ newline has just been seen */
+ if (c == -1)
+ {
+ if (Lstream_byte_count
+ (XLSTREAM(Vread_buffer_stream)) ==
+ 0)
+ cancel = 1;
+ }
+ else
+ Lstream_put_ichar(XLSTREAM
+ (Vread_buffer_stream),
+ c);
+ QUIT;
+ }
+ if (c < 0)
+ return Fsignal(Qend_of_file,
+ list1(READCHARFUN_MAYBE(readcharfun)));
+
+ /* If purifying, and string starts with \ newline,
+ return zero instead. This is for doc strings
+ that we are really going to find in lib-src/DOC.nn.nn */
+ if (purify_flag && NILP(Vinternal_doc_file_name)
+ && cancel)
+ return Qzero;
+
+ Lstream_flush(XLSTREAM(Vread_buffer_stream));
+ return make_string(resizing_buffer_stream_ptr
+ (XLSTREAM(Vread_buffer_stream)),
+ Lstream_byte_count(XLSTREAM(Vread_buffer_stream)));
+}
+
+static Lisp_Object
+read_raw_string (Lisp_Object readcharfun)
+{
+ Ichar c;
+ Ichar permit_unicode = 0;
+
+ do {
+ c = reader_nextchar(readcharfun);
+ switch (c) {
+ /* #r:engine"my sexy raw string" -- raw string w/ flags*/
+ /* case ':': */
+ /* #ru"Hi there\u20AC \U000020AC" -- raw string, honouring Unicode. */
+ case 'u':
+ case 'U':
+ permit_unicode = c;
+ continue;
+
+ /* #r"my raw string" -- raw string */
+ case '\"':
+ return read_string(readcharfun, '\"', 1, permit_unicode);
+ /* invalid syntax */
+ default:
+ {
+ if (permit_unicode)
+ {
+ unreadchar(readcharfun, permit_unicode);
+ }
+ unreadchar(readcharfun, c);
+ return Fsignal(Qinvalid_read_syntax,
+ list1(build_string
+ ("unrecognized raw string syntax")));
+ }
+ }
+ } while (1);
+}
+
/* Read the next Lisp object from the stream READCHARFUN and return it.
If the return value is a cons whose car is Qunbound, then read1()
encountered a misplaced token (e.g. a right bracket, right paren,
＠＠ -2509,6 +2618,8 ＠＠ retry:
case 'x': return read_integer (readcharfun, 16);
/* #b010 => 2 -- binary constant syntax */
case 'b': return read_integer (readcharfun, 2);
+ /* #r"raw\stringt" -- raw string syntax */
+ case 'r': return read_raw_string(readcharfun);
/* #s(foobar key1 val1 key2 val2) -- structure syntax */
case 's': return read_structure (readcharfun);
case '<':
＠＠ -2654,48 +2765,8 ＠＠ retry:
}
case '\"':
- {
- /* String */
-#ifdef I18N3
- /* #### If the input stream is translating, then the string
- should be marked as translatable by setting its
- `string-translatable' property to t. .el and .elc files
- normally are translating input streams. See Fgettext()
- and print_internal(). */
-#endif
- int cancel = 0;
-
- Lstream_rewind (XLSTREAM (Vread_buffer_stream));
- while ((c = readchar (readcharfun)) >= 0
- && c != '\"')
- {
- if (c == '\\')
- c = read_escape (readcharfun);
- /* c is -1 if \ newline has just been seen */
- if (c == -1)
- {
- if (Lstream_byte_count (XLSTREAM (Vread_buffer_stream)) == 0)
- cancel = 1;
- }
- else
- Lstream_put_ichar (XLSTREAM (Vread_buffer_stream), c);
- QUIT;
- }
- if (c < 0)
- return Fsignal (Qend_of_file, list1 (READCHARFUN_MAYBE (readcharfun)));
-
- /* If purifying, and string starts with \ newline,
- return zero instead. This is for doc strings
- that we are really going to find in lib-src/DOC.nn.nn */
- if (purify_flag && NILP (Vinternal_doc_file_name) && cancel)
- return Qzero;
-
- Lstream_flush (XLSTREAM (Vread_buffer_stream));
- return
- make_string
- (resizing_buffer_stream_ptr (XLSTREAM (Vread_buffer_stream)),
- Lstream_byte_count (XLSTREAM (Vread_buffer_stream)));
- }
+ /* String */
+ return read_string(readcharfun, '\"', 0, 1);
default:
{
1.83 +7 -0 XEmacs/xemacs/tests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- ChangeLog 2006/06/24 14:30:36 1.82
+++ ChangeLog 2006/08/04 22:55:18 1.83
＠＠ -1,3 +1,10 ＠＠
+2006-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-reader-tests.el:
+ New file, imported from Martin Kuehl's SXEmacs commit; test the
+ new raw string syntax, including the Unicode escapes, which
+ SXEmacs doesn't have.
+
2006-06-24 Stephen J. Turnbull <stephen(a)xemacs.org>
* automated/test-harness.el (Silence-Message): New macro.
1.1 XEmacs/xemacs/tests/automated/lisp-reader-tests.el
Index: lisp-reader-tests.el
===================================================================
;; Copyright (C) 2005 Martin Kuehl.
;; Author: Martin Kuehl <martin.kuehl(a)gmail.com>
;; Maintainer: Martin Kuehl <martin.kuehl(a)gmail.com>
;; Created: 2005
;; Keywords: tests
;; This file is NOT part of SXEmacs.
;; SXEmacs 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 2, or (at your option)
;; any later version.
;; SXEmacs 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 SXEmacs; see the file COPYING. If not, write to the Free
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.
;;; Synched up with: Not in FSF.
;;; Commentary:
;; Test the lisp reader.
;; See test-harness.el for instructions on how to run these tests.
;;; Raw Strings
;;; ===========
;; Equality to "traditional" strings
;; ---------------------------------
(dolist (strings '((#r"xyz" "xyz") ; no backslashes
(#r"\xyz" "\\xyz") ; backslash at start
(#r"\\xyz" "\\\\xyz") ; backslashes at start
(#r"\nxyz" "\\nxyz") ; escape seq. at start
(#r"\"xyz" "\\\"xyz") ; quote at start
(#r"xy\z" "xy\\z") ; backslash in middle
(#r"xy\\z" "xy\\\\z") ; backslashes in middle
(#r"xy\nz" "xy\\nz") ; escape seq. in middle
(#r"xy\"z" "xy\\\"z") ; quote in middle
;;(#r"xyz\" "xyz\\") ; backslash at end: error
(#r"xyz\\" "xyz\\\\") ; backslashes at end
(#r"xyz\n" "xyz\\n") ; escape seq. at end
(#r"xyz\"" "xyz\\\"") ; quote at end
(#ru"\u00ABxyz" "\u00ABxyz") ; one Unicode escape
(#rU"\U000000ABxyz" "\U000000ABxyz") ; another Unicode escape
(#rU"xyz\u00AB" "xyz\u00AB") ; one Unicode escape
))
(Assert (apply #'string= strings)))
;; Odd number of backslashes at the end
;; ------------------------------------
(dolist (string '("#r\"xyz\\\"" ; `#r"abc\"': escaped delimiter
"#r\"xyz\\\\\\\"" ; `#r"abc\\\"': escaped delimiter
))
(with-temp-buffer
(insert string)
(Check-Error end-of-file (eval-buffer))))
;; Alternate string/regex delimiters
;; ---------------------------------
(dolist (string '("#r/xyz/" ; Perl syntax
"#r:ix/xyz/" ; Extended Perl syntax
"#r|xyz|" ; TeX syntax
"#r[xyz]" ; (uncommon) Perl syntax
"#r<xyz>" ; Perl6 syntax?
"#r(xyz)" ; arbitrary santax
"#r{xyz}" ; arbitrary santax
"#r,xyz," ; arbitrary santax
"#r!xyz!" ; arbitrary santax
))
(with-temp-buffer
(insert string)
(Check-Error-Message invalid-read-syntax "unrecognized raw string"
(eval-buffer))))
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: viteno
Date: 06/08/04 23:50:47
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1613 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1612
retrieving revision 1.1613
diff -u -p -r1.1612 -r1.1613
--- version.sh 2006/08/03 21:51:11 1.1612
+++ version.sh 2006/08/04 21:50:46 1.1613
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20060803)"
+xemacs_extra_name="(+CVS-20060804)"
xemacs_release_date="2006-05-16"
- 1 participants
- 0 comments
CVS update by aidan xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: aidan
Date: 06/08/04 22:55:06
Modified: xemacs/src ChangeLog event-tty.c
Log:
Stop TTYs dropping chars when no X11 support built-in.
Revision Changes Path
1.992 +7 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -p -r1.991 -r1.992
--- ChangeLog 2006/08/04 20:01:12 1.991
+++ ChangeLog 2006/08/04 20:55:02 1.992
＠＠ -1,5 +1,12 ＠＠
2006-08-04 Aidan Kehoe <kehoea(a)parhasard.net>
+ * event-tty.c (emacs_tty_next_event):
+ Check dispatch_event_queue for pending events, since we add to
+ that in drain_tty_devices(). Fixes dropped key sequences on TTY
+ builds.
+
+2006-08-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
* syntax.c (Fsyntax_table_p):
Make the docstring better reflect the code.
* syntax.c (define_standard_syntax):
1.17 +10 -0 XEmacs/xemacs/src/event-tty.c
Index: event-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-tty.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- event-tty.c 2004/11/04 23:06:27 1.16
+++ event-tty.c 2006/08/04 20:55:04 1.17
＠＠ -113,6 +113,16 ＠＠ emacs_tty_next_event (Lisp_Event *emacs_
EMACS_TIME time_to_block;
EMACS_SELECT_TIME select_time_to_block, *pointer_to_this;
+ if (!NILP (dispatch_event_queue))
+ {
+ Lisp_Object event, event2;
+ event2 = wrap_event (emacs_event);
+ event = dequeue_dispatch_event ();
+ Fcopy_event (event, event2);
+ Fdeallocate_event (event);
+ return;
+ }
+
if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block))
/* no timer events; block indefinitely */
pointer_to_this = 0;
- 1 participants
- 0 comments
CVS update by jmiller packages/xemacs-packages/calendar, cal-hebrew.el, diary-lib.el ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: jmiller
Date: 06/08/04 22:23:52
Modified: packages/xemacs-packages/calendar ChangeLog appt.el
cal-hebrew.el cal-tex.el cal-xemacs.el calendar.el
diary-lib.el solar.el
Log:
committing Emacs CVS syncs to 2002-04-04
Revision Changes Path
1.35 +78 -0 XEmacs/packages/xemacs-packages/calendar/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ChangeLog 2006/08/02 23:45:54 1.34
+++ ChangeLog 2006/08/04 20:23:50 1.35
＠＠ -1,5 +1,83 ＠＠
2006-08-02 Jeff Miller <jeff.miller(a)xemacs.org>
+ Synching with Emacs CVS
+
+ 2002-04-04 Richard M. Stallman <rms(a)gnu.org>
+
+ * calendar/solar.el (solar-northern-spring-or-summer-season): Doc fix.
+
+ 2002-04-03 Edward M. Reingold <reingold(a)emr.cs.iit.edu>
+
+ * solar.el (solar-spring-or-summer-season): Delete.
+ (solar-northern-spring-or-summer-season): New variable.
+ (solar-sunrise-and-sunset, solar-moment, solar-sunrise-sunset):
+ Rewrite.
+
+ * solar.el (diary-sabbath-candles-minutes): New variable.
+ (diary-sabbath-candles): Use it instead of fixed 18 minutes.
+
+ * calendar.el (update-calendar-mode-line): Force mode-line update.
+ Make date under the cursor available as `date' in
+ calendar-mode-line-format.
+ Eval items in calendar-mode-line-format list.
+ * cal-tex.el (cal-tex-hook, cal-tex-year-hook, cal-tex-month-hook)
+ (cal-tex-week-hook, cal-tex-daily-hook): Add doc strings.
+
+ * cal-tex.el (cal-tex-latexify-list): Fix doc string.
+
+ * cal-tex.el (cal-tex-insert-day-names): LaTeXify day names.
+ (cal-tex-cursor-week-iso, cal-tex-week-hours, cal-tex-weekly4-box)
+ (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
+ (cal-tex-daily-page, cal-tex-mini-calendar): LaTeXify day names.
+
+ * cal-tex.el: Change all instances (interactive "P") to
+ (interactive "p").
+ (cal-tex-cursor-month): Add hfill and newline at end of month that
+ ended on Saturday.
+ (cal-tex-preamble): Change to LaTeX2e.
+ (cal-tex-cursor-filofax-year): Don't use default month names in
+ LaTeX macros in case user changes them.
+ (cal-tex-month-name): New function. Used throughout in case user
+ has done something funny with month names.
+
+ * cal-hebrew.el (holiday-rosh-hashanah-etc): Spelling correction.
+ (diary-rosh-hodesh): Spelling correction.
+
+ 2002-03-03 Thien-Thi Nguyen <ttn(a)gnu.org>
+
+ * calendar/diary-lib.el (list-diary-entries): Use `buffer-substring'
+ instead of `buffer-substring-no-properties' to support enriched mode.
+
+ 2002-02-08 Eli Zaretskii <eliz(a)is.elta.co.il>
+
+ * calendar/cal-menu.el (calendar-mode-map): Change the menu item's
+ name to "Insert Diary Entry".
+
+ * updated "Diary" menu entries to match Emacs
+
+ 2002-01-28 Eli Zaretskii <eliz(a)is.elta.co.il>
+
+ * calendar/calendar.el (generate-calendar-month): Doc fix.
+
+ 2002-01-24 Richard M. Stallman <rms(a)gnu.org>
+
+ * calendar/calendar.el (generate-calendar-month): Doc fix.
+
+ 2002-01-03 Richard M. Stallman <rms(a)gnu.org>
+
+ * calendar/diary-lib.el (diary-block): Doc fix.
+
+ 2001-11-26 Pavel Jan,Am(Bk <Pavel(a)Janik.cz>
+
+ * calendar/appt.el (appt-disp-window): Use insert instead of
+ insert-string.
+
+ * calendar/diary-lib.el (list-diary-entries): Likewise.
+
+
+
+2006-08-02 Jeff Miller <jeff.miller(a)xemacs.org>
+
* cal-xemacs.el (calendar-mouse-print-dates): Add menu entry for
Fixed (RD) date.
1.11 +1 -1 XEmacs/packages/xemacs-packages/calendar/appt.el
Index: appt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/appt.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- appt.el 2006/07/31 02:15:22 1.10
+++ appt.el 2006/08/04 20:23:50 1.11
＠＠ -683,7 +683,7 ＠＠ The following variables control appointm
(concat "-------------------- Appointment in "
min-to-app " minutes. " new-time " %-"))
(erase-buffer)
- (insert-string appt-msg)
+ (insert appt-msg)
(shrink-window-if-larger-than-buffer (get-buffer-window appt-disp-buf t))
(set-buffer-modified-p nil)
(raise-frame (selected-frame))
1.5 +4 -4 XEmacs/packages/xemacs-packages/calendar/cal-hebrew.el
Index: cal-hebrew.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-hebrew.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cal-hebrew.el 2006/07/31 02:15:22 1.4
+++ cal-hebrew.el 2006/08/04 20:23:50 1.5
＠＠ -347,7 +347,7 ＠＠ nil if it is not visible in the current
(list (calendar-gregorian-from-absolute (+ abs-r-h 19))
"Hol Hamoed Sukkot (fourth day)")
(list (calendar-gregorian-from-absolute (+ abs-r-h 20))
- "Hoshannah Rabbah")))
+ "Hoshanah Rabbah")))
(output-list
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
＠＠ -979,9 +979,9 ＠＠ Entry applies if date is Rosh Hodesh, th
(if (= h-yesterday 30)
(format "%s (second day)" this-month)
this-month)))
- (if (= (% d 7) 6);; Saturday--check for Shabbat Mevarhim
+ (if (= (% d 7) 6);; Saturday--check for Shabbat Mevarchim
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
- (format "Mevarhim Rosh Hodesh %s (%s)"
+ (format "Mevarchim Rosh Hodesh %s (%s)"
(aref h-month-names
(if (= h-month
(hebrew-calendar-last-month-of-year
＠＠ -989,7 +989,7 ＠＠ Entry applies if date is Rosh Hodesh, th
0 h-month))
(aref calendar-day-name-array (- 29 h-day))))
((and (< h-day 30) (> h-day 22) (= 30 last-day))
- (format "Mevarhim Rosh Hodesh %s (%s-%s)"
+ (format "Mevarchim Rosh Hodesh %s (%s-%s)"
(aref h-month-names h-month)
(if (= h-day 29)
"tomorrow"
1.5 +103 -54 XEmacs/packages/xemacs-packages/calendar/cal-tex.el
Index: cal-tex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-tex.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cal-tex.el 2006/07/31 02:15:23 1.4
+++ cal-tex.el 2006/08/04 20:23:50 1.5
＠＠ -121,6 +121,35 ＠＠ will put the Hebrew date at the bottom o
:type 'integer
:group 'calendar-tex)
+(defcustom cal-tex-hook nil
+ "*List of functions called after any LaTeX calendar buffer is generated.
+You can use this to do postprocessing on the buffer. For example, to change
+characters with diacritical marks to their LaTeX equivalents, use
+ (add-hook 'cal-tex-hook
+ '(lambda () (iso-iso2tex (point-min) (point-max))))"
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-year-hook nil
+ "*List of functions called after a LaTeX year calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-month-hook nil
+ "*List of functions called after a LaTeX month calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-week-hook nil
+ "*List of functions called after a LaTeX week calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-daily-hook nil
+ "*List of functions called after a LaTeX daily calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
;;;
;;; Definitions for LaTeX code
;;;
＠＠ -221,7 +250,7 ＠＠ Preamble Includes initial definitions fo
Optional ARGS are included."
(set-buffer (get-buffer-create cal-tex-buffer))
(erase-buffer)
- (insert "\\documentstyle")
+ (insert "\\documentclass")
(if args
(insert "[" args "]"))
(insert "{article}\n"
＠＠ -255,14 +284,14 ＠＠ Optional ARGS are included."
(defun cal-tex-cursor-year (&optional arg)
"Make a buffer with LaTeX commands for the year cursor is on.
Optional prefix argument specifies number of years."
- (interactive "P")
+ (interactive "p")
(cal-tex-year (extract-calendar-year (calendar-cursor-to-date t))
(if arg arg 1)))
(defun cal-tex-cursor-year-landscape (&optional arg)
"Make a buffer with LaTeX commands for the year cursor is on.
Optional prefix argument specifies number of years."
- (interactive "P")
+ (interactive "p")
(cal-tex-year (extract-calendar-year (calendar-cursor-to-date t))
(if arg arg 1)
t))
＠＠ -306,7 +335,7 ＠＠ four months each."
(defun cal-tex-cursor-filofax-year (&optional arg)
"Make a Filofax one page yearly calendar of year indicated by cursor.
Optional parameter specifies number of years."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(year (extract-calendar-year (calendar-cursor-to-date t))))
(cal-tex-preamble "twoside")
＠＠ -327,10 +356,13 ＠＠ Optional parameter specifies number of y
(insert "\n")
(cal-tex-noindent)
(cal-tex-nl)
+ (let ((month-names; don't use default in case user changed it
+ ["January" "February" "March" "April" "May" "June"
+ "July" "August" "September" "October" "November" "December"]))
(calendar-for-loop i from 1 to 12 do
(insert (cal-tex-mini-calendar i year
- (calendar-month-name i)
- "1in" ".9in" "tiny" "0.6mm")))
+ (aref month-names (1- i))
+ "1in" ".9in" "tiny" "0.6mm"))))
(insert
"\\noindent\\fbox{\\January}\\fbox{\\February}\\fbox{\\March}\\\\
\\noindent\\fbox{\\April}\\fbox{\\May}\\fbox{\\June}\\\\
＠＠ -355,7 +387,7 ＠＠ Optional parameter specifies number of y
"Make a buffer with LaTeX commands for the month cursor is on.
Optional prefix argument specifies number of months to be produced.
The output is in landscape format, one month to a page."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-cursor-to-date t))
(month (extract-calendar-month date))
＠＠ -416,7 +448,8 ＠＠ The output is in landscape format, one m
year)))
7)))
(insert "\\vspace*{-\\cellwidth}\\hspace*{-2\\cellwidth}"
- "\\lastmonth\\nextmonth"))
+ "\\lastmonth\\nextmonth%
+ "))
(if (/= i n)
(progn
(run-hooks 'cal-tex-month-hook)
＠＠ -432,7 +465,7 ＠＠ The output is in landscape format, one m
"Make a buffer with LaTeX commands for the month cursor is on.
Optional prefix argument specifies number of months to be produced.
Calendar is condensed onto one page."
- (interactive "P")
+ (interactive "p")
(let* ((date (calendar-cursor-to-date t))
(month (extract-calendar-month date))
(year (extract-calendar-year date))
＠＠ -472,6 +505,15 ＠＠ Calendar is condensed onto one page."
(setq other-year year)
(cal-tex-insert-days month year diary-list holidays
cal-tex-day-prefix)
+ (if (= (mod (calendar-absolute-from-gregorian
+ (list month
+ (calendar-last-day-of-month month year)
+ year))
+ 7)
+ 6); last day of month was Saturday
+ (progn
+ (cal-tex-hfill)
+ (cal-tex-nl)))
(increment-calendar-month month year 1))
(cal-tex-insert-blank-days-at-end end-month end-year cal-tex-day-prefix)
(cal-tex-end-document)))
＠＠ -493,7 +535,7 ＠＠ Each day is formatted using format DAY-F
(setq date (list month i year))
(if (memq (calendar-day-of-week date) cal-tex-which-days)
(progn
- (insert (format day-format (calendar-month-name month) i))
+ (insert (format day-format (cal-tex-month-name month) i))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
(cal-tex-arg (eval cal-tex-daily-string))
＠＠ -510,16 +552,17 ＠＠ Each day is formatted using format DAY-F
(calendar-for-loop i from 0 to 6 do
(if (memq i cal-tex-which-days)
(insert (format cal-tex-day-name-format
+ (cal-tex-LaTeXify-string
(aref calendar-day-name-array
- (mod (+ calendar-week-start-day i) 7)))))
+ (mod (+ calendar-week-start-day i) 7))))))
(cal-tex-comment)))
(defun cal-tex-insert-month-header (n month year end-month end-year)
"Create a title for a calendar.
A title is inserted for a calendar with N months starting with
MONTH YEAR and ending with END-MONTH END-YEAR."
- (let ((month-name (calendar-month-name month))
- (end-month-name (calendar-month-name end-month)))
+ (let ((month-name (cal-tex-month-name month))
+ (end-month-name (cal-tex-month-name end-month)))
(if (= 1 n)
(insert (format "\\calmonth{%s}{%s}\n\\vspace*{-0.5cm}"
month-name year) )
＠＠ -613,7 +656,7 ＠＠ this is only an upper bound."
It applies to the week that point is in.
Optional prefix argument specifies number of weeks.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -639,7 +682,7 ＠＠ Holidays are included if `cal-tex-holida
(cal-tex-vspace "-1.5in")
(cal-tex-b-center)
(cal-tex-Huge-bf (format "\\uppercase{%s}"
- (calendar-month-name month)))
+ (cal-tex-month-name month)))
(cal-tex-hspace "2em")
(cal-tex-Huge-bf (number-to-string year))
(cal-tex-nl ".5cm")
＠＠ -664,7 +707,7 ＠＠ Holidays are included if `cal-tex-holida
It applies to the week that point is in.
Optional prefix argument specifies number of weeks.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -691,7 +734,7 ＠＠ Holidays are included if `cal-tex-holida
(cal-tex-vspace "-1.5in")
(cal-tex-b-center)
(cal-tex-Huge-bf (format "\\uppercase{%s}"
- (calendar-month-name month)))
+ (cal-tex-month-name month)))
(cal-tex-hspace "2em")
(cal-tex-Huge-bf (number-to-string year))
(cal-tex-nl ".5cm")
＠＠ -744,7 +787,7 ＠＠ Holidays are included if `cal-tex-holida
Optional prefix argument specifies number of weeks.
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -790,9 +833,9 ＠＠ Holidays are included if `cal-tex-holida
(cal-tex-rule "0pt" "\\textwidth" ".2mm")
(cal-tex-nl)
(cal-tex-b-parbox "t" "\\textwidth")
- (cal-tex-large-bf (calendar-day-name date))
+ (cal-tex-large-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
(insert ", ")
- (cal-tex-large-bf (calendar-month-name month))
+ (cal-tex-large-bf (cal-tex-month-name month))
(insert " ")
(cal-tex-large-bf (number-to-string day))
(if (not (string= "" (cal-tex-latexify-list holidays date)))
＠＠ -844,9 +887,9 ＠＠ Holidays are included if `cal-tex-holida
(cal-tex-cmd "\\ \\\\[-.2cm]")
(cal-tex-cmd "\\noindent")
(cal-tex-b-parbox "l" "6.8in")
- (cal-tex-large-bf (calendar-day-name date))
+ (cal-tex-large-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
(insert ", ")
- (cal-tex-large-bf (calendar-month-name month))
+ (cal-tex-large-bf (cal-tex-month-name month))
(insert " ")
(cal-tex-large-bf (number-to-string day))
(if (not (string= "" (cal-tex-latexify-list holidays date)))
＠＠ -875,7 +918,7 ＠＠ Holidays are included if `cal-tex-holida
It applies to the week that point is in, and starts on Monday.
Optional prefix argument specifies number of weeks.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -913,12 +956,12 ＠＠ Holidays are included if `cal-tex-holida
(day (extract-calendar-day date))
(month (extract-calendar-month date))
(year (extract-calendar-year date))
- (dayname (calendar-day-name date))
+ (dayname (cal-tex-LaTeXify-string (calendar-day-name date)))
(date1 (cal-tex-incr-date date))
(day1 (extract-calendar-day date1))
(month1 (extract-calendar-month date1))
(year1 (extract-calendar-year date1))
- (dayname1 (calendar-day-name date1))
+ (dayname1 (cal-tex-LaTeXify-string (calendar-day-name date1)))
)
(cal-tex-b-framebox "8cm" "l")
(cal-tex-b-parbox "b" "7.5cm")
＠＠ -951,7 +994,7 ＠＠ Holidays are included if `cal-tex-holida
Optional prefix argument specifies number of weeks.
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -1011,29 +1054,29 ＠＠ Holidays are included if `cal-tex-holida
(if (= (extract-calendar-month date)
(extract-calendar-month d))
(format "%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date))
(if (= (extract-calendar-year date)
(extract-calendar-year d))
(format "%s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month d))
(extract-calendar-year date))
(format "%s %s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date)
- (calendar-month-name (extract-calendar-month d))
+ (cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
(calendar-for-loop j from 1 to 7 do
(if (= (mod i 2) 1)
(insert "\\rightday")
(insert "\\leftday"))
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1053,7 +1096,7 ＠＠ Optional prefix argument specifies numbe
Weeks start on Monday.
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -1120,27 +1163,27 ＠＠ Holidays are included if `cal-tex-holida
(if (= (extract-calendar-month date)
(extract-calendar-month d))
(format "%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date))
(if (= (extract-calendar-year date)
(extract-calendar-year d))
(format "%s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month d))
(extract-calendar-year date))
(format "%s %s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date)
- (calendar-month-name (extract-calendar-month d))
+ (cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
(calendar-for-loop j from 1 to 3 do
(insert "\\leftday")
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1155,27 +1198,27 ＠＠ Holidays are included if `cal-tex-holida
(if (= (extract-calendar-month date)
(extract-calendar-month d))
(format "%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date))
(if (= (extract-calendar-year date)
(extract-calendar-year d))
(format "%s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month d))
(extract-calendar-year date))
(format "%s %s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date)
- (calendar-month-name (extract-calendar-month d))
+ (cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
(calendar-for-loop j from 1 to 2 do
(insert "\\rightday")
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1184,7 +1227,7 ＠＠ Holidays are included if `cal-tex-holida
(setq date (cal-tex-incr-date date)))
(calendar-for-loop j from 1 to 2 do
(insert "\\weekend")
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1204,7 +1247,7 ＠＠ Optional prefix argument specifies numbe
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t.
Pages are ruled if `cal-tex-rules' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -1313,7 +1356,7 ＠＠ Pages are ruled if `cal-tex-rules' is t.
(defun cal-tex-cursor-day (&optional arg)
"Make a buffer with LaTeX commands for the day cursor is on.
Optional prefix argument specifies number of days."
- (interactive "P")
+ (interactive "p")
(let ((n (if arg arg 1))
(date (calendar-absolute-from-gregorian (calendar-cursor-to-date t))))
(cal-tex-preamble "12pt")
＠＠ -1335,7 +1378,7 ＠＠ Optional prefix argument specifies numbe
(defun cal-tex-daily-page (date)
"Make a calendar page for Gregorian DATE on 8.5 by 11 paper."
(let* ((hour)
- (month-name (calendar-month-name (extract-calendar-month date))))
+ (month-name (cal-tex-month-name (extract-calendar-month date))))
(cal-tex-banner "cal-tex-daily-page")
(cal-tex-b-makebox "4cm" "l")
(cal-tex-b-parbox "b" "3.8cm")
＠＠ -1350,7 +1393,7 ＠＠ Optional prefix argument specifies numbe
(cal-tex-e-makebox)
(cal-tex-hfill)
(cal-tex-b-makebox "4cm" "r")
- (cal-tex-bf (calendar-day-name date))
+ (cal-tex-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-e-makebox)
(cal-tex-nl)
(cal-tex-hspace ".4cm")
＠＠ -1422,15 +1465,17 ＠＠ COLSEP gives the column separation; 1mm
"}}r＠{\\hspace{" colsep "}}r＠{\\hspace{" colsep
"}}r＠{\\hspace{" colsep "}}r＠{\\hspace{0mm}}}%\n"
"\\multicolumn{7}{c}{"
- (calendar-month-name month)
+ (cal-tex-month-name month)
" "
(int-to-string year)
"}\\\\[1mm]\n")))
(calendar-for-loop i from 0 to 6 do
- (setq str (concat str
+ (setq str
+ (concat str
+ (cal-tex-LaTeXify-string
(substring (aref calendar-day-name-array
(mod (+ calendar-week-start-day i) 7))
- 0 2)
+ 0 2))
(if (/= i 6)
" & "
"\\\\[0.7mm]\n"))))
＠＠ -1455,7 +1500,7 ＠＠ If optional N is given, the date of N da
(+ (if n n 1) (calendar-absolute-from-gregorian date))))
(defun cal-tex-latexify-list (date-list date &optional separator final-separator)
- "Return string with concatenated, LaTeXified entries in DATE_LIST for DATE.
+ "Return string with concatenated, LaTeXified entries in DATE-LIST for DATE.
Use double backslash as a separator unless optional SEPARATOR is given.
If resulting string is not empty, put separator at end if optional
FINAL-SEPARATOR is t."
＠＠ -1575,6 +1620,10 ＠＠ without erasing current contents."
(setq tail (substring tail 1))
(setq head (concat head (if pair (cdr pair) ch)))))
head)))
+
+(defun cal-tex-month-name (month)
+ "The name of MONTH, LaTeXified."
+ (cal-tex-LaTeXify-string (calendar-month-name month)))
(defun cal-tex-hfill () "Insert hfill." (insert "\\hfill"))
1.9 +11 -11 XEmacs/packages/xemacs-packages/calendar/cal-xemacs.el
Index: cal-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-xemacs.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cal-xemacs.el 2006/08/02 23:45:54 1.8
+++ cal-xemacs.el 2006/08/04 20:23:50 1.9
＠＠ -143,17 +143,17 ＠＠ frame). Support for popup menus require
(defconst calendar-diary-menu
'("Diary"
- ["Other file" view-other-diary-entries (calendar-cursor-to-date)]
- ["Cursor date" view-diary-entries (calendar-cursor-to-date)]
- ["Mark all" mark-diary-entries t]
- ["Show all" show-all-diary-entries t]
- ["Insert daily"insert-diary-entry t]
- ["Insert weekly" insert-weekly-diary-entry (calendar-cursor-to-date)]
- ["Insert monthly" insert-monthly-diary-entry (calendar-cursor-to-date)]
- ["Insert yearly" insert-yearly-diary-entry (calendar-cursor-to-date)]
- ["Insert anniversary" insert-anniversary-diary-entry (calendar-cursor-to-date)]
- ["Insert block" insert-block-diary-entry (calendar-cursor-to-date)]
- ["Insert cyclic" insert-cyclic-diary-entry (calendar-cursor-to-date)]
+ ["Other File" view-other-diary-entries (calendar-cursor-to-date)]
+ ["Cursor Date" view-diary-entries (calendar-cursor-to-date)]
+ ["Mark All" mark-diary-entries t]
+ ["Show All" show-all-diary-entries t]
+ ["Insert Diary Entry"insert-diary-entry t]
+ ["Insert Weekly" insert-weekly-diary-entry (calendar-cursor-to-date)]
+ ["Insert Monthly" insert-monthly-diary-entry (calendar-cursor-to-date)]
+ ["Insert Yearly" insert-yearly-diary-entry (calendar-cursor-to-date)]
+ ["Insert Anniversary" insert-anniversary-diary-entry (calendar-cursor-to-date)]
+ ["Insert Block" insert-block-diary-entry (calendar-cursor-to-date)]
+ ["Insert Cyclic" insert-cyclic-diary-entry (calendar-cursor-to-date)]
["Insert Islamic" calendar-mouse-insert-islamic-diary-entry (calendar-cursor-to-date)]
["Insert Hebrew" calendar-mouse-insert-hebrew-diary-entry (calendar-cursor-to-date)]))
1.10 +37 -7 XEmacs/packages/xemacs-packages/calendar/calendar.el
Index: calendar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- calendar.el 2006/08/02 02:59:43 1.9
+++ calendar.el 2006/08/04 20:23:50 1.10
＠＠ -635,7 +635,7 ＠＠ See the documentation of `diary-date-for
european-date-diary-pattern
american-date-diary-pattern)
"*List of pseudo-patterns describing the forms of date used in the diary.
-The patterns on the list must be MUTUALLY EXCLUSIVE and must not match
+The patterns on the list must be MUTUALLY EXCLUSIVE and should not match
any portion of the diary entry itself, just the date component.
A pseudo-pattern is a list of regular expressions and the keywords `month',
＠＠ -1902,10 +1902,10 ＠＠ Or, for optional MON, YR."
(defun generate-calendar-month (month year indent)
"Produce a calendar for MONTH, YEAR on the Gregorian calendar.
-The calendar is inserted in the buffer starting at the line on which point
-is currently located, but indented INDENT spaces. The indentation is done
-from the first character on the line and does not disturb the first INDENT
-characters on the line."
+The calendar is inserted at the top of the buffer in which point is currently
+located, but indented INDENT spaces. The indentation is done from the first
+character on the line and does not disturb the first INDENT characters on the
+line."
(let* ((blank-days;; at start of month
(mod
(- (calendar-day-of-week (list month 1 year))
＠＠ -2143,8 +2143,33 ＠＠ the inserted text. Value is always t."
"\\<calendar-mode-map>\\[scroll-calendar-right]")
'help-echo "mouse-2: scroll right"
))
- "The mode line of the calendar buffer.")
+ "The mode line of the calendar buffer.
+This must be a list of items that evaluate to strings--those strings are
+evaluated and concatenated together, evenly separated by blanks. The variable
+`date' is available for use as the date under (or near) the cursor; `date'
+defaults to the current date if it is otherwise undefined. Here is an example
+value that has the Hebrew date, the day number/days remaining in the year,
+and the ISO week/year numbers in the mode. When calendar-move-hook is set to
+'update-calendar-mode-line, these mode line shows these values for the date
+under the cursor:
+
+ (list
+ \"\"
+ '(calendar-hebrew-date-string date)
+ '(let* ((year (extract-calendar-year date))
+ (d (calendar-day-number date))
+ (days-remaining
+ (- (calendar-day-number (list 12 31 year)) d)))
+ (format \"%d/%d\" d days-remaining))
+ '(let* ((d (calendar-absolute-from-gregorian date))
+ (iso-date (calendar-iso-from-absolute d)))
+ (format \"ISO week %d of %d\"
+ (extract-calendar-month iso-date)
+ (extract-calendar-year iso-date)))
+ \"\"))
+")
+
(defun calendar-goto-info-node ()
"Go to the info node for the calendar."
(interactive)
＠＠ -2222,7 +2247,12 ＠＠ the STRINGS are just concatenated and th
(set-buffer calendar-buffer)
(setq mode-line-format
(calendar-string-spread
- calendar-mode-line-format ? (frame-width))))))
+ (let ((date (condition-case nil
+ (calendar-cursor-to-nearest-date)
+ (error (calendar-current-date)))))
+ (mapcar 'eval calendar-mode-line-format))
+ ? (frame-width)))
+ (force-mode-line-update))))
(defun calendar-window-list ()
"List of all calendar-related windows."
1.6 +6 -5 XEmacs/packages/xemacs-packages/calendar/diary-lib.el
Index: diary-lib.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/diary-lib.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- diary-lib.el 2006/07/31 02:15:23 1.5
+++ diary-lib.el 2006/08/04 20:23:50 1.6
＠＠ -265,10 +265,10 ＠＠ These hooks have the following distinct
(if (not (looking-at "\^M\\|\n"))
(progn
(goto-char (point-max))
- (insert-string "\^M")))
+ (insert "\^M")))
(goto-char (point-min))
(if (not (looking-at "\^M\\|\n"))
- (insert-string "\^M"))
+ (insert "\^M"))
(subst-char-in-region (point-min) (point-max) ?\n ?\^M t)
(calendar-for-loop i from 1 to number do
(let ((d diary-date-forms)
＠＠ -328,9 +328,9 ＠＠ These hooks have the following distinct
(point) ?\^M ?\n t)
(add-to-diary-list
date
- (buffer-substring-no-properties
+ (buffer-substring
entry-start (point))
- (buffer-substring-no-properties
+ (buffer-substring
(1+ date-start) (1- entry-start)) )))))
(setq d (cdr d)))
(or entry-found
＠＠ -1252,7 +1252,8 ＠＠ all values."
(defun diary-block (m1 d1 y1 m2 d2 y2)
"Block diary entry.
-Entry applies if date is between two dates. Order of the parameters is
+Entry applies if date is between, or on one of, two dates.
+The order of the parameters is
M1, D1, Y1, M2, D2, Y2 if `european-calendar-style' is nil, and
D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t."
(let ((date1 (calendar-absolute-from-gregorian
1.7 +42 -24 XEmacs/packages/xemacs-packages/calendar/solar.el
Index: solar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/solar.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- solar.el 2006/07/31 02:15:24 1.6
+++ solar.el 2006/08/04 20:23:51 1.7
＠＠ -200,8 +200,8 ＠＠ delta. At present, delta = 0.01 degrees
nil
"Sidereal time at Greenwich at midnight (universal time).")
-(defvar solar-spring-or-summer-season nil
- "T if spring or summer and nil otherwise.
+(defvar solar-northern-spring-or-summer-season nil
+ "Non-nil if northern spring or summer and nil otherwise.
Needed for polar areas, in order to know whether the day lasts 0 or 24 hours.")
(defun solar-setup ()
＠＠ -300,7 +300,7 ＠＠ Both arguments are in degrees."
(* (solar-sin-degrees obliquity)
(solar-sin-degrees longitude))))
-(defun solar-sunrise-and-sunset (time latitude longitude)
+(defun solar-sunrise-and-sunset (time latitude longitude height)
"Sunrise, sunset and length of day.
Parameters are the midday TIME and the LATITUDE, LONGITUDE of the location.
＠＠ -310,14 +310,20 ＠＠ time. For instance, the pair correspond
\(-0.040945 16), -0.040945 being the number of julian centuries elapsed between
Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.
-Coordinates are included because this function is called with latitude=10
+HEIGHT is the angle the center of the sun has over the horizon for the contact
+we are trying to find. For sunrise and sunset, it is usually -0.61 degrees,
+accounting for the edge of the sun being on the horizon.
+
+Coordinates are included because this function is called with latitude=1
degrees to find out if polar regions have 24 hours of sun or only night."
- (let* ((rise-time (solar-moment -1 latitude longitude time))
- (set-time (solar-moment 1 latitude longitude time))
+ (let* ((rise-time (solar-moment -1 latitude longitude time height))
+ (set-time (solar-moment 1 latitude longitude time height))
(day-length))
(if (not (and rise-time set-time))
- (if (or (and (> latitude 0) solar-spring-or-summer-season)
- (and (< latitude 0) (not solar-spring-or-summer-season)))
+ (if (or (and (> latitude 0)
+ solar-northern-spring-or-summer-season)
+ (and (< latitude 0)
+ (not solar-northern-spring-or-summer-season)))
(setq day-length 24)
(setq day-length 0))
(setq day-length (- set-time rise-time)))
＠＠ -325,7 +331,7 ＠＠ degrees to find out if polar regions hav
(if set-time (+ set-time (/ calendar-time-zone 60.0)) nil)
day-length)))
-(defun solar-moment (direction latitude longitude time)
+(defun solar-moment (direction latitude longitude time height)
"Sunrise/sunset at location.
Sunrise if DIRECTION =-1 or sunset if =1 at LATITUDE, LONGITUDE, with midday
being TIME.
＠＠ -336,9 +342,13 ＠＠ time. For instance, the pair correspond
\(-0.040945 16), -0.040945 being the number of julian centuries elapsed between
Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.
+HEIGHT is the angle the center of the sun has over the horizon for the contact
+we are trying to find. For sunrise and sunset, it is usually -0.61 degrees,
+accounting for the edge of the sun being on the horizon.
+
Uses binary search."
(let* ((ut (car (cdr time)))
- (possible 1) ; we assume that rise or set are possible
+ (possible t) ; we assume that rise or set are possible
(utmin (+ ut (* direction 12.0)))
(utmax ut) ; the time searched is between utmin and utmax
; utmin and utmax are in hours
＠＠ -354,10 +364,10 ＠＠ Uses binary search."
latitude longitude t)))))
; -0.61 degrees is the height of the middle of the sun, when it rises
; or sets.
- (if (< hmin -0.61)
- (if (> hmax -0.61)
+ (if (< hmin height)
+ (if (> hmax height)
(while ;(< i 20) ; we perform a simple dichotomy
- ;(> (abs (+ hut 0.61)) epsilon)
+ ;(> (abs (- hut height)) epsilon)
(>= (abs (- utmoment utmoment-old))
(/ solar-error 60))
(setq utmoment-old utmoment)
＠＠ -365,12 +375,12 ＠＠ Uses binary search."
(setq hut (car (cdr
(solar-horizontal-coordinates
(list t0 utmoment) latitude longitude t))))
- (if (< hut -0.61) (setq utmin utmoment))
- (if (> hut -0.61) (setq utmax utmoment))
+ (if (< hut height) (setq utmin utmoment))
+ (if (> hut height) (setq utmax utmoment))
)
- (setq possible 0)) ; the sun never rises
- (setq possible 0)) ; the sun never sets
- (if (equal possible 0) nil utmoment)))
+ (setq possible nil)) ; the sun never rises
+ (setq possible nil)) ; the sun never sets
+ (if (not possible) nil utmoment)))
(defun solar-time-string (time time-zone)
"Printable form for decimal fraction TIME in TIME-ZONE.
＠＠ -429,20 +439,20 ＠＠ Corresponding value is nil if there is n
(solar-sidereal-time t0))
(solar-sunrise-and-sunset
(list t0 (car (cdr exact-local-noon)))
- 10.0
- (calendar-longitude))))
+ 1.0
+ (calendar-longitude) 0)))
; store the spring/summer information,
; compute sunrise and sunset (two first components of rise-set).
; length of day is the third component (it is only the difference
; between sunset and sunrise when there is a sunset and a sunrise)
(rise-set
(progn
- (setq solar-spring-or-summer-season
- (if (> (car (cdr (cdr equator-rise-set))) 12) 1 0))
+ (setq solar-northern-spring-or-summer-season
+ (if (> (car (cdr (cdr equator-rise-set))) 12) t nil))
(solar-sunrise-and-sunset
(list t0 (car (cdr exact-local-noon)))
(calendar-latitude)
- (calendar-longitude))))
+ (calendar-longitude) -0.61)))
(rise (car rise-set))
(adj-rise (if rise (dst-adjust-time date rise) nil))
(set (car (cdr rise-set)))
＠＠ -906,6 +916,12 ＠＠ Accurate to a few seconds."
(solar-setup))
(solar-sunrise-sunset-string date))
+(defcustom diary-sabbath-candles-minutes 18
+ "*Number of minutes before sunset for sabbath candle lighting."
+:group 'diary
+:type 'integer
+:version "21.1")
+
(defun diary-sabbath-candles ()
"Local time of candle lighting diary entry--applies if date is a Friday.
No diary entry if there is no sunset on that date."
＠＠ -914,7 +930,9 ＠＠ No diary entry if there is no sunset on
(if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday
(let* ((sunset (car (cdr (solar-sunrise-sunset date))))
(light (if sunset
- (cons (- (car sunset) (/ 18.0 60.0)) (cdr sunset)))))
+ (cons (- (car sunset)
+ (/ diary-sabbath-candles-minutes 60.0))
+ (cdr sunset)))))
(if sunset
(format "%s Sabbath candle lighting"
(apply 'solar-time-string light))))))
- 1 participants
- 0 comments