Added secondary sorting (i.e., breaking ties when two documents have the same Q)

[libucw.git] / charset / charconv.h

diff --git a/charset/charconv.h b/charset/charconv.h
index 14fee079ac02fea498c077bffcc55934c4a165e6..35044311f10dbd0b6b1da86789b3f4bb959a9a0a 100644 (file)
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -1,7 +1,7 @@
 /*
 /*

- *     Character Set Conversion Library 1.0
+ *     Character Set Conversion Library 1.1

  *
  *

- *     (c) 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     (c) 1998--2001 Martin Mares <mj@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU General Public License. See file COPYING in any of the GNU packages.
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU General Public License. See file COPYING in any of the GNU packages.


@@ -33,11 +33,27 @@ void conv_set_charset(struct conv_context *, int, int);
 #define CONV_DEST_END 2
 #define CONV_SKIP 4
 
 #define CONV_DEST_END 2
 #define CONV_SKIP 4
 

-#define CONV_CHARSET_ASCII 0
-#define CONV_CHARSET_LATIN1 1
-#define CONV_CHARSET_LATIN2 2
-#define CONV_CHARSET_UTF8 8
-#define CONV_NUM_CHARSETS 9
+enum charset_id {
+       CONV_CHARSET_ASCII,
+       CONV_CHARSET_LATIN1,
+       CONV_CHARSET_LATIN2,
+       CONV_CHARSET_WIN1250,
+       CONV_CHARSET_WIN1252,
+       CONV_CHARSET_KAMCS,
+       CONV_CHARSET_CSN369103,
+       CONV_CHARSET_CP852,
+       CONV_CHARSET_MACCE,
+       CONV_CHARSET_CORK,
+       CONV_CHARSET_UTF8,
+       CONV_NUM_CHARSETS
+};
+
+/* For those brave ones who want to mess with charconv internals */
+unsigned int conv_x_to_ucs(unsigned int x);
+unsigned int conv_ucs_to_x(unsigned int ucs);
+unsigned int conv_x_count(void);
+
+/* Charset names */

 
 int find_charset_by_name(char *);
 char *charset_name(int);
 
 int find_charset_by_name(char *);
 char *charset_name(int);