The groff man-ext macros define fonts CB, CI, and CR,

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index a6b6962e70553d3e917b593b9a2f5713362b3e6b..ae1906ef735ac9b0020f9dc4b96f614b22cc7514 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.44 2017/07/04 21:08:29 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.45 2017/07/08 17:52:50 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -128,7 +128,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                    tbl->parse, ln, sv, dat->string);
 }
 
                    tbl->parse, ln, sv, dat->string);
 }
 

-int
+void

 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
        struct tbl_dat  *dat;
 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
        struct tbl_dat  *dat;


@@ -143,10 +143,10 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
                        pos++;
                        while (p[pos] != '\0')
                                getdata(tbl, tbl->last_span, ln, p, &pos);
                        pos++;
                        while (p[pos] != '\0')
                                getdata(tbl, tbl->last_span, ln, p, &pos);

-                       return 1;
+                       return;

                } else if (p[pos] == '\0') {
                        tbl->part = TBL_PART_DATA;
                } else if (p[pos] == '\0') {
                        tbl->part = TBL_PART_DATA;

-                       return 1;
+                       return;

                }
 
                /* Fallthrough: T} is part of a word. */
                }
 
                /* Fallthrough: T} is part of a word. */


@@ -166,8 +166,6 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
        if (dat->layout->pos == TBL_CELL_DOWN)
                mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
                    ln, pos, dat->string);
        if (dat->layout->pos == TBL_CELL_DOWN)
                mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
                    ln, pos, dat->string);

-
-       return 0;

 }
 
 static struct tbl_span *
 }
 
 static struct tbl_span *