diff options
| author |   schwarze <schwarze@openbsd.org> | 2010-04-25 16:32:19 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2010-04-25 16:32:19 +0000 |
| commit | a2047730238eba36892eb3ef092f982e4d17cf3c (patch) | |
| tree | 23ced65c28f9c790cd09f752c6b486ad6c43dcf9 /usr.bin/mandoc/man.c | |
| parent | dirhash cna cope with real locks (and has before), enable mutexes here. (diff) | |
| download | wireguard-openbsd-a2047730238eba36892eb3ef092f982e4d17cf3c.tar.xz wireguard-openbsd-a2047730238eba36892eb3ef092f982e4d17cf3c.zip | |
Implement roff conditional instructions .if .ie .el, in man(7) only for now;
fixing OpenBSD::PackageName(3p) and friends for espie@.
Diffstat (limited to 'usr.bin/mandoc/man.c')
| -rw-r--r-- | usr.bin/mandoc/man.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c index 30426f19cbf..24a4c27cfe8 100644 --- a/usr.bin/mandoc/man.c +++ b/usr.bin/mandoc/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.24 2010/04/02 11:37:07 schwarze Exp $ */ +/* $Id: man.c,v 1.25 2010/04/25 16:32:19 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -62,7 +62,7 @@ const char *const __man_macronames[MAN_MAX] = { "RS", "DT", "UC", "PD", "Sp", "Vb", "Ve", "de", "dei", "am", "ami", "ig", - ".", + ".", "if", "ie", "el", }; const char * const *man_macronames = __man_macronames; @@ -152,10 +152,27 @@ man_endparse(struct man *m) int man_parseln(struct man *m, int ln, char *buf) { + char *p; + size_t len; + int brace_close = 0; + + if ((len = strlen(buf)) > 1) { + p = buf + (len - 2); + if (p[0] == '\\' && p[1] == '}') { + brace_close = 1; + *p = '\0'; + } + } + + if ('.' == *buf || '\'' == *buf) { + if ( ! man_pmacro(m, ln, buf)) + return(0); + } else { + if ( ! man_ptext(m, ln, buf)) + return(0); + } - return('.' == *buf || '\'' == *buf ? - man_pmacro(m, ln, buf) : - man_ptext(m, ln, buf)); + return(brace_close ? man_brace_close(m, ln, len-2) : 1); } |