Annotation of /trunk/groff/patches/groff-1.19.1-stack.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 3659 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 3659 byte(s)
-import
1 | niro | 144 | --- groff-1.19.1/tmac/s.tmac 2004-04-16 06:34:21.000000000 +0200 |
2 | +++ groff/tmac/s.tmac 2004-08-05 18:38:23.000000000 +0200 | ||
3 | @@ -188,7 +188,10 @@ | ||
4 | .di cov*au-div!\\n[cov*n-au] | ||
5 | .nf | ||
6 | .ft I | ||
7 | -.ps \\n[PS] | ||
8 | +.ie (\\n[PS] >= 1000) \ | ||
9 | +. ps (\\n[PS]z / 1000u) | ||
10 | +.el \ | ||
11 | +. ps \\n[PS] | ||
12 | .. | ||
13 | .de @AI | ||
14 | .if !'\*(.T'html' .par@reset | ||
15 | @@ -201,7 +204,10 @@ | ||
16 | . di cov*ai-div!\\n[cov*n-au] | ||
17 | . nf | ||
18 | . ft R | ||
19 | -. ps \\n[PS] | ||
20 | +. ie (\\n[PS] >= 1000) \ | ||
21 | +. ps (\\n[PS]z / 1000u) | ||
22 | +. el \ | ||
23 | +. ps \\n[PS] | ||
24 | .\} | ||
25 | .. | ||
26 | .de LP | ||
27 | @@ -499,7 +505,6 @@ | ||
28 | .nr PN \\n% | ||
29 | .nr pg*col-num 0 | ||
30 | .nr pg@fn-bottom-margin 0 | ||
31 | -.nr pg*saved-po \\n[PO] | ||
32 | .po \\n[PO]u | ||
33 | .ev h | ||
34 | .par@reset | ||
35 | @@ -536,12 +541,12 @@ | ||
36 | .. | ||
37 | .de pg*end-col | ||
38 | 'sp |\\n[pg*col-top]u | ||
39 | -.po (u;\\n[pg*saved-po]+(\\n[pg@colw]+\\n[pg*gutw]*\\n[pg*col-num])) | ||
40 | +.po (u;\\n[PO]+(\\n[pg@colw]+\\n[pg*gutw]*\\n[pg*col-num])) | ||
41 | .\"po +(u;\\n[pg@colw]+\\n[pg*gutw]) | ||
42 | .pg*start-col | ||
43 | .. | ||
44 | .de pg*end-page | ||
45 | -.po \\n[pg*saved-po]u | ||
46 | +.po \\n[PO]u | ||
47 | .\" Make sure we don't exit if there are still floats or footnotes left-over. | ||
48 | .ie \\n[kp@head]<\\n[kp@tail]:\\n[fn@have-overflow] \{\ | ||
49 | . \" Switching environments ensures that we don't get an unnecessary | ||
50 | @@ -873,7 +878,6 @@ | ||
51 | .ds*end!\\n[\\n[.ev]:ds-type] | ||
52 | .nr \\n[.ev]:ds-type 0 | ||
53 | .. | ||
54 | -.als De DE | ||
55 | .de ds@auto-end | ||
56 | .if \\n[\\n[.ev]:ds-type] \{\ | ||
57 | . @error automatically terminating display | ||
58 | @@ -951,7 +955,6 @@ | ||
59 | . nr \\n[.ev]:ds-type 3 | ||
60 | .\} | ||
61 | .. | ||
62 | -.als Ds DS | ||
63 | .de ds@need | ||
64 | .if '\\n(.z'' \{\ | ||
65 | . while \\n[.t]<=(\\$1)&(\\n[nl]>\\n[pg@header-bottom]) \{\ | ||
66 | @@ -999,10 +1002,23 @@ | ||
67 | .\" don't set LT so that it can be defaulted from LL | ||
68 | .ie rLT .lt \\n[LT]u | ||
69 | .el .lt \\n[LL]u | ||
70 | -.ps \\n[PS] | ||
71 | +.ie (\\n[PS] >= 1000) \ | ||
72 | +. ps (\\n[PS]z / 1000u) | ||
73 | +.el \ | ||
74 | +. ps \\n[PS] | ||
75 | .\" don't set VS so that it can be defaulted from PS | ||
76 | -.ie rVS .par*vs \\n[VS] | ||
77 | -.el .par*vs \\n[PS]+2 | ||
78 | +.ie rVS \{\ | ||
79 | +. ie (\\n[VS] >= 1000) \ | ||
80 | +. par*vs "(\\n[VS]p / 1000u)" | ||
81 | +. el \ | ||
82 | +. par*vs \\n[VS] | ||
83 | +.\} | ||
84 | +.el \{\ | ||
85 | +. ie (\\n[PS] >= 1000) \ | ||
86 | +. par*vs "((\\n[PS]p / 1000u) + 2p)" | ||
87 | +. el \ | ||
88 | +. par*vs "(\\n[PS] + 2)" | ||
89 | +.\} | ||
90 | .if dFAM .fam \\*[FAM] | ||
91 | .if !rHY .nr HY 14 | ||
92 | .hy \\n[HY] | ||
93 | @@ -1034,16 +1050,37 @@ | ||
94 | .de par@init | ||
95 | .if !rLT .nr LT \\n[LL] | ||
96 | .if !rFL .nr FL \\n[LL]*5/6 | ||
97 | -.if !rVS .nr VS \\n[PS]+2 | ||
98 | +.if !rVS \{\ | ||
99 | +. ie (\\n[PS] >= 1000) \ | ||
100 | +. nr VS (\\n[PS] + 2000) | ||
101 | +. el \ | ||
102 | +. nr VS (\\n[PS] + 2) | ||
103 | +.\} | ||
104 | .if !rDI .nr DI .5i | ||
105 | -.if !rFPS .nr FPS \\n[PS]-2 | ||
106 | -.if !rFVS .nr FVS \\n[FPS]+2 | ||
107 | +.if !rFPS \{\ | ||
108 | +. ie (\\n[PS] >= 1000) \ | ||
109 | +. nr FPS (\\n[PS] - 2000) | ||
110 | +. el \ | ||
111 | +. nr FPS (\\n[PS] - 2) | ||
112 | +.\} | ||
113 | +.if !rFVS \{\ | ||
114 | +. ie (\\n[FPS] >= 1000) \ | ||
115 | +. nr FVS (\\n[FPS] + 2000) | ||
116 | +. el \ | ||
117 | +. nr FVS (\\n[FPS] + 2) | ||
118 | +.\} | ||
119 | .\" don't change environment 0 | ||
120 | .ev h | ||
121 | -.ps \\n[PS] | ||
122 | +.ie (\\n[PS] >= 1000) \ | ||
123 | +. ps (\\n[PS]z / 1000u) | ||
124 | +.el \ | ||
125 | +. ps \\n[PS] | ||
126 | .if !rQI .nr QI 5n | ||
127 | .if !rPI .nr PI 5n | ||
128 | -.par*vs \\n[VS] | ||
129 | +.ie (\\n[VS] >= 1000) \ | ||
130 | +. par*vs "(\\n[VS]p / 1000u)" | ||
131 | +.el \ | ||
132 | +. par*vs \\n[VS] | ||
133 | .if !rPD .nr PD .3v>?\n(.V | ||
134 | .if !rDD .nr DD .5v>?\n(.V | ||
135 | .if !rFI .nr FI 2n | ||
136 | @@ -1101,8 +1138,14 @@ | ||
137 | .in (u;\\n[\\n[.ev]:li]+\\n[\\n[.ev]:pli]) | ||
138 | .ft 1 | ||
139 | .fam \\*[FAM] | ||
140 | -.ps \\n[\\n[.ev]:PS] | ||
141 | -.par*vs \\n[\\n[.ev]:VS] | ||
142 | +.ie (\\n[\\n[.ev]:PS] >= 1000) \ | ||
143 | +. ps (\\n[\\n[.ev]:PS]z / 1000u) | ||
144 | +.el \ | ||
145 | +. ps \\n[\\n[.ev]:PS] | ||
146 | +.ie (\\n[\\n[.ev]:VS] >= 1000) \ | ||
147 | +. par*vs "(\\n[\\n[.ev]:VS]p / 1000u)" | ||
148 | +.el \ | ||
149 | +. par*vs \\n[\\n[.ev]:VS] | ||
150 | .ls 1 | ||
151 | .TA | ||
152 | .hy \\n[HY] | ||
153 | @@ -1357,7 +1400,10 @@ | ||
154 | .. | ||
155 | .\" In paragraph macros. | ||
156 | .de NL | ||
157 | -.ps \\n[\\n[.ev]:PS] | ||
158 | +.ie (\\n[\\n[.ev]:PS] >= 1000) \ | ||
159 | +. ps (\\n[\\n[.ev]:PS]z / 1000u) | ||
160 | +.el \ | ||
161 | +. ps \\n[\\n[.ev]:PS] | ||
162 | .. | ||
163 | .de SM | ||
164 | .ps -2 | ||
165 | @@ -1545,7 +1591,10 @@ | ||
166 | .1C | ||
167 | .if !'\\$1'no' \{\ | ||
168 | . ce 1 | ||
169 | -. ps \\n[PS]+2 | ||
170 | +. ie (\\n[PS] >= 1000) \ | ||
171 | +. ps ((\\n[PS]z / 1000u) + 2z) | ||
172 | +. el \ | ||
173 | +. ps \\n[PS]+2 | ||
174 | . ft B | ||
175 | \\*[TOC] | ||
176 | . ft |