aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/712322_fix_doc_build.patch
blob: 5abe34d3cce34422d4a98a60053ec1dd3e7c5f3b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
Description: Fix texinfo files for texinfo 5
 This is a backport of a number of fixes from upstream to make sure that the
 texinfo files are compatible with textinfo 5. It also fixes the code that
 generates some of these files.
Bug-Debian: http://bugs.debian.org/712322
Forwarded: not-needed

--- a/phil-spc.scm
+++ b/phil-spc.scm
@@ -136,8 +136,9 @@
 ;;@defun integer->gray-code k
 ;;Converts @var{k} to a Gray code of the same @code{integer-length} as
 ;;@var{k}.
+;;@end defun
 ;;
-;;@defunx gray-code->integer k
+;;@defun gray-code->integer k
 ;;Converts the Gray code @var{k} to an integer of the same
 ;;@code{integer-length} as @var{k}.
 ;;
--- a/schmooz.texi
+++ b/schmooz.texi
@@ -17,8 +17,9 @@
 top-level comments containing schmooz commands from @var{filename}.scm
 and writes the converted Texinfo source to a file named
 @var{filename}.txi.
+@end deffn
 
-@deffnx Procedure schmooz filename@r{.texi} @dots{}
+@deffn Procedure schmooz filename@r{.texi} @dots{}
 @deffnx Procedure schmooz filename@r{.tex} @dots{}
 @deffnx Procedure schmooz filename@r{.txi} @dots{}
 @var{Filename} should be a string naming an existing file containing
--- a/slib.texi
+++ b/slib.texi
@@ -816,11 +816,13 @@
 Displays the information of @code{(slib:report-version)} followed by
 almost all the information neccessary for submitting a problem report.
 An unspecified value is returned.
+@end defun
 
-@defunx slib:report #t
+@defun slib:report #t
 provides a more verbose listing.
+@end defun
 
-@defunx slib:report filename
+@defun slib:report filename
 Writes the report to file @file{filename}.
 
 @example
