Mercurial > illumos > illumos-gate

changeset 13116:6fa1bbe65855

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6786012 catman issues with SUNWxwpmn and some man pages do not format properly
author Rich Burridge <rich.burridge@oracle.com>
date Fri, 13 Aug 2010 12:20:44 -0700
parents 17b823d436a7
children f8c2d8257841
files usr/src/cmd/man/src/man.c usr/src/pkg/manifests/text-doctools.mf
diffstat 2 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/man/src/man.c	Fri Aug 13 11:23:20 2010 -0700
+++ b/usr/src/cmd/man/src/man.c	Fri Aug 13 12:20:44 2010 -0700
@@ -149,16 +149,17 @@
 static const struct preprocessor {
 	char	p_tag;
 	char	*p_nroff,
-		*p_troff;
+		*p_troff,
+		*p_stdin_char;
 } preprocessors [] = {
-	{'c',	"cw",				"cw"},
+	{'c',	"cw",				"cw",		"-"},
 	{'e',	"neqn /usr/share/lib/pub/eqnchar",
-			"eqn /usr/share/lib/pub/eqnchar"},
-	{'p',	"pic",				"pic"},
-	{'r',	"refer",			"refer"},
-	{'t',	"tbl",				"tbl"},
-	{'v',	"vgrind -f",			"vgrind -f"},
-	{0,	0,				0}
+			"eqn /usr/share/lib/pub/eqnchar",	"-"},
+	{'p',	"gpic",				"gpic",		"-"},
+	{'r',	"refer",			"refer",	"-"},
+	{'t',	"tbl",				"tbl",		""},
+	{'v',	"vgrind -f",			"vgrind -f",	"-"},
+	{0,	0,				0,		0}
 };
 
 struct suffix {
@@ -2579,7 +2580,8 @@
 				 */
 				(void) sprintf(cbp, "%s %s |",
 				    troffit ? pp->p_troff : pp->p_nroff,
-				    pipestage++ == 0 ? manpname : "-");
+				    pipestage++ == 0 ? manpname :
+				    pp->p_stdin_char);
 				cbp += strlen(cbp);
 
 				/*
--- a/usr/src/pkg/manifests/text-doctools.mf	Fri Aug 13 11:23:20 2010 -0700
+++ b/usr/src/pkg/manifests/text-doctools.mf	Fri Aug 13 12:20:44 2010 -0700
@@ -388,4 +388,8 @@
     license=usr/src/cmd/vgrind/THIRDPARTYLICENSE
 link path=usr/lib/tmac target=../share/lib/tmac
 link path=usr/man target=./share/man
+#
+# gpic is used as a preprocessor by the apropos command
+#
+depend fmri=text/groff type=require
 depend fmri=text/less type=require