X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/78c730856d459899f1ea8134c9f5415f586503ba..02478c4f78199bda48514bca58e4b912cb86c737:/halibut.h

diff --git a/halibut.h b/halibut.h
index 62b87db..f76d059 100644
--- a/halibut.h
+++ b/halibut.h
@@ -221,10 +221,12 @@ enum {
     err_explbr,			       /* expected `{' after command */
     err_commenteof,		       /* EOF inside braced comment */
     err_kwexprbr,		       /* expected `}' after cross-ref */
+    err_codequote,                     /* \q within \c is not supported */
     err_missingrbrace,		       /* unclosed braces at end of para */
     err_missingrbrace2,		       /* unclosed braces at end of file */
     err_nestedstyles,		       /* unable to nest text styles */
     err_nestedindex,		       /* unable to nest `\i' thingys */
+    err_indexcase,		       /* two \i differing only in case */
     err_nosuchkw,		       /* unresolved cross-reference */
     err_multiBR,		       /* multiple \BRs on same keyword */
     err_nosuchidxtag,		       /* \IM on unknown index tag (warning) */
@@ -238,6 +240,8 @@ enum {
     err_infodirentry,		       /* \cfg{info-dir-entry} missing param */
     err_infonodechar,		       /* colon/comma in node name in info */
     err_text_codeline,		       /* \c line too long in text backend */
+    err_htmlver,		       /* unrecognised HTML version keyword */
+    err_charset,		       /* unrecognised character set name */
     err_whatever                       /* random error of another type */
 };
 
@@ -261,9 +265,10 @@ void free_para_list(paragraph *p);
 word *dup_word_list(word *w);
 char *dupstr(char *s);
 
-#define mknew(type) ( (type *) smalloc (sizeof (type)) )
-#define mknewa(type, number) ( (type *) smalloc ((number) * sizeof (type)) )
-#define resize(array, len) ( srealloc ((array), (len) * sizeof (*(array))) )
+#define snew(type) ( (type *) smalloc (sizeof (type)) )
+#define snewn(number, type) ( (type *) smalloc ((number) * sizeof (type)) )
+#define sresize(array, number, type) \
+	( (type *) srealloc ((array), (number) * sizeof (type)) )
 #define lenof(array) ( sizeof(array) / sizeof(*(array)) )
 
 /*
@@ -295,6 +300,7 @@ int uisdigit(wchar_t);
 wchar_t *ustrlow(wchar_t *s);
 wchar_t *ustrftime(const wchar_t *wfmt, const struct tm *timespec);
 int cvt_ok(int charset, const wchar_t *s);
+int charset_from_ustr(filepos *fpos, const wchar_t *name);
 
 /*
  * wcwidth.c