*** empty log message ***

[gnu-emacs] / src / casefiddle.c

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 212780acb21f2b7aea500b4dd0b5f11060084ba7..02ec3f76b4ee43f93f2b8828aaddc40d0d8d9a7e 100644 (file)
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,11 +1,12 @@
 /* GNU Emacs case conversion functions.
 /* GNU Emacs case conversion functions.

-   Copyright (C) 1985 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.

 
 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
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,16 +16,22 @@ 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
 
 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
 
 
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"

+#include "charset.h"

 #include "commands.h"
 #include "syntax.h"
 #include "commands.h"
 #include "syntax.h"

+#include "composite.h"
+#include "keymap.h"

 
 enum case_action {CASE_UP, CASE_DOWN, CASE_CAPITALIZE, CASE_CAPITALIZE_UP};
 
 enum case_action {CASE_UP, CASE_DOWN, CASE_CAPITALIZE, CASE_CAPITALIZE_UP};

+
+Lisp_Object Qidentity;

 \f
 Lisp_Object
 casify_object (flag, obj)
 \f
 Lisp_Object
 casify_object (flag, obj)


@@ -34,34 +41,74 @@ casify_object (flag, obj)
   register int i, c, len;
   register int inword = flag == CASE_DOWN;
 
   register int i, c, len;
   register int inword = flag == CASE_DOWN;
 

+  /* If the case table is flagged as modified, rescan it.  */
+  if (NILP (XCHAR_TABLE (current_buffer->downcase_table)->extras[1]))
+    Fset_case_table (current_buffer->downcase_table);
+

   while (1)
     {
   while (1)
     {

-      if (XTYPE (obj) == Lisp_Int)
+      if (INTEGERP (obj))

        {
        {

-         c = XINT (obj);
-         if (c >= 0 && c <= 0400)
+         int flagbits = (CHAR_ALT | CHAR_SUPER | CHAR_HYPER
+                         | CHAR_SHIFT | CHAR_CTL | CHAR_META);
+         int flags = XINT (obj) & flagbits;
+
+         /* If the character has higher bits set
+            above the flags, return it unchanged.
+            It is not a real character.  */
+         if ((unsigned) XFASTINT (obj) > (unsigned) flagbits)
+           return obj;
+
+         c = DOWNCASE (XFASTINT (obj) & ~flagbits);
+         if (inword)
+           XSETFASTINT (obj, c | flags);
+         else if (c == (XFASTINT (obj) & ~flagbits))

            {
            {

-             if (inword)
-               XFASTINT (obj) = DOWNCASE (c);
-             else if (!UPPERCASEP (c))
-               XFASTINT (obj) = UPCASE1 (c);
+             c = UPCASE1 ((XFASTINT (obj) & ~flagbits));
+             XSETFASTINT (obj, c | flags);

            }
          return obj;
        }
            }
          return obj;
        }

-      if (XTYPE (obj) == Lisp_String)
+
+      if (STRINGP (obj))

        {
        {

+         int multibyte = STRING_MULTIBYTE (obj);
+         int n;
+

          obj = Fcopy_sequence (obj);
          obj = Fcopy_sequence (obj);

-         len = XSTRING (obj)->size;
-         for (i = 0; i < len; i++)
+         len = SBYTES (obj);
+
+         /* I counts bytes, and N counts chars.  */
+         for (i = n = 0; i < len; n++)

            {
            {

-             c = XSTRING (obj)->data[i];
-             if (inword)
+             int from_len = 1, to_len = 1;
+
+             c = SREF (obj, i);
+
+             if (multibyte && c >= 0x80)
+               c = STRING_CHAR_AND_LENGTH (SDATA (obj) + i, len -i, from_len);
+             if (inword && flag != CASE_CAPITALIZE_UP)

                c = DOWNCASE (c);
                c = DOWNCASE (c);

-             else if (!UPPERCASEP (c))
+             else if (!UPPERCASEP (c)
+                      && (!inword || flag != CASE_CAPITALIZE_UP))

                c = UPCASE1 (c);
                c = UPCASE1 (c);

-             XSTRING (obj)->data[i] = c;
-             if (flag == CASE_CAPITALIZE)
+             if ((ASCII_BYTE_P (c) && from_len == 1)
+                 || (! multibyte && SINGLE_BYTE_CHAR_P (c)))
+               SSET (obj, i, c);
+             else
+               {
+                 to_len = CHAR_BYTES (c);
+                 if (from_len == to_len)
+                   CHAR_STRING (c, SDATA (obj) + i);
+                 else
+                   {
+                     Faset (obj, make_number (n), make_number (c));
+                     len += to_len - from_len;
+                   }
+               }
+             if ((int) flag >= (int) CASE_CAPITALIZE)

                inword = SYNTAX (c) == Sword;
                inword = SYNTAX (c) == Sword;

+             i += to_len;

            }
          return obj;
        }
            }
          return obj;
        }


@@ -70,40 +117,55 @@ casify_object (flag, obj)
 }
 
 DEFUN ("upcase", Fupcase, Supcase, 1, 1, 0,
 }
 
 DEFUN ("upcase", Fupcase, Supcase, 1, 1, 0,

-  "Convert argument to upper case and return that.\n\
-The argument may be a character or string.  The result has the same type.\n\
-The argument object is not altered.  See also `capitalize'.")
-  (obj)
+       doc: /* Convert argument to upper case and return that.
+The argument may be a character or string.  The result has the same type.
+The argument object is not altered--the value is a copy.
+See also `capitalize', `downcase' and `upcase-initials'.  */)
+     (obj)

      Lisp_Object obj;
 {
   return casify_object (CASE_UP, obj);
 }
 
 DEFUN ("downcase", Fdowncase, Sdowncase, 1, 1, 0,
      Lisp_Object obj;
 {
   return casify_object (CASE_UP, obj);
 }
 
 DEFUN ("downcase", Fdowncase, Sdowncase, 1, 1, 0,

-  "Convert argument to lower case and return that.\n\
-The argument may be a character or string.  The result has the same type.\n\
-The argument object is not altered.")
-  (obj)
+       doc: /* Convert argument to lower case and return that.
+The argument may be a character or string.  The result has the same type.
+The argument object is not altered--the value is a copy.  */)
+     (obj)

      Lisp_Object obj;
 {
   return casify_object (CASE_DOWN, obj);
 }
 
 DEFUN ("capitalize", Fcapitalize, Scapitalize, 1, 1, 0,
      Lisp_Object obj;
 {
   return casify_object (CASE_DOWN, obj);
 }
 
 DEFUN ("capitalize", Fcapitalize, Scapitalize, 1, 1, 0,

-  "Convert argument to capitalized form and return that.\n\
-This means that each word's first character is upper case\n\
-and the rest is lower case.\n\
-The argument may be a character or string.  The result has the same type.\n\
-The argument object is not altered.")
-  (obj)
+       doc: /* Convert argument to capitalized form and return that.
+This means that each word's first character is upper case
+and the rest is lower case.
+The argument may be a character or string.  The result has the same type.
+The argument object is not altered--the value is a copy.  */)
+     (obj)

      Lisp_Object obj;
 {
   return casify_object (CASE_CAPITALIZE, obj);
 }
      Lisp_Object obj;
 {
   return casify_object (CASE_CAPITALIZE, obj);
 }

