Ready for looking over by people.

diff --git a/Makefile b/Makefile
index 1c78b441e8e9ca8d7618898b8755c2bf91367c4e..618046fe28451ec407edcb7258d7081dad91df59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION        = 1.0.3
 
 # FIXME
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+CFLAGS += -W -Wall -Wno-unused-parameter -g
 
 LNS    = mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
          compat.ln tokens.ln literals.ln tags.ln noop.ln
@@ -26,10 +26,10 @@ XML = index.xml
 
 TEXT   = index.txt
 
-CLEAN  = mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) \
-         $(XML) $(TEXT)
+CLEAN  = mdocml $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) $(XML) $(TEXT) \
+         mdocml-$(VERSION).tar.gz mdocml-port-$(VERSION).tar.gz
 
-INSTALL        = Makefile $(HEADS) $(SRCS) $(MANS)
+INSTALL        = Makefile $(HEADS) $(SRCS) $(MANS) mdocml.css
 
 FAIL   = test.0 test.1 test.2 test.3 test.4 test.5 test.6 \
          test.15 test.20 test.22 test.24 test.26 test.27 test.30 \
@@ -48,7 +48,7 @@ all: mdocml
 
 lint: llib-lmdocml.ln
 
-dist: mdocml.tgz mdocml-port.tgz
+dist: mdocml-$(VERSION).tar.gz mdocml-port-$(VERSION).tar.gz
 
 www: all $(HTML) $(XML) $(TEXT)
 
@@ -69,10 +69,10 @@ clean:
        rm -f $(CLEAN)
 
 index.html: index.7 mdocml.css
-       ./mdocml -Wall -fhtml -e -o $@ index.7
+       ./mdocml -fhtml -Wall -e -o $@ index.7
 
 index.xml: index.7 mdocml.css
-       ./mdocml -Wall -o $@ index.7
+       ./mdocml -fxml -Wall -o $@ index.7
 
 index.txt: index.7
        cp -f index.7 index.txt
@@ -80,28 +80,42 @@ index.txt: index.7
 mdocml.html: mdocml.1 mdocml.css
        ./mdocml -Wall -fhtml -e -o $@ mdocml.1
 
+install:
+       mkdir -p $(PREFIX)/bin/
+       install -m 0755 mdocml $(PREFIX)/bin/
+       mkdir -p $(PREFIX)/man/man1/
+       install -m 0444 mdocml.1 $(PREFIX)/man/man1/
+       mkdir -p $(PREFIX)/share/mdocml/
+       install -m 0444 mdocml.css $(PREFIX)/share/mdocml/
+
+uninstall:
+       rm -f $(PREFIX)/bin/mdocml
+       rm -f $(PREFIX)/man/man1/mdocml.1
+       rm -f $(PREFIX)/share/mdocml/mdocml.css
+
 install-www: www dist
-       install -m 0644 mdocml.tgz $(PREFIX)/mdocml-$(VERSION).tgz
-       install -m 0644 mdocml.tgz $(PREFIX)/mdocml.tgz
-       install -m 0644 mdocml-port.tgz $(PREFIX)/mdocml-port-$(VERSION).tgz
-       install -m 0644 mdocml-port.tgz $(PREFIX)/mdocml-port.tgz
+       install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/
+       install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/mdocml.tar.gz
+       install -m 0644 mdocml-port-$(VERSION).tar.gz $(PREFIX)/
+       install -m 0644 mdocml-port-$(VERSION).tar.gz $(PREFIX)/mdocml-port.tar.gz
        install -m 0644 $(HTML) $(XML) $(TEXT) $(PREFIX)/
 
-mdocml.tgz: $(INSTALL)
+mdocml-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
        install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
-mdocml-port.tgz: $(INSTALL)
+mdocml-port-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/pkg
        sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
-       md5 mdocml-$(VERSION).tgz > .dist/mdocml/distinfo
-       rmd160 mdocml-$(VERSION).tgz >> .dist/mdocml/distinfo
-       sha1 mdocml-$(VERSION).tgz >> .dist/mdocml/distinfo
+       md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
+       rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
+       sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
        install -m 0644 DESCR .dist/mdocml/pkg/DESCR
        echo @comment $$OpenBSD$$ > .dist/mdocml/pkg/PLIST
        echo bin/mdocml >> .dist/mdocml/pkg/PLIST
+       echo share/mdocml/mdocml.css >> .dist/mdocml/pkg/PLIST
        echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
        ( cd .dist/ && tar zcf ../$@ mdocml/ )
        rm -rf .dist/

