Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/mdocml/dist Merge for mdocml-1.10.9
details: https://anonhg.NetBSD.org/src/rev/8a8622755102
branches: trunk
changeset: 760770:8a8622755102
user: joerg <joerg%NetBSD.org@localhost>
date: Wed Jan 12 22:58:42 2011 +0000
description:
Merge for mdocml-1.10.9
diffstat:
external/bsd/mdocml/dist/man_action.c | 281 --------
external/bsd/mdocml/dist/man_term.c | 240 ++++---
external/bsd/mdocml/dist/mdoc_action.c | 1045 --------------------------------
external/bsd/mdocml/dist/mdoc_term.c | 613 +++++++++---------
external/bsd/mdocml/dist/style.css | 77 --
5 files changed, 451 insertions(+), 1805 deletions(-)
diffs (truncated from 2880 to 300 lines):
diff -r 97acf42593cf -r 8a8622755102 external/bsd/mdocml/dist/man_action.c
--- a/external/bsd/mdocml/dist/man_action.c Wed Jan 12 22:57:08 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-/* $Vendor-Id: man_action.c,v 1.40 2010/07/22 23:03:15 kristaps Exp $ */
-/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "mandoc.h"
-#include "libman.h"
-#include "libmandoc.h"
-
-struct actions {
- int (*post)(struct man *);
-};
-
-static int post_TH(struct man *);
-static int post_fi(struct man *);
-static int post_nf(struct man *);
-static int post_AT(struct man *);
-static int post_UC(struct man *);
-
-const struct actions man_actions[MAN_MAX] = {
- { NULL }, /* br */
- { post_TH }, /* TH */
- { NULL }, /* SH */
- { NULL }, /* SS */
- { NULL }, /* TP */
- { NULL }, /* LP */
- { NULL }, /* PP */
- { NULL }, /* P */
- { NULL }, /* IP */
- { NULL }, /* HP */
- { NULL }, /* SM */
- { NULL }, /* SB */
- { NULL }, /* BI */
- { NULL }, /* IB */
- { NULL }, /* BR */
- { NULL }, /* RB */
- { NULL }, /* R */
- { NULL }, /* B */
- { NULL }, /* I */
- { NULL }, /* IR */
- { NULL }, /* RI */
- { NULL }, /* na */
- { NULL }, /* i */
- { NULL }, /* sp */
- { post_nf }, /* nf */
- { post_fi }, /* fi */
- { NULL }, /* r */
- { NULL }, /* RE */
- { NULL }, /* RS */
- { NULL }, /* DT */
- { post_UC }, /* UC */
- { NULL }, /* PD */
- { NULL }, /* Sp */
- { post_nf }, /* Vb */
- { post_fi }, /* Ve */
- { post_AT }, /* AT */
- { NULL }, /* in */
-};
-
-
-int
-man_action_post(struct man *m)
-{
-
- if (MAN_ACTED & m->last->flags)
- return(1);
- m->last->flags |= MAN_ACTED;
-
- switch (m->last->type) {
- case (MAN_TEXT):
- /* FALLTHROUGH */
- case (MAN_ROOT):
- return(1);
- default:
- break;
- }
-
- if (NULL == man_actions[m->last->tok].post)
- return(1);
- return((*man_actions[m->last->tok].post)(m));
-}
-
-
-static int
-post_fi(struct man *m)
-{
-
- if ( ! (MAN_LITERAL & m->flags))
- if ( ! man_nmsg(m, m->last, MANDOCERR_NOSCOPE))
- return(0);
- m->flags &= ~MAN_LITERAL;
- return(1);
-}
-
-
-static int
-post_nf(struct man *m)
-{
-
- if (MAN_LITERAL & m->flags)
- if ( ! man_nmsg(m, m->last, MANDOCERR_SCOPEREP))
- return(0);
- m->flags |= MAN_LITERAL;
- return(1);
-}
-
-
-static int
-post_TH(struct man *m)
-{
- struct man_node *n;
-
- if (m->meta.title)
- free(m->meta.title);
- if (m->meta.vol)
- free(m->meta.vol);
- if (m->meta.source)
- free(m->meta.source);
- if (m->meta.msec)
- free(m->meta.msec);
- if (m->meta.rawdate)
- free(m->meta.rawdate);
-
- m->meta.title = m->meta.vol = m->meta.rawdate =
- m->meta.msec = m->meta.source = NULL;
- m->meta.date = 0;
-
- /* ->TITLE<- MSEC DATE SOURCE VOL */
-
- n = m->last->child;
- assert(n);
- m->meta.title = mandoc_strdup(n->string);
-
- /* TITLE ->MSEC<- DATE SOURCE VOL */
-
- n = n->next;
- assert(n);
- m->meta.msec = mandoc_strdup(n->string);
-
- /* TITLE MSEC ->DATE<- SOURCE VOL */
-
- /*
- * Try to parse the date. If this works, stash the epoch (this
- * is optimal because we can reformat it in the canonical form).
- * If it doesn't parse, isn't specified at all, or is an empty
- * string, then use the current date.
- */
-
- n = n->next;
- if (n && n->string && *n->string) {
- m->meta.date = mandoc_a2time
- (MTIME_ISO_8601, n->string);
- if (0 == m->meta.date) {
- if ( ! man_nmsg(m, n, MANDOCERR_BADDATE))
- return(0);
- m->meta.rawdate = mandoc_strdup(n->string);
- }
- } else
- m->meta.date = time(NULL);
-
- /* TITLE MSEC DATE ->SOURCE<- VOL */
-
- if (n && (n = n->next))
- m->meta.source = mandoc_strdup(n->string);
-
- /* TITLE MSEC DATE SOURCE ->VOL<- */
-
- if (n && (n = n->next))
- m->meta.vol = mandoc_strdup(n->string);
-
- /*
- * Remove the `TH' node after we've processed it for our
- * meta-data.
- */
- man_node_delete(m, m->last);
- return(1);
-}
-
-
-static int
-post_AT(struct man *m)
-{
- static const char * const unix_versions[] = {
- "7th Edition",
- "System III",
- "System V",
- "System V Release 2",
- };
-
- const char *p, *s;
- struct man_node *n, *nn;
-
- n = m->last->child;
-
- if (NULL == n || MAN_TEXT != n->type)
- p = unix_versions[0];
- else {
- s = n->string;
- if (0 == strcmp(s, "3"))
- p = unix_versions[0];
- else if (0 == strcmp(s, "4"))
- p = unix_versions[1];
- else if (0 == strcmp(s, "5")) {
- nn = n->next;
- if (nn && MAN_TEXT == nn->type && nn->string[0])
- p = unix_versions[3];
- else
- p = unix_versions[2];
- } else
- p = unix_versions[0];
- }
-
- if (m->meta.source)
- free(m->meta.source);
-
- m->meta.source = mandoc_strdup(p);
-
- return(1);
-}
-
-
-static int
-post_UC(struct man *m)
-{
- static const char * const bsd_versions[] = {
- "3rd Berkeley Distribution",
- "4th Berkeley Distribution",
- "4.2 Berkeley Distribution",
- "4.3 Berkeley Distribution",
- "4.4 Berkeley Distribution",
- };
-
- const char *p, *s;
- struct man_node *n;
-
- n = m->last->child;
-
- if (NULL == n || MAN_TEXT != n->type)
- p = bsd_versions[0];
- else {
- s = n->string;
- if (0 == strcmp(s, "3"))
- p = bsd_versions[0];
- else if (0 == strcmp(s, "4"))
- p = bsd_versions[1];
- else if (0 == strcmp(s, "5"))
- p = bsd_versions[2];
- else if (0 == strcmp(s, "6"))
- p = bsd_versions[3];
- else if (0 == strcmp(s, "7"))
- p = bsd_versions[4];
- else
- p = bsd_versions[0];
- }
-
- if (m->meta.source)
- free(m->meta.source);
-
- m->meta.source = mandoc_strdup(p);
-
- return(1);
-}
diff -r 97acf42593cf -r 8a8622755102 external/bsd/mdocml/dist/man_term.c
--- a/external/bsd/mdocml/dist/man_term.c Wed Jan 12 22:57:08 2011 +0000
+++ b/external/bsd/mdocml/dist/man_term.c Wed Jan 12 22:58:42 2011 +0000
@@ -1,6 +1,7 @@
-/* $Vendor-Id: man_term.c,v 1.84 2010/07/23 13:22:35 kristaps Exp $ */
+/* $Vendor-Id: man_term.c,v 1.94 2011/01/04 01:23:18 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
+ * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze%openbsd.org@localhost>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -80,14 +81,12 @@
static void print_bvspace(struct termp *,
const struct man_node *);
Home |
Main Index |
Thread Index |
Old Index