+
+/* Like Fcapitalize but change only the initials.  */
+
+DEFUN ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0,
+       doc: /* Convert the initial of each word in the argument to upper case.
+Do not change the other letters of each word.
+The argument may be a character or string.  The result has the same type.
+The argument object is not altered--the value is a copy.  */)
+     (obj)
+     Lisp_Object obj;
+{
+  return casify_object (CASE_CAPITALIZE_UP, obj);
+}

 \f
 /* flag is CASE_UP, CASE_DOWN or CASE_CAPITALIZE or CASE_CAPITALIZE_UP.
    b and e specify range of buffer to operate on. */
 
 \f
 /* flag is CASE_UP, CASE_DOWN or CASE_CAPITALIZE or CASE_CAPITALIZE_UP.
    b and e specify range of buffer to operate on. */
 

+void

 casify_region (flag, b, e)
      enum case_action flag;
      Lisp_Object b, e;
 casify_region (flag, b, e)
      enum case_action flag;
      Lisp_Object b, e;


@@ -111,78 +173,161 @@ casify_region (flag, b, e)
   register int i;
   register int c;
   register int inword = flag == CASE_DOWN;
   register int i;
   register int c;
   register int inword = flag == CASE_DOWN;

+  register int multibyte = !NILP (current_buffer->enable_multibyte_characters);
+  int start, end;
+  int start_byte, end_byte;
+  int changed = 0;

 
   if (EQ (b, e))
     /* Not modifying because nothing marked */
     return;
 
 
   if (EQ (b, e))
     /* Not modifying because nothing marked */
     return;
 

+  /* If the case table is flagged as modified, rescan it.  */
+  if (NILP (XCHAR_TABLE (current_buffer->downcase_table)->extras[1]))
+    Fset_case_table (current_buffer->downcase_table);
+

   validate_region (&b, &e);
   validate_region (&b, &e);

