Support for maxrmargin-breaking with TERMP_NOBREAK.

[mandoc.git] / strings.c

diff --git a/strings.c b/strings.c
index 5d143492674a65d216da1d70e38547aca5b6604d..4910e308c7f077e3d720a333a444e835a3a3595d 100644 (file)
--- a/strings.c
+++ b/strings.c
@@ -1,4 +1,4 @@
-/* $Id: strings.c,v 1.20 2009/02/26 16:08:11 kristaps Exp $ */
+/* $Id: strings.c,v 1.23 2009/03/02 12:09:32 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -61,6 +61,18 @@ mdoc_isescape(const char *p)
                /* FALLTHROUGH */
        case ('e'):
                return(2);
                /* FALLTHROUGH */
        case ('e'):
                return(2);

+       case ('*'):
+               if (0 == *++p || ! isgraph((int)*p))
+                       return(0);
+               switch (*p) {
+               case ('('):
+                       if (0 == *++p || ! isgraph((int)*p))
+                               return(0);
+                       return(4);
+               default:
+                       break;
+               }
+               return(3);

        case ('('):
                if (0 == *++p || ! isgraph((int)*p))
                        return(0);
        case ('('):
                if (0 == *++p || ! isgraph((int)*p))
                        return(0);


@@ -178,9 +190,9 @@ mdoc_atotime(const char *p)
 
        (void)memset(&tm, 0, sizeof(struct tm));
 
 
        (void)memset(&tm, 0, sizeof(struct tm));
 

-       if (xstrcmp(p, "$Mdocdate: February 26 2009 $"))
+       if (xstrcmp(p, "$Mdocdate: March 2 2009 $"))

                return(time(NULL));
                return(time(NULL));

-       if ((pp = strptime(p, "$Mdocdate: February 26 2009 $", &tm)) && 0 == *pp)
+       if ((pp = strptime(p, "$Mdocdate: March 2 2009 $", &tm)) && 0 == *pp)

                return(mktime(&tm));
        /* XXX - this matches "June 1999", which is wrong. */
        if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
                return(mktime(&tm));
        /* XXX - this matches "June 1999", which is wrong. */
        if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)


@@ -346,6 +358,8 @@ mdoc_atoatt(const char *p)
                return(ATT_v7);
        else if (0 == strcmp(p, "32v"))
                return(ATT_32v);
                return(ATT_v7);
        else if (0 == strcmp(p, "32v"))
                return(ATT_32v);

+       else if (0 == strcmp(p, "V"))
+               return(ATT_V);

        else if (0 == strcmp(p, "V.1"))
                return(ATT_V1);
        else if (0 == strcmp(p, "V.2"))
        else if (0 == strcmp(p, "V.1"))
                return(ATT_V1);
        else if (0 == strcmp(p, "V.2"))


@@ -460,23 +474,23 @@ mdoc_vol2a(enum mdoc_vol vol)
 
        switch (vol) {
        case (VOL_AMD):
 
        switch (vol) {
        case (VOL_AMD):

-               return("OpenBSD Ancestral Manual Documents");
+               return("Ancestral Manual Documents");

        case (VOL_IND):
        case (VOL_IND):

-               return("OpenBSD Manual Master Index");
+               return("Manual Master Index");

        case (VOL_KM):
        case (VOL_KM):

-               return("OpenBSD Kernel Manual");
+               return("Kernel Manual");

        case (VOL_LOCAL):
        case (VOL_LOCAL):

-               return("OpenBSD Local Manual");
+               return("Local Manual");

        case (VOL_PRM):
        case (VOL_PRM):

-               return("OpenBSD Programmer's Manual");
+               return("Programmer's Manual");

        case (VOL_PS1):
        case (VOL_PS1):

-               return("OpenBSD Programmer's Supplementary Documents");
+               return("Programmer's Supplementary Documents");

        case (VOL_SMM):
        case (VOL_SMM):

-               return("OpenBSD System Manager's Manual");
+               return("System Manager's Manual");

        case (VOL_URM):
        case (VOL_URM):

-               return("OpenBSD Reference Manual");
+               return("Reference Manual");

        case (VOL_USD):
        case (VOL_USD):

-               return("OpenBSD User's Supplementary Documents");
+               return("User's Supplementary Documents");

        case (VOL_DEFAULT):
                return(NULL);
        default:
        case (VOL_DEFAULT):
                return(NULL);
        default:


@@ -707,6 +721,9 @@ mdoc_att2a(enum mdoc_att c)
        case(ATT_32v):
                p = "Version 32V AT&T UNIX";
                break;
        case(ATT_32v):
                p = "Version 32V AT&T UNIX";
                break;

+       case(ATT_V):
+               p = "AT&T System V UNIX";
+               break;

        case(ATT_V1):
                p = "AT&T System V.1 UNIX";
                break;
        case(ATT_V1):
                p = "AT&T System V.1 UNIX";
                break;