aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2012-06-12 12:47:14 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2012-06-12 12:47:14 +0000
commit1b2ff8223b21e7001b7a739aec2a9ba0cba62dc8 (patch)
tree1c154680035a7aedd5d325979c771fa6ead59a7c
parent684d974f356a1e07a9d8739dcd6cb5ba2c8b67c1 (diff)
downloadmandoc-1b2ff8223b21e7001b7a739aec2a9ba0cba62dc8.tar.gz
mandoc-1b2ff8223b21e7001b7a739aec2a9ba0cba62dc8.tar.zst
mandoc-1b2ff8223b21e7001b7a739aec2a9ba0cba62dc8.zip
Fix an assert() raised by `RS' when following `TP'.
The reason was that `RS' wasn't BSCOPE'd, so the next-line (BLINE) scope opened by `TP' would still be in the HEAD macro. This was from joerg@'s archive of failures.
-rw-r--r--TODO8
-rw-r--r--man_macro.c4
2 files changed, 3 insertions, 9 deletions
diff --git a/TODO b/TODO
index b08ee5bf..6eed3a61 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
************************************************************************
* Official mandoc TODO.
-* $Id: TODO,v 1.134 2012/06/05 21:29:26 schwarze Exp $
+* $Id: TODO,v 1.135 2012/06/12 12:47:14 kristaps Exp $
************************************************************************
************************************************************************
@@ -319,12 +319,6 @@
in dig(1).
************************************************************************
-* error reporting issues
-************************************************************************
-
-- .TP directly followed by .RS gives an assertion.
-
-************************************************************************
* performance issues
************************************************************************
diff --git a/man_macro.c b/man_macro.c
index 649ff35d..340fc16b 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.73 2012/06/03 09:52:07 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.74 2012/06/12 12:47:14 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -78,7 +78,7 @@ const struct man_macro __man_macros[MAN_MAX] = {
{ in_line_eoln, MAN_BSCOPE }, /* nf */
{ in_line_eoln, MAN_BSCOPE }, /* fi */
{ blk_close, 0 }, /* RE */
- { blk_exp, MAN_EXPLICIT }, /* RS */
+ { blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* RS */
{ in_line_eoln, 0 }, /* DT */
{ in_line_eoln, 0 }, /* UC */
{ in_line_eoln, 0 }, /* PD */