This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "lisp.h"
/* Temporary variable used in macros COMPOSITION_XXX. */
Lisp_Object composition_temp;
-extern int enable_font_backend;
\f
/* Return COMPOSITION-ID of a composition at buffer position
CHARPOS/BYTEPOS and length NCHARS. The `composition' property of
vector or a list. It should be a sequence of:
char1 rule1 char2 rule2 char3 ... ruleN charN+1 */
-#ifdef USE_FONT_BACKEND
- if (enable_font_backend
- && VECTORP (components)
+ if (VECTORP (components)
&& ASIZE (components) >= 2
&& VECTORP (AREF (components, 0)))
{
if (! VECTORP (AREF (key, i)))
goto invalid_composition;
}
- else
-#endif /* USE_FONT_BACKEND */
- if (VECTORP (components) || CONSP (components))
+ else if (VECTORP (components) || CONSP (components))
{
int len = XVECTOR (key)->size;
: ((INTEGERP (components) || STRINGP (components))
? COMPOSITION_WITH_ALTCHARS
: COMPOSITION_WITH_RULE_ALTCHARS));
-#ifdef USE_FONT_BACKEND
if (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS
&& VECTORP (components)
&& ! INTEGERP (AREF (components, 0)))
cmp->method = COMPOSITION_WITH_GLYPH_STRING;
-#endif /* USE_FONT_BACKEND */
cmp->hash_index = hash_index;
glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS
? (XVECTOR (key)->size + 1) / 2
cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2);
cmp->font = NULL;
-#ifdef USE_FONT_BACKEND
+ /* Calculate the width of overall glyphs of the composition. */
if (cmp->method == COMPOSITION_WITH_GLYPH_STRING)
{
cmp->width = 1; /* Should be fixed later. */
cmp->glyph_len--;
}
- else
-#endif /* USE_FONT_BACKEND */
- /* Calculate the width of overall glyphs of the composition. */
- if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS)
+ else if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS)
{
/* Relative composition. */
cmp->width = 0;
{
Lisp_Object prop;
-#if 0
- if (VECTORP (components) && ASIZE (components) > 1
- && VECTORP (AREF (components, 0)))
- prop = components;
- else
-#endif /* USE_FONT_BACKEND */
prop = Fcons (Fcons (make_number (end - start), components),
modification_func);
Fput_text_property (make_number (start), make_number (end),