===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/mandoc/mdoc_term.c	2009/07/18 19:13:44	1.31
--- src/usr.bin/mandoc/mdoc_term.c	2009/07/18 19:44:38	1.32
***************
*** 1,4 ****
! /*	$Id: mdoc_term.c,v 1.31 2009/07/18 19:13:44 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc_term.c,v 1.32 2009/07/18 19:44:38 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 127,133 ****
  static	int	  termp_ap_pre(DECL_ARGS);
  static	int	  termp_aq_pre(DECL_ARGS);
  static	int	  termp_ar_pre(DECL_ARGS);
- static	int	  termp_at_pre(DECL_ARGS);
  static	int	  termp_bd_pre(DECL_ARGS);
  static	int	  termp_bf_pre(DECL_ARGS);
  static	int	  termp_bq_pre(DECL_ARGS);
--- 127,132 ----
***************
*** 148,154 ****
  static	int	  termp_ic_pre(DECL_ARGS);
  static	int	  termp_in_pre(DECL_ARGS);
  static	int	  termp_it_pre(DECL_ARGS);
- static	int	  termp_lb_pre(DECL_ARGS);
  static	int	  termp_lk_pre(DECL_ARGS);
  static	int	  termp_ms_pre(DECL_ARGS);
  static	int	  termp_mt_pre(DECL_ARGS);
--- 147,152 ----
***************
*** 167,173 ****
  static	int	  termp_sm_pre(DECL_ARGS);
  static	int	  termp_sq_pre(DECL_ARGS);
  static	int	  termp_ss_pre(DECL_ARGS);
- static	int	  termp_st_pre(DECL_ARGS);
  static	int	  termp_sx_pre(DECL_ARGS);
  static	int	  termp_sy_pre(DECL_ARGS);
  static	int	  termp_ud_pre(DECL_ARGS);
--- 165,170 ----
***************
*** 214,220 ****
  	{ NULL, NULL }, /* Ot */
  	{ termp_pa_pre, NULL }, /* Pa */
  	{ termp_rv_pre, NULL }, /* Rv */
! 	{ termp_st_pre, NULL }, /* St */ 
  	{ termp_va_pre, NULL }, /* Va */
  	{ termp_vt_pre, termp_vt_post }, /* Vt */ 
  	{ termp_xr_pre, NULL }, /* Xr */
--- 211,217 ----
  	{ NULL, NULL }, /* Ot */
  	{ termp_pa_pre, NULL }, /* Pa */
  	{ termp_rv_pre, NULL }, /* Rv */
! 	{ NULL, NULL }, /* St */ 
  	{ termp_va_pre, NULL }, /* Va */
  	{ termp_vt_pre, termp_vt_post }, /* Vt */ 
  	{ termp_xr_pre, NULL }, /* Xr */
***************
*** 232,238 ****
  	{ NULL, NULL }, /* Ac */
  	{ termp_aq_pre, termp_aq_post }, /* Ao */
  	{ termp_aq_pre, termp_aq_post }, /* Aq */
! 	{ termp_at_pre, NULL }, /* At */
  	{ NULL, NULL }, /* Bc */
  	{ termp_bf_pre, NULL }, /* Bf */ 
  	{ termp_bq_pre, termp_bq_post }, /* Bo */
--- 229,235 ----
  	{ NULL, NULL }, /* Ac */
  	{ termp_aq_pre, termp_aq_post }, /* Ao */
  	{ termp_aq_pre, termp_aq_post }, /* Aq */
! 	{ NULL, NULL }, /* At */
  	{ NULL, NULL }, /* Bc */
  	{ termp_bf_pre, NULL }, /* Bf */ 
  	{ termp_bq_pre, termp_bq_post }, /* Bo */
***************
*** 283,289 ****
  	{ NULL, NULL }, /* Hf */
  	{ NULL, NULL }, /* Fr */
  	{ termp_ud_pre, NULL }, /* Ud */
! 	{ termp_lb_pre, termp_lb_post }, /* Lb */
  	{ termp_pp_pre, NULL }, /* Lp */ 
  	{ termp_lk_pre, NULL }, /* Lk */ 
  	{ termp_mt_pre, NULL }, /* Mt */ 
--- 280,286 ----
  	{ NULL, NULL }, /* Hf */
  	{ NULL, NULL }, /* Fr */
  	{ termp_ud_pre, NULL }, /* Ud */
! 	{ NULL, termp_lb_post }, /* Lb */
  	{ termp_pp_pre, NULL }, /* Lp */ 
  	{ termp_lk_pre, NULL }, /* Lk */ 
  	{ termp_mt_pre, NULL }, /* Mt */ 
***************
*** 322,328 ****
  	 * Main output function.  When this is called, assume that the
  	 * tree is properly formed.
  	 */
- 
  	print_head(p, mdoc_meta(m));
  	assert(mdoc_node(m));
  	assert(MDOC_ROOT == mdoc_node(m)->type);
--- 319,324 ----
***************
*** 1037,1054 ****
  
  /* ARGSUSED */
  static int
- termp_st_pre(DECL_ARGS)
- {
- 	const char	*cp;
- 
- 	if (node->child && (cp = mdoc_a2st(node->child->string)))
- 		term_word(p, cp);
- 	return(0);
- }
- 
- 
- /* ARGSUSED */
- static int
  termp_rs_pre(DECL_ARGS)
  {
  
--- 1033,1038 ----
***************
*** 1293,1315 ****
  
  
  /* ARGSUSED */
- static int
- termp_lb_pre(DECL_ARGS)
- {
- 	const char	*lb;
- 
- 	assert(node->child && MDOC_TEXT == node->child->type);
- 	lb = mdoc_a2lib(node->child->string);
- 	if (lb) {
- 		term_word(p, lb);
- 		return(0);
- 	}
- 	term_word(p, "library");
- 	return(1);
- }
- 
- 
- /* ARGSUSED */
  static void
  termp_lb_post(DECL_ARGS)
  {
--- 1277,1282 ----
***************
*** 1834,1857 ****
  	 */
  	if (node->next && MDOC_In != node->next->tok)
  		term_vspace(p);
- }
- 
- 
- /* ARGSUSED */
- static int
- termp_at_pre(DECL_ARGS)
- {
- 	const char	*att;
- 
- 	att = NULL;
- 
- 	if (node->child)
- 		att = mdoc_a2att(node->child->string);
- 	if (NULL == att)
- 		att = "AT&T UNIX";
- 
- 	term_word(p, att);
- 	return(0);
  }
  
  
--- 1801,1806 ----