From 587194b81ba2da80b5598567914c9ddc9a124208 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <paul@apatience.com>
Date: Tue, 8 Feb 2022 11:39:35 +0000
Subject: getopts: uniformize opthelp newlines and headers.
The documented options and type legend both end in a blank line,
unlike the undocumented options and option conventions.
* stdlib/getopts.tl (opthelp): Print a blank line after the
undocumented options.
(opthelp-conventions): Print a blank line after the conventions.
Also, change the header from "Option Conventions" to "Option
conventions" to follow the style of the undocumented options and
type legend.
* txr.1: Remove superfluous (as of now) put-line calls in the
--extra-help example of getopts. While here, correct o.extrahelp
to o.extra-help.
---
stdlib/getopts.tl | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'stdlib/getopts.tl')
diff --git a/stdlib/getopts.tl b/stdlib/getopts.tl
index 06cc514c..bb3f394b 100644
--- a/stdlib/getopts.tl
+++ b/stdlib/getopts.tl
@@ -306,12 +306,13 @@
(flatten (mappend (op list @1.short @1.long)
undocumented))] ", "}`))
(each ((line (sys:wdwrap undoc-str 75)))
- (put-line ` @line`))))))
+ (put-line ` @line`)))
+ (put-line))))
(defun opthelp-conventions (opt-desc-list : (*stdout* *stdout*))
(let ((documented (remove-if (op null @1.helptext) opt-desc-list))
(undocumented (keep-if (op null @1.helptext) opt-desc-list)))
- (put-line "Option Conventions:\n")
+ (put-line "Option conventions:\n")
(let* ((have-short (some documented (usl short)))
(have-long (some documented (usl long)))
(have-arg-p (some documented (usl arg-p)))
@@ -355,7 +356,8 @@
arguments which follow are not treated as options\ \
even if they look like options.")))
(mapdo (do put-line ` @1`)
- (sys:wdwrap `@{(flatten texts)}` 77)))))
+ (sys:wdwrap `@{(flatten texts)}` 77)))
+ (put-line)))
(defun opthelp-types (opt-desc-list : (*stdout* *stdout*))
(let ((documented (remove-if (op null @1.helptext) opt-desc-list)))
--
cgit v1.2.3