diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-08-09 19:59:14 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-08-09 19:59:14 +0000 |
| commit | 402fffbb11a6b188778cb92fe058a62543b1642e (patch) | |
| tree | d3a3d5c7bfbca8f528dcda46d95ddfbd9f5965f9 | |
| parent | 6469e3b83f0e3245301b06b6429b9b86c539974b (diff) | |
sync to 1.8.3: .Pa without arguments is a synonym for .Pa ~
| -rw-r--r-- | usr.bin/mandoc/mdoc_action.c | 12 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_macro.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/mandoc/mdoc_action.c b/usr.bin/mandoc/mdoc_action.c index 8ea01b3300e..8cc6c0f6277 100644 --- a/usr.bin/mandoc/mdoc_action.c +++ b/usr.bin/mandoc/mdoc_action.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_action.c,v 1.16 2009/07/26 01:59:46 schwarze Exp $ */ +/* $Id: mdoc_action.c,v 1.17 2009/08/09 19:59:13 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -42,13 +42,13 @@ static int post_dd(POST_ARGS); static int post_display(POST_ARGS); static int post_dt(POST_ARGS); static int post_lb(POST_ARGS); -static int post_lk(POST_ARGS); static int post_nm(POST_ARGS); static int post_os(POST_ARGS); static int post_prol(POST_ARGS); static int post_sh(POST_ARGS); static int post_st(POST_ARGS); static int post_std(POST_ARGS); +static int post_tilde(POST_ARGS); static int pre_bd(PRE_ARGS); static int pre_dl(PRE_ARGS); @@ -89,7 +89,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, post_nm }, /* Nm */ { NULL, NULL }, /* Op */ { NULL, NULL }, /* Ot */ - { NULL, NULL }, /* Pa */ + { NULL, post_tilde }, /* Pa */ { NULL, post_std }, /* Rv */ { NULL, post_st }, /* St */ { NULL, NULL }, /* Va */ @@ -162,7 +162,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ud */ { NULL, post_lb }, /* Lb */ { NULL, NULL }, /* Lp */ - { NULL, post_lk }, /* Lk */ + { NULL, post_tilde }, /* Lk */ { NULL, NULL }, /* Mt */ { NULL, NULL }, /* Brq */ { NULL, NULL }, /* Bro */ @@ -731,7 +731,7 @@ post_bl(POST_ARGS) static int -post_lk(POST_ARGS) +post_tilde(POST_ARGS) { struct mdoc_node *n; @@ -741,7 +741,7 @@ post_lk(POST_ARGS) n = m->last; m->next = MDOC_NEXT_CHILD; - /* XXX: this isn't documented anywhere! */ + /* XXX: not documented for `Lk'. */ if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "~")) return(0); diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c index 03ccd6b12eb..eeb3d8923fa 100644 --- a/usr.bin/mandoc/mdoc_macro.c +++ b/usr.bin/mandoc/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.17 2009/08/09 17:13:00 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.18 2009/08/09 19:59:13 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -748,6 +748,8 @@ in_line(MACRO_PROT_ARGS) /* FALLTHROUGH */ case (MDOC_Lk): /* FALLTHROUGH */ + case (MDOC_Pa): + /* FALLTHROUGH */ case (MDOC_Ar): nc = 1; break; |