diff --git a/Makefile.port b/Makefile.port
index a4637d2db6814ae8755bfa7f83e3111cab4875d7..8e002b5ded5f2515ffe3a9e91fd3ed08b3f6112c 100644 (file)
--- a/Makefile.port
+++ b/Makefile.port
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=          http://sysjail.bsd.lv/dist/
+MASTER_SITES=          http://mdocml.bsd.lv/
 
 WANTLIB=               c
 

diff --git a/index.7 b/index.7
index fb5b7341c47e7a73ec67d45c26baebd61d573171..c573771c58703785699497b5898a087df95d5a1f 100644 (file)
--- a/index.7
+++ b/index.7
@@ -79,15 +79,17 @@ The HTML filter has the following features:
 .Pp
 .Bl -enum -compact
 .It
-HTML-4.01 strict compliance.
+HTML-4.01 strict compliance;
 .It
-Proper render of values in UTF-8, such as
+proper rendering of values in UTF-8, such as
 .Dq quotes
-and \*(>= predefined values.
+and \*(>= predefined values;
 .It
-URI-appearing http://bsd.lv/ strings are correctly enclosed in link tags.
+URI-appearing http://bsd.lv/ strings are correctly enclosed in link tags;
 .It
-CSS-dictated style with meaningful non-CSS defaults.
+CSS-dictated style with meaningful non-CSS defaults;
+.It
+and so on.
 .El
 .Pp
 The XML filter creates a correct XML tree with 
@@ -104,13 +106,16 @@ http://mdocml.bsd.lv/index.xml
 .Sh DOWNLOADS
 Download 
 .Nm
-at http://mdocml.bsd.lv/mdocml.tgz
+at http://mdocml.bsd.lv/mdocml.tar.gz
 .Ns . 
 .\" - UPDATE ME WITH EVERY RELEASE. ----------------------------------
 The current version is 1.0.3, dated 10/12/2008.
 .\" ------------------------------------------------------------------
 .Pp
-Previous versions are archived as mdocml-x.y.z.tgz, with the appropriate
+An OpenBSD port is available at http://mdocml.bsd.lv/mdocml-port.tar.gz
+.Ns .
+.Pp
+Previous versions are archived as mdocml-x.y.z.tar.gz, with the appropriate
 versions filled in.
 .\" 
 .Sh DOCUMENTS

diff --git a/noop.c b/noop.c
index 9214ddd4d6570b5b0426ef0ae5bf322e562f5a01..24014d907218a2402e489bf0a9968f7cd7bae3d1 100644 (file)
--- a/noop.c
+++ b/noop.c
@@ -1,4 +1,4 @@
-/* $Id: noop.c,v 1.1 2008/12/10 14:42:46 kristaps Exp $ */
+/* $Id: noop.c,v 1.2 2008/12/10 16:03:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <err.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "private.h"
 
@@ -86,6 +87,7 @@ md_line_noop(void *data, char *buf)
 }
 
 
+/* ARGSUSED */
 void *
 md_init_noop(const struct md_args *args, 
                struct md_mbuf *mbuf, const struct md_rbuf *rbuf)

diff --git a/roff.c b/roff.c
index 5243fe7169e790ea75a85e34f9f43585321df263..b2ac8e38155b2f23b2cf3221ff5ff1ffb504d836 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.62 2008/12/10 13:41:59 kristaps Exp $ */
+/* $Id: roff.c,v 1.63 2008/12/10 16:03:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1181,7 +1181,7 @@ roff_layout(ROFFCALL_ARGS)
 
        assert( ! (ROFF_CALLABLE & tokens[tok].flags));
 
-       if ( ! ROFFSec_NAME & tree->asec)
+       if ( ! (ROFFSec_PR_Os & tree->asec))
                return(roff_errp(tree, *argv, tok, ERR_NOT_PR));
 
        if (ROFF_EXIT == type) {
@@ -1349,7 +1349,7 @@ roff_ordered(ROFFCALL_ARGS)
         * .Xr arg1 arg2 punctuation
         */
 
-       if ( ! ROFFSec_NAME & tree->asec)
+       if ( ! (ROFFSec_PR_Os & tree->asec))
                return(roff_errp(tree, *argv, tok, ERR_NOT_PR));
 
        first = (*argv == tree->cur);
@@ -1421,7 +1421,7 @@ roff_text(ROFFCALL_ARGS)
         * <fl> v W f </fl> ;
         */
 
-       if ( ! ROFFSec_NAME & tree->asec)
+       if ( ! (ROFFSec_PR_Os & tree->asec))
                return(roff_errp(tree, *argv, tok, ERR_NOT_PR));
 
        first = (*argv == tree->cur);