Mercurial > emacs
annotate src/disptab.h @ 96975:60149c696033
2008-07-24 Carsten Dominik <dominik@science.uva.nl>
* org-exp.el (org-export-region-as-html, org-export-as-html): Make
sure that calls from `org-export-region-as-html' do not do the
special check for a subtree.
* org-agenda.el (org-batch-store-agenda-views): Fix parsing bug.
* org.el (org-open-file): Use
`org-open-directory-means-index-dot-org'.
(org-open-directory-means-index-dot-org): New option.
* org.el (org-make-link-string): Remove link attributes from
description.
(org-open-at-point): Remove link attributes bevore using the path.
* org-exp.el (org-export-as-html): Handle link attributes.
* org.el (org-extract-attributes, org-attributes-to-string): New functions.
* org-table.el (org-table-to-lisp): New function.
* org.el (org-narrow-to-subtree): Do not include the final newline
into the narrowed region.
* org-agenda.el (org-agenda-custom-commands-local-options): Fixed
bug with user-define skipping condition.
* org-agenda.el (org-agenda-get-restriction-and-command): Fixed typo.
* org-exp.el (org-export-html-style-default): Automatic overflow
handling for pre fields.
(org-export-as-ascii, org-export-as-html): Change default format
for time stamp.
* org-table.el (org-table-export): Offer completion for translator
functions, and do not require a heading above the table.
* org.el (org-renumber-ordered-list, org-beginning-of-item-list):
Cater for the case of a list starting in the first line of the
buffer.
* org-publish.el (org-publish-find-title): Bug fix.
(org-publish-org-index): Implement new :index-style option.
* org-publish.el (org-publish-timestamp-filename): Use
SHA1-encoded file names in the timestamp directory.
* org-publish.el (org-publish-needed-p): Be verbose about files
published and files skipped.
* org-exp.el (org-export-preprocess-string): Swap link
normalization and inernal link targeting.
* org-publish.el (org-publish-needed-p): Create timestamp
directory when it does not exist.
* org-clock.el (org-clock-out-when-done): Doc fix.
* org.el (org-agenda-skip-unavailable-files): Doc fix.
* org-exp.el (org-export-remove-comment-blocks-and-subtrees):
Ignore case when searching for the COMMENT cookie at export time.
* org-exp.el (org-get-file-contents)
(org-get-and-remove-property): New functions.
(org-export-handle-include-files): Handle the new prefix options.
(org-export-as-html): Fix the verse environment.
* org.el (org-time=, org-time<, org-time<=, org-time>)
(org-time>=, org-time<>, org-2ft): New functions.
(org-op-to-function): Also provide for the time testing fucntions.
* org-exp.el (org-export-html-style-default): New constant.
* org-exp.el (org-export-html-style-extra): New variable.
(org-export-splice-style): New function.
* org-exp.el (org-export-plist-vars, org-export-as-html):
Implement `org-export-creator-info'.
(org-export-creator-info): New option.
* org.el (org-clock-drawer-start-re, org-clock-drawer-end-re)
(org-property-drawer-re, org-clock-drawer-re): New constants.
* org-exp.el (org-icalendar-use-deadline)
(org-icalendar-use-scheduled): New options.
(org-icalendar-include-todo): Default changed to t.
(org-print-icalendar-entries): Implement better utilization of
scheduling and deadline time stamps.
(org-export-target-internal-links, org-export-as-html): Allow file
lines without the "file:" prefix if the file path is an absolute
path or starts with ".".
* org-clock.el (org-clocktable-shift): Also undertand yesterday,
lastweek etc.
(org-clock-special-range): Also undertand yesterday, lastweek etc.
* org.el (org-agenda-skip-archived-trees): Docstring now
discourages using this.
(org-scan-tags): Check for org-agenda-archives-mode.
(org-map-entries): Make sure org-agenda-archives-mode is nil.
(org-agenda-files): Functionality of second arg changed.
* org-agenda.el (org-agenda-archives-mode): New variable
(org-write-agenda, org-prepare-agenda, org-agenda-list)
(org-search-view, org-todo-list, org-tags-view)
(org-agenda-list-stuck-projects): Call `org-agenda-files' with
`ifmode' argument.
(org-agenda-quit): Reset the archives mode.
(org-agenda-archives-mode): New command.
(org-agenda-set-mode-name): Include archives info.
* org.el (org-paste-subtree): Make sure the yanked headline is
visible if it was yanked at a visible point.
(org-move-item-up): Fix the bug with moving white space at the end
of the item.
(org-show-empty-lines-in-parent): New function.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Thu, 24 Jul 2008 13:59:56 +0000 |
parents | 29adfc9354e7 |
children | e038c1a8307c |
rev | line source |
---|---|
484 | 1 /* Things for GLYPHS and glyph tables. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
2 Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, |
79759 | 3 2006, 2007, 2008 Free Software Foundation, Inc. |
484 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
484 | 8 it under the terms of the GNU General Public License as published by |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
10 (at your option) any later version. |
484 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
484 | 19 |
20 /* Access the slots of a display-table, according to their purpose. */ | |
21 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
22 #define DISP_TABLE_P(obj) \ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
23 (CHAR_TABLE_P (obj) \ |
17363
0fe9203c7a06
(DISP_TABLE_P): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17332
diff
changeset
|
24 && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table) \ |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
25 && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
26 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
27 #define DISP_TABLE_EXTRA_SLOTS 6 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
28 #define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
29 #define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
30 #define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
31 #define DISP_CTRL_GLYPH(dp) ((dp)->extras[3]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
32 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
33 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
34 |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
35 extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int)); |
17332
35269345d9ef
(disp_char_vector): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
17183
diff
changeset
|
36 |
88370
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
37 #define DISP_CHAR_VECTOR(dp, c) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
38 (ASCII_CHAR_P(c) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
39 ? (NILP ((dp)->ascii) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
40 ? (dp)->defalt \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
41 : (SUB_CHAR_TABLE_P ((dp)->ascii) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
42 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c] \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
43 : (dp)->ascii)) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
44 : disp_char_vector ((dp), (c))) |
484 | 45 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
46 /* Defined in window.c. */ |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
47 extern struct Lisp_Char_Table *window_display_table P_ ((struct window *)); |
484 | 48 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
49 /* Defined in indent.c. */ |
20309
51fb1f36e614
Add prototypes. Remove declaration of obsolete
Andreas Schwab <schwab@suse.de>
parents:
17363
diff
changeset
|
50 extern struct Lisp_Char_Table *buffer_display_table P_ ((void)); |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
51 |
484 | 52 /* Display table to use for vectors that don't specify their own. */ |
53 extern Lisp_Object Vstandard_display_table; | |
54 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
55 /* This is the `purpose' slot of a display table. */ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
56 extern Lisp_Object Qdisplay_table; |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
57 |
484 | 58 /* Vector of GLYPH definitions. Indexed by GLYPH number, |
59 the contents are a string which is how to output the GLYPH. */ | |
60 extern Lisp_Object Vglyph_table; | |
61 | |
62 /* Return the current length of the GLYPH table, | |
63 or 0 if the table isn't currently valid. */ | |
64 #define GLYPH_TABLE_LENGTH \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
65 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0) |
484 | 66 |
67 /* Return the current base (for indexing) of the GLYPH table, | |
68 or 0 if the table isn't currently valid. */ | |
69 #define GLYPH_TABLE_BASE \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
70 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0) |
484 | 71 |
72 /* Given BASE and LEN returned by the two previous macros, | |
73 return nonzero if the GLYPH code G should be output as a single | |
74 character with code G. Return zero if G has a string in the table. */ | |
92277 | 75 #define GLYPH_SIMPLE_P(base,len,g) \ |
76 (GLYPH_FACE (g) != DEFAULT_FACE_ID || GLYPH_CHAR (g) >= (len) || !STRINGP (base[GLYPH_CHAR (g)])) | |
484 | 77 |
78 /* Given BASE and LEN returned by the two previous macros, | |
79 return nonzero if GLYPH code G is aliased to a different code. */ | |
92277 | 80 #define GLYPH_ALIAS_P(base,len,g) \ |
81 (GLYPH_FACE (g) == DEFAULT_FACE_ID && GLYPH_CHAR (g) < (len) && INTEGERP (base[GLYPH_CHAR (g)])) | |
484 | 82 |
2725
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
83 /* Follow all aliases for G in the glyph table given by (BASE, |
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
84 LENGTH), and set G to the final glyph. */ |
92277 | 85 #define GLYPH_FOLLOW_ALIASES(base, length, g) \ |
86 do { \ | |
87 while (GLYPH_ALIAS_P ((base), (length), (g))) \ | |
88 SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \ | |
89 if (!GLYPH_CHAR_VALID_P (g)) \ | |
90 SET_GLYPH_CHAR (g, ' '); \ | |
17183
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
91 } while (0) |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
92 |
484 | 93 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0, |
94 return the length and the address of the character-sequence | |
95 used for outputting GLYPH G. */ | |
92277 | 96 #define GLYPH_LENGTH(base,g) SCHARS (base[GLYPH_CHAR (g)]) |
97 #define GLYPH_STRING(base,g) SDATA (base[GLYPH_CHAR (g)]) | |
484 | 98 |
99 /* GLYPH for a space character. */ | |
100 | |
101 #define SPACEGLYPH 040 | |
102 #define NULL_GLYPH 00 | |
103 | |
92277 | 104 #define SET_GLYPH_FROM_CHAR(glyph, c) \ |
105 SET_GLYPH (glyph, c, DEFAULT_FACE_ID) | |
52401 | 106 |
107 /* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349 | |
108 (do not change this comment) */ |