From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Tue, 17 May 2011 13:11:40 +0000 (+0000)
Subject: In tbl layouts, we puked if a space didn't followed a vertical bar
X-Git-Tag: VERSION_1_11_3~32
X-Git-Url: https://git.cameronkatri.com/mandoc.git/commitdiff_plain/79f16537cd09bc054f9d18169708d63030803d98?ds=inline

In tbl layouts, we puked if a space didn't followed a vertical bar
(found by Yuri Pankov).  This was due to looking for modifiers for the
vertical bar.  This has been fixed, along with other special-key layout
types.
---

diff --git a/tbl_layout.c b/tbl_layout.c
index 936685c1..0aa18dcb 100644
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,4 +1,4 @@
-/*	$Id: tbl_layout.c,v 1.19 2011/04/07 01:08:42 joerg Exp $ */
+/*	$Id: tbl_layout.c,v 1.20 2011/05/17 13:11:40 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -72,6 +72,23 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
 	char		 buf[5];
 	int		 i;
 
+	/* Not all types accept modifiers. */
+
+	switch (cp->pos) {
+	case (TBL_CELL_DOWN):
+		/* FALLTHROUGH */
+	case (TBL_CELL_HORIZ):
+		/* FALLTHROUGH */
+	case (TBL_CELL_DHORIZ):
+		/* FALLTHROUGH */
+	case (TBL_CELL_VERT):
+		/* FALLTHROUGH */
+	case (TBL_CELL_DVERT):
+		return(1);
+	default:
+		break;
+	}
+
 mod:
 	/* 
 	 * XXX: since, at least for now, modifiers are non-conflicting