From ef304928cf8372f743d9864ba9fbc8f688675600 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 25 Jun 2009 08:42:06 +0000 Subject: Updating web-page to be a bit more compact. --- Makefile | 17 +++-- index.sgml | 212 ++++++++++++++++++++++++++++++---------------------------- mdoc.template | 4 +- mdoc_action.c | 8 ++- style.css | 1 + 5 files changed, 130 insertions(+), 112 deletions(-) diff --git a/Makefile b/Makefile index e6ed0c78..cefef547 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.SUFFIXES: .html .sgml .1.txt .3.txt .7.txt .1 .3 .7 +.SUFFIXES: .html .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include @@ -51,6 +51,10 @@ HEADS = mdoc.h libmdoc.h man.h libman.h term.h SGMLS = index.sgml HTMLS = index.html STATICS = style.css external.png +MD5S = mdocml-$(VERSION).md5 \ + mdocml-oport-$(VERSION).md5 \ + mdocml-fport-$(VERSION).md5 \ + mdocml-nport-$(VERSION).md5 TARGZS = mdocml-$(VERSION).tar.gz \ mdocml-oport-$(VERSION).tar.gz \ mdocml-fport-$(VERSION).tar.gz \ @@ -79,11 +83,11 @@ cleanlint: dist: mdocml-$(VERSION).tar.gz -port: mdocml-oport-$(VERSION).tar.gz \ - mdocml-fport-$(VERSION).tar.gz \ - mdocml-nport-$(VERSION).tar.gz +html: $(HTMLS) -www: all $(HTMLS) $(TARGZS) $(TEXTS) ChangeLog +md5: $(MD5) + +www: all $(TARGZS) $(TEXTS) ChangeLog installwww: www install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/ @@ -261,3 +265,6 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a .7.7.txt: ./mandoc -Wall,error -fstrict $< | col -b > $@ + +.tar.gz.md5: + md5 $< $@ diff --git a/index.sgml b/index.sgml index 215b1054..d455662b 100644 --- a/index.sgml +++ b/index.sgml @@ -48,110 +48,121 @@

- INSTALLING SOURCES + DOWNLOADS

Sources correctly build and install on FreeBSD, OpenBSD, NetBSD and Linux operating systems, tested variously on i386, AMD64, alpha and others. The most current version is @VERSION@, dated @VDATE@. + class="attn">@VERSION@, dated @VDATE@. A full ChangeLog is written with each new version.

- Snapshot source + Downstream

-

- CVS sources are checkedout and snapshotted with version updates. These (and all historical snapshots) - may be found in the /snapshots/ directory. A full ChangeLog is written with each new snapshot. -

- -

- % cd /tmp
- % ftp -V -o- - http://mdocml.bsd.lv/snapshots/mdocml.tar.gz | tar -zvxf -
- % cd mdocml
- % make all
- # make install -

+ + + + + + + + + + + + + + + + + +
FreeBSD (ports) + /textproc/mandoc +
NetBSD (pkgsrc) + /textproc/mandoc +
OpenBSD (base system) + /usr.bin/mandoc +

- Snapshot port/pkgsrc + Current

-

- The source snapshot is automatically converted into OpenBSD, NetBSD and FreeBSD ports at /ports-openbsd/, /ports-netbsd/ and /ports-freebsd/, respectively. Please read the OpenBSD Ports FAQ, the NetBSD pkgsrc guide or the FreeBSD ports - guide, first. -

- -

- OpenBSD port -

- -

- Note: the mdocml utility is part of OpenBSD's base system at usr.bin/mandoc. Please use this - instead of the provided port. -

- -

- # pkg_delete mdocml
- # cd /usr/ports/textproc/
- # rm -rf mdocml
- # ftp -V -o- - http://mdocml.bsd.lv/ports-openbsd/mdocml.tar.gz | tar -zvxf -
- # cd mdocml
- # make build
- # make install -

- -

- NetBSD pkgsrc -

- -

- Note: a pkgsrc port is maintained in-tree at textproc/mdocml. Please use this - instead of the provided pkgsrc. -

- -

