===================================================================
RCS file: /cvs/mandoc/roff.h,v
retrieving revision 1.32
retrieving revision 1.35
diff -u -p -r1.32 -r1.35
--- mandoc/roff.h	2015/04/18 16:34:25	1.32
+++ mandoc/roff.h	2015/10/17 00:21:07	1.35
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roff.h,v 1.32 2015/04/18 16:34:25 schwarze Exp $	*/
+/*	$OpenBSD: roff.h,v 1.35 2015/10/17 00:21:07 schwarze Exp $	*/
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -97,6 +97,7 @@ struct	roff_node {
 	int		  line;    /* Input file line number. */
 	int		  pos;     /* Input file column number. */
 	int		  tok;     /* Request or macro ID. */
+#define	TOKEN_NONE	 (-1)	   /* No request or macro. */
 	int		  flags;
 #define	MDOC_VALID	 (1 << 0)  /* Has been validated. */
 #define	MDOC_ENDED	 (1 << 1)  /* Gone past body end mark. */
@@ -140,8 +141,8 @@ struct	roff_man {
 #define	MDOC_LITERAL	 (1 << 1)  /* In a literal scope. */
 #define	MDOC_PBODY	 (1 << 2)  /* In the document body. */
 #define	MDOC_NEWLINE	 (1 << 3)  /* First macro/text in a line. */
-#define	MDOC_PHRASELIT	 (1 << 4)  /* Literal within a partial phrase. */
-#define	MDOC_PPHRASE	 (1 << 5)  /* Within a partial phrase. */
+#define	MDOC_PHRASE	 (1 << 4)  /* In a Bl -column phrase. */
+#define	MDOC_PHRASELIT	 (1 << 5)  /* Literal within a phrase. */
 #define	MDOC_FREECOL	 (1 << 6)  /* `It' invocation should close. */
 #define	MDOC_SYNOPSIS	 (1 << 7)  /* SYNOPSIS-style formatting. */
 #define	MDOC_KEEP	 (1 << 8)  /* In a word keep. */
@@ -149,6 +150,9 @@ struct	roff_man {
 #define	MDOC_NODELIMC	 (1 << 10) /* Disable closing delimiter handling. */
 #define	MAN_ELINE	 (1 << 11) /* Next-line element scope. */
 #define	MAN_BLINE	 (1 << 12) /* Next-line block scope. */
+#define	MDOC_PHRASEQF	 (1 << 13) /* Quote first word encountered. */
+#define	MDOC_PHRASEQL	 (1 << 14) /* Quote last word of this phrase. */
+#define	MDOC_PHRASEQN	 (1 << 15) /* Quote first word of the next phrase. */
 #define	MAN_LITERAL	  MDOC_LITERAL
 #define	MAN_NEWLINE	  MDOC_NEWLINE
 	enum roff_macroset macroset; /* Kind of high-level macros used. */
@@ -156,3 +160,9 @@ struct	roff_man {
 	enum roff_sec	  lastnamed; /* Last standard section seen. */
 	enum roff_next	  next;    /* Where to put the next node. */
 };
+
+__BEGIN_DECLS
+
+void		 deroff(char **, const struct roff_node *);
+
+__END_DECLS