* mdocml: Remove `i' and `r' macro handlers.
@ 2010-12-08 10:58 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2010-12-08 10:58 UTC (permalink / raw)
To: source
Log Message:
-----------
Remove `i' and `r' macro handlers. These macros, originally part of the
me package, aren't recognised by "groff -mandoc" so we don't need to do
so either. Discussed on tech@ with schwarze@.
While at it, remove references to `b' in man.7. As far as I know, this
was never supported anyway.
Modified Files:
--------------
mdocml:
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.91
retrieving revision 1.92
diff -Lman.7 -Lman.7 -u -p -r1.91 -r1.92
--- man.7
+++ man.7
@@ -424,11 +424,9 @@ The syntax is as follows:
.It Sx \&br Ta 0 Ta current Ta compat
.It Sx \&fi Ta 0 Ta current Ta compat
.It Sx \&ft Ta 1 Ta current Ta compat
-.It Sx \&i Ta n Ta current Ta compat
.It Sx \&in Ta 1 Ta current Ta compat
.It Sx \&na Ta 0 Ta current Ta compat
.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
.El
.Pp
@@ -509,12 +507,9 @@ The optional arguments specify which rel
Text is rendered in bold face.
.Pp
See also
-.Sx \&I ,
-.Sx \&R ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&I
and
-.Sx \&r .
+.Sx \&R .
.Ss \&BI
Text is rendered alternately in bold face and italic.
Thus,
@@ -591,12 +586,9 @@ and
Text is rendered in italics.
.Pp
See also
-.Sx \&B ,
-.Sx \&R ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&B
and
-.Sx \&r .
+.Sx \&R .
.Ss \&IB
Text is rendered alternately in italics and bold face.
Whitespace between arguments is omitted in output.
@@ -692,12 +684,9 @@ and
Text is rendered in roman (the default font).
.Pp
See also
-.Sx \&I ,
-.Sx \&B ,
-.Sx \&b ,
-.Sx \&i ,
+.Sx \&I
and
-.Sx \&r .
+.Sx \&B .
.Ss \&RB
Text is rendered alternately in roman (the default font) and bold face.
Whitespace between arguments is omitted in output.
@@ -836,18 +825,6 @@ Change the current font mode.
See
.Sx Text Decoration
for a listing of available font modes.
-.Ss \&i
-Italicise arguments.
-Synonym for
-.Sx \&I .
-.Pp
-See also
-.Sx \&B ,
-.Sx \&I ,
-.Sx \&R .
-.Sx \&b ,
-and
-.Sx \&r .
.Ss \&in
Indent relative to the current indentation:
.Pp
@@ -865,16 +842,6 @@ Begin literal mode: all subsequent free-
line boundaries preserved.
May be ended by
.Sx \&fi .
-.Ss \&r
-Fonts and styles (bold face, italics) reset to roman (default font).
-.Pp
-See also
-.Sx \&B ,
-.Sx \&I ,
-.Sx \&R ,
-.Sx \&b ,
-and
-.Sx \&i .
.Ss \&sp
Insert vertical spaces into output with the following syntax:
.Bd -filled -offset indent
Index: man_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -Lman_term.c -Lman_term.c -u -p -r1.89 -r1.90
--- man_term.c
+++ man_term.c
@@ -126,11 +126,9 @@ static const struct termact termacts[MAN
{ pre_alternate, NULL, 0 }, /* IR */
{ pre_alternate, NULL, 0 }, /* RI */
{ NULL, NULL, MAN_NOTEXT }, /* na */
- { pre_I, NULL, 0 }, /* i */
{ pre_sp, NULL, MAN_NOTEXT }, /* sp */
{ pre_literal, NULL, 0 }, /* nf */
{ pre_literal, NULL, 0 }, /* fi */
- { NULL, NULL, 0 }, /* r */
{ NULL, NULL, 0 }, /* RE */
{ pre_RS, post_RS, 0 }, /* RS */
{ pre_ign, NULL, 0 }, /* DT */
Index: man_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lman_html.c -Lman_html.c -u -p -r1.51 -r1.52
--- man_html.c
+++ man_html.c
@@ -102,11 +102,9 @@ static const struct htmlman mans[MAN_MAX
{ man_alt_pre, NULL }, /* IR */
{ man_alt_pre, NULL }, /* RI */
{ NULL, NULL }, /* na */
- { NULL, NULL }, /* i */
{ man_br_pre, NULL }, /* sp */
{ man_literal_pre, NULL }, /* nf */
{ man_literal_pre, NULL }, /* fi */
- { NULL, NULL }, /* r */
{ NULL, NULL }, /* RE */
{ man_RS_pre, NULL }, /* RS */
{ man_ign_pre, NULL }, /* DT */
Index: man.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lman.h -Lman.h -u -p -r1.47 -r1.48
--- man.h
+++ man.h
@@ -43,11 +43,9 @@ enum mant {
MAN_IR,
MAN_RI,
MAN_na,
- MAN_i,
MAN_sp,
MAN_nf,
MAN_fi,
- MAN_r,
MAN_RE,
MAN_RS,
MAN_DT,
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -Lman.c -Lman.c -u -p -r1.91 -r1.92
--- man.c
+++ man.c
@@ -36,10 +36,10 @@ const char *const __man_macronames[MAN_M
"IP", "HP", "SM", "SB",
"BI", "IB", "BR", "RB",
"R", "B", "I", "IR",
- "RI", "na", "i", "sp",
- "nf", "fi", "r", "RE",
- "RS", "DT", "UC", "PD",
- "AT", "in", "ft"
+ "RI", "na", "sp", "nf",
+ "fi", "RE", "RS", "DT",
+ "UC", "PD", "AT", "in",
+ "ft"
};
const char * const *man_macronames = __man_macronames;
Index: man_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_validate.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lman_validate.c -Lman_validate.c -u -p -r1.55 -r1.56
--- man_validate.c
+++ man_validate.c
@@ -98,11 +98,9 @@ static const struct man_valid man_valids
{ NULL, NULL }, /* IR */
{ NULL, NULL }, /* RI */
{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
- { NULL, NULL }, /* i */
{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */
{ pres_bline, posts_nf }, /* nf */
{ pres_bline, posts_fi }, /* fi */
- { NULL, NULL }, /* r */
{ NULL, NULL }, /* RE */
{ NULL, posts_part }, /* RS */
{ NULL, NULL }, /* DT */
Index: man_macro.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lman_macro.c -Lman_macro.c -u -p -r1.53 -r1.54
--- man_macro.c
+++ man_macro.c
@@ -69,11 +69,9 @@ const struct man_macro __man_macros[MAN_
{ in_line_eoln, 0 }, /* IR */
{ in_line_eoln, 0 }, /* RI */
{ in_line_eoln, MAN_NSCOPED }, /* na */
- { in_line_eoln, 0 }, /* i */
{ in_line_eoln, MAN_NSCOPED }, /* sp */
{ in_line_eoln, 0 }, /* nf */
{ in_line_eoln, 0 }, /* fi */
- { in_line_eoln, 0 }, /* r */
{ blk_close, 0 }, /* RE */
{ blk_exp, MAN_EXPLICIT }, /* RS */
{ in_line_eoln, 0 }, /* DT */
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-08 10:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-08 10:58 mdocml: Remove `i' and `r' macro handlers kristaps
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).