===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- mandoc/mdoc.c	2008/12/29 18:08:44	1.9
+++ mandoc/mdoc.c	2008/12/30 19:06:03	1.12
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.9 2008/12/29 18:08:44 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.12 2008/12/30 19:06:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -100,26 +100,26 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_text, MDOC_CALLABLE }, /* Ad */ 
 	{ NULL, 0 }, /* An */ 
 	{ macro_text, MDOC_CALLABLE }, /* Ar */
-	{ NULL, 0 }, /* Cd */
+	{ macro_constant, MDOC_QUOTABLE }, /* Cd */
 	{ macro_text, MDOC_CALLABLE }, /* Cm */
 	{ macro_text, MDOC_CALLABLE }, /* Dv */ 
 	{ macro_text, MDOC_CALLABLE }, /* Er */ 
 	{ macro_text, MDOC_CALLABLE }, /* Ev */ 
-	{ NULL, 0 }, /* Ex */
+	{ macro_constant_argv, 0 }, /* Ex */
 	{ macro_text, MDOC_CALLABLE }, /* Fa */ 
 	{ NULL, 0 }, /* Fd */ 
 	{ macro_text, MDOC_CALLABLE }, /* Fl */
-	{ NULL, 0 }, /* Fn */ 
+	{ macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fn */ 
 	{ macro_text, 0 }, /* Ft */ 
 	{ macro_text, MDOC_CALLABLE }, /* Ic */ 
 	{ NULL, 0 }, /* In */ 
 	{ macro_text, MDOC_CALLABLE }, /* Li */
-	{ NULL, 0 }, /* Nd */ 
+	{ macro_constant, 0 }, /* Nd */ 
 	{ NULL, 0 }, /* Nm */ 
 	{ NULL, 0 }, /* Op */
 	{ NULL, 0 }, /* Ot */
 	{ macro_text, MDOC_CALLABLE }, /* Pa */
-	{ NULL, 0 }, /* Rv */
+	{ macro_constant_argv, 0 }, /* Rv */
 	{ NULL, 0 }, /* St */
 	{ macro_text, MDOC_CALLABLE }, /* Va */
 	{ macro_text, MDOC_CALLABLE }, /* Vt */ 
@@ -173,8 +173,8 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* So */
 	{ macro_scoped_pline, MDOC_CALLABLE }, /* Sq */
 	{ NULL, 0 }, /* Sm */
-	{ NULL, 0 }, /* Sx */
-	{ NULL, 0 }, /* Sy */
+	{ macro_text, MDOC_CALLABLE }, /* Sx */
+	{ macro_text, MDOC_CALLABLE }, /* Sy */
 	{ macro_text, MDOC_CALLABLE }, /* Tn */
 	{ macro_constant_delimited, 0 }, /* Ux */
 	{ NULL, 0 }, /* Xc */
@@ -186,8 +186,8 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* Bk */
 	{ NULL, 0 }, /* Ek */
 	{ macro_constant, 0 }, /* Bt */
-	{ NULL, 0 }, /* Hf */
-	{ NULL, 0 }, /* Fr */
+	{ macro_constant, 0 }, /* Hf */
+	{ macro_obsolete, 0 }, /* Fr */
 	{ macro_constant, 0 }, /* Ud */
 };