Have mandoc-db grok `Dt'/`TH' manual title as well.

[mandoc.git] / mandoc-db.c

diff --git a/mandoc-db.c b/mandoc-db.c
index abc885ba78ee5ac78dd47e55cd33dc7e231852ca..1086a3fbe3febc07ab676dce598d36d22c29ce5a 100644 (file)
--- a/mandoc-db.c
+++ b/mandoc-db.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc-db.c,v 1.13 2011/04/28 10:44:02 kristaps Exp $ */
+/*     $Id: mandoc-db.c,v 1.16 2011/05/03 10:08:09 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -223,6 +223,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 +357,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 +375,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. */
@@ -453,6 +459,48 @@ dbt_appendb(DBT *key, size_t *ksz, const void *cp, size_t sz)
                key->data = mandoc_realloc(key->data, *ksz);
        }
 
+#if 0
+       dstp = key->data + (int)key->size;
+
+       while (NULL != (endp = memchr(cp, '\\', sz))) {
+               ssz = endp - cp;
+               memcpy(dstp, cp, ssz);
+
+               dstp += ssz;
+               key->size += ssz;
+               sz -= ssz;
+
+               cp = endp++;
+               /* FIXME: expects nil-terminated string! */
+               esc = mandoc_escape((const char **)&endp, NULL, NULL);
+
+               switch (esc) {
+               case (ESCAPE_ERROR):
+                       /* Nil-terminate this point. */
+                       memcpy(dstp, "", 1);
+                       key->size++;
+                       return;
+               case (ESCAPE_PREDEF):
+                       /* FALLTHROUGH */
+               case (ESCAPE_SPECIAL):
+                       break;
+               default:
+                       sz -= endp - cp;
+                       cp = endp;
+                       continue;
+               }
+
+               ssz = endp - cp;
+               memcpy(dstp, cp, ssz);
+
+               dstp += ssz;
+               key->size += ssz;
+               sz -= ssz;
+
+               cp = endp;
+       }
+#endif
+
        memcpy(key->data + (int)key->size, cp, sz);
        key->size += sz;
 }
@@ -485,7 +533,6 @@ pmdoc_Fd(MDOC_ARGS)
        uint32_t         fl;
        const char      *start, *end;
        size_t           sz;
-       const char       nil = '\0';
        
        if (SEC_SYNOPSIS != n->sec)
                return;
@@ -519,7 +566,7 @@ pmdoc_Fd(MDOC_ARGS)
                end--;
 
        dbt_appendb(key, ksz, start, end - start + 1);
-       dbt_appendb(key, ksz, &nil, 1);
+       dbt_appendb(key, ksz, "", 1);
 
        fl = MANDOC_INCLUDES;
        memcpy(val->data, &fl, 4);
@@ -590,9 +637,8 @@ static void
 pmdoc_Vt(MDOC_ARGS)
 {
        uint32_t         fl;
-       const char      *start, *end;
+       const char      *start;
        size_t           sz;
-       const char       nil = '\0';
        
        if (SEC_SYNOPSIS != n->sec)
                return;
@@ -613,15 +659,15 @@ pmdoc_Vt(MDOC_ARGS)
        if (0 == (sz = strlen(start)))
                return;
 
-       end = &start[sz - 1];
-       while (end > start && ';' == *end)
-               end--;
+       if (';' == start[sz - 1])
+               sz--;
 
-       if (end == start)
+       if (0 == sz)
                return;
 
-       dbt_appendb(key, ksz, start, end - start + 1);
-       dbt_appendb(key, ksz, &nil, 1);
+       dbt_appendb(key, ksz, start, sz);
+       dbt_appendb(key, ksz, "", 1);
+
        fl = MANDOC_VARIABLE;
        memcpy(val->data, &fl, 4);
 }
@@ -656,7 +702,6 @@ pmdoc_Nd(MDOC_ARGS)
                        dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1);
                else
                        dbt_append(rval, rsz, n->string);
-
                first = 0;
        }
 }
@@ -733,8 +778,8 @@ pmdoc_node(MDOC_ARGS)
                        break;
 
                dbt_init(key, ksz);
-               (*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n);
 
+               (*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n);
                dbt_put(db, dbn, key, val);
                break;
        default:
@@ -750,7 +795,6 @@ pman_node(MAN_ARGS)
 {
        const struct man_node *head, *body;
        const char      *start, *sv;
-       const char       nil = '\0';
        size_t           sz;
        uint32_t         fl;
 
@@ -797,7 +841,7 @@ pman_node(MAN_ARGS)
 
                                dbt_init(key, ksz);
                                dbt_appendb(key, ksz, start, sz);
-                               dbt_appendb(key, ksz, &nil, 1);
+                               dbt_appendb(key, ksz, "", 1);
 
                                dbt_put(db, dbn, key, val);