diff options
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/src/font.h b/src/font.h index 539ebeba52a..2c7456a2f29 100644 --- a/src/font.h +++ b/src/font.h @@ -117,7 +117,7 @@ enum font_property_index font. */ FONT_AVGWIDTH_INDEX, -#if 0 +#if false /* The following two members are to substitute for the above 6 members (FONT_WEIGHT_INDEX to FONT_AVGWIDTH_INDEX excluding FONT_SIZE_INDEX) if it is found that font-entities consumes too @@ -201,38 +201,38 @@ enum font_property_index ? (XINT (AREF ((font), FONT_WIDTH_INDEX)) >> 8) : -1) /* Return the symbolic weight value of FONT. */ #define FONT_WEIGHT_SYMBOLIC(font) \ - font_style_symbolic (font, FONT_WEIGHT_INDEX, 0) + font_style_symbolic (font, FONT_WEIGHT_INDEX, false) /* Return the symbolic slant value of FONT. */ #define FONT_SLANT_SYMBOLIC(font) \ - font_style_symbolic (font, FONT_SLANT_INDEX, 0) + font_style_symbolic (font, FONT_SLANT_INDEX, false) /* Return the symbolic width value of FONT. */ #define FONT_WIDTH_SYMBOLIC(font) \ - font_style_symbolic (font, FONT_WIDTH_INDEX, 0) + font_style_symbolic (font, FONT_WIDTH_INDEX, false) /* Return the face-weight corresponding to the weight of FONT. */ #define FONT_WEIGHT_FOR_FACE(font) \ - font_style_symbolic (font, FONT_WEIGHT_INDEX, 1) + font_style_symbolic (font, FONT_WEIGHT_INDEX, true) /* Return the face-slant corresponding to the slant of FONT. */ #define FONT_SLANT_FOR_FACE(font) \ - font_style_symbolic (font, FONT_SLANT_INDEX, 1) + font_style_symbolic (font, FONT_SLANT_INDEX, true) /* Return the face-swidth corresponding to the slant of FONT. */ #define FONT_WIDTH_FOR_FACE(font) \ - font_style_symbolic (font, FONT_WIDTH_INDEX, 1) + font_style_symbolic (font, FONT_WIDTH_INDEX, true) /* Return the numeric weight value corresponding ot the symbol NAME. */ #define FONT_WEIGHT_NAME_NUMERIC(name) \ - (font_style_to_value (FONT_WEIGHT_INDEX, (name), 0) >> 8) + (font_style_to_value (FONT_WEIGHT_INDEX, (name), false) >> 8) /* Return the numeric slant value corresponding ot the symbol NAME. */ #define FONT_SLANT_NAME_NUMERIC(name) \ - (font_style_to_value (FONT_SLANT_INDEX, (name), 0) >> 8) + (font_style_to_value (FONT_SLANT_INDEX, (name), false) >> 8) /* Return the numeric width value corresponding ot the symbol NAME. */ #define FONT_WIDTH_NAME_NUMERIC(name) \ - (font_style_to_value (FONT_WIDTH_INDEX, (name), 0) >> 8) + (font_style_to_value (FONT_WIDTH_INDEX, (name), false) >> 8) /* Set the font property PROP of FONT to VAL. PROP is one of style-related font property index (FONT_WEIGHT/SLANT/WIDTH_INDEX). VAL (integer or symbol) is the numeric or symbolic style value. */ #define FONT_SET_STYLE(font, prop, val) \ - ASET ((font), prop, make_number (font_style_to_value (prop, val, 1))) + ASET ((font), prop, make_number (font_style_to_value (prop, val, true))) #define FONT_WIDTH(f) ((f)->max_width) #define FONT_HEIGHT(f) ((f)->height) @@ -424,19 +424,19 @@ struct font_bitmap /* Predicates to check various font-related objects. */ -/* 1 iff X is one of font-spec, font-entity, and font-object. */ +/* True iff X is one of font-spec, font-entity, and font-object. */ #define FONTP(x) PSEUDOVECTORP (x, PVEC_FONT) -/* 1 iff X is font-spec. */ +/* True iff X is font-spec. */ #define FONT_SPEC_P(x) \ (FONTP (x) && (ASIZE (x) & PSEUDOVECTOR_SIZE_MASK) == FONT_SPEC_MAX) -/* 1 iff X is font-entity. */ +/* True iff X is font-entity. */ #define FONT_ENTITY_P(x) \ (FONTP (x) && (ASIZE (x) & PSEUDOVECTOR_SIZE_MASK) == FONT_ENTITY_MAX) -/* 1 iff X is font-object. */ +/* True iff X is font-object. */ #define FONT_OBJECT_P(x) \ (FONTP (x) && (ASIZE (x) & PSEUDOVECTOR_SIZE_MASK) == FONT_OBJECT_MAX) -/* 1 iff ENTITY can't be loaded. */ +/* True iff ENTITY can't be loaded. */ #define FONT_ENTITY_NOT_LOADABLE(entity) \ EQ (AREF (entity, FONT_OBJLIST_INDEX), Qt) @@ -448,19 +448,22 @@ struct font_bitmap /* Check macros for various font-related objects. */ #define CHECK_FONT(x) \ - do { if (! FONTP (x)) wrong_type_argument (Qfont, x); } while (0) + do { if (! FONTP (x)) wrong_type_argument (Qfont, x); } while (false) #define CHECK_FONT_SPEC(x) \ - do { if (! FONT_SPEC_P (x)) wrong_type_argument (Qfont_spec, x); } while (0) + do { if (! FONT_SPEC_P (x)) wrong_type_argument (Qfont_spec, x); } \ + while (false) #define CHECK_FONT_ENTITY(x) \ - do { if (! FONT_ENTITY_P (x)) wrong_type_argument (Qfont_entity, x); } while (0) + do { if (! FONT_ENTITY_P (x)) wrong_type_argument (Qfont_entity, x); } \ + while (false) #define CHECK_FONT_OBJECT(x) \ - do { if (! FONT_OBJECT_P (x)) wrong_type_argument (Qfont_object, x); } while (0) + do { if (! FONT_OBJECT_P (x)) wrong_type_argument (Qfont_object, x); } \ + while (false) #define CHECK_FONT_GET_OBJECT(x, font) \ do { \ CHECK_FONT_OBJECT (x); \ font = XFONT_OBJECT (x); \ - } while (0) + } while (false) #define XFONT_SPEC(p) \ (eassert (FONT_SPEC_P (p)), (struct font_spec *) XUNTAG (p, Lisp_Vectorlike)) @@ -848,12 +851,12 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object); do { \ if (! EQ (Vfont_log, Qt)) \ font_add_log ((ACTION), (ARG), (RESULT)); \ - } while (0) + } while (false) #define FONT_DEFERRED_LOG(ACTION, ARG, RESULT) \ do { \ if (! EQ (Vfont_log, Qt)) \ font_deferred_log ((ACTION), (ARG), (RESULT)); \ - } while (0) + } while (false) #endif /* not EMACS_FONT_H */ |