From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Restore the traditional behaviour of the man(7) single-font
Date: Tue, 16 Aug 2022 18:01:40 -0500 (EST) [thread overview]
Message-ID: <336a3b3a821f723f@mandoc.bsd.lv> (raw)
Log Message:
-----------
Restore the traditional behaviour of the man(7) single-font
macros .B, .I, .SM, and .SB that the next-line scope extends
to the end of the next logical input line and is not extended
if that line ends with a \c (no-space) escape sequence.
While improving a loosely related feature in the man(7) .TP
macro, a regression entered the groff codebase in groff
commit 3549fd9f (28-Apr-2017) caused by the usual sloppiness
of Bjarni Ingi Gislason. Since that time, groff wrongly had \c
extend next-line scope to a second line for these macros.
In man.c rev. 1.127 (25-Aug-2018) i synched mandoc behaviour
with groff in this respect, unfortunately failing to notice
the recent regression in groff. The groff regression was
finally fixed by gbranden@ in commit 09c028f3 (07-Jun-2022).
With the present commit, mandoc is back in sync with both GNU and
Heirloom roff regarding the interaction of single-font macros with \c.
Modified Files:
--------------
mandoc:
man.c
Revision Data
-------------
Index: man.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/man.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -Lman.c -Lman.c -u -p -r1.188 -r1.189
--- man.c
+++ man.c
@@ -76,16 +76,7 @@ man_hasc(char *start)
void
man_descope(struct roff_man *man, int line, int offs, char *start)
{
- /* Trailing \c keeps next-line scope open. */
-
- if (start != NULL && man_hasc(start) != NULL)
- return;
-
- /*
- * Co-ordinate what happens with having a next-line scope open:
- * first close out the element scopes (if applicable),
- * then close out the block scope (also if applicable).
- */
+ /* First close out all next-line element scopes, if any. */
if (man->flags & MAN_ELINE) {
while (man->last->parent->type != ROFFT_ROOT &&
@@ -93,6 +84,14 @@ man_descope(struct roff_man *man, int li
man_unscope(man, man->last->parent);
man->flags &= ~MAN_ELINE;
}
+
+ /* Trailing \c keeps next-line block scope open. */
+
+ if (start != NULL && man_hasc(start) != NULL)
+ return;
+
+ /* Close out the next-line block scope, if there is one. */
+
if ( ! (man->flags & MAN_BLINE))
return;
man_unscope(man, man->last->parent);
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2022-08-16 23:01 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=336a3b3a821f723f@mandoc.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).