-  modify_region (current_buffer, XFASTINT (b), XFASTINT (e));
-  record_change (XFASTINT (b), XFASTINT (e) - XFASTINT (b));
+  start = XFASTINT (b);
+  end = XFASTINT (e);
+  modify_region (current_buffer, start, end);
+  record_change (start, end - start);
+  start_byte = CHAR_TO_BYTE (start);
+  end_byte = CHAR_TO_BYTE (end);

 
 

-  for (i = XFASTINT (b); i < XFASTINT (e); i++)
+  for (i = start_byte; i < end_byte; i++, start++)

     {
     {

-      c = FETCH_CHAR (i);
+      int c2;
+      c = c2 = FETCH_BYTE (i);
+      if (multibyte && c >= 0x80)
+       /* A multibyte character can't be handled in this simple loop.  */
+       break;

       if (inword && flag != CASE_CAPITALIZE_UP)
        c = DOWNCASE (c);
       else if (!UPPERCASEP (c)
               && (!inword || flag != CASE_CAPITALIZE_UP))
        c = UPCASE1 (c);
       if (inword && flag != CASE_CAPITALIZE_UP)
        c = DOWNCASE (c);
       else if (!UPPERCASEP (c)
               && (!inword || flag != CASE_CAPITALIZE_UP))
        c = UPCASE1 (c);

-      FETCH_CHAR (i) = c;
+      if (multibyte && c >= 0x80)
+       /* A multibyte result character can't be handled in this
+          simple loop.  */
+       break;
+      FETCH_BYTE (i) = c;
+      if (c != c2)
+       changed = 1;

       if ((int) flag >= (int) CASE_CAPITALIZE)
       if ((int) flag >= (int) CASE_CAPITALIZE)

-       inword = SYNTAX (c) == Sword;
+       inword = SYNTAX (c) == Sword && (inword || !SYNTAX_PREFIX (c));
+    }
+  if (i < end_byte)
+    {
+      /* The work is not yet finished because of a multibyte character
+        just encountered.  */
+      int opoint = PT;
+      int opoint_byte = PT_BYTE;
+      int c2;
+
+      while (start < end)
+       {
+         if ((c = FETCH_BYTE (i)) >= 0x80)
+           c = FETCH_MULTIBYTE_CHAR (i);
+         c2 = c;
+         if (inword && flag != CASE_CAPITALIZE_UP)
+           c2 = DOWNCASE (c);
+         else if (!UPPERCASEP (c)
+                  && (!inword || flag != CASE_CAPITALIZE_UP))
+           c2 = UPCASE1 (c);
+         if (c != c2)
+           {
+             int fromlen, tolen, j;
+             unsigned char str[MAX_MULTIBYTE_LENGTH];
+
+             changed = 1;
+             /* Handle the most likely case */
+             if (c < 0400 && c2 < 0400)
+               FETCH_BYTE (i) = c2;
+             else if (fromlen = CHAR_STRING (c, str),
+                      tolen = CHAR_STRING (c2, str),
+                      fromlen == tolen)
+               {
+                 /* Length is unchanged.  */
+                 for (j = 0; j < tolen; ++j)
+                   FETCH_BYTE (i + j) = str[j];
+               }
+             else
+               {
+                 /* Replace one character with the other,
+                    keeping text properties the same.  */
+                 replace_range_2 (start, i,
+                                  start + 1, i + fromlen,
+                                  str, 1, tolen,
+                                  1);
+                 if (opoint > start)
+                   opoint_byte += tolen - fromlen;
+               }
+           }
+         if ((int) flag >= (int) CASE_CAPITALIZE)
+           inword = SYNTAX (c2) == Sword;
+         INC_BOTH (start, i);
+       }
+      TEMP_SET_PT_BOTH (opoint, opoint_byte);

     }
 
     }
 

-  signal_after_change (XFASTINT (b),
-                      XFASTINT (e) - XFASTINT (b), 
-                      XFASTINT (e) - XFASTINT (b));
+  start = XFASTINT (b);
+  if (changed)
+    {
+      signal_after_change (start, end - start, end - start);
+      update_compositions (start, end, CHECK_ALL);
+    }

 }
 
 DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r",
 }
 
 DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r",

