X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.h;h=78a97378cb75dcbae05f2e58db62785ea33622d7;hb=f5099c58d17e8f66a74a84918e688ef17936d392;hp=e2663a022094b65e5fc5f2aa6e2d303508c2a83b;hpb=26c0db0a90c83201a90583e2b9afa3c11f08ec2d;p=pspp-builds.git

diff --git a/src/libpspp/i18n.h b/src/libpspp/i18n.h
index e2663a02..78a97378 100644
--- a/src/libpspp/i18n.h
+++ b/src/libpspp/i18n.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,44 +18,34 @@
 #define I18N_H
 
 #include <stdbool.h>
+#include <unistr.h>
 
 void  i18n_done (void);
 void  i18n_init (void);
 
 #define UTF8 "UTF-8"
 
-struct pool;
-
-
-/* 
-Converts the string TEXT, which should be encoded in FROM-encoding, to a
-dynamically allocated string in TO-encoding.   Any characters which cannot
-be converted will be represented by '?'.
-
-LENGTH should be the length of the string or -1, if null terminated.
-
-The returned string will be allocated on POOL.
-
-This function's behaviour differs from that of g_convert_with_fallback provided
-by GLib.  The GLib function will fail (returns NULL) if any part of the input
-string is not valid in the declared input encoding.  This function however perseveres
-even in the presence of badly encoded input.
-*/
-char *recode_string_pool (const char *to, const char *from,
-			  const char *text, int length, struct pool *pool);
+/* The encoding of literal strings in PSPP source code, as seen at execution
+   time.  In fact this is likely to be some extended ASCII encoding, such as
+   UTF-8 or ISO-8859-1, but ASCII is adequate for our purposes. */
+#define C_ENCODING "ASCII"
 
+struct pool;
 
+char recode_byte (const char *to, const char *from, char);
 
-/* Similar to recode_string_pool, but allocates the returned value on the heap instead of 
-   in a pool.  It is the caller's responsibility to free the returned value. */
 char *recode_string (const char *to, const char *from,
-		      const char *text, int len);
+                     const char *text, int len);
+char *recode_string_pool (const char *to, const char *from,
+			  const char *text, int length, struct pool *);
+struct substring recode_substring_pool (const char *to, const char *from,
+                                        struct substring text, struct pool *);
 
+size_t recode_string_len (const char *to, const char *from,
+                          const char *text, int len);
 
 bool valid_encoding (const char *enc);
 
-/* Return the decimal separator according to the
-   system locale */
 char get_system_decimal (void);
 
 const char * get_default_encoding (void);
@@ -63,5 +53,6 @@ void set_default_encoding (const char *enc);
 
 bool set_encoding_from_locale (const char *loc);
 
+const char *uc_name (ucs4_t uc, char buffer[16]);
 
 #endif /* i18n.h */