diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-26 18:42:30 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-26 18:42:30 +0000 |
commit | fb1f845c9ebafe8648f3df58f8a4581041ff067e (patch) | |
tree | 07765bfe61b2b3ed91ec2f3e112706b0a88c6a8b /read.c | |
parent | ba5583393dfa12234c2752e45824ac58a3851700 (diff) | |
download | mandoc-fb1f845c9ebafe8648f3df58f8a4581041ff067e.tar.gz |
Rework tbl(7) layout parsing:
* Continue parsing even if part of the input is invalid.
* Do not require whitespace between cell specifications.
* Allow tabs as well as blanks between modifiers.
* Mark the 'm' modifier as unsupported.
* Parse and ignore the 'p' and 'v' modifiers.
* Better warning and error messages.
* Get rid of a static buffer.
Improved functionality but minus 50 lines of code.
Diffstat (limited to 'read.c')
-rw-r--r-- | read.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -171,6 +171,11 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "invalid escape sequence", "undefined string, using \"\"", + /* related to tables */ + "tbl line starts with span", + "tbl column starts with span", + "skipping vertical bar in tbl layout", + "generic error", /* related to equations */ @@ -184,7 +189,9 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "skipping unknown tbl option", "missing tbl option argument", "wrong tbl option argument size", - "no table layout cells specified", + "empty tbl layout", + "invalid character in tbl layout", + "unmatched parenthesis in tbl layout", "no table data cells specified", "ignore data in cell", "data block still open", @@ -222,7 +229,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "input too large", "unsupported control character", "unsupported roff request", - "unsupported table layout", + "unsupported tbl layout modifier", "ignoring macro in table", "eqn in tbl", }; |