===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/mandoc/mdoc_html.c	2010/07/13 01:09:13	1.25
--- src/usr.bin/mandoc/mdoc_html.c	2010/07/25 18:05:54	1.26
***************
*** 1,4 ****
! /*	$Id: mdoc_html.c,v 1.25 2010/07/13 01:09:13 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: mdoc_html.c,v 1.26 2010/07/25 18:05:54 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 121,126 ****
--- 121,127 ----
  static	int		  mdoc_rs_pre(MDOC_ARGS);
  static	int		  mdoc_rv_pre(MDOC_ARGS);
  static	int		  mdoc_sh_pre(MDOC_ARGS);
+ static	int		  mdoc_sm_pre(MDOC_ARGS);
  static	int		  mdoc_sp_pre(MDOC_ARGS);
  static	void		  mdoc_sq_post(MDOC_ARGS);
  static	int		  mdoc_sq_pre(MDOC_ARGS);
***************
*** 205,211 ****
  	{mdoc_em_pre, NULL}, /* Em */ 
  	{NULL, NULL}, /* Eo */
  	{mdoc_xx_pre, NULL}, /* Fx */
! 	{mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
  	{NULL, NULL}, /* No */
  	{mdoc_ns_pre, NULL}, /* Ns */
  	{mdoc_xx_pre, NULL}, /* Nx */
--- 206,212 ----
  	{mdoc_em_pre, NULL}, /* Em */ 
  	{NULL, NULL}, /* Eo */
  	{mdoc_xx_pre, NULL}, /* Fx */
! 	{mdoc_ms_pre, NULL}, /* Ms */
  	{NULL, NULL}, /* No */
  	{mdoc_ns_pre, NULL}, /* Ns */
  	{mdoc_xx_pre, NULL}, /* Nx */
***************
*** 223,229 ****
  	{NULL, NULL}, /* Sc */
  	{mdoc_sq_pre, mdoc_sq_post}, /* So */
  	{mdoc_sq_pre, mdoc_sq_post}, /* Sq */
! 	{NULL, NULL}, /* Sm */ /* FIXME - no idea. */
  	{mdoc_sx_pre, NULL}, /* Sx */
  	{mdoc_sy_pre, NULL}, /* Sy */
  	{NULL, NULL}, /* Tn */
--- 224,230 ----
  	{NULL, NULL}, /* Sc */
  	{mdoc_sq_pre, mdoc_sq_post}, /* So */
  	{mdoc_sq_pre, mdoc_sq_post}, /* Sq */
! 	{mdoc_sm_pre, NULL}, /* Sm */ 
  	{mdoc_sx_pre, NULL}, /* Sx */
  	{mdoc_sy_pre, NULL}, /* Sy */
  	{NULL, NULL}, /* Tn */
***************
*** 1718,1723 ****
--- 1719,1741 ----
  
  /* ARGSUSED */
  static int
+ mdoc_sm_pre(MDOC_ARGS)
+ {
+ 
+ 	assert(n->child && MDOC_TEXT == n->child->type);
+ 	if (0 == strcmp("on", n->child->string)) {
+ 		/* FIXME: no p->col to check... */
+ 		h->flags &= ~HTML_NOSPACE;
+ 		h->flags &= ~HTML_NONOSPACE;
+ 	} else
+ 		h->flags |= HTML_NONOSPACE;
+ 
+ 	return(0);
+ }
+ 
+ 
+ /* ARGSUSED */
+ static int
  mdoc_sp_pre(MDOC_ARGS)
  {
  	int		 len;
***************
*** 1733,1738 ****
--- 1751,1761 ----
  		len = 0;
  		break;
  	default:
+ 		assert(n->parent);
+ 		if ((NULL == n->next || NULL == n->prev) &&
+ 				(MDOC_Ss == n->parent->tok ||
+ 				 MDOC_Sh == n->parent->tok))
+ 			return(0);
  		len = 1;
  		break;
  	}