In theory, Kristaps never intended to write a roff parser,

but in practice, most real legacy man(7)uals are using so much
low level roff that we can't really get away without at least
partially handling some roff instructions.

As doing this in man(7) only has become messy and as even some
mdoc(7) pages need it, start a minimal partial roff preprocessor.
As a first step, move handling of .am[i], .de[i] and .ig there.
Do not use the roff preprocessor for new manuals!

Now that we have three main parser libraries - roff, man and mdoc -
each one having its own error handling is becoming messy, too.
Thus, start unifying message handling in one central place,
introducing a new generic function mmsg().

coded by kristaps@

1 files changed, 1 insertions, 5 deletions

diff --git a/usr.bin/mandoc/libman.h b/usr.bin/mandoc/libman.h
index 5c72f729103..28d542286fc 100644
--- a/usr.bin/mandoc/libman.h
+++ b/usr.bin/mandoc/libman.h
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.18 2010/05/15 18:06:02 schwarze Exp $ */
+/*	$Id: libman.h,v 1.19 2010/05/16 00:54:03 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -28,7 +28,6 @@ struct	man {
 	void		*data;
 	struct man_cb	 cb;
 	int		 pflags; /* parse flags (see man.h) */
-	int		 svflags; /* flags saved during roff blocks */
 	int		 flags; /* parse flags */
 #define	MAN_HALT	(1 << 0) /* badness happened: die */
 #define	MAN_ELINE	(1 << 1) /* Next-line element scope. */
@@ -38,7 +37,6 @@ struct	man {
 #define	MAN_BPLINE	(1 << 5)
 #define	MAN_EL_USE	(1 << 6) /* Following .el will be used. */
 	enum man_next	 next;
-	enum man_next	 svnext;
 	struct man_node	*last;
 	struct man_node	*first;
 	struct man_meta	 meta;
@@ -63,8 +61,6 @@ enum	merr {
 	WNOSCOPE,
 	WOLITERAL,
 	WNLITERAL,
-	WROFFNEST,
-	WROFFSCOPE,
 	WTITLECASE,
 	WBADCOMMENT,
 	WERRMAX