From 22c17699961b61390b0edf1528ac584f4dee3b8d Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Mon, 16 Mar 2009 23:37:28 +0000 Subject: Changed e-mail address to @openbsd. Cleaned up manual-page documentation. --- Makefile | 4 ++-- action.c | 5 +++-- argv.c | 5 +++-- hash.c | 4 ++-- macro.c | 5 +++-- mdoc.3 | 6 +++--- mdoc.7 | 28 +++++++++++++++++++++++----- mdoc.c | 6 +++--- mdoc.h | 5 +++-- mdoclint.1 | 8 ++++---- mdoclint.c | 4 ++-- mdocterm.1 | 6 +++--- mdocterm.c | 4 ++-- mdoctree.1 | 8 ++++---- mdoctree.c | 4 ++-- mmain.c | 4 ++-- term.c | 16 ++++++++++++++-- validate.c | 5 +++-- xstd.c | 4 ++-- 19 files changed, 83 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index b33a43b6..ae859aa2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .SUFFIXES: .html .sgml -VERSION = 1.5.1 -VDATE = 15 March 2009 +VERSION = 1.5.2 +VDATE = 17 March 2009 BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include diff --git a/action.c b/action.c index 589f16aa..33a5fb35 100644 --- a/action.c +++ b/action.c @@ -1,6 +1,6 @@ -/* $Id: action.c,v 1.42 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: action.c,v 1.43 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -183,6 +183,7 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* %C */ { NULL }, /* Es */ { NULL }, /* En */ + { NULL }, /* Dx */ }; diff --git a/argv.c b/argv.c index 20eaa3fb..c0b8e65a 100644 --- a/argv.c +++ b/argv.c @@ -1,6 +1,6 @@ -/* $Id: argv.c,v 1.52 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: argv.c,v 1.53 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -222,6 +222,7 @@ static int mdoc_argflags[MDOC_MAX] = { ARGS_QUOTED, /* %C */ 0, /* Es */ 0, /* En */ + 0, /* Dx */ }; diff --git a/hash.c b/hash.c index fe6ce6c7..6301c291 100644 --- a/hash.c +++ b/hash.c @@ -1,6 +1,6 @@ -/* $Id: hash.c,v 1.10 2009/03/11 00:39:58 kristaps Exp $ */ +/* $Id: hash.c,v 1.11 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the diff --git a/macro.c b/macro.c index dff02ed4..4bcc7d43 100644 --- a/macro.c +++ b/macro.c @@ -1,6 +1,6 @@ -/* $Id: macro.c,v 1.72 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: macro.c,v 1.73 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -197,6 +197,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { in_line_eoln, 0 }, /* %C */ { obsolete, 0 }, /* Es */ { obsolete, 0 }, /* En */ + { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */ }; const struct mdoc_macro * const mdoc_macros = __mdoc_macros; diff --git a/mdoc.3 b/mdoc.3 index 37b68091..b0ab387d 100644 --- a/mdoc.3 +++ b/mdoc.3 @@ -1,6 +1,6 @@ -.\" $Id: mdoc.3,v 1.18 2009/03/16 22:19:19 kristaps Exp $ +.\" $Id: mdoc.3,v 1.19 2009/03/16 23:37:28 kristaps Exp $ .\" -.\" Copyright (c) 2009 Kristaps Dzonsons +.\" Copyright (c) 2009 Kristaps Dzonsons .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the @@ -294,7 +294,7 @@ mdoc_free(mdoc); The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@kth.se . +.An Kristaps Dzonsons Aq kristaps@openbsd.org . .\" SECTION .Sh CAVEATS .Bl -dash -compact diff --git a/mdoc.7 b/mdoc.7 index cbadee2e..66caccfc 100644 --- a/mdoc.7 +++ b/mdoc.7 @@ -1,6 +1,6 @@ -.\" $Id: mdoc.7,v 1.5 2009/03/16 22:19:19 kristaps Exp $ +.\" $Id: mdoc.7,v 1.6 2009/03/16 23:37:28 kristaps Exp $ .\" -.\" Copyright (c) 2009 Kristaps Dzonsons +.\" Copyright (c) 2009 Kristaps Dzonsons .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the @@ -41,8 +41,7 @@ of these macros. .\" SECTION .Sh CHARACTER ENCODING .Nm -documents may contain only printable alphanumeric characters, the space -character +documents may contain only printable characters, the space character .Sq \ , and, in certain circumstances, the tab character .Sq \et . @@ -643,6 +642,7 @@ then the macro accepts an arbitrary number of arguments. .It \&.Sy Ta Yes Ta Yes Ta >0 .It \&.Tn Ta Yes Ta Yes Ta >0 .It \&.Ux Ta Yes Ta Yes Ta n +.It \&.Dx Ta Yes Ta Yes Ta n .It \&.Bt Ta \&No Ta \&No Ta 0 .It \&.Hf Ta \&No Ta \&No Ta n .It \&.Fr Ta \&No Ta \&No Ta n @@ -652,7 +652,17 @@ then the macro accepts an arbitrary number of arguments. .It \&.Lp Ta \&No Ta \&No Ta 0 .It \&.Lk Ta \&No Ta Yes Ta >0 .It \&.Mt Ta \&No Ta Yes Ta >0 +.It \&.Es Ta \&No Ta \&No Ta 0 +.It \&.En Ta \&No Ta \&No Ta 0 .El +.Pp +The +.Sq \&Ot , +.Sq \&Fr , +.Sq \&Es +and +.Sq \&En , +macros are obsolete. .\" SECTION .Sh COMPATIBILITY The mdoc language was traditionally a @@ -718,7 +728,7 @@ is callable. The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@kth.se . +.An Kristaps Dzonsons Aq kristaps@openbsd.org . .\" SECTION .Sh CAVEATS There are several ambiguous parts of mdoc. @@ -773,4 +783,12 @@ The .Sq \&Dt macro lacks clarity. It should be absolutely clear which title will render when formatting the manual page. +.\" LIST-ITEM +.It +A +.Sq \&Lx +should be provided for Linux (\(`a la +.Sq \&Ox , +.Sq \&Nx +etc.). .El diff --git a/mdoc.c b/mdoc.c index e99cb376..56cab045 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,6 +1,6 @@ -/* $Id: mdoc.c,v 1.65 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.66 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -75,7 +75,7 @@ const char *const __mdoc_macronames[MDOC_MAX] = { "Lp", "Lk", "Mt", "Brq", /* LINTED */ "Bro", "Brc", "\%C", "Es", - "En" + "En", "Dx" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { diff --git a/mdoc.h b/mdoc.h index 6e55aaf4..11b01858 100644 --- a/mdoc.h +++ b/mdoc.h @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.48 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.49 2009/03/16 23:37:28 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -148,7 +148,8 @@ #define MDOC__C 114 #define MDOC_Es 115 #define MDOC_En 116 -#define MDOC_MAX 117 +#define MDOC_Dx 117 +#define MDOC_MAX 118 /* What follows is a list of ALL possible macro arguments. */ diff --git a/mdoclint.1 b/mdoclint.1 index 2c3d13eb..a1e6b176 100644 --- a/mdoclint.1 +++ b/mdoclint.1 @@ -1,6 +1,6 @@ -.\" $Id: mdoclint.1,v 1.4 2009/03/15 07:08:52 kristaps Exp $ +.\" $Id: mdoclint.1,v 1.5 2009/03/16 23:37:28 kristaps Exp $ .\" -.\" Copyright (c) 2009 Kristaps Dzonsons +.\" Copyright (c) 2009 Kristaps Dzonsons .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the @@ -16,7 +16,7 @@ .\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 15 2009 $ +.Dd $Mdocdate: March 16 2009 $ .Dt mdoclint 1 .Os .\" SECTION @@ -148,7 +148,7 @@ To validate this manual page: The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@kth.se . +.An Kristaps Dzonsons Aq kristaps@openbsd.org . .\" SECTION .Sh CAVEATS See diff --git a/mdoclint.c b/mdoclint.c index 2dab9190..b9240d4b 100644 --- a/mdoclint.c +++ b/mdoclint.c @@ -1,6 +1,6 @@ - /* $Id: mdoclint.c,v 1.3 2009/03/15 07:08:52 kristaps Exp $ */ +/* $Id: mdoclint.c,v 1.4 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the diff --git a/mdocterm.1 b/mdocterm.1 index f3fa7ddc..35de2fe1 100644 --- a/mdocterm.1 +++ b/mdocterm.1 @@ -1,6 +1,6 @@ -.\" $Id: mdocterm.1,v 1.23 2009/03/16 22:19:19 kristaps Exp $ +.\" $Id: mdocterm.1,v 1.24 2009/03/16 23:37:28 kristaps Exp $ .\" -.\" Copyright (c) 2009 Kristaps Dzonsons +.\" Copyright (c) 2009 Kristaps Dzonsons .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the @@ -203,7 +203,7 @@ To pipe a manual page to the pager: The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@kth.se . +.An Kristaps Dzonsons Aq kristaps@openbsd.org . .\" SECTION .Sh CAVEATS See diff --git a/mdocterm.c b/mdocterm.c index a742328c..4bcea5e4 100644 --- a/mdocterm.c +++ b/mdocterm.c @@ -1,6 +1,6 @@ -/* $Id: mdocterm.c,v 1.46 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: mdocterm.c,v 1.47 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the diff --git a/mdoctree.1 b/mdoctree.1 index 0894b2ba..e9dbaf62 100644 --- a/mdoctree.1 +++ b/mdoctree.1 @@ -1,6 +1,6 @@ -.\" $Id: mdoctree.1,v 1.6 2009/03/09 13:04:01 kristaps Exp $ +.\" $Id: mdoctree.1,v 1.7 2009/03/16 23:37:28 kristaps Exp $ .\" -.\" Copyright (c) 2009 Kristaps Dzonsons +.\" Copyright (c) 2009 Kristaps Dzonsons .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the @@ -16,7 +16,7 @@ .\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 9 2009 $ +.Dd $Mdocdate: March 16 2009 $ .Dt mdoctree 1 .Os .\" SECTION @@ -154,7 +154,7 @@ To validate this manual page: The .Nm utility was written by -.An Kristaps Dzonsons Aq kristaps@kth.se . +.An Kristaps Dzonsons Aq kristaps@openbsd.org . .\" SECTION .Sh CAVEATS See diff --git a/mdoctree.c b/mdoctree.c index 7fcc6255..3b48b8f7 100644 --- a/mdoctree.c +++ b/mdoctree.c @@ -1,6 +1,6 @@ - /* $Id: mdoctree.c,v 1.7 2009/03/15 07:08:53 kristaps Exp $ */ +/* $Id: mdoctree.c,v 1.8 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the diff --git a/mmain.c b/mmain.c index df70a2ee..59ccf0f9 100644 --- a/mmain.c +++ b/mmain.c @@ -1,6 +1,6 @@ - /* $Id: mmain.c,v 1.13 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: mmain.c,v 1.14 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the diff --git a/term.c b/term.c index 6a81765a..8d73f624 100644 --- a/term.c +++ b/term.c @@ -1,6 +1,6 @@ -/* $Id: term.c,v 1.60 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: term.c,v 1.61 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -149,6 +149,7 @@ DECL_PRE(termp_bsx); DECL_PRE(termp_bt); DECL_PRE(termp_cd); DECL_PRE(termp_cm); +DECL_PRE(termp_dx); DECL_PRE(termp_em); DECL_PRE(termp_ex); DECL_PRE(termp_fa); @@ -298,6 +299,7 @@ const struct termact __termacts[MDOC_MAX] = { { NULL, NULL }, /* %C */ { NULL, NULL }, /* Es */ { NULL, NULL }, /* En */ + { termp_dx_pre, NULL }, /* Dx */ }; const struct termact *termacts = __termacts; @@ -1390,6 +1392,16 @@ termp_ox_pre(DECL_ARGS) } +/* ARGSUSED */ +static int +termp_dx_pre(DECL_ARGS) +{ + + word(p, "DragonFly"); + return(1); +} + + /* ARGSUSED */ static int termp_ux_pre(DECL_ARGS) diff --git a/validate.c b/validate.c index 58b4aa57..43c2da53 100644 --- a/validate.c +++ b/validate.c @@ -1,6 +1,6 @@ -/* $Id: validate.c,v 1.84 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: validate.c,v 1.85 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the @@ -315,6 +315,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_text }, /* %C */ { NULL, NULL }, /* Es */ { NULL, NULL }, /* En */ + { NULL, NULL }, /* Dx */ }; diff --git a/xstd.c b/xstd.c index 383653bb..e1e5262d 100644 --- a/xstd.c +++ b/xstd.c @@ -1,6 +1,6 @@ -/* $Id: xstd.c,v 1.10 2009/03/16 22:19:19 kristaps Exp $ */ +/* $Id: xstd.c,v 1.11 2009/03/16 23:37:28 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the -- cgit v1.2.3-56-ge451