From 922b4298b735175f477fe5dde8b3c0c5c7c8c07c Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 11 Jun 2009 07:26:35 +0000 Subject: [PATCH] Fixed email address in manual AUTHOR reference. Set max right margin to 80 columns (schwarze@openbsd.org). Fixed centre-field heading position (schwarze@openbsd.org). Also fixed -Tman centre-field. --- man.3 | 6 +++--- man.7 | 6 +++--- man_term.c | 4 ++-- mandoc.1 | 6 +++--- mandoc_char.7 | 6 +++--- mdoc.3 | 6 +++--- mdoc.7 | 6 +++--- mdoc_term.c | 4 ++-- term.c | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/man.3 b/man.3 index c55ef89b..3c9cd5de 100644 --- a/man.3 +++ b/man.3 @@ -1,4 +1,4 @@ -.\" $Id: man.3,v 1.4 2009/06/10 20:18:43 kristaps Exp $ +.\" $Id: man.3,v 1.5 2009/06/11 07:26:35 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 10 2009 $ +.Dd $Mdocdate: June 11 2009 $ .Dt MAN 3 .Os .\" SECTION @@ -274,4 +274,4 @@ man_free(man); The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@openbsd.org . +.An Kristaps Dzonsons Aq kristaps@kth.se . diff --git a/man.7 b/man.7 index 2899c8c9..e9dd35d9 100644 --- a/man.7 +++ b/man.7 @@ -1,4 +1,4 @@ -.\" $Id: man.7,v 1.11 2009/06/10 20:18:43 kristaps Exp $ +.\" $Id: man.7,v 1.12 2009/06/11 07:26:35 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 10 2009 $ +.Dd $Mdocdate: June 11 2009 $ .Dt MAN 7 .Os .\" SECTION @@ -195,7 +195,7 @@ macros. The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@openbsd.org . +.An Kristaps Dzonsons Aq kristaps@kth.se . .\" SECTION .Sh CAVEATS Do not use this language. Use diff --git a/man_term.c b/man_term.c index 67cafb20..ef1d6636 100644 --- a/man_term.c +++ b/man_term.c @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.9 2009/06/10 20:18:43 kristaps Exp $ */ +/* $Id: man_term.c,v 1.10 2009/06/11 07:26:35 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -495,7 +495,7 @@ print_head(struct termp *p, const struct man_meta *meta) meta->title, meta->msec); p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf)) / 2; + p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; term_word(p, title); diff --git a/mandoc.1 b/mandoc.1 index 03d0e02d..ab688306 100644 --- a/mandoc.1 +++ b/mandoc.1 @@ -1,4 +1,4 @@ -.\" $Id: mandoc.1,v 1.17 2009/06/10 20:18:43 kristaps Exp $ +.\" $Id: mandoc.1,v 1.18 2009/06/11 07:26:35 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 10 2009 $ +.Dd $Mdocdate: June 11 2009 $ .Dt MANDOC 1 .Os .\" SECTION @@ -248,7 +248,7 @@ To page manuals to the terminal: The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@openbsd.org . +.An Kristaps Dzonsons Aq kristaps@kth.se . .\" SECTION .Sh CAVEATS The diff --git a/mandoc_char.7 b/mandoc_char.7 index 8b061d27..aa38504d 100644 --- a/mandoc_char.7 +++ b/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $Id: mandoc_char.7,v 1.5 2009/06/10 20:18:43 kristaps Exp $ +.\" $Id: mandoc_char.7,v 1.6 2009/06/11 07:26:35 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 10 2009 $ +.Dd $Mdocdate: June 11 2009 $ .Dt MANDOC_CHAR 7 .Os .\" SECTION @@ -477,4 +477,4 @@ mode. The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@openbsd.org . +.An Kristaps Dzonsons Aq kristaps@kth.se . diff --git a/mdoc.3 b/mdoc.3 index fd5db6e1..6c50a489 100644 --- a/mdoc.3 +++ b/mdoc.3 @@ -1,4 +1,4 @@ -.\" $Id: mdoc.3,v 1.29 2009/06/10 20:18:43 kristaps Exp $ +.\" $Id: mdoc.3,v 1.30 2009/06/11 07:26:35 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 10 2009 $ +.Dd $Mdocdate: June 11 2009 $ .Dt MDOC 3 .Os .\" SECTION @@ -297,7 +297,7 @@ mdoc_free(mdoc); The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@openbsd.org . +.An Kristaps Dzonsons Aq kristaps@kth.se . .\" SECTION .Sh CAVEATS .Bl -dash -compact diff --git a/mdoc.7 b/mdoc.7 index 8c824529..0d5dd99f 100644 --- a/mdoc.7 +++ b/mdoc.7 @@ -1,4 +1,4 @@ -.\" $Id: mdoc.7,v 1.23 2009/06/10 20:18:43 kristaps Exp $ +.\" $Id: mdoc.7,v 1.24 2009/06/11 07:26:35 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 10 2009 $ +.Dd $Mdocdate: June 11 2009 $ .Dt MDOC 7 .Os .\" SECTION @@ -531,7 +531,7 @@ is callable. The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@openbsd.org . +.An Kristaps Dzonsons Aq kristaps@kth.se . .\" SECTION .Sh CAVEATS There are several ambiguous parts of mdoc. diff --git a/mdoc_term.c b/mdoc_term.c index a43bde55..5a7f5921 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.7 2009/06/10 20:18:43 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.8 2009/06/11 07:26:35 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -485,7 +485,7 @@ print_head(struct termp *p, const struct mdoc_meta *meta) meta->title, meta->msec); p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf)) / 2; + p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; term_word(p, title); diff --git a/term.c b/term.c index 0cdae1d3..feab2941 100644 --- a/term.c +++ b/term.c @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.75 2009/06/10 20:18:44 kristaps Exp $ */ +/* $Id: term.c,v 1.76 2009/06/11 07:26:35 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -106,7 +106,7 @@ term_alloc(enum termenc enc) if (NULL == (p = malloc(sizeof(struct termp)))) err(1, "malloc"); bzero(p, sizeof(struct termp)); - p->maxrmargin = 78; + p->maxrmargin = 80; p->enc = enc; return(p); } -- 2.47.1