aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--TODO5
-rw-r--r--man.78
-rw-r--r--man_html.c4
-rw-r--r--man_term.c4
4 files changed, 13 insertions, 8 deletions
diff --git a/TODO b/TODO
index be1cd68e..54ad9b97 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
************************************************************************
* Official mandoc TODO.
-* $Id: TODO,v 1.116 2011/07/03 22:40:10 schwarze Exp $
+* $Id: TODO,v 1.117 2011/07/03 22:57:32 kristaps Exp $
************************************************************************
************************************************************************
@@ -128,9 +128,6 @@
- groff an-ext.tmac macros (.UR, .UE) occur in xine(5)
reported by brad@ Sat, 15 Jan 2011 15:45:23 -0500
-- .SH implies .fi, see e.g. sasl_setpass(1)
- reported by naddy@ Sun, 3 Jul 2011 23:55:17 +0200
-
--- missing tbl features -----------------------------------------------
- implement basic non-parametric .de to support e.g. sox(1)
diff --git a/man.7 b/man.7
index 8aa1f2c0..65947f53 100644
--- a/man.7
+++ b/man.7
@@ -1,4 +1,4 @@
-.\" $Id: man.7,v 1.100 2011/05/26 09:26:16 kristaps Exp $
+.\" $Id: man.7,v 1.101 2011/07/03 22:57:32 kristaps Exp $
.\"
.\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 26 2011 $
+.Dd $Mdocdate: July 3 2011 $
.Dt MAN 7
.Os
.Sh NAME
@@ -845,6 +845,10 @@ Begin literal mode: all subsequent free-form lines have their end of
line boundaries preserved.
May be ended by
.Sx \&fi .
+Literal mode is implicitly ended by
+.Sx \&SH
+or
+.Sx \&SS .
.Ss \&sp
Insert vertical spaces into output with the following syntax:
.Bd -filled -offset indent
diff --git a/man_html.c b/man_html.c
index f3aab2e2..fe79390c 100644
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/* $Id: man_html.c,v 1.75 2011/06/29 15:38:09 kristaps Exp $ */
+/* $Id: man_html.c,v 1.76 2011/07/03 22:57:32 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -439,6 +439,7 @@ man_SH_pre(MAN_ARGS)
struct htmlpair tag;
if (MAN_BLOCK == n->type) {
+ mh->fl &= ~MANH_LITERAL;
PAIR_CLASS_INIT(&tag, "section");
print_otag(h, TAG_DIV, 1, &tag);
return(1);
@@ -520,6 +521,7 @@ man_SS_pre(MAN_ARGS)
struct htmlpair tag;
if (MAN_BLOCK == n->type) {
+ mh->fl &= ~MANH_LITERAL;
PAIR_CLASS_INIT(&tag, "subsection");
print_otag(h, TAG_DIV, 1, &tag);
return(1);
diff --git a/man_term.c b/man_term.c
index 7bff3542..4a77eb5f 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/* $Id: man_term.c,v 1.112 2011/06/29 15:38:09 kristaps Exp $ */
+/* $Id: man_term.c,v 1.113 2011/07/03 22:57:32 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -709,6 +709,7 @@ pre_SS(DECL_ARGS)
switch (n->type) {
case (MAN_BLOCK):
+ mt->fl &= ~MANT_LITERAL;
mt->lmargin = term_len(p, INDENT);
mt->offset = term_len(p, INDENT);
/* If following a prior empty `SS', no vspace. */
@@ -759,6 +760,7 @@ pre_SH(DECL_ARGS)
switch (n->type) {
case (MAN_BLOCK):
+ mt->fl &= ~MANT_LITERAL;
mt->lmargin = term_len(p, INDENT);
mt->offset = term_len(p, INDENT);
/* If following a prior empty `SH', no vspace. */