Mercurial > emacs
view src/composite.h @ 92870:8f17f65dd575
* textmodes/org.el (org-ctrl-c-star): Implement a missing branch
in the decision tree.
(org-select-remember-template): Cleaned the code.
(org-prepare-dblock): Added the extra :content parameter.
(org-write-agenda): New output type ".ics" files.
(org-write-agenda): Call `org-icalendar-verify-function', both for
time stamps and for TODO entries.
(org-agenda-collect-markers, org-create-marker-find-array)
(org-check-agenda-marker-table): New functions.
(org-agenda-marker-table): New variable.
(org-export-as-html): Revert the change that killed the html
buffer. Side effects first need to be studied carefully.
(org-get-tags-at): Fix the structure of the condition-case
statement.
(org-ts-regexp0, org-repeat-re, org-display-custom-time)
(org-timestamp-change): Fix regulear expressions to swallow the
extra character for repeat-shift control.
(org-auto-repeat-maybe): Implement the new repeater mechanisms.
(org-get-legal-level): Aliased to `org-get-valid-level'.
(org-dblock-write:clocktable): Added a :link parameter, linking
headlines to their location in the Org agenda files.
(org-get-tags-at): Bugfix: prevent `org-back-to-heading' from
throwing an error when getting tags before headlines.
(org-timestamp-change, org-modify-ts-extra)
(org-ts-regexp1): Fix timestamp editing.
(org-agenda-custom-commands-local-options): New constant.
(org-agenda-custom-commands): Use
`org-agenda-custom-commands-local-options' to improve customize
type. "htmlize": Removed hack to fix face problem with htmlize,
it no longer seem necessary.
(org-follow-link-hook): New hook.
(org-agenda-custom-commands): Added "Component" as a tag for each
item in a command serie.
(org-open-at-point): Run `org-follow-link-hook'.
(org-agenda-schedule): Bugfix: don't display marker type when it
is `nil'.
(org-store-link): org-irc required.
(org-set-regexps-and-options): Parse the new logging options.
(org-extract-log-state-settings): New function.
(org-todo): Handle the new ways of recording state change stuff.
(org-local-logging): New function.
(org-columns-open-link): Fixed bug with opening link in column
view.
(org-local-logging): New function
(org-todo): Make sure that LOGGING properties are honoured.
(org-todo-keywords): Improve docstring.
(org-startup-options): Cleanup startup options.
(org-set-regexps-and-options): Process the "!" markers.
(org-todo): Respect the new logging stuff.
(org-log-note-how): New variable.
(org-add-log-maybe): New parameter HOW that defines how logging
should be done and also overrides PURPOSE. Add a docstring.
(org-add-log-note): Check if we really need to ask for a note.
(org-get-current-options): Digest the new keyword.
(org-agenda-reset-markers): Renamed from
`org-agenda-maybe-reset-markers'. FORCE argument removed.
(org-diary, org-agenda-quit, org-prepare-agenda): Call the renamed
function, without force argument.
(org-buffer-property-keys): Bind local variables s and p.
(org-make-tags-matcher): Allow "" to match an empty or
non-existent property value.
(org-export-as-html): Join unsorted lists when they directly
follow each other. Such lists may be created by headlines that
are converted to lists.
(org-nofm-to-completion): New function.
(org-export-as-html): Use :html-extension instead of
org-export-html-extension.
(org-store-link): Support for links from `rmail-summary-mode'.
(org-columns-new, org-complete, org-set-property): Set the
`include-columns' argument in the call to
`org-buffer-property-keys'.
(org-buffer-property-keys): New argument `include-columns', to
include properties expected by any of the COLUMS formats in the
current buffer.
(org-cleaned-string-for-export): Get rid of drawers first, so that
they will be removed also in the text before the first headline.
(org-clock-report): Show the clocktable when found.
(org-refile): Fix positioning bug when `org-reverse-note-order' is
nil.
(org-version): With prefix argument, insert `org-version' at
point.
(org-agenda-goto): Recenter the window after finding the target
location, to make sure the correct position will be displayed.
(org-agenda-get-deadlines): Don't scale priority with the warning
period.
(org-insert-heading): Don't break line in the middle of the line.
(org-agenda-get-deadlines): Allow `org-deadline-warning-days' to
be 0.
(org-update-checkbox-count): Revamped to deal with hierarchical
beckboxes. This was a patch from Miguel A. Figueroa-Villanueva.
(org-remove-timestamp-with-keyword): New function.
(org-schedule, org-deadline): Use
`org-remove-timestamp-with-keyword' to make sure all such time
stamps are removed.
(org-mode): Support for `align'.
(org-agenda-get-deadlines): Make sure priorities increase as the
due date approaches and is passed.
(org-remember-apply-template): Fixed problem with tags that
contain "_" or "@".
(org-make-link-regexps): Improve the regular expression for plain
links.
(org-agenda-get-closed): List each clocking entry.
(org-set-tags): Only tabify before tags if indent-tabs-mode is t.
(org-special-ctrl-k): New option.
(org-kill-line): New function.
(org-archive-all-done): Fixed incorrect number of stars in regexp.
(org-refile-get-location): New function.
(org-refile-goto-last-stored): New function.
(org-global-tags-completion-table): Add the value of org-tag-alist
in each buffer, to make sure that also unused tags will be
available for completion.
(org-columns-edit-value)
(org-columns-next-allowed-value): Only update if not in agenda.
(org-clocktable-steps): New function.
(org-dblock-write:clocktable): Call `org-clocktable-steps'.
(org-archive-subtree): Add the outline tree context as a property.
(org-closest-date): New optional argument `prefer'.
(org-goto-auto-isearch): New option.
(org-goto-map, org-get-location): Implement auto-isearch.
(org-goto-local-auto-isearch-map): New variable.
(org-goto-local-search-forward-headings)
(org-goto-local-auto-isearch): New functions
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Thu, 13 Mar 2008 08:54:11 +0000 |
parents | 63d4513550f9 |
children | 29adfc9354e7 |
line wrap: on
line source
/* Header for composite sequence handler. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef EMACS_COMPOSITE_H #define EMACS_COMPOSITE_H /* Methods to display a sequence of components of a composition. */ enum composition_method { /* Compose relatively without alternate characters. */ COMPOSITION_RELATIVE, /* Compose by specified composition rules. This is not used in Emacs 21 but we need it to decode files saved in the older versions of Emacs. */ COMPOSITION_WITH_RULE, /* Compose relatively with alternate characters. */ COMPOSITION_WITH_ALTCHARS, /* Compose by specified composition rules with alternate characters. */ COMPOSITION_WITH_RULE_ALTCHARS, /* Compose by specified lispy glyph-string. */ COMPOSITION_WITH_GLYPH_STRING, /* This is not a method. */ COMPOSITION_NO }; /* Maximum number of compoments a single composition can have. */ #define MAX_COMPOSITION_COMPONENTS 16 /* These macros access information about a composition that has `composition' property PROP. PROP is: ((LENGTH . COMPONENTS) . MODIFICATION-FUNC) or (COMPOSITION-ID . (LENGTH COMPONENTS . MODIFICATION-FUNC)) They don't check validity of PROP. */ /* Temporary variable used only in the following macros. */ extern Lisp_Object composition_temp; /* Return 1 if the composition is already registered. */ #define COMPOSITION_REGISTERD_P(prop) INTEGERP (XCAR (prop)) /* Return ID number of the already registered composition. */ #define COMPOSITION_ID(prop) XINT (XCAR (prop)) /* Return length of the composition. */ #define COMPOSITION_LENGTH(prop) \ (COMPOSITION_REGISTERD_P (prop) \ ? XINT (XCAR (XCDR (prop))) \ : XINT (XCAR (XCAR (prop)))) /* Return components of the composition. */ #define COMPOSITION_COMPONENTS(prop) \ (COMPOSITION_REGISTERD_P (prop) \ ? XCAR (XCDR (XCDR (prop))) \ : XCDR (XCAR (prop))) /* Return modification function of the composition. */ #define COMPOSITION_MODIFICATION_FUNC(prop) \ (COMPOSITION_REGISTERD_P (prop) \ ? XCDR (XCDR (XCDR (prop))) \ : CONSP (prop) ? XCDR (prop) : Qnil) /* Return the method of composition. */ #define COMPOSITION_METHOD(prop) \ (COMPOSITION_REGISTERD_P (prop) \ ? composition_table[COMPOSITION_ID (prop)]->method \ : (composition_temp = XCDR (XCAR (prop)), \ (NILP (composition_temp) \ ? COMPOSITION_RELATIVE \ : (INTEGERP (composition_temp) || STRINGP (composition_temp)) \ ? COMPOSITION_WITH_ALTCHARS \ : (VECTORP (composition_temp) \ && ASIZE (composition_temp) >= 2 \ && VECTORP (AREF (composition_temp, 0))) \ ? COMPOSITION_WITH_GLYPH_STRING \ : COMPOSITION_WITH_RULE_ALTCHARS))) /* Return 1 if the composition is valid. It is valid if length of the composition equals to (END - START). */ #define COMPOSITION_VALID_P(start, end, prop) \ (CONSP (prop) \ && (COMPOSITION_REGISTERD_P (prop) \ ? (COMPOSITION_ID (prop) >= 0 \ && COMPOSITION_ID (prop) <= n_compositions \ && CONSP (XCDR (prop))) \ : (composition_temp = XCAR (prop), \ (CONSP (composition_temp) \ && (composition_temp = XCDR (composition_temp), \ (NILP (composition_temp) \ || STRINGP (composition_temp) \ || VECTORP (composition_temp) \ || INTEGERP (composition_temp) \ || CONSP (composition_temp)))))) \ && (end - start) == COMPOSITION_LENGTH (prop)) /* Return the Nth glyph of composition specified by CMP. CMP is a pointer to `struct composition'. */ #define COMPOSITION_GLYPH(cmp, n) \ XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \ ->key_and_value) \ ->contents[cmp->hash_index * 2]) \ ->contents[cmp->method == COMPOSITION_WITH_RULE_ALTCHARS \ ? (n) * 2 : (n)]) /* Return the encoded composition rule to compose the Nth glyph of rule-base composition specified by CMP. CMP is a pointer to `struct composition'. */ #define COMPOSITION_RULE(cmp, n) \ XINT (XVECTOR (XVECTOR (XHASH_TABLE (composition_hash_table) \ ->key_and_value) \ ->contents[cmp->hash_index * 2]) \ ->contents[(n) * 2 - 1]) /* Decode encoded composition rule RULE_CODE into GREF (global reference point code), NREF (new reference point code), XOFF (horizontal offset) YOFF (vertical offset). Don't check RULE_CODE, always set GREF and NREF to valid values. By side effect, RULE_CODE is modified. */ #define COMPOSITION_DECODE_RULE(rule_code, gref, nref, xoff, yoff) \ do { \ xoff = (rule_code) >> 16; \ yoff = ((rule_code) >> 8) & 0xFF; \ rule_code &= 0xFF; \ gref = (rule_code) / 12; \ if (gref > 12) gref = 11; \ nref = (rule_code) % 12; \ } while (0) /* Return encoded composition rule for the pair of global reference point GREF and new reference point NREF. If arguments are invalid, return -1. */ #define COMPOSITION_ENCODE_RULE(gref, nref) \ ((unsigned) (gref) < 12 && (unsigned) (nref) < 12 \ ? (gref) * 12 + (nref) : -1) /* Data structure that records information about a composition currently used in some buffers or strings. When a composition is assigned an ID number (by get_composition_id), this structure is allocated for the composition and linked in composition_table[ID]. Identical compositions appearing at different places have the same ID, and thus share the same instance of this structure. */ struct composition { /* Number of glyphs of the composition components. */ unsigned glyph_len; /* Width, ascent, and descent pixels of the composition. */ short pixel_width, ascent, descent; short lbearing, rbearing; /* How many columns the overall glyphs occupy on the screen. This gives an approximate value for column calculation in Fcurrent_column, and etc. */ unsigned short width; /* Method of the composition. */ enum composition_method method; /* Index to the composition hash table. */ int hash_index; /* For which font we have calculated the remaining members. The actual type is device dependent. */ void *font; /* Pointer to an array of x-offset and y-offset (by pixels) of glyphs. This points to a sufficient memory space (sizeof (int) * glyph_len * 2) that is allocated when the composition is registered in composition_table. X-offset and Y-offset of Nth glyph are (2N)th and (2N+1)th elements respectively. */ short *offsets; }; /* Table of pointers to the structure `composition' indexed by COMPOSITION-ID. */ extern struct composition **composition_table; /* Number of the currently registered compositions. */ extern int n_compositions; /* Mask bits for CHECK_MASK arg to update_compositions. For a change in the region FROM and TO, check compositions ... */ #define CHECK_HEAD 1 /* adjacent to FROM */ #define CHECK_TAIL 2 /* adjacent to TO */ #define CHECK_INSIDE 4 /* between FROM and TO */ #define CHECK_BORDER (CHECK_HEAD | CHECK_TAIL) #define CHECK_ALL (CHECK_BORDER | CHECK_INSIDE) extern Lisp_Object Qcomposition; extern Lisp_Object composition_hash_table; extern Lisp_Object Qauto_composed; extern Lisp_Object Vauto_composition_function; extern Lisp_Object Qauto_composition_function; extern int get_composition_id P_ ((int, int, int, Lisp_Object, Lisp_Object)); extern int find_composition P_ ((int, int, EMACS_INT *, EMACS_INT *, Lisp_Object *, Lisp_Object)); extern void update_compositions P_ ((EMACS_INT, EMACS_INT, int)); extern void make_composition_value_copy P_ ((Lisp_Object)); extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object, Lisp_Object)); extern void syms_of_composite P_ ((void)); extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object, Lisp_Object)); EXFUN (Fcompose_region_internal, 4); EXFUN (Fcompose_string_internal, 5); #endif /* not EMACS_COMPOSITE_H */ /* arch-tag: 59524d89-c645-47bd-b5e6-65e861690118 (do not change this comment) */