Churn-ish check-in getting mdoc_parseln() and man_parseln() to accept a

[mandoc.git] / mdoc.h

diff --git a/mdoc.h b/mdoc.h
index b8d39bebfdfbf61d11635aa4995a2960e76d95d4..dc4be5875d560aefc28fd74fca8f2e8e4b21fdd6 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,6 +1,6 @@
-/*     $Id: mdoc.h,v 1.81 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: mdoc.h,v 1.92 2010/06/26 15:36:37 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -149,11 +149,13 @@ enum      mdoct {
        MDOC_br,
        MDOC_sp,
        MDOC__U,
        MDOC_br,
        MDOC_sp,
        MDOC__U,

+       MDOC_Ta,

        MDOC_MAX
 };
 
 /* What follows is a list of ALL possible macro arguments. */
 
        MDOC_MAX
 };
 
 /* What follows is a list of ALL possible macro arguments. */
 

+/* FIXME: make this into an enum. */

 #define        MDOC_Split       0
 #define        MDOC_Nosplit     1
 #define        MDOC_Ragged      2
 #define        MDOC_Split       0
 #define        MDOC_Nosplit     1
 #define        MDOC_Ragged      2


@@ -247,6 +249,43 @@ struct     mdoc_arg {
        unsigned int      refcnt;
 };
 
        unsigned int      refcnt;
 };
 

+enum   mdoc_list {
+       LIST__NONE = 0,
+       LIST_bullet,
+       LIST_column,
+       LIST_dash,
+       LIST_diag,
+       LIST_enum,
+       LIST_hang,
+       LIST_hyphen,
+       LIST_inset,
+       LIST_item,
+       LIST_ohang,
+       LIST_tag
+};
+
+enum   mdoc_disp {
+       DISP__NONE = 0,
+       DISP_centred,
+       DISP_ragged,
+       DISP_unfilled,
+       DISP_filled,
+       DISP_literal
+};
+
+struct mdoc_bd {
+       const char       *offs; /* -offset */
+       enum mdoc_disp    type; /* -ragged, etc. */
+       int               comp; /* -compact */
+};
+
+struct mdoc_bl {
+       const char       *width; /* -width */
+       const char       *offs; /* -offset */
+       enum mdoc_list    type; /* -tag, -enum, etc. */
+       int               comp; /* -compact */
+};
+

 /* Node in AST. */
 struct mdoc_node {
        struct mdoc_node *parent; /* parent AST node */
 /* Node in AST. */
 struct mdoc_node {
        struct mdoc_node *parent; /* parent AST node */


@@ -272,6 +311,11 @@ struct     mdoc_node {
        struct mdoc_node *body;         /* BLOCK */
        struct mdoc_node *tail;         /* BLOCK */
        char             *string;       /* TEXT */
        struct mdoc_node *body;         /* BLOCK */
        struct mdoc_node *tail;         /* BLOCK */
        char             *string;       /* TEXT */

+
+       union {
+               struct mdoc_bl Bl;
+               struct mdoc_bd Bd;
+       } data;

 };
 
 #define        MDOC_IGN_SCOPE   (1 << 0) /* Ignore scope violations. */
 };
 
 #define        MDOC_IGN_SCOPE   (1 << 0) /* Ignore scope violations. */


@@ -292,7 +336,9 @@ struct      mdoc;
 void             mdoc_free(struct mdoc *);
 struct mdoc     *mdoc_alloc(void *, int, mandocmsg);
 void             mdoc_reset(struct mdoc *);
 void             mdoc_free(struct mdoc *);
 struct mdoc     *mdoc_alloc(void *, int, mandocmsg);
 void             mdoc_reset(struct mdoc *);

-int              mdoc_parseln(struct mdoc *, int, char *, int);
+int              mdoc_parseln(struct mdoc *, 
+                       const struct regset *,
+                       int, char *, int);

 const struct mdoc_node *mdoc_node(const struct mdoc *);
 const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 int              mdoc_endparse(struct mdoc *);
 const struct mdoc_node *mdoc_node(const struct mdoc *);
 const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 int              mdoc_endparse(struct mdoc *);