Keep words after .Ic together in a single argument.

[mandoc.git] / libroff.h

diff --git a/libroff.h b/libroff.h
index e4d6a4babf9fc8bd22143db06149f6bce9aa61d3..5b84c5fc4541a1e432030c40ec304fc16c5c545d 100644 (file)
--- a/libroff.h
+++ b/libroff.h
@@ -1,6 +1,6 @@
-/*     $Id: libroff.h,v 1.5 2010/12/29 14:38:14 kristaps Exp $ */
+/*     $Id: libroff.h,v 1.28 2013/05/31 21:37:17 schwarze Exp $ */

 /*
 /*

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


@@ -22,73 +22,62 @@ __BEGIN_DECLS
 enum   tbl_part {
        TBL_PART_OPTS, /* in options (first line) */
        TBL_PART_LAYOUT, /* describing layout */
 enum   tbl_part {
        TBL_PART_OPTS, /* in options (first line) */
        TBL_PART_LAYOUT, /* describing layout */

-       TBL_PART_DATA  /* creating data rows */
+       TBL_PART_DATA, /* creating data rows */
+       TBL_PART_CDATA /* continue previous row */

 };
 
 };
 

-enum   tbl_cellt {
-       TBL_CELL_CENTRE, /* c, C */
-       TBL_CELL_RIGHT, /* r, R */
-       TBL_CELL_LEFT, /* l, L */
-       TBL_CELL_NUMBER, /* n, N */
-       TBL_CELL_SPAN, /* s, S */
-       TBL_CELL_LONG, /* a, A */
-       TBL_CELL_DOWN, /* ^ */
-       TBL_CELL_HORIZ, /* _, - */
-       TBL_CELL_DHORIZ, /* = */
-       TBL_CELL_VERT, /* | */
-       TBL_CELL_DVERT, /* || */
-       TBL_CELL_MAX
+struct tbl_node {
+       struct mparse    *parse; /* parse point */
+       int               pos; /* invocation column */
+       int               line; /* invocation line */
+       enum tbl_part     part;
+       struct tbl_opts   opts;
+       struct tbl_row   *first_row;
+       struct tbl_row   *last_row;
+       struct tbl_span  *first_span;
+       struct tbl_span  *current_span;
+       struct tbl_span  *last_span;
+       struct tbl_head  *first_head;
+       struct tbl_head  *last_head;
+       struct tbl_node  *next;

 };
 
 };
 

-struct tbl_cell {
-       struct tbl_cell  *next;
-       enum tbl_cellt    pos;
-       int               spacing;
-       int               flags;
-#define        TBL_CELL_TALIGN  (1 << 0) /* t, T */
-#define        TBL_CELL_BALIGN  (1 << 1) /* d, D */
-#define        TBL_CELL_BOLD    (1 << 2) /* fB, B, b */
-#define        TBL_CELL_ITALIC  (1 << 3) /* fI, I, i */
-#define        TBL_CELL_EQUAL   (1 << 4) /* e, E */
-#define        TBL_CELL_UP      (1 << 5) /* u, U */
-#define        TBL_CELL_WIGN    (1 << 6) /* z, Z */
+struct eqn_node {
+       struct eqn_def   *defs;
+       size_t            defsz;
+       char             *data;
+       size_t            rew;
+       size_t            cur;
+       size_t            sz;
+       int               gsize;
+       struct eqn        eqn;
+       struct mparse    *parse;
+       struct eqn_node  *next;

 };
 
 };
 

-struct tbl_row {
-       struct tbl_row   *next;
-       struct tbl_cell  *first;
-       struct tbl_cell  *last;
+struct eqn_def {
+       char             *key;
+       size_t            keysz;
+       char             *val;
+       size_t            valsz;

 };
 
 };
 

-struct tbl {
-       mandocmsg         msg; /* status messages */
-       void             *data; /* privdata for messages */
-       enum tbl_part     part;
-       char              tab; /* cell-separator */
-       char              decimal; /* decimal point */
-       int               linesize;
-       char              delims[2];
-       int               opts;
-#define        TBL_OPT_CENTRE   (1 << 0)
-#define        TBL_OPT_EXPAND   (1 << 1)
-#define        TBL_OPT_BOX      (1 << 2)
-#define        TBL_OPT_DBOX     (1 << 3)
-#define        TBL_OPT_ALLBOX   (1 << 4)
-#define        TBL_OPT_NOKEEP   (1 << 5)
-#define        TBL_OPT_NOSPACE  (1 << 6)
-       struct tbl_row   *first;
-       struct tbl_row   *last;
-};
-
-#define        TBL_MSG(tblp, type, line, col) \
-       (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL)
-
-struct tbl     *tbl_alloc(void *, mandocmsg);
-void            tbl_free(struct tbl *);
-void            tbl_reset(struct tbl *);
-enum rofferr    tbl_read(struct tbl *, int, const char *, int);
-int             tbl_option(struct tbl *, int, const char *);
-int             tbl_layout(struct tbl *, int, const char *);
+struct tbl_node        *tbl_alloc(int, int, struct mparse *);
+void            tbl_restart(int, int, struct tbl_node *);
+void            tbl_free(struct tbl_node *);
+void            tbl_reset(struct tbl_node *);
+enum rofferr    tbl_read(struct tbl_node *, int, const char *, int);
+int             tbl_option(struct tbl_node *, int, const char *);
+int             tbl_layout(struct tbl_node *, int, const char *);
+int             tbl_data(struct tbl_node *, int, const char *);
+int             tbl_cdata(struct tbl_node *, int, const char *);
+const struct tbl_span  *tbl_span(struct tbl_node *);
+void            tbl_end(struct tbl_node **);
+struct eqn_node        *eqn_alloc(const char *, int, int, struct mparse *);
+enum rofferr    eqn_end(struct eqn_node **);
+void            eqn_free(struct eqn_node *);
+enum rofferr    eqn_read(struct eqn_node **, int, 
+                       const char *, int, int *);

 
 __END_DECLS
 
 
 __END_DECLS