From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Two consecutive .SY blocks only get a blank line in between if
Date: Sat, 18 Aug 2018 09:03:26 -0500 (EST) [thread overview]
Message-ID: <c89f1057aaafd898@fantadrom.bsd.lv> (raw)
Log Message:
-----------
Two consecutive .SY blocks only get a blank line in between
if the first one is explicitly closed with .YS.
Modified Files:
--------------
mandoc:
man_macro.c
man_term.c
Revision Data
-------------
Index: man_term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/man_term.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -Lman_term.c -Lman_term.c -u -p -r1.216 -r1.217
--- man_term.c
+++ man_term.c
@@ -861,7 +861,8 @@ pre_SY(DECL_ARGS)
switch (n->type) {
case ROFFT_BLOCK:
- print_bvspace(p, n, mt->pardist);
+ if (n->prev == NULL || n->prev->tok != MAN_SY)
+ print_bvspace(p, n, mt->pardist);
return 1;
case ROFFT_HEAD:
case ROFFT_BODY:
Index: man_macro.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/man_macro.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -Lman_macro.c -Lman_macro.c -u -p -r1.128 -r1.129
--- man_macro.c
+++ man_macro.c
@@ -71,7 +71,7 @@ static const struct man_macro man_macros
{ in_line_eoln, MAN_NSCOPED }, /* PD */
{ in_line_eoln, 0 }, /* AT */
{ in_line_eoln, MAN_NSCOPED }, /* in */
- { blk_exp, MAN_BSCOPE }, /* SY */
+ { blk_imp, MAN_BSCOPE }, /* SY */
{ blk_close, MAN_BSCOPE }, /* YS */
{ in_line_eoln, 0 }, /* OP */
{ in_line_eoln, MAN_BSCOPE }, /* EX */
@@ -269,6 +269,13 @@ blk_close(MACRO_PROT_ARGS)
if (ctok == MAN_LP || ctok == MAN_PP || ctok == MAN_P) {
*pos = strlen(buf);
blk_imp(man, ctok, cline, cpos, pos, buf);
+ }
+
+ /* Synopsis blocks need an explicit end marker for spacing. */
+
+ if (tok == MAN_YS && man->last == nn) {
+ roff_elem_alloc(man, line, ppos, tok);
+ man_unscope(man, man->last);
}
}
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2018-08-18 14:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c89f1057aaafd898@fantadrom.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).