pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/mandoc mandoc: update to 1.14.4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a13297e4f908
branches: trunk
changeset: 383922:a13297e4f908
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Aug 14 09:21:52 2018 +0000
description:
mandoc: update to 1.14.4.
Changes in version 1.14.4, released on August 8, 2018
--- MAJOR NEW FEATURES ---
* In ASCII output, render mathematical symbols and greek letters
as transliterations conveying the characters' meanings rather
than trying to imitate their shape. Consequently, such characters
can now be used in portable manual pages. All the same, please
limit their use to contexts where they really matter, for example
when showing complicated mathematical formulae.
* First steps towards better support for small screens in HTML
output (responsive design): avoid most style= attributes, in
particular all hard-coded indentations and column widths, and
provide a better mandoc.css style sheet with a @media query,
using em units throughout, and avoiding redundancy in selectors.
* Better HTML output with some more fitting HTML elements, eliminating
needless class= attributes, and avoiding various HTML syntax errors
(element nesting, URL-fragment syntax, duplicate id= attributes).
--- MINOR NEW FEATURES ---
* When a man(1) argument contains a slash, imply -l like in man-db.
* Use TIOCGWINSZ to reduce the default -Owidth and -Oindent during
interactive use on terminals narrower than 79 columns.
* Generated PostScript files are now more than 50% smaller.
* Terminal rendering of eqn(7) is improved in several respects.
* Simplified and nicer output from the mdoc(7) .Lk macro, formatting
all links in-line, even long ones.
* roff(7) \n+ and \n- numerical register auto-increment and -decrement
* roff(7) .nr optional third argument (auto-increment step size)
* Autodetect in ./configure whether the compiler can use -W and -static,
allowing to build on Solaris 10 and 11 without any configure.local.
--- RELIABILITY BUGFIXES ---
* Only activate UTF-8 output when the user really selected UTF-8,
not some other multibyte character encoding.
* Prevent excessive .ll arguments from generating infinite output.
* Fix out of bounds accesses to parse buffers that could happen when
using renamed or user defined macros after roff(7) conditionals.
* Avoid an assertion failure in certain .Bl -column lists.
* Avoid a NULL pointer access on deroff() failure after '.SS ""'.
* Fix a segfault that could be triggered by two invalid .Dt macros.
* Fix two syntax errors in generated PDF files.
* Properly state the page size in generated PostScript files.
* Close a memory leak caused by missing gzclose(3).
* Fix misformatting of man(7) documents lacking .SH macros
in PostScript and PDF output.
* And many minor bugfixes.
--- THANKS TO ---
* Marc Espie (OpenBSD) for implementing the size reduction of
PostScript files, one additional patch for code simplification,
and two bug reports.
* Theo Buehler (OpenBSD) for a bugfix patch,
and Theo de Raadt (OpenBSD) for checking it.
* John Gardner for more than a dozen suggestions regarding HTML output.
* Mike Williams for teaching me how to use %%DocumentMedia and
setpagedevice in PostScript files.
* Werner Lemberg (groff) for feedback on mdoc(7) language changes.
* Colin Watson (man-db) for feedback on man-db semantics.
* Jason McIntyre (OpenBSD) for lots of feedback and suggestions
on diagnostic messages and on the documentation.
* Thomas Klausner (NetBSD) for suggesting two new style messages
and one new feature, for two bug reports, and for release testing.
* Leah Neukirchen (Void Linux) for suggesting a new style message,
five bug reports, and release testing.
* Anthony Bentley (OpenBSD) for reporting multiple bugs and missing
features.
* Paul Irofti (OpenBSD) and Nate Bargmann for suggesting new features.
* Michael Stapelberg (Debian) for bug reports and release testing.
* Christian Weisgerber, Jonathan Gray, Stuart Henderson,
Ted Unangst (OpenBSD), Takeshi Nakayama (NetBSD),
Anton Lazarov, Jakub Klinkovsky, Jan Stary, Jesper Wallin,
Will Backmam, and Wolfgang Mueller for bug reports.
* Sevan Janiyan (NetBSD) for additions to lib.in.
* George Brown for suggesting code simplifications.
* David Coppa, Igor Sobrado (OpenBSD), and Alexander Kuleshov
for documentation improvements.
* Laura Morales and Raf Czlonka for questions resulting in better
documentation.
* Yuri Pankov (illumos) for release testing.
diffstat:
textproc/mandoc/Makefile | 7 +-
textproc/mandoc/distinfo | 19 +--
textproc/mandoc/patches/patch-configure | 10 +-
textproc/mandoc/patches/patch-mandoc.1 | 25 -----
textproc/mandoc/patches/patch-mandoc.h | 15 ---
textproc/mandoc/patches/patch-mdoc__man.c | 21 ----
textproc/mandoc/patches/patch-mdoc__validate.c | 110 -------------------------
textproc/mandoc/patches/patch-read.c | 15 ---
textproc/mandoc/patches/patch-roff.7 | 6 +-
9 files changed, 17 insertions(+), 211 deletions(-)
diffs (296 lines):
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/Makefile
--- a/textproc/mandoc/Makefile Tue Aug 14 07:33:58 2018 +0000
+++ b/textproc/mandoc/Makefile Tue Aug 14 09:21:52 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/04/05 09:20:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2018/08/14 09:21:52 wiz Exp $
-DISTNAME= mandoc-1.14.3
-PKGREVISION= 1
+DISTNAME= mandoc-1.14.4
CATEGORIES= textproc devel
MASTER_SITES= http://mdocml.bsd.lv/snapshots/
@@ -12,8 +11,6 @@
HAS_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${DISTNAME:C/rc[0-9]*//}
-
SUBST_CLASSES+= roff
SUBST_STAGE.roff= pre-build
SUBST_FILES.roff= mandoc.1 mandoc.3
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/distinfo
--- a/textproc/mandoc/distinfo Tue Aug 14 07:33:58 2018 +0000
+++ b/textproc/mandoc/distinfo Tue Aug 14 09:21:52 2018 +0000
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.3 2018/04/05 09:20:52 wiz Exp $
+$NetBSD: distinfo,v 1.4 2018/08/14 09:21:52 wiz Exp $
-SHA1 (mandoc-1.14.3.tar.gz) = 25b3c97f6346a2722964279c9effab314c1e57cf
-RMD160 (mandoc-1.14.3.tar.gz) = 0155d0670421c37aa79c1887ecab3904236907cd
-SHA512 (mandoc-1.14.3.tar.gz) = cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b
-Size (mandoc-1.14.3.tar.gz) = 617202 bytes
-SHA1 (patch-configure) = bd53ddf7d98de53bc04dafe6b2dbb1b79e35399e
-SHA1 (patch-mandoc.1) = a281578c23dfbf22ff51b6bf48470daf94a15d8b
-SHA1 (patch-mandoc.h) = 23cc9a244c5ef0628f1bacddbabc6325f6c3de70
-SHA1 (patch-mdoc__man.c) = 138a77f2be58b98437b24cf17753647c716d1e0d
-SHA1 (patch-mdoc__validate.c) = 0fb549297abfd0cde2dbbcd49c13c08c41448d91
-SHA1 (patch-read.c) = a50ea4c5e907f3a9e2e61fffbf04e0d324b6af29
-SHA1 (patch-roff.7) = a11e2377e034393f4d900d292b094a9e751a6c0a
+SHA1 (mandoc-1.14.4.tar.gz) = 089bb02a8ec107059b6cff11e4b4fc7da0b9d379
+RMD160 (mandoc-1.14.4.tar.gz) = 5e3702e49a70a270184132bf08f891eb12100ea2
+SHA512 (mandoc-1.14.4.tar.gz) = c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
+Size (mandoc-1.14.4.tar.gz) = 627229 bytes
+SHA1 (patch-configure) = 18d381c8beb6cf72e4a7478f06b46c74d7a96c5d
+SHA1 (patch-roff.7) = a9df5f51c185da2b8224e6341813fc54036890d7
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-configure
--- a/textproc/mandoc/patches/patch-configure Tue Aug 14 07:33:58 2018 +0000
+++ b/textproc/mandoc/patches/patch-configure Tue Aug 14 09:21:52 2018 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2017/08/01 15:06:24 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2018/08/14 09:21:53 wiz Exp $
Avoid broken CC detection.
---- configure.orig 2017-02-21 00:25:20.000000000 +0000
+--- configure.orig 2018-07-31 15:37:10.000000000 +0000
+++ configure
-@@ -39,7 +39,7 @@ MANPATH_DEFAULT="/usr/share/man:/usr/X11
+@@ -40,7 +40,7 @@ MANPATH_DEFAULT="/usr/share/man:/usr/X11
OSNAME=
UTF8_LOCALE=
-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
+#CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
- CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"
- CFLAGS="${CFLAGS} -Wno-unused-parameter"
+ CFLAGS=
LDADD=
+ LDFLAGS=
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-mandoc.1
--- a/textproc/mandoc/patches/patch-mandoc.1 Tue Aug 14 07:33:58 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-mandoc.1,v 1.1 2018/04/05 09:20:52 wiz Exp $
-
-Style message about bad input encoding of em-dashes as -- instead of \(em.
-Suggested by Thomas Klausner <wiz at NetBSD>; discussed with jmc@.
-
---- mandoc.1.orig 2017-08-05 12:40:21.000000000 +0000
-+++ mandoc.1
-@@ -2,5 +2,5 @@
- .\"
- .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
--.\" Copyright (c) 2012, 2014-2017 Ingo Schwarze <schwarze%openbsd.org@localhost>
-+.\" Copyright (c) 2012, 2014-2018 Ingo Schwarze <schwarze%openbsd.org@localhost>
- .\"
- .\" Permission to use, copy, modify, and distribute this software for any
-@@ -939,4 +939,10 @@ request occurs even though the document
- and did not switch back to fill mode yet.
- It has no effect.
-+.It Sy "verbatim \(dq--\(dq, maybe consider using \e(em"
-+.Pq mdoc
-+Even though the ASCII output device renders an em-dash as
-+.Qq \-\- ,
-+that is not a good way to write it in an input file
-+because it renders poorly on all other output devices.
- .It Sy "function name without markup"
- .Pq mdoc
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-mandoc.h
--- a/textproc/mandoc/patches/patch-mandoc.h Tue Aug 14 07:33:58 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-mandoc.h,v 1.1 2018/04/05 09:20:52 wiz Exp $
-
-Style message about bad input encoding of em-dashes as -- instead of \(em.
-Suggested by Thomas Klausner <wiz at NetBSD>; discussed with jmc@.
-
---- mandoc.h.orig 2017-08-05 12:40:21.000000000 +0000
-+++ mandoc.h
-@@ -68,6 +68,7 @@ enum mandocerr {
- MANDOCERR_DELIM_NB, /* no blank before trailing delimiter: macro ... */
- MANDOCERR_FI_SKIP, /* fill mode already enabled, skipping: fi */
- MANDOCERR_NF_SKIP, /* fill mode already disabled, skipping: nf */
-+ MANDOCERR_DASHDASH, /* verbatim "--", maybe consider using \(em */
- MANDOCERR_FUNC, /* function name without markup: name() */
- MANDOCERR_SPACE_EOL, /* whitespace at end of input line */
- MANDOCERR_COMMENT_BAD, /* bad comment style */
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-mdoc__man.c
--- a/textproc/mandoc/patches/patch-mdoc__man.c Tue Aug 14 07:33:58 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-mdoc__man.c,v 1.1 2018/04/05 09:20:52 wiz Exp $
-
-Revision 1.124
-
-For .Do/.Dq, use the documented and portable \(lq and \(rq
-character escape sequences rather than the undocumented and
-non-portable \(Lq and \(Rq.
-
---- mdoc_man.c.orig 2017-08-05 12:40:22.000000000 +0000
-+++ mdoc_man.c
-@@ -202,8 +202,8 @@ static const struct manact __manacts[MDO
- { NULL, pre_bk, post_bk, NULL, NULL }, /* Bx */
- { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
- { NULL, NULL, NULL, NULL, NULL }, /* Dc */
-- { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
-- { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Dq */
-+ { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
-+ { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
- { NULL, NULL, NULL, NULL, NULL }, /* Ec */
- { NULL, NULL, NULL, NULL, NULL }, /* Ef */
- { NULL, pre_em, post_font, NULL, NULL }, /* Em */
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-mdoc__validate.c
--- a/textproc/mandoc/patches/patch-mdoc__validate.c Tue Aug 14 07:33:58 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-$NetBSD: patch-mdoc__validate.c,v 1.1 2018/04/05 09:20:52 wiz Exp $
-
-Style message about bad input encoding of em-dashes as -- instead of \(em.
-Suggested by Thomas Klausner <wiz at NetBSD>; discussed with jmc@.
-
---- mdoc_validate.c.orig 2017-08-05 12:40:22.000000000 +0000
-+++ mdoc_validate.c
-@@ -2,5 +2,5 @@
- /*
- * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
-- * Copyright (c) 2010-2017 Ingo Schwarze <schwarze%openbsd.org@localhost>
-+ * Copyright (c) 2010-2018 Ingo Schwarze <schwarze%openbsd.org@localhost>
- * Copyright (c) 2010 Joerg Sonnenberger <joerg%netbsd.org@localhost>
- *
-@@ -54,8 +54,9 @@ typedef void (*v_post)(POST_ARGS);
-
- static int build_list(struct roff_man *, int);
--static void check_text(struct roff_man *, int, int, char *);
- static void check_argv(struct roff_man *,
- struct roff_node *, struct mdoc_argv *);
- static void check_args(struct roff_man *, struct roff_node *);
-+static void check_text(struct roff_man *, int, int, char *);
-+static void check_text_em(struct roff_man *, int, int, char *);
- static void check_toptext(struct roff_man *, int, int, const char *);
- static int child_an(const struct roff_node *);
-@@ -289,5 +290,5 @@ void
- mdoc_node_validate(struct roff_man *mdoc)
- {
-- struct roff_node *n;
-+ struct roff_node *n, *np;
- const v_post *p;
-
-@@ -306,11 +307,16 @@ mdoc_node_validate(struct roff_man *mdoc
- switch (n->type) {
- case ROFFT_TEXT:
-+ np = n->parent;
- if (n->sec != SEC_SYNOPSIS ||
-- (n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd))
-+ (np->tok != MDOC_Cd && np->tok != MDOC_Fd))
- check_text(mdoc, n->line, n->pos, n->string);
-- if (n->parent->tok == MDOC_It ||
-- (n->parent->type == ROFFT_BODY &&
-- (n->parent->tok == MDOC_Sh ||
-- n->parent->tok == MDOC_Ss)))
-+ if (np->tok != MDOC_Ql && np->tok != MDOC_Dl &&
-+ (np->tok != MDOC_Bd ||
-+ (mdoc->flags & MDOC_LITERAL) == 0) &&
-+ (np->tok != MDOC_It || np->type != ROFFT_HEAD ||
-+ np->parent->parent->norm->Bl.type != LIST_diag))
-+ check_text_em(mdoc, n->line, n->pos, n->string);
-+ if (np->tok == MDOC_It || (np->type == ROFFT_BODY &&
-+ (np->tok == MDOC_Sh || np->tok == MDOC_Ss)))
- check_toptext(mdoc, n->line, n->pos, n->string);
- break;
-@@ -396,4 +402,55 @@ check_text(struct roff_man *mdoc, int ln
-
- static void
-+check_text_em(struct roff_man *mdoc, int ln, int pos, char *p)
-+{
-+ const struct roff_node *np, *nn;
-+ char *cp;
-+
-+ np = mdoc->last->prev;
-+ nn = mdoc->last->next;
-+
-+ /* Look for em-dashes wrongly encoded as "--". */
-+
-+ for (cp = p; *cp != '\0'; cp++) {
-+ if (*cp != '-' || *++cp != '-')
-+ continue;
-+
-+ /* Skip input sequences of more than two '-'. */
-+
-+ if (cp[1] == '-') {
-+ while (cp[1] == '-')
-+ cp++;
-+ continue;
-+ }
-+
-+ /* Skip "--" directly attached to something else. */
-+
-+ if ((cp - p > 1 && cp[-2] != ' ') ||
-+ (cp[1] != '\0' && cp[1] != ' '))
-+ continue;
-+
-+ /* Require a letter right before or right afterwards. */
-+
-+ if ((cp - p > 2 ?
-+ isalpha((unsigned char)cp[-3]) :
-+ np != NULL &&
-+ np->type == ROFFT_TEXT &&
-+ np->string != '\0' &&
-+ isalpha((unsigned char)np->string[
-+ strlen(np->string) - 1])) ||
-+ (cp[2] != '\0' ?
-+ isalpha((unsigned char)cp[2]) :
-+ nn != NULL &&
-+ nn->type == ROFFT_TEXT &&
-+ nn->string != '\0' &&
-+ isalpha((unsigned char)*nn->string))) {
-+ mandoc_msg(MANDOCERR_DASHDASH, mdoc->parse,
-+ ln, pos + (int)(cp - p) - 1, NULL);
-+ break;
-+ }
-+ }
-+}
-+
-+static void
- check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p)
- {
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-read.c
--- a/textproc/mandoc/patches/patch-read.c Tue Aug 14 07:33:58 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-read.c,v 1.1 2018/04/05 09:20:52 wiz Exp $
-
-Style message about bad input encoding of em-dashes as -- instead of \(em.
-Suggested by Thomas Klausner <wiz at NetBSD>; discussed with jmc@.
-
---- read.c.orig 2017-08-05 12:40:22.000000000 +0000
-+++ read.c
-@@ -106,6 +106,7 @@ static const char * const mandocerrs[MAN
- "no blank before trailing delimiter",
- "fill mode already enabled, skipping",
- "fill mode already disabled, skipping",
-+ "verbatim \"--\", maybe consider using \\(em",
- "function name without markup",
- "whitespace at end of input line",
- "bad comment style",
diff -r 4993bb27f764 -r a13297e4f908 textproc/mandoc/patches/patch-roff.7
--- a/textproc/mandoc/patches/patch-roff.7 Tue Aug 14 07:33:58 2018 +0000
+++ b/textproc/mandoc/patches/patch-roff.7 Tue Aug 14 09:21:52 2018 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-roff.7,v 1.1 2017/08/01 15:06:24 wiz Exp $
+$NetBSD: patch-roff.7,v 1.2 2018/08/14 09:21:53 wiz Exp $
Install roff with 'mandoc-' prefix to avoid conflict with groff.
---- roff.7.orig 2017-07-20 16:39:59.000000000 +0000
+--- roff.7.orig 2018-07-31 15:37:10.000000000 +0000
+++ roff.7
@@ -16,10 +16,10 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
- .Dd $Mdocdate: July 5 2017 $
+ .Dd $Mdocdate: April 10 2018 $
-.Dt ROFF 7
+.Dt MANDOC-ROFF 7
.Os
Home |
Main Index |
Thread Index |
Old Index