comparison src/editfns.c @ 22698:ea6ef56295b4

(Fformat): Pay attention to the byte combining problem.

22697:578f11200ed5

  register unsigned char *format, *end;
  int length, nchars;
  /* Nonzero if the output should be a multibyte string,
     which is true if any of the inputs is one.  */
  int multibyte = 0;
  unsigned char *this_format;
  int longest_format;
  Lisp_Object val;

  extern char *index ();

  nchars = 0;
  n = 0;

  /* Scan the format and store result in BUF.  */
  format = XSTRING (args[0])->data;
  while (format != end)
    {
      if (*format == '%')
	{
	  int minlen;

		  {
		    *p++ = ' ';
		    nchars++;
		  }

	      nbytes = copy_text (XSTRING (args[n])->data, p,
				  STRING_BYTES (XSTRING (args[n])),
				  STRING_MULTIBYTE (args[n]), multibyte);
	      p += nbytes;
	      nchars += XSTRING (args[n])->size;

	      if (INTEGERP (args[n]))
		sprintf (p, this_format, XINT (args[n]));
	      else
		sprintf (p, this_format, XFLOAT (args[n])->data);

	      this_nchars = strlen (p);
	      p += this_nchars;
	      nchars += this_nchars;
	    }
	}
      else if (STRING_MULTIBYTE (args[0]))
	{
	  /* Copy a whole multibyte character.  */
	  *p++ = *format++;
	  while (! CHAR_HEAD_P (*format)) *p++ = *format++;
	  nchars++;
	}
      else if (multibyte)

	}
      else
	*p++ = *format++, nchars++;
    }

  val = make_specified_string (buf, nchars, p - buf, multibyte);

  /* If we allocated BUF with malloc, free it too.  */
  if (total >= 1000)
    xfree (buf);

22698:ea6ef56295b4

  register unsigned char *format, *end;
  int length, nchars;
  /* Nonzero if the output should be a multibyte string,
     which is true if any of the inputs is one.  */
  int multibyte = 0;
  /* When we make a multibyte string, we must pay attention to the
     byte combining problem, i.e., a byte may be combined with a
     multibyte charcter of the previous string.  This flag tells if we
     must consider such a situation or not.  */
  int maybe_combine_byte;
  unsigned char *this_format;
  int longest_format;
  Lisp_Object val;

  extern char *index ();

  nchars = 0;
  n = 0;

  /* Scan the format and store result in BUF.  */
  format = XSTRING (args[0])->data;
  maybe_combine_byte = 0;
  while (format != end)
    {
      if (*format == '%')
	{
	  int minlen;

		  {
		    *p++ = ' ';
		    nchars++;
		  }

	      if (p > buf
		  && multibyte
		  && *((unsigned char *) p - 1) >= 0x80
		  && STRING_MULTIBYTE (args[n])
		  && XSTRING (args[n])->data[0] >= 0xA0)
		maybe_combine_byte = 1;
	      nbytes = copy_text (XSTRING (args[n])->data, p,
				  STRING_BYTES (XSTRING (args[n])),
				  STRING_MULTIBYTE (args[n]), multibyte);
	      p += nbytes;
	      nchars += XSTRING (args[n])->size;

	      if (INTEGERP (args[n]))
		sprintf (p, this_format, XINT (args[n]));
	      else
		sprintf (p, this_format, XFLOAT (args[n])->data);

	      if (p > buf
		  && multibyte
		  && *((unsigned char *) p - 1) >= 0x80
		  && *((unsigned char *) p) >= 0xA0)
		maybe_combine_byte = 1;
	      this_nchars = strlen (p);
	      p += this_nchars;
	      nchars += this_nchars;
	    }
	}
      else if (STRING_MULTIBYTE (args[0]))
	{
	  /* Copy a whole multibyte character.  */
	  if (p > buf
	      && multibyte
	      && *((unsigned char *) p - 1) >= 0x80
	      && *format >= 0xA0)
	    maybe_combine_byte = 1;
	  *p++ = *format++;
	  while (! CHAR_HEAD_P (*format)) *p++ = *format++;
	  nchars++;
	}
      else if (multibyte)

	}
      else
	*p++ = *format++, nchars++;
    }

  if (maybe_combine_byte)
    nchars = multibyte_chars_in_text (buf, p - buf);
  val = make_specified_string (buf, nchars, p - buf, multibyte);

  /* If we allocated BUF with malloc, free it too.  */
  if (total >= 1000)
    xfree (buf);