From 8f2cd195e18f7c26345dfd701216affcd1fdbcd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 1 Jun 2020 15:40:15 +0200 Subject: Remove *TOP* tags from descriptions. --- module/entry-points/benchmark.scm | 10 ++++------ module/entry-points/html.scm | 32 ++++++++++++++++---------------- module/entry-points/server.scm | 6 +++--- module/entry-points/text.scm | 2 +- module/main.scm | 29 ++++++++++++++--------------- module/util/options.scm | 2 +- 6 files changed, 39 insertions(+), 42 deletions(-) diff --git a/module/entry-points/benchmark.scm b/module/entry-points/benchmark.scm index 0ff5556d..d11ba463 100644 --- a/module/entry-points/benchmark.scm +++ b/module/entry-points/benchmark.scm @@ -11,14 +11,12 @@ (define opt-spec `((field (value #t) (description - (*TOP* - "Which field from the current app to force. Most heavy fields are defined in " - (i "(vcomponent)") "."))) + "Which field from the current app to force. Most heavy fields are defined in " + (i "(vcomponent)") ".")) (enable-output (single-char #\o) (description - (*TOP* - "Output is be default supressed, since many fields contain way to much data " - "to read. This turns it on again."))) + "Output is be default supressed, since many fields contain way to much data " + "to read. This turns it on again.")) (help (single-char #\h) (description "Print this help.")))) diff --git a/module/entry-points/html.scm b/module/entry-points/html.scm index 1237f628..e58cbddd 100644 --- a/module/entry-points/html.scm +++ b/module/entry-points/html.scm @@ -17,25 +17,25 @@ (description "Start date of output.") ) (count (value #t) - (description (*TOP* "How many pages should be rendered." - "If --style=" (b "week") " and --from=" (b "2020-04-27") - " then --count=" (b 4) " would render the four pages " - "2020-04-27, 2020-05-04, 2020-05-11, and 2020-05-25. " - "Defaults to 12 to give a whole year when --style=" (b "month") "." - ))) + (description "How many pages should be rendered." + "If --style=" (b "week") " and --from=" (b "2020-04-27") + " then --count=" (b 4) " would render the four pages " + "2020-04-27, 2020-05-04, 2020-05-11, and 2020-05-25. " + "Defaults to 12 to give a whole year when --style=" (b "month") "." + )) (style (value #t) (predicate ,(lambda (v) (memv (string->symbol v) '(wide week table)))) - (description (*TOP* "How the body of the HTML page should be layed out. " - (br) (b "week") - " gives a horizontally scrolling page with 7 elements, " - "where each has events graphically laid out hour by hour." - (br) (b "table") - " gives a month in overview as a table. Each block contains " - "the events for the given day, in order of start time. They are " - "however not graphically sized. " - (br) (b "wide") - " is the same as week, but gives a full month.")) + (description "How the body of the HTML page should be layed out. " + (br) (b "week") + " gives a horizontally scrolling page with 7 elements, " + "where each has events graphically laid out hour by hour." + (br) (b "table") + " gives a month in overview as a table. Each block contains " + "the events for the given day, in order of start time. They are " + "however not graphically sized. " + (br) (b "wide") + " is the same as week, but gives a full month.") ) (help (single-char #\h) (description "Print this help.")))) diff --git a/module/entry-points/server.scm b/module/entry-points/server.scm index ceefc5b9..b2716c15 100644 --- a/module/entry-points/server.scm +++ b/module/entry-points/server.scm @@ -175,10 +175,10 @@ (define options '((port (value #t) (single-char #\p) - (description (*TOP* "Bind to TCP port, defaults to " (i 8080) "."))) + (description "Bind to TCP port, defaults to " (i 8080) ".")) (addr (value #t) - (description (*TOP* "Address to use, defaults to " (i "0.0.0.0") - " for IPv4, and " (i "::") " for IPv6.")) + (description "Address to use, defaults to " (i "0.0.0.0") + " for IPv4, and " (i "::") " for IPv6.") ) ;; TODO numbers as single-char seems to not work. (six (single-char #\6) diff --git a/module/entry-points/text.scm b/module/entry-points/text.scm index 587beda3..4a0dfb91 100644 --- a/module/entry-points/text.scm +++ b/module/entry-points/text.scm @@ -11,7 +11,7 @@ '((width (value #t) (single-char #\w) (description "Width of written text, defaults to 70 chars.")) (file (value #t) (single-char #\f) - (description (*TOP* "Read from " (i "file") " instead of standard input."))) + (description "Read from " (i "file") " instead of standard input.")) (help (single-char #\h) (description "Prints this help.")))) diff --git a/module/main.scm b/module/main.scm index 8332f566..3f5397ad 100644 --- a/module/main.scm +++ b/module/main.scm @@ -38,16 +38,16 @@ (define options '((statprof (value display-style) - (description (*TOP* "Run the program within Guile's built in statical " - "profiler. Display style is one of " - (b "flat") " or " (b "tree") "."))) + (description "Run the program within Guile's built in statical " + "profiler. Display style is one of " + (b "flat") " or " (b "tree") ".")) (repl (value address) (description - (*TOP* "Start a Guile repl which can be connected to, defaults to the unix socket " - (i "/run/user/${UID}/calp-${PID}") ", but it can be bound to any unix or " - "TCP socket. ((@ (util app) current-app)) should return the current app context." - (br) - (b "Should NOT be used in production.")))) + "Start a Guile repl which can be connected to, defaults to the unix socket " + (i "/run/user/${UID}/calp-${PID}") ", but it can be bound to any unix or " + "TCP socket. ((@ (util app) current-app)) should return the current app context." + (br) + (b "Should NOT be used in production."))) ;; Techical note: ;; Guile's getopt doesn't support repeating keys. Thereby the small jank, @@ -55,13 +55,12 @@ (option (single-char #\o) (value #t) (description - (*TOP* - "Set configuration options, on the form " - (i "key") "=" (i "value") - " as if they were set in the config file. These options have " - "priority over those from the file. " - "Can " (i "not") " be given with an equal after --option." - (br) "Can be given multiple times."))) + "Set configuration options, on the form " + (i "key") "=" (i "value") + " as if they were set in the config file. These options have " + "priority over those from the file. " + "Can " (i "not") " be given with an equal after --option." + (br) "Can be given multiple times.")) (help (single-char #\h) (description "Print this help")))) diff --git a/module/util/options.scm b/module/util/options.scm index c1377253..17d77006 100644 --- a/module/util/options.scm +++ b/module/util/options.scm @@ -38,7 +38,7 @@ ,@valuefmt)) (br) ,@(awhen (assoc-ref args 'description) - `((blockquote ,(car it)) + `((blockquote ,@it) (br))))))) (define (esc . effect) -- cgit v1.2.3