-  "Convert the region to upper case.  In programs, wants two arguments.\n\
-These arguments specify the starting and ending character numbers of\n\
-the region to operate on.  When used as a command, the text between\n\
-point and the mark is operated on.\n\
-See also `capitalize-region'.")
-  (b, e)
-     Lisp_Object b, e;
+       doc: /* Convert the region to upper case.  In programs, wants two arguments.
+These arguments specify the starting and ending character numbers of
+the region to operate on.  When used as a command, the text between
+point and the mark is operated on.
+See also `capitalize-region'.  */)
+     (beg, end)
+     Lisp_Object beg, end;

 {
 {

-  casify_region (CASE_UP, b, e);
+  casify_region (CASE_UP, beg, end);

   return Qnil;
 }
 
 DEFUN ("downcase-region", Fdowncase_region, Sdowncase_region, 2, 2, "r",
   return Qnil;
 }
 
 DEFUN ("downcase-region", Fdowncase_region, Sdowncase_region, 2, 2, "r",

-  "Convert the region to lower case.  In programs, wants two arguments.\n\
-These arguments specify the starting and ending character numbers of\n\
-the region to operate on.  When used as a command, the text between\n\
-point and the mark is operated on.")
-  (b, e)
-     Lisp_Object b, e;
+       doc: /* Convert the region to lower case.  In programs, wants two arguments.
+These arguments specify the starting and ending character numbers of
+the region to operate on.  When used as a command, the text between
+point and the mark is operated on.  */)
+     (beg, end)
+     Lisp_Object beg, end;

 {
 {

-  casify_region (CASE_DOWN, b, e);
+  casify_region (CASE_DOWN, beg, end);

   return Qnil;
 }
 
 DEFUN ("capitalize-region", Fcapitalize_region, Scapitalize_region, 2, 2, "r",
   return Qnil;
 }
 
 DEFUN ("capitalize-region", Fcapitalize_region, Scapitalize_region, 2, 2, "r",

-  "Convert the region to capitalized form.\n\
-Capitalized form means each word's first character is upper case\n\
-and the rest of it is lower case.\n\
-In programs, give two arguments, the starting and ending\n\
-character positions to operate on.")
-  (b, e)
-     Lisp_Object b, e;
+       doc: /* Convert the region to capitalized form.
+Capitalized form means each word's first character is upper case
+and the rest of it is lower case.
+In programs, give two arguments, the starting and ending
+character positions to operate on.  */)
+     (beg, end)
+     Lisp_Object beg, end;

 {
 {

-  casify_region (CASE_CAPITALIZE, b, e);
+  casify_region (CASE_CAPITALIZE, beg, end);

   return Qnil;
 }
 
   return Qnil;
 }
 

-/* Like Fcapitalize but change only the initials.  */
+/* Like Fcapitalize_region but change only the initials.  */

 
 

-Lisp_Object
-upcase_initials_region (b, e)
-     Lisp_Object b, e;
+DEFUN ("upcase-initials-region", Fupcase_initials_region,
+       Supcase_initials_region, 2, 2, "r",
+       doc: /* Upcase the initial of each word in the region.
+Subsequent letters of each word are not changed.
+In programs, give two arguments, the starting and ending
+character positions to operate on.  */)
+     (beg, end)
+     Lisp_Object beg, end;

 {
 {

-  casify_region (CASE_CAPITALIZE_UP, b, e);
+  casify_region (CASE_CAPITALIZE_UP, beg, end);

   return Qnil;
 }
 \f
   return Qnil;
 }
 \f