- # pkg_delete mdocml
- # cd /usr/pkgsrc/textproc/
- # rm -rf mdocml
- # ftp -V -o- - http://mdocml.bsd.lv/ports-netbsd/mdocml.tar.gz | tar -zvxf -
- # cd mdocml
- # make build
- # make install -

- -

- FreeBSD port -

+ + + + + + + + + + + + + + + + + + + + + +
Source archive + /snapshots/mdocml.tar.gz + (md5) +
OpenBSD port + /ports-openbsd/mdocml.tar.gz + (md5) +
FreeBSD port + /ports-freebsd/mdocml.tar.gz + (md5) +
NetBSD pkgsrc + /ports-netbsd/mdocml.tar.gz + (md5) +
-

- Note: a port is maintained in-tree at textproc/mdocml. Please use - this instead of the provided port. -

+

+ Historical +

-

- # pkg_delete -x mdocml
- # cd /tmp
- # ftp -V -o- - http://mdocml.bsd.lv/ports-freebsd/mdocml.tar.gz | tar -zvxf -
- # cd mdocml
- # make
- # make install -

+ + + + + + + + + + + + + + + + + + + + + +
Source archive + /snapshots/ +
OpenBSD port + /ports-openbsd/ +
FreeBSD port + /ports-freebsd/ +
NetBSD pkgsrc + /ports-netbsd/ +
@@ -160,47 +171,39 @@ DOCUMENTATION - - - - - - +
+ + + - - - - - - - +
mandoc(1) format and display UNIX manuals
mandoc_char(7) mandoc special characters
mdoc(7) mdoc language reference
man(7) man language reference
manuals(7) a guide to writing UNIX manuals
mdoc(3) mdoc macro compiler library
man(3) man macro compiler library
@@ -211,7 +214,8 @@

- For all issues related to mdocml, contact Kristaps, krismdocml, contact Kristaps Džonsons, kris - Copyright © 2008, 2009 Kristaps Džonsons, $Date: 2009/06/17 19:12:03 $ + Copyright © 2008, 2009 Kristaps Džonsons, $Date: 2009/06/25 08:42:06 $ diff --git a/mdoc.template b/mdoc.template index e9f70665..6d2beb0d 100644 --- a/mdoc.template +++ b/mdoc.template @@ -8,9 +8,11 @@ .\" See mdoc(7) for further reference. .\" .Dd $\&Mdocdate$ -.Dt DOCUMENT_TITLE SECTION +.Dt

.Os .Sh NAME +.Nm +.Nd .\" The next request should be used for sections 2 and 3 only. .\" .Sh LIBRARY .Sh SYNOPSIS diff --git a/mdoc_action.c b/mdoc_action.c index 55df294f..ca6a76d3 100644 --- a/mdoc_action.c +++ b/mdoc_action.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_action.c,v 1.19 2009/06/22 12:38:07 kristaps Exp $ */ +/* $Id: mdoc_action.c,v 1.20 2009/06/25 08:42:06 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -33,6 +33,7 @@ enum mwarn { enum merr { ETOOLONG, EMALLOC, + EUTSNAME, ENUMFMT }; @@ -272,6 +273,9 @@ perr(struct mdoc *m, int line, int pos, enum merr type) case (ETOOLONG): p = "argument text too long"; break; + case (EUTSNAME): + p = "utsname"; + break; case (EMALLOC): p = "memory exhausted"; break; @@ -505,7 +509,7 @@ post_os(POST_ARGS) if (0 == buf[0]) { if (-1 == uname(&utsname)) - return(mdoc_err(m, "utsname")); + return(verr(m, EUTSNAME)); if (strlcat(buf, utsname.sysname, 64) >= 64) return(verr(m, ETOOLONG)); if (strlcat(buf, " ", 64) >= 64) diff --git a/style.css b/style.css index d41c313f..63a161a5 100644 --- a/style.css +++ b/style.css @@ -55,3 +55,4 @@ div.foot { border-top: 1px dotted #cccccc; a.external { background: transparent url(external.png) center right no-repeat; padding-right: 12px; } +td.zebra { background-color: #eeeeee; } -- cgit v1.2.3-56-ge451