summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mdoc.h3
-rw-r--r--mdocterm.c4
-rw-r--r--private.h1
-rw-r--r--strings.c187
-rw-r--r--term.c172
5 files changed, 356 insertions, 11 deletions
diff --git a/mdoc.h b/mdoc.h
index dca0bdeb..8b7dea49 100644
--- a/mdoc.h
+++ b/mdoc.h
@@ -431,6 +431,9 @@ int mdoc_endparse(struct mdoc *);
const char *mdoc_arch2a(enum mdoc_arch);
const char *mdoc_vol2a(enum mdoc_vol);
const char *mdoc_msec2a(enum mdoc_msec);
+const char *mdoc_att2a(enum mdoc_att);
+enum mdoc_att mdoc_atoatt(const char *);
+const char *mdoc_st2a(int);
int mdoc_isdelim(const char *);
__END_DECLS
diff --git a/mdocterm.c b/mdocterm.c
index 10b4b8d8..d4b27c9e 100644
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -305,6 +305,10 @@ pescape(struct termp *p, const char *word, size_t *i, size_t len)
stringa(p, "<-");
else if ('-' == word[*i] && '>' == word[*i + 1])
stringa(p, "->");
+ else if ('l' == word[*i] && 'q' == word[*i + 1])
+ chara(p, '\"');
+ else if ('r' == word[*i] && 'q' == word[*i + 1])
+ chara(p, '\"');
(*i)++;
return;
diff --git a/private.h b/private.h
index 16e3f5a6..0daf875b 100644
--- a/private.h
+++ b/private.h
@@ -130,7 +130,6 @@ enum mdoc_sec mdoc_atosec(const char *);
enum mdoc_msec mdoc_atomsec(const char *);
enum mdoc_vol mdoc_atovol(const char *);
enum mdoc_arch mdoc_atoarch(const char *);
-enum mdoc_att mdoc_atoatt(const char *);
time_t mdoc_atotime(const char *);
char *mdoc_type2a(enum mdoc_type);
diff --git a/strings.c b/strings.c
index 2ca3de93..ec96904c 100644
--- a/strings.c
+++ b/strings.c
@@ -539,3 +539,190 @@ mdoc_msec2a(enum mdoc_msec msec)
/* NOTREACHED */
}
+
+const char *
+mdoc_st2a(int c)
+{
+ char *p;
+
+ switch (c) {
+ case(MDOC_p1003_1_88):
+ p = "IEEE Std 1003.1-1988 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1_90):
+ p = "IEEE Std 1003.1-1990 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1_96):
+ p = "ISO/IEC 9945-1:1996 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1_2001):
+ p = "IEEE Std 1003.1-2001 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1_2004):
+ p = "IEEE Std 1003.1-2004 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1):
+ p = "IEEE Std 1003.1 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1b):
+ p = "IEEE Std 1003.1b (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1b_93):
+ p = "IEEE Std 1003.1b-1993 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1c_95):
+ p = "IEEE Std 1003.1c-1995 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_1g_2000):
+ p = "IEEE Std 1003.1g-2000 (\\(lqPOSIX\\(rq)";
+ break;
+ case(MDOC_p1003_2_92):
+ p = "IEEE Std 1003.2-1992 (\\(lqPOSIX.2\\(rq)";
+ break;
+ case(MDOC_p1387_2_95):
+ p = "IEEE Std 1387.2-1995 (\\(lqPOSIX.7.2\\(rq)";
+ break;
+ case(MDOC_p1003_2):
+ p = "IEEE Std 1003.2 (\\(lqPOSIX.2\\(rq)";
+ break;
+ case(MDOC_p1387_2):
+ p = "IEEE Std 1387.2 (\\(lqPOSIX.7.2\\(rq)";
+ break;
+ case(MDOC_isoC_90):
+ p = "ISO/IEC 9899:1990 (\\(lqISO C90\\(rq)";
+ break;
+ case(MDOC_isoC_amd1):
+ p = "ISO/IEC 9899/AMD1:1995 (\\(lqISO C90\\(rq)";
+ break;
+ case(MDOC_isoC_tcor1):
+ p = "ISO/IEC 9899/TCOR1:1994 (\\(lqISO C90\\(rq)";
+ break;
+ case(MDOC_isoC_tcor2):
+ p = "ISO/IEC 9899/TCOR2:1995 (\\(lqISO C90\\(rq)";
+ break;
+ case(MDOC_isoC_99):
+ p = "ISO/IEC 9899:1999 (\\(lqISO C99\\(rq)";
+ break;
+ case(MDOC_ansiC):
+ p = "ANSI X3.159-1989 (\\(lqANSI C\\(rq)";
+ break;
+ case(MDOC_ansiC_89):
+ p = "ANSI X3.159-1989 (\\(lqANSI C\\(rq)";
+ break;
+ case(MDOC_ansiC_99):
+ p = "ANSI/ISO/IEC 9899-1999 (\\(lqANSI C99\\(rq)";
+ break;
+ case(MDOC_ieee754):
+ p = "IEEE Std 754-1985";
+ break;
+ case(MDOC_iso8802_3):
+ p = "ISO 8802-3: 1989";
+ break;
+ case(MDOC_xpg3):
+ p = "X/Open Portability Guide Issue 3 "
+ "(\\(lqXPG3\\(rq)";
+ break;
+ case(MDOC_xpg4):
+ p = "X/Open Portability Guide Issue 4 "
+ "(\\(lqXPG4\\(rq)";
+ break;
+ case(MDOC_xpg4_2):
+ p = "X/Open Portability Guide Issue 4.2 "
+ "(\\(lqXPG4.2\\(rq)";
+ break;
+ case(MDOC_xpg4_3):
+ p = "X/Open Portability Guide Issue 4.3 "
+ "(\\(lqXPG4.3\\(rq)";
+ break;
+ case(MDOC_xbd5):
+ p = "X/Open System Interface Definitions Issue 5 "
+ "(\\(lqXBD5\\(rq)";
+ break;
+ case(MDOC_xcu5):
+ p = "X/Open Commands and Utilities Issue 5 "
+ "(\\(lqXCU5\\(rq)";
+ break;
+ case(MDOC_xsh5):
+ p = "X/Open System Interfaces and Headers Issue 5 "
+ "(\\(lqXSH5\\(rq)";
+ break;
+ case(MDOC_xns5):
+ p = "X/Open Networking Services Issue 5 "
+ "(\\(lqXNS5\\(rq)";
+ break;
+ case(MDOC_xns5_2d2_0):
+ p = "X/Open Networking Services Issue 5.2 Draft 2.0 "
+ "(\\(lqXNS5.2D2.0\\(rq)";
+ break;
+ case(MDOC_xcurses4_2):
+ p = "X/Open Curses Issue 4 Version 2 "
+ "(\\(lqXCURSES4.2\\(rq)";
+ break;
+ case(MDOC_susv2):
+ p = "Version 2 of the Single UNIX Specification";
+ break;
+ case(MDOC_susv3):
+ p = "Version 3 of the Single UNIX Specification";
+ break;
+ case(MDOC_svid4):
+ p = "System V Interface Definition, Fourth Edition "
+ "(\\(lqSVID4\\(rq)";
+ break;
+ default:
+ p = NULL;
+ break;
+ }
+
+ return(p);
+}
+
+
+const char *
+mdoc_att2a(enum mdoc_att c)
+{
+ char *p;
+
+ switch (c) {
+ case(ATT_v1):
+ p = "Version 1 AT&T UNIX";
+ break;
+ case(ATT_v2):
+ p = "Version 2 AT&T UNIX";
+ break;
+ case(ATT_v3):
+ p = "Version 3 AT&T UNIX";
+ break;
+ case(ATT_v4):
+ p = "Version 4 AT&T UNIX";
+ break;
+ case(ATT_v5):
+ p = "Version 5 AT&T UNIX";
+ break;
+ case(ATT_v6):
+ p = "Version 6 AT&T UNIX";
+ break;
+ case(ATT_v7):
+ p = "Version 7 AT&T UNIX";
+ break;
+ case(ATT_32v):
+ p = "Version 32V AT&T UNIX";
+ break;
+ case(ATT_V1):
+ p = "AT&T System V.1 UNIX";
+ break;
+ case(ATT_V2):
+ p = "AT&T System V.2 UNIX";
+ break;
+ case(ATT_V3):
+ p = "AT&T System V.3 UNIX";
+ break;
+ case(ATT_V4):
+ p = "AT&T System V.4 UNIX";
+ break;
+ default:
+ p = "AT&T UNIX";
+ break;
+ }
+
+ return(p);
+}
diff --git a/term.c b/term.c
index 8ba4beae..f1b45608 100644
--- a/term.c
+++ b/term.c
@@ -45,7 +45,10 @@
#define TTYPE_SSECTION 10
#define TTYPE_FILE 11
#define TTYPE_EMPH 12
-#define TTYPE_NMAX 13
+#define TTYPE_CONFIG 13
+#define TTYPE_CMD 14
+#define TTYPE_INCLUDE 15
+#define TTYPE_NMAX 16
/*
* These define "styles" for element types, like command arguments or
@@ -66,7 +69,10 @@ const int ttypes[TTYPE_NMAX] = {
TERMP_UNDERLINE, /* TTYPE_LINK */
TERMP_BOLD, /* TTYPE_SSECTION */
TERMP_UNDERLINE, /* TTYPE_FILE */
- TERMP_UNDERLINE /* TTYPE_EMPH */
+ TERMP_UNDERLINE, /* TTYPE_EMPH */
+ TERMP_BOLD, /* TTYPE_CONFIG */
+ TERMP_BOLD, /* TTYPE_CMD */
+ TERMP_BOLD /* TTYPE_INCLUDE */
};
static int arg_hasattr(int, size_t,
@@ -97,6 +103,8 @@ DECL_POST(name);
DECL_PREPOST(termp_aq);
DECL_PREPOST(termp_ar);
DECL_PREPOST(termp_bd);
+DECL_PREPOST(termp_cd);
+DECL_PREPOST(termp_cm);
DECL_PREPOST(termp_d1);
DECL_PREPOST(termp_dq);
DECL_PREPOST(termp_em);
@@ -105,6 +113,8 @@ DECL_PREPOST(termp_fd);
DECL_PREPOST(termp_fl);
DECL_PREPOST(termp_fn);
DECL_PREPOST(termp_ft);
+DECL_PREPOST(termp_ic);
+DECL_PREPOST(termp_in);
DECL_PREPOST(termp_it);
DECL_PREPOST(termp_nm);
DECL_PREPOST(termp_op);
@@ -119,6 +129,7 @@ DECL_PREPOST(termp_sx);
DECL_PREPOST(termp_va);
DECL_PREPOST(termp_vt);
+DECL_PRE(termp_at);
DECL_PRE(termp_bx);
DECL_PRE(termp_ex);
DECL_PRE(termp_nd);
@@ -126,6 +137,8 @@ DECL_PRE(termp_ns);
DECL_PRE(termp_nx);
DECL_PRE(termp_ox);
DECL_PRE(termp_pp);
+DECL_PRE(termp_rv);
+DECL_PRE(termp_st);
DECL_PRE(termp_ud);
DECL_PRE(termp_xr);
@@ -149,8 +162,8 @@ const struct termact __termacts[MDOC_MAX] = {
{ NULL, NULL }, /* Ad */
{ NULL, NULL }, /* An */
{ termp_ar_pre, termp_ar_post }, /* Ar */
- { NULL, NULL }, /* Cd */
- { NULL, NULL }, /* Cm */
+ { termp_cd_pre, termp_cd_post }, /* Cd */
+ { termp_cm_pre, termp_cm_post }, /* Cm */
{ NULL, NULL }, /* Dv */
{ NULL, NULL }, /* Er */
{ NULL, NULL }, /* Ev */
@@ -160,16 +173,16 @@ const struct termact __termacts[MDOC_MAX] = {
{ termp_fl_pre, termp_fl_post }, /* Fl */
{ termp_fn_pre, termp_fn_post }, /* Fn */
{ termp_ft_pre, termp_ft_post }, /* Ft */
- { NULL, NULL }, /* Ic */
- { NULL, NULL }, /* In */
+ { termp_ic_pre, termp_ic_post }, /* Ic */
+ { termp_in_pre, termp_in_post }, /* In */
{ NULL, NULL }, /* Li */
{ termp_nd_pre, NULL }, /* Nd */
{ termp_nm_pre, termp_nm_post }, /* Nm */
{ termp_op_pre, termp_op_post }, /* Op */
{ NULL, NULL }, /* Ot */
{ termp_pa_pre, termp_pa_post }, /* Pa */
- { NULL, NULL }, /* Rv */
- { NULL, NULL }, /* St */
+ { termp_rv_pre, NULL }, /* Rv */
+ { termp_st_pre, NULL }, /* St */
{ termp_va_pre, termp_va_post }, /* Va */
{ termp_vt_pre, termp_vt_post }, /* Vt */
{ termp_xr_pre, NULL }, /* Xr */
@@ -185,9 +198,9 @@ const struct termact __termacts[MDOC_MAX] = {
{ NULL, NULL }, /* %T */
{ NULL, NULL }, /* %V */
{ NULL, NULL }, /* Ac */
- { NULL, NULL }, /* Ao */
+ { termp_aq_pre, termp_aq_post }, /* Ao */
{ termp_aq_pre, termp_aq_post }, /* Aq */
- { NULL, NULL }, /* At */
+ { termp_at_pre, NULL }, /* At */
{ NULL, NULL }, /* Bc */
{ NULL, NULL }, /* Bf */
{ NULL, NULL }, /* Bo */
@@ -545,6 +558,52 @@ termp_ar_post(DECL_ARGS)
/* ARGSUSED */
static int
+termp_st_pre(DECL_ARGS)
+{
+ const char *tp;
+
+ assert(1 == node->data.elem.argc);
+
+ tp = mdoc_st2a(node->data.elem.argv[0].arg);
+ word(p, tp);
+
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_rv_pre(DECL_ARGS)
+{
+ int i;
+
+ i = arg_getattr(MDOC_Std, node->data.elem.argc,
+ node->data.elem.argv);
+ assert(i >= 0);
+
+ newln(p);
+ word(p, "The");
+
+ p->flags |= ttypes[TTYPE_FUNC_NAME];
+ word(p, *node->data.elem.argv[i].value);
+ p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+
+ word(p, "() function returns the value 0 if successful;");
+ word(p, "otherwise the value -1 is returned and the");
+ word(p, "global variable");
+
+ p->flags |= ttypes[TTYPE_VAR_DECL];
+ word(p, "errno");
+ p->flags &= ~ttypes[TTYPE_VAR_DECL];
+
+ word(p, "is set to indicate the error.");
+
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
termp_ex_pre(DECL_ARGS)
{
int i;
@@ -1189,3 +1248,96 @@ termp_em_post(DECL_ARGS)
p->flags &= ~ttypes[TTYPE_EMPH];
}
+
+
+/* ARGSUSED */
+static int
+termp_cd_pre(DECL_ARGS)
+{
+
+ p->flags |= ttypes[TTYPE_CONFIG];
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_cd_post(DECL_ARGS)
+{
+
+ p->flags &= ~ttypes[TTYPE_CONFIG];
+}
+
+
+/* ARGSUSED */
+static int
+termp_cm_pre(DECL_ARGS)
+{
+
+ p->flags |= ttypes[TTYPE_CMD_FLAG];
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_cm_post(DECL_ARGS)
+{
+
+ p->flags &= ~ttypes[TTYPE_CMD_FLAG];
+}
+
+
+/* ARGSUSED */
+static int
+termp_ic_pre(DECL_ARGS)
+{
+
+ p->flags |= ttypes[TTYPE_CMD];
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_ic_post(DECL_ARGS)
+{
+
+ p->flags &= ~ttypes[TTYPE_CMD];
+}
+
+
+/* ARGSUSED */
+static int
+termp_in_pre(DECL_ARGS)
+{
+
+ p->flags |= ttypes[TTYPE_INCLUDE];
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_in_post(DECL_ARGS)
+{
+
+ p->flags &= ~ttypes[TTYPE_INCLUDE];
+}
+
+
+/* ARGSUSED */
+static int
+termp_at_pre(DECL_ARGS)
+{
+ enum mdoc_att c;
+
+ c = ATT_DEFAULT;
+ if (node->child) {
+ assert(MDOC_TEXT == node->child->type);
+ c = mdoc_atoatt(node->child->data.text.string);
+ }
+
+ word(p, mdoc_att2a(c));
+ return(0);
+}