summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--action.c3
-rw-r--r--argv.c3
-rw-r--r--hash.c2
-rw-r--r--macro.c3
-rw-r--r--mdoc.34
-rw-r--r--mdoc.726
-rw-r--r--mdoc.c4
-rw-r--r--mdoc.h3
-rw-r--r--mdoclint.14
-rw-r--r--mdoclint.c4
-rw-r--r--mdocterm.14
-rw-r--r--mdocterm.c2
-rw-r--r--mdoctree.14
-rw-r--r--mdoctree.c4
-rw-r--r--mmain.c4
-rw-r--r--term.c14
-rw-r--r--validate.c3
-rw-r--r--xstd.c2
19 files changed, 66 insertions, 31 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 1324f365..d88643ac 100644
--- a/action.c
+++ b/action.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 6f9d16ab..ec2555d3 100644
--- a/argv.c
+++ b/argv.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 2e5e9fc6..78d907f2 100644
--- a/hash.c
+++ b/hash.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 45eb1938..a274a362 100644
--- a/macro.c
+++ b/macro.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 56d18b7e..89cfbbf0 100644
--- a/mdoc.3
+++ b/mdoc.3
@@ -1,6 +1,6 @@
.\" $Id$
.\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
.\"
.\" 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 74b86a62..df79cc4a 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -1,6 +1,6 @@
.\" $Id$
.\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
.\"
.\" 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 83bcb351..a08842e3 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 8e872755..0d093fa7 100644
--- a/mdoc.h
+++ b/mdoc.h
@@ -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 7b00acb1..9bd7c3d6 100644
--- a/mdoclint.1
+++ b/mdoclint.1
@@ -1,6 +1,6 @@
.\" $Id$
.\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the
@@ -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 a99ec21e..526df42d 100644
--- a/mdoclint.c
+++ b/mdoclint.c
@@ -1,6 +1,6 @@
- /* $Id$ */
+/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 8568e8d1..3ea9b49e 100644
--- a/mdocterm.1
+++ b/mdocterm.1
@@ -1,6 +1,6 @@
.\" $Id$
.\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
.\"
.\" 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 8464e370..6e308939 100644
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 d494ae43..631ff5da 100644
--- a/mdoctree.1
+++ b/mdoctree.1
@@ -1,6 +1,6 @@
.\" $Id$
.\"
-.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+.\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the
@@ -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 5ad68e32..68f08d4a 100644
--- a/mdoctree.c
+++ b/mdoctree.c
@@ -1,6 +1,6 @@
- /* $Id$ */
+/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 35596b8e..b8936eed 100644
--- a/mmain.c
+++ b/mmain.c
@@ -1,6 +1,6 @@
- /* $Id$ */
+/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 c12bc618..c0819fa2 100644
--- a/term.c
+++ b/term.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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;
@@ -1392,6 +1394,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 9037b6d4..1d63dda4 100644
--- a/validate.c
+++ b/validate.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* 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 cf251efb..52437901 100644
--- a/xstd.c
+++ b/xstd.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the
generated by cgit (git 2.34.1) at 2024-11-10 23:04:32 +0000