correct .Eo spacing

correct .Eo spacing

[Ingo Schwarze]

Hi,

even though .Eo does not print any delimiters except the custom
ones printed implicitly, it still needs to suppress spacing when
entering and exiting its body.

OK?
  Ingo


Index: mdoc_term.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.138
diff -u -p -r1.138 mdoc_term.c
--- mdoc_term.c	16 Oct 2011 12:18:32 -0000	1.138
+++ mdoc_term.c	1 Nov 2011 16:05:03 -0000
@@ -190,7 +190,7 @@ static	const struct termact termacts[MDO
 	{ NULL, NULL }, /* Ec */ /* FIXME: no space */
 	{ NULL, NULL }, /* Ef */
 	{ termp_under_pre, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
+	{ termp_quote_pre, termp_quote_post }, /* Eo */
 	{ termp_xx_pre, NULL }, /* Fx */
 	{ termp_bold_pre, NULL }, /* Ms */
 	{ termp_igndelim_pre, NULL }, /* No */
@@ -1921,6 +1921,8 @@ termp_quote_pre(DECL_ARGS)
 	case (MDOC_Dq):
 		term_word(p, "``");
 		break;
+	case (MDOC_Eo):
+		break;
 	case (MDOC_Po):
 		/* FALLTHROUGH */
 	case (MDOC_Pq):
@@ -1984,6 +1986,8 @@ termp_quote_post(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Dq):
 		term_word(p, "''");
+		break;
+	case (MDOC_Eo):
 		break;
 	case (MDOC_Po):
 		/* FALLTHROUGH */
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv

Re: correct .Eo spacing

[Kristaps Dzonsons]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

On 11/01/11 17:00, Ingo Schwarze wrote:
> Hi,
>
> even though .Eo does not print any delimiters except the custom
> ones printed implicitly, it still needs to suppress spacing when
> entering and exiting its body.

I'm ok with this.  However, -T[x]html needed the same treatment. 
Modified patch enclosed...

Thanks!

Kristaps

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 2076 bytes --]

Index: mdoc_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v
retrieving revision 1.181
diff -u -p -r1.181 mdoc_html.c
--- mdoc_html.c	16 Oct 2011 12:20:34 -0000	1.181
+++ mdoc_html.c	3 Nov 2011 15:03:38 -0000
@@ -189,7 +189,7 @@ static	const struct htmlmdoc mdocs[MDOC_
 	{NULL, NULL}, /* Ec */ /* FIXME: no space */
 	{NULL, NULL}, /* Ef */
 	{mdoc_em_pre, NULL}, /* Em */ 
-	{NULL, NULL}, /* Eo */
+	{mdoc_quote_pre, mdoc_quote_post}, /* Eo */
 	{mdoc_xx_pre, NULL}, /* Fx */
 	{mdoc_ms_pre, NULL}, /* Ms */
 	{mdoc_igndelim_pre, NULL}, /* No */
@@ -2185,6 +2185,8 @@ mdoc_quote_pre(MDOC_ARGS)
 		PAIR_CLASS_INIT(&tag, "opt");
 		print_otag(h, TAG_SPAN, 1, &tag);
 		break;
+	case (MDOC_Eo):
+		break;
 	case (MDOC_Do):
 		/* FALLTHROUGH */
 	case (MDOC_Dq):
@@ -2249,6 +2251,8 @@ mdoc_quote_post(MDOC_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Bq):
 		print_text(h, "\\(rB");
+		break;
+	case (MDOC_Eo):
 		break;
 	case (MDOC_Qo):
 		/* FALLTHROUGH */
Index: mdoc_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v
retrieving revision 1.236
diff -u -p -r1.236 mdoc_term.c
--- mdoc_term.c	16 Oct 2011 12:20:34 -0000	1.236
+++ mdoc_term.c	3 Nov 2011 15:03:39 -0000
@@ -194,7 +194,7 @@ static	const struct termact termacts[MDO
 	{ NULL, NULL }, /* Ec */ /* FIXME: no space */
 	{ NULL, NULL }, /* Ef */
 	{ termp_under_pre, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
+	{ termp_quote_pre, termp_quote_post }, /* Eo */
 	{ termp_xx_pre, NULL }, /* Fx */
 	{ termp_bold_pre, NULL }, /* Ms */
 	{ termp_igndelim_pre, NULL }, /* No */
@@ -1925,6 +1925,8 @@ termp_quote_pre(DECL_ARGS)
 	case (MDOC_Dq):
 		term_word(p, "``");
 		break;
+	case (MDOC_Eo):
+		break;
 	case (MDOC_Po):
 		/* FALLTHROUGH */
 	case (MDOC_Pq):
@@ -1988,6 +1990,8 @@ termp_quote_post(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Dq):
 		term_word(p, "''");
+		break;
+	case (MDOC_Eo):
 		break;
 	case (MDOC_Po):
 		/* FALLTHROUGH */