Implement SYNOPSIS .Fn indentation for -Tman.

diff --git a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in
index 37832bb..62c3e03 100644 (file)
--- a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in
+++ b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.in
@@ -7,6 +7,9 @@
 .Sh SYNOPSIS
 In the synopsis, almost all macros do not show
 .No the word keep effect they would get in a \&Bk block.
+.Pp
+.Fn xxxxxxxxxxxxxxxxxxxx "xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx" xxxxxxxxxxxxxxxxxxxx
+.Pp
 .Nm ksh
 .Op Fl +abCefhiklmnpruvXx
 .Op Fl +o Ar option

diff --git a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii
index 082defe..01e839f 100644 (file)
--- a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii
@@ -6,6 +6,10 @@ N\bNA\bAM\bME\bE
 S\bSY\bYN\bNO\bOP\bPS\bSI\bIS\bS
      In the synopsis, almost all macros do not show the word keep effect they
      would get in a Bk block.
+
+     x\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bxx\bx(_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx _\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx,
+         _\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx_\bx);
+
      k\bks\bsh\bh [-\b-+\b+a\bab\bbC\bCe\bef\bfh\bhi\bik\bkl\blm\bmn\bnp\bpr\bru\buv\bvX\bXx\bx] [-\b-+\b+o\bo _\bo_\bp_\bt_\bi_\bo_\bn]
          [-\b-c\bc _\bs_\bt_\br_\bi_\bn_\bg | -\b-s\bs | _\bf_\bi_\bl_\be [_\ba_\br_\bg_\bu_\bm_\be_\bn_\bt _\b._\b._\b.]]
      k\bks\bsh\bh [-\b-+\b+a\bab\bbC\bCe\bef\bfh\bhi\bik\bkl\blm\bmn\bnp\bpr\bru\buv\bvX\bXx\bx] [-\b-+\b+o\bo _\bo_\bp_\bt_\bi_\bo_\bn]
@@ -15,4 +19,4 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
      k\bks\bsh\bh [-\b-+\b+a\bab\bbC\bCe\bef\bfh\bhi\bik\bkl\blm\bmn\bnp\bpr\bru\buv\bvX\bXx\bx] [-\b-+\b+o\bo _\bo_\bp_\bt_\bi_\bo_\bn] [-\b-c\bc _\bs_\bt_\br_\bi_\bn_\bg | -\b-s\bs | _\bf_\bi_\bl_\be [_\ba_\br_\bg_\bu_\bm_\be_\bn_\bt
      _\b._\b._\b.]]
 
-OpenBSD                          May 29, 2013                          OpenBSD
+OpenBSD                        December 24, 2013                       OpenBSD

diff --git a/usr.bin/mandoc/mdoc_man.c b/usr.bin/mandoc/mdoc_man.c
index 3798dea..2cc2341 100644 (file)
--- a/usr.bin/mandoc/mdoc_man.c
+++ b/usr.bin/mandoc/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.53 2013/12/24 20:45:21 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.54 2013/12/24 22:08:23 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -1087,6 +1087,9 @@ pre_fn(DECL_ARGS)
        if (NULL == n)
                return(0);
 
+       if (MDOC_SYNPRETTY & n->flags)
+               print_block(".HP 4n", MMAN_nl);
+
        font_push('B');
        print_node(meta, n);
        font_pop();
@@ -1107,7 +1110,7 @@ post_fn(DECL_ARGS)
        print_word(")");
        if (MDOC_SYNPRETTY & n->flags) {
                print_word(";");
-               outflags |= MMAN_br;
+               outflags |= MMAN_PP;
        }
 }