Mercurial > hg > xemacs-beta
annotate src/font-mgr.h @ 4678:b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
lisp/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (ceiling*, floor*, round*, truncate*):
Implement these in terms of the C functions; mark them as
obsolete.
(mod*, rem*): Use #'nth-value with the C functions, not #'nth with
the CL emulation functions.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Bigfloat Basics):
Correct this documentation (ignoring for the moment that it breaks
off in mid-sentence).
tests/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test the new Common Lisp-compatible rounding functions available in
C.
(generate-rounding-output): Provide a function useful for
generating the data for the rounding functions tests.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* floatfns.c (ROUNDING_CONVERT, CONVERT_WITH_NUMBER_TYPES)
(CONVERT_WITHOUT_NUMBER_TYPES, MAYBE_TWO_ARGS_BIGNUM)
(MAYBE_ONE_ARG_BIGNUM, MAYBE_TWO_ARGS_RATIO)
(MAYBE_ONE_ARG_RATIO, MAYBE_TWO_ARGS_BIGFLOAT)
(MAYBE_ONE_ARG_BIGFLOAT, MAYBE_EFF, MAYBE_CHAR_OR_MARKER):
New macros, used in the implementation of the rounding functions.
(ceiling_two_fixnum, ceiling_two_bignum, ceiling_two_ratio)
(ceiling_two_bigfloat, ceiling_one_ratio, ceiling_one_bigfloat)
(ceiling_two_float, ceiling_one_float, ceiling_one_mundane_arg)
(floor_two_fixnum, floor_two_bignum, floor_two_ratio)
(floor_two_bigfloat, floor_one_ratio, floor_one_bigfloat)
(floor_two_float, floor_one_mundane_arg, round_two_fixnum)
(round_two_bignum_1, round_two_bignum, round_two_ratio)
(round_one_bigfloat_1, round_two_bigfloat, round_one_ratio)
(round_one_bigfloat, round_two_float, round_one_float)
(round_one_mundane_arg, truncate_two_fixnum)
(truncate_two_bignum, truncate_two_ratio, truncate_two_bigfloat)
(truncate_one_ratio, truncate_one_bigfloat, truncate_two_float)
(truncate_one_float, truncate_one_mundane_arg):
New functions, used in the implementation of the rounding
functions.
(Fceiling, Ffloor, Fround, Ftruncate, Ffceiling, Fffloor)
(Ffround, Fftruncate):
Revise to fully support Common Lisp conventions. This means:
-- All functions have optional DIVISOR arguments
-- All functions return multiple values; see #'values
-- All functions do their arithmetic with the correct number types
according to the contamination rules.
-- #'round and #'fround always round towards the even number
in ambiguous cases.
* doprnt.c (emacs_doprnt_1):
* number.c (internal_coerce_number):
Call Ftruncate with two arguments, not one.
* floatfns.c (Ffloat):
Correct this, if NUMBER is a bignum.
* lisp.h:
Declare Ftruncate as taking two arguments.
* number.c:
Provide scratch_ratio2, init it appropriately.
* number.h:
Make scratch_ratio2 available.
* number.h (BIGFLOAT_ARITH_RETURN):
* number.h (BIGFLOAT_ARITH_RETURN1):
Correct these functions.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 11 Aug 2009 17:59:23 +0100 |
| parents | dfd878799ef0 |
| children | a23ac8f90a49 |
| rev | line source |
|---|---|
| 3354 | 1 /* Lisp font data structures for X and Xft. |
| 2 | |
| 3 Copyright (C) 2003 Eric Knauel and Matthias Neubauer | |
| 4 Copyright (C) 2005 Eric Knauel | |
| 5 Copyright (C) 2004, 2005 Free Software Foundation, Inc. | |
| 6 | |
| 7 Authors: Eric Knauel <knauel@informatik.uni-tuebingen.de> | |
| 8 Matthias Neubauer <neubauer@informatik.uni-freiburg.de> | |
| 9 Stephen J. Turnbull <stephen@xemacs.org> | |
| 10 Created: 27 Oct 2003 | |
| 11 Updated: 05 Mar 2005 by Stephen J. Turnbull | |
| 12 | |
| 13 This file is part of XEmacs. | |
| 14 | |
| 15 XEmacs is free software; you can redistribute it and/or modify it | |
| 16 under the terms of the GNU General Public License as published by the | |
| 17 Free Software Foundation; either version 2, or (at your option) any | |
| 18 later version. | |
| 19 | |
| 20 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 21 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 22 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 23 for more details. | |
| 24 | |
| 25 You should have received a copy of the GNU General Public License | |
| 26 along with XEmacs; see the file COPYING. If not, write to | |
| 27 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 28 Boston, MA 02111-1307, USA. */ | |
| 29 | |
| 30 /* Synched up with: Not in GNU Emacs. */ | |
| 31 | |
| 32 /* This module provides the Lisp interface to fonts in X11, including Xft, | |
| 33 but (at least at first) not GTK+ or Qt. | |
| 34 | |
| 35 It should be renamed to fonts-x.h. | |
| 36 | |
| 37 Sealevel code should be in ../lwlib/lwlib-fonts.h or | |
| 38 ../lwlib/lwlib-colors.h. | |
| 39 */ | |
| 40 | |
| 41 | |
| 42 #ifndef INCLUDED_font_mgr_h_ | |
| 43 #define INCLUDED_font_mgr_h_ | |
| 44 | |
| 45 #include "../lwlib/lwlib-fonts.h" | |
| 46 #include "../lwlib/lwlib-colors.h" | |
| 47 | |
| 48 extern Fixnum debug_xft; | |
| 49 | |
| 50 /* Standard for fontconfig. Use a macro to show we're not guessing. */ | |
| 3360 | 51 #define Qfc_font_name_encoding Qutf_8 |
| 3354 | 52 |
| 53 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s))) | |
| 54 | |
| 55 struct fc_pattern | |
| 56 { | |
| 57 struct LCRECORD_HEADER header; | |
| 58 FcPattern *fcpatPtr; | |
| 59 }; | |
| 60 | |
| 61 typedef struct fc_pattern fc_pattern; | |
| 62 | |
| 63 DECLARE_LRECORD(fc_pattern, struct fc_pattern); | |
| 64 #define XFCPATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern) | |
| 65 #define wrap_fcpattern(p) wrap_record (p, fc_pattern) | |
| 66 #define FCPATTERNP(x) RECORDP (x, fc_pattern) | |
| 67 #define CHECK_FCPATTERN(x) CHECK_RECORD (x, fc_pattern) | |
| 68 #define CONCHECK_FCPATTERN(x) CONCHECK_RECORD (x, fc_pattern) | |
| 69 #define XFCPATTERN_PTR(x) (XFCPATTERN(x)->fcpatPtr) | |
| 70 | |
| 3931 | 71 #define FONTCONFIG_EXPOSE_CONFIG |
| 72 #ifdef FONTCONFIG_EXPOSE_CONFIG | |
| 73 | |
| 74 struct fc_config | |
| 75 { | |
| 76 struct LCRECORD_HEADER header; | |
| 77 FcConfig *fccfgPtr; | |
| 78 }; | |
| 79 | |
| 80 typedef struct fc_config fc_config; | |
| 81 | |
| 82 DECLARE_LRECORD(fc_config, struct fc_config); | |
| 83 #define XFCCONFIG(x) XRECORD (x, fc_config, struct fc_config) | |
| 84 #define wrap_fcconfig(p) wrap_record (p, fc_config) | |
| 85 #define FCCONFIGP(x) RECORDP (x, fc_config) | |
| 86 #define CHECK_FCCONFIG(x) CHECK_RECORD (x, fc_config) | |
| 87 #define CONCHECK_FCCONFIG(x) CONCHECK_RECORD (x, fc_config) | |
| 88 #define XFCCONFIG_PTR(x) (XFCCONFIG(x)->fccfgPtr) | |
| 89 | |
| 90 #endif /* FONTCONFIG_EXPOSE_CONFIG */ | |
| 91 | |
| 3666 | 92 #ifdef USE_XFT |
|
4328
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
93 |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
94 #ifndef HAVE_FCCONFIGGETRESCANINTERVAL |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
95 /* Older fontconfig versions misspell this function name. */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
96 #define FcConfigGetRescanInterval FcConfigGetRescanInverval |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
97 #endif /* */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
98 |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
99 #ifndef HAVE_FCCONFIGSETRESCANINTERVAL |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
100 /* Older fontconfig versions misspell this function name. */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
101 #define FcConfigSetRescanInterval FcConfigSetRescanInverval |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
102 #endif /* */ |
|
dfd878799ef0
Autoconfiscate the recent fontconfig spelling change.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3931
diff
changeset
|
103 |
| 3666 | 104 /* |
| 105 The format of a fontname (as returned by fontconfig) is not well-documented, | |
| 106 But the character repertoire is represented in an ASCII-compatible way. See | |
| 107 fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. | |
| 108 | |
| 109 Currently we have a hack where different versions of the unparsed name are | |
| 110 used in different contexts fairly arbitrarily. I don't think this is close | |
| 111 to coherency; even without the charset and lang properties fontconfig names | |
| 112 are too unwieldy to use. We need to rethink the approach here. I think | |
| 113 probably Lisp_Font_Instance.name should contain the font name as specified | |
| 114 to Lisp (almost surely much shorter than shortname, even, and most likely | |
| 115 wildcarded), while Lisp_Font_Instance.truename should contain the longname. | |
| 116 For now, I'm going to #ifdef the return values defaulting to short. -- sjt | |
| 117 */ | |
| 118 | |
| 119 /* DEBUGGING STUFF */ | |
| 120 | |
| 121 /* print message to stderr: one internal-format string argument */ | |
| 122 #define DEBUG_XFT0(level,s) \ | |
| 123 if (debug_xft > level) stderr_out (s) | |
| 124 | |
| 125 /* print message to stderr: one formatted argument */ | |
| 126 #define DEBUG_XFT1(level,format,x1) \ | |
| 127 if (debug_xft > level) stderr_out (format, x1) | |
| 128 | |
| 129 /* print message to stderr: two formatted arguments */ | |
| 130 #define DEBUG_XFT2(level,format,x1,x2) \ | |
| 131 if (debug_xft > level) stderr_out (format, x1, x2) | |
| 132 | |
| 133 /* print message to stderr: three formatted arguments */ | |
| 134 #define DEBUG_XFT3(level,format,x1,x2,x3) \ | |
| 135 if (debug_xft > level) stderr_out (format, x1, x2, x3) | |
| 136 | |
| 137 /* print message to stderr: four formatted arguments */ | |
| 138 #define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ | |
| 139 if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) | |
| 140 | |
| 141 /* print an Xft pattern to stderr | |
| 142 LEVEL is the debug level (to compare to debug_xft) | |
| 143 FORMAT is a newline-terminated printf format with one %s for the pattern | |
| 144 and must be internal format (eg, pure ASCII) | |
| 145 PATTERN is an FcPattern *. */ | |
| 146 #define PRINT_XFT_PATTERN(level,format,pattern) \ | |
| 147 do { \ | |
| 148 DECLARE_EISTRING (eistrpxft_name); \ | |
| 149 FcChar8 *name = FcNameUnparse (pattern); \ | |
| 150 \ | |
| 151 eicpy_ext(eistrpxft_name, name, Qfc_font_name_encoding); \ | |
| 152 DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ | |
| 153 free (name); \ | |
| 154 } while (0) | |
| 155 | |
| 156 /* print a progress message | |
| 157 LEVEL is the debug level (to compare to debug_xft) | |
| 158 FONT is the Xft font name in UTF-8 (the native encoding of Xft) | |
| 159 LANG is the language being checked for support (must be ASCII). */ | |
| 160 #define CHECKING_LANG(level,font,lang) \ | |
| 161 do { \ | |
| 162 DECLARE_EISTRING (eistrcl_name); \ | |
| 163 eicpy_ext(eistrcl_name, font, Qfc_font_name_encoding); \ | |
| 164 DEBUG_XFT2 (level, "checking if %s handles %s\n", \ | |
| 165 eidata(eistrcl_name), lang); \ | |
| 166 } while (0) | |
| 167 | |
| 168 #else /* USE_XFT */ | |
| 169 | |
| 170 #endif /* USE_XFT */ | |
| 171 | |
| 3354 | 172 #endif /* INCLUDED_font_mgr_h_ */ |