diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2008-12-01 16:14:34 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2008-12-01 16:14:34 +0000 |
| commit | e1d78876eec368e83465ee580da59a8cbe578000 (patch) | |
| tree | a9b393f8b943a92e4b9531fb0aa10fec20563c90 | |
| parent | 34e63140e4025ce706092434e50fc5b5000f30cd (diff) | |
| download | mandoc-e1d78876eec368e83465ee580da59a8cbe578000.tar.gz mandoc-e1d78876eec368e83465ee580da59a8cbe578000.tar.zst mandoc-e1d78876eec368e83465ee580da59a8cbe578000.zip | |
Better Oo/Oc support.
| -rw-r--r-- | roff.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.28 2008/12/01 16:01:28 kristaps Exp $ */ +/* $Id: roff.c,v 1.29 2008/12/01 16:14:34 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> * @@ -166,14 +166,13 @@ static const int roffarg_St[] = { static const int roffchild_Bl[] = { ROFF_It, ROFF_El, ROFF_MAX }; static const int roffchild_Fo[] = { ROFF_Fa, ROFF_Fc, ROFF_MAX }; -static const int roffchild_Oo[] = { ROFF_Op, ROFF_Oc, ROFF_MAX }; static const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B, ROFF__D, ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P, ROFF__R, ROFF__T, ROFF__V, ROFF_MAX }; static const int roffparent_El[] = { ROFF_Bl, ROFF_It, ROFF_MAX }; static const int roffparent_Fc[] = { ROFF_Fo, ROFF_Fa, ROFF_MAX }; -static const int roffparent_Oc[] = { ROFF_Oo, ROFF_Oc, ROFF_MAX }; +static const int roffparent_Oc[] = { ROFF_Oo, ROFF_MAX }; static const int roffparent_It[] = { ROFF_Bl, ROFF_It, ROFF_MAX }; static const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX }; @@ -277,7 +276,7 @@ static const struct rofftok tokens[ROFF_MAX] = { { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */ { roff_layout, NULL, NULL, roffchild_Fo, 0, ROFF_LAYOUT, 0 }, /* Fo */ { roff_noop, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */ - { roff_layout, NULL, NULL, roffchild_Oo, 0, ROFF_LAYOUT, 0 }, /* Oo */ + { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */ { roff_noop, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */ { roff_layout, roffarg_Bk, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */ { roff_noop, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */ @@ -439,7 +438,7 @@ roff_engine(struct rofftree *tree, char *buf) assert(buf); if (0 == *buf) { - roff_warn(tree, buf, "blank line"); + roff_err(tree, buf, "blank line"); return(0); } else if ('.' != *buf) return(textparse(tree, buf)); |