aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_term.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2012-07-09 23:53:36 +0000
committerIngo Schwarze <schwarze@openbsd.org>2012-07-09 23:53:36 +0000
commit46e3c278c370d1404debff5aa25ae184a3e13a14 (patch)
tree980813ad358b1aac2da0a38052830a0c4d6e617a /mdoc_term.c
parent1c4bd309e3fdb17789722bddac6ba8b2c1de4f42 (diff)
downloadmandoc-46e3c278c370d1404debff5aa25ae184a3e13a14.tar.gz
mandoc-46e3c278c370d1404debff5aa25ae184a3e13a14.tar.zst
mandoc-46e3c278c370d1404debff5aa25ae184a3e13a14.zip
fix -Tascii .Fd line breaking
and implement -Tman .Fd OpenBSD rev. 1.27 and 1.143, respectively
Diffstat (limited to 'mdoc_term.c')
-rw-r--r--mdoc_term.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/mdoc_term.c b/mdoc_term.c
index cff10571..36181778 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_term.c,v 1.240 2012/07/08 22:49:29 schwarze Exp $ */
+/* $Id: mdoc_term.c,v 1.241 2012/07/09 23:53:36 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -69,7 +69,7 @@ static void termp_an_post(DECL_ARGS);
static void termp_bd_post(DECL_ARGS);
static void termp_bk_post(DECL_ARGS);
static void termp_bl_post(DECL_ARGS);
-static void termp_d1_post(DECL_ARGS);
+static void termp_fd_post(DECL_ARGS);
static void termp_fo_post(DECL_ARGS);
static void termp_in_post(DECL_ARGS);
static void termp_it_post(DECL_ARGS);
@@ -129,8 +129,8 @@ static const struct termact termacts[MDOC_MAX] = {
{ termp_sh_pre, termp_sh_post }, /* Sh */
{ termp_ss_pre, termp_ss_post }, /* Ss */
{ termp_sp_pre, NULL }, /* Pp */
- { termp_d1_pre, termp_d1_post }, /* D1 */
- { termp_d1_pre, termp_d1_post }, /* Dl */
+ { termp_d1_pre, termp_bl_post }, /* D1 */
+ { termp_d1_pre, termp_bl_post }, /* Dl */
{ termp_bd_pre, termp_bd_post }, /* Bd */
{ NULL, NULL }, /* Ed */
{ termp_bl_pre, termp_bl_post }, /* Bl */
@@ -146,7 +146,7 @@ static const struct termact termacts[MDOC_MAX] = {
{ NULL, NULL }, /* Ev */
{ termp_ex_pre, NULL }, /* Ex */
{ termp_fa_pre, NULL }, /* Fa */
- { termp_fd_pre, NULL }, /* Fd */
+ { termp_fd_pre, termp_fd_post }, /* Fd */
{ termp_fl_pre, NULL }, /* Fl */
{ termp_fn_pre, NULL }, /* Fn */
{ termp_ft_pre, NULL }, /* Ft */
@@ -1407,6 +1407,15 @@ termp_fd_pre(DECL_ARGS)
/* ARGSUSED */
+static void
+termp_fd_post(DECL_ARGS)
+{
+
+ term_newln(p);
+}
+
+
+/* ARGSUSED */
static int
termp_sh_pre(DECL_ARGS)
{
@@ -1500,17 +1509,6 @@ termp_d1_pre(DECL_ARGS)
/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
-{
-
- if (MDOC_BLOCK != n->type)
- return;
- term_newln(p);
-}
-
-
-/* ARGSUSED */
static int
termp_ft_pre(DECL_ARGS)
{