summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-03-23 09:47:13 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-03-23 09:47:13 +0000
commitf1eb879e0eb3e0f4696cb9626224a8cc40918d6b (patch)
tree663728944c6fe383cb9d94e243b50403002baff5
parent95efc599afc482072cf9239b5f78898fa1ea21e1 (diff)
downloadmandoc-f1eb879e0eb3e0f4696cb9626224a8cc40918d6b.tar.gz
Make (e.g.) `SM' before `B' be only a warning. In reality, this refers
to ELINE macros ("next-line", but not unbreakable like the next-line paragraph macros) followed by other macros. This addresses a report by Christian Weisgerber, posted in the TODO by schwarze@, and aired on discuss@ (22/03/2011) for whether a fix is warranted.
-rw-r--r--TODO6
-rw-r--r--main.c2
-rw-r--r--mandoc.h2
3 files changed, 2 insertions, 8 deletions
diff --git a/TODO b/TODO
index b2abfc0e..84cbcb44 100644
--- a/TODO
+++ b/TODO
@@ -103,12 +103,6 @@
--- missing man features -----------------------------------------------
-- bashbug(1) complains "line scope broken" after
- .SM
- .B something
- should either just work or be a warning
- reported by naddy@
-
- groff an-ext.tmac macros (.UR, .UE) occur in xine(5)
reported by brad@ Sat, 15 Jan 2011 15:45:23 -0500
diff --git a/main.c b/main.c
index 591f3eca..3c0cb697 100644
--- a/main.c
+++ b/main.c
@@ -106,6 +106,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"child violates parent syntax",
"nested displays are not portable",
"already in literal mode",
+ "line scope broken",
/* related to missing macro arguments */
"skipping empty macro",
@@ -153,7 +154,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = {
"skipping text before the first section header",
"skipping unknown macro",
"NOT IMPLEMENTED, please use groff: skipping request",
- "line scope broken",
"argument count wrong",
"skipping end of block that is not open",
"missing end of block",
diff --git a/mandoc.h b/mandoc.h
index 9dbfdc2e..e629016c 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -74,6 +74,7 @@ enum mandocerr {
MANDOCERR_CHILD, /* child violates parent syntax */
MANDOCERR_NESTEDDISP, /* nested displays are not portable */
MANDOCERR_SCOPEREP, /* already in literal mode */
+ MANDOCERR_LINESCOPE, /* line scope broken */
/* related to missing macro arguments */
MANDOCERR_MACROEMPTY, /* skipping empty macro */
@@ -121,7 +122,6 @@ enum mandocerr {
MANDOCERR_NOTEXT, /* skipping text before the first section header */
MANDOCERR_MACRO, /* skipping unknown macro */
MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */
- MANDOCERR_LINESCOPE, /* line scope broken */
MANDOCERR_ARGCOUNT, /* argument count wrong */
MANDOCERR_NOSCOPE, /* skipping end of block that is not open */
MANDOCERR_SCOPEBROKEN, /* missing end of block */