comparison src/lisp.h @ 5015:d95c102a96d3

cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-08 Ben Wing <ben@xemacs.org> * faces.c: * faces.c (face_property_matching_instance): * faces.c (ensure_face_cachel_contains_charset): * faces.h (FACE_FONT): * lisp.h: * lisp.h (enum font_specifier_matchspec_stages): * objects-msw.c: * objects-msw.c (mswindows_font_spec_matches_charset): * objects-msw.c (mswindows_find_charset_font): * objects-tty.c: * objects-tty.c (tty_font_spec_matches_charset): * objects-tty.c (tty_find_charset_font): * objects-xlike-inc.c: * objects-xlike-inc.c (XFUN): * objects-xlike-inc.c (xft_find_charset_font): * objects.c: * objects.c (font_instantiate): * objects.c (FROB): * specifier.c: * specifier.c (charset_matches_specifier_tag_set_p): * specifier.c (call_charset_predicate): * specifier.c (define_specifier_tag): * specifier.c (Fdefine_specifier_tag): * specifier.c (setup_charset_initial_specifier_tags): * specifier.c (specifier_instance_from_inst_list): * specifier.c (FROB): * specifier.c (vars_of_specifier): * specifier.h: Rename the specifier-font-matching stages in preparation for eliminating shadowed warnings, some other related fixes from ben-unicode-internal. 1. Rename raw enums: initial -> STAGE_INITIAL final -> STAGE_FINAL impossible -> NUM_MATCHSPEC_STAGES 2. Move `enum font_specifier_matchspec_stages' from specifier.h to lisp.h. 3. Whitespace changes to match coding standards. 4. Eliminate unused second argument STAGE in charset predicates that don't use it -- the code that calls the charset predicates is now smart enough to supply the right number of arguments automatically. 5. Add some long(ish) comments and authorial notices, esp. in objects.c. 6. In specifier.c, change Vcharset_tag_lists from a vector over leading bytes to a hash table over charsets. This change is unnecessary currently but doesn't hurt and will be required when we merge in Unicode-internal. 7. In specifier.c, extract out the code that calls charset predicates into a function call_charset_predicate().
author Ben Wing <ben@xemacs.org>
date Mon, 08 Feb 2010 16:51:25 -0600
parents ae48681c47fa
children 2ade80e8c640
comparison
equal deleted inserted replaced
5014:c2e0c3af5fe3 5015:d95c102a96d3
1594 { 1594 {
1595 MUNGE_ME_FUNCTION_KEY, 1595 MUNGE_ME_FUNCTION_KEY,
1596 MUNGE_ME_KEY_TRANSLATION 1596 MUNGE_ME_KEY_TRANSLATION
1597 }; 1597 };
1598 1598
1599 /* The various stages of font instantiation; initial means "find a font for
1600 CHARSET that matches the charset's registries" and final means "find a
1601 font for CHARSET that matches iso10646-1, since we haven't found a font
1602 that matches its registry."
1603 */
1604 enum font_specifier_matchspec_stages
1605 {
1606 STAGE_INITIAL,
1607 STAGE_FINAL,
1608 NUM_MATCHSPEC_STAGES,
1609 };
1610
1599 /* ------------------------------- */ 1611 /* ------------------------------- */
1600 /* misc */ 1612 /* misc */
1601 /* ------------------------------- */ 1613 /* ------------------------------- */
1602 1614
1603 #ifdef MEMORY_USAGE_STATS 1615 #ifdef MEMORY_USAGE_STATS