Permalink
Browse files

8547 update mandoc to 1.14.3

Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
  • Loading branch information...
yuripv authored and richlowe committed Jul 29, 2017
1 parent 12014b7 commit c66b8046543352459a11a51501b628d1c98a8c44
Showing with 9,065 additions and 4,837 deletions.
  1. +6 −2 usr/src/cmd/mandoc/Makefile.common
  2. +8 −6 usr/src/cmd/mandoc/THIRDPARTYLICENSE
  3. +1 −1 usr/src/cmd/mandoc/THIRDPARTYLICENSE.descrip
  4. +2 −1 usr/src/cmd/mandoc/att.c
  5. +19 −2 usr/src/cmd/mandoc/chars.c
  6. +1 −16 usr/src/cmd/mandoc/config.h
  7. +420 −443 usr/src/cmd/mandoc/eqn.c
  8. +75 −17 usr/src/cmd/mandoc/eqn_html.c
  9. +40 −16 usr/src/cmd/mandoc/eqn_term.c
  10. +95 −36 usr/src/cmd/mandoc/html.c
  11. +8 −3 usr/src/cmd/mandoc/html.h
  12. +2 −1 usr/src/cmd/mandoc/lib.c
  13. +2 −3 usr/src/cmd/mandoc/libman.h
  14. +3 −12 usr/src/cmd/mandoc/libmandoc.h
  15. +11 −12 usr/src/cmd/mandoc/libmdoc.h
  16. +14 −13 usr/src/cmd/mandoc/libroff.h
  17. +142 −72 usr/src/cmd/mandoc/main.c
  18. +3 −1 usr/src/cmd/mandoc/main.h
  19. +64 −50 usr/src/cmd/mandoc/man.c
  20. +1 −45 usr/src/cmd/mandoc/man.h
  21. +0 −103 usr/src/cmd/mandoc/man_hash.c
  22. +42 −41 usr/src/cmd/mandoc/man_html.c
  23. +36 −27 usr/src/cmd/mandoc/man_macro.c
  24. +107 −187 usr/src/cmd/mandoc/man_term.c
  25. +66 −67 usr/src/cmd/mandoc/man_validate.c
  26. +3 −2 usr/src/cmd/mandoc/manconf.h
  27. +35 −11 usr/src/cmd/mandoc/mandoc.c
  28. +57 −27 usr/src/cmd/mandoc/mandoc.h
  29. +11 −4 usr/src/cmd/mandoc/mandoc_aux.c
  30. +3 −2 usr/src/cmd/mandoc/mandoc_aux.h
  31. +121 −0 usr/src/cmd/mandoc/mandoc_xr.c
  32. +31 −0 usr/src/cmd/mandoc/mandoc_xr.h
  33. +37 −15 usr/src/cmd/mandoc/mandocdb.c
  34. +9 −2 usr/src/cmd/mandoc/manpath.c
  35. +136 −46 usr/src/cmd/mandoc/mansearch.c
  36. +5 −2 usr/src/cmd/mandoc/mansearch.h
  37. +55 −78 usr/src/cmd/mandoc/mdoc.c
  38. +1 −130 usr/src/cmd/mandoc/mdoc.h
  39. +19 −19 usr/src/cmd/mandoc/mdoc_argv.c
  40. +0 −95 usr/src/cmd/mandoc/mdoc_hash.c
  41. +188 −162 usr/src/cmd/mandoc/mdoc_html.c
  42. +69 −76 usr/src/cmd/mandoc/mdoc_macro.c
  43. +181 −66 usr/src/cmd/mandoc/mdoc_man.c
  44. +1,569 −0 usr/src/cmd/mandoc/mdoc_markdown.c
  45. +8 −8 usr/src/cmd/mandoc/mdoc_state.c
  46. +173 −202 usr/src/cmd/mandoc/mdoc_term.c
  47. +576 −121 usr/src/cmd/mandoc/mdoc_validate.c
  48. +72 −32 usr/src/cmd/mandoc/out.c
  49. +8 −4 usr/src/cmd/mandoc/out.h
  50. +94 −130 usr/src/cmd/mandoc/read.c
  51. +1,071 −793 usr/src/cmd/mandoc/roff.c
  52. +422 −5 usr/src/cmd/mandoc/roff.h
  53. +96 −0 usr/src/cmd/mandoc/roff_html.c
  54. +1 −3 usr/src/cmd/mandoc/roff_int.h
  55. +248 −0 usr/src/cmd/mandoc/roff_term.c
  56. +97 −0 usr/src/cmd/mandoc/roff_validate.c
  57. +2 −1 usr/src/cmd/mandoc/st.c
  58. +1 −2 usr/src/cmd/mandoc/st.in
  59. +9 −13 usr/src/cmd/mandoc/tbl.c
  60. +57 −57 usr/src/cmd/mandoc/tbl_data.c
  61. +34 −4 usr/src/cmd/mandoc/tbl_html.c
  62. +23 −3 usr/src/cmd/mandoc/tbl_layout.c
  63. +373 −117 usr/src/cmd/mandoc/tbl_term.c
  64. +320 −168 usr/src/cmd/mandoc/term.c
  65. +43 −22 usr/src/cmd/mandoc/term.h
  66. +14 −9 usr/src/cmd/mandoc/term_ascii.c
  67. +11 −5 usr/src/cmd/mandoc/term_ps.c
  68. +128 −0 usr/src/cmd/mandoc/term_tab.c
  69. +9 −13 usr/src/cmd/mandoc/tree.c
  70. +2 −2 usr/src/man/Makefile.man
  71. +4 −3 usr/src/man/man1/apropos.1
  72. +463 −201 usr/src/man/man1/mandoc.1
  73. +15 −38 usr/src/man/man1m/automount.1m
  74. +44 −44 usr/src/man/man1m/ipadm.1m
  75. +4 −4 usr/src/man/man1m/lofiadm.1m
  76. +5 −5 usr/src/man/man1m/mount_nfs.1m
  77. +7 −7 usr/src/man/man1m/share_nfs.1m
  78. +21 −21 usr/src/man/man1m/stmfadm.1m
  79. +6 −4 usr/src/man/man1m/zdb.1m
  80. +11 −11 usr/src/man/man1m/zfs.1m
  81. +2 −2 usr/src/man/man1m/zpool.1m
  82. +1 −1 usr/src/man/man3c/thrd_detach.3c
  83. +2 −2 usr/src/man/man3lib/libpkcs11.3lib
  84. +1 −1 usr/src/man/man3proc/Lgrab_error.3proc
  85. +1 −1 usr/src/man/man3proc/Pgetareg.3proc
  86. +0 −1 usr/src/man/man3proc/Pgrab_file.3proc
  87. +4 −2 usr/src/man/man3proc/Plwp_getspymaster.3proc
  88. +0 −2 usr/src/man/man3proc/Psysentry.3proc
  89. +3 −3 usr/src/man/man5/beastie.4th.5
  90. +3 −3 usr/src/man/man5/eqn.5
  91. +1 −1 usr/src/man/man5/loader.5
  92. +28 −9 usr/src/man/man5/mandoc_char.5
  93. +506 −472 usr/src/man/man5/mandoc_roff.5
  94. +10 −42 usr/src/man/man5/mdoc.5
  95. +6 −6 usr/src/man/man5/regex.5
  96. +254 −189 usr/src/man/man5/tbl.5
  97. +32 −64 usr/src/man/man7d/usba.7d
  98. +1 −2 usr/src/man/man9e/mc_propinfo.9e
  99. +1 −1 usr/src/man/man9f/mac_alloc.9f
  100. +3 −3 usr/src/man/man9f/mac_init_ops.9f
  101. +0 −1 usr/src/man/man9s/mac_callbacks.9s
  102. +2 −1 usr/src/tools/mandoc/Makefile
  103. +0 −50 usr/src/tools/mandoc/config.h
  104. +19 −4 usr/src/tools/mandoc/fts.h
  105. +1 −0 usr/src/tools/onbld/Checks/ManLint.py
  106. +14 −8 usr/src/tools/scripts/webrev.sh
