* mdocml: Allow multiple ELINE macros without raising a fatal error.
@ 2010-12-06 13:49 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2010-12-06 13:49 UTC (permalink / raw)
To: source
Log Message:
-----------
Allow multiple ELINE macros without raising a fatal error. From a field-
tested patch by schwarze@.
Modified Files:
--------------
mdocml:
man.c
Revision Data
-------------
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -Lman.c -Lman.c -u -p -r1.89 -r1.90
--- man.c
+++ man.c
@@ -473,9 +473,7 @@ man_pmacro(struct man *m, int ln, char *
tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX;
if (MAN_MAX == tok) {
- man_vmsg(m, MANDOCERR_MACRO, ln, ppos,
- "unknown macro: %s%s",
- buf, strlen(buf) > 3 ? "..." : "");
+ man_vmsg(m, MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1);
return(1);
}
@@ -494,37 +492,23 @@ man_pmacro(struct man *m, int ln, char *
goto err;
/*
- * Remove prior ELINE macro, as it's being clobbering by a new
+ * Remove prior ELINE macro, as it's being clobbered by a new
* macro. Note that NSCOPED macros do not close out ELINE
* macros---they don't print text---so we let those slip by.
*/
if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
m->flags & MAN_ELINE) {
- assert(MAN_TEXT != m->last->type);
-
- /*
- * This occurs in the following construction:
- * .B
- * .br
- * .B
- * .br
- * I hate man macros.
- * Flat-out disallow this madness.
- */
- if (MAN_NSCOPED & man_macros[m->last->tok].flags) {
- man_pmsg(m, ln, ppos, MANDOCERR_SYNTLINESCOPE);
- return(0);
- }
-
n = m->last;
+ assert(MAN_TEXT != n->type);
+
+ /* Remove repeated NSCOPED macros causing ELINE. */
- assert(n);
- assert(NULL == n->child);
- assert(0 == n->nchild);
+ if (MAN_NSCOPED & man_macros[n->tok].flags)
+ n = n->parent;
- if ( ! man_nmsg(m, n, MANDOCERR_LINESCOPE))
- return(0);
+ man_vmsg(m, MANDOCERR_LINESCOPE, n->line, n->pos,
+ "%s", man_macronames[n->tok]);
man_node_delete(m, n);
m->flags &= ~MAN_ELINE;
--
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-06 13:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-06 13:49 mdocml: Allow multiple ELINE macros without raising a fatal error 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).