Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.8

[libucw.git] / charset / charconv.h

diff --git a/charset/charconv.h b/charset/charconv.h
index 9685e77f55878ae5d72af7f9bca42affcd2ffd14..d3482438b3484bfa3eb59ec024fefa572b34e53d 100644 (file)
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -1,7 +1,7 @@
 /*
  *     Character Set Conversion Library 1.2
  *
 /*
  *     Character Set Conversion Library 1.2
  *

- *     (c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *     (c) 1998--2005 Martin Mares <mj@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.


@@ -53,6 +53,7 @@ enum charset_id {
        CONV_CHARSET_ISO_8859_15,
        CONV_CHARSET_ISO_8859_16,
        CONV_CHARSET_WIN1250,
        CONV_CHARSET_ISO_8859_15,
        CONV_CHARSET_ISO_8859_16,
        CONV_CHARSET_WIN1250,

+       CONV_CHARSET_WIN1251,

        CONV_CHARSET_WIN1252,
        CONV_CHARSET_KAMCS,
        CONV_CHARSET_CSN369103,
        CONV_CHARSET_WIN1252,
        CONV_CHARSET_KAMCS,
        CONV_CHARSET_CSN369103,


@@ -63,6 +64,10 @@ enum charset_id {
        CONV_NUM_CHARSETS
 };
 
        CONV_NUM_CHARSETS
 };
 

+/* Conversion of a single character between current non-UTF8 charset and Unicode */
+int conv_in_to_ucs(struct conv_context *c, unsigned int y);
+int conv_ucs_to_out(struct conv_context *c, unsigned int ucs);
+

 /* 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);
 /* 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);