diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-05-20 00:58:03 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-05-20 00:58:03 +0000 |
| commit | 0c83ccafaea1f0c8603a8aea73b075667939517e (patch) | |
| tree | 7202cb2dbb730c8e3aa83595497aad753dc2d2ef /usr.bin/mandoc/mandoc.h | |
| parent | c713a7721e58dd0a453fae998afd21f12fd821e8 (diff) | |
Support nested roff instructions:
* allow roff_parseln() to be re-run
* allow roff_parseln() to manipulate the line buffer offset
* support the offset in the man and mdoc libraries
* adapt .if, .ie, .el, .ig, .am* and .de* support
* interpret some instructions even in conditional-negative context
Coded by kristaps during the last day of the mandoc hackathon.
To avoid regressions in the OpenBSD tree, commit this together
with some small local additions:
* detect roff block end "\}" even on macro lines
* actually implement the ".if n" conditional
* ignore .ds, .rm and .tr in libroff
Also back my old .if/.ie/.el-handling out of libman, reverting:
man.h 1.15 man.c 1.25 man_macro.c 1.15 man_validate.c 1.19
man_action.c 1.15 man_term.c 1.28 man_html.c 1.9.
Diffstat (limited to 'usr.bin/mandoc/mandoc.h')
| -rw-r--r-- | usr.bin/mandoc/mandoc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index 6fe33b0966b..d7e47950feb 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.1 2010/05/16 01:46:39 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.2 2010/05/20 00:58:02 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -22,9 +22,10 @@ __BEGIN_DECLS enum mandocerr { MANDOCERR_OK, MANDOCERR_SCOPEEXIT, /* scope open on exit */ - MANDOCERR_NOSCOPE, /* request scope close w/none open */ #define MANDOCERR_WARNING MANDOCERR_SCOPEEXIT + MANDOCERR_NOSCOPE, /* request scope close w/none open */ + MANDOCERR_NOARGS, /* macro requires argument(s) */ MANDOCERR_ARGSLOST, /* line arguments will be lost */ #define MANDOCERR_ERROR MANDOCERR_ARGSLOST |