output buffer. If CH is less than 256, CH is written as is. */
#define CCL_WRITE_CHAR(ch) \
do { \
+ int bytes = SINGLE_BYTE_CHAR_P (ch) ? 1: CHAR_BYTES (ch); \
+ if (ch == '\n' && ccl->eol_type == CODING_EOL_CRLF) \
+ bytes++; \
if (!dst) \
CCL_INVALID_CMD; \
- else \
+ else if (dst + bytes <= (dst_bytes ? dst_end : src)) \
{ \
- unsigned char str[MAX_MULTIBYTE_LENGTH], *p = str; \
- int len = CHAR_STRING (ch, str); \
- if (dst + len <= (dst_bytes ? dst_end : src)) \
+ if (ch == '\n') \
{ \
- while (len--) *dst++ = *p++; \
+ if (ccl->eol_type == CODING_EOL_CRLF) \
+ *dst++ = '\r', *dst++ = '\n'; \
+ else if (ccl->eol_type == CODING_EOL_CR) \
+ *dst++ = '\r'; \
+ else \
+ *dst++ = '\n'; \
} \
+ else if (bytes == 1) \
+ *dst++ = (ch); \
else \
- CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \
+ dst += CHAR_STRING (ch, dst); \
} \
+ else \
+ CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \
} while (0)
/* Write a string at ccl_prog[IC] of length LEN to the current output
} while (0)
+/* Set C to the character code made from CHARSET and CODE. This is
+ like MAKE_CHAR but check the validity of CHARSET and CODE. If they
+ are not valid, set C to (CODE & 0xFF) because that is usually the
+ case that CCL_ReadMultibyteChar2 read an invalid code and it set
+ CODE to that invalid byte. */
+
+#define CCL_MAKE_CHAR(charset, code, c) \
+ do { \
+ if (charset == CHARSET_ASCII) \
+ c = code & 0xFF; \
+ else if (CHARSET_DEFINED_P (charset) \
+ && (code & 0x7F) >= 32 \
+ && (code < 256 || ((code >> 7) & 0x7F) >= 32)) \
+ { \
+ int c1 = code & 0x7F, c2 = 0; \
+ \
+ if (code >= 256) \
+ c2 = c1, c1 = (code >> 7) & 0x7F; \
+ c = MAKE_CHAR (charset, c1, c2); \
+ } \
+ else \
+ c = code & 0xFF; \
+ } while (0)
+
+
/* Execute CCL code on SRC_BYTES length text at SOURCE. The resulting
text goes to a place pointed by DESTINATION, the length of which
should not exceed DST_BYTES. The bytes actually processed is
break;
case CCL_End: /* 0000000000000000000000XXXXX */
- if (stack_idx-- > 0)
+ if (stack_idx > 0)
{
+ stack_idx--;
ccl_prog = ccl_prog_stack_struct[stack_idx].ccl_prog;
ic = ccl_prog_stack_struct[stack_idx].ic;
break;
reg[rrr] = ((i << 7) | (*src & 0x7F));
src++;
}
+ else if (i == LEADING_CODE_8_BIT_CONTROL)
+ {
+ if (src >= src_end)
+ goto ccl_read_multibyte_character_suspend;
+ reg[RRR] = CHARSET_8_BIT_CONTROL;
+ reg[rrr] = (*src++ - 0x20);
+ }
+ else if (i >= 0xA0)
+ {
+ reg[RRR] = CHARSET_8_BIT_GRAPHIC;
+ reg[rrr] = i;
+ }
else
{
/* INVALID CODE. Return a single byte character. */
case CCL_WriteMultibyteChar2:
i = reg[RRR]; /* charset */
- if (i == CHARSET_ASCII)
+ if (i == CHARSET_ASCII
+ || i == CHARSET_8_BIT_CONTROL
+ || i == CHARSET_8_BIT_GRAPHIC)
i = reg[rrr] & 0xFF;
else if (CHARSET_DIMENSION (i) == 1)
i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
break;
case CCL_TranslateCharacter:
- i = reg[RRR]; /* charset */
- if (i == CHARSET_ASCII)
- i = reg[rrr];
- else if (CHARSET_DIMENSION (i) == 1)
- i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
- else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
- i = ((i - 0x8F) << 14) | (reg[rrr] & 0x3FFF);
- else
- i = ((i - 0xE0) << 14) | (reg[rrr] & 0x3FFF);
-
+ CCL_MAKE_CHAR (reg[RRR], reg[rrr], i);
op = translate_char (GET_TRANSLATION_TABLE (reg[Rrr]),
i, -1, 0, 0);
SPLIT_CHAR (op, reg[RRR], i, j);
case CCL_TranslateCharacterConstTbl:
op = XINT (ccl_prog[ic]); /* table */
ic++;
- i = reg[RRR]; /* charset */
- if (i == CHARSET_ASCII)
- i = reg[rrr];
- else if (CHARSET_DIMENSION (i) == 1)
- i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
- else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
- i = ((i - 0x8F) << 14) | (reg[rrr] & 0x3FFF);
- else
- i = ((i - 0xE0) << 14) | (reg[rrr] & 0x3FFF);
-
+ CCL_MAKE_CHAR (reg[RRR], reg[rrr], i);
op = translate_char (GET_TRANSLATION_TABLE (op), i, -1, 0, 0);
SPLIT_CHAR (op, reg[RRR], i, j);
if (j != -1)
}
else if (EQ (content, Qlambda))
{
+ reg[RRR] = i;
break;
}
else
reg[RRR] = -1;
else
{
+ reg[RRR] = 0;
content = XVECTOR (map)->contents[point];
if (NILP (content))
reg[RRR] = -1;
else if (NUMBERP (content))
reg[rrr] = XINT (content);
- else if (EQ (content, Qt))
- reg[RRR] = i;
+ else if (EQ (content, Qt));
else if (CONSP (content))
{
attrib = XCAR (content);
ccl->private_state = 0;
ccl->status = 0;
ccl->stack_idx = 0;
+ ccl->eol_type = CODING_EOL_LF;
return 0;
}