1. 14 May, 2008 23 commits
    • Kenichi Handa's avatar
      (ftxfont_list): Return a list, not vector. · a952e54c
      Kenichi Handa authored
      (ftxfont_open): Return a font-ojbect.  Adjusted for the change of
      struct font.  Get underline_thickness and underline_position from
      font property.  Don't update dpyinfo->smallest_font_height and
      dpyinfo->smallest_char_width.
      (ftxfont_close): Don't decrese FRAME_X_DISPLAY_INFO (f)->n_fonts.
      (ftxfont_draw): Adjusted for the change of struct font.
      a952e54c
    • Kenichi Handa's avatar
      (ftfont_pattern_entity): Argument FRAME removed. Make · 42984a74
      Kenichi Handa authored
      a font-entity by font_make_entity.  Use font_intern_prop instead
      of intern_downcase.  Use FONT_SET_STYLE to set a style-related
      font property.  If a font is scalable, set avgwidth property to 0.
      Set font-entity property by font_put_extra.
      (ftfont_list_generic_family): Argument SPEC and REGISTRY removed.
      (ffont_driver): Adjusted for the change of struct font_driver.
      (ftfont_spec_pattern): New function.
      (ftfont_list): Return a list, not vector.
      (ftfont_match): Use ftfont_spec_pattern to get a pattern.
      (ftfont_list_family): Don't downcase names.
      (ftfont_free_entity): Deleted.
      (ftfont_open): Return a font-ojbect.  Adjusted for the change of
      struct font.  Get underline_thickness and underline_position from
      font property.  Don't update dpyinfo->smallest_font_height and
      dpyinfo->smallest_char_width.
      (ftfont_close): Don't free `struct font'.
      (ftfont_has_char): Adjusted for the format change of font-entity.
      (ftfont_encode_char, ftfont_text_extents): Likewise.
      42984a74
    • Kenichi Handa's avatar
      Delete USE_FONT_BACKEND conditional. · 38548f60
      Kenichi Handa authored
      38548f60
    • Kenichi Handa's avatar
      (internal_equal): Handle PREV_FONT. · f6204a24
      Kenichi Handa authored
      f6204a24
    • Kenichi Handa's avatar
      Throughout the file, delete all USE_FONT_BACKEND · 581f7ac7
      Kenichi Handa authored
      conditionals.  Don't check enable_font_backend.  Delete all codes
      used only when USE_FONT_BACKEND is not defined.
      (get_font_info_func, list_font_func, load_font_func)
      (query_font_func, set_frame_fontset_func, find_ccl_program_func)
      (get_font_repertory_func): Delete them.
      (FONTSET_SPEC, FONT_DEF_NEW, FONT_DEF_SPEC, FONT_DEF_ENCODING)
      (FONT_DEF_REPERTORY, RFONT_DEF_FACE, RFONT_DEF_SET_FACE)
      (RFONT_DEF_FONT_DEF, RFONT_DEF_SPEC, RFONT_DEF_REPERTORY)
      (RFONT_DEF_OBJECT, RFONT_DEF_SET_OBJECT, RFONT_DEF_SCORE)
      (RFONT_DEF_SET_SCORE, RFONT_DEF_NEW): New macros.
      (fontset_compare_rfontdef): New function.
      (reorder_font_vector): Remove the argument CHARSET-ID.  Sort
      ront-defs by qsort.  Adjusted for the change of font-group vector.
      (load_font_get_repertory): Deleted.
      (fontset_find_font): Use new macros to ref/set elements of
      font-def and rfont-def.
      (fontset_font): Fix the timing of remembering that no font for C.
      (free_face_fontset): Do nothing if the face has no fontset.
      (face_suitable_for_char_p): Use new macros to ref/set elements of
      rfont-def.
      (face_for_char): Likewise.  Call face_for_char with font_object.
      (fs_load_font): Delete.  Delete #pragma surrounding it.
      (fs_query_fontset): Use strcasecmp instead of strcmp.
      (generate_ascii_font_name): Adjusted for the format change of
      font-spec.
      (Fset_fontset_font): Likewise.  Use new macros to set elements of
      font-def.
      (Fnew_fontset): Use font_unparse_xlfd to generate
      FONTSET_ASCII (fontset).
      (new_fontset_from_font_name): Deleted.
      (fontset_from_font): Renamed from new_fontset_from_font.  Check if
      a fontset is already created for the font.  FIx updating of
      Vfontset_alias_alist.
      (fontset_ascii_font): Deleted.
      (Ffont_info): Adjusted for the format change of font-spec.
      (Finternal_char_font): Likewise.
      (Ffontset_info): Likewise.
      (syms_of_fontset): Don't check load_font_func.
      581f7ac7
    • Kenichi Handa's avatar
      (struct font_info): Delete it. Most memnbers go to · f36f5a93
      Kenichi Handa authored
      struct font.
      (FONT_ENCODING_NOT_DECIDED): Moved to font.h.
      (enum FONT_SPEC_INDEX): Delete it.
      (font_info, list_fonts_func, load_font_func, query_font_func)
      (set_frame_fontset_func, find_ccl_program_func)
      (get_font_repertory_func, new_fontset_from_font_name): Delete
      externs.
      (fontset_from_font_name): Extern it.
      (FS_LOAD_FONT, FONT_INFO_ID, FONT_INFO_FROM_ID)
      (FONT_INFO_FROM_FACE): Deleted.
      (face_for_font): Adjust prototype.
      f36f5a93
    • Kenichi Handa's avatar
      Include <strings.h>. · 35027d0c
      Kenichi Handa authored
      (enable_font_backend): Delete it.
      (Qfont_spec, Qfont_entity, Qfont_object): New variables.
      (CHECK_VALIDATE_FONT_SPEC): Delete it.
      (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Moved to font.h.
      (null_string): Delete it.
      (null_vector): Make it static.
      (font_family_alist): Delete it.
      (Qnormal): Extern it.
      (QCextra, QClanguage): Delete it.
      (QClang, QCavgwidth, QCfont_entity, QCfc_unknown_spec): New
      variables.
      (font_make_spec, font_make_entity, font_make_object)
      (font_intern_prop): Renamed from intern_downcase.  Don't downcase
      the string.  Callers changed.
      (font_pixel_size): Adjusted for the format change of font-related
      objects.
      (prop_name_to_numeric, prop_numeric_to_name): Delete them.
      (font_style_to_value, font_style_symbolic): New function.
      (build_font_family_alist): Delete it.
      (font_registry_charsets): Use Fassoc_string instead of
      assq_no_quit.
      (font_prop_validate_symbol): Don't return null_string.
      (font_prop_validate_style): Adjusted for the change of
      style-related values in a font vector.
      (font_property_table): Delete entries for QClangauge and
      QCantialias, add entries for QCavgwidth.
      (get_font_prop_index): Delete the 2nd argument FROM.
      (font_prop_validate): Arguments changed.
      (font_put_extra): Adjusted for the change of font-related objects.
      (font_expand_wildcards, font_parse_xlfd, font_unparse_xlfd)
      (font_parse_fcname, font_unparse_fcname)
      (font_prepare_composition): Likewise.
      (font_parse_family_registry): Renamed from font_merge_old_spec.
      (otf_open): Delete the 1st arg entity.
      (font_otf_capability): Adjusted for the above change.
      (font_score): New arg alternate_families.  Adjusted for the change
      of font-related objects.
      (font_sort_entites): New arg best_only.
      (font_symbolic_weight, font_symbolic_slant, font_symbolic_width):
      Delete them.
      (font_match_p): Check alternate families.
      (font_find_object): Delete it.
      (font_check_object): New function.
      (font_clear_cache): Adjusted for the change of font-related
      objects.
      (font_delete_unmatched): New arg.
      (font_list_entities): Call font_driver->list with a spec that
      doesn't specify style-related properties.
      (font_matching_entity): Arguments changed.  Caller changed.
      (font_open_entity): Adjusted for the change of font-related
      objects.
      (font_close_object, font_has_char, font_encode_char)
      (font_get_name, font_get_spec): Likewise.
      (font_spec_from_name, font_clear_prop, font_update_lface): New
      functions.
      (font_find_for_lface, font_open_for_lface, font_load_for_lface):
      (font_prepare_for_face, font_done_for_face, font_open_by_name)
      (font_at): Adjusted for the change of font-related objects.
      (font_range): New function.
      (Ffontp, Ffont_spec, Ffont_get, Ffont_put, Flist_fonts)
      (Ffont_xlfd_name): Adjusted for the change of font-related
      objects.
      (Fcopy_font_spec, Fmerge_font_spec): New function.
      (Ffont_family_list): Renamed from list-families.
      (Finternal_set_font_style_table): Arguments changed.
      (Ffont_fill_gstring, Ffont_shape_text, Fopen_font)
      (Ffont_drive_otf, Fquery_font, Ffont_match_p): Adjusted for the
      change of font-related objects.
      (syms_of_font): Delete "ifdef USE_FONT_BACKEND".  DEFSYM new
      symboles.
      35027d0c
    • Kenichi Handa's avatar
      (Qfont_spec, Qfont_entity, Qfont_object): Extern them. · 875003e5
      Kenichi Handa authored
      (enum font_property_index): New members FONT_DPI_INDEX,
      FONT_SPACING_INDEX, FONT_AVGWIDTH_INDEX, FONT_NAME_INDEX,
      FONT_FULLNAME_INDEX, FONT_FILE_INDEX, FONT_FORMAT_INDEX,
      FONT_OBJECT_MAX.  Delete FONT_FRAME_INDEX.
      (FONT_WEIGHT_NUMERIC, FONT_SLANT_NUMERIC, FONT_WIDTH_NUMERIC)
      (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC, FONT_WIDTH_SYMBOLIC)
      (FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE, FONT_WIDTH_FOR_FACE)
      (FONT_WEIGHT_NAME_NUMERIC, FONT_SLANT_NAME_NUMERIC)
      (FONT_WIDTH_NAME_NUMERIC, FONT_SET_STYLE): New macros.
      (struct font_spec, struct font_entity): New structs.
      (FONT_ENCODING_NOT_DECIDED): Moved from fontset.h.
      (struct font): Many members from old "struct font_info" moved to
      here.  Members font and entity deleted.
      (FONT_SPEC_P, FONT_ENTITY_P, FONT_OBJECT_P, FONTP): Modified for
      the new font-related objects.
      (CHECK_FONT_SPEC, CHECK_FONT_ENTITY, CHECK_FONT_OBJECT)
      (CHECK_FONT_GET_OBJECT): Likewise.
      (XFONT_SPEC, XFONT_ENTITY, XFONT_OBJECT, XSETFONT): New macros.
      (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Moved from font.h.
      (struct font_driver): New members case_sensitive anc check.  Type
      of the member list and open changed.
      (enable_font_backend, font_symbolic_weight, font_symbolic_slant)
      (font_symbolic_width, font_find_object, font_get_spec)
      (font_set_lface_from_name): Delete extern.
      (Fcopy_font_spec, Fmerge_font_spec, Ffont_family_list): New
      EXFUNs.
      875003e5
    • Kenichi Handa's avatar
      (enable_font_backend): Delete extern. · 5a51a144
      Kenichi Handa authored
      (main): Don't set enable_font_backend.  Don't check the command
      line argument "-disable-font-backend".
      5a51a144
    • Kenichi Handa's avatar
      (struct glyph_string): Change type of `font' to · 93cf902a
      Kenichi Handa authored
      `struct font *'.
      (struct glyph_string): New member underline_position and
      underline_thickness.
      (enum lface_attribute_index): Remove LFACE_AVGWIDTH_INDEX.
      (struct face): Change type of `font' to `struct font *'.  Remove
      members `font_name', `font_info_id'.
      (per_char_metric, encode_char): Delete externs.
      (calc_pixel_width_or_height): Adjust the prototype.
      93cf902a
    • Kenichi Handa's avatar
      Throughout the file, delete all USE_FONT_BACKEND · dd5e1ed4
      Kenichi Handa authored
      conditionals.  Don't check enable_font_backend.  Delete all codes
      used only when USE_FONT_BACKEND is not defined.
      dd5e1ed4
    • Kenichi Handa's avatar
      (Vcharset_non_preferred_head): New variable. · 6a9c90ec
      Kenichi Handa authored
      (Vcurrent_iso639_language): New variable.
      (syms_of_charset): Declare it as a Lisp variable.
      (char_charset): Don't check non preferred charsets.  As a last
      resort, return charset_unicode.
      (Fset_charset_priority): Update Vcharset_non_preferred_head.
      6a9c90ec
    • Kenichi Handa's avatar
      (Vcharset_non_preferred_head) · 370cefff
      Kenichi Handa authored
      (Vcurrent_iso639_language): Extern them.
      370cefff
    • Kenichi Handa's avatar
      42da60f7
    • Kenichi Handa's avatar
      Delete USE_FONT_BACKEND conditionals. · 0bd4ba0a
      Kenichi Handa authored
      (frame.o, image.o, print.o): Depend on $(FONTSRC).
      0bd4ba0a
    • Kenichi Handa's avatar
      Throughout the file, delete all USE_FONT_BACKEND · 1cc06b86
      Kenichi Handa authored
      conditionals.  Don't check enable_font_backend.  Delete all codes
      used only when USE_FONT_BACKEND is not defined.  Surround non-used
      code by "#ifdef OLD_FONT" and "endif".
      (Fw32_select_font): Use FONT_COMPAT to get old font structure.
      1cc06b86
    • Kenichi Handa's avatar
      (struct w32font_info): New member. · 7a9ef2ed
      Kenichi Handa authored
      (FONT_COMPAT): New macro.
      (w32font_open_internal): Prototype adjusted.
      7a9ef2ed
    • Kenichi Handa's avatar
      (XGCValues): Surround `XFontStruct *font' by "if · bce485cc
      Kenichi Handa authored
      OLD_FONT" and "endif".
      bce485cc
    • Kenichi Handa's avatar
      Throughout the file, delete all USE_FONT_BACKEND · 5f18d119
      Kenichi Handa authored
      conditionals.  Don't check enable_font_backend.  Delete all codes
      used only when USE_FONT_BACKEND is not defined.
      (w32font_open): Return a font-object.  Make a font-object by
      font_make_object.  Adjusted for the change of struct w32font_info.
      (w32font_close): Don't free struct font.  Adjusted for the change
      of struct w32font_info.
      (w32font_encode_char, w32font_text_extents, w32font_draw):
      Adjusted for the change of struct w32font_info.
      (w32font_draw): Likewise.
      (w32font_list_internal): Return a list, not vector.
      (w32font_open_internal): Change the 4th arg to font-object.
      Adjusted for the change of struct w32font_info and font-object
      format.
      (add_font_name_to_list): Don't downcase names.
      (w32_enumfont_pattern_entity): Make a font-entity by
      font_make_entity.  Adjusted for the format change of font-entity.
      Use FONT_SET_STYLE to set a style-related font property.  If a
      font is scalable, set avgwidth property to 0.  Set font-entity
      property by font_put_extra.
      (font_matches_spec): Adjusted for the format change of
      font-entity.
      (w32_weight_table, w32_decode_weight): New variables.
      (w32_encode_weight): New function.
      (fill_in_logfont): Adjusted for the format change of font-spec.
      (w32font_full_name): Use FONT_WEIGHT_SYMBOLIC to get a symbol
      weight value.
      (w32font_driver): Adjusted for the change of struct font_driver.
      
      (w32font_open_internal): Change last argument from
      w32font_info struct to font object.  Fill in font object from
      font_entity.  Get Outline metrics if possible.  Use them to
      calculate underline position and thickness.  Use xlfd name as name
      property.  Don't set codepage.
      (w32font_open): Pass font_object to w32font_open_internal.  Don't
      update dpyinfo->smallest_font_height and
      dpyinfo->smallest_char_width.
      (w32font_draw): Use s->font.
      (clear_cached_metrics): Don't clear non-existent blocks.
      5f18d119
    • Kenichi Handa's avatar
      Throughout the file, delete all USE_FONT_BACKEND · 3af8ab1d
      Kenichi Handa authored
      conditionals.  Don't check enable_font_backend. Surround non-used
      code by "#ifdef OLD_FONT" and "endif".
      (FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT)
      (FONT_AVG_WIDTH): Adjusted for the change of struct font.
      3af8ab1d
    • Kenichi Handa's avatar
      : Throughout the file, delete all USE_FONT_BACKEND · ef39ccbb
      Kenichi Handa authored
      conditionals.  Don't check enable_font_backend.  Delete all codes
      used only when USE_FONT_BACKEND is not defined.  Surround non-used
      code by "#ifdef OLD_FONT" and "endif".
      ef39ccbb
    • Kenichi Handa's avatar
      Delete USE_FONT_BACKEND conditional. · fd302b02
      Kenichi Handa authored
      (uniscribe_open): Return value changed to font-object.  Adjusted
      for the format change of font-object.
      (uniscribe_otf_capability): Adjusted for the change of struct
      font.
      (add_opentype_font_name_to_list): Don't downcase names.
      (uniscribe_font_driver): Adjusted for the change of struct
      font_driver.
      fd302b02
    • Kenichi Handa's avatar
      Throughout the file, delete all USE_FONT_BACKEND · 28ca067b
      Kenichi Handa authored
      conditionals.
      (FONT_WIDTH): Return (f)->max_width.
      (struct x_display_info): Delete member `font'.
      (x_list_fonts, x_get_font_info, x_load_font, x_query_font)
      (x_find_ccl_program, x_get_font_repertory): Delete externs.
      (struct x_output): Change type of `font' to `struct font *'.
      28ca067b
  2. 13 May, 2008 5 commits
  3. 12 May, 2008 1 commit
  4. 10 May, 2008 2 commits
  5. 09 May, 2008 8 commits
  6. 08 May, 2008 1 commit