===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** src/usr.bin/mandoc/mdoc_macro.c	2011/04/24 16:49:10	1.67
--- src/usr.bin/mandoc/mdoc_macro.c	2011/05/29 21:22:18	1.68
***************
*** 1,4 ****
! /*	$Id: mdoc_macro.c,v 1.67 2011/04/24 16:49:10 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_macro.c,v 1.68 2011/05/29 21:22:18 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 615,621 ****
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 615,621 ----
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(m, line, pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 628,639 ****
  		 * If we encounter end-of-sentence symbols, then trigger
  		 * the double-space.
  		 *
! 		 * XXX: it's easy to allow this to propogate outward to
  		 * the last symbol, such that `. )' will cause the
  		 * correct double-spacing.  However, (1) groff isn't
  		 * smart enough to do this and (2) it would require
  		 * knowing which symbols break this behaviour, for
! 		 * example, `.  ;' shouldn't propogate the double-space.
  		 */
  		if (mandoc_eos(p, strlen(p), 0))
  			m->last->flags |= MDOC_EOS;
--- 628,639 ----
  		 * If we encounter end-of-sentence symbols, then trigger
  		 * the double-space.
  		 *
! 		 * XXX: it's easy to allow this to propagate outward to
  		 * the last symbol, such that `. )' will cause the
  		 * correct double-spacing.  However, (1) groff isn't
  		 * smart enough to do this and (2) it would require
  		 * knowing which symbols break this behaviour, for
! 		 * example, `.  ;' shouldn't propagate the double-space.
  		 */
  		if (mandoc_eos(p, strlen(p), 0))
  			m->last->flags |= MDOC_EOS;
***************
*** 992,998 ****
  	}
  
  	/*
! 	 * This routine accomodates implicitly- and explicitly-scoped
  	 * macro openings.  Implicit ones first close out prior scope
  	 * (seen above).  Delay opening the head until necessary to
  	 * allow leading punctuation to print.  Special consideration
--- 992,998 ----
  	}
  
  	/*
! 	 * This routine accommodates implicitly- and explicitly-scoped
  	 * macro openings.  Implicit ones first close out prior scope
  	 * (seen above).  Delay opening the head until necessary to
  	 * allow leading punctuation to print.  Special consideration
***************
*** 1289,1295 ****
  		if (mandoc_eos(n->string, strlen(n->string), 1))
  			n->flags |= MDOC_EOS;
  
! 	/* Up-propogate the end-of-space flag. */
  
  	if (n && (MDOC_EOS & n->flags)) {
  		body->flags |= MDOC_EOS;
--- 1289,1295 ----
  		if (mandoc_eos(n->string, strlen(n->string), 1))
  			n->flags |= MDOC_EOS;
  
! 	/* Up-propagate the end-of-space flag. */
  
  	if (n && (MDOC_EOS & n->flags)) {
  		body->flags |= MDOC_EOS;
***************
*** 1711,1717 ****
  	for (pos = ppos; ; ) {
  		la = pos;
  
! 		ac = mdoc_zargs(m, line, &pos, buf, 0, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1711,1717 ----
  	for (pos = ppos; ; ) {
  		la = pos;
  
! 		ac = mdoc_zargs(m, line, &pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1756,1762 ****
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(m, line, pos, buf, 0, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1756,1762 ----
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(m, line, pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);