1 2007-06-22 Jason Rumney <jasonr@gnu.org>
3 * w32bdf.c (get_quoted_string): Make function static.
5 2007-06-20 Kenichi Handa <handa@m17n.org>
7 * xftfont.c (xftfont_open): If one of font's ASCII glyph has
8 bigger ascent and descent than those of the font, use them as
9 font's ascent and descent.
11 2007-06-18 Kenichi Handa <handa@m17n.org>
13 * Makefile.in (${lispsource}international/charprop.el): Move this
14 target within "#ifdef HAVE_UNIDATA" and "#endif".
16 2007-06-16 Kenichi Handa <handa@m17n.org>
18 * Makefile.in (lisp): Add ${lispsource}language/tai-viet.el.
19 (shortlisp): Add ../lisp/language/tai-viet.el.
21 2007-06-15 Ulrich Mueller <ulm@gentoo.org> (tiny change)
23 * Makefile.in (${lispsource}international/charprop.el): Depend on
26 2007-06-13 Jason Rumney <jasonr@gnu.org>
28 * w32font.c (w32font_close): Delete the GDI font object.
30 * w32menu.c: Include character.h
32 * w32proc.c: Likewise.
34 * w32select.c: Likewise.
36 * makefile.w32-in (w32proc.o): Depend on character.h
38 2007-06-11 Jason Rumney <jasonr@gnu.org>
40 * w32fns.c (syms_of_w32fns): Use DEFSYM macro.
42 * w32menu.c (syms_of_w32menu): Likewise.
44 * w32proc.c (syms_of_ntproc): Likewise.
46 * w32select.c (syms_of_w32select): Likewise.
48 * w32term.c (syms_of_w32term): Likewise.
50 2007-06-06 Jason Rumney <jasonr@gnu.org>
52 * w32font.c (w32font_draw): Delete brush after using it.
54 2007-06-04 Jason Rumney <jasonr@gnu.org>
56 * w32font.c (w32font_open): Don't set font_idx.
57 (w32font_text_extents): Try GetTextExtentPoint32W before defaulting
59 (w32font_draw): Fill background explicitly.
61 2007-06-03 Jason Rumney <jasonr@gnu.org>
63 * w32term.c (w32_initialize): Don't call w32font_initialize.
65 * w32font.c (w32font_info): Remove subranges.
66 (QCsubranges, Qmodern, Qswiss, Qroman): Remove.
67 (QCfamily, Qmonospace, Qsans_serif, Qmono, Qsans, Qsans__serif)
68 (Qraster, Qoutline, Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian)
69 (Qhebrew, Qarabic, Qsyriac, Qnko, Qthaana, Qdevanagari, Qbengali)
70 (Qgurmukhi, Qgujarati, Qoriya, Qtamil, Qtelugu, Qkannada)
71 (Qmalayalam, Qsinhala, Qthai, Qlao, Qtibetan, Qmyanmar, Qgeorgian)
72 (Qhangul, Qethiopic, Qcherokee, Qcanadian_aboriginal, Qogham)
73 (Qrunic, Qkhmer, Qmongolian, Qsymbol, Qbraille, Qhan)
74 (Qideographic_description, Qcjk_misc, Qkana, Qbopomofo, Qkanbun)
75 (Qyi, Qbyzantine_musical_symbol, Qmusical_symbol, Qmathematical):
77 (font_callback_data): New struct.
78 (w32font_list, w32font_match): Use it.
79 (w32font_open): Don't populate subranges.
80 (w32font_has_char): Use script Lisp symbols, not subrange bitmask.
81 (w32font_encode_char): Always return unicode code-point as-is.
82 (w32font_text_extents): Supply a tranformation matrix to
83 GetGlyphOutline. Never look up by glyph index. Avoid looping
84 twice. Use unicode version of GetTexExtentPoint32 instead of
86 (set_fonts_frame): Remove
87 (w32_enumfont_pattern_entity): Add frame parameter, use it to
88 set frame parameter. Use backward compatible fake foundries.
89 Save generic family in extra slot under QCfamily. Make width slot
90 constant. Save QCspacing value. Save list of scripts instead of
92 (w32_generic_family, logfonts_match, font_matches_spec): New functions.
93 (add_font_entity_to_list): Use font_callback_data struct. Filter
95 (add_one_font_entity_to_list): Use font_callback_data struct.
96 (w32_registry): Default to iso10646_1;
97 (fill_in_logfont): Use dpi from extra slot. Don't bother with
98 string font registries. Don't fill in font name if it is a generic
99 family name, fill family instead. Use spacing, family and script
100 extra info to fill pitch, family and charset fields.
101 (list_all_matching_fonts): Use font_callback_data struct.
102 (unicode_range_for_char): Remove.
103 (font_supported_scripts): New function.
104 (w32font_initialize): Remove.
105 (syms_of_w32font): Update which symbols are defined.
107 2007-06-02 Jason Rumney <jasonr@gnu.org>
109 * font.c (font_pixel_size): Reverse assq_no_quit args.
111 * w32term.h (FONT_WIDTH): Report max width, not average.
112 (FONT_MAX_WIDTH): Remove.
113 (FONT_AVG_WIDTH): New macro.
115 * xfaces.c (Fx_list_fonts) [WINDOWSNT]: Remove Windows only
116 redefinition of FONT_WIDTH.
118 * w32term.c (x_font_min_bounds): Use FONT_AVG_WIDTH.
119 (w32_cache_char_metrics): Use FONT_WIDTH.
121 * w32fns.c (w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH.
123 2007-06-01 Jason Rumney <jasonr@gnu.org>
125 * w32font.c (w32font_open): Make lfHeight negative.
127 * w32fns.c (x_default_font_parameter): Use new style font name.
128 (Fx_create_frame, x_create_tip_frame): Initialize resx and resy.
130 2007-05-31 Jason Rumney <jasonr@gnu.org>
132 * w32font.c (QCsubranges): New symbol.
133 (w32font_open, w32font_has_char): Get subranges from subproperty
135 (w32_enumfont_pattern_entity): Set subranges as subproperty of extra.
136 (syms_of_w32font): Define :subranges symbol.
138 * font.c (font_put_extra): Expose externally.
140 * font.h (font_put_extra): Moved declaration from font.c.
142 * font.c (Ffont_get): Use font driver to determine otf capability.
143 (adjust_anchor): Check if driver defines anchor_point before using.
145 * w32font.c (w32font_open): Handle size, height and pixel_size better.
146 (w32font_draw): Use options.
147 (w32_enumfont_pattern_entity): Set size to 0 for scalable fonts.
148 Fix detection of truetype fonts.
149 (registry_to_w32_charset): Handle charsets other than iso8859-1
150 expressed as lisp symbols.
151 (w32_registry): Express charset as lisp symbol.
152 (fill_in_logfont): Reverse pixel and point height logic.
153 Don't set width here. Set quality to default.
155 * w32fns.c (w32_load_system_font): Fix detecting FIXED_PITCH fonts.
156 (x_to_w32_font): Fill in lfPitchAndFamily correctly.
158 * xterm.c (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]:
159 Remove redundant loop and allocation.
161 * makefile.w32-in (font.o, w32font.o): New objects.
162 (fontset.o, xdisp.o, xfaces.o, w32fns.o, w32term.o): Depend on font.h
163 (FONTOBJ): New group of objects conditioned on USE_FONT_BACKEND.
165 * xdisp.c (fill_composite_glyph_string): Make the first arg to
166 STORE_XCHARB a valid l-value.
168 * w32term.c (w32_native_per_char_metric): Swap width and rbearing
169 calculations for non-Truetype fonts.
170 (x_draw_glyph_string): Sync with xterm.c.
171 (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]: Remove
173 (w32_initialize) [USE_FONT_BACKEND]: Call w32font_initialize.
175 * w32term.h (w32_output_data) [USE_FONT_BACKEND]: Add fontp member.
176 (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro from xterm.h.
178 * w32fns.c [USE_FONT_BACKEND]: Port font backend changes from xfns.c.
179 (x_to_w32_charset, w32_to_x_charset): Expose externally.
181 * w32font.c: New file for w32 font backend.
183 2007-05-28 Kenichi Handa <handa@m17n.org>
185 * term.c: Don't include "buffer.h" twice.
187 2007-05-21 Kenichi Handa <handa@m17n.org>
189 * syntax.c (skip_syntaxes): Synch with the trunk.
191 2007-05-14 Kenichi Handa <handa@m17n.org>
193 * character.c (Funibyte_string): New function.
194 (syms_of_character): Defsubr it.
196 2007-05-01 Jason Rumney <jasonr@gnu.org>
198 * w32term.c [USE_FONT_BACKEND]:
199 (x_get_font_repertory, note_mouse_movement, x_set_mouse_face_gc):
200 (x_set_glyph_string_clipping, x_set_glyph_string_clipping_exactly):
201 (x_draw_glyph_string, x_draw_glyph_string_foreground):
202 (x_draw_composite_glyph_string_foreground, x_new_fontset2):
203 (x_free_frame_resources): Sync with xterm.c.
205 2007-04-29 Andreas Schwab <schwab@suse.de>
207 * lread.c (read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
210 2007-04-26 Kenichi Handa <handa@m17n.org>
212 * font.c (check_otf_features): Define it regardless of
215 2007-04-25 Kenichi Handa <handa@m17n.org>
217 * ftfont.c (ftfont_driver): Delete font_otf_gsub and
218 font_otf_gpos, add font_drive_otf.
220 * fontset.c (fontset_find_font): Pay attention to font size
221 specified for a font.
222 (reorder_font_vector): Check contents of font_def.
224 * font.c (struct otf_list): Delete it.
225 (otf_list): Make it a lisp variable..
226 (otf_open): Use lispy otf_list.
227 (generate_otf_features): Renamed from parse_gsub_gpos_spec.
228 (check_otf_features): New function.
229 (font_otf_DeviceTable, font_otf_ValueRecord, font_otf_Anchor): New
231 (font_drive_otf): New function merging font_otf_gsub and
233 (font_open_for_lface): New arg spec. Change argument order.
234 (font_load_for_face): Adjusted for the change of
236 (Ffont_drive_otf): New function merging Ffont_otf_gsub and
238 (syms_of_font): Staticpro otf_list. Delete defsubr of
239 Sfont_otf_gsub and Sfont_otf_gpos. Defsubr Sfont_drive_otf.
241 * xfaces.c (set_font_frame_param): Adjusted for the change of
244 * font.h (font_open_for_lface): Adjust prototype.
245 (struct font_driver): Delete members otf_gsub and otf_gpos, add
247 (font_otf_gsub, font_otf_gpos): Delete externs.
248 (font_drive_otf): Extern it.
250 2007-04-24 Kenichi Handa <handa@m17n.org>
252 * font.c (font_at): If the window W is not on a window system,
255 * coding.c (produce_chars): Don't call insert_from_gap if no
256 characters to produce.
257 (encode_coding): Likewise.
259 2007-04-17 Kenichi Handa <handa@m17n.org>
261 * fontset.c (free_realized_fontsets): Avoid unnecessary call of
264 * xfaces.c (face_for_font): Check also face->font==font->font.font.
266 2007-04-16 Miles Bader <miles@gnu.org>
268 * emacs.c (main): Change default value of `enable_font_backend' to 1.
269 Parse "--disable-font-backend" option.
270 (standard_args): Add "--disable-font-backend" option.
272 2007-04-13 Kenichi Handa <handa@m17n.org>
274 * fontset.c (fontset_find_font): New function.
275 (fontset_font): Use fontset_find_font.
276 (make_fontset_for_ascii_face): Don't set face ID in rfont_def.
277 Register the specified font for all Latin characters.
278 (new_fontset_from_font): Register the specified font for all Latin
280 (dump_fontset): For a realized fontset, include the base fontset
281 name in the returned vector.
283 2007-04-11 Kenichi Handa <handa@m17n.org>
285 * character.h (CHAR_STRING): Cast C to unsigned on calling
288 * character.c (char_string): Type of arg C changed to unsigned.
289 Signal an error if C is an invalid character code.
291 * editfns.c (general_insert_function): Use CHARACTERP, not INTEGERP.
292 (Fchar_to_string): Likewise.
294 2007-03-23 Kenichi Handa <handa@m17n.org>
296 * character.h (MIN_MULTIBYTE_LEADING_CODE)
297 (MAX_MULTIBYTE_LEADING_CODE): New macros.
299 * regex.c (analyse_first): Fix for multibyte characters in "case
300 charset:" and "case categoryspec:".
302 2007-03-04 Andreas Schwab <schwab@suse.de>
304 * Makefile.in (LIBES): Move standard libraries to the end.
306 2007-02-27 Kenichi Handa <handa@m17n.org>
308 * process.c: Cancel the change done by sync with HEAD.
310 2007-02-23 Kenichi Handa <handa@m17n.org>
312 * alloc.c (Fgarbage_collect): If nextb->text->inhibit_shrinking is
313 nonzero, don't shrink the buffer nextb.
315 * buffer.h (struct buffer_text): New member inhibit_shrinking.
317 * coding.c (coding_alloc_by_making_gap): New arg offset.
318 (alloc_destination): Call coding_alloc_by_making_gap with the arg
320 (decode_coding_iso_2022): Update coding->safe_charsets.
321 (decode_coding_gap): Temporarily set
322 current_buffer->text->inhibit_shrinking to 1.
324 2007-02-20 Kenichi Handa <handa@m17n.org>
326 * xterm.c (x_draw_composite_glyph_string_foreground): Fix
327 indexing into elements of s->cmp and s->char2b.
329 2007-02-16 Juanma Barranquero <lekktu@gmail.com>
331 * regex.c (RE_STRING_CHAR_AND_LENGTH) [! emacs]: Add missing arg `len'.
333 2007-02-16 Kenichi Handa <handa@m17n.org>
335 * regex.c (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
336 target_multibyte instead of multibyte.
337 (re_match_2_internal): Call bcmp_translate with target_multibyte.
338 (bcmp_translate): Change the argument name from multibyte to
341 2007-02-15 Kenichi Handa <handa@m17n.org>
343 These changes are to compile a regexp into a pattern that can be
344 used both for multibyte and unibyte targets.
346 * Makefile.in (search.o): Depend on charset.h.
348 * character.c (multibyte_char_to_unibyte_safe): New function.
350 * search.c: Include "charset.h".
351 (compile_pattern_1): Delete argument multibyte. Don't set
352 cp->buf.target_multibyte here. Set cp->buf.charset_unibyte.
353 (compile_pattern): Don't compare cp->buf.target_multibyte.
354 Compare cp->buf.charset_unibyte.
355 (compile_pattern): Set cp->buf.target_multibyte.
357 * lisp.h (multibyte_char_to_unibyte_safe): Extern it.
359 * regex.h (struct re_pattern_buffer): New member charset_unibyte.
361 * regex.c (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
362 multibyte. Callers changed.
363 (RE_CHAR_TO_MULTIBYTE, RE_CHAR_TO_UNIBYTE): New macros.
364 (MAKE_CHAR_MULTIBYTE, MAKE_CHAR_UNIBYTE): Deleted. Callers
365 changed to use RE_CHAR_TO_MULTIBYTE and RE_CHAR_TO_UNIBYTE
367 (SETUP_ASCII_RANGE, SETUP_UNIBYTE_RANGE): New macros.
368 (SETUP_MULTIBYTE_RANGE): Generate a more compact range_table.
369 (regex_compile): Make the compiled pattern usable both for
370 multibyte and unibyte targets.
371 (analyse_first): Make the fastmap usable both for multibyte and
373 (TRANSLATE_VIA_MULTIBYTE): Deleted.
374 (re_match_2_internal): Pay attention to the case that the
375 multibyteness of bufp and target may be different.
377 2007-02-14 Kenichi Handa <handa@m17n.org>
379 * xdisp.c (x_produce_glyphs): When a font is not found, make the
380 empty box occupy at least one column width.
382 2007-01-30 Miles Bader <miles@gnu.org>
384 * Makefile.in: Remove redundant HAVE_XFT clause.
386 2006-12-20 Kenichi Handa <handa@m17n.org>
388 * xrdb.c (x_load_resources): Setup the default fontSet X reource.
390 2006-12-15 Kenichi Handa <handa@m17n.org>
392 * regex.c (regex_compile): Synch with HEAD.
394 2006-12-12 Kenichi Handa <handa@m17n.org>
396 * fontset.c (Finternal_char_font): Fix previous change.
398 2006-12-07 Kenichi Handa <handa@m17n.org>
400 * fontset.c (Finternal_char_font): Fix for the case of POSITION
403 2006-12-06 Kenichi Handa <handa@m17n.org>
405 * xftfont.c (xftfont_open): Call FcConfigSubstitute.
407 2006-12-05 Kenichi Handa <handa@m17n.org>
409 * xftfont.c (xftfont_open): Don't enable antialias explicitly.
411 2006-11-30 Kenichi Handa <handa@m17n.org>
413 * search.c (simple_search): Fix previous change.
415 2006-11-29 Kenichi Handa <handa@m17n.org>
417 * xftfont.c (ftfont_font_format): Extern declaration.
419 * frame.c (x_set_font): Fix the second arg to fs_query_fontset.
421 * xfont.c (xfont_driver): Initialize ftfont_driver.type by 0.
422 (xfont_list): Don't directly use Lisp_Object as an operand of &&.
424 * ftfont.c (ftfont_driver): Initialize ftfont_driver.type by 0.
425 (ftfont_font_format): Fix previous change.
427 * font.h (Ffont_xlfd_name): EXFUN it.
429 * font.c (font_parse_xlfd): Fix the array size of `f'.
430 (register_font_driver): Use EQ to compare driver->type.
432 * xfns.c (xic_create_xfontset2) [USE_FONT_BACKEND]: New function.
433 (create_frame_xic) [USE_FONT_BACKEND]: Call xic_create_xfontset2.
434 (xic_set_xfontset) [USE_FONT_BACKEND]: Likewise.
436 2006-11-27 Kenichi Handa <handa@m17n.org>
438 * ftfont.c (ftfont_pattern_entity): Check if FC_FONTFORMAT is
440 (ftfont_list_generic_family, ftfont_list, ftfont_font_format):
443 2006-11-24 Kenichi Handa <handa@m17n.org>
445 * xfont.c (xfont_open): Set font->format.
447 * xftfont.c (xftfont_open): Set font->format.
449 * ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern.
450 (ftfont_list): Include FC_FONTFORMAT in FcObject.
451 (ftfont_open): Set font->format.
452 (ftfont_font_format): New function.
454 * font.h (struct font): New memeber format.
456 * font.c (Qopentype): New variable.
457 (syms_of_font): Defsym it.
458 (Fquery_font): Change the format of the last element of the return
461 2006-11-22 Kenichi Handa <handa@m17n.org>
463 * search.c (simple_search): Fix sync with HEAD.
465 2006-11-17 Kenichi Handa <handa@m17n.org>
467 * xfns.c (xic_create_xfontset): Try the default fontset name as a
470 2006-11-08 Kenichi Handa <handa@m17n.org>
472 * coding.c (detect_coding_charset): Fix detection of multi-byte
475 2006-11-07 Bob Halley <halley@play-bow.org> (tiny change)
477 * ccl.c (ccl_driver): If DST is NULL, set ccl->produced to 0.
479 2006-10-31 Kenichi Handa <handa@m17n.org>
481 * xdisp.c (get_next_display_element): Set it->face_id for the
482 first component of a composition.
483 (x_produce_glyphs): Check if the font is changed or not for
486 2006-10-31 Kenichi Handa <handa@m17n.org>
488 (get_next_display_element): Set it->face_id for the
489 first component of a composition.
490 (x_produce_glyphs): Check if the font is changed or not for
493 2006-10-30 Kenichi Handa <handa@m17n.org>
495 * fontset.c (Qlatin): New variable.
496 (syms_of_fontset): Define it as a lisp symbol.
497 (Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for
500 2006-10-27 Kenichi Handa <handa@m17n.org>
502 * font.c (font_unparse_fcname): Pay attention to the case that
503 some of font property is a null string.
505 2006-10-26 Kenichi Handa <handa@m17n.org>
507 * term.c: Include "composite.h".
508 (encode_terminal_code): Output all components of composition.
509 Check the size of encode_terminal_src.
510 (produce_glyphs): For compostion, call produce_composite_glyph.
511 (append_composite_glyph, produce_composite_glyph): New functions.
513 * xdisp.c (x_produce_glyphs): In handling composition, if a font
514 is not found, get font_info from the current ascii face.
516 2006-10-23 Kenichi Handa <handa@m17n.org>
518 * fileio.c (Finsert_file_contents): On replacing, temporarily bind
519 buffer-file-name to Qnil before calling insert_from_buffer.
521 * font.c (font_unparse_fcname): Pay attention to the case that
522 foundry is a null string.
524 2006-10-17 Kenichi Handa <handa@m17n.org>
526 * ftfont.c (ftfont_list): Allow registry "unicode-sip".
528 * font.c (Qunicode_sip): New variable.
529 (syms_of_font): Declare it as a Lisp symbol.
531 * font.h (Qunicode_sip): Extern it.
533 2006-10-16 Kenichi Handa <handa@m17n.org>
535 * composite.c (get_composition_id): Pay attention to TAB
538 * xterm.c (x_draw_composite_glyph_string_foreground): Don't draw
539 TAB. Adjusted for the change of s->char2b which always points to
540 the first elememnt of allocated memory.
542 * xftfont.c (xftfont_text_extents): Fix calculation of descent
545 * xdisp.c (handle_composition_prop): Set it->c to the first
547 (fill_composite_glyph_string): Argument changed.
548 (BUILD_COMPOSITE_GLYPH_STRING): Adjusted for the above change.
549 (x_produce_glyphs): Fix handling of left/right padding.
551 2006-10-04 Kenichi Handa <handa@m17n.org>
553 * regex.c (analyse_first): Cancel the change for synching with
556 2006-08-28 Kenichi Handa <handa@m17n.org>
558 * coding.c (detect_coding_system): Fix for handling off
559 inhibit_iso_escape_detection. Fix for the case that no coding
560 system is defined for a specific coding category.
562 2006-08-21 Kenichi Handa <handa@m17n.org>
564 * font.c (font_matching_entity): Dolete unused local var.
566 * xftfont.c (xftfont_open): Call XftDefaultSubstitute before
569 * fileio.c (Finsert_file_contents): On recovering a file, assume
571 (choose_write_coding_system): On auto-saving a file, force
574 * coding.c (setup_coding_system): Fix setting of
575 coding->common_flags based on eol_type.
576 (coding_inherit_eol_type): If PARENT is not nil, be sure to
579 2006-08-04 Kenichi Handa <handa@m17n.org>
581 * alloc.c (NSTATICS): Increased to 0x600.
583 2006-08-01 Kenichi Handa <handa@m17n.org>
585 * ftfont.c (ftfont_driver): Set ftfont_driver.match to
587 (ftfont_list): Don't check :name property.
588 (ftfont_match): New function.
589 (ftfont_pattern_entity): If the pattern doesn't contain
590 FC_SPACING, don't assuce FC_MONO.
592 * font.h (struct font_driver): New member `match'.
593 (font_update_drivers): Prototype adjusted.
595 * font.c (font_parse_fcname): Don't change :name property of FONT.
596 (font_parse_name): Likewise.
597 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE, check_gstring): Define
598 them unconditionally.
599 (font_matching_entity): New function.
600 (font_open_by_name): Try font_matching_entity if exact match is
602 (font_update_drivers): Delete the arg FONT. Return a list of
603 actually used backends. Don't free faces, font caches here.
604 Don't store data in frame parameters. Don't call x_set_font.
605 (Ffont_spec): Store :name property as is.
606 (Ffont_get): Check HAVE_LIBOTF before calling font_otf_capability.
607 (Ffont_otf_gsub): Call font->driver->otf_gsub instead of
609 (Ffont_otf_gpos): Call font->driver->otf_gpos instead of
611 (Ffont_otf_alternates): Check if the driver has otf_gsub function.
612 Call font->driver->otf_gsub instead of font_otf_gsub.
614 * frame.c (x_set_font_backend): Do more works that were done in
615 font_update_drivers before.
617 * xfont.c (xfont_match): New function.
618 (xfont_driver): Set xfont_driver.match to xfont_match.
619 (xfont_draw): Set font in GC if necessary.
621 * ftxfont.c (ftxfont_match): New function.
622 (syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
624 * xftfont.c (xftfont_match): New function.
625 (syms_of_xftfont): Set xftfont_driver.match to xftfont_match.
627 2006-07-28 Kenichi Handa <handa@m17n.org>
629 * font.h (struct font): New member scalable.
630 (struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
631 (font_otf_gsub): Prototype adjusted.
633 * font.c (font_otf_capability): Fix handling of the default
635 (parse_gsub_gpos_spec): Type changed to void. New arg nbytes.
636 Check the contents of SPEC.
637 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE): New macros.
638 (check_gstring): New function.
639 (REPLACEMENT_CHARACTER): New macro.
640 (font_otf_gsub): New arg alternate_subst. Be sure to set all
641 glyph codes of GSTRING.
642 (font_otf_gpos): Be sure to set all glyph codes of GSTRING.
643 (font_prepare_composition): Set cmp->glyph_len.
644 (font_open_entity): Set font->scalable.
645 (Ffont_get): Handle :otf property.
646 (Ffont_otf_gsub, Ffont_otf_gpos, Ffont_otf_alternates): New
648 (Fquery_font): Use font->font.full_name.
649 (syms_of_font): Defsubr Sfont_otf_gsub, Sfont_otf_gpos, and
650 Sfont_otf_alternates.
652 * ftfont.c (ftfont_open): Set font->font.full_name and
653 font->font.name properly. Fix calculation of font->font.height
656 * ftxfont.c (ftxfont_create_gcs): New function.
657 (ftxfont_draw_bitmap): Fix arg to ftfont_driver.get_bitmap.
658 (ftxfont_draw_backgrond): Fix filling region.
659 (ftxfont_default_fid): New function.
660 (ftxfont_open): Set xfotn->fid to the return value of
662 (ftxfont_prepare_face): Use ftxfont_create_gcs to create GCs.
663 (ftxfont_done_face): Free only GCs that are created by
665 (ftxfont_draw): If face->gc != s->gc, create proper GCs.
667 * xterm.c (x_set_glyph_string_clipping_exactly) [USE_FONT_BACKEND]:
668 Clip to src->width, etc (not src->clip_XXX).
670 * xfns.c (x_create_tip_frame) [USE_FONT_BACKEND]: Handle
671 FontBackend frame parameter.
673 2006-07-26 Kenichi Handa <handa@m17n.org>
675 * font.h (struct font_driver_list): New member `on'.
676 (Fclear_font_cache): EXFUN it.
677 (font_update_drivers): Extern it.
679 * font.c (font_unparse_fcname): Fix typo (swidth->width).
680 (font_list_entities): Check driver_list->on.
681 (register_font_driver): Initalize `on' member to 0.
682 (font_update_drivers): New function.
683 (Fclear_font_cache): Check driver_list->on.
685 * frame.h (Qfont_backend): Extern it.
686 (x_set_font_backend): Extern it.
688 * frame.c (Qfont_backend): New variable.
689 (frame_parms): New element for font-backend.
690 (x_set_font_backend): New function.
692 * xfns.c (Fx_create_frame) [USE_FONT_BACKEND]: Handle
693 FontBackend frame parameter.
694 (x_frame_parm_handlers) [USE_FONT_BACKEND]: New element
697 * xfont.c (xfont_list): Don't try listing by :name property if the
698 name is not for XLFD.
700 2006-07-24 Kenichi Handa <handa@m17n.org>
702 * font.h (LGLYPH_FROM, LGLYPH_TO, LGLYPH_SET_FROM)
703 (LGLYPH_SET_TO): New macros.
704 (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WADJUST): Check if adjustment
705 element of G is vector or not.
706 (font_at): Extern it.
708 * font.c: Include window.h.
709 (font_lispy_object): New function.
710 (font_prepare_composition): Check LGLYPH_FORM (g) to detect the
712 (font_close_object): Fix getting (struct font *).
713 (font_at): New function.
714 (Ffont_get): If FONT is a font-object, get entity from it.
715 (Ffont_make_gstring): Initialize elements of glyphs with nil.
716 (Ffont_fill_gstring): Use macro LGSTRING_XXX and LGLYPH_XXX. Fix
718 (Ffont_at): New function.
719 (syms_of_font): Defsubr Sfont_at.
721 * xdisp.c (it_props): Move the entry for Qauto_composed to just
722 before the entry for Qcompostion.
723 (handle_auto_composed_prop): Call auto-composition-function with 4
725 (handle_composition_prop) [USE_FONT_BACKEND]: Set it->face_id from
727 (fill_composite_glyph_string) [USE_FONT_BACKEND]: Check
728 LGLYPH_FORM (g) to detect the end of valid glyph.
729 (x_produce_glyphs) [USE_FONT_BACKEND]: Don't update it->face_id if
730 we are composing with gstring.
732 * xterm.c (x_draw_composite_glyph_string_foreground) [USE_FONT_BACKEND]:
733 Check if adjustment is vector or not.
735 * Makefile.in (font.o): Make it depends on window.h.
737 2006-07-24 Kenichi Handa <handa@m17n.org>
739 * xterm.c (x_draw_composite_glyph_string_foreground): Check if
740 adjustment is vector or not.
742 2006-07-20 Kenichi Handa <handa@m17n.org>
744 * casefiddle.c (casify_object): Sync with HEAD.
746 2006-07-18 Miles Bader <miles@gnu.org>
748 * character.h (CHECK_CHARACTER): Redefine in terms of CHECK_TYPE.
750 2006-07-14 Kenichi Handa <handa@m17n.org>
752 * font.h (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WIDTH, LGLYPH_WADJUST)
753 (LGLYPH_SET_WIDTH): Adjusted for the change of LGLYPH format.
754 (LGLYPH_ADJUSTMENT, LGLYPH_SET_ADJUSTMENT): New macros.
756 * font.c (font_merge_old_spec): Treat '*' in foundry as a wild
758 (DEVICE_DELTA): Fix typo.
759 (font_otf_gpos): Adjusted for the change of LGLYPH format.
760 (font_prepare_composition): Likewise.
762 * xterm.c (x_draw_composite_glyph_string_foreground): Adjusted for
763 the change of LGLYPH format.
765 2006-07-07 Kenichi Handa <handa@m17n.org>
767 * ftfont.c (ftfont_list): Fix typo.
768 (ftfont_build_basic_charsets): Don't include letters with
771 2006-07-09 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
773 * xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
775 * xftfont.c (xftfont_done_face): Call XftDrawDestroy only if
776 xftface_info is non-NULL.
778 2006-07-07 Kenichi Handa <handa@m17n.org>
780 * ftfont.c (ftfont_list): Fix typo.
781 (ftfont_build_basic_charsets): Don't include letters with
784 2006-07-05 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
786 * ftfont.c (ftfont_list): Move misplaced #endif
788 2006-07-05 Kenichi Handa <handa@m17n.org>
790 * ftfont.c (ftfont_list): Pay attention to the case that
791 FC_CAPABILITY is not defined.
793 2006-07-03 Kenichi Handa <handa@m17n.org>
795 * xftfont.c (xftfont_open): Set charset related members to -1.
797 * ftfont.c (ftfont_list): Handle QCotf property. Handling of
799 (ftfont_open): Set charset related members to -1.
801 * fontset.c (Votf_script_alist): New variable.
802 (syms_of_fontset): Initialize it.
803 (fontset_font): Delete unused variable.
805 * fontset.h (Votf_script_alist): Extern it.
807 * font.c (font_find_for_lface): Code optimized.
809 * font.h (font_close_object, font_merge_old_spec): Extern them.
811 2006-06-28 Kenichi Handa <handa@m17n.org>
813 * font.c (QCscalable, Qc, Qm, Qp, Qd): New variables.
814 (syms_of_font): Initialize them.
815 (font_pixel_size): Allow float value in dpi.
816 (font_prop_validate_type): Deleted.
817 (font_prop_validate_symbol, font_prop_validate_style): Argument
818 changed. Caller changed.
819 (font_prop_validate_non_neg): Renamed from
820 font_prop_validate_size.
821 (font_prop_validate_extra): Deleted.
822 (font_prop_validate_spacing): New function.
823 (font_property_table): Add elements for all known properties.
824 (get_font_prop_index): Renamed from check_font_prop_name. New
825 argument FROM. Caller changed.
826 (font_prop_validate): Validate all known properties.
827 (font_put_extra): Argument force deleted. Caller changed.
828 (font_expand_wildcards): Make it static. Fix the way of shrinking
830 (font_parse_xlfd): Arguemnt merge deleted. Fix handling of RESX,
831 RESY, SPACING, and AVGWIDTH. Don't validate property values here.
833 (font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
834 (font_parse_fcname): Arguemnt merge deleted. Fix parsing of point
835 size. Don't validate properties values here. Caller changed.
836 (font_unparse_fcname): Handle dpi, spacing, and scalable
838 (font_open_by_name): Delete unused variable.
839 (Ffont_spec): Likewise. Validate property values.
840 (Ffont_match_p): New function.
842 * font.h (QCscalable): Extern it.
843 (font_parse_xlfd, font_parse_fcname): Prototype adjusted.
845 * ftfont.c (ftfont_list): Handle properties dpi, spacing, and
848 * xfont.c (xfont_query_font): Adjusted for the change of
850 (xfont_list_pattern): New function.
851 (xfont_list): Use xfont_list_pattern.
853 * xftfont.c (xftfont_prepare_face): Cancel previous change.
854 (xftfont_done_face): Likewise.
856 2006-06-26 Kenichi Handa <handa@m17n.org>
858 * font.h (Flist_fonts): EXFUN it.
860 2006-06-25 Jason Rumney <jasonr@gnu.org>
862 * w32term.c (w32_initialize): Add back smoothing_type and
863 smoothing_enabled definitions.
865 2006-06-23 Kenichi Handa <handa@m17n.org>
867 * xterm.c (x_draw_glyph_string) [USE_FONT_BACKEND]: Check
868 s->face->font on determining underline position.
870 2006-06-21 Kenichi Handa <handa@m17n.org>
872 * font.c (font_parse_xlfd): Fix generating of CHARSET_REGISTRY field.
873 (font_has_char): Accept font-object too.
874 (font_find_for_lface): Try at first with a size specified in face.
876 * xftfont.c (xftfont_prepare_face): Make non-ascii face share
877 face->extra with ascii face.
878 (xftfont_done_face): Don't free face->extra of non-ascii face.
880 2006-06-20 Kenichi Handa <handa@m17n.org>
882 * frame.c (x_set_font) [USE_FONT_BACKEND]: Fix argument to
885 2006-06-19 Kenichi Handa <handa@m17n.org>
887 * font.h (QCspacing, QCdpi): Extern them.
888 (enum font_spacing): New enum.
889 (FONT_PIXEL_SIZE_QUANTUM): New macro.
891 * font.c (POINT_TO_PIXEL): Don't divice POINT by 10.
892 (QCspacing, QCdpi): New variables.
893 (syms_of_font): Initialize them.
894 (font_pixel_size): New function.
895 (font_put_extra): New function.
896 (font_parse_xlfd): Fix handling of font size. Add QCdpi property
898 (font_parse_fcname): Handle enumenrated values (e.g. bold). Fix
899 handling font size. Add QCname property that contains only
901 (font_score): Change argument. Caller changed. Pay attention to
902 FONT_PIXEL_SIZE_QUANTUM.
903 (font_sort_entites): Fix handling of font size.
904 (font_list_entities): Likewise.
905 (font_find_for_lface): Likewise.
906 (font_open_for_lface): Likewise.
907 (font_open_by_name): Likewise.
908 (Ffont_spec): Add QCname property that contains only unknown
911 * ftfont.c (ftfont_list): Use assq_no_quit, not Fassq. Don't
912 include weight in listing pattern, instead check weight of each
913 listed font. Don't include scalable in pattern. Pay attention to
914 FONT_PIXEL_SIZE_QUANTUM.
916 2006-06-19 Kenichi Handa <handa@m17n.org>
918 * lread.c (read_escape): Fix the code synched with HEAD.
920 * font.c (font_parse_fcname): Fix parsing of point-size.
921 (font_unparse_fcname): Produce symbolic names for style
923 (font_list_entities): Handle float size correctly.
924 (font_open_by_name): Prefer `normal' property values if the name
925 doesn't specify them.
927 * fontset.c (Finternal_char_font): Use font_get_name, not
930 * ftfont.c (ftfont_pattern_entity): Use the numeric value 100 for
931 FC_WEIGHT_REGULAR. Exclude FC_SIZE and FC_PIXEL_SIZE from listing
932 pattern. Don't force scalable.
934 * xftfont.c (xftfont_open): For generating a name, start from
937 2006-06-16 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
939 * frame.h (x_new_fontset2): Fix prototype.
941 2006-06-16 Kenichi Handa <handa@m17n.org>
943 * font.h (struct font_driver): Member parse_name deleted.
944 (font_match_p, font_get_spec, font_parse_fcname)
945 (font_unparse_fcname): Extern them.
946 (font_get_name): Prototype adjusted.
948 * font.c (XLFD_SMALLNUM_MASK): Delete this macro.
949 (XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
950 (font_expand_wildcards): Fix handling ENCODING field. Avoid
951 unnecessary checks for weight, slant, and swidth.
952 (font_parse_fcname): New function.
953 (font_unparse_fcname): New function.
954 (font_parse_name): New function.
955 (font_match_p): New function.
956 (font_get_name): Return value changed to Lisp string.
957 (font_get_spec): New function.
958 (Qunspecified, Qignore_defface): Don't extern them.
959 (font_find_for_lface): Assume that LFACE is fully specified.
960 (font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
961 object, use it for FACE.
962 (font_open_by_name): Call Ffont_spec with QCname prop. Don't call
964 (Ffont_spec): Call font_parse_name, not font_parse_xlfd.
966 * fontset.h (new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
969 * fontset.c (new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
970 deleted. Don't call Fnew_fontset. Instead, directly call
973 * frame.h (x_new_fontset2) [USE_FONT_BACKEND]: Prototype adjusted.
975 * frame.c (x_set_font) [USE_FONT_BACKEND]: Adjusted for the change
978 * ftfont.c (Qmonospace, Qsans_serif, Qserif, Qmono, Qsans)
979 (Qsans__serif): New variables.
980 (ftfont_generic_family_list): New variable.
981 (syms_of_ftfont): Initialize the above variables.
982 (ftfont_pattern_entity): Argument NAME deleted.
983 (ftfont_list_generic_family): New function.
984 (ftfont_parse_name): Delete this function.
985 (ftfont_list): Try generic family only when FcFontList found no
987 (ftfont_list_family): Fix args to FcObjectSetBuild.
989 * xfaces.c (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
990 object in attrs[LFACE_FONT_INDEX].
991 (set_lface_from_font_name): Cancel all changes for font-backend.
992 (set_lface_from_font_and_fontset) [USE_FONT_BACKEND]: New
994 (Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]: Accept a
995 font object in QCfont attribute.
996 (set_font_frame_param) [USE_FONT_BACKEND]: Likewise.
997 (realize_default_face) [USE_FONT_BACKEND]: Call
998 set_lface_from_font_and_fontset.
1000 * xfns.c (x_default_font_parameter) [USE_FONT_BACKEND]: Try also
1001 "fixed", and signal error here if no suitable font was found.
1003 * xfont.c (xfont_parse_name): Delete this function.
1005 * xftfont.c (xftfont_open): Change coding style of error
1006 handling. Generate fontconfig's fontname pattern.
1008 * xterm.h (struct x_output) [USE_FONT_BACKEND]: New member fontp.
1009 (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro.
1011 * xterm.c (x_new_fontset2) [USE_FONT_BACKEND]: Change arguments.
1012 Both args FONTSET and FONT_OBJECT must be existing ones.
1014 2006-06-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1016 * macterm.c (mac_set_unicode_keystroke_event): Don't use MAKE_CHAR.
1018 2006-06-14 Kenichi Handa <handa@m17n.org>
1020 * xfont.c (xfont_open, xfont_encode_char): Fix typo.
1022 * font.h (struct font): Fix typo.
1024 * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to
1026 (enum xlfd_field_mask): New enum.
1027 (intern_font_field): Argument changed. Caller changed. If digits
1028 are followed by non-digits, return a symbol.
1029 (font_expand_wildcards): New function.
1030 (font_parse_xlfd): Fix wildcard handling.
1031 (Ffont_spec): If :name is specified, reflect the info in the other
1034 * ftfont.c (ftfont_pattern_entity): Fix typo.
1035 (ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of
1038 2006-06-09 Kenichi Handa <handa@m17n.org>
1040 * font.h (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Extern them.
1042 * font.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved from
1044 (font_unparse_xlfd): Fix argument type declaration. Append "*" if
1045 registry doesn't specify encoding part.
1046 (font_find_for_lface): Pay attention to LFACE_FONT_INDEX.
1047 (font_open_by_name): At first try parsing the name.
1048 (syms_of_font): Declare Qiso8859_1, Qiso10646_1, and Qunicode_bmp
1051 * fontset.c (reorder_font_vector): Pay attention to the case that
1052 the 3rd element of font_def is nil.
1053 (fontset_font): For the default fontset, append one more fontset
1054 elements for a script-based font specification. Don't add script
1055 attribute on finding a font.
1056 (new_fontset_from_font): Unconditionally set FONTSET_ASCII to the
1058 (fontset_ascii_font): If a font can't be opened, return nil.
1060 * ftfont.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved to
1062 (ftfont_pattern_entity): New function.
1063 (ftfont_get_cache): Assume that freetype_font_cache is already
1065 (ftfont_list): Handle the case that a file is specified in font
1066 name. Use ftfont_pattern_entity to generate entities.
1067 (ftfont_has_char): Check if the pattern contains FC_CHARSET.
1068 (syms_of_ftfont): Initialize freetype_font_cache.
1070 * xftfont.c (xftfont_open): Make the font name fontconfig's
1071 style. Add BLOCK_INPUT and UNBLOCK_INPUT.
1072 (xftfont_close): Free font->font.name if not NULL.
1074 * xfont.c (xfont_list): If script is specified for a font, return
1076 (xfont_list_family): Declare argument type.
1078 * xfaces.c (set_lface_from_font_name): If a font doesn't have a
1079 name, set LFACE_FONT (lface) to nil.
1081 * xterm.c (x_new_fontset2): If an ASCII font couldn't be loaded,
1084 2006-06-08 Jason Rumney <jasonr@gnu.org>
1086 * w32term.c (w32_initialize): Manually sync 2006-06-05 change from
1089 2006-06-08 Kenichi Handa <handa@m17n.org>
1091 * emacs.c (main): Check -enable-font-backend arg after the check
1093 (standard_args): Add "-enable-font-backend".
1095 * coding.c (Ffind_operation_coding_system): Sync with HEAD.
1097 * callproc.c (Fcall_process): Sync with HEAD.
1099 * coding.h (CODING_REQUIRE_ENCODING): Comment sync with HEAD.
1101 2006-06-07 Kenichi Handa <handa@m17n.org>
1103 * xftfont.c (xftfont_default_fid): Set fid_known to 1.
1104 (struct xftdraw_list, xftdraw_list): Delete them.
1105 (register_xftdraw, check_xftdraw): Delete them.
1106 (xftfont_prepare_face): Don't call register_xftdraw.
1107 (xftfont_done_face): Don't call check_xftdraw.
1108 (xftfont_draw): Get backroudn color only when with_background is
1111 * xfont.c (xfont_encode_char): Fix calculation of char2b.
1113 2006-06-06 Kenichi Handa <handa@m17n.org>
1115 These changes are for the new font handling codes.
1117 * Makefile.in (ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
1118 @FONTCONFIG_CFLAGS@, and @LIBOTF_CFLAGS@.
1119 (LIB_X11_LIB): If HAVE_XFT is defined, set to @XFT_LIBS@.
1120 (FONTSRC, FONTOBJ): New variables.
1121 (obj): Add $(FONTOBJ).
1122 (SOME_MACHINE_OBJECTS): Lib_X11_Lib.
1123 (LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
1125 (font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
1126 (fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
1129 * font.h, font.c, xfont.c, ftfont.c, xftfont.c, ftxfont.c: New
1132 * character.h (Vscript_representative_chars): Extern it.
1134 * character.c (Vscript_representative_chars): New variable.
1135 (syms_of_character): Declare it as a Lisp variable.
1137 * composite.c (get_composition_id) [USE_FONT_BACKEND]: If
1138 enable_font_backend is nonzero, accept the composition method
1139 COMPOSITION_WITH_GLYPH_STRING.
1141 * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
1142 enumeration COMPOSITION_WITH_GLYPH_STRING.
1144 * config.in: Re-generated.
1146 * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
1147 members clip_x, clip_y, clip_width, and clip_height.
1148 (struct face) [USE_FONT_BACKEND]: New members font_info and extra.
1150 * emacs.c (main) [USE_FONT_BACKEND]: Handle arg
1151 --enable-font-backend. Call syms_of_font.
1153 * fns.c (assoc_no_quit): New function.
1155 * fontset.h (FONT_INFO_FROM_FACE): New macro.
1156 (face_for_font, new_fontset_from_font)
1157 (fontset_ascii_font) [USE_FONT_BACKEND]: Extern them.
1159 * fontset.c [USE_FONT_BACKEND]: Include "font.h".
1160 (fontset_font, fontset_ascii, face_for_char)
1161 (make_fontset_for_ascii_face, Ffont_info)
1162 (Finternal_char_font) [USE_FONT_BACKEND]: If enable_font_backend
1163 is nonzero, use font-backend mechanism.
1164 (find_font_encoding): Make it non-static.
1165 (new_fontset_from_font, fontset_ascii_font) [USE_FONT_BACKEND]:
1168 * frame.h (struct frame): New members resx and resy.
1169 (struct frame) [USE_FONT_BACKEND]: New member font_driver_list.
1170 (x_new_fontset2) [USE_FONT_BACKEND]: Extern it.
1172 * frame.c [USE_FONT_BACKEND]: Include "font.h".
1173 (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend
1176 * lisp.h (assoc_no_quit): Extern it.
1178 * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h".
1179 Through out the file, use FONT_INFO_FROM_FACE instead of
1180 FONT_INFO_FROM_ID, use get_per_char_metric instead of
1181 rif->per_char_metric.
1182 (handle_composition_prop) [USE_FONT_BACKEND]: If the composition
1183 method is COMPOSITION_WITH_GLYPH_STRING, just set it->c to ' '.
1184 (get_glyph_face_and_encoding, fill_composite_glyph_string)
1185 (get_char_face_and_encoding, BUILD_COMPOSITE_GLYPH_STRING)
1186 (x_produce_glyphs) [USE_FONT_BACKEND]: If enable_font_backend is
1187 nonzero, use font-backend mechanism.
1188 (get_per_char_metric): New function.
1190 * xfaces.c [USE_FONT_BACKEND]: Include "font.h".
1191 (set_lface_from_font_name)
1192 (set_font_frame_param, free_realized_face)
1193 (prepare_face_for_display, clear_face_gcs)
1194 (Finternal_set_font_selection_order, realize_x_face)
1195 [USE_FONT_BACKEND]: If enable_font_backend is nonzero, use
1196 font-backend mechanism.
1197 (clear_face_cache) [USE_FONT_BACKEND]: Don't call
1199 (load_face_font) [USE_FONT_BACKEND]: Abort.
1200 (face_symbolic_value, face_symbolic_weight, face_symbolic_slant)
1201 (face_symbolic_swidth, face_for_font) [USE_FONT_BACKEND]: New
1204 * xfns.c [USE_FONT_BACKEND]: Include "font.h".
1205 (x_default_font_parameter) [USE_FONT_BACKEND]: New function.
1206 (Fx_create_frame) [USE_FONT_BACKEND]: If enable_font_backend is
1207 nonzero, register all available font drivers. Call
1208 x_default_font_parameter for deciding a font.
1209 (x_create_tip_frame) [USE_FONT_BACKEND]: Likewise.
1211 * xterm.c [USE_FONT_BACKEND]: Include "font.h".
1212 (x_set_mouse_face_gc, x_set_glyph_string_clipping)
1213 (x_set_glyph_string_clipping_exactly)
1214 (x_compute_glyph_string_overhangs)
1215 (x_draw_glyph_string_foreground)
1216 (x_draw_composite_glyph_string_foreground, x_draw_glyph_string)
1217 (x_free_frame_resources) [USE_FONT_BACKEND]: If
1218 enable_font_backend is nonzero, use font-backend mechanism.
1219 (x_new_fontset2) [USE_FONT_BACKEND]: New function.
1221 2006-05-15 Kenichi Handa <handa@m17n.org>
1223 * coding.h (system_eol_type): Fix synching with HEAD.
1225 * coding.c (system_eol_type): Sync with HEAD.
1226 (coding_inherit_eol_type): If PARENT is nil, inherit from
1228 (syms_of_coding): Initialize system_eol_type.
1230 * callproc.c (Fcall_process): Sync with HEAD.
1232 * process.c (setup_process_coding_systems): Fix synching with
1234 (read_process_output): Likewise.
1235 (Fset_process_coding_system): Inherit system's eol format if
1238 * fileio.c (choose_write_coding_system): Fix synching with HEAD.
1240 * keymap.c (push_key_description): Fix synching with HEAD.
1242 2006-05-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1244 * macgui.h (USE_ATSUI): Don't enable on emacs-unicode-2 branch.
1246 2006-04-07 Kenichi Handa <handa@m17n.org>
1248 * coding.c (decode_eol): Pay attention to buffer relocation in
1250 (decode_coding): Call decode_eol before restoring undo_list.
1252 2006-03-20 Kenichi Handa <handa@m17n.org>
1254 * charset.c (Fdefine_charset_internal): Fix setting of
1257 2006-03-14 Kenichi Handa <handa@m17n.org>
1259 * keyboard.c (read_char): Check if C is a character or not before
1260 looking up Vkeyboard_translate_table.
1262 2006-03-10 Kenichi Handa <handa@m17n.org>
1264 * coding.c (DECODE_EMACS_MULE_20_RELATIVE_COMPOSITION): Fix
1265 condition to terminate the loop.
1267 2006-03-09 Kenichi Handa <handa@m17n.org>
1269 * coding.c (produce_composition): Compare charbuf[i] instead of
1271 (Fterminal_coding_system): Use EQ to compare Lisp objects.
1273 2006-03-07 Kenichi Handa <handa@m17n.org>
1275 * coding.c (DECODE_COMPOSITION_START): If the source is short, set
1276 coding->result to CODING_RESULT_INSUFFICIENT_SRC.
1277 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK after the call of
1279 (emacs_mule_char): Handle old style (Emacs 20) component character
1281 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Fix parsing a composition
1283 (DECODE_EMACS_MULE_20_RULEBASE_COMPOSITION): Likewise.
1284 (decode_coding_emacs_mule): Handle invalid bytes correctly.
1286 2006-03-04 Kenichi Handa <handa@m17n.org>
1288 * coding.c (encode_coding_ccl): Allocate destination dynamically
1291 2006-03-03 Kenichi Handa <handa@m17n.org>
1293 * ccl.c (Fccl_execute_on_string): Fix the condition of terminating
1294 the loop. When quitted, show a proper error message.
1296 2006-03-02 Kenichi Handa <handa@m17n.org>
1298 * coding.c (decode_coding): Fix previous change.
1300 * xterm.c (x_set_glyph_string_clipping_exactly): Set
1301 src->clip_head and src->clip_tail temporarily instead of src->hl.
1303 * ccl.c (CCL_WRITE_STRING): Handle a flag bit for multibyte
1305 (Fccl_execute_on_string): Use ASET, not XSET.
1307 2006-03-01 Kenichi Handa <handa@m17n.org>
1309 * search.c (search_buffer): Fix handling of "\\" in a trivial
1312 2006-02-28 Kenichi Handa <handa@m17n.org>
1314 * coding.c (decode_coding): Fix the condition of terminating the
1317 2006-02-27 Kenichi Handa <handa@m17n.org>
1319 * data.c (Faset): On setting a character bigger than 255 in a
1320 unibyte string, signal an error instead of make the string
1323 2006-02-22 Kenichi Handa <handa@m17n.org>
1325 * charset.c (map_charset_chars): Fix for ascii-compatible charset
1326 made by a mapping table.
1328 2006-02-21 Kenichi Handa <handa@m17n.org>
1330 * xdisp.c (fill_composite_glyph_string): Check s->face is NULL or
1332 (BUILD_COMPOSITE_GLYPH_STRING): If C is TAB, set s->face to NULL.
1333 (x_produce_glyphs): If CH is TAB, set cmp->offsets properly.
1335 * xterm.c (x_draw_composite_glyph_string_foreground): Check
1336 s->face is NULL or not.
1338 2006-02-20 Kenichi Handa <handa@m17n.org>
1340 * xterm.c (x_set_glyph_string_clipping_exactly): New function.
1341 (x_draw_glyph_string): Fix drawing of right_overhang and
1342 left_overhang around/on cursor.
1344 * xdisp.c (draw_glyphs): Fix inclusion of right_overwriting
1347 * term.c (produce_glyphs): Sync to HEAD.
1349 2006-02-15 Kenichi Handa <handa@m17n.org>
1351 * xdisp.c (x_produce_glyphs): Handle composition with TAB.
1353 2006-02-05 Kenichi Handa <handa@m17n.org>
1355 * coding.c: Cancel incorrect synching with HEAD.
1357 2006-02-03 Kenichi Handa <handa@m17n.org>
1359 * coding.c (Fdefine_coding_system_internal): Avoid a duplicated
1360 element in Vcoding_system_alist.
1361 (Fdefine_coding_system_alias): Likewise.
1363 2006-01-19 Kenichi Handa <handa@m17n.org>
1365 * xterm.c (handle_one_xevent): Handle keysyms 0x1000000..0x10000FF.
1367 * coding.c: Sync to HEAD for handling autoload-coding-system.
1368 (Qcoding_system_define_form): New variable.
1369 (syms_of_coding): Intern and staticpro it.
1370 (Fcoding_system_p): Check Qcoding_system_define_form.
1371 (Fcheck_coding_system): Try to autoload the definition of
1374 * coding.h (CODING_SYSTEM_P): If ID is not available, call
1376 (CHECK_CODING_SYSTEM): If ID is not available, call
1377 Fcheck_coding_system.
1378 (CHECK_CODING_SYSTEM_GET_SPEC): Try also Fcheck_coding_system.
1379 (CHECK_CODING_SYSTEM_GET_ID): Likewise.
1381 2006-01-17 Kenichi Handa <handa@m17n.org>
1383 * xterm.c (handle_one_xevent): Delete unnecessary code inserted by
1386 * coding.c (code_conversion_restore): GCPRO arg.
1388 2005-12-28 Kenichi Handa <handa@m17n.org>
1390 * character.c (lisp_string_width): Check multibyteness of STRING.
1392 2005-10-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1394 * macterm.c (mac_encode_char): Call ccl_driver with the last arg
1395 Qnil. Use JIS_TO_SJIS instead of ENCODE_SJIS.
1396 (decode_mac_font_name): Use decode_coding_c_string instead of
1398 (x_load_font): Initialize fontp->fontset to -1. Set
1399 fontp->encoding_type.
1401 2005-10-17 Kenichi Handa <handa@m17n.org>
1403 * search.c (search_buffer): Give up BM search on case-fold-search
1404 if one of a target character has a case-equivalence of different
1405 byte length even if that target charcter is an ASCII.
1406 (simple_search): Fix culculation of byte length of matched text.
1407 (boyer_moore): Fix handling of case-equivalent multibyte
1410 2005-10-15 Kenichi Handa <handa@m17n.org>
1412 * coding.c (decode_coding): Fix handling of invalid bytes.
1414 2005-10-06 Kenichi Handa <handa@m17n.org>
1416 * xterm.c (handle_one_xevent): Handle keysyms directly mapped to
1419 2005-09-23 Kenichi Handa <handa@m17n.org>
1421 * coding.c (encode_coding_object): If a pre-write-conversion
1422 function makes a new buffer, kill it.
1424 2005-07-29 Kenichi Handa <handa@m17n.org>
1426 * coding.c (QCascii_compatible_p): New variable.
1427 (syms_of_coding): Initialize it.
1428 (ONE_MORE_BYTE): Decrement `src' before calling string_char.
1429 (ONE_MORE_BYTE_NO_CHECK): Likewise.
1430 (record_conversion_result): Add `default:' case.
1431 (coding_charset_list): Delete unused variable `coding_type'.
1432 (Fdefine_coding_system_internal): Add `ascii-compatible-p'
1433 property in the plist of the coding system.
1434 (Fcoding_system_put): Check QCascii_compatible_p.
1436 2005-06-09 Kenichi Handa <handa@m17n.org>
1438 * xdisp.c (get_next_display_element): Sync with the change in
1441 2005-06-06 Kenichi Handa <handa@m17n.org>
1443 * callproc.c (Fcall_process): Sync with the change in
1446 2005-06-05 Miles Bader <miles@gnu.org>
1448 * xfaces.c (Finternal_lisp_face_equal_p): Restore previously
1449 removed calculation of frame `f', as it's now used.
1451 2005-05-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1453 * macterm.c (x_font_name_to_mac_font_name): Sync with trunk
1454 for the case that does not require code conversion.
1456 2005-05-11 Kenichi Handa <handa@m17n.org>
1458 * Makefile.in (shortlisp): Cancel previous change.
1459 (RUN_TEMACS): Include "-nl" if HAVE_SHM is defined.
1460 (emacs${EXEEXT}): Run $(RUN_TEMACS) unconditionally.
1461 (UNIDATA): New variable.
1462 (${lispsource}international/charprop.el): Depends on ${UNIDATA}.
1463 (bootstrap-emacs${EXEEXT}): Depends on charprop.el. Run
1464 $(RUN_TEMACS) unconditionally.
1466 2005-05-10 Kenichi Handa <handa@m17n.org>
1468 * Makefile.in (shortlisp): Add ../lisp/international/charprop.el.
1469 (temacs${EXEEXT}): Build charprop.el if necessary.
1470 (admindir): New variable.
1471 ($(lispsource)international/charprop.el): New target.
1473 2005-05-04 Miles Bader <miles@gnu.org>
1475 * character.c (chars-in-region): Obsolete function removed.
1476 (syms_of_character): Remove its initialization.
1478 2005-04-28 Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
1480 * w32select.c (validate_coding_system)
1481 (setup_windows_coding_system): New functions.
1482 (convert_to_handle_as_coded, Fw32_get_clipboard_data): Use
1483 setup_windows_coding_system.
1484 (setup_config, Fw32_get_clipboard_data): Use
1485 validate_coding_system.
1486 (Fx_selection_exists): Move call to setup_config to a place
1487 were signals are allowed.
1489 * lisp.h (Fcoding_system_base, Fcoding_system_eol_type)
1490 (Fcheck_coding_system): Add declarations.
1492 2005-04-28 Kenichi Handa <handa@m17n.org>
1494 * s/ms-w32.h (STDC_HEADERS): Sync with the change in
1497 2005-04-25 Kenichi Handa <handa@m17n.org>
1499 * charset.c (load_charset_map_from_vector): Fix for the first
1502 2005-04-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1504 * macfns.c (Fx_create_frame, x_create_tip_frame): Pass Lisp
1505 string as the second argument for x_new_fontset.
1507 2005-04-18 Kenichi Handa <handa@m17n.org>
1509 * fns.c (Fstring_as_multibyte): Fix the change for syncing with
1512 2005-04-09 Kenichi Handa <handa@m17n.org>
1514 * search.c (search_buffer): Fix the change for syncing with CVS
1516 (search_buffer): Likewise.
1518 2005-03-31 Kenichi Handa <handa@m17n.org>
1520 * xdisp.c (get_next_display_element): Sync with CVS head.
1522 2005-03-29 Kenichi Handa <handa@m17n.org>
1524 * coding.c (decode_coding_object): Use safe_call1 instead of call1.
1525 (encode_coding_object): Use safe_call instead of call2.
1527 2005-03-14 Kenichi Handa <handa@m17n.org>
1529 * fontset.c (set_default_ascii_font): Fix the change for
1530 syncing with CVS head.
1532 2005-01-30 Kenichi Handa <handa@m17n.org>
1534 * fontset.c (Fset_fontset_font): Check family element of a given
1537 * Makefile.in (lisp): Include charprop.el.
1539 2005-01-17 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1541 * macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
1542 Not sure if it's unnecessary.
1544 2005-01-16 Steven Tamm <steventamm@mac.com>
1546 * macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
1547 some possibly unnecessary fontset checking code that crashed
1548 when creating a new frame
1550 2005-01-17 Kenichi Handa <handa@m17n.org>
1552 * xfaces.c (merge_faces): Fix argument to lookup_derived_face and
1555 * xdisp.c (Fformat_mode_line): Fix argument to lookup_named_face.
1557 * fringe.c (draw_fringe_bitmap_1): Fix argument to
1560 2004-12-25 Kenichi Handa <handa@m17n.org>
1562 * xdisp.c (get_next_display_element): Sync to the change in HEAD
1565 2004-12-11 Kenichi Handa <handa@m17n.org>
1567 * search.c: Sync to the change in HEAD on 2004-11-19, 20.
1569 * w32console.c: Sync to the change in HEAD on 2004-12-01.
1571 * coding.c: Cancel the change done in HEAD on 2004-11-30.
1572 (coding_charset_list): New function.
1574 * coding.h (coding_charset_list): Extern it.
1576 * term.c: Sync to the change in HEAD on 2004-11-30.
1578 2004-12-09 Kenichi Handa <handa@m17n.org>
1580 * fontset.c (Fset_fontset_font): Call find_font_encoding with
1581 concatenation of family and registry.
1583 2004-12-06 Kenichi Handa <handa@m17n.org>
1585 * character.h (BYTE8_STRING): Fix typo.
1587 * editfns.c (Ftranslate_region_internal): Don't convert unibyte
1588 string to multibyte (sync to HEAD).
1590 * casefiddle.c (casify_region): Handle changes in byte-length
1591 using replace_range_2 (sync to HEAD).
1593 2004-11-24 Andreas Schwab <schwab@suse.de>
1595 * chartab.c (map_char_table): GCPRO table and arg.
1597 2004-10-29 Kenichi Handa <handa@m17n.org>
1599 * syntax.c (skip_syntaxes): Return lispy 0 (not nil) if point is
1602 2004-10-23 Kenichi Handa <handa@m17n.org>
1604 * fontset.c (fs_load_font): Use fast_string_match_ignore_case
1605 instead of fast_c_string_match_ignore_case.
1606 (find_font_encoding): Argument changed to Lisp_Object. Use
1607 fast_string_match_ignore_case instead of
1608 fast_c_string_match_ignore_case. Caller changed.
1610 2004-10-15 Kenichi Handa <handa@m17n.org>
1612 * xdisp.c (get_next_display_element): In unibyte case, decide to
1613 display in octal form by checking a chacter by
1614 UNIBYTE_CHAR_HAS_MULTIBYTE_P.
1616 * charset.c (Fset_unibyte_charset): Setup
1617 unibyte_has_multibyte_table.
1619 * character.c (unibyte_has_multibyte_table): New variable.
1621 * character.h (unibyte_has_multibyte_table): Extern it.
1622 (UNIBYTE_CHAR_HAS_MULTIBYTE_P): New macro.
1624 2004-10-14 Kenichi Handa <handa@m17n.org>
1626 * callproc.c (Fcall_process): Fix merging of 2004-10-13 change.
1628 2004-10-13 Kenichi Handa <handa@m17n.org>
1630 * coding.c (encode_coding_iso_2022): Fix handling of charset
1633 2004-10-12 Kenichi Handa <handa@m17n.org>
1635 * coding.c (setup_coding_system): If coding_system is nil, use
1637 (Fterminal_coding_system): Return nil if terminal coding system is
1639 (syms_of_coding): Define coding-system `undecided' here. Setup
1640 terminal_coding as `undecided'.
1642 2004-10-04 Kenichi Handa <handa@m17n.org>
1644 * xdisp.c (message_dolog, set_message_1): Call
1645 unibyte_char_to_multibyte with arg type int.
1647 * fileio.c (Fsubstitute_in_file_name): Fix previous change.
1649 * lread.c (read1): Fix reading of a char-table.
1651 * print.c (print_object): Include sub char-table in cicularities
1654 2004-10-01 Kenichi Handa <handa@m17n.org>
1656 * keymap.c (where_is_internal_2): Fix for the case that KEY is a
1657 cons. Append the found sequences in car of ARGS instead of
1660 2004-09-28 Kenichi Handa <handa@m17n.org>
1662 * fileio.c (report_file_error): Make a unibyte string from
1664 (Fsubstitute_in_file_name): Fix the arg to
1665 unibyte_char_to_multibyte. It is evaluated twice.
1667 2004-09-19 Kenichi Handa <handa@m17n.org>
1669 * charset.h (CHAR_CHARSET): Shortcut for ASCII case.
1671 2004-09-14 Kenichi Handa <handa@m17n.org>
1673 * coding.c (detect_coding): Fix previous change.
1675 2004-09-13 Kenichi Handa <handa@m17n.org>
1677 * coding.c (detect_coding_utf_16): Don't set detect_info->found if
1679 (detect_coding): Optimization for ISO-2022 when no 8-bit data is
1681 (detect_coding_system): Likewise.
1683 2004-09-01 Jason Rumney <jasonr@gnu.org>
1685 * w32fns.c (x_to_w32_font): Update to use new coding struct.
1687 2004-08-17 Kenichi Handa <handa@m17n.org>
1689 * charset.c (Fdeclare_equiv_charset): Fix handing of CHARS.
1690 (Fiso_charset): Likewise.
1692 2004-08-03 Steven Tamm <steventamm@mac.com>
1694 * macterm.c (mac_encode_char): Add charset argument and update
1695 to use encoding_type
1696 (x_new_font,x_new_fontset): Merge in changes from xterm.c;
1697 switch to pure fontset
1698 (decode_mac_font_name): Temporarily remove decoding
1699 (x_font_name_to_mac_font_name): Temporarily remove encoding
1700 (x_load_font): Temporarily remove encoding
1702 2004-06-30 Kenichi Handa <handa@m17n.org>
1704 * xfaces.c (Fface_font): If frame is not on a window system,
1705 ignore CHARACTER arg. If HAVE_WINDOW_SYSTEM is not defined, don't
1706 refer to face->font.
1707 (split_font_name_into_vector, build_font_name_from_vector)
1708 (lookup_non_ascii_face, realize_non_ascii_face): Define them only
1709 whne HAVE_WINDOW_SYSTEM is defined.
1711 2004-05-29 Kenichi Handa <handa@m17n.org>
1713 * xdisp.c (BUILD_GLYPH_STRINGS): Check if s is NULL.
1714 (x_produce_glyphs): Fix setting of members of cmp in case
1715 cmp->glyph_len is zero,
1717 * fontset.c (Fset_fontset_font): Docstring fixed.
1718 (Ffontset_info): Make it backward compatible. New arg ALL.
1720 2004-05-11 Kim F. Storm <storm@cua.dk>
1722 * process.c (read_process_output): Grow decoding_buf when needed;
1723 this could cause a crash in allocate_string and compact_small_strings.
1725 2004-04-29 Kenichi Handa <handa@m17n.org>
1727 * fileio.c (WRITE_BUF_SIZE): This macro deleted.
1728 (e_write): Fix previous change.
1730 2004-04-28 Kenichi Handa <handa@m17n.org>
1732 * coding.c (setup_coding_system): Set coding->common_flags
1733 correctly for raw-text.
1734 (consume_chars): On encoding unibyte text by raw-text, don't check
1736 (encode_coding): On encoding by raw-text, never use translation
1739 * fileio.c (e_write): Short cut for the case of no encoding.
1741 2004-04-20 Kenichi Handa <handa@m17n.org>
1743 * coding.c (detect_coding): Delete unused variables.
1744 (detect_coding_system): Likewise.
1746 2004-04-18 Kenichi Handa <handa@m17n.org>
1748 * coding.c (encode_coding_utf_8): Fix handling of raw-byte char.
1749 (consume_chars): Fix handling of 8-bit bytes in unibyte source.
1751 2004-04-14 Kenichi Handa <handa@m17n.org>
1753 Sync all files to HEAD.
1755 2004-04-14 Kenichi Handa <handa@m17n.org>
1757 * coding.c (Ffind_coding_systems_region_internal): Include
1758 raw-text and no-conversion in the result.
1760 * fontset.h: Sync to HEAD.
1762 * fontset.c: Sync to HEAD.
1764 2004-04-14 Kenichi Handa <handa@m17n.org>
1766 * fontset.c (find_font_encoding): Return `ascii' for unknown
1768 (load_font_get_repertory): Delete unnecessary check of ENCODING of
1770 (font_def_arg, add_arg, from_arg, to_arg): New args.
1771 (set_fontset_font): Argument changed.
1772 (Fset_fontset_font): Fix for the case that TARGET is a script
1773 name and charset name.
1774 (new_fontset_from_font_name): Fix argument to Fnew_fontset.
1776 2004-04-13 Kenichi Handa <handa@m17n.org>
1778 * fontset.c (fontset_font): Renamed from fontset_face. Return
1780 (face_suitable_for_char_p): Adjusted for the change of
1782 (face_for_char): Likewise.
1783 (make_fontset_for_ascii_face): Fix setting of the fontset element
1785 (Finternal_char_font): Use fontset_font instead of FACE_FOR_CHAR
1787 (Ffontset_info): Adjusted for the change of fontset_font.
1789 * composite.c: Sync to HEAD.
1791 * search.c: Sync to HEAD.
1793 * coding.c: Sync to HEAD.
1794 (emacs_mule_char): Check invalid code more regidly.
1796 * coding.h: Sync to HEAD.
1798 * charset.c: Sync to HEAD.
1800 * charset.h: Sync to HEAD.
1802 * character.h (LEADING_CODE_LATIN_1_MIN)
1803 (LEADING_CODE_LATIN_1_MAX): Delete these macros.
1805 2004-04-08 Kenichi Handa <handa@m17n.org>
1807 * category.h: Sync to HEAD.
1809 * category.c: Sync to HEAD.
1811 * syntax.h: Sync to HEAD.
1813 * syntax.c: Sync to HEAD.
1815 * regex.h: Sync to HEAD.
1817 * regex.c: Sync to HEAD.
1819 2004-04-07 Kenichi Handa <handa@m17n.org>
1821 * editfns.c: Sync to HEAD.
1822 (check_translation): New function.
1823 (Ftranslate_region_internal): Handle M:N mapping.
1825 2004-04-06 Kenichi Handa <handa@m17n.org>
1827 * xfaces.c (xlfd_point_size): Set font->numeric[XLFD_PIXEL_SIZE].
1829 2004-03-30 Kenichi Handa <handa@m17n.org>
1831 * coding.c (DECODE_DESIGNATION): Set chars_96 to -1 instead of
1833 (decode_coding_iso_2022): Fix handling of invalid designation.
1835 * fileio.c (Finsert_file_contents): Be sure to call unbind_to
1836 after calling code_conversion_save.
1838 2004-03-11 Kenichi Handa <handa@m17n.org>
1840 * xdisp.c (handle_auto_composed_prop): Fix Lisp_Object/int mixup.
1842 * print.c (print_prune_string_charset): Fix Lisp_Object/int mixup.
1844 * fontset.c: Include "intervals.h".
1845 (fontset_face): Fix comparing of Lisp_Objects.
1846 (free_face_fontset): Fix Lisp_Object/int mixup.
1847 (new_fontset_from_font_name): Likewise.
1849 * editfns.c (Ftranslate_region_internal): Fix Lisp_Object/int mixup.
1851 * coding.c: Add many prototypes for static functions.
1852 (get_translation_table): Allow max_lookup to be NULL.
1853 (decode_coding): Call get_translation_table with max_lookup NULL.
1854 (Ffind_coding_systems_region_internal): Likewise.
1855 (Funencodable_char_position, Fcheck_coding_systems_region):
1858 2004-03-11 Kenichi Handa <handa@m17n.org>
1860 * coding.c (get_translation_table): Declare it as Lisp_Object.
1861 (LOOKUP_TRANSLATION_TABLE): New macro.
1862 (produce_chars): Use LOOKUP_TRANSLATION_TABLE instead of
1864 (consume_chars): Likewise.
1866 2004-03-11 Kenichi Handa <handa@m17n.org>
1868 * coding.c (MAX_ANNOTATION_LENGTH): Adjusted for the change of
1869 annotation data format.
1870 (ADD_ANNOTATION_DATA, ADD_COMPOSITION_DATA, ADD_CHARSET_DATA):
1871 Change arguments FROM and TO to single argument NCHARS. Caller
1873 (decode_coding_utf_8): Pay attention to coding->charbuf_used.
1874 (decode_coding_utf_16, decode_coding_emacs_mule)
1875 (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
1876 (decode_coding_ccl, decode_coding_charset): Likewise.
1877 (get_translation): New function.
1878 (produce_chars): New arguments translation_table and last_block.
1879 Translate characters here. Return number of carryover chars.
1881 (produce_composition): New argument pos. Caller changed.
1882 Adjusted for the change of annotation data format.
1883 (produce_charset, produce_annotation): Likewise.
1884 (decode_coding, encode_coding): Don't call translate_chars.
1885 (consume_chars): New arg translation_table. Caller changed.
1886 (translate_chars): Deleted.
1887 (syms_of_coding): Make translation-table's number of extra slots
1890 2004-03-09 Kenichi Handa <handa@m17n.org>
1892 * search.c (simple_search): Fix setting this_pos_byte in backward
1895 * coding.c (detect_coding_emacs_mule): Fix counting of encoded
1897 (detect_coding_ccl): Fix setting of the variable valids.
1899 2004-03-04 Kenichi Handa <handa@m17n.org>
1901 * xterm.c (x_list_fonts): Fix the detection of an auto-scaled font.
1903 * coding.c (decode_coding_utf_16): Fix handling of surrogate pair.
1905 * editfns.c (Ftranslate_region_internal): Renamed from
1906 Ftranslate_region. Accept a char-table in TABLE.
1907 (syms_of_editfns): Defsubr Stranslate_region_internal.
1909 * xfaces.c (set_lface_from_font_name): If a font is specified for
1910 a frame, generate a fontset from the font.
1911 (build_scalable_font_name): If the scalable font is requested for
1912 a specific size, don't change that size.
1913 (try_font_list): Try a scalable font also in the case that a
1914 pattern string is specified,
1917 2004-03-03 Kenichi Handa <handa@m17n.org>
1919 * xfaces.c (Fface_font): New optional arg CHARACTER.
1921 2004-02-17 Kenichi Handa <handa@m17n.org>
1923 * charset.h (CHARSET_OFFSET): New macro.
1925 2004-02-13 Kenichi Handa <handa@m17n.org>
1927 * xterm.c (x_get_font_repertory): Fix for non-Unicode-bmp charset.
1929 * fontset.c (fontset_face): Handle the case that repertory is a
1931 (find_font_encoding): Return nil for unknown encoding.
1932 (Fset_fontset_font): Ignore a font of unknown encoding.
1934 2004-02-09 Kenichi Handa <handa@m17n.org>
1936 * keymap.c (describe_vector): Handle default value of a char
1939 * fontset.c (fontset_face): Handle fallback fonts correctly.
1940 (Ffontset_info): Return infomation about fallback fonts.
1942 2004-02-06 Kenichi Handa <handa@m17n.org>
1944 * fontset.c (FONTSET_DEFAULT): New macro.
1945 (FONTSET_ADD): Handle the case that range is nil.
1946 (fontset_add): Likewise.
1947 (Fset_fontset_font): Change the 2nd arg name to TARGET, and handle
1948 the case that it is nil.
1949 (dump_fontset): Call FONTSET_DEFAULT, not FONTSET_FALLBACK.
1950 (syms_of_fontset): Set char-table-extra-slots property of fontset
1953 * charset.h (CHAR_CHARSET_P): Fix for the case that the method is
1956 2004-01-30 Kenichi Handa <handa@m17n.org>
1958 * emacs.c (main): Call init_charset after syms_of_XXX.
1960 * charset.c (Vcharset_map_directory): Deleted.
1961 (Vcharset_map_path): New variable
1962 (load_charset_map_from_file): Use Vcharset_map_path instead.
1963 (init_charset): Initialize Vcharset_map_path.
1964 (syms_of_charset): Delete declaration of "charset-map-directory",
1965 add declaration of "charset-map-path".
1967 2004-01-29 Kenichi Handa <handa@m17n.org>
1969 * fns.c (string_char_to_byte): Optimize for ASCII only string.
1970 (string_byte_to_char): Likewise.
1972 * fileio.c (Finsert_file_contents): Avoid detecting a code twice.
1974 * coding.c (detect_coding_iso_2022): Fix handling of SS2 and SS3.
1975 (detect_coding): Treat '\0' as normal ASCII byte..
1976 (detect_coding_system): Likewise.
1978 2004-01-27 Kenichi Handa <handa@m17n.org>
1980 * coding.h (SJIS_TO_JIS2, JIS_TO_SJIS2): New macros.
1982 * coding.c (QCmnemonic, QCdefalut_char)
1983 (QCdecode_translation_table, QCencode_translation_table)
1984 (QCpost_read_conversion, QCpre_write_conversion): New variables.
1985 (get_translation_table): Return a list of translation tables if
1987 (decode_coding): Call get_translation_table with ENCODEP 0.
1988 (char_encodable_p): If translation_table is non-nil, always call
1990 (Fdefine_coding_system_internal): Accept list of translation
1991 tables as :encode-translation-table and :decode-translation-table.
1992 (Fcoding_system_put): New function.
1993 (syms_of_coding): Declare new symbols. Defsubr
1995 (decode_coding_sjis): Handle 4th charset (typically JISX0212).
1996 (encode_coding_sjis): Likewise.
1998 * charset.c (map_charset_chars): Fix arg to map_charset_chars in
1999 when the charset is superset type.
2001 * character.c (translate_char): Accept list of translation tables.
2003 2004-01-25 Kenichi Handa <handa@m17n.org>
2005 * coding.h (enum coding_attr_index): New member
2006 coding_attr_trans_tbl.
2007 (CODING_ATTR_TRANS_TBL): New macro.
2009 * coding.c (get_translation_table): New function.
2010 (translate_chars): Fix the bug of skipping annotation data.
2011 (decode_coding): Utilze get_translation_table.
2012 (encode_coding): Likewise.
2013 (char_encodable_p): Translate char if necessary.
2014 (Funencodable_char_position): Likewise.
2015 (Ffind_coding_systems_region_internal): Setup translation table
2016 for encode in a coding system attribute vector in advance.
2017 (Fcheck_coding_systems_region): Likewise.
2018 (Fdefine_coding_system_internal): Allow a symbol as translation
2019 table. For shift-jis type coding system, allow 4th charset.
2021 2004-01-24 Kenichi Handa <handa@m17n.org>
2023 * coding.c (decode_coding_sjis): Check the first byte rigidly.
2025 * xdisp.c (get_next_display_element): Pass -1 as POS to
2026 FACE_FOR_CHAR if displaying a C-string.
2028 2004-01-23 Kenichi Handa <handa@m17n.org>
2030 * composite.c (get_composition_id): Handle xoff and yoff in a
2033 * composite.h (COMPOSITION_DECODE_RULE): New arg xoff and yoff.
2034 (struct composition): New member lbearing and rbearing.
2036 * xdisp.c (move_it_to): Optimize for the case (op & MOVE_TO_Y).
2037 (x_get_glyph_overhangs): Handle a composition glyph.
2038 (x_produce_glyphs): Setup lbearing and rbreaing for a composition
2041 * xterm.c (x_compute_glyph_string_overhangs): Handle also a
2044 2004-01-18 Kenichi Handa <handa@m17n.org>
2046 * print.c: Include charset.h.
2047 (Vprint_charset_text_property): New variable.
2048 (Qdefault): Extern it.
2049 (PRINT_STRING_NON_CHARSET_FOUND)
2050 (PRINT_STRING_UNSAFE_CHARSET_FOUND): New macros.
2051 (print_check_string_result): New variable.
2052 (print_check_string_charset_prop): New function.
2053 (print_prune_charset_plist): New variable.
2054 (print_prune_string_charset): New function.
2055 (print_object): Call print_prune_string_charset if
2056 Vprint_charset_text_property is not t.
2057 (print_interval): Print nothing if itnerval->plist is nil.
2058 (syms_of_print): Declare Vprint_charset_text_property as a lisp
2059 variable. Init and staticpro print_prune_charset_plist.
2061 2004-01-15 Kenichi Handa <handa@m17n.org>
2063 * fontset.c (new_fontset_from_font_name): Use the specified font
2064 for all characters in the new fontset.
2066 * macterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
2069 * xdisp.c (x_produce_glyphs): Call FACE_FOR_CHAR with POS and
2070 OBJECT args for composition too.
2072 * w32term.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
2075 2004-01-13 Kenichi Handa <handa@m17n.org>
2077 * dispextern.h (FACE_FOR_CHAR): New args POS and OBJECT.
2079 * fontset.c (reorder_font_vector): Adjusted for the change of
2081 (fontset_face): New arg id. Caller changed.
2082 (face_for_char): New args pos and object.
2083 (make_fontset_for_ascii_face): Adjusted for the change of FONT_DEF
2085 (fs_query_fontset): Check NAME by Fassoc too.
2086 (Fset_fontset_font): Allow non-XLFD font name.
2087 (Ffontset_info): Adjusted for the change of FONT_DEF format.
2089 * fontset.h (face_for_char): Prototype adjusted.
2091 * xdisp.c (face_before_or_after_it_pos): Call FACE_FOR_CHAR with
2092 POS and OBJECT args.
2093 (get_next_display_element): Likewise.
2094 (append_space): Likewise.
2095 (extend_face_to_end_of_line): Likewise.
2096 (get_char_face_and_encoding): Likewise.
2097 (BUILD_COMPOSITE_GLYPH_STRING): Likewise.
2098 (x_produce_glyphs): Likewise.
2100 * xfaces.c (compute_char_face): Call FACE_FOR_CHAR with
2101 POS and OBJECT args.
2103 * xterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with
2104 POS and OBJECT args.
2106 2004-01-03 Jason Rumney <jasonr@gnu.org>
2108 * w32select.c (Fw32_set_clipboard_data): Avoid potential realloc
2109 of GlobalAlloc'ed memory.
2111 2003-12-29 Kenichi Handa <handa@m17n.org>
2113 * ccl.c (Fccl_execute_on_string): Fix the condition of loop.
2115 * charset.h (charset_table_used): Delete extern.
2117 * charset.c (charset_table_used): Make it static.
2118 (map_charset_chars): Fix args to c_function with.
2120 * chartab.c (map_sub_char_table_for_charset): Fix args to
2123 * coding.h (enum coding_result_code): Delete
2124 CODING_RESULT_INSUFFICIENT_CMP, add CODING_RESULT_INVALID_SRC.
2126 * coding.c (Qinsufficient_source, Qinconsistent_eol)
2127 (Qinvalid_source, Qinterrupted, Qinsufficient_memory): New
2129 (Vlast_code_conversion_error): New variables.
2130 (syms_of_coding): DEFSYM or DEFVAR_LISP them.
2131 (ONE_MORE_BYTE): Record error if any instead of signaling an
2132 error. If non-ASCII multibyte char is found, return the negative
2133 value of the code. All callers changed to check it.
2134 (ONE_MORE_BYTE_NO_CHECK): Likewise.
2135 (record_conversion_result): New function. All codes setting
2136 coding->result are changed to call this function.
2137 (detect_coding_utf_8): Don't use the local variable incomplete.
2138 (decode_coding_utf_8): Likewise.
2139 (emacs_mule_char): Change the second arg to `const'.
2140 (detect_coding_emacs_mule): Don't use the local variable
2142 (detect_coding_sjis): Likewise.
2143 (detect_coding_big5): Likewise.
2144 (decode_coding): Fix of flushing out unprocessed data.
2145 (make_conversion_work_buffer): Fix making of a work buffer.
2146 (decode_coding_object): Return coding->dst_object;
2148 * fontset.c (set_fontset_font): Fix args.
2150 * lisp.h (CHARACTERBITS): Define as 22.
2152 * process.c (send_process): Be sure to set coding->src_multibyte.
2154 * xdisp.c (handle_auto_composed_prop): Fix setting of limit.
2156 2003-12-02 Kenichi Handa <handa@m17n.org>
2158 * xdisp.c (handle_auto_composed_prop): Give limit to
2159 Fnext_single_char_property_change.
2161 2003-12-02 Kenichi Handa <handa@m17n.org>
2163 * coding.c (detect_coding): Fix previous change.
2164 (detect_coding_system): Likewise.
2166 2003-12-02 Kenichi Handa <handa@m17n.org>
2168 * composite.c (syms_of_composite): Don't make the compostion hash
2171 * fontset.c (Fset_fontset_font): Fix docstring.
2173 * lisp.h (detect_coding_system): Adjust prototype.
2175 * fileio.c (kill_workbuf_unwind): Delete this function.
2176 (Finsert_file_contents): Adjust the call of detect_coding_system.
2177 Get conversion_buffer by code_conversion_save. Use the macor
2178 CODING_MAY_REQUIRE_DECODING. After decoding, update
2181 * coding.h (make_conversion_work_buffer): Delete extern.
2182 (code_conversion_save): Extern it.
2184 * coding.c (enum iso_code_class_type): Delete ISO_carriage_return.
2185 (CODING_GET_INFO): Delete argument eol_type. Callers changed.
2186 (decode_coding_utf_8): Don't do eol converion.
2187 (detect_coding_utf_16): Check coding->src_chars, not
2188 coding->src_bytes. Add heuristics for those that have no
2190 (decode_coding_emacs_mule): Don't do eol converion.
2191 (decode_coding_iso_2022): Likewise.
2192 (decode_coding_sjis): Likewise.
2193 (decode_coding_big5): Likewise.
2194 (decode_coding_charset): Likewise.
2195 (adjust_coding_eol_type): Return a new coding system.
2196 (detect_coding): Don't detect eol. Fix for utf-16 detection.
2197 (decode_eol): In case of CRLF->LF conversion, use del_range_2 on
2199 (decode_coding): Pay attention to undo_list. Do eol convesion for
2200 all types of coding-systems (if necessary).
2201 (Vcode_conversion_work_buf_list): Delete it.
2202 (Vcode_conversion_reused_workbuf): Renamed from
2203 Vcode_conversion_reused_work_buf.
2204 (Vcode_conversion_workbuf_name): New variable.
2205 (reused_workbuf_in_use): New variable.
2206 (make_conversion_work_buffer): Delete the arg DEPTH.
2207 (code_conversion_restore): Argument changed to cons.
2208 (code_conversion_save): Delete the argument BUFFER. Callers
2210 (detect_coding_system): New argument src_chars. Callers changed.
2211 Fix for utf-16 detection.
2212 (init_coding_once): Don't use ISO_carriage_return.
2213 (syms_of_coding): Initialized Vcode_conversion_workbuf_name and
2214 reused_workbuf_in_use.
2216 2003-11-24 Kenichi Handa <handa@m17n.org>
2218 * keymap.c (store_in_keymap): Pay attention to the case that idx
2219 is a cons specifying a character range.
2221 * coding.c (Fdefine_coding_system_internal): Fix previous change.
2223 2003-11-23 Kenichi Handa <handa@m17n.org>
2225 * xdisp.c (handle_auto_composed_prop): Fix the case of returning
2226 HANDLED_RECOMPUTE_PROPS.
2228 * coding.c (Fdefine_coding_system_internal): Fix checking of
2229 ascii compatibility.
2231 2003-11-22 Kenichi Handa <handa@m17n.org>
2233 * charset.c (find_charsets_in_text): Delete unused locale
2235 (Fset_charset_priority): Update Vemacs_mule_charset_list too.
2237 * coding.c (encode_coding_emacs_mule): Emit bytes with MSB.
2238 Resync charset_list to Vemacs_mule_charset_list.
2240 * keymap.c (store_in_keymap): Pay attention to the case that idx
2241 is a cons specifying a character range.
2243 2003-11-18 Kenichi Handa <handa@m17n.org>
2245 * composite.c (update_compositions): Bind inhibit-read-only, etc
2246 to t before calling remove-list-of-text-properties.
2248 * print.c (print_object): Always print ASCII chars as is.
2250 2003-11-17 Kenichi Handa <handa@m17n.org>
2252 * keymap.c (Fdefine_key): Fix handling of Lucid style event type
2255 * fns.c (Fmapconcat): Signal an error if SEQUENCE is a char table.
2256 (Fmapcar): Likewise.
2259 2003-11-15 Kenichi Handa <handa@m17n.org>
2261 * syntax.c (skip_chars): Be sure to alloca char_ranges when
2264 2003-11-14 Kenichi Handa <handa@m17n.org>
2266 * xfaces.c (set_lface_from_font_name): Fix for the case that
2267 FONTNAME is not fontset name.
2269 2003-11-13 Kenichi Handa <handa@m17n.org>
2271 * fns.c (base64_encode_1): Fix previous change.
2273 2003-11-08 Kenichi Handa <handa@m17n.org>
2275 * fontset.c (set_fontset_font): New function.
2276 (Fset_fontset_font): If a font is specified for a charset, use
2277 map_charset_chars to store the font spec in a fontset.
2279 2003-10-29 Kenichi Handa <handa@m17n.org>
2281 * fontset.c (fontset_face): Create a fallback fontset on demand
2282 (make_fontset): Don't create a fallback fontset here.
2283 (free_face_fontset): Free a fallback fontset (if any) too.
2284 (n_auto_fontsets): Delete this variable.
2285 (auto_fontset_alist): New variable.
2286 (new_fontset_from_font_name): Check auto_fontset_alist.
2287 (dump_fontset) [FONTSET_DEBUG]: Fully re-written.
2288 (Ffontset_list_all) [FONTSET_DEBUG]: New function.
2289 (syms_of_fontset): Initialize and staticpro auto_fontset_alist.
2290 Defsubr Sfontset_list_all.
2292 2003-10-24 Kenichi Handa <handa@m17n.org>
2294 * xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
2296 2003-10-23 Kenichi Handa <handa@m17n.org>
2298 * fontset.c (Fnew_fontset): Check NAME more rigidly.
2300 2003-10-17 Kenichi Handa <handa@m17n.org>
2302 * editfns.c (Fgoto_char): Fix docstring.
2304 2003-10-16 Kenichi Handa <handa@m17n.org>
2306 * insdel.c (insert_from_gap): Adjust intervals correctly.
2308 2003-10-12 Jason Rumney <jasonr@gnu.org>
2310 * w32term.c (GLYPHSET, WCRANGE): Define if system headers don't.
2311 (pfnGetFontUnicodeRanges): New dynamically loaded function.
2312 (w32_initialize): Try to load it.
2313 (x_get_font_repertory): Use it if available.
2314 (w32_encode_char): Add shortcut for unicode output.
2316 * w32fns.c (w32_load_system_font): Default charset to -1.
2317 (x_to_w32_charset): Match all fonts for unicode.
2318 (w32_to_x_charset): New parameter matching. Don't return partial
2319 or wildcard charsets.
2320 (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
2321 (w32_codepage_for_font): Return CP_UNICODE for unicode.
2322 (w32_to_x_font): Match charset to real charset.
2323 (enum_font_cb2): Always list unicode versions.
2325 * makefile.w32-in (temacs): Increase EMHEAP.
2327 2003-10-11 Jason Rumney <jasonr@gnu.org>
2329 * w32term.c (w32_encode_char): New charset parameter.
2330 font_info.encoding becomes encoding_type.
2331 (x_get_font_repertory): New function. Warning: stub only!
2332 (x_new_font): Return quickly if font already set.
2333 (x_new_fontset): fontsetname parameter is Lisp_Object.
2334 Use new fs_query_fontset. Try new_fontset_from_font_name. Use
2335 fontset_name for return value.
2337 * w32term.h: Declare x_get_font_repertory.
2339 * w32select.c (Fw32_set_clipboard_data): Use string_x_string_p in
2340 place of find_charset_in_text. Use encode_coding_object in place
2342 (Fw32_get_clipboard_data): Use decode_coding_c_string in place of
2345 * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
2347 (w32_load_system_font): Initialize charset as unicode.
2348 font_info.encoding becomes encoding_type.
2349 (w32_to_x_font): Use decode_coding_c_string in place of
2351 (x_to_w32_font): Use encode_coding_object in place of
2353 (syms_of_w32fns): Set get_font_repertory_func.
2355 * w32console.c: Include character.h. Use terminal_encode_buffer
2357 (write_glyphs): Use new version of encode_terminal_code. Use
2358 encode_coding_object in place of encode_coding.
2360 * w32bdf.c (w32_load_bdf_font): Clear font_info before filling.
2361 encoding becomes encoding_type.
2363 * term.c (terminal_encode_buffer): Make externally visible.
2365 * makefile.w32-in: Add character.h dependancies.
2366 (character.o, chartab.o): New targets.
2368 2003-10-10 Kenichi Handa <handa@m17n.org>
2370 * fileio.c (Finsert_file_contents) [DOS_NT]: Use the macro
2371 CODING_ID_EOL_TYPE..
2373 2003-10-07 Andreas Schwab <schwab@suse.de>
2375 * coding.c (produce_chars): Revert last change.
2377 2003-10-06 Kenichi Handa <handa@m17n.org>
2379 * charset.h (charset_unicode): Extern it.
2381 * charset.c (string_xstring_p): Check by (C >= 0x100).
2382 (find_charsets_in_text): Format of the arc CHARSETS changed. New
2384 (Ffind_charset_region, Ffind_charset_string): Adjusted for the
2385 change of find_charsets_in_text.
2386 (Fsplit_char): Fix doc. Never return unknown.
2388 * chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
2390 * coding.c (Fdefine_coding_system_alias): Update
2391 Vcoding_system_list.
2393 * fontset.c (load_font_get_repertory): Pay attention to the case
2394 that ENCODING of a font is specified by a char-table.
2396 * xterm.c (x_get_font_repertory): Handle the case that the
2397 encoding of font is other than Unicode.
2399 2003-10-02 Kenichi Handa <handa@m17n.org>
2401 * term.c (encode_terminal_code): Don't handle glyph-table. Check
2402 if a character is encodable by the terminal coding system. If
2403 not, produces proper number of `?'s. Update
2404 terminal_encode_buffer and terminal_encode_buf_size if necessary.
2405 (produce_glyphs): Check by CHAR_BYTE8_P, not SINGLE_BYTE_CHAR_P.
2407 2003-10-01 Kenichi Handa <handa@m17n.org>
2409 * term.c (terminal_encode_buffer, terminal_encode_buf_size): New
2411 (encode_terminal_code): Argument changed. Encode multiple
2412 characters at once. Store the result of encoding in
2413 terminal_encode_buffer.
2414 (write_glyphs): Adjusted for the change of encode_terminal_code.
2415 (insert_glyphs): Likewise.
2416 (term_init): Initialize terminal_encode_buffer and
2417 terminal_encode_buf_size.
2419 * coding.c (consume_chars): If coding->src_object is nil, don't
2422 2003-09-30 Kenichi Handa <handa@m17n.org>
2424 * character.c (char_string): Use ASCII_CHAR_P instead of
2427 2003-09-30 Kenichi Handa <handa@m17n.org>
2429 * xdisp.c (handle_auto_composed_prop): Check if the last
2430 characters of auto-composed region is newly composed with the
2431 following characters.
2432 (handle_composition_prop): Fix checking of point being inside
2435 2003-09-26 Kenichi Handa <handa@m17n.org>
2437 * fns.c (concat): Don't change multibyteness of the result by
2438 concatenating an 8-bit character.
2440 * data.c (Faset): Check newelt by CHECK_CHARACTER. Don't change
2441 multibyteness of the result when newelt is an 8-bit character.
2443 2003-09-29 Dave Love <fx@gnu.org>
2445 * xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
2448 * xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
2450 * xfaces.c (face_numeric_value): Declare dim size_t.
2451 (Finternal_lisp_face_equal_p): Remove unused f.
2453 * xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
2454 (MATRIX_ROW): Remove unused vars.
2455 (draw_glyphs, x_insert_glyphs, fast_find_position)
2456 (fast_find_position, fast_find_string_pos): Use EMACS_INT for
2459 * regex.c (regex_compile): Remove unused var.
2461 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
2463 * keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
2464 (Faccessible_keymaps, where_is_internal): Remove unused vars.
2466 * keyboard.c (cancel_hourglass_unwind): Return Qnil.
2468 * frame.c (frame_name_fnn_p): Make len EMACS_INT.
2470 * fileio.c (Fwrite_region): Remove unused var.
2472 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
2473 (adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
2475 * composite.c (Fremove_list_of_text_properties): Declare.
2477 * coding.c (inhibit_pre_post_conversion): Removed (unused).
2478 (alloc_destination, produce_chars): Use EMACS_INT for byte/char
2480 (coding_inherit_eol_type): Remove unused attrs.
2481 (detect_coding): Cast arg of detect_eol.
2483 * charset.c (syms_of_charset): Remove unused var p.
2484 (find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
2487 * casetab.c (set_case_table): Remove unused var.
2489 * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
2492 2003-09-26 Dave Love <fx@gnu.org>
2494 * xterm.c (x_bitmap_mask): Declare.
2496 2003-09-17 Dave Love <fx@gnu.org>
2498 * xterm.c (x_term_init): Fix type error.
2500 * lisp.h: Add Funibyte_char_to_multibyte.
2502 * coding.c (Fread_coding_system): Fix arg of XSETSTRING.
2503 (Fset_coding_system_priority): Doc fix.
2505 * alloc.c: Sync with HEAD version.
2507 * ccl.c (ccl_driver): Fix arg of CHARACTERP.
2509 * indent.c (check_composition): Make start and end EMACS_INT.
2511 * character.c (lisp_string_width): Make ignore and end EMACS_INT.
2513 * xdisp.c (handle_composition_prop, check_point_in_composition):
2514 Make buffer positions EMACS_INT.
2516 * composite.c (find_composition, run_composition_function)
2517 (update_compositions, Ffind_composition_internal): Make buffer
2518 positions EMACS_INT.
2520 * composite.h (find_composition, update_compositions): Make
2521 position args EMACS_INT.
2523 * keyboard.c (adjust_point_for_property): Make beg and end
2526 * intervals.c (get_property_and_range)
2527 * intervals.h (get_property_and_range): Make start and end EMACS_INT.
2529 * unexalpha.c: Don't include varargs.h.
2531 2003-09-16 Dave Love <fx@gnu.org>
2533 * coding.h (ENCODE_UTF_8): New.
2535 * Makefile.in (gtkutil.o): Depend on coding.h.
2537 * coding.c (Fset_coding_system_priority): Doc fix.
2539 2003-09-16 Kenichi Handa <handa@m17n.org>
2541 * fileio.c (Finsert_file_contents): Call setup_coding_system in
2542 the case of auto saving.
2544 2003-09-10 Andreas Schwab <schwab@suse.de>
2546 * chartab.c (map_char_table): Protect `range' from GC.
2547 (map_char_table_for_charset): Likewise.
2549 2003-07-09 Kenichi Handa <handa@m17n.org>
2551 * coding.c (decode_coding_sjis): Check bytes more rigidly.
2553 2003-06-26 Kenichi Handa <handa@m17n.org>
2555 * fileio.c (choose_write_coding_system): Return a decided coding
2557 (Fwrite_region): Set Vlast_coding_system_used to the return value
2558 of choose_write_coding_system.
2560 2003-06-06 Kenichi Handa <handa@m17n.org>
2562 * charset.c (Fset_charset_priority): Pay attention to duplicated
2565 * coding.c (QCcategory): New variable.
2566 (syms_of_coding): Defsym it. Set all elements of
2567 Vcoding_category_table and their symbol values.
2568 (Fset_coding_system_priority): Doc fix. Update symbol qvalues of
2569 coding-category-XXX, and coding-category-list.
2570 (Fdefine_coding_system_internal): Add category in the plist.
2572 2003-06-05 Kenichi Handa <handa@m17n.org>
2574 * callproc.c (Fcall_process): Handle carryover correctly.
2576 * coding.c (decode_coding_iso_2022): Fix handling of invalid
2578 (raw_text_coding_system): Check NILP (coding_system).
2579 (coding_inherit_eol_type): Check NILP (coding_system) and
2581 (consume_chars): Fix for the case of raw-text.
2583 * process.c (read_process_output): Handle carryover correctly.
2585 2003-06-02 Dave Love <fx@gnu.org>
2587 * regex.c (re_search_2): Fix last change.
2589 2003-05-30 Kenichi Handa <handa@m17n.org>
2591 * regex.c (GET_CHAR_BEFORE_2): Check multibyte, not
2592 target_multibyte. Even in a unibyte case, return a converted
2594 (GET_CHAR_AFTER): New macro.
2595 (PATFETCH): Translate via multibyte char.
2596 (HANDLE_UNIBYTE_RANGE): Delete this macro.
2597 (SETUP_MULTIBYTE_RANGE): New macro.
2598 (regex_compile): Setup compiled code so that its multibyteness
2599 matches that of a target. Fix the handling of "[X-YZ]" using
2600 SETUP_MULTIBYTE_RANGE.
2601 (analyse_first) <charset>: For filling fastmap for all multibyte
2602 characters, don't check by BASE_LEADING_CODE_P.
2603 (re_search_2): Don't check RE_TARGET_MULTIBYTE_P (bufp). It is
2604 the same as RE_MULTIBYTE_P (bufp) now.
2605 (mutually_exclusive_p): Check by (! multibyte ||
2607 (TARGET_CHAR_AND_LENGTH): Delete this macro.
2608 (TRANSLATE_VIA_MULTIBYTE): New macro.
2609 (re_match_2_internal): Don't check RE_TARGET_MULTIBYTE_P (bufp).
2610 It is the same as RE_MULTIBYTE_P (bufp) now.
2611 <exactn>: Translate via multibyte.
2612 <anychar>: Fetch a character by RE_STRING_CHAR_AND_LENGTH. Don't
2614 <charset, charset_not>: Fetch a character by
2615 RE_STRING_CHAR_AND_LENGTH. Translate via multibyte.
2616 <duplicate>: Call bcmp_translate with the last arg `multibyte'.
2617 <wordbound, notwordbound, wordbeg, wordend, syntaxspec,
2618 notsyntaxspec, categoryspec, notcategoryspec> Fetch a character
2620 (bcmp_translate): Likewise.
2622 * search.c (compile_pattern): Check the member target_multibyte,
2623 not the member multibyte of buf.
2625 * lread.c (read1): While reading a string, set force_singlebyte
2626 and force_multibyte correctly.
2628 * charset.c (Fset_unibyte_charset): Fix setting up of
2629 unibyte_to_multibyte_table.
2630 (init_charset_once): Likewise.
2632 2003-05-29 Kenichi Handa <handa@m17n.org>
2634 * coding.c (setup_coding_system): If coding has
2635 post-read-conversion or pre-write-conversion, set
2636 CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK
2638 (decode_coding_gap): Run post-read-conversion if any.
2640 * fileio.c (Finsert_file_contents): Even if we read into a
2641 unibyte buffer, check if we must decode the result or not.
2643 2003-05-29 Kenichi Handa <handa@m17n.org>
2645 * coding.c (make_conversion_work_buffer): Change the work buffer
2646 name to the same one as that of Emacs 21.
2648 2003-05-28 Kenichi Handa <handa@m17n.org>
2650 * coding.h (make_conversion_work_buffer): Prototype adjusted.
2651 (code_conversion_restore): Don't extern it.
2653 * coding.c (detected_mask): Delete unused variable.
2654 (decode_coding_iso_2022): Pay attention to the byte sequence of
2655 CTEXT extended segment, and retain those bytes as is.
2656 (decode_coding_ccl): Delete unused variable `valids'.
2657 (setup_coding_system): Delete unused variable `category'.
2658 (consume_chars): Delete unused variable `category'. Make it work
2659 for non-multibyte case.
2660 (make_conversion_work_buffer): Argument changed.
2661 (saved_coding): Delete unused variable.
2662 (code_conversion_restore): Don't check saved_coding->destination.
2663 (code_conversion_save): New function.
2664 (decode_coding_gap, encode_coding_gap): Call code_conversion_save
2665 instead of record_unwind_protect.
2666 (decode_coding_object, encode_coding_object): Likewise. Recover
2668 (detect_coding_system): Delete unused variable `mask'.
2669 (Fdefine_coding_system_internal): Delete unsed vaiable id;
2671 * fileio.c (kill_workbuf_unwind): New function.
2672 (Finsert_file_contents): On replacing, call
2673 make_conversion_work_buffer with correct args, and call
2674 record_unwind_protect with the first arg kill_workbuf_unwind.
2676 * lisp.h (Fgenerate_new_buffer_name): EXFUN it.
2678 2003-05-20 Kenichi Handa <handa@m17n.org>
2680 * fontset.c (BASE_FONTSET_P): Check FONTSET_BASE, not
2682 (fontset_add): Fix for the case that TO is less than TO1.
2683 (Ffontset_info): Don't use fallback fontset on checking the
2685 (dump_fontset): New function for debugging.
2687 * coding.c (Fdefine_coding_system_internal): Fix for the case that
2688 coding_type is Qcharset.
2690 2003-05-07 Kenichi Handa <handa@m17n.org>
2692 * chartab.c (map_sub_char_table): New argument DEFAULT_VAL.
2693 (map_char_table): Don't inherit the value from the parent on
2694 initializing VAL. Adjusted for the above change.
2696 2003-05-06 Kenichi Handa <handa@m17n.org>
2698 * coding.c (Qsignature, Qendian): Delete these variables.
2699 (syms_of_coding): Don't initialize them.
2700 (CATEGORY_MASK_UTF_16_AUTO): New macro.
2701 (detect_coding_utf_16): Add CATEGORY_MASK_UTF_16_AUTO in
2703 (decode_coding_utf_16): Don't detect BOM here.
2704 (encode_coding_utf_16): Produce BOM if CODING_UTF_16_BOM (coding)
2705 is NOT utf_16_without_bom.
2706 (setup_coding_system): For a coding system of type utf-16, check
2707 if the attribute :endian is Qbig or not (not nil or not), and set
2708 CODING_REQUIRE_DETECTION_MASK if BOM detection is required.
2709 (detect_coding): If coding type is utf-16 and BOM detection is
2710 required, detect it.
2711 (Fdefine_coding_system_internal): For a coding system of type
2712 utf-16, check if the attribute :endian is Qbig or not (not nil or
2715 2003-05-06 Kenichi Handa <handa@m17n.org>
2717 * coding.c (coding_set_source): Fix for the case that the current
2718 buffer is different from coding->src_object.
2719 (decode_coding_object): Don't use the conversion work buffer if
2720 DST_OBJECT is a buffer.
2722 2003-05-04 Dave Love <fx@gnu.org>
2724 * lread.c (read_emacs_mule_char) [len==2]: Index
2725 emacs_mule_charset correctly.
2727 2003-02-16 Dave Love <fx@gnu.org>
2729 * coding.c (Qbig5, Vbig5_coding_system, CATEGORY_MASK_BIG5)
2730 (detect_coding_big5, decode_coding_big5, encode_coding_big5)
2731 (Fdecode_big5_char, Fencode_big5_char): Deleted. (Big5 no longer
2733 (setup_coding_system, coding_category, CATEGORY_MASK_ANY)
2734 (detected_mask): Remove Big5 bits.
2736 2003-04-09 Kenichi Handa <handa@m17n.org>
2738 The following changes are to make the font rescaling facility
2739 compatible with Emacs 21.
2741 * xfaces.c (Vface_font_rescale_alist): Renamed from
2742 Vface_resizing_fonts.
2743 (struct font_name): Rename member resizing_ratio to rescale_ratio.
2744 (font_rescale_ratio): Renamed from font_resizing_ratio.
2745 (split_font_name): Set font->rescale_ratio.
2746 (better_font_p): Pay attention to font->rescale_ratio.
2747 (build_scalable_font_name): Likewise. Change RESX, and RESY
2749 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
2752 2003-03-28 Kenichi Handa <handa@m17n.org>
2754 * coding.c (Qutf_16_be_nosig, Qutf_16_be, Qutf_16_le_nosig)
2755 (Qutf_16_le): Remove these variables.
2756 (syms_of_coding): Don't DEFSYM them.
2757 (decode_coding_utf_16): Fix handling of BOM.
2758 (encode_coding_utf_16): Fix handling of BOM.
2760 2003-03-14 Kenichi Handa <handa@m17n.org>
2762 * fileio.c (Finsert_file_contents): On replacing, before decoding
2763 the file into the work buffer, set point of the work buffer to the
2766 2003-02-13 Dave Love <fx@gnu.org>
2768 * coding.c (Fcheck_coding_systems_region): Fix type errors.
2770 2003-02-04 Dave Love <fx@gnu.org>
2772 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2775 2003-01-31 Kenichi Handa <handa@m17n.org>
2777 * xdisp.c (SKIP_GLYPHS): New macro.
2778 (set_cursor_from_row): Pay attention to string display properties.
2780 * category.c (copy_category_entry): Fix for the case that RANGE
2783 * xterm.c (x_encode_char): Call ccl_driver with the last arg Qnil.
2785 * w32term.c (w32_encode_char): Call ccl_driver with the last arg
2788 2003-01-30 Kenichi Handa <handa@m17n.org>
2790 * charset.c (Fcharset_id_internal): New function.
2791 (syms_of_charset): Defsubr it.
2793 * coding.c (decode_coding_ccl, encode_coding_ccl): Call ccl_driver
2794 with the last arg charset_list acquired from coding.
2795 (Fdefine_coding_system_internal): For ccl-based coding system, fix
2796 the attribute coding_attr_ccl_valids.
2798 * coding.h (enum define_coding_ccl_arg_index): Set the first
2799 member coding_arg_ccl_decoder to coding_arg_max.
2801 * ccl.h (ccl_driver): Prototype adjusted.
2803 * ccl.c (CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros.
2804 (ccl_driver): New arg CHARSET_LIST. Use the above macros instead
2805 of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET.
2806 (Fccl_execute): Call ccl_driver with the last arg Qnil.
2807 (Fccl_execute_on_string): Likewise.
2809 2003-01-11 Kenichi Handa <handa@m17n.org>
2811 * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
2814 * charset.c (encode_char): Fix handling of methods SUBSET and
2817 * xterm.c (x_new_fontset): Fix previous change.
2819 2003-01-10 Dave Love <fx@gnu.org>
2821 * composite.c (syms_of_composite): Make composition_hash_table
2824 2003-01-10 Kenichi Handa <handa@m17n.org>
2826 * dispextern.h (check_face_attributes, generate_ascii_font_name)
2827 (font_name_registry): Don't extern them.
2828 (split_font_name_into_vector, build_font_name_from_vector): Extern
2831 * fontset.h (Qfontset): Don't extern it.
2832 (new_fontset_from_font_name): Extern it.
2834 * fontset.c: Give 8 extra slots to fontset objects.
2835 (Qfontset_info): New variable.
2836 (syms_of_fontset): Defsym it.
2837 (FONTSET_FALLBACK): New macro.
2838 (fontset_face): Try also the default fontset.
2839 (make_fontset): Realize a fallback fontset from the default
2841 (generate_ascii_font_name): Moved from xfaces.c. Rewritten by
2842 using split_font_name_into_vector and build_font_name_from_vector.
2843 (Fset_fontset_font): Access the elements of font_spec by enum
2844 FONT_SPEC_INDEX. If font_spec is a string, extract the registry
2845 name by using split_font_name_into_vector.
2846 (Fnew_fontset): If no ASCII font is specified in FONTLIST,
2847 generate a proper font name from the fontset name. Update
2848 Vfontset_alias_alist.
2849 (n_auto_fontsets): New variable.
2850 (new_fontset_from_font_name): New function.
2851 (Ffont_info): Store the information about fonts generated from the
2852 default fontset in the first extra slot of the returned
2855 * xfaces.c (generate_ascii_font_name): Moved to fontset.c.
2856 (font_name_registry): Function deleted.
2857 (split_font_name_into_vector): New function.
2858 (build_font_name_from_vector): New function.
2859 (font_list): The argument REGISTRY is now a list of registry
2861 (choose_face_font): If we are choosing an ASCII font, and ATTRS
2862 specifies an explicit font name, return the name as is. Make a
2863 list of registy names.
2865 * xfns.c (x_set_font, x_create_tip_frame): Adjusted to the change
2867 (Fx_create_frame): Don't call x_new_fontset here. Just use
2868 x_list_fonts to check the existence of fonts.
2870 * xterm.h (x_new_fontset): Prototype adjusted.
2872 * xterm.c (x_new_fontset): Change the arg FONTSETNAME to Lisp
2873 string. Use new_fontset_from_font_name to create a fontset from a
2876 2003-01-07 Dave Love <fx@gnu.org>
2878 * Makefile.in: Fix some dependencies.
2880 * keymap.c (Fapropos_internal): Don't gcpro apropos_predicate but
2881 set it to nil before returning.
2883 * composite.c (update_compositions): Fix type error.
2885 * syntax.c (skip_chars, skip_syntaxes): Fix type errors.
2887 2003-01-07 Kenichi Handa <handa@m17n.org>
2889 * xterm.c (x_new_font): Optimize for the case that the font is
2890 already set for the frame.
2892 2003-01-06 Kenichi Handa <handa@m17n.org>
2894 * chartab.c (char_table_ascii): Check if the char table contents
2895 is sub-char-table or not.
2896 (char_table_set): Fix argument to char_table_ascii.
2897 (char_table_set_range): Likewise.
2899 * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
2900 (detect_coding_utf_8, detect_coding_utf_16)
2901 (detect_coding_emacs_mule, detect_coding_iso_2022)
2902 (detect_coding_sjis, detect_coding_big5)
2903 (detect_coding_ccl, detect_coding_charset): Change argument MASK
2904 to DETECT_INFO. Update DETECT_INFO and return 1 if the byte
2905 sequence is valid in this coding system. Callers changed.
2906 (MAX_ANNOTATION_LENGTH): New macro.
2907 (ADD_ANNOTATION_DATA): New macro.
2908 (ADD_COMPOSITION_DATA): Argument changed. Callers changed. Call
2909 ADD_ANNOTATION_DATA. The format of annotation data changed.
2910 (ADD_CHARSET_DATA): New macro.
2911 (emacs_mule_char): New argument ID. Callers changed.
2912 (decode_coding_emacs_mule, decode_coding_iso_2022)
2913 (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
2914 Produce charset annotation data in coding->charbuf.
2915 (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
2916 to charset annotation data in coding->charbuf.
2917 (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
2918 coding->common_flags if the coding system is iso-2022 based and
2920 (produce_composition): Adjusted for the new annotation data
2922 (produce_charset): New function.
2923 (produce_annotation): Handle charset annotation.
2924 (handle_composition_annotation, handle_charset_annotation): New
2926 (consume_chars): Handle charset annotation. Utilize the above two
2928 (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
2929 buffer, get the deleted text as a string and set
2930 coding->src_object to that string.
2931 (detect_coding, detect_coding_system): Use the new struct
2932 coding_detection_info.
2934 * coding.h (struct coding_detection_info): New structure.
2935 (struct coding_system): Prototype of the member `detector'
2937 (CODING_ANNOTATE_CHARSET_MASK): New macro.
2939 2003-01-06 Kenichi Handa <handa@m17n.org>
2941 * insdel.c (insert_from_gap): Fix argument to offset_intervals.
2943 2003-01-03 Dave Love <fx@gnu.org>
2945 * keymap.c (apropos_predicate, apropos_accumulate): Declare
2947 (Fapropos_internal): Don't gcpro apropos_accumulate. Set result
2948 to new local and nullify apropos_accumulate before returning.
2949 (syms_of_keymap): Staticpro and initialize apropos_accumulate.
2951 2002-12-05 Kenichi Handa <handa@m17n.org>
2953 * charset.c (Fdefine_charset_internal): Setup charset.fast_map
2956 2002-11-26 Dave Love <fx@gnu.org>
2958 * fns.c (Flanginfo): Call synchronize_system_time_locale.
2960 2002-11-07 Kenichi Handa <handa@m17n.org>
2962 The following changes are to make character composition happen
2963 automatically on displaying.
2965 * Makefile.in (lisp, shortlisp): Add composite.elc
2967 * composite.h (Qauto_composed, Vauto_composition_function,
2968 Qauto_composition_function): Extern them.
2970 * composite.c (Vcomposition_function_table,
2971 Qcomposition_function_table): Delete variables.
2972 (Qauto_composed, Vauto_composition_function,
2973 Qauto_composition_function): New variables.
2974 (run_composition_function): Don't call
2975 compose-chars-after-function.
2976 (update_compositions): Clear `auto-composed' text property.
2977 (compose_chars_in_text): Delete this function.
2978 (syms_of_composite): Staticpro Qauto_composed and
2979 Qauto_composition_function. Declare Vauto_composition_function as
2982 * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
2984 * xdisp.c (it_props): Add an entry for Qauto_composed.
2985 (handle_auto_composed_prop): New function.
2987 * xselect.c (selection_data_to_lisp_data): Don't call
2988 compose_chars_in_text.
2990 2002-11-06 Dave Love <fx@gnu.org>
2992 * keyboard.c (read_char): Modify checking around use of
2993 Vkeyboard_translate_table.
2995 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2998 2002-11-06 Kenichi Handa <handa@m17n.org>
3000 * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
3001 the case that the last byte is '\r' correctly.
3002 (decode_coding_emacs_mule): Likewise.
3003 (decode_coding_iso_2022): Likewise.
3004 (decode_coding_sjis): Likewise.
3005 (decode_coding_big5): Likewise.
3006 (decode_coding_charset): Likewise.
3007 (produce_chars): Likewise.
3008 (decode_coding): Flushing out the unprocessed data correctly.
3009 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
3012 2002-10-31 Dave Love <fx@gnu.org>
3014 * xterm.c (XTread_socket): Fix changes for defined keysyms. Add
3016 (xaw_scroll_callback): Revert last change.
3018 2002-10-30 Kenichi Handa <handa@m17n.org>
3020 * charset.c (Fset_charset_priority): Update
3021 Viso_2022_charset_list.
3023 2002-10-29 Kenichi Handa <handa@m17n.org>
3025 * xfaces.c (Vface_resizing_fonts): New variable.
3026 (struct font_name): New member `resizing_ratio'.
3027 (font_resizing_ratio): New function.
3028 (split_font_name): Set font->resizing_ratio.
3029 (better_font_p): Pay attention to font->resizing_ratio.
3030 (build_scalable_font_name): Likewise. Don't change POINT_SIZE,
3031 RESX, and RESY fields.
3032 (try_alternative_families): Try scalable fonts if
3033 Vscalable_fonts_allowed is not Qt.
3034 (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
3036 2002-10-29 Dave Love <fx@gnu.org>
3038 * xterm.c (xaw_scroll_callback): Cast correctly.
3040 2002-10-28 Dave Love <fx@gnu.org>
3042 * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
3043 (lispy_kana_keys): Comment out.
3044 (make_lispy_event) [XK_kana_A]: Comment out.
3046 * xterm.c (xaw_scroll_callback): Cast call_data.
3047 (XTread_socket): Deal with ASCII keysyms.
3048 (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
3050 2002-10-27 Dave Love <fx@gnu.org>
3052 * xterm.c (Vx_keysym_table): New.
3053 (syms_of_xterm): Initialize it.
3054 (XTread_socket): Use it.
3055 From head: Eliminate incorrect optimization that tried to avoid
3056 decoding the output of X*LookupString.
3057 (x_get_font_repertory): Delete charset declaration.
3059 2002-10-16 Kenichi Handa <handa@m17n.org>
3061 * coding.c (detect_coding): Fix previous change.
3062 (detect_coding_charset): If only ASCII bytes are found, return 0.
3063 (detect_coding_system): Fix previous change.
3064 (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT
3067 2002-10-15 Dave Love <fx@gnu.org>
3069 * coding.c (Fcheck_coding_system): Doc fix.
3071 * editfns.c (Finsert_byte): Return a proper value.
3073 2002-10-14 Kenichi Handa <handa@m17n.org>
3075 * coding.c (decode_coding): Fix args to translate_chars. Pay
3076 attention to Vstandard_translation_table_for_decode.
3077 (encode_coding): Fix args to translate_chars. Pay attention to
3078 Vstandard_translation_table_for_encode.
3080 * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
3083 * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
3084 not by SINGLE_BYTE_CHAR_P.
3086 * fns.c (concat): Check CH by ASCII_CHAR_P, not by
3089 * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
3092 * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
3093 by SINGLE_BYTE_CHAR_P.
3095 * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
3098 2002-10-14 Dave Love <fx@gnu.org>
3100 * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
3102 2002-10-10 Dave Love <fx@gnu.org>
3104 * fns.c (Flanginfo): Fix typo.
3106 * unexelf.c (unexec): Make last change conditional on Irix 6.5.
3108 2002-10-10 Kenichi Handa <handa@m17n.org>
3110 * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
3111 Don't update *mask when correctly detected.
3112 (detect_coding_utf_16): Likewise.
3113 (detect_coding_emacs_mule): Likewise.
3114 (detect_coding_iso_2022): Likewise.
3115 (detect_coding_sjis): Likewise.
3116 (detect_coding_big5): Likewise.
3117 (detect_coding_ccl): Likewise.
3118 (decode_coding_sjis): Fix decoding of katakana-jisx0201.
3119 (detect_eol): Delete the argument CODING, and add the argument
3121 (detect_coding): Adjusted for the changes above.
3122 (detect_coding_system): Likewise.
3124 2002-10-09 Kenichi Handa <handa@m17n.org>
3126 * character.c (char_string): Renamed from
3127 char_string_with_unification. Pay attention to
3129 (string_char): Renamed from string_char.
3131 * character.h (CHAR_STRING): Call char_string if C is greater than
3133 (CHAR_STRING_ADVANCE): Likewise.
3134 (STRING_CHAR): Call string_char instead of
3135 string_char_with_unification.
3136 (STRING_CHAR_AND_LENGTH): Likewise.
3137 (STRING_CHAR_ADVANCE): Likewise.
3139 2002-10-09 Dave Love <fx@gnu.org>
3141 * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
3143 2002-10-07 Kenichi Handa <handa@m17n.org>
3145 * keymap.c (push_key_description): Pay attention to
3148 * regex.c (re_search_2): Fix for the case of unibyte buffer.
3150 2002-10-06 Dave Love <fx@gnu.org>
3152 * charset.c (define_charset_internal): Rename `supprementary'.
3154 * Makefile.in (lisp, shortlisp): Remove latin-N.
3156 2002-10-05 Dave Love <fx@gnu.org>
3158 * xfns.c (x_window, x_window): Use use_xim.
3160 * xterm.c (use_xim): Initialize.
3161 (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
3162 (x_term_init): Maybe set use_xim.
3164 * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
3166 2002-10-01 Kenichi Handa <handa@m17n.org>
3168 * search.c (search_buffer): Fix case-fold-search of multibyte
3170 (boyer_moore): Rename the last argument to char_high_bits.
3172 2002-09-27 Kenichi Handa <handa@m17n.org>
3174 * xdisp.c (display_string): Fix for the case of zero width glyph.
3176 * xfns.c (x_set_font): Change the error message of the case that
3177 x_new_fontset returns Qt.
3179 * xfaces.c (set_lface_from_font_name): Reject the default fontset.
3180 (Finternal_set_lisp_face_attribute): Use signal_error for the
3181 error of invalid fontset.
3183 * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
3186 2002-09-19 Kenichi Handa <handa@m17n.org>
3188 * regex.c (re_search_2): Fix previous change.
3190 2002-09-18 Kenichi Handa <handa@m17n.org>
3192 * syntax.c (skip_syntaxes): Fix previous change.
3194 2002-09-13 Kenichi Handa <handa@m17n.org>
3196 * syntax.c (skip_chars): Fix previous change.
3197 (skip_syntaxes): Fix previous change.
3199 2002-09-06 Dave Love <fx@gnu.org>
3201 * config.in: Restore it.
3203 2002-09-05 Dave Love <fx@gnu.org>
3205 * config.in: Removed (now auto-generated).
3207 * s/usg5-4.h: Fix last change.
3209 * unexelf.c (unexec): Make .got handling not SGI-specific.
3211 * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
3213 * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
3215 * keyboard.c (read_key_sequence): Fix type error.
3217 * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
3220 * fontset.c (fontset_add): Return Lisp_Object.
3222 2002-09-03 Dave Love <fx@gnu.org>
3224 * charset.h (charset_ordered_list_tick): Declare extern.
3226 2002-09-03 Kenichi Handa <handa@m17n.org>
3228 The following changes (and some of 2002-08-20 changes of mine) are
3229 for handling syntax, category, and case conversion for unibyte
3230 characters by converting them to multibyte on the fly. With these
3231 changes, we don't have to setup syntax and case tables for unibyte
3232 characters in each language environment.
3234 * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
3235 multibyte if necessary.
3237 * bytecode.c (Fbyte_code): Likewise.
3239 * character.h (LEADING_CODE_LATIN_1_MIN)
3240 (LEADING_CODE_LATIN_1_MAX): New macros.
3241 (unibyte_to_multibyte_table): Extern it.
3242 (unibyte_char_to_multibyte): New macro.
3243 (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
3244 (CHAR_LEADING_CODE): New macro.
3245 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
3247 * character.c (unibyte_to_multibyte_table): New variable.
3248 (unibyte_char_to_multibyte): Move to character.h and defined as
3250 (multibyte_char_to_unibyte): If C is an eight-bit character,
3251 convert it to the corresponding byte value.
3253 * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
3254 not 1, singals an error. Update the elements of
3255 unibyte_to_multibyte_table.
3256 (init_charset_once): Initialize unibyte_to_multibyte_table.
3257 (syms_of_charset): Define the charset `iso-8859-1'.
3259 * casefiddle.c (casify_object): Fix previous change.
3261 * cmds.c (internal_self_insert): In a multibyte buffer, insert C
3262 as is without converting it to unibyte. In a unibyte buffer,
3263 convert C to multibyte before checking the syntax.
3265 * lisp.h (unibyte_char_to_multibyte): Extern deleted.
3267 * minibuf.c (Fminibuffer_complete_word): Use the macro
3268 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
3270 * regex.h (struct re_pattern_buffer): New member target_multibyte.
3272 * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
3273 (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte. If
3274 that is zero, convert an eight-bit char to multibyte.
3275 (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
3277 (PATFETCH): Convert an eight-bit char to multibyte.
3278 (HANDLE_UNIBYTE_RANGE): New macro.
3279 (regex_compile): Setup the compiled pattern for multibyte chars
3280 even if the given regex string is unibyte. Use PATFETCH_RAW
3281 instead of PATFETCH in many places. To handle `charset'
3282 specification of unibyte, call HANDLE_UNIBYTE_RANGE. Use bitmap
3283 only for ASCII chars.
3284 (analyse_first) <exactn>: Simplified because the compiled pattern
3286 <charset_not>: Setup fastmap from bitmap only for ASCII chars.
3287 <charset>: Use CHAR_LEADING_CODE to get leading codes.
3288 <categoryspec>: If multibyte, setup fastmap only for ASCII chars
3290 (re_compile_fastmap) [emacs]: Call analyse_first with the arg
3292 (re_search_2) In emacs, set the locale variable multibyte to 1,
3293 otherwise to 0. New local variable target_multibyte. Check it
3294 to decide the multibyteness of STR1 and STR2. If
3295 target_multibyte is zero, convert unibyte chars to multibyte
3296 before translating and checking fastmap.
3297 (TARGET_CHAR_AND_LENGTH): New macro.
3298 (re_match_2_internal): In emacs, set the locale variable multibyte
3299 to 1, otherwise to 0. New local variable target_multibyte. Check
3300 it to decide the multibyteness of STR1 and STR2. Use
3301 TARGET_CHAR_AND_LENGTH to fetch a character from D.
3302 <charset, charset_not>: If multibyte is nonzero, check fastmap
3303 only for ASCII chars. Call bcmp_translate with
3304 target_multibyte, not with multibyte.
3305 <begline>: Declare the local variable C as `unsigned'.
3306 (bcmp_translate): Change the last arg name to target_multibyte.
3308 * search.c (compile_pattern_1): Don't adjust the multibyteness of
3309 the regexp pattern and the matching target. Set cp->buf.multibyte
3310 to the multibyteness of the regexp pattern. Set
3311 cp->but.target_multibyte to the multibyteness of the matching
3313 (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
3314 FETCH_STRING_CHAR_ADVANCE.
3315 (Freplace_match): Convert unibyte chars to multibyte.
3317 * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
3318 unibyte chars to multibyte.
3319 (back_comment): Likewise.
3320 (scan_words): Likewise.
3321 (skip_chars): The arg syntaxp is deleted, and the code for
3322 handling syntaxes is moved to skip_syntaxes. Callers changed.
3323 Fix the case that the multibyteness of STRING and the current
3324 buffer doesn't match.
3325 (skip_syntaxes): New function.
3326 (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
3328 (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
3330 (scan_lists): Likewise.
3331 (Fbackward_prefix_chars): Likewise.
3332 (scan_sexps_forward): Likewise.
3334 2002-08-23 Kenichi Handa <handa@m17n.org>
3336 * xfaces.c (QCfontset): New variable.
3337 (LFACE_FONTSET): New macro.
3338 (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
3339 (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
3340 (Finternal_set_lisp_face_attribute): Handle QCfontset.
3341 (Finternal_get_lisp_face_attribute): Likewise.
3342 (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
3343 check also LFACE_FONTSET_INDEX.
3344 (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
3345 attrs[LFACE_FONT_INDEX].
3346 (syms_of_xfaces): Intern and staticpro QCfontset.
3348 * dispextern.h (enum lface_attribute_index): New member
3349 LFACE_FONTSET_INDEX.
3351 * fns.c (base64_encode_1): Handle eight-bit chars correctly.
3353 2002-08-21 Kenichi Handa <handa@m17n.org>
3355 * coding.c (coding_set_destination): Fix coding->destination for
3356 the case converting a region.
3357 (encode_coding_utf_8): Encode eight-bit chars as single byte.
3358 (encode_coding_object): Fix coding->dst_pos and
3359 coding->dst_pos_byte for the case converting a region.
3361 * insdel.c (insert_from_gap): Make it work even if PT != GTP.
3363 * character.h (BYTE8_STRING): New macro.
3365 * fns.c (base64_decode_1): Insert eight-bit chars correctly.
3367 2002-08-20 Kenichi Handa <handa@m17n.org>
3369 * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
3370 characters by octal form.
3372 * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
3374 * buffer.h (_fetch_multibyte_char_len): Extern deleted.
3375 (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
3376 (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
3377 (FETCH_CHAR_AS_MULTIBYTE): New macro.
3379 * casetab.c (set_canon, set_identity, shuffle): Simplified.
3381 * casefiddle.c (casify_object): Simplified. Handle the case that
3382 the case conversion change the byte length.
3383 (casify_region): Likewise
3385 * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
3388 * character.c (_fetch_multibyte_char_len): This variable deleted.
3389 (syms_of_character): Setup Vprintable_chars.
3391 * editfns.c (Fchar_equal): Fix for the unibyte case.
3392 (Finsert_byte): New function.
3393 (syms_of_editfns): Defsubr it.
3395 * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
3396 of direct code 0x3ffff.
3398 * search.c (Freplace_match): Fix for the unibyte case.
3400 2002-08-19 Kenichi Handa <handa@m17n.org>
3402 * lread.c (safe_to_load_p): Fix the logic.
3404 * syntax.c (scan_words): Don't treat characters belonging to
3405 different scripts as constituting a word.
3407 * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3409 * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
3412 * emacs.c (main): In the case of --unibyte, instead of aborting on
3413 finding non-empty buffer, make it unibyte.
3415 2002-08-18 Kenichi Handa <handa@m17n.org>
3417 * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
3418 to create a fontset.
3420 2002-08-18 Dave Love <fx@gnu.org>
3422 * character.c (Funibyte_char_to_multibyte): Doc fix.
3424 * xfns.c [HAVE_STDLIB_H]: Fix last change.
3426 2002-08-15 Kenichi Handa <handa@m17n.org>
3428 * fontset.c (fontset_add): Make the type `int'.
3429 (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
3431 * character.c (unibyte_char_to_multibyte): Refer to
3432 charset_unibyte, not charset_primary.
3433 (multibyte_char_to_unibyte): Likewise.
3434 (Funibyte_char_to_multibyte): Likewise.
3436 * charset.h: (charset_unibyte): Extern it instead of
3439 * charset.c (charset_unibyte): Renamed from charset_primary.
3440 (Funibyte_charset): Renamed from Fprimary_charset.
3441 (Fset_unibyte_charset): Renamed from Fset_primary_charset.
3442 (syms_of_charset): Adjusted for the above changes.
3444 * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3445 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
3446 it->multibyte_p is zero.
3448 * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
3451 2002-08-08 Kenichi Handa <handa@m17n.org>
3453 * coding.c (Fdefine_coding_system_internal): Fix category setting
3454 for a coding system of type iso-2022.
3456 2002-08-02 Kenichi Handa <handa@m17n.org>
3458 * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
3461 2002-08-01 Kenichi Handa <handa@m17n.org>
3463 * syntax.c (Vnext_word_boundary_function_table): New variable.
3464 (syms_of_syntax): Declare it as a Lisp variable.
3465 (scan_words): Call functions in Vnext_word_boundary_function_table
3468 * xterm.c (x_load_font): Initialize fontp->fontset to -1.
3470 * fontset.c (fs_load_font): If fontp->charset is not negative,
3471 return fontp without setting its members.
3473 2002-07-31 Dave Love <fx@gnu.org>
3475 * config.in: Generated with autoheader.
3477 * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
3479 * m/sparc.h (HAVE_ALLOCA): Delete.
3481 * s/irix6-5.h: Don't include strings.h.
3482 (bcopy, bzero, bcmp): Don't undef.
3484 * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
3486 * s/usg5-4.h (NO_SIOCTL_H): Don't define.
3487 (TIOCSIGSEND): Don't test IRIX6.
3488 (bcopy, bzero, bcmp): Define conditionally.
3490 2002-07-31 Kenichi Handa <handa@m17n.org>
3492 * buffer.c (Qas, Qmake, Qto): New variables.
3493 (Fset_buffer_multibyte): New optional arg METHOD. Caller changed.
3494 (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
3496 * callproc.c (Fcall_process): Don't call insert_1_both directly if
3497 we are inserting a process output into a multibyte buffer.
3499 * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
3500 multibyte_char_to_unibyte.
3502 * character.c (Funibyte_char_to_multibyte): If C can't be decoded
3503 by the primary charset, make it eight-bit char.
3504 (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
3506 * charset.c: (charset_eight_bit, Qeight_bit_control): New
3508 (charset_8_bit__control, charset_8_bit_graphic,
3509 Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
3510 (define_charset_internal): New function.
3511 (syms_of_charset): Call define_charset_internal for pre-defined
3514 * charset.h (charset_8_bit): Extern it.
3516 * coding.c (make_conversion_work_buffer): Adjusted for the change
3517 of Fset_buffer_multibyte.
3518 (encode_coding_raw_text): Increment p0 in the loop.
3520 * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
3522 * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
3523 for the change of Fset_buffer_multibyte.
3525 * fns.c (Fstring_to_multibyte): New function.
3526 (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
3528 2002-07-30 Dave Love <fx@gnu.org>
3530 * xfns.c (x_put_x_image): Declare args.
3532 * xfaces.c (font_name_registry, choose_face_font): Delete unused
3534 (try_font_list): Declare an arg.
3536 * xdisp.c (message2_nolog, set_message): Declare an arg.
3538 * terminfo.c (tparam): Declare an arg. Use P_ to declare tparm.
3540 * syntax.c (scan_sexps_forward): Declare an arg.
3542 * scroll.c (calculate_scrolling, calculate_direct_scrolling):
3545 * lisp.h (Fnew_fontset): Declare.
3547 * keymap.c (push_key_description): Call CHARACTERP correctly.
3549 * fontset.c (fontset_add): Declare args. Call make_number
3551 (face_for_char): Delete unused vars.
3552 (Fset_fontset_font): Doc fix. Delete unused vars.
3554 * doc.c (Fsubstitute_command_keys): Delete unused vars.
3556 * composite.c (update_compositions): Declare arg.
3558 * cm.c (calccost, cmgoto): Declare args.
3560 * charset.c: Remove `emacs' conditional. Doc fixes.
3561 (map_char_table_for_charset): Declare.
3563 * character.c (syms_of_character) <translation-table-vector>: Doc
3566 * ccl.c: Remove `emacs' conditional. Include hash table stuff
3569 2002-07-26 Kenichi Handa <handa@m17n.org>
3571 The following changes are to allow specifying multiple font
3572 patterns for a character range (specified by script or charset).
3574 * Makefile.in (abbrev.o): Depend on syntax.h.
3575 (xfaces.o): Depend on charset.h.
3577 * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
3580 * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
3582 * character.h (Vchar_script_table): Extern it.
3584 * character.c (Vscript_alist): This variable deleted.
3585 (Vchar_script_table, Qchar_script_table): New variable.
3586 (syms_of_character): Declare Vchar_script_table as a lisp variable
3589 * chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't
3590 have property char-table-extra-slots, make no extra slot.
3592 * dispextern.h (struct face): Member `charset' deleted.
3593 (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
3595 (FACE_FOR_CHAR): Likewise.
3596 (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
3598 (lookup_face, lookup_named_face, lookup_derived_face): Prototype
3600 (generate_ascii_font_name): Renamed from generate_ascii_font.
3602 * fontset.h (get_font_repertory_func): New prototype.
3603 (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
3604 (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
3606 * fontset.c (Qprepend, Qappend): New variables.
3607 (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
3608 (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
3609 (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
3610 (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
3611 (fontset_ref_and_range, fontset_add, reorder_font_vector)
3612 (load_font_get_repertory): New functions.
3613 (fontset_set): This function deleted.
3614 (fontset_face): New arg FACE. Return face ID, not face.
3615 Completely re-written to handle new fontset structure. Caller
3617 (free_face_fontset): Use ASET istead of AREF (X) = Y.
3618 (face_for_char): Don't call lookup_face.
3619 (make_fontset_for_ascii_face): New arg FACE.
3620 (fs_load_font): New arg CHARSET_ID. Don't check
3621 Vfont_encoding_alist here.
3622 (find_font_encoding): New function.
3623 (list_fontsets): Use STRINGP, not ! NILP.
3624 (accumulate_script_ranges): New function.
3625 (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
3626 re-written to handle new fontset structure.
3627 (Ffontset_font): Return a copy of element.
3628 (syms_of_fontset): Define symbols Qprepend and Qappend. Fix
3629 docstring of font-encoding-alist.
3631 * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
3632 (Fset_fotset_font): Fix arguments to 5.
3634 * msdos.c (XMenuActivate): Adjuted for the change of
3635 lookup_derived_face.
3637 * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
3638 Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3639 (highlight_trailing_whitespace): Adjusted for the change of
3642 * xfaces.c: Include charset.h.
3643 (load_face_font): Argument C deleted. Caller changed.
3644 (generate_ascii_font_name): Renamed from generate_ascii_font.
3645 (font_name_registry): New function.
3646 (cache_face): Store ascii faces before non-ascii faces in buckets.
3647 (lookup_face): Arguments C and BASE_FACE deleted. Caller changed.
3648 Lookup only ascii faces.
3649 (lookup_non_ascii_face): New function.
3650 (lookup_named_face): Argument C deleted. Caller changed.
3651 (lookup_derived_face): Argument C deleted. Caller changed.
3652 (try_font_list): New arg PATTERN. Caller changed. If PATTERN is
3653 a string, just call font_list with it.
3654 (choose_face_font): Arguments FACE and C deleted. New arg
3655 FONT_SPEC. Caller changed.
3656 (realize_face): Arguments C and BASE_FACE deleted. Caller
3657 (realize_x_face): Likewise.
3658 (realize_non_ascii_face): New function.
3659 (realize_x_face): Call load_face_font here.
3660 (realize_tty_face): Argument C deleted. Caller changed.
3661 (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
3663 (dump_realized_face): Don't print charset of FACE.
3665 * xfns.c (x_set_font): Always call x_new_fontset and
3666 store_frame_parameter.
3667 (Fx_create_frame): Call x_new_fontset, not x_new_font.
3668 (syms_of_xfns): Set get_font_repertory_func to
3669 x_get_font_repertory.
3671 * xterm.h (x_get_font_repertory): Extern it.
3673 * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3674 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
3675 it->multibyte_p is zero.
3676 (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3677 (x_new_fontset): If FONTSETNAME doesn't match any existing
3678 fontsets, create a new one.
3679 (x_get_font_repertory): New function.
3681 2002-07-25 Kenichi Handa <handa@m17n.org>
3683 * coding.c (Ffind_coding_systems_region_internal): Detect an
3684 ASCII only string correctly.
3686 * lread.c (Fload): Don't load with Qload_force_doc_strings t if
3689 2002-07-24 Kenichi Handa <handa@m17n.org>
3691 * lread.c: Include "coding.h".
3692 (Qget_emacs_mule_file_char, Qload_force_doc_strings,
3693 load_each_byte, unread_char): New variables.
3694 (readchar_backlog): This variable deleted.
3695 (readchar): Return a character unless load_each_byte is nonzero.
3696 Handle the case that readcharfun is Qget_emacs_mule_file_char or a
3697 cons. If unread_char is not -1, simply return it.
3698 (unreadchar): Handle the case that readcharfun is
3699 Qget_emacs_mule_file_char or a cons. Set unread_char if
3701 (read_multibyte): This function deleted.
3702 (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
3703 (read_emacs_mule_char): New functions.
3704 (Fload): Even if the file doesn't have the extention ".elc", if
3705 safe_to_load_p returns a positive version number, assume that the
3706 file contains bytecompiled code. If the version is less than 22,
3707 load the file while decoding multibyte sequences by emacs-mule.
3708 (readevalloop): Don't use readchar_backlog.
3709 (Fread): Likewise. Pay attention to the case that STREAM is a
3711 (Fread_from_string): Pay attention to the case that STREAM is a
3713 (read_escape): The arg BYTEREP deleted.
3714 (read1): Set load_each_byte to 1 temporarily while handling
3715 #@NUMBER. Don't call read_multibyte.
3716 (read_vector): Call Fread with a cons. If readcharfun is
3717 Qget_emacs_mule_file_char, decode the read string by emacs-mule.
3718 (read_list): If doc_reference is 2, make the cdr part string as
3720 (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
3721 and Qload_force_doc_strings.
3723 2002-07-23 Kenichi Handa <handa@m17n.org>
3725 * xdisp.c (face_before_or_after_it_pos): Call
3726 FETCH_MULTIBYTE_CHAR with byte postion, not char position.
3728 2002-07-22 Kenichi Handa <handa@m17n.org>
3730 * character.h (TRAILING_CODE_P): New macro.
3731 (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
3732 (string_char_with_unification): Fix prototype.
3733 (Vscript_alist): Extern it.
3735 * character.c (Vscript_alist): New variable.
3736 (string_char_with_unification): Add `const' to local variables.
3737 (str_as_unibyte): Likewise.
3738 (string_escape_byte8): Likewise.
3739 (syms_of_character): Declare script-alist as a Lisp variable.
3741 * charset.h (Vcharset_ordered_list): Extern it.
3742 (charset_ordered_list_tick): Extern it.
3743 (EMACS_MULE_LEADING_CODE_PRIVATE_11)
3744 (EMACS_MULE_LEADING_CODE_PRIVATE_12)
3745 (EMACS_MULE_LEADING_CODE_PRIVATE_21)
3746 (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
3747 (Funify_charset): Adjusted for the change of Funify_charset.
3749 * charset.c (charset_ordered_list_tick): New variable.
3750 (Fdefine_charset_internal): Increment charset_ordered_list_tick.
3751 (Funify_charset): New optional arg DEUNIFY. If it is non-nil,
3752 deunify intead of unify a charset.
3753 (string_xstring_p): Add `const' to local variables.
3754 (find_charsets_in_text): Add `const' to arguemnts and local
3756 (encode_char): Adjusted for the change of Funify_charset. Fix
3757 detecting of invalid code.
3758 (Fset_charset_priority): Increment charset_ordered_list_tick.
3759 (Fmap_charset_chars): Fix handling of default value for FROM_CODE
3762 * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
3763 (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
3764 deleted. Callers changed to use
3765 EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
3766 (decode_coding_ccl): Add `const' to local variables.
3767 (consume_chars): Likewise.
3768 (Ffind_coding_systems_region_internal): Likewise.
3769 (Fcheck_coding_systems_region): Likewise.
3771 * print.c (print_object): Use octal form for printing the
3772 contents of a bool vector.
3774 2002-07-18 Dave Love <fx@gnu.org>
3776 * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
3777 <version == 20>: Refuse to load.
3779 2002-07-17 Dave Love <fx@gnu.org>
3781 * fns.c: Move coding.h.
3782 (Qcodeset, Qdays, Qmonths): New.
3783 (concat): Use CHARACTERP instead of INTERGERP.
3784 (Flocale_codeset): Deleted.
3785 (Flanginfo): New function.
3786 (syms_of_fns): Changed accordingly.
3788 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
3790 2002-07-16 Dave Love <fx@gnu.org>
3792 * casetab.c (init_casetab_once, init_casetab_once): Fix
3793 CHAR_TABLE_SET call.
3795 * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
3797 * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
3799 * charset.c (Fmap_charset_chars): Check args. Convert Lisp types.
3800 (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
3801 (Fset_charset_priority, syms_of_charset): Convert Lisp types.
3803 * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
3805 * coding.c (ENCODE_DESIGNATION, decode_eol)
3806 (make_conversion_work_buffer, code_conversion_restore)
3807 (Fdefine_coding_system_internal): Convert Lisp types.
3808 (code_conversion_restore): Use EQ, not ==.
3809 (Fencode_coding_string): Fix code_convert_string call.
3811 * coding.h (code_convert_region): Fix prototype.
3813 * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
3815 * fontset.c (fontset_ref, fontset_set, fs_load_font)
3816 (Ffontset_info): Convert Lisp types.
3818 * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
3820 * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
3822 * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
3824 * chartab.c: Include "...h", not <...h> in some cases.
3826 * callproc.c (Fcall_process): Remove unused variables.
3828 2002-07-12 Dave Love <fx@gnu.org>
3830 * coding.c (Fset_coding_system_priority): Allow null arg list.
3832 2002-07-03 Dave Love <fx@gnu.org>
3834 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
3835 (Fself_insert_and_exit): Use CHARACTERP.
3837 * callproc.c (Fcall_process): Remove unused vars.
3839 * xterm.c (XTread_socket): Add extra dead keysyms.
3841 * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
3843 * dispextern.h: Remove prototypes for redraw_frame,
3844 redraw_garbaged_frames.
3846 * cmds.c (Fself_insert_command): Use CHARACTERP.
3848 * chartab.c (make_sub_char_table): Remove unused var.
3849 (Fset_char_table_default, Fmap_char_table): Doc fix.
3851 * keymap.c (access_keymap): Remove generic char code.
3852 (push_key_description): Use CHARACTERP.
3854 2002-07-01 Dave Love <fx@gnu.org>
3856 * charset.c: Doc fixes.
3857 (Funify_charset): Extra checking.
3859 2002-06-24 Dave Love <fx@gnu.org>
3861 * lread.c: Remove some unused variables.
3862 (safe_to_load_p): If safe, return the magic number version byte.
3863 (Fload): Maybe use load-with-code-conversion.
3865 2002-06-12 Kenichi Handa <handa@m17n.org>
3867 * category.c (Fmodify_category_entry): Don't modify the contents
3868 of category_set for characters out of the range. Avoid
3869 unnecessary modification.
3871 * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
3872 Vchar_unify_table. The default value of the table is now nil.
3874 * character.c (syms_of_character): Setup Vchar_width_table for
3875 eight-bit-control and raw-byte chars.
3877 * charset.h (enum define_charset_arg_index): Delete
3878 charset_arg_parents and add charset_arg_subset and
3879 charset_arg_superset.
3880 (enum charset_attr_index): Delete charset_parents and add
3881 charset_subset and charset_superset.
3882 (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
3883 CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
3884 (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
3885 (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
3886 (CHARSET_SUPERSET): New macros.
3887 (charset_work): Extern it.
3888 (ENCODE_CHAR): Use charset_work.
3889 (CHAR_CHARSET_P): Adjusted for the change of encoder format.
3890 (map_charset_chars): Extern it.
3892 * charset.c (load_charset_map): Set the default value of encoder
3893 and deunifier char-tables to nil.
3894 (map_charset_chars): Argument changed. Callers changed. Use
3895 map_char_table_for_charset instead of map_char_table.
3896 (Fmap_charset_chars): New optional args from_code and to_code.
3897 (Fdefine_charset_internal): Adjusted for the change of
3898 `define-charset' (:parents -> :subset or :superset).
3899 (charset_work): New variable.
3900 (encode_char): Adjusted for the change of
3901 Fdefine_charset_internal.
3902 (syms_of_charset): Likewise.
3903 (Ffind_charset_string): Setup the vector `charsets' correctly.
3905 * chartab.c (sub_char_table_ref_and_range): New arg defalt. Fix
3906 the previous change.
3907 (char_table_ref_and_range): Adjusted for the above change.
3908 (map_sub_char_table_for_charset): New function.
3909 (map_char_table_for_charset): New function.
3911 * keymap.c (describe_vector): Handle a char-table directly here.
3912 (describe_char_table): Deleted.
3914 * lisp.h (map_charset_chars): Deleted.
3916 2002-06-11 Dave Love <fx@gnu.org>
3918 * fns.c (count_combining): Comment out (unused).
3919 (Flocale_codeset): New.
3920 (syms_of_fns): Defsubr it.
3922 * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
3925 2002-06-06 Dave Love <fx@gnu.org>
3927 * Makefile.in (chartab.o): Depend on charset.h
3929 2002-06-03 Kenichi Handa <handa@m17n.org>
3931 * character.c (syms_of_character): Set the default value of
3932 Vprintable_chars to Qnil.
3934 2002-05-31 Dave Love <fx@gnu.org>
3936 * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
3938 2002-05-31 Kenichi Handa <handa@m17n.org>
3940 * charset.c (load_charset_map): Handle the case that from < to
3943 * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
3945 (encode_coding_iso_2022): Likewise.
3946 (encode_coding_sjis): Likewise.
3947 (encode_coding_big5): Likewise.
3948 (encode_coding_charset): Likewise.
3950 2002-05-30 Kenichi Handa <handa@m17n.org>
3952 * Makefile.in (lisp): Change chinese.elc to chinese.el. They are
3953 not bytecompiled now.
3954 (shortlisp): Likewise.
3956 * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
3957 (charset_jisx0208): New variables.
3958 (Fdefine_charset_internal): Setup them if appropriate.
3959 (init_charset_once): Initialize them to -1.
3961 * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
3962 charset_jisx0208): Extern them.
3964 * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
3965 (CODING_ISO_FLAG_USE_OLDJIS): New macro.
3966 (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
3967 (setup_iso_safe_charsets): Fix arguemtns to Fassq.
3968 (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
3969 and CODING_ISO_FLAG_USE_OLDJIS.
3970 (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
3971 (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
3972 (encode_coding_iso_2022): Change the 1st arg to
3973 ENCODE_ISO_CHARACTER to a variable.
3975 2002-05-29 Kenichi Handa <handa@m17n.org>
3977 * charset.h (enum define_charset_arg_index): New enums
3978 charset_arg_min_code and charset_arg_max_code.
3979 (struct charset): New member char_index_offset.
3981 * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
3983 (INDEX_TO_CODE_POINT): Likewise.
3984 (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
3985 args[charset_arg_max_code]. Setup charset.char_index_offset.
3986 (syms_of_charset): Fix args to Fdefine_charset_internal.
3988 2002-05-27 Dave Love <fx@gnu.org>
3990 * coding.c (decode_coding_utf_8): Reject overlong sequences.
3992 2002-05-26 Dave Love <fx@gnu.org>
3994 * coding.c: Doc fixes.
3995 (Fcoding_system_aliases): Fix return value.
3996 (Qmac): Remove (duplicated) definition.
3998 2002-05-25 Dave Love <fx@gnu.org>
4000 * charset.c (Fcharset_priority_list, Fset_charset_priority): New
4003 * character.c (Fstring): Doc fix.
4005 * charset.c (Fdefine_charset_alias): Update Vcharset_list.
4007 * fontset.c (Ffontset_info): Doc fix. Return charset names, not
4009 (font-encoding-alist): Doc fix.
4011 2002-05-24 Dave Love <fx@gnu.org>
4013 * term.c (costs_set): Declare static, non-initialized for pcc.
4014 (encode_terminal_code): Remove ensued var.
4016 * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
4019 * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
4021 * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
4022 (suffixes): Moved out of make_subsidiaries for K&R.
4024 * charset.c (map_charset_chars): Fix c_function declaration for
4027 * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
4029 2002-05-23 Dave Love <fx@gnu.org>
4031 * data.c (Fchar_or_string_p): Doc fix. Use CHARACTERP.
4033 * category.c (Fmodify_category_entry): Doc fix. Remove unused
4036 2002-05-23 Yong Lu <lyongu@asia-infonet.com>
4038 * charset.c (Fdefine_charset_internal): Fix argument to bzero.
4040 * coding.c (Fdefine_coding_system_internal): Fix previous change.
4041 (decode_coding_charset): Workaround for the bug of GCC 2.96.
4043 2002-05-23 Kenichi Handa <handa@m17n.org>
4045 * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
4046 vietnamese.elc to vietnamese.el. They are not bytecompiled now.
4047 (shortlisp): Likewise.
4049 2002-05-22 Kenichi Handa <handa@m17n.org>
4051 * coding.c (decode_coding_charset): Adjusted for the change of
4052 Fdefine_coding_system_internal.
4053 (Fdefine_coding_system_internal): For a coding system of
4054 `charset' type, store a list of charset IDs in
4055 `charset_attr_charset_valids' element of coding attributes.
4057 * charset.c (Fmake_char): Fix previous change.
4059 2002-05-21 Kenichi Handa <handa@m17n.org>
4061 * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
4062 (emacs_mule_char): New arg src. Delete arg `composition'. Caller
4063 changed. Handle 2-byte and 3-byte charsets correctly.
4064 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
4065 DECODE_EMACS_MULE_COMPOSITION_RULE. Caller changed.
4066 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
4067 (DECODE_EMACS_MULE_21_COMPOSITION): Call
4068 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
4070 (decode_coding_emacs_mule): Handle composition correctly. Rewind
4071 `src' and `consumed_chars' correctly before calling
4073 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
4074 and alt&rule composition.
4075 (decode_coding_iso_2022): Handle composition correctly.
4076 (init_coding_once): Setup emacs_mule_bytes for private charsets.
4078 * charset.c (Fdefine_charset_internal): Fix bug for the case of
4079 re-defining a charset. If the charset has :emacs-mule-id, setup
4081 (Fmake_char): If CODE1 is nil, use the minimum code of the
4084 2002-05-20 Kenichi Handa <handa@m17n.org>
4086 * coding.c (encode_coding_iso_2022): If coding requires safe
4087 encoding, produce a character specified by
4088 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
4089 (encode_coding_sjis): Likewise.
4090 (encode_coding_big5): Likewise.
4091 (encode_coding_charset): Likewise.
4093 2002-05-17 Dave Love <fx@gnu.org>
4095 * xterm.c (XSetIMValues): Declare.
4097 * process.c: Conditionally include sys/wait.h, pty.h.
4099 * print.c (print_object): Fix print format for 64-bit
4102 * keyboard.c (modify_event_symbol): Fix print format for 64-bit
4105 * buffer.c (emacs_strerror): Declare.
4106 (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
4109 * fontset.c (Fclear_face_cache): Declare.
4110 (accumulate_font_info): Commented-out (unused).
4111 (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
4114 * character.h (string_escape_byte8): Declare.
4116 * charset.c (load_charset_map, load_charset_map_from_file): Remove
4118 (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
4119 (Fmap_charset_chars): Doc fix.
4121 * coding.c (Vchar_coding_system_table, Qchar_coding_system):
4123 (Fset_coding_system_priority, Fset_coding_system_priority)
4124 (Fdefine_coding_system_internal): Doc fix.
4126 2002-05-16 Dave Love <fx@gnu.org>
4128 * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
4130 2002-05-16 Kenichi Handa <handa@m17n.org>
4132 * character.c (string_escape_byte8): Make multibyte string with
4135 * charset.c (Fmake_char): Delete unnecessary code.
4137 2002-05-14 Kenichi Handa <handa@m17n.org>
4139 * xfns.c (x_encode_text): Allocate coding.destination here, and
4140 call encode_coding_object with dst_object Qnil.
4142 * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
4143 multibyte form correctly.
4145 * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
4146 against Vfont_encoding_alist.
4148 * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
4149 handling of charset list.
4150 (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
4151 (decode_coding_object): Move point to coding->dst_pos before
4152 calling post-read-conversion function.
4153 (encode_coding_object): Give correct arguments to
4154 pre-write-conversion. Ignore the return value of
4155 pre-write-conversion function. Pay attention to the case that
4156 pre-write-conversion changes the current buffer. If dst_object is
4157 Qt, even if coding->src_bytes is zero, allocate at least one byte
4158 to coding->destination.
4160 * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
4162 * charset.c (Fmake_char): Make it more backward compatible.
4163 (Fmap_charset_chars): Fix docstring.
4165 2002-05-13 Dave Love <fx@gnu.org>
4167 * coding.c: Doc fixes.
4168 (Fdefine_coding_system_alias): Use names, not symbols, in
4169 coding-system-alist.
4171 2002-05-13 Kenichi Handa <handa@m17n.org>
4173 * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
4174 of calling free_realized_face.
4176 2002-05-10 Yong Lu <lyongu@asia-infonet.com>
4178 * charset.c (load_charset_map): Fix previous change.
4179 (read_hex): Don't treat SPC as a comment starter.
4180 (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
4182 (Fdecode_char): Fix typo.
4184 2002-05-10 Kenichi Handa <handa@m17n.org>
4186 * charset.h (struct charset): New member `code_space_mask'.
4188 * coding.c (coding_set_source): Delete the local variable
4190 (encode_coding_charset): Delete the local variable charset.
4191 (Fdefine_coding_system_internal): Likewise.
4192 (Fdefine_coding_system_internal): Setup
4193 attrs[coding_attr_charset_valids] correctly.
4195 * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
4196 member to check if CODE is valid or not.
4197 (Fdefine_charset_internal): Initialize `code_space_mask' member.
4198 (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
4199 is within the range of charset->min_code and carset->max_code.
4201 2002-05-09 Dave Love <fx@gnu.org>
4203 * syntax.h (syntax_temp) [!__GNUC__]: Declare.
4205 * dispextern.h (generate_ascii_font): Fix return type.
4207 * xfaces.c (generate_ascii_font): Fix arg declaration.
4209 * coding.c (coding_inherit_eol_type)
4210 (Fset_terminal_coding_system_internal)
4211 (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
4213 2002-05-08 Kenichi Handa <handa@m17n.org>
4215 * coding.c (decode_coding_charset, encode_coding_charset): Handle
4216 multiple charsets correctly.
4218 2002-05-07 Kenichi Handa <handa@m17n.org>
4220 * search.c (boyer_moore): Fix handling of mulitbyte character
4223 * xdisp.c (display_mode_element): When the variable `elt' is
4224 changed, update `this' and `lisp_string'.
4226 2002-05-07 Kenichi Handa <handa@m17n.org>
4228 * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
4230 * callproc.c (Fcall_process): Be sure to give the current buffer
4231 to decode_coding_c_string. Update PT and PT_BYTE after the
4234 * charset.c (struct charset_map_entries): New struct.
4235 (load_charset_map): Renamed from parse_charset_map. New args
4236 entries and n_entries. Caller changed.
4237 (load_charset_map_from_file): Renamed from load_charset_map.
4238 Caller changed. New arg control_flag. Call load_charset_map at
4240 (load_charset_map_from_vector): New function.
4241 (Fdefine_charset_internal): Setup charset.compact_codes_p.
4242 (encode_char): If the charset is compact, change a character index
4245 * coding.c (coding_alloc_by_making_gap): Check the case that the
4246 source and destination are the same correctly.
4247 (decode_coding_raw_text): Set coding->consumed_char and
4248 coding->consumed to 0.
4249 (produce_chars): If coding->chars_at_source is nonzero, update
4250 coding->consumed_char and coding->consumed before calling
4252 (Fdefine_coding_system_alias): Register ALIAS in
4253 Vcoding_system_alist.
4254 (syms_of_coding): Define `no-convesion' coding system at the tail.
4256 * fileio.c (Finsert_file_contents): Set coding_system instead of
4257 val. If the current buffer is multibyte, always call
4260 * xfaces.c (try_font_list): Give higher priority to fontset's
4261 family than face's family.
4263 2002-04-18 Kenichi Handa <handa@m17n.org>
4265 * callproc.c (Fcall_process): Be sure to give the current buffer
4266 to decode_coding_c_string.
4268 * xfaces.c (try_font_list): Give a family specified in a fontset
4269 higher priority than a family specified in a face.
4271 2002-04-09 Kenichi Handa <handa@m17n.org>
4273 * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
4274 Fix arguments to insert_from_buffer.
4276 * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
4278 2002-03-11 Kenichi Handa <handa@m17n.org>
4280 * coding.c (produce_chars): Set the variable `multibytep' correctly.
4281 (decode_coding_gap): Set coding->dst_multibyte correctly.
4283 2002-03-07 Kenichi Handa <handa@m17n.org>
4285 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
4286 (decode_coding_utf_16): Fix converting high and low bytes to
4288 (encode_coding_utf_16): Substitute coding->default_char for
4289 non-Unicode characters.
4290 (decode_coding): Don't call record_insert here.
4291 (setup_coding_system): Initialize `surrogate' of
4292 coding->spec.utf_16 to 0.
4293 (EMIT_ONE_BYTE): Fix for multibyte case.
4295 * insdel.c (insert_from_gap): Call record_insert.
4297 2002-03-04 Kenichi Handa <handa@m17n.org>
4299 * casefiddle.c (casify_region): Fix multibyte case.
4301 * character.c (c_string_width): Add return type `int'.
4302 (char_string_with_unification): Arg ADVANCED deleted.
4304 * character.h (CHAR_VALID_P): Don't call CHARACTERP.
4305 (CHAR_STRING): Adjusted for the change of
4306 char_string_with_unification.
4307 (CHAR_STRING_ADVANCE): Make it do-while statement.
4309 * chartab.c (sub_char_table_set_range): Optimized for the case
4310 DEPTH == 3. Add workaround code for a GCC optimization bug.
4312 * charset.c (parse_charset_map): Remove an unused variable.
4314 * coding.c: Delete unused variables.
4316 * fileio.c (Finsert_file_contents): Set coding_system to Qnil
4317 earlier. If inserted is zero and the coding system doesn't
4318 require flushing, don't call decode_coding_gap.
4320 * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
4322 2002-03-01 Kenichi Handa <handa@m17n.org>
4324 The following changes are for using Unicode as an internal
4325 character model, and use UTF-8 format for buffer/string
4328 * .gdbinit (xchartable): Adjusted for the change of char table
4330 (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
4332 * Makefile.in (obj): Add character.o and chartab.o.
4333 (lisp, shortlisp): Remove utf-8.elc:
4334 (*.o): For many files, change dependency on charset.h to
4335 character.h, and add dependency on character.h.
4336 (character.o, chartab.o): New targets.
4338 * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
4339 doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
4340 w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
4343 * dired.c, filelock.c: Include "character.h".
4345 * alloc.c: Include "character.h" instead of "charset.h".
4346 (Fmake_char_table): Moved to chartab.c.
4347 (make_sub_char_table): Likewise.
4348 (syms_of_alloc): Remove defsubr for Smake_char_table.
4350 * buffer.c: Include "character.h" instead of "charset.h", don't
4352 (Fset_buffer_multibyte): Adjuted for UTF-8.
4354 * buffer.h: EXFUN Fbuffer_live_p.
4356 * callproc.c: Include "character.h" instead of "charset.h".
4357 (Fcall_process): Big change for the new code-conversion APIs.
4359 * casetab.c: Include "character.h" instead of "charset.h".
4360 (set_canon, set_identity, shuffle): Adjusted for the new
4361 map_char_table spec.
4362 (init_casetab_once): Call CHAR_TABLE_SET instead of directly
4363 accessing the char table structure.
4365 * chartab.c: New file that implements char table.
4367 * category.c: Include "character.h".
4368 (copy_category_entry): New function.
4369 (copy_category_table): Call map_char_table and copy_category_entry.
4370 (Fmake_category_table): Initialize all top-vel slots.
4371 (char_category_set): New function.
4372 (modify_lower_category_set): Deleted.
4373 (Fmodify_category_entry): Call char_table_ref_and_range.
4375 * category.h (CATEGORY_SET): Just call char_category_set.
4377 * ccl.c: Include "character.h".
4378 (Qccl, Qcclp): New variables.
4379 (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
4381 (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
4382 (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
4384 (ccl_driver): Types of arguments changed. Code adjusted for that.
4385 (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
4387 (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
4389 * ccl.h (struct ccl_program): Members eol_type and multibyte
4390 deleted. New members src_multibyte, dst_multibyte, consumed, and
4392 (struct ccl_spec): Members decoder and encoder deleted. New
4394 (CODING_SPEC_CCL_PROGRAM): New macro.
4395 (ccl_driver): Prototype updated.
4396 (Qccl, Qcclp, Fccl_program_p): Extern them.
4397 (CHECK_CCL_PROGRAM): New macro.
4399 * character.c, character.h, chartab.c: New files.
4401 * charset.c: Mostly re-written. Character and multibyte sequence
4402 handling codes are moved to character.c.
4404 * charset.h: Mostly re-written. Character and multibyte sequence
4405 handling codes are moved to character.h.
4407 * coding.c, coding.h: Mostly re-written.
4409 * composite.c: Include "character.h" instead of "charset.h".
4410 (CHAR_WIDTH): Moved to character.h.
4411 (HASH_KEY, HASH_VALUE): Deleted.
4413 * composite.h (enum composition_method): Order of enumeration
4416 * data.c: Include "character.h" instead of "charset.h".
4417 (Faref): Call CHAR_TABLE_REF for a char table.
4418 (Faset): Call CHAR_TABLE_SET for a char table.
4420 * dispextern.h (free_realized_face, check_face_attribytes,
4421 generate_ascii_font): Extern them.
4422 (free_realized_multibyte_face): Extern deleted.
4424 * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
4427 * editfns.c: Include "character.h" instead of "charset.h".
4428 (Fchar_to_string): Always call CHAR_STRING.
4430 * emacs.c (main): Call init_charset_once, init_charset,
4431 syms_of_chartab, and syms_of_character.
4433 * fileio.c: Include "character.h" instead of "charset.h".
4434 (Finsert_file_contents): Big change for the new code-conversion
4436 (choose_write_coding_system): Likewise.
4437 (Fwrite_region): Likewise.
4438 (build_annotations_2): Deleted.
4439 (e_write): Big change for the new code-conversion API.
4441 * fns.c: Include "character.h" instead of "charset.h".
4442 (copy_sub_char_table): Moved to chartab.c.
4443 (Fcopy_sequence): Call copy_char_table for a char table.
4444 (concat): Delete codes calling count_multibyte.
4445 (string_char_to_byte): Adjusted for the new multibyte form.
4446 (string_byte_to_char): Likewise.
4447 (internal_equal): Adjusted for the change of char table structure.
4448 (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
4449 Fchar_table_extra_slot, Fset_char_table_extra_slot,
4450 Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
4451 char_table_translate, optimize_sub_char_table,
4452 Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
4454 (char_table_ref_and_index): Deleted.
4455 (HASH_KEY, HASH_VALUE): Moved to lisp.h.
4456 (Fmd5): Call preferred_coding_system instead of accessing
4457 Vcoding_category_list. Adjusted for the new code-conversion API.
4458 (syms_of_fns): Defsubr for char table related functions moved to
4461 * fontset.c: Mostly re-written.
4463 * fontset.h (struct font_info): Type of the member encoding_type
4465 (enum FONT_SPEC_INDEX): New enum.
4466 (fontset_font_pattern, fs_load_font): Prototype updated.
4467 (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
4469 * indent.c: Include "character.h" instead of "charset.h".
4470 (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
4473 * insdel.c: Include "character.h" instead of "charset.h".
4474 (copy_text): Don't refer to Vnonascii_translation_table.
4475 (insert_from_gap): New function.
4477 * keyboard.c: Include "character.h" instead of "charset.h".
4478 (command_loop_1): Never call direct_output_forward_char before
4479 a non-ASCII character.
4480 (read_char): If Vkeyboard_translate_table is a char table, always
4481 translated a character.
4483 * keymap.c: Include "character.h".
4484 (store_in_keymap): Handle the case that IDX is a cons.
4485 (Fdefine_key): Handle the case that KEY is a cons and the car part
4486 is also a cons (range).
4487 (push_key_description): Adjusted for the new character code.
4488 (describe_vector): Call describe_char_table for a char table.
4489 (describe_char_table): New function.
4491 * keymap.h (describe_char_table): Extern it.
4493 * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
4494 (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
4495 (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
4496 SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
4498 (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
4500 (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
4501 (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
4502 CHARTAB_SIZE_BITS_3): New macros.
4503 (chartab_size): Extern it.
4504 (struct Lisp_Char_Table): Re-designed.
4505 (struct Lisp_Sub_Char_Table): New structure.
4506 (HASH_KEY, HASH_VALUE): Moved from fns.c.
4507 (CHARACTERBITS): Defined as 22.
4508 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
4509 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
4510 (GC_SUB_CHAR_TABLE_P): New macro.
4511 (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
4512 (code_convert_string_norecord): Extern deleted.
4513 (init_character_once, syms_of_character, init_charset,
4514 syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
4516 * lread.c: Include "character.h".
4517 (read_multibyte): New arg NBYTES.
4518 (read_escape): The meaning of returned *BYTEREP changed.
4519 (to_multibyte): Deleted.
4520 (read1): Adjuted the handling of char table and string.
4522 * print.c: Include "character.h" instead of "charset.h".
4523 (print_string): Convert 8-bit raw bytes to octal form by
4524 string_escape_byte8.
4525 (print_object): Adjusted for the new multibyte form. Print 8-bit
4526 raw bytes always in octal form. Handle sub char table correctly.
4528 * process.c: Include "character.h" instead of "charset.h".
4529 (read_process_output): Adjusted for the new code-conversion API.
4530 (send_process): Likewise.
4532 * puresize.h (BASE_PURESIZE): Increased.
4534 * regex.c: Include "character.h" instead of "charset.h".
4535 (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
4536 (regex_compile): Accept a range whose starting and ending
4537 character have different leading bytes.
4538 (analyse_first): Adjusted for the above change.
4540 * search.c: Include "character.h" instead of "charset.h".
4541 (search_buffer, boyer_moore): Adjusted for the new multibyte form.
4542 (Freplace_match): Adjusted for the change of
4543 multibyte_char_to_unibyte.
4545 * syntax.c: Include "character.h" instead of "charset.h".
4546 (syntax_parent_lookup): Deleted.
4547 (Fmodify_syntax_entry): Accept a cons as CHAR.
4548 (skip_chars): Adjusted for the new multibyte form.
4549 (init_syntax_once): Call char_table_set_range instead of directly
4550 accessing the structure of a char table.
4552 * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
4553 (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
4554 (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
4555 (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
4557 * term.c: Include "buffer.h" and "character.h".
4558 (encode_terminal_code): Adjusted for the new code-conversion API.
4559 (write_glyphs): Likewise.
4560 (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
4562 * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4564 * xdisp.c: Include "character.h".
4565 (get_next_display_element): Adjusted for the new multibyte form.
4566 (disp_char_vector): Adjusted for the new char table structure.
4567 (decode_mode_spec_coding): Adjusted for the new structure of
4569 (decode_mode_spec): Adjusted for the new code-conversion API.
4571 * xfaces.c: Include "character.h" instead of "charset.h".
4572 (load_face_font): Adjusted for the change of choose_face_font and
4574 (generate_ascii_font): New function.
4575 (set_lface_from_font_name): Adjusted for the change of
4577 (set_font_frame_param): Adjusted for the change of
4579 (free_realized_face): Make it public.
4580 (free_realized_faces_for_fontset): Renamed from
4581 free_realized_multibyte_face. Free also faces realized for ASCII.
4582 (choose_face_font): Argments changed. Adjusted for the change of
4583 fontset_font_pattern and FS_LOAD_FONT.
4585 * xfns.c: Include "character.h".
4586 (x_encode_text): Adjusted for the new code-conversion API.
4588 * xselect.c: Don't include "charset.h".
4589 (selection_data_to_lisp_data): Adjusted for the new code
4592 * xterm.c: Include "character.h".
4593 (x_encode_char): New argument CHARSET. Caller changed.
4594 (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
4596 (x_get_glyph_face_and_encoding): Likewise.
4597 (x_produce_glyphs): Don't check Vnonascii_translation_table Call
4598 CHAR_WIDTH instead of CHARSET_WIDTH.
4599 (XTread_socket): Adjusted for the new code-conversion API.
4600 (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4601 (x_load_font): Adjusted for the change of struct font.
4604 ;; coding: iso-2022-7bit
4607 Copyright (C) 2002 Free Software Foundation, Inc.
4608 Copying and distribution of this file, with or without modification,
4609 are permitted provided the copyright notice and this notice are preserved.
4611 ;;; arch-tag: 1bff38bd-2030-46ae-9d18-f15e6006b665