--- /usr/share/groff/current/tmac/s.tmac	2017-06-25 22:19:44.000000000 +0200
+++ s.tmac	2018-08-17 20:02:01.000000000 +0200
@@ -1162,15 +1162,6 @@
 .rj 0
 .ul 0
 .fi
-.ie address@hidden>1 \{\
-.	ll (u;\\n[\\n[.ev]:MCLL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
-.	lt \\n[\\n[.ev]:MCLT]u
-.\}
-.el \{\
-.	ll (u;\\n[\\n[.ev]:LL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
-.	lt \\n[\\n[.ev]:LT]u
-.\}
-.in (u;\\n[\\n[.ev]:li]+\\n[\\n[.ev]:pli])
 .ft 1
 .fam \\*[FAM]
 .ie (\\n[\\n[.ev]:PS] >= 1000) \
@@ -1182,13 +1173,22 @@
 .el \
 .	par*vs \\n[\\n[.ev]:VS]
 .ls 1
+.if !'\\$1'' .nr \\n[.ev]:pli (n;\\$1)
+.if !'\\$2'' .nr \\n[.ev]:pri (n;\\$2)
+.ie address@hidden>1 \{\
+.	ll (u;\\n[\\n[.ev]:MCLL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
+.	lt \\n[\\n[.ev]:MCLT]u
+.\}
+.el \{\
+.	ll (u;\\n[\\n[.ev]:LL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
+.	lt \\n[\\n[.ev]:LT]u
+.\}
+.in (u;\\n[\\n[.ev]:li]+\\n[\\n[.ev]:pli])
 .TA
 .hy \\n[HY]
 ..
 .de @RT
-.nr \\n[.ev]:pli 0
-.nr \\n[.ev]:pri 0
address@hidden
address@hidden 0 0
 ..
 .\" This can be redefined by the user.
 .de TA
@@ -1201,16 +1201,12 @@
 .
 .de par*start
 address@hidden
-.nr \\n[.ev]:pli \\$1
-.nr \\n[.ev]:pri \\$2
address@hidden
address@hidden \\$1 \\$2
 .sp \\n[\\n[.ev]:PD]u
 .ne \\n[PORPHANS]v+\\n(.Vu
 ..
 .de address@hidden
-.nr \\n[.ev]:pli 0
-.nr \\n[.ev]:pri 0
address@hidden
address@hidden 0 0
 ..
 .\" normal LP
 .de @LP
@@ -1224,15 +1220,18 @@
 ..
 .de @QP
 .nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-.par*start \\n[QI] \\n[QI]
+.par*start \\n[QI]u \\n[QI]u
 ..
 .de @XP
-.par*start \\n[\\n[.ev]:PI] 0
+.par*start \\n[\\n[.ev]:PI]u 0
 .ti -\\n[\\n[.ev]:PI]u
 ..
 .de @IP
-.if \\n[.$]>1 .nr \\n[.ev]:ai (n;\\$2)
-.par*start \\n[\\n[.ev]:ai] 0
+.ie \\n[.$]>1 \{\
+.par*start \\$2 0
+.nr \\n[.ev]:ai \\n[\\n[.ev]:pli]
+.\}
+.el .par*start \\n[\\n[.ev]:ai]u 0
 .if !'\\$1'' \{\
 .	\" Divert the label so as to freeze any spaces.
 .	di par*label