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 Import mdocml 1.12.3 from upstream ...
details: https://anonhg.NetBSD.org/src/rev/31dd49dea4e7
branches: trunk
changeset: 792505:31dd49dea4e7
user: joerg <joerg%NetBSD.org@localhost>
date: Sun Jan 05 19:21:37 2014 +0000
description:
Import mdocml 1.12.3 from upstream CVS as of today.
Changes in version 1.12.3, released on December 31, 2013
* In the mdoc(7) SYNOPSIS, line breaks and hanging indentation
now work correctly for .Fo/.Fa/.Fc and .Fn blocks.
Thanks to Franco Fichtner for doing part of the work.
* The mdoc(7) .Bk macro got some addititonal bugfixes.
* In mdoc(7) macro arguments, double quotes can now be quoted
by doubling them, just like in man(7).
Thanks to Tsugutomo ENAMI for the patch.
* At the end of man(7) macro lines, end-of-sentence spacing
now works. Thanks to Franco Fichtner for the patch.
* For backward compatibility, the man(7) parser now supports the
man-ext .UR/.UE (uniform resource identifier) block macros.
* The man(7) parser now handles closing blocks that are not open
more gracefully.
* The man(7) parser now ignores blank lines right after .SH and .SS.
* In the man(7) formatter, reset indentation when leaving a block,
not just when entering the next one.
* The roff(7) .nr request now supports incrementing and decrementing
number registers and stops parsing the number right before the
first non-digit character.
* The roff(7) parser now supports the alternative escape sequence
syntax \C'uXXXX' for Unicode characters.
* The roff(7) parser now parses and ignores the .fam (font family)
and .hw (hyphenation points) requests and the \d and \u escape
sequences.
* The roff(7) manual got a new ESCAPE SEQUENCE REFERENCE.
Changes in version 1.12.2, released on Oktober 5, 2013
* The mdoc(7) to man(7) converter, to be called as mandoc -Tman,
is now fully functional.
* The mandoc(1) utility now supports the -Ios (default operating system)
input option, and the -Tutf8 output mode now actually works.
* The mandocdb(8) utility no longer truncates existing databases when
starting to build new ones, but only replaces them when the build
actually succeeds.
* The man(7) parser now supports the PD macro (paragraph distance),
and (for GNU man-ext compatibility only) EX (example block) and EE
(example end). Plus several bugfixes regarding indentation, line
breaks, and vertical spacing, and regarding RS following TP.
* The roff(7) parser now supports the \f(BI (bold+italic) font escape,
the \z (zero cursor advance) escape and the cc (change control
character) and it (input line trap) requests. Plus bugfixes regarding
the \t (tab) escape, nested escape sequences, and conditional requests.
* In mdoc(7), several bugs were fixed related to UTF-8 output of quoting
enclosures, delimiter handling, list indentation and horizontal and
vertical spacing, formatting of the Lk, %U, and %C macros, plus some
bugfixes related to the handling of syntax errors like badly nested
font blocks, stray Ta macros outside column lists, unterminated It Xo
blocks, and non-text children of Nm blocks.
* In tbl(7), the width of horizontal spans and the vertical spacing
around tables was corrected, and in man(7) files, a crash was fixed
that was triggered by some particular unclosed T{ macros.
* For mandoc developers, we now provide a tbl(3) library manual and
gmdiff, a very small, very simplistic groff-versus-mandoc output
comparison tool.
diffstat:
external/bsd/mdocml/dist/Makefile | 417 +--
external/bsd/mdocml/dist/NEWS | 370 ++
external/bsd/mdocml/dist/TODO | 184 +-
external/bsd/mdocml/dist/apropos.1 | 159 +-
external/bsd/mdocml/dist/apropos.c | 211 +-
external/bsd/mdocml/dist/arch.c | 2 +-
external/bsd/mdocml/dist/att.c | 2 +-
external/bsd/mdocml/dist/att.in | 2 +-
external/bsd/mdocml/dist/cgi.c | 78 +-
external/bsd/mdocml/dist/chars.c | 6 +-
external/bsd/mdocml/dist/chars.in | 3 +-
external/bsd/mdocml/dist/compat_ohash.c | 337 ++
external/bsd/mdocml/dist/compat_ohash.h | 73 +
external/bsd/mdocml/dist/compat_strcasestr.c | 74 +
external/bsd/mdocml/dist/compat_strnlen.c | 43 +
external/bsd/mdocml/dist/compat_strsep.c | 80 +
external/bsd/mdocml/dist/config.h.post | 29 +-
external/bsd/mdocml/dist/config.h.pre | 1 +
external/bsd/mdocml/dist/configure | 48 +
external/bsd/mdocml/dist/demandoc.1 | 7 +-
external/bsd/mdocml/dist/demandoc.c | 4 +-
external/bsd/mdocml/dist/eqn.7 | 7 +-
external/bsd/mdocml/dist/eqn.c | 2 +-
external/bsd/mdocml/dist/eqn_html.c | 2 +-
external/bsd/mdocml/dist/eqn_term.c | 2 +-
external/bsd/mdocml/dist/example.style.css | 2 +-
external/bsd/mdocml/dist/external.png.uu | 2 +-
external/bsd/mdocml/dist/gmdiff | 35 +
external/bsd/mdocml/dist/html.c | 126 +-
external/bsd/mdocml/dist/html.h | 7 +-
external/bsd/mdocml/dist/lib.c | 2 +-
external/bsd/mdocml/dist/libman.h | 12 +-
external/bsd/mdocml/dist/libmdoc.h | 27 +-
external/bsd/mdocml/dist/libroff.h | 4 +-
external/bsd/mdocml/dist/main.c | 30 +-
external/bsd/mdocml/dist/main.h | 2 +-
external/bsd/mdocml/dist/man.7 | 109 +-
external/bsd/mdocml/dist/man.c | 270 +-
external/bsd/mdocml/dist/man.cgi.7 | 5 +-
external/bsd/mdocml/dist/man.h | 6 +-
external/bsd/mdocml/dist/man_hash.c | 2 +-
external/bsd/mdocml/dist/man_html.c | 90 +-
external/bsd/mdocml/dist/man_macro.c | 179 +-
external/bsd/mdocml/dist/man_validate.c | 218 +-
external/bsd/mdocml/dist/mandoc.1 | 22 +-
external/bsd/mdocml/dist/mandoc.3 | 100 +-
external/bsd/mdocml/dist/mandoc.c | 375 +-
external/bsd/mdocml/dist/mandoc_char.7 | 60 +-
external/bsd/mdocml/dist/mandocdb.8 | 248 +-
external/bsd/mdocml/dist/mandocdb.c | 3431 +++++++++++++------------
external/bsd/mdocml/dist/manpage.c | 191 +
external/bsd/mdocml/dist/manpath.c | 22 +-
external/bsd/mdocml/dist/manpath.h | 4 +-
external/bsd/mdocml/dist/mansearch.c | 715 +++++
external/bsd/mdocml/dist/mansearch.h | 92 +
external/bsd/mdocml/dist/mdoc.7 | 123 +-
external/bsd/mdocml/dist/mdoc.c | 317 +-
external/bsd/mdocml/dist/mdoc.h | 5 +-
external/bsd/mdocml/dist/mdoc_hash.c | 2 +-
external/bsd/mdocml/dist/mdoc_html.c | 73 +-
external/bsd/mdocml/dist/mdoc_macro.c | 614 ++--
external/bsd/mdocml/dist/mdoc_man.c | 1375 ++++++++-
external/bsd/mdocml/dist/msec.c | 2 +-
external/bsd/mdocml/dist/out.c | 42 +-
external/bsd/mdocml/dist/out.h | 2 +-
external/bsd/mdocml/dist/preconv.1 | 7 +-
external/bsd/mdocml/dist/preconv.c | 11 +-
external/bsd/mdocml/dist/predefs.in | 4 +-
external/bsd/mdocml/dist/roff.7 | 315 ++-
external/bsd/mdocml/dist/st.c | 2 +-
external/bsd/mdocml/dist/tbl.3 | 295 ++
external/bsd/mdocml/dist/tbl.7 | 14 +-
external/bsd/mdocml/dist/tbl_html.c | 20 +-
external/bsd/mdocml/dist/tbl_term.c | 138 +-
external/bsd/mdocml/dist/term.c | 212 +-
external/bsd/mdocml/dist/term.h | 26 +-
external/bsd/mdocml/dist/term_ascii.c | 5 +-
external/bsd/mdocml/dist/term_ps.c | 7 +-
external/bsd/mdocml/dist/test-fgetln.c | 8 +-
external/bsd/mdocml/dist/test-getsubopt.c | 13 +-
external/bsd/mdocml/dist/test-mmap.c | 6 +-
external/bsd/mdocml/dist/test-ohash.c | 19 +
external/bsd/mdocml/dist/test-strcasestr.c | 9 +
external/bsd/mdocml/dist/test-strlcat.c | 7 +-
external/bsd/mdocml/dist/test-strlcpy.c | 7 +-
external/bsd/mdocml/dist/test-strnlen.c | 8 +
external/bsd/mdocml/dist/test-strptime.c | 9 +-
external/bsd/mdocml/dist/test-strsep.c | 10 +
external/bsd/mdocml/dist/tree.c | 20 +-
external/bsd/mdocml/dist/vol.c | 2 +-
external/bsd/mdocml/dist/vol.in | 2 +-
91 files changed, 7936 insertions(+), 4326 deletions(-)
diffs (truncated from 18304 to 300 lines):
diff -r 63c061269102 -r 31dd49dea4e7 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Sun Jan 05 17:30:16 2014 +0000
+++ b/external/bsd/mdocml/dist/Makefile Sun Jan 05 19:21:37 2014 +0000
@@ -1,19 +1,15 @@
.PHONY: clean install installwww
.SUFFIXES: .sgml .html .md5 .h .h.html
.SUFFIXES: .1 .3 .7 .8
-.SUFFIXES: .1.txt .3.txt .7.txt .8.txt
-.SUFFIXES: .1.pdf .3.pdf .7.pdf .8.pdf
-.SUFFIXES: .1.ps .3.ps .7.ps .8.ps
.SUFFIXES: .1.html .3.html .7.html .8.html
-.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml .8.xhtml
# Specify this if you want to hard-code the operating system to appear
# in the lower-left hand corner of -mdoc manuals.
#
-# CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
+# CFLAGS += -DOSNAME="\"OpenBSD 5.4\""
-VERSION = 1.12.1
-VDATE = 23 March 2012
+VERSION = 1.13.0
+VDATE = 4 January 2014
# IFF your system supports multi-byte functions (setlocale(), wcwidth(),
# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
@@ -24,17 +20,17 @@
CFLAGS += -DUSE_WCHAR
# If your system has manpath(1), uncomment this. This is most any
-# system that's not OpenBSD or NetBSD. If uncommented, apropos(1),
-# mandocdb(8), and man.cgi will popen(3) manpath(1) to get the MANPATH
-# variable.
+# system that's not OpenBSD or NetBSD. If uncommented, manpage(1) and
+# mandocdb(8) will use manpath(1) to get the MANPATH variable.
#CFLAGS += -DUSE_MANPATH
-# If your system supports static binaries only, uncomment this. This
-# appears only to be BSD UNIX systems (Mac OS X has no support and Linux
-# requires -pthreads for static libdb).
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
STATIC = -static
+# Linux requires -pthread to statically link with libdb.
+#STATIC += -pthread
-CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
WWWPREFIX = /var/www
@@ -52,38 +48,44 @@
INSTALL_SOURCE = $(INSTALL) -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
-# apropos.
-# However, if you don't have -ldb at all (or it's not native), then
-# comment out apropos and mandocdb.
-#
-#DBLIB = -ldb
-DBBIN = apropos mandocdb man.cgi catman whatis
-DBLN = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
+DBLIB = -L/usr/local/lib -lsqlite3
+DBBIN = mandocdb manpage apropos
all: mandoc preconv demandoc $(DBBIN)
+TESTSRCS = test-fgetln.c \
+ test-getsubopt.c \
+ test-mmap.c \
+ test-ohash.c \
+ test-strlcat.c \
+ test-strlcpy.c \
+ test-strnlen.c \
+ test-strptime.c
+
SRCS = Makefile \
+ NEWS \
TODO \
apropos.1 \
apropos.c \
- apropos_db.c \
- apropos_db.h \
arch.c \
arch.in \
att.c \
att.in \
- catman.8 \
- catman.c \
cgi.c \
chars.c \
chars.in \
compat_fgetln.c \
compat_getsubopt.c \
+ compat_ohash.c \
+ compat_ohash.h \
+ compat_strcasestr.c \
compat_strlcat.c \
compat_strlcpy.c \
+ compat_strnlen.c \
+ compat_strsep.c \
config.h.post \
config.h.pre \
+ configure \
demandoc.1 \
demandoc.c \
eqn.7 \
@@ -92,6 +94,7 @@
eqn_term.c \
example.style.css \
external.png \
+ gmdiff \
html.c \
html.h \
index.css \
@@ -106,7 +109,6 @@
main.h \
man.7 \
man.c \
- man.cgi.7 \
man-cgi.css \
man.h \
man_hash.c \
@@ -121,9 +123,11 @@
mandoc_char.7 \
mandocdb.8 \
mandocdb.c \
- mandocdb.h \
+ manpage.c \
manpath.c \
manpath.h \
+ mansearch.c \
+ mansearch.h \
mdoc.7 \
mdoc.c \
mdoc.h \
@@ -147,6 +151,7 @@
st.c \
st.in \
style.css \
+ tbl.3 \
tbl.7 \
tbl.c \
tbl_data.c \
@@ -158,25 +163,15 @@
term.h \
term_ascii.c \
term_ps.c \
- test-fgetln.c \
- test-getsubopt.c \
- test-mmap.c \
- test-strlcat.c \
- test-strlcpy.c \
- test-strptime.c \
tree.c \
vol.c \
vol.in \
- whatis.1
+ $(TESTSRCS)
LIBMAN_OBJS = man.o \
man_hash.o \
man_macro.o \
man_validate.o
-LIBMAN_LNS = man.ln \
- man_hash.ln \
- man_macro.ln \
- man_validate.ln
LIBMDOC_OBJS = arch.o \
att.o \
@@ -188,16 +183,6 @@
mdoc_validate.o \
st.o \
vol.o
-LIBMDOC_LNS = arch.ln \
- att.ln \
- lib.ln \
- mdoc.ln \
- mdoc_argv.ln \
- mdoc_hash.ln \
- mdoc_macro.ln \
- mdoc_validate.ln \
- st.ln \
- vol.ln
LIBROFF_OBJS = eqn.o \
roff.o \
@@ -205,12 +190,6 @@
tbl_data.o \
tbl_layout.o \
tbl_opts.o
-LIBROFF_LNS = eqn.ln \
- roff.ln \
- tbl.ln \
- tbl_data.ln \
- tbl_layout.ln \
- tbl_opts.ln
LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
$(LIBMDOC_OBJS) \
@@ -219,52 +198,39 @@
mandoc.o \
msec.o \
read.o
-LIBMANDOC_LNS = $(LIBMAN_LNS) \
- $(LIBMDOC_LNS) \
- $(LIBROFF_LNS) \
- chars.ln \
- mandoc.ln \
- msec.ln \
- read.ln
COMPAT_OBJS = compat_fgetln.o \
compat_getsubopt.o \
+ compat_ohash.o \
+ compat_strcasestr.o \
compat_strlcat.o \
- compat_strlcpy.o
-COMPAT_LNS = compat_fgetln.ln \
- compat_getsubopt.ln \
- compat_strlcat.ln \
- compat_strlcpy.ln
+ compat_strlcpy.o \
+ compat_strnlen.o \
+ compat_strsep.o
-arch.o arch.ln: arch.in
-att.o att.ln: att.in
-chars.o chars.ln: chars.in
-lib.o lib.ln: lib.in
-msec.o msec.ln: msec.in
-roff.o roff.ln: predefs.in
-st.o st.ln: st.in
-vol.o vol.ln: vol.in
+arch.o: arch.in
+att.o: att.in
+chars.o: chars.in
+lib.o: lib.in
+msec.o: msec.in
+roff.o: predefs.in
+st.o: st.in
+vol.o: vol.in
-$(LIBMAN_OBJS) $(LIBMAN_LNS): libman.h
-$(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
-$(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
-$(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h
-
-$(COMPAT_OBJS) $(COMPAT_LNS): config.h
+$(LIBMAN_OBJS): libman.h
+$(LIBMDOC_OBJS): libmdoc.h
+$(LIBROFF_OBJS): libroff.h
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(COMPAT_OBJS): config.h compat_ohash.h
MANDOC_HTML_OBJS = eqn_html.o \
html.o \
man_html.o \
mdoc_html.o \
tbl_html.o
-MANDOC_HTML_LNS = eqn_html.ln \
- html.ln \
- man_html.ln \
- mdoc_html.ln \
- tbl_html.ln
+$(MANDOC_HTML_OBJS): html.h
MANDOC_MAN_OBJS = mdoc_man.o
-MANDOC_MAN_LNS = mdoc_man.ln
MANDOC_TERM_OBJS = eqn_term.o \
man_term.o \
@@ -273,13 +239,7 @@
term_ascii.o \
term_ps.o \
tbl_term.o
-MANDOC_TERM_LNS = eqn_term.ln \
- man_term.ln \
- mdoc_term.ln \
- term.ln \
- term_ascii.ln \
- term_ps.ln \
- tbl_term.ln
+$(MANDOC_TERM_OBJS): term.h
MANDOC_OBJS = $(MANDOC_HTML_OBJS) \
$(MANDOC_MAN_OBJS) \
@@ -287,137 +247,36 @@
main.o \
out.o \
tree.o
-MANDOC_LNS = $(MANDOC_HTML_LNS) \
- $(MANDOC_MAN_LNS) \
- $(MANDOC_TERM_LNS) \
- main.ln \
- out.ln \
- tree.ln
-
Home |
Main Index |
Thread Index |
Old Index