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.20.1pre import
details: https://anonhg.NetBSD.org/src/rev/1bafb086dca8
branches: trunk
changeset: 773292:1bafb086dca8
user: joerg <joerg%NetBSD.org@localhost>
date: Mon Jan 30 17:03:01 2012 +0000
description:
Merge for mdocml 1.20.1pre import
diffstat:
external/bsd/mdocml/dist/arch.in | 128 +++++++++++++++++----------
external/bsd/mdocml/dist/compat_fgetln.c | 2 +-
external/bsd/mdocml/dist/lib.in | 5 +-
external/bsd/mdocml/dist/man_term.c | 139 +++++++++++++++++++++---------
external/bsd/mdocml/dist/mdoc_term.c | 26 +++--
external/bsd/mdocml/dist/mdoc_validate.c | 36 ++++++-
external/bsd/mdocml/dist/msec.in | 18 ++--
external/bsd/mdocml/dist/read.c | 3 +-
external/bsd/mdocml/dist/roff.c | 30 +++---
external/bsd/mdocml/dist/tbl_data.c | 8 +-
10 files changed, 256 insertions(+), 139 deletions(-)
diffs (truncated from 865 to 300 lines):
diff -r 544af7954728 -r 1bafb086dca8 external/bsd/mdocml/dist/arch.in
--- a/external/bsd/mdocml/dist/arch.in Mon Jan 30 16:54:46 2012 +0000
+++ b/external/bsd/mdocml/dist/arch.in Mon Jan 30 17:03:01 2012 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: arch.in,v 1.10 2010/09/27 06:56:44 kristaps Exp $ */
+/* $Vendor-Id: arch.in,v 1.12 2012/01/28 14:02:17 joerg Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
*
@@ -26,54 +26,86 @@
* REMEMBER TO ADD NEW ARCHITECTURES TO MDOC.7!
*/
-LINE("acorn26", "acorn26")
-LINE("acorn32", "acorn32")
-LINE("alpha", "alpha")
-LINE("amd64", "amd64")
-LINE("amiga", "amiga")
-LINE("arc", "arc")
-LINE("arm", "arm")
-LINE("armish", "armish")
-LINE("atari", "atari")
-LINE("aviion", "aviion")
-LINE("cobalt", "cobalt")
-LINE("dreamcast", "dreamcast")
-LINE("emips", "emips")
-LINE("evbarm", "evbarm")
-LINE("evbmips", "evbmips")
-LINE("evbppc", "evbppc")
-LINE("hp300", "hp300")
-LINE("hp700", "hp700")
-LINE("hpcarm", "hpcarm")
-LINE("hpcmips", "hpcmips")
-LINE("hpcsh", "hpcsh")
-LINE("hppa", "hppa")
-LINE("hppa64", "hppa64")
+LINE("acorn26", "Acorn26")
+LINE("acorn32", "Acorn32")
+LINE("algor", "Algor")
+LINE("alpha", "Alpha")
+LINE("amd64", "AMD64")
+LINE("amiga", "Amiga")
+LINE("amigappc", "AmigaPPC")
+LINE("arc", "ARC")
+LINE("arm", "ARM")
+LINE("arm26", "ARM26")
+LINE("arm32", "ARM32")
+LINE("armish", "ARMISH")
+LINE("aviion", "AViiON")
+LINE("atari", "ATARI")
+LINE("beagle", "Beagle")
+LINE("bebox", "BeBox")
+LINE("cats", "cats")
+LINE("cesfic", "CESFIC")
+LINE("cobalt", "Cobalt")
+LINE("dreamcast", "Dreamcast")
+LINE("emips", "EMIPS")
+LINE("evbarm", "evbARM")
+LINE("evbmips", "evbMIPS")
+LINE("evbppc", "evbPPC")
+LINE("evbsh3", "evbSH3")
+LINE("ews4800mips", "EWS4800MIPS")
+LINE("hp300", "HP300")
+LINE("hp700", "HP700")
+LINE("hpcarm", "HPCARM")
+LINE("hpcmips", "HPCMIPS")
+LINE("hpcsh", "HPCSH")
+LINE("hppa", "HPPA")
+LINE("hppa64", "HPPA64")
+LINE("ia64", "ia64")
LINE("i386", "i386")
-LINE("landisk", "landisk")
-LINE("loongson", "loongson")
-LINE("luna88k", "luna88k")
-LINE("mac68k", "mac68k")
+LINE("ibmnws", "IBMNWS")
+LINE("iyonix", "Iyonix")
+LINE("landisk", "LANDISK")
+LINE("loongson", "Loongson")
+LINE("luna68k", "Luna68k")
+LINE("luna88k", "Luna88k")
LINE("m68k", "m68k")
-LINE("macppc", "macppc")
-LINE("mips64", "mips64")
-LINE("mvme68k", "mvme68k")
-LINE("mvme88k", "mvme88k")
-LINE("mvmeppc", "mvmeppc")
-LINE("next68k", "next68k")
-LINE("pmax", "pmax")
-LINE("prep", "prep")
-LINE("sandpoint", "sandpoint")
-LINE("sgi", "sgi")
-LINE("sgimips", "sgimips")
-LINE("socppc", "socppc")
-LINE("sparc", "sparc")
-LINE("sparc64", "sparc64")
-LINE("sun2", "sun2")
-LINE("sun3", "sun3")
-LINE("vax", "vax")
-LINE("x68k", "x68k")
+LINE("mac68k", "Mac68k")
+LINE("macppc", "MacPPC")
+LINE("mips", "MIPS")
+LINE("mips64", "MIPS64")
+LINE("mipsco", "MIPSCo")
+LINE("mmeye", "mmEye")
+LINE("mvme68k", "MVME68k")
+LINE("mvme88k", "MVME88k")
+LINE("mvmeppc", "MVMEPPC")
+LINE("netwinder", "NetWinder")
+LINE("news68k", "NeWS68k")
+LINE("newsmips", "NeWSMIPS")
+LINE("next68k", "NeXT68k")
+LINE("ofppc", "OFPPC")
+LINE("palm", "Palm")
+LINE("pc532", "PC532")
+LINE("playstation2", "PlayStation2")
+LINE("pmax", "PMAX")
+LINE("pmppc", "pmPPC")
+LINE("powerpc", "PowerPC")
+LINE("prep", "PReP")
+LINE("rs6000", "RS6000")
+LINE("sandpoint", "Sandpoint")
+LINE("sbmips", "SBMIPS")
+LINE("sgi", "SGI")
+LINE("sgimips", "SGIMIPS")
+LINE("sh3", "SH3")
+LINE("shark", "Shark")
+LINE("socppc", "SOCPPC")
+LINE("solbourne", "Solbourne")
+LINE("sparc", "SPARC")
+LINE("sparc64", "SPARC64")
+LINE("sun2", "Sun2")
+LINE("sun3", "Sun3")
+LINE("tahoe", "Tahoe")
+LINE("vax", "VAX")
+LINE("x68k", "X68k")
LINE("x86", "x86")
LINE("x86_64", "x86_64")
-LINE("xen", "xen")
-LINE("zaurus", "zaurus")
+LINE("xen", "Xen")
+LINE("zaurus", "Zaurus")
diff -r 544af7954728 -r 1bafb086dca8 external/bsd/mdocml/dist/compat_fgetln.c
--- a/external/bsd/mdocml/dist/compat_fgetln.c Mon Jan 30 16:54:46 2012 +0000
+++ b/external/bsd/mdocml/dist/compat_fgetln.c Mon Jan 30 17:03:01 2012 +0000
@@ -8,7 +8,7 @@
#else
-/* $NetBSD: compat_fgetln.c,v 1.1.1.1 2012/01/30 16:44:03 joerg Exp $ */
+/* $NetBSD: compat_fgetln.c,v 1.2 2012/01/30 17:03:01 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff -r 544af7954728 -r 1bafb086dca8 external/bsd/mdocml/dist/lib.in
--- a/external/bsd/mdocml/dist/lib.in Mon Jan 30 16:54:46 2012 +0000
+++ b/external/bsd/mdocml/dist/lib.in Mon Jan 30 17:03:01 2012 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: lib.in,v 1.10 2011/09/20 23:36:24 schwarze Exp $ */
+/* $Vendor-Id: lib.in,v 1.13 2012/01/28 23:46:28 joerg Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
*
@@ -81,10 +81,11 @@
LINE("libresolv", "DNS Resolver Library (libresolv, \\-lresolv)")
LINE("librpcsec_gss", "RPC GSS-API Authentication Library (librpcsec_gss, \\-lrpcsec_gss)")
LINE("librpcsvc", "RPC Service Library (librpcsvc, \\-lrpcsvc)")
-LINE("librt", "POSIX Real\\-time Library (librt, -lrt)")
+LINE("librt", "POSIX Real\\-time Library (librt, \\-lrt)")
LINE("libsaslc", "Simple Authentication and Security Layer client library (libsaslc, \\-lsaslc)")
LINE("libsdp", "Bluetooth Service Discovery Protocol User Library (libsdp, \\-lsdp)")
LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)")
+LINE("libSystem", "System Library (libSystem, \\-lSystem)")
LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)")
LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)")
LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)")
diff -r 544af7954728 -r 1bafb086dca8 external/bsd/mdocml/dist/man_term.c
--- a/external/bsd/mdocml/dist/man_term.c Mon Jan 30 16:54:46 2012 +0000
+++ b/external/bsd/mdocml/dist/man_term.c Mon Jan 30 17:03:01 2012 +0000
@@ -1,4 +1,4 @@
-/* $Vendor-Id: man_term.c,v 1.121 2011/09/21 09:57:13 schwarze Exp $ */
+/* $Vendor-Id: man_term.c,v 1.127 2012/01/03 15:16:24 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze%openbsd.org@localhost>
@@ -33,8 +33,6 @@
#include "term.h"
#include "main.h"
-#define INDENT 7 /* fixed-width char full-indent */
-#define HALFINDENT 3 /* fixed-width char half-indent */
#define MAXMARGINS 64 /* maximum number of indented scopes */
/* FIXME: have PD set the default vspace width. */
@@ -70,21 +68,22 @@
static void print_bvspace(struct termp *,
const struct man_node *);
-static int pre_alternate(DECL_ARGS);
static int pre_B(DECL_ARGS);
static int pre_HP(DECL_ARGS);
static int pre_I(DECL_ARGS);
static int pre_IP(DECL_ARGS);
+static int pre_OP(DECL_ARGS);
static int pre_PP(DECL_ARGS);
static int pre_RS(DECL_ARGS);
static int pre_SH(DECL_ARGS);
static int pre_SS(DECL_ARGS);
static int pre_TP(DECL_ARGS);
+static int pre_alternate(DECL_ARGS);
+static int pre_ft(DECL_ARGS);
static int pre_ign(DECL_ARGS);
static int pre_in(DECL_ARGS);
static int pre_literal(DECL_ARGS);
static int pre_sp(DECL_ARGS);
-static int pre_ft(DECL_ARGS);
static void post_IP(DECL_ARGS);
static void post_HP(DECL_ARGS);
@@ -127,6 +126,7 @@
{ pre_ign, NULL, 0 }, /* AT */
{ pre_in, NULL, MAN_NOTEXT }, /* in */
{ pre_ft, NULL, MAN_NOTEXT }, /* ft */
+ { pre_OP, NULL, 0 }, /* OP */
};
@@ -141,6 +141,9 @@
p = (struct termp *)arg;
+ if (0 == p->defindent)
+ p->defindent = 7;
+
p->overstep = 0;
p->maxrmargin = p->defrmargin;
p->tabwidth = term_len(p, 5);
@@ -156,8 +159,8 @@
memset(&mt, 0, sizeof(struct mtermp));
- mt.lmargin[mt.lmargincur] = term_len(p, INDENT);
- mt.offset = term_len(p, INDENT);
+ mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
+ mt.offset = term_len(p, p->defindent);
if (n->child)
print_man_nodelist(p, &mt, n->child, m);
@@ -323,6 +326,29 @@
/* ARGSUSED */
static int
+pre_OP(DECL_ARGS)
+{
+
+ term_word(p, "[");
+ p->flags |= TERMP_NOSPACE;
+
+ if (NULL != (n = n->child)) {
+ term_fontrepl(p, TERMFONT_BOLD);
+ term_word(p, n->string);
+ }
+ if (NULL != n && NULL != n->next) {
+ term_fontrepl(p, TERMFONT_UNDER);
+ term_word(p, n->next->string);
+ }
+
+ term_fontrepl(p, TERMFONT_NONE);
+ p->flags |= TERMP_NOSPACE;
+ term_word(p, "]");
+ return(0);
+}
+
+/* ARGSUSED */
+static int
pre_ft(DECL_ARGS)
{
const char *cp;
@@ -511,7 +537,7 @@
switch (n->type) {
case (MAN_BLOCK):
- mt->lmargin[mt->lmargincur] = term_len(p, INDENT);
+ mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
print_bvspace(p, n);
break;
default:
@@ -706,8 +732,8 @@
switch (n->type) {
case (MAN_BLOCK):
mt->fl &= ~MANT_LITERAL;
- mt->lmargin[mt->lmargincur] = term_len(p, INDENT);
- mt->offset = term_len(p, INDENT);
+ mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
+ mt->offset = term_len(p, p->defindent);
/* If following a prior empty `SS', no vspace. */
if (n->prev && MAN_SS == n->prev->tok)
if (NULL == n->prev->body->child)
@@ -718,7 +744,7 @@
Home |
Main Index |
Thread Index |
Old Index