@@ -944,8 +946,9 @@
 current position of the character in @var{port} which will next be
 read or written.  If the implementation does not support
 file-position, then @code{#f} is returned.
+@end defun
 
-@defunx file-position port k
+@defun file-position port k
 @var{port} must be open to a file.  @code{file-position} sets the
 current position in @var{port} which will next be read or written.  If
 successful, @code{#f} is returned; otherwise @code{file-position}
@@ -3390,7 +3393,7 @@
 A character that specifies the conversion to be applied.
 @end itemize
 
-@subsubsection Exact Conversions
+Exact Conversions
 
 @table @asis
 @item @samp{b}, @samp{B}
@@ -3416,7 +3419,7 @@
 digits @samp{0123456789ABCDEF}.
 @end table
 
-@subsubsection Inexact Conversions
+Inexact Conversions
 
 @table @asis
 @item @samp{f}
@@ -3441,7 +3444,8 @@
 
 @end table
 
-@subsubsection Other Conversions
+Other Conversions
+
 @table @asis
 @item @samp{c}
 Print a single character.  The @samp{-} flag is the only one which can
@@ -4582,11 +4586,13 @@
 
 @defun tzset
 Returns the default time-zone.
+@end defun
 
-@defunx tzset tz
+@defun tzset tz
 Sets (and returns) the default time-zone to @var{tz}.
+@end defun
 
-@defunx tzset TZ-string
+@defun tzset TZ-string
 Sets (and returns) the default time-zone to that specified by
 @var{TZ-string}.
 
@@ -4660,11 +4666,13 @@
 
 @defun gmtime caltime
 Converts the calendar time @var{caltime} to UTC and returns it.
+@end defun
 
-@defunx localtime caltime tz
+@defun localtime caltime tz
 Returns @var{caltime} converted to UTC relative to timezone @var{tz}.
+@end defun
 
-@defunx localtime caltime
+@defun localtime caltime
 converts the calendar time @var{caltime} to a vector of integers
 expressed relative to the user's time zone.  @code{localtime} sets the
 variable @var{*timezone*} with the difference between Coordinated
@@ -4676,12 +4684,14 @@
 @defun gmktime univtime
 Converts a vector of integers in GMT Coordinated Universal Time (UTC)
 format to a calendar time.
+@end defun
 
-@defunx mktime univtime
+@defun mktime univtime
 Converts a vector of integers in local Coordinated Universal Time (UTC)
 format to a calendar time.
+@end defun
 
-@defunx mktime univtime tz
+@defun mktime univtime tz
 Converts a vector of integers in Coordinated Universal Time (UTC) format
 (relative to time-zone @var{tz})
 to calendar time.
@@ -5085,8 +5095,9 @@
 @code{integer->list} returns a list of @var{len} booleans corresponding
 to each bit of the given integer.  #t is coded for each 1; #f for 0.
 The @var{len} argument defaults to @code{(integer-length @var{k})}.
+@end defun
 
-@defunx list->integer list
+@defun list->integer list
 @code{list->integer} returns an integer formed from the booleans in the
 list @var{list}, which must be a list of booleans.  A 1 bit is coded for
 each #t; a 0 bit for #f.
@@ -5508,8 +5519,9 @@
 (cksum (in-vicinity (library-vicinity) "ratize.scm"))
 @result{} 157103930
 @end example
+@end defun
 
-@defunx cksum port
+@defun cksum port
 Computes the checksum of the bytes read from @var{port} until the
 end-of-file.
 
@@ -5528,8 +5540,9 @@
 @defun crc16 file
 
 Computes the USB data-packet (16-bit) CRC of @var{file}.
+@end defun
 
-@defunx crc16 port
+@defun crc16 port
 Computes the USB data-packet (16-bit) CRC of the bytes read from
 @var{port} until the end-of-file.
 
@@ -5541,8 +5554,9 @@
 @defun crc5 file
 
 Computes the USB token (5-bit) CRC of @var{file}.
+@end defun
 
-@defunx crc5 port
+@defun crc5 port
 Computes the USB token (5-bit) CRC of the bytes read from
 @var{port} until the end-of-file.
 
@@ -5736,8 +5750,9 @@
 
 @defun color? obj
 Returns #t if @var{obj} is a color.
+@end defun
 
-@defunx color? obj typ
+@defun color? obj typ
 Returns #t if @var{obj} is a color of color-space @var{typ}.  The symbol
 @var{typ} must be one of:
 
@@ -5950,14 +5965,16 @@
 Loads the Spectral Tristimulus Values
 @cite{CIE 1964 Supplementary Standard Colorimetric Observer},
 defining @var{cie:x-bar}, @var{cie:y-bar}, and @var{cie:z-bar}.
+@end deftp
 
-@deftpx {Feature} cie1931
+@deftp {Feature} cie1931
 @ftindex cie1931
 Loads the Spectral Tristimulus Values
 @cite{CIE 1931 Supplementary Standard Colorimetric Observer},
 defining @var{cie:x-bar}, @var{cie:y-bar}, and @var{cie:z-bar}.
+@end deftp
 
-@deftpx {Feature} ciexyz
+@deftp {Feature} ciexyz
 @ftindex ciexyz
 Requires Spectral Tristimulus Values, defaulting to cie1931,
 defining @var{cie:x-bar}, @var{cie:y-bar}, and @var{cie:z-bar}.
@@ -6026,8 +6043,9 @@
 computes the CIEXYZ(1931) values for the spectrum returned by @var{proc}
 when called with arguments from 380e-9 to 780e-9, the wavelength in
 meters.
+@end defun
 
-@defunx spectrum->XYZ spectrum x1 x2
+@defun spectrum->XYZ spectrum x1 x2
 @var{x1} and @var{x2} must be positive real numbers specifying the
 wavelengths (in meters) corresponding to the zeroth and last elements of
 vector or list @var{spectrum}.  @code{spectrum->XYZ} returns the
@@ -6149,8 +6167,9 @@
 scales each chromaticity so it sums to 1 or less; and divides the
 @var{Y} values by the maximum @var{Y} in the dataset, so all lie between
 0 and 1.
+@end defun
 
-@defunx xyY:normalize-colors colors n
+@defun xyY:normalize-colors colors n
 If @var{n} is positive real, then @code{xyY:normalize-colors} divides
 the @var{Y} values by @var{n} times the maximum @var{Y} in the dataset.
 
@@ -6195,8 +6214,9 @@
 
 @defun L*a*b*:DE* lab1 lab2
 Returns the Euclidean distance between @var{lab1} and @var{lab2}.
+@end defun
 
-@defunx CIE:DE* color1 color2 white-point
+@defun CIE:DE* color1 color2 white-point
 @defunx CIE:DE* color1 color2
 Returns the Euclidean distance in L*a*b* space between @var{color1} and
 @var{color2}.
@@ -6708,8 +6728,9 @@
 @var{sub-op2}, respectively.  The argument @var{reduction} is a
 procedure accepting 2 arguments which will be lists whose @code{car}s
 are @var{sub-op1} and @var{sub-op2}.
+@end defun
 
-@defunx cring:define-rule op sub-op1 'identity reduction
+@defun cring:define-rule op sub-op1 'identity reduction
 Defines a rule for the case when the operation represented by symbol
 @var{op} is applied to a list whose @code{car} is @var{sub-op1}, and
 some other argument.  @var{Reduction} will be called with the list whose
@@ -7195,8 +7216,9 @@
 returns the key-list identifying the lowest record higher than
 @var{key1} @var{key2} @dots{} which is stored in the relational-table;
 or false if no higher record is present.
+@end defop
 
-@defopx {Operation} {relational-table} isam-next column-name
+@defop {Operation} {relational-table} isam-next column-name
 The symbol @var{column-name} names a key field.  In the list returned
 by @code{isam-next}, that field, or a field to its left, will be
 changed.  This allows one to skip over less significant key fields.
@@ -7207,8 +7229,9 @@
 returns the key-list identifying the highest record less than
 @var{key1} @var{key2} @dots{} which is stored in the relational-table;
 or false if no lower record is present.
+@end defop
 
-@defopx {Operation} {relational-table} isam-prev column-name
+@defop {Operation} {relational-table} isam-prev column-name
 The symbol @var{column-name} names a key field.  In the list returned
 by @code{isam-next}, that field, or a field to its left, will be
 changed.  This allows one to skip over less significant key fields.
@@ -7248,8 +7271,9 @@
 names, or type names respectively for this table.  These 4 methods are
 different from the others in that the list is returned, rather than a
 procedure to obtain the list.
+@end defop
 
-@defopx {Operation} {relational-table} primary-limit
+@defop {Operation} {relational-table} primary-limit
 Returns the number of primary keys fields in the relations in this
 table.
 @end defop
@@ -7382,16 +7406,19 @@
 supplied, @code{open-command-database} will attempt to deduce the correct
 base-table-type.  If the database can not be opened or if it lacks the
 @code{*commands*} table, @code{#f} is returned.
+@end defun
 
-@defunx open-command-database! filename
+@defun open-command-database! filename
 @defunx open-command-database! filename base-table-type
 Returns @emph{mutable} open enhanced relational database @dots{}
+@end defun
 
-@defunx open-command-database database
+@defun open-command-database database
 Returns @var{database} if it is an immutable relational database; #f
 otherwise.
+@end defun
 
-@defunx open-command-database! database
+@defun open-command-database! database
 Returns @var{database} if it is a mutable relational database; #f
 otherwise.
 @end defun
@@ -7912,32 +7939,31 @@
 
 Prints the names of all the tables in @var{database} and sets browse's
 default to @var{database}.
-
-@deffnx {Procedure} browse
+@end deffn
+@deffn {Procedure} browse
 
 Prints the names of all the tables in the default database.
-
-@deffnx {Procedure} browse table-name
+@end deffn
+@deffn {Procedure} browse table-name
 
 For each record of the table named by the symbol @var{table-name},
 prints a line composed of all the field values.
-
-@deffnx {Procedure} browse pathname
+@end deffn
+@deffn {Procedure} browse pathname
 
 Opens the database named by the string @var{pathname}, prints the names
 of all its tables, and sets browse's default to the database.
-
-@deffnx {Procedure} browse database table-name
+@end deffn
+@deffn {Procedure} browse database table-name
 
 Sets browse's default to @var{database} and prints the records of the
 table named by the symbol @var{table-name}.
-
-@deffnx {Procedure} browse pathname table-name
+@end deffn
+@deffn {Procedure} browse pathname table-name
 
 Opens the database named by the string @var{pathname} and sets browse's
 default to it; @code{browse} prints the records of the table named by
 the symbol @var{table-name}.
-
 @end deffn
 
 
@@ -8560,8 +8586,9 @@
 describing the columns of a new base table in this database, otherwise
 returns @code{#f}.  For the fields and layout of descriptor tables,
 @xref{Catalog Representation}.
+@end defop
 
-@defopx {Operation} {relational-database} create-table table-name table-desc-name
+@defop {Operation} {relational-database} create-table table-name table-desc-name
 Returns a methods procedure for a new (open) relational table with
 columns as described by @var{table-desc-name}, otherwise returns
 @code{#f}.
@@ -9829,14 +9856,16 @@
 @defun list-of?? predicate
 Returns a predicate which returns true if its argument is a list every
 element of which satisfies @var{predicate}.
+@end defun
 
-@defunx list-of?? predicate low-bound high-bound
+@defun list-of?? predicate low-bound high-bound
 @var{low-bound} and @var{high-bound} are non-negative integers.
 @code{list-of??} returns a predicate which returns true if its argument
 is a list of length between @var{low-bound} and @var{high-bound}
 (inclusive); every element of which satisfies @var{predicate}.
+@end defun
 
-@defunx list-of?? predicate bound
+@defun list-of?? predicate bound
 @var{bound} is an integer.  If @var{bound} is negative, @code{list-of??}
 returns a predicate which returns true if its argument is a list of
 length greater than @code{(- @var{bound})}; every element of which
@@ -10613,16 +10642,19 @@
 @deffn {Procedure} find-string-from-port? str in-port max-no-chars
 Looks for a string @var{str} within the first @var{max-no-chars} chars
 of the input port @var{in-port}.
+@end deffn
 
-@deffnx {Procedure} find-string-from-port? str in-port
+@deffn {Procedure} find-string-from-port? str in-port
 When called with two arguments, the search span is limited by the end of
 the input stream.
+@end deffn
 
-@deffnx {Procedure} find-string-from-port? str in-port char
+@deffn {Procedure} find-string-from-port? str in-port char
 Searches up to the first occurrence of character @var{char} in
 @var{str}.
+@end deffn
 
-@deffnx {Procedure} find-string-from-port? str in-port proc
+@deffn {Procedure} find-string-from-port? str in-port proc
 Searches up to the first occurrence of the procedure @var{proc}
 returning non-false when called with a character (from @var{in-port})
 argument.
@@ -11562,12 +11594,14 @@
 @deffn {Procedure} trace-all file @dots{}
 Traces (@pxref{Trace}) all procedures @code{define}d at top-level in
 @file{file} @dots{}.
+@end deffn
 
-@deffnx {Procedure} track-all file @dots{}
+@deffn {Procedure} track-all file @dots{}
 Tracks (@pxref{Trace}) all procedures @code{define}d at top-level in
 @file{file} @dots{}.
+@end deffn
 
-@deffnx {Procedure} stack-all file @dots{}
+@deffn {Procedure} stack-all file @dots{}
 Stacks (@pxref{Trace}) all procedures @code{define}d at top-level in
 @file{file} @dots{}.
 @end deffn
@@ -11603,8 +11637,9 @@
 @defun continue
 Pops the topmost continuation off of the continuation stack and returns
 an unspecified value to it.
+@end defun
 
-@defunx continue arg1 @dots{}
+@defun continue arg1 @dots{}
 Pops the topmost continuation off of the continuation stack and returns
 @var{arg1} @dots{} to it.
 @end defun
@@ -11612,7 +11647,9 @@
 @defmac break proc1 @dots{}
 Redefines the top-level named procedures given as arguments so that
 @code{breakpoint} is called before calling @var{proc1} @dots{}.
-@defmacx break
+@end defmac
+
+@defmac break
 With no arguments, makes sure that all the currently broken identifiers
 are broken (even if those identifiers have been redefined) and returns a
 list of the broken identifiers.
@@ -11620,7 +11657,9 @@
 
 @defmac unbreak proc1 @dots{}
 Turns breakpoints off for its arguments.
-@defmacx unbreak
+@end defmac
+
+@defmac unbreak
 With no arguments, unbreaks all currently broken identifiers and returns
 a list of these formerly broken identifiers.
 @end defmac
@@ -11695,7 +11734,9 @@
 
 @defmac trace proc1 @dots{}
 Traces the top-level named procedures given as arguments.
-@defmacx trace
+@end defmac
+
+@defmac trace
 With no arguments, makes sure that all the currently traced identifiers
 are traced (even if those identifiers have been redefined) and returns a
 list of the traced identifiers.
@@ -11703,7 +11744,8 @@
 
 @defmac track proc1 @dots{}
 Traces the top-level named procedures given as arguments.
-@defmacx track
+@end defmac
+@defmac track
 With no arguments, makes sure that all the currently tracked identifiers
 are tracked (even if those identifiers have been redefined) and returns
 a list of the tracked identifiers.
@@ -11711,7 +11753,8 @@
 
 @defmac stack proc1 @dots{}
 Traces the top-level named procedures given as arguments.
-@defmacx stack
+@end defmac
+@defmac stack
 With no arguments, makes sure that all the currently stacked identifiers
 are stacked (even if those identifiers have been redefined) and returns
 a list of the stacked identifiers.
@@ -11719,21 +11762,24 @@
 
 @defmac untrace proc1 @dots{}
 Turns tracing, tracking, and  off for its arguments.
-@defmacx untrace
+@end defmac
+@defmac untrace
 With no arguments, untraces all currently traced identifiers and returns
 a list of these formerly traced identifiers.
 @end defmac
 
 @defmac untrack proc1 @dots{}
 Turns tracing, tracking, and  off for its arguments.
-@defmacx untrack
+@end defmac
+@defmac untrack
 With no arguments, untracks all currently tracked identifiers and returns
 a list of these formerly tracked identifiers.
 @end defmac
 
 @defmac unstack proc1 @dots{}
 Turns tracing, stacking, and  off for its arguments.
-@defmacx unstack
+@end defmac
+@defmac unstack
 With no arguments, unstacks all currently stacked identifiers and returns
 a list of these formerly stacked identifiers.
 @end defmac
--- a/color.txi
+++ b/color.txi
@@ -107,8 +107,9 @@
 @defun color:l*a*b* L* a* b* white-point
 
 Returns the L*a*b* color composed of @var{L*}, @var{a*}, @var{b*} with @var{white-point}.
+@end defun
 
-@defunx color:l*a*b* L* a* b*
+@defun color:l*a*b* L* a* b*
 Returns the L*a*b* color composed of @var{L*}, @var{a*}, @var{b*}.  If the coordinates
 do not encode a valid L*a*b* color, then an error is signaled.
 @end defun
@@ -117,8 +118,9 @@
 @defun color->l*a*b* color white-point
 
 Returns the list of 3 numbers encoding @var{color} in L*a*b* with @var{white-point}.
+@end defun
 
-@defunx color->l*a*b* color
+@defun color->l*a*b* color
 Returns the list of 3 numbers encoding @var{color} in L*a*b*.
 @end defun
 
@@ -138,8 +140,9 @@
 @defun color:l*u*v* L* u* v* white-point
 
 Returns the L*u*v* color composed of @var{L*}, @var{u*}, @var{v*} with @var{white-point}.
+@end defun
 
-@defunx color:l*u*v* L* u* v*
+@defun color:l*u*v* L* u* v*
 Returns the L*u*v* color composed of @var{L*}, @var{u*}, @var{v*}.  If the coordinates
 do not encode a valid L*u*v* color, then an error is signaled.
 @end defun
@@ -148,8 +151,9 @@
 @defun color->l*u*v* color white-point
 
 Returns the list of 3 numbers encoding @var{color} in L*u*v* with @var{white-point}.
+@end defun
 
-@defunx color->l*u*v* color
+@defun color->l*u*v* color
 Returns the list of 3 numbers encoding @var{color} in L*u*v*.
 @end defun
 
@@ -206,8 +210,9 @@
 @defun color:l*c*h L* C* h white-point
 
 Returns the L*C*h color composed of @var{L*}, @var{C*}, @var{h} with @var{white-point}.
+@end defun
 
-@defunx color:l*c*h L* C* h
+@defun color:l*c*h L* C* h
 Returns the L*C*h color composed of @var{L*}, @var{C*}, @var{h}.  If the coordinates
 do not encode a valid L*C*h color, then an error is signaled.
 @end defun
@@ -216,8 +221,9 @@
 @defun color->l*c*h color white-point
 
 Returns the list of 3 numbers encoding @var{color} in L*C*h with @var{white-point}.
+@end defun
 
-@defunx color->l*c*h color
+@defun color->l*c*h color
 Returns the list of 3 numbers encoding @var{color} in L*C*h.
 @end defun
 
@@ -326,11 +332,13 @@
 @defun color:e-srgb 10 r g b
 
 Returns the e-sRGB10 color composed of integers @var{r}, @var{g}, @var{b}.
+@end defun
 
-@defunx color:e-srgb 12 r g b
+@defun color:e-srgb 12 r g b
 Returns the e-sRGB12 color composed of integers @var{r}, @var{g}, @var{b}.
+@end defun
 
-@defunx color:e-srgb 16 r g b
+@defun color:e-srgb 16 r g b
 Returns the e-sRGB16 color composed of integers @var{r}, @var{g}, @var{b}.
 If the coordinates do not encode a valid e-sRGB color, then an error
 is signaled.
--- a/schmooz.scm
+++ b/schmooz.scm
@@ -306,22 +306,32 @@
 				  #\!))
 		     '("deffn {Procedure}" "deffnx {Procedure}" "deffn")
 		     '("defun" "defunx" "defun"))))))
+    (define in-body? #f)
     (out-header args (car ops))
     (let loop ((xdefs xdefs))
       (cond ((pair? xdefs)
 	     (out-header (car xdefs) (cadr ops))
 	     (loop (cdr xdefs)))))
     (for-each (lambda (subl)
+		;;(print 'in-body? in-body? 'subl subl)
 		(out 0 (car subl))
 		(for-each (lambda (l)
 			    (case (car l)
 			      ((@dfn)
 			       (out-cindex (cadr l)))
 			      ((@args)
-			       (out-header
-				(cons (car args) (cdr l))
-				(cadr ops)))))
-			  (cdr subl)))
+			       (cond
+				(in-body?
+				 (out 0 "@end " (caddr ops))
+				 (set! in-body? #f)
+				 (out-header (cons (car args) (cdr l))
+					     (car ops)))
+				(else
+				 (out-header (cons (car args) (cdr l))
+					     (cadr ops)))))))
+			  (cdr subl))
+		(if (not (equal? "" (car subl)))
+		    (set! in-body? #t)))
 	      (map (lambda (bl)
 		     (substitute-macs bl mac-list))
 		   body))
@@ -344,9 +354,7 @@
 			      (else
 			       (report "bad macro" l))))
 			  (cdr subl)))
-	      (map (lambda (bl)
-		     (substitute-macs bl mac-list))
-		   body))
+	      (map (lambda (bl) (substitute-macs bl mac-list)) body))
     (out 0 "@end defvar")
     (out 0)))
 
--- a/grapheps.scm
+++ b/grapheps.scm
@@ -527,12 +527,12 @@
 ;;over the range @2 to @3.  If the optional integer argument @4 is
 ;;supplied, it specifies the number of points to evaluate @1 at.
 ;;
-;;@defunx x1 x2 npts func1 func2 ...
+;;@args x1 x2 npts func1 func2 ...
 ;;Creates and displays an encapsulated PostScript graph of the
 ;;one-argument functions @var{func1}, @var{func2}, ... over the range
 ;;@var{x1} to @var{x2} at @var{npts} points.
 ;;
-;;@defunx plot coords x-label y-label
+;;@args coords x-label y-label
 ;;@var{coords} is a list or vector of coordinates, lists of x and y
 ;;coordinates.  @var{x-label} and @var{y-label} are strings with which
 ;;to label the x and y axes.