integrate preconv(1) into mandoc(1);

[mandoc.git] / mdoc_argv.c

diff --git a/mdoc_argv.c b/mdoc_argv.c
index e411d51abbb2a6e25fc40c12594e08d1697345c7..b12c510f25ef5c1ea609e0e6778439c4c2e34d63 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.93 2014/04/23 21:06:41 schwarze Exp $ */
+/*     $Id: mdoc_argv.c,v 1.96 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -179,7 +177,7 @@ static      const struct mdocarg mdocargs[MDOC_MAX] = {
        { ARGSFL_NONE, NULL }, /* Nd */
        { ARGSFL_DELIM, NULL }, /* Nm */
        { ARGSFL_DELIM, NULL }, /* Op */
-       { ARGSFL_NONE, NULL }, /* Ot */
+       { ARGSFL_DELIM, NULL }, /* Ot */
        { ARGSFL_DELIM, NULL }, /* Pa */
        { ARGSFL_NONE, args_Ex }, /* Rv */
        { ARGSFL_DELIM, NULL }, /* St */
@@ -249,7 +247,7 @@ static      const struct mdocarg mdocargs[MDOC_MAX] = {
        { ARGSFL_NONE, NULL }, /* Ek */
        { ARGSFL_NONE, NULL }, /* Bt */
        { ARGSFL_NONE, NULL }, /* Hf */
-       { ARGSFL_NONE, NULL }, /* Fr */
+       { ARGSFL_DELIM, NULL }, /* Fr */
        { ARGSFL_NONE, NULL }, /* Ud */
        { ARGSFL_DELIM, NULL }, /* Lb */
        { ARGSFL_NONE, NULL }, /* Lp */
@@ -260,7 +258,7 @@ static      const struct mdocarg mdocargs[MDOC_MAX] = {
        { ARGSFL_DELIM, NULL }, /* Brc */
        { ARGSFL_NONE, NULL }, /* %C */
        { ARGSFL_NONE, NULL }, /* Es */
-       { ARGSFL_NONE, NULL }, /* En */
+       { ARGSFL_DELIM, NULL }, /* En */
        { ARGSFL_DELIM, NULL }, /* Dx */
        { ARGSFL_NONE, NULL }, /* %Q */
        { ARGSFL_NONE, NULL }, /* br */
@@ -461,7 +459,8 @@ args(struct mdoc *mdoc, int line, int *pos,
                 * is unterminated.
                 */
                if (MDOC_PHRASELIT & mdoc->flags)
-                       mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE);
+                       mandoc_msg(MANDOCERR_ARG_QUOTE,
+                           mdoc->parse, line, *pos, NULL);
 
                mdoc->flags &= ~MDOC_PHRASELIT;
                return(ARGS_EOLN);
@@ -520,7 +519,8 @@ args(struct mdoc *mdoc, int line, int *pos,
 
                /* Whitespace check for eoln case... */
                if ('\0' == *p && ' ' == *(p - 1))
-                       mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE);
+                       mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                           line, *pos, NULL);
 
                *pos += (int)(p - *v);
 
@@ -575,7 +575,8 @@ args(struct mdoc *mdoc, int line, int *pos,
                if ('\0' == buf[*pos]) {
                        if (MDOC_PPHRASE & mdoc->flags)
                                return(ARGS_QWORD);
-                       mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE);
+                       mandoc_msg(MANDOCERR_ARG_QUOTE,
+                           mdoc->parse, line, *pos, NULL);
                        return(ARGS_QWORD);
                }
 
@@ -589,7 +590,8 @@ args(struct mdoc *mdoc, int line, int *pos,
                        (*pos)++;
 
                if ('\0' == buf[*pos])
-                       mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE);
+                       mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                           line, *pos, NULL);
 
                return(ARGS_QWORD);
        }