=================================================================== RCS file: /cvs/mandoc/Attic/mandoc-db.c,v retrieving revision 1.15 retrieving revision 1.17 diff -u -p -r1.15 -r1.17 --- mandoc/Attic/mandoc-db.c 2011/05/02 13:56:13 1.15 +++ mandoc/Attic/mandoc-db.c 2011/05/03 14:39:27 1.17 @@ -1,4 +1,4 @@ -/* $Id: mandoc-db.c,v 1.15 2011/05/02 13:56:13 kristaps Exp $ */ +/* $Id: mandoc-db.c,v 1.17 2011/05/03 14:39:27 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -49,7 +49,8 @@ enum type { MANDOC_UTILITY, MANDOC_INCLUDES, MANDOC_VARIABLE, - MANDOC_STANDARD + MANDOC_STANDARD, + MANDOC_AUTHOR }; #define MAN_ARGS DB *db, \ @@ -77,6 +78,7 @@ static int pman_node(MAN_ARGS); static void pmdoc(DB *, const char *, DBT *, size_t *, DBT *, DBT *, size_t *, struct mdoc *); static void pmdoc_node(MDOC_ARGS); +static void pmdoc_An(MDOC_ARGS); static void pmdoc_Fd(MDOC_ARGS); static void pmdoc_In(MDOC_ARGS); static void pmdoc_Fn(MDOC_ARGS); @@ -106,7 +108,7 @@ static const pmdoc_nf mdocs[MDOC_MAX] = { NULL, /* El */ NULL, /* It */ NULL, /* Ad */ - NULL, /* An */ + pmdoc_An, /* An */ NULL, /* Ar */ NULL, /* Cd */ NULL, /* Cm */ @@ -223,6 +225,7 @@ main(int argc, char *argv[]) struct man *man; /* resulting man */ char *fn; /* current file being parsed */ const char *msec, /* manual section */ + *mtitle, /* manual title */ *dir; /* result dir (default: cwd) */ char ibuf[MAXPATHLEN], /* index fname */ ibbuf[MAXPATHLEN], /* index backup fname */ @@ -356,8 +359,12 @@ main(int argc, char *argv[]) msec = NULL != mdoc ? mdoc_meta(mdoc)->msec : man_meta(man)->msec; + mtitle = NULL != mdoc ? + mdoc_meta(mdoc)->title : + man_meta(man)->title; assert(msec); + assert(mtitle); /* * The index record value consists of a nil-terminated @@ -370,6 +377,7 @@ main(int argc, char *argv[]) dbt_init(&rval, &rsz); dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1); dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1); + dbt_appendb(&rval, &rsz, mtitle, strlen(mtitle) + 1); sv = rval.size; /* Fix the record number in the btree value. */ @@ -518,6 +526,23 @@ dbt_append(DBT *key, size_t *ksz, const char *cp) ((char *)key->data)[(int)key->size - 1] = ' '; dbt_appendb(key, ksz, cp, sz + 1); +} + +/* ARGSUSED */ +static void +pmdoc_An(MDOC_ARGS) +{ + uint32_t fl; + + if (SEC_AUTHORS != n->sec) + return; + + for (n = n->child; n; n = n->next) + if (MDOC_TEXT == n->type) + dbt_append(key, ksz, n->string); + + fl = MANDOC_AUTHOR; + memcpy(val->data, &fl, 4); } /* ARGSUSED */