--- a/style	Tue Jul 10 13:08:51 2012 +0200
+++ b/style	Tue Jul 10 15:58:46 2012 +0200
@@ -36,9 +36,9 @@
 
 .ss 12 0  \" the second (non-portable) argument requests french spacing
 
-.nr PI 3n
+.nr PI 4n
 .nr PD .3v
-.nr QI 6n
+.nr QI 2u*\n(PIu
 .nr lu 0
 .af PN i
 
@@ -87,9 +87,8 @@
 .ds .] ]
 .rm ]<
 .de ]<
-.	LP
 .	de FP
-.	IP \\\\$1.
+.	IP \\\\$1
 \\..
 .	rm FS FE
 ..
@@ -265,14 +264,25 @@
 .nr PP 1
 ..
 
-.	\" IP - Paragraph with hanging label
-.am IP
-.nr PP 0
+.am LP
+.nr PP 1
+..
+
+
+.	\" LI - Numbered paragraph ``list item'' ($1=label)
+.de LI
+.ie \\n(.$ .IP "\\h'\\n(PIu'\\$1." 2u*\\n(PIu
+.el .IP "\\h'\\n(PIu'\\(bu" 2u*\\n(PIu
+.nr PP 1
+..
+.ig \" backup
+.ie \\n(.$ .IP "\h'1n'\\$1"
+.el .IP "\h'1.5n'\\(bu"
 ..
 
 .	\" BU - Bulleted paragraph
 .de BU
-.IP \(bu
+.LI
 ..
 
 .	\" QS - Block quote start
@@ -340,8 +350,7 @@
 .br
 .di
 .ne \\n(dnu+1v \" ensure enough space on the page
-.if t .in +.5i
-.if n .in +8n
+.in 2u*\\n(PIu
 .ta T 8n
 \.ec  \" set up verbatim environment, once again
 \.c2 ""
@@ -352,8 +361,7 @@
 .c2
 .ec
 .blm __
-.if t .in -.5i
-.if n .in -8n
+.in \\n(PIu
 .sp \n(DDu
 .ft P
 .fi