-.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
-.TH MT-ARGS 1 "June 25, 2017"
+.\" $OpenBSD: args.in,v 1.3 2018/08/14 01:26:12 schwarze Exp $
+.TH MT-ARGS 1 "August 13, 2018"
.SH NAME
MT-args \- argument handling of the man-ext mailto macro
.SH DESCRIPTION
+argument, text, and tail:
+.MT test@example.com
+text
+.ME tail args
+.PP
argument plus text:
.MT test@example.com
invalid
address
.ME
+next line
.PP
argument but no text:
.MT test@example.com
MT-args - argument handling of the man-ext mailto macro
D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
- argument plus text: invalid address <test@example.com>
+ argument, text, and tail: text <test@example.com>tail args
+
+ argument plus text: invalid address <test@example.com> next line
argument but no text: <test@example.com>
-OpenBSD June 25, 2017 MT-ARGS(1)
+OpenBSD August 13, 2018 MT-ARGS(1)
-mandoc: args.in:22:11: ERROR: skipping excess arguments: MT ... second
-mandoc: args.in:27:11: ERROR: skipping excess arguments: MT ... second
-mandoc: args.in:13:2: WARNING: empty block: MT
-mandoc: args.in:17:2: WARNING: missing resource identifier, using "": MT
-mandoc: args.in:27:2: WARNING: empty block: MT
+mandoc: args.in:28:11: ERROR: skipping excess arguments: MT ... second
+mandoc: args.in:33:11: ERROR: skipping excess arguments: MT ... second
+mandoc: args.in:19:2: WARNING: empty block: MT
+mandoc: args.in:23:2: WARNING: missing resource identifier, using "": MT
+mandoc: args.in:33:2: WARNING: empty block: MT
-.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
-.TH UR-ARGS 1 "October 17, 2013"
+.\" $OpenBSD: args.in,v 1.3 2018/08/14 01:26:12 schwarze Exp $
+.TH UR-ARGS 1 "August 14, 2018"
.SH NAME
UR-basic \- argument handling of the man-ext URI macro
.SH DESCRIPTION
+argument, text, and tail:
+.UR http://www.openbsd.org/
+text
+.UE tail argument
+.PP
argument plus text:
.UR http://www.openbsd.org/
OpenBSD
homepage
.UE
+next line
.PP
argument but no text:
.UR http://www.netbsd.org/
UR-basic - argument handling of the man-ext URI macro
D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
- argument plus text: OpenBSD homepage <http://www.openbsd.org/>
+ argument, text, and tail: text <http://www.openbsd.org/>tail argument
+
+ argument plus text: OpenBSD homepage <http://www.openbsd.org/> next
+ line
argument but no text: <http://www.netbsd.org/>
-OpenBSD October 17, 2013 UR-ARGS(1)
+OpenBSD August 14, 2018 UR-ARGS(1)
-mandoc: args.in:22:11: ERROR: skipping excess arguments: UR ... second
-mandoc: args.in:27:11: ERROR: skipping excess arguments: UR ... second
-mandoc: args.in:13:2: WARNING: empty block: UR
-mandoc: args.in:17:2: WARNING: missing resource identifier, using "": UR
-mandoc: args.in:27:2: WARNING: empty block: UR
+mandoc: args.in:28:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:33:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:19:2: WARNING: empty block: UR
+mandoc: args.in:23:2: WARNING: missing resource identifier, using "": UR
+mandoc: args.in:33:2: WARNING: empty block: UR
-/* $OpenBSD: man_macro.c,v 1.85 2017/06/25 07:23:53 bentley Exp $ */
+/* $OpenBSD: man_macro.c,v 1.86 2018/08/14 01:26:12 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
*
* Permission to use, copy, modify, and distribute this software for any
void
blk_close(MACRO_PROT_ARGS)
{
- enum roff_tok ntok;
+ enum roff_tok ctok, ntok;
const struct roff_node *nn;
char *p;
- int nrew, target;
+ int cline, cpos, nrew, target;
nrew = 1;
switch (tok) {
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse,
line, ppos, roff_name[tok]);
rew_scope(man, MAN_PP);
- } else {
- line = man->last->line;
- ppos = man->last->pos;
- ntok = man->last->tok;
- man_unscope(man, nn);
+ return;
+ }
- if (tok == MAN_RE && nn->head->aux > 0)
- roff_setreg(man->roff, "an-margin",
- nn->head->aux, '-');
+ cline = man->last->line;
+ cpos = man->last->pos;
+ ctok = man->last->tok;
+ man_unscope(man, nn);
- /* Move a trailing paragraph behind the block. */
+ if (tok == MAN_RE && nn->head->aux > 0)
+ roff_setreg(man->roff, "an-margin", nn->head->aux, '-');
- if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) {
- *pos = strlen(buf);
- blk_imp(man, ntok, line, ppos, pos, buf);
- }
+ /* Trailing text. */
+
+ if (buf[*pos] != '\0') {
+ roff_word_alloc(man, line, ppos, buf + *pos);
+ man->last->flags |= NODE_DELIMC;
+ }
+
+ /* Move a trailing paragraph behind the block. */
+
+ if (ctok == MAN_LP || ctok == MAN_PP || ctok == MAN_P) {
+ *pos = strlen(buf);
+ blk_imp(man, ctok, line, ppos, pos, buf);
}
}
-/* $OpenBSD: man_term.c,v 1.164 2018/06/10 15:12:32 schwarze Exp $ */
+/* $OpenBSD: man_term.c,v 1.165 2018/08/14 01:26:12 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
} else if (*n->string == ' ' && n->flags & NODE_LINE &&
(p->flags & TERMP_NONEWLINE) == 0)
term_newln(p);
+ else if (n->flags & NODE_DELIMC)
+ p->flags |= TERMP_NOSPACE;
term_word(p, n->string);
goto out;
-/* $OpenBSD: tree.c,v 1.45 2018/04/11 17:10:35 schwarze Exp $ */
+/* $OpenBSD: tree.c,v 1.46 2018/08/14 01:26:12 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
if (NODE_LINE & n->flags)
putchar('*');
printf("%d:%d", n->line, n->pos + 1);
+ if (NODE_DELIMC & n->flags)
+ putchar(')');
if (NODE_EOS & n->flags)
putchar('.');
putchar('\n');
projects / openbsd / commitdiff