/[emacs]/emacs/src/fontset.c
ViewVC logotype

Diff of /emacs/src/fontset.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.60 by andrewi, Thu Oct 18 16:22:55 2001 UTC revision 1.61 by pj, Fri Nov 2 20:27:33 2001 UTC
# Line 816  If REGEXPP is non-nil, PATTERN is a regu Line 816  If REGEXPP is non-nil, PATTERN is a regu
816    
817    (*check_window_system_func) ();    (*check_window_system_func) ();
818    
819    CHECK_STRING (pattern, 0);    CHECK_STRING (pattern);
820    
821    if (XSTRING (pattern)->size == 0)    if (XSTRING (pattern)->size == 0)
822      return Qnil;      return Qnil;
# Line 888  FONTLIST is an alist of charsets vs corr Line 888  FONTLIST is an alist of charsets vs corr
888    
889    (*check_window_system_func) ();    (*check_window_system_func) ();
890    
891    CHECK_STRING (name, 0);    CHECK_STRING (name);
892    CHECK_LIST (fontlist, 1);    CHECK_LIST (fontlist);
893    
894    name = Fdowncase (name);    name = Fdowncase (name);
895    tem = Fquery_fontset (name, Qnil);    tem = Fquery_fontset (name, Qnil);
# Line 969  check_fontset_name (name) Line 969  check_fontset_name (name)
969    if (EQ (name, Qt))    if (EQ (name, Qt))
970      return Vdefault_fontset;      return Vdefault_fontset;
971    
972    CHECK_STRING (name, 0);    CHECK_STRING (name);
973    id = fs_query_fontset (name, 0);    id = fs_query_fontset (name, 0);
974    if (id < 0)    if (id < 0)
975      error ("Fontset `%s' does not exist", XSTRING (name)->data);      error ("Fontset `%s' does not exist", XSTRING (name)->data);
# Line 1002  name of a font, REGSITRY is a registry n Line 1002  name of a font, REGSITRY is a registry n
1002      {      {
1003        /* CH should be (FROM . TO) where FROM and TO are non-generic        /* CH should be (FROM . TO) where FROM and TO are non-generic
1004           characters.  */           characters.  */
1005        CHECK_NUMBER_CAR (character, 1);        CHECK_NUMBER_CAR (character);
1006        CHECK_NUMBER_CDR (character, 1);        CHECK_NUMBER_CDR (character);
1007        from = XINT (XCAR (character));        from = XINT (XCAR (character));
1008        to = XINT (XCDR (character));        to = XINT (XCDR (character));
1009        if (!char_valid_p (from, 0) || !char_valid_p (to, 0))        if (!char_valid_p (from, 0) || !char_valid_p (to, 0))
# Line 1022  name of a font, REGSITRY is a registry n Line 1022  name of a font, REGSITRY is a registry n
1022      }      }
1023    else    else
1024      {      {
1025        CHECK_NUMBER (character, 1);        CHECK_NUMBER (character);
1026        from = XINT (character);        from = XINT (character);
1027        to = from;        to = from;
1028      }      }
# Line 1045  name of a font, REGSITRY is a registry n Line 1045  name of a font, REGSITRY is a registry n
1045      }      }
1046    else    else
1047      {      {
1048        CHECK_CONS (fontname, 2);        CHECK_CONS (fontname);
1049        family = XCAR (fontname);        family = XCAR (fontname);
1050        registry = XCDR (fontname);        registry = XCDR (fontname);
1051        if (!NILP (family))        if (!NILP (family))
1052          {          {
1053            CHECK_STRING (family, 2);            CHECK_STRING (family);
1054            family = Fdowncase (family);            family = Fdowncase (family);
1055          }          }
1056        if (!NILP (registry))        if (!NILP (registry))
1057          {          {
1058            CHECK_STRING (registry, 2);            CHECK_STRING (registry);
1059            registry = Fdowncase (registry);            registry = Fdowncase (registry);
1060          }          }
1061        elt = Fcons (make_number (from), Fcons (family, registry));        elt = Fcons (make_number (from), Fcons (family, registry));
# Line 1064  name of a font, REGSITRY is a registry n Line 1064  name of a font, REGSITRY is a registry n
1064    /* The arg FRAME is kept for backward compatibility.  We only check    /* The arg FRAME is kept for backward compatibility.  We only check
1065       the validity.  */       the validity.  */
1066    if (!NILP (frame))    if (!NILP (frame))
1067      CHECK_LIVE_FRAME (frame, 3);      CHECK_LIVE_FRAME (frame);
1068    
1069    for (; from <= to; from++)    for (; from <= to; from++)
1070      FONTSET_SET (fontset, from, elt);      FONTSET_SET (fontset, from, elt);
# Line 1113  If the named font is not yet loaded, ret Line 1113  If the named font is not yet loaded, ret
1113    
1114    (*check_window_system_func) ();    (*check_window_system_func) ();
1115    
1116    CHECK_STRING (name, 0);    CHECK_STRING (name);
1117    name = Fdowncase (name);    name = Fdowncase (name);
1118    if (NILP (frame))    if (NILP (frame))
1119      frame = selected_frame;      frame = selected_frame;
1120    CHECK_LIVE_FRAME (frame, 1);    CHECK_LIVE_FRAME (frame);
1121    f = XFRAME (frame);    f = XFRAME (frame);
1122    
1123    if (!query_font_func)    if (!query_font_func)
# Line 1170  DEFUN ("internal-char-font", Finternal_c Line 1170  DEFUN ("internal-char-font", Finternal_c
1170    struct frame *f;    struct frame *f;
1171    struct face *face;    struct face *face;
1172    
1173    CHECK_NUMBER_COERCE_MARKER (position, 0);    CHECK_NUMBER_COERCE_MARKER (position);
1174    pos = XINT (position);    pos = XINT (position);
1175    if (pos < BEGV || pos >= ZV)    if (pos < BEGV || pos >= ZV)
1176      args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));      args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
# Line 1274  If FRAME is omitted, it defaults to the Line 1274  If FRAME is omitted, it defaults to the
1274    
1275    if (NILP (frame))    if (NILP (frame))
1276      frame = selected_frame;      frame = selected_frame;
1277    CHECK_LIVE_FRAME (frame, 1);    CHECK_LIVE_FRAME (frame);
1278    f = XFRAME (frame);    f = XFRAME (frame);
1279    
1280    /* Recode realized fontsets whose base is FONTSET in the table    /* Recode realized fontsets whose base is FONTSET in the table
# Line 1360  If NAME is t, find a font name pattern i Line 1360  If NAME is t, find a font name pattern i
1360    
1361    fontset = check_fontset_name (name);    fontset = check_fontset_name (name);
1362    
1363    CHECK_NUMBER (ch, 1);    CHECK_NUMBER (ch);
1364    c = XINT (ch);    c = XINT (ch);
1365    if (!char_valid_p (c, 1))    if (!char_valid_p (c, 1))
1366      invalid_character (c);      invalid_character (c);

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26