===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -p -r1.6 -r1.12
--- mandoc/mdoc.c	2008/12/28 21:25:09	1.6
+++ mandoc/mdoc.c	2008/12/30 19:06:03	1.12
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.6 2008/12/28 21:25:09 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 */ 
@@ -137,46 +137,46 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* %V */
 	{ NULL, 0 }, /* Ac */
 	{ NULL, 0 }, /* Ao */
-	{ NULL, 0 }, /* Aq */
-	{ NULL, 0 }, /* At */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Aq */
+	{ macro_constant, 0 }, /* At */
 	{ NULL, 0 }, /* Bc */
 	{ NULL, 0 }, /* Bf */ 
 	{ NULL, 0 }, /* Bo */
-	{ NULL, 0 }, /* Bq */
-	{ NULL, 0 }, /* Bsx */
-	{ NULL, 0 }, /* Bx */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Bq */
+	{ macro_constant_delimited, 0 }, /* Bsx */
+	{ macro_constant_delimited, 0 }, /* Bx */
 	{ NULL, 0 }, /* Db */
 	{ NULL, 0 }, /* Dc */
 	{ NULL, 0 }, /* Do */
-	{ NULL, 0 }, /* Dq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Dq */
 	{ NULL, 0 }, /* Ec */
 	{ NULL, 0 }, /* Ef */
 	{ macro_text, MDOC_CALLABLE }, /* Em */ 
 	{ NULL, 0 }, /* Eo */
-	{ NULL, 0 }, /* Fx */
+	{ macro_constant_delimited, 0 }, /* Fx */
 	{ macro_text, 0 }, /* Ms */
 	{ NULL, 0 }, /* No */
 	{ NULL, 0 }, /* Ns */
-	{ NULL, 0 }, /* Nx */
-	{ NULL, 0 }, /* Ox */
+	{ macro_constant_delimited, 0 }, /* Nx */
+	{ macro_constant_delimited, 0 }, /* Ox */
 	{ NULL, 0 }, /* Pc */
 	{ NULL, 0 }, /* Pf */
 	{ NULL, 0 }, /* Po */
-	{ NULL, 0 }, /* Pq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Pq */
 	{ NULL, 0 }, /* Qc */
-	{ NULL, 0 }, /* Ql */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Ql */
 	{ NULL, 0 }, /* Qo */
 	{ macro_scoped_pline, MDOC_CALLABLE }, /* Qq */
 	{ NULL, 0 }, /* Re */
 	{ NULL, 0 }, /* Rs */
 	{ NULL, 0 }, /* Sc */
 	{ NULL, 0 }, /* So */
-	{ NULL, 0 }, /* Sq */
+	{ 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 */
-	{ NULL, 0 }, /* Ux */
+	{ macro_constant_delimited, 0 }, /* Ux */
 	{ NULL, 0 }, /* Xc */
 	{ NULL, 0 }, /* Xo */
 	{ NULL, 0 }, /* Fo */ 
@@ -185,10 +185,10 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* Oc */
 	{ NULL, 0 }, /* Bk */
 	{ NULL, 0 }, /* Ek */
-	{ NULL, 0 }, /* Bt */
-	{ NULL, 0 }, /* Hf */
-	{ NULL, 0 }, /* Fr */
-	{ NULL, 0 }, /* Ud */
+	{ macro_constant, 0 }, /* Bt */
+	{ macro_constant, 0 }, /* Hf */
+	{ macro_obsolete, 0 }, /* Fr */
+	{ macro_constant, 0 }, /* Ud */
 };
 
 const	char * const *mdoc_macronames = __mdoc_macronames;