@@ -32,29 +32,32 @@ OBJS= att.o \
main.o \
man.o \
manpath.o \
man_hash.o \
man_html.o \
man_macro.o \
man_term.o \
man_validate.o \
mandoc.o \
mandoc_aux.o \
mandoc_ohash.o \
mandoc_xr.o \
mandocdb.o \
mansearch.o \
mdoc.o \
mdoc_argv.o \
mdoc_hash.o \
mdoc_html.o \
mdoc_macro.o \
mdoc_man.o \
mdoc_markdown.o \
mdoc_state.o \
mdoc_term.o \
mdoc_validate.o \
msec.o \
out.o \
read.o \
roff.o \
roff_html.o \
roff_term.o \
roff_validate.o \
preconv.o \
st.o \
tag.o \
@@ -67,6 +70,7 @@ OBJS= att.o \
term.o \
term_ascii.o \
term_ps.o \
term_tab.o \
tree.o
OBJS += compat_ohash.o
@@ -1,17 +1,19 @@
$Id: LICENSE,v 1.12 2016/07/07 23:46:36 schwarze Exp $
$Id: LICENSE,v 1.17 2017/06/23 15:58:14 schwarze Exp $
With the exceptions noted below, all code and documentation
contained in the mdocml toolkit is protected by the Copyright
contained in the mandoc toolkit is protected by the Copyright
of the following developers:
Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
Copyright (c) 2010-2016 Ingo Schwarze <schwarze@openbsd.org>
Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger <joerg@netbsd.org>
Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
Copyright (c) 2014 Baptiste Daroussin <bapt@freebsd.org>
Copyright (c) 2016 Ed Maste <emaste@freebsd.org>
Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
Copyright (c) 1998, 2004, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
Copyright (c) 2008, 2017 Otto Moerbeek <otto@drijf.net>
Copyright (c) 2004 Ted Unangst <tedu@openbsd.org>
Copyright (c) 1994 Christos Zoulas <christos@netbsd.org>
Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org>
@@ -20,7 +22,7 @@ See the individual source files for information about who contributed
to which file during which years.
The mdocml distribution as a whole is distributed by its developers
The mandoc distribution as a whole is distributed by its developers
under the following license:
Permission to use, copy, modify, and distribute this software for any
@@ -1 +1 @@
MDOCML - The mandoc UNIX manpage compiler toolset
The mandoc UNIX manpage compiler toolset
@@ -1,4 +1,4 @@
/* $Id: att.c,v 1.15 2015/10/06 18:32:19 schwarze Exp $ */
/* $Id: att.c,v 1.16 2017/06/24 14:38:32 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <string.h>
#include "mandoc.h"
#include "roff.h"
#include "mdoc.h"
#include "libmdoc.h"
@@ -1,7 +1,7 @@
/* $Id: chars.c,v 1.69 2017/02/17 18:28:06 schwarze Exp $ */
/* $Id: chars.c,v 1.71 2017/06/14 20:57:07 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -61,6 +61,7 @@ static struct ln lines[] = {
{ "ba", "|", 0x007c },
{ "br", "|", 0x2502 },
{ "ul", "_", 0x005f },
{ "ru", "_", 0x005f },
{ "rn", "-", 0x203e },
{ "bb", "|", 0x00a6 },
{ "sl", "/", 0x002f },
@@ -81,6 +82,10 @@ static struct ln lines[] = {
{ "sh", "#", 0x0023 },
{ "CR", "_|", 0x21b5 },
{ "OK", "\\/", 0x2713 },
{ "CL", "<club>", 0x2663 },
{ "SP", "<spade>", 0x2660 },
{ "HE", "<heart>", 0x2665 },
{ "DI", "<diamond>", 0x2666 },
/* Legal symbols. */
{ "co", "(C)", 0x00a9 },
@@ -161,6 +166,7 @@ static struct ln lines[] = {
{ "uA", "=\b^", 0x21d1 },
{ "dA", "=\bv", 0x21d3 },
{ "vA", "^=v", 0x21d5 },
{ "an", "-", 0x23af },
/* Logic. */
{ "AN", "^", 0x2227 },
@@ -234,11 +240,20 @@ static struct ln lines[] = {
{ "Ah", "N", 0x2135 },
{ "Im", "I", 0x2111 },
{ "Re", "R", 0x211c },
{ "wp", "P", 0x2118 },
{ "pd", "a", 0x2202 },
{ "-h", "/h", 0x210f },
{ "hbar", "/h", 0x210f },
{ "12", "1/2", 0x00bd },
{ "14", "1/4", 0x00bc },
{ "34", "3/4", 0x00be },
{ "18", "1/8", 0x215B },
{ "38", "3/8", 0x215C },
{ "58", "5/8", 0x215D },
{ "78", "7/8", 0x215E },
{ "S1", "1", 0x00B9 },
{ "S2", "2", 0x00B2 },
{ "S3", "3", 0x00B3 },
/* Ligatures. */
{ "ff", "ff", 0xfb00 },
@@ -354,6 +369,8 @@ static struct ln lines[] = {
{ "fm", "\'", 0x2032 },
{ "sd", "''", 0x2033 },
{ "mc", ",\bu", 0x00b5 },
{ "Of", "_\ba", 0x00aa },
{ "Om", "_\bo", 0x00ba },
/* Greek characters. */
{ "*A", "A", 0x0391 },
@@ -4,39 +4,24 @@
#include <sys/types.h>
#define MAN_CONF_FILE "/etc/man.conf"
#define MANPATH_BASE "/usr/share/man"
#define MANPATH_DEFAULT "/usr/share/man:/usr/gnu/share/man"
#define UTF8_LOCALE "en_US.UTF-8"
#define EFTYPE EINVAL
#define O_DIRECTORY 0
#define HAVE_CMSG_XPG42 0
#define HAVE_DIRENT_NAMLEN 0
#define HAVE_ENDIAN 1
#define HAVE_ERR 1
#define HAVE_FTS 1
#define HAVE_FTS_COMPARE_CONST 0
#define HAVE_GETLINE 1
#define HAVE_GETSUBOPT 1
#define HAVE_ISBLANK 1
#define HAVE_MKDTEMP 1
#define HAVE_NTOHL 1
#define HAVE_OHASH 0
#define HAVE_PLEDGE 0
#define HAVE_PROGNAME 1
#define HAVE_REALLOCARRAY 1
#define HAVE_REWB_BSD 1
#define HAVE_REWB_SYSV 1
#define HAVE_SANDBOX_INIT 0
#define HAVE_STRCASESTR 1
#define HAVE_STRINGLIST 0
#define HAVE_STRLCAT 1
#define HAVE_STRLCPY 1
#define HAVE_STRPTIME 1
#define HAVE_STRSEP 1
#define HAVE_STRTONUM 1
#define HAVE_SYS_ENDIAN 0
#define HAVE_VASPRINTF 1
#define HAVE_WCHAR 1
#define BINM_APROPOS "apropos"
Oops, something went wrong.

0 comments on commit c66b804

Please sign in to comment.