From: kristaps@bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Backed out check for `Ex' manual sec (ok schwarze@, joerg@), in
Date: Fri, 14 May 2010 11:31:25 -0600 (MDT) [thread overview]
Message-ID: <201005141731.o4EHVPdx003294@krisdoz.my.domain> (raw)
Log Message:
-----------
Backed out check for `Ex' manual sec (ok schwarze@, joerg@), in turn backing out check_msec() and deps.
Modified Files:
--------------
mdocml:
libmdoc.h
mdoc.7
mdoc.c
mdoc_validate.c
Revision Data
-------------
Index: mdoc_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_validate.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.75 -r1.76
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -45,7 +45,6 @@ struct valids {
};
static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
-static int check_msec(PRE_ARGS, ...);
static int check_sec(PRE_ARGS, ...);
static int check_stdarg(PRE_ARGS);
static int check_text(struct mdoc *, int, int, const char *);
@@ -100,7 +99,6 @@ static int pre_bl(PRE_ARGS);
static int pre_dd(PRE_ARGS);
static int pre_display(PRE_ARGS);
static int pre_dt(PRE_ARGS);
-static int pre_ex(PRE_ARGS);
static int pre_fd(PRE_ARGS);
static int pre_it(PRE_ARGS);
static int pre_lb(PRE_ARGS);
@@ -139,7 +137,7 @@ static v_pre pres_d1[] = { pre_display,
static v_pre pres_dd[] = { pre_dd, NULL };
static v_pre pres_dt[] = { pre_dt, NULL };
static v_pre pres_er[] = { NULL, NULL };
-static v_pre pres_ex[] = { pre_ex, NULL };
+static v_pre pres_ex[] = { NULL, NULL };
static v_pre pres_fd[] = { pre_fd, NULL };
static v_pre pres_it[] = { pre_it, NULL };
static v_pre pres_lb[] = { pre_lb, NULL };
@@ -440,28 +438,6 @@ check_sec(PRE_ARGS, ...)
static int
-check_msec(PRE_ARGS, ...)
-{
- va_list ap;
- int msec;
-
- va_start(ap, n);
- for (;;) {
- /* LINTED */
- if (0 == (msec = va_arg(ap, int)))
- break;
- if (msec != mdoc->meta.msec)
- continue;
- va_end(ap);
- return(1);
- }
-
- va_end(ap);
- return(mdoc_nwarn(mdoc, n, EBADMSEC));
-}
-
-
-static int
check_args(struct mdoc *m, const struct mdoc_node *n)
{
int i;
@@ -773,16 +749,6 @@ static int
pre_rv(PRE_ARGS)
{
- return(check_stdarg(mdoc, n));
-}
-
-
-static int
-pre_ex(PRE_ARGS)
-{
-
- if ( ! check_msec(mdoc, n, 1, 6, 8, 0))
- return(0);
return(check_stdarg(mdoc, n));
}
Index: libmdoc.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/libmdoc.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -Llibmdoc.h -Llibmdoc.h -u -p -r1.43 -r1.44
--- libmdoc.h
+++ libmdoc.h
@@ -79,7 +79,6 @@ enum merr {
ENOLINE,
EPROLOOO,
EPROLREP,
- EBADMSEC,
EBADSEC,
EFONT,
EBADDATE,
Index: mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -Lmdoc.c -Lmdoc.c -u -p -r1.130 -r1.131
--- mdoc.c
+++ mdoc.c
@@ -68,7 +68,6 @@ const char *const __mdoc_merrnames[MERRM
"line arguments discouraged", /* ENOLINE */
"prologue macro out of conventional order", /* EPROLOOO */
"prologue macro repeated", /* EPROLREP */
- "invalid manual section", /* EBADMSEC */
"invalid section", /* EBADSEC */
"invalid font mode", /* EFONT */
"invalid date syntax", /* EBADDATE */
Index: mdoc.7
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc.7,v
retrieving revision 1.105
retrieving revision 1.106
diff -Lmdoc.7 -Lmdoc.7 -u -p -r1.105 -r1.106
--- mdoc.7
+++ mdoc.7
@@ -1956,8 +1956,9 @@ This is not the case in mandoc.
In groff, the
.Sx \&Cd ,
.Sx \&Er ,
+.Sx \&Ex ,
and
-.Sx \&Ex
+.Sx \&Rv
macros were stipulated only to occur in certain manual sections.
mandoc does not have these restrictions.
.It
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2010-05-14 17:31 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=201005141731.o4EHVPdx003294@krisdoz.my.domain \
--to=kristaps@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).