@@ -193,28 +338,30 @@ operate_on_word (arg, newpoint)
 {
   Lisp_Object val;
   int farend;
 {
   Lisp_Object val;
   int farend;

+  int iarg;

 
 

-  CHECK_NUMBER (arg, 0);
-  farend = scan_words (point, XINT (arg));
+  CHECK_NUMBER (arg);
+  iarg = XINT (arg);
+  farend = scan_words (PT, iarg);

   if (!farend)
   if (!farend)

-    farend = XINT (arg) > 0 ? ZV : BEGV;
+    farend = iarg > 0 ? ZV : BEGV;

 
 

-  *newpoint = point > farend ? point : farend;
-  XFASTINT (val) = farend;
+  *newpoint = PT > farend ? PT : farend;
+  XSETFASTINT (val, farend);

 
   return val;
 }
 
 DEFUN ("upcase-word", Fupcase_word, Supcase_word, 1, 1, "p",
 
   return val;
 }
 
 DEFUN ("upcase-word", Fupcase_word, Supcase_word, 1, 1, "p",

-  "Convert following word (or ARG words) to upper case, moving over.\n\
-With negative argument, convert previous words but do not move.\n\
-See also `capitalize-word'.")
-  (arg)
+       doc: /* Convert following word (or ARG words) to upper case, moving over.
+With negative argument, convert previous words but do not move.
+See also `capitalize-word'.  */)
+     (arg)

      Lisp_Object arg;
 {
   Lisp_Object beg, end;
   int newpoint;
      Lisp_Object arg;
 {
   Lisp_Object beg, end;
   int newpoint;

-  XFASTINT (beg) = point;
+  XSETFASTINT (beg, PT);

   end = operate_on_word (arg, &newpoint);
   casify_region (CASE_UP, beg, end);
   SET_PT (newpoint);
   end = operate_on_word (arg, &newpoint);
   casify_region (CASE_UP, beg, end);
   SET_PT (newpoint);


@@ -222,14 +369,14 @@ See also `capitalize-word'.")
 }
 
 DEFUN ("downcase-word", Fdowncase_word, Sdowncase_word, 1, 1, "p",
 }
 
 DEFUN ("downcase-word", Fdowncase_word, Sdowncase_word, 1, 1, "p",

-  "Convert following word (or ARG words) to lower case, moving over.\n\
-With negative argument, convert previous words but do not move.")
-  (arg)
+       doc: /* Convert following word (or ARG words) to lower case, moving over.
+With negative argument, convert previous words but do not move.  */)
+     (arg)

      Lisp_Object arg;
 {
   Lisp_Object beg, end;
   int newpoint;
      Lisp_Object arg;
 {
   Lisp_Object beg, end;
   int newpoint;

-  XFASTINT (beg) = point;
+  XSETFASTINT (beg, PT);

   end = operate_on_word (arg, &newpoint);
   casify_region (CASE_DOWN, beg, end);
   SET_PT (newpoint);
   end = operate_on_word (arg, &newpoint);
   casify_region (CASE_DOWN, beg, end);
   SET_PT (newpoint);


@@ -237,35 +384,41 @@ With negative argument, convert previous words but do not move.")
 }
 
 DEFUN ("capitalize-word", Fcapitalize_word, Scapitalize_word, 1, 1, "p",
 }
 
 DEFUN ("capitalize-word", Fcapitalize_word, Scapitalize_word, 1, 1, "p",

-  "Capitalize the following word (or ARG words), moving over.\n\
-This gives the word(s) a first character in upper case\n\
-and the rest lower case.\n\
-With negative argument, capitalize previous words but do not move.")
-  (arg)
+       doc: /* Capitalize the following word (or ARG words), moving over.
+This gives the word(s) a first character in upper case
+and the rest lower case.
+With negative argument, capitalize previous words but do not move.  */)
+     (arg)

      Lisp_Object arg;
 {
   Lisp_Object beg, end;
   int newpoint;
      Lisp_Object arg;
 {
   Lisp_Object beg, end;
   int newpoint;

-  XFASTINT (beg) = point;
+  XSETFASTINT (beg, PT);

   end = operate_on_word (arg, &newpoint);
   casify_region (CASE_CAPITALIZE, beg, end);
   SET_PT (newpoint);
   return Qnil;
 }
 \f
   end = operate_on_word (arg, &newpoint);
   casify_region (CASE_CAPITALIZE, beg, end);
   SET_PT (newpoint);
   return Qnil;
 }
 \f

+void

 syms_of_casefiddle ()
 {
 syms_of_casefiddle ()
 {

+  Qidentity = intern ("identity");
+  staticpro (&Qidentity);

   defsubr (&Supcase);
   defsubr (&Sdowncase);
   defsubr (&Scapitalize);
   defsubr (&Supcase);
   defsubr (&Sdowncase);
   defsubr (&Scapitalize);

+  defsubr (&Supcase_initials);

   defsubr (&Supcase_region);
   defsubr (&Sdowncase_region);
   defsubr (&Scapitalize_region);
   defsubr (&Supcase_region);
   defsubr (&Sdowncase_region);
   defsubr (&Scapitalize_region);

+  defsubr (&Supcase_initials_region);

   defsubr (&Supcase_word);
   defsubr (&Sdowncase_word);
   defsubr (&Scapitalize_word);
 }
 
   defsubr (&Supcase_word);
   defsubr (&Sdowncase_word);
   defsubr (&Scapitalize_word);
 }
 

+void

 keys_of_casefiddle ()
 {
   initial_define_key (control_x_map, Ctl('U'), "upcase-region");
 keys_of_casefiddle ()
 {
   initial_define_key (control_x_map, Ctl('U'), "upcase-region");


@@ -277,3 +430,6 @@ keys_of_casefiddle ()
   initial_define_key (meta_map, 'l', "downcase-word");
   initial_define_key (meta_map, 'c', "capitalize-word");
 }
   initial_define_key (meta_map, 'l', "downcase-word");
   initial_define_key (meta_map, 'c', "capitalize-word");
 }

+
+/* arch-tag: 60a73c66-5489-47e7-a81f-cead4057c526
+   (do not change this comment) */