* need a space before .No even if it starts with a closing delimiter

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 2bdb85a0fe51376d7b61732c20b822ea6525df5d..d039af4c146ddce785ee708fc960ac2f4405cb2b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.191 2010/09/27 23:03:44 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.192 2010/10/01 21:51:13 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>


@@ -102,6 +102,7 @@ static      int       termp_fl_pre(DECL_ARGS);
 static int       termp_fn_pre(DECL_ARGS);
 static int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);
 static int       termp_fn_pre(DECL_ARGS);
 static int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);

+static int       termp_igndelim_pre(DECL_ARGS);

 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);


@@ -109,7 +110,6 @@ static      int       termp_lk_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);
 static int       termp_ns_pre(DECL_ARGS);
 static int       termp_nd_pre(DECL_ARGS);
 static int       termp_nm_pre(DECL_ARGS);
 static int       termp_ns_pre(DECL_ARGS);

-static int       termp_pf_pre(DECL_ARGS);

 static int       termp_quote_pre(DECL_ARGS);
 static int       termp_rs_pre(DECL_ARGS);
 static int       termp_rv_pre(DECL_ARGS);
 static int       termp_quote_pre(DECL_ARGS);
 static int       termp_rs_pre(DECL_ARGS);
 static int       termp_rv_pre(DECL_ARGS);


@@ -196,12 +196,12 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */

-       { NULL, NULL }, /* No */
+       { termp_igndelim_pre, NULL }, /* No */

        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */

-       { termp_pf_pre, termp_pf_post }, /* Pf */
+       { termp_igndelim_pre, termp_pf_post }, /* Pf */

        { termp_quote_pre, termp_quote_post }, /* Po */
        { termp_quote_pre, termp_quote_post }, /* Pq */
        { NULL, NULL }, /* Qc */
        { termp_quote_pre, termp_quote_post }, /* Po */
        { termp_quote_pre, termp_quote_post }, /* Pq */
        { NULL, NULL }, /* Qc */


@@ -1684,7 +1684,7 @@ termp_xx_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-termp_pf_pre(DECL_ARGS)
+termp_igndelim_pre(DECL_ARGS)

 {
 
        p->flags |= TERMP_IGNDELIM;
 {
 
        p->flags |= TERMP_IGNDELIM;


@@ -1697,7 +1697,6 @@ static void
 termp_pf_post(DECL_ARGS)
 {
 
 termp_pf_post(DECL_ARGS)
 {
 

-       p->flags &= ~TERMP_IGNDELIM;

        p->flags |= TERMP_NOSPACE;
 }
 
        p->flags |= TERMP_NOSPACE;
 }