/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: siconv.c,v 1.12 2005-05-08 07:35:23 adam Exp $
+ * $Id: siconv.c,v 1.23 2006-05-09 21:37:02 adam Exp $
*/
/**
* \file siconv.c
* This implements an interface similar to that of iconv and
* is used by YAZ to interface with iconv (if present).
* For systems where iconv is not present, this layer
- * provides a few important conversion: UTF-8, MARC-8, Latin-1.
+ * provides a few important conversions: UTF-8, MARC-8, Latin-1.
*/
#if HAVE_CONFIG_H
#include <yaz/yaz-util.h>
-unsigned long yaz_marc8_1_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_2_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_3_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_4_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_5_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_6_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_7_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_8_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-unsigned long yaz_marc8_9_conv (unsigned char *inp, size_t inbytesleft,
- size_t *no_read, int *combining);
-
-#define NEW_COMB 1
+unsigned long yaz_marc8_1_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_2_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_3_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_4_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_5_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_6_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_7_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_8_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8_9_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+
+
+unsigned long yaz_marc8r_1_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_2_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_3_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_4_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_5_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_6_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_7_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_8_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
+unsigned long yaz_marc8r_9_conv(unsigned char *inp, size_t inbytesleft,
+ size_t *no_read, int *combining);
struct yaz_iconv_struct {
int my_errno;
size_t inbytesleft, size_t *no_read);
size_t (*write_handle)(yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
- int last);
+ int last);
int marc8_esc_mode;
-#if NEW_COMB
+
int comb_offset;
int comb_size;
unsigned long comb_x[8];
size_t comb_no_read[8];
-#else
- int marc8_comb_x;
- int marc8_comb_no_read;
-#endif
size_t no_read_x;
unsigned long unget_x;
#if HAVE_ICONV_H
iconv_t iconv_cd;
#endif
unsigned long compose_char;
+
+ unsigned long write_marc8_comb_ch[8];
+ size_t write_marc8_comb_no;
+ unsigned long write_marc8_last;
+ const char *write_marc8_page_chr;
+};
+
+static struct {
+ unsigned long x1, x2;
+ unsigned y;
+} latin1_comb[] = {
+ { 'A', 0x0300, 0xc0}, /* LATIN CAPITAL LETTER A WITH GRAVE */
+ { 'A', 0x0301, 0xc1}, /* LATIN CAPITAL LETTER A WITH ACUTE */
+ { 'A', 0x0302, 0xc2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+ { 'A', 0x0303, 0xc3}, /* LATIN CAPITAL LETTER A WITH TILDE */
+ { 'A', 0x0308, 0xc4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+ { 'A', 0x030a, 0xc5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+ /* no need for 0xc6 LATIN CAPITAL LETTER AE */
+ { 'C', 0x0327, 0xc7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+ { 'E', 0x0300, 0xc8}, /* LATIN CAPITAL LETTER E WITH GRAVE */
+ { 'E', 0x0301, 0xc9}, /* LATIN CAPITAL LETTER E WITH ACUTE */
+ { 'E', 0x0302, 0xca}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+ { 'E', 0x0308, 0xcb}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+ { 'I', 0x0300, 0xcc}, /* LATIN CAPITAL LETTER I WITH GRAVE */
+ { 'I', 0x0301, 0xcd}, /* LATIN CAPITAL LETTER I WITH ACUTE */
+ { 'I', 0x0302, 0xce}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+ { 'I', 0x0308, 0xcf}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+ { 'N', 0x0303, 0xd1}, /* LATIN CAPITAL LETTER N WITH TILDE */
+ { 'O', 0x0300, 0xd2}, /* LATIN CAPITAL LETTER O WITH GRAVE */
+ { 'O', 0x0301, 0xd3}, /* LATIN CAPITAL LETTER O WITH ACUTE */
+ { 'O', 0x0302, 0xd4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+ { 'O', 0x0303, 0xd5}, /* LATIN CAPITAL LETTER O WITH TILDE */
+ { 'O', 0x0308, 0xd6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+ /* omitted: 0xd7 MULTIPLICATION SIGN */
+ /* omitted: 0xd8 LATIN CAPITAL LETTER O WITH STROKE */
+ { 'U', 0x0300, 0xd9}, /* LATIN CAPITAL LETTER U WITH GRAVE */
+ { 'U', 0x0301, 0xda}, /* LATIN CAPITAL LETTER U WITH ACUTE */
+ { 'U', 0x0302, 0xdb}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+ { 'U', 0x0308, 0xdc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+ { 'Y', 0x0301, 0xdd}, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+ /* omitted: 0xde LATIN CAPITAL LETTER THORN */
+ /* omitted: 0xdf LATIN SMALL LETTER SHARP S */
+ { 'a', 0x0300, 0xe0}, /* LATIN SMALL LETTER A WITH GRAVE */
+ { 'a', 0x0301, 0xe1}, /* LATIN SMALL LETTER A WITH ACUTE */
+ { 'a', 0x0302, 0xe2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+ { 'a', 0x0303, 0xe3}, /* LATIN SMALL LETTER A WITH TILDE */
+ { 'a', 0x0308, 0xe4}, /* LATIN SMALL LETTER A WITH DIAERESIS */
+ { 'a', 0x030a, 0xe5}, /* LATIN SMALL LETTER A WITH RING ABOVE */
+ /* omitted: 0xe6 LATIN SMALL LETTER AE */
+ { 'c', 0x0327, 0xe7}, /* LATIN SMALL LETTER C WITH CEDILLA */
+ { 'e', 0x0300, 0xe8}, /* LATIN SMALL LETTER E WITH GRAVE */
+ { 'e', 0x0301, 0xe9}, /* LATIN SMALL LETTER E WITH ACUTE */
+ { 'e', 0x0302, 0xea}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+ { 'e', 0x0308, 0xeb}, /* LATIN SMALL LETTER E WITH DIAERESIS */
+ { 'i', 0x0300, 0xec}, /* LATIN SMALL LETTER I WITH GRAVE */
+ { 'i', 0x0301, 0xed}, /* LATIN SMALL LETTER I WITH ACUTE */
+ { 'i', 0x0302, 0xee}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+ { 'i', 0x0308, 0xef}, /* LATIN SMALL LETTER I WITH DIAERESIS */
+ /* omitted: 0xf0 LATIN SMALL LETTER ETH */
+ { 'n', 0x0303, 0xf1}, /* LATIN SMALL LETTER N WITH TILDE */
+ { 'o', 0x0300, 0xf2}, /* LATIN SMALL LETTER O WITH GRAVE */
+ { 'o', 0x0301, 0xf3}, /* LATIN SMALL LETTER O WITH ACUTE */
+ { 'o', 0x0302, 0xf4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+ { 'o', 0x0303, 0xf5}, /* LATIN SMALL LETTER O WITH TILDE */
+ { 'o', 0x0308, 0xf6}, /* LATIN SMALL LETTER O WITH DIAERESIS */
+ /* omitted: 0xf7 DIVISION SIGN */
+ /* omitted: 0xf8 LATIN SMALL LETTER O WITH STROKE */
+ { 'u', 0x0300, 0xf9}, /* LATIN SMALL LETTER U WITH GRAVE */
+ { 'u', 0x0301, 0xfa}, /* LATIN SMALL LETTER U WITH ACUTE */
+ { 'u', 0x0302, 0xfb}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+ { 'u', 0x0308, 0xfc}, /* LATIN SMALL LETTER U WITH DIAERESIS */
+ { 'y', 0x0301, 0xfd}, /* LATIN SMALL LETTER Y WITH ACUTE */
+ /* omitted: 0xfe LATIN SMALL LETTER THORN */
+ { 'y', 0x0308, 0xff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */
+
+ { 0, 0, 0}
};
static unsigned long yaz_read_ISO8859_1 (yaz_iconv_t cd, unsigned char *inp,
cd->my_errno = YAZ_ICONV_EINVAL;
return (size_t) -1;
}
- if (inp[1] != 0xbb || inp[2] != 0xbf)
- {
- cd->my_errno = YAZ_ICONV_EILSEQ;
- return (size_t) -1;
- }
- *no_read = 3;
+ if (inp[1] != 0xbb && inp[2] == 0xbf)
+ *no_read = 3;
+ else
+ *no_read = 0;
return 0;
}
else if (inp[0] <= 0xef && inbytesleft >= 3)
{
x = ((inp[0] & 0x0f) << 12) | ((inp[1] & 0x3f) << 6) |
- (inp[1] & 0x3f);
+ (inp[2] & 0x3f);
if (x >= 0x800)
*no_read = 3;
else
#endif
-#if NEW_COMB
static unsigned long yaz_read_marc8_comb (yaz_iconv_t cd, unsigned char *inp,
- size_t inbytesleft, size_t *no_read,
- int *comb);
+ size_t inbytesleft, size_t *no_read,
+ int *comb);
static unsigned long yaz_read_marc8 (yaz_iconv_t cd, unsigned char *inp,
- size_t inbytesleft, size_t *no_read)
+ size_t inbytesleft, size_t *no_read)
{
unsigned long x;
if (cd->comb_offset < cd->comb_size)
{
- *no_read = cd->comb_no_read[cd->comb_offset];
- x = cd->comb_x[cd->comb_offset];
- cd->comb_offset++;
- return x;
+ *no_read = cd->comb_no_read[cd->comb_offset];
+ x = cd->comb_x[cd->comb_offset];
+
+ /* special case for double-diacritic combining characters,
+ INVERTED BREVE and DOUBLE TILDE.
+ We'll increment the no_read counter by 1, since we want to skip over
+ the processing of the closing ligature character
+ */
+ /* this code is no longer necessary.. our handlers code in
+ yaz_marc8_?_conv (generated by charconv.tcl) now returns
+ 0 and no_read=1 when a sequence does not match the input.
+ The SECOND HALFs in codetables.xml produces a non-existant
+ entry in the conversion trie.. Hence when met, the input byte is
+ skipped as it should (in yaz_iconv)
+ */
+#if 0
+ if (x == 0x0361 || x == 0x0360)
+ *no_read += 1;
+#endif
+ cd->comb_offset++;
+ return x;
}
cd->comb_offset = 0;
for (cd->comb_size = 0; cd->comb_size < 8; cd->comb_size++)
{
- int comb = 0;
- x = yaz_read_marc8_comb(cd, inp, inbytesleft, no_read, &comb);
- if (!comb || !x)
- break;
- cd->comb_x[cd->comb_size] = x;
- cd->comb_no_read[cd->comb_size] = *no_read;
- inp += *no_read;
- inbytesleft = inbytesleft - *no_read;
+ int comb = 0;
+ x = yaz_read_marc8_comb(cd, inp, inbytesleft, no_read, &comb);
+ if (!comb || !x)
+ break;
+ cd->comb_x[cd->comb_size] = x;
+ cd->comb_no_read[cd->comb_size] = *no_read;
+ inp += *no_read;
+ inbytesleft = inbytesleft - *no_read;
}
return x;
}
-static unsigned long yaz_read_marc8_comb (yaz_iconv_t cd, unsigned char *inp,
- size_t inbytesleft, size_t *no_read,
- int *comb)
+static unsigned long yaz_read_marc8s(yaz_iconv_t cd, unsigned char *inp,
+ size_t inbytesleft, size_t *no_read)
{
- *no_read = 0;
- while(inbytesleft >= 1 && inp[0] == 27)
- {
- size_t inbytesleft0 = inbytesleft;
- inp++;
- inbytesleft--;
- while(inbytesleft > 0 && strchr("(,$!", *inp))
- {
- inbytesleft--;
- inp++;
- }
- if (inbytesleft <= 0)
- {
- *no_read = 0;
- cd->my_errno = YAZ_ICONV_EINVAL;
- return 0;
- }
- cd->marc8_esc_mode = *inp++;
- inbytesleft--;
- (*no_read) += inbytesleft0 - inbytesleft;
- }
- if (inbytesleft <= 0)
- return 0;
- else
+ unsigned long x = yaz_read_marc8(cd, inp, inbytesleft, no_read);
+ if (x && cd->comb_size == 1)
{
- unsigned long x;
- size_t no_read_sub = 0;
- *comb = 0;
-
- switch(cd->marc8_esc_mode)
- {
- case 'B': /* Basic ASCII */
- case 'E': /* ANSEL */
- case 's': /* ASCII */
- x = yaz_marc8_1_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case 'g': /* Greek */
- x = yaz_marc8_2_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case 'b': /* Subscripts */
- x = yaz_marc8_3_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case 'p': /* Superscripts */
- x = yaz_marc8_4_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case '2': /* Basic Hebrew */
- x = yaz_marc8_5_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case 'N': /* Basic Cyrillic */
- case 'Q': /* Extended Cyrillic */
- x = yaz_marc8_6_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case '3': /* Basic Arabic */
- case '4': /* Extended Arabic */
- x = yaz_marc8_7_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case 'S': /* Greek */
- x = yaz_marc8_8_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- case '1': /* Chinese, Japanese, Korean (EACC) */
- x = yaz_marc8_9_conv(inp, inbytesleft, &no_read_sub, comb);
- break;
- default:
- *no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
- return 0;
- }
- *no_read += no_read_sub;
- return x;
+ /* For MARC8s we try to get a Latin-1 page code out of it */
+ int i;
+ for (i = 0; latin1_comb[i].x1; i++)
+ if (cd->comb_x[0] == latin1_comb[i].x2 && x == latin1_comb[i].x1)
+ {
+ *no_read += cd->comb_no_read[0];
+ cd->comb_size = 0;
+ x = latin1_comb[i].y;
+ break;
+ }
}
+ return x;
}
-#else
-static unsigned long yaz_read_marc8 (yaz_iconv_t cd, unsigned char *inp,
- size_t inbytesleft, size_t *no_read)
+
+static unsigned long yaz_read_marc8_comb(yaz_iconv_t cd, unsigned char *inp,
+ size_t inbytesleft, size_t *no_read,
+ int *comb)
{
- if (cd->marc8_comb_x)
- {
- unsigned long x = cd->marc8_comb_x;
- *no_read = cd->marc8_comb_no_read;
- cd->marc8_comb_x = 0;
- return x;
- }
*no_read = 0;
while(inbytesleft >= 1 && inp[0] == 27)
{
- size_t inbytesleft0 = inbytesleft;
- inp++;
- inbytesleft--;
- while(inbytesleft > 0 && strchr("(,$!", *inp))
- {
- inbytesleft--;
- inp++;
- }
- if (inbytesleft <= 0)
- {
- *no_read = 0;
- cd->my_errno = YAZ_ICONV_EINVAL;
- return 0;
- }
- cd->marc8_esc_mode = *inp++;
- inbytesleft--;
- (*no_read) += inbytesleft0 - inbytesleft;
+ size_t inbytesleft0 = inbytesleft;
+ inp++;
+ inbytesleft--;
+ while(inbytesleft > 0 && strchr("(,$!", *inp))
+ {
+ inbytesleft--;
+ inp++;
+ }
+ if (inbytesleft <= 0)
+ {
+ *no_read = 0;
+ cd->my_errno = YAZ_ICONV_EINVAL;
+ return 0;
+ }
+ cd->marc8_esc_mode = *inp++;
+ inbytesleft--;
+ (*no_read) += inbytesleft0 - inbytesleft;
}
if (inbytesleft <= 0)
- return 0;
+ return 0;
else
{
- unsigned long x;
- int comb = 0;
- size_t no_read_sub = 0;
-
- switch(cd->marc8_esc_mode)
- {
- case 'B': /* Basic ASCII */
- case 'E': /* ANSEL */
- case 's': /* ASCII */
- x = yaz_marc8_1_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case 'g': /* Greek */
- x = yaz_marc8_2_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case 'b': /* Subscripts */
- x = yaz_marc8_3_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case 'p': /* Superscripts */
- x = yaz_marc8_4_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case '2': /* Basic Hebrew */
- x = yaz_marc8_5_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case 'N': /* Basic Cyrillic */
- case 'Q': /* Extended Cyrillic */
- x = yaz_marc8_6_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case '3': /* Basic Arabic */
- case '4': /* Extended Arabic */
- x = yaz_marc8_7_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case 'S': /* Greek */
- x = yaz_marc8_8_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- case '1': /* Chinese, Japanese, Korean (EACC) */
- x = yaz_marc8_9_conv(inp, inbytesleft, &no_read_sub, &comb);
- break;
- default:
- *no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
- return 0;
- }
-#if 0
- printf ("esc mode=%c x=%04lX comb=%d\n", cd->marc8_esc_mode, x, comb);
-#endif
- *no_read += no_read_sub;
-
- if (comb && cd->marc8_comb_x == 0)
- {
- size_t tmp_read = 0;
- unsigned long next_x;
-
- /* read next char .. */
- next_x = yaz_read_marc8(cd, inp + *no_read,
- inbytesleft - *no_read, &tmp_read);
- /* save this x for later .. */
- cd->marc8_comb_x = x;
- /* save next read for later .. */
- cd->marc8_comb_no_read = tmp_read;
- /* return next x - thereby swap */
- x = next_x;
- }
- return x;
+ unsigned long x;
+ size_t no_read_sub = 0;
+ *comb = 0;
+
+ switch(cd->marc8_esc_mode)
+ {
+ case 'B': /* Basic ASCII */
+ case 'E': /* ANSEL */
+ case 's': /* ASCII */
+ x = yaz_marc8_1_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case 'g': /* Greek */
+ x = yaz_marc8_2_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case 'b': /* Subscripts */
+ x = yaz_marc8_3_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case 'p': /* Superscripts */
+ x = yaz_marc8_4_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case '2': /* Basic Hebrew */
+ x = yaz_marc8_5_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case 'N': /* Basic Cyrillic */
+ case 'Q': /* Extended Cyrillic */
+ x = yaz_marc8_6_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case '3': /* Basic Arabic */
+ case '4': /* Extended Arabic */
+ x = yaz_marc8_7_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case 'S': /* Greek */
+ x = yaz_marc8_8_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ case '1': /* Chinese, Japanese, Korean (EACC) */
+ x = yaz_marc8_9_conv(inp, inbytesleft, &no_read_sub, comb);
+ break;
+ default:
+ *no_read = 0;
+ cd->my_errno = YAZ_ICONV_EILSEQ;
+ return 0;
+ }
+ *no_read += no_read_sub;
+ return x;
}
}
-#endif
static size_t yaz_write_UTF8 (yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
- int last)
+ int last)
{
unsigned char *outp = (unsigned char *) *outbuf;
+
if (x <= 0x7f && *outbytesleft >= 1)
{
*outp++ = (unsigned char) x;
static size_t yaz_write_ISO8859_1 (yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
- int last)
+ int last)
{
/* list of two char unicode sequence that, when combined, are
equivalent to single unicode chars that can be represented in
but since MARC-8 to UTF-8 generates these composed sequence
we get a better chance of a successful MARC-8 -> ISO-8859-1
conversion */
- static struct {
- unsigned long x1, x2;
- unsigned y;
- } comb[] = {
- { 'A', 0x0300, 0xc0}, /* LATIN CAPITAL LETTER A WITH GRAVE */
- { 'A', 0x0301, 0xc1}, /* LATIN CAPITAL LETTER A WITH ACUTE */
- { 'A', 0x0302, 0xc2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
- { 'A', 0x0303, 0xc3}, /* LATIN CAPITAL LETTER A WITH TILDE */
- { 'A', 0x0308, 0xc4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
- { 'A', 0x030a, 0xc5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
- /* no need for 0xc6 LATIN CAPITAL LETTER AE */
- { 'C', 0x0327, 0xc7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */
- { 'E', 0x0300, 0xc8}, /* LATIN CAPITAL LETTER E WITH GRAVE */
- { 'E', 0x0301, 0xc9}, /* LATIN CAPITAL LETTER E WITH ACUTE */
- { 'E', 0x0302, 0xca}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
- { 'E', 0x0308, 0xcb}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
- { 'I', 0x0300, 0xcc}, /* LATIN CAPITAL LETTER I WITH GRAVE */
- { 'I', 0x0301, 0xcd}, /* LATIN CAPITAL LETTER I WITH ACUTE */
- { 'I', 0x0302, 0xce}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
- { 'I', 0x0308, 0xcf}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
- { 'N', 0x0303, 0xd1}, /* LATIN CAPITAL LETTER N WITH TILDE */
- { 'O', 0x0300, 0xd2}, /* LATIN CAPITAL LETTER O WITH GRAVE */
- { 'O', 0x0301, 0xd3}, /* LATIN CAPITAL LETTER O WITH ACUTE */
- { 'O', 0x0302, 0xd4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
- { 'O', 0x0303, 0xd5}, /* LATIN CAPITAL LETTER O WITH TILDE */
- { 'O', 0x0308, 0xd6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
- /* omitted: 0xd7 MULTIPLICATION SIGN */
- /* omitted: 0xd8 LATIN CAPITAL LETTER O WITH STROKE */
- { 'U', 0x0300, 0xd9}, /* LATIN CAPITAL LETTER U WITH GRAVE */
- { 'U', 0x0301, 0xda}, /* LATIN CAPITAL LETTER U WITH ACUTE */
- { 'U', 0x0302, 0xdb}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
- { 'U', 0x0308, 0xdc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
- { 'Y', 0x0301, 0xdd}, /* LATIN CAPITAL LETTER Y WITH ACUTE */
- /* omitted: 0xde LATIN CAPITAL LETTER THORN */
- /* omitted: 0xdf LATIN SMALL LETTER SHARP S */
- { 'a', 0x0300, 0xe0}, /* LATIN SMALL LETTER A WITH GRAVE */
- { 'a', 0x0301, 0xe1}, /* LATIN SMALL LETTER A WITH ACUTE */
- { 'a', 0x0302, 0xe2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
- { 'a', 0x0303, 0xe3}, /* LATIN SMALL LETTER A WITH TILDE */
- { 'a', 0x0308, 0xe4}, /* LATIN SMALL LETTER A WITH DIAERESIS */
- { 'a', 0x030a, 0xe5}, /* LATIN SMALL LETTER A WITH RING ABOVE */
- /* omitted: 0xe6 LATIN SMALL LETTER AE */
- { 'c', 0x0327, 0xe7}, /* LATIN SMALL LETTER C WITH CEDILLA */
- { 'e', 0x0300, 0xe8}, /* LATIN SMALL LETTER E WITH GRAVE */
- { 'e', 0x0301, 0xe9}, /* LATIN SMALL LETTER E WITH ACUTE */
- { 'e', 0x0302, 0xea}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
- { 'e', 0x0308, 0xeb}, /* LATIN SMALL LETTER E WITH DIAERESIS */
- { 'i', 0x0300, 0xec}, /* LATIN SMALL LETTER I WITH GRAVE */
- { 'i', 0x0301, 0xed}, /* LATIN SMALL LETTER I WITH ACUTE */
- { 'i', 0x0302, 0xee}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
- { 'i', 0x0308, 0xef}, /* LATIN SMALL LETTER I WITH DIAERESIS */
- /* omitted: 0xf0 LATIN SMALL LETTER ETH */
- { 'n', 0x0303, 0xf1}, /* LATIN SMALL LETTER N WITH TILDE */
- { 'o', 0x0300, 0xf2}, /* LATIN SMALL LETTER O WITH GRAVE */
- { 'o', 0x0301, 0xf3}, /* LATIN SMALL LETTER O WITH ACUTE */
- { 'o', 0x0302, 0xf4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
- { 'o', 0x0303, 0xf5}, /* LATIN SMALL LETTER O WITH TILDE */
- { 'o', 0x0308, 0xf6}, /* LATIN SMALL LETTER O WITH DIAERESIS */
- /* omitted: 0xf7 DIVISION SIGN */
- /* omitted: 0xf8 LATIN SMALL LETTER O WITH STROKE */
- { 'u', 0x0300, 0xf9}, /* LATIN SMALL LETTER U WITH GRAVE */
- { 'u', 0x0301, 0xfa}, /* LATIN SMALL LETTER U WITH ACUTE */
- { 'u', 0x0302, 0xfb}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
- { 'u', 0x0308, 0xfc}, /* LATIN SMALL LETTER U WITH DIAERESIS */
- { 'y', 0x0301, 0xfd}, /* LATIN SMALL LETTER Y WITH ACUTE */
- /* omitted: 0xfe LATIN SMALL LETTER THORN */
- { 'y', 0x0308, 0xff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */
-
- { 0, 0, 0}
- };
unsigned char *outp = (unsigned char *) *outbuf;
- if (!last && x > 32 && x < 127 && cd->compose_char == 0)
+ if (cd->compose_char)
{
- cd->compose_char = x;
- return 0;
- }
- else if (cd->compose_char)
- {
- int i;
- for (i = 0; comb[i].x1; i++)
- if (cd->compose_char == comb[i].x1 && x == comb[i].x2)
- {
- x = comb[i].y;
- break;
- }
- if (!comb[i].x1)
- { /* not found */
- if (*outbytesleft >= 1)
+ int i;
+ for (i = 0; latin1_comb[i].x1; i++)
+ if (cd->compose_char == latin1_comb[i].x1 && x == latin1_comb[i].x2)
{
- *outp++ = (unsigned char) cd->compose_char;
- (*outbytesleft)--;
- *outbuf = (char *) outp;
- if (!last && x > 32 && x < 127)
- {
- cd->compose_char = x;
- return 0;
- }
- }
- else
- {
- cd->my_errno = YAZ_ICONV_E2BIG;
- return (size_t)(-1);
+ x = latin1_comb[i].y;
+ break;
}
- }
- /* compose_char and old x combined to one new char: x */
- cd->compose_char = 0;
+ if (*outbytesleft < 1)
+ { /* no room. Retain compose_char and bail out */
+ cd->my_errno = YAZ_ICONV_E2BIG;
+ return (size_t)(-1);
+ }
+ if (!latin1_comb[i].x1)
+ { /* not found. Just write compose_char */
+ *outp++ = (unsigned char) cd->compose_char;
+ (*outbytesleft)--;
+ *outbuf = (char *) outp;
+ }
+ /* compose_char used so reset it. x now holds current char */
+ cd->compose_char = 0;
}
- if (x > 255 || x < 1)
+
+ if (!last && x > 32 && x < 127 && cd->compose_char == 0)
{
- cd->my_errno = YAZ_ICONV_EILSEQ;
- return (size_t) -1;
+ cd->compose_char = x;
+ return 0;
}
- else if (*outbytesleft >= 1)
+ else if (x > 255 || x < 1)
{
- *outp++ = (unsigned char) x;
- (*outbytesleft)--;
+ cd->my_errno = YAZ_ICONV_EILSEQ;
+ return (size_t) -1;
}
- else
+ else if (*outbytesleft < 1)
{
cd->my_errno = YAZ_ICONV_E2BIG;
return (size_t)(-1);
}
+ *outp++ = (unsigned char) x;
+ (*outbytesleft)--;
*outbuf = (char *) outp;
return 0;
}
static size_t yaz_write_UCS4 (yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
- int last)
+ int last)
{
unsigned char *outp = (unsigned char *) *outbuf;
if (*outbytesleft >= 4)
static size_t yaz_write_UCS4LE (yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
- int last)
+ int last)
{
unsigned char *outp = (unsigned char *) *outbuf;
if (*outbytesleft >= 4)
return 0;
}
+static unsigned long lookup_marc8(yaz_iconv_t cd,
+ unsigned long x, int *comb,
+ const char **page_chr)
+{
+ char utf8_buf[7];
+ char *utf8_outbuf = utf8_buf;
+ size_t utf8_outbytesleft = sizeof(utf8_buf)-1, r;
+
+ r = yaz_write_UTF8(cd, x, &utf8_outbuf, &utf8_outbytesleft, 0);
+ if (r == (size_t)(-1))
+ {
+ cd->my_errno = YAZ_ICONV_EILSEQ;
+ return 0;
+ }
+ else
+ {
+ unsigned char *inp;
+ size_t inbytesleft, no_read_sub = 0;
+ unsigned long x;
+
+ *utf8_outbuf = '\0';
+ inp = (unsigned char *) utf8_buf;
+ inbytesleft = strlen(utf8_buf);
+
+ x = yaz_marc8r_1_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033(B";
+ return x;
+ }
+ x = yaz_marc8r_2_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033g";
+ return x;
+ }
+ x = yaz_marc8r_3_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033b";
+ return x;
+ }
+ x = yaz_marc8r_4_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033p";
+ return x;
+ }
+ x = yaz_marc8r_5_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033(2";
+ return x;
+ }
+ x = yaz_marc8r_6_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033(N";
+ return x;
+ }
+ x = yaz_marc8r_7_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033(3";
+ return x;
+ }
+ x = yaz_marc8r_8_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033(S";
+ return x;
+ }
+ x = yaz_marc8r_9_conv(inp, inbytesleft, &no_read_sub, comb);
+ if (x)
+ {
+ *page_chr = "\033(1";
+ return x;
+ }
+ cd->my_errno = YAZ_ICONV_EILSEQ;
+ return x;
+ }
+}
+
+static size_t flush_combos(yaz_iconv_t cd,
+ char **outbuf, size_t *outbytesleft)
+{
+ unsigned long y = cd->write_marc8_last;
+ unsigned char byte, second_half = 0;
+ char out_buf[10];
+ size_t i, out_no = 0;
+
+ if (!y)
+ return 0;
+
+ byte = (unsigned char )((y>>16) & 0xff);
+ if (byte)
+ out_buf[out_no++] = byte;
+ byte = (unsigned char)((y>>8) & 0xff);
+ if (byte)
+ out_buf[out_no++] = byte;
+ byte = (unsigned char )(y & 0xff);
+ if (byte)
+ out_buf[out_no++] = byte;
+
+ if (out_no + cd->write_marc8_comb_no + 1 > *outbytesleft)
+ {
+ cd->my_errno = YAZ_ICONV_E2BIG;
+ return (size_t) (-1);
+ }
+
+ for (i = 0; i < cd->write_marc8_comb_no; i++)
+ {
+ /* all MARC-8 combined characters are simple bytes */
+ byte = (unsigned char )(cd->write_marc8_comb_ch[i]);
+ if (byte == 0xEB)
+ second_half = 0xEC;
+ else if (byte == 0xFA)
+ second_half = 0xFB;
+
+ *(*outbuf)++ = byte;
+ (*outbytesleft)--;
+ }
+ memcpy(*outbuf, out_buf, out_no);
+ *outbuf += out_no;
+ (*outbytesleft) -= out_no;
+ if (second_half)
+ {
+ *(*outbuf)++ = second_half;
+ (*outbytesleft)--;
+ }
+
+ cd->write_marc8_last = 0;
+ cd->write_marc8_comb_no = 0;
+ return 0;
+}
+
+static size_t yaz_write_marc8_2(yaz_iconv_t cd, unsigned long x,
+ char **outbuf, size_t *outbytesleft,
+ int last)
+{
+ int comb = 0;
+ const char *page_chr = 0;
+ unsigned long y = lookup_marc8(cd, x, &comb, &page_chr);
+
+ if (!y)
+ return (size_t) (-1);
+
+ if (comb)
+ {
+ if (cd->write_marc8_comb_no < 6)
+ cd->write_marc8_comb_ch[cd->write_marc8_comb_no++] = y;
+ }
+ else
+ {
+ size_t r = flush_combos(cd, outbuf, outbytesleft);
+ if (r)
+ return r;
+ if (strcmp(page_chr, cd->write_marc8_page_chr))
+ {
+ size_t plen = strlen(page_chr);
+
+ if (*outbytesleft < plen)
+ {
+ cd->my_errno = YAZ_ICONV_E2BIG;
+ return (size_t) (-1);
+ }
+ memcpy(*outbuf, page_chr, plen);
+ (*outbuf) += plen;
+ (*outbytesleft) -= plen;
+ cd->write_marc8_page_chr = page_chr;
+ }
+ cd->write_marc8_last = y;
+ }
+ if (last)
+ {
+ size_t r = flush_combos(cd, outbuf, outbytesleft);
+ if (r)
+ {
+ if (comb)
+ cd->write_marc8_comb_no--;
+ else
+ cd->write_marc8_last = 0;
+ return r;
+ }
+ }
+ return 0;
+}
+
+static size_t yaz_write_marc8(yaz_iconv_t cd, unsigned long x,
+ char **outbuf, size_t *outbytesleft,
+ int last)
+{
+ int i;
+ for (i = 0; latin1_comb[i].x1; i++)
+ {
+ if (x == latin1_comb[i].y)
+ {
+ size_t r ;
+ /* save the output pointers .. */
+ char *outbuf0 = *outbuf;
+ size_t outbytesleft0 = *outbytesleft;
+ int last_ch = cd->write_marc8_last;
+
+ r = yaz_write_marc8_2(cd, latin1_comb[i].x1,
+ outbuf, outbytesleft, 0);
+ if (r)
+ return r;
+ r = yaz_write_marc8_2(cd, latin1_comb[i].x2,
+ outbuf, outbytesleft, last);
+ if (r && cd->my_errno == YAZ_ICONV_E2BIG)
+ {
+ /* not enough room. reset output to original values */
+ *outbuf = outbuf0;
+ *outbytesleft = outbytesleft0;
+ cd->write_marc8_last = last_ch;
+ }
+ return r;
+ }
+ }
+ return yaz_write_marc8_2(cd, x, outbuf, outbytesleft, last);
+}
+
+
#if HAVE_WCHAR_H
static size_t yaz_write_wchar_t (yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
- int last)
+ int last)
{
unsigned char *outp = (unsigned char *) *outbuf;
cd->init_handle = 0;
cd->my_errno = YAZ_ICONV_UNKNOWN;
cd->marc8_esc_mode = 'B';
-#if NEW_COMB
cd->comb_offset = cd->comb_size = 0;
-#else
- cd->marc8_comb_x = 0;
-#endif
cd->compose_char = 0;
+ cd->write_marc8_comb_no = 0;
+ cd->write_marc8_last = 0;
+ cd->write_marc8_page_chr = "\033(B";
+
/* a useful hack: if fromcode has leading @,
the library not use YAZ's own conversions .. */
if (fromcode[0] == '@')
cd->read_handle = yaz_read_UCS4LE;
else if (!yaz_matchstr(fromcode, "MARC8"))
cd->read_handle = yaz_read_marc8;
+ else if (!yaz_matchstr(fromcode, "MARC8s"))
+ cd->read_handle = yaz_read_marc8s;
#if HAVE_WCHAR_H
else if (!yaz_matchstr(fromcode, "WCHAR_T"))
cd->read_handle = yaz_read_wchar_t;
cd->write_handle = yaz_write_UCS4;
else if (!yaz_matchstr(tocode, "UCS4LE"))
cd->write_handle = yaz_write_UCS4LE;
+ else if (!yaz_matchstr(tocode, "MARC8"))
+ cd->write_handle = yaz_write_marc8;
+ else if (!yaz_matchstr(tocode, "MARC8s"))
+ cd->write_handle = yaz_write_marc8;
#if HAVE_WCHAR_H
else if (!yaz_matchstr(tocode, "WCHAR_T"))
cd->write_handle = yaz_write_wchar_t;
{
char *inbuf0;
size_t r = 0;
+
#if HAVE_ICONV_H
if (cd->iconv_cd)
{
*inbuf += no_read;
}
cd->init_flag = 0;
- cd->unget_x = 0;
- cd->no_read_x = 0;
+ cd->unget_x = 0;
+ cd->no_read_x = 0;
}
while (1)
{
r = *inbuf - inbuf0;
break;
}
- if (!cd->unget_x)
- {
- x = (cd->read_handle)(cd, (unsigned char *) *inbuf, *inbytesleft,
- &no_read);
- if (no_read == 0)
- {
- r = (size_t)(-1);
- break;
- }
- }
- else
- {
- x = cd->unget_x;
- no_read = cd->no_read_x;
- }
- if (x)
- {
- r = (cd->write_handle)(cd, x, outbuf, outbytesleft,
- (*inbytesleft - no_read) == 0 ? 1 : 0);
- if (r)
- {
- /* unable to write it. save it because read_handle cannot
- rewind .. */
- cd->unget_x = x;
- cd->no_read_x = no_read;
- break;
- }
- cd->unget_x = 0;
- }
+ if (!cd->unget_x)
+ {
+ x = (cd->read_handle)(cd, (unsigned char *) *inbuf, *inbytesleft,
+ &no_read);
+ if (no_read == 0)
+ {
+ r = (size_t)(-1);
+ break;
+ }
+ }
+ else
+ {
+ x = cd->unget_x;
+ no_read = cd->no_read_x;
+ }
+ if (x)
+ {
+ r = (cd->write_handle)(cd, x, outbuf, outbytesleft,
+ (*inbytesleft - no_read) == 0 ? 1 : 0);
+ if (r)
+ {
+ /* unable to write it. save it because read_handle cannot
+ rewind .. */
+ if (cd->my_errno == YAZ_ICONV_E2BIG)
+ {
+ cd->unget_x = x;
+ cd->no_read_x = no_read;
+ break;
+ }
+ }
+ cd->unget_x = 0;
+ }
*inbytesleft -= no_read;
(*inbuf) += no_read;
}
return 0;
}
-
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff