From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: correct the spacing after in-line equations that start at the
Date: Mon, 20 Oct 2014 11:50:24 -0400 (EDT) [thread overview]
Message-ID: <201410201550.s9KFoOC3013978@krisdoz.my.domain> (raw)
Log Message:
-----------
correct the spacing after in-line equations
that start at the beginning of an input line
but end before the end of an input line
Modified Files:
--------------
mdocml:
man.c
man_term.c
mdoc.c
mdoc_term.c
Revision Data
-------------
Index: man_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -Lman_term.c -Lman_term.c -u -p -r1.153 -r1.154
--- man_term.c
+++ man_term.c
@@ -990,7 +990,7 @@ print_man_node(DECL_ARGS)
if ( ! (n->flags & MAN_LINE))
p->flags |= TERMP_NOSPACE;
term_eqn(p, n->eqn);
- if ( ! (n->flags & MAN_LINE))
+ if (n->next != NULL && ! (n->next->flags & MAN_LINE))
p->flags |= TERMP_NOSPACE;
return;
case MAN_TBL:
Index: mdoc_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.285 -r1.286
--- mdoc_term.c
+++ mdoc_term.c
@@ -347,7 +347,7 @@ print_mdoc_node(DECL_ARGS)
if ( ! (n->flags & MDOC_LINE))
p->flags |= TERMP_NOSPACE;
term_eqn(p, n->eqn);
- if ( ! (n->flags & MDOC_LINE))
+ if (n->next != NULL && ! (n->next->flags & MDOC_LINE))
p->flags |= TERMP_NOSPACE;
break;
case MDOC_TBL:
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -Lman.c -Lman.c -u -p -r1.140 -r1.141
--- man.c
+++ man.c
@@ -119,7 +119,8 @@ int
man_parseln(struct man *man, int ln, char *buf, int offs)
{
- man->flags |= MAN_NEWLINE;
+ if (man->last->type != MAN_EQN || ln > man->last->line)
+ man->flags |= MAN_NEWLINE;
return (roff_getcontrol(man->roff, buf, &offs) ?
man_pmacro(man, ln, buf, offs) :
Index: mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -Lmdoc.c -Lmdoc.c -u -p -r1.227 -r1.228
--- mdoc.c
+++ mdoc.c
@@ -238,7 +238,8 @@ int
mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
{
- mdoc->flags |= MDOC_NEWLINE;
+ if (mdoc->last->type != MDOC_EQN || ln > mdoc->last->line)
+ mdoc->flags |= MDOC_NEWLINE;
/*
* Let the roff nS register switch SYNOPSIS mode early,
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2014-10-20 15:50 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=201410201550.s9KFoOC3013978@krisdoz.my.domain \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.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).