X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficonv_decode_marc8.c;h=86f1246cb31d6d19790e804993e640eac0e7bdda;hp=694a5ed46ac87b2a8f277606c09e187c0e6f0da2;hb=1346b30779b120691e4145a3578716f77300951e;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7

diff --git a/src/iconv_decode_marc8.c b/src/iconv_decode_marc8.c
index 694a5ed..86f1246 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-2009 Index Data
+ * Copyright (C) 1995-2013 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
@@ -173,10 +172,10 @@ static unsigned long yaz_read_marc8_comb(yaz_iconv_t cd,
     }
     if (inbytesleft == 0)
         return 0;
-    else if (*inp == ' ')
+    else if (*inp <= ' ')
     {
         *no_read += 1;
-        return ' ';
+        return *inp;
     }
     else
     {
@@ -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
  */
+