X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/db662ca1b30d08ecf779c42f8c642c2694966279..12f0ee84ca3e9810b49601347e9ecc0a0d97e948:/error.c

diff --git a/error.c b/error.c
index 0e90f0c..3635f0f 100644
--- a/error.c
+++ b/error.c
@@ -18,7 +18,7 @@ static void do_error(int code, va_list ap) {
     char c;
     int i, j;
     char *sp, *sp2;
-    wchar_t *wsp;
+    wchar_t *wsp, *wsp2;
     filepos fpos, fpos2;
     int flags;
 
@@ -37,6 +37,17 @@ static void do_error(int code, va_list ap) {
 	sprintf(error, "unrecognised option `-%.200s'", sp);
 	flags = PREFIX;
 	break;
+      case err_cmdcharset:
+	sp = va_arg(ap, char *);
+	sprintf(error, "character set `%.200s' not recognised", sp);
+	flags = PREFIX;
+	break;
+      case err_futileopt:
+	sp = va_arg(ap, char *);
+	sp2 = va_arg(ap, char *);
+	sprintf(error, "warning: option `-%s' has no effect%s", sp, sp2);
+	flags = PREFIX;
+	break;
       case err_noinput:		       /* no arguments */
 	sprintf(error, "no input files");
 	flags = PREFIX;
@@ -117,6 +128,11 @@ static void do_error(int code, va_list ap) {
 	sprintf(error, "expected `}' after cross-reference");
 	flags = FILEPOS;
 	break;
+      case err_codequote:
+	fpos = *va_arg(ap, filepos *);
+	sprintf(error, "unable to nest \\q{...} within \\c{...} or \\cw{...}");
+	flags = FILEPOS;
+	break;	
       case err_missingrbrace:
 	fpos = *va_arg(ap, filepos *);
 	sprintf(error, "unclosed braces at end of paragraph");
@@ -137,6 +153,20 @@ static void do_error(int code, va_list ap) {
 	sprintf(error, "unable to nest index markings");
 	flags = FILEPOS;
 	break;
+      case err_indexcase:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	fpos2 = *va_arg(ap, filepos *);
+	wsp2 = va_arg(ap, wchar_t *);
+	sp2 = utoa_locale_dup(wsp2);
+	sprintf(error, "warning: index tag `%.200s' used with ", sp);
+	sprintf(error + strlen(error), "different case (`%.200s') at %s:%d",
+		sp2, fpos2.filename, fpos2.line);
+	flags = FILEPOS;
+	sfree(sp);
+	sfree(sp2);
+	break;
       case err_nosuchkw:
 	fpos = *va_arg(ap, filepos *);
 	wsp = va_arg(ap, wchar_t *);
@@ -209,10 +239,12 @@ static void do_error(int code, va_list ap) {
 		sp);
 	flags = FILEPOS;
 	break;
-      case err_infodirentry:
+      case err_cfginsufarg:
 	fpos = *va_arg(ap, filepos *);
-	sprintf(error, "\\cfg{info-dir-entry} expects at least three"
-		" parameters");
+	sp = va_arg(ap, char *);
+	i = va_arg(ap, int);
+	sprintf(error, "\\cfg{%s} expects at least %d parameter%s", sp,
+		i, (i==1)?"":"s");
 	flags = FILEPOS;
 	break;
       case err_infonodechar:
@@ -230,6 +262,22 @@ static void do_error(int code, va_list ap) {
 		" than body width %d", i, j);
 	flags = FILEPOS;
 	break;
+      case err_htmlver:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	sprintf(error, "unrecognised HTML version keyword `%.200s'", sp);
+	sfree(sp);
+	flags = FILEPOS;
+	break;
+      case err_charset:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	sprintf(error, "character set `%.200s' not recognised", sp);
+	flags = FILEPOS;
+	sfree(sp);
+	break;
       case err_whatever:
 	sp = va_arg(ap, char *);
         vsprintf(error, sp, ap);