* mdocml: Close a preceding implicit block before opening an explicit
@ 2012-06-03 9:52 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2012-06-03 9:52 UTC (permalink / raw)
To: source
Log Message:
-----------
Close a preceding implicit block before opening an explicit block.
To allow doing so, no longer abuse rew_scope() to unwind explicit blocks;
explicitly call man_unscope() instead.
Fixing the indentation of slapd.conf(5) in the OpenLDAP port;
thanks to guenther@ for the report.
Modified Files:
--------------
mdocml:
man_macro.c
Revision Data
-------------
Index: man_macro.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -Lman_macro.c -Lman_macro.c -u -p -r1.72 -r1.73
--- man_macro.c
+++ man_macro.c
@@ -1,6 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -185,8 +186,12 @@ rew_dohalt(enum mant tok, enum man_type
return(REW_NOHALT);
/* First: rewind to ourselves. */
- if (type == n->type && tok == n->tok)
- return(REW_REWIND);
+ if (type == n->type && tok == n->tok) {
+ if (MAN_EXPLICIT & man_macros[n->tok].flags)
+ return(REW_HALT);
+ else
+ return(REW_REWIND);
+ }
/*
* Next follow the implicit scope-smashings as defined by man.7:
@@ -202,6 +207,10 @@ rew_dohalt(enum mant tok, enum man_type
return(c);
break;
case (MAN_RS):
+ /* Preserve empty paragraphs before RS. */
+ if (0 == n->nchild && (MAN_P == n->tok ||
+ MAN_PP == n->tok || MAN_LP == n->tok))
+ return(REW_HALT);
/* Rewind to a subsection, if a block. */
if (REW_NOHALT != (c = rew_block(MAN_SS, type, n)))
return(c);
@@ -281,17 +290,14 @@ blk_close(MACRO_PROT_ARGS)
}
for (nn = m->last->parent; nn; nn = nn->parent)
- if (ntok == nn->tok)
+ if (ntok == nn->tok && MAN_BLOCK == nn->type)
break;
- if (NULL == nn)
+ if (NULL != nn)
+ man_unscope(m, nn, MANDOCERR_MAX);
+ else
man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
- if ( ! rew_scope(MAN_BODY, m, ntok))
- return(0);
- if ( ! rew_scope(MAN_BLOCK, m, ntok))
- return(0);
-
return(1);
}
@@ -300,14 +306,14 @@ blk_close(MACRO_PROT_ARGS)
int
blk_exp(MACRO_PROT_ARGS)
{
+ struct man_node *n;
int la;
char *p;
- /*
- * Close out prior scopes. "Regular" explicit macros cannot be
- * nested, but we allow roff macros to be placed just about
- * anywhere.
- */
+ /* Close out prior implicit scopes. */
+
+ if ( ! rew_scope(MAN_BLOCK, m, tok))
+ return(0);
if ( ! man_block_alloc(m, line, ppos, tok))
return(0);
@@ -325,8 +331,14 @@ blk_exp(MACRO_PROT_ARGS)
assert(m);
assert(tok != MAN_MAX);
- if ( ! rew_scope(MAN_HEAD, m, tok))
- return(0);
+ for (n = m->last; n; n = n->parent) {
+ if (n->tok != tok)
+ continue;
+ assert(MAN_HEAD == n->type);
+ man_unscope(m, n, MANDOCERR_MAX);
+ break;
+ }
+
return(man_body_alloc(m, line, ppos, tok));
}
--
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:[~2012-06-03 9:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-03 9:52 mdocml: Close a preceding implicit block before opening an explicit schwarze
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).