/[emacs]/emacs/src/composite.c
ViewVC logotype

Diff of /emacs/src/composite.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.16 by pj, Fri Nov 2 20:21:05 2001 UTC revision 1.17 by pj, Tue Nov 13 07:44:43 2001 UTC
# Line 717  compose_chars_in_text (start, end, strin Line 717  compose_chars_in_text (start, end, strin
717    
718  DEFUN ("compose-region-internal", Fcompose_region_internal,  DEFUN ("compose-region-internal", Fcompose_region_internal,
719         Scompose_region_internal, 2, 4, 0,         Scompose_region_internal, 2, 4, 0,
720    "Internal use only.\n\         doc: /* Internal use only.
721  \n\  
722  Compose text in the region between START and END.\n\  Compose text in the region between START and END.
723  Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC\n\  Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC
724  for the composition.   See `compose-region' for more detial.")  for the composition.   See `compose-region' for more detial. */)
725    (start, end, components, mod_func)       (start, end, components, mod_func)
726       Lisp_Object start, end, components, mod_func;       Lisp_Object start, end, components, mod_func;
727  {  {
728    validate_region (&start, &end);    validate_region (&start, &end);
# Line 738  for the composition.   See `compose-regi Line 738  for the composition.   See `compose-regi
738    
739  DEFUN ("compose-string-internal", Fcompose_string_internal,  DEFUN ("compose-string-internal", Fcompose_string_internal,
740         Scompose_string_internal, 3, 5, 0,         Scompose_string_internal, 3, 5, 0,
741    "Internal use only.\n\         doc: /* Internal use only.
742  \n\  
743  Compose text between indices START and END of STRING.\n\  Compose text between indices START and END of STRING.
744  Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC\n\  Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC
745  for the composition.   See `compose-string' for more detial.")  for the composition.   See `compose-string' for more detial.  */)
746    (string, start, end, components, mod_func)       (string, start, end, components, mod_func)
747       Lisp_Object string, start, end, components, mod_func;       Lisp_Object string, start, end, components, mod_func;
748  {  {
749    CHECK_STRING (string);    CHECK_STRING (string);
# Line 761  for the composition.   See `compose-stri Line 761  for the composition.   See `compose-stri
761    
762  DEFUN ("find-composition-internal", Ffind_composition_internal,  DEFUN ("find-composition-internal", Ffind_composition_internal,
763         Sfind_composition_internal, 4, 4, 0,         Sfind_composition_internal, 4, 4, 0,
764    "Internal use only.\n\         doc: /* Internal use only.
765  \n\  
766  Return information about composition at or nearest to position POS.\n\  Return information about composition at or nearest to position POS.
767  See `find-composition' for more detail.")  See `find-composition' for more detail.  */)
768    (pos, limit, string, detail_p)       (pos, limit, string, detail_p)
769       Lisp_Object pos, limit, string, detail_p;       Lisp_Object pos, limit, string, detail_p;
770  {  {
771    Lisp_Object prop, tail;    Lisp_Object prop, tail;
# Line 861  syms_of_composite () Line 861  syms_of_composite ()
861      = Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky);      = Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky);
862    
863    DEFVAR_LISP ("compose-chars-after-function", &Vcompose_chars_after_function,    DEFVAR_LISP ("compose-chars-after-function", &Vcompose_chars_after_function,
864      "Function to adjust composition of buffer text.\n\                 doc: /* Function to adjust composition of buffer text.
865  \n\  
866  The function is called with three arguments FROM, TO, and OBJECT.\n\  The function is called with three arguments FROM, TO, and OBJECT.
867  FROM and TO specify the range of text of which composition should be\n\  FROM and TO specify the range of text of which composition should be
868  adjusted.  OBJECT, if non-nil, is a string that contains the text.\n\  adjusted.  OBJECT, if non-nil, is a string that contains the text.
869  \n\  
870  This function is called after a text with `composition' property is\n\  This function is called after a text with `composition' property is
871  inserted or deleted to keep `composition' property of buffer text\n\  inserted or deleted to keep `composition' property of buffer text
872  valid.\n\  valid.
873  \n\  
874  The default value is the function `compose-chars-after'.");  The default value is the function `compose-chars-after'.  */);
875    Vcompose_chars_after_function = intern ("compose-chars-after");    Vcompose_chars_after_function = intern ("compose-chars-after");
876    
877    Qcomposition_function_table = intern ("composition-function-table");    Qcomposition_function_table = intern ("composition-function-table");
# Line 885  The default value is the function `compo Line 885  The default value is the function `compo
885    Fput (Qcomposition_function_table, Qchar_table_extra_slots, make_number (0));    Fput (Qcomposition_function_table, Qchar_table_extra_slots, make_number (0));
886    
887    DEFVAR_LISP ("composition-function-table", &Vcomposition_function_table,    DEFVAR_LISP ("composition-function-table", &Vcomposition_function_table,
888      "Char table of patterns and functions to make a composition.\n\                 doc: /* Char table of patterns and functions to make a composition.
889  \n\  
890  Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs\n\  Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs
891  are regular expressions and FUNCs are functions.  FUNC is responsible\n\  are regular expressions and FUNCs are functions.  FUNC is responsible
892  for composing text matching the corresponding PATTERN.  FUNC is called\n\  for composing text matching the corresponding PATTERN.  FUNC is called
893  with three arguments FROM, TO, and PATTERN.  See the function\n\  with three arguments FROM, TO, and PATTERN.  See the function
894  `compose-chars-after' for more detail.\n\  `compose-chars-after' for more detail.
895  \n\  
896  This table is looked up by the first character of a composition when\n\  This table is looked up by the first character of a composition when
897  the composition gets invalid after a change in a buffer.");  the composition gets invalid after a change in a buffer.  */);
898    Vcomposition_function_table    Vcomposition_function_table
899      = Fmake_char_table (Qcomposition_function_table, Qnil);      = Fmake_char_table (Qcomposition_function_table, Qnil);
900    

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26