[prev in list] [next in list] [prev in thread] [next in thread]
List: mandoc-source
Subject: mdocml: Expose the parsed table API to the world and add accessors
From: kristaps () mdocml ! bsd ! lv
Date: 2010-12-31 18:19:43
Message-ID: 201012311819.oBVIJhhk024178 () krisdoz ! my ! domain
[Download RAW message or body]
Log Message:
-----------
Expose the parsed table API to the world and add accessors through the
roff.h interface.
Modified Files:
--------------
mdocml:
libroff.h
mandoc.h
roff.c
roff.h
tbl.c
Revision Data
-------------
Index: tbl.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/tbl.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -Ltbl.c -Ltbl.c -u -p -r1.10 -r1.11
--- tbl.c
+++ tbl.c
@@ -120,3 +120,10 @@ tbl_restart(struct tbl *tbl)
tbl->part = TBL_PART_LAYOUT;
}
+const struct tbl_span *
+tbl_span(const struct tbl *tbl)
+{
+
+ assert(tbl);
+ return(tbl->last_span);
+}
Index: roff.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lroff.h -Lroff.h -u -p -r1.20 -r1.21
--- roff.h
+++ roff.h
@@ -38,6 +38,7 @@ void roff_reset(struct roff *);
enum rofferr roff_parseln(struct roff *, int,
char **, size_t *, int, int *);
int roff_endparse(struct roff *);
+const struct tbl_span *roff_span(const struct roff *);
__END_DECLS
Index: mandoc.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandoc.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lmandoc.h -Lmandoc.h -u -p -r1.37 -r1.38
--- mandoc.h
+++ mandoc.h
@@ -139,6 +139,75 @@ enum mandocerr {
MANDOCERR_MAX
};
+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
+};
+
+/*
+ * A cell in a layout row.
+ */
+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 */
+};
+
+/*
+ * A layout row.
+ */
+struct tbl_row {
+ struct tbl_row *next;
+ struct tbl_cell *first;
+ struct tbl_cell *last;
+};
+
+/*
+ * A cell within a row of data. The "string" field contains the actual
+ * string value that's in the cell. The rest is layout.
+ */
+struct tbl_dat {
+ struct tbl_cell *layout; /* layout cell: CAN BE NULL */
+ struct tbl_dat *next;
+ char *string;
+ int flags;
+#define TBL_DATA_HORIZ (1 << 0)
+#define TBL_DATA_DHORIZ (1 << 1)
+#define TBL_DATA_NHORIZ (1 << 2)
+#define TBL_DATA_NDHORIZ (1 << 3)
+};
+
+/*
+ * A row of data in a table.
+ */
+struct tbl_span {
+ struct tbl_row *layout; /* layout row: CAN BE NULL */
+ struct tbl_dat *first;
+ struct tbl_dat *last;
+ int flags;
+#define TBL_SPAN_HORIZ (1 << 0)
+#define TBL_SPAN_DHORIZ (1 << 1)
+ struct tbl_span *next;
+};
+
/*
* Available registers (set in libroff, accessed elsewhere).
*/
Index: roff.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -Lroff.c -Lroff.c -u -p -r1.113 -r1.114
--- roff.c
+++ roff.c
@@ -1375,3 +1375,10 @@ roff_freestr(struct roff *r)
r->first_string = NULL;
}
+
+const struct tbl_span *
+roff_span(const struct roff *r)
+{
+
+ return(r->tbl ? tbl_span(r->tbl) : NULL);
+}
Index: libroff.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/libroff.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -Llibroff.h -Llibroff.h -u -p -r1.10 -r1.11
--- libroff.h
+++ libroff.h
@@ -25,62 +25,6 @@ enum tbl_part {
TBL_PART_DATA /* creating data rows */
};
-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_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 tbl_row {
- struct tbl_row *next;
- struct tbl_cell *first;
- struct tbl_cell *last;
-};
-
-struct tbl_dat {
- struct tbl_cell *layout; /* layout cell: CAN BE NULL */
- struct tbl_dat *next;
- char *string;
- int flags;
-#define TBL_DATA_HORIZ (1 << 0)
-#define TBL_DATA_DHORIZ (1 << 1)
-#define TBL_DATA_NHORIZ (1 << 2)
-#define TBL_DATA_NDHORIZ (1 << 3)
-};
-
-struct tbl_span {
- struct tbl_row *layout; /* layout row: CAN BE NULL */
- struct tbl_dat *first;
- struct tbl_dat *last;
- int flags;
-#define TBL_SPAN_HORIZ (1 << 0)
-#define TBL_SPAN_DHORIZ (1 << 1)
- struct tbl_span *next;
-};
-
struct tbl {
mandocmsg msg; /* status messages */
void *data; /* privdata for messages */
@@ -115,6 +59,7 @@ enum rofferr tbl_read(struct tbl *, in
int tbl_option(struct tbl *, int, const char *);
int tbl_layout(struct tbl *, int, const char *);
int tbl_data(struct tbl *, int, const char *);
+const struct tbl_span *tbl_span(const struct tbl *);
__END_DECLS
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic