resolve conflicts

merge conflicts

merge conflicts.

merge conflicts

CID 1257473: NULL deref

import mdocml 1.13.3

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 fo

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.

show more ...

Merge mdocml state from 2012-01-30 for various relaxed checks in the
parser to allow it to pass almost all man pages in pkgsrc.

Import mdocml 1.12.0:
- Support to output HTML fragments
- Initial support for mdoc->man translation
- Initial eqn support
- preconv / apropos / demandoc (not hooked up)
- Various bugfixes

Import mdocml-1.11.1 with a few additional fixes from CVS:

Merge the libraries into a single frontend, libmandoc.
Iinitial support for eqn(1) functionality.

Additional changes:
Portability fixes (t

Import mdocml-1.11.1 with a few additional fixes from CVS:

Merge the libraries into a single frontend, libmandoc.
Iinitial support for eqn(1) functionality.

Additional changes:
Portability fixes (tbl_opts.c 1.11, tbl_layout.c 1.18, tbl.c 1.25)
HTML space fixe (mdocml_html.c 1.163)
ROFF conditional nesting bug (roff.c 1.131)

show more ...

Import mdocml-1.10.9 and additional post-release bugfixes
(tbl_data.c 1.15, tbl_layout.c 1.13, tbl_opts.c 1.8).

This features many small improvements and the initial integration of
tbl(1) support on

Import mdocml-1.10.9 and additional post-release bugfixes
(tbl_data.c 1.15, tbl_layout.c 1.13, tbl_opts.c 1.8).

This features many small improvements and the initial integration of
tbl(1) support on all output devices.

show more ...

Import mdocml 1.10.5:
- Initial support for PDF output
- Improved support for various roff commands

Import mdocml 1.10.4:
- Smaller bugfixes
- Improved .ds support
- Support .Bk -words
- Improve multi-page postscript output
- Improve indentation in SYNOPSIS
- Improved support for badly nested blocks

Import mdocml-1.10.2:
- Minor bug-fixes and optimisations
- Support font styles for Postscript output

Import mdocml-1.10.0:
- basic support for the low-level roff macros
- various cleanups and improvements

Import of mdocml-1.9.22:
- Better support for obsolete .Xo/.Xc macros if compiled with -DUGLY
- Support for more roff instructions in the man(7) code
- Correct handling of opening punctuation in macr

Import of mdocml-1.9.22:
- Better support for obsolete .Xo/.Xc macros if compiled with -DUGLY
- Support for more roff instructions in the man(7) code
- Correct handling of opening punctuation in macros for mdoc(7)
- Discard more of the pod2man junk

show more ...

Import mdocml 1.9.15 modulo a patch for .Xr handling:
- XHTML output support, more human-readable HTML output
- end-of-line white space detected in all lines
- fix subtle bug for list displays in som

Import mdocml 1.9.15 modulo a patch for .Xr handling:
- XHTML output support, more human-readable HTML output
- end-of-line white space detected in all lines
- fix subtle bug for list displays in some modes
- fix column handling
- full support for \f etc
- imporoved column handling
- various other bug fixes
- compatiblity support for strlcat/strlcpy
- groff-compatible .Xr [backed out]

show more ...

Import mdocml-1.9.10:
- allow compile-time override for the OS name
- added support for .PD and .%U
- extend mdoc.7
- switch option select to -O, so that -o can be used for the output
format
- improv

Import mdocml-1.9.10:
- allow compile-time override for the OS name
- added support for .PD and .%U
- extend mdoc.7
- switch option select to -O, so that -o can be used for the output
format
- improve portability

show more ...

Initial import mdocml-1.9.9.

mdocml provides a fast parser for man(7) and mdoc(7) formated documents.
It supports validation and can currently create output as plain text
with overstriking and HTML.