=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.71 retrieving revision 1.75 diff -u -p -r1.71 -r1.75 --- mandoc/main.c 2010/05/15 18:35:14 1.71 +++ mandoc/main.c 2010/05/16 00:04:46 1.75 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.71 2010/05/15 18:35:14 kristaps Exp $ */ +/* $Id: main.c,v 1.75 2010/05/16 00:04:46 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -574,7 +574,7 @@ pset(const char *buf, int pos, struct curparse *curp, * default to -man, which is more lenient. */ - if (buf[0] == '.') { + if ('.' == buf[0] || '\'' == buf[0]) { for (i = 1; buf[i]; i++) if (' ' != buf[i] && '\t' != buf[i]) break; @@ -773,6 +773,14 @@ mwarn(void *arg, int line, int col, const char *msg) return(1); } +static const char * const mandocerrs[MANDOCERR_MAX] = { + "ok", + "multi-line scope open on exit", + "request for scope closure when no matching scope is open", + "line arguments will be lost", + "memory exhausted" +}; + /* * XXX: this is experimental code that will eventually become the * generic means of covering all warnings and errors! @@ -781,11 +789,18 @@ mwarn(void *arg, int line, int col, const char *msg) static int mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg) { +#if 0 struct curparse *cp; cp = (struct curparse *)arg; - fprintf(stderr, "%s:%d:%d: %s\n", cp->file, ln, col + 1, msg); + fprintf(stderr, "%s:%d:%d: %s", cp->file, + ln, col + 1, mandocerrs[t]); + if (msg) + fprintf(stderr, ": %s", msg); + + fputc('\n', stderr); +#endif return(1); }