*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c7af82c87aadb6d7ba07bc5abaf72a0f577d263..5d0c10f0c54ac38c55934280cf23365e5c105f2e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2005-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * term/mac-win.el: Add coding: tag and set it to iso-2022-7bit.
+       (mac-add-charset-info): New function.  Initialize variable
+       mac-charset-info-alist using it.
+       (mac-centraleurroman, mac-cyrillic): Do not use UCS in table data
+       for translation.
+       (mac-symbol-encoder, mac-dingbats-encoder): New translation table.
+       (mac-font-encoder-list): Add entries for mac-symbol and
+       mac-dingbats.
+       (ccl-encode-mac-symbol-font, ccl-encode-mac-dingbats-font): New
+       CCL programs.
+
 2005-04-19  Kim F. Storm  <storm@cua.dk>
 
        * simple.el (next-buffer, prev-buffer, next-error)

diff --git a/src/ChangeLog b/src/ChangeLog
index 30d0158b417d99ad6fd00d7f8b1e3207eddc6f18..3bbe249636949b458aa5f866bf0205c67ba5624a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,35 @@
+2005-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macgui.h (MacFontStruct): Remove member `fontname'.  Add member
+       `full_name'.
+       [TARGET_API_MAC_CARBON] (MacFontStruct): Use type int for
+       mac_scriptcode member.
+
+       * macterm.c (Qbig5, Qcn_gb, Qsjis, Qeuc_kr): Remove variables.
+       (syms_of_mac): Don't initialize them.
+       (Vmac_charset_info_alist): New variable.
+       (syms_of_mac): Defvar it.
+       (create_text_encoding_info_alist): New function.
+       (decode_mac_font_name, mac_to_x_fontname)
+       (x_font_name_to_mac_font_name, init_font_name_table): Don't hard
+       code the correspondence among XLFD charsets, Mac script codes, and
+       Emacs coding systems.  Use Vmac_charset_info_alist and result of
+       create_text_encoding_info_alist instead.
+       (init_font_name_table) [TARGET_API_MAC_CARBON]: Use Font Manager
+       routines also on Mac OS Classic.
+       (init_font_name_table) [!TARGET_API_MAC_CARBON]: Use
+       add_font_name_table_entry.
+       (mac_do_list_fonts): Regard 0 in XLFD scaleble fields as
+       specified.  Derive unspecified scalable fields from specified one.
+       (x_list_fonts): Consider Valternate_fontname_alist.
+       (kDefaultFontSize): Change value from 9 to 12.
+       (XLoadQueryFont): Get decoded font family, font face, and charset
+       from x_font_name_to_mac_font_name.  Set full name of loaded font.
+       (mac_unload_font): Free `full_name' member.
+       (x_load_font): Don't try XLoadQueryFont if x_list_fonts returns
+       NULL.  Copy full_name member of struct MacFontStruct to that of
+       struct font_info.
+
 2005-04-19  Kim F. Storm  <storm@cua.dk>
 
        * xdisp.c (handle_stop): Set saved_face_id to current face if