X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsiconv.c;h=8557bbd301ecc4dafb6cc6c43a8b38ebae06bbab;hb=1b9e01d65c2e5a8b805c132bc1a043dc4d2c3ec5;hp=378bd75356a9f66f9410c83f0cd7f0d101b1bc6d;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;p=yaz-moved-to-github.git diff --git a/src/siconv.c b/src/siconv.c index 378bd75..8557bbd 100644 --- a/src/siconv.c +++ b/src/siconv.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2008, Index Data ApS * See the file LICENSE for details. * - * $Id: siconv.c,v 1.13 2005-06-25 15:46:05 adam Exp $ + * $Id: siconv.c,v 1.50 2008-03-12 08:53:28 adam Exp $ */ /** * \file siconv.c @@ -11,13 +11,17 @@ * 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. + * + * MARC-8 reference: + * http://www.loc.gov/marc/specifications/speccharmarc8.html */ #if HAVE_CONFIG_H #include #endif +#include #include #include #include @@ -29,28 +33,61 @@ #include #endif -#include - -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 +#include +#include +#include "iconv-p.h" + + +unsigned long yaz_marc8_42_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_45_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_67_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_62_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_70_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_32_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_4E_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_51_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_33_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_34_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_53_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8_31_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); + + +unsigned long yaz_marc8r_42_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_45_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_67_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_62_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_70_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_32_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_4E_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_51_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_33_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_34_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_53_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); +unsigned long yaz_marc8r_31_conv(unsigned char *inp, size_t inbytesleft, + size_t *no_read, int *combining); struct yaz_iconv_struct { int my_errno; @@ -60,175 +97,117 @@ struct yaz_iconv_struct { unsigned long (*read_handle)(yaz_iconv_t cd, unsigned char *inbuf, 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 marc8_esc_mode; -#if NEW_COMB + char **outbuf, size_t *outbytesleft); + size_t (*flush_handle)(yaz_iconv_t cd, + char **outbuf, size_t *outbytesleft); + int g0_mode; + int g1_mode; + 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 write_marc8_second_half_char; + unsigned long write_marc8_last; + const char *write_marc8_lpage; + const char *write_marc8_g0; + const char *write_marc8_g1; }; -static unsigned long yaz_read_ISO8859_1 (yaz_iconv_t cd, unsigned char *inp, - size_t inbytesleft, size_t *no_read) -{ - unsigned long x = inp[0]; - *no_read = 1; - return x; -} -static size_t yaz_init_UTF8 (yaz_iconv_t cd, unsigned char *inp, - size_t inbytesleft, size_t *no_read) -{ - if (inp[0] != 0xef) - { - *no_read = 0; - return 0; - } - if (inbytesleft < 3) - { - 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; - return 0; -} +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_UTF8 (yaz_iconv_t cd, unsigned char *inp, - size_t inbytesleft, size_t *no_read) -{ - unsigned long x = 0; +#define ESC "\033" - if (inp[0] <= 0x7f) - { - x = inp[0]; - *no_read = 1; - } - else if (inp[0] <= 0xbf || inp[0] >= 0xfe) - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EILSEQ; - } - else if (inp[0] <= 0xdf && inbytesleft >= 2) - { - x = ((inp[0] & 0x1f) << 6) | (inp[1] & 0x3f); - if (x >= 0x80) - *no_read = 2; - else - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EILSEQ; - } - } - else if (inp[0] <= 0xef && inbytesleft >= 3) - { - x = ((inp[0] & 0x0f) << 12) | ((inp[1] & 0x3f) << 6) | - (inp[1] & 0x3f); - if (x >= 0x800) - *no_read = 3; - else - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EILSEQ; - } - } - else if (inp[0] <= 0xf7 && inbytesleft >= 4) - { - x = ((inp[0] & 0x07) << 18) | ((inp[1] & 0x3f) << 12) | - ((inp[2] & 0x3f) << 6) | (inp[3] & 0x3f); - if (x >= 0x10000) - *no_read = 4; - else - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EILSEQ; - } - } - else if (inp[0] <= 0xfb && inbytesleft >= 5) - { - x = ((inp[0] & 0x03) << 24) | ((inp[1] & 0x3f) << 18) | - ((inp[2] & 0x3f) << 12) | ((inp[3] & 0x3f) << 6) | - (inp[4] & 0x3f); - if (x >= 0x200000) - *no_read = 5; - else - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EILSEQ; - } - } - else if (inp[0] <= 0xfd && inbytesleft >= 6) - { - x = ((inp[0] & 0x01) << 30) | ((inp[1] & 0x3f) << 24) | - ((inp[2] & 0x3f) << 18) | ((inp[3] & 0x3f) << 12) | - ((inp[4] & 0x3f) << 6) | (inp[5] & 0x3f); - if (x >= 0x4000000) - *no_read = 6; - else - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EILSEQ; - } - } - else - { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EINVAL; - } - return x; -} +static size_t yaz_write_marc8_page_chr(yaz_iconv_t cd, + char **outbuf, size_t *outbytesleft, + const char *page_chr); -static unsigned long yaz_read_UCS4 (yaz_iconv_t cd, unsigned char *inp, - size_t inbytesleft, size_t *no_read) +static unsigned long yaz_read_ISO8859_1(yaz_iconv_t cd, unsigned char *inp, + size_t inbytesleft, size_t *no_read) { - unsigned long x = 0; - - if (inbytesleft < 4) - { - cd->my_errno = YAZ_ICONV_EINVAL; /* incomplete input */ - *no_read = 0; - } - else - { - x = (inp[0]<<24) | (inp[1]<<16) | (inp[2]<<8) | inp[3]; - *no_read = 4; - } + unsigned long x = inp[0]; + *no_read = 1; return x; } -static unsigned long yaz_read_UCS4LE (yaz_iconv_t cd, unsigned char *inp, - size_t inbytesleft, size_t *no_read) -{ - unsigned long x = 0; - - if (inbytesleft < 4) - { - cd->my_errno = YAZ_ICONV_EINVAL; /* incomplete input */ - *no_read = 0; - } - else - { - x = (inp[3]<<24) | (inp[2]<<16) | (inp[1]<<8) | inp[0]; - *no_read = 4; - } - return x; -} + #if HAVE_WCHAR_H static unsigned long yaz_read_wchar_t (yaz_iconv_t cd, unsigned char *inp, @@ -253,7 +232,6 @@ static unsigned long yaz_read_wchar_t (yaz_iconv_t cd, unsigned char *inp, #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); @@ -266,6 +244,23 @@ static unsigned long yaz_read_marc8 (yaz_iconv_t cd, unsigned char *inp, { *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; } @@ -274,6 +269,14 @@ static unsigned long yaz_read_marc8 (yaz_iconv_t cd, unsigned char *inp, for (cd->comb_size = 0; cd->comb_size < 8; cd->comb_size++) { int comb = 0; + + if (inbytesleft == 0 && cd->comb_size) + { + cd->my_errno = YAZ_ICONV_EINVAL; + x = 0; + *no_read = 0; + break; + } x = yaz_read_marc8_comb(cd, inp, inbytesleft, no_read, &comb); if (!comb || !x) break; @@ -285,247 +288,144 @@ static unsigned long yaz_read_marc8 (yaz_iconv_t cd, unsigned char *inp, 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) +{ + unsigned long x = yaz_read_marc8(cd, inp, inbytesleft, no_read); + if (x && cd->comb_size == 1) + { + /* 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; +} + +static unsigned long yaz_read_marc8_comb(yaz_iconv_t cd, unsigned char *inp, + size_t inbytesleft, size_t *no_read, + int *comb) { *no_read = 0; - while(inbytesleft >= 1 && inp[0] == 27) + while (inbytesleft > 0 && *inp == 27) { + int *modep = &cd->g0_mode; size_t inbytesleft0 = inbytesleft; - inp++; + inbytesleft--; - while(inbytesleft > 0 && strchr("(,$!", *inp)) + inp++; + if (inbytesleft == 0) + goto incomplete; + if (*inp == '$') /* set with multiple bytes */ { inbytesleft--; inp++; } - if (inbytesleft <= 0) + if (inbytesleft == 0) + goto incomplete; + if (*inp == '(' || *inp == ',') /* G0 */ { - *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; - 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; + inbytesleft--; + inp++; } - *no_read += no_read_sub; - return x; - } -} -#else -static unsigned long yaz_read_marc8 (yaz_iconv_t cd, unsigned char *inp, - size_t inbytesleft, size_t *no_read) -{ - 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)) + else if (*inp == ')' || *inp == '-') /* G1 */ { inbytesleft--; inp++; + modep = &cd->g1_mode; } - if (inbytesleft <= 0) + if (inbytesleft == 0) + goto incomplete; + if (*inp == '!') /* ANSEL is a special case */ { - *no_read = 0; - cd->my_errno = YAZ_ICONV_EINVAL; - return 0; + inbytesleft--; + inp++; } - cd->marc8_esc_mode = *inp++; + if (inbytesleft == 0) + goto incomplete; + *modep = *inp++; /* Final character */ inbytesleft--; + (*no_read) += inbytesleft0 - inbytesleft; } - if (inbytesleft <= 0) + if (inbytesleft == 0) return 0; + else if (*inp == ' ') + { + *no_read += 1; + return ' '; + } else { unsigned long x; - int comb = 0; size_t no_read_sub = 0; + int mode = *inp < 128 ? cd->g0_mode : cd->g1_mode; + *comb = 0; - switch(cd->marc8_esc_mode) + switch(mode) { case 'B': /* Basic ASCII */ - case 'E': /* ANSEL */ case 's': /* ASCII */ - x = yaz_marc8_1_conv(inp, inbytesleft, &no_read_sub, &comb); + case 'E': /* ANSEL */ + x = yaz_marc8_42_conv(inp, inbytesleft, &no_read_sub, comb); + if (!x) + { + no_read_sub = 0; + x = yaz_marc8_45_conv(inp, inbytesleft, &no_read_sub, comb); + } break; case 'g': /* Greek */ - x = yaz_marc8_2_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_67_conv(inp, inbytesleft, &no_read_sub, comb); break; case 'b': /* Subscripts */ - x = yaz_marc8_3_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_62_conv(inp, inbytesleft, &no_read_sub, comb); break; case 'p': /* Superscripts */ - x = yaz_marc8_4_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_70_conv(inp, inbytesleft, &no_read_sub, comb); break; case '2': /* Basic Hebrew */ - x = yaz_marc8_5_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_32_conv(inp, inbytesleft, &no_read_sub, comb); break; case 'N': /* Basic Cyrillic */ + x = yaz_marc8_4E_conv(inp, inbytesleft, &no_read_sub, comb); + break; case 'Q': /* Extended Cyrillic */ - x = yaz_marc8_6_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_51_conv(inp, inbytesleft, &no_read_sub, comb); break; case '3': /* Basic Arabic */ + x = yaz_marc8_33_conv(inp, inbytesleft, &no_read_sub, comb); + break; case '4': /* Extended Arabic */ - x = yaz_marc8_7_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_34_conv(inp, inbytesleft, &no_read_sub, comb); break; case 'S': /* Greek */ - x = yaz_marc8_8_conv(inp, inbytesleft, &no_read_sub, &comb); + x = yaz_marc8_53_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); + x = yaz_marc8_31_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; } -} -#endif - -static size_t yaz_write_UTF8 (yaz_iconv_t cd, unsigned long x, - char **outbuf, size_t *outbytesleft, - int last) -{ - unsigned char *outp = (unsigned char *) *outbuf; - if (x <= 0x7f && *outbytesleft >= 1) - { - *outp++ = (unsigned char) x; - (*outbytesleft)--; - } - else if (x <= 0x7ff && *outbytesleft >= 2) - { - *outp++ = (unsigned char) ((x >> 6) | 0xc0); - *outp++ = (unsigned char) ((x & 0x3f) | 0x80); - (*outbytesleft) -= 2; - } - else if (x <= 0xffff && *outbytesleft >= 3) - { - *outp++ = (unsigned char) ((x >> 12) | 0xe0); - *outp++ = (unsigned char) (((x >> 6) & 0x3f) | 0x80); - *outp++ = (unsigned char) ((x & 0x3f) | 0x80); - (*outbytesleft) -= 3; - } - else if (x <= 0x1fffff && *outbytesleft >= 4) - { - *outp++ = (unsigned char) ((x >> 18) | 0xf0); - *outp++ = (unsigned char) (((x >> 12) & 0x3f) | 0x80); - *outp++ = (unsigned char) (((x >> 6) & 0x3f) | 0x80); - *outp++ = (unsigned char) ((x & 0x3f) | 0x80); - (*outbytesleft) -= 4; - } - else if (x <= 0x3ffffff && *outbytesleft >= 5) - { - *outp++ = (unsigned char) ((x >> 24) | 0xf8); - *outp++ = (unsigned char) (((x >> 18) & 0x3f) | 0x80); - *outp++ = (unsigned char) (((x >> 12) & 0x3f) | 0x80); - *outp++ = (unsigned char) (((x >> 6) & 0x3f) | 0x80); - *outp++ = (unsigned char) ((x & 0x3f) | 0x80); - (*outbytesleft) -= 5; - } - else if (*outbytesleft >= 6) - { - *outp++ = (unsigned char) ((x >> 30) | 0xfc); - *outp++ = (unsigned char) (((x >> 24) & 0x3f) | 0x80); - *outp++ = (unsigned char) (((x >> 18) & 0x3f) | 0x80); - *outp++ = (unsigned char) (((x >> 12) & 0x3f) | 0x80); - *outp++ = (unsigned char) (((x >> 6) & 0x3f) | 0x80); - *outp++ = (unsigned char) ((x & 0x3f) | 0x80); - (*outbytesleft) -= 6; - } - else - { - cd->my_errno = YAZ_ICONV_E2BIG; /* not room for output */ - return (size_t)(-1); - } - *outbuf = (char *) outp; +incomplete: + *no_read = 0; + cd->my_errno = YAZ_ICONV_EINVAL; return 0; } - -static size_t yaz_write_ISO8859_1 (yaz_iconv_t cd, unsigned long x, - char **outbuf, size_t *outbytesleft, - int last) +static size_t yaz_write_ISO8859_1(yaz_iconv_t cd, unsigned long x, + char **outbuf, size_t *outbytesleft) { /* list of two char unicode sequence that, when combined, are equivalent to single unicode chars that can be represented in @@ -534,182 +434,362 @@ static size_t yaz_write_ISO8859_1 (yaz_iconv_t cd, unsigned long x, 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) - { - cd->compose_char = x; - return 0; - } - else if (cd->compose_char) + if (cd->compose_char) { int i; - for (i = 0; comb[i].x1; i++) - if (cd->compose_char == comb[i].x1 && x == comb[i].x2) + for (i = 0; latin1_comb[i].x1; i++) + if (cd->compose_char == latin1_comb[i].x1 && x == latin1_comb[i].x2) { - x = comb[i].y; + x = latin1_comb[i].y; break; } - if (!comb[i].x1) - { /* not found */ - if (*outbytesleft >= 1) - { - *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); - } + if (*outbytesleft < 1) + { /* no room. Retain compose_char and bail out */ + cd->my_errno = YAZ_ICONV_E2BIG; + return (size_t)(-1); } - /* compose_char and old x combined to one new char: x */ + 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 (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_flush_ISO8859_1(yaz_iconv_t cd, + char **outbuf, size_t *outbytesleft) +{ + if (cd->compose_char) + { + unsigned char *outp = (unsigned char *) *outbuf; + if (*outbytesleft < 1) + { + cd->my_errno = YAZ_ICONV_E2BIG; + return (size_t)(-1); + } + *outp++ = (unsigned char) cd->compose_char; + (*outbytesleft)--; + *outbuf = (char *) outp; + cd->compose_char = 0; + } + return 0; +} -static size_t yaz_write_UCS4 (yaz_iconv_t cd, unsigned long x, - char **outbuf, size_t *outbytesleft, - int last) +static unsigned long lookup_marc8(yaz_iconv_t cd, + unsigned long x, int *comb, + const char **page_chr) { - unsigned char *outp = (unsigned char *) *outbuf; - if (*outbytesleft >= 4) + 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); + if (r == (size_t)(-1)) { - *outp++ = (unsigned char) (x>>24); - *outp++ = (unsigned char) (x>>16); - *outp++ = (unsigned char) (x>>8); - *outp++ = (unsigned char) x; - (*outbytesleft) -= 4; + 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_42_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(B"; + return x; + } + x = yaz_marc8r_45_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(B"; + return x; + } + x = yaz_marc8r_62_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "b"; + return x; + } + x = yaz_marc8r_70_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "p"; + return x; + } + x = yaz_marc8r_32_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(2"; + return x; + } + x = yaz_marc8r_4E_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(N"; + return x; + } + x = yaz_marc8r_51_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(Q"; + return x; + } + x = yaz_marc8r_33_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(3"; + return x; + } + x = yaz_marc8r_34_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(4"; + return x; + } + x = yaz_marc8r_53_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "(S"; + return x; + } + x = yaz_marc8r_31_conv(inp, inbytesleft, &no_read_sub, comb); + if (x) + { + *page_chr = ESC "$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; + char out_buf[4]; + size_t out_no = 0; + + if (!y) + return 0; + + assert(cd->write_marc8_lpage); + if (cd->write_marc8_lpage) + { + size_t r = yaz_write_marc8_page_chr(cd, outbuf, outbytesleft, + cd->write_marc8_lpage); + if (r) + return r; + } + + 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 + 2 >= *outbytesleft) + { cd->my_errno = YAZ_ICONV_E2BIG; - return (size_t)(-1); + return (size_t) (-1); } - *outbuf = (char *) outp; + + memcpy(*outbuf, out_buf, out_no); + *outbuf += out_no; + (*outbytesleft) -= out_no; + if (cd->write_marc8_second_half_char) + { + *(*outbuf)++ = cd->write_marc8_second_half_char; + (*outbytesleft)--; + } + + cd->write_marc8_last = 0; + cd->write_marc8_lpage = 0; + cd->write_marc8_second_half_char = 0; return 0; } -static size_t yaz_write_UCS4LE (yaz_iconv_t cd, unsigned long x, - char **outbuf, size_t *outbytesleft, - int last) +static size_t yaz_write_marc8_page_chr(yaz_iconv_t cd, + char **outbuf, size_t *outbytesleft, + const char *page_chr) { - unsigned char *outp = (unsigned char *) *outbuf; - if (*outbytesleft >= 4) + const char **old_page_chr = &cd->write_marc8_g0; + + /* are we going to a G1-set (such as such as ESC ")!E") */ + if (page_chr && page_chr[1] == ')') + old_page_chr = &cd->write_marc8_g1; + + if (!*old_page_chr || strcmp(page_chr, *old_page_chr)) { - *outp++ = (unsigned char) x; - *outp++ = (unsigned char) (x>>8); - *outp++ = (unsigned char) (x>>16); - *outp++ = (unsigned char) (x>>24); - (*outbytesleft) -= 4; + size_t plen = 0; + const char *page_out = page_chr; + + if (*outbytesleft < 8) + { + cd->my_errno = YAZ_ICONV_E2BIG; + + return (size_t) (-1); + } + + if (*old_page_chr) + { + if (!strcmp(*old_page_chr, ESC "p") + || !strcmp(*old_page_chr, ESC "g") + || !strcmp(*old_page_chr, ESC "b")) + { + page_out = ESC "s"; + /* Technique 1 leave */ + if (strcmp(page_chr, ESC "(B")) /* Not going ASCII page? */ + { + /* Must leave script + enter new page */ + plen = strlen(page_out); + memcpy(*outbuf, page_out, plen); + (*outbuf) += plen; + (*outbytesleft) -= plen; + page_out = ESC "(B"; + } + } + } + *old_page_chr = page_chr; + plen = strlen(page_out); + memcpy(*outbuf, page_out, plen); + (*outbuf) += plen; + (*outbytesleft) -= plen; + } + return 0; +} + + +static size_t yaz_write_marc8_2(yaz_iconv_t cd, unsigned long x, + char **outbuf, size_t *outbytesleft) +{ + 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 (page_chr) + { + size_t r = yaz_write_marc8_page_chr(cd, outbuf, outbytesleft, + page_chr); + if (r) + return r; + } + if (x == 0x0361) + cd->write_marc8_second_half_char = 0xEC; + else if (x == 0x0360) + cd->write_marc8_second_half_char = 0xFB; + + if (*outbytesleft <= 1) + { + cd->my_errno = YAZ_ICONV_E2BIG; + return (size_t) (-1); + } + *(*outbuf)++ = y; + (*outbytesleft)--; } else { - cd->my_errno = YAZ_ICONV_E2BIG; - return (size_t)(-1); + size_t r = flush_combos(cd, outbuf, outbytesleft); + if (r) + return r; + + cd->write_marc8_last = y; + cd->write_marc8_lpage = page_chr; } - *outbuf = (char *) outp; return 0; } +static size_t yaz_flush_marc8(yaz_iconv_t cd, + char **outbuf, size_t *outbytesleft) +{ + size_t r = flush_combos(cd, outbuf, outbytesleft); + if (r) + return r; + cd->write_marc8_g1 = 0; + return yaz_write_marc8_page_chr(cd, outbuf, outbytesleft, ESC "(B"); +} + +static size_t yaz_write_marc8(yaz_iconv_t cd, unsigned long x, + char **outbuf, size_t *outbytesleft) +{ + 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; + const char *lpage = cd->write_marc8_lpage; + + r = yaz_write_marc8_2(cd, latin1_comb[i].x1, + outbuf, outbytesleft); + if (r) + return r; + r = yaz_write_marc8_2(cd, latin1_comb[i].x2, + outbuf, outbytesleft); + 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; + cd->write_marc8_lpage = lpage; + } + return r; + } + } + return yaz_write_marc8_2(cd, x, outbuf, outbytesleft); +} + + #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) +static size_t yaz_write_wchar_t(yaz_iconv_t cd, unsigned long x, + char **outbuf, size_t *outbytesleft) { unsigned char *outp = (unsigned char *) *outbuf; @@ -742,14 +822,8 @@ yaz_iconv_t yaz_iconv_open (const char *tocode, const char *fromcode) cd->write_handle = 0; cd->read_handle = 0; cd->init_handle = 0; + cd->flush_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; /* a useful hack: if fromcode has leading @, the library not use YAZ's own conversions .. */ @@ -770,6 +844,14 @@ yaz_iconv_t yaz_iconv_open (const char *tocode, const char *fromcode) 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; + else if (!yaz_matchstr(fromcode, "advancegreek")) + cd->read_handle = yaz_read_advancegreek; + else if (!yaz_matchstr(fromcode, "iso54281984")) + cd->read_handle = yaz_read_iso5428_1984; + else if (!yaz_matchstr(fromcode, "iso5428:1984")) + cd->read_handle = yaz_read_iso5428_1984; #if HAVE_WCHAR_H else if (!yaz_matchstr(fromcode, "WCHAR_T")) cd->read_handle = yaz_read_wchar_t; @@ -778,11 +860,36 @@ yaz_iconv_t yaz_iconv_open (const char *tocode, const char *fromcode) if (!yaz_matchstr(tocode, "UTF8")) cd->write_handle = yaz_write_UTF8; else if (!yaz_matchstr(tocode, "ISO88591")) + { cd->write_handle = yaz_write_ISO8859_1; + cd->flush_handle = yaz_flush_ISO8859_1; + } else if (!yaz_matchstr (tocode, "UCS4")) 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; + cd->flush_handle = yaz_flush_marc8; + } + else if (!yaz_matchstr(tocode, "MARC8s")) + { + cd->write_handle = yaz_write_marc8; + cd->flush_handle = yaz_flush_marc8; + } + else if (!yaz_matchstr(tocode, "advancegreek")) + { + cd->write_handle = yaz_write_advancegreek; + } + else if (!yaz_matchstr(tocode, "iso54281984")) + { + cd->write_handle = yaz_write_iso5428_1984; + } + else if (!yaz_matchstr(tocode, "iso5428:1984")) + { + cd->write_handle = yaz_write_iso5428_1984; + } #if HAVE_WCHAR_H else if (!yaz_matchstr(tocode, "WCHAR_T")) cd->write_handle = yaz_write_wchar_t; @@ -813,8 +920,9 @@ yaz_iconv_t yaz_iconv_open (const char *tocode, const char *fromcode) size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { - char *inbuf0; + char *inbuf0 = 0; size_t r = 0; + #if HAVE_ICONV_H if (cd->iconv_cd) { @@ -840,19 +948,34 @@ size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft, return r; } #endif - if (inbuf == 0 || *inbuf == 0) + + if (inbuf) + inbuf0 = *inbuf; + + if (cd->init_flag) { - cd->init_flag = 1; cd->my_errno = YAZ_ICONV_UNKNOWN; - return 0; + cd->g0_mode = 'B'; + cd->g1_mode = 'B'; + + cd->comb_offset = cd->comb_size = 0; + cd->compose_char = 0; + + cd->write_marc8_second_half_char = 0; + cd->write_marc8_last = 0; + cd->write_marc8_lpage = 0; + cd->write_marc8_g0 = ESC "(B"; + cd->write_marc8_g1 = 0; + + cd->unget_x = 0; + cd->no_read_x = 0; } - inbuf0 = *inbuf; if (cd->init_flag) { - if (cd->init_handle) + if (cd->init_handle && inbuf && *inbuf) { - size_t no_read; + size_t no_read = 0; size_t r = (cd->init_handle)(cd, (unsigned char *) *inbuf, *inbytesleft, &no_read); if (r) @@ -865,46 +988,61 @@ size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft, *inbytesleft -= no_read; *inbuf += no_read; } - cd->init_flag = 0; + } + cd->init_flag = 0; + + if (!inbuf || !*inbuf) + { + if (outbuf && *outbuf) + { + if (cd->unget_x) + r = (*cd->write_handle)(cd, cd->unget_x, outbuf, outbytesleft); + if (cd->flush_handle) + r = (*cd->flush_handle)(cd, outbuf, outbytesleft); + } + if (r == 0) + cd->init_flag = 1; cd->unget_x = 0; - cd->no_read_x = 0; + return r; } while (1) { unsigned long x; size_t no_read; - if (*inbytesleft == 0) + if (cd->unget_x) { - r = *inbuf - inbuf0; - break; + x = cd->unget_x; + no_read = cd->no_read_x; } - if (!cd->unget_x) + else { - x = (cd->read_handle)(cd, (unsigned char *) *inbuf, *inbytesleft, - &no_read); + if (*inbytesleft == 0) + { + r = *inbuf - inbuf0; + break; + } + 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); + r = (*cd->write_handle)(cd, x, outbuf, outbytesleft); if (r) { /* unable to write it. save it because read_handle cannot rewind .. */ - cd->unget_x = x; - cd->no_read_x = no_read; - break; + if (cd->my_errno == YAZ_ICONV_E2BIG) + { + cd->unget_x = x; + cd->no_read_x = no_read; + break; + } } cd->unget_x = 0; } @@ -929,7 +1067,11 @@ int yaz_iconv_close (yaz_iconv_t cd) return 0; } - +void yaz_iconv_set_errno(yaz_iconv_t cd, int no) +{ + cd->my_errno = no; +} + /* * Local variables: * c-basic-offset: 4 @@ -937,4 +1079,3 @@ int yaz_iconv_close (yaz_iconv_t cd) * End: * vim: shiftwidth=4 tabstop=8 expandtab */ -