*** s.tmac	2004-01-04 14:14:28.000000000 +0100
--- snew.tmac	2004-01-06 23:41:28.000000000 +0100
***************
*** 647,652 ****
--- 647,653 ----
  .el \{\
  .	nr fn*open 0
  .	br
+ .	nr par*box-fnspace +\\n[.d]
  .	ev
  .	fn*end-div
  .\}
***************
*** 1249,1259 ****
  address@hidden
  ..
  .als @QE @RE
! .\" start boxed text
  .de B1
  .br
  .HTML-IMAGE
! .di par*box-div
  .nr \\n[.ev]:li +1n
  .nr \\n[.ev]:ri +1n
  .nr par*box-in \\n[.in]
--- 1250,1275 ----
  address@hidden
  ..
  .als @QE @RE
! .\" --------------------------------------------------------------------
! .\" B1 [fill_color [frame_color [frame_thickness]]]
! .\"     start boxed text
! .\"
  .de B1
+ .ie \\n[.$]>0 \{\
+ . nr par*box-compat 0
+ . ds par*box-color \\$1
+ . ds par*box-fcolor \\*[par*box-color]
+ . nr par*box-fthickness 0
+ .
+ . if \\n[.$]>1 .ds par*box-fcolor \\$2
+ . if \\n[.$]>2 .nr par*box-fthickness \\$3
+ .\}
+ .el .nr par*box-compat 1
+ .
+ .nr par*box-fnspace 0
  .br
  .HTML-IMAGE
! .di par*box-div			\" beginn diverting text to par*box-div
  .nr \\n[.ev]:li +1n
  .nr \\n[.ev]:ri +1n
  .nr par*box-in \\n[.in]
***************
*** 1274,1292 ****
  .ie '\\n(.z'par*box-div' \{\
  .	br
  .	if \n[.V]>.25m .sp
! .	di
  .	if \n[.V]>.25m .sp
  .	address@hidden \\n[dn]
  .	par*box-mark-top
! .	ev nf
! .	par*box-div
! .	ev
  .	nr \\n[.ev]:ri -\\n[par*box-n]
  .	nr \\n[.ev]:li -\\n[par*box-n]
  .	in -\\n[par*box-n]u
  .	ll +\\n[par*box-n]u
  .	lt +\\n[par*box-n]u
  .	par*box-draw \\n[.i]u \\n[.l]u-(\\n[.H]u==1n*1n)
  .\}
  .el address@hidden B2 without B1
  .HTML-IMAGE-END
--- 1290,1310 ----
  .ie '\\n(.z'par*box-div' \{\
  .	br
  .	if \n[.V]>.25m .sp
! .	di			\" end diverting text
  .	if \n[.V]>.25m .sp
  .	address@hidden \\n[dn]
  .	par*box-mark-top
! .
  .	nr \\n[.ev]:ri -\\n[par*box-n]
  .	nr \\n[.ev]:li -\\n[par*box-n]
  .	in -\\n[par*box-n]u
  .	ll +\\n[par*box-n]u
  .	lt +\\n[par*box-n]u
+ .\"     box color isn't transparent, it must be drawn before writing the text
  .	par*box-draw \\n[.i]u \\n[.l]u-(\\n[.H]u==1n*1n)
+ .	ev nf
+ .	par*box-div
+ .	ev
  .\}
  .el address@hidden B2 without B1
  .HTML-IMAGE-END
***************
*** 1304,1318 ****
  .	nr par*box-ll \\n[.l]
  .	nr par*box-vpt \\n[.vpt]
  .	nr par*box-ad \\n[.j]
! .	ad l
! .	vpt 0
  .	in \\$1
  .	ll \\$2
  \v'-1v+.25m'\
  \D'l (u;\\n[.l]-\\n[.i]) 0'\
  \D'l 0 |\\n[par*box-top]u'\
  \D'l -(u;\\n[.l]-\\n[.i]) 0'\
  \D'l 0 -|\\n[par*box-top]u'
  .	br
  .	sp -1
  .	in \\n[par*box-in]u
--- 1322,1358 ----
  .	nr par*box-ll \\n[.l]
  .	nr par*box-vpt \\n[.vpt]
  .	nr par*box-ad \\n[.j]
! .	ad l            \" adjust to left
! .	vpt 0           \" disable vertical position trap
  .	in \\$1
  .	ll \\$2
+ .\" we are at the top left corner
+ .\" calculate the opposite
+ .nr par*box-top \\n[par*box-top]u+\\n[dn]-\\n[par*box-fnspace]
+ .if \\n[par*box-fnspace]>0 .nr par*box-top -\\n[fn*need]u
+ .ie \\n[par*box-compat] \{\
  \v'-1v+.25m'\
  \D'l (u;\\n[.l]-\\n[.i]) 0'\
  \D'l 0 |\\n[par*box-top]u'\
  \D'l -(u;\\n[.l]-\\n[.i]) 0'\
  \D'l 0 -|\\n[par*box-top]u'
+ .\}
+ .el \{\
+ .
+ .\" first draw a solid polygon(\D'P...'), after that the borders (\D'p...') 
+ \v'-1v+.25m'\M[\\*[par*box-color]]\D'P\
+     (u;\\n[.l]-\\n[.i]) 0 \
+     0 |\\n[par*box-top]u \
+     -(u;\\n[.l]-\\n[.i]) 0 \
+     0 -|\\n[par*box-top]u'\M[]\
+ \m[\\*[par*box-fcolor]]\
+ \D't \\n[par*box-fthickness]'\h'-\\n[par*box-fthickness]u'\D'p\
+     (u;\\n[.l]-\\n[.i]) 0 \
+     0 |\\n[par*box-top]u \
+     -(u;\\n[.l]-\\n[.i]) 0 \
+     0 -|\\n[par*box-top]u'\m[]\D't 0'
+ .\}
+ .
  .	br
  .	sp -1
  .	in \\n[par*box-in]u
***************
*** 1322,1327 ****
--- 1362,1368 ----
  .\}
  .el \!.par*box-draw \\$1 \\$2
  ..
+ .\" ------------------- /box ----------------------------------------------
  .de SH-NO-TAG
  address@hidden
  .\" Keep together the heading and the first two lines of the next paragraph.