X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/e4ea58f8cb4dccaa8e99306a3497de1e37600480..bb9e7835935e7a2098f2ce27964342d4c4557e3f:/halibut.h

diff --git a/halibut.h b/halibut.h
index 94493d4..f3de665 100644
--- a/halibut.h
+++ b/halibut.h
@@ -27,12 +27,6 @@
 #include "tree234.h"
 
 /*
- * FIXME: Charset temporary workarounds
- */
-#define CS_FIXME CS_ISO8859_1
-#define CS_LOCAL CS_ISO8859_1
-
-/*
  * Structure tags
  */
 typedef struct input_Tag input;
@@ -282,6 +276,8 @@ char *utoa_dup(wchar_t const *s, int charset);
 char *utoa_dup_len(wchar_t const *s, int charset, int *len);
 char *utoa_careful_dup(wchar_t const *s, int charset);
 wchar_t *ufroma_dup(char const *s, int charset);
+char *utoa_locale_dup(wchar_t const *s);
+wchar_t *ufroma_locale_dup(char const *s);
 int ustrlen(wchar_t const *s);
 wchar_t *uadv(wchar_t *s);
 wchar_t *ustrcpy(wchar_t *dest, wchar_t const *source);
@@ -294,6 +290,13 @@ int utob(wchar_t *);
 int uisdigit(wchar_t);
 wchar_t *ustrlow(wchar_t *s);
 wchar_t *ustrftime(wchar_t *fmt, struct tm *timespec);
+int cvt_ok(int charset, const wchar_t *s);
+
+/*
+ * wcwidth.c
+ */
+int strwid(char const *s, int charset);
+int ustrwid(wchar_t const *s, int charset);
 
 /*
  * help.c
@@ -345,7 +348,7 @@ char *rdtrimc(rdstringc *rs);
 
 int compare_wordlists(word *a, word *b);
 
-void mark_attr_ends(paragraph *sourceform);
+void mark_attr_ends(word *words);
 
 typedef struct tagWrappedLine wrappedline;
 struct tagWrappedLine {