X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficonv_decode_marc8.c;h=c20c3e982e187e1b9fabc87ea29e8abba5689de1;hp=84af5b34390415cbe68dae4ad77b8b3a43be206c;hb=00537b483d646bd04a204708ecbde708861f044e;hpb=bf95c509245f5cb4025ef2db348d5f7ace3b5994

diff --git a/src/iconv_decode_marc8.c b/src/iconv_decode_marc8.c
index 84af5b3..c20c3e9 100644
--- a/src/iconv_decode_marc8.c
+++ b/src/iconv_decode_marc8.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -17,7 +17,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <ctype.h>
 
 #include <yaz/xmalloc.h>
 #include "iconv-p.h"
@@ -63,7 +62,7 @@ static unsigned long read_marc8(yaz_iconv_t cd, yaz_iconv_decoder_t d,
         *no_read = data->comb_no_read[data->comb_offset];
         x = data->comb_x[data->comb_offset];
 
-        /* special case for double-diacritic combining characters, 
+        /* 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
@@ -259,7 +258,7 @@ void destroy_marc8(yaz_iconv_decoder_t d)
 yaz_iconv_decoder_t yaz_marc8_decoder(const char *fromcode,
                                       yaz_iconv_decoder_t d)
 {
-    if (!yaz_matchstr(fromcode, "MARC8"))
+    if (!yaz_matchstr(fromcode, "MARC8") || !yaz_matchstr(fromcode, "ANSEL"))
         d->read_handle = read_marc8;
     else if (!yaz_matchstr(fromcode, "MARC8s"))
         d->read_handle = read_marc8s;
@@ -279,7 +278,9 @@ yaz_iconv_decoder_t yaz_marc8_decoder(const char *fromcode,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+