=================================================================== RCS file: /cvs/mandoc/mandoc.h,v retrieving revision 1.259 retrieving revision 1.262 diff -u -p -r1.259 -r1.262 --- mandoc/mandoc.h 2018/12/14 01:18:25 1.259 +++ mandoc/mandoc.h 2018/12/16 00:17:02 1.262 @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.259 2018/12/14 01:18:25 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.262 2018/12/16 00:17:02 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2012-2018 Ingo Schwarze @@ -169,6 +169,7 @@ enum mandocerr { MANDOCERR_FI_TAB, /* tab in filled text */ MANDOCERR_EOS, /* new sentence, new line */ MANDOCERR_ESC_BAD, /* invalid escape sequence: esc */ + MANDOCERR_ESC_UNDEF, /* undefined escape, printing literally: char */ MANDOCERR_STR_UNDEF, /* undefined string, using "": name */ /* related to tables */ @@ -231,6 +232,7 @@ enum mandocerr { MANDOCERR_TOOLARGE, /* input too large */ MANDOCERR_CHAR_UNSUPP, /* unsupported control character: number */ + MANDOCERR_ESC_UNSUPP, /* unsupported escape sequence: escape */ MANDOCERR_REQ_UNSUPP, /* unsupported roff request: request */ MANDOCERR_WHILE_NEST, /* nested .while loops */ MANDOCERR_WHILE_OUTOF, /* end of scope with open .while loop */ @@ -245,7 +247,9 @@ enum mandocerr { enum mandoc_esc { ESCAPE_ERROR = 0, /* bail! unparsable escape */ + ESCAPE_UNSUPP, /* unsupported escape; ignore it */ ESCAPE_IGNORE, /* escape to be ignored */ + ESCAPE_UNDEF, /* undefined escape; print literal character */ ESCAPE_SPECIAL, /* a regular special character */ ESCAPE_FONT, /* a generic font mode */ ESCAPE_FONTBOLD, /* bold font mode */ @@ -266,6 +270,7 @@ enum mandoc_esc { }; +enum mandoc_esc mandoc_font(const char *, int sz); enum mandoc_esc mandoc_escape(const char **, const char **, int *); void mandoc_msg_setoutfile(FILE *); const char *mandoc_msg_getinfilename(void); @@ -274,10 +279,8 @@ enum mandocerr mandoc_msg_getmin(void); void mandoc_msg_setmin(enum mandocerr); enum mandoclevel mandoc_msg_getrc(void); void mandoc_msg_setrc(enum mandoclevel); -void mandoc_msg(enum mandocerr, void *, int, int, const char *); -void mandoc_vmsg(enum mandocerr, void *, int, int, - const char *, ...) - __attribute__((__format__ (__printf__, 5, 6))); +void mandoc_msg(enum mandocerr, int, int, const char *, ...) + __attribute__((__format__ (__printf__, 4, 5))); void mchars_alloc(void); void mchars_free(void); int mchars_num2char(const char *, size_t);