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.

diff --git a/man.3 b/man.3
index c55ef89b1455282d7c8ca17b183205fc96b8c340..3c9cd5de3d602aeb6f7e5f9032c6d4abff671cb0 100644 (file)
--- 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 <kristaps@kth.se>
 .\"
@@ -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 2899c8c99bcaeb310a0441afe946fc3c19f7863f..e9dd35d918a570562d164b129cc0ce4e511bd6de 100644 (file)
--- 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 <kristaps@kth.se>
 .\"
@@ -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 67cafb20ed200ef066fb9e2e8def891dc04a25ca..ef1d66367f0da4f1ff40c3ffee21c2b81fe863a4 100644 (file)
--- 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 <kristaps@kth.se>
  *
@@ -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 03d0e02d5f259dba0dd20440550c474d5f1a7331..ab688306655430994a3b7373e550041d634e8eb4 100644 (file)
--- 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 <kristaps@kth.se>
 .\"
@@ -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 8b061d27a98ee5a60a2f385c8a53e82bc76876a8..aa38504d1859fa75096006897fec841f1bd84aa3 100644 (file)
--- 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 <kristaps@kth.se>
 .\"
@@ -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 fd5db6e1af42ddfcb97dfc2255757bd4021f0ee6..6c50a489483cd2e6e800b820db4e8e3e324629e3 100644 (file)
--- 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 <kristaps@kth.se>
 .\"
@@ -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 8c824529c76737cdaa3b26508587fc061297b8f7..0d5dd99f4403691cf29d18f346f55339b467b622 100644 (file)
--- 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 <kristaps@kth.se>
 .\"
@@ -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 a43bde55469dc888f9d1c757b96f7190854f69eb..5a7f59212e270a3a027a3a2a8afa178dc65d4b59 100644 (file)
--- 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 <kristaps@kth.se>
  *
@@ -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 0cdae1d3b50d5e17df811738bc1152f8e5b2251d..feab294148a3689e64539adf4d3be9a6068b9ac9 100644 (file)
--- 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 <kristaps@kth.se>
  *
@@ -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);
 }