aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--mdoc_argv.c5
-rw-r--r--regress/mdoc/Bl/column.in7
-rw-r--r--regress/mdoc/Bl/column.out_ascii2
-rw-r--r--regress/mdoc/Bl/column.out_lint2
-rw-r--r--regress/mdoc/Bl/column.out_markdown2
5 files changed, 10 insertions, 8 deletions
diff --git a/mdoc_argv.c b/mdoc_argv.c
index f4ce4a87..1bfd336b 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,7 +1,7 @@
-/* $Id: mdoc_argv.c,v 1.119 2018/12/21 17:15:19 schwarze Exp $ */
+/* $Id: mdoc_argv.c,v 1.120 2019/07/11 17:06:17 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -454,6 +454,7 @@ args(struct roff_man *mdoc, int line, int *pos,
mandoc_msg(MANDOCERR_ARG_QUOTE, line, *pos, NULL);
mdoc->flags &= ~MDOC_PHRASELIT;
}
+ mdoc->flags &= ~MDOC_PHRASEQL;
return ARGS_EOLN;
}
diff --git a/regress/mdoc/Bl/column.in b/regress/mdoc/Bl/column.in
index a6c791d7..8bb32698 100644
--- a/regress/mdoc/Bl/column.in
+++ b/regress/mdoc/Bl/column.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: column.in,v 1.10 2017/07/04 14:53:24 schwarze Exp $
-.Dd $Mdocdate: July 4 2017 $
+.\" $OpenBSD: column.in,v 1.11 2019/07/11 16:56:52 schwarze Exp $
+.Dd $Mdocdate: July 11 2019 $
.Dt BL-COLUMN 1
.Os
.Sh NAME
@@ -81,7 +81,8 @@
.\" Mixed tab and Ta
.Bl -column a b c d
.It a b c d
-.It a b c Ta d
+.It "a b c" Ta
+d
.It a b Ta c d
.It a b Ta c Ta d
.It a Ta b c d
diff --git a/regress/mdoc/Bl/column.out_ascii b/regress/mdoc/Bl/column.out_ascii
index 732cf2d9..6734c1a1 100644
--- a/regress/mdoc/Bl/column.out_ascii
+++ b/regress/mdoc/Bl/column.out_ascii
@@ -71,4 +71,4 @@ DDEESSCCRRIIPPTTIIOONN
aa bb tab at eol
aa bb cc dd
-OpenBSD July 4, 2017 OpenBSD
+OpenBSD July 11, 2019 OpenBSD
diff --git a/regress/mdoc/Bl/column.out_lint b/regress/mdoc/Bl/column.out_lint
index 4d64846e..49135fad 100644
--- a/regress/mdoc/Bl/column.out_lint
+++ b/regress/mdoc/Bl/column.out_lint
@@ -4,4 +4,4 @@ mandoc: column.in:75:2: WARNING: skipping empty macro: It
mandoc: column.in:77:2: WARNING: wrong number of cells: 2 columns, 4 cells
mandoc: column.in:78:2: WARNING: wrong number of cells: 2 columns, 5 cells
mandoc: column.in:79:2: WARNING: skipping empty macro: It
-mandoc: column.in:107:18: WARNING: skipping -width argument: Bl -column
+mandoc: column.in:108:18: WARNING: skipping -width argument: Bl -column
diff --git a/regress/mdoc/Bl/column.out_markdown b/regress/mdoc/Bl/column.out_markdown
index 6e3e27b2..a9b84156 100644
--- a/regress/mdoc/Bl/column.out_markdown
+++ b/regress/mdoc/Bl/column.out_markdown
@@ -75,4 +75,4 @@ BL-COLUMN(1) - General Commands Manual
aa bb cc dd
-OpenBSD - July 4, 2017
+OpenBSD - July 11, 2019