correctly handle scaling units after .PD

[mandoc.git] / mdoc.h

diff --git a/mdoc.h b/mdoc.h
index b6f3d96e78d38411e7e4f03fff4b8cd587deffe3..05e23992f8724fddde70652fb2989b431d63334e 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.129 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: mdoc.h,v 1.133 2014/12/18 03:10:11 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,8 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef MDOC_H
-#define MDOC_H

 
 enum   mdoct {
        MDOC_Ap = 0,
 
 enum   mdoct {
        MDOC_Ap = 0,


@@ -280,7 +278,7 @@ enum        mdoc_list {
 
 enum   mdoc_disp {
        DISP__NONE = 0,
 
 enum   mdoc_disp {
        DISP__NONE = 0,

-       DISP_centred, /* -centered */
+       DISP_centered, /* -centered */

        DISP_ragged, /* -ragged */
        DISP_unfilled, /* -unfilled */
        DISP_filled, /* -filled */
        DISP_ragged, /* -ragged */
        DISP_unfilled, /* -unfilled */
        DISP_filled, /* -filled */


@@ -338,6 +336,7 @@ union       mdoc_data {
        struct mdoc_bd    Bd;
        struct mdoc_bf    Bf;
        struct mdoc_bl    Bl;
        struct mdoc_bd    Bd;
        struct mdoc_bf    Bf;
        struct mdoc_bl    Bl;

+       struct mdoc_node *Es;

        struct mdoc_rs    Rs;
 };
 
        struct mdoc_rs    Rs;
 };
 


@@ -357,6 +356,7 @@ struct      mdoc_node {
        enum mdoct        tok; /* tok or MDOC__MAX if none */
        int               flags;
 #define        MDOC_VALID       (1 << 0) /* has been validated */
        enum mdoct        tok; /* tok or MDOC__MAX if none */
        int               flags;
 #define        MDOC_VALID       (1 << 0) /* has been validated */

+#define        MDOC_BREAK       (1 << 1) /* has broken another block */

 #define        MDOC_EOS         (1 << 2) /* at sentence boundary */
 #define        MDOC_LINE        (1 << 3) /* first macro/text on line */
 #define        MDOC_SYNPRETTY   (1 << 4) /* SYNOPSIS-style formatting */
 #define        MDOC_EOS         (1 << 2) /* at sentence boundary */
 #define        MDOC_LINE        (1 << 3) /* first macro/text on line */
 #define        MDOC_SYNPRETTY   (1 << 4) /* SYNOPSIS-style formatting */


@@ -394,5 +394,3 @@ const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 void mdoc_deroff(char **, const struct mdoc_node *);
 
 __END_DECLS
 void mdoc_deroff(char **, const struct mdoc_node *);
 
 __END_DECLS

-
-#endif /*!MDOC_H*/