=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- src/usr.bin/mandoc/mdoc_macro.c 2011/10/16 12:18:32 1.70 +++ src/usr.bin/mandoc/mdoc_macro.c 2011/12/03 22:47:27 1.71 @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.70 2011/10/16 12:18:32 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.71 2011/12/03 22:47:27 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -596,6 +596,17 @@ if (DELIM_OPEN == d) m->last->flags |= MDOC_DELIMO; + + /* + * Closing delimiters only suppress the preceding space + * when they follow something, not when they start a new + * block or element, and not when they follow `No'. + * + * XXX Explicitly special-casing MDOC_No here feels + * like a layering violation. Find a better way + * and solve this in the code related to `No'! + */ + else if (DELIM_CLOSE == d && m->last->prev && m->last->prev->tok != MDOC_No) m->last->flags |= MDOC_DELIMC;