From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Remove `Sp', `Vb', and `Ve' (as per schwarze@'s changes in
Date: Sun, 5 Dec 2010 11:14:16 -0500 (EST) [thread overview]
Message-ID: <201012051614.oB5GEGv9015753@krisdoz.my.domain> (raw)
Log Message:
-----------
Remove `Sp', `Vb', and `Ve' (as per schwarze@'s changes in OpenBSD),
which are now accomodated for the new libroff modifications.
Modified Files:
--------------
mdocml:
man.3
man.7
man.c
man.h
man_html.c
man_macro.c
man_term.c
man_validate.c
Revision Data
-------------
Index: man.7
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.7,v
retrieving revision 1.89
retrieving revision 1.90
diff -Lman.7 -Lman.7 -u -p -r1.89 -r1.90
--- man.7
+++ man.7
@@ -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
Index: man_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lman_html.c -Lman_html.c -u -p -r1.45 -r1.46
--- man_html.c
+++ man_html.c
@@ -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;
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -Lman.c -Lman.c -u -p -r1.88 -r1.89
--- man.c
+++ man.c
@@ -39,8 +39,7 @@ const char *const __man_macronames[MAN_M
"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;
Index: man_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -Lman_term.c -Lman_term.c -u -p -r1.85 -r1.86
--- man_term.c
+++ man_term.c
@@ -137,9 +137,6 @@ static const struct termact termacts[MAN
{ 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;
Index: man.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lman.h -Lman.h -u -p -r1.45 -r1.46
--- man.h
+++ man.h
@@ -53,9 +53,6 @@ enum mant {
MAN_DT,
MAN_UC,
MAN_PD,
- MAN_Sp,
- MAN_Vb,
- MAN_Ve,
MAN_AT,
MAN_in,
MAN_MAX
Index: man.3
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.3,v
retrieving revision 1.25
retrieving revision 1.26
diff -Lman.3 -Lman.3 -u -p -r1.25 -r1.26
--- man.3
+++ man.3
@@ -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
Index: man_macro.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lman_macro.c -Lman_macro.c -u -p -r1.51 -r1.52
--- man_macro.c
+++ man_macro.c
@@ -79,9 +79,6 @@ const struct man_macro __man_macros[MAN_
{ 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 */
};
Index: man_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_validate.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lman_validate.c -Lman_validate.c -u -p -r1.51 -r1.52
--- man_validate.c
+++ man_validate.c
@@ -70,7 +70,6 @@ static v_check posts_part[] = { check_
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
{ 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 */
};
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2010-12-05 16:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201012051614.oB5GEGv9015753@krisdoz.my.domain \
--to=kristaps@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).