aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--man.324
-rw-r--r--man.728
-rw-r--r--man.c5
-rw-r--r--man.h5
-rw-r--r--man_html.c12
-rw-r--r--man_macro.c5
-rw-r--r--man_term.c9
-rw-r--r--man_validate.c6
8 files changed, 15 insertions, 79 deletions
diff --git a/man.3 b/man.3
index 1a703ae9..8d756b78 100644
--- a/man.3
+++ b/man.3
@@ -1,4 +1,4 @@
-.\" $Id: man.3,v 1.25 2010/10/10 09:47:05 kristaps Exp $
+.\" $Id: man.3,v 1.26 2010/12/05 16:14:16 kristaps Exp $
.\"
.\" Copyright (c) 2009-2010 Kristaps Dzonsons <kristaps@bsd.lv>
.\"
@@ -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: October 10 2010 $
+.Dd $Mdocdate: December 5 2010 $
.Dt MAN 3
.Os
.Sh NAME
@@ -81,27 +81,11 @@ Beyond the full set of macros defined in
.Xr man 7 ,
the
.Nm
-library also accepts the following macros:
+library also accepts the following macro:
.Pp
.Bl -tag -width Ds -compact
.It PD
-Has no effect. Handled as a current-scope line macro.
-.It Sp
-A synonym for
-.Sq sp 0.5v
-.Pq part of the standard preamble for Perl documentation .
-Handled as a line macro.
-.It Vb
-A synonym for
-.Sq nf
-.Pq part of the standard preamble for Perl documentation .
-Handled as a current-scope line macro.
-.It Ve
-A synonym for
-.Sq fi ,
-closing
-.Sq Vb
-.Pq part of the standard preamble for Perl documentation .
+Has no effect.
Handled as a current-scope line macro.
.El
.Ss Types
diff --git a/man.7 b/man.7
index 6d41ef6e..bc49b0cb 100644
--- a/man.7
+++ b/man.7
@@ -1,4 +1,4 @@
-.\" $Id: man.7,v 1.89 2010/09/26 19:46:48 schwarze Exp $
+.\" $Id: man.7,v 1.90 2010/12/05 16:14:16 kristaps Exp $
.\"
.\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
.\"
@@ -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: September 26 2010 $
+.Dd $Mdocdate: December 5 2010 $
.Dt MAN 7
.Os
.Sh NAME
@@ -430,9 +430,6 @@ The syntax is as follows:
.It Sx \&nf Ta 0 Ta current Ta compat
.It Sx \&r Ta 0 Ta current Ta compat
.It Sx \&sp Ta 1 Ta current Ta compat
-.\" .It Sx \&Sp Ta <1 Ta current Ta compat
-.\" .It Sx \&Vb Ta <1 Ta current Ta compat
-.\" .It Sx \&Ve Ta 0 Ta current Ta compat
.El
.Pp
Macros marked as
@@ -821,12 +818,6 @@ See also
.Sx \&P ,
and
.Sx \&PP .
-.\" .
-.\" .
-.\" .Ss \&PD
-.\" Has no effect. Included for compatibility.
-.\" .
-.\" .
.Ss \&UC
Sets the volume for the footer for compatibility with man pages from
BSD releases.
@@ -897,21 +888,6 @@ Defaults to 1, if unspecified.
.Pp
See also
.Sx \&br .
-.\" .Ss \&Sp
-.\" A synonym for
-.\" .Sx \&sp
-.\" .Cm 0.5v .
-.\" .
-.\" .Ss \&Vb
-.\" A synonym for
-.\" .Sx \&nf .
-.\" Accepts an argument (the height of the formatted space) which is
-.\" disregarded.
-.\" .
-.\" .Ss \&Ve
-.\" A synonym for
-.\" .Sx \&fi .
-.\" .
.Sh COMPATIBILITY
This section documents areas of questionable portability between
implementations of the
diff --git a/man.c b/man.c
index 8f43f94a..589b0633 100644
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.88 2010/11/30 15:36:28 kristaps Exp $ */
+/* $Id: man.c,v 1.89 2010/12/05 16:14:16 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -39,8 +39,7 @@ const char *const __man_macronames[MAN_MAX] = {
"RI", "na", "i", "sp",
"nf", "fi", "r", "RE",
"RS", "DT", "UC", "PD",
- "Sp", "Vb", "Ve", "AT",
- "in"
+ "AT", "in"
};
const char * const *man_macronames = __man_macronames;
diff --git a/man.h b/man.h
index 21c1a321..43a71bfb 100644
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/* $Id: man.h,v 1.45 2010/10/04 07:01:02 kristaps Exp $ */
+/* $Id: man.h,v 1.46 2010/12/05 16:14:16 kristaps Exp $ */
/*
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -53,9 +53,6 @@ enum mant {
MAN_DT,
MAN_UC,
MAN_PD,
- MAN_Sp,
- MAN_Vb,
- MAN_Ve,
MAN_AT,
MAN_in,
MAN_MAX
diff --git a/man_html.c b/man_html.c
index 0a386e07..63de4534 100644
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/* $Id: man_html.c,v 1.45 2010/07/23 12:27:28 kristaps Exp $ */
+/* $Id: man_html.c,v 1.46 2010/12/05 16:14:16 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -112,9 +112,6 @@ static const struct htmlman mans[MAN_MAX] = {
{ man_ign_pre, NULL }, /* DT */
{ man_ign_pre, NULL }, /* UC */
{ man_ign_pre, NULL }, /* PD */
- { man_br_pre, NULL }, /* Sp */
- { man_literal_pre, NULL }, /* Vb */
- { man_literal_pre, NULL }, /* Ve */
{ man_ign_pre, NULL }, /* AT */
{ man_in_pre, NULL }, /* in */
};
@@ -366,9 +363,6 @@ man_br_pre(MAN_ARGS)
SCALE_VS_INIT(&su, 1);
switch (n->tok) {
- case (MAN_Sp):
- SCALE_VS_INIT(&su, 0.5);
- break;
case (MAN_sp):
if (n->child)
a2roffsu(n->child->string, &su, SCALE_VS);
@@ -738,11 +732,9 @@ man_literal_pre(MAN_ARGS)
switch (n->tok) {
case (MAN_nf):
- /* FALLTHROUGH */
- case (MAN_Vb):
print_otag(h, TAG_BR, 0, NULL);
mh->fl |= MANH_LITERAL;
- return(MAN_Vb != n->tok);
+ break;
default:
mh->fl &= ~MANH_LITERAL;
break;
diff --git a/man_macro.c b/man_macro.c
index e866d81d..32179c67 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.51 2010/11/30 15:36:28 kristaps Exp $ */
+/* $Id: man_macro.c,v 1.52 2010/12/05 16:14:16 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -79,9 +79,6 @@ const struct man_macro __man_macros[MAN_MAX] = {
{ in_line_eoln, 0 }, /* DT */
{ in_line_eoln, 0 }, /* UC */
{ in_line_eoln, 0 }, /* PD */
- { in_line_eoln, MAN_NSCOPED }, /* Sp */
- { in_line_eoln, 0 }, /* Vb */
- { in_line_eoln, 0 }, /* Ve */
{ in_line_eoln, 0 }, /* AT */
{ in_line_eoln, 0 }, /* in */
};
diff --git a/man_term.c b/man_term.c
index f9a02fda..fa51615d 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/* $Id: man_term.c,v 1.85 2010/09/15 14:36:16 kristaps Exp $ */
+/* $Id: man_term.c,v 1.86 2010/12/05 16:14:16 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -137,9 +137,6 @@ static const struct termact termacts[MAN_MAX] = {
{ pre_ign, NULL, 0 }, /* DT */
{ pre_ign, NULL, 0 }, /* UC */
{ pre_ign, NULL, 0 }, /* PD */
- { pre_sp, NULL, MAN_NOTEXT }, /* Sp */
- { pre_literal, NULL, 0 }, /* Vb */
- { pre_literal, NULL, 0 }, /* Ve */
{ pre_ign, NULL, 0 }, /* AT */
{ pre_in, NULL, MAN_NOTEXT }, /* in */
};
@@ -254,11 +251,9 @@ pre_literal(DECL_ARGS)
term_newln(p);
switch (n->tok) {
- case (MAN_Vb):
- /* FALLTHROUGH */
case (MAN_nf):
mt->fl |= MANT_LITERAL;
- return(MAN_Vb != n->tok);
+ break;
default:
mt->fl &= ~MANT_LITERAL;
break;
diff --git a/man_validate.c b/man_validate.c
index 5862fc2c..f899f929 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/* $Id: man_validate.c,v 1.51 2010/11/30 15:24:27 kristaps Exp $ */
+/* $Id: man_validate.c,v 1.52 2010/12/05 16:14:16 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -70,7 +70,6 @@ static v_check posts_part[] = { check_part, NULL };
static v_check posts_sec[] = { check_sec, NULL };
static v_check posts_th[] = { check_ge2, check_le5, check_title, post_TH, NULL };
static v_check posts_uc[] = { post_UC, NULL };
-static v_check posts_vb[] = { check_le1, post_nf, NULL };
static v_check pres_bline[] = { check_bline, NULL };
@@ -107,9 +106,6 @@ static const struct man_valid man_valids[MAN_MAX] = {
{ NULL, NULL }, /* DT */
{ NULL, posts_uc }, /* UC */
{ NULL, NULL }, /* PD */
- { NULL, posts_le1 }, /* Sp */ /* FIXME: should warn only. */
- { pres_bline, posts_vb }, /* Vb */ /* FIXME: should warn only. */
- { pres_bline, posts_fi }, /* Ve */
{ NULL, posts_at }, /* AT */
{ NULL, NULL }, /* in */
};
generated by cgit v1.2.3-56-ge451 (git 2.39.0) at 2024-06-23 02:35:42 +0000