5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD

@@ -1,6 +1,6 @@
-/*      $Id: mdoc.h,v 1.122 2011/03/22 14:05:45 kristaps Exp $ */
+/*      $Id: mdoc.h,v 1.125 2013/12/24 19:11:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

@@ -309,10 +309,11 @@
         const char       *offs; /* -offset */
         enum mdoc_list    type; /* -tag, -enum, etc. */
         int               comp; /* -compact */
         size_t            ncols; /* -column arg count */
         const char      **cols; /* -column val ptr */
+        int               count; /* -enum counter */
 };
 
 struct  mdoc_bf {
         enum mdoc_font    font; /* font */
 };

@@ -348,10 +349,11 @@
         struct mdoc_node *next; /* sibling AST node */
         struct mdoc_node *prev; /* prior sibling AST node */
         int               nchild; /* number children */
         int               line; /* parse line */
         int               pos; /* parse column */
+        int               lastline; /* the node ends on this line */
         enum mdoct        tok; /* tok or MDOC__MAX if none */
         int               flags;
 #define MDOC_VALID       (1 << 0) /* has been validated */
 #define MDOC_EOS         (1 << 2) /* at sentence boundary */
 #define MDOC_LINE        (1 << 3) /* first macro/text on line */

@@ -360,10 +362,11 @@
 #define MDOC_DELIMO      (1 << 6)
 #define MDOC_DELIMC      (1 << 7)
         enum mdoc_type    type; /* AST node type */
         enum mdoc_sec     sec; /* current named section */
         union mdoc_data  *norm; /* normalised args */
+        const void       *prev_font; /* before entering this node */
         /* FIXME: these can be union'd to shave a few bytes. */
         struct mdoc_arg  *args; /* BLOCK/ELEM */
         struct mdoc_node *pending; /* BLOCK */
         struct mdoc_node *head; /* BLOCK */
         struct mdoc_node *body; /* BLOCK */