aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tree.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2010-06-29 19:20:38 +0000
committerIngo Schwarze <schwarze@openbsd.org>2010-06-29 19:20:38 +0000
commit4c7036f39cd338c9cd69fe37813577f0f4a1bc69 (patch)
treee5acb7c52eab35523e9ecd1eea6b370402dc92f0 /tree.c
parent1d0a7892377ad99dbf5e1bcd38b15f01a53a28c9 (diff)
downloadmandoc-4c7036f39cd338c9cd69fe37813577f0f4a1bc69.tar.gz
mandoc-4c7036f39cd338c9cd69fe37813577f0f4a1bc69.tar.zst
mandoc-4c7036f39cd338c9cd69fe37813577f0f4a1bc69.zip
Support for badly nested blocks, written around the time of
the Rostock mandoc hackathon and tested and polished since, supporting constructs like: .Ao Bo Ac Bc (exp breaking exp) .Aq Bo eol Bc (imp breaking exp) .Ao Bq Ac eol (exp breaking imp) .Ao Bo So Bc Ac Sc (double break, inner before outer) .Ao Bo So Ac Bc Sc (double break, outer before inner) .Ao Bo Ac So Bc Sc (broken breaker) .Ao Bo So Bc Do Ac Sc Dc (broken double breaker) There are still two known issues which are tricky: 1) Breaking two identical explicit blocks (Ao Bo Bo Ac or Aq Bo Bo eol) fails outright, triggering a bogus syntax error. 2) Breaking a block by two identical explicit blocks (Ao Ao Bo Ac Ac Bc or Ao Ao Bq Ac Ac eol) still has a minor rendering error left: "<ao1 <ao2 [bo ac2> ac1> bc]>" should not have the final ">". We can fix these later in the tree, let's not grow this diff too large. "get it in" kristaps@
Diffstat (limited to 'tree.c')
-rw-r--r--tree.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tree.c b/tree.c
index 61ce1b4f..09bc87e6 100644
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/* $Id: tree.c,v 1.22 2010/06/26 15:36:37 kristaps Exp $ */
+/* $Id: tree.c,v 1.23 2010/06/29 19:20:38 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -75,7 +75,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
t = "block-head";
break;
case (MDOC_BODY):
- t = "block-body";
+ if (n->end)
+ t = "body-end";
+ else
+ t = "block-body";
break;
case (MDOC_TAIL):
t = "block-tail";