From 13147b8cddc9c00830cdafc301f4af3492ad67f5 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 18 Jul 2009 23:31:04 +0000 Subject: More clarity fixes in mdoc.7. Sm/Sy argument to `Bf' fixed (schwarze@openbsd). --- mdoc.7 | 26 ++++++++------------------ mdoc_validate.c | 4 ++-- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/mdoc.7 b/mdoc.7 index 063b4e11..1d95a690 100644 --- a/mdoc.7 +++ b/mdoc.7 @@ -1,4 +1,4 @@ -.\" $Id: mdoc.7,v 1.47 2009/07/18 18:49:19 kristaps Exp $ +.\" $Id: mdoc.7,v 1.48 2009/07/18 23:31:04 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -131,11 +131,6 @@ also be text-decorated using the .Sq \ef escape followed by an indicator: B (bold), I, (italic), or P and R (Roman, or reset). This form is not recommended. -.Pp -Lastly, a standalone double-quote may be produced in a macro line by -using two consecutive double-quotes within a quoted literal. See -.Sx Quotation -for details. .\" SUB-SECTION---------------------- .Ss Whitespace In non-literal free-form lines, consecutive blocks of whitespace are @@ -162,18 +157,8 @@ or when in a literal context. Macro arguments may be quoted with a double-quote to group space-delimited terms or to retain blocks of whitespace. A quoted argument begins with a double-quote preceded by whitespace. The next -double-quote that is -.Em -preceded by a double-quote terminates the term, regardless of -surrounding whitespace. Thus, the following construction produces -.Sq "a""b" , -since, as mentioned in -.Sx Special Characters , -two consecutive double-quotes in a quoted literal produce a standalone -double-quote: -.Bd -literal -offset indent -\&.Em "a""""b" -.Ed +double-quote not pair-wise adjacent to another double-quote terminates +the literal, regardless of surrounding whitespace. .\" PARAGRAPH------------ .Pp This produces tokens @@ -471,6 +456,11 @@ file re-write .Bl -dash -compact .\" LIST-ITEM .It +In quoted literals, groff allowed pair-wise double-quotes to produce a +standalone double-quote in formatted output. This idiosyncratic +behaviour is no longer applicable. +.\" LIST-ITEM +.It The .Sq \&sp macro does not accept negative numbers. diff --git a/mdoc_validate.c b/mdoc_validate.c index 5d2be450..9c8d679a 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.36 2009/07/17 12:40:48 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.37 2009/07/18 23:31:04 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -862,7 +862,7 @@ post_bf(POST_ARGS) return(1); else if (0 == strcmp(p, "Li")) return(1); - else if (0 == strcmp(p, "Sm")) + else if (0 == strcmp(p, "Sy")) return(1); return(mdoc_nerr(mdoc, head, EFONT)); -- cgit v1.2.